diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 index 0000000000..9ac37df2c8 --- /dev/null +++ b/Jenkinsfile @@ -0,0 +1,38 @@ +pipeline { + agent any + + stages { + + stage('Copy ROM') { + steps { + echo 'Setting up ROM...' + sh 'cp /usr/local/etc/roms/baserom_mm.z64 baserom.z64' + } + } + stage('Build') { + when { + not { + branch 'master' + } + } + steps { + sh 'make -j init' + } + } + stage('Report Progress') { + when { + branch 'master' + } + steps { + sh 'python3 progress.py csv >> /var/www/html/reports/progress_mm.csv' + sh 'python3 progress.py csv -m >> /var/www/html/reports/progress_mm_matching.csv' + sh 'python3 progress.py shield-json > /var/www/html/reports/progress_mm_shield.json' + } + } + } + post { + always { + cleanWs() + } + } +} diff --git a/Makefile b/Makefile index 4671e414a4..4c3d814427 100644 --- a/Makefile +++ b/Makefile @@ -97,7 +97,7 @@ ROM_FILES := $(shell cat ./tables/makerom_files.txt) UNCOMPRESSED_ROM_FILES := $(shell cat ./tables/makerom_uncompressed_files.txt) # create build directories -$(shell mkdir -p build/asm build/baserom build/comp build/decomp $(foreach dir,$(SRC_DIRS),$(shell mkdir -p build/$(dir)))) +$(shell mkdir -p build/asm build/asm/boot build/asm/code build/asm/overlays build/baserom build/comp build/decomp $(foreach dir,$(SRC_DIRS),$(shell mkdir -p build/$(dir)))) build/src/libultra/os/%: OPTFLAGS := -O1 build/src/libultra/io/%: OPTFLAGS := -O2 @@ -167,6 +167,7 @@ $(S_FILES): disasm disasm: tables/files.txt tables/functions.txt tables/objects.txt tables/variables.txt tables/vrom_variables.txt tables/pre_boot_variables.txt tables/files_with_nonmatching.txt ./tools/disasm.py -d ./asm -u . -l ./tables/files.txt -f ./tables/functions.txt -o ./tables/objects.txt -v ./tables/variables.txt -v ./tables/vrom_variables.txt -v ./tables/pre_boot_variables.txt @while read -r file; do \ + #echo "$$file" \ ./tools/split_asm.py ./asm/$$file.asm ./asm/non_matchings/$$file; \ done < ./tables/files_with_nonmatching.txt @@ -187,6 +188,7 @@ diff-init: all cp $(ROM) expected/$(ROM) init: + $(MAKE) clean $(MAKE) setup $(MAKE) all $(MAKE) diff-init diff --git a/linker_scripts/code_script.txt b/linker_scripts/code_script.txt index 65f815502c..37666b4297 100644 --- a/linker_scripts/code_script.txt +++ b/linker_scripts/code_script.txt @@ -15,264 +15,264 @@ SECTIONS build/src/boot_O2_g3/idle.o(.text) build/src/boot_O2_g3/viconfig.o(.text) build/src/boot_O2_g3/z_std_dma.o(.text) - build/asm/boot_0x80080E30.o(.text) + build/asm/boot/boot_0x80080E30.o(.text) build/src/boot_O2_g3/irqmgr.o(.text) build/src/boot_O2_g3/CIC6105.o(.text) build/src/boot_O2_g3/boot_0x80081920.o(.text) build/src/boot_O2_g3_trapuv/fault.o(.text) build/src/boot_O2_g3_trapuv/fault_drawer.o(.text) build/src/boot_O1/boot_0x80084940.o(.text) - build/asm/loadfragment.o(.text) + build/asm/boot/loadfragment.o(.text) build/src/boot_O2/loadfragment2.o(.text) - build/asm/boot_0x80085130.o(.text) + build/asm/boot/boot_0x80085130.o(.text) build/src/boot_O2/stackcheck.o(.text) - build/asm/boot_0x80085570.o(.text) - build/asm/mtxuty-cvt.o(.text) - build/asm/boot_0x80086280.o(.text) - build/asm/boot_0x800862E0.o(.text) - build/asm/boot_0x80086760.o(.text) - build/asm/boot_0x80086DD0.o(.text) - build/asm/boot_0x80086FA0.o(.text) - build/asm/__osMalloc.o(.text) + build/asm/boot/boot_0x80085570.o(.text) + build/asm/boot/mtxuty-cvt.o(.text) + build/asm/boot/boot_0x80086280.o(.text) + build/asm/boot/boot_0x800862E0.o(.text) + build/asm/boot/boot_0x80086760.o(.text) + build/asm/boot/boot_0x80086DD0.o(.text) + build/asm/boot/boot_0x80086FA0.o(.text) + build/asm/boot/__osMalloc.o(.text) build/src/libultra/rmon/sprintf.o(.text) - build/asm/boot_0x80087900.o(.text) - build/asm/setcause.o(.text) + build/asm/boot/boot_0x80087900.o(.text) + build/asm/boot/setcause.o(.text) build/src/libultra/os/sendmesg.o(.text) - build/asm/boot_0x80087C60.o(.text) + build/asm/boot/boot_0x80087C60.o(.text) build/src/boot_O1/boot_0x80087E00.o(.text) build/src/libultra/os/stopthread.o(.text) build/src/libultra/os/recvmesg.o(.text) - build/asm/setintmask.o(.text) - build/asm/getintmask.o(.text) - build/asm/boot_0x80088110.o(.text) - build/asm/boot_0x800882A0.o(.text) + build/asm/boot/setintmask.o(.text) + build/asm/boot/getintmask.o(.text) + build/asm/boot/boot_0x80088110.o(.text) + build/asm/boot/boot_0x800882A0.o(.text) build/src/libultra/gu/sinf.o(.text) build/src/libultra/gu/sins.o(.text) build/src/libultra/io/sptask.o(.text) build/src/libultra/libc/ll.o(.text) - build/asm/exceptasm.o(.text) + build/asm/boot/exceptasm.o(.text) build/src/libultra/os/thread.o(.text) build/src/libultra/os/destroythread.o(.text) - build/asm/boot_0x80089580.o(.text) - build/asm/bzero.o(.text) - build/asm/boot_0x800896D0.o(.text) + build/asm/boot/boot_0x80089580.o(.text) + build/asm/boot/bzero.o(.text) + build/asm/boot/boot_0x800896D0.o(.text) build/src/libultra/io/siacs.o(.text) build/src/libultra/io/controller.o(.text) build/src/libultra/os/createthread.o(.text) build/src/libultra/io/contreaddata.o(.text) - build/asm/boot_0x8008A170.o(.text) + build/asm/boot/boot_0x8008A170.o(.text) build/src/libultra/os/virtualtophysical.o(.text) - build/asm/getsr.o(.text) - build/asm/setsr.o(.text) - build/asm/writebackdcache.o(.text) - build/asm/initialize.o(.text) + build/asm/boot/getsr.o(.text) + build/asm/boot/setsr.o(.text) + build/asm/boot/writebackdcache.o(.text) + build/asm/boot/initialize.o(.text) build/src/libultra/io/vigetnextframebuf.o(.text) build/src/libultra/gu/perspective.o(.text) build/src/libultra/io/sprawdma.o(.text) build/src/libultra/io/sirawdma.o(.text) - build/asm/boot_0x8008AE20.o(.text) + build/asm/boot/boot_0x8008AE20.o(.text) build/src/libultra/io/viblack.o(.text) build/src/libultra/io/sirawread.o(.text) build/src/libultra/os/getthreadid.o(.text) build/src/libultra/io/sptaskyield.o(.text) - build/asm/pfsreadwritefile.o(.text) - build/asm/boot_0x8008B3C0.o(.text) - build/asm/boot_0x8008B600.o(.text) + build/asm/boot/pfsreadwritefile.o(.text) + build/asm/boot/boot_0x8008B3C0.o(.text) + build/asm/boot/boot_0x8008B600.o(.text) build/src/libultra/io/visetmode.o(.text) - build/asm/getconfig.o(.text) - build/asm/setconfig.o(.text) - build/asm/lookat.o(.text) - build/asm/boot_0x8008B9F0.o(.text) + build/asm/boot/getconfig.o(.text) + build/asm/boot/setconfig.o(.text) + build/asm/boot/lookat.o(.text) + build/asm/boot/boot_0x8008B9F0.o(.text) build/src/libultra/os/stoptimer.o(.text) - build/asm/probetlb.o(.text) + build/asm/boot/probetlb.o(.text) build/src/libultra/io/pimgr.o(.text) build/src/libultra/io/piacs.o(.text) . += 0x10; - build/asm/devmgr.o(.text) - build/asm/boot_0x8008C640.o(.text) + build/asm/boot/devmgr.o(.text) + build/asm/boot/boot_0x8008C640.o(.text) build/src/libultra/io/pirawdma.o(.text) - build/asm/boot_0x8008C740.o(.text) - build/asm/getcount.o(.text) - build/asm/boot_0x8008D2E0.o(.text) + build/asm/boot/boot_0x8008C740.o(.text) + build/asm/boot/getcount.o(.text) + build/asm/boot/boot_0x8008D2E0.o(.text) build/src/libultra/os/getmemsize.o(.text) - build/asm/boot_0x8008D470.o(.text) + build/asm/boot/boot_0x8008D470.o(.text) build/src/libultra/os/seteventmesg.o(.text) - build/asm/sqrtf.o(.text) - build/asm/boot_0x8008D710.o(.text) + build/asm/boot/sqrtf.o(.text) + build/asm/boot/boot_0x8008D710.o(.text) build/src/libultra/io/contquery.o(.text) - build/asm/lookathil.o(.text) + build/asm/boot/lookathil.o(.text) build/src/libultra/rmon/xprintf.o(.text) - build/asm/boot_0x8008ED30.o(.text) - build/asm/unmaptlball.o(.text) + build/asm/boot/boot_0x8008ED30.o(.text) + build/asm/boot/unmaptlball.o(.text) build/src/libultra/io/epidma.o(.text) - build/asm/boot_0x8008EED0.o(.text) - build/asm/boot_0x8008F100.o(.text) + build/asm/boot/boot_0x8008EED0.o(.text) + build/asm/boot/boot_0x8008F100.o(.text) build/src/libultra/libc/string.o(.text) build/src/libultra/os/createmesgqueue.o(.text) - build/asm/invalicache.o(.text) - build/asm/invaldcache.o(.text) + build/asm/boot/invalicache.o(.text) + build/asm/boot/invaldcache.o(.text) build/src/libultra/os/timerintr.o(.text) - build/asm/boot_0x8008F7D0.o(.text) - build/asm/boot_0x8008FA00.o(.text) + build/asm/boot/boot_0x8008F7D0.o(.text) + build/asm/boot/boot_0x8008FA00.o(.text) build/src/libultra/io/si.o(.text) - build/asm/boot_0x8008FA60.o(.text) + build/asm/boot/boot_0x8008FA60.o(.text) build/src/libultra/os/jammesg.o(.text) build/src/libultra/os/setthreadpri.o(.text) build/src/libultra/os/getthreadpri.o(.text) - build/asm/boot_0x8008FD00.o(.text) + build/asm/boot/boot_0x8008FD00.o(.text) build/src/libultra/io/viswapbuf.o(.text) - build/asm/position.o(.text) - build/asm/boot_0x800900C0.o(.text) + build/asm/boot/position.o(.text) + build/asm/boot/boot_0x800900C0.o(.text) build/src/libultra/io/sptaskyielded.o(.text) - build/asm/memcmp.o(.text) + build/asm/boot/memcmp.o(.text) build/src/libultra/os/gettime.o(.text) build/src/libultra/gu/rotate.o(.text) - build/asm/setglobalintmask.o(.text) - build/asm/boot_0x800906D0.o(.text) - build/asm/boot_0x80090810.o(.text) - build/asm/boot_0x80090900.o(.text) - build/asm/aisetfreq.o(.text) - build/asm/contramread.o(.text) - build/asm/boot_0x80090E70.o(.text) - build/asm/crc.o(.text) + build/asm/boot/setglobalintmask.o(.text) + build/asm/boot/boot_0x800906D0.o(.text) + build/asm/boot/boot_0x80090810.o(.text) + build/asm/boot/boot_0x80090900.o(.text) + build/asm/boot/aisetfreq.o(.text) + build/asm/boot/contramread.o(.text) + build/asm/boot/boot_0x80090E70.o(.text) + build/asm/boot/crc.o(.text) build/src/libultra/os/getactivequeue.o(.text) - build/asm/normalize.o(.text) - build/asm/setcompare.o(.text) - build/asm/getcompare.o(.text) + build/asm/boot/normalize.o(.text) + build/asm/boot/setcompare.o(.text) + build/asm/boot/getcompare.o(.text) build/src/libultra/io/dpgetstat.o(.text) build/src/libultra/io/dpsetstat.o(.text) - build/asm/bcopy.o(.text) - build/asm/resetglobalintmask.o(.text) - build/asm/boot_0x80091630.o(.text) + build/asm/boot/bcopy.o(.text) + build/asm/boot/resetglobalintmask.o(.text) + build/asm/boot/boot_0x80091630.o(.text) build/src/libultra/gu/ortho.o(.text) - build/asm/interrupt.o(.text) + build/asm/boot/interrupt.o(.text) build/src/libultra/io/vi.o(.text) - build/asm/viswapcontext.o(.text) + build/asm/boot/viswapcontext.o(.text) build/src/libultra/io/pigetcmdq.o(.text) - build/asm/cosf.o(.text) - build/asm/boot_0x800920B0.o(.text) + build/asm/boot/cosf.o(.text) + build/asm/boot/boot_0x800920B0.o(.text) build/src/libultra/io/visetspecial.o(.text) build/src/libultra/gu/coss.o(.text) build/src/libultra/os/settime.o(.text) - build/asm/boot_0x800922C0.o(.text) + build/asm/boot/boot_0x800922C0.o(.text) build/src/libultra/gu/visetevent.o(.text) - build/asm/pfsisplug.o(.text) - build/asm/boot_0x80092730.o(.text) - build/asm/cartrominit.o(.text) - build/asm/boot_0x80092A80.o(.text) - build/asm/boot_0x80092C00.o(.text) + build/asm/boot/pfsisplug.o(.text) + build/asm/boot/boot_0x80092730.o(.text) + build/asm/boot/cartrominit.o(.text) + build/asm/boot/boot_0x80092A80.o(.text) + build/asm/boot/boot_0x80092C00.o(.text) build/src/libultra/io/contsetch.o(.text) - build/asm/setfpccsr.o(.text) - build/asm/getfpccsr.o(.text) - build/asm/boot_0x80092D00.o(.text) - build/asm/boot_0x80092EE0.o(.text) - build/asm/boot_0x800931F0.o(.text) + build/asm/boot/setfpccsr.o(.text) + build/asm/boot/getfpccsr.o(.text) + build/asm/boot/boot_0x80092D00.o(.text) + build/asm/boot/boot_0x80092EE0.o(.text) + build/asm/boot/boot_0x800931F0.o(.text) build/src/libultra/io/aigetlen.o(.text) - build/asm/boot_0x80093BB0.o(.text) - build/asm/maptlbrdb.o(.text) + build/asm/boot/boot_0x80093BB0.o(.text) + build/asm/boot/maptlbrdb.o(.text) build/src/libultra/os/yieldthread.o(.text) . += 0x10; - build/asm/boot_0x80093CC0.o(.text) - build/asm/getcause.o(.text) - build/asm/contramwrite.o(.text) - build/asm/boot_0x80093FF0.o(.text) + build/asm/boot/boot_0x80093CC0.o(.text) + build/asm/boot/getcause.o(.text) + build/asm/boot/contramwrite.o(.text) + build/asm/boot/boot_0x80093FF0.o(.text) build/src/libultra/os/settimer.o(.text) - build/asm/xldtob.o(.text) + build/asm/boot/xldtob.o(.text) build/src/libultra/libc/ldiv.o(.text) - build/asm/xlitob.o(.text) + build/asm/boot/xlitob.o(.text) build/src/libultra/io/sirawwrite.o(.text) build/src/libultra/io/spgetstat.o(.text) build/src/libultra/io/spsetstat.o(.text) . += 0x10; - build/asm/vimgr.o(.text) + build/asm/boot/vimgr.o(.text) build/src/libultra/io/vigetcurrcontext.o(.text) - build/asm/writebackdcacheall.o(.text) + build/asm/boot/writebackdcacheall.o(.text) build/src/libultra/os/getcurrfaultthread.o(.text) - build/asm/boot_0x80095600.o(.text) - build/asm/boot_0x80095740.o(.text) + build/asm/boot/boot_0x80095600.o(.text) + build/asm/boot/boot_0x80095740.o(.text) build/src/libultra/os/startthread.o(.text) build/src/libultra/io/visetyscale.o(.text) build/src/libultra/io/visetxscale.o(.text) build/src/libultra/libc/llcvt.o(.text) - build/asm/boot_0x80095C70.o(.text) - build/asm/boot_0x80096360.o(.text) - build/asm/boot_0x80096410.o(.text) - build/asm/boot_0x800964D0.o(.text) - build/asm/spsetpc.o(.text) - build/asm/boot_0x80096540.o(.text) - build/asm/boot_0x80096770.o(.text) - build/asm/boot_0x800967A0.o(.text) - build/asm/boot_0x80096810.o(.text) - build/asm/boot_0x80096820.o(.text) - build/asm/boot_0x80096880.o(.text) + build/asm/boot/boot_0x80095C70.o(.text) + build/asm/boot/boot_0x80096360.o(.text) + build/asm/boot/boot_0x80096410.o(.text) + build/asm/boot/boot_0x800964D0.o(.text) + build/asm/boot/spsetpc.o(.text) + build/asm/boot/boot_0x80096540.o(.text) + build/asm/boot/boot_0x80096770.o(.text) + build/asm/boot/boot_0x800967A0.o(.text) + build/asm/boot/boot_0x80096810.o(.text) + build/asm/boot/boot_0x80096820.o(.text) + build/asm/boot/boot_0x80096880.o(.text) build/src/boot_O2_g3/boot_0x800968B0.o(.text) - build/asm/boot_0x800968F0.o(.text) - build/asm/boot_0x80096930.o(.text) + build/asm/boot/boot_0x800968F0.o(.text) + build/asm/boot/boot_0x80096930.o(.text) boot_text_end = .; boot_data_start = .; - build/asm/boot_data_0x800969C0.o(.data) + build/asm/boot/boot_data_0x800969C0.o(.data) build/src/boot_O2_g3/idle.o(.data) - build/asm/boot_data_0x80096B40.o(.data) + build/asm/boot/boot_data_0x80096B40.o(.data) build/src/boot_O2_g3/z_std_dma.o(.data) build/src/boot_O2_g3/irqmgr.o(.data) - build/asm/boot_data_fault.o(.data) + build/asm/boot/boot_data_fault.o(.data) build/src/boot_O2_g3_trapuv/fault_drawer.o(.data) - build/asm/boot_data_loadfragment.o(.data) + build/asm/boot/boot_data_loadfragment.o(.data) build/src/boot_O2/loadfragment2.o(.data) build/src/boot_O2/stackcheck.o(.data) - build/asm/boot_data_0x80085570.o(.data) - build/asm/boot_data_0x800862E0.o(.data) - build/asm/boot_data_0x80086FA0.o(.data) - build/asm/boot_data_0x80097540.o(.data) + build/asm/boot/boot_data_0x80085570.o(.data) + build/asm/boot/boot_data_0x800862E0.o(.data) + build/asm/boot/boot_data_0x80086FA0.o(.data) + build/asm/boot/boot_data_0x80097540.o(.data) build/src/libultra/gu/sins.o(.data) - build/asm/boot_data_0x80097DE0.o(.data) + build/asm/boot/boot_data_0x80097DE0.o(.data) build/src/libultra/os/thread.o(.data) build/src/libultra/io/siacs.o(.data) build/src/libultra/io/controller.o(.data) - build/asm/boot_data_initialize.o(.data) - build/asm/boot_data_pimgr.o(.data) + build/asm/boot/boot_data_initialize.o(.data) + build/asm/boot/boot_data_pimgr.o(.data) build/src/libultra/io/piacs.o(.data) - build/asm/boot_data_0x80097EB0.o(.data) + build/asm/boot/boot_data_0x80097EB0.o(.data) build/src/libultra/os/seteventmesg.o(.data) build/src/libultra/rmon/xprintf.o(.data) build/src/libultra/os/timerintr.o(.data) - build/asm/boot_data_position.o(.data) + build/asm/boot/boot_data_position.o(.data) build/src/libultra/gu/rotate.o(.data) - build/asm/boot_data_0x800906D0.o(.data) - build/asm/boot_data_contramread.o(.data) - build/asm/boot_data_vi.o(.data) - build/asm/boot_data_cartrominit.o(.data) - build/asm/boot_data_0x800980E0.o(.data) - build/asm/boot_data_xldtob.o(.data) - build/asm/boot_data_vimgr.o(.data) + build/asm/boot/boot_data_0x800906D0.o(.data) + build/asm/boot/boot_data_contramread.o(.data) + build/asm/boot/boot_data_vi.o(.data) + build/asm/boot/boot_data_cartrominit.o(.data) + build/asm/boot/boot_data_0x800980E0.o(.data) + build/asm/boot/boot_data_xldtob.o(.data) + build/asm/boot/boot_data_vimgr.o(.data) boot_data_end = .; boot_rodata_start = .; build/src/boot_O2_g3/boot_main.o(.rodata) build/src/boot_O2_g3/idle.o(.rodata) - build/asm/boot_rodata_z_std_dma.o(.rodata) - build/asm/boot_rodata_0x80080E30.o(.rodata) + build/asm/boot/boot_rodata_z_std_dma.o(.rodata) + build/asm/boot/boot_rodata_0x80080E30.o(.rodata) build/src/boot_O2_g3/irqmgr.o(.rodata) build/src/boot_O2_g3/CIC6105.o(.rodata) - build/asm/boot_rodata_fault.o(.rodata) - build/asm/boot_rodata_fault_drawer.o(.rodata) - build/asm/boot_rodata_0x80085570.o(.rodata) - build/asm/boot_rodata_0x80086280.o(.rodata) - build/asm/boot_rodata_0x80086760.o(.rodata) - build/asm/boot_rodata___osMalloc.o(.rodata) - build/asm/boot_rodata_setintmask.o(.rodata) + build/asm/boot/boot_rodata_fault.o(.rodata) + build/asm/boot/boot_rodata_fault_drawer.o(.rodata) + build/asm/boot/boot_rodata_0x80085570.o(.rodata) + build/asm/boot/boot_rodata_0x80086280.o(.rodata) + build/asm/boot/boot_rodata_0x80086760.o(.rodata) + build/asm/boot/boot_rodata___osMalloc.o(.rodata) + build/asm/boot/boot_rodata_setintmask.o(.rodata) build/src/libultra/gu/sinf.o(.rodata) - build/asm/boot_rodata_exceptasm.o(.rodata) + build/asm/boot/boot_rodata_exceptasm.o(.rodata) build/src/libultra/gu/perspective.o(.rodata) - build/asm/boot_rodata_0x8008C260.o(.rodata) - build/asm/boot_rodata_lookathil.o(.rodata) + build/asm/boot/boot_rodata_0x8008C260.o(.rodata) + build/asm/boot/boot_rodata_lookathil.o(.rodata) build/src/libultra/rmon/xprintf.o(.rodata) - build/asm/boot_rodata_cosf.o(.rodata) - build/asm/boot_rodata___libm_qnan_f.o(.rodata) - build/asm/boot_rodata_xldtob.o(.rodata) + build/asm/boot/boot_rodata_cosf.o(.rodata) + build/asm/boot/boot_rodata___libm_qnan_f.o(.rodata) + build/asm/boot/boot_rodata_xldtob.o(.rodata) build/src/libultra/libc/llcvt.o(.rodata) - build/asm/boot_rodata_build_date.o(.rodata) + build/asm/boot/boot_rodata_build_date.o(.rodata) boot_rodata_end = .; } SegmentEnd = .; @@ -319,300 +319,300 @@ SECTIONS { code_text_start = .; build/src/code/code_0x800A5AC0.o(.text) - build/asm/z_en_item00.o(.text) - build/asm/z_eff_blure.o(.text) - build/asm/z_eff_shield_particle.o(.text) - build/asm/z_eff_spark.o(.text) - build/asm/z_eff_ss_dead.o(.text) - build/asm/z_eff_tire_mark.o(.text) + build/asm/code/z_en_item00.o(.text) + build/asm/code/z_eff_blure.o(.text) + build/asm/code/z_eff_shield_particle.o(.text) + build/asm/code/z_eff_spark.o(.text) + build/asm/code/z_eff_ss_dead.o(.text) + build/asm/code/z_eff_tire_mark.o(.text) build/src/code/code_0x800AF710.o(.text) build/src/code/z_effect_soft_sprite.o(.text) - build/asm/z_effect_soft_sprite_old_init.o(.text) - build/asm/flg_set.o(.text) - build/asm/z_DLF.o(.text) + build/asm/code/z_effect_soft_sprite_old_init.o(.text) + build/asm/code/flg_set.o(.text) + build/asm/code/z_DLF.o(.text) build/src/code/z_actor.o(.text) build/src/code/z_actor_dlftbls.o(.text) build/src/code/z_bgcheck.o(.text) build/src/code/code_0x800CAAD0.o(.text) build/src/code/code_0x800CAE10.o(.text) - build/asm/code_0x800CB000.o(.text) - build/asm/z_camera.o(.text) + build/asm/code/code_0x800CB000.o(.text) + build/asm/code/z_camera.o(.text) build/src/code/code_0x800E03A0.o(.text) . += 0x10; - build/asm/z_collision_check.o(.text) + build/asm/code/z_collision_check.o(.text) build/src/code/code_0x800E8EA0.o(.text) - build/asm/code_0x800E9360.o(.text) - build/asm/z_debug.o(.text) - build/asm/z_debug_display.o(.text) - build/asm/z_debug_mode.o(.text) - build/asm/z_draw.o(.text) + build/asm/code/code_0x800E9360.o(.text) + build/asm/code/z_debug.o(.text) + build/asm/code/z_debug_display.o(.text) + build/asm/code/z_debug_mode.o(.text) + build/asm/code/z_draw.o(.text) build/src/code/z_eff_footmark.o(.text) - build/asm/code_0x800F0390.o(.text) - build/asm/code_0x800F05C0.o(.text) - build/asm/code_0x800F07C0.o(.text) - build/asm/code_0x800F1250.o(.text) - build/asm/code_0x800F1460.o(.text) - build/asm/code_0x800F23E0.o(.text) - build/asm/z_fcurve_data_skelanime.o(.text) - build/asm/z_fireobj.o(.text) - build/asm/z_horse.o(.text) - build/asm/z_jpeg.o(.text) - build/asm/code_0x800F4A10.o(.text) + build/asm/code/code_0x800F0390.o(.text) + build/asm/code/code_0x800F05C0.o(.text) + build/asm/code/code_0x800F07C0.o(.text) + build/asm/code/code_0x800F1250.o(.text) + build/asm/code/code_0x800F1460.o(.text) + build/asm/code/code_0x800F23E0.o(.text) + build/asm/code/z_fcurve_data_skelanime.o(.text) + build/asm/code/z_fireobj.o(.text) + build/asm/code/z_horse.o(.text) + build/asm/code/z_jpeg.o(.text) + build/asm/code/code_0x800F4A10.o(.text) build/src/code/z_kanfont.o(.text) - build/asm/z_kankyo.o(.text) + build/asm/code/z_kankyo.o(.text) build/src/code/z_lib.o(.text) - build/asm/z_lifemeter.o(.text) + build/asm/code/z_lifemeter.o(.text) build/src/code/z_lights.o(.text) - build/asm/code_0x80102C60.o(.text) - build/asm/z_map_disp.o(.text) - build/asm/z_map_data.o(.text) - build/asm/z_map_exp.o(.text) - build/asm/z_msgevent.o(.text) - build/asm/code_0x8010C0C0.o(.text) - build/asm/code_0x8010C230.o(.text) - build/asm/z_parameter.o(.text) - build/asm/code_0x801224E0.o(.text) - build/asm/code_0x80122660.o(.text) - build/asm/z_player_lib.o(.text) + build/asm/code/code_0x80102C60.o(.text) + build/asm/code/z_map_disp.o(.text) + build/asm/code/z_map_data.o(.text) + build/asm/code/z_map_exp.o(.text) + build/asm/code/z_msgevent.o(.text) + build/asm/code/code_0x8010C0C0.o(.text) + build/asm/code/code_0x8010C230.o(.text) + build/asm/code/z_parameter.o(.text) + build/asm/code/code_0x801224E0.o(.text) + build/asm/code/code_0x80122660.o(.text) + build/asm/code/z_player_lib.o(.text) build/src/code/z_prenmi.o(.text) - build/asm/code_0x8012A080.o(.text) + build/asm/code/code_0x8012A080.o(.text) build/src/code/z_rcp.o(.text) . += 0x10; build/src/code/z_room.o(.text) - build/asm/code_0x8012EC80.o(.text) + build/asm/code/code_0x8012EC80.o(.text) build/src/code/z_scene.o(.text) build/src/code/z_scene_proc.o(.text) - build/asm/z_scene_table.o(.text) - build/asm/code_0x801323D0.o(.text) + build/asm/code/z_scene_table.o(.text) + build/asm/code/code_0x801323D0.o(.text) build/src/code/z_skelanime.o(.text) - build/asm/z_skin.o(.text) - build/asm/z_skin_awb.o(.text) - build/asm/code_0x80138BA0.o(.text) + build/asm/code/z_skin.o(.text) + build/asm/code/z_skin_awb.o(.text) + build/asm/code/code_0x80138BA0.o(.text) build/src/code/z_snap.o(.text) - build/asm/z_sub_s.o(.text) - build/asm/code_0x8013EC10.o(.text) + build/asm/code/z_sub_s.o(.text) + build/asm/code/code_0x8013EC10.o(.text) build/src/code/z_view.o(.text) - build/asm/z_vimode.o(.text) - build/asm/code_0x80140E80.o(.text) - build/asm/z_vismono.o(.text) - build/asm/code_0x801420C0.o(.text) - build/asm/z_vr_box.o(.text) - build/asm/z_vr_box_draw.o(.text) - build/asm/z_sram_NES.o(.text) - build/asm/z_message.o(.text) - build/asm/z_message_nes.o(.text) - build/asm/z_message_staff.o(.text) - build/asm/code_0x80160A90.o(.text) - build/asm/z_shrink_window.o(.text) - build/asm/code_0x80161180.o(.text) - build/asm/z_kaleido_manager.o(.text) - build/asm/code_0x801639A0.o(.text) - build/asm/code_0x80163C90.o(.text) - build/asm/z_fbdemo.o(.text) - build/asm/code_0x801647D0.o(.text) - build/asm/z_fbdemo_circle.o(.text) - build/asm/z_overlay.o(.text) - build/asm/z_play.o(.text) - build/asm/z_play_hireso.o(.text) - build/asm/PreRender.o(.text) - build/asm/code_0x801727F0.o(.text) - build/asm/code_0x80172A00.o(.text) - build/asm/code_0x80172BC0.o(.text) - build/asm/code_0x80172C30.o(.text) + build/asm/code/z_vimode.o(.text) + build/asm/code/code_0x80140E80.o(.text) + build/asm/code/z_vismono.o(.text) + build/asm/code/code_0x801420C0.o(.text) + build/asm/code/z_vr_box.o(.text) + build/asm/code/z_vr_box_draw.o(.text) + build/asm/code/z_sram_NES.o(.text) + build/asm/code/z_message.o(.text) + build/asm/code/z_message_nes.o(.text) + build/asm/code/z_message_staff.o(.text) + build/asm/code/code_0x80160A90.o(.text) + build/asm/code/z_shrink_window.o(.text) + build/asm/code/code_0x80161180.o(.text) + build/asm/code/z_kaleido_manager.o(.text) + build/asm/code/code_0x801639A0.o(.text) + build/asm/code/code_0x80163C90.o(.text) + build/asm/code/z_fbdemo.o(.text) + build/asm/code/code_0x801647D0.o(.text) + build/asm/code/z_fbdemo_circle.o(.text) + build/asm/code/z_overlay.o(.text) + build/asm/code/z_play.o(.text) + build/asm/code/z_play_hireso.o(.text) + build/asm/code/PreRender.o(.text) + build/asm/code/code_0x801727F0.o(.text) + build/asm/code/code_0x80172A00.o(.text) + build/asm/code/code_0x80172BC0.o(.text) + build/asm/code/code_0x80172C30.o(.text) build/src/code/title_setup.o(.text) build/src/code/game.o(.text) - build/asm/gamealloc.o(.text) - build/asm/graph.o(.text) - build/asm/code_0x80174A40.o(.text) - build/asm/listalloc.o(.text) - build/asm/main.o(.text) - build/asm/padmgr.o(.text) - build/asm/sched.o(.text) - build/asm/speed_meter.o(.text) - build/asm/sys_cmpdma.o(.text) - build/asm/sys_initial_check.o(.text) - build/asm/code_0x80179300.o(.text) - build/asm/code_0x801795F0.o(.text) - build/asm/code_0x8017FEB0.o(.text) - build/asm/sys_matrix.o(.text) - build/asm/code_0x80182CE0.o(.text) + build/asm/code/gamealloc.o(.text) + build/asm/code/graph.o(.text) + build/asm/code/code_0x80174A40.o(.text) + build/asm/code/listalloc.o(.text) + build/asm/code/main.o(.text) + build/asm/code/padmgr.o(.text) + build/asm/code/sched.o(.text) + build/asm/code/speed_meter.o(.text) + build/asm/code/sys_cmpdma.o(.text) + build/asm/code/sys_initial_check.o(.text) + build/asm/code/code_0x80179300.o(.text) + build/asm/code/code_0x801795F0.o(.text) + build/asm/code/code_0x8017FEB0.o(.text) + build/asm/code/sys_matrix.o(.text) + build/asm/code/code_0x80182CE0.o(.text) build/src/code/code_0x80183070.o(.text) - build/asm/code_0x801830A0.o(.text) - build/asm/sys_flashrom.o(.text) - build/asm/code_0x80185F90.o(.text) - build/asm/code_0x801877D0.o(.text) - build/asm/code_0x8018B0F0.o(.text) - build/asm/code_0x8018EB60.o(.text) - build/asm/code_0x80192BE0.o(.text) - build/asm/code_0x80194710.o(.text) - build/asm/code_0x80194930.o(.text) - build/asm/code_0x801974D0.o(.text) - build/asm/code_0x8019AE40.o(.text) - build/asm/code_0x8019AEC0.o(.text) - build/asm/code_0x8019AF00.o(.text) - build/asm/code_0x801A51F0.o(.text) - build/asm/code_0x801A5BD0.o(.text) - build/asm/code_0x801A7B10.o(.text) - build/asm/code_0x801AA020.o(.text) - build/asm/code_0x801AA610.o(.text) - build/asm/code_0x801AAAA0.o(.text) + build/asm/code/code_0x801830A0.o(.text) + build/asm/code/sys_flashrom.o(.text) + build/asm/code/code_0x80185F90.o(.text) + build/asm/code/code_0x801877D0.o(.text) + build/asm/code/code_0x8018B0F0.o(.text) + build/asm/code/code_0x8018EB60.o(.text) + build/asm/code/code_0x80192BE0.o(.text) + build/asm/code/code_0x80194710.o(.text) + build/asm/code/code_0x80194930.o(.text) + build/asm/code/code_0x801974D0.o(.text) + build/asm/code/code_0x8019AE40.o(.text) + build/asm/code/code_0x8019AEC0.o(.text) + build/asm/code/code_0x8019AF00.o(.text) + build/asm/code/code_0x801A51F0.o(.text) + build/asm/code/code_0x801A5BD0.o(.text) + build/asm/code/code_0x801A7B10.o(.text) + build/asm/code/code_0x801AA020.o(.text) + build/asm/code/code_0x801AA610.o(.text) + build/asm/code/code_0x801AAAA0.o(.text) code_text_end = .; code_data_start = .; - build/asm/code_data_0x801AAAB0.o(.data) - build/asm/code_data_0x800A5AC0.o(.data) - build/asm/code_data_z_en_item00.o(.data) - build/asm/code_data_z_eff_blure.o(.data) - build/asm/code_data_z_eff_shield_particle.o(.data) + build/asm/code/code_data_0x801AAAB0.o(.data) + build/asm/code/code_data_0x800A5AC0.o(.data) + build/asm/code/code_data_z_en_item00.o(.data) + build/asm/code/code_data_z_eff_blure.o(.data) + build/asm/code/code_data_z_eff_shield_particle.o(.data) build/src/code/code_0x800AF710.o(.data) - build/asm/code_data_z_effect_soft_sprite.o(.data) - build/asm/code_data_z_effect_soft_sprite_old_init.o(.data) - build/asm/code_data_flg_set_table.o(.data) - build/asm/code_data_flg_set.o(.data) - build/asm/code_data_z_actor.o(.data) + build/asm/code/code_data_z_effect_soft_sprite.o(.data) + build/asm/code/code_data_z_effect_soft_sprite_old_init.o(.data) + build/asm/code/code_data_flg_set_table.o(.data) + build/asm/code/code_data_flg_set.o(.data) + build/asm/code/code_data_z_actor.o(.data) build/src/code/z_actor_dlftbls.o(.data) - build/asm/code_data_z_bgcheck.o(.data) - build/asm/code_data_z_camera.o(.data) - build/asm/code_data_z_collision_check.o(.data) - build/asm/code_data_z_debug_display.o(.data) - build/asm/code_data_z_debug_mode.o(.data) - build/asm/code_data_z_draw.o(.data) - build/asm/code_data_z_eff_footmark.o(.data) - build/asm/code_data_0x800F07C0.o(.data) - build/asm/code_data_0x800F1460.o(.data) - build/asm/code_data_z_fireobj.o(.data) - build/asm/code_data_0x801BD910.o(.data) - build/asm/code_data_z_horse.o(.data) - build/asm/code_data_z_jpeg.o(.data) - build/asm/code_data_z_kanfont.o(.data) - build/asm/code_data_z_kankyo.o(.data) - build/asm/code_data_z_lib.o(.data) - build/asm/code_data_z_lifemeter.o(.data) - build/asm/code_data_z_lights.o(.data) - build/asm/code_data_z_map_disp.o(.data) - build/asm/code_data_z_map_exp.o(.data) - build/asm/code_data_z_msgevent.o(.data) - build/asm/code_data_z_parameter.o(.data) - build/asm/code_data_z_player_lib.o(.data) - build/asm/code_data_0x8012A080.o(.data) + build/asm/code/code_data_z_bgcheck.o(.data) + build/asm/code/code_data_z_camera.o(.data) + build/asm/code/code_data_z_collision_check.o(.data) + build/asm/code/code_data_z_debug_display.o(.data) + build/asm/code/code_data_z_debug_mode.o(.data) + build/asm/code/code_data_z_draw.o(.data) + build/asm/code/code_data_z_eff_footmark.o(.data) + build/asm/code/code_data_0x800F07C0.o(.data) + build/asm/code/code_data_0x800F1460.o(.data) + build/asm/code/code_data_z_fireobj.o(.data) + build/asm/code/code_data_0x801BD910.o(.data) + build/asm/code/code_data_z_horse.o(.data) + build/asm/code/code_data_z_jpeg.o(.data) + build/asm/code/code_data_z_kanfont.o(.data) + build/asm/code/code_data_z_kankyo.o(.data) + build/asm/code/code_data_z_lib.o(.data) + build/asm/code/code_data_z_lifemeter.o(.data) + build/asm/code/code_data_z_lights.o(.data) + build/asm/code/code_data_z_map_disp.o(.data) + build/asm/code/code_data_z_map_exp.o(.data) + build/asm/code/code_data_z_msgevent.o(.data) + build/asm/code/code_data_z_parameter.o(.data) + build/asm/code/code_data_z_player_lib.o(.data) + build/asm/code/code_data_0x8012A080.o(.data) build/src/code/z_rcp.o(.data) - build/asm/code_data_z_room.o(.data) - build/asm/code_data_0x801C1D30.o(.data) - build/asm/code_data_z_scene.o(.data) - build/asm/code_data_0x801C2730.o(.data) - build/asm/code_data_z_scene_proc.o(.data) - build/asm/code_data_z_scene_table.o(.data) - build/asm/code_data_0x801323D0.o(.data) + build/asm/code/code_data_z_room.o(.data) + build/asm/code/code_data_0x801C1D30.o(.data) + build/asm/code/code_data_z_scene.o(.data) + build/asm/code/code_data_0x801C2730.o(.data) + build/asm/code/code_data_z_scene_proc.o(.data) + build/asm/code/code_data_z_scene_table.o(.data) + build/asm/code/code_data_0x801323D0.o(.data) build/src/code/z_skelanime.o(.data) - build/asm/code_data_0x80138BA0.o(.data) - build/asm/code_data_z_sub_s.o(.data) - build/asm/code_data_z_vimode.o(.data) - build/asm/code_data_z_vr_box.o(.data) - build/asm/code_data_z_vr_box_draw.o(.data) - build/asm/code_data_z_sram_NES.o(.data) - build/asm/code_data_z_message_nes.o(.data) - build/asm/code_data_0x80160A90.o(.data) - build/asm/code_data_z_kaleido_manager.o(.data) - build/asm/code_data_0x80163C90.o(.data) - build/asm/code_data_z_fbdemo.o(.data) - build/asm/code_data_z_fbdemo_circle.o(.data) - build/asm/code_data_z_play.o(.data) - build/asm/code_data_z_play_hireso.o(.data) - build/asm/code_data_0x80172C30.o(.data) + build/asm/code/code_data_0x80138BA0.o(.data) + build/asm/code/code_data_z_sub_s.o(.data) + build/asm/code/code_data_z_vimode.o(.data) + build/asm/code/code_data_z_vr_box.o(.data) + build/asm/code/code_data_z_vr_box_draw.o(.data) + build/asm/code/code_data_z_sram_NES.o(.data) + build/asm/code/code_data_z_message_nes.o(.data) + build/asm/code/code_data_0x80160A90.o(.data) + build/asm/code/code_data_z_kaleido_manager.o(.data) + build/asm/code/code_data_0x80163C90.o(.data) + build/asm/code/code_data_z_fbdemo.o(.data) + build/asm/code/code_data_z_fbdemo_circle.o(.data) + build/asm/code/code_data_z_play.o(.data) + build/asm/code/code_data_z_play_hireso.o(.data) + build/asm/code/code_data_0x80172C30.o(.data) build/src/code/game.o(.data) - build/asm/code_data_graph.o(.data) - build/asm/code_data_padmgr.o(.data) - build/asm/code_data_speed_meter.o(.data) - build/asm/code_data_0x80179300.o(.data) - build/asm/code_data_0x801D15B0.o(.data) - build/asm/code_data_0x8017FEB0.o(.data) - build/asm/code_data_sys_matrix.o(.data) - build/asm/code_data_0x80182CE0.o(.data) - build/asm/code_data_0x8018B0F0.o(.data) - build/asm/code_data_0x80194930.o(.data) - build/asm/code_data_0x8019AF00.o(.data) - build/asm/code_data_0x801A51F0.o(.data) - build/asm/code_data_0x801A5BD0.o(.data) + build/asm/code/code_data_graph.o(.data) + build/asm/code/code_data_padmgr.o(.data) + build/asm/code/code_data_speed_meter.o(.data) + build/asm/code/code_data_0x80179300.o(.data) + build/asm/code/code_data_0x801D15B0.o(.data) + build/asm/code/code_data_0x8017FEB0.o(.data) + build/asm/code/code_data_sys_matrix.o(.data) + build/asm/code/code_data_0x80182CE0.o(.data) + build/asm/code/code_data_0x8018B0F0.o(.data) + build/asm/code/code_data_0x80194930.o(.data) + build/asm/code/code_data_0x8019AF00.o(.data) + build/asm/code/code_data_0x801A51F0.o(.data) + build/asm/code/code_data_0x801A5BD0.o(.data) code_data_end = .; code_rodata_start = .; - build/asm/code_rodata_z_en_item00.o(.rodata) - build/asm/code_rodata_z_eff_blure.o(.rodata) - build/asm/code_rodata_z_eff_shield_particle.o(.rodata) - build/asm/code_rodata_z_eff_spark.o(.rodata) - build/asm/code_rodata_z_eff_ss_dead.o(.rodata) + build/asm/code/code_rodata_z_en_item00.o(.rodata) + build/asm/code/code_rodata_z_eff_blure.o(.rodata) + build/asm/code/code_rodata_z_eff_shield_particle.o(.rodata) + build/asm/code/code_rodata_z_eff_spark.o(.rodata) + build/asm/code/code_rodata_z_eff_ss_dead.o(.rodata) build/src/code/code_0x800AF710.o(.rodata) - build/asm/code_rodata_z_effect_soft_sprite_old_init.o(.rodata) - build/asm/code_rodata_flg_set.o(.rodata) - build/asm/code_rodata_z_actor.o(.rodata) + build/asm/code/code_rodata_z_effect_soft_sprite_old_init.o(.rodata) + build/asm/code/code_rodata_flg_set.o(.rodata) + build/asm/code/code_rodata_z_actor.o(.rodata) build/src/code/z_actor_dlftbls.o(.rodata) - build/asm/code_rodata_z_bgcheck.o(.rodata) - build/asm/code_rodata_0x800CB000.o(.rodata) - build/asm/code_rodata_z_camera.o(.rodata) - build/asm/code_rodata_z_collision_check.o(.rodata) - build/asm/code_rodata_0x800E8EA0.o(.rodata) - build/asm/code_rodata_z_debug_mode.o(.rodata) - build/asm/code_rodata_z_draw.o(.rodata) + build/asm/code/code_rodata_z_bgcheck.o(.rodata) + build/asm/code/code_rodata_0x800CB000.o(.rodata) + build/asm/code/code_rodata_z_camera.o(.rodata) + build/asm/code/code_rodata_z_collision_check.o(.rodata) + build/asm/code/code_rodata_0x800E8EA0.o(.rodata) + build/asm/code/code_rodata_z_debug_mode.o(.rodata) + build/asm/code/code_rodata_z_draw.o(.rodata) build/src/code/z_eff_footmark.o(.rodata) - build/asm/code_rodata_0x800F1460.o(.rodata) - build/asm/code_rodata_0x800F23E0.o(.rodata) - build/asm/code_rodata_z_fcurve_data_skelanime.o(.rodata) - build/asm/code_rodata_z_fireobj.o(.rodata) - build/asm/code_rodata_z_horse.o(.rodata) - build/asm/code_rodata_z_jpeg.o(.rodata) - build/asm/code_rodata_z_kankyo.o(.rodata) - build/asm/code_rodata_z_lib.o(.rodata) - build/asm/code_rodata_z_lifemeter.o(.rodata) - build/asm/code_rodata_z_lights.o(.rodata) - build/asm/code_rodata_z_map_disp.o(.rodata) - build/asm/code_rodata_0x8010C230.o(.rodata) - build/asm/code_rodata_z_parameter.o(.rodata) - build/asm/code_rodata_z_player_lib.o(.rodata) - build/asm/code_rodata_0x8012A080.o(.rodata) - build/asm/code_rodata_z_room.o(.rodata) + build/asm/code/code_rodata_0x800F1460.o(.rodata) + build/asm/code/code_rodata_0x800F23E0.o(.rodata) + build/asm/code/code_rodata_z_fcurve_data_skelanime.o(.rodata) + build/asm/code/code_rodata_z_fireobj.o(.rodata) + build/asm/code/code_rodata_z_horse.o(.rodata) + build/asm/code/code_rodata_z_jpeg.o(.rodata) + build/asm/code/code_rodata_z_kankyo.o(.rodata) + build/asm/code/code_rodata_z_lib.o(.rodata) + build/asm/code/code_rodata_z_lifemeter.o(.rodata) + build/asm/code/code_rodata_z_lights.o(.rodata) + build/asm/code/code_rodata_z_map_disp.o(.rodata) + build/asm/code/code_rodata_0x8010C230.o(.rodata) + build/asm/code/code_rodata_z_parameter.o(.rodata) + build/asm/code/code_rodata_z_player_lib.o(.rodata) + build/asm/code/code_rodata_0x8012A080.o(.rodata) + build/asm/code/code_rodata_z_room.o(.rodata) build/src/code/z_scene_proc.o(.rodata) - build/asm/code_rodata_z_scene_table.o(.rodata) - build/asm/code_rodata_z_skin.o(.rodata) - build/asm/code_rodata_0x80138BA0.o(.rodata) - build/asm/code_rodata_z_sub_s.o(.rodata) - build/asm/code_rodata_0x8013EC10.o(.rodata) + build/asm/code/code_rodata_z_scene_table.o(.rodata) + build/asm/code/code_rodata_z_skin.o(.rodata) + build/asm/code/code_rodata_0x80138BA0.o(.rodata) + build/asm/code/code_rodata_z_sub_s.o(.rodata) + build/asm/code/code_rodata_0x8013EC10.o(.rodata) build/src/code/z_view.o(.rodata) - build/asm/code_rodata_z_vimode.o(.rodata) - build/asm/code_rodata_0x80140E80.o(.rodata) - build/asm/code_rodata_z_vr_box.o(.rodata) - build/asm/code_rodata_z_message.o(.rodata) - build/asm/code_rodata_z_message_nes.o(.rodata) - build/asm/code_rodata_z_message_staff.o(.rodata) - build/asm/code_rodata_0x80160A90.o(.rodata) - build/asm/code_rodata_z_kaleido_manager.o(.rodata) - build/asm/code_rodata_z_fbdemo_circle.o(.rodata) - build/asm/code_rodata_z_play.o(.rodata) - build/asm/code_rodata_z_play_hireso.o(.rodata) - build/asm/code_rodata_PreRender.o(.rodata) - build/asm/code_rodata_0x80172BC0.o(.rodata) - build/asm/code_rodata_0x80172C30.o(.rodata) + build/asm/code/code_rodata_z_vimode.o(.rodata) + build/asm/code/code_rodata_0x80140E80.o(.rodata) + build/asm/code/code_rodata_z_vr_box.o(.rodata) + build/asm/code/code_rodata_z_message.o(.rodata) + build/asm/code/code_rodata_z_message_nes.o(.rodata) + build/asm/code/code_rodata_z_message_staff.o(.rodata) + build/asm/code/code_rodata_0x80160A90.o(.rodata) + build/asm/code/code_rodata_z_kaleido_manager.o(.rodata) + build/asm/code/code_rodata_z_fbdemo_circle.o(.rodata) + build/asm/code/code_rodata_z_play.o(.rodata) + build/asm/code/code_rodata_z_play_hireso.o(.rodata) + build/asm/code/code_rodata_PreRender.o(.rodata) + build/asm/code/code_rodata_0x80172BC0.o(.rodata) + build/asm/code/code_rodata_0x80172C30.o(.rodata) build/src/code/game.o(.rodata) - build/asm/code_rodata_graph.o(.rodata) - build/asm/code_rodata_main.o(.rodata) - build/asm/code_rodata_padmgr.o(.rodata) - build/asm/code_rodata_sched.o(.rodata) - build/asm/code_rodata_0x80179300.o(.rodata) - build/asm/code_rodata_0x801795F0.o(.rodata) - build/asm/code_rodata_0x8017FEB0.o(.rodata) - build/asm/code_rodata_sys_matrix.o(.rodata) - build/asm/code_rodata_0x801830A0.o(.rodata) - build/asm/code_rodata_sys_flashrom.o(.rodata) - build/asm/code_rodata_0x801877D0.o(.rodata) - build/asm/code_rodata_0x8018B0F0.o(.rodata) - build/asm/code_rodata_0x8018EB60.o(.rodata) - build/asm/code_rodata_0x80192BE0.o(.rodata) - build/asm/code_rodata_0x80194930.o(.rodata) - build/asm/code_rodata_0x801974D0.o(.rodata) - build/asm/code_rodata_0x8019AF00.o(.rodata) - build/asm/code_rodata_0x801A51F0.o(.rodata) - build/asm/code_rodata_0x801A5BD0.o(.rodata) - build/asm/code_rodata_0x801A7B10.o(.rodata) - build/asm/code_rodata_0x801AA610.o(.rodata) + build/asm/code/code_rodata_graph.o(.rodata) + build/asm/code/code_rodata_main.o(.rodata) + build/asm/code/code_rodata_padmgr.o(.rodata) + build/asm/code/code_rodata_sched.o(.rodata) + build/asm/code/code_rodata_0x80179300.o(.rodata) + build/asm/code/code_rodata_0x801795F0.o(.rodata) + build/asm/code/code_rodata_0x8017FEB0.o(.rodata) + build/asm/code/code_rodata_sys_matrix.o(.rodata) + build/asm/code/code_rodata_0x801830A0.o(.rodata) + build/asm/code/code_rodata_sys_flashrom.o(.rodata) + build/asm/code/code_rodata_0x801877D0.o(.rodata) + build/asm/code/code_rodata_0x8018B0F0.o(.rodata) + build/asm/code/code_rodata_0x8018EB60.o(.rodata) + build/asm/code/code_rodata_0x80192BE0.o(.rodata) + build/asm/code/code_rodata_0x80194930.o(.rodata) + build/asm/code/code_rodata_0x801974D0.o(.rodata) + build/asm/code/code_rodata_0x8019AF00.o(.rodata) + build/asm/code/code_rodata_0x801A51F0.o(.rodata) + build/asm/code/code_rodata_0x801A5BD0.o(.rodata) + build/asm/code/code_rodata_0x801A7B10.o(.rodata) + build/asm/code/code_rodata_0x801AA610.o(.rodata) code_rodata_end = .; } SegmentEnd = .; @@ -629,9 +629,9 @@ SECTIONS _ovl_titleSegmentStart = SegmentStart; ovl_title : AT(RomLocation) { - build/asm/ovl_title_0x80800000.o(.text) - build/asm/ovl_title_data.o(.data) - build/asm/ovl_title_rodata.o(.rodata) + build/asm/overlays/ovl_title_0x80800000.o(.text) + build/asm/overlays/ovl_title_data.o(.data) + build/asm/overlays/ovl_title_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -642,9 +642,9 @@ SECTIONS _ovl_selectSegmentStart = SegmentStart; ovl_select : AT(RomLocation) { - build/asm/ovl_select_0x80800910.o(.text) - build/asm/ovl_select_data.o(.data) - build/asm/ovl_select_rodata.o(.rodata) + build/asm/overlays/ovl_select_0x80800910.o(.text) + build/asm/overlays/ovl_select_data.o(.data) + build/asm/overlays/ovl_select_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -655,9 +655,9 @@ SECTIONS _ovl_openingSegmentStart = SegmentStart; ovl_opening : AT(RomLocation) { - build/asm/ovl_opening_0x80803DF0.o(.text) - build/asm/ovl_opening_data.o(.data) - build/asm/ovl_opening_rodata.o(.rodata) + build/asm/overlays/ovl_opening_0x80803DF0.o(.text) + build/asm/overlays/ovl_opening_data.o(.data) + build/asm/overlays/ovl_opening_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -668,11 +668,11 @@ SECTIONS _ovl_file_chooseSegmentStart = SegmentStart; ovl_file_choose : AT(RomLocation) { - build/asm/ovl_file_choose_0x80804010.o(.text) - build/asm/ovl_file_choose_0x80807940.o(.text) - build/asm/ovl_file_choose_0x8080BC20.o(.text) - build/asm/ovl_file_choose_data.o(.data) - build/asm/ovl_file_choose_rodata.o(.rodata) + build/asm/overlays/ovl_file_choose_0x80804010.o(.text) + build/asm/overlays/ovl_file_choose_0x80807940.o(.text) + build/asm/overlays/ovl_file_choose_0x8080BC20.o(.text) + build/asm/overlays/ovl_file_choose_data.o(.data) + build/asm/overlays/ovl_file_choose_rodata.o(.rodata) ovl_file_choose_bss_start = .; } . += 0x30; @@ -685,9 +685,9 @@ SECTIONS _ovl_daytelopSegmentStart = SegmentStart; ovl_daytelop : AT(RomLocation) { - build/asm/ovl_daytelop_0x80814EB0.o(.text) - build/asm/ovl_daytelop_data.o(.data) - build/asm/ovl_daytelop_rodata.o(.rodata) + build/asm/overlays/ovl_daytelop_0x80814EB0.o(.text) + build/asm/overlays/ovl_daytelop_data.o(.data) + build/asm/overlays/ovl_daytelop_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -698,10 +698,10 @@ SECTIONS _ovl_kaleido_scopeSegmentStart = SegmentStart; ovl_kaleido_scope : AT(RomLocation) { - build/asm/ovl_kaleido_scope_0x808160A0.o(.text) - build/asm/ovl_kaleido_scope_0x8081D240.o(.text) - build/asm/ovl_kaleido_scope_0x8081FF80.o(.text) - build/asm/ovl_kaleido_scope_data.o(.data) + build/asm/overlays/ovl_kaleido_scope_0x808160A0.o(.text) + build/asm/overlays/ovl_kaleido_scope_0x8081D240.o(.text) + build/asm/overlays/ovl_kaleido_scope_0x8081FF80.o(.text) + build/asm/overlays/ovl_kaleido_scope_data.o(.data) ovl_kaleido_scope_bss_start = .; } . += 0x40; @@ -714,8 +714,8 @@ SECTIONS _ovl_Player_ActorSegmentStart = SegmentStart; ovl_Player_Actor : AT(RomLocation) { - build/asm/ovl_Player_Actor_0x8082DA90.o(.text) - build/asm/ovl_Player_Actor_data.o(.data) + build/asm/overlays/ovl_Player_Actor_0x8082DA90.o(.text) + build/asm/overlays/ovl_Player_Actor_data.o(.data) ovl_Player_Actor_bss_start = .; } . += 0x80; @@ -729,9 +729,9 @@ SECTIONS ovl_En_Test : AT(RomLocation) { build/src/overlays/actors/ovl_En_Test/z_en_test.o(.text) - build/asm/ovl_En_Test_data.o(.data) + build/asm/overlays/ovl_En_Test_data.o(.data) build/src/overlays/actors/ovl_En_Test/z_en_test.o(.rodata) - build/asm/ovl_En_Test_rodata.o(.rodata) + build/asm/overlays/ovl_En_Test_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -743,9 +743,9 @@ SECTIONS ovl_En_GirlA : AT(RomLocation) { build/src/overlays/actors/ovl_En_GirlA/z_en_girla.o(.text) - build/asm/ovl_En_GirlA_data.o(.data) + build/asm/overlays/ovl_En_GirlA_data.o(.data) build/src/overlays/actors/ovl_En_GirlA/z_en_girla.o(.rodata) - build/asm/ovl_En_GirlA_rodata.o(.rodata) + build/asm/overlays/ovl_En_GirlA_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -757,9 +757,9 @@ SECTIONS ovl_En_Part : AT(RomLocation) { build/src/overlays/actors/ovl_En_Part/z_en_part.o(.text) - build/asm/ovl_En_Part_data.o(.data) + build/asm/overlays/ovl_En_Part_data.o(.data) build/src/overlays/actors/ovl_En_Part/z_en_part.o(.rodata) - build/asm/ovl_En_Part_rodata.o(.rodata) + build/asm/overlays/ovl_En_Part_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -771,9 +771,9 @@ SECTIONS ovl_En_Light : AT(RomLocation) { build/src/overlays/actors/ovl_En_Light/z_en_light.o(.text) - build/asm/ovl_En_Light_data.o(.data) + build/asm/overlays/ovl_En_Light_data.o(.data) build/src/overlays/actors/ovl_En_Light/z_en_light.o(.rodata) - build/asm/ovl_En_Light_rodata.o(.rodata) + build/asm/overlays/ovl_En_Light_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -785,9 +785,9 @@ SECTIONS ovl_En_Door : AT(RomLocation) { build/src/overlays/actors/ovl_En_Door/z_en_door.o(.text) - build/asm/ovl_En_Door_data.o(.data) + build/asm/overlays/ovl_En_Door_data.o(.data) build/src/overlays/actors/ovl_En_Door/z_en_door.o(.rodata) - build/asm/ovl_En_Door_rodata.o(.rodata) + build/asm/overlays/ovl_En_Door_rodata.o(.rodata) ovl_En_Door_bss_start = .; } . += 0x10; @@ -801,9 +801,9 @@ SECTIONS ovl_En_Box : AT(RomLocation) { build/src/overlays/actors/ovl_En_Box/z_en_box.o(.text) - build/asm/ovl_En_Box_data.o(.data) + build/asm/overlays/ovl_En_Box_data.o(.data) build/src/overlays/actors/ovl_En_Box/z_en_box.o(.rodata) - build/asm/ovl_En_Box_rodata.o(.rodata) + build/asm/overlays/ovl_En_Box_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -815,9 +815,9 @@ SECTIONS ovl_En_Pametfrog : AT(RomLocation) { build/src/overlays/actors/ovl_En_Pametfrog/z_en_pametfrog.o(.text) - build/asm/ovl_En_Pametfrog_data.o(.data) + build/asm/overlays/ovl_En_Pametfrog_data.o(.data) build/src/overlays/actors/ovl_En_Pametfrog/z_en_pametfrog.o(.rodata) - build/asm/ovl_En_Pametfrog_rodata.o(.rodata) + build/asm/overlays/ovl_En_Pametfrog_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -829,9 +829,9 @@ SECTIONS ovl_En_Okuta : AT(RomLocation) { build/src/overlays/actors/ovl_En_Okuta/z_en_okuta.o(.text) - build/asm/ovl_En_Okuta_data.o(.data) + build/asm/overlays/ovl_En_Okuta_data.o(.data) build/src/overlays/actors/ovl_En_Okuta/z_en_okuta.o(.rodata) - build/asm/ovl_En_Okuta_rodata.o(.rodata) + build/asm/overlays/ovl_En_Okuta_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -843,9 +843,9 @@ SECTIONS ovl_En_Bom : AT(RomLocation) { build/src/overlays/actors/ovl_En_Bom/z_en_bom.o(.text) - build/asm/ovl_En_Bom_data.o(.data) + build/asm/overlays/ovl_En_Bom_data.o(.data) build/src/overlays/actors/ovl_En_Bom/z_en_bom.o(.rodata) - build/asm/ovl_En_Bom_rodata.o(.rodata) + build/asm/overlays/ovl_En_Bom_rodata.o(.rodata) ovl_En_Bom_bss_start = .; } . += 0x1C0; @@ -859,9 +859,9 @@ SECTIONS ovl_En_Wallmas : AT(RomLocation) { build/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.o(.text) - build/asm/ovl_En_Wallmas_data.o(.data) + build/asm/overlays/ovl_En_Wallmas_data.o(.data) build/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.o(.rodata) - build/asm/ovl_En_Wallmas_rodata.o(.rodata) + build/asm/overlays/ovl_En_Wallmas_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -873,9 +873,9 @@ SECTIONS ovl_En_Dodongo : AT(RomLocation) { build/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.o(.text) - build/asm/ovl_En_Dodongo_data.o(.data) + build/asm/overlays/ovl_En_Dodongo_data.o(.data) build/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.o(.rodata) - build/asm/ovl_En_Dodongo_rodata.o(.rodata) + build/asm/overlays/ovl_En_Dodongo_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -887,9 +887,9 @@ SECTIONS ovl_En_Firefly : AT(RomLocation) { build/src/overlays/actors/ovl_En_Firefly/z_en_firefly.o(.text) - build/asm/ovl_En_Firefly_data.o(.data) + build/asm/overlays/ovl_En_Firefly_data.o(.data) build/src/overlays/actors/ovl_En_Firefly/z_en_firefly.o(.rodata) - build/asm/ovl_En_Firefly_rodata.o(.rodata) + build/asm/overlays/ovl_En_Firefly_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -901,9 +901,9 @@ SECTIONS ovl_En_Horse : AT(RomLocation) { build/src/overlays/actors/ovl_En_Horse/z_en_horse.o(.text) - build/asm/ovl_En_Horse_data.o(.data) + build/asm/overlays/ovl_En_Horse_data.o(.data) build/src/overlays/actors/ovl_En_Horse/z_en_horse.o(.rodata) - build/asm/ovl_En_Horse_rodata.o(.rodata) + build/asm/overlays/ovl_En_Horse_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -915,9 +915,9 @@ SECTIONS ovl_En_Arrow : AT(RomLocation) { build/src/overlays/actors/ovl_En_Arrow/z_en_arrow.o(.text) - build/asm/ovl_En_Arrow_data.o(.data) + build/asm/overlays/ovl_En_Arrow_data.o(.data) build/src/overlays/actors/ovl_En_Arrow/z_en_arrow.o(.rodata) - build/asm/ovl_En_Arrow_rodata.o(.rodata) + build/asm/overlays/ovl_En_Arrow_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -929,9 +929,9 @@ SECTIONS ovl_En_Elf : AT(RomLocation) { build/src/overlays/actors/ovl_En_Elf/z_en_elf.o(.text) - build/asm/ovl_En_Elf_data.o(.data) + build/asm/overlays/ovl_En_Elf_data.o(.data) build/src/overlays/actors/ovl_En_Elf/z_en_elf.o(.rodata) - build/asm/ovl_En_Elf_rodata.o(.rodata) + build/asm/overlays/ovl_En_Elf_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -943,9 +943,9 @@ SECTIONS ovl_En_Niw : AT(RomLocation) { build/src/overlays/actors/ovl_En_Niw/z_en_niw.o(.text) - build/asm/ovl_En_Niw_data.o(.data) + build/asm/overlays/ovl_En_Niw_data.o(.data) build/src/overlays/actors/ovl_En_Niw/z_en_niw.o(.rodata) - build/asm/ovl_En_Niw_rodata.o(.rodata) + build/asm/overlays/ovl_En_Niw_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -957,9 +957,9 @@ SECTIONS ovl_En_Tite : AT(RomLocation) { build/src/overlays/actors/ovl_En_Tite/z_en_tite.o(.text) - build/asm/ovl_En_Tite_data.o(.data) + build/asm/overlays/ovl_En_Tite_data.o(.data) build/src/overlays/actors/ovl_En_Tite/z_en_tite.o(.rodata) - build/asm/ovl_En_Tite_rodata.o(.rodata) + build/asm/overlays/ovl_En_Tite_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -971,9 +971,9 @@ SECTIONS ovl_En_Peehat : AT(RomLocation) { build/src/overlays/actors/ovl_En_Peehat/z_en_peehat.o(.text) - build/asm/ovl_En_Peehat_data.o(.data) + build/asm/overlays/ovl_En_Peehat_data.o(.data) build/src/overlays/actors/ovl_En_Peehat/z_en_peehat.o(.rodata) - build/asm/ovl_En_Peehat_rodata.o(.rodata) + build/asm/overlays/ovl_En_Peehat_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -985,9 +985,9 @@ SECTIONS ovl_En_Holl : AT(RomLocation) { build/src/overlays/actors/ovl_En_Holl/z_en_holl.o(.text) - build/asm/ovl_En_Holl_data.o(.data) + build/asm/overlays/ovl_En_Holl_data.o(.data) build/src/overlays/actors/ovl_En_Holl/z_en_holl.o(.rodata) - build/asm/ovl_En_Holl_rodata.o(.rodata) + build/asm/overlays/ovl_En_Holl_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -999,9 +999,9 @@ SECTIONS ovl_En_Dinofos : AT(RomLocation) { build/src/overlays/actors/ovl_En_Dinofos/z_en_dinofos.o(.text) - build/asm/ovl_En_Dinofos_data.o(.data) + build/asm/overlays/ovl_En_Dinofos_data.o(.data) build/src/overlays/actors/ovl_En_Dinofos/z_en_dinofos.o(.rodata) - build/asm/ovl_En_Dinofos_rodata.o(.rodata) + build/asm/overlays/ovl_En_Dinofos_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -1013,9 +1013,9 @@ SECTIONS ovl_En_Hata : AT(RomLocation) { build/src/overlays/actors/ovl_En_Hata/z_en_hata.o(.text) - build/asm/ovl_En_Hata_data.o(.data) + build/asm/overlays/ovl_En_Hata_data.o(.data) build/src/overlays/actors/ovl_En_Hata/z_en_hata.o(.rodata) - build/asm/ovl_En_Hata_rodata.o(.rodata) + build/asm/overlays/ovl_En_Hata_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -1042,9 +1042,9 @@ SECTIONS ovl_En_Viewer : AT(RomLocation) { build/src/overlays/actors/ovl_En_Viewer/z_en_viewer.o(.text) - build/asm/ovl_En_Viewer_data.o(.data) + build/asm/overlays/ovl_En_Viewer_data.o(.data) build/src/overlays/actors/ovl_En_Viewer/z_en_viewer.o(.rodata) - build/asm/ovl_En_Viewer_rodata.o(.rodata) + build/asm/overlays/ovl_En_Viewer_rodata.o(.rodata) ovl_En_Viewer_bss_start = .; } . += 0x10; @@ -1058,9 +1058,9 @@ SECTIONS ovl_En_Bubble : AT(RomLocation) { build/src/overlays/actors/ovl_En_Bubble/z_en_bubble.o(.text) - build/asm/ovl_En_Bubble_data.o(.data) + build/asm/overlays/ovl_En_Bubble_data.o(.data) build/src/overlays/actors/ovl_En_Bubble/z_en_bubble.o(.rodata) - build/asm/ovl_En_Bubble_rodata.o(.rodata) + build/asm/overlays/ovl_En_Bubble_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -1072,9 +1072,9 @@ SECTIONS ovl_Door_Shutter : AT(RomLocation) { build/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.o(.text) - build/asm/ovl_Door_Shutter_data.o(.data) + build/asm/overlays/ovl_Door_Shutter_data.o(.data) build/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.o(.rodata) - build/asm/ovl_Door_Shutter_rodata.o(.rodata) + build/asm/overlays/ovl_Door_Shutter_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -1086,9 +1086,9 @@ SECTIONS ovl_En_Boom : AT(RomLocation) { build/src/overlays/actors/ovl_En_Boom/z_en_boom.o(.text) - build/asm/ovl_En_Boom_data.o(.data) + build/asm/overlays/ovl_En_Boom_data.o(.data) build/src/overlays/actors/ovl_En_Boom/z_en_boom.o(.rodata) - build/asm/ovl_En_Boom_rodata.o(.rodata) + build/asm/overlays/ovl_En_Boom_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -1100,9 +1100,9 @@ SECTIONS ovl_En_Torch2 : AT(RomLocation) { build/src/overlays/actors/ovl_En_Torch2/z_en_torch2.o(.text) - build/asm/ovl_En_Torch2_data.o(.data) + build/asm/overlays/ovl_En_Torch2_data.o(.data) build/src/overlays/actors/ovl_En_Torch2/z_en_torch2.o(.rodata) - build/asm/ovl_En_Torch2_rodata.o(.rodata) + build/asm/overlays/ovl_En_Torch2_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -1114,9 +1114,9 @@ SECTIONS ovl_En_Minifrog : AT(RomLocation) { build/src/overlays/actors/ovl_En_Minifrog/z_en_minifrog.o(.text) - build/asm/ovl_En_Minifrog_data.o(.data) + build/asm/overlays/ovl_En_Minifrog_data.o(.data) build/src/overlays/actors/ovl_En_Minifrog/z_en_minifrog.o(.rodata) - build/asm/ovl_En_Minifrog_rodata.o(.rodata) + build/asm/overlays/ovl_En_Minifrog_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -1128,9 +1128,9 @@ SECTIONS ovl_En_St : AT(RomLocation) { build/src/overlays/actors/ovl_En_St/z_en_st.o(.text) - build/asm/ovl_En_St_data.o(.data) + build/asm/overlays/ovl_En_St_data.o(.data) build/src/overlays/actors/ovl_En_St/z_en_st.o(.rodata) - build/asm/ovl_En_St_rodata.o(.rodata) + build/asm/overlays/ovl_En_St_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -1142,9 +1142,9 @@ SECTIONS ovl_Obj_Wturn : AT(RomLocation) { build/src/overlays/actors/ovl_Obj_Wturn/z_obj_wturn.o(.text) - build/asm/ovl_Obj_Wturn_data.o(.data) + build/asm/overlays/ovl_Obj_Wturn_data.o(.data) build/src/overlays/actors/ovl_Obj_Wturn/z_obj_wturn.o(.rodata) - build/asm/ovl_Obj_Wturn_rodata.o(.rodata) + build/asm/overlays/ovl_Obj_Wturn_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -1156,9 +1156,9 @@ SECTIONS ovl_En_River_Sound : AT(RomLocation) { build/src/overlays/actors/ovl_En_River_Sound/z_en_river_sound.o(.text) - build/asm/ovl_En_River_Sound_data.o(.data) + build/asm/overlays/ovl_En_River_Sound_data.o(.data) build/src/overlays/actors/ovl_En_River_Sound/z_en_river_sound.o(.rodata) - build/asm/ovl_En_River_Sound_rodata.o(.rodata) + build/asm/overlays/ovl_En_River_Sound_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -1170,10 +1170,10 @@ SECTIONS ovl_En_Ossan : AT(RomLocation) { build/src/overlays/actors/ovl_En_Ossan/z_en_ossan.o(.text) - build/asm/ovl_En_Ossan_data.o(.data) + build/asm/overlays/ovl_En_Ossan_data.o(.data) build/src/overlays/actors/ovl_En_Ossan/z_en_ossan.o(.rodata) - build/asm/ovl_En_Ossan_rodata.o(.rodata) - build/asm/ovl_En_Ossan_late_rodata.o(.rodata) + build/asm/overlays/ovl_En_Ossan_rodata.o(.rodata) + build/asm/overlays/ovl_En_Ossan_late_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -1185,9 +1185,9 @@ SECTIONS ovl_En_Famos : AT(RomLocation) { build/src/overlays/actors/ovl_En_Famos/z_en_famos.o(.text) - build/asm/ovl_En_Famos_data.o(.data) + build/asm/overlays/ovl_En_Famos_data.o(.data) build/src/overlays/actors/ovl_En_Famos/z_en_famos.o(.rodata) - build/asm/ovl_En_Famos_rodata.o(.rodata) + build/asm/overlays/ovl_En_Famos_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -1199,9 +1199,9 @@ SECTIONS ovl_En_Bombf : AT(RomLocation) { build/src/overlays/actors/ovl_En_Bombf/z_en_bombf.o(.text) - build/asm/ovl_En_Bombf_data.o(.data) + build/asm/overlays/ovl_En_Bombf_data.o(.data) build/src/overlays/actors/ovl_En_Bombf/z_en_bombf.o(.rodata) - build/asm/ovl_En_Bombf_rodata.o(.rodata) + build/asm/overlays/ovl_En_Bombf_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -1213,9 +1213,9 @@ SECTIONS ovl_En_Am : AT(RomLocation) { build/src/overlays/actors/ovl_En_Am/z_en_am.o(.text) - build/asm/ovl_En_Am_data.o(.data) + build/asm/overlays/ovl_En_Am_data.o(.data) build/src/overlays/actors/ovl_En_Am/z_en_am.o(.rodata) - build/asm/ovl_En_Am_rodata.o(.rodata) + build/asm/overlays/ovl_En_Am_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -1227,9 +1227,9 @@ SECTIONS ovl_En_Dekubaba : AT(RomLocation) { build/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.o(.text) - build/asm/ovl_En_Dekubaba_data.o(.data) + build/asm/overlays/ovl_En_Dekubaba_data.o(.data) build/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.o(.rodata) - build/asm/ovl_En_Dekubaba_rodata.o(.rodata) + build/asm/overlays/ovl_En_Dekubaba_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -1241,9 +1241,9 @@ SECTIONS ovl_En_M_Fire1 : AT(RomLocation) { build/src/overlays/actors/ovl_En_M_Fire1/z_en_m_fire1.o(.text) - build/asm/ovl_En_M_Fire1_data.o(.data) + build/asm/overlays/ovl_En_M_Fire1_data.o(.data) build/src/overlays/actors/ovl_En_M_Fire1/z_en_m_fire1.o(.rodata) - build/asm/ovl_En_M_Fire1_rodata.o(.rodata) + build/asm/overlays/ovl_En_M_Fire1_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -1255,9 +1255,9 @@ SECTIONS ovl_En_M_Thunder : AT(RomLocation) { build/src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.o(.text) - build/asm/ovl_En_M_Thunder_data.o(.data) + build/asm/overlays/ovl_En_M_Thunder_data.o(.data) build/src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.o(.rodata) - build/asm/ovl_En_M_Thunder_rodata.o(.rodata) + build/asm/overlays/ovl_En_M_Thunder_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -1269,9 +1269,9 @@ SECTIONS ovl_Bg_Breakwall : AT(RomLocation) { build/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.o(.text) - build/asm/ovl_Bg_Breakwall_data.o(.data) + build/asm/overlays/ovl_Bg_Breakwall_data.o(.data) build/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.o(.rodata) - build/asm/ovl_Bg_Breakwall_rodata.o(.rodata) + build/asm/overlays/ovl_Bg_Breakwall_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -1283,9 +1283,9 @@ SECTIONS ovl_Door_Warp1 : AT(RomLocation) { build/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.o(.text) - build/asm/ovl_Door_Warp1_data.o(.data) + build/asm/overlays/ovl_Door_Warp1_data.o(.data) build/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.o(.rodata) - build/asm/ovl_Door_Warp1_rodata.o(.rodata) + build/asm/overlays/ovl_Door_Warp1_rodata.o(.rodata) ovl_Door_Warp1_bss_start = .; } . += 0x10; @@ -1299,9 +1299,9 @@ SECTIONS ovl_Obj_Syokudai : AT(RomLocation) { build/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.o(.text) - build/asm/ovl_Obj_Syokudai_data.o(.data) + build/asm/overlays/ovl_Obj_Syokudai_data.o(.data) build/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.o(.rodata) - build/asm/ovl_Obj_Syokudai_rodata.o(.rodata) + build/asm/overlays/ovl_Obj_Syokudai_rodata.o(.rodata) ovl_Obj_Syokudai_bss_start = .; } . += 0x10; @@ -1315,9 +1315,9 @@ SECTIONS ovl_Item_B_Heart : AT(RomLocation) { build/src/overlays/actors/ovl_Item_B_Heart/z_item_b_heart.o(.text) - build/asm/ovl_Item_B_Heart_data.o(.data) + build/asm/overlays/ovl_Item_B_Heart_data.o(.data) build/src/overlays/actors/ovl_Item_B_Heart/z_item_b_heart.o(.rodata) - build/asm/ovl_Item_B_Heart_rodata.o(.rodata) + build/asm/overlays/ovl_Item_B_Heart_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -1329,9 +1329,9 @@ SECTIONS ovl_En_Dekunuts : AT(RomLocation) { build/src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.o(.text) - build/asm/ovl_En_Dekunuts_data.o(.data) + build/asm/overlays/ovl_En_Dekunuts_data.o(.data) build/src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.o(.rodata) - build/asm/ovl_En_Dekunuts_rodata.o(.rodata) + build/asm/overlays/ovl_En_Dekunuts_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -1343,9 +1343,9 @@ SECTIONS ovl_En_Bbfall : AT(RomLocation) { build/src/overlays/actors/ovl_En_Bbfall/z_en_bbfall.o(.text) - build/asm/ovl_En_Bbfall_data.o(.data) + build/asm/overlays/ovl_En_Bbfall_data.o(.data) build/src/overlays/actors/ovl_En_Bbfall/z_en_bbfall.o(.rodata) - build/asm/ovl_En_Bbfall_rodata.o(.rodata) + build/asm/overlays/ovl_En_Bbfall_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -1372,9 +1372,9 @@ SECTIONS ovl_En_Bb : AT(RomLocation) { build/src/overlays/actors/ovl_En_Bb/z_en_bb.o(.text) - build/asm/ovl_En_Bb_data.o(.data) + build/asm/overlays/ovl_En_Bb_data.o(.data) build/src/overlays/actors/ovl_En_Bb/z_en_bb.o(.rodata) - build/asm/ovl_En_Bb_rodata.o(.rodata) + build/asm/overlays/ovl_En_Bb_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -1386,9 +1386,9 @@ SECTIONS ovl_Bg_Keikoku_Spr : AT(RomLocation) { build/src/overlays/actors/ovl_Bg_Keikoku_Spr/z_bg_keikoku_spr.o(.text) - build/asm/ovl_Bg_Keikoku_Spr_data.o(.data) + build/asm/overlays/ovl_Bg_Keikoku_Spr_data.o(.data) build/src/overlays/actors/ovl_Bg_Keikoku_Spr/z_bg_keikoku_spr.o(.rodata) - build/asm/ovl_Bg_Keikoku_Spr_rodata.o(.rodata) + build/asm/overlays/ovl_Bg_Keikoku_Spr_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -1400,9 +1400,9 @@ SECTIONS ovl_En_Wood02 : AT(RomLocation) { build/src/overlays/actors/ovl_En_Wood02/z_en_wood02.o(.text) - build/asm/ovl_En_Wood02_data.o(.data) + build/asm/overlays/ovl_En_Wood02_data.o(.data) build/src/overlays/actors/ovl_En_Wood02/z_en_wood02.o(.rodata) - build/asm/ovl_En_Wood02_rodata.o(.rodata) + build/asm/overlays/ovl_En_Wood02_rodata.o(.rodata) ovl_En_Wood02_bss_start = .; } . += 0x10; @@ -1416,9 +1416,9 @@ SECTIONS ovl_En_Death : AT(RomLocation) { build/src/overlays/actors/ovl_En_Death/z_en_death.o(.text) - build/asm/ovl_En_Death_data.o(.data) + build/asm/overlays/ovl_En_Death_data.o(.data) build/src/overlays/actors/ovl_En_Death/z_en_death.o(.rodata) - build/asm/ovl_En_Death_rodata.o(.rodata) + build/asm/overlays/ovl_En_Death_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -1430,9 +1430,9 @@ SECTIONS ovl_En_Minideath : AT(RomLocation) { build/src/overlays/actors/ovl_En_Minideath/z_en_minideath.o(.text) - build/asm/ovl_En_Minideath_data.o(.data) + build/asm/overlays/ovl_En_Minideath_data.o(.data) build/src/overlays/actors/ovl_En_Minideath/z_en_minideath.o(.rodata) - build/asm/ovl_En_Minideath_rodata.o(.rodata) + build/asm/overlays/ovl_En_Minideath_rodata.o(.rodata) ovl_En_Minideath_bss_start = .; } . += 0x10; @@ -1446,9 +1446,9 @@ SECTIONS ovl_En_Vm : AT(RomLocation) { build/src/overlays/actors/ovl_En_Vm/z_en_vm.o(.text) - build/asm/ovl_En_Vm_data.o(.data) + build/asm/overlays/ovl_En_Vm_data.o(.data) build/src/overlays/actors/ovl_En_Vm/z_en_vm.o(.rodata) - build/asm/ovl_En_Vm_rodata.o(.rodata) + build/asm/overlays/ovl_En_Vm_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -1460,9 +1460,9 @@ SECTIONS ovl_Demo_Effect : AT(RomLocation) { build/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.o(.text) - build/asm/ovl_Demo_Effect_data.o(.data) + build/asm/overlays/ovl_Demo_Effect_data.o(.data) build/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.o(.rodata) - build/asm/ovl_Demo_Effect_rodata.o(.rodata) + build/asm/overlays/ovl_Demo_Effect_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -1474,9 +1474,9 @@ SECTIONS ovl_Demo_Kankyo : AT(RomLocation) { build/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.o(.text) - build/asm/ovl_Demo_Kankyo_data.o(.data) + build/asm/overlays/ovl_Demo_Kankyo_data.o(.data) build/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.o(.rodata) - build/asm/ovl_Demo_Kankyo_rodata.o(.rodata) + build/asm/overlays/ovl_Demo_Kankyo_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -1488,9 +1488,9 @@ SECTIONS ovl_En_Floormas : AT(RomLocation) { build/src/overlays/actors/ovl_En_Floormas/z_en_floormas.o(.text) - build/asm/ovl_En_Floormas_data.o(.data) + build/asm/overlays/ovl_En_Floormas_data.o(.data) build/src/overlays/actors/ovl_En_Floormas/z_en_floormas.o(.rodata) - build/asm/ovl_En_Floormas_rodata.o(.rodata) + build/asm/overlays/ovl_En_Floormas_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -1502,9 +1502,9 @@ SECTIONS ovl_En_Rd : AT(RomLocation) { build/src/overlays/actors/ovl_En_Rd/z_en_rd.o(.text) - build/asm/ovl_En_Rd_data.o(.data) + build/asm/overlays/ovl_En_Rd_data.o(.data) build/src/overlays/actors/ovl_En_Rd/z_en_rd.o(.rodata) - build/asm/ovl_En_Rd_rodata.o(.rodata) + build/asm/overlays/ovl_En_Rd_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -1516,9 +1516,9 @@ SECTIONS ovl_Bg_F40_Flift : AT(RomLocation) { build/src/overlays/actors/ovl_Bg_F40_Flift/z_bg_f40_flift.o(.text) - build/asm/ovl_Bg_F40_Flift_data.o(.data) + build/asm/overlays/ovl_Bg_F40_Flift_data.o(.data) build/src/overlays/actors/ovl_Bg_F40_Flift/z_bg_f40_flift.o(.rodata) - build/asm/ovl_Bg_F40_Flift_rodata.o(.rodata) + build/asm/overlays/ovl_Bg_F40_Flift_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -1530,8 +1530,8 @@ SECTIONS ovl_Obj_Mure : AT(RomLocation) { build/src/overlays/actors/ovl_Obj_Mure/z_obj_mure.o(.text) - build/asm/ovl_Obj_Mure_data.o(.data) - build/asm/ovl_Obj_Mure_rodata.o(.rodata) + build/asm/overlays/ovl_Obj_Mure_data.o(.data) + build/asm/overlays/ovl_Obj_Mure_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -1543,9 +1543,9 @@ SECTIONS ovl_En_Sw : AT(RomLocation) { build/src/overlays/actors/ovl_En_Sw/z_en_sw.o(.text) - build/asm/ovl_En_Sw_data.o(.data) + build/asm/overlays/ovl_En_Sw_data.o(.data) build/src/overlays/actors/ovl_En_Sw/z_en_sw.o(.rodata) - build/asm/ovl_En_Sw_rodata.o(.rodata) + build/asm/overlays/ovl_En_Sw_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -1557,9 +1557,9 @@ SECTIONS ovl_Object_Kankyo : AT(RomLocation) { build/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.o(.text) - build/asm/ovl_Object_Kankyo_data.o(.data) + build/asm/overlays/ovl_Object_Kankyo_data.o(.data) build/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.o(.rodata) - build/asm/ovl_Object_Kankyo_rodata.o(.rodata) + build/asm/overlays/ovl_Object_Kankyo_rodata.o(.rodata) ovl_Object_Kankyo_bss_start = .; } . += 0x10; @@ -1573,9 +1573,9 @@ SECTIONS ovl_En_Horse_Link_Child : AT(RomLocation) { build/src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.o(.text) - build/asm/ovl_En_Horse_Link_Child_data.o(.data) + build/asm/overlays/ovl_En_Horse_Link_Child_data.o(.data) build/src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.o(.rodata) - build/asm/ovl_En_Horse_Link_Child_rodata.o(.rodata) + build/asm/overlays/ovl_En_Horse_Link_Child_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -1587,9 +1587,9 @@ SECTIONS ovl_Door_Ana : AT(RomLocation) { build/src/overlays/actors/ovl_Door_Ana/z_door_ana.o(.text) - build/asm/ovl_Door_Ana_data.o(.data) + build/asm/overlays/ovl_Door_Ana_data.o(.data) build/src/overlays/actors/ovl_Door_Ana/z_door_ana.o(.rodata) - build/asm/ovl_Door_Ana_rodata.o(.rodata) + build/asm/overlays/ovl_Door_Ana_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -1601,9 +1601,9 @@ SECTIONS ovl_En_Encount1 : AT(RomLocation) { build/src/overlays/actors/ovl_En_Encount1/z_en_encount1.o(.text) - build/asm/ovl_En_Encount1_data.o(.data) + build/asm/overlays/ovl_En_Encount1_data.o(.data) build/src/overlays/actors/ovl_En_Encount1/z_en_encount1.o(.rodata) - build/asm/ovl_En_Encount1_rodata.o(.rodata) + build/asm/overlays/ovl_En_Encount1_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -1615,9 +1615,9 @@ SECTIONS ovl_Demo_Tre_Lgt : AT(RomLocation) { build/src/overlays/actors/ovl_Demo_Tre_Lgt/z_demo_tre_lgt.o(.text) - build/asm/ovl_Demo_Tre_Lgt_data.o(.data) + build/asm/overlays/ovl_Demo_Tre_Lgt_data.o(.data) build/src/overlays/actors/ovl_Demo_Tre_Lgt/z_demo_tre_lgt.o(.rodata) - build/asm/ovl_Demo_Tre_Lgt_rodata.o(.rodata) + build/asm/overlays/ovl_Demo_Tre_Lgt_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -1629,9 +1629,9 @@ SECTIONS ovl_En_Encount2 : AT(RomLocation) { build/src/overlays/actors/ovl_En_Encount2/z_en_encount2.o(.text) - build/asm/ovl_En_Encount2_data.o(.data) + build/asm/overlays/ovl_En_Encount2_data.o(.data) build/src/overlays/actors/ovl_En_Encount2/z_en_encount2.o(.rodata) - build/asm/ovl_En_Encount2_rodata.o(.rodata) + build/asm/overlays/ovl_En_Encount2_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -1658,9 +1658,9 @@ SECTIONS ovl_Bg_Ctower_Rot : AT(RomLocation) { build/src/overlays/actors/ovl_Bg_Ctower_Rot/z_bg_ctower_rot.o(.text) - build/asm/ovl_Bg_Ctower_Rot_data.o(.data) + build/asm/overlays/ovl_Bg_Ctower_Rot_data.o(.data) build/src/overlays/actors/ovl_Bg_Ctower_Rot/z_bg_ctower_rot.o(.rodata) - build/asm/ovl_Bg_Ctower_Rot_rodata.o(.rodata) + build/asm/overlays/ovl_Bg_Ctower_Rot_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -1672,10 +1672,10 @@ SECTIONS ovl_Mir_Ray : AT(RomLocation) { build/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.o(.text) - build/asm/ovl_Mir_Ray_data.o(.data) + build/asm/overlays/ovl_Mir_Ray_data.o(.data) build/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.o(.rodata) - build/asm/ovl_Mir_Ray_rodata.o(.rodata) - build/asm/ovl_Mir_Ray_late_rodata.o(.rodata) + build/asm/overlays/ovl_Mir_Ray_rodata.o(.rodata) + build/asm/overlays/ovl_Mir_Ray_late_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -1687,9 +1687,9 @@ SECTIONS ovl_En_Sb : AT(RomLocation) { build/src/overlays/actors/ovl_En_Sb/z_en_sb.o(.text) - build/asm/ovl_En_Sb_data.o(.data) + build/asm/overlays/ovl_En_Sb_data.o(.data) build/src/overlays/actors/ovl_En_Sb/z_en_sb.o(.rodata) - build/asm/ovl_En_Sb_rodata.o(.rodata) + build/asm/overlays/ovl_En_Sb_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -1701,9 +1701,9 @@ SECTIONS ovl_En_Bigslime : AT(RomLocation) { build/src/overlays/actors/ovl_En_Bigslime/z_en_bigslime.o(.text) - build/asm/ovl_En_Bigslime_data.o(.data) + build/asm/overlays/ovl_En_Bigslime_data.o(.data) build/src/overlays/actors/ovl_En_Bigslime/z_en_bigslime.o(.rodata) - build/asm/ovl_En_Bigslime_rodata.o(.rodata) + build/asm/overlays/ovl_En_Bigslime_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -1715,9 +1715,9 @@ SECTIONS ovl_En_Karebaba : AT(RomLocation) { build/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.o(.text) - build/asm/ovl_En_Karebaba_data.o(.data) + build/asm/overlays/ovl_En_Karebaba_data.o(.data) build/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.o(.rodata) - build/asm/ovl_En_Karebaba_rodata.o(.rodata) + build/asm/overlays/ovl_En_Karebaba_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -1729,9 +1729,9 @@ SECTIONS ovl_En_In : AT(RomLocation) { build/src/overlays/actors/ovl_En_In/z_en_in.o(.text) - build/asm/ovl_En_In_data.o(.data) + build/asm/overlays/ovl_En_In_data.o(.data) build/src/overlays/actors/ovl_En_In/z_en_in.o(.rodata) - build/asm/ovl_En_In_rodata.o(.rodata) + build/asm/overlays/ovl_En_In_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -1743,9 +1743,9 @@ SECTIONS ovl_En_Bom_Chu : AT(RomLocation) { build/src/overlays/actors/ovl_En_Bom_Chu/z_en_bom_chu.o(.text) - build/asm/ovl_En_Bom_Chu_data.o(.data) + build/asm/overlays/ovl_En_Bom_Chu_data.o(.data) build/src/overlays/actors/ovl_En_Bom_Chu/z_en_bom_chu.o(.rodata) - build/asm/ovl_En_Bom_Chu_rodata.o(.rodata) + build/asm/overlays/ovl_En_Bom_Chu_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -1757,8 +1757,8 @@ SECTIONS ovl_En_Horse_Game_Check : AT(RomLocation) { build/src/overlays/actors/ovl_En_Horse_Game_Check/z_en_horse_game_check.o(.text) - build/asm/ovl_En_Horse_Game_Check_data.o(.data) - build/asm/ovl_En_Horse_Game_Check_rodata.o(.rodata) + build/asm/overlays/ovl_En_Horse_Game_Check_data.o(.data) + build/asm/overlays/ovl_En_Horse_Game_Check_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -1770,9 +1770,9 @@ SECTIONS ovl_En_Rr : AT(RomLocation) { build/src/overlays/actors/ovl_En_Rr/z_en_rr.o(.text) - build/asm/ovl_En_Rr_data.o(.data) + build/asm/overlays/ovl_En_Rr_data.o(.data) build/src/overlays/actors/ovl_En_Rr/z_en_rr.o(.rodata) - build/asm/ovl_En_Rr_rodata.o(.rodata) + build/asm/overlays/ovl_En_Rr_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -1784,9 +1784,9 @@ SECTIONS ovl_En_Fr : AT(RomLocation) { build/src/overlays/actors/ovl_En_Fr/z_en_fr.o(.text) - build/asm/ovl_En_Fr_data.o(.data) + build/asm/overlays/ovl_En_Fr_data.o(.data) build/src/overlays/actors/ovl_En_Fr/z_en_fr.o(.rodata) - build/asm/ovl_En_Fr_rodata.o(.rodata) + build/asm/overlays/ovl_En_Fr_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -1797,9 +1797,9 @@ SECTIONS _ovl_En_FishingSegmentStart = SegmentStart; ovl_En_Fishing : AT(RomLocation) { - build/asm/ovl_En_Fishing_0x808FC6C0.o(.text) - build/asm/ovl_En_Fishing_data.o(.data) - build/asm/ovl_En_Fishing_rodata.o(.rodata) + build/asm/overlays/ovl_En_Fishing_0x808FC6C0.o(.text) + build/asm/overlays/ovl_En_Fishing_data.o(.data) + build/asm/overlays/ovl_En_Fishing_rodata.o(.rodata) ovl_En_Fishing_bss_start = .; } . += 0x70E0; @@ -1813,9 +1813,9 @@ SECTIONS ovl_Obj_Oshihiki : AT(RomLocation) { build/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.o(.text) - build/asm/ovl_Obj_Oshihiki_data.o(.data) + build/asm/overlays/ovl_Obj_Oshihiki_data.o(.data) build/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.o(.rodata) - build/asm/ovl_Obj_Oshihiki_rodata.o(.rodata) + build/asm/overlays/ovl_Obj_Oshihiki_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -1827,9 +1827,9 @@ SECTIONS ovl_Eff_Dust : AT(RomLocation) { build/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.o(.text) - build/asm/ovl_Eff_Dust_data.o(.data) + build/asm/overlays/ovl_Eff_Dust_data.o(.data) build/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.o(.rodata) - build/asm/ovl_Eff_Dust_rodata.o(.rodata) + build/asm/overlays/ovl_Eff_Dust_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -1841,9 +1841,9 @@ SECTIONS ovl_Bg_Umajump : AT(RomLocation) { build/src/overlays/actors/ovl_Bg_Umajump/z_bg_umajump.o(.text) - build/asm/ovl_Bg_Umajump_data.o(.data) + build/asm/overlays/ovl_Bg_Umajump_data.o(.data) build/src/overlays/actors/ovl_Bg_Umajump/z_bg_umajump.o(.rodata) - build/asm/ovl_Bg_Umajump_rodata.o(.rodata) + build/asm/overlays/ovl_Bg_Umajump_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -1855,9 +1855,9 @@ SECTIONS ovl_En_Insect : AT(RomLocation) { build/src/overlays/actors/ovl_En_Insect/z_en_insect.o(.text) - build/asm/ovl_En_Insect_data.o(.data) + build/asm/overlays/ovl_En_Insect_data.o(.data) build/src/overlays/actors/ovl_En_Insect/z_en_insect.o(.rodata) - build/asm/ovl_En_Insect_rodata.o(.rodata) + build/asm/overlays/ovl_En_Insect_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -1869,9 +1869,9 @@ SECTIONS ovl_En_Butte : AT(RomLocation) { build/src/overlays/actors/ovl_En_Butte/z_en_butte.o(.text) - build/asm/ovl_En_Butte_data.o(.data) + build/asm/overlays/ovl_En_Butte_data.o(.data) build/src/overlays/actors/ovl_En_Butte/z_en_butte.o(.rodata) - build/asm/ovl_En_Butte_rodata.o(.rodata) + build/asm/overlays/ovl_En_Butte_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -1883,9 +1883,9 @@ SECTIONS ovl_En_Fish : AT(RomLocation) { build/src/overlays/actors/ovl_En_Fish/z_en_fish.o(.text) - build/asm/ovl_En_Fish_data.o(.data) + build/asm/overlays/ovl_En_Fish_data.o(.data) build/src/overlays/actors/ovl_En_Fish/z_en_fish.o(.rodata) - build/asm/ovl_En_Fish_rodata.o(.rodata) + build/asm/overlays/ovl_En_Fish_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -1897,9 +1897,9 @@ SECTIONS ovl_Item_Etcetera : AT(RomLocation) { build/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.o(.text) - build/asm/ovl_Item_Etcetera_data.o(.data) + build/asm/overlays/ovl_Item_Etcetera_data.o(.data) build/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.o(.rodata) - build/asm/ovl_Item_Etcetera_rodata.o(.rodata) + build/asm/overlays/ovl_Item_Etcetera_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -1911,9 +1911,9 @@ SECTIONS ovl_Arrow_Fire : AT(RomLocation) { build/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.o(.text) - build/asm/ovl_Arrow_Fire_data.o(.data) + build/asm/overlays/ovl_Arrow_Fire_data.o(.data) build/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.o(.rodata) - build/asm/ovl_Arrow_Fire_rodata.o(.rodata) + build/asm/overlays/ovl_Arrow_Fire_rodata.o(.rodata) ovl_Arrow_Fire_bss_start = .; } . += 0x10; @@ -1927,10 +1927,10 @@ SECTIONS ovl_Arrow_Ice : AT(RomLocation) { build/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.o(.text) - build/asm/ovl_Arrow_Ice_data.o(.data) + build/asm/overlays/ovl_Arrow_Ice_data.o(.data) build/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.o(.rodata) - build/asm/ovl_Arrow_Ice_rodata.o(.rodata) - build/asm/ovl_Arrow_Ice_late_rodata.o(.rodata) + build/asm/overlays/ovl_Arrow_Ice_rodata.o(.rodata) + build/asm/overlays/ovl_Arrow_Ice_late_rodata.o(.rodata) ovl_Arrow_Ice_bss_start = .; } . += 0x10; @@ -1944,10 +1944,10 @@ SECTIONS ovl_Arrow_Light : AT(RomLocation) { build/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.o(.text) - build/asm/ovl_Arrow_Light_data.o(.data) + build/asm/overlays/ovl_Arrow_Light_data.o(.data) build/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.o(.rodata) - build/asm/ovl_Arrow_Light_rodata.o(.rodata) - build/asm/ovl_Arrow_Light_late_rodata.o(.rodata) + build/asm/overlays/ovl_Arrow_Light_rodata.o(.rodata) + build/asm/overlays/ovl_Arrow_Light_late_rodata.o(.rodata) ovl_Arrow_Light_bss_start = .; } . += 0x10; @@ -1961,9 +1961,9 @@ SECTIONS ovl_Obj_Kibako : AT(RomLocation) { build/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.o(.text) - build/asm/ovl_Obj_Kibako_data.o(.data) + build/asm/overlays/ovl_Obj_Kibako_data.o(.data) build/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.o(.rodata) - build/asm/ovl_Obj_Kibako_rodata.o(.rodata) + build/asm/overlays/ovl_Obj_Kibako_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -1975,9 +1975,9 @@ SECTIONS ovl_Obj_Tsubo : AT(RomLocation) { build/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.o(.text) - build/asm/ovl_Obj_Tsubo_data.o(.data) + build/asm/overlays/ovl_Obj_Tsubo_data.o(.data) build/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.o(.rodata) - build/asm/ovl_Obj_Tsubo_rodata.o(.rodata) + build/asm/overlays/ovl_Obj_Tsubo_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -1989,9 +1989,9 @@ SECTIONS ovl_En_Ik : AT(RomLocation) { build/src/overlays/actors/ovl_En_Ik/z_en_ik.o(.text) - build/asm/ovl_En_Ik_data.o(.data) + build/asm/overlays/ovl_En_Ik_data.o(.data) build/src/overlays/actors/ovl_En_Ik/z_en_ik.o(.rodata) - build/asm/ovl_En_Ik_rodata.o(.rodata) + build/asm/overlays/ovl_En_Ik_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -2018,9 +2018,9 @@ SECTIONS ovl_En_Dns : AT(RomLocation) { build/src/overlays/actors/ovl_En_Dns/z_en_dns.o(.text) - build/asm/ovl_En_Dns_data.o(.data) + build/asm/overlays/ovl_En_Dns_data.o(.data) build/src/overlays/actors/ovl_En_Dns/z_en_dns.o(.rodata) - build/asm/ovl_En_Dns_rodata.o(.rodata) + build/asm/overlays/ovl_En_Dns_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -2032,10 +2032,10 @@ SECTIONS ovl_Elf_Msg : AT(RomLocation) { build/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.o(.text) - build/asm/ovl_Elf_Msg_data.o(.data) + build/asm/overlays/ovl_Elf_Msg_data.o(.data) build/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.o(.rodata) - build/asm/ovl_Elf_Msg_rodata.o(.rodata) - build/asm/ovl_Elf_Msg_late_rodata.o(.rodata) + build/asm/overlays/ovl_Elf_Msg_rodata.o(.rodata) + build/asm/overlays/ovl_Elf_Msg_late_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -2047,9 +2047,9 @@ SECTIONS ovl_En_Honotrap : AT(RomLocation) { build/src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.o(.text) - build/asm/ovl_En_Honotrap_data.o(.data) + build/asm/overlays/ovl_En_Honotrap_data.o(.data) build/src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.o(.rodata) - build/asm/ovl_En_Honotrap_rodata.o(.rodata) + build/asm/overlays/ovl_En_Honotrap_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -2061,9 +2061,9 @@ SECTIONS ovl_En_Tubo_Trap : AT(RomLocation) { build/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.o(.text) - build/asm/ovl_En_Tubo_Trap_data.o(.data) + build/asm/overlays/ovl_En_Tubo_Trap_data.o(.data) build/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.o(.rodata) - build/asm/ovl_En_Tubo_Trap_rodata.o(.rodata) + build/asm/overlays/ovl_En_Tubo_Trap_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -2075,9 +2075,9 @@ SECTIONS ovl_Obj_Ice_Poly : AT(RomLocation) { build/src/overlays/actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.o(.text) - build/asm/ovl_Obj_Ice_Poly_data.o(.data) + build/asm/overlays/ovl_Obj_Ice_Poly_data.o(.data) build/src/overlays/actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.o(.rodata) - build/asm/ovl_Obj_Ice_Poly_rodata.o(.rodata) + build/asm/overlays/ovl_Obj_Ice_Poly_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -2089,9 +2089,9 @@ SECTIONS ovl_En_Fz : AT(RomLocation) { build/src/overlays/actors/ovl_En_Fz/z_en_fz.o(.text) - build/asm/ovl_En_Fz_data.o(.data) + build/asm/overlays/ovl_En_Fz_data.o(.data) build/src/overlays/actors/ovl_En_Fz/z_en_fz.o(.rodata) - build/asm/ovl_En_Fz_rodata.o(.rodata) + build/asm/overlays/ovl_En_Fz_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -2103,9 +2103,9 @@ SECTIONS ovl_En_Kusa : AT(RomLocation) { build/src/overlays/actors/ovl_En_Kusa/z_en_kusa.o(.text) - build/asm/ovl_En_Kusa_data.o(.data) + build/asm/overlays/ovl_En_Kusa_data.o(.data) build/src/overlays/actors/ovl_En_Kusa/z_en_kusa.o(.rodata) - build/asm/ovl_En_Kusa_rodata.o(.rodata) + build/asm/overlays/ovl_En_Kusa_rodata.o(.rodata) ovl_En_Kusa_bss_start = .; } . += 0x220; @@ -2119,9 +2119,9 @@ SECTIONS ovl_Obj_Bean : AT(RomLocation) { build/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.o(.text) - build/asm/ovl_Obj_Bean_data.o(.data) + build/asm/overlays/ovl_Obj_Bean_data.o(.data) build/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.o(.rodata) - build/asm/ovl_Obj_Bean_rodata.o(.rodata) + build/asm/overlays/ovl_Obj_Bean_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -2133,8 +2133,8 @@ SECTIONS ovl_Obj_Bombiwa : AT(RomLocation) { build/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.o(.text) - build/asm/ovl_Obj_Bombiwa_data.o(.data) - build/asm/ovl_Obj_Bombiwa_rodata.o(.rodata) + build/asm/overlays/ovl_Obj_Bombiwa_data.o(.data) + build/asm/overlays/ovl_Obj_Bombiwa_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -2146,9 +2146,9 @@ SECTIONS ovl_Obj_Switch : AT(RomLocation) { build/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.o(.text) - build/asm/ovl_Obj_Switch_data.o(.data) + build/asm/overlays/ovl_Obj_Switch_data.o(.data) build/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.o(.rodata) - build/asm/ovl_Obj_Switch_rodata.o(.rodata) + build/asm/overlays/ovl_Obj_Switch_rodata.o(.rodata) ovl_Obj_Switch_bss_start = .; } . += 0x10; @@ -2162,9 +2162,9 @@ SECTIONS ovl_Obj_Lift : AT(RomLocation) { build/src/overlays/actors/ovl_Obj_Lift/z_obj_lift.o(.text) - build/asm/ovl_Obj_Lift_data.o(.data) + build/asm/overlays/ovl_Obj_Lift_data.o(.data) build/src/overlays/actors/ovl_Obj_Lift/z_obj_lift.o(.rodata) - build/asm/ovl_Obj_Lift_rodata.o(.rodata) + build/asm/overlays/ovl_Obj_Lift_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -2176,9 +2176,9 @@ SECTIONS ovl_Obj_Hsblock : AT(RomLocation) { build/src/overlays/actors/ovl_Obj_Hsblock/z_obj_hsblock.o(.text) - build/asm/ovl_Obj_Hsblock_data.o(.data) + build/asm/overlays/ovl_Obj_Hsblock_data.o(.data) build/src/overlays/actors/ovl_Obj_Hsblock/z_obj_hsblock.o(.rodata) - build/asm/ovl_Obj_Hsblock_rodata.o(.rodata) + build/asm/overlays/ovl_Obj_Hsblock_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -2190,9 +2190,9 @@ SECTIONS ovl_En_Okarina_Tag : AT(RomLocation) { build/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.o(.text) - build/asm/ovl_En_Okarina_Tag_data.o(.data) + build/asm/overlays/ovl_En_Okarina_Tag_data.o(.data) build/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.o(.rodata) - build/asm/ovl_En_Okarina_Tag_rodata.o(.rodata) + build/asm/overlays/ovl_En_Okarina_Tag_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -2204,9 +2204,9 @@ SECTIONS ovl_En_Goroiwa : AT(RomLocation) { build/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.o(.text) - build/asm/ovl_En_Goroiwa_data.o(.data) + build/asm/overlays/ovl_En_Goroiwa_data.o(.data) build/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.o(.rodata) - build/asm/ovl_En_Goroiwa_rodata.o(.rodata) + build/asm/overlays/ovl_En_Goroiwa_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -2218,9 +2218,9 @@ SECTIONS ovl_En_Daiku : AT(RomLocation) { build/src/overlays/actors/ovl_En_Daiku/z_en_daiku.o(.text) - build/asm/ovl_En_Daiku_data.o(.data) + build/asm/overlays/ovl_En_Daiku_data.o(.data) build/src/overlays/actors/ovl_En_Daiku/z_en_daiku.o(.rodata) - build/asm/ovl_En_Daiku_rodata.o(.rodata) + build/asm/overlays/ovl_En_Daiku_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -2232,9 +2232,9 @@ SECTIONS ovl_En_Nwc : AT(RomLocation) { build/src/overlays/actors/ovl_En_Nwc/z_en_nwc.o(.text) - build/asm/ovl_En_Nwc_data.o(.data) + build/asm/overlays/ovl_En_Nwc_data.o(.data) build/src/overlays/actors/ovl_En_Nwc/z_en_nwc.o(.rodata) - build/asm/ovl_En_Nwc_rodata.o(.rodata) + build/asm/overlays/ovl_En_Nwc_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -2246,9 +2246,9 @@ SECTIONS ovl_Item_Inbox : AT(RomLocation) { build/src/overlays/actors/ovl_Item_Inbox/z_item_inbox.o(.text) - build/asm/ovl_Item_Inbox_data.o(.data) + build/asm/overlays/ovl_Item_Inbox_data.o(.data) build/src/overlays/actors/ovl_Item_Inbox/z_item_inbox.o(.rodata) - build/asm/ovl_Item_Inbox_rodata.o(.rodata) + build/asm/overlays/ovl_Item_Inbox_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -2260,9 +2260,9 @@ SECTIONS ovl_En_Ge1 : AT(RomLocation) { build/src/overlays/actors/ovl_En_Ge1/z_en_ge1.o(.text) - build/asm/ovl_En_Ge1_data.o(.data) + build/asm/overlays/ovl_En_Ge1_data.o(.data) build/src/overlays/actors/ovl_En_Ge1/z_en_ge1.o(.rodata) - build/asm/ovl_En_Ge1_rodata.o(.rodata) + build/asm/overlays/ovl_En_Ge1_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -2274,9 +2274,9 @@ SECTIONS ovl_Obj_Blockstop : AT(RomLocation) { build/src/overlays/actors/ovl_Obj_Blockstop/z_obj_blockstop.o(.text) - build/asm/ovl_Obj_Blockstop_data.o(.data) + build/asm/overlays/ovl_Obj_Blockstop_data.o(.data) build/src/overlays/actors/ovl_Obj_Blockstop/z_obj_blockstop.o(.rodata) - build/asm/ovl_Obj_Blockstop_rodata.o(.rodata) + build/asm/overlays/ovl_Obj_Blockstop_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -2288,9 +2288,9 @@ SECTIONS ovl_En_Sda : AT(RomLocation) { build/src/overlays/actors/ovl_En_Sda/z_en_sda.o(.text) - build/asm/ovl_En_Sda_data.o(.data) + build/asm/overlays/ovl_En_Sda_data.o(.data) build/src/overlays/actors/ovl_En_Sda/z_en_sda.o(.rodata) - build/asm/ovl_En_Sda_rodata.o(.rodata) + build/asm/overlays/ovl_En_Sda_rodata.o(.rodata) ovl_En_Sda_bss_start = .; } . += 0xC0; @@ -2304,9 +2304,9 @@ SECTIONS ovl_En_Clear_Tag : AT(RomLocation) { build/src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.o(.text) - build/asm/ovl_En_Clear_Tag_data.o(.data) + build/asm/overlays/ovl_En_Clear_Tag_data.o(.data) build/src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.o(.rodata) - build/asm/ovl_En_Clear_Tag_rodata.o(.rodata) + build/asm/overlays/ovl_En_Clear_Tag_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -2318,9 +2318,9 @@ SECTIONS ovl_En_Gm : AT(RomLocation) { build/src/overlays/actors/ovl_En_Gm/z_en_gm.o(.text) - build/asm/ovl_En_Gm_data.o(.data) + build/asm/overlays/ovl_En_Gm_data.o(.data) build/src/overlays/actors/ovl_En_Gm/z_en_gm.o(.rodata) - build/asm/ovl_En_Gm_rodata.o(.rodata) + build/asm/overlays/ovl_En_Gm_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -2332,9 +2332,9 @@ SECTIONS ovl_En_Ms : AT(RomLocation) { build/src/overlays/actors/ovl_En_Ms/z_en_ms.o(.text) - build/asm/ovl_En_Ms_data.o(.data) + build/asm/overlays/ovl_En_Ms_data.o(.data) build/src/overlays/actors/ovl_En_Ms/z_en_ms.o(.rodata) - build/asm/ovl_En_Ms_rodata.o(.rodata) + build/asm/overlays/ovl_En_Ms_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -2346,9 +2346,9 @@ SECTIONS ovl_En_Hs : AT(RomLocation) { build/src/overlays/actors/ovl_En_Hs/z_en_hs.o(.text) - build/asm/ovl_En_Hs_data.o(.data) + build/asm/overlays/ovl_En_Hs_data.o(.data) build/src/overlays/actors/ovl_En_Hs/z_en_hs.o(.rodata) - build/asm/ovl_En_Hs_rodata.o(.rodata) + build/asm/overlays/ovl_En_Hs_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -2360,9 +2360,9 @@ SECTIONS ovl_Bg_Ingate : AT(RomLocation) { build/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.o(.text) - build/asm/ovl_Bg_Ingate_data.o(.data) + build/asm/overlays/ovl_Bg_Ingate_data.o(.data) build/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.o(.rodata) - build/asm/ovl_Bg_Ingate_rodata.o(.rodata) + build/asm/overlays/ovl_Bg_Ingate_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -2374,9 +2374,9 @@ SECTIONS ovl_En_Kanban : AT(RomLocation) { build/src/overlays/actors/ovl_En_Kanban/z_en_kanban.o(.text) - build/asm/ovl_En_Kanban_data.o(.data) + build/asm/overlays/ovl_En_Kanban_data.o(.data) build/src/overlays/actors/ovl_En_Kanban/z_en_kanban.o(.rodata) - build/asm/ovl_En_Kanban_rodata.o(.rodata) + build/asm/overlays/ovl_En_Kanban_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -2388,9 +2388,9 @@ SECTIONS ovl_En_Attack_Niw : AT(RomLocation) { build/src/overlays/actors/ovl_En_Attack_Niw/z_en_attack_niw.o(.text) - build/asm/ovl_En_Attack_Niw_data.o(.data) + build/asm/overlays/ovl_En_Attack_Niw_data.o(.data) build/src/overlays/actors/ovl_En_Attack_Niw/z_en_attack_niw.o(.rodata) - build/asm/ovl_En_Attack_Niw_rodata.o(.rodata) + build/asm/overlays/ovl_En_Attack_Niw_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -2402,9 +2402,9 @@ SECTIONS ovl_En_Mk : AT(RomLocation) { build/src/overlays/actors/ovl_En_Mk/z_en_mk.o(.text) - build/asm/ovl_En_Mk_data.o(.data) + build/asm/overlays/ovl_En_Mk_data.o(.data) build/src/overlays/actors/ovl_En_Mk/z_en_mk.o(.rodata) - build/asm/ovl_En_Mk_rodata.o(.rodata) + build/asm/overlays/ovl_En_Mk_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -2416,9 +2416,9 @@ SECTIONS ovl_En_Owl : AT(RomLocation) { build/src/overlays/actors/ovl_En_Owl/z_en_owl.o(.text) - build/asm/ovl_En_Owl_data.o(.data) + build/asm/overlays/ovl_En_Owl_data.o(.data) build/src/overlays/actors/ovl_En_Owl/z_en_owl.o(.rodata) - build/asm/ovl_En_Owl_rodata.o(.rodata) + build/asm/overlays/ovl_En_Owl_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -2430,9 +2430,9 @@ SECTIONS ovl_En_Ishi : AT(RomLocation) { build/src/overlays/actors/ovl_En_Ishi/z_en_ishi.o(.text) - build/asm/ovl_En_Ishi_data.o(.data) + build/asm/overlays/ovl_En_Ishi_data.o(.data) build/src/overlays/actors/ovl_En_Ishi/z_en_ishi.o(.rodata) - build/asm/ovl_En_Ishi_rodata.o(.rodata) + build/asm/overlays/ovl_En_Ishi_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -2459,9 +2459,9 @@ SECTIONS ovl_Obj_Lightswitch : AT(RomLocation) { build/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.o(.text) - build/asm/ovl_Obj_Lightswitch_data.o(.data) + build/asm/overlays/ovl_Obj_Lightswitch_data.o(.data) build/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.o(.rodata) - build/asm/ovl_Obj_Lightswitch_rodata.o(.rodata) + build/asm/overlays/ovl_Obj_Lightswitch_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -2473,8 +2473,8 @@ SECTIONS ovl_Obj_Mure2 : AT(RomLocation) { build/src/overlays/actors/ovl_Obj_Mure2/z_obj_mure2.o(.text) - build/asm/ovl_Obj_Mure2_data.o(.data) - build/asm/ovl_Obj_Mure2_rodata.o(.rodata) + build/asm/overlays/ovl_Obj_Mure2_data.o(.data) + build/asm/overlays/ovl_Obj_Mure2_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -2486,9 +2486,9 @@ SECTIONS ovl_En_Fu : AT(RomLocation) { build/src/overlays/actors/ovl_En_Fu/z_en_fu.o(.text) - build/asm/ovl_En_Fu_data.o(.data) + build/asm/overlays/ovl_En_Fu_data.o(.data) build/src/overlays/actors/ovl_En_Fu/z_en_fu.o(.rodata) - build/asm/ovl_En_Fu_rodata.o(.rodata) + build/asm/overlays/ovl_En_Fu_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -2500,9 +2500,9 @@ SECTIONS ovl_En_Stream : AT(RomLocation) { build/src/overlays/actors/ovl_En_Stream/z_en_stream.o(.text) - build/asm/ovl_En_Stream_data.o(.data) + build/asm/overlays/ovl_En_Stream_data.o(.data) build/src/overlays/actors/ovl_En_Stream/z_en_stream.o(.rodata) - build/asm/ovl_En_Stream_rodata.o(.rodata) + build/asm/overlays/ovl_En_Stream_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -2514,9 +2514,9 @@ SECTIONS ovl_En_Mm : AT(RomLocation) { build/src/overlays/actors/ovl_En_Mm/z_en_mm.o(.text) - build/asm/ovl_En_Mm_data.o(.data) + build/asm/overlays/ovl_En_Mm_data.o(.data) build/src/overlays/actors/ovl_En_Mm/z_en_mm.o(.rodata) - build/asm/ovl_En_Mm_rodata.o(.rodata) + build/asm/overlays/ovl_En_Mm_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -2528,9 +2528,9 @@ SECTIONS ovl_En_Weather_Tag : AT(RomLocation) { build/src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.o(.text) - build/asm/ovl_En_Weather_Tag_data.o(.data) + build/asm/overlays/ovl_En_Weather_Tag_data.o(.data) build/src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.o(.rodata) - build/asm/ovl_En_Weather_Tag_rodata.o(.rodata) + build/asm/overlays/ovl_En_Weather_Tag_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -2542,9 +2542,9 @@ SECTIONS ovl_En_Ani : AT(RomLocation) { build/src/overlays/actors/ovl_En_Ani/z_en_ani.o(.text) - build/asm/ovl_En_Ani_data.o(.data) + build/asm/overlays/ovl_En_Ani_data.o(.data) build/src/overlays/actors/ovl_En_Ani/z_en_ani.o(.rodata) - build/asm/ovl_En_Ani_rodata.o(.rodata) + build/asm/overlays/ovl_En_Ani_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -2556,9 +2556,9 @@ SECTIONS ovl_En_Js : AT(RomLocation) { build/src/overlays/actors/ovl_En_Js/z_en_js.o(.text) - build/asm/ovl_En_Js_data.o(.data) + build/asm/overlays/ovl_En_Js_data.o(.data) build/src/overlays/actors/ovl_En_Js/z_en_js.o(.rodata) - build/asm/ovl_En_Js_rodata.o(.rodata) + build/asm/overlays/ovl_En_Js_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -2584,9 +2584,9 @@ SECTIONS ovl_En_Mag : AT(RomLocation) { build/src/overlays/actors/ovl_En_Mag/z_en_mag.o(.text) - build/asm/ovl_En_Mag_data.o(.data) + build/asm/overlays/ovl_En_Mag_data.o(.data) build/src/overlays/actors/ovl_En_Mag/z_en_mag.o(.rodata) - build/asm/ovl_En_Mag_rodata.o(.rodata) + build/asm/overlays/ovl_En_Mag_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -2598,8 +2598,8 @@ SECTIONS ovl_Elf_Msg2 : AT(RomLocation) { build/src/overlays/actors/ovl_Elf_Msg2/z_elf_msg2.o(.text) - build/asm/ovl_Elf_Msg2_data.o(.data) - build/asm/ovl_Elf_Msg2_rodata.o(.rodata) + build/asm/overlays/ovl_Elf_Msg2_data.o(.data) + build/asm/overlays/ovl_Elf_Msg2_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -2611,9 +2611,9 @@ SECTIONS ovl_Bg_F40_Swlift : AT(RomLocation) { build/src/overlays/actors/ovl_Bg_F40_Swlift/z_bg_f40_swlift.o(.text) - build/asm/ovl_Bg_F40_Swlift_data.o(.data) + build/asm/overlays/ovl_Bg_F40_Swlift_data.o(.data) build/src/overlays/actors/ovl_Bg_F40_Swlift/z_bg_f40_swlift.o(.rodata) - build/asm/ovl_Bg_F40_Swlift_rodata.o(.rodata) + build/asm/overlays/ovl_Bg_F40_Swlift_rodata.o(.rodata) ovl_Bg_F40_Swlift_bss_start = .; } . += 0x10; @@ -2627,9 +2627,9 @@ SECTIONS ovl_En_Kakasi : AT(RomLocation) { build/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.o(.text) - build/asm/ovl_En_Kakasi_data.o(.data) + build/asm/overlays/ovl_En_Kakasi_data.o(.data) build/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.o(.rodata) - build/asm/ovl_En_Kakasi_rodata.o(.rodata) + build/asm/overlays/ovl_En_Kakasi_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -2641,9 +2641,9 @@ SECTIONS ovl_Obj_Makeoshihiki : AT(RomLocation) { build/src/overlays/actors/ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.o(.text) - build/asm/ovl_Obj_Makeoshihiki_data.o(.data) + build/asm/overlays/ovl_Obj_Makeoshihiki_data.o(.data) build/src/overlays/actors/ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.o(.rodata) - build/asm/ovl_Obj_Makeoshihiki_rodata.o(.rodata) + build/asm/overlays/ovl_Obj_Makeoshihiki_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -2655,9 +2655,9 @@ SECTIONS ovl_Oceff_Spot : AT(RomLocation) { build/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.o(.text) - build/asm/ovl_Oceff_Spot_data.o(.data) + build/asm/overlays/ovl_Oceff_Spot_data.o(.data) build/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.o(.rodata) - build/asm/ovl_Oceff_Spot_rodata.o(.rodata) + build/asm/overlays/ovl_Oceff_Spot_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -2684,9 +2684,9 @@ SECTIONS ovl_Shot_Sun : AT(RomLocation) { build/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.o(.text) - build/asm/ovl_Shot_Sun_data.o(.data) + build/asm/overlays/ovl_Shot_Sun_data.o(.data) build/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.o(.rodata) - build/asm/ovl_Shot_Sun_rodata.o(.rodata) + build/asm/overlays/ovl_Shot_Sun_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -2698,9 +2698,9 @@ SECTIONS ovl_Obj_Roomtimer : AT(RomLocation) { build/src/overlays/actors/ovl_Obj_Roomtimer/z_obj_roomtimer.o(.text) - build/asm/ovl_Obj_Roomtimer_data.o(.data) + build/asm/overlays/ovl_Obj_Roomtimer_data.o(.data) build/src/overlays/actors/ovl_Obj_Roomtimer/z_obj_roomtimer.o(.rodata) - build/asm/ovl_Obj_Roomtimer_rodata.o(.rodata) + build/asm/overlays/ovl_Obj_Roomtimer_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -2712,9 +2712,9 @@ SECTIONS ovl_En_Ssh : AT(RomLocation) { build/src/overlays/actors/ovl_En_Ssh/z_en_ssh.o(.text) - build/asm/ovl_En_Ssh_data.o(.data) + build/asm/overlays/ovl_En_Ssh_data.o(.data) build/src/overlays/actors/ovl_En_Ssh/z_en_ssh.o(.rodata) - build/asm/ovl_En_Ssh_rodata.o(.rodata) + build/asm/overlays/ovl_En_Ssh_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -2726,9 +2726,9 @@ SECTIONS ovl_Oceff_Wipe : AT(RomLocation) { build/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.o(.text) - build/asm/ovl_Oceff_Wipe_data.o(.data) + build/asm/overlays/ovl_Oceff_Wipe_data.o(.data) build/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.o(.rodata) - build/asm/ovl_Oceff_Wipe_rodata.o(.rodata) + build/asm/overlays/ovl_Oceff_Wipe_rodata.o(.rodata) ovl_Oceff_Wipe_bss_start = .; } . += 0x10; @@ -2741,8 +2741,8 @@ SECTIONS _ovl_Effect_Ss_DustSegmentStart = SegmentStart; ovl_Effect_Ss_Dust : AT(RomLocation) { - build/asm/ovl_Effect_Ss_Dust_0x80977210.o(.text) - build/asm/ovl_Effect_Ss_Dust_data.o(.data) + build/asm/overlays/ovl_Effect_Ss_Dust_0x80977210.o(.text) + build/asm/overlays/ovl_Effect_Ss_Dust_data.o(.data) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -2753,8 +2753,8 @@ SECTIONS _ovl_Effect_Ss_KirakiraSegmentStart = SegmentStart; ovl_Effect_Ss_Kirakira : AT(RomLocation) { - build/asm/ovl_Effect_Ss_Kirakira_0x80977A00.o(.text) - build/asm/ovl_Effect_Ss_Kirakira_data.o(.data) + build/asm/overlays/ovl_Effect_Ss_Kirakira_0x80977A00.o(.text) + build/asm/overlays/ovl_Effect_Ss_Kirakira_data.o(.data) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -2765,8 +2765,8 @@ SECTIONS _ovl_Effect_Ss_Bomb2SegmentStart = SegmentStart; ovl_Effect_Ss_Bomb2 : AT(RomLocation) { - build/asm/ovl_Effect_Ss_Bomb2_0x80978070.o(.text) - build/asm/ovl_Effect_Ss_Bomb2_data.o(.data) + build/asm/overlays/ovl_Effect_Ss_Bomb2_0x80978070.o(.text) + build/asm/overlays/ovl_Effect_Ss_Bomb2_data.o(.data) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -2777,8 +2777,8 @@ SECTIONS _ovl_Effect_Ss_BlastSegmentStart = SegmentStart; ovl_Effect_Ss_Blast : AT(RomLocation) { - build/asm/ovl_Effect_Ss_Blast_0x809788D0.o(.text) - build/asm/ovl_Effect_Ss_Blast_data.o(.data) + build/asm/overlays/ovl_Effect_Ss_Blast_0x809788D0.o(.text) + build/asm/overlays/ovl_Effect_Ss_Blast_data.o(.data) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -2789,8 +2789,8 @@ SECTIONS _ovl_Effect_Ss_G_SpkSegmentStart = SegmentStart; ovl_Effect_Ss_G_Spk : AT(RomLocation) { - build/asm/ovl_Effect_Ss_G_Spk_0x80978C30.o(.text) - build/asm/ovl_Effect_Ss_G_Spk_data.o(.data) + build/asm/overlays/ovl_Effect_Ss_G_Spk_0x80978C30.o(.text) + build/asm/overlays/ovl_Effect_Ss_G_Spk_data.o(.data) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -2801,8 +2801,8 @@ SECTIONS _ovl_Effect_Ss_D_FireSegmentStart = SegmentStart; ovl_Effect_Ss_D_Fire : AT(RomLocation) { - build/asm/ovl_Effect_Ss_D_Fire_0x809791B0.o(.text) - build/asm/ovl_Effect_Ss_D_Fire_data.o(.data) + build/asm/overlays/ovl_Effect_Ss_D_Fire_0x809791B0.o(.text) + build/asm/overlays/ovl_Effect_Ss_D_Fire_data.o(.data) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -2813,8 +2813,8 @@ SECTIONS _ovl_Effect_Ss_BubbleSegmentStart = SegmentStart; ovl_Effect_Ss_Bubble : AT(RomLocation) { - build/asm/ovl_Effect_Ss_Bubble_0x809795C0.o(.text) - build/asm/ovl_Effect_Ss_Bubble_data.o(.data) + build/asm/overlays/ovl_Effect_Ss_Bubble_0x809795C0.o(.text) + build/asm/overlays/ovl_Effect_Ss_Bubble_data.o(.data) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -2825,8 +2825,8 @@ SECTIONS _ovl_Effect_Ss_G_RippleSegmentStart = SegmentStart; ovl_Effect_Ss_G_Ripple : AT(RomLocation) { - build/asm/ovl_Effect_Ss_G_Ripple_0x80979B30.o(.text) - build/asm/ovl_Effect_Ss_G_Ripple_data.o(.data) + build/asm/overlays/ovl_Effect_Ss_G_Ripple_0x80979B30.o(.text) + build/asm/overlays/ovl_Effect_Ss_G_Ripple_data.o(.data) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -2837,8 +2837,8 @@ SECTIONS _ovl_Effect_Ss_G_SplashSegmentStart = SegmentStart; ovl_Effect_Ss_G_Splash : AT(RomLocation) { - build/asm/ovl_Effect_Ss_G_Splash_0x8097A050.o(.text) - build/asm/ovl_Effect_Ss_G_Splash_data.o(.data) + build/asm/overlays/ovl_Effect_Ss_G_Splash_0x8097A050.o(.text) + build/asm/overlays/ovl_Effect_Ss_G_Splash_data.o(.data) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -2849,8 +2849,8 @@ SECTIONS _ovl_Effect_Ss_G_FireSegmentStart = SegmentStart; ovl_Effect_Ss_G_Fire : AT(RomLocation) { - build/asm/ovl_Effect_Ss_G_Fire_0x8097A470.o(.text) - build/asm/ovl_Effect_Ss_G_Fire_data.o(.data) + build/asm/overlays/ovl_Effect_Ss_G_Fire_0x8097A470.o(.text) + build/asm/overlays/ovl_Effect_Ss_G_Fire_data.o(.data) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -2861,8 +2861,8 @@ SECTIONS _ovl_Effect_Ss_LightningSegmentStart = SegmentStart; ovl_Effect_Ss_Lightning : AT(RomLocation) { - build/asm/ovl_Effect_Ss_Lightning_0x8097A680.o(.text) - build/asm/ovl_Effect_Ss_Lightning_data.o(.data) + build/asm/overlays/ovl_Effect_Ss_Lightning_0x8097A680.o(.text) + build/asm/overlays/ovl_Effect_Ss_Lightning_data.o(.data) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -2873,8 +2873,8 @@ SECTIONS _ovl_Effect_Ss_Dt_BubbleSegmentStart = SegmentStart; ovl_Effect_Ss_Dt_Bubble : AT(RomLocation) { - build/asm/ovl_Effect_Ss_Dt_Bubble_0x8097AD60.o(.text) - build/asm/ovl_Effect_Ss_Dt_Bubble_data.o(.data) + build/asm/overlays/ovl_Effect_Ss_Dt_Bubble_0x8097AD60.o(.text) + build/asm/overlays/ovl_Effect_Ss_Dt_Bubble_data.o(.data) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -2885,8 +2885,8 @@ SECTIONS _ovl_Effect_Ss_HahenSegmentStart = SegmentStart; ovl_Effect_Ss_Hahen : AT(RomLocation) { - build/asm/ovl_Effect_Ss_Hahen_0x8097B270.o(.text) - build/asm/ovl_Effect_Ss_Hahen_data.o(.data) + build/asm/overlays/ovl_Effect_Ss_Hahen_0x8097B270.o(.text) + build/asm/overlays/ovl_Effect_Ss_Hahen_data.o(.data) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -2897,8 +2897,8 @@ SECTIONS _ovl_Effect_Ss_StickSegmentStart = SegmentStart; ovl_Effect_Ss_Stick : AT(RomLocation) { - build/asm/ovl_Effect_Ss_Stick_0x8097B810.o(.text) - build/asm/ovl_Effect_Ss_Stick_data.o(.data) + build/asm/overlays/ovl_Effect_Ss_Stick_0x8097B810.o(.text) + build/asm/overlays/ovl_Effect_Ss_Stick_data.o(.data) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -2909,8 +2909,8 @@ SECTIONS _ovl_Effect_Ss_SibukiSegmentStart = SegmentStart; ovl_Effect_Ss_Sibuki : AT(RomLocation) { - build/asm/ovl_Effect_Ss_Sibuki_0x8097BAD0.o(.text) - build/asm/ovl_Effect_Ss_Sibuki_data.o(.data) + build/asm/overlays/ovl_Effect_Ss_Sibuki_0x8097BAD0.o(.text) + build/asm/overlays/ovl_Effect_Ss_Sibuki_data.o(.data) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -2921,8 +2921,8 @@ SECTIONS _ovl_Effect_Ss_Stone1SegmentStart = SegmentStart; ovl_Effect_Ss_Stone1 : AT(RomLocation) { - build/asm/ovl_Effect_Ss_Stone1_0x8097C130.o(.text) - build/asm/ovl_Effect_Ss_Stone1_data.o(.data) + build/asm/overlays/ovl_Effect_Ss_Stone1_0x8097C130.o(.text) + build/asm/overlays/ovl_Effect_Ss_Stone1_data.o(.data) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -2933,8 +2933,8 @@ SECTIONS _ovl_Effect_Ss_HitmarkSegmentStart = SegmentStart; ovl_Effect_Ss_Hitmark : AT(RomLocation) { - build/asm/ovl_Effect_Ss_Hitmark_0x8097C490.o(.text) - build/asm/ovl_Effect_Ss_Hitmark_data.o(.data) + build/asm/overlays/ovl_Effect_Ss_Hitmark_0x8097C490.o(.text) + build/asm/overlays/ovl_Effect_Ss_Hitmark_data.o(.data) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -2945,8 +2945,8 @@ SECTIONS _ovl_Effect_Ss_Fhg_FlashSegmentStart = SegmentStart; ovl_Effect_Ss_Fhg_Flash : AT(RomLocation) { - build/asm/ovl_Effect_Ss_Fhg_Flash_0x8097C990.o(.text) - build/asm/ovl_Effect_Ss_Fhg_Flash_data.o(.data) + build/asm/overlays/ovl_Effect_Ss_Fhg_Flash_0x8097C990.o(.text) + build/asm/overlays/ovl_Effect_Ss_Fhg_Flash_data.o(.data) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -2957,8 +2957,8 @@ SECTIONS _ovl_Effect_Ss_K_FireSegmentStart = SegmentStart; ovl_Effect_Ss_K_Fire : AT(RomLocation) { - build/asm/ovl_Effect_Ss_K_Fire_0x8097D410.o(.text) - build/asm/ovl_Effect_Ss_K_Fire_data.o(.data) + build/asm/overlays/ovl_Effect_Ss_K_Fire_0x8097D410.o(.text) + build/asm/overlays/ovl_Effect_Ss_K_Fire_data.o(.data) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -2969,8 +2969,8 @@ SECTIONS _ovl_Effect_Ss_Solder_Srch_BallSegmentStart = SegmentStart; ovl_Effect_Ss_Solder_Srch_Ball : AT(RomLocation) { - build/asm/ovl_Effect_Ss_Solder_Srch_Ball_0x8097D850.o(.text) - build/asm/ovl_Effect_Ss_Solder_Srch_Ball_data.o(.data) + build/asm/overlays/ovl_Effect_Ss_Solder_Srch_Ball_0x8097D850.o(.text) + build/asm/overlays/ovl_Effect_Ss_Solder_Srch_Ball_data.o(.data) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -2981,8 +2981,8 @@ SECTIONS _ovl_Effect_Ss_KakeraSegmentStart = SegmentStart; ovl_Effect_Ss_Kakera : AT(RomLocation) { - build/asm/ovl_Effect_Ss_Kakera_0x8097DCA0.o(.text) - build/asm/ovl_Effect_Ss_Kakera_data.o(.data) + build/asm/overlays/ovl_Effect_Ss_Kakera_0x8097DCA0.o(.text) + build/asm/overlays/ovl_Effect_Ss_Kakera_data.o(.data) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -2993,8 +2993,8 @@ SECTIONS _ovl_Effect_Ss_Ice_PieceSegmentStart = SegmentStart; ovl_Effect_Ss_Ice_Piece : AT(RomLocation) { - build/asm/ovl_Effect_Ss_Ice_Piece_0x8097ECD0.o(.text) - build/asm/ovl_Effect_Ss_Ice_Piece_data.o(.data) + build/asm/overlays/ovl_Effect_Ss_Ice_Piece_0x8097ECD0.o(.text) + build/asm/overlays/ovl_Effect_Ss_Ice_Piece_data.o(.data) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -3005,8 +3005,8 @@ SECTIONS _ovl_Effect_Ss_En_IceSegmentStart = SegmentStart; ovl_Effect_Ss_En_Ice : AT(RomLocation) { - build/asm/ovl_Effect_Ss_En_Ice_0x8097F0D0.o(.text) - build/asm/ovl_Effect_Ss_En_Ice_data.o(.data) + build/asm/overlays/ovl_Effect_Ss_En_Ice_0x8097F0D0.o(.text) + build/asm/overlays/ovl_Effect_Ss_En_Ice_data.o(.data) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -3017,8 +3017,8 @@ SECTIONS _ovl_Effect_Ss_Fire_TailSegmentStart = SegmentStart; ovl_Effect_Ss_Fire_Tail : AT(RomLocation) { - build/asm/ovl_Effect_Ss_Fire_Tail_0x8097F880.o(.text) - build/asm/ovl_Effect_Ss_Fire_Tail_data.o(.data) + build/asm/overlays/ovl_Effect_Ss_Fire_Tail_0x8097F880.o(.text) + build/asm/overlays/ovl_Effect_Ss_Fire_Tail_data.o(.data) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -3029,8 +3029,8 @@ SECTIONS _ovl_Effect_Ss_En_FireSegmentStart = SegmentStart; ovl_Effect_Ss_En_Fire : AT(RomLocation) { - build/asm/ovl_Effect_Ss_En_Fire_0x8097FF60.o(.text) - build/asm/ovl_Effect_Ss_En_Fire_data.o(.data) + build/asm/overlays/ovl_Effect_Ss_En_Fire_0x8097FF60.o(.text) + build/asm/overlays/ovl_Effect_Ss_En_Fire_data.o(.data) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -3041,8 +3041,8 @@ SECTIONS _ovl_Effect_Ss_ExtraSegmentStart = SegmentStart; ovl_Effect_Ss_Extra : AT(RomLocation) { - build/asm/ovl_Effect_Ss_Extra_0x809805D0.o(.text) - build/asm/ovl_Effect_Ss_Extra_data.o(.data) + build/asm/overlays/ovl_Effect_Ss_Extra_0x809805D0.o(.text) + build/asm/overlays/ovl_Effect_Ss_Extra_data.o(.data) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -3053,8 +3053,8 @@ SECTIONS _ovl_Effect_Ss_Dead_DbSegmentStart = SegmentStart; ovl_Effect_Ss_Dead_Db : AT(RomLocation) { - build/asm/ovl_Effect_Ss_Dead_Db_0x80980940.o(.text) - build/asm/ovl_Effect_Ss_Dead_Db_data.o(.data) + build/asm/overlays/ovl_Effect_Ss_Dead_Db_0x80980940.o(.text) + build/asm/overlays/ovl_Effect_Ss_Dead_Db_data.o(.data) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -3065,8 +3065,8 @@ SECTIONS _ovl_Effect_Ss_Dead_DdSegmentStart = SegmentStart; ovl_Effect_Ss_Dead_Dd : AT(RomLocation) { - build/asm/ovl_Effect_Ss_Dead_Dd_0x80980D50.o(.text) - build/asm/ovl_Effect_Ss_Dead_Dd_data.o(.data) + build/asm/overlays/ovl_Effect_Ss_Dead_Dd_0x80980D50.o(.text) + build/asm/overlays/ovl_Effect_Ss_Dead_Dd_data.o(.data) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -3077,8 +3077,8 @@ SECTIONS _ovl_Effect_Ss_Dead_DsSegmentStart = SegmentStart; ovl_Effect_Ss_Dead_Ds : AT(RomLocation) { - build/asm/ovl_Effect_Ss_Dead_Ds_0x809812E0.o(.text) - build/asm/ovl_Effect_Ss_Dead_Ds_data.o(.data) + build/asm/overlays/ovl_Effect_Ss_Dead_Ds_0x809812E0.o(.text) + build/asm/overlays/ovl_Effect_Ss_Dead_Ds_data.o(.data) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -3090,9 +3090,9 @@ SECTIONS ovl_Oceff_Storm : AT(RomLocation) { build/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.o(.text) - build/asm/ovl_Oceff_Storm_data.o(.data) + build/asm/overlays/ovl_Oceff_Storm_data.o(.data) build/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.o(.rodata) - build/asm/ovl_Oceff_Storm_rodata.o(.rodata) + build/asm/overlays/ovl_Oceff_Storm_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -3104,9 +3104,9 @@ SECTIONS ovl_Obj_Demo : AT(RomLocation) { build/src/overlays/actors/ovl_Obj_Demo/z_obj_demo.o(.text) - build/asm/ovl_Obj_Demo_data.o(.data) + build/asm/overlays/ovl_Obj_Demo_data.o(.data) build/src/overlays/actors/ovl_Obj_Demo/z_obj_demo.o(.rodata) - build/asm/ovl_Obj_Demo_rodata.o(.rodata) + build/asm/overlays/ovl_Obj_Demo_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -3118,9 +3118,9 @@ SECTIONS ovl_En_Minislime : AT(RomLocation) { build/src/overlays/actors/ovl_En_Minislime/z_en_minislime.o(.text) - build/asm/ovl_En_Minislime_data.o(.data) + build/asm/overlays/ovl_En_Minislime_data.o(.data) build/src/overlays/actors/ovl_En_Minislime/z_en_minislime.o(.rodata) - build/asm/ovl_En_Minislime_rodata.o(.rodata) + build/asm/overlays/ovl_En_Minislime_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -3132,9 +3132,9 @@ SECTIONS ovl_En_Nutsball : AT(RomLocation) { build/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.o(.text) - build/asm/ovl_En_Nutsball_data.o(.data) + build/asm/overlays/ovl_En_Nutsball_data.o(.data) build/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.o(.rodata) - build/asm/ovl_En_Nutsball_rodata.o(.rodata) + build/asm/overlays/ovl_En_Nutsball_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -3146,9 +3146,9 @@ SECTIONS ovl_Oceff_Wipe2 : AT(RomLocation) { build/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.o(.text) - build/asm/ovl_Oceff_Wipe2_data.o(.data) + build/asm/overlays/ovl_Oceff_Wipe2_data.o(.data) build/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.o(.rodata) - build/asm/ovl_Oceff_Wipe2_rodata.o(.rodata) + build/asm/overlays/ovl_Oceff_Wipe2_rodata.o(.rodata) ovl_Oceff_Wipe2_bss_start = .; } . += 0x10; @@ -3162,9 +3162,9 @@ SECTIONS ovl_Oceff_Wipe3 : AT(RomLocation) { build/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.o(.text) - build/asm/ovl_Oceff_Wipe3_data.o(.data) + build/asm/overlays/ovl_Oceff_Wipe3_data.o(.data) build/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.o(.rodata) - build/asm/ovl_Oceff_Wipe3_rodata.o(.rodata) + build/asm/overlays/ovl_Oceff_Wipe3_rodata.o(.rodata) ovl_Oceff_Wipe3_bss_start = .; } . += 0x10; @@ -3178,9 +3178,9 @@ SECTIONS ovl_En_Dg : AT(RomLocation) { build/src/overlays/actors/ovl_En_Dg/z_en_dg.o(.text) - build/asm/ovl_En_Dg_data.o(.data) + build/asm/overlays/ovl_En_Dg_data.o(.data) build/src/overlays/actors/ovl_En_Dg/z_en_dg.o(.rodata) - build/asm/ovl_En_Dg_rodata.o(.rodata) + build/asm/overlays/ovl_En_Dg_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -3192,9 +3192,9 @@ SECTIONS ovl_En_Si : AT(RomLocation) { build/src/overlays/actors/ovl_En_Si/z_en_si.o(.text) - build/asm/ovl_En_Si_data.o(.data) + build/asm/overlays/ovl_En_Si_data.o(.data) build/src/overlays/actors/ovl_En_Si/z_en_si.o(.rodata) - build/asm/ovl_En_Si_rodata.o(.rodata) + build/asm/overlays/ovl_En_Si_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -3206,9 +3206,9 @@ SECTIONS ovl_Obj_Comb : AT(RomLocation) { build/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.o(.text) - build/asm/ovl_Obj_Comb_data.o(.data) + build/asm/overlays/ovl_Obj_Comb_data.o(.data) build/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.o(.rodata) - build/asm/ovl_Obj_Comb_rodata.o(.rodata) + build/asm/overlays/ovl_Obj_Comb_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -3220,9 +3220,9 @@ SECTIONS ovl_Obj_Kibako2 : AT(RomLocation) { build/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.o(.text) - build/asm/ovl_Obj_Kibako2_data.o(.data) + build/asm/overlays/ovl_Obj_Kibako2_data.o(.data) build/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.o(.rodata) - build/asm/ovl_Obj_Kibako2_rodata.o(.rodata) + build/asm/overlays/ovl_Obj_Kibako2_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -3248,8 +3248,8 @@ SECTIONS ovl_Obj_Mure3 : AT(RomLocation) { build/src/overlays/actors/ovl_Obj_Mure3/z_obj_mure3.o(.text) - build/asm/ovl_Obj_Mure3_data.o(.data) - build/asm/ovl_Obj_Mure3_rodata.o(.rodata) + build/asm/overlays/ovl_Obj_Mure3_data.o(.data) + build/asm/overlays/ovl_Obj_Mure3_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -3261,9 +3261,9 @@ SECTIONS ovl_En_Tg : AT(RomLocation) { build/src/overlays/actors/ovl_En_Tg/z_en_tg.o(.text) - build/asm/ovl_En_Tg_data.o(.data) + build/asm/overlays/ovl_En_Tg_data.o(.data) build/src/overlays/actors/ovl_En_Tg/z_en_tg.o(.rodata) - build/asm/ovl_En_Tg_rodata.o(.rodata) + build/asm/overlays/ovl_En_Tg_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -3275,9 +3275,9 @@ SECTIONS ovl_En_Wf : AT(RomLocation) { build/src/overlays/actors/ovl_En_Wf/z_en_wf.o(.text) - build/asm/ovl_En_Wf_data.o(.data) + build/asm/overlays/ovl_En_Wf_data.o(.data) build/src/overlays/actors/ovl_En_Wf/z_en_wf.o(.rodata) - build/asm/ovl_En_Wf_rodata.o(.rodata) + build/asm/overlays/ovl_En_Wf_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -3289,9 +3289,9 @@ SECTIONS ovl_En_Skb : AT(RomLocation) { build/src/overlays/actors/ovl_En_Skb/z_en_skb.o(.text) - build/asm/ovl_En_Skb_data.o(.data) + build/asm/overlays/ovl_En_Skb_data.o(.data) build/src/overlays/actors/ovl_En_Skb/z_en_skb.o(.rodata) - build/asm/ovl_En_Skb_rodata.o(.rodata) + build/asm/overlays/ovl_En_Skb_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -3303,9 +3303,9 @@ SECTIONS ovl_En_Gs : AT(RomLocation) { build/src/overlays/actors/ovl_En_Gs/z_en_gs.o(.text) - build/asm/ovl_En_Gs_data.o(.data) + build/asm/overlays/ovl_En_Gs_data.o(.data) build/src/overlays/actors/ovl_En_Gs/z_en_gs.o(.rodata) - build/asm/ovl_En_Gs_rodata.o(.rodata) + build/asm/overlays/ovl_En_Gs_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -3317,9 +3317,9 @@ SECTIONS ovl_Obj_Sound : AT(RomLocation) { build/src/overlays/actors/ovl_Obj_Sound/z_obj_sound.o(.text) - build/asm/ovl_Obj_Sound_data.o(.data) + build/asm/overlays/ovl_Obj_Sound_data.o(.data) build/src/overlays/actors/ovl_Obj_Sound/z_obj_sound.o(.rodata) - build/asm/ovl_Obj_Sound_rodata.o(.rodata) + build/asm/overlays/ovl_Obj_Sound_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -3331,9 +3331,9 @@ SECTIONS ovl_En_Crow : AT(RomLocation) { build/src/overlays/actors/ovl_En_Crow/z_en_crow.o(.text) - build/asm/ovl_En_Crow_data.o(.data) + build/asm/overlays/ovl_En_Crow_data.o(.data) build/src/overlays/actors/ovl_En_Crow/z_en_crow.o(.rodata) - build/asm/ovl_En_Crow_rodata.o(.rodata) + build/asm/overlays/ovl_En_Crow_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -3345,9 +3345,9 @@ SECTIONS ovl_En_Cow : AT(RomLocation) { build/src/overlays/actors/ovl_En_Cow/z_en_cow.o(.text) - build/asm/ovl_En_Cow_data.o(.data) + build/asm/overlays/ovl_En_Cow_data.o(.data) build/src/overlays/actors/ovl_En_Cow/z_en_cow.o(.rodata) - build/asm/ovl_En_Cow_rodata.o(.rodata) + build/asm/overlays/ovl_En_Cow_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -3359,9 +3359,9 @@ SECTIONS ovl_Oceff_Wipe4 : AT(RomLocation) { build/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.o(.text) - build/asm/ovl_Oceff_Wipe4_data.o(.data) + build/asm/overlays/ovl_Oceff_Wipe4_data.o(.data) build/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.o(.rodata) - build/asm/ovl_Oceff_Wipe4_rodata.o(.rodata) + build/asm/overlays/ovl_Oceff_Wipe4_rodata.o(.rodata) ovl_Oceff_Wipe4_bss_start = .; } . += 0x10; @@ -3375,9 +3375,9 @@ SECTIONS ovl_En_Zo : AT(RomLocation) { build/src/overlays/actors/ovl_En_Zo/z_en_zo.o(.text) - build/asm/ovl_En_Zo_data.o(.data) + build/asm/overlays/ovl_En_Zo_data.o(.data) build/src/overlays/actors/ovl_En_Zo/z_en_zo.o(.rodata) - build/asm/ovl_En_Zo_rodata.o(.rodata) + build/asm/overlays/ovl_En_Zo_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -3388,8 +3388,8 @@ SECTIONS _ovl_Effect_Ss_Ice_SmokeSegmentStart = SegmentStart; ovl_Effect_Ss_Ice_Smoke : AT(RomLocation) { - build/asm/ovl_Effect_Ss_Ice_Smoke_0x8099F730.o(.text) - build/asm/ovl_Effect_Ss_Ice_Smoke_data.o(.data) + build/asm/overlays/ovl_Effect_Ss_Ice_Smoke_0x8099F730.o(.text) + build/asm/overlays/ovl_Effect_Ss_Ice_Smoke_data.o(.data) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -3401,9 +3401,9 @@ SECTIONS ovl_Obj_Makekinsuta : AT(RomLocation) { build/src/overlays/actors/ovl_Obj_Makekinsuta/z_obj_makekinsuta.o(.text) - build/asm/ovl_Obj_Makekinsuta_data.o(.data) + build/asm/overlays/ovl_Obj_Makekinsuta_data.o(.data) build/src/overlays/actors/ovl_Obj_Makekinsuta/z_obj_makekinsuta.o(.rodata) - build/asm/ovl_Obj_Makekinsuta_rodata.o(.rodata) + build/asm/overlays/ovl_Obj_Makekinsuta_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -3415,9 +3415,9 @@ SECTIONS ovl_En_Ge3 : AT(RomLocation) { build/src/overlays/actors/ovl_En_Ge3/z_en_ge3.o(.text) - build/asm/ovl_En_Ge3_data.o(.data) + build/asm/overlays/ovl_En_Ge3_data.o(.data) build/src/overlays/actors/ovl_En_Ge3/z_en_ge3.o(.rodata) - build/asm/ovl_En_Ge3_rodata.o(.rodata) + build/asm/overlays/ovl_En_Ge3_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -3429,9 +3429,9 @@ SECTIONS ovl_Obj_Hamishi : AT(RomLocation) { build/src/overlays/actors/ovl_Obj_Hamishi/z_obj_hamishi.o(.text) - build/asm/ovl_Obj_Hamishi_data.o(.data) + build/asm/overlays/ovl_Obj_Hamishi_data.o(.data) build/src/overlays/actors/ovl_Obj_Hamishi/z_obj_hamishi.o(.rodata) - build/asm/ovl_Obj_Hamishi_rodata.o(.rodata) + build/asm/overlays/ovl_Obj_Hamishi_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -3443,9 +3443,9 @@ SECTIONS ovl_En_Zl4 : AT(RomLocation) { build/src/overlays/actors/ovl_En_Zl4/z_en_zl4.o(.text) - build/asm/ovl_En_Zl4_data.o(.data) + build/asm/overlays/ovl_En_Zl4_data.o(.data) build/src/overlays/actors/ovl_En_Zl4/z_en_zl4.o(.rodata) - build/asm/ovl_En_Zl4_rodata.o(.rodata) + build/asm/overlays/ovl_En_Zl4_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -3457,9 +3457,9 @@ SECTIONS ovl_En_Mm2 : AT(RomLocation) { build/src/overlays/actors/ovl_En_Mm2/z_en_mm2.o(.text) - build/asm/ovl_En_Mm2_data.o(.data) + build/asm/overlays/ovl_En_Mm2_data.o(.data) build/src/overlays/actors/ovl_En_Mm2/z_en_mm2.o(.rodata) - build/asm/ovl_En_Mm2_rodata.o(.rodata) + build/asm/overlays/ovl_En_Mm2_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -3471,9 +3471,9 @@ SECTIONS ovl_Door_Spiral : AT(RomLocation) { build/src/overlays/actors/ovl_Door_Spiral/z_door_spiral.o(.text) - build/asm/ovl_Door_Spiral_data.o(.data) + build/asm/overlays/ovl_Door_Spiral_data.o(.data) build/src/overlays/actors/ovl_Door_Spiral/z_door_spiral.o(.rodata) - build/asm/ovl_Door_Spiral_rodata.o(.rodata) + build/asm/overlays/ovl_Door_Spiral_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -3485,9 +3485,9 @@ SECTIONS ovl_Obj_Pzlblock : AT(RomLocation) { build/src/overlays/actors/ovl_Obj_Pzlblock/z_obj_pzlblock.o(.text) - build/asm/ovl_Obj_Pzlblock_data.o(.data) + build/asm/overlays/ovl_Obj_Pzlblock_data.o(.data) build/src/overlays/actors/ovl_Obj_Pzlblock/z_obj_pzlblock.o(.rodata) - build/asm/ovl_Obj_Pzlblock_rodata.o(.rodata) + build/asm/overlays/ovl_Obj_Pzlblock_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -3499,9 +3499,9 @@ SECTIONS ovl_Obj_Toge : AT(RomLocation) { build/src/overlays/actors/ovl_Obj_Toge/z_obj_toge.o(.text) - build/asm/ovl_Obj_Toge_data.o(.data) + build/asm/overlays/ovl_Obj_Toge_data.o(.data) build/src/overlays/actors/ovl_Obj_Toge/z_obj_toge.o(.rodata) - build/asm/ovl_Obj_Toge_rodata.o(.rodata) + build/asm/overlays/ovl_Obj_Toge_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -3513,9 +3513,9 @@ SECTIONS ovl_Obj_Armos : AT(RomLocation) { build/src/overlays/actors/ovl_Obj_Armos/z_obj_armos.o(.text) - build/asm/ovl_Obj_Armos_data.o(.data) + build/asm/overlays/ovl_Obj_Armos_data.o(.data) build/src/overlays/actors/ovl_Obj_Armos/z_obj_armos.o(.rodata) - build/asm/ovl_Obj_Armos_rodata.o(.rodata) + build/asm/overlays/ovl_Obj_Armos_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -3527,9 +3527,9 @@ SECTIONS ovl_Obj_Boyo : AT(RomLocation) { build/src/overlays/actors/ovl_Obj_Boyo/z_obj_boyo.o(.text) - build/asm/ovl_Obj_Boyo_data.o(.data) + build/asm/overlays/ovl_Obj_Boyo_data.o(.data) build/src/overlays/actors/ovl_Obj_Boyo/z_obj_boyo.o(.rodata) - build/asm/ovl_Obj_Boyo_rodata.o(.rodata) + build/asm/overlays/ovl_Obj_Boyo_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -3541,9 +3541,9 @@ SECTIONS ovl_En_Grasshopper : AT(RomLocation) { build/src/overlays/actors/ovl_En_Grasshopper/z_en_grasshopper.o(.text) - build/asm/ovl_En_Grasshopper_data.o(.data) + build/asm/overlays/ovl_En_Grasshopper_data.o(.data) build/src/overlays/actors/ovl_En_Grasshopper/z_en_grasshopper.o(.rodata) - build/asm/ovl_En_Grasshopper_rodata.o(.rodata) + build/asm/overlays/ovl_En_Grasshopper_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -3555,9 +3555,9 @@ SECTIONS ovl_Obj_Grass : AT(RomLocation) { build/src/overlays/actors/ovl_Obj_Grass/z_obj_grass.o(.text) - build/asm/ovl_Obj_Grass_data.o(.data) + build/asm/overlays/ovl_Obj_Grass_data.o(.data) build/src/overlays/actors/ovl_Obj_Grass/z_obj_grass.o(.rodata) - build/asm/ovl_Obj_Grass_rodata.o(.rodata) + build/asm/overlays/ovl_Obj_Grass_rodata.o(.rodata) ovl_Obj_Grass_bss_start = .; } . += 0xC0; @@ -3571,9 +3571,9 @@ SECTIONS ovl_Obj_Grass_Carry : AT(RomLocation) { build/src/overlays/actors/ovl_Obj_Grass_Carry/z_obj_grass_carry.o(.text) - build/asm/ovl_Obj_Grass_Carry_data.o(.data) + build/asm/overlays/ovl_Obj_Grass_Carry_data.o(.data) build/src/overlays/actors/ovl_Obj_Grass_Carry/z_obj_grass_carry.o(.rodata) - build/asm/ovl_Obj_Grass_Carry_rodata.o(.rodata) + build/asm/overlays/ovl_Obj_Grass_Carry_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -3585,9 +3585,9 @@ SECTIONS ovl_Obj_Grass_Unit : AT(RomLocation) { build/src/overlays/actors/ovl_Obj_Grass_Unit/z_obj_grass_unit.o(.text) - build/asm/ovl_Obj_Grass_Unit_data.o(.data) + build/asm/overlays/ovl_Obj_Grass_Unit_data.o(.data) build/src/overlays/actors/ovl_Obj_Grass_Unit/z_obj_grass_unit.o(.rodata) - build/asm/ovl_Obj_Grass_Unit_rodata.o(.rodata) + build/asm/overlays/ovl_Obj_Grass_Unit_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -3599,9 +3599,9 @@ SECTIONS ovl_Bg_Fire_Wall : AT(RomLocation) { build/src/overlays/actors/ovl_Bg_Fire_Wall/z_bg_fire_wall.o(.text) - build/asm/ovl_Bg_Fire_Wall_data.o(.data) + build/asm/overlays/ovl_Bg_Fire_Wall_data.o(.data) build/src/overlays/actors/ovl_Bg_Fire_Wall/z_bg_fire_wall.o(.rodata) - build/asm/ovl_Bg_Fire_Wall_rodata.o(.rodata) + build/asm/overlays/ovl_Bg_Fire_Wall_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -3613,9 +3613,9 @@ SECTIONS ovl_En_Bu : AT(RomLocation) { build/src/overlays/actors/ovl_En_Bu/z_en_bu.o(.text) - build/asm/ovl_En_Bu_data.o(.data) + build/asm/overlays/ovl_En_Bu_data.o(.data) build/src/overlays/actors/ovl_En_Bu/z_en_bu.o(.rodata) - build/asm/ovl_En_Bu_rodata.o(.rodata) + build/asm/overlays/ovl_En_Bu_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -3627,9 +3627,9 @@ SECTIONS ovl_En_Encount3 : AT(RomLocation) { build/src/overlays/actors/ovl_En_Encount3/z_en_encount3.o(.text) - build/asm/ovl_En_Encount3_data.o(.data) + build/asm/overlays/ovl_En_Encount3_data.o(.data) build/src/overlays/actors/ovl_En_Encount3/z_en_encount3.o(.rodata) - build/asm/ovl_En_Encount3_rodata.o(.rodata) + build/asm/overlays/ovl_En_Encount3_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -3641,9 +3641,9 @@ SECTIONS ovl_En_Jso : AT(RomLocation) { build/src/overlays/actors/ovl_En_Jso/z_en_jso.o(.text) - build/asm/ovl_En_Jso_data.o(.data) + build/asm/overlays/ovl_En_Jso_data.o(.data) build/src/overlays/actors/ovl_En_Jso/z_en_jso.o(.rodata) - build/asm/ovl_En_Jso_rodata.o(.rodata) + build/asm/overlays/ovl_En_Jso_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -3655,9 +3655,9 @@ SECTIONS ovl_Obj_Chikuwa : AT(RomLocation) { build/src/overlays/actors/ovl_Obj_Chikuwa/z_obj_chikuwa.o(.text) - build/asm/ovl_Obj_Chikuwa_data.o(.data) + build/asm/overlays/ovl_Obj_Chikuwa_data.o(.data) build/src/overlays/actors/ovl_Obj_Chikuwa/z_obj_chikuwa.o(.rodata) - build/asm/ovl_Obj_Chikuwa_rodata.o(.rodata) + build/asm/overlays/ovl_Obj_Chikuwa_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -3669,9 +3669,9 @@ SECTIONS ovl_En_Knight : AT(RomLocation) { build/src/overlays/actors/ovl_En_Knight/z_en_knight.o(.text) - build/asm/ovl_En_Knight_data.o(.data) + build/asm/overlays/ovl_En_Knight_data.o(.data) build/src/overlays/actors/ovl_En_Knight/z_en_knight.o(.rodata) - build/asm/ovl_En_Knight_rodata.o(.rodata) + build/asm/overlays/ovl_En_Knight_rodata.o(.rodata) ovl_En_Knight_bss_start = .; } . += 0x1790; @@ -3685,9 +3685,9 @@ SECTIONS ovl_En_Warp_tag : AT(RomLocation) { build/src/overlays/actors/ovl_En_Warp_tag/z_en_warp_tag.o(.text) - build/asm/ovl_En_Warp_tag_data.o(.data) + build/asm/overlays/ovl_En_Warp_tag_data.o(.data) build/src/overlays/actors/ovl_En_Warp_tag/z_en_warp_tag.o(.rodata) - build/asm/ovl_En_Warp_tag_rodata.o(.rodata) + build/asm/overlays/ovl_En_Warp_tag_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -3699,9 +3699,9 @@ SECTIONS ovl_En_Aob_01 : AT(RomLocation) { build/src/overlays/actors/ovl_En_Aob_01/z_en_aob_01.o(.text) - build/asm/ovl_En_Aob_01_data.o(.data) + build/asm/overlays/ovl_En_Aob_01_data.o(.data) build/src/overlays/actors/ovl_En_Aob_01/z_en_aob_01.o(.rodata) - build/asm/ovl_En_Aob_01_rodata.o(.rodata) + build/asm/overlays/ovl_En_Aob_01_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -3758,8 +3758,8 @@ SECTIONS ovl_En_Encount4 : AT(RomLocation) { build/src/overlays/actors/ovl_En_Encount4/z_en_encount4.o(.text) - build/asm/ovl_En_Encount4_data.o(.data) - build/asm/ovl_En_Encount4_rodata.o(.rodata) + build/asm/overlays/ovl_En_Encount4_data.o(.data) + build/asm/overlays/ovl_En_Encount4_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -3771,9 +3771,9 @@ SECTIONS ovl_En_Bom_Bowl_Man : AT(RomLocation) { build/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.o(.text) - build/asm/ovl_En_Bom_Bowl_Man_data.o(.data) + build/asm/overlays/ovl_En_Bom_Bowl_Man_data.o(.data) build/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.o(.rodata) - build/asm/ovl_En_Bom_Bowl_Man_rodata.o(.rodata) + build/asm/overlays/ovl_En_Bom_Bowl_Man_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -3785,9 +3785,9 @@ SECTIONS ovl_En_Syateki_Man : AT(RomLocation) { build/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.o(.text) - build/asm/ovl_En_Syateki_Man_data.o(.data) + build/asm/overlays/ovl_En_Syateki_Man_data.o(.data) build/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.o(.rodata) - build/asm/ovl_En_Syateki_Man_rodata.o(.rodata) + build/asm/overlays/ovl_En_Syateki_Man_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -3799,9 +3799,9 @@ SECTIONS ovl_Bg_Icicle : AT(RomLocation) { build/src/overlays/actors/ovl_Bg_Icicle/z_bg_icicle.o(.text) - build/asm/ovl_Bg_Icicle_data.o(.data) + build/asm/overlays/ovl_Bg_Icicle_data.o(.data) build/src/overlays/actors/ovl_Bg_Icicle/z_bg_icicle.o(.rodata) - build/asm/ovl_Bg_Icicle_rodata.o(.rodata) + build/asm/overlays/ovl_Bg_Icicle_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -3813,9 +3813,9 @@ SECTIONS ovl_En_Syateki_Crow : AT(RomLocation) { build/src/overlays/actors/ovl_En_Syateki_Crow/z_en_syateki_crow.o(.text) - build/asm/ovl_En_Syateki_Crow_data.o(.data) + build/asm/overlays/ovl_En_Syateki_Crow_data.o(.data) build/src/overlays/actors/ovl_En_Syateki_Crow/z_en_syateki_crow.o(.rodata) - build/asm/ovl_En_Syateki_Crow_rodata.o(.rodata) + build/asm/overlays/ovl_En_Syateki_Crow_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -3842,9 +3842,9 @@ SECTIONS ovl_En_Cne_01 : AT(RomLocation) { build/src/overlays/actors/ovl_En_Cne_01/z_en_cne_01.o(.text) - build/asm/ovl_En_Cne_01_data.o(.data) + build/asm/overlays/ovl_En_Cne_01_data.o(.data) build/src/overlays/actors/ovl_En_Cne_01/z_en_cne_01.o(.rodata) - build/asm/ovl_En_Cne_01_rodata.o(.rodata) + build/asm/overlays/ovl_En_Cne_01_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -3856,9 +3856,9 @@ SECTIONS ovl_En_Bba_01 : AT(RomLocation) { build/src/overlays/actors/ovl_En_Bba_01/z_en_bba_01.o(.text) - build/asm/ovl_En_Bba_01_data.o(.data) + build/asm/overlays/ovl_En_Bba_01_data.o(.data) build/src/overlays/actors/ovl_En_Bba_01/z_en_bba_01.o(.rodata) - build/asm/ovl_En_Bba_01_rodata.o(.rodata) + build/asm/overlays/ovl_En_Bba_01_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -3870,9 +3870,9 @@ SECTIONS ovl_En_Bji_01 : AT(RomLocation) { build/src/overlays/actors/ovl_En_Bji_01/z_en_bji_01.o(.text) - build/asm/ovl_En_Bji_01_data.o(.data) + build/asm/overlays/ovl_En_Bji_01_data.o(.data) build/src/overlays/actors/ovl_En_Bji_01/z_en_bji_01.o(.rodata) - build/asm/ovl_En_Bji_01_rodata.o(.rodata) + build/asm/overlays/ovl_En_Bji_01_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -3884,9 +3884,9 @@ SECTIONS ovl_Bg_Spdweb : AT(RomLocation) { build/src/overlays/actors/ovl_Bg_Spdweb/z_bg_spdweb.o(.text) - build/asm/ovl_Bg_Spdweb_data.o(.data) + build/asm/overlays/ovl_Bg_Spdweb_data.o(.data) build/src/overlays/actors/ovl_Bg_Spdweb/z_bg_spdweb.o(.rodata) - build/asm/ovl_Bg_Spdweb_rodata.o(.rodata) + build/asm/overlays/ovl_Bg_Spdweb_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -3898,9 +3898,9 @@ SECTIONS ovl_En_Mt_tag : AT(RomLocation) { build/src/overlays/actors/ovl_En_Mt_tag/z_en_mt_tag.o(.text) - build/asm/ovl_En_Mt_tag_data.o(.data) + build/asm/overlays/ovl_En_Mt_tag_data.o(.data) build/src/overlays/actors/ovl_En_Mt_tag/z_en_mt_tag.o(.rodata) - build/asm/ovl_En_Mt_tag_rodata.o(.rodata) + build/asm/overlays/ovl_En_Mt_tag_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -3912,9 +3912,9 @@ SECTIONS ovl_Boss_01 : AT(RomLocation) { build/src/overlays/actors/ovl_Boss_01/z_boss_01.o(.text) - build/asm/ovl_Boss_01_data.o(.data) + build/asm/overlays/ovl_Boss_01_data.o(.data) build/src/overlays/actors/ovl_Boss_01/z_boss_01.o(.rodata) - build/asm/ovl_Boss_01_rodata.o(.rodata) + build/asm/overlays/ovl_Boss_01_rodata.o(.rodata) ovl_Boss_01_bss_start = .; } . += 0x17C0; @@ -3928,9 +3928,9 @@ SECTIONS ovl_Boss_02 : AT(RomLocation) { build/src/overlays/actors/ovl_Boss_02/z_boss_02.o(.text) - build/asm/ovl_Boss_02_data.o(.data) + build/asm/overlays/ovl_Boss_02_data.o(.data) build/src/overlays/actors/ovl_Boss_02/z_boss_02.o(.rodata) - build/asm/ovl_Boss_02_rodata.o(.rodata) + build/asm/overlays/ovl_Boss_02_rodata.o(.rodata) ovl_Boss_02_bss_start = .; } . += 0x2340; @@ -3944,9 +3944,9 @@ SECTIONS ovl_Boss_03 : AT(RomLocation) { build/src/overlays/actors/ovl_Boss_03/z_boss_03.o(.text) - build/asm/ovl_Boss_03_data.o(.data) + build/asm/overlays/ovl_Boss_03_data.o(.data) build/src/overlays/actors/ovl_Boss_03/z_boss_03.o(.rodata) - build/asm/ovl_Boss_03_rodata.o(.rodata) + build/asm/overlays/ovl_Boss_03_rodata.o(.rodata) ovl_Boss_03_bss_start = .; } . += 0x2800; @@ -3960,9 +3960,9 @@ SECTIONS ovl_Boss_04 : AT(RomLocation) { build/src/overlays/actors/ovl_Boss_04/z_boss_04.o(.text) - build/asm/ovl_Boss_04_data.o(.data) + build/asm/overlays/ovl_Boss_04_data.o(.data) build/src/overlays/actors/ovl_Boss_04/z_boss_04.o(.rodata) - build/asm/ovl_Boss_04_rodata.o(.rodata) + build/asm/overlays/ovl_Boss_04_rodata.o(.rodata) ovl_Boss_04_bss_start = .; } . += 0x10; @@ -3976,9 +3976,9 @@ SECTIONS ovl_Boss_05 : AT(RomLocation) { build/src/overlays/actors/ovl_Boss_05/z_boss_05.o(.text) - build/asm/ovl_Boss_05_data.o(.data) + build/asm/overlays/ovl_Boss_05_data.o(.data) build/src/overlays/actors/ovl_Boss_05/z_boss_05.o(.rodata) - build/asm/ovl_Boss_05_rodata.o(.rodata) + build/asm/overlays/ovl_Boss_05_rodata.o(.rodata) ovl_Boss_05_bss_start = .; } . += 0x10; @@ -3992,9 +3992,9 @@ SECTIONS ovl_Boss_06 : AT(RomLocation) { build/src/overlays/actors/ovl_Boss_06/z_boss_06.o(.text) - build/asm/ovl_Boss_06_data.o(.data) + build/asm/overlays/ovl_Boss_06_data.o(.data) build/src/overlays/actors/ovl_Boss_06/z_boss_06.o(.rodata) - build/asm/ovl_Boss_06_rodata.o(.rodata) + build/asm/overlays/ovl_Boss_06_rodata.o(.rodata) ovl_Boss_06_bss_start = .; } . += 0x610; @@ -4008,9 +4008,9 @@ SECTIONS ovl_Boss_07 : AT(RomLocation) { build/src/overlays/actors/ovl_Boss_07/z_boss_07.o(.text) - build/asm/ovl_Boss_07_data.o(.data) + build/asm/overlays/ovl_Boss_07_data.o(.data) build/src/overlays/actors/ovl_Boss_07/z_boss_07.o(.rodata) - build/asm/ovl_Boss_07_rodata.o(.rodata) + build/asm/overlays/ovl_Boss_07_rodata.o(.rodata) ovl_Boss_07_bss_start = .; } . += 0xE60; @@ -4024,9 +4024,9 @@ SECTIONS ovl_Bg_Dy_Yoseizo : AT(RomLocation) { build/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.o(.text) - build/asm/ovl_Bg_Dy_Yoseizo_data.o(.data) + build/asm/overlays/ovl_Bg_Dy_Yoseizo_data.o(.data) build/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.o(.rodata) - build/asm/ovl_Bg_Dy_Yoseizo_rodata.o(.rodata) + build/asm/overlays/ovl_Bg_Dy_Yoseizo_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -4053,10 +4053,10 @@ SECTIONS ovl_En_Sob1 : AT(RomLocation) { build/src/overlays/actors/ovl_En_Sob1/z_en_sob1.o(.text) - build/asm/ovl_En_Sob1_data.o(.data) + build/asm/overlays/ovl_En_Sob1_data.o(.data) build/src/overlays/actors/ovl_En_Sob1/z_en_sob1.o(.rodata) - build/asm/ovl_En_Sob1_rodata.o(.rodata) - build/asm/ovl_En_Sob1_late_rodata.o(.rodata) + build/asm/overlays/ovl_En_Sob1_rodata.o(.rodata) + build/asm/overlays/ovl_En_Sob1_late_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -4068,9 +4068,9 @@ SECTIONS ovl_En_Go : AT(RomLocation) { build/src/overlays/actors/ovl_En_Go/z_en_go.o(.text) - build/asm/ovl_En_Go_data.o(.data) + build/asm/overlays/ovl_En_Go_data.o(.data) build/src/overlays/actors/ovl_En_Go/z_en_go.o(.rodata) - build/asm/ovl_En_Go_rodata.o(.rodata) + build/asm/overlays/ovl_En_Go_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -4082,9 +4082,9 @@ SECTIONS ovl_En_Raf : AT(RomLocation) { build/src/overlays/actors/ovl_En_Raf/z_en_raf.o(.text) - build/asm/ovl_En_Raf_data.o(.data) + build/asm/overlays/ovl_En_Raf_data.o(.data) build/src/overlays/actors/ovl_En_Raf/z_en_raf.o(.rodata) - build/asm/ovl_En_Raf_rodata.o(.rodata) + build/asm/overlays/ovl_En_Raf_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -4096,9 +4096,9 @@ SECTIONS ovl_Obj_Funen : AT(RomLocation) { build/src/overlays/actors/ovl_Obj_Funen/z_obj_funen.o(.text) - build/asm/ovl_Obj_Funen_data.o(.data) + build/asm/overlays/ovl_Obj_Funen_data.o(.data) build/src/overlays/actors/ovl_Obj_Funen/z_obj_funen.o(.rodata) - build/asm/ovl_Obj_Funen_rodata.o(.rodata) + build/asm/overlays/ovl_Obj_Funen_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -4110,9 +4110,9 @@ SECTIONS ovl_Obj_Raillift : AT(RomLocation) { build/src/overlays/actors/ovl_Obj_Raillift/z_obj_raillift.o(.text) - build/asm/ovl_Obj_Raillift_data.o(.data) + build/asm/overlays/ovl_Obj_Raillift_data.o(.data) build/src/overlays/actors/ovl_Obj_Raillift/z_obj_raillift.o(.rodata) - build/asm/ovl_Obj_Raillift_rodata.o(.rodata) + build/asm/overlays/ovl_Obj_Raillift_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -4124,9 +4124,9 @@ SECTIONS ovl_Bg_Numa_Hana : AT(RomLocation) { build/src/overlays/actors/ovl_Bg_Numa_Hana/z_bg_numa_hana.o(.text) - build/asm/ovl_Bg_Numa_Hana_data.o(.data) + build/asm/overlays/ovl_Bg_Numa_Hana_data.o(.data) build/src/overlays/actors/ovl_Bg_Numa_Hana/z_bg_numa_hana.o(.rodata) - build/asm/ovl_Bg_Numa_Hana_rodata.o(.rodata) + build/asm/overlays/ovl_Bg_Numa_Hana_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -4138,9 +4138,9 @@ SECTIONS ovl_Obj_Flowerpot : AT(RomLocation) { build/src/overlays/actors/ovl_Obj_Flowerpot/z_obj_flowerpot.o(.text) - build/asm/ovl_Obj_Flowerpot_data.o(.data) + build/asm/overlays/ovl_Obj_Flowerpot_data.o(.data) build/src/overlays/actors/ovl_Obj_Flowerpot/z_obj_flowerpot.o(.rodata) - build/asm/ovl_Obj_Flowerpot_rodata.o(.rodata) + build/asm/overlays/ovl_Obj_Flowerpot_rodata.o(.rodata) ovl_Obj_Flowerpot_bss_start = .; } . += 0x220; @@ -4154,9 +4154,9 @@ SECTIONS ovl_Obj_Spinyroll : AT(RomLocation) { build/src/overlays/actors/ovl_Obj_Spinyroll/z_obj_spinyroll.o(.text) - build/asm/ovl_Obj_Spinyroll_data.o(.data) + build/asm/overlays/ovl_Obj_Spinyroll_data.o(.data) build/src/overlays/actors/ovl_Obj_Spinyroll/z_obj_spinyroll.o(.rodata) - build/asm/ovl_Obj_Spinyroll_rodata.o(.rodata) + build/asm/overlays/ovl_Obj_Spinyroll_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -4168,9 +4168,9 @@ SECTIONS ovl_Dm_Hina : AT(RomLocation) { build/src/overlays/actors/ovl_Dm_Hina/z_dm_hina.o(.text) - build/asm/ovl_Dm_Hina_data.o(.data) + build/asm/overlays/ovl_Dm_Hina_data.o(.data) build/src/overlays/actors/ovl_Dm_Hina/z_dm_hina.o(.rodata) - build/asm/ovl_Dm_Hina_rodata.o(.rodata) + build/asm/overlays/ovl_Dm_Hina_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -4182,9 +4182,9 @@ SECTIONS ovl_En_Syateki_Wf : AT(RomLocation) { build/src/overlays/actors/ovl_En_Syateki_Wf/z_en_syateki_wf.o(.text) - build/asm/ovl_En_Syateki_Wf_data.o(.data) + build/asm/overlays/ovl_En_Syateki_Wf_data.o(.data) build/src/overlays/actors/ovl_En_Syateki_Wf/z_en_syateki_wf.o(.rodata) - build/asm/ovl_En_Syateki_Wf_rodata.o(.rodata) + build/asm/overlays/ovl_En_Syateki_Wf_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -4196,9 +4196,9 @@ SECTIONS ovl_Obj_Skateblock : AT(RomLocation) { build/src/overlays/actors/ovl_Obj_Skateblock/z_obj_skateblock.o(.text) - build/asm/ovl_Obj_Skateblock_data.o(.data) + build/asm/overlays/ovl_Obj_Skateblock_data.o(.data) build/src/overlays/actors/ovl_Obj_Skateblock/z_obj_skateblock.o(.rodata) - build/asm/ovl_Obj_Skateblock_rodata.o(.rodata) + build/asm/overlays/ovl_Obj_Skateblock_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -4209,8 +4209,8 @@ SECTIONS _ovl_Effect_En_Ice_BlockSegmentStart = SegmentStart; ovl_Effect_En_Ice_Block : AT(RomLocation) { - build/asm/ovl_Effect_En_Ice_Block_0x80A22D40.o(.text) - build/asm/ovl_Effect_En_Ice_Block_data.o(.data) + build/asm/overlays/ovl_Effect_En_Ice_Block_0x80A22D40.o(.text) + build/asm/overlays/ovl_Effect_En_Ice_Block_data.o(.data) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -4222,9 +4222,9 @@ SECTIONS ovl_Obj_Iceblock : AT(RomLocation) { build/src/overlays/actors/ovl_Obj_Iceblock/z_obj_iceblock.o(.text) - build/asm/ovl_Obj_Iceblock_data.o(.data) + build/asm/overlays/ovl_Obj_Iceblock_data.o(.data) build/src/overlays/actors/ovl_Obj_Iceblock/z_obj_iceblock.o(.rodata) - build/asm/ovl_Obj_Iceblock_rodata.o(.rodata) + build/asm/overlays/ovl_Obj_Iceblock_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -4236,9 +4236,9 @@ SECTIONS ovl_En_Bigpamet : AT(RomLocation) { build/src/overlays/actors/ovl_En_Bigpamet/z_en_bigpamet.o(.text) - build/asm/ovl_En_Bigpamet_data.o(.data) + build/asm/overlays/ovl_En_Bigpamet_data.o(.data) build/src/overlays/actors/ovl_En_Bigpamet/z_en_bigpamet.o(.rodata) - build/asm/ovl_En_Bigpamet_rodata.o(.rodata) + build/asm/overlays/ovl_En_Bigpamet_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -4250,9 +4250,9 @@ SECTIONS ovl_Bg_Dblue_Movebg : AT(RomLocation) { build/src/overlays/actors/ovl_Bg_Dblue_Movebg/z_bg_dblue_movebg.o(.text) - build/asm/ovl_Bg_Dblue_Movebg_data.o(.data) + build/asm/overlays/ovl_Bg_Dblue_Movebg_data.o(.data) build/src/overlays/actors/ovl_Bg_Dblue_Movebg/z_bg_dblue_movebg.o(.rodata) - build/asm/ovl_Bg_Dblue_Movebg_rodata.o(.rodata) + build/asm/overlays/ovl_Bg_Dblue_Movebg_rodata.o(.rodata) ovl_Bg_Dblue_Movebg_bss_start = .; } . += 0x10; @@ -4266,9 +4266,9 @@ SECTIONS ovl_En_Syateki_Dekunuts : AT(RomLocation) { build/src/overlays/actors/ovl_En_Syateki_Dekunuts/z_en_syateki_dekunuts.o(.text) - build/asm/ovl_En_Syateki_Dekunuts_data.o(.data) + build/asm/overlays/ovl_En_Syateki_Dekunuts_data.o(.data) build/src/overlays/actors/ovl_En_Syateki_Dekunuts/z_en_syateki_dekunuts.o(.rodata) - build/asm/ovl_En_Syateki_Dekunuts_rodata.o(.rodata) + build/asm/overlays/ovl_En_Syateki_Dekunuts_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -4280,10 +4280,10 @@ SECTIONS ovl_Elf_Msg3 : AT(RomLocation) { build/src/overlays/actors/ovl_Elf_Msg3/z_elf_msg3.o(.text) - build/asm/ovl_Elf_Msg3_data.o(.data) + build/asm/overlays/ovl_Elf_Msg3_data.o(.data) build/src/overlays/actors/ovl_Elf_Msg3/z_elf_msg3.o(.rodata) - build/asm/ovl_Elf_Msg3_rodata.o(.rodata) - build/asm/ovl_Elf_Msg3_late_rodata.o(.rodata) + build/asm/overlays/ovl_Elf_Msg3_rodata.o(.rodata) + build/asm/overlays/ovl_Elf_Msg3_late_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -4295,9 +4295,9 @@ SECTIONS ovl_En_Fg : AT(RomLocation) { build/src/overlays/actors/ovl_En_Fg/z_en_fg.o(.text) - build/asm/ovl_En_Fg_data.o(.data) + build/asm/overlays/ovl_En_Fg_data.o(.data) build/src/overlays/actors/ovl_En_Fg/z_en_fg.o(.rodata) - build/asm/ovl_En_Fg_rodata.o(.rodata) + build/asm/overlays/ovl_En_Fg_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -4309,9 +4309,9 @@ SECTIONS ovl_Dm_Ravine : AT(RomLocation) { build/src/overlays/actors/ovl_Dm_Ravine/z_dm_ravine.o(.text) - build/asm/ovl_Dm_Ravine_data.o(.data) + build/asm/overlays/ovl_Dm_Ravine_data.o(.data) build/src/overlays/actors/ovl_Dm_Ravine/z_dm_ravine.o(.rodata) - build/asm/ovl_Dm_Ravine_rodata.o(.rodata) + build/asm/overlays/ovl_Dm_Ravine_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -4323,9 +4323,9 @@ SECTIONS ovl_Dm_Sa : AT(RomLocation) { build/src/overlays/actors/ovl_Dm_Sa/z_dm_sa.o(.text) - build/asm/ovl_Dm_Sa_data.o(.data) + build/asm/overlays/ovl_Dm_Sa_data.o(.data) build/src/overlays/actors/ovl_Dm_Sa/z_dm_sa.o(.rodata) - build/asm/ovl_Dm_Sa_rodata.o(.rodata) + build/asm/overlays/ovl_Dm_Sa_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -4337,8 +4337,8 @@ SECTIONS ovl_En_Slime : AT(RomLocation) { build/src/overlays/actors/ovl_En_Slime/z_en_slime.o(.text) - build/asm/ovl_En_Slime_data.o(.data) - build/asm/ovl_En_Slime_rodata.o(.rodata) + build/asm/overlays/ovl_En_Slime_data.o(.data) + build/asm/overlays/ovl_En_Slime_rodata.o(.rodata) ovl_En_Slime_bss_start = .; } . += 0x10; @@ -4352,9 +4352,9 @@ SECTIONS ovl_En_Pr : AT(RomLocation) { build/src/overlays/actors/ovl_En_Pr/z_en_pr.o(.text) - build/asm/ovl_En_Pr_data.o(.data) + build/asm/overlays/ovl_En_Pr_data.o(.data) build/src/overlays/actors/ovl_En_Pr/z_en_pr.o(.rodata) - build/asm/ovl_En_Pr_rodata.o(.rodata) + build/asm/overlays/ovl_En_Pr_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -4366,8 +4366,8 @@ SECTIONS ovl_Obj_Toudai : AT(RomLocation) { build/src/overlays/actors/ovl_Obj_Toudai/z_obj_toudai.o(.text) - build/asm/ovl_Obj_Toudai_data.o(.data) - build/asm/ovl_Obj_Toudai_rodata.o(.rodata) + build/asm/overlays/ovl_Obj_Toudai_data.o(.data) + build/asm/overlays/ovl_Obj_Toudai_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -4379,9 +4379,9 @@ SECTIONS ovl_Obj_Entotu : AT(RomLocation) { build/src/overlays/actors/ovl_Obj_Entotu/z_obj_entotu.o(.text) - build/asm/ovl_Obj_Entotu_data.o(.data) + build/asm/overlays/ovl_Obj_Entotu_data.o(.data) build/src/overlays/actors/ovl_Obj_Entotu/z_obj_entotu.o(.rodata) - build/asm/ovl_Obj_Entotu_rodata.o(.rodata) + build/asm/overlays/ovl_Obj_Entotu_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -4393,9 +4393,9 @@ SECTIONS ovl_Obj_Bell : AT(RomLocation) { build/src/overlays/actors/ovl_Obj_Bell/z_obj_bell.o(.text) - build/asm/ovl_Obj_Bell_data.o(.data) + build/asm/overlays/ovl_Obj_Bell_data.o(.data) build/src/overlays/actors/ovl_Obj_Bell/z_obj_bell.o(.rodata) - build/asm/ovl_Obj_Bell_rodata.o(.rodata) + build/asm/overlays/ovl_Obj_Bell_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -4407,9 +4407,9 @@ SECTIONS ovl_En_Syateki_Okuta : AT(RomLocation) { build/src/overlays/actors/ovl_En_Syateki_Okuta/z_en_syateki_okuta.o(.text) - build/asm/ovl_En_Syateki_Okuta_data.o(.data) + build/asm/overlays/ovl_En_Syateki_Okuta_data.o(.data) build/src/overlays/actors/ovl_En_Syateki_Okuta/z_en_syateki_okuta.o(.rodata) - build/asm/ovl_En_Syateki_Okuta_rodata.o(.rodata) + build/asm/overlays/ovl_En_Syateki_Okuta_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -4421,9 +4421,9 @@ SECTIONS ovl_Obj_Shutter : AT(RomLocation) { build/src/overlays/actors/ovl_Obj_Shutter/z_obj_shutter.o(.text) - build/asm/ovl_Obj_Shutter_data.o(.data) + build/asm/overlays/ovl_Obj_Shutter_data.o(.data) build/src/overlays/actors/ovl_Obj_Shutter/z_obj_shutter.o(.rodata) - build/asm/ovl_Obj_Shutter_rodata.o(.rodata) + build/asm/overlays/ovl_Obj_Shutter_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -4435,9 +4435,9 @@ SECTIONS ovl_Dm_Zl : AT(RomLocation) { build/src/overlays/actors/ovl_Dm_Zl/z_dm_zl.o(.text) - build/asm/ovl_Dm_Zl_data.o(.data) + build/asm/overlays/ovl_Dm_Zl_data.o(.data) build/src/overlays/actors/ovl_Dm_Zl/z_dm_zl.o(.rodata) - build/asm/ovl_Dm_Zl_rodata.o(.rodata) + build/asm/overlays/ovl_Dm_Zl_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -4449,9 +4449,9 @@ SECTIONS ovl_En_Ru : AT(RomLocation) { build/src/overlays/actors/ovl_En_Ru/z_en_ru.o(.text) - build/asm/ovl_En_Ru_data.o(.data) + build/asm/overlays/ovl_En_Ru_data.o(.data) build/src/overlays/actors/ovl_En_Ru/z_en_ru.o(.rodata) - build/asm/ovl_En_Ru_rodata.o(.rodata) + build/asm/overlays/ovl_En_Ru_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -4463,9 +4463,9 @@ SECTIONS ovl_En_Elfgrp : AT(RomLocation) { build/src/overlays/actors/ovl_En_Elfgrp/z_en_elfgrp.o(.text) - build/asm/ovl_En_Elfgrp_data.o(.data) + build/asm/overlays/ovl_En_Elfgrp_data.o(.data) build/src/overlays/actors/ovl_En_Elfgrp/z_en_elfgrp.o(.rodata) - build/asm/ovl_En_Elfgrp_rodata.o(.rodata) + build/asm/overlays/ovl_En_Elfgrp_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -4477,9 +4477,9 @@ SECTIONS ovl_Dm_Tsg : AT(RomLocation) { build/src/overlays/actors/ovl_Dm_Tsg/z_dm_tsg.o(.text) - build/asm/ovl_Dm_Tsg_data.o(.data) + build/asm/overlays/ovl_Dm_Tsg_data.o(.data) build/src/overlays/actors/ovl_Dm_Tsg/z_dm_tsg.o(.rodata) - build/asm/ovl_Dm_Tsg_rodata.o(.rodata) + build/asm/overlays/ovl_Dm_Tsg_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -4491,9 +4491,9 @@ SECTIONS ovl_En_Baguo : AT(RomLocation) { build/src/overlays/actors/ovl_En_Baguo/z_en_baguo.o(.text) - build/asm/ovl_En_Baguo_data.o(.data) + build/asm/overlays/ovl_En_Baguo_data.o(.data) build/src/overlays/actors/ovl_En_Baguo/z_en_baguo.o(.rodata) - build/asm/ovl_En_Baguo_rodata.o(.rodata) + build/asm/overlays/ovl_En_Baguo_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -4505,9 +4505,9 @@ SECTIONS ovl_Obj_Vspinyroll : AT(RomLocation) { build/src/overlays/actors/ovl_Obj_Vspinyroll/z_obj_vspinyroll.o(.text) - build/asm/ovl_Obj_Vspinyroll_data.o(.data) + build/asm/overlays/ovl_Obj_Vspinyroll_data.o(.data) build/src/overlays/actors/ovl_Obj_Vspinyroll/z_obj_vspinyroll.o(.rodata) - build/asm/ovl_Obj_Vspinyroll_rodata.o(.rodata) + build/asm/overlays/ovl_Obj_Vspinyroll_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -4519,9 +4519,9 @@ SECTIONS ovl_Obj_Smork : AT(RomLocation) { build/src/overlays/actors/ovl_Obj_Smork/z_obj_smork.o(.text) - build/asm/ovl_Obj_Smork_data.o(.data) + build/asm/overlays/ovl_Obj_Smork_data.o(.data) build/src/overlays/actors/ovl_Obj_Smork/z_obj_smork.o(.rodata) - build/asm/ovl_Obj_Smork_rodata.o(.rodata) + build/asm/overlays/ovl_Obj_Smork_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -4533,9 +4533,9 @@ SECTIONS ovl_En_Test2 : AT(RomLocation) { build/src/overlays/actors/ovl_En_Test2/z_en_test2.o(.text) - build/asm/ovl_En_Test2_data.o(.data) + build/asm/overlays/ovl_En_Test2_data.o(.data) build/src/overlays/actors/ovl_En_Test2/z_en_test2.o(.rodata) - build/asm/ovl_En_Test2_rodata.o(.rodata) + build/asm/overlays/ovl_En_Test2_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -4547,9 +4547,9 @@ SECTIONS ovl_En_Test3 : AT(RomLocation) { build/src/overlays/actors/ovl_En_Test3/z_en_test3.o(.text) - build/asm/ovl_En_Test3_data.o(.data) + build/asm/overlays/ovl_En_Test3_data.o(.data) build/src/overlays/actors/ovl_En_Test3/z_en_test3.o(.rodata) - build/asm/ovl_En_Test3_rodata.o(.rodata) + build/asm/overlays/ovl_En_Test3_rodata.o(.rodata) ovl_En_Test3_bss_start = .; } . += 0x50; @@ -4563,7 +4563,7 @@ SECTIONS ovl_En_Test4 : AT(RomLocation) { build/src/overlays/actors/ovl_En_Test4/z_en_test4.o(.text) - build/asm/ovl_En_Test4_data.o(.data) + build/asm/overlays/ovl_En_Test4_data.o(.data) ovl_En_Test4_bss_start = .; } . += 0x10; @@ -4577,9 +4577,9 @@ SECTIONS ovl_En_Bat : AT(RomLocation) { build/src/overlays/actors/ovl_En_Bat/z_en_bat.o(.text) - build/asm/ovl_En_Bat_data.o(.data) + build/asm/overlays/ovl_En_Bat_data.o(.data) build/src/overlays/actors/ovl_En_Bat/z_en_bat.o(.rodata) - build/asm/ovl_En_Bat_rodata.o(.rodata) + build/asm/overlays/ovl_En_Bat_rodata.o(.rodata) ovl_En_Bat_bss_start = .; } . += 0x10; @@ -4593,9 +4593,9 @@ SECTIONS ovl_En_Sekihi : AT(RomLocation) { build/src/overlays/actors/ovl_En_Sekihi/z_en_sekihi.o(.text) - build/asm/ovl_En_Sekihi_data.o(.data) + build/asm/overlays/ovl_En_Sekihi_data.o(.data) build/src/overlays/actors/ovl_En_Sekihi/z_en_sekihi.o(.rodata) - build/asm/ovl_En_Sekihi_rodata.o(.rodata) + build/asm/overlays/ovl_En_Sekihi_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -4607,9 +4607,9 @@ SECTIONS ovl_En_Wiz : AT(RomLocation) { build/src/overlays/actors/ovl_En_Wiz/z_en_wiz.o(.text) - build/asm/ovl_En_Wiz_data.o(.data) + build/asm/overlays/ovl_En_Wiz_data.o(.data) build/src/overlays/actors/ovl_En_Wiz/z_en_wiz.o(.rodata) - build/asm/ovl_En_Wiz_rodata.o(.rodata) + build/asm/overlays/ovl_En_Wiz_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -4621,9 +4621,9 @@ SECTIONS ovl_En_Wiz_Brock : AT(RomLocation) { build/src/overlays/actors/ovl_En_Wiz_Brock/z_en_wiz_brock.o(.text) - build/asm/ovl_En_Wiz_Brock_data.o(.data) + build/asm/overlays/ovl_En_Wiz_Brock_data.o(.data) build/src/overlays/actors/ovl_En_Wiz_Brock/z_en_wiz_brock.o(.rodata) - build/asm/ovl_En_Wiz_Brock_rodata.o(.rodata) + build/asm/overlays/ovl_En_Wiz_Brock_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -4635,9 +4635,9 @@ SECTIONS ovl_En_Wiz_Fire : AT(RomLocation) { build/src/overlays/actors/ovl_En_Wiz_Fire/z_en_wiz_fire.o(.text) - build/asm/ovl_En_Wiz_Fire_data.o(.data) + build/asm/overlays/ovl_En_Wiz_Fire_data.o(.data) build/src/overlays/actors/ovl_En_Wiz_Fire/z_en_wiz_fire.o(.rodata) - build/asm/ovl_En_Wiz_Fire_rodata.o(.rodata) + build/asm/overlays/ovl_En_Wiz_Fire_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -4649,9 +4649,9 @@ SECTIONS ovl_Eff_Change : AT(RomLocation) { build/src/overlays/actors/ovl_Eff_Change/z_eff_change.o(.text) - build/asm/ovl_Eff_Change_data.o(.data) + build/asm/overlays/ovl_Eff_Change_data.o(.data) build/src/overlays/actors/ovl_Eff_Change/z_eff_change.o(.rodata) - build/asm/ovl_Eff_Change_rodata.o(.rodata) + build/asm/overlays/ovl_Eff_Change_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -4663,9 +4663,9 @@ SECTIONS ovl_Dm_Statue : AT(RomLocation) { build/src/overlays/actors/ovl_Dm_Statue/z_dm_statue.o(.text) - build/asm/ovl_Dm_Statue_data.o(.data) + build/asm/overlays/ovl_Dm_Statue_data.o(.data) build/src/overlays/actors/ovl_Dm_Statue/z_dm_statue.o(.rodata) - build/asm/ovl_Dm_Statue_rodata.o(.rodata) + build/asm/overlays/ovl_Dm_Statue_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -4677,9 +4677,9 @@ SECTIONS ovl_Obj_Fireshield : AT(RomLocation) { build/src/overlays/actors/ovl_Obj_Fireshield/z_obj_fireshield.o(.text) - build/asm/ovl_Obj_Fireshield_data.o(.data) + build/asm/overlays/ovl_Obj_Fireshield_data.o(.data) build/src/overlays/actors/ovl_Obj_Fireshield/z_obj_fireshield.o(.rodata) - build/asm/ovl_Obj_Fireshield_rodata.o(.rodata) + build/asm/overlays/ovl_Obj_Fireshield_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -4691,9 +4691,9 @@ SECTIONS ovl_Bg_Ladder : AT(RomLocation) { build/src/overlays/actors/ovl_Bg_Ladder/z_bg_ladder.o(.text) - build/asm/ovl_Bg_Ladder_data.o(.data) + build/asm/overlays/ovl_Bg_Ladder_data.o(.data) build/src/overlays/actors/ovl_Bg_Ladder/z_bg_ladder.o(.rodata) - build/asm/ovl_Bg_Ladder_rodata.o(.rodata) + build/asm/overlays/ovl_Bg_Ladder_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -4705,9 +4705,9 @@ SECTIONS ovl_En_Mkk : AT(RomLocation) { build/src/overlays/actors/ovl_En_Mkk/z_en_mkk.o(.text) - build/asm/ovl_En_Mkk_data.o(.data) + build/asm/overlays/ovl_En_Mkk_data.o(.data) build/src/overlays/actors/ovl_En_Mkk/z_en_mkk.o(.rodata) - build/asm/ovl_En_Mkk_rodata.o(.rodata) + build/asm/overlays/ovl_En_Mkk_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -4719,9 +4719,9 @@ SECTIONS ovl_Demo_Getitem : AT(RomLocation) { build/src/overlays/actors/ovl_Demo_Getitem/z_demo_getitem.o(.text) - build/asm/ovl_Demo_Getitem_data.o(.data) + build/asm/overlays/ovl_Demo_Getitem_data.o(.data) build/src/overlays/actors/ovl_Demo_Getitem/z_demo_getitem.o(.rodata) - build/asm/ovl_Demo_Getitem_rodata.o(.rodata) + build/asm/overlays/ovl_Demo_Getitem_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -4733,9 +4733,9 @@ SECTIONS ovl_En_Dnb : AT(RomLocation) { build/src/overlays/actors/ovl_En_Dnb/z_en_dnb.o(.text) - build/asm/ovl_En_Dnb_data.o(.data) + build/asm/overlays/ovl_En_Dnb_data.o(.data) build/src/overlays/actors/ovl_En_Dnb/z_en_dnb.o(.rodata) - build/asm/ovl_En_Dnb_rodata.o(.rodata) + build/asm/overlays/ovl_En_Dnb_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -4747,9 +4747,9 @@ SECTIONS ovl_En_Dnh : AT(RomLocation) { build/src/overlays/actors/ovl_En_Dnh/z_en_dnh.o(.text) - build/asm/ovl_En_Dnh_data.o(.data) + build/asm/overlays/ovl_En_Dnh_data.o(.data) build/src/overlays/actors/ovl_En_Dnh/z_en_dnh.o(.rodata) - build/asm/ovl_En_Dnh_rodata.o(.rodata) + build/asm/overlays/ovl_En_Dnh_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -4761,9 +4761,9 @@ SECTIONS ovl_En_Dnk : AT(RomLocation) { build/src/overlays/actors/ovl_En_Dnk/z_en_dnk.o(.text) - build/asm/ovl_En_Dnk_data.o(.data) + build/asm/overlays/ovl_En_Dnk_data.o(.data) build/src/overlays/actors/ovl_En_Dnk/z_en_dnk.o(.rodata) - build/asm/ovl_En_Dnk_rodata.o(.rodata) + build/asm/overlays/ovl_En_Dnk_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -4775,9 +4775,9 @@ SECTIONS ovl_En_Dnq : AT(RomLocation) { build/src/overlays/actors/ovl_En_Dnq/z_en_dnq.o(.text) - build/asm/ovl_En_Dnq_data.o(.data) + build/asm/overlays/ovl_En_Dnq_data.o(.data) build/src/overlays/actors/ovl_En_Dnq/z_en_dnq.o(.rodata) - build/asm/ovl_En_Dnq_rodata.o(.rodata) + build/asm/overlays/ovl_En_Dnq_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -4789,9 +4789,9 @@ SECTIONS ovl_Bg_Keikoku_Saku : AT(RomLocation) { build/src/overlays/actors/ovl_Bg_Keikoku_Saku/z_bg_keikoku_saku.o(.text) - build/asm/ovl_Bg_Keikoku_Saku_data.o(.data) + build/asm/overlays/ovl_Bg_Keikoku_Saku_data.o(.data) build/src/overlays/actors/ovl_Bg_Keikoku_Saku/z_bg_keikoku_saku.o(.rodata) - build/asm/ovl_Bg_Keikoku_Saku_rodata.o(.rodata) + build/asm/overlays/ovl_Bg_Keikoku_Saku_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -4803,9 +4803,9 @@ SECTIONS ovl_Obj_Hugebombiwa : AT(RomLocation) { build/src/overlays/actors/ovl_Obj_Hugebombiwa/z_obj_hugebombiwa.o(.text) - build/asm/ovl_Obj_Hugebombiwa_data.o(.data) + build/asm/overlays/ovl_Obj_Hugebombiwa_data.o(.data) build/src/overlays/actors/ovl_Obj_Hugebombiwa/z_obj_hugebombiwa.o(.rodata) - build/asm/ovl_Obj_Hugebombiwa_rodata.o(.rodata) + build/asm/overlays/ovl_Obj_Hugebombiwa_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -4832,9 +4832,9 @@ SECTIONS ovl_En_Rat : AT(RomLocation) { build/src/overlays/actors/ovl_En_Rat/z_en_rat.o(.text) - build/asm/ovl_En_Rat_data.o(.data) + build/asm/overlays/ovl_En_Rat_data.o(.data) build/src/overlays/actors/ovl_En_Rat/z_en_rat.o(.rodata) - build/asm/ovl_En_Rat_rodata.o(.rodata) + build/asm/overlays/ovl_En_Rat_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -4846,9 +4846,9 @@ SECTIONS ovl_En_Water_Effect : AT(RomLocation) { build/src/overlays/actors/ovl_En_Water_Effect/z_en_water_effect.o(.text) - build/asm/ovl_En_Water_Effect_data.o(.data) + build/asm/overlays/ovl_En_Water_Effect_data.o(.data) build/src/overlays/actors/ovl_En_Water_Effect/z_en_water_effect.o(.rodata) - build/asm/ovl_En_Water_Effect_rodata.o(.rodata) + build/asm/overlays/ovl_En_Water_Effect_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -4860,9 +4860,9 @@ SECTIONS ovl_En_Kusa2 : AT(RomLocation) { build/src/overlays/actors/ovl_En_Kusa2/z_en_kusa2.o(.text) - build/asm/ovl_En_Kusa2_data.o(.data) + build/asm/overlays/ovl_En_Kusa2_data.o(.data) build/src/overlays/actors/ovl_En_Kusa2/z_en_kusa2.o(.rodata) - build/asm/ovl_En_Kusa2_rodata.o(.rodata) + build/asm/overlays/ovl_En_Kusa2_rodata.o(.rodata) ovl_En_Kusa2_bss_start = .; } . += 0x1960; @@ -4876,9 +4876,9 @@ SECTIONS ovl_Bg_Spout_Fire : AT(RomLocation) { build/src/overlays/actors/ovl_Bg_Spout_Fire/z_bg_spout_fire.o(.text) - build/asm/ovl_Bg_Spout_Fire_data.o(.data) + build/asm/overlays/ovl_Bg_Spout_Fire_data.o(.data) build/src/overlays/actors/ovl_Bg_Spout_Fire/z_bg_spout_fire.o(.rodata) - build/asm/ovl_Bg_Spout_Fire_rodata.o(.rodata) + build/asm/overlays/ovl_Bg_Spout_Fire_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -4905,9 +4905,9 @@ SECTIONS ovl_En_Bal : AT(RomLocation) { build/src/overlays/actors/ovl_En_Bal/z_en_bal.o(.text) - build/asm/ovl_En_Bal_data.o(.data) + build/asm/overlays/ovl_En_Bal_data.o(.data) build/src/overlays/actors/ovl_En_Bal/z_en_bal.o(.rodata) - build/asm/ovl_En_Bal_rodata.o(.rodata) + build/asm/overlays/ovl_En_Bal_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -4919,9 +4919,9 @@ SECTIONS ovl_En_Ginko_Man : AT(RomLocation) { build/src/overlays/actors/ovl_En_Ginko_Man/z_en_ginko_man.o(.text) - build/asm/ovl_En_Ginko_Man_data.o(.data) + build/asm/overlays/ovl_En_Ginko_Man_data.o(.data) build/src/overlays/actors/ovl_En_Ginko_Man/z_en_ginko_man.o(.rodata) - build/asm/ovl_En_Ginko_Man_rodata.o(.rodata) + build/asm/overlays/ovl_En_Ginko_Man_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -4933,9 +4933,9 @@ SECTIONS ovl_En_Warp_Uzu : AT(RomLocation) { build/src/overlays/actors/ovl_En_Warp_Uzu/z_en_warp_uzu.o(.text) - build/asm/ovl_En_Warp_Uzu_data.o(.data) + build/asm/overlays/ovl_En_Warp_Uzu_data.o(.data) build/src/overlays/actors/ovl_En_Warp_Uzu/z_en_warp_uzu.o(.rodata) - build/asm/ovl_En_Warp_Uzu_rodata.o(.rodata) + build/asm/overlays/ovl_En_Warp_Uzu_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -4947,9 +4947,9 @@ SECTIONS ovl_Obj_Driftice : AT(RomLocation) { build/src/overlays/actors/ovl_Obj_Driftice/z_obj_driftice.o(.text) - build/asm/ovl_Obj_Driftice_data.o(.data) + build/asm/overlays/ovl_Obj_Driftice_data.o(.data) build/src/overlays/actors/ovl_Obj_Driftice/z_obj_driftice.o(.rodata) - build/asm/ovl_Obj_Driftice_rodata.o(.rodata) + build/asm/overlays/ovl_Obj_Driftice_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -4961,9 +4961,9 @@ SECTIONS ovl_En_Look_Nuts : AT(RomLocation) { build/src/overlays/actors/ovl_En_Look_Nuts/z_en_look_nuts.o(.text) - build/asm/ovl_En_Look_Nuts_data.o(.data) + build/asm/overlays/ovl_En_Look_Nuts_data.o(.data) build/src/overlays/actors/ovl_En_Look_Nuts/z_en_look_nuts.o(.rodata) - build/asm/ovl_En_Look_Nuts_rodata.o(.rodata) + build/asm/overlays/ovl_En_Look_Nuts_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -4975,9 +4975,9 @@ SECTIONS ovl_En_Mushi2 : AT(RomLocation) { build/src/overlays/actors/ovl_En_Mushi2/z_en_mushi2.o(.text) - build/asm/ovl_En_Mushi2_data.o(.data) + build/asm/overlays/ovl_En_Mushi2_data.o(.data) build/src/overlays/actors/ovl_En_Mushi2/z_en_mushi2.o(.rodata) - build/asm/ovl_En_Mushi2_rodata.o(.rodata) + build/asm/overlays/ovl_En_Mushi2_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -4989,9 +4989,9 @@ SECTIONS ovl_En_Fall : AT(RomLocation) { build/src/overlays/actors/ovl_En_Fall/z_en_fall.o(.text) - build/asm/ovl_En_Fall_data.o(.data) + build/asm/overlays/ovl_En_Fall_data.o(.data) build/src/overlays/actors/ovl_En_Fall/z_en_fall.o(.rodata) - build/asm/ovl_En_Fall_rodata.o(.rodata) + build/asm/overlays/ovl_En_Fall_rodata.o(.rodata) ovl_En_Fall_bss_start = .; } . += 0x710; @@ -5005,9 +5005,9 @@ SECTIONS ovl_En_Mm3 : AT(RomLocation) { build/src/overlays/actors/ovl_En_Mm3/z_en_mm3.o(.text) - build/asm/ovl_En_Mm3_data.o(.data) + build/asm/overlays/ovl_En_Mm3_data.o(.data) build/src/overlays/actors/ovl_En_Mm3/z_en_mm3.o(.rodata) - build/asm/ovl_En_Mm3_rodata.o(.rodata) + build/asm/overlays/ovl_En_Mm3_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -5019,9 +5019,9 @@ SECTIONS ovl_Bg_Crace_Movebg : AT(RomLocation) { build/src/overlays/actors/ovl_Bg_Crace_Movebg/z_bg_crace_movebg.o(.text) - build/asm/ovl_Bg_Crace_Movebg_data.o(.data) + build/asm/overlays/ovl_Bg_Crace_Movebg_data.o(.data) build/src/overlays/actors/ovl_Bg_Crace_Movebg/z_bg_crace_movebg.o(.rodata) - build/asm/ovl_Bg_Crace_Movebg_rodata.o(.rodata) + build/asm/overlays/ovl_Bg_Crace_Movebg_rodata.o(.rodata) ovl_Bg_Crace_Movebg_bss_start = .; } . += 0x20; @@ -5035,9 +5035,9 @@ SECTIONS ovl_En_Dno : AT(RomLocation) { build/src/overlays/actors/ovl_En_Dno/z_en_dno.o(.text) - build/asm/ovl_En_Dno_data.o(.data) + build/asm/overlays/ovl_En_Dno_data.o(.data) build/src/overlays/actors/ovl_En_Dno/z_en_dno.o(.rodata) - build/asm/ovl_En_Dno_rodata.o(.rodata) + build/asm/overlays/ovl_En_Dno_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -5049,9 +5049,9 @@ SECTIONS ovl_En_Pr2 : AT(RomLocation) { build/src/overlays/actors/ovl_En_Pr2/z_en_pr2.o(.text) - build/asm/ovl_En_Pr2_data.o(.data) + build/asm/overlays/ovl_En_Pr2_data.o(.data) build/src/overlays/actors/ovl_En_Pr2/z_en_pr2.o(.rodata) - build/asm/ovl_En_Pr2_rodata.o(.rodata) + build/asm/overlays/ovl_En_Pr2_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -5063,9 +5063,9 @@ SECTIONS ovl_En_Prz : AT(RomLocation) { build/src/overlays/actors/ovl_En_Prz/z_en_prz.o(.text) - build/asm/ovl_En_Prz_data.o(.data) + build/asm/overlays/ovl_En_Prz_data.o(.data) build/src/overlays/actors/ovl_En_Prz/z_en_prz.o(.rodata) - build/asm/ovl_En_Prz_rodata.o(.rodata) + build/asm/overlays/ovl_En_Prz_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -5077,9 +5077,9 @@ SECTIONS ovl_En_Jso2 : AT(RomLocation) { build/src/overlays/actors/ovl_En_Jso2/z_en_jso2.o(.text) - build/asm/ovl_En_Jso2_data.o(.data) + build/asm/overlays/ovl_En_Jso2_data.o(.data) build/src/overlays/actors/ovl_En_Jso2/z_en_jso2.o(.rodata) - build/asm/ovl_En_Jso2_rodata.o(.rodata) + build/asm/overlays/ovl_En_Jso2_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -5091,9 +5091,9 @@ SECTIONS ovl_Obj_Etcetera : AT(RomLocation) { build/src/overlays/actors/ovl_Obj_Etcetera/z_obj_etcetera.o(.text) - build/asm/ovl_Obj_Etcetera_data.o(.data) + build/asm/overlays/ovl_Obj_Etcetera_data.o(.data) build/src/overlays/actors/ovl_Obj_Etcetera/z_obj_etcetera.o(.rodata) - build/asm/ovl_Obj_Etcetera_rodata.o(.rodata) + build/asm/overlays/ovl_Obj_Etcetera_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -5105,9 +5105,9 @@ SECTIONS ovl_En_Egol : AT(RomLocation) { build/src/overlays/actors/ovl_En_Egol/z_en_egol.o(.text) - build/asm/ovl_En_Egol_data.o(.data) + build/asm/overlays/ovl_En_Egol_data.o(.data) build/src/overlays/actors/ovl_En_Egol/z_en_egol.o(.rodata) - build/asm/ovl_En_Egol_rodata.o(.rodata) + build/asm/overlays/ovl_En_Egol_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -5119,9 +5119,9 @@ SECTIONS ovl_Obj_Mine : AT(RomLocation) { build/src/overlays/actors/ovl_Obj_Mine/z_obj_mine.o(.text) - build/asm/ovl_Obj_Mine_data.o(.data) + build/asm/overlays/ovl_Obj_Mine_data.o(.data) build/src/overlays/actors/ovl_Obj_Mine/z_obj_mine.o(.rodata) - build/asm/ovl_Obj_Mine_rodata.o(.rodata) + build/asm/overlays/ovl_Obj_Mine_rodata.o(.rodata) ovl_Obj_Mine_bss_start = .; } . += 0x300; @@ -5135,9 +5135,9 @@ SECTIONS ovl_Obj_Purify : AT(RomLocation) { build/src/overlays/actors/ovl_Obj_Purify/z_obj_purify.o(.text) - build/asm/ovl_Obj_Purify_data.o(.data) + build/asm/overlays/ovl_Obj_Purify_data.o(.data) build/src/overlays/actors/ovl_Obj_Purify/z_obj_purify.o(.rodata) - build/asm/ovl_Obj_Purify_rodata.o(.rodata) + build/asm/overlays/ovl_Obj_Purify_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -5149,9 +5149,9 @@ SECTIONS ovl_En_Tru : AT(RomLocation) { build/src/overlays/actors/ovl_En_Tru/z_en_tru.o(.text) - build/asm/ovl_En_Tru_data.o(.data) + build/asm/overlays/ovl_En_Tru_data.o(.data) build/src/overlays/actors/ovl_En_Tru/z_en_tru.o(.rodata) - build/asm/ovl_En_Tru_rodata.o(.rodata) + build/asm/overlays/ovl_En_Tru_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -5163,10 +5163,10 @@ SECTIONS ovl_En_Trt : AT(RomLocation) { build/src/overlays/actors/ovl_En_Trt/z_en_trt.o(.text) - build/asm/ovl_En_Trt_data.o(.data) + build/asm/overlays/ovl_En_Trt_data.o(.data) build/src/overlays/actors/ovl_En_Trt/z_en_trt.o(.rodata) - build/asm/ovl_En_Trt_rodata.o(.rodata) - build/asm/ovl_En_Trt_late_rodata.o(.rodata) + build/asm/overlays/ovl_En_Trt_rodata.o(.rodata) + build/asm/overlays/ovl_En_Trt_late_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -5178,9 +5178,9 @@ SECTIONS ovl_En_Test5 : AT(RomLocation) { build/src/overlays/actors/ovl_En_Test5/z_en_test5.o(.text) - build/asm/ovl_En_Test5_data.o(.data) + build/asm/overlays/ovl_En_Test5_data.o(.data) build/src/overlays/actors/ovl_En_Test5/z_en_test5.o(.rodata) - build/asm/ovl_En_Test5_rodata.o(.rodata) + build/asm/overlays/ovl_En_Test5_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -5192,9 +5192,9 @@ SECTIONS ovl_En_Test6 : AT(RomLocation) { build/src/overlays/actors/ovl_En_Test6/z_en_test6.o(.text) - build/asm/ovl_En_Test6_data.o(.data) + build/asm/overlays/ovl_En_Test6_data.o(.data) build/src/overlays/actors/ovl_En_Test6/z_en_test6.o(.rodata) - build/asm/ovl_En_Test6_rodata.o(.rodata) + build/asm/overlays/ovl_En_Test6_rodata.o(.rodata) ovl_En_Test6_bss_start = .; } . += 0x120; @@ -5208,9 +5208,9 @@ SECTIONS ovl_En_Az : AT(RomLocation) { build/src/overlays/actors/ovl_En_Az/z_en_az.o(.text) - build/asm/ovl_En_Az_data.o(.data) + build/asm/overlays/ovl_En_Az_data.o(.data) build/src/overlays/actors/ovl_En_Az/z_en_az.o(.rodata) - build/asm/ovl_En_Az_rodata.o(.rodata) + build/asm/overlays/ovl_En_Az_rodata.o(.rodata) ovl_En_Az_bss_start = .; } . += 0x20; @@ -5224,9 +5224,9 @@ SECTIONS ovl_En_Estone : AT(RomLocation) { build/src/overlays/actors/ovl_En_Estone/z_en_estone.o(.text) - build/asm/ovl_En_Estone_data.o(.data) + build/asm/overlays/ovl_En_Estone_data.o(.data) build/src/overlays/actors/ovl_En_Estone/z_en_estone.o(.rodata) - build/asm/ovl_En_Estone_rodata.o(.rodata) + build/asm/overlays/ovl_En_Estone_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -5238,9 +5238,9 @@ SECTIONS ovl_Bg_Hakugin_Post : AT(RomLocation) { build/src/overlays/actors/ovl_Bg_Hakugin_Post/z_bg_hakugin_post.o(.text) - build/asm/ovl_Bg_Hakugin_Post_data.o(.data) + build/asm/overlays/ovl_Bg_Hakugin_Post_data.o(.data) build/src/overlays/actors/ovl_Bg_Hakugin_Post/z_bg_hakugin_post.o(.rodata) - build/asm/ovl_Bg_Hakugin_Post_rodata.o(.rodata) + build/asm/overlays/ovl_Bg_Hakugin_Post_rodata.o(.rodata) ovl_Bg_Hakugin_Post_bss_start = .; } . += 0x1B90; @@ -5254,9 +5254,9 @@ SECTIONS ovl_Dm_Opstage : AT(RomLocation) { build/src/overlays/actors/ovl_Dm_Opstage/z_dm_opstage.o(.text) - build/asm/ovl_Dm_Opstage_data.o(.data) + build/asm/overlays/ovl_Dm_Opstage_data.o(.data) build/src/overlays/actors/ovl_Dm_Opstage/z_dm_opstage.o(.rodata) - build/asm/ovl_Dm_Opstage_rodata.o(.rodata) + build/asm/overlays/ovl_Dm_Opstage_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -5268,9 +5268,9 @@ SECTIONS ovl_Dm_Stk : AT(RomLocation) { build/src/overlays/actors/ovl_Dm_Stk/z_dm_stk.o(.text) - build/asm/ovl_Dm_Stk_data.o(.data) + build/asm/overlays/ovl_Dm_Stk_data.o(.data) build/src/overlays/actors/ovl_Dm_Stk/z_dm_stk.o(.rodata) - build/asm/ovl_Dm_Stk_rodata.o(.rodata) + build/asm/overlays/ovl_Dm_Stk_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -5282,9 +5282,9 @@ SECTIONS ovl_Dm_Char00 : AT(RomLocation) { build/src/overlays/actors/ovl_Dm_Char00/z_dm_char00.o(.text) - build/asm/ovl_Dm_Char00_data.o(.data) + build/asm/overlays/ovl_Dm_Char00_data.o(.data) build/src/overlays/actors/ovl_Dm_Char00/z_dm_char00.o(.rodata) - build/asm/ovl_Dm_Char00_rodata.o(.rodata) + build/asm/overlays/ovl_Dm_Char00_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -5296,9 +5296,9 @@ SECTIONS ovl_Dm_Char01 : AT(RomLocation) { build/src/overlays/actors/ovl_Dm_Char01/z_dm_char01.o(.text) - build/asm/ovl_Dm_Char01_data.o(.data) + build/asm/overlays/ovl_Dm_Char01_data.o(.data) build/src/overlays/actors/ovl_Dm_Char01/z_dm_char01.o(.rodata) - build/asm/ovl_Dm_Char01_rodata.o(.rodata) + build/asm/overlays/ovl_Dm_Char01_rodata.o(.rodata) ovl_Dm_Char01_bss_start = .; } . += 0x10; @@ -5312,9 +5312,9 @@ SECTIONS ovl_Dm_Char02 : AT(RomLocation) { build/src/overlays/actors/ovl_Dm_Char02/z_dm_char02.o(.text) - build/asm/ovl_Dm_Char02_data.o(.data) + build/asm/overlays/ovl_Dm_Char02_data.o(.data) build/src/overlays/actors/ovl_Dm_Char02/z_dm_char02.o(.rodata) - build/asm/ovl_Dm_Char02_rodata.o(.rodata) + build/asm/overlays/ovl_Dm_Char02_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -5326,9 +5326,9 @@ SECTIONS ovl_Dm_Char03 : AT(RomLocation) { build/src/overlays/actors/ovl_Dm_Char03/z_dm_char03.o(.text) - build/asm/ovl_Dm_Char03_data.o(.data) + build/asm/overlays/ovl_Dm_Char03_data.o(.data) build/src/overlays/actors/ovl_Dm_Char03/z_dm_char03.o(.rodata) - build/asm/ovl_Dm_Char03_rodata.o(.rodata) + build/asm/overlays/ovl_Dm_Char03_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -5340,9 +5340,9 @@ SECTIONS ovl_Dm_Char04 : AT(RomLocation) { build/src/overlays/actors/ovl_Dm_Char04/z_dm_char04.o(.text) - build/asm/ovl_Dm_Char04_data.o(.data) + build/asm/overlays/ovl_Dm_Char04_data.o(.data) build/src/overlays/actors/ovl_Dm_Char04/z_dm_char04.o(.rodata) - build/asm/ovl_Dm_Char04_rodata.o(.rodata) + build/asm/overlays/ovl_Dm_Char04_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -5354,9 +5354,9 @@ SECTIONS ovl_Dm_Char05 : AT(RomLocation) { build/src/overlays/actors/ovl_Dm_Char05/z_dm_char05.o(.text) - build/asm/ovl_Dm_Char05_data.o(.data) + build/asm/overlays/ovl_Dm_Char05_data.o(.data) build/src/overlays/actors/ovl_Dm_Char05/z_dm_char05.o(.rodata) - build/asm/ovl_Dm_Char05_rodata.o(.rodata) + build/asm/overlays/ovl_Dm_Char05_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -5368,9 +5368,9 @@ SECTIONS ovl_Dm_Char06 : AT(RomLocation) { build/src/overlays/actors/ovl_Dm_Char06/z_dm_char06.o(.text) - build/asm/ovl_Dm_Char06_data.o(.data) + build/asm/overlays/ovl_Dm_Char06_data.o(.data) build/src/overlays/actors/ovl_Dm_Char06/z_dm_char06.o(.rodata) - build/asm/ovl_Dm_Char06_rodata.o(.rodata) + build/asm/overlays/ovl_Dm_Char06_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -5382,9 +5382,9 @@ SECTIONS ovl_Dm_Char07 : AT(RomLocation) { build/src/overlays/actors/ovl_Dm_Char07/z_dm_char07.o(.text) - build/asm/ovl_Dm_Char07_data.o(.data) + build/asm/overlays/ovl_Dm_Char07_data.o(.data) build/src/overlays/actors/ovl_Dm_Char07/z_dm_char07.o(.rodata) - build/asm/ovl_Dm_Char07_rodata.o(.rodata) + build/asm/overlays/ovl_Dm_Char07_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -5396,9 +5396,9 @@ SECTIONS ovl_Dm_Char08 : AT(RomLocation) { build/src/overlays/actors/ovl_Dm_Char08/z_dm_char08.o(.text) - build/asm/ovl_Dm_Char08_data.o(.data) + build/asm/overlays/ovl_Dm_Char08_data.o(.data) build/src/overlays/actors/ovl_Dm_Char08/z_dm_char08.o(.rodata) - build/asm/ovl_Dm_Char08_rodata.o(.rodata) + build/asm/overlays/ovl_Dm_Char08_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -5410,9 +5410,9 @@ SECTIONS ovl_Dm_Char09 : AT(RomLocation) { build/src/overlays/actors/ovl_Dm_Char09/z_dm_char09.o(.text) - build/asm/ovl_Dm_Char09_data.o(.data) + build/asm/overlays/ovl_Dm_Char09_data.o(.data) build/src/overlays/actors/ovl_Dm_Char09/z_dm_char09.o(.rodata) - build/asm/ovl_Dm_Char09_rodata.o(.rodata) + build/asm/overlays/ovl_Dm_Char09_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -5424,9 +5424,9 @@ SECTIONS ovl_Obj_Tokeidai : AT(RomLocation) { build/src/overlays/actors/ovl_Obj_Tokeidai/z_obj_tokeidai.o(.text) - build/asm/ovl_Obj_Tokeidai_data.o(.data) + build/asm/overlays/ovl_Obj_Tokeidai_data.o(.data) build/src/overlays/actors/ovl_Obj_Tokeidai/z_obj_tokeidai.o(.rodata) - build/asm/ovl_Obj_Tokeidai_rodata.o(.rodata) + build/asm/overlays/ovl_Obj_Tokeidai_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -5438,9 +5438,9 @@ SECTIONS ovl_En_Mnk : AT(RomLocation) { build/src/overlays/actors/ovl_En_Mnk/z_en_mnk.o(.text) - build/asm/ovl_En_Mnk_data.o(.data) + build/asm/overlays/ovl_En_Mnk_data.o(.data) build/src/overlays/actors/ovl_En_Mnk/z_en_mnk.o(.rodata) - build/asm/ovl_En_Mnk_rodata.o(.rodata) + build/asm/overlays/ovl_En_Mnk_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -5452,9 +5452,9 @@ SECTIONS ovl_En_Egblock : AT(RomLocation) { build/src/overlays/actors/ovl_En_Egblock/z_en_egblock.o(.text) - build/asm/ovl_En_Egblock_data.o(.data) + build/asm/overlays/ovl_En_Egblock_data.o(.data) build/src/overlays/actors/ovl_En_Egblock/z_en_egblock.o(.rodata) - build/asm/ovl_En_Egblock_rodata.o(.rodata) + build/asm/overlays/ovl_En_Egblock_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -5466,9 +5466,9 @@ SECTIONS ovl_En_Guard_Nuts : AT(RomLocation) { build/src/overlays/actors/ovl_En_Guard_Nuts/z_en_guard_nuts.o(.text) - build/asm/ovl_En_Guard_Nuts_data.o(.data) + build/asm/overlays/ovl_En_Guard_Nuts_data.o(.data) build/src/overlays/actors/ovl_En_Guard_Nuts/z_en_guard_nuts.o(.rodata) - build/asm/ovl_En_Guard_Nuts_rodata.o(.rodata) + build/asm/overlays/ovl_En_Guard_Nuts_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -5480,9 +5480,9 @@ SECTIONS ovl_Bg_Hakugin_Bombwall : AT(RomLocation) { build/src/overlays/actors/ovl_Bg_Hakugin_Bombwall/z_bg_hakugin_bombwall.o(.text) - build/asm/ovl_Bg_Hakugin_Bombwall_data.o(.data) + build/asm/overlays/ovl_Bg_Hakugin_Bombwall_data.o(.data) build/src/overlays/actors/ovl_Bg_Hakugin_Bombwall/z_bg_hakugin_bombwall.o(.rodata) - build/asm/ovl_Bg_Hakugin_Bombwall_rodata.o(.rodata) + build/asm/overlays/ovl_Bg_Hakugin_Bombwall_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -5494,9 +5494,9 @@ SECTIONS ovl_Obj_Tokei_Tobira : AT(RomLocation) { build/src/overlays/actors/ovl_Obj_Tokei_Tobira/z_obj_tokei_tobira.o(.text) - build/asm/ovl_Obj_Tokei_Tobira_data.o(.data) + build/asm/overlays/ovl_Obj_Tokei_Tobira_data.o(.data) build/src/overlays/actors/ovl_Obj_Tokei_Tobira/z_obj_tokei_tobira.o(.rodata) - build/asm/ovl_Obj_Tokei_Tobira_rodata.o(.rodata) + build/asm/overlays/ovl_Obj_Tokei_Tobira_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -5508,9 +5508,9 @@ SECTIONS ovl_Bg_Hakugin_Elvpole : AT(RomLocation) { build/src/overlays/actors/ovl_Bg_Hakugin_Elvpole/z_bg_hakugin_elvpole.o(.text) - build/asm/ovl_Bg_Hakugin_Elvpole_data.o(.data) + build/asm/overlays/ovl_Bg_Hakugin_Elvpole_data.o(.data) build/src/overlays/actors/ovl_Bg_Hakugin_Elvpole/z_bg_hakugin_elvpole.o(.rodata) - build/asm/ovl_Bg_Hakugin_Elvpole_rodata.o(.rodata) + build/asm/overlays/ovl_Bg_Hakugin_Elvpole_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -5522,9 +5522,9 @@ SECTIONS ovl_En_Ma4 : AT(RomLocation) { build/src/overlays/actors/ovl_En_Ma4/z_en_ma4.o(.text) - build/asm/ovl_En_Ma4_data.o(.data) + build/asm/overlays/ovl_En_Ma4_data.o(.data) build/src/overlays/actors/ovl_En_Ma4/z_en_ma4.o(.rodata) - build/asm/ovl_En_Ma4_rodata.o(.rodata) + build/asm/overlays/ovl_En_Ma4_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -5536,9 +5536,9 @@ SECTIONS ovl_En_Twig : AT(RomLocation) { build/src/overlays/actors/ovl_En_Twig/z_en_twig.o(.text) - build/asm/ovl_En_Twig_data.o(.data) + build/asm/overlays/ovl_En_Twig_data.o(.data) build/src/overlays/actors/ovl_En_Twig/z_en_twig.o(.rodata) - build/asm/ovl_En_Twig_rodata.o(.rodata) + build/asm/overlays/ovl_En_Twig_rodata.o(.rodata) ovl_En_Twig_bss_start = .; } . += 0x40; @@ -5552,9 +5552,9 @@ SECTIONS ovl_En_Po_Fusen : AT(RomLocation) { build/src/overlays/actors/ovl_En_Po_Fusen/z_en_po_fusen.o(.text) - build/asm/ovl_En_Po_Fusen_data.o(.data) + build/asm/overlays/ovl_En_Po_Fusen_data.o(.data) build/src/overlays/actors/ovl_En_Po_Fusen/z_en_po_fusen.o(.rodata) - build/asm/ovl_En_Po_Fusen_rodata.o(.rodata) + build/asm/overlays/ovl_En_Po_Fusen_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -5566,9 +5566,9 @@ SECTIONS ovl_En_Door_Etc : AT(RomLocation) { build/src/overlays/actors/ovl_En_Door_Etc/z_en_door_etc.o(.text) - build/asm/ovl_En_Door_Etc_data.o(.data) + build/asm/overlays/ovl_En_Door_Etc_data.o(.data) build/src/overlays/actors/ovl_En_Door_Etc/z_en_door_etc.o(.rodata) - build/asm/ovl_En_Door_Etc_rodata.o(.rodata) + build/asm/overlays/ovl_En_Door_Etc_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -5580,9 +5580,9 @@ SECTIONS ovl_En_Bigokuta : AT(RomLocation) { build/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.o(.text) - build/asm/ovl_En_Bigokuta_data.o(.data) + build/asm/overlays/ovl_En_Bigokuta_data.o(.data) build/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.o(.rodata) - build/asm/ovl_En_Bigokuta_rodata.o(.rodata) + build/asm/overlays/ovl_En_Bigokuta_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -5594,9 +5594,9 @@ SECTIONS ovl_Bg_Icefloe : AT(RomLocation) { build/src/overlays/actors/ovl_Bg_Icefloe/z_bg_icefloe.o(.text) - build/asm/ovl_Bg_Icefloe_data.o(.data) + build/asm/overlays/ovl_Bg_Icefloe_data.o(.data) build/src/overlays/actors/ovl_Bg_Icefloe/z_bg_icefloe.o(.rodata) - build/asm/ovl_Bg_Icefloe_rodata.o(.rodata) + build/asm/overlays/ovl_Bg_Icefloe_rodata.o(.rodata) ovl_Bg_Icefloe_bss_start = .; } . += 0x10; @@ -5609,8 +5609,8 @@ SECTIONS _f385_0x00cfc450SegmentStart = SegmentStart; f385_0x00cfc450 : { - build/asm/385_0x00cfc450_0x80AC5070.o(.text) - build/asm/385_0x00cfc450_data.o(.data) + build/asm/overlays/385_0x00cfc450_0x80AC5070.o(.text) + build/asm/overlays/385_0x00cfc450_data.o(.data) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -5621,8 +5621,8 @@ SECTIONS _f386_0x00cfc970SegmentStart = SegmentStart; f386_0x00cfc970 : { - build/asm/386_0x00cfc970_0x80AC57B0.o(.text) - build/asm/386_0x00cfc970_data.o(.data) + build/asm/overlays/386_0x00cfc970_0x80AC57B0.o(.text) + build/asm/overlays/386_0x00cfc970_data.o(.data) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -5633,8 +5633,8 @@ SECTIONS _f387_0x00cfd400SegmentStart = SegmentStart; f387_0x00cfd400 : { - build/asm/387_0x00cfd400_0x80AC6740.o(.text) - build/asm/387_0x00cfd400_data.o(.data) + build/asm/overlays/387_0x00cfd400_0x80AC6740.o(.text) + build/asm/overlays/387_0x00cfd400_data.o(.data) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -5645,8 +5645,8 @@ SECTIONS _f388_0x00cfdf10SegmentStart = SegmentStart; f388_0x00cfdf10 : { - build/asm/388_0x00cfdf10_0x80AC8430.o(.text) - build/asm/388_0x00cfdf10_data.o(.data) + build/asm/overlays/388_0x00cfdf10_0x80AC8430.o(.text) + build/asm/overlays/388_0x00cfdf10_data.o(.data) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -5657,8 +5657,8 @@ SECTIONS _f389_0x00cfe150SegmentStart = SegmentStart; f389_0x00cfe150 : { - build/asm/389_0x00cfe150_0x80AC86F0.o(.text) - build/asm/389_0x00cfe150_data.o(.data) + build/asm/overlays/389_0x00cfe150_0x80AC86F0.o(.text) + build/asm/overlays/389_0x00cfe150_data.o(.data) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -5669,8 +5669,8 @@ SECTIONS _ovl_Effect_Ss_SbnSegmentStart = SegmentStart; ovl_Effect_Ss_Sbn : AT(RomLocation) { - build/asm/ovl_Effect_Ss_Sbn_0x80AC8B50.o(.text) - build/asm/ovl_Effect_Ss_Sbn_data.o(.data) + build/asm/overlays/ovl_Effect_Ss_Sbn_0x80AC8B50.o(.text) + build/asm/overlays/ovl_Effect_Ss_Sbn_data.o(.data) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -5682,9 +5682,9 @@ SECTIONS ovl_Obj_Ocarinalift : AT(RomLocation) { build/src/overlays/actors/ovl_Obj_Ocarinalift/z_obj_ocarinalift.o(.text) - build/asm/ovl_Obj_Ocarinalift_data.o(.data) + build/asm/overlays/ovl_Obj_Ocarinalift_data.o(.data) build/src/overlays/actors/ovl_Obj_Ocarinalift/z_obj_ocarinalift.o(.rodata) - build/asm/ovl_Obj_Ocarinalift_rodata.o(.rodata) + build/asm/overlays/ovl_Obj_Ocarinalift_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -5696,9 +5696,9 @@ SECTIONS ovl_En_Time_Tag : AT(RomLocation) { build/src/overlays/actors/ovl_En_Time_Tag/z_en_time_tag.o(.text) - build/asm/ovl_En_Time_Tag_data.o(.data) + build/asm/overlays/ovl_En_Time_Tag_data.o(.data) build/src/overlays/actors/ovl_En_Time_Tag/z_en_time_tag.o(.rodata) - build/asm/ovl_En_Time_Tag_rodata.o(.rodata) + build/asm/overlays/ovl_En_Time_Tag_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -5710,9 +5710,9 @@ SECTIONS ovl_Bg_Open_Shutter : AT(RomLocation) { build/src/overlays/actors/ovl_Bg_Open_Shutter/z_bg_open_shutter.o(.text) - build/asm/ovl_Bg_Open_Shutter_data.o(.data) + build/asm/overlays/ovl_Bg_Open_Shutter_data.o(.data) build/src/overlays/actors/ovl_Bg_Open_Shutter/z_bg_open_shutter.o(.rodata) - build/asm/ovl_Bg_Open_Shutter_rodata.o(.rodata) + build/asm/overlays/ovl_Bg_Open_Shutter_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -5724,9 +5724,9 @@ SECTIONS ovl_Bg_Open_Spot : AT(RomLocation) { build/src/overlays/actors/ovl_Bg_Open_Spot/z_bg_open_spot.o(.text) - build/asm/ovl_Bg_Open_Spot_data.o(.data) + build/asm/overlays/ovl_Bg_Open_Spot_data.o(.data) build/src/overlays/actors/ovl_Bg_Open_Spot/z_bg_open_spot.o(.rodata) - build/asm/ovl_Bg_Open_Spot_rodata.o(.rodata) + build/asm/overlays/ovl_Bg_Open_Spot_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -5753,9 +5753,9 @@ SECTIONS ovl_Obj_Aqua : AT(RomLocation) { build/src/overlays/actors/ovl_Obj_Aqua/z_obj_aqua.o(.text) - build/asm/ovl_Obj_Aqua_data.o(.data) + build/asm/overlays/ovl_Obj_Aqua_data.o(.data) build/src/overlays/actors/ovl_Obj_Aqua/z_obj_aqua.o(.rodata) - build/asm/ovl_Obj_Aqua_rodata.o(.rodata) + build/asm/overlays/ovl_Obj_Aqua_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -5767,9 +5767,9 @@ SECTIONS ovl_En_Elforg : AT(RomLocation) { build/src/overlays/actors/ovl_En_Elforg/z_en_elforg.o(.text) - build/asm/ovl_En_Elforg_data.o(.data) + build/asm/overlays/ovl_En_Elforg_data.o(.data) build/src/overlays/actors/ovl_En_Elforg/z_en_elforg.o(.rodata) - build/asm/ovl_En_Elforg_rodata.o(.rodata) + build/asm/overlays/ovl_En_Elforg_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -5781,9 +5781,9 @@ SECTIONS ovl_En_Elfbub : AT(RomLocation) { build/src/overlays/actors/ovl_En_Elfbub/z_en_elfbub.o(.text) - build/asm/ovl_En_Elfbub_data.o(.data) + build/asm/overlays/ovl_En_Elfbub_data.o(.data) build/src/overlays/actors/ovl_En_Elfbub/z_en_elfbub.o(.rodata) - build/asm/ovl_En_Elfbub_rodata.o(.rodata) + build/asm/overlays/ovl_En_Elfbub_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -5795,9 +5795,9 @@ SECTIONS ovl_En_Fu_Mato : AT(RomLocation) { build/src/overlays/actors/ovl_En_Fu_Mato/z_en_fu_mato.o(.text) - build/asm/ovl_En_Fu_Mato_data.o(.data) + build/asm/overlays/ovl_En_Fu_Mato_data.o(.data) build/src/overlays/actors/ovl_En_Fu_Mato/z_en_fu_mato.o(.rodata) - build/asm/ovl_En_Fu_Mato_rodata.o(.rodata) + build/asm/overlays/ovl_En_Fu_Mato_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -5809,9 +5809,9 @@ SECTIONS ovl_En_Fu_Kago : AT(RomLocation) { build/src/overlays/actors/ovl_En_Fu_Kago/z_en_fu_kago.o(.text) - build/asm/ovl_En_Fu_Kago_data.o(.data) + build/asm/overlays/ovl_En_Fu_Kago_data.o(.data) build/src/overlays/actors/ovl_En_Fu_Kago/z_en_fu_kago.o(.rodata) - build/asm/ovl_En_Fu_Kago_rodata.o(.rodata) + build/asm/overlays/ovl_En_Fu_Kago_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -5823,9 +5823,9 @@ SECTIONS ovl_En_Osn : AT(RomLocation) { build/src/overlays/actors/ovl_En_Osn/z_en_osn.o(.text) - build/asm/ovl_En_Osn_data.o(.data) + build/asm/overlays/ovl_En_Osn_data.o(.data) build/src/overlays/actors/ovl_En_Osn/z_en_osn.o(.rodata) - build/asm/ovl_En_Osn_rodata.o(.rodata) + build/asm/overlays/ovl_En_Osn_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -5837,9 +5837,9 @@ SECTIONS ovl_Bg_Ctower_Gear : AT(RomLocation) { build/src/overlays/actors/ovl_Bg_Ctower_Gear/z_bg_ctower_gear.o(.text) - build/asm/ovl_Bg_Ctower_Gear_data.o(.data) + build/asm/overlays/ovl_Bg_Ctower_Gear_data.o(.data) build/src/overlays/actors/ovl_Bg_Ctower_Gear/z_bg_ctower_gear.o(.rodata) - build/asm/ovl_Bg_Ctower_Gear_rodata.o(.rodata) + build/asm/overlays/ovl_Bg_Ctower_Gear_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -5851,9 +5851,9 @@ SECTIONS ovl_En_Trt2 : AT(RomLocation) { build/src/overlays/actors/ovl_En_Trt2/z_en_trt2.o(.text) - build/asm/ovl_En_Trt2_data.o(.data) + build/asm/overlays/ovl_En_Trt2_data.o(.data) build/src/overlays/actors/ovl_En_Trt2/z_en_trt2.o(.rodata) - build/asm/ovl_En_Trt2_rodata.o(.rodata) + build/asm/overlays/ovl_En_Trt2_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -5865,9 +5865,9 @@ SECTIONS ovl_Obj_Tokei_Step : AT(RomLocation) { build/src/overlays/actors/ovl_Obj_Tokei_Step/z_obj_tokei_step.o(.text) - build/asm/ovl_Obj_Tokei_Step_data.o(.data) + build/asm/overlays/ovl_Obj_Tokei_Step_data.o(.data) build/src/overlays/actors/ovl_Obj_Tokei_Step/z_obj_tokei_step.o(.rodata) - build/asm/ovl_Obj_Tokei_Step_rodata.o(.rodata) + build/asm/overlays/ovl_Obj_Tokei_Step_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -5879,9 +5879,9 @@ SECTIONS ovl_Bg_Lotus : AT(RomLocation) { build/src/overlays/actors/ovl_Bg_Lotus/z_bg_lotus.o(.text) - build/asm/ovl_Bg_Lotus_data.o(.data) + build/asm/overlays/ovl_Bg_Lotus_data.o(.data) build/src/overlays/actors/ovl_Bg_Lotus/z_bg_lotus.o(.rodata) - build/asm/ovl_Bg_Lotus_rodata.o(.rodata) + build/asm/overlays/ovl_Bg_Lotus_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -5893,9 +5893,9 @@ SECTIONS ovl_En_Kame : AT(RomLocation) { build/src/overlays/actors/ovl_En_Kame/z_en_kame.o(.text) - build/asm/ovl_En_Kame_data.o(.data) + build/asm/overlays/ovl_En_Kame_data.o(.data) build/src/overlays/actors/ovl_En_Kame/z_en_kame.o(.rodata) - build/asm/ovl_En_Kame_rodata.o(.rodata) + build/asm/overlays/ovl_En_Kame_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -5907,9 +5907,9 @@ SECTIONS ovl_Obj_Takaraya_Wall : AT(RomLocation) { build/src/overlays/actors/ovl_Obj_Takaraya_Wall/z_obj_takaraya_wall.o(.text) - build/asm/ovl_Obj_Takaraya_Wall_data.o(.data) + build/asm/overlays/ovl_Obj_Takaraya_Wall_data.o(.data) build/src/overlays/actors/ovl_Obj_Takaraya_Wall/z_obj_takaraya_wall.o(.rodata) - build/asm/ovl_Obj_Takaraya_Wall_rodata.o(.rodata) + build/asm/overlays/ovl_Obj_Takaraya_Wall_rodata.o(.rodata) ovl_Obj_Takaraya_Wall_bss_start = .; } . += 0x6A0; @@ -5923,9 +5923,9 @@ SECTIONS ovl_Bg_Fu_Mizu : AT(RomLocation) { build/src/overlays/actors/ovl_Bg_Fu_Mizu/z_bg_fu_mizu.o(.text) - build/asm/ovl_Bg_Fu_Mizu_data.o(.data) + build/asm/overlays/ovl_Bg_Fu_Mizu_data.o(.data) build/src/overlays/actors/ovl_Bg_Fu_Mizu/z_bg_fu_mizu.o(.rodata) - build/asm/ovl_Bg_Fu_Mizu_rodata.o(.rodata) + build/asm/overlays/ovl_Bg_Fu_Mizu_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -5937,9 +5937,9 @@ SECTIONS ovl_En_Sellnuts : AT(RomLocation) { build/src/overlays/actors/ovl_En_Sellnuts/z_en_sellnuts.o(.text) - build/asm/ovl_En_Sellnuts_data.o(.data) + build/asm/overlays/ovl_En_Sellnuts_data.o(.data) build/src/overlays/actors/ovl_En_Sellnuts/z_en_sellnuts.o(.rodata) - build/asm/ovl_En_Sellnuts_rodata.o(.rodata) + build/asm/overlays/ovl_En_Sellnuts_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -5951,9 +5951,9 @@ SECTIONS ovl_Bg_Dkjail_Ivy : AT(RomLocation) { build/src/overlays/actors/ovl_Bg_Dkjail_Ivy/z_bg_dkjail_ivy.o(.text) - build/asm/ovl_Bg_Dkjail_Ivy_data.o(.data) + build/asm/overlays/ovl_Bg_Dkjail_Ivy_data.o(.data) build/src/overlays/actors/ovl_Bg_Dkjail_Ivy/z_bg_dkjail_ivy.o(.rodata) - build/asm/ovl_Bg_Dkjail_Ivy_rodata.o(.rodata) + build/asm/overlays/ovl_Bg_Dkjail_Ivy_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -5965,9 +5965,9 @@ SECTIONS ovl_Obj_Visiblock : AT(RomLocation) { build/src/overlays/actors/ovl_Obj_Visiblock/z_obj_visiblock.o(.text) - build/asm/ovl_Obj_Visiblock_data.o(.data) + build/asm/overlays/ovl_Obj_Visiblock_data.o(.data) build/src/overlays/actors/ovl_Obj_Visiblock/z_obj_visiblock.o(.rodata) - build/asm/ovl_Obj_Visiblock_rodata.o(.rodata) + build/asm/overlays/ovl_Obj_Visiblock_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -5979,9 +5979,9 @@ SECTIONS ovl_En_Takaraya : AT(RomLocation) { build/src/overlays/actors/ovl_En_Takaraya/z_en_takaraya.o(.text) - build/asm/ovl_En_Takaraya_data.o(.data) + build/asm/overlays/ovl_En_Takaraya_data.o(.data) build/src/overlays/actors/ovl_En_Takaraya/z_en_takaraya.o(.rodata) - build/asm/ovl_En_Takaraya_rodata.o(.rodata) + build/asm/overlays/ovl_En_Takaraya_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -5993,9 +5993,9 @@ SECTIONS ovl_En_Tsn : AT(RomLocation) { build/src/overlays/actors/ovl_En_Tsn/z_en_tsn.o(.text) - build/asm/ovl_En_Tsn_data.o(.data) + build/asm/overlays/ovl_En_Tsn_data.o(.data) build/src/overlays/actors/ovl_En_Tsn/z_en_tsn.o(.rodata) - build/asm/ovl_En_Tsn_rodata.o(.rodata) + build/asm/overlays/ovl_En_Tsn_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -6007,9 +6007,9 @@ SECTIONS ovl_En_Ds2n : AT(RomLocation) { build/src/overlays/actors/ovl_En_Ds2n/z_en_ds2n.o(.text) - build/asm/ovl_En_Ds2n_data.o(.data) + build/asm/overlays/ovl_En_Ds2n_data.o(.data) build/src/overlays/actors/ovl_En_Ds2n/z_en_ds2n.o(.rodata) - build/asm/ovl_En_Ds2n_rodata.o(.rodata) + build/asm/overlays/ovl_En_Ds2n_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -6021,9 +6021,9 @@ SECTIONS ovl_En_Fsn : AT(RomLocation) { build/src/overlays/actors/ovl_En_Fsn/z_en_fsn.o(.text) - build/asm/ovl_En_Fsn_data.o(.data) + build/asm/overlays/ovl_En_Fsn_data.o(.data) build/src/overlays/actors/ovl_En_Fsn/z_en_fsn.o(.rodata) - build/asm/ovl_En_Fsn_rodata.o(.rodata) + build/asm/overlays/ovl_En_Fsn_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -6035,9 +6035,9 @@ SECTIONS ovl_En_Shn : AT(RomLocation) { build/src/overlays/actors/ovl_En_Shn/z_en_shn.o(.text) - build/asm/ovl_En_Shn_data.o(.data) + build/asm/overlays/ovl_En_Shn_data.o(.data) build/src/overlays/actors/ovl_En_Shn/z_en_shn.o(.rodata) - build/asm/ovl_En_Shn_rodata.o(.rodata) + build/asm/overlays/ovl_En_Shn_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -6049,9 +6049,9 @@ SECTIONS ovl_En_Stop_heishi : AT(RomLocation) { build/src/overlays/actors/ovl_En_Stop_heishi/z_en_stop_heishi.o(.text) - build/asm/ovl_En_Stop_heishi_data.o(.data) + build/asm/overlays/ovl_En_Stop_heishi_data.o(.data) build/src/overlays/actors/ovl_En_Stop_heishi/z_en_stop_heishi.o(.rodata) - build/asm/ovl_En_Stop_heishi_rodata.o(.rodata) + build/asm/overlays/ovl_En_Stop_heishi_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -6063,9 +6063,9 @@ SECTIONS ovl_Obj_Bigicicle : AT(RomLocation) { build/src/overlays/actors/ovl_Obj_Bigicicle/z_obj_bigicicle.o(.text) - build/asm/ovl_Obj_Bigicicle_data.o(.data) + build/asm/overlays/ovl_Obj_Bigicicle_data.o(.data) build/src/overlays/actors/ovl_Obj_Bigicicle/z_obj_bigicicle.o(.rodata) - build/asm/ovl_Obj_Bigicicle_rodata.o(.rodata) + build/asm/overlays/ovl_Obj_Bigicicle_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -6077,9 +6077,9 @@ SECTIONS ovl_En_Lift_Nuts : AT(RomLocation) { build/src/overlays/actors/ovl_En_Lift_Nuts/z_en_lift_nuts.o(.text) - build/asm/ovl_En_Lift_Nuts_data.o(.data) + build/asm/overlays/ovl_En_Lift_Nuts_data.o(.data) build/src/overlays/actors/ovl_En_Lift_Nuts/z_en_lift_nuts.o(.rodata) - build/asm/ovl_En_Lift_Nuts_rodata.o(.rodata) + build/asm/overlays/ovl_En_Lift_Nuts_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -6091,9 +6091,9 @@ SECTIONS ovl_En_Tk : AT(RomLocation) { build/src/overlays/actors/ovl_En_Tk/z_en_tk.o(.text) - build/asm/ovl_En_Tk_data.o(.data) + build/asm/overlays/ovl_En_Tk_data.o(.data) build/src/overlays/actors/ovl_En_Tk/z_en_tk.o(.rodata) - build/asm/ovl_En_Tk_rodata.o(.rodata) + build/asm/overlays/ovl_En_Tk_rodata.o(.rodata) ovl_En_Tk_bss_start = .; } . += 0x10; @@ -6122,9 +6122,9 @@ SECTIONS ovl_Obj_Lupygamelift : AT(RomLocation) { build/src/overlays/actors/ovl_Obj_Lupygamelift/z_obj_lupygamelift.o(.text) - build/asm/ovl_Obj_Lupygamelift_data.o(.data) + build/asm/overlays/ovl_Obj_Lupygamelift_data.o(.data) build/src/overlays/actors/ovl_Obj_Lupygamelift/z_obj_lupygamelift.o(.rodata) - build/asm/ovl_Obj_Lupygamelift_rodata.o(.rodata) + build/asm/overlays/ovl_Obj_Lupygamelift_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -6136,9 +6136,9 @@ SECTIONS ovl_En_Test7 : AT(RomLocation) { build/src/overlays/actors/ovl_En_Test7/z_en_test7.o(.text) - build/asm/ovl_En_Test7_data.o(.data) + build/asm/overlays/ovl_En_Test7_data.o(.data) build/src/overlays/actors/ovl_En_Test7/z_en_test7.o(.rodata) - build/asm/ovl_En_Test7_rodata.o(.rodata) + build/asm/overlays/ovl_En_Test7_rodata.o(.rodata) ovl_En_Test7_bss_start = .; } . += 0x60; @@ -6152,9 +6152,9 @@ SECTIONS ovl_Obj_Lightblock : AT(RomLocation) { build/src/overlays/actors/ovl_Obj_Lightblock/z_obj_lightblock.o(.text) - build/asm/ovl_Obj_Lightblock_data.o(.data) + build/asm/overlays/ovl_Obj_Lightblock_data.o(.data) build/src/overlays/actors/ovl_Obj_Lightblock/z_obj_lightblock.o(.rodata) - build/asm/ovl_Obj_Lightblock_rodata.o(.rodata) + build/asm/overlays/ovl_Obj_Lightblock_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -6166,9 +6166,9 @@ SECTIONS ovl_Mir_Ray2 : AT(RomLocation) { build/src/overlays/actors/ovl_Mir_Ray2/z_mir_ray2.o(.text) - build/asm/ovl_Mir_Ray2_data.o(.data) + build/asm/overlays/ovl_Mir_Ray2_data.o(.data) build/src/overlays/actors/ovl_Mir_Ray2/z_mir_ray2.o(.rodata) - build/asm/ovl_Mir_Ray2_rodata.o(.rodata) + build/asm/overlays/ovl_Mir_Ray2_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -6180,9 +6180,9 @@ SECTIONS ovl_En_Wdhand : AT(RomLocation) { build/src/overlays/actors/ovl_En_Wdhand/z_en_wdhand.o(.text) - build/asm/ovl_En_Wdhand_data.o(.data) + build/asm/overlays/ovl_En_Wdhand_data.o(.data) build/src/overlays/actors/ovl_En_Wdhand/z_en_wdhand.o(.rodata) - build/asm/ovl_En_Wdhand_rodata.o(.rodata) + build/asm/overlays/ovl_En_Wdhand_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -6194,9 +6194,9 @@ SECTIONS ovl_En_Gamelupy : AT(RomLocation) { build/src/overlays/actors/ovl_En_Gamelupy/z_en_gamelupy.o(.text) - build/asm/ovl_En_Gamelupy_data.o(.data) + build/asm/overlays/ovl_En_Gamelupy_data.o(.data) build/src/overlays/actors/ovl_En_Gamelupy/z_en_gamelupy.o(.rodata) - build/asm/ovl_En_Gamelupy_rodata.o(.rodata) + build/asm/overlays/ovl_En_Gamelupy_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -6208,9 +6208,9 @@ SECTIONS ovl_Bg_Danpei_Movebg : AT(RomLocation) { build/src/overlays/actors/ovl_Bg_Danpei_Movebg/z_bg_danpei_movebg.o(.text) - build/asm/ovl_Bg_Danpei_Movebg_data.o(.data) + build/asm/overlays/ovl_Bg_Danpei_Movebg_data.o(.data) build/src/overlays/actors/ovl_Bg_Danpei_Movebg/z_bg_danpei_movebg.o(.rodata) - build/asm/ovl_Bg_Danpei_Movebg_rodata.o(.rodata) + build/asm/overlays/ovl_Bg_Danpei_Movebg_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -6222,9 +6222,9 @@ SECTIONS ovl_En_Snowwd : AT(RomLocation) { build/src/overlays/actors/ovl_En_Snowwd/z_en_snowwd.o(.text) - build/asm/ovl_En_Snowwd_data.o(.data) + build/asm/overlays/ovl_En_Snowwd_data.o(.data) build/src/overlays/actors/ovl_En_Snowwd/z_en_snowwd.o(.rodata) - build/asm/ovl_En_Snowwd_rodata.o(.rodata) + build/asm/overlays/ovl_En_Snowwd_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -6236,9 +6236,9 @@ SECTIONS ovl_En_Pm : AT(RomLocation) { build/src/overlays/actors/ovl_En_Pm/z_en_pm.o(.text) - build/asm/ovl_En_Pm_data.o(.data) + build/asm/overlays/ovl_En_Pm_data.o(.data) build/src/overlays/actors/ovl_En_Pm/z_en_pm.o(.rodata) - build/asm/ovl_En_Pm_rodata.o(.rodata) + build/asm/overlays/ovl_En_Pm_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -6250,9 +6250,9 @@ SECTIONS ovl_En_Gakufu : AT(RomLocation) { build/src/overlays/actors/ovl_En_Gakufu/z_en_gakufu.o(.text) - build/asm/ovl_En_Gakufu_data.o(.data) + build/asm/overlays/ovl_En_Gakufu_data.o(.data) build/src/overlays/actors/ovl_En_Gakufu/z_en_gakufu.o(.rodata) - build/asm/ovl_En_Gakufu_rodata.o(.rodata) + build/asm/overlays/ovl_En_Gakufu_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -6264,10 +6264,10 @@ SECTIONS ovl_Elf_Msg4 : AT(RomLocation) { build/src/overlays/actors/ovl_Elf_Msg4/z_elf_msg4.o(.text) - build/asm/ovl_Elf_Msg4_data.o(.data) + build/asm/overlays/ovl_Elf_Msg4_data.o(.data) build/src/overlays/actors/ovl_Elf_Msg4/z_elf_msg4.o(.rodata) - build/asm/ovl_Elf_Msg4_rodata.o(.rodata) - build/asm/ovl_Elf_Msg4_late_rodata.o(.rodata) + build/asm/overlays/ovl_Elf_Msg4_rodata.o(.rodata) + build/asm/overlays/ovl_Elf_Msg4_late_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -6279,8 +6279,8 @@ SECTIONS ovl_Elf_Msg5 : AT(RomLocation) { build/src/overlays/actors/ovl_Elf_Msg5/z_elf_msg5.o(.text) - build/asm/ovl_Elf_Msg5_data.o(.data) - build/asm/ovl_Elf_Msg5_rodata.o(.rodata) + build/asm/overlays/ovl_Elf_Msg5_data.o(.data) + build/asm/overlays/ovl_Elf_Msg5_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -6292,9 +6292,9 @@ SECTIONS ovl_En_Col_Man : AT(RomLocation) { build/src/overlays/actors/ovl_En_Col_Man/z_en_col_man.o(.text) - build/asm/ovl_En_Col_Man_data.o(.data) + build/asm/overlays/ovl_En_Col_Man_data.o(.data) build/src/overlays/actors/ovl_En_Col_Man/z_en_col_man.o(.rodata) - build/asm/ovl_En_Col_Man_rodata.o(.rodata) + build/asm/overlays/ovl_En_Col_Man_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -6306,9 +6306,9 @@ SECTIONS ovl_En_Talk_Gibud : AT(RomLocation) { build/src/overlays/actors/ovl_En_Talk_Gibud/z_en_talk_gibud.o(.text) - build/asm/ovl_En_Talk_Gibud_data.o(.data) + build/asm/overlays/ovl_En_Talk_Gibud_data.o(.data) build/src/overlays/actors/ovl_En_Talk_Gibud/z_en_talk_gibud.o(.rodata) - build/asm/ovl_En_Talk_Gibud_rodata.o(.rodata) + build/asm/overlays/ovl_En_Talk_Gibud_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -6320,9 +6320,9 @@ SECTIONS ovl_En_Giant : AT(RomLocation) { build/src/overlays/actors/ovl_En_Giant/z_en_giant.o(.text) - build/asm/ovl_En_Giant_data.o(.data) + build/asm/overlays/ovl_En_Giant_data.o(.data) build/src/overlays/actors/ovl_En_Giant/z_en_giant.o(.rodata) - build/asm/ovl_En_Giant_rodata.o(.rodata) + build/asm/overlays/ovl_En_Giant_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -6334,9 +6334,9 @@ SECTIONS ovl_Obj_Snowball : AT(RomLocation) { build/src/overlays/actors/ovl_Obj_Snowball/z_obj_snowball.o(.text) - build/asm/ovl_Obj_Snowball_data.o(.data) + build/asm/overlays/ovl_Obj_Snowball_data.o(.data) build/src/overlays/actors/ovl_Obj_Snowball/z_obj_snowball.o(.rodata) - build/asm/ovl_Obj_Snowball_rodata.o(.rodata) + build/asm/overlays/ovl_Obj_Snowball_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -6348,9 +6348,9 @@ SECTIONS ovl_Boss_Hakugin : AT(RomLocation) { build/src/overlays/actors/ovl_Boss_Hakugin/z_boss_hakugin.o(.text) - build/asm/ovl_Boss_Hakugin_data.o(.data) + build/asm/overlays/ovl_Boss_Hakugin_data.o(.data) build/src/overlays/actors/ovl_Boss_Hakugin/z_boss_hakugin.o(.rodata) - build/asm/ovl_Boss_Hakugin_rodata.o(.rodata) + build/asm/overlays/ovl_Boss_Hakugin_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -6362,9 +6362,9 @@ SECTIONS ovl_En_Gb2 : AT(RomLocation) { build/src/overlays/actors/ovl_En_Gb2/z_en_gb2.o(.text) - build/asm/ovl_En_Gb2_data.o(.data) + build/asm/overlays/ovl_En_Gb2_data.o(.data) build/src/overlays/actors/ovl_En_Gb2/z_en_gb2.o(.rodata) - build/asm/ovl_En_Gb2_rodata.o(.rodata) + build/asm/overlays/ovl_En_Gb2_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -6376,9 +6376,9 @@ SECTIONS ovl_En_Onpuman : AT(RomLocation) { build/src/overlays/actors/ovl_En_Onpuman/z_en_onpuman.o(.text) - build/asm/ovl_En_Onpuman_data.o(.data) + build/asm/overlays/ovl_En_Onpuman_data.o(.data) build/src/overlays/actors/ovl_En_Onpuman/z_en_onpuman.o(.rodata) - build/asm/ovl_En_Onpuman_rodata.o(.rodata) + build/asm/overlays/ovl_En_Onpuman_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -6390,9 +6390,9 @@ SECTIONS ovl_Bg_Tobira01 : AT(RomLocation) { build/src/overlays/actors/ovl_Bg_Tobira01/z_bg_tobira01.o(.text) - build/asm/ovl_Bg_Tobira01_data.o(.data) + build/asm/overlays/ovl_Bg_Tobira01_data.o(.data) build/src/overlays/actors/ovl_Bg_Tobira01/z_bg_tobira01.o(.rodata) - build/asm/ovl_Bg_Tobira01_rodata.o(.rodata) + build/asm/overlays/ovl_Bg_Tobira01_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -6404,9 +6404,9 @@ SECTIONS ovl_En_Tag_Obj : AT(RomLocation) { build/src/overlays/actors/ovl_En_Tag_Obj/z_en_tag_obj.o(.text) - build/asm/ovl_En_Tag_Obj_data.o(.data) + build/asm/overlays/ovl_En_Tag_Obj_data.o(.data) build/src/overlays/actors/ovl_En_Tag_Obj/z_en_tag_obj.o(.rodata) - build/asm/ovl_En_Tag_Obj_rodata.o(.rodata) + build/asm/overlays/ovl_En_Tag_Obj_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -6418,9 +6418,9 @@ SECTIONS ovl_Obj_Dhouse : AT(RomLocation) { build/src/overlays/actors/ovl_Obj_Dhouse/z_obj_dhouse.o(.text) - build/asm/ovl_Obj_Dhouse_data.o(.data) + build/asm/overlays/ovl_Obj_Dhouse_data.o(.data) build/src/overlays/actors/ovl_Obj_Dhouse/z_obj_dhouse.o(.rodata) - build/asm/ovl_Obj_Dhouse_rodata.o(.rodata) + build/asm/overlays/ovl_Obj_Dhouse_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -6432,9 +6432,9 @@ SECTIONS ovl_Obj_Hakaisi : AT(RomLocation) { build/src/overlays/actors/ovl_Obj_Hakaisi/z_obj_hakaisi.o(.text) - build/asm/ovl_Obj_Hakaisi_data.o(.data) + build/asm/overlays/ovl_Obj_Hakaisi_data.o(.data) build/src/overlays/actors/ovl_Obj_Hakaisi/z_obj_hakaisi.o(.rodata) - build/asm/ovl_Obj_Hakaisi_rodata.o(.rodata) + build/asm/overlays/ovl_Obj_Hakaisi_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -6446,9 +6446,9 @@ SECTIONS ovl_Bg_Hakugin_Switch : AT(RomLocation) { build/src/overlays/actors/ovl_Bg_Hakugin_Switch/z_bg_hakugin_switch.o(.text) - build/asm/ovl_Bg_Hakugin_Switch_data.o(.data) + build/asm/overlays/ovl_Bg_Hakugin_Switch_data.o(.data) build/src/overlays/actors/ovl_Bg_Hakugin_Switch/z_bg_hakugin_switch.o(.rodata) - build/asm/ovl_Bg_Hakugin_Switch_rodata.o(.rodata) + build/asm/overlays/ovl_Bg_Hakugin_Switch_rodata.o(.rodata) ovl_Bg_Hakugin_Switch_bss_start = .; } . += 0x10; @@ -6462,9 +6462,9 @@ SECTIONS ovl_En_Snowman : AT(RomLocation) { build/src/overlays/actors/ovl_En_Snowman/z_en_snowman.o(.text) - build/asm/ovl_En_Snowman_data.o(.data) + build/asm/overlays/ovl_En_Snowman_data.o(.data) build/src/overlays/actors/ovl_En_Snowman/z_en_snowman.o(.rodata) - build/asm/ovl_En_Snowman_rodata.o(.rodata) + build/asm/overlays/ovl_En_Snowman_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -6491,9 +6491,9 @@ SECTIONS ovl_En_Po_Sisters : AT(RomLocation) { build/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.o(.text) - build/asm/ovl_En_Po_Sisters_data.o(.data) + build/asm/overlays/ovl_En_Po_Sisters_data.o(.data) build/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.o(.rodata) - build/asm/ovl_En_Po_Sisters_rodata.o(.rodata) + build/asm/overlays/ovl_En_Po_Sisters_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -6505,9 +6505,9 @@ SECTIONS ovl_En_Pp : AT(RomLocation) { build/src/overlays/actors/ovl_En_Pp/z_en_pp.o(.text) - build/asm/ovl_En_Pp_data.o(.data) + build/asm/overlays/ovl_En_Pp_data.o(.data) build/src/overlays/actors/ovl_En_Pp/z_en_pp.o(.rodata) - build/asm/ovl_En_Pp_rodata.o(.rodata) + build/asm/overlays/ovl_En_Pp_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -6519,9 +6519,9 @@ SECTIONS ovl_En_Hakurock : AT(RomLocation) { build/src/overlays/actors/ovl_En_Hakurock/z_en_hakurock.o(.text) - build/asm/ovl_En_Hakurock_data.o(.data) + build/asm/overlays/ovl_En_Hakurock_data.o(.data) build/src/overlays/actors/ovl_En_Hakurock/z_en_hakurock.o(.rodata) - build/asm/ovl_En_Hakurock_rodata.o(.rodata) + build/asm/overlays/ovl_En_Hakurock_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -6533,9 +6533,9 @@ SECTIONS ovl_En_Hanabi : AT(RomLocation) { build/src/overlays/actors/ovl_En_Hanabi/z_en_hanabi.o(.text) - build/asm/ovl_En_Hanabi_data.o(.data) + build/asm/overlays/ovl_En_Hanabi_data.o(.data) build/src/overlays/actors/ovl_En_Hanabi/z_en_hanabi.o(.rodata) - build/asm/ovl_En_Hanabi_rodata.o(.rodata) + build/asm/overlays/ovl_En_Hanabi_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -6547,9 +6547,9 @@ SECTIONS ovl_Obj_Dowsing : AT(RomLocation) { build/src/overlays/actors/ovl_Obj_Dowsing/z_obj_dowsing.o(.text) - build/asm/ovl_Obj_Dowsing_data.o(.data) + build/asm/overlays/ovl_Obj_Dowsing_data.o(.data) build/src/overlays/actors/ovl_Obj_Dowsing/z_obj_dowsing.o(.rodata) - build/asm/ovl_Obj_Dowsing_rodata.o(.rodata) + build/asm/overlays/ovl_Obj_Dowsing_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -6561,9 +6561,9 @@ SECTIONS ovl_Obj_Wind : AT(RomLocation) { build/src/overlays/actors/ovl_Obj_Wind/z_obj_wind.o(.text) - build/asm/ovl_Obj_Wind_data.o(.data) + build/asm/overlays/ovl_Obj_Wind_data.o(.data) build/src/overlays/actors/ovl_Obj_Wind/z_obj_wind.o(.rodata) - build/asm/ovl_Obj_Wind_rodata.o(.rodata) + build/asm/overlays/ovl_Obj_Wind_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -6575,9 +6575,9 @@ SECTIONS ovl_En_Racedog : AT(RomLocation) { build/src/overlays/actors/ovl_En_Racedog/z_en_racedog.o(.text) - build/asm/ovl_En_Racedog_data.o(.data) + build/asm/overlays/ovl_En_Racedog_data.o(.data) build/src/overlays/actors/ovl_En_Racedog/z_en_racedog.o(.rodata) - build/asm/ovl_En_Racedog_rodata.o(.rodata) + build/asm/overlays/ovl_En_Racedog_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -6589,9 +6589,9 @@ SECTIONS ovl_En_Kendo_Js : AT(RomLocation) { build/src/overlays/actors/ovl_En_Kendo_Js/z_en_kendo_js.o(.text) - build/asm/ovl_En_Kendo_Js_data.o(.data) + build/asm/overlays/ovl_En_Kendo_Js_data.o(.data) build/src/overlays/actors/ovl_En_Kendo_Js/z_en_kendo_js.o(.rodata) - build/asm/ovl_En_Kendo_Js_rodata.o(.rodata) + build/asm/overlays/ovl_En_Kendo_Js_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -6603,9 +6603,9 @@ SECTIONS ovl_Bg_Botihasira : AT(RomLocation) { build/src/overlays/actors/ovl_Bg_Botihasira/z_bg_botihasira.o(.text) - build/asm/ovl_Bg_Botihasira_data.o(.data) + build/asm/overlays/ovl_Bg_Botihasira_data.o(.data) build/src/overlays/actors/ovl_Bg_Botihasira/z_bg_botihasira.o(.rodata) - build/asm/ovl_Bg_Botihasira_rodata.o(.rodata) + build/asm/overlays/ovl_Bg_Botihasira_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -6617,9 +6617,9 @@ SECTIONS ovl_En_Fish2 : AT(RomLocation) { build/src/overlays/actors/ovl_En_Fish2/z_en_fish2.o(.text) - build/asm/ovl_En_Fish2_data.o(.data) + build/asm/overlays/ovl_En_Fish2_data.o(.data) build/src/overlays/actors/ovl_En_Fish2/z_en_fish2.o(.rodata) - build/asm/ovl_En_Fish2_rodata.o(.rodata) + build/asm/overlays/ovl_En_Fish2_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -6631,9 +6631,9 @@ SECTIONS ovl_En_Pst : AT(RomLocation) { build/src/overlays/actors/ovl_En_Pst/z_en_pst.o(.text) - build/asm/ovl_En_Pst_data.o(.data) + build/asm/overlays/ovl_En_Pst_data.o(.data) build/src/overlays/actors/ovl_En_Pst/z_en_pst.o(.rodata) - build/asm/ovl_En_Pst_rodata.o(.rodata) + build/asm/overlays/ovl_En_Pst_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -6645,9 +6645,9 @@ SECTIONS ovl_En_Poh : AT(RomLocation) { build/src/overlays/actors/ovl_En_Poh/z_en_poh.o(.text) - build/asm/ovl_En_Poh_data.o(.data) + build/asm/overlays/ovl_En_Poh_data.o(.data) build/src/overlays/actors/ovl_En_Poh/z_en_poh.o(.rodata) - build/asm/ovl_En_Poh_rodata.o(.rodata) + build/asm/overlays/ovl_En_Poh_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -6659,9 +6659,9 @@ SECTIONS ovl_Obj_Spidertent : AT(RomLocation) { build/src/overlays/actors/ovl_Obj_Spidertent/z_obj_spidertent.o(.text) - build/asm/ovl_Obj_Spidertent_data.o(.data) + build/asm/overlays/ovl_Obj_Spidertent_data.o(.data) build/src/overlays/actors/ovl_Obj_Spidertent/z_obj_spidertent.o(.rodata) - build/asm/ovl_Obj_Spidertent_rodata.o(.rodata) + build/asm/overlays/ovl_Obj_Spidertent_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -6673,9 +6673,9 @@ SECTIONS ovl_En_Zoraegg : AT(RomLocation) { build/src/overlays/actors/ovl_En_Zoraegg/z_en_zoraegg.o(.text) - build/asm/ovl_En_Zoraegg_data.o(.data) + build/asm/overlays/ovl_En_Zoraegg_data.o(.data) build/src/overlays/actors/ovl_En_Zoraegg/z_en_zoraegg.o(.rodata) - build/asm/ovl_En_Zoraegg_rodata.o(.rodata) + build/asm/overlays/ovl_En_Zoraegg_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -6687,9 +6687,9 @@ SECTIONS ovl_En_Kbt : AT(RomLocation) { build/src/overlays/actors/ovl_En_Kbt/z_en_kbt.o(.text) - build/asm/ovl_En_Kbt_data.o(.data) + build/asm/overlays/ovl_En_Kbt_data.o(.data) build/src/overlays/actors/ovl_En_Kbt/z_en_kbt.o(.rodata) - build/asm/ovl_En_Kbt_rodata.o(.rodata) + build/asm/overlays/ovl_En_Kbt_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -6701,9 +6701,9 @@ SECTIONS ovl_En_Gg : AT(RomLocation) { build/src/overlays/actors/ovl_En_Gg/z_en_gg.o(.text) - build/asm/ovl_En_Gg_data.o(.data) + build/asm/overlays/ovl_En_Gg_data.o(.data) build/src/overlays/actors/ovl_En_Gg/z_en_gg.o(.rodata) - build/asm/ovl_En_Gg_rodata.o(.rodata) + build/asm/overlays/ovl_En_Gg_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -6715,9 +6715,9 @@ SECTIONS ovl_En_Maruta : AT(RomLocation) { build/src/overlays/actors/ovl_En_Maruta/z_en_maruta.o(.text) - build/asm/ovl_En_Maruta_data.o(.data) + build/asm/overlays/ovl_En_Maruta_data.o(.data) build/src/overlays/actors/ovl_En_Maruta/z_en_maruta.o(.rodata) - build/asm/ovl_En_Maruta_rodata.o(.rodata) + build/asm/overlays/ovl_En_Maruta_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -6729,9 +6729,9 @@ SECTIONS ovl_Obj_Snowball2 : AT(RomLocation) { build/src/overlays/actors/ovl_Obj_Snowball2/z_obj_snowball2.o(.text) - build/asm/ovl_Obj_Snowball2_data.o(.data) + build/asm/overlays/ovl_Obj_Snowball2_data.o(.data) build/src/overlays/actors/ovl_Obj_Snowball2/z_obj_snowball2.o(.rodata) - build/asm/ovl_Obj_Snowball2_rodata.o(.rodata) + build/asm/overlays/ovl_Obj_Snowball2_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -6743,9 +6743,9 @@ SECTIONS ovl_En_Gg2 : AT(RomLocation) { build/src/overlays/actors/ovl_En_Gg2/z_en_gg2.o(.text) - build/asm/ovl_En_Gg2_data.o(.data) + build/asm/overlays/ovl_En_Gg2_data.o(.data) build/src/overlays/actors/ovl_En_Gg2/z_en_gg2.o(.rodata) - build/asm/ovl_En_Gg2_rodata.o(.rodata) + build/asm/overlays/ovl_En_Gg2_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -6757,9 +6757,9 @@ SECTIONS ovl_Obj_Ghaka : AT(RomLocation) { build/src/overlays/actors/ovl_Obj_Ghaka/z_obj_ghaka.o(.text) - build/asm/ovl_Obj_Ghaka_data.o(.data) + build/asm/overlays/ovl_Obj_Ghaka_data.o(.data) build/src/overlays/actors/ovl_Obj_Ghaka/z_obj_ghaka.o(.rodata) - build/asm/ovl_Obj_Ghaka_rodata.o(.rodata) + build/asm/overlays/ovl_Obj_Ghaka_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -6771,9 +6771,9 @@ SECTIONS ovl_En_Dnp : AT(RomLocation) { build/src/overlays/actors/ovl_En_Dnp/z_en_dnp.o(.text) - build/asm/ovl_En_Dnp_data.o(.data) + build/asm/overlays/ovl_En_Dnp_data.o(.data) build/src/overlays/actors/ovl_En_Dnp/z_en_dnp.o(.rodata) - build/asm/ovl_En_Dnp_rodata.o(.rodata) + build/asm/overlays/ovl_En_Dnp_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -6785,9 +6785,9 @@ SECTIONS ovl_En_Dai : AT(RomLocation) { build/src/overlays/actors/ovl_En_Dai/z_en_dai.o(.text) - build/asm/ovl_En_Dai_data.o(.data) + build/asm/overlays/ovl_En_Dai_data.o(.data) build/src/overlays/actors/ovl_En_Dai/z_en_dai.o(.rodata) - build/asm/ovl_En_Dai_rodata.o(.rodata) + build/asm/overlays/ovl_En_Dai_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -6799,9 +6799,9 @@ SECTIONS ovl_Bg_Goron_Oyu : AT(RomLocation) { build/src/overlays/actors/ovl_Bg_Goron_Oyu/z_bg_goron_oyu.o(.text) - build/asm/ovl_Bg_Goron_Oyu_data.o(.data) + build/asm/overlays/ovl_Bg_Goron_Oyu_data.o(.data) build/src/overlays/actors/ovl_Bg_Goron_Oyu/z_bg_goron_oyu.o(.rodata) - build/asm/ovl_Bg_Goron_Oyu_rodata.o(.rodata) + build/asm/overlays/ovl_Bg_Goron_Oyu_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -6813,9 +6813,9 @@ SECTIONS ovl_En_Kgy : AT(RomLocation) { build/src/overlays/actors/ovl_En_Kgy/z_en_kgy.o(.text) - build/asm/ovl_En_Kgy_data.o(.data) + build/asm/overlays/ovl_En_Kgy_data.o(.data) build/src/overlays/actors/ovl_En_Kgy/z_en_kgy.o(.rodata) - build/asm/ovl_En_Kgy_rodata.o(.rodata) + build/asm/overlays/ovl_En_Kgy_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -6827,9 +6827,9 @@ SECTIONS ovl_En_Invadepoh : AT(RomLocation) { build/src/overlays/actors/ovl_En_Invadepoh/z_en_invadepoh.o(.text) - build/asm/ovl_En_Invadepoh_data.o(.data) + build/asm/overlays/ovl_En_Invadepoh_data.o(.data) build/src/overlays/actors/ovl_En_Invadepoh/z_en_invadepoh.o(.rodata) - build/asm/ovl_En_Invadepoh_rodata.o(.rodata) + build/asm/overlays/ovl_En_Invadepoh_rodata.o(.rodata) ovl_En_Invadepoh_bss_start = .; } . += 0x170; @@ -6843,9 +6843,9 @@ SECTIONS ovl_En_Gk : AT(RomLocation) { build/src/overlays/actors/ovl_En_Gk/z_en_gk.o(.text) - build/asm/ovl_En_Gk_data.o(.data) + build/asm/overlays/ovl_En_Gk_data.o(.data) build/src/overlays/actors/ovl_En_Gk/z_en_gk.o(.rodata) - build/asm/ovl_En_Gk_rodata.o(.rodata) + build/asm/overlays/ovl_En_Gk_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -6857,9 +6857,9 @@ SECTIONS ovl_En_An : AT(RomLocation) { build/src/overlays/actors/ovl_En_An/z_en_an.o(.text) - build/asm/ovl_En_An_data.o(.data) + build/asm/overlays/ovl_En_An_data.o(.data) build/src/overlays/actors/ovl_En_An/z_en_an.o(.rodata) - build/asm/ovl_En_An_rodata.o(.rodata) + build/asm/overlays/ovl_En_An_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -6871,9 +6871,9 @@ SECTIONS ovl_En_Bee : AT(RomLocation) { build/src/overlays/actors/ovl_En_Bee/z_en_bee.o(.text) - build/asm/ovl_En_Bee_data.o(.data) + build/asm/overlays/ovl_En_Bee_data.o(.data) build/src/overlays/actors/ovl_En_Bee/z_en_bee.o(.rodata) - build/asm/ovl_En_Bee_rodata.o(.rodata) + build/asm/overlays/ovl_En_Bee_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -6885,9 +6885,9 @@ SECTIONS ovl_En_Ot : AT(RomLocation) { build/src/overlays/actors/ovl_En_Ot/z_en_ot.o(.text) - build/asm/ovl_En_Ot_data.o(.data) + build/asm/overlays/ovl_En_Ot_data.o(.data) build/src/overlays/actors/ovl_En_Ot/z_en_ot.o(.rodata) - build/asm/ovl_En_Ot_rodata.o(.rodata) + build/asm/overlays/ovl_En_Ot_rodata.o(.rodata) ovl_En_Ot_bss_start = .; } . += 0x10; @@ -6901,9 +6901,9 @@ SECTIONS ovl_En_Dragon : AT(RomLocation) { build/src/overlays/actors/ovl_En_Dragon/z_en_dragon.o(.text) - build/asm/ovl_En_Dragon_data.o(.data) + build/asm/overlays/ovl_En_Dragon_data.o(.data) build/src/overlays/actors/ovl_En_Dragon/z_en_dragon.o(.rodata) - build/asm/ovl_En_Dragon_rodata.o(.rodata) + build/asm/overlays/ovl_En_Dragon_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -6915,9 +6915,9 @@ SECTIONS ovl_Obj_Dora : AT(RomLocation) { build/src/overlays/actors/ovl_Obj_Dora/z_obj_dora.o(.text) - build/asm/ovl_Obj_Dora_data.o(.data) + build/asm/overlays/ovl_Obj_Dora_data.o(.data) build/src/overlays/actors/ovl_Obj_Dora/z_obj_dora.o(.rodata) - build/asm/ovl_Obj_Dora_rodata.o(.rodata) + build/asm/overlays/ovl_Obj_Dora_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -6929,9 +6929,9 @@ SECTIONS ovl_En_Bigpo : AT(RomLocation) { build/src/overlays/actors/ovl_En_Bigpo/z_en_bigpo.o(.text) - build/asm/ovl_En_Bigpo_data.o(.data) + build/asm/overlays/ovl_En_Bigpo_data.o(.data) build/src/overlays/actors/ovl_En_Bigpo/z_en_bigpo.o(.rodata) - build/asm/ovl_En_Bigpo_rodata.o(.rodata) + build/asm/overlays/ovl_En_Bigpo_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -6943,9 +6943,9 @@ SECTIONS ovl_Obj_Kendo_Kanban : AT(RomLocation) { build/src/overlays/actors/ovl_Obj_Kendo_Kanban/z_obj_kendo_kanban.o(.text) - build/asm/ovl_Obj_Kendo_Kanban_data.o(.data) + build/asm/overlays/ovl_Obj_Kendo_Kanban_data.o(.data) build/src/overlays/actors/ovl_Obj_Kendo_Kanban/z_obj_kendo_kanban.o(.rodata) - build/asm/ovl_Obj_Kendo_Kanban_rodata.o(.rodata) + build/asm/overlays/ovl_Obj_Kendo_Kanban_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -6957,8 +6957,8 @@ SECTIONS ovl_Obj_Hariko : AT(RomLocation) { build/src/overlays/actors/ovl_Obj_Hariko/z_obj_hariko.o(.text) - build/asm/ovl_Obj_Hariko_data.o(.data) - build/asm/ovl_Obj_Hariko_rodata.o(.rodata) + build/asm/overlays/ovl_Obj_Hariko_data.o(.data) + build/asm/overlays/ovl_Obj_Hariko_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -6970,9 +6970,9 @@ SECTIONS ovl_En_Sth : AT(RomLocation) { build/src/overlays/actors/ovl_En_Sth/z_en_sth.o(.text) - build/asm/ovl_En_Sth_data.o(.data) + build/asm/overlays/ovl_En_Sth_data.o(.data) build/src/overlays/actors/ovl_En_Sth/z_en_sth.o(.rodata) - build/asm/ovl_En_Sth_rodata.o(.rodata) + build/asm/overlays/ovl_En_Sth_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -6984,9 +6984,9 @@ SECTIONS ovl_Bg_Sinkai_Kabe : AT(RomLocation) { build/src/overlays/actors/ovl_Bg_Sinkai_Kabe/z_bg_sinkai_kabe.o(.text) - build/asm/ovl_Bg_Sinkai_Kabe_data.o(.data) + build/asm/overlays/ovl_Bg_Sinkai_Kabe_data.o(.data) build/src/overlays/actors/ovl_Bg_Sinkai_Kabe/z_bg_sinkai_kabe.o(.rodata) - build/asm/ovl_Bg_Sinkai_Kabe_rodata.o(.rodata) + build/asm/overlays/ovl_Bg_Sinkai_Kabe_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -7013,9 +7013,9 @@ SECTIONS ovl_Bg_Kin2_Bombwall : AT(RomLocation) { build/src/overlays/actors/ovl_Bg_Kin2_Bombwall/z_bg_kin2_bombwall.o(.text) - build/asm/ovl_Bg_Kin2_Bombwall_data.o(.data) + build/asm/overlays/ovl_Bg_Kin2_Bombwall_data.o(.data) build/src/overlays/actors/ovl_Bg_Kin2_Bombwall/z_bg_kin2_bombwall.o(.rodata) - build/asm/ovl_Bg_Kin2_Bombwall_rodata.o(.rodata) + build/asm/overlays/ovl_Bg_Kin2_Bombwall_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -7027,9 +7027,9 @@ SECTIONS ovl_Bg_Kin2_Fence : AT(RomLocation) { build/src/overlays/actors/ovl_Bg_Kin2_Fence/z_bg_kin2_fence.o(.text) - build/asm/ovl_Bg_Kin2_Fence_data.o(.data) + build/asm/overlays/ovl_Bg_Kin2_Fence_data.o(.data) build/src/overlays/actors/ovl_Bg_Kin2_Fence/z_bg_kin2_fence.o(.rodata) - build/asm/ovl_Bg_Kin2_Fence_rodata.o(.rodata) + build/asm/overlays/ovl_Bg_Kin2_Fence_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -7041,9 +7041,9 @@ SECTIONS ovl_Bg_Kin2_Picture : AT(RomLocation) { build/src/overlays/actors/ovl_Bg_Kin2_Picture/z_bg_kin2_picture.o(.text) - build/asm/ovl_Bg_Kin2_Picture_data.o(.data) + build/asm/overlays/ovl_Bg_Kin2_Picture_data.o(.data) build/src/overlays/actors/ovl_Bg_Kin2_Picture/z_bg_kin2_picture.o(.rodata) - build/asm/ovl_Bg_Kin2_Picture_rodata.o(.rodata) + build/asm/overlays/ovl_Bg_Kin2_Picture_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -7055,9 +7055,9 @@ SECTIONS ovl_Bg_Kin2_Shelf : AT(RomLocation) { build/src/overlays/actors/ovl_Bg_Kin2_Shelf/z_bg_kin2_shelf.o(.text) - build/asm/ovl_Bg_Kin2_Shelf_data.o(.data) + build/asm/overlays/ovl_Bg_Kin2_Shelf_data.o(.data) build/src/overlays/actors/ovl_Bg_Kin2_Shelf/z_bg_kin2_shelf.o(.rodata) - build/asm/ovl_Bg_Kin2_Shelf_rodata.o(.rodata) + build/asm/overlays/ovl_Bg_Kin2_Shelf_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -7069,9 +7069,9 @@ SECTIONS ovl_En_Rail_Skb : AT(RomLocation) { build/src/overlays/actors/ovl_En_Rail_Skb/z_en_rail_skb.o(.text) - build/asm/ovl_En_Rail_Skb_data.o(.data) + build/asm/overlays/ovl_En_Rail_Skb_data.o(.data) build/src/overlays/actors/ovl_En_Rail_Skb/z_en_rail_skb.o(.rodata) - build/asm/ovl_En_Rail_Skb_rodata.o(.rodata) + build/asm/overlays/ovl_En_Rail_Skb_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -7083,9 +7083,9 @@ SECTIONS ovl_En_Jg : AT(RomLocation) { build/src/overlays/actors/ovl_En_Jg/z_en_jg.o(.text) - build/asm/ovl_En_Jg_data.o(.data) + build/asm/overlays/ovl_En_Jg_data.o(.data) build/src/overlays/actors/ovl_En_Jg/z_en_jg.o(.rodata) - build/asm/ovl_En_Jg_rodata.o(.rodata) + build/asm/overlays/ovl_En_Jg_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -7097,9 +7097,9 @@ SECTIONS ovl_En_Tru_Mt : AT(RomLocation) { build/src/overlays/actors/ovl_En_Tru_Mt/z_en_tru_mt.o(.text) - build/asm/ovl_En_Tru_Mt_data.o(.data) + build/asm/overlays/ovl_En_Tru_Mt_data.o(.data) build/src/overlays/actors/ovl_En_Tru_Mt/z_en_tru_mt.o(.rodata) - build/asm/ovl_En_Tru_Mt_rodata.o(.rodata) + build/asm/overlays/ovl_En_Tru_Mt_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -7111,9 +7111,9 @@ SECTIONS ovl_Obj_Um : AT(RomLocation) { build/src/overlays/actors/ovl_Obj_Um/z_obj_um.o(.text) - build/asm/ovl_Obj_Um_data.o(.data) + build/asm/overlays/ovl_Obj_Um_data.o(.data) build/src/overlays/actors/ovl_Obj_Um/z_obj_um.o(.rodata) - build/asm/ovl_Obj_Um_rodata.o(.rodata) + build/asm/overlays/ovl_Obj_Um_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -7125,9 +7125,9 @@ SECTIONS ovl_En_Neo_Reeba : AT(RomLocation) { build/src/overlays/actors/ovl_En_Neo_Reeba/z_en_neo_reeba.o(.text) - build/asm/ovl_En_Neo_Reeba_data.o(.data) + build/asm/overlays/ovl_En_Neo_Reeba_data.o(.data) build/src/overlays/actors/ovl_En_Neo_Reeba/z_en_neo_reeba.o(.rodata) - build/asm/ovl_En_Neo_Reeba_rodata.o(.rodata) + build/asm/overlays/ovl_En_Neo_Reeba_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -7154,9 +7154,9 @@ SECTIONS ovl_Bg_Ikana_Block : AT(RomLocation) { build/src/overlays/actors/ovl_Bg_Ikana_Block/z_bg_ikana_block.o(.text) - build/asm/ovl_Bg_Ikana_Block_data.o(.data) + build/asm/overlays/ovl_Bg_Ikana_Block_data.o(.data) build/src/overlays/actors/ovl_Bg_Ikana_Block/z_bg_ikana_block.o(.rodata) - build/asm/ovl_Bg_Ikana_Block_rodata.o(.rodata) + build/asm/overlays/ovl_Bg_Ikana_Block_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -7168,9 +7168,9 @@ SECTIONS ovl_Bg_Ikana_Mirror : AT(RomLocation) { build/src/overlays/actors/ovl_Bg_Ikana_Mirror/z_bg_ikana_mirror.o(.text) - build/asm/ovl_Bg_Ikana_Mirror_data.o(.data) + build/asm/overlays/ovl_Bg_Ikana_Mirror_data.o(.data) build/src/overlays/actors/ovl_Bg_Ikana_Mirror/z_bg_ikana_mirror.o(.rodata) - build/asm/ovl_Bg_Ikana_Mirror_rodata.o(.rodata) + build/asm/overlays/ovl_Bg_Ikana_Mirror_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -7182,9 +7182,9 @@ SECTIONS ovl_Bg_Ikana_Rotaryroom : AT(RomLocation) { build/src/overlays/actors/ovl_Bg_Ikana_Rotaryroom/z_bg_ikana_rotaryroom.o(.text) - build/asm/ovl_Bg_Ikana_Rotaryroom_data.o(.data) + build/asm/overlays/ovl_Bg_Ikana_Rotaryroom_data.o(.data) build/src/overlays/actors/ovl_Bg_Ikana_Rotaryroom/z_bg_ikana_rotaryroom.o(.rodata) - build/asm/ovl_Bg_Ikana_Rotaryroom_rodata.o(.rodata) + build/asm/overlays/ovl_Bg_Ikana_Rotaryroom_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -7196,9 +7196,9 @@ SECTIONS ovl_Bg_Dblue_Balance : AT(RomLocation) { build/src/overlays/actors/ovl_Bg_Dblue_Balance/z_bg_dblue_balance.o(.text) - build/asm/ovl_Bg_Dblue_Balance_data.o(.data) + build/asm/overlays/ovl_Bg_Dblue_Balance_data.o(.data) build/src/overlays/actors/ovl_Bg_Dblue_Balance/z_bg_dblue_balance.o(.rodata) - build/asm/ovl_Bg_Dblue_Balance_rodata.o(.rodata) + build/asm/overlays/ovl_Bg_Dblue_Balance_rodata.o(.rodata) ovl_Bg_Dblue_Balance_bss_start = .; } . += 0x10; @@ -7212,9 +7212,9 @@ SECTIONS ovl_Bg_Dblue_Waterfall : AT(RomLocation) { build/src/overlays/actors/ovl_Bg_Dblue_Waterfall/z_bg_dblue_waterfall.o(.text) - build/asm/ovl_Bg_Dblue_Waterfall_data.o(.data) + build/asm/overlays/ovl_Bg_Dblue_Waterfall_data.o(.data) build/src/overlays/actors/ovl_Bg_Dblue_Waterfall/z_bg_dblue_waterfall.o(.rodata) - build/asm/ovl_Bg_Dblue_Waterfall_rodata.o(.rodata) + build/asm/overlays/ovl_Bg_Dblue_Waterfall_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -7226,9 +7226,9 @@ SECTIONS ovl_En_Kaizoku : AT(RomLocation) { build/src/overlays/actors/ovl_En_Kaizoku/z_en_kaizoku.o(.text) - build/asm/ovl_En_Kaizoku_data.o(.data) + build/asm/overlays/ovl_En_Kaizoku_data.o(.data) build/src/overlays/actors/ovl_En_Kaizoku/z_en_kaizoku.o(.rodata) - build/asm/ovl_En_Kaizoku_rodata.o(.rodata) + build/asm/overlays/ovl_En_Kaizoku_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -7240,9 +7240,9 @@ SECTIONS ovl_En_Ge2 : AT(RomLocation) { build/src/overlays/actors/ovl_En_Ge2/z_en_ge2.o(.text) - build/asm/ovl_En_Ge2_data.o(.data) + build/asm/overlays/ovl_En_Ge2_data.o(.data) build/src/overlays/actors/ovl_En_Ge2/z_en_ge2.o(.rodata) - build/asm/ovl_En_Ge2_rodata.o(.rodata) + build/asm/overlays/ovl_En_Ge2_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -7254,9 +7254,9 @@ SECTIONS ovl_En_Ma_Yts : AT(RomLocation) { build/src/overlays/actors/ovl_En_Ma_Yts/z_en_ma_yts.o(.text) - build/asm/ovl_En_Ma_Yts_data.o(.data) + build/asm/overlays/ovl_En_Ma_Yts_data.o(.data) build/src/overlays/actors/ovl_En_Ma_Yts/z_en_ma_yts.o(.rodata) - build/asm/ovl_En_Ma_Yts_rodata.o(.rodata) + build/asm/overlays/ovl_En_Ma_Yts_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -7268,9 +7268,9 @@ SECTIONS ovl_En_Ma_Yto : AT(RomLocation) { build/src/overlays/actors/ovl_En_Ma_Yto/z_en_ma_yto.o(.text) - build/asm/ovl_En_Ma_Yto_data.o(.data) + build/asm/overlays/ovl_En_Ma_Yto_data.o(.data) build/src/overlays/actors/ovl_En_Ma_Yto/z_en_ma_yto.o(.rodata) - build/asm/ovl_En_Ma_Yto_rodata.o(.rodata) + build/asm/overlays/ovl_En_Ma_Yto_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -7282,9 +7282,9 @@ SECTIONS ovl_Obj_Tokei_Turret : AT(RomLocation) { build/src/overlays/actors/ovl_Obj_Tokei_Turret/z_obj_tokei_turret.o(.text) - build/asm/ovl_Obj_Tokei_Turret_data.o(.data) + build/asm/overlays/ovl_Obj_Tokei_Turret_data.o(.data) build/src/overlays/actors/ovl_Obj_Tokei_Turret/z_obj_tokei_turret.o(.rodata) - build/asm/ovl_Obj_Tokei_Turret_rodata.o(.rodata) + build/asm/overlays/ovl_Obj_Tokei_Turret_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -7296,9 +7296,9 @@ SECTIONS ovl_Bg_Dblue_Elevator : AT(RomLocation) { build/src/overlays/actors/ovl_Bg_Dblue_Elevator/z_bg_dblue_elevator.o(.text) - build/asm/ovl_Bg_Dblue_Elevator_data.o(.data) + build/asm/overlays/ovl_Bg_Dblue_Elevator_data.o(.data) build/src/overlays/actors/ovl_Bg_Dblue_Elevator/z_bg_dblue_elevator.o(.rodata) - build/asm/ovl_Bg_Dblue_Elevator_rodata.o(.rodata) + build/asm/overlays/ovl_Bg_Dblue_Elevator_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -7310,9 +7310,9 @@ SECTIONS ovl_Obj_Warpstone : AT(RomLocation) { build/src/overlays/actors/ovl_Obj_Warpstone/z_obj_warpstone.o(.text) - build/asm/ovl_Obj_Warpstone_data.o(.data) + build/asm/overlays/ovl_Obj_Warpstone_data.o(.data) build/src/overlays/actors/ovl_Obj_Warpstone/z_obj_warpstone.o(.rodata) - build/asm/ovl_Obj_Warpstone_rodata.o(.rodata) + build/asm/overlays/ovl_Obj_Warpstone_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -7324,9 +7324,9 @@ SECTIONS ovl_En_Zog : AT(RomLocation) { build/src/overlays/actors/ovl_En_Zog/z_en_zog.o(.text) - build/asm/ovl_En_Zog_data.o(.data) + build/asm/overlays/ovl_En_Zog_data.o(.data) build/src/overlays/actors/ovl_En_Zog/z_en_zog.o(.rodata) - build/asm/ovl_En_Zog_rodata.o(.rodata) + build/asm/overlays/ovl_En_Zog_rodata.o(.rodata) ovl_En_Zog_bss_start = .; } . += 0x10; @@ -7340,9 +7340,9 @@ SECTIONS ovl_Obj_Rotlift : AT(RomLocation) { build/src/overlays/actors/ovl_Obj_Rotlift/z_obj_rotlift.o(.text) - build/asm/ovl_Obj_Rotlift_data.o(.data) + build/asm/overlays/ovl_Obj_Rotlift_data.o(.data) build/src/overlays/actors/ovl_Obj_Rotlift/z_obj_rotlift.o(.rodata) - build/asm/ovl_Obj_Rotlift_rodata.o(.rodata) + build/asm/overlays/ovl_Obj_Rotlift_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -7354,9 +7354,9 @@ SECTIONS ovl_Obj_Jg_Gakki : AT(RomLocation) { build/src/overlays/actors/ovl_Obj_Jg_Gakki/z_obj_jg_gakki.o(.text) - build/asm/ovl_Obj_Jg_Gakki_data.o(.data) + build/asm/overlays/ovl_Obj_Jg_Gakki_data.o(.data) build/src/overlays/actors/ovl_Obj_Jg_Gakki/z_obj_jg_gakki.o(.rodata) - build/asm/ovl_Obj_Jg_Gakki_rodata.o(.rodata) + build/asm/overlays/ovl_Obj_Jg_Gakki_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -7368,9 +7368,9 @@ SECTIONS ovl_Bg_Inibs_Movebg : AT(RomLocation) { build/src/overlays/actors/ovl_Bg_Inibs_Movebg/z_bg_inibs_movebg.o(.text) - build/asm/ovl_Bg_Inibs_Movebg_data.o(.data) + build/asm/overlays/ovl_Bg_Inibs_Movebg_data.o(.data) build/src/overlays/actors/ovl_Bg_Inibs_Movebg/z_bg_inibs_movebg.o(.rodata) - build/asm/ovl_Bg_Inibs_Movebg_rodata.o(.rodata) + build/asm/overlays/ovl_Bg_Inibs_Movebg_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -7382,9 +7382,9 @@ SECTIONS ovl_En_Zot : AT(RomLocation) { build/src/overlays/actors/ovl_En_Zot/z_en_zot.o(.text) - build/asm/ovl_En_Zot_data.o(.data) + build/asm/overlays/ovl_En_Zot_data.o(.data) build/src/overlays/actors/ovl_En_Zot/z_en_zot.o(.rodata) - build/asm/ovl_En_Zot_rodata.o(.rodata) + build/asm/overlays/ovl_En_Zot_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -7396,9 +7396,9 @@ SECTIONS ovl_Obj_Tree : AT(RomLocation) { build/src/overlays/actors/ovl_Obj_Tree/z_obj_tree.o(.text) - build/asm/ovl_Obj_Tree_data.o(.data) + build/asm/overlays/ovl_Obj_Tree_data.o(.data) build/src/overlays/actors/ovl_Obj_Tree/z_obj_tree.o(.rodata) - build/asm/ovl_Obj_Tree_rodata.o(.rodata) + build/asm/overlays/ovl_Obj_Tree_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -7410,9 +7410,9 @@ SECTIONS ovl_Obj_Y2lift : AT(RomLocation) { build/src/overlays/actors/ovl_Obj_Y2lift/z_obj_y2lift.o(.text) - build/asm/ovl_Obj_Y2lift_data.o(.data) + build/asm/overlays/ovl_Obj_Y2lift_data.o(.data) build/src/overlays/actors/ovl_Obj_Y2lift/z_obj_y2lift.o(.rodata) - build/asm/ovl_Obj_Y2lift_rodata.o(.rodata) + build/asm/overlays/ovl_Obj_Y2lift_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -7424,9 +7424,9 @@ SECTIONS ovl_Obj_Y2shutter : AT(RomLocation) { build/src/overlays/actors/ovl_Obj_Y2shutter/z_obj_y2shutter.o(.text) - build/asm/ovl_Obj_Y2shutter_data.o(.data) + build/asm/overlays/ovl_Obj_Y2shutter_data.o(.data) build/src/overlays/actors/ovl_Obj_Y2shutter/z_obj_y2shutter.o(.rodata) - build/asm/ovl_Obj_Y2shutter_rodata.o(.rodata) + build/asm/overlays/ovl_Obj_Y2shutter_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -7438,9 +7438,9 @@ SECTIONS ovl_Obj_Boat : AT(RomLocation) { build/src/overlays/actors/ovl_Obj_Boat/z_obj_boat.o(.text) - build/asm/ovl_Obj_Boat_data.o(.data) + build/asm/overlays/ovl_Obj_Boat_data.o(.data) build/src/overlays/actors/ovl_Obj_Boat/z_obj_boat.o(.rodata) - build/asm/ovl_Obj_Boat_rodata.o(.rodata) + build/asm/overlays/ovl_Obj_Boat_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -7452,9 +7452,9 @@ SECTIONS ovl_Obj_Taru : AT(RomLocation) { build/src/overlays/actors/ovl_Obj_Taru/z_obj_taru.o(.text) - build/asm/ovl_Obj_Taru_data.o(.data) + build/asm/overlays/ovl_Obj_Taru_data.o(.data) build/src/overlays/actors/ovl_Obj_Taru/z_obj_taru.o(.rodata) - build/asm/ovl_Obj_Taru_rodata.o(.rodata) + build/asm/overlays/ovl_Obj_Taru_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -7466,9 +7466,9 @@ SECTIONS ovl_Obj_Hunsui : AT(RomLocation) { build/src/overlays/actors/ovl_Obj_Hunsui/z_obj_hunsui.o(.text) - build/asm/ovl_Obj_Hunsui_data.o(.data) + build/asm/overlays/ovl_Obj_Hunsui_data.o(.data) build/src/overlays/actors/ovl_Obj_Hunsui/z_obj_hunsui.o(.rodata) - build/asm/ovl_Obj_Hunsui_rodata.o(.rodata) + build/asm/overlays/ovl_Obj_Hunsui_rodata.o(.rodata) ovl_Obj_Hunsui_bss_start = .; } . += 0x10; @@ -7482,9 +7482,9 @@ SECTIONS ovl_En_Jc_Mato : AT(RomLocation) { build/src/overlays/actors/ovl_En_Jc_Mato/z_en_jc_mato.o(.text) - build/asm/ovl_En_Jc_Mato_data.o(.data) + build/asm/overlays/ovl_En_Jc_Mato_data.o(.data) build/src/overlays/actors/ovl_En_Jc_Mato/z_en_jc_mato.o(.rodata) - build/asm/ovl_En_Jc_Mato_rodata.o(.rodata) + build/asm/overlays/ovl_En_Jc_Mato_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -7496,9 +7496,9 @@ SECTIONS ovl_Mir_Ray3 : AT(RomLocation) { build/src/overlays/actors/ovl_Mir_Ray3/z_mir_ray3.o(.text) - build/asm/ovl_Mir_Ray3_data.o(.data) + build/asm/overlays/ovl_Mir_Ray3_data.o(.data) build/src/overlays/actors/ovl_Mir_Ray3/z_mir_ray3.o(.rodata) - build/asm/ovl_Mir_Ray3_rodata.o(.rodata) + build/asm/overlays/ovl_Mir_Ray3_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -7510,9 +7510,9 @@ SECTIONS ovl_En_Zob : AT(RomLocation) { build/src/overlays/actors/ovl_En_Zob/z_en_zob.o(.text) - build/asm/ovl_En_Zob_data.o(.data) + build/asm/overlays/ovl_En_Zob_data.o(.data) build/src/overlays/actors/ovl_En_Zob/z_en_zob.o(.rodata) - build/asm/ovl_En_Zob_rodata.o(.rodata) + build/asm/overlays/ovl_En_Zob_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -7524,9 +7524,9 @@ SECTIONS ovl_Elf_Msg6 : AT(RomLocation) { build/src/overlays/actors/ovl_Elf_Msg6/z_elf_msg6.o(.text) - build/asm/ovl_Elf_Msg6_data.o(.data) + build/asm/overlays/ovl_Elf_Msg6_data.o(.data) build/src/overlays/actors/ovl_Elf_Msg6/z_elf_msg6.o(.rodata) - build/asm/ovl_Elf_Msg6_rodata.o(.rodata) + build/asm/overlays/ovl_Elf_Msg6_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -7538,9 +7538,9 @@ SECTIONS ovl_Obj_Nozoki : AT(RomLocation) { build/src/overlays/actors/ovl_Obj_Nozoki/z_obj_nozoki.o(.text) - build/asm/ovl_Obj_Nozoki_data.o(.data) + build/asm/overlays/ovl_Obj_Nozoki_data.o(.data) build/src/overlays/actors/ovl_Obj_Nozoki/z_obj_nozoki.o(.rodata) - build/asm/ovl_Obj_Nozoki_rodata.o(.rodata) + build/asm/overlays/ovl_Obj_Nozoki_rodata.o(.rodata) ovl_Obj_Nozoki_bss_start = .; } . += 0x10; @@ -7554,9 +7554,9 @@ SECTIONS ovl_En_Toto : AT(RomLocation) { build/src/overlays/actors/ovl_En_Toto/z_en_toto.o(.text) - build/asm/ovl_En_Toto_data.o(.data) + build/asm/overlays/ovl_En_Toto_data.o(.data) build/src/overlays/actors/ovl_En_Toto/z_en_toto.o(.rodata) - build/asm/ovl_En_Toto_rodata.o(.rodata) + build/asm/overlays/ovl_En_Toto_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -7568,9 +7568,9 @@ SECTIONS ovl_En_Railgibud : AT(RomLocation) { build/src/overlays/actors/ovl_En_Railgibud/z_en_railgibud.o(.text) - build/asm/ovl_En_Railgibud_data.o(.data) + build/asm/overlays/ovl_En_Railgibud_data.o(.data) build/src/overlays/actors/ovl_En_Railgibud/z_en_railgibud.o(.rodata) - build/asm/ovl_En_Railgibud_rodata.o(.rodata) + build/asm/overlays/ovl_En_Railgibud_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -7582,9 +7582,9 @@ SECTIONS ovl_En_Baba : AT(RomLocation) { build/src/overlays/actors/ovl_En_Baba/z_en_baba.o(.text) - build/asm/ovl_En_Baba_data.o(.data) + build/asm/overlays/ovl_En_Baba_data.o(.data) build/src/overlays/actors/ovl_En_Baba/z_en_baba.o(.rodata) - build/asm/ovl_En_Baba_rodata.o(.rodata) + build/asm/overlays/ovl_En_Baba_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -7596,9 +7596,9 @@ SECTIONS ovl_En_Suttari : AT(RomLocation) { build/src/overlays/actors/ovl_En_Suttari/z_en_suttari.o(.text) - build/asm/ovl_En_Suttari_data.o(.data) + build/asm/overlays/ovl_En_Suttari_data.o(.data) build/src/overlays/actors/ovl_En_Suttari/z_en_suttari.o(.rodata) - build/asm/ovl_En_Suttari_rodata.o(.rodata) + build/asm/overlays/ovl_En_Suttari_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -7610,9 +7610,9 @@ SECTIONS ovl_En_Zod : AT(RomLocation) { build/src/overlays/actors/ovl_En_Zod/z_en_zod.o(.text) - build/asm/ovl_En_Zod_data.o(.data) + build/asm/overlays/ovl_En_Zod_data.o(.data) build/src/overlays/actors/ovl_En_Zod/z_en_zod.o(.rodata) - build/asm/ovl_En_Zod_rodata.o(.rodata) + build/asm/overlays/ovl_En_Zod_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -7624,9 +7624,9 @@ SECTIONS ovl_En_Kujiya : AT(RomLocation) { build/src/overlays/actors/ovl_En_Kujiya/z_en_kujiya.o(.text) - build/asm/ovl_En_Kujiya_data.o(.data) + build/asm/overlays/ovl_En_Kujiya_data.o(.data) build/src/overlays/actors/ovl_En_Kujiya/z_en_kujiya.o(.rodata) - build/asm/ovl_En_Kujiya_rodata.o(.rodata) + build/asm/overlays/ovl_En_Kujiya_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -7638,9 +7638,9 @@ SECTIONS ovl_En_Geg : AT(RomLocation) { build/src/overlays/actors/ovl_En_Geg/z_en_geg.o(.text) - build/asm/ovl_En_Geg_data.o(.data) + build/asm/overlays/ovl_En_Geg_data.o(.data) build/src/overlays/actors/ovl_En_Geg/z_en_geg.o(.rodata) - build/asm/ovl_En_Geg_rodata.o(.rodata) + build/asm/overlays/ovl_En_Geg_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -7652,9 +7652,9 @@ SECTIONS ovl_Obj_Kinoko : AT(RomLocation) { build/src/overlays/actors/ovl_Obj_Kinoko/z_obj_kinoko.o(.text) - build/asm/ovl_Obj_Kinoko_data.o(.data) + build/asm/overlays/ovl_Obj_Kinoko_data.o(.data) build/src/overlays/actors/ovl_Obj_Kinoko/z_obj_kinoko.o(.rodata) - build/asm/ovl_Obj_Kinoko_rodata.o(.rodata) + build/asm/overlays/ovl_Obj_Kinoko_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -7666,9 +7666,9 @@ SECTIONS ovl_Obj_Yasi : AT(RomLocation) { build/src/overlays/actors/ovl_Obj_Yasi/z_obj_yasi.o(.text) - build/asm/ovl_Obj_Yasi_data.o(.data) + build/asm/overlays/ovl_Obj_Yasi_data.o(.data) build/src/overlays/actors/ovl_Obj_Yasi/z_obj_yasi.o(.rodata) - build/asm/ovl_Obj_Yasi_rodata.o(.rodata) + build/asm/overlays/ovl_Obj_Yasi_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -7680,9 +7680,9 @@ SECTIONS ovl_En_Tanron1 : AT(RomLocation) { build/src/overlays/actors/ovl_En_Tanron1/z_en_tanron1.o(.text) - build/asm/ovl_En_Tanron1_data.o(.data) + build/asm/overlays/ovl_En_Tanron1_data.o(.data) build/src/overlays/actors/ovl_En_Tanron1/z_en_tanron1.o(.rodata) - build/asm/ovl_En_Tanron1_rodata.o(.rodata) + build/asm/overlays/ovl_En_Tanron1_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -7694,9 +7694,9 @@ SECTIONS ovl_En_Tanron2 : AT(RomLocation) { build/src/overlays/actors/ovl_En_Tanron2/z_en_tanron2.o(.text) - build/asm/ovl_En_Tanron2_data.o(.data) + build/asm/overlays/ovl_En_Tanron2_data.o(.data) build/src/overlays/actors/ovl_En_Tanron2/z_en_tanron2.o(.rodata) - build/asm/ovl_En_Tanron2_rodata.o(.rodata) + build/asm/overlays/ovl_En_Tanron2_rodata.o(.rodata) ovl_En_Tanron2_bss_start = .; } . += 0x150; @@ -7710,9 +7710,9 @@ SECTIONS ovl_En_Tanron3 : AT(RomLocation) { build/src/overlays/actors/ovl_En_Tanron3/z_en_tanron3.o(.text) - build/asm/ovl_En_Tanron3_data.o(.data) + build/asm/overlays/ovl_En_Tanron3_data.o(.data) build/src/overlays/actors/ovl_En_Tanron3/z_en_tanron3.o(.rodata) - build/asm/ovl_En_Tanron3_rodata.o(.rodata) + build/asm/overlays/ovl_En_Tanron3_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -7724,9 +7724,9 @@ SECTIONS ovl_Obj_Chan : AT(RomLocation) { build/src/overlays/actors/ovl_Obj_Chan/z_obj_chan.o(.text) - build/asm/ovl_Obj_Chan_data.o(.data) + build/asm/overlays/ovl_Obj_Chan_data.o(.data) build/src/overlays/actors/ovl_Obj_Chan/z_obj_chan.o(.rodata) - build/asm/ovl_Obj_Chan_rodata.o(.rodata) + build/asm/overlays/ovl_Obj_Chan_rodata.o(.rodata) ovl_Obj_Chan_bss_start = .; } . += 0x10; @@ -7740,9 +7740,9 @@ SECTIONS ovl_En_Zos : AT(RomLocation) { build/src/overlays/actors/ovl_En_Zos/z_en_zos.o(.text) - build/asm/ovl_En_Zos_data.o(.data) + build/asm/overlays/ovl_En_Zos_data.o(.data) build/src/overlays/actors/ovl_En_Zos/z_en_zos.o(.rodata) - build/asm/ovl_En_Zos_rodata.o(.rodata) + build/asm/overlays/ovl_En_Zos_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -7754,9 +7754,9 @@ SECTIONS ovl_En_S_Goro : AT(RomLocation) { build/src/overlays/actors/ovl_En_S_Goro/z_en_s_goro.o(.text) - build/asm/ovl_En_S_Goro_data.o(.data) + build/asm/overlays/ovl_En_S_Goro_data.o(.data) build/src/overlays/actors/ovl_En_S_Goro/z_en_s_goro.o(.rodata) - build/asm/ovl_En_S_Goro_rodata.o(.rodata) + build/asm/overlays/ovl_En_S_Goro_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -7768,9 +7768,9 @@ SECTIONS ovl_En_Nb : AT(RomLocation) { build/src/overlays/actors/ovl_En_Nb/z_en_nb.o(.text) - build/asm/ovl_En_Nb_data.o(.data) + build/asm/overlays/ovl_En_Nb_data.o(.data) build/src/overlays/actors/ovl_En_Nb/z_en_nb.o(.rodata) - build/asm/ovl_En_Nb_rodata.o(.rodata) + build/asm/overlays/ovl_En_Nb_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -7782,9 +7782,9 @@ SECTIONS ovl_En_Ja : AT(RomLocation) { build/src/overlays/actors/ovl_En_Ja/z_en_ja.o(.text) - build/asm/ovl_En_Ja_data.o(.data) + build/asm/overlays/ovl_En_Ja_data.o(.data) build/src/overlays/actors/ovl_En_Ja/z_en_ja.o(.rodata) - build/asm/ovl_En_Ja_rodata.o(.rodata) + build/asm/overlays/ovl_En_Ja_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -7796,9 +7796,9 @@ SECTIONS ovl_Bg_F40_Block : AT(RomLocation) { build/src/overlays/actors/ovl_Bg_F40_Block/z_bg_f40_block.o(.text) - build/asm/ovl_Bg_F40_Block_data.o(.data) + build/asm/overlays/ovl_Bg_F40_Block_data.o(.data) build/src/overlays/actors/ovl_Bg_F40_Block/z_bg_f40_block.o(.rodata) - build/asm/ovl_Bg_F40_Block_rodata.o(.rodata) + build/asm/overlays/ovl_Bg_F40_Block_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -7810,9 +7810,9 @@ SECTIONS ovl_Bg_F40_Switch : AT(RomLocation) { build/src/overlays/actors/ovl_Bg_F40_Switch/z_bg_f40_switch.o(.text) - build/asm/ovl_Bg_F40_Switch_data.o(.data) + build/asm/overlays/ovl_Bg_F40_Switch_data.o(.data) build/src/overlays/actors/ovl_Bg_F40_Switch/z_bg_f40_switch.o(.rodata) - build/asm/ovl_Bg_F40_Switch_rodata.o(.rodata) + build/asm/overlays/ovl_Bg_F40_Switch_rodata.o(.rodata) ovl_Bg_F40_Switch_bss_start = .; } . += 0x10; @@ -7826,9 +7826,9 @@ SECTIONS ovl_En_Po_Composer : AT(RomLocation) { build/src/overlays/actors/ovl_En_Po_Composer/z_en_po_composer.o(.text) - build/asm/ovl_En_Po_Composer_data.o(.data) + build/asm/overlays/ovl_En_Po_Composer_data.o(.data) build/src/overlays/actors/ovl_En_Po_Composer/z_en_po_composer.o(.rodata) - build/asm/ovl_En_Po_Composer_rodata.o(.rodata) + build/asm/overlays/ovl_En_Po_Composer_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -7840,9 +7840,9 @@ SECTIONS ovl_En_Guruguru : AT(RomLocation) { build/src/overlays/actors/ovl_En_Guruguru/z_en_guruguru.o(.text) - build/asm/ovl_En_Guruguru_data.o(.data) + build/asm/overlays/ovl_En_Guruguru_data.o(.data) build/src/overlays/actors/ovl_En_Guruguru/z_en_guruguru.o(.rodata) - build/asm/ovl_En_Guruguru_rodata.o(.rodata) + build/asm/overlays/ovl_En_Guruguru_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -7854,9 +7854,9 @@ SECTIONS ovl_Oceff_Wipe5 : AT(RomLocation) { build/src/overlays/actors/ovl_Oceff_Wipe5/z_oceff_wipe5.o(.text) - build/asm/ovl_Oceff_Wipe5_data.o(.data) + build/asm/overlays/ovl_Oceff_Wipe5_data.o(.data) build/src/overlays/actors/ovl_Oceff_Wipe5/z_oceff_wipe5.o(.rodata) - build/asm/ovl_Oceff_Wipe5_rodata.o(.rodata) + build/asm/overlays/ovl_Oceff_Wipe5_rodata.o(.rodata) ovl_Oceff_Wipe5_bss_start = .; } . += 0x10; @@ -7870,9 +7870,9 @@ SECTIONS ovl_En_Stone_heishi : AT(RomLocation) { build/src/overlays/actors/ovl_En_Stone_heishi/z_en_stone_heishi.o(.text) - build/asm/ovl_En_Stone_heishi_data.o(.data) + build/asm/overlays/ovl_En_Stone_heishi_data.o(.data) build/src/overlays/actors/ovl_En_Stone_heishi/z_en_stone_heishi.o(.rodata) - build/asm/ovl_En_Stone_heishi_rodata.o(.rodata) + build/asm/overlays/ovl_En_Stone_heishi_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -7884,9 +7884,9 @@ SECTIONS ovl_Oceff_Wipe6 : AT(RomLocation) { build/src/overlays/actors/ovl_Oceff_Wipe6/z_oceff_wipe6.o(.text) - build/asm/ovl_Oceff_Wipe6_data.o(.data) + build/asm/overlays/ovl_Oceff_Wipe6_data.o(.data) build/src/overlays/actors/ovl_Oceff_Wipe6/z_oceff_wipe6.o(.rodata) - build/asm/ovl_Oceff_Wipe6_rodata.o(.rodata) + build/asm/overlays/ovl_Oceff_Wipe6_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -7898,9 +7898,9 @@ SECTIONS ovl_En_Scopenuts : AT(RomLocation) { build/src/overlays/actors/ovl_En_Scopenuts/z_en_scopenuts.o(.text) - build/asm/ovl_En_Scopenuts_data.o(.data) + build/asm/overlays/ovl_En_Scopenuts_data.o(.data) build/src/overlays/actors/ovl_En_Scopenuts/z_en_scopenuts.o(.rodata) - build/asm/ovl_En_Scopenuts_rodata.o(.rodata) + build/asm/overlays/ovl_En_Scopenuts_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -7912,9 +7912,9 @@ SECTIONS ovl_En_Scopecrow : AT(RomLocation) { build/src/overlays/actors/ovl_En_Scopecrow/z_en_scopecrow.o(.text) - build/asm/ovl_En_Scopecrow_data.o(.data) + build/asm/overlays/ovl_En_Scopecrow_data.o(.data) build/src/overlays/actors/ovl_En_Scopecrow/z_en_scopecrow.o(.rodata) - build/asm/ovl_En_Scopecrow_rodata.o(.rodata) + build/asm/overlays/ovl_En_Scopecrow_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -7926,9 +7926,9 @@ SECTIONS ovl_Oceff_Wipe7 : AT(RomLocation) { build/src/overlays/actors/ovl_Oceff_Wipe7/z_oceff_wipe7.o(.text) - build/asm/ovl_Oceff_Wipe7_data.o(.data) + build/asm/overlays/ovl_Oceff_Wipe7_data.o(.data) build/src/overlays/actors/ovl_Oceff_Wipe7/z_oceff_wipe7.o(.rodata) - build/asm/ovl_Oceff_Wipe7_rodata.o(.rodata) + build/asm/overlays/ovl_Oceff_Wipe7_rodata.o(.rodata) ovl_Oceff_Wipe7_bss_start = .; } . += 0x10; @@ -7942,9 +7942,9 @@ SECTIONS ovl_Eff_Kamejima_Wave : AT(RomLocation) { build/src/overlays/actors/ovl_Eff_Kamejima_Wave/z_eff_kamejima_wave.o(.text) - build/asm/ovl_Eff_Kamejima_Wave_data.o(.data) + build/asm/overlays/ovl_Eff_Kamejima_Wave_data.o(.data) build/src/overlays/actors/ovl_Eff_Kamejima_Wave/z_eff_kamejima_wave.o(.rodata) - build/asm/ovl_Eff_Kamejima_Wave_rodata.o(.rodata) + build/asm/overlays/ovl_Eff_Kamejima_Wave_rodata.o(.rodata) ovl_Eff_Kamejima_Wave_bss_start = .; } . += 0x10; @@ -7958,9 +7958,9 @@ SECTIONS ovl_En_Hg : AT(RomLocation) { build/src/overlays/actors/ovl_En_Hg/z_en_hg.o(.text) - build/asm/ovl_En_Hg_data.o(.data) + build/asm/overlays/ovl_En_Hg_data.o(.data) build/src/overlays/actors/ovl_En_Hg/z_en_hg.o(.rodata) - build/asm/ovl_En_Hg_rodata.o(.rodata) + build/asm/overlays/ovl_En_Hg_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -7972,9 +7972,9 @@ SECTIONS ovl_En_Hgo : AT(RomLocation) { build/src/overlays/actors/ovl_En_Hgo/z_en_hgo.o(.text) - build/asm/ovl_En_Hgo_data.o(.data) + build/asm/overlays/ovl_En_Hgo_data.o(.data) build/src/overlays/actors/ovl_En_Hgo/z_en_hgo.o(.rodata) - build/asm/ovl_En_Hgo_rodata.o(.rodata) + build/asm/overlays/ovl_En_Hgo_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -7986,9 +7986,9 @@ SECTIONS ovl_En_Zov : AT(RomLocation) { build/src/overlays/actors/ovl_En_Zov/z_en_zov.o(.text) - build/asm/ovl_En_Zov_data.o(.data) + build/asm/overlays/ovl_En_Zov_data.o(.data) build/src/overlays/actors/ovl_En_Zov/z_en_zov.o(.rodata) - build/asm/ovl_En_Zov_rodata.o(.rodata) + build/asm/overlays/ovl_En_Zov_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -8000,9 +8000,9 @@ SECTIONS ovl_En_Ah : AT(RomLocation) { build/src/overlays/actors/ovl_En_Ah/z_en_ah.o(.text) - build/asm/ovl_En_Ah_data.o(.data) + build/asm/overlays/ovl_En_Ah_data.o(.data) build/src/overlays/actors/ovl_En_Ah/z_en_ah.o(.rodata) - build/asm/ovl_En_Ah_rodata.o(.rodata) + build/asm/overlays/ovl_En_Ah_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -8014,9 +8014,9 @@ SECTIONS ovl_Obj_Hgdoor : AT(RomLocation) { build/src/overlays/actors/ovl_Obj_Hgdoor/z_obj_hgdoor.o(.text) - build/asm/ovl_Obj_Hgdoor_data.o(.data) + build/asm/overlays/ovl_Obj_Hgdoor_data.o(.data) build/src/overlays/actors/ovl_Obj_Hgdoor/z_obj_hgdoor.o(.rodata) - build/asm/ovl_Obj_Hgdoor_rodata.o(.rodata) + build/asm/overlays/ovl_Obj_Hgdoor_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -8028,9 +8028,9 @@ SECTIONS ovl_Bg_Ikana_Bombwall : AT(RomLocation) { build/src/overlays/actors/ovl_Bg_Ikana_Bombwall/z_bg_ikana_bombwall.o(.text) - build/asm/ovl_Bg_Ikana_Bombwall_data.o(.data) + build/asm/overlays/ovl_Bg_Ikana_Bombwall_data.o(.data) build/src/overlays/actors/ovl_Bg_Ikana_Bombwall/z_bg_ikana_bombwall.o(.rodata) - build/asm/ovl_Bg_Ikana_Bombwall_rodata.o(.rodata) + build/asm/overlays/ovl_Bg_Ikana_Bombwall_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -8057,9 +8057,9 @@ SECTIONS ovl_Bg_Ikana_Shutter : AT(RomLocation) { build/src/overlays/actors/ovl_Bg_Ikana_Shutter/z_bg_ikana_shutter.o(.text) - build/asm/ovl_Bg_Ikana_Shutter_data.o(.data) + build/asm/overlays/ovl_Bg_Ikana_Shutter_data.o(.data) build/src/overlays/actors/ovl_Bg_Ikana_Shutter/z_bg_ikana_shutter.o(.rodata) - build/asm/ovl_Bg_Ikana_Shutter_rodata.o(.rodata) + build/asm/overlays/ovl_Bg_Ikana_Shutter_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -8071,9 +8071,9 @@ SECTIONS ovl_Bg_Haka_Bombwall : AT(RomLocation) { build/src/overlays/actors/ovl_Bg_Haka_Bombwall/z_bg_haka_bombwall.o(.text) - build/asm/ovl_Bg_Haka_Bombwall_data.o(.data) + build/asm/overlays/ovl_Bg_Haka_Bombwall_data.o(.data) build/src/overlays/actors/ovl_Bg_Haka_Bombwall/z_bg_haka_bombwall.o(.rodata) - build/asm/ovl_Bg_Haka_Bombwall_rodata.o(.rodata) + build/asm/overlays/ovl_Bg_Haka_Bombwall_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -8085,9 +8085,9 @@ SECTIONS ovl_Bg_Haka_Tomb : AT(RomLocation) { build/src/overlays/actors/ovl_Bg_Haka_Tomb/z_bg_haka_tomb.o(.text) - build/asm/ovl_Bg_Haka_Tomb_data.o(.data) + build/asm/overlays/ovl_Bg_Haka_Tomb_data.o(.data) build/src/overlays/actors/ovl_Bg_Haka_Tomb/z_bg_haka_tomb.o(.rodata) - build/asm/ovl_Bg_Haka_Tomb_rodata.o(.rodata) + build/asm/overlays/ovl_Bg_Haka_Tomb_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -8099,9 +8099,9 @@ SECTIONS ovl_En_Sc_Ruppe : AT(RomLocation) { build/src/overlays/actors/ovl_En_Sc_Ruppe/z_en_sc_ruppe.o(.text) - build/asm/ovl_En_Sc_Ruppe_data.o(.data) + build/asm/overlays/ovl_En_Sc_Ruppe_data.o(.data) build/src/overlays/actors/ovl_En_Sc_Ruppe/z_en_sc_ruppe.o(.rodata) - build/asm/ovl_En_Sc_Ruppe_rodata.o(.rodata) + build/asm/overlays/ovl_En_Sc_Ruppe_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -8113,9 +8113,9 @@ SECTIONS ovl_Bg_Iknv_Doukutu : AT(RomLocation) { build/src/overlays/actors/ovl_Bg_Iknv_Doukutu/z_bg_iknv_doukutu.o(.text) - build/asm/ovl_Bg_Iknv_Doukutu_data.o(.data) + build/asm/overlays/ovl_Bg_Iknv_Doukutu_data.o(.data) build/src/overlays/actors/ovl_Bg_Iknv_Doukutu/z_bg_iknv_doukutu.o(.rodata) - build/asm/ovl_Bg_Iknv_Doukutu_rodata.o(.rodata) + build/asm/overlays/ovl_Bg_Iknv_Doukutu_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -8127,9 +8127,9 @@ SECTIONS ovl_Bg_Iknv_Obj : AT(RomLocation) { build/src/overlays/actors/ovl_Bg_Iknv_Obj/z_bg_iknv_obj.o(.text) - build/asm/ovl_Bg_Iknv_Obj_data.o(.data) + build/asm/overlays/ovl_Bg_Iknv_Obj_data.o(.data) build/src/overlays/actors/ovl_Bg_Iknv_Obj/z_bg_iknv_obj.o(.rodata) - build/asm/ovl_Bg_Iknv_Obj_rodata.o(.rodata) + build/asm/overlays/ovl_Bg_Iknv_Obj_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -8141,9 +8141,9 @@ SECTIONS ovl_En_Pamera : AT(RomLocation) { build/src/overlays/actors/ovl_En_Pamera/z_en_pamera.o(.text) - build/asm/ovl_En_Pamera_data.o(.data) + build/asm/overlays/ovl_En_Pamera_data.o(.data) build/src/overlays/actors/ovl_En_Pamera/z_en_pamera.o(.rodata) - build/asm/ovl_En_Pamera_rodata.o(.rodata) + build/asm/overlays/ovl_En_Pamera_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -8155,9 +8155,9 @@ SECTIONS ovl_Obj_HsStump : AT(RomLocation) { build/src/overlays/actors/ovl_Obj_HsStump/z_obj_hsstump.o(.text) - build/asm/ovl_Obj_HsStump_data.o(.data) + build/asm/overlays/ovl_Obj_HsStump_data.o(.data) build/src/overlays/actors/ovl_Obj_HsStump/z_obj_hsstump.o(.rodata) - build/asm/ovl_Obj_HsStump_rodata.o(.rodata) + build/asm/overlays/ovl_Obj_HsStump_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -8169,9 +8169,9 @@ SECTIONS ovl_En_Hidden_Nuts : AT(RomLocation) { build/src/overlays/actors/ovl_En_Hidden_Nuts/z_en_hidden_nuts.o(.text) - build/asm/ovl_En_Hidden_Nuts_data.o(.data) + build/asm/overlays/ovl_En_Hidden_Nuts_data.o(.data) build/src/overlays/actors/ovl_En_Hidden_Nuts/z_en_hidden_nuts.o(.rodata) - build/asm/ovl_En_Hidden_Nuts_rodata.o(.rodata) + build/asm/overlays/ovl_En_Hidden_Nuts_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -8183,9 +8183,9 @@ SECTIONS ovl_En_Zow : AT(RomLocation) { build/src/overlays/actors/ovl_En_Zow/z_en_zow.o(.text) - build/asm/ovl_En_Zow_data.o(.data) + build/asm/overlays/ovl_En_Zow_data.o(.data) build/src/overlays/actors/ovl_En_Zow/z_en_zow.o(.rodata) - build/asm/ovl_En_Zow_rodata.o(.rodata) + build/asm/overlays/ovl_En_Zow_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -8197,9 +8197,9 @@ SECTIONS ovl_En_Talk : AT(RomLocation) { build/src/overlays/actors/ovl_En_Talk/z_en_talk.o(.text) - build/asm/ovl_En_Talk_data.o(.data) + build/asm/overlays/ovl_En_Talk_data.o(.data) build/src/overlays/actors/ovl_En_Talk/z_en_talk.o(.rodata) - build/asm/ovl_En_Talk_rodata.o(.rodata) + build/asm/overlays/ovl_En_Talk_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -8211,9 +8211,9 @@ SECTIONS ovl_En_Al : AT(RomLocation) { build/src/overlays/actors/ovl_En_Al/z_en_al.o(.text) - build/asm/ovl_En_Al_data.o(.data) + build/asm/overlays/ovl_En_Al_data.o(.data) build/src/overlays/actors/ovl_En_Al/z_en_al.o(.rodata) - build/asm/ovl_En_Al_rodata.o(.rodata) + build/asm/overlays/ovl_En_Al_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -8225,9 +8225,9 @@ SECTIONS ovl_En_Tab : AT(RomLocation) { build/src/overlays/actors/ovl_En_Tab/z_en_tab.o(.text) - build/asm/ovl_En_Tab_data.o(.data) + build/asm/overlays/ovl_En_Tab_data.o(.data) build/src/overlays/actors/ovl_En_Tab/z_en_tab.o(.rodata) - build/asm/ovl_En_Tab_rodata.o(.rodata) + build/asm/overlays/ovl_En_Tab_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -8239,9 +8239,9 @@ SECTIONS ovl_En_Nimotsu : AT(RomLocation) { build/src/overlays/actors/ovl_En_Nimotsu/z_en_nimotsu.o(.text) - build/asm/ovl_En_Nimotsu_data.o(.data) + build/asm/overlays/ovl_En_Nimotsu_data.o(.data) build/src/overlays/actors/ovl_En_Nimotsu/z_en_nimotsu.o(.rodata) - build/asm/ovl_En_Nimotsu_rodata.o(.rodata) + build/asm/overlays/ovl_En_Nimotsu_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -8253,9 +8253,9 @@ SECTIONS ovl_En_Hit_Tag : AT(RomLocation) { build/src/overlays/actors/ovl_En_Hit_Tag/z_en_hit_tag.o(.text) - build/asm/ovl_En_Hit_Tag_data.o(.data) + build/asm/overlays/ovl_En_Hit_Tag_data.o(.data) build/src/overlays/actors/ovl_En_Hit_Tag/z_en_hit_tag.o(.rodata) - build/asm/ovl_En_Hit_Tag_rodata.o(.rodata) + build/asm/overlays/ovl_En_Hit_Tag_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -8267,9 +8267,9 @@ SECTIONS ovl_En_Ruppecrow : AT(RomLocation) { build/src/overlays/actors/ovl_En_Ruppecrow/z_en_ruppecrow.o(.text) - build/asm/ovl_En_Ruppecrow_data.o(.data) + build/asm/overlays/ovl_En_Ruppecrow_data.o(.data) build/src/overlays/actors/ovl_En_Ruppecrow/z_en_ruppecrow.o(.rodata) - build/asm/ovl_En_Ruppecrow_rodata.o(.rodata) + build/asm/overlays/ovl_En_Ruppecrow_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -8281,9 +8281,9 @@ SECTIONS ovl_En_Tanron4 : AT(RomLocation) { build/src/overlays/actors/ovl_En_Tanron4/z_en_tanron4.o(.text) - build/asm/ovl_En_Tanron4_data.o(.data) + build/asm/overlays/ovl_En_Tanron4_data.o(.data) build/src/overlays/actors/ovl_En_Tanron4/z_en_tanron4.o(.rodata) - build/asm/ovl_En_Tanron4_rodata.o(.rodata) + build/asm/overlays/ovl_En_Tanron4_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -8295,9 +8295,9 @@ SECTIONS ovl_En_Tanron5 : AT(RomLocation) { build/src/overlays/actors/ovl_En_Tanron5/z_en_tanron5.o(.text) - build/asm/ovl_En_Tanron5_data.o(.data) + build/asm/overlays/ovl_En_Tanron5_data.o(.data) build/src/overlays/actors/ovl_En_Tanron5/z_en_tanron5.o(.rodata) - build/asm/ovl_En_Tanron5_rodata.o(.rodata) + build/asm/overlays/ovl_En_Tanron5_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -8324,9 +8324,9 @@ SECTIONS ovl_En_Daiku2 : AT(RomLocation) { build/src/overlays/actors/ovl_En_Daiku2/z_en_daiku2.o(.text) - build/asm/ovl_En_Daiku2_data.o(.data) + build/asm/overlays/ovl_En_Daiku2_data.o(.data) build/src/overlays/actors/ovl_En_Daiku2/z_en_daiku2.o(.rodata) - build/asm/ovl_En_Daiku2_rodata.o(.rodata) + build/asm/overlays/ovl_En_Daiku2_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -8338,9 +8338,9 @@ SECTIONS ovl_En_Muto : AT(RomLocation) { build/src/overlays/actors/ovl_En_Muto/z_en_muto.o(.text) - build/asm/ovl_En_Muto_data.o(.data) + build/asm/overlays/ovl_En_Muto_data.o(.data) build/src/overlays/actors/ovl_En_Muto/z_en_muto.o(.rodata) - build/asm/ovl_En_Muto_rodata.o(.rodata) + build/asm/overlays/ovl_En_Muto_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -8352,9 +8352,9 @@ SECTIONS ovl_En_Baisen : AT(RomLocation) { build/src/overlays/actors/ovl_En_Baisen/z_en_baisen.o(.text) - build/asm/ovl_En_Baisen_data.o(.data) + build/asm/overlays/ovl_En_Baisen_data.o(.data) build/src/overlays/actors/ovl_En_Baisen/z_en_baisen.o(.rodata) - build/asm/ovl_En_Baisen_rodata.o(.rodata) + build/asm/overlays/ovl_En_Baisen_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -8366,9 +8366,9 @@ SECTIONS ovl_En_Heishi : AT(RomLocation) { build/src/overlays/actors/ovl_En_Heishi/z_en_heishi.o(.text) - build/asm/ovl_En_Heishi_data.o(.data) + build/asm/overlays/ovl_En_Heishi_data.o(.data) build/src/overlays/actors/ovl_En_Heishi/z_en_heishi.o(.rodata) - build/asm/ovl_En_Heishi_rodata.o(.rodata) + build/asm/overlays/ovl_En_Heishi_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -8380,9 +8380,9 @@ SECTIONS ovl_En_Demo_heishi : AT(RomLocation) { build/src/overlays/actors/ovl_En_Demo_heishi/z_en_demo_heishi.o(.text) - build/asm/ovl_En_Demo_heishi_data.o(.data) + build/asm/overlays/ovl_En_Demo_heishi_data.o(.data) build/src/overlays/actors/ovl_En_Demo_heishi/z_en_demo_heishi.o(.rodata) - build/asm/ovl_En_Demo_heishi_rodata.o(.rodata) + build/asm/overlays/ovl_En_Demo_heishi_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -8394,9 +8394,9 @@ SECTIONS ovl_En_Dt : AT(RomLocation) { build/src/overlays/actors/ovl_En_Dt/z_en_dt.o(.text) - build/asm/ovl_En_Dt_data.o(.data) + build/asm/overlays/ovl_En_Dt_data.o(.data) build/src/overlays/actors/ovl_En_Dt/z_en_dt.o(.rodata) - build/asm/ovl_En_Dt_rodata.o(.rodata) + build/asm/overlays/ovl_En_Dt_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -8408,9 +8408,9 @@ SECTIONS ovl_En_Cha : AT(RomLocation) { build/src/overlays/actors/ovl_En_Cha/z_en_cha.o(.text) - build/asm/ovl_En_Cha_data.o(.data) + build/asm/overlays/ovl_En_Cha_data.o(.data) build/src/overlays/actors/ovl_En_Cha/z_en_cha.o(.rodata) - build/asm/ovl_En_Cha_rodata.o(.rodata) + build/asm/overlays/ovl_En_Cha_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -8437,9 +8437,9 @@ SECTIONS ovl_Eff_Lastday : AT(RomLocation) { build/src/overlays/actors/ovl_Eff_Lastday/z_eff_lastday.o(.text) - build/asm/ovl_Eff_Lastday_data.o(.data) + build/asm/overlays/ovl_Eff_Lastday_data.o(.data) build/src/overlays/actors/ovl_Eff_Lastday/z_eff_lastday.o(.rodata) - build/asm/ovl_Eff_Lastday_rodata.o(.rodata) + build/asm/overlays/ovl_Eff_Lastday_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -8451,9 +8451,9 @@ SECTIONS ovl_Bg_Ikana_Dharma : AT(RomLocation) { build/src/overlays/actors/ovl_Bg_Ikana_Dharma/z_bg_ikana_dharma.o(.text) - build/asm/ovl_Bg_Ikana_Dharma_data.o(.data) + build/asm/overlays/ovl_Bg_Ikana_Dharma_data.o(.data) build/src/overlays/actors/ovl_Bg_Ikana_Dharma/z_bg_ikana_dharma.o(.rodata) - build/asm/ovl_Bg_Ikana_Dharma_rodata.o(.rodata) + build/asm/overlays/ovl_Bg_Ikana_Dharma_rodata.o(.rodata) ovl_Bg_Ikana_Dharma_bss_start = .; } . += 0x10; @@ -8467,9 +8467,9 @@ SECTIONS ovl_En_Akindonuts : AT(RomLocation) { build/src/overlays/actors/ovl_En_Akindonuts/z_en_akindonuts.o(.text) - build/asm/ovl_En_Akindonuts_data.o(.data) + build/asm/overlays/ovl_En_Akindonuts_data.o(.data) build/src/overlays/actors/ovl_En_Akindonuts/z_en_akindonuts.o(.rodata) - build/asm/ovl_En_Akindonuts_rodata.o(.rodata) + build/asm/overlays/ovl_En_Akindonuts_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -8481,9 +8481,9 @@ SECTIONS ovl_Eff_Stk : AT(RomLocation) { build/src/overlays/actors/ovl_Eff_Stk/z_eff_stk.o(.text) - build/asm/ovl_Eff_Stk_data.o(.data) + build/asm/overlays/ovl_Eff_Stk_data.o(.data) build/src/overlays/actors/ovl_Eff_Stk/z_eff_stk.o(.rodata) - build/asm/ovl_Eff_Stk_rodata.o(.rodata) + build/asm/overlays/ovl_Eff_Stk_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -8495,9 +8495,9 @@ SECTIONS ovl_En_Ig : AT(RomLocation) { build/src/overlays/actors/ovl_En_Ig/z_en_ig.o(.text) - build/asm/ovl_En_Ig_data.o(.data) + build/asm/overlays/ovl_En_Ig_data.o(.data) build/src/overlays/actors/ovl_En_Ig/z_en_ig.o(.rodata) - build/asm/ovl_En_Ig_rodata.o(.rodata) + build/asm/overlays/ovl_En_Ig_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -8509,9 +8509,9 @@ SECTIONS ovl_En_Rg : AT(RomLocation) { build/src/overlays/actors/ovl_En_Rg/z_en_rg.o(.text) - build/asm/ovl_En_Rg_data.o(.data) + build/asm/overlays/ovl_En_Rg_data.o(.data) build/src/overlays/actors/ovl_En_Rg/z_en_rg.o(.rodata) - build/asm/ovl_En_Rg_rodata.o(.rodata) + build/asm/overlays/ovl_En_Rg_rodata.o(.rodata) ovl_En_Rg_bss_start = .; } . += 0x10; @@ -8525,9 +8525,9 @@ SECTIONS ovl_En_Osk : AT(RomLocation) { build/src/overlays/actors/ovl_En_Osk/z_en_osk.o(.text) - build/asm/ovl_En_Osk_data.o(.data) + build/asm/overlays/ovl_En_Osk_data.o(.data) build/src/overlays/actors/ovl_En_Osk/z_en_osk.o(.rodata) - build/asm/ovl_En_Osk_rodata.o(.rodata) + build/asm/overlays/ovl_En_Osk_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -8539,9 +8539,9 @@ SECTIONS ovl_En_Sth2 : AT(RomLocation) { build/src/overlays/actors/ovl_En_Sth2/z_en_sth2.o(.text) - build/asm/ovl_En_Sth2_data.o(.data) + build/asm/overlays/ovl_En_Sth2_data.o(.data) build/src/overlays/actors/ovl_En_Sth2/z_en_sth2.o(.rodata) - build/asm/ovl_En_Sth2_rodata.o(.rodata) + build/asm/overlays/ovl_En_Sth2_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -8553,9 +8553,9 @@ SECTIONS ovl_En_Yb : AT(RomLocation) { build/src/overlays/actors/ovl_En_Yb/z_en_yb.o(.text) - build/asm/ovl_En_Yb_data.o(.data) + build/asm/overlays/ovl_En_Yb_data.o(.data) build/src/overlays/actors/ovl_En_Yb/z_en_yb.o(.rodata) - build/asm/ovl_En_Yb_rodata.o(.rodata) + build/asm/overlays/ovl_En_Yb_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -8567,9 +8567,9 @@ SECTIONS ovl_En_Rz : AT(RomLocation) { build/src/overlays/actors/ovl_En_Rz/z_en_rz.o(.text) - build/asm/ovl_En_Rz_data.o(.data) + build/asm/overlays/ovl_En_Rz_data.o(.data) build/src/overlays/actors/ovl_En_Rz/z_en_rz.o(.rodata) - build/asm/ovl_En_Rz_rodata.o(.rodata) + build/asm/overlays/ovl_En_Rz_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -8581,9 +8581,9 @@ SECTIONS ovl_En_Scopecoin : AT(RomLocation) { build/src/overlays/actors/ovl_En_Scopecoin/z_en_scopecoin.o(.text) - build/asm/ovl_En_Scopecoin_data.o(.data) + build/asm/overlays/ovl_En_Scopecoin_data.o(.data) build/src/overlays/actors/ovl_En_Scopecoin/z_en_scopecoin.o(.rodata) - build/asm/ovl_En_Scopecoin_rodata.o(.rodata) + build/asm/overlays/ovl_En_Scopecoin_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -8595,9 +8595,9 @@ SECTIONS ovl_En_Bjt : AT(RomLocation) { build/src/overlays/actors/ovl_En_Bjt/z_en_bjt.o(.text) - build/asm/ovl_En_Bjt_data.o(.data) + build/asm/overlays/ovl_En_Bjt_data.o(.data) build/src/overlays/actors/ovl_En_Bjt/z_en_bjt.o(.rodata) - build/asm/ovl_En_Bjt_rodata.o(.rodata) + build/asm/overlays/ovl_En_Bjt_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -8609,9 +8609,9 @@ SECTIONS ovl_En_Bomjima : AT(RomLocation) { build/src/overlays/actors/ovl_En_Bomjima/z_en_bomjima.o(.text) - build/asm/ovl_En_Bomjima_data.o(.data) + build/asm/overlays/ovl_En_Bomjima_data.o(.data) build/src/overlays/actors/ovl_En_Bomjima/z_en_bomjima.o(.rodata) - build/asm/ovl_En_Bomjima_rodata.o(.rodata) + build/asm/overlays/ovl_En_Bomjima_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -8623,9 +8623,9 @@ SECTIONS ovl_En_Bomjimb : AT(RomLocation) { build/src/overlays/actors/ovl_En_Bomjimb/z_en_bomjimb.o(.text) - build/asm/ovl_En_Bomjimb_data.o(.data) + build/asm/overlays/ovl_En_Bomjimb_data.o(.data) build/src/overlays/actors/ovl_En_Bomjimb/z_en_bomjimb.o(.rodata) - build/asm/ovl_En_Bomjimb_rodata.o(.rodata) + build/asm/overlays/ovl_En_Bomjimb_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -8637,9 +8637,9 @@ SECTIONS ovl_En_Bombers : AT(RomLocation) { build/src/overlays/actors/ovl_En_Bombers/z_en_bombers.o(.text) - build/asm/ovl_En_Bombers_data.o(.data) + build/asm/overlays/ovl_En_Bombers_data.o(.data) build/src/overlays/actors/ovl_En_Bombers/z_en_bombers.o(.rodata) - build/asm/ovl_En_Bombers_rodata.o(.rodata) + build/asm/overlays/ovl_En_Bombers_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -8651,9 +8651,9 @@ SECTIONS ovl_En_Bombers2 : AT(RomLocation) { build/src/overlays/actors/ovl_En_Bombers2/z_en_bombers2.o(.text) - build/asm/ovl_En_Bombers2_data.o(.data) + build/asm/overlays/ovl_En_Bombers2_data.o(.data) build/src/overlays/actors/ovl_En_Bombers2/z_en_bombers2.o(.rodata) - build/asm/ovl_En_Bombers2_rodata.o(.rodata) + build/asm/overlays/ovl_En_Bombers2_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -8665,9 +8665,9 @@ SECTIONS ovl_En_Bombal : AT(RomLocation) { build/src/overlays/actors/ovl_En_Bombal/z_en_bombal.o(.text) - build/asm/ovl_En_Bombal_data.o(.data) + build/asm/overlays/ovl_En_Bombal_data.o(.data) build/src/overlays/actors/ovl_En_Bombal/z_en_bombal.o(.rodata) - build/asm/ovl_En_Bombal_rodata.o(.rodata) + build/asm/overlays/ovl_En_Bombal_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -8679,9 +8679,9 @@ SECTIONS ovl_Obj_Moon_Stone : AT(RomLocation) { build/src/overlays/actors/ovl_Obj_Moon_Stone/z_obj_moon_stone.o(.text) - build/asm/ovl_Obj_Moon_Stone_data.o(.data) + build/asm/overlays/ovl_Obj_Moon_Stone_data.o(.data) build/src/overlays/actors/ovl_Obj_Moon_Stone/z_obj_moon_stone.o(.rodata) - build/asm/ovl_Obj_Moon_Stone_rodata.o(.rodata) + build/asm/overlays/ovl_Obj_Moon_Stone_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -8693,9 +8693,9 @@ SECTIONS ovl_Obj_Mu_Pict : AT(RomLocation) { build/src/overlays/actors/ovl_Obj_Mu_Pict/z_obj_mu_pict.o(.text) - build/asm/ovl_Obj_Mu_Pict_data.o(.data) + build/asm/overlays/ovl_Obj_Mu_Pict_data.o(.data) build/src/overlays/actors/ovl_Obj_Mu_Pict/z_obj_mu_pict.o(.rodata) - build/asm/ovl_Obj_Mu_Pict_rodata.o(.rodata) + build/asm/overlays/ovl_Obj_Mu_Pict_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -8707,9 +8707,9 @@ SECTIONS ovl_Bg_Ikninside : AT(RomLocation) { build/src/overlays/actors/ovl_Bg_Ikninside/z_bg_ikninside.o(.text) - build/asm/ovl_Bg_Ikninside_data.o(.data) + build/asm/overlays/ovl_Bg_Ikninside_data.o(.data) build/src/overlays/actors/ovl_Bg_Ikninside/z_bg_ikninside.o(.rodata) - build/asm/ovl_Bg_Ikninside_rodata.o(.rodata) + build/asm/overlays/ovl_Bg_Ikninside_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -8721,9 +8721,9 @@ SECTIONS ovl_Eff_Zoraband : AT(RomLocation) { build/src/overlays/actors/ovl_Eff_Zoraband/z_eff_zoraband.o(.text) - build/asm/ovl_Eff_Zoraband_data.o(.data) + build/asm/overlays/ovl_Eff_Zoraband_data.o(.data) build/src/overlays/actors/ovl_Eff_Zoraband/z_eff_zoraband.o(.rodata) - build/asm/ovl_Eff_Zoraband_rodata.o(.rodata) + build/asm/overlays/ovl_Eff_Zoraband_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -8735,9 +8735,9 @@ SECTIONS ovl_Obj_Kepn_Koya : AT(RomLocation) { build/src/overlays/actors/ovl_Obj_Kepn_Koya/z_obj_kepn_koya.o(.text) - build/asm/ovl_Obj_Kepn_Koya_data.o(.data) + build/asm/overlays/ovl_Obj_Kepn_Koya_data.o(.data) build/src/overlays/actors/ovl_Obj_Kepn_Koya/z_obj_kepn_koya.o(.rodata) - build/asm/ovl_Obj_Kepn_Koya_rodata.o(.rodata) + build/asm/overlays/ovl_Obj_Kepn_Koya_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -8749,9 +8749,9 @@ SECTIONS ovl_Obj_Usiyane : AT(RomLocation) { build/src/overlays/actors/ovl_Obj_Usiyane/z_obj_usiyane.o(.text) - build/asm/ovl_Obj_Usiyane_data.o(.data) + build/asm/overlays/ovl_Obj_Usiyane_data.o(.data) build/src/overlays/actors/ovl_Obj_Usiyane/z_obj_usiyane.o(.rodata) - build/asm/ovl_Obj_Usiyane_rodata.o(.rodata) + build/asm/overlays/ovl_Obj_Usiyane_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -8777,9 +8777,9 @@ SECTIONS ovl_Obj_Kzsaku : AT(RomLocation) { build/src/overlays/actors/ovl_Obj_Kzsaku/z_obj_kzsaku.o(.text) - build/asm/ovl_Obj_Kzsaku_data.o(.data) + build/asm/overlays/ovl_Obj_Kzsaku_data.o(.data) build/src/overlays/actors/ovl_Obj_Kzsaku/z_obj_kzsaku.o(.rodata) - build/asm/ovl_Obj_Kzsaku_rodata.o(.rodata) + build/asm/overlays/ovl_Obj_Kzsaku_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -8791,9 +8791,9 @@ SECTIONS ovl_Obj_Milk_Bin : AT(RomLocation) { build/src/overlays/actors/ovl_Obj_Milk_Bin/z_obj_milk_bin.o(.text) - build/asm/ovl_Obj_Milk_Bin_data.o(.data) + build/asm/overlays/ovl_Obj_Milk_Bin_data.o(.data) build/src/overlays/actors/ovl_Obj_Milk_Bin/z_obj_milk_bin.o(.rodata) - build/asm/ovl_Obj_Milk_Bin_rodata.o(.rodata) + build/asm/overlays/ovl_Obj_Milk_Bin_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -8805,9 +8805,9 @@ SECTIONS ovl_En_Kitan : AT(RomLocation) { build/src/overlays/actors/ovl_En_Kitan/z_en_kitan.o(.text) - build/asm/ovl_En_Kitan_data.o(.data) + build/asm/overlays/ovl_En_Kitan_data.o(.data) build/src/overlays/actors/ovl_En_Kitan/z_en_kitan.o(.rodata) - build/asm/ovl_En_Kitan_rodata.o(.rodata) + build/asm/overlays/ovl_En_Kitan_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -8819,9 +8819,9 @@ SECTIONS ovl_Bg_Astr_Bombwall : AT(RomLocation) { build/src/overlays/actors/ovl_Bg_Astr_Bombwall/z_bg_astr_bombwall.o(.text) - build/asm/ovl_Bg_Astr_Bombwall_data.o(.data) + build/asm/overlays/ovl_Bg_Astr_Bombwall_data.o(.data) build/src/overlays/actors/ovl_Bg_Astr_Bombwall/z_bg_astr_bombwall.o(.rodata) - build/asm/ovl_Bg_Astr_Bombwall_rodata.o(.rodata) + build/asm/overlays/ovl_Bg_Astr_Bombwall_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -8833,9 +8833,9 @@ SECTIONS ovl_Bg_Iknin_Susceil : AT(RomLocation) { build/src/overlays/actors/ovl_Bg_Iknin_Susceil/z_bg_iknin_susceil.o(.text) - build/asm/ovl_Bg_Iknin_Susceil_data.o(.data) + build/asm/overlays/ovl_Bg_Iknin_Susceil_data.o(.data) build/src/overlays/actors/ovl_Bg_Iknin_Susceil/z_bg_iknin_susceil.o(.rodata) - build/asm/ovl_Bg_Iknin_Susceil_rodata.o(.rodata) + build/asm/overlays/ovl_Bg_Iknin_Susceil_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -8847,9 +8847,9 @@ SECTIONS ovl_En_Bsb : AT(RomLocation) { build/src/overlays/actors/ovl_En_Bsb/z_en_bsb.o(.text) - build/asm/ovl_En_Bsb_data.o(.data) + build/asm/overlays/ovl_En_Bsb_data.o(.data) build/src/overlays/actors/ovl_En_Bsb/z_en_bsb.o(.rodata) - build/asm/ovl_En_Bsb_rodata.o(.rodata) + build/asm/overlays/ovl_En_Bsb_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -8861,9 +8861,9 @@ SECTIONS ovl_En_Recepgirl : AT(RomLocation) { build/src/overlays/actors/ovl_En_Recepgirl/z_en_recepgirl.o(.text) - build/asm/ovl_En_Recepgirl_data.o(.data) + build/asm/overlays/ovl_En_Recepgirl_data.o(.data) build/src/overlays/actors/ovl_En_Recepgirl/z_en_recepgirl.o(.rodata) - build/asm/ovl_En_Recepgirl_rodata.o(.rodata) + build/asm/overlays/ovl_En_Recepgirl_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -8875,9 +8875,9 @@ SECTIONS ovl_En_Thiefbird : AT(RomLocation) { build/src/overlays/actors/ovl_En_Thiefbird/z_en_thiefbird.o(.text) - build/asm/ovl_En_Thiefbird_data.o(.data) + build/asm/overlays/ovl_En_Thiefbird_data.o(.data) build/src/overlays/actors/ovl_En_Thiefbird/z_en_thiefbird.o(.rodata) - build/asm/ovl_En_Thiefbird_rodata.o(.rodata) + build/asm/overlays/ovl_En_Thiefbird_rodata.o(.rodata) ovl_En_Thiefbird_bss_start = .; } . += 0x10; @@ -8891,9 +8891,9 @@ SECTIONS ovl_En_Jgame_Tsn : AT(RomLocation) { build/src/overlays/actors/ovl_En_Jgame_Tsn/z_en_jgame_tsn.o(.text) - build/asm/ovl_En_Jgame_Tsn_data.o(.data) + build/asm/overlays/ovl_En_Jgame_Tsn_data.o(.data) build/src/overlays/actors/ovl_En_Jgame_Tsn/z_en_jgame_tsn.o(.rodata) - build/asm/ovl_En_Jgame_Tsn_rodata.o(.rodata) + build/asm/overlays/ovl_En_Jgame_Tsn_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -8905,9 +8905,9 @@ SECTIONS ovl_Obj_Jgame_Light : AT(RomLocation) { build/src/overlays/actors/ovl_Obj_Jgame_Light/z_obj_jgame_light.o(.text) - build/asm/ovl_Obj_Jgame_Light_data.o(.data) + build/asm/overlays/ovl_Obj_Jgame_Light_data.o(.data) build/src/overlays/actors/ovl_Obj_Jgame_Light/z_obj_jgame_light.o(.rodata) - build/asm/ovl_Obj_Jgame_Light_rodata.o(.rodata) + build/asm/overlays/ovl_Obj_Jgame_Light_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -8919,7 +8919,7 @@ SECTIONS ovl_Obj_Yado : AT(RomLocation) { build/src/overlays/actors/ovl_Obj_Yado/z_obj_yado.o(.text) - build/asm/ovl_Obj_Yado_data.o(.data) + build/asm/overlays/ovl_Obj_Yado_data.o(.data) ovl_Obj_Yado_bss_start = .; } . += 0x10; @@ -8933,9 +8933,9 @@ SECTIONS ovl_Demo_Syoten : AT(RomLocation) { build/src/overlays/actors/ovl_Demo_Syoten/z_demo_syoten.o(.text) - build/asm/ovl_Demo_Syoten_data.o(.data) + build/asm/overlays/ovl_Demo_Syoten_data.o(.data) build/src/overlays/actors/ovl_Demo_Syoten/z_demo_syoten.o(.rodata) - build/asm/ovl_Demo_Syoten_rodata.o(.rodata) + build/asm/overlays/ovl_Demo_Syoten_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -8947,9 +8947,9 @@ SECTIONS ovl_Demo_Moonend : AT(RomLocation) { build/src/overlays/actors/ovl_Demo_Moonend/z_demo_moonend.o(.text) - build/asm/ovl_Demo_Moonend_data.o(.data) + build/asm/overlays/ovl_Demo_Moonend_data.o(.data) build/src/overlays/actors/ovl_Demo_Moonend/z_demo_moonend.o(.rodata) - build/asm/ovl_Demo_Moonend_rodata.o(.rodata) + build/asm/overlays/ovl_Demo_Moonend_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -8961,9 +8961,9 @@ SECTIONS ovl_Bg_Lbfshot : AT(RomLocation) { build/src/overlays/actors/ovl_Bg_Lbfshot/z_bg_lbfshot.o(.text) - build/asm/ovl_Bg_Lbfshot_data.o(.data) + build/asm/overlays/ovl_Bg_Lbfshot_data.o(.data) build/src/overlays/actors/ovl_Bg_Lbfshot/z_bg_lbfshot.o(.rodata) - build/asm/ovl_Bg_Lbfshot_rodata.o(.rodata) + build/asm/overlays/ovl_Bg_Lbfshot_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -8975,9 +8975,9 @@ SECTIONS ovl_Bg_Last_Bwall : AT(RomLocation) { build/src/overlays/actors/ovl_Bg_Last_Bwall/z_bg_last_bwall.o(.text) - build/asm/ovl_Bg_Last_Bwall_data.o(.data) + build/asm/overlays/ovl_Bg_Last_Bwall_data.o(.data) build/src/overlays/actors/ovl_Bg_Last_Bwall/z_bg_last_bwall.o(.rodata) - build/asm/ovl_Bg_Last_Bwall_rodata.o(.rodata) + build/asm/overlays/ovl_Bg_Last_Bwall_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -8989,9 +8989,9 @@ SECTIONS ovl_En_And : AT(RomLocation) { build/src/overlays/actors/ovl_En_And/z_en_and.o(.text) - build/asm/ovl_En_And_data.o(.data) + build/asm/overlays/ovl_En_And_data.o(.data) build/src/overlays/actors/ovl_En_And/z_en_and.o(.rodata) - build/asm/ovl_En_And_rodata.o(.rodata) + build/asm/overlays/ovl_En_And_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -9003,9 +9003,9 @@ SECTIONS ovl_En_Invadepoh_Demo : AT(RomLocation) { build/src/overlays/actors/ovl_En_Invadepoh_Demo/z_en_invadepoh_demo.o(.text) - build/asm/ovl_En_Invadepoh_Demo_data.o(.data) + build/asm/overlays/ovl_En_Invadepoh_Demo_data.o(.data) build/src/overlays/actors/ovl_En_Invadepoh_Demo/z_en_invadepoh_demo.o(.rodata) - build/asm/ovl_En_Invadepoh_Demo_rodata.o(.rodata) + build/asm/overlays/ovl_En_Invadepoh_Demo_rodata.o(.rodata) ovl_En_Invadepoh_Demo_bss_start = .; } . += 0x80; @@ -9019,9 +9019,9 @@ SECTIONS ovl_Obj_Danpeilift : AT(RomLocation) { build/src/overlays/actors/ovl_Obj_Danpeilift/z_obj_danpeilift.o(.text) - build/asm/ovl_Obj_Danpeilift_data.o(.data) + build/asm/overlays/ovl_Obj_Danpeilift_data.o(.data) build/src/overlays/actors/ovl_Obj_Danpeilift/z_obj_danpeilift.o(.rodata) - build/asm/ovl_Obj_Danpeilift_rodata.o(.rodata) + build/asm/overlays/ovl_Obj_Danpeilift_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -9033,9 +9033,9 @@ SECTIONS ovl_En_Fall2 : AT(RomLocation) { build/src/overlays/actors/ovl_En_Fall2/z_en_fall2.o(.text) - build/asm/ovl_En_Fall2_data.o(.data) + build/asm/overlays/ovl_En_Fall2_data.o(.data) build/src/overlays/actors/ovl_En_Fall2/z_en_fall2.o(.rodata) - build/asm/ovl_En_Fall2_rodata.o(.rodata) + build/asm/overlays/ovl_En_Fall2_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -9047,9 +9047,9 @@ SECTIONS ovl_Dm_Al : AT(RomLocation) { build/src/overlays/actors/ovl_Dm_Al/z_dm_al.o(.text) - build/asm/ovl_Dm_Al_data.o(.data) + build/asm/overlays/ovl_Dm_Al_data.o(.data) build/src/overlays/actors/ovl_Dm_Al/z_dm_al.o(.rodata) - build/asm/ovl_Dm_Al_rodata.o(.rodata) + build/asm/overlays/ovl_Dm_Al_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -9061,9 +9061,9 @@ SECTIONS ovl_Dm_An : AT(RomLocation) { build/src/overlays/actors/ovl_Dm_An/z_dm_an.o(.text) - build/asm/ovl_Dm_An_data.o(.data) + build/asm/overlays/ovl_Dm_An_data.o(.data) build/src/overlays/actors/ovl_Dm_An/z_dm_an.o(.rodata) - build/asm/ovl_Dm_An_rodata.o(.rodata) + build/asm/overlays/ovl_Dm_An_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -9075,9 +9075,9 @@ SECTIONS ovl_Dm_Ah : AT(RomLocation) { build/src/overlays/actors/ovl_Dm_Ah/z_dm_ah.o(.text) - build/asm/ovl_Dm_Ah_data.o(.data) + build/asm/overlays/ovl_Dm_Ah_data.o(.data) build/src/overlays/actors/ovl_Dm_Ah/z_dm_ah.o(.rodata) - build/asm/ovl_Dm_Ah_rodata.o(.rodata) + build/asm/overlays/ovl_Dm_Ah_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -9089,9 +9089,9 @@ SECTIONS ovl_Dm_Nb : AT(RomLocation) { build/src/overlays/actors/ovl_Dm_Nb/z_dm_nb.o(.text) - build/asm/ovl_Dm_Nb_data.o(.data) + build/asm/overlays/ovl_Dm_Nb_data.o(.data) build/src/overlays/actors/ovl_Dm_Nb/z_dm_nb.o(.rodata) - build/asm/ovl_Dm_Nb_rodata.o(.rodata) + build/asm/overlays/ovl_Dm_Nb_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -9103,9 +9103,9 @@ SECTIONS ovl_En_Drs : AT(RomLocation) { build/src/overlays/actors/ovl_En_Drs/z_en_drs.o(.text) - build/asm/ovl_En_Drs_data.o(.data) + build/asm/overlays/ovl_En_Drs_data.o(.data) build/src/overlays/actors/ovl_En_Drs/z_en_drs.o(.rodata) - build/asm/ovl_En_Drs_rodata.o(.rodata) + build/asm/overlays/ovl_En_Drs_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -9132,9 +9132,9 @@ SECTIONS ovl_Dm_Bal : AT(RomLocation) { build/src/overlays/actors/ovl_Dm_Bal/z_dm_bal.o(.text) - build/asm/ovl_Dm_Bal_data.o(.data) + build/asm/overlays/ovl_Dm_Bal_data.o(.data) build/src/overlays/actors/ovl_Dm_Bal/z_dm_bal.o(.rodata) - build/asm/ovl_Dm_Bal_rodata.o(.rodata) + build/asm/overlays/ovl_Dm_Bal_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -9146,9 +9146,9 @@ SECTIONS ovl_En_Paper : AT(RomLocation) { build/src/overlays/actors/ovl_En_Paper/z_en_paper.o(.text) - build/asm/ovl_En_Paper_data.o(.data) + build/asm/overlays/ovl_En_Paper_data.o(.data) build/src/overlays/actors/ovl_En_Paper/z_en_paper.o(.rodata) - build/asm/ovl_En_Paper_rodata.o(.rodata) + build/asm/overlays/ovl_En_Paper_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -9160,9 +9160,9 @@ SECTIONS ovl_En_Hint_Skb : AT(RomLocation) { build/src/overlays/actors/ovl_En_Hint_Skb/z_en_hint_skb.o(.text) - build/asm/ovl_En_Hint_Skb_data.o(.data) + build/asm/overlays/ovl_En_Hint_Skb_data.o(.data) build/src/overlays/actors/ovl_En_Hint_Skb/z_en_hint_skb.o(.rodata) - build/asm/ovl_En_Hint_Skb_rodata.o(.rodata) + build/asm/overlays/ovl_En_Hint_Skb_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -9174,9 +9174,9 @@ SECTIONS ovl_Dm_Tag : AT(RomLocation) { build/src/overlays/actors/ovl_Dm_Tag/z_dm_tag.o(.text) - build/asm/ovl_Dm_Tag_data.o(.data) + build/asm/overlays/ovl_Dm_Tag_data.o(.data) build/src/overlays/actors/ovl_Dm_Tag/z_dm_tag.o(.rodata) - build/asm/ovl_Dm_Tag_rodata.o(.rodata) + build/asm/overlays/ovl_Dm_Tag_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -9188,9 +9188,9 @@ SECTIONS ovl_En_Bh : AT(RomLocation) { build/src/overlays/actors/ovl_En_Bh/z_en_bh.o(.text) - build/asm/ovl_En_Bh_data.o(.data) + build/asm/overlays/ovl_En_Bh_data.o(.data) build/src/overlays/actors/ovl_En_Bh/z_en_bh.o(.rodata) - build/asm/ovl_En_Bh_rodata.o(.rodata) + build/asm/overlays/ovl_En_Bh_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -9262,9 +9262,9 @@ SECTIONS ovl_En_Ending_Hero6 : AT(RomLocation) { build/src/overlays/actors/ovl_En_Ending_Hero6/z_en_ending_hero6.o(.text) - build/asm/ovl_En_Ending_Hero6_data.o(.data) + build/asm/overlays/ovl_En_Ending_Hero6_data.o(.data) build/src/overlays/actors/ovl_En_Ending_Hero6/z_en_ending_hero6.o(.rodata) - build/asm/ovl_En_Ending_Hero6_rodata.o(.rodata) + build/asm/overlays/ovl_En_Ending_Hero6_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -9276,9 +9276,9 @@ SECTIONS ovl_Dm_Gm : AT(RomLocation) { build/src/overlays/actors/ovl_Dm_Gm/z_dm_gm.o(.text) - build/asm/ovl_Dm_Gm_data.o(.data) + build/asm/overlays/ovl_Dm_Gm_data.o(.data) build/src/overlays/actors/ovl_Dm_Gm/z_dm_gm.o(.rodata) - build/asm/ovl_Dm_Gm_rodata.o(.rodata) + build/asm/overlays/ovl_Dm_Gm_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -9290,9 +9290,9 @@ SECTIONS ovl_Obj_Swprize : AT(RomLocation) { build/src/overlays/actors/ovl_Obj_Swprize/z_obj_swprize.o(.text) - build/asm/ovl_Obj_Swprize_data.o(.data) + build/asm/overlays/ovl_Obj_Swprize_data.o(.data) build/src/overlays/actors/ovl_Obj_Swprize/z_obj_swprize.o(.rodata) - build/asm/ovl_Obj_Swprize_rodata.o(.rodata) + build/asm/overlays/ovl_Obj_Swprize_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -9304,9 +9304,9 @@ SECTIONS ovl_En_Invisible_Ruppe : AT(RomLocation) { build/src/overlays/actors/ovl_En_Invisible_Ruppe/z_en_invisible_ruppe.o(.text) - build/asm/ovl_En_Invisible_Ruppe_data.o(.data) + build/asm/overlays/ovl_En_Invisible_Ruppe_data.o(.data) build/src/overlays/actors/ovl_En_Invisible_Ruppe/z_en_invisible_ruppe.o(.rodata) - build/asm/ovl_En_Invisible_Ruppe_rodata.o(.rodata) + build/asm/overlays/ovl_En_Invisible_Ruppe_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -9318,9 +9318,9 @@ SECTIONS ovl_Obj_Ending : AT(RomLocation) { build/src/overlays/actors/ovl_Obj_Ending/z_obj_ending.o(.text) - build/asm/ovl_Obj_Ending_data.o(.data) + build/asm/overlays/ovl_Obj_Ending_data.o(.data) build/src/overlays/actors/ovl_Obj_Ending/z_obj_ending.o(.rodata) - build/asm/ovl_Obj_Ending_rodata.o(.rodata) + build/asm/overlays/ovl_Obj_Ending_rodata.o(.rodata) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; diff --git a/src/boot_O2/loadfragment2.c b/src/boot_O2/loadfragment2.c index c711e6175e..ba382dbd0a 100644 --- a/src/boot_O2/loadfragment2.c +++ b/src/boot_O2/loadfragment2.c @@ -56,7 +56,7 @@ void Load2_Relocate(u32 allocatedVRamAddr, OverlayBlockSizes* overlayInfo, u32 v } } #else -#pragma GLOBAL_ASM("./asm/non_matchings/loadfragment2/Load2_Relocate.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/boot/loadfragment2/Load2_Relocate.asm") #endif #ifdef NON_MATCHING @@ -92,7 +92,7 @@ s32 Load2_LoadOverlay(u32 vRomStart, u32 vRomEnd, u32 vRamStart, u32 vRamEnd, u3 return nbytes; } #else -#pragma GLOBAL_ASM("./asm/non_matchings/loadfragment2/Load2_LoadOverlay.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/boot/loadfragment2/Load2_LoadOverlay.asm") #endif void* Load2_AllocateAndLoad(u32 vRomStart, u32 vRomEnd, u32 vRamStart, u32 vRamEnd) { diff --git a/src/boot_O2/stackcheck.c b/src/boot_O2/stackcheck.c index 4c6ea91466..1c7790d97d 100644 --- a/src/boot_O2/stackcheck.c +++ b/src/boot_O2/stackcheck.c @@ -97,7 +97,7 @@ s32 StackCheck_GetState(StackEntry* entry) { return 0; } #else -#pragma GLOBAL_ASM("asm/non_matchings/stackcheck/StackCheck_GetState.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/boot/stackcheck/StackCheck_GetState.asm") #endif u32 StackCheck_CheckAll() { diff --git a/src/boot_O2_g3/idle.c b/src/boot_O2_g3/idle.c index 4cba6e49c1..f3c5f711c4 100644 --- a/src/boot_O2_g3/idle.c +++ b/src/boot_O2_g3/idle.c @@ -23,7 +23,7 @@ void Idle_InitFramebuffer(u32* ptr, u32 numBytes, u32 value) { } } #else -#pragma GLOBAL_ASM("./asm/non_matchings/idle/Idle_InitFramebuffer.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/boot/idle/Idle_InitFramebuffer.asm") #endif void Idle_InitScreen(void) { @@ -65,7 +65,7 @@ void Idle_InitCodeAndMemory(void) { Idle_ClearMemory(&code_bss_start, &code_bss_end); } #else -#pragma GLOBAL_ASM("./asm/non_matchings/idle/Idle_InitCodeAndMemory.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/boot/idle/Idle_InitCodeAndMemory.asm") #endif void Main_ThreadEntry(void* arg) { diff --git a/src/boot_O2_g3/viconfig.c b/src/boot_O2_g3/viconfig.c index f5a0eed3e2..c36f9b2e29 100644 --- a/src/boot_O2_g3/viconfig.c +++ b/src/boot_O2_g3/viconfig.c @@ -49,7 +49,7 @@ void ViConfig_UpdateVi(u32 arg0) { gViConfigUseDefault = arg0; } #else -#pragma GLOBAL_ASM("./asm/non_matchings/viconfig/ViConfig_UpdateVi.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/boot/viconfig/ViConfig_UpdateVi.asm") #endif void ViConfig_UpdateBlack(void) { diff --git a/src/boot_O2_g3/z_std_dma.c b/src/boot_O2_g3/z_std_dma.c index ea80097a6e..6b70433962 100644 --- a/src/boot_O2_g3/z_std_dma.c +++ b/src/boot_O2_g3/z_std_dma.c @@ -141,7 +141,7 @@ void DmaMgr_ProcessMsg(DmaRequest* a0) { } } #else -#pragma GLOBAL_ASM("./asm/non_matchings/z_std_dma/DmaMgr_ProcessMsg.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/boot/z_std_dma/DmaMgr_ProcessMsg.asm") #endif void Dmamgr_ThreadEntry(void* a0) { @@ -215,7 +215,7 @@ void Dmamgr_Start() { osStartThread(&dmamgrOSThread); } #else -#pragma GLOBAL_ASM("./asm/non_matchings/z_std_dma/Dmamgr_Start.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/boot/z_std_dma/Dmamgr_Start.asm") #endif void Dmamgr_Stop() { diff --git a/src/boot_O2_g3_trapuv/fault.c b/src/boot_O2_g3_trapuv/fault.c index a9bbf6a57f..80bb0c5cd4 100644 --- a/src/boot_O2_g3_trapuv/fault.c +++ b/src/boot_O2_g3_trapuv/fault.c @@ -45,7 +45,7 @@ end: } } #else -#pragma GLOBAL_ASM("./asm/non_matchings/fault/Fault_AddClient.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/boot/fault/Fault_AddClient.asm") #endif void Fault_RemoveClient(FaultClient* client) { @@ -119,7 +119,7 @@ end: } } #else -#pragma GLOBAL_ASM("./asm/non_matchings/fault/Fault_AddAddrConvClient.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/boot/fault/Fault_AddAddrConvClient.asm") #endif void Fault_RemoveAddrConvClient(FaultAddrConvClient* client) { @@ -233,7 +233,7 @@ s32 Fault_WaitForInputImpl() { return 0; } #else -#pragma GLOBAL_ASM("./asm/non_matchings/fault/Fault_WaitForInputImpl.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/boot/fault/Fault_WaitForInputImpl.asm") #endif void Fault_WaitForInput() { @@ -289,7 +289,7 @@ void Fault_LogFReg(s32 idx, f32* value) { } } #else -#pragma GLOBAL_ASM("./asm/non_matchings/fault/Fault_LogFReg.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/boot/fault/Fault_LogFReg.asm") #endif void Fault_PrintFPCR(u32 value) { @@ -574,7 +574,7 @@ void Fault_DrawMemDump(u32 pc, u32 sp, u32 unk0, u32 unk1) { faultCtxt->faultActive = 1; } #else -#pragma GLOBAL_ASM("./asm/non_matchings/fault/Fault_DrawMemDump.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/boot/fault/Fault_DrawMemDump.asm") #endif #ifdef NON_MATCHING @@ -635,7 +635,7 @@ void Fault_FindNextStackCall(u32** sp, u32** pc, u32** ra) { *ra = currentRa; } #else -#pragma GLOBAL_ASM("./asm/non_matchings/fault/Fault_FindNextStackCall.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/boot/fault/Fault_FindNextStackCall.asm") #endif void Fault_DrawStackTrace(OSThread* t, u32 flags) { @@ -733,7 +733,7 @@ void Fault_CommitFB() { FaultDrawer_SetDrawerFB(fb, 0x140, 0xF0); } #else -#pragma GLOBAL_ASM("./asm/non_matchings/fault/Fault_CommitFB.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/boot/fault/Fault_CommitFB.asm") #endif void Fault_ProcessClients(void) { @@ -788,7 +788,7 @@ void Fault_SetOptionsFromController3(void) { } } #else -#pragma GLOBAL_ASM("./asm/non_matchings/fault/Fault_SetOptionsFromController3.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/boot/fault/Fault_SetOptionsFromController3.asm") #endif void Fault_SetOptions(void) { diff --git a/src/boot_O2_g3_trapuv/fault_drawer.c b/src/boot_O2_g3_trapuv/fault_drawer.c index e8ce577bdd..b5710aba29 100644 --- a/src/boot_O2_g3_trapuv/fault_drawer.c +++ b/src/boot_O2_g3_trapuv/fault_drawer.c @@ -44,10 +44,10 @@ void FaultDrawer_DrawRecImpl(s32 xstart, s32 ystart, s32 xend, s32 yend, u16 col } } #else -#pragma GLOBAL_ASM("./asm/non_matchings/fault_drawer/FaultDrawer_DrawRecImpl.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/boot/fault_drawer/FaultDrawer_DrawRecImpl.asm") #endif -#pragma GLOBAL_ASM("./asm/non_matchings/fault_drawer/FaultDrawer_DrawChar.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/boot/fault_drawer/FaultDrawer_DrawChar.asm") s32 FaultDrawer_ColorToPrintColor(u16 color) { s32 i; @@ -110,15 +110,15 @@ void FaultDrawer_FillScreen() { FaultDrawer_SetCursor(sFaultDrawContext->xStart, sFaultDrawContext->yStart); } -#pragma GLOBAL_ASM("./asm/non_matchings/fault_drawer/FaultDrawer_FormatStringFunc.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/boot/fault_drawer/FaultDrawer_FormatStringFunc.asm") void FaultDrawer_VPrintf(char* str, char* args) { //va_list _Printf((printf_func)FaultDrawer_FormatStringFunc, sFaultDrawContext, str, args); } -#pragma GLOBAL_ASM("./asm/non_matchings/fault_drawer/FaultDrawer_Printf.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/boot/fault_drawer/FaultDrawer_Printf.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/fault_drawer/FaultDrawer_DrawText.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/boot/fault_drawer/FaultDrawer_DrawText.asm") void FaultDrawer_SetDrawerFB(void* fb, u16 w, u16 h) { sFaultDrawContext->fb = (u16*)fb; diff --git a/src/code/code_0x800AF710.c b/src/code/code_0x800AF710.c index fe50027839..33697927df 100644 --- a/src/code/code_0x800AF710.c +++ b/src/code/code_0x800AF710.c @@ -214,7 +214,7 @@ void Effect_DrawAll(GraphicsContext* gCtxt) { } } #else -#pragma GLOBAL_ASM("./asm/non_matchings/code_0x800AF710/Effect_DrawAll.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/code_0x800AF710/Effect_DrawAll.asm") #endif #ifdef NON_MATCHING @@ -255,7 +255,7 @@ void Effect_UpdateAll(GlobalContext* ctxt) { } } #else -#pragma GLOBAL_ASM("./asm/non_matchings/code_0x800AF710/Effect_UpdateAll.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/code_0x800AF710/Effect_UpdateAll.asm") #endif void Effect_Destroy(GlobalContext* ctxt, s32 index) { diff --git a/src/code/z_actor.c b/src/code/z_actor.c index 6715613ece..2a9b9af6e0 100644 --- a/src/code/z_actor.c +++ b/src/code/z_actor.c @@ -5,7 +5,7 @@ #define ABS(x) ((x) < 0 ? -(x) : (x)) #define DECR(x) ((x) == 0 ? 0 : ((x) -= 1)) -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//Actor_PrintLists.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//Actor_PrintLists.asm") void Actor_SetDrawParams(ActorShape* actorShape, f32 yOffset, ActorShadowFunc func, f32 scale) { actorShape->yOffset = yOffset; @@ -14,33 +14,33 @@ void Actor_SetDrawParams(ActorShape* actorShape, f32 yOffset, ActorShadowFunc fu actorShape->shadowAlpha = 255; } -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//Actor_PostDraw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//Actor_PostDraw.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B3FC0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B3FC0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B4024.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B4024.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B4088.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B4088.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B40B8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B40B8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B40E0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B40E0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B42F8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B42F8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B4A98.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B4A98.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B4AEC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B4AEC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B4B50.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B4B50.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B4EDC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B4EDC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B4F40.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B4F40.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B4F78.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B4F78.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B5040.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B5040.asm") void Actor_TargetContextInit(TargetContext* targetCtxt, Actor* actor, GlobalContext* ctxt) { targetCtxt->unk90 = NULL; @@ -54,9 +54,9 @@ void Actor_TargetContextInit(TargetContext* targetCtxt, Actor* actor, GlobalCont func_800B4F78(targetCtxt, actor->category, ctxt); } -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B5208.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B5208.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B5814.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B5814.asm") u32 Actor_GetSwitchFlag(GlobalContext* ctxt, s32 flag) { if (flag >= 0 && flag < 0x80) { @@ -147,7 +147,7 @@ void Actor_TitleCardCreate(GlobalContext* ctxt, TitleCardContext* titleCtxt, u32 titleCtxt->fadeInDelay = 0; } -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//Actor_Nop800B5E50.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//Actor_Nop800B5E50.asm") void Actor_TitleCardUpdate(GlobalContext* ctxt, TitleCardContext* titleCtxt) { if (DECR(titleCtxt->fadeInDelay) == 0) { @@ -161,23 +161,23 @@ void Actor_TitleCardUpdate(GlobalContext* ctxt, TitleCardContext* titleCtxt) { } } -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//Actor_TitleCardDraw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//Actor_TitleCardDraw.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B6434.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B6434.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B6468.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B6468.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B6474.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B6474.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B648C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B648C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B64FC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B64FC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B6584.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B6584.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B6608.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B6608.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B6680.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B6680.asm") void Actor_MarkForDeath(Actor* actor) { actor->draw = NULL; @@ -245,7 +245,7 @@ void Actor_InitToDefaultValues(Actor* actor, GlobalContext* ctxt) { } } #else -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//Actor_InitToDefaultValues.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//Actor_InitToDefaultValues.asm") #endif void Actor_FiniActor(Actor* actor, GlobalContext* ctxt) { @@ -268,7 +268,7 @@ void Actor_ApplyMovement(Actor* actor) { actor->world.pos.z += ((actor->velocity.z * actorMovementScale) + actor->colChkInfo.displacement.z); } #else -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//Actor_ApplyMovement.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//Actor_ApplyMovement.asm") #endif #ifdef NON_MATCHING @@ -282,7 +282,7 @@ void Actor_SetVelocityYRotationAndGravity(Actor* actor) { } } #else -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//Actor_SetVelocityYRotationAndGravity.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//Actor_SetVelocityYRotationAndGravity.asm") #endif void Actor_SetVelocityAndMoveYRotationAndGravity(Actor* actor) { @@ -314,9 +314,9 @@ void Actor_SetVelocityAndMoveXYRotationReverse(Actor* actor) { Actor_ApplyMovement(actor); } -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B6C04.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B6C04.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B6C58.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B6C58.asm") s16 Actor_YawBetweenActors(Actor* from, Actor* to) { return Math_Vec3f_Yaw(&from->world.pos, &to->world.pos); @@ -377,38 +377,38 @@ f32 Actor_YDistance(Actor* actor1, Actor* actor2) { return actor2->world.pos.y - actor1->world.pos.y; } -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B6F20.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B6F20.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B6FC8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B6FC8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B7090.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B7090.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B7118.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B7118.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B7128.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B7128.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B715C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B715C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B7170.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B7170.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B71DC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B71DC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B7200.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B7200.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B722C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B722C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B724C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B724C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B7298.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B7298.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B72E0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B72E0.asm") void func_800B72F8(DynaPolyActor* dpactor, f32 a1, s16 a2) { dpactor->unk150 = a2; dpactor->unk148 += a1; } -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//Actor_IsLinkFacingActor.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//Actor_IsLinkFacingActor.asm") s32 Actor_IsActorFacedByActor(Actor* actor, Actor* other, s16 tolerance) { s16 angle; @@ -442,7 +442,7 @@ s32 Actor_IsActorFacingActor(Actor* actor, Actor* other, s16 tolerance) { return 0; } -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//Actor_IsActorFacingLinkAndWithinRange.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//Actor_IsActorFacingLinkAndWithinRange.asm") s32 Actor_IsActorFacingActorAndWithinRange(Actor* actor, Actor* other, f32 range, s16 tolerance) { s16 dist; @@ -456,65 +456,65 @@ s32 Actor_IsActorFacingActorAndWithinRange(Actor* actor, Actor* other, f32 range return 0; } -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B75A0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B75A0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B761C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B761C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B7678.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B7678.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B78B8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B78B8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B7E04.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B7E04.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B7FE0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B7FE0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B8018.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B8018.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B8050.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B8050.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B8118.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B8118.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B81E0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B81E0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B8214.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B8214.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B8248.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B8248.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B82EC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B82EC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B83BC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B83BC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B83F8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B83F8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B84D0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B84D0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B8500.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B8500.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B85E0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B85E0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B8614.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B8614.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B863C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B863C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B867C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B867C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B86C8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B86C8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B8708.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B8708.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B8718.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B8718.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B874C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B874C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B8804.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B8804.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B882C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B882C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B886C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B886C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B8898.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B8898.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B8934.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B8934.asm") u32 Actor_HasParent(Actor* actor, GlobalContext* ctxt) { if (actor->parent != NULL) { @@ -524,102 +524,102 @@ u32 Actor_HasParent(Actor* actor, GlobalContext* ctxt) { } } -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B8A1C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B8A1C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B8B84.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B8B84.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B8BB0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B8BB0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B8BD0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B8BD0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B8BFC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B8BFC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B8C20.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B8C20.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B8C50.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B8C50.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B8C78.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B8C78.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B8C9C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B8C9C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B8CEC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B8CEC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B8D10.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B8D10.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B8D50.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B8D50.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B8D98.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B8D98.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B8DD4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B8DD4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B8E1C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B8E1C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B8E58.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B8E58.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B8EC8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B8EC8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B8EF4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B8EF4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B8F98.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B8F98.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B8FC0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B8FC0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B8FE8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B8FE8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B9010.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B9010.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B9038.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B9038.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B9084.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B9084.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B9098.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B9098.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B90AC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B90AC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B90F4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B90F4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B9120.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B9120.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//Actor_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//Actor_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B9334.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B9334.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//Actor_UpdateActor.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//Actor_UpdateActor.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//Actor_UpdateAll.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//Actor_UpdateAll.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//Actor_DrawActor.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//Actor_DrawActor.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B9D1C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B9D1C.asm") void Actor_DrawAllSetup(GlobalContext* ctxt) { ctxt->actorCtx.undrawnActorCount = 0; ctxt->actorCtx.unkB = 0; } -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//Actor_RecordUndrawnActor.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//Actor_RecordUndrawnActor.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B9E84.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B9E84.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B9EF4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B9EF4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800BA2D8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BA2D8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800BA2FC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BA2FC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//Actor_DrawAll.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//Actor_DrawAll.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800BA6FC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BA6FC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800BA798.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BA798.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800BA8B8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BA8B8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800BA9B4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BA9B4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//Actor_InsertIntoTypeList.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//Actor_InsertIntoTypeList.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//Actor_RemoveFromTypeList.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//Actor_RemoveFromTypeList.asm") void Actor_FreeOverlay(ActorOverlay* entry) { void* ramAddr; @@ -641,126 +641,126 @@ void Actor_FreeOverlay(ActorOverlay* entry) { } } -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//Actor_Spawn.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//Actor_Spawn.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//Actor_LoadOverlay.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//Actor_LoadOverlay.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//Actor_SpawnWithParentAndCutscene.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//Actor_SpawnWithParentAndCutscene.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//Actor_SpawnWithParent.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//Actor_SpawnWithParent.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//Actor_SpawnTransitionActors.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//Actor_SpawnTransitionActors.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800BB2D0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BB2D0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800BB498.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BB498.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800BB59C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BB59C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800BB604.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BB604.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800BB8EC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BB8EC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800BBA88.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BBA88.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800BBAC0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BBAC0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800BBB74.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BBB74.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800BBC20.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BBC20.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800BBCEC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BBCEC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800BBDAC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BBDAC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800BBFB0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BBFB0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800BC154.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BC154.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800BC188.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BC188.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800BC1B4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BC1B4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800BC270.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BC270.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800BC444.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BC444.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800BC4EC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BC4EC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800BC5B8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BC5B8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800BC5EC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BC5EC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800BC620.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BC620.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800BC770.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BC770.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800BC7D8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BC7D8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800BC848.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BC848.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800BC8B8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BC8B8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800BCB50.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BCB50.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800BCB70.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BCB70.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800BCBF4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BCBF4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800BCC68.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BCC68.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800BCCDC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BCCDC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800BD2B4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BD2B4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800BD384.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BD384.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800BD6B8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BD6B8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800BD6E4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BD6E4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800BD888.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BD888.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800BD9A0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BD9A0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800BD9E0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BD9E0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800BDAA0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BDAA0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800BDB6C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BDB6C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800BDC5C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BDC5C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800BDCF4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BDCF4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800BDFB0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BDFB0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800BDFC0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BDFC0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800BE03C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BE03C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800BE0B8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BE0B8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800BE184.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BE184.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800BE22C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BE22C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800BE258.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BE258.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800BE2B8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BE2B8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800BE33C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BE33C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800BE3D0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BE3D0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800BE504.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BE504.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800BE568.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BE568.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800BE5CC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BE5CC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800BE63C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BE63C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800BE680.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BE680.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800BF7CC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BF7CC.asm") diff --git a/src/code/z_bgcheck.c b/src/code/z_bgcheck.c index e4dec7c488..36ce943f5d 100644 --- a/src/code/z_bgcheck.c +++ b/src/code/z_bgcheck.c @@ -64,369 +64,369 @@ void BgCheck_CreateVertexFromVec3f(BgVertex* vertex, Vec3f* vector) { vertex->pos.z = vector->z; } -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800BFD84.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800BFD84.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800BFDEC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800BFDEC.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/BgCheck_PolygonGetMinY.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/BgCheck_PolygonGetMinY.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/BgCheck_PolygonGetNormal.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/BgCheck_PolygonGetNormal.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C0094.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C0094.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C01B8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C01B8.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/BgCheck_CreateColTriParamsFromPolygon.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/BgCheck_CreateColTriParamsFromPolygon.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C02C0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C02C0.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C0340.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C0340.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C0474.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C0474.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C0668.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C0668.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C06A8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C06A8.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C074C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C074C.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C07F0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C07F0.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/BgCheck_PolygonCollidesWithSphere.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/BgCheck_PolygonCollidesWithSphere.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/BgCheck_ScenePolygonListsInsertSorted.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/BgCheck_ScenePolygonListsInsertSorted.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/BgCheck_ScenePolygonListsInsert.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/BgCheck_ScenePolygonListsInsert.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C0E74.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C0E74.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C10FC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C10FC.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C1238.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C1238.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C12A4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C12A4.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C1B68.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C1B68.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C1D7C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C1D7C.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C2008.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C2008.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C20F4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C20F4.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C2310.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C2310.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C2460.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C2460.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C2514.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C2514.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C25E0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C25E0.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/BgCheck_GetPolyMinSubdivisions.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/BgCheck_GetPolyMinSubdivisions.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/BgCheck_GetPolyMaxSubdivisions.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/BgCheck_GetPolyMaxSubdivisions.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/BgCheck_GetPolyMinMaxSubdivisions.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/BgCheck_GetPolyMinMaxSubdivisions.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C2BE0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C2BE0.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/BgCheck_SplitScenePolygonsIntoSubdivisions.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/BgCheck_SplitScenePolygonsIntoSubdivisions.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/BgCheck_GetIsDefaultSpecialScene.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/BgCheck_GetIsDefaultSpecialScene.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/BgCheck_GetSpecialSceneMaxMemory.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/BgCheck_GetSpecialSceneMaxMemory.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/BgCheck_CalcSubdivisionSize.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/BgCheck_CalcSubdivisionSize.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/BgCheck_GetSpecialSceneMaxObjects.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/BgCheck_GetSpecialSceneMaxObjects.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/BgCheck_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/BgCheck_Init.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C3C00.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C3C00.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C3C14.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C3C14.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/BgCheck_GetActorMeshHeader.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/BgCheck_GetActorMeshHeader.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C3C94.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C3C94.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C3D50.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C3D50.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C3F40.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C3F40.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C3FA0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C3FA0.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C4000.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C4000.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C4058.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C4058.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C40B4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C40B4.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C411C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C411C.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C4188.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C4188.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C41E4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C41E4.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C4240.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C4240.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C42A8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C42A8.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C4314.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C4314.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C43CC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C43CC.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C4488.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C4488.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C44F0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C44F0.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C455C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C455C.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C45C4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C45C4.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C4C74.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C4C74.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C4CD8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C4CD8.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C4D3C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C4D3C.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C4DA4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C4DA4.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C4E10.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C4E10.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C4F38.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C4F38.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C4F84.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C4F84.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C4FD4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C4FD4.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C5464.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C5464.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C54AC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C54AC.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C5538.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C5538.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C55C4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C55C4.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C5650.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C5650.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C56E0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C56E0.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C576C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C576C.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C57F8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C57F8.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C583C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C583C.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C58C8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C58C8.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C5954.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C5954.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C5A20.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C5A20.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C5A64.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C5A64.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/BgCheck_ScenePolygonListsInit.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/BgCheck_ScenePolygonListsInit.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/BgCheck_ScenePolygonListsAlloc.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/BgCheck_ScenePolygonListsAlloc.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C5B80.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C5B80.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/BgCheck_ScenePolygonListsReserveNode.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/BgCheck_ScenePolygonListsReserveNode.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/BgCheck_ActorMeshParamsInit.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/BgCheck_ActorMeshParamsInit.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/BgCheck_SetActorMeshParams.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/BgCheck_SetActorMeshParams.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/BgCheck_AreActorMeshParamsEqual.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/BgCheck_AreActorMeshParamsEqual.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/BgCheck_ActorMeshPolyListsHeadsInit.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/BgCheck_ActorMeshPolyListsHeadsInit.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/BgCheck_ActorMeshPolyListsInit.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/BgCheck_ActorMeshPolyListsInit.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/BgCheck_ActorMeshVerticesIndexInit.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/BgCheck_ActorMeshVerticesIndexInit.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/BgCheck_ActorMeshWaterboxesIndexInit.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/BgCheck_ActorMeshWaterboxesIndexInit.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/BgCheck_ActorMeshInit.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/BgCheck_ActorMeshInit.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/BgCheck_ActorMeshInitFromActor.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/BgCheck_ActorMeshInitFromActor.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/BgCheck_HasActorMeshChanged.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/BgCheck_HasActorMeshChanged.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/BgCheck_PolygonsInit.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/BgCheck_PolygonsInit.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/BgCheck_PolygonsAlloc.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/BgCheck_PolygonsAlloc.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/BgCheck_VerticesInit.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/BgCheck_VerticesInit.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/BgCheck_VerticesListAlloc.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/BgCheck_VerticesListAlloc.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/BgCheck_WaterboxListInit.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/BgCheck_WaterboxListInit.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/BgCheck_WaterboxListAlloc.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/BgCheck_WaterboxListAlloc.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/BgCheck_ActorMeshUpdateParams.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/BgCheck_ActorMeshUpdateParams.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/BgCheck_IsActorMeshIndexValid.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/BgCheck_IsActorMeshIndexValid.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/BgCheck_DynaInit.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/BgCheck_DynaInit.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/BgCheck_DynaAlloc.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/BgCheck_DynaAlloc.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/BgCheck_AddActorMesh.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/BgCheck_AddActorMesh.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/BgCheck_GetActorOfMesh.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/BgCheck_GetActorOfMesh.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C62BC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C62BC.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C6314.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C6314.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C636C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C636C.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C63C4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C63C4.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C641C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C641C.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C6474.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C6474.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/BgCheck_RemoveActorMesh.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/BgCheck_RemoveActorMesh.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C6554.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C6554.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/BgCheck_CalcWaterboxDimensions.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/BgCheck_CalcWaterboxDimensions.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/BgCheck_AddActorMeshToLists.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/BgCheck_AddActorMeshToLists.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/BgCheck_ResetFlagsIfLoadedActor.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/BgCheck_ResetFlagsIfLoadedActor.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/BgCheck_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/BgCheck_Update.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C756C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C756C.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/BgCheck_UpdateAllActorMeshes.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/BgCheck_UpdateAllActorMeshes.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C76EC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C76EC.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C7974.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C7974.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C7E40.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C7E40.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C8580.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C8580.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C87D0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C87D0.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C8A60.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C8A60.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C8BD0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C8BD0.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C8DC0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C8DC0.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C8EEC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C8EEC.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C90AC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C90AC.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C921C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C921C.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C9380.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C9380.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/BgCheck_RelocateMeshHeaderPointers.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/BgCheck_RelocateMeshHeaderPointers.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/BgCheck_RelocateMeshHeader.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/BgCheck_RelocateMeshHeader.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/BgCheck_RelocateAllMeshHeaders.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/BgCheck_RelocateAllMeshHeaders.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C9640.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C9640.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/BgCheck_GetPolygonAttributes.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/BgCheck_GetPolygonAttributes.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C9704.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C9704.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C9728.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C9728.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C9770.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C9770.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C97F8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C97F8.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C9844.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C9844.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C98CC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C98CC.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C9924.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C9924.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C99AC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C99AC.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C99D4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C99D4.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C99FC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C99FC.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C9A24.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C9A24.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C9A4C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C9A4C.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C9A7C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C9A7C.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C9AB0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C9AB0.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C9AE4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C9AE4.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C9B18.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C9B18.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C9B40.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C9B40.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C9B68.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C9B68.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C9B90.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C9B90.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C9BB8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C9BB8.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C9BDC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C9BDC.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C9C24.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C9C24.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C9C74.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C9C74.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C9C9C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C9C9C.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C9CC4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C9CC4.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C9CEC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C9CEC.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C9D14.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C9D14.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C9D50.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C9D50.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C9D8C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C9D8C.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C9DDC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C9DDC.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C9E18.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C9E18.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C9E40.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C9E40.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C9E88.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C9E88.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C9EBC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C9EBC.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800CA1AC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800CA1AC.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800CA1E8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800CA1E8.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800CA22C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800CA22C.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800CA568.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800CA568.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800CA634.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800CA634.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800CA648.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800CA648.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800CA6B8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800CA6B8.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800CA6D8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800CA6D8.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800CA6F0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800CA6F0.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800CA9D0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800CA9D0.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800CAA14.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800CAA14.asm") diff --git a/src/code/z_effect_soft_sprite.c b/src/code/z_effect_soft_sprite.c index f4d1d12dfe..19478622f7 100644 --- a/src/code/z_effect_soft_sprite.c +++ b/src/code/z_effect_soft_sprite.c @@ -145,7 +145,7 @@ s32 EffectSS_FindFreeSpace(u32 priority, u32* tableEntry) { return ret; } #else -#pragma GLOBAL_ASM("./asm/non_matchings/z_effect_soft_sprite/EffectSS_FindFreeSpace.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_effect_soft_sprite/EffectSS_FindFreeSpace.asm") #endif void EffectSS_Copy(GlobalContext* ctxt, LoadedParticleEntry* a1) { @@ -208,7 +208,7 @@ void EffectSS_LoadParticle(GlobalContext* ctxt, u32 type, u32 priority, void* in } } #else -#pragma GLOBAL_ASM("./asm/non_matchings/z_effect_soft_sprite/EffectSS_LoadParticle.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_effect_soft_sprite/EffectSS_LoadParticle.asm") #endif void EffectSS_UpdateParticle(GlobalContext* ctxt, s32 index) { @@ -291,7 +291,7 @@ s16 func_800B096C(s16 a0, s16 a1, s32 a2) { return ret; } #else -#pragma GLOBAL_ASM("./asm/non_matchings/z_effect_soft_sprite/func_800B096C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_effect_soft_sprite/func_800B096C.asm") #endif s16 func_800B09D0(s16 a0, s16 a1, f32 a2) { diff --git a/src/code/z_lib.c b/src/code/z_lib.c index a974790cc5..fb02269fae 100644 --- a/src/code/z_lib.c +++ b/src/code/z_lib.c @@ -25,7 +25,7 @@ void* Lib_MemSet(u8* a0, u32 a1, u32 a2) { return a0; } #else -#pragma GLOBAL_ASM("./asm/non_matchings/z_lib/Lib_MemSet.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_lib/Lib_MemSet.asm") #endif f32 Math_Coss(s16 angle) { @@ -149,7 +149,7 @@ s32 Lib_StepTowardsCheck_f(f32* start, f32 target, f32 step) { return 0; } #else -#pragma GLOBAL_ASM("./asm/non_matchings/z_lib/Lib_StepTowardsCheck_f.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_lib/Lib_StepTowardsCheck_f.asm") #endif #ifdef NON_MATCHING @@ -168,7 +168,7 @@ s32 func_800FF0D0(s16* a0, s16 a1, s16 a2) { return 0; } #else -#pragma GLOBAL_ASM("./asm/non_matchings/z_lib/func_800FF0D0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_lib/func_800FF0D0.asm") #endif #ifdef NON_MATCHING @@ -176,7 +176,7 @@ void func_800FF138() { } #else -#pragma GLOBAL_ASM("./asm/non_matchings/z_lib/func_800FF138.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_lib/func_800FF138.asm") #endif #ifdef NON_MATCHING @@ -184,7 +184,7 @@ void func_800FF1FC(void) { } #else -#pragma GLOBAL_ASM("./asm/non_matchings/z_lib/func_800FF1FC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_lib/func_800FF1FC.asm") #endif #ifdef NON_MATCHING @@ -192,7 +192,7 @@ void func_800FF2A8(void) { } #else -#pragma GLOBAL_ASM("./asm/non_matchings/z_lib/func_800FF2A8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_lib/func_800FF2A8.asm") #endif #ifdef NON_MATCHING @@ -201,7 +201,7 @@ void func_800FF2F8(void) { } #else -#pragma GLOBAL_ASM("./asm/non_matchings/z_lib/func_800FF2F8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_lib/func_800FF2F8.asm") #endif #ifdef NON_MATCHING @@ -209,7 +209,7 @@ void func_800FF3A0(void) { } #else -#pragma GLOBAL_ASM("./asm/non_matchings/z_lib/func_800FF3A0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_lib/func_800FF3A0.asm") #endif s16 Math_Rand_S16Offset(s16 base, s16 range) { @@ -363,7 +363,7 @@ void Math_Vec3f_PushAwayXZ(Vec3f* start, Vec3f* pusher, f32 distanceToApproach) start->z = pusher->z + sp20 * f2; } #else -#pragma GLOBAL_ASM("./asm/non_matchings/z_lib/Math_Vec3f_PushAwayXZ.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_lib/Math_Vec3f_PushAwayXZ.asm") #endif f32 Math_Vec3f_DiffY(Vec3f* a, Vec3f* b) { @@ -518,7 +518,7 @@ s32 Math_SmoothScaleMaxMinS(s16* start, s16 target, s16 scale, s16 maxStep, s16 } #else -#pragma GLOBAL_ASM("./asm/non_matchings/z_lib/Math_SmoothScaleMaxMinS.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_lib/Math_SmoothScaleMaxMinS.asm") #endif void Math_SmoothScaleMaxS(s16* start, s16 target, s16 scale, s16 maxStep) { @@ -576,7 +576,7 @@ void Lib_LerpRGB(RGB* a, RGB* b, f32 t, RGB* dst) { dst->blue = (f32)a->blue + ((f32)b->blue - (f32)a->blue) * t; } #else -#pragma GLOBAL_ASM("./asm/non_matchings/z_lib/Lib_LerpRGB.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_lib/Lib_LerpRGB.asm") #endif f32 Lib_PushAwayVec3f(Vec3f* start, Vec3f* pusher, f32 distanceToApproach) { diff --git a/src/code/z_lights.c b/src/code/z_lights.c index c1044254d0..7ed0b0951d 100644 --- a/src/code/z_lights.c +++ b/src/code/z_lights.c @@ -70,7 +70,7 @@ void Lights_UploadLights(LightMapper* mapper, GraphicsContext* gCtxt) { gSPLight(gCtxt->polyXlu.p++, &mapper->lights.a, i); } #else -#pragma GLOBAL_ASM("asm/non_matchings/z_lights/Lights_UploadLights.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_lights/Lights_UploadLights.asm") #endif Light* Lights_MapperGetNextFreeSlot(LightMapper* mapper) { @@ -126,7 +126,7 @@ void Lights_MapPositionalWithReference(LightMapper* mapper, LightInfoPositionalP } } #else -#pragma GLOBAL_ASM("asm/non_matchings/z_lights/Lights_MapPositionalWithReference.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_lights/Lights_MapPositionalWithReference.asm") #endif // This function matches, but uses .rodata. We don't have a good way to match partial .rodata for a file yet. @@ -172,7 +172,7 @@ void Lights_MapPositional(LightMapper* mapper, LightInfoPositionalParams* params } } #else -#pragma GLOBAL_ASM("asm/non_matchings/z_lights/Lights_MapPositional.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_lights/Lights_MapPositional.asm") #endif void Lights_MapDirectional(LightMapper* mapper, LightInfoDirectionalParams* params, GlobalContext* ctxt) { @@ -393,7 +393,7 @@ void func_80102880(GlobalContext* ctxt) { } } #else -#pragma GLOBAL_ASM("asm/non_matchings/z_lights/func_80102880.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_lights/func_80102880.asm") #endif // XXX regalloc @@ -440,5 +440,5 @@ void func_80102A64(GlobalContext* ctxt) { } } #else -#pragma GLOBAL_ASM("asm/non_matchings/z_lights/func_80102A64.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_lights/func_80102A64.asm") #endif diff --git a/src/code/z_prenmi.c b/src/code/z_prenmi.c index 5a9fee3cb9..53120b88db 100644 --- a/src/code/z_prenmi.c +++ b/src/code/z_prenmi.c @@ -30,7 +30,7 @@ void PreNMI_Draw(PreNMIContext* prenmiCtx) { gDPFillRectangle(gfxCtx->polyOpa.p++, 0, prenmiCtx->timer + 100, 320 /*SCREEN_WIDTH*/ - 1, prenmiCtx->timer + 100); } #else -#pragma GLOBAL_ASM("asm/non_matchings/z_prenmi/PreNMI_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_prenmi/PreNMI_Draw.asm") #endif void PreNMI_Main(PreNMIContext* prenmiCtx) { diff --git a/src/code/z_rcp.c b/src/code/z_rcp.c index 302e1151b6..beb04ef707 100644 --- a/src/code/z_rcp.c +++ b/src/code/z_rcp.c @@ -1303,7 +1303,7 @@ void func_8012CF0C(GraphicsContext* gCtxt, s32 iParm2, s32 iParm3, u8 r, u8 g, u } } #else -#pragma GLOBAL_ASM("asm/non_matchings/z_rcp/func_8012CF0C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_rcp/func_8012CF0C.asm") #endif void func_8012D374(GraphicsContext* gCtxt, u8 r, u8 g, u8 b) { diff --git a/src/code/z_room.c b/src/code/z_room.c index 65c8e82da6..2c04cabe86 100644 --- a/src/code/z_room.c +++ b/src/code/z_room.c @@ -42,13 +42,13 @@ void Room_DrawType0Mesh(GlobalContext* ctxt, Room* room, u32 flags) { } } -#pragma GLOBAL_ASM("asm/non_matchings/z_room/Room_DrawType2Mesh.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_room/Room_DrawType2Mesh.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_room/func_8012DEE8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_room/func_8012DEE8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_room/func_8012E254.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_room/func_8012E254.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_room/func_8012E32C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_room/func_8012E32C.asm") void Room_DrawType1Mesh(GlobalContext* ctxt, Room* room, u32 flags) { RoomMeshType1* mesh = &room->mesh->type1; @@ -72,7 +72,7 @@ void Room_Init(GlobalContext* ctxt, RoomContext* roomCtxt) { } } -#pragma GLOBAL_ASM("asm/non_matchings/z_room/Room_AllocateAndLoad.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_room/Room_AllocateAndLoad.asm") #ifdef NON_MATCHING s32 Room_StartRoomTransition(GlobalContext* ctxt, RoomContext* roomCtxt, s32 index) { @@ -99,7 +99,7 @@ s32 Room_StartRoomTransition(GlobalContext* ctxt, RoomContext* roomCtxt, s32 ind return 0; } #else -#pragma GLOBAL_ASM("asm/non_matchings/z_room/Room_StartRoomTransition.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_room/Room_StartRoomTransition.asm") #endif s32 Room_HandleLoadCallbacks(GlobalContext* ctxt, RoomContext* roomCtxt) { diff --git a/src/code/z_scene_proc.c b/src/code/z_scene_proc.c index 6d2d5bd674..11e6fa832d 100644 --- a/src/code/z_scene_proc.c +++ b/src/code/z_scene_proc.c @@ -104,7 +104,7 @@ void SceneProc_DrawFlashingTexture(GlobalContext* ctxt, u32 segment, FlashingTex gSPEndDisplayList(dl++); } #else -#pragma GLOBAL_ASM("./asm/non_matchings/z_scene_proc/SceneProc_DrawFlashingTexture.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_scene_proc/SceneProc_DrawFlashingTexture.asm") #endif void SceneProc_DrawType2Texture(GlobalContext* ctxt, u32 segment, FlashingTextureParams* params) { @@ -188,10 +188,10 @@ void SceneProc_DrawType3Texture(GlobalContext* ctxt, u32 segment, FlashingTextur SceneProc_DrawFlashingTexture(ctxt, segment, &primColorIn, envColorPtrIn); } #else -#pragma GLOBAL_ASM("./asm/non_matchings/z_scene_proc/SceneProc_DrawType3Texture.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_scene_proc/SceneProc_DrawType3Texture.asm") #endif -#pragma GLOBAL_ASM("./asm/non_matchings/z_scene_proc/SceneProc_Interpolate.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_scene_proc/SceneProc_Interpolate.asm") u8 SceneProc_InterpolateClamped(u32 numKeyFrames, f32* keyFrames, f32* values, f32 frame) { s32 ret = SceneProc_Interpolate(numKeyFrames, keyFrames, values, frame); @@ -201,7 +201,7 @@ u8 SceneProc_InterpolateClamped(u32 numKeyFrames, f32* keyFrames, f32* values, f ret; } -#pragma GLOBAL_ASM("./asm/non_matchings/z_scene_proc/SceneProc_DrawType4Texture.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_scene_proc/SceneProc_DrawType4Texture.asm") void SceneProc_DrawType5Texture(GlobalContext* ctxt, u32 segment, CyclingTextureParams* params) { u8* offsets; @@ -332,7 +332,7 @@ void SceneProc_DrawSceneConfig3(GlobalContext* ctxt) { gDPSetEnvColor(gfxCtx->polyOpa.p++, 0x80, 0x80, 0x80, 0x80); } #else -#pragma GLOBAL_ASM("./asm/non_matchings/z_scene_proc/SceneProc_DrawSceneConfig3.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_scene_proc/SceneProc_DrawSceneConfig3.asm") #endif void SceneProc_DrawSceneConfig4(GlobalContext* ctxt) { diff --git a/src/code/z_skelanime.c b/src/code/z_skelanime.c index 98c5eb6566..c85e83d8d2 100644 --- a/src/code/z_skelanime.c +++ b/src/code/z_skelanime.c @@ -848,7 +848,7 @@ Gfx* SkelAnime_DrawSV2(GlobalContext* globalCtx, Skeleton* skeleton, Vec3s* limb } //Function is unused. -#pragma GLOBAL_ASM("asm/non_matchings/z_skelanime/func_80134FFC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_skelanime/func_80134FFC.asm") s16 func_801353D4(GenericAnimationHeader* animationSeg) { GenericAnimationHeader* animation = Lib_PtrSegToVirt(animationSeg); diff --git a/src/code/z_view.c b/src/code/z_view.c index d583c2b136..f72b77ec0b 100644 --- a/src/code/z_view.c +++ b/src/code/z_view.c @@ -349,7 +349,7 @@ s32 View_RenderToPerspectiveMatrix(View* view) { return 1; } #else -#pragma GLOBAL_ASM("asm/non_matchings/z_view/View_RenderToPerspectiveMatrix.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_view/View_RenderToPerspectiveMatrix.asm") #endif #ifdef NON_MATCHING @@ -393,12 +393,12 @@ s32 View_RenderToOrthographicMatrix(View* view) { return 1; } #else -#pragma GLOBAL_ASM("asm/non_matchings/z_view/View_RenderToOrthographicMatrix.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_view/View_RenderToOrthographicMatrix.asm") #endif -#pragma GLOBAL_ASM("asm/non_matchings/z_view/func_8013FBC8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_view/func_8013FBC8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/z_view/func_8013FD74.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_view/func_8013FD74.asm") s32 func_80140024(View* view) { guLookAt(view->viewingPtr, view->eye.x, view->eye.y, view->eye.z, @@ -411,5 +411,5 @@ s32 func_80140024(View* view) { return 1; } -#pragma GLOBAL_ASM("asm/non_matchings/z_view/func_801400CC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_view/func_801400CC.asm") 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 43579cd142..7f3a9cdadd 100644 --- a/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c +++ b/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c @@ -23,22 +23,22 @@ const ActorInit Arrow_Fire_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Arrow_Fire_0x80920340/FireArrow_SetUpdateFunc.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Arrow_Fire_0x80920340/FireArrow_SetUpdateFunc.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Arrow_Fire_0x80920340/ArrowFire_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Arrow_Fire_0x80920340/ArrowFire_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Arrow_Fire_0x80920340/ArrowFire_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Arrow_Fire_0x80920340/ArrowFire_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Arrow_Fire_0x80920340/FireArrow_Update1.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Arrow_Fire_0x80920340/FireArrow_Update1.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Arrow_Fire_0x80920340/FireArrow_Lerp.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Arrow_Fire_0x80920340/FireArrow_Lerp.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Arrow_Fire_0x80920340/FireArrow_Update3.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Arrow_Fire_0x80920340/FireArrow_Update3.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Arrow_Fire_0x80920340/FireArrow_Update2.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Arrow_Fire_0x80920340/FireArrow_Update2.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Arrow_Fire_0x80920340/ArrowFire_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Arrow_Fire_0x80920340/ArrowFire_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Arrow_Fire_0x80920340/func_80920948.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Arrow_Fire_0x80920340/func_80920948.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Arrow_Fire_0x80920340/ArrowFire_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Arrow_Fire_0x80920340/ArrowFire_Draw.asm") 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 71181e48d2..2ec05b6aeb 100644 --- a/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c +++ b/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c @@ -23,20 +23,20 @@ const ActorInit Arrow_Ice_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Arrow_Ice_0x80922430/func_80922430.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Arrow_Ice_0x80922430/func_80922430.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Arrow_Ice_0x80922430/ArrowIce_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Arrow_Ice_0x80922430/ArrowIce_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Arrow_Ice_0x80922430/ArrowIce_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Arrow_Ice_0x80922430/ArrowIce_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Arrow_Ice_0x80922430/func_809224DC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Arrow_Ice_0x80922430/func_809224DC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Arrow_Ice_0x80922430/func_809225D0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Arrow_Ice_0x80922430/func_809225D0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Arrow_Ice_0x80922430/func_80922628.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Arrow_Ice_0x80922430/func_80922628.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Arrow_Ice_0x80922430/func_809227F4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Arrow_Ice_0x80922430/func_809227F4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Arrow_Ice_0x80922430/ArrowIce_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Arrow_Ice_0x80922430/ArrowIce_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Arrow_Ice_0x80922430/ArrowIce_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Arrow_Ice_0x80922430/ArrowIce_Draw.asm") 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 d4b23b713b..ec5ba6be0e 100644 --- a/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c +++ b/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c @@ -23,20 +23,20 @@ const ActorInit Arrow_Light_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Arrow_Light_0x80924300/func_80924300.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Arrow_Light_0x80924300/func_80924300.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Arrow_Light_0x80924300/ArrowLight_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Arrow_Light_0x80924300/ArrowLight_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Arrow_Light_0x80924300/ArrowLight_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Arrow_Light_0x80924300/ArrowLight_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Arrow_Light_0x80924300/func_809243AC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Arrow_Light_0x80924300/func_809243AC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Arrow_Light_0x80924300/func_809244A0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Arrow_Light_0x80924300/func_809244A0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Arrow_Light_0x80924300/func_809244F8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Arrow_Light_0x80924300/func_809244F8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Arrow_Light_0x80924300/func_809246C4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Arrow_Light_0x80924300/func_809246C4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Arrow_Light_0x80924300/ArrowLight_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Arrow_Light_0x80924300/ArrowLight_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Arrow_Light_0x80924300/ArrowLight_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Arrow_Light_0x80924300/ArrowLight_Draw.asm") diff --git a/src/overlays/actors/ovl_Bg_Astr_Bombwall/z_bg_astr_bombwall.c b/src/overlays/actors/ovl_Bg_Astr_Bombwall/z_bg_astr_bombwall.c index 2a336a8d51..2864da5c74 100644 --- a/src/overlays/actors/ovl_Bg_Astr_Bombwall/z_bg_astr_bombwall.c +++ b/src/overlays/actors/ovl_Bg_Astr_Bombwall/z_bg_astr_bombwall.c @@ -23,26 +23,26 @@ const ActorInit Bg_Astr_Bombwall_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Astr_Bombwall_0x80C09ED0/func_80C09ED0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Astr_Bombwall_0x80C09ED0/func_80C09ED0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Astr_Bombwall_0x80C09ED0/BgAstrBombwall_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Astr_Bombwall_0x80C09ED0/BgAstrBombwall_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Astr_Bombwall_0x80C09ED0/BgAstrBombwall_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Astr_Bombwall_0x80C09ED0/BgAstrBombwall_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Astr_Bombwall_0x80C09ED0/func_80C0A120.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Astr_Bombwall_0x80C09ED0/func_80C0A120.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Astr_Bombwall_0x80C09ED0/func_80C0A378.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Astr_Bombwall_0x80C09ED0/func_80C0A378.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Astr_Bombwall_0x80C09ED0/func_80C0A38C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Astr_Bombwall_0x80C09ED0/func_80C0A38C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Astr_Bombwall_0x80C09ED0/func_80C0A400.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Astr_Bombwall_0x80C09ED0/func_80C0A400.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Astr_Bombwall_0x80C09ED0/func_80C0A418.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Astr_Bombwall_0x80C09ED0/func_80C0A418.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Astr_Bombwall_0x80C09ED0/func_80C0A458.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Astr_Bombwall_0x80C09ED0/func_80C0A458.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Astr_Bombwall_0x80C09ED0/func_80C0A4BC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Astr_Bombwall_0x80C09ED0/func_80C0A4BC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Astr_Bombwall_0x80C09ED0/BgAstrBombwall_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Astr_Bombwall_0x80C09ED0/BgAstrBombwall_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Astr_Bombwall_0x80C09ED0/BgAstrBombwall_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Astr_Bombwall_0x80C09ED0/BgAstrBombwall_Draw.asm") diff --git a/src/overlays/actors/ovl_Bg_Botihasira/z_bg_botihasira.c b/src/overlays/actors/ovl_Bg_Botihasira/z_bg_botihasira.c index 7f4ab4a580..002ddeb119 100644 --- a/src/overlays/actors/ovl_Bg_Botihasira/z_bg_botihasira.c +++ b/src/overlays/actors/ovl_Bg_Botihasira/z_bg_botihasira.c @@ -23,12 +23,12 @@ const ActorInit Bg_Botihasira_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Botihasira_0x80B28080/BgBotihasira_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Botihasira_0x80B28080/BgBotihasira_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Botihasira_0x80B28080/BgBotihasira_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Botihasira_0x80B28080/BgBotihasira_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Botihasira_0x80B28080/func_80B2815C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Botihasira_0x80B28080/func_80B2815C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Botihasira_0x80B28080/BgBotihasira_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Botihasira_0x80B28080/BgBotihasira_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Botihasira_0x80B28080/BgBotihasira_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Botihasira_0x80B28080/BgBotihasira_Draw.asm") 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 1ed9e1b368..c15bee0f6d 100644 --- a/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.c +++ b/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.c @@ -21,52 +21,52 @@ const ActorInit Bg_Breakwall_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Breakwall_0x808B7360/func_808B7360.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Breakwall_0x808B7360/func_808B7360.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Breakwall_0x808B7360/func_808B736C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Breakwall_0x808B7360/func_808B736C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Breakwall_0x808B7360/func_808B7380.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Breakwall_0x808B7360/func_808B7380.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Breakwall_0x808B7360/func_808B73C4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Breakwall_0x808B7360/func_808B73C4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Breakwall_0x808B7360/func_808B73FC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Breakwall_0x808B7360/func_808B73FC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Breakwall_0x808B7360/func_808B7410.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Breakwall_0x808B7360/func_808B7410.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Breakwall_0x808B7360/func_808B7460.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Breakwall_0x808B7360/func_808B7460.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Breakwall_0x808B7360/func_808B74A8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Breakwall_0x808B7360/func_808B74A8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Breakwall_0x808B7360/func_808B74D8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Breakwall_0x808B7360/func_808B74D8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Breakwall_0x808B7360/func_808B751C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Breakwall_0x808B7360/func_808B751C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Breakwall_0x808B7360/BgBreakwall_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Breakwall_0x808B7360/BgBreakwall_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Breakwall_0x808B7360/func_808B767C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Breakwall_0x808B7360/func_808B767C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Breakwall_0x808B7360/func_808B76CC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Breakwall_0x808B7360/func_808B76CC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Breakwall_0x808B7360/func_808B77D0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Breakwall_0x808B7360/func_808B77D0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Breakwall_0x808B7360/func_808B77E0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Breakwall_0x808B7360/func_808B77E0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Breakwall_0x808B7360/func_808B782C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Breakwall_0x808B7360/func_808B782C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Breakwall_0x808B7360/func_808B78A4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Breakwall_0x808B7360/func_808B78A4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Breakwall_0x808B7360/func_808B78DC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Breakwall_0x808B7360/func_808B78DC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Breakwall_0x808B7360/func_808B7914.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Breakwall_0x808B7360/func_808B7914.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Breakwall_0x808B7360/func_808B7A10.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Breakwall_0x808B7360/func_808B7A10.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Breakwall_0x808B7360/BgBreakwall_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Breakwall_0x808B7360/BgBreakwall_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Breakwall_0x808B7360/func_808B7A90.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Breakwall_0x808B7360/func_808B7A90.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Breakwall_0x808B7360/func_808B7B54.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Breakwall_0x808B7360/func_808B7B54.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Breakwall_0x808B7360/func_808B7D34.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Breakwall_0x808B7360/func_808B7D34.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Breakwall_0x808B7360/func_808B7FE4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Breakwall_0x808B7360/func_808B7FE4.asm") diff --git a/src/overlays/actors/ovl_Bg_Crace_Movebg/z_bg_crace_movebg.c b/src/overlays/actors/ovl_Bg_Crace_Movebg/z_bg_crace_movebg.c index f85f739c7f..c8e888775d 100644 --- a/src/overlays/actors/ovl_Bg_Crace_Movebg/z_bg_crace_movebg.c +++ b/src/overlays/actors/ovl_Bg_Crace_Movebg/z_bg_crace_movebg.c @@ -23,42 +23,42 @@ const ActorInit Bg_Crace_Movebg_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Crace_Movebg_0x80A706F0/BgCraceMovebg_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Crace_Movebg_0x80A706F0/BgCraceMovebg_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Crace_Movebg_0x80A706F0/func_80A7090C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Crace_Movebg_0x80A706F0/func_80A7090C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Crace_Movebg_0x80A706F0/func_80A70970.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Crace_Movebg_0x80A706F0/func_80A70970.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Crace_Movebg_0x80A706F0/func_80A7099C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Crace_Movebg_0x80A706F0/func_80A7099C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Crace_Movebg_0x80A706F0/func_80A709E4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Crace_Movebg_0x80A706F0/func_80A709E4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Crace_Movebg_0x80A706F0/func_80A70A08.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Crace_Movebg_0x80A706F0/func_80A70A08.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Crace_Movebg_0x80A706F0/func_80A70A84.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Crace_Movebg_0x80A706F0/func_80A70A84.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Crace_Movebg_0x80A706F0/func_80A70A9C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Crace_Movebg_0x80A706F0/func_80A70A9C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Crace_Movebg_0x80A706F0/BgCraceMovebg_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Crace_Movebg_0x80A706F0/BgCraceMovebg_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Crace_Movebg_0x80A706F0/BgCraceMovebg_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Crace_Movebg_0x80A706F0/BgCraceMovebg_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Crace_Movebg_0x80A706F0/func_80A70C04.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Crace_Movebg_0x80A706F0/func_80A70C04.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Crace_Movebg_0x80A706F0/func_80A70D74.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Crace_Movebg_0x80A706F0/func_80A70D74.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Crace_Movebg_0x80A706F0/func_80A70DA8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Crace_Movebg_0x80A706F0/func_80A70DA8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Crace_Movebg_0x80A706F0/func_80A70E2C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Crace_Movebg_0x80A706F0/func_80A70E2C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Crace_Movebg_0x80A706F0/func_80A70E70.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Crace_Movebg_0x80A706F0/func_80A70E70.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Crace_Movebg_0x80A706F0/func_80A70F14.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Crace_Movebg_0x80A706F0/func_80A70F14.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Crace_Movebg_0x80A706F0/func_80A70F2C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Crace_Movebg_0x80A706F0/func_80A70F2C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Crace_Movebg_0x80A706F0/func_80A70FF4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Crace_Movebg_0x80A706F0/func_80A70FF4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Crace_Movebg_0x80A706F0/func_80A71040.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Crace_Movebg_0x80A706F0/func_80A71040.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Crace_Movebg_0x80A706F0/BgCraceMovebg_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Crace_Movebg_0x80A706F0/BgCraceMovebg_Draw.asm") diff --git a/src/overlays/actors/ovl_Bg_Ctower_Gear/z_bg_ctower_gear.c b/src/overlays/actors/ovl_Bg_Ctower_Gear/z_bg_ctower_gear.c index 3794e6ec62..00816c1b0a 100644 --- a/src/overlays/actors/ovl_Bg_Ctower_Gear/z_bg_ctower_gear.c +++ b/src/overlays/actors/ovl_Bg_Ctower_Gear/z_bg_ctower_gear.c @@ -23,16 +23,16 @@ const ActorInit Bg_Ctower_Gear_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ctower_Gear_0x80AD2B70/func_80AD2B70.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Ctower_Gear_0x80AD2B70/func_80AD2B70.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ctower_Gear_0x80AD2B70/BgCtowerGear_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Ctower_Gear_0x80AD2B70/BgCtowerGear_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ctower_Gear_0x80AD2B70/BgCtowerGear_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Ctower_Gear_0x80AD2B70/BgCtowerGear_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ctower_Gear_0x80AD2B70/BgCtowerGear_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Ctower_Gear_0x80AD2B70/BgCtowerGear_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ctower_Gear_0x80AD2B70/func_80AD3054.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Ctower_Gear_0x80AD2B70/func_80AD3054.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ctower_Gear_0x80AD2B70/BgCtowerGear_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Ctower_Gear_0x80AD2B70/BgCtowerGear_Draw.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ctower_Gear_0x80AD2B70/func_80AD3164.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Ctower_Gear_0x80AD2B70/func_80AD3164.asm") diff --git a/src/overlays/actors/ovl_Bg_Ctower_Rot/z_bg_ctower_rot.c b/src/overlays/actors/ovl_Bg_Ctower_Rot/z_bg_ctower_rot.c index 341c4aa225..74f29c470f 100644 --- a/src/overlays/actors/ovl_Bg_Ctower_Rot/z_bg_ctower_rot.c +++ b/src/overlays/actors/ovl_Bg_Ctower_Rot/z_bg_ctower_rot.c @@ -23,20 +23,20 @@ const ActorInit Bg_Ctower_Rot_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ctower_Rot_0x808E2070/BgCtowerRot_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Ctower_Rot_0x808E2070/BgCtowerRot_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ctower_Rot_0x808E2070/BgCtowerRot_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Ctower_Rot_0x808E2070/BgCtowerRot_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ctower_Rot_0x808E2070/func_808E21FC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Ctower_Rot_0x808E2070/func_808E21FC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ctower_Rot_0x808E2070/func_808E22DC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Ctower_Rot_0x808E2070/func_808E22DC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ctower_Rot_0x808E2070/func_808E22EC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Ctower_Rot_0x808E2070/func_808E22EC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ctower_Rot_0x808E2070/func_808E23D0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Ctower_Rot_0x808E2070/func_808E23D0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ctower_Rot_0x808E2070/func_808E2444.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Ctower_Rot_0x808E2070/func_808E2444.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ctower_Rot_0x808E2070/BgCtowerRot_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Ctower_Rot_0x808E2070/BgCtowerRot_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ctower_Rot_0x808E2070/BgCtowerRot_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Ctower_Rot_0x808E2070/BgCtowerRot_Draw.asm") diff --git a/src/overlays/actors/ovl_Bg_Danpei_Movebg/z_bg_danpei_movebg.c b/src/overlays/actors/ovl_Bg_Danpei_Movebg/z_bg_danpei_movebg.c index 0ccff884eb..cbb5f6fb9a 100644 --- a/src/overlays/actors/ovl_Bg_Danpei_Movebg/z_bg_danpei_movebg.c +++ b/src/overlays/actors/ovl_Bg_Danpei_Movebg/z_bg_danpei_movebg.c @@ -22,26 +22,26 @@ const ActorInit Bg_Danpei_Movebg_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Danpei_Movebg_0x80AF6DE0/func_80AF6DE0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Danpei_Movebg_0x80AF6DE0/func_80AF6DE0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Danpei_Movebg_0x80AF6DE0/BgDanpeiMovebg_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Danpei_Movebg_0x80AF6DE0/BgDanpeiMovebg_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Danpei_Movebg_0x80AF6DE0/func_80AF6EA8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Danpei_Movebg_0x80AF6DE0/func_80AF6EA8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Danpei_Movebg_0x80AF6DE0/BgDanpeiMovebg_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Danpei_Movebg_0x80AF6DE0/BgDanpeiMovebg_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Danpei_Movebg_0x80AF6DE0/BgDanpeiMovebg_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Danpei_Movebg_0x80AF6DE0/BgDanpeiMovebg_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Danpei_Movebg_0x80AF6DE0/func_80AF705C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Danpei_Movebg_0x80AF6DE0/func_80AF705C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Danpei_Movebg_0x80AF6DE0/func_80AF70FC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Danpei_Movebg_0x80AF6DE0/func_80AF70FC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Danpei_Movebg_0x80AF6DE0/func_80AF71FC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Danpei_Movebg_0x80AF6DE0/func_80AF71FC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Danpei_Movebg_0x80AF6DE0/func_80AF72F8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Danpei_Movebg_0x80AF6DE0/func_80AF72F8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Danpei_Movebg_0x80AF6DE0/func_80AF7354.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Danpei_Movebg_0x80AF6DE0/func_80AF7354.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Danpei_Movebg_0x80AF6DE0/func_80AF746C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Danpei_Movebg_0x80AF6DE0/func_80AF746C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Danpei_Movebg_0x80AF6DE0/func_80AF74CC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Danpei_Movebg_0x80AF6DE0/func_80AF74CC.asm") diff --git a/src/overlays/actors/ovl_Bg_Dblue_Balance/z_bg_dblue_balance.c b/src/overlays/actors/ovl_Bg_Dblue_Balance/z_bg_dblue_balance.c index c716120d26..b0e6ad5d8c 100644 --- a/src/overlays/actors/ovl_Bg_Dblue_Balance/z_bg_dblue_balance.c +++ b/src/overlays/actors/ovl_Bg_Dblue_Balance/z_bg_dblue_balance.c @@ -23,42 +23,42 @@ const ActorInit Bg_Dblue_Balance_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dblue_Balance_0x80B823B0/func_80B823B0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Dblue_Balance_0x80B823B0/func_80B823B0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dblue_Balance_0x80B823B0/func_80B82454.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Dblue_Balance_0x80B823B0/func_80B82454.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dblue_Balance_0x80B823B0/func_80B8259C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Dblue_Balance_0x80B823B0/func_80B8259C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dblue_Balance_0x80B823B0/func_80B8264C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Dblue_Balance_0x80B823B0/func_80B8264C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dblue_Balance_0x80B823B0/func_80B828E4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Dblue_Balance_0x80B823B0/func_80B828E4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dblue_Balance_0x80B823B0/func_80B8296C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Dblue_Balance_0x80B823B0/func_80B8296C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dblue_Balance_0x80B823B0/func_80B82B00.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Dblue_Balance_0x80B823B0/func_80B82B00.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dblue_Balance_0x80B823B0/BgDblueBalance_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Dblue_Balance_0x80B823B0/BgDblueBalance_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dblue_Balance_0x80B823B0/BgDblueBalance_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Dblue_Balance_0x80B823B0/BgDblueBalance_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dblue_Balance_0x80B823B0/func_80B82DC4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Dblue_Balance_0x80B823B0/func_80B82DC4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dblue_Balance_0x80B823B0/func_80B82DE0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Dblue_Balance_0x80B823B0/func_80B82DE0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dblue_Balance_0x80B823B0/BgDblueBalance_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Dblue_Balance_0x80B823B0/BgDblueBalance_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dblue_Balance_0x80B823B0/func_80B8330C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Dblue_Balance_0x80B823B0/func_80B8330C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dblue_Balance_0x80B823B0/func_80B83344.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Dblue_Balance_0x80B823B0/func_80B83344.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dblue_Balance_0x80B823B0/func_80B8335C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Dblue_Balance_0x80B823B0/func_80B8335C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dblue_Balance_0x80B823B0/func_80B833A8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Dblue_Balance_0x80B823B0/func_80B833A8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dblue_Balance_0x80B823B0/func_80B833C4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Dblue_Balance_0x80B823B0/func_80B833C4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dblue_Balance_0x80B823B0/func_80B83518.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Dblue_Balance_0x80B823B0/func_80B83518.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dblue_Balance_0x80B823B0/BgDblueBalance_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Dblue_Balance_0x80B823B0/BgDblueBalance_Draw.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dblue_Balance_0x80B823B0/func_80B83758.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Dblue_Balance_0x80B823B0/func_80B83758.asm") diff --git a/src/overlays/actors/ovl_Bg_Dblue_Elevator/z_bg_dblue_elevator.c b/src/overlays/actors/ovl_Bg_Dblue_Elevator/z_bg_dblue_elevator.c index ca411d1d00..af8e7a21d5 100644 --- a/src/overlays/actors/ovl_Bg_Dblue_Elevator/z_bg_dblue_elevator.c +++ b/src/overlays/actors/ovl_Bg_Dblue_Elevator/z_bg_dblue_elevator.c @@ -23,30 +23,30 @@ const ActorInit Bg_Dblue_Elevator_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dblue_Elevator_0x80B91F20/func_80B91F20.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Dblue_Elevator_0x80B91F20/func_80B91F20.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dblue_Elevator_0x80B91F20/func_80B91F74.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Dblue_Elevator_0x80B91F20/func_80B91F74.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dblue_Elevator_0x80B91F20/func_80B922C0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Dblue_Elevator_0x80B91F20/func_80B922C0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dblue_Elevator_0x80B91F20/func_80B922FC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Dblue_Elevator_0x80B91F20/func_80B922FC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dblue_Elevator_0x80B91F20/BgDblueElevator_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Dblue_Elevator_0x80B91F20/BgDblueElevator_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dblue_Elevator_0x80B91F20/BgDblueElevator_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Dblue_Elevator_0x80B91F20/BgDblueElevator_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dblue_Elevator_0x80B91F20/func_80B924DC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Dblue_Elevator_0x80B91F20/func_80B924DC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dblue_Elevator_0x80B91F20/func_80B924F8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Dblue_Elevator_0x80B91F20/func_80B924F8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dblue_Elevator_0x80B91F20/func_80B9257C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Dblue_Elevator_0x80B91F20/func_80B9257C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dblue_Elevator_0x80B91F20/func_80B925B8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Dblue_Elevator_0x80B91F20/func_80B925B8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dblue_Elevator_0x80B91F20/func_80B92644.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Dblue_Elevator_0x80B91F20/func_80B92644.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dblue_Elevator_0x80B91F20/func_80B92660.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Dblue_Elevator_0x80B91F20/func_80B92660.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dblue_Elevator_0x80B91F20/BgDblueElevator_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Dblue_Elevator_0x80B91F20/BgDblueElevator_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dblue_Elevator_0x80B91F20/BgDblueElevator_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Dblue_Elevator_0x80B91F20/BgDblueElevator_Draw.asm") diff --git a/src/overlays/actors/ovl_Bg_Dblue_Movebg/z_bg_dblue_movebg.c b/src/overlays/actors/ovl_Bg_Dblue_Movebg/z_bg_dblue_movebg.c index b0e45d68a2..a93d408ade 100644 --- a/src/overlays/actors/ovl_Bg_Dblue_Movebg/z_bg_dblue_movebg.c +++ b/src/overlays/actors/ovl_Bg_Dblue_Movebg/z_bg_dblue_movebg.c @@ -23,40 +23,40 @@ const ActorInit Bg_Dblue_Movebg_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dblue_Movebg_0x80A29A80/func_80A29A80.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Dblue_Movebg_0x80A29A80/func_80A29A80.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dblue_Movebg_0x80A29A80/BgDblueMovebg_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Dblue_Movebg_0x80A29A80/BgDblueMovebg_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dblue_Movebg_0x80A29A80/BgDblueMovebg_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Dblue_Movebg_0x80A29A80/BgDblueMovebg_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dblue_Movebg_0x80A29A80/func_80A2A128.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Dblue_Movebg_0x80A29A80/func_80A2A128.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dblue_Movebg_0x80A29A80/func_80A2A1E0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Dblue_Movebg_0x80A29A80/func_80A2A1E0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dblue_Movebg_0x80A29A80/func_80A2A32C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Dblue_Movebg_0x80A29A80/func_80A2A32C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dblue_Movebg_0x80A29A80/func_80A2A444.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Dblue_Movebg_0x80A29A80/func_80A2A444.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dblue_Movebg_0x80A29A80/func_80A2A670.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Dblue_Movebg_0x80A29A80/func_80A2A670.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dblue_Movebg_0x80A29A80/func_80A2A688.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Dblue_Movebg_0x80A29A80/func_80A2A688.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dblue_Movebg_0x80A29A80/func_80A2A714.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Dblue_Movebg_0x80A29A80/func_80A2A714.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dblue_Movebg_0x80A29A80/func_80A2A7F8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Dblue_Movebg_0x80A29A80/func_80A2A7F8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dblue_Movebg_0x80A29A80/func_80A2AAB8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Dblue_Movebg_0x80A29A80/func_80A2AAB8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dblue_Movebg_0x80A29A80/func_80A2ABD0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Dblue_Movebg_0x80A29A80/func_80A2ABD0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dblue_Movebg_0x80A29A80/func_80A2AED0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Dblue_Movebg_0x80A29A80/func_80A2AED0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dblue_Movebg_0x80A29A80/func_80A2B1A0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Dblue_Movebg_0x80A29A80/func_80A2B1A0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dblue_Movebg_0x80A29A80/BgDblueMovebg_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Dblue_Movebg_0x80A29A80/BgDblueMovebg_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dblue_Movebg_0x80A29A80/func_80A2B274.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Dblue_Movebg_0x80A29A80/func_80A2B274.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dblue_Movebg_0x80A29A80/func_80A2B308.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Dblue_Movebg_0x80A29A80/func_80A2B308.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dblue_Movebg_0x80A29A80/BgDblueMovebg_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Dblue_Movebg_0x80A29A80/BgDblueMovebg_Draw.asm") diff --git a/src/overlays/actors/ovl_Bg_Dblue_Waterfall/z_bg_dblue_waterfall.c b/src/overlays/actors/ovl_Bg_Dblue_Waterfall/z_bg_dblue_waterfall.c index 0c4a5babef..fbbbcefe43 100644 --- a/src/overlays/actors/ovl_Bg_Dblue_Waterfall/z_bg_dblue_waterfall.c +++ b/src/overlays/actors/ovl_Bg_Dblue_Waterfall/z_bg_dblue_waterfall.c @@ -23,46 +23,46 @@ const ActorInit Bg_Dblue_Waterfall_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dblue_Waterfall_0x80B83C80/func_80B83C80.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Dblue_Waterfall_0x80B83C80/func_80B83C80.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dblue_Waterfall_0x80B83C80/func_80B83D04.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Dblue_Waterfall_0x80B83C80/func_80B83D04.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dblue_Waterfall_0x80B83C80/func_80B83D58.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Dblue_Waterfall_0x80B83C80/func_80B83D58.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dblue_Waterfall_0x80B83C80/func_80B83D94.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Dblue_Waterfall_0x80B83C80/func_80B83D94.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dblue_Waterfall_0x80B83C80/func_80B83E1C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Dblue_Waterfall_0x80B83C80/func_80B83E1C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dblue_Waterfall_0x80B83C80/func_80B83EA4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Dblue_Waterfall_0x80B83C80/func_80B83EA4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dblue_Waterfall_0x80B83C80/func_80B841A0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Dblue_Waterfall_0x80B83C80/func_80B841A0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dblue_Waterfall_0x80B83C80/func_80B84348.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Dblue_Waterfall_0x80B83C80/func_80B84348.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dblue_Waterfall_0x80B83C80/func_80B84568.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Dblue_Waterfall_0x80B83C80/func_80B84568.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dblue_Waterfall_0x80B83C80/func_80B84610.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Dblue_Waterfall_0x80B83C80/func_80B84610.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dblue_Waterfall_0x80B83C80/BgDblueWaterfall_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Dblue_Waterfall_0x80B83C80/BgDblueWaterfall_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dblue_Waterfall_0x80B83C80/BgDblueWaterfall_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Dblue_Waterfall_0x80B83C80/BgDblueWaterfall_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dblue_Waterfall_0x80B83C80/func_80B8484C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Dblue_Waterfall_0x80B83C80/func_80B8484C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dblue_Waterfall_0x80B83C80/func_80B84928.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Dblue_Waterfall_0x80B83C80/func_80B84928.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dblue_Waterfall_0x80B83C80/func_80B84AD4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Dblue_Waterfall_0x80B83C80/func_80B84AD4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dblue_Waterfall_0x80B83C80/func_80B84AEC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Dblue_Waterfall_0x80B83C80/func_80B84AEC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dblue_Waterfall_0x80B83C80/func_80B84B9C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Dblue_Waterfall_0x80B83C80/func_80B84B9C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dblue_Waterfall_0x80B83C80/func_80B84BCC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Dblue_Waterfall_0x80B83C80/func_80B84BCC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dblue_Waterfall_0x80B83C80/func_80B84EF0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Dblue_Waterfall_0x80B83C80/func_80B84EF0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dblue_Waterfall_0x80B83C80/func_80B84F20.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Dblue_Waterfall_0x80B83C80/func_80B84F20.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dblue_Waterfall_0x80B83C80/BgDblueWaterfall_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Dblue_Waterfall_0x80B83C80/BgDblueWaterfall_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dblue_Waterfall_0x80B83C80/BgDblueWaterfall_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Dblue_Waterfall_0x80B83C80/BgDblueWaterfall_Draw.asm") diff --git a/src/overlays/actors/ovl_Bg_Dkjail_Ivy/z_bg_dkjail_ivy.c b/src/overlays/actors/ovl_Bg_Dkjail_Ivy/z_bg_dkjail_ivy.c index ad38570f38..90b4afe47a 100644 --- a/src/overlays/actors/ovl_Bg_Dkjail_Ivy/z_bg_dkjail_ivy.c +++ b/src/overlays/actors/ovl_Bg_Dkjail_Ivy/z_bg_dkjail_ivy.c @@ -23,24 +23,24 @@ const ActorInit Bg_Dkjail_Ivy_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dkjail_Ivy_0x80ADE230/func_80ADE230.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Dkjail_Ivy_0x80ADE230/func_80ADE230.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dkjail_Ivy_0x80ADE230/BgDkjailIvy_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Dkjail_Ivy_0x80ADE230/BgDkjailIvy_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dkjail_Ivy_0x80ADE230/BgDkjailIvy_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Dkjail_Ivy_0x80ADE230/BgDkjailIvy_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dkjail_Ivy_0x80ADE230/func_80ADE6AC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Dkjail_Ivy_0x80ADE230/func_80ADE6AC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dkjail_Ivy_0x80ADE230/func_80ADE6C0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Dkjail_Ivy_0x80ADE230/func_80ADE6C0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dkjail_Ivy_0x80ADE230/func_80ADE734.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Dkjail_Ivy_0x80ADE230/func_80ADE734.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dkjail_Ivy_0x80ADE230/func_80ADE748.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Dkjail_Ivy_0x80ADE230/func_80ADE748.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dkjail_Ivy_0x80ADE230/func_80ADE7E0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Dkjail_Ivy_0x80ADE230/func_80ADE7E0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dkjail_Ivy_0x80ADE230/func_80ADE7F4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Dkjail_Ivy_0x80ADE230/func_80ADE7F4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dkjail_Ivy_0x80ADE230/BgDkjailIvy_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Dkjail_Ivy_0x80ADE230/BgDkjailIvy_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dkjail_Ivy_0x80ADE230/BgDkjailIvy_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Dkjail_Ivy_0x80ADE230/BgDkjailIvy_Draw.asm") 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 08ddf10f92..386f032819 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 @@ -22,50 +22,50 @@ const ActorInit Bg_Dy_Yoseizo_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dy_Yoseizo_0x80A0A8A0/BgDyYoseizo_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Dy_Yoseizo_0x80A0A8A0/BgDyYoseizo_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dy_Yoseizo_0x80A0A8A0/BgDyYoseizo_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Dy_Yoseizo_0x80A0A8A0/BgDyYoseizo_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dy_Yoseizo_0x80A0A8A0/func_80A0A96C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Dy_Yoseizo_0x80A0A8A0/func_80A0A96C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dy_Yoseizo_0x80A0A8A0/func_80A0A9E4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Dy_Yoseizo_0x80A0A8A0/func_80A0A9E4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dy_Yoseizo_0x80A0A8A0/func_80A0AA40.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Dy_Yoseizo_0x80A0A8A0/func_80A0AA40.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dy_Yoseizo_0x80A0A8A0/func_80A0AD50.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Dy_Yoseizo_0x80A0A8A0/func_80A0AD50.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dy_Yoseizo_0x80A0A8A0/func_80A0AE1C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Dy_Yoseizo_0x80A0A8A0/func_80A0AE1C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dy_Yoseizo_0x80A0A8A0/func_80A0AFDC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Dy_Yoseizo_0x80A0A8A0/func_80A0AFDC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dy_Yoseizo_0x80A0A8A0/func_80A0B078.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Dy_Yoseizo_0x80A0A8A0/func_80A0B078.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dy_Yoseizo_0x80A0A8A0/func_80A0B184.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Dy_Yoseizo_0x80A0A8A0/func_80A0B184.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dy_Yoseizo_0x80A0A8A0/func_80A0B290.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Dy_Yoseizo_0x80A0A8A0/func_80A0B290.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dy_Yoseizo_0x80A0A8A0/func_80A0B35C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Dy_Yoseizo_0x80A0A8A0/func_80A0B35C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dy_Yoseizo_0x80A0A8A0/func_80A0B500.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Dy_Yoseizo_0x80A0A8A0/func_80A0B500.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dy_Yoseizo_0x80A0A8A0/func_80A0B5F0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Dy_Yoseizo_0x80A0A8A0/func_80A0B5F0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dy_Yoseizo_0x80A0A8A0/func_80A0B75C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Dy_Yoseizo_0x80A0A8A0/func_80A0B75C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dy_Yoseizo_0x80A0A8A0/func_80A0B834.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Dy_Yoseizo_0x80A0A8A0/func_80A0B834.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dy_Yoseizo_0x80A0A8A0/func_80A0B8CC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Dy_Yoseizo_0x80A0A8A0/func_80A0B8CC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dy_Yoseizo_0x80A0A8A0/func_80A0BB08.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Dy_Yoseizo_0x80A0A8A0/func_80A0BB08.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dy_Yoseizo_0x80A0A8A0/BgDyYoseizo_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Dy_Yoseizo_0x80A0A8A0/BgDyYoseizo_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dy_Yoseizo_0x80A0A8A0/func_80A0BCD8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Dy_Yoseizo_0x80A0A8A0/func_80A0BCD8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dy_Yoseizo_0x80A0A8A0/func_80A0BD40.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Dy_Yoseizo_0x80A0A8A0/func_80A0BD40.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dy_Yoseizo_0x80A0A8A0/func_80A0BE60.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Dy_Yoseizo_0x80A0A8A0/func_80A0BE60.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dy_Yoseizo_0x80A0A8A0/func_80A0BF70.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Dy_Yoseizo_0x80A0A8A0/func_80A0BF70.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dy_Yoseizo_0x80A0A8A0/func_80A0C270.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Dy_Yoseizo_0x80A0A8A0/func_80A0C270.asm") diff --git a/src/overlays/actors/ovl_Bg_F40_Block/z_bg_f40_block.c b/src/overlays/actors/ovl_Bg_F40_Block/z_bg_f40_block.c index 15a1e3d406..029af75176 100644 --- a/src/overlays/actors/ovl_Bg_F40_Block/z_bg_f40_block.c +++ b/src/overlays/actors/ovl_Bg_F40_Block/z_bg_f40_block.c @@ -23,40 +23,40 @@ const ActorInit Bg_F40_Block_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_F40_Block_0x80BC3980/func_80BC3980.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_F40_Block_0x80BC3980/func_80BC3980.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_F40_Block_0x80BC3980/func_80BC3A2C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_F40_Block_0x80BC3980/func_80BC3A2C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_F40_Block_0x80BC3980/func_80BC3B00.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_F40_Block_0x80BC3980/func_80BC3B00.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_F40_Block_0x80BC3980/func_80BC3CA4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_F40_Block_0x80BC3980/func_80BC3CA4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_F40_Block_0x80BC3980/func_80BC3D08.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_F40_Block_0x80BC3980/func_80BC3D08.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_F40_Block_0x80BC3980/func_80BC4038.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_F40_Block_0x80BC3980/func_80BC4038.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_F40_Block_0x80BC3980/BgF40Block_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_F40_Block_0x80BC3980/BgF40Block_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_F40_Block_0x80BC3980/BgF40Block_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_F40_Block_0x80BC3980/BgF40Block_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_F40_Block_0x80BC3980/func_80BC41AC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_F40_Block_0x80BC3980/func_80BC41AC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_F40_Block_0x80BC3980/func_80BC4228.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_F40_Block_0x80BC3980/func_80BC4228.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_F40_Block_0x80BC3980/func_80BC4344.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_F40_Block_0x80BC3980/func_80BC4344.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_F40_Block_0x80BC3980/func_80BC4380.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_F40_Block_0x80BC3980/func_80BC4380.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_F40_Block_0x80BC3980/func_80BC43CC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_F40_Block_0x80BC3980/func_80BC43CC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_F40_Block_0x80BC3980/func_80BC4448.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_F40_Block_0x80BC3980/func_80BC4448.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_F40_Block_0x80BC3980/func_80BC44F4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_F40_Block_0x80BC3980/func_80BC44F4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_F40_Block_0x80BC3980/func_80BC4530.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_F40_Block_0x80BC3980/func_80BC4530.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_F40_Block_0x80BC3980/func_80BC457C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_F40_Block_0x80BC3980/func_80BC457C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_F40_Block_0x80BC3980/BgF40Block_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_F40_Block_0x80BC3980/BgF40Block_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_F40_Block_0x80BC3980/BgF40Block_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_F40_Block_0x80BC3980/BgF40Block_Draw.asm") diff --git a/src/overlays/actors/ovl_Bg_F40_Flift/z_bg_f40_flift.c b/src/overlays/actors/ovl_Bg_F40_Flift/z_bg_f40_flift.c index c6b47bc2a8..cc7654e3fa 100644 --- a/src/overlays/actors/ovl_Bg_F40_Flift/z_bg_f40_flift.c +++ b/src/overlays/actors/ovl_Bg_F40_Flift/z_bg_f40_flift.c @@ -23,14 +23,14 @@ const ActorInit Bg_F40_Flift_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_F40_Flift_0x808D7550/BgF40Flift_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_F40_Flift_0x808D7550/BgF40Flift_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_F40_Flift_0x808D7550/BgF40Flift_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_F40_Flift_0x808D7550/BgF40Flift_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_F40_Flift_0x808D7550/func_808D75F0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_F40_Flift_0x808D7550/func_808D75F0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_F40_Flift_0x808D7550/func_808D7714.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_F40_Flift_0x808D7550/func_808D7714.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_F40_Flift_0x808D7550/BgF40Flift_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_F40_Flift_0x808D7550/BgF40Flift_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_F40_Flift_0x808D7550/BgF40Flift_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_F40_Flift_0x808D7550/BgF40Flift_Draw.asm") diff --git a/src/overlays/actors/ovl_Bg_F40_Switch/z_bg_f40_switch.c b/src/overlays/actors/ovl_Bg_F40_Switch/z_bg_f40_switch.c index 5a9ecfdfb2..1eb771e940 100644 --- a/src/overlays/actors/ovl_Bg_F40_Switch/z_bg_f40_switch.c +++ b/src/overlays/actors/ovl_Bg_F40_Switch/z_bg_f40_switch.c @@ -23,22 +23,22 @@ const ActorInit Bg_F40_Switch_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_F40_Switch_0x80BC47B0/func_80BC47B0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_F40_Switch_0x80BC47B0/func_80BC47B0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_F40_Switch_0x80BC47B0/BgF40Switch_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_F40_Switch_0x80BC47B0/BgF40Switch_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_F40_Switch_0x80BC47B0/BgF40Switch_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_F40_Switch_0x80BC47B0/BgF40Switch_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_F40_Switch_0x80BC47B0/func_80BC4B20.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_F40_Switch_0x80BC47B0/func_80BC4B20.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_F40_Switch_0x80BC47B0/func_80BC4B94.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_F40_Switch_0x80BC47B0/func_80BC4B94.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_F40_Switch_0x80BC47B0/func_80BC4BB8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_F40_Switch_0x80BC47B0/func_80BC4BB8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_F40_Switch_0x80BC47B0/func_80BC4C68.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_F40_Switch_0x80BC47B0/func_80BC4C68.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_F40_Switch_0x80BC47B0/func_80BC4D30.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_F40_Switch_0x80BC47B0/func_80BC4D30.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_F40_Switch_0x80BC47B0/BgF40Switch_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_F40_Switch_0x80BC47B0/BgF40Switch_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_F40_Switch_0x80BC47B0/BgF40Switch_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_F40_Switch_0x80BC47B0/BgF40Switch_Draw.asm") diff --git a/src/overlays/actors/ovl_Bg_F40_Swlift/z_bg_f40_swlift.c b/src/overlays/actors/ovl_Bg_F40_Swlift/z_bg_f40_swlift.c index e94ab67669..0bd6ee04dc 100644 --- a/src/overlays/actors/ovl_Bg_F40_Swlift/z_bg_f40_swlift.c +++ b/src/overlays/actors/ovl_Bg_F40_Swlift/z_bg_f40_swlift.c @@ -23,10 +23,10 @@ const ActorInit Bg_F40_Swlift_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_F40_Swlift_0x8096F160/BgF40Swlift_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_F40_Swlift_0x8096F160/BgF40Swlift_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_F40_Swlift_0x8096F160/BgF40Swlift_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_F40_Swlift_0x8096F160/BgF40Swlift_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_F40_Swlift_0x8096F160/BgF40Swlift_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_F40_Swlift_0x8096F160/BgF40Swlift_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_F40_Swlift_0x8096F160/BgF40Swlift_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_F40_Swlift_0x8096F160/BgF40Swlift_Draw.asm") diff --git a/src/overlays/actors/ovl_Bg_Fire_Wall/z_bg_fire_wall.c b/src/overlays/actors/ovl_Bg_Fire_Wall/z_bg_fire_wall.c index 76528e3982..f28fb33032 100644 --- a/src/overlays/actors/ovl_Bg_Fire_Wall/z_bg_fire_wall.c +++ b/src/overlays/actors/ovl_Bg_Fire_Wall/z_bg_fire_wall.c @@ -22,24 +22,24 @@ const ActorInit Bg_Fire_Wall_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Fire_Wall_0x809AC4B0/BgFireWall_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Fire_Wall_0x809AC4B0/BgFireWall_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Fire_Wall_0x809AC4B0/BgFireWall_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Fire_Wall_0x809AC4B0/BgFireWall_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Fire_Wall_0x809AC4B0/func_809AC5C0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Fire_Wall_0x809AC4B0/func_809AC5C0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Fire_Wall_0x809AC4B0/func_809AC638.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Fire_Wall_0x809AC4B0/func_809AC638.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Fire_Wall_0x809AC4B0/func_809AC68C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Fire_Wall_0x809AC4B0/func_809AC68C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Fire_Wall_0x809AC4B0/func_809AC6C0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Fire_Wall_0x809AC4B0/func_809AC6C0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Fire_Wall_0x809AC4B0/func_809AC760.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Fire_Wall_0x809AC4B0/func_809AC760.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Fire_Wall_0x809AC4B0/func_809AC7F8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Fire_Wall_0x809AC4B0/func_809AC7F8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Fire_Wall_0x809AC4B0/func_809AC970.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Fire_Wall_0x809AC4B0/func_809AC970.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Fire_Wall_0x809AC4B0/BgFireWall_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Fire_Wall_0x809AC4B0/BgFireWall_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Fire_Wall_0x809AC4B0/func_809ACB28.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Fire_Wall_0x809AC4B0/func_809ACB28.asm") diff --git a/src/overlays/actors/ovl_Bg_Fu_Mizu/z_bg_fu_mizu.c b/src/overlays/actors/ovl_Bg_Fu_Mizu/z_bg_fu_mizu.c index 546a0d0e16..d340f03a11 100644 --- a/src/overlays/actors/ovl_Bg_Fu_Mizu/z_bg_fu_mizu.c +++ b/src/overlays/actors/ovl_Bg_Fu_Mizu/z_bg_fu_mizu.c @@ -23,12 +23,12 @@ const ActorInit Bg_Fu_Mizu_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Fu_Mizu_0x80ADAAF0/BgFuMizu_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Fu_Mizu_0x80ADAAF0/BgFuMizu_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Fu_Mizu_0x80ADAAF0/BgFuMizu_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Fu_Mizu_0x80ADAAF0/BgFuMizu_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Fu_Mizu_0x80ADAAF0/func_80ADABA4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Fu_Mizu_0x80ADAAF0/func_80ADABA4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Fu_Mizu_0x80ADAAF0/BgFuMizu_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Fu_Mizu_0x80ADAAF0/BgFuMizu_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Fu_Mizu_0x80ADAAF0/BgFuMizu_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Fu_Mizu_0x80ADAAF0/BgFuMizu_Draw.asm") diff --git a/src/overlays/actors/ovl_Bg_Goron_Oyu/z_bg_goron_oyu.c b/src/overlays/actors/ovl_Bg_Goron_Oyu/z_bg_goron_oyu.c index 44b0b9e740..6af37611ba 100644 --- a/src/overlays/actors/ovl_Bg_Goron_Oyu/z_bg_goron_oyu.c +++ b/src/overlays/actors/ovl_Bg_Goron_Oyu/z_bg_goron_oyu.c @@ -23,26 +23,26 @@ const ActorInit Bg_Goron_Oyu_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Goron_Oyu_0x80B40080/func_80B40080.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Goron_Oyu_0x80B40080/func_80B40080.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Goron_Oyu_0x80B40080/func_80B4009C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Goron_Oyu_0x80B40080/func_80B4009C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Goron_Oyu_0x80B40080/func_80B400C8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Goron_Oyu_0x80B40080/func_80B400C8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Goron_Oyu_0x80B40080/func_80B40100.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Goron_Oyu_0x80B40080/func_80B40100.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Goron_Oyu_0x80B40080/func_80B40160.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Goron_Oyu_0x80B40080/func_80B40160.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Goron_Oyu_0x80B40080/func_80B401F8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Goron_Oyu_0x80B40080/func_80B401F8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Goron_Oyu_0x80B40080/func_80B40308.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Goron_Oyu_0x80B40080/func_80B40308.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Goron_Oyu_0x80B40080/func_80B40394.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Goron_Oyu_0x80B40080/func_80B40394.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Goron_Oyu_0x80B40080/BgGoronOyu_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Goron_Oyu_0x80B40080/BgGoronOyu_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Goron_Oyu_0x80B40080/BgGoronOyu_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Goron_Oyu_0x80B40080/BgGoronOyu_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Goron_Oyu_0x80B40080/BgGoronOyu_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Goron_Oyu_0x80B40080/BgGoronOyu_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Goron_Oyu_0x80B40080/BgGoronOyu_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Goron_Oyu_0x80B40080/BgGoronOyu_Draw.asm") diff --git a/src/overlays/actors/ovl_Bg_Haka_Bombwall/z_bg_haka_bombwall.c b/src/overlays/actors/ovl_Bg_Haka_Bombwall/z_bg_haka_bombwall.c index b2c0948fe7..316fbb7d7d 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Bombwall/z_bg_haka_bombwall.c +++ b/src/overlays/actors/ovl_Bg_Haka_Bombwall/z_bg_haka_bombwall.c @@ -23,26 +23,26 @@ const ActorInit Bg_Haka_Bombwall_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Haka_Bombwall_0x80BD5E00/func_80BD5E00.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Haka_Bombwall_0x80BD5E00/func_80BD5E00.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Haka_Bombwall_0x80BD5E00/func_80BD5E6C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Haka_Bombwall_0x80BD5E00/func_80BD5E6C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Haka_Bombwall_0x80BD5E00/BgHakaBombwall_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Haka_Bombwall_0x80BD5E00/BgHakaBombwall_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Haka_Bombwall_0x80BD5E00/BgHakaBombwall_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Haka_Bombwall_0x80BD5E00/BgHakaBombwall_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Haka_Bombwall_0x80BD5E00/func_80BD6260.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Haka_Bombwall_0x80BD5E00/func_80BD6260.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Haka_Bombwall_0x80BD5E00/func_80BD6274.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Haka_Bombwall_0x80BD5E00/func_80BD6274.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Haka_Bombwall_0x80BD5E00/func_80BD62D0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Haka_Bombwall_0x80BD5E00/func_80BD62D0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Haka_Bombwall_0x80BD5E00/func_80BD6314.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Haka_Bombwall_0x80BD5E00/func_80BD6314.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Haka_Bombwall_0x80BD5E00/func_80BD63B4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Haka_Bombwall_0x80BD5E00/func_80BD63B4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Haka_Bombwall_0x80BD5E00/func_80BD63D0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Haka_Bombwall_0x80BD5E00/func_80BD63D0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Haka_Bombwall_0x80BD5E00/BgHakaBombwall_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Haka_Bombwall_0x80BD5E00/BgHakaBombwall_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Haka_Bombwall_0x80BD5E00/BgHakaBombwall_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Haka_Bombwall_0x80BD5E00/BgHakaBombwall_Draw.asm") diff --git a/src/overlays/actors/ovl_Bg_Haka_Tomb/z_bg_haka_tomb.c b/src/overlays/actors/ovl_Bg_Haka_Tomb/z_bg_haka_tomb.c index 333e099e13..a2de8b72d5 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Tomb/z_bg_haka_tomb.c +++ b/src/overlays/actors/ovl_Bg_Haka_Tomb/z_bg_haka_tomb.c @@ -23,24 +23,24 @@ const ActorInit Bg_Haka_Tomb_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Haka_Tomb_0x80BD6580/BgHakaTomb_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Haka_Tomb_0x80BD6580/BgHakaTomb_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Haka_Tomb_0x80BD6580/BgHakaTomb_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Haka_Tomb_0x80BD6580/BgHakaTomb_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Haka_Tomb_0x80BD6580/func_80BD6624.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Haka_Tomb_0x80BD6580/func_80BD6624.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Haka_Tomb_0x80BD6580/func_80BD6638.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Haka_Tomb_0x80BD6580/func_80BD6638.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Haka_Tomb_0x80BD6580/func_80BD66AC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Haka_Tomb_0x80BD6580/func_80BD66AC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Haka_Tomb_0x80BD6580/func_80BD6754.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Haka_Tomb_0x80BD6580/func_80BD6754.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Haka_Tomb_0x80BD6580/func_80BD6768.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Haka_Tomb_0x80BD6580/func_80BD6768.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Haka_Tomb_0x80BD6580/func_80BD67A8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Haka_Tomb_0x80BD6580/func_80BD67A8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Haka_Tomb_0x80BD6580/func_80BD67BC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Haka_Tomb_0x80BD6580/func_80BD67BC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Haka_Tomb_0x80BD6580/BgHakaTomb_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Haka_Tomb_0x80BD6580/BgHakaTomb_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Haka_Tomb_0x80BD6580/BgHakaTomb_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Haka_Tomb_0x80BD6580/BgHakaTomb_Draw.asm") diff --git a/src/overlays/actors/ovl_Bg_Hakugin_Bombwall/z_bg_hakugin_bombwall.c b/src/overlays/actors/ovl_Bg_Hakugin_Bombwall/z_bg_hakugin_bombwall.c index d0244b0e73..a63d6145c5 100644 --- a/src/overlays/actors/ovl_Bg_Hakugin_Bombwall/z_bg_hakugin_bombwall.c +++ b/src/overlays/actors/ovl_Bg_Hakugin_Bombwall/z_bg_hakugin_bombwall.c @@ -23,28 +23,28 @@ const ActorInit Bg_Hakugin_Bombwall_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Bombwall_0x80ABBFC0/func_80ABBFC0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Hakugin_Bombwall_0x80ABBFC0/func_80ABBFC0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Bombwall_0x80ABBFC0/func_80ABC2E0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Hakugin_Bombwall_0x80ABBFC0/func_80ABC2E0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Bombwall_0x80ABBFC0/func_80ABC58C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Hakugin_Bombwall_0x80ABBFC0/func_80ABC58C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Bombwall_0x80ABBFC0/func_80ABC7FC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Hakugin_Bombwall_0x80ABBFC0/func_80ABC7FC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Bombwall_0x80ABBFC0/BgHakuginBombwall_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Hakugin_Bombwall_0x80ABBFC0/BgHakuginBombwall_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Bombwall_0x80ABBFC0/BgHakuginBombwall_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Hakugin_Bombwall_0x80ABBFC0/BgHakuginBombwall_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Bombwall_0x80ABBFC0/func_80ABCB5C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Hakugin_Bombwall_0x80ABBFC0/func_80ABCB5C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Bombwall_0x80ABBFC0/func_80ABCC00.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Hakugin_Bombwall_0x80ABBFC0/func_80ABCC00.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Bombwall_0x80ABBFC0/func_80ABCCE4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Hakugin_Bombwall_0x80ABBFC0/func_80ABCCE4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Bombwall_0x80ABBFC0/func_80ABCD98.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Hakugin_Bombwall_0x80ABBFC0/func_80ABCD98.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Bombwall_0x80ABBFC0/func_80ABCE60.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Hakugin_Bombwall_0x80ABBFC0/func_80ABCE60.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Bombwall_0x80ABBFC0/BgHakuginBombwall_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Hakugin_Bombwall_0x80ABBFC0/BgHakuginBombwall_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Bombwall_0x80ABBFC0/BgHakuginBombwall_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Hakugin_Bombwall_0x80ABBFC0/BgHakuginBombwall_Draw.asm") diff --git a/src/overlays/actors/ovl_Bg_Hakugin_Elvpole/z_bg_hakugin_elvpole.c b/src/overlays/actors/ovl_Bg_Hakugin_Elvpole/z_bg_hakugin_elvpole.c index 61d6ff9eb2..0a9d1c9d58 100644 --- a/src/overlays/actors/ovl_Bg_Hakugin_Elvpole/z_bg_hakugin_elvpole.c +++ b/src/overlays/actors/ovl_Bg_Hakugin_Elvpole/z_bg_hakugin_elvpole.c @@ -23,12 +23,12 @@ const ActorInit Bg_Hakugin_Elvpole_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Elvpole_0x80ABD830/BgHakuginElvpole_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Hakugin_Elvpole_0x80ABD830/BgHakuginElvpole_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Elvpole_0x80ABD830/BgHakuginElvpole_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Hakugin_Elvpole_0x80ABD830/BgHakuginElvpole_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Elvpole_0x80ABD830/func_80ABD92C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Hakugin_Elvpole_0x80ABD830/func_80ABD92C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Elvpole_0x80ABD830/BgHakuginElvpole_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Hakugin_Elvpole_0x80ABD830/BgHakuginElvpole_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Elvpole_0x80ABD830/BgHakuginElvpole_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Hakugin_Elvpole_0x80ABD830/BgHakuginElvpole_Draw.asm") diff --git a/src/overlays/actors/ovl_Bg_Hakugin_Post/z_bg_hakugin_post.c b/src/overlays/actors/ovl_Bg_Hakugin_Post/z_bg_hakugin_post.c index b69907048e..4b0a68a754 100644 --- a/src/overlays/actors/ovl_Bg_Hakugin_Post/z_bg_hakugin_post.c +++ b/src/overlays/actors/ovl_Bg_Hakugin_Post/z_bg_hakugin_post.c @@ -22,84 +22,84 @@ const ActorInit Bg_Hakugin_Post_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Post_0x80A9ACD0/func_80A9ACD0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Hakugin_Post_0x80A9ACD0/func_80A9ACD0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Post_0x80A9ACD0/func_80A9ACF0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Hakugin_Post_0x80A9ACD0/func_80A9ACF0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Post_0x80A9ACD0/func_80A9AD18.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Hakugin_Post_0x80A9ACD0/func_80A9AD18.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Post_0x80A9ACD0/func_80A9AE3C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Hakugin_Post_0x80A9ACD0/func_80A9AE3C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Post_0x80A9ACD0/func_80A9AEB8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Hakugin_Post_0x80A9ACD0/func_80A9AEB8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Post_0x80A9ACD0/func_80A9AFB4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Hakugin_Post_0x80A9ACD0/func_80A9AFB4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Post_0x80A9ACD0/func_80A9B160.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Hakugin_Post_0x80A9ACD0/func_80A9B160.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Post_0x80A9ACD0/func_80A9B244.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Hakugin_Post_0x80A9ACD0/func_80A9B244.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Post_0x80A9ACD0/func_80A9B2B8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Hakugin_Post_0x80A9ACD0/func_80A9B2B8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Post_0x80A9ACD0/func_80A9B32C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Hakugin_Post_0x80A9ACD0/func_80A9B32C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Post_0x80A9ACD0/func_80A9B384.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Hakugin_Post_0x80A9ACD0/func_80A9B384.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Post_0x80A9ACD0/func_80A9B3BC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Hakugin_Post_0x80A9ACD0/func_80A9B3BC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Post_0x80A9ACD0/func_80A9B46C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Hakugin_Post_0x80A9ACD0/func_80A9B46C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Post_0x80A9ACD0/func_80A9B554.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Hakugin_Post_0x80A9ACD0/func_80A9B554.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Post_0x80A9ACD0/func_80A9BC0C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Hakugin_Post_0x80A9ACD0/func_80A9BC0C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Post_0x80A9ACD0/func_80A9BD24.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Hakugin_Post_0x80A9ACD0/func_80A9BD24.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Post_0x80A9ACD0/func_80A9C058.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Hakugin_Post_0x80A9ACD0/func_80A9C058.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Post_0x80A9ACD0/func_80A9C18C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Hakugin_Post_0x80A9ACD0/func_80A9C18C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Post_0x80A9ACD0/func_80A9C228.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Hakugin_Post_0x80A9ACD0/func_80A9C228.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Post_0x80A9ACD0/func_80A9C634.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Hakugin_Post_0x80A9ACD0/func_80A9C634.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Post_0x80A9ACD0/func_80A9C854.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Hakugin_Post_0x80A9ACD0/func_80A9C854.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Post_0x80A9ACD0/BgHakuginPost_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Hakugin_Post_0x80A9ACD0/BgHakuginPost_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Post_0x80A9ACD0/BgHakuginPost_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Hakugin_Post_0x80A9ACD0/BgHakuginPost_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Post_0x80A9ACD0/func_80A9CA94.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Hakugin_Post_0x80A9ACD0/func_80A9CA94.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Post_0x80A9ACD0/func_80A9CAA8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Hakugin_Post_0x80A9ACD0/func_80A9CAA8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Post_0x80A9ACD0/func_80A9CC84.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Hakugin_Post_0x80A9ACD0/func_80A9CC84.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Post_0x80A9ACD0/func_80A9CCA0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Hakugin_Post_0x80A9ACD0/func_80A9CCA0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Post_0x80A9ACD0/func_80A9CD00.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Hakugin_Post_0x80A9ACD0/func_80A9CD00.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Post_0x80A9ACD0/func_80A9CD14.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Hakugin_Post_0x80A9ACD0/func_80A9CD14.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Post_0x80A9ACD0/func_80A9CE00.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Hakugin_Post_0x80A9ACD0/func_80A9CE00.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Post_0x80A9ACD0/func_80A9CE1C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Hakugin_Post_0x80A9ACD0/func_80A9CE1C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Post_0x80A9ACD0/func_80A9D0A0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Hakugin_Post_0x80A9ACD0/func_80A9D0A0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Post_0x80A9ACD0/func_80A9D0B4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Hakugin_Post_0x80A9ACD0/func_80A9D0B4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Post_0x80A9ACD0/func_80A9D1E0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Hakugin_Post_0x80A9ACD0/func_80A9D1E0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Post_0x80A9ACD0/func_80A9D260.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Hakugin_Post_0x80A9ACD0/func_80A9D260.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Post_0x80A9ACD0/func_80A9D2C4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Hakugin_Post_0x80A9ACD0/func_80A9D2C4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Post_0x80A9ACD0/func_80A9D360.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Hakugin_Post_0x80A9ACD0/func_80A9D360.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Post_0x80A9ACD0/func_80A9D3E4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Hakugin_Post_0x80A9ACD0/func_80A9D3E4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Post_0x80A9ACD0/func_80A9D434.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Hakugin_Post_0x80A9ACD0/func_80A9D434.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Post_0x80A9ACD0/BgHakuginPost_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Hakugin_Post_0x80A9ACD0/BgHakuginPost_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Post_0x80A9ACD0/func_80A9D61C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Hakugin_Post_0x80A9ACD0/func_80A9D61C.asm") diff --git a/src/overlays/actors/ovl_Bg_Hakugin_Switch/z_bg_hakugin_switch.c b/src/overlays/actors/ovl_Bg_Hakugin_Switch/z_bg_hakugin_switch.c index 62755cbe23..4479b38f62 100644 --- a/src/overlays/actors/ovl_Bg_Hakugin_Switch/z_bg_hakugin_switch.c +++ b/src/overlays/actors/ovl_Bg_Hakugin_Switch/z_bg_hakugin_switch.c @@ -23,54 +23,54 @@ const ActorInit Bg_Hakugin_Switch_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Switch_0x80B15790/func_80B15790.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Hakugin_Switch_0x80B15790/func_80B15790.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Switch_0x80B15790/func_80B157C4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Hakugin_Switch_0x80B15790/func_80B157C4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Switch_0x80B15790/BgHakuginSwitch_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Hakugin_Switch_0x80B15790/BgHakuginSwitch_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Switch_0x80B15790/BgHakuginSwitch_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Hakugin_Switch_0x80B15790/BgHakuginSwitch_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Switch_0x80B15790/func_80B15A4C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Hakugin_Switch_0x80B15790/func_80B15A4C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Switch_0x80B15790/func_80B15A68.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Hakugin_Switch_0x80B15790/func_80B15A68.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Switch_0x80B15790/func_80B15B1C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Hakugin_Switch_0x80B15790/func_80B15B1C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Switch_0x80B15790/func_80B15B74.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Hakugin_Switch_0x80B15790/func_80B15B74.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Switch_0x80B15790/func_80B15E0C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Hakugin_Switch_0x80B15790/func_80B15E0C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Switch_0x80B15790/func_80B15E78.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Hakugin_Switch_0x80B15790/func_80B15E78.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Switch_0x80B15790/func_80B15F3C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Hakugin_Switch_0x80B15790/func_80B15F3C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Switch_0x80B15790/func_80B15F88.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Hakugin_Switch_0x80B15790/func_80B15F88.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Switch_0x80B15790/func_80B1606C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Hakugin_Switch_0x80B15790/func_80B1606C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Switch_0x80B15790/func_80B160DC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Hakugin_Switch_0x80B15790/func_80B160DC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Switch_0x80B15790/func_80B16180.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Hakugin_Switch_0x80B15790/func_80B16180.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Switch_0x80B15790/func_80B161A0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Hakugin_Switch_0x80B15790/func_80B161A0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Switch_0x80B15790/func_80B16244.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Hakugin_Switch_0x80B15790/func_80B16244.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Switch_0x80B15790/func_80B162AC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Hakugin_Switch_0x80B15790/func_80B162AC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Switch_0x80B15790/func_80B163C4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Hakugin_Switch_0x80B15790/func_80B163C4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Switch_0x80B15790/func_80B16400.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Hakugin_Switch_0x80B15790/func_80B16400.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Switch_0x80B15790/func_80B16494.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Hakugin_Switch_0x80B15790/func_80B16494.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Switch_0x80B15790/func_80B16520.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Hakugin_Switch_0x80B15790/func_80B16520.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Switch_0x80B15790/func_80B165A0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Hakugin_Switch_0x80B15790/func_80B165A0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Switch_0x80B15790/func_80B165E0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Hakugin_Switch_0x80B15790/func_80B165E0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Switch_0x80B15790/BgHakuginSwitch_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Hakugin_Switch_0x80B15790/BgHakuginSwitch_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Switch_0x80B15790/BgHakuginSwitch_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Hakugin_Switch_0x80B15790/BgHakuginSwitch_Draw.asm") diff --git a/src/overlays/actors/ovl_Bg_Icefloe/z_bg_icefloe.c b/src/overlays/actors/ovl_Bg_Icefloe/z_bg_icefloe.c index 2b7e908e49..fbb567f368 100644 --- a/src/overlays/actors/ovl_Bg_Icefloe/z_bg_icefloe.c +++ b/src/overlays/actors/ovl_Bg_Icefloe/z_bg_icefloe.c @@ -23,22 +23,22 @@ const ActorInit Bg_Icefloe_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Icefloe_0x80AC48F0/BgIcefloe_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Icefloe_0x80AC48F0/BgIcefloe_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Icefloe_0x80AC48F0/BgIcefloe_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Icefloe_0x80AC48F0/BgIcefloe_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Icefloe_0x80AC48F0/func_80AC4A80.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Icefloe_0x80AC48F0/func_80AC4A80.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Icefloe_0x80AC48F0/func_80AC4AE8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Icefloe_0x80AC48F0/func_80AC4AE8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Icefloe_0x80AC48F0/func_80AC4C18.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Icefloe_0x80AC48F0/func_80AC4C18.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Icefloe_0x80AC48F0/func_80AC4C34.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Icefloe_0x80AC48F0/func_80AC4C34.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Icefloe_0x80AC48F0/func_80AC4CF0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Icefloe_0x80AC48F0/func_80AC4CF0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Icefloe_0x80AC48F0/func_80AC4D2C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Icefloe_0x80AC48F0/func_80AC4D2C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Icefloe_0x80AC48F0/BgIcefloe_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Icefloe_0x80AC48F0/BgIcefloe_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Icefloe_0x80AC48F0/BgIcefloe_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Icefloe_0x80AC48F0/BgIcefloe_Draw.asm") diff --git a/src/overlays/actors/ovl_Bg_Icicle/z_bg_icicle.c b/src/overlays/actors/ovl_Bg_Icicle/z_bg_icicle.c index 4bf84ee7e4..9a81eadd2a 100644 --- a/src/overlays/actors/ovl_Bg_Icicle/z_bg_icicle.c +++ b/src/overlays/actors/ovl_Bg_Icicle/z_bg_icicle.c @@ -23,24 +23,24 @@ const ActorInit Bg_Icicle_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Icicle_0x809C9A60/BgIcicle_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Icicle_0x809C9A60/BgIcicle_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Icicle_0x809C9A60/BgIcicle_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Icicle_0x809C9A60/BgIcicle_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Icicle_0x809C9A60/func_809C9B9C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Icicle_0x809C9A60/func_809C9B9C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Icicle_0x809C9A60/func_809C9D7C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Icicle_0x809C9A60/func_809C9D7C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Icicle_0x809C9A60/func_809C9D8C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Icicle_0x809C9A60/func_809C9D8C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Icicle_0x809C9A60/func_809C9DC4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Icicle_0x809C9A60/func_809C9DC4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Icicle_0x809C9A60/func_809C9F28.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Icicle_0x809C9A60/func_809C9F28.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Icicle_0x809C9A60/func_809CA06C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Icicle_0x809C9A60/func_809CA06C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Icicle_0x809C9A60/func_809CA0BC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Icicle_0x809C9A60/func_809CA0BC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Icicle_0x809C9A60/BgIcicle_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Icicle_0x809C9A60/BgIcicle_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Icicle_0x809C9A60/BgIcicle_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Icicle_0x809C9A60/BgIcicle_Draw.asm") diff --git a/src/overlays/actors/ovl_Bg_Ikana_Block/z_bg_ikana_block.c b/src/overlays/actors/ovl_Bg_Ikana_Block/z_bg_ikana_block.c index 99cb6c7bc9..3e513d24e3 100644 --- a/src/overlays/actors/ovl_Bg_Ikana_Block/z_bg_ikana_block.c +++ b/src/overlays/actors/ovl_Bg_Ikana_Block/z_bg_ikana_block.c @@ -22,46 +22,46 @@ const ActorInit Bg_Ikana_Block_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Block_0x80B7EA60/func_80B7EA60.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Ikana_Block_0x80B7EA60/func_80B7EA60.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Block_0x80B7EA60/func_80B7EB30.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Ikana_Block_0x80B7EA60/func_80B7EB30.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Block_0x80B7EA60/func_80B7EB64.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Ikana_Block_0x80B7EA60/func_80B7EB64.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Block_0x80B7EA60/func_80B7EB7C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Ikana_Block_0x80B7EA60/func_80B7EB7C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Block_0x80B7EA60/func_80B7EB94.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Ikana_Block_0x80B7EA60/func_80B7EB94.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Block_0x80B7EA60/func_80B7ECFC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Ikana_Block_0x80B7EA60/func_80B7ECFC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Block_0x80B7EA60/func_80B7ED54.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Ikana_Block_0x80B7EA60/func_80B7ED54.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Block_0x80B7EA60/func_80B7EDC4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Ikana_Block_0x80B7EA60/func_80B7EDC4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Block_0x80B7EA60/func_80B7EE70.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Ikana_Block_0x80B7EA60/func_80B7EE70.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Block_0x80B7EA60/func_80B7EEB4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Ikana_Block_0x80B7EA60/func_80B7EEB4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Block_0x80B7EA60/BgIkanaBlock_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Ikana_Block_0x80B7EA60/BgIkanaBlock_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Block_0x80B7EA60/BgIkanaBlock_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Ikana_Block_0x80B7EA60/BgIkanaBlock_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Block_0x80B7EA60/func_80B7F00C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Ikana_Block_0x80B7EA60/func_80B7F00C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Block_0x80B7EA60/func_80B7F034.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Ikana_Block_0x80B7EA60/func_80B7F034.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Block_0x80B7EA60/func_80B7F0A4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Ikana_Block_0x80B7EA60/func_80B7F0A4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Block_0x80B7EA60/func_80B7F0D0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Ikana_Block_0x80B7EA60/func_80B7F0D0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Block_0x80B7EA60/func_80B7F1A8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Ikana_Block_0x80B7EA60/func_80B7F1A8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Block_0x80B7EA60/func_80B7F290.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Ikana_Block_0x80B7EA60/func_80B7F290.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Block_0x80B7EA60/func_80B7F360.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Ikana_Block_0x80B7EA60/func_80B7F360.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Block_0x80B7EA60/func_80B7F398.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Ikana_Block_0x80B7EA60/func_80B7F398.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Block_0x80B7EA60/BgIkanaBlock_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Ikana_Block_0x80B7EA60/BgIkanaBlock_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Block_0x80B7EA60/func_80B7F564.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Ikana_Block_0x80B7EA60/func_80B7F564.asm") diff --git a/src/overlays/actors/ovl_Bg_Ikana_Bombwall/z_bg_ikana_bombwall.c b/src/overlays/actors/ovl_Bg_Ikana_Bombwall/z_bg_ikana_bombwall.c index c72332bcb5..b089063725 100644 --- a/src/overlays/actors/ovl_Bg_Ikana_Bombwall/z_bg_ikana_bombwall.c +++ b/src/overlays/actors/ovl_Bg_Ikana_Bombwall/z_bg_ikana_bombwall.c @@ -23,34 +23,34 @@ const ActorInit Bg_Ikana_Bombwall_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Bombwall_0x80BD4720/func_80BD4720.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Ikana_Bombwall_0x80BD4720/func_80BD4720.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Bombwall_0x80BD4720/func_80BD4A14.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Ikana_Bombwall_0x80BD4720/func_80BD4A14.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Bombwall_0x80BD4720/BgIkanaBombwall_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Ikana_Bombwall_0x80BD4720/BgIkanaBombwall_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Bombwall_0x80BD4720/BgIkanaBombwall_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Ikana_Bombwall_0x80BD4720/BgIkanaBombwall_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Bombwall_0x80BD4720/func_80BD4E44.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Ikana_Bombwall_0x80BD4720/func_80BD4E44.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Bombwall_0x80BD4720/func_80BD4EAC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Ikana_Bombwall_0x80BD4720/func_80BD4EAC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Bombwall_0x80BD4720/func_80BD4F18.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Ikana_Bombwall_0x80BD4720/func_80BD4F18.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Bombwall_0x80BD4720/func_80BD4F2C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Ikana_Bombwall_0x80BD4720/func_80BD4F2C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Bombwall_0x80BD4720/func_80BD4F88.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Ikana_Bombwall_0x80BD4720/func_80BD4F88.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Bombwall_0x80BD4720/func_80BD4F9C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Ikana_Bombwall_0x80BD4720/func_80BD4F9C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Bombwall_0x80BD4720/func_80BD4FF8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Ikana_Bombwall_0x80BD4720/func_80BD4FF8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Bombwall_0x80BD4720/func_80BD503C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Ikana_Bombwall_0x80BD4720/func_80BD503C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Bombwall_0x80BD4720/func_80BD5118.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Ikana_Bombwall_0x80BD4720/func_80BD5118.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Bombwall_0x80BD4720/func_80BD5134.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Ikana_Bombwall_0x80BD4720/func_80BD5134.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Bombwall_0x80BD4720/BgIkanaBombwall_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Ikana_Bombwall_0x80BD4720/BgIkanaBombwall_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Bombwall_0x80BD4720/BgIkanaBombwall_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Ikana_Bombwall_0x80BD4720/BgIkanaBombwall_Draw.asm") diff --git a/src/overlays/actors/ovl_Bg_Ikana_Dharma/z_bg_ikana_dharma.c b/src/overlays/actors/ovl_Bg_Ikana_Dharma/z_bg_ikana_dharma.c index cd7f6c7a4e..212fb90d23 100644 --- a/src/overlays/actors/ovl_Bg_Ikana_Dharma/z_bg_ikana_dharma.c +++ b/src/overlays/actors/ovl_Bg_Ikana_Dharma/z_bg_ikana_dharma.c @@ -23,24 +23,24 @@ const ActorInit Bg_Ikana_Dharma_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Dharma_0x80BEC240/func_80BEC240.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Ikana_Dharma_0x80BEC240/func_80BEC240.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Dharma_0x80BEC240/BgIkanaDharma_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Ikana_Dharma_0x80BEC240/BgIkanaDharma_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Dharma_0x80BEC240/BgIkanaDharma_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Ikana_Dharma_0x80BEC240/BgIkanaDharma_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Dharma_0x80BEC240/func_80BEC5C4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Ikana_Dharma_0x80BEC240/func_80BEC5C4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Dharma_0x80BEC240/func_80BEC5E0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Ikana_Dharma_0x80BEC240/func_80BEC5E0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Dharma_0x80BEC240/func_80BEC758.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Ikana_Dharma_0x80BEC240/func_80BEC758.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Dharma_0x80BEC240/func_80BEC790.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Ikana_Dharma_0x80BEC240/func_80BEC790.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Dharma_0x80BEC240/func_80BEC7EC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Ikana_Dharma_0x80BEC240/func_80BEC7EC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Dharma_0x80BEC240/func_80BEC808.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Ikana_Dharma_0x80BEC240/func_80BEC808.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Dharma_0x80BEC240/BgIkanaDharma_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Ikana_Dharma_0x80BEC240/BgIkanaDharma_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Dharma_0x80BEC240/BgIkanaDharma_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Ikana_Dharma_0x80BEC240/BgIkanaDharma_Draw.asm") diff --git a/src/overlays/actors/ovl_Bg_Ikana_Mirror/z_bg_ikana_mirror.c b/src/overlays/actors/ovl_Bg_Ikana_Mirror/z_bg_ikana_mirror.c index 860e080eef..baac62e257 100644 --- a/src/overlays/actors/ovl_Bg_Ikana_Mirror/z_bg_ikana_mirror.c +++ b/src/overlays/actors/ovl_Bg_Ikana_Mirror/z_bg_ikana_mirror.c @@ -23,20 +23,20 @@ const ActorInit Bg_Ikana_Mirror_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Mirror_0x80B7F730/func_80B7F730.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Ikana_Mirror_0x80B7F730/func_80B7F730.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Mirror_0x80B7F730/BgIkanaMirror_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Ikana_Mirror_0x80B7F730/BgIkanaMirror_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Mirror_0x80B7F730/BgIkanaMirror_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Ikana_Mirror_0x80B7F730/BgIkanaMirror_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Mirror_0x80B7F730/func_80B7FA84.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Ikana_Mirror_0x80B7F730/func_80B7FA84.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Mirror_0x80B7F730/func_80B7FA9C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Ikana_Mirror_0x80B7F730/func_80B7FA9C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Mirror_0x80B7F730/func_80B7FB84.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Ikana_Mirror_0x80B7F730/func_80B7FB84.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Mirror_0x80B7F730/func_80B7FBA4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Ikana_Mirror_0x80B7F730/func_80B7FBA4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Mirror_0x80B7F730/BgIkanaMirror_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Ikana_Mirror_0x80B7F730/BgIkanaMirror_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Mirror_0x80B7F730/BgIkanaMirror_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Ikana_Mirror_0x80B7F730/BgIkanaMirror_Draw.asm") diff --git a/src/overlays/actors/ovl_Bg_Ikana_Rotaryroom/z_bg_ikana_rotaryroom.c b/src/overlays/actors/ovl_Bg_Ikana_Rotaryroom/z_bg_ikana_rotaryroom.c index 0a87c0f7ef..c46e155632 100644 --- a/src/overlays/actors/ovl_Bg_Ikana_Rotaryroom/z_bg_ikana_rotaryroom.c +++ b/src/overlays/actors/ovl_Bg_Ikana_Rotaryroom/z_bg_ikana_rotaryroom.c @@ -23,60 +23,60 @@ const ActorInit Bg_Ikana_Rotaryroom_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Rotaryroom_0x80B802E0/func_80B802E0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Ikana_Rotaryroom_0x80B802E0/func_80B802E0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Rotaryroom_0x80B802E0/func_80B80358.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Ikana_Rotaryroom_0x80B802E0/func_80B80358.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Rotaryroom_0x80B802E0/func_80B80440.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Ikana_Rotaryroom_0x80B802E0/func_80B80440.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Rotaryroom_0x80B802E0/func_80B80550.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Ikana_Rotaryroom_0x80B802E0/func_80B80550.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Rotaryroom_0x80B802E0/func_80B80778.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Ikana_Rotaryroom_0x80B802E0/func_80B80778.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Rotaryroom_0x80B802E0/func_80B80894.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Ikana_Rotaryroom_0x80B802E0/func_80B80894.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Rotaryroom_0x80B802E0/func_80B80C88.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Ikana_Rotaryroom_0x80B802E0/func_80B80C88.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Rotaryroom_0x80B802E0/func_80B80F08.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Ikana_Rotaryroom_0x80B802E0/func_80B80F08.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Rotaryroom_0x80B802E0/func_80B81010.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Ikana_Rotaryroom_0x80B802E0/func_80B81010.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Rotaryroom_0x80B802E0/func_80B81234.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Ikana_Rotaryroom_0x80B802E0/func_80B81234.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Rotaryroom_0x80B802E0/func_80B814B8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Ikana_Rotaryroom_0x80B802E0/func_80B814B8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Rotaryroom_0x80B802E0/func_80B81570.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Ikana_Rotaryroom_0x80B802E0/func_80B81570.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Rotaryroom_0x80B802E0/func_80B816A4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Ikana_Rotaryroom_0x80B802E0/func_80B816A4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Rotaryroom_0x80B802E0/BgIkanaRotaryroom_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Ikana_Rotaryroom_0x80B802E0/BgIkanaRotaryroom_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Rotaryroom_0x80B802E0/BgIkanaRotaryroom_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Ikana_Rotaryroom_0x80B802E0/BgIkanaRotaryroom_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Rotaryroom_0x80B802E0/func_80B818B4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Ikana_Rotaryroom_0x80B802E0/func_80B818B4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Rotaryroom_0x80B802E0/func_80B818C8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Ikana_Rotaryroom_0x80B802E0/func_80B818C8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Rotaryroom_0x80B802E0/func_80B81978.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Ikana_Rotaryroom_0x80B802E0/func_80B81978.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Rotaryroom_0x80B802E0/func_80B8198C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Ikana_Rotaryroom_0x80B802E0/func_80B8198C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Rotaryroom_0x80B802E0/func_80B819DC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Ikana_Rotaryroom_0x80B802E0/func_80B819DC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Rotaryroom_0x80B802E0/func_80B819F0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Ikana_Rotaryroom_0x80B802E0/func_80B819F0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Rotaryroom_0x80B802E0/func_80B81A64.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Ikana_Rotaryroom_0x80B802E0/func_80B81A64.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Rotaryroom_0x80B802E0/func_80B81A80.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Ikana_Rotaryroom_0x80B802E0/func_80B81A80.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Rotaryroom_0x80B802E0/func_80B81B84.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Ikana_Rotaryroom_0x80B802E0/func_80B81B84.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Rotaryroom_0x80B802E0/func_80B81BA0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Ikana_Rotaryroom_0x80B802E0/func_80B81BA0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Rotaryroom_0x80B802E0/func_80B81DAC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Ikana_Rotaryroom_0x80B802E0/func_80B81DAC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Rotaryroom_0x80B802E0/func_80B81DC8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Ikana_Rotaryroom_0x80B802E0/func_80B81DC8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Rotaryroom_0x80B802E0/BgIkanaRotaryroom_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Ikana_Rotaryroom_0x80B802E0/BgIkanaRotaryroom_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Rotaryroom_0x80B802E0/BgIkanaRotaryroom_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Ikana_Rotaryroom_0x80B802E0/BgIkanaRotaryroom_Draw.asm") diff --git a/src/overlays/actors/ovl_Bg_Ikana_Shutter/z_bg_ikana_shutter.c b/src/overlays/actors/ovl_Bg_Ikana_Shutter/z_bg_ikana_shutter.c index 9cdc868a50..a6bb45e8d5 100644 --- a/src/overlays/actors/ovl_Bg_Ikana_Shutter/z_bg_ikana_shutter.c +++ b/src/overlays/actors/ovl_Bg_Ikana_Shutter/z_bg_ikana_shutter.c @@ -23,48 +23,48 @@ const ActorInit Bg_Ikana_Shutter_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Shutter_0x80BD5690/func_80BD5690.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Ikana_Shutter_0x80BD5690/func_80BD5690.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Shutter_0x80BD5690/BgIkanaShutter_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Ikana_Shutter_0x80BD5690/BgIkanaShutter_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Shutter_0x80BD5690/BgIkanaShutter_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Ikana_Shutter_0x80BD5690/BgIkanaShutter_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Shutter_0x80BD5690/func_80BD5828.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Ikana_Shutter_0x80BD5690/func_80BD5828.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Shutter_0x80BD5690/func_80BD5844.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Ikana_Shutter_0x80BD5690/func_80BD5844.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Shutter_0x80BD5690/func_80BD5878.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Ikana_Shutter_0x80BD5690/func_80BD5878.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Shutter_0x80BD5690/func_80BD5894.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Ikana_Shutter_0x80BD5690/func_80BD5894.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Shutter_0x80BD5690/func_80BD58F0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Ikana_Shutter_0x80BD5690/func_80BD58F0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Shutter_0x80BD5690/func_80BD5910.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Ikana_Shutter_0x80BD5690/func_80BD5910.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Shutter_0x80BD5690/func_80BD599C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Ikana_Shutter_0x80BD5690/func_80BD599C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Shutter_0x80BD5690/func_80BD59C4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Ikana_Shutter_0x80BD5690/func_80BD59C4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Shutter_0x80BD5690/func_80BD59F8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Ikana_Shutter_0x80BD5690/func_80BD59F8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Shutter_0x80BD5690/func_80BD5A18.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Ikana_Shutter_0x80BD5690/func_80BD5A18.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Shutter_0x80BD5690/func_80BD5AE8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Ikana_Shutter_0x80BD5690/func_80BD5AE8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Shutter_0x80BD5690/func_80BD5B04.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Ikana_Shutter_0x80BD5690/func_80BD5B04.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Shutter_0x80BD5690/func_80BD5B44.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Ikana_Shutter_0x80BD5690/func_80BD5B44.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Shutter_0x80BD5690/func_80BD5B60.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Ikana_Shutter_0x80BD5690/func_80BD5B60.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Shutter_0x80BD5690/func_80BD5BC4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Ikana_Shutter_0x80BD5690/func_80BD5BC4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Shutter_0x80BD5690/func_80BD5BD8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Ikana_Shutter_0x80BD5690/func_80BD5BD8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Shutter_0x80BD5690/func_80BD5C64.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Ikana_Shutter_0x80BD5690/func_80BD5C64.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Shutter_0x80BD5690/func_80BD5C8C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Ikana_Shutter_0x80BD5690/func_80BD5C8C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Shutter_0x80BD5690/BgIkanaShutter_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Ikana_Shutter_0x80BD5690/BgIkanaShutter_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Shutter_0x80BD5690/BgIkanaShutter_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Ikana_Shutter_0x80BD5690/BgIkanaShutter_Draw.asm") diff --git a/src/overlays/actors/ovl_Bg_Iknin_Susceil/z_bg_iknin_susceil.c b/src/overlays/actors/ovl_Bg_Iknin_Susceil/z_bg_iknin_susceil.c index 2494040954..c00898ec61 100644 --- a/src/overlays/actors/ovl_Bg_Iknin_Susceil/z_bg_iknin_susceil.c +++ b/src/overlays/actors/ovl_Bg_Iknin_Susceil/z_bg_iknin_susceil.c @@ -23,44 +23,44 @@ const ActorInit Bg_Iknin_Susceil_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Iknin_Susceil_0x80C0A740/func_80C0A740.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Iknin_Susceil_0x80C0A740/func_80C0A740.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Iknin_Susceil_0x80C0A740/func_80C0A804.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Iknin_Susceil_0x80C0A740/func_80C0A804.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Iknin_Susceil_0x80C0A740/func_80C0A838.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Iknin_Susceil_0x80C0A740/func_80C0A838.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Iknin_Susceil_0x80C0A740/func_80C0A86C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Iknin_Susceil_0x80C0A740/func_80C0A86C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Iknin_Susceil_0x80C0A740/func_80C0A95C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Iknin_Susceil_0x80C0A740/func_80C0A95C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Iknin_Susceil_0x80C0A740/BgIkninSusceil_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Iknin_Susceil_0x80C0A740/BgIkninSusceil_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Iknin_Susceil_0x80C0A740/BgIkninSusceil_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Iknin_Susceil_0x80C0A740/BgIkninSusceil_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Iknin_Susceil_0x80C0A740/func_80C0AB14.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Iknin_Susceil_0x80C0A740/func_80C0AB14.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Iknin_Susceil_0x80C0A740/func_80C0AB44.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Iknin_Susceil_0x80C0A740/func_80C0AB44.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Iknin_Susceil_0x80C0A740/func_80C0AB88.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Iknin_Susceil_0x80C0A740/func_80C0AB88.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Iknin_Susceil_0x80C0A740/func_80C0ABA8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Iknin_Susceil_0x80C0A740/func_80C0ABA8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Iknin_Susceil_0x80C0A740/func_80C0AC74.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Iknin_Susceil_0x80C0A740/func_80C0AC74.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Iknin_Susceil_0x80C0A740/func_80C0AC90.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Iknin_Susceil_0x80C0A740/func_80C0AC90.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Iknin_Susceil_0x80C0A740/func_80C0ACD4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Iknin_Susceil_0x80C0A740/func_80C0ACD4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Iknin_Susceil_0x80C0A740/func_80C0ACE8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Iknin_Susceil_0x80C0A740/func_80C0ACE8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Iknin_Susceil_0x80C0A740/func_80C0AD44.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Iknin_Susceil_0x80C0A740/func_80C0AD44.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Iknin_Susceil_0x80C0A740/func_80C0AD64.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Iknin_Susceil_0x80C0A740/func_80C0AD64.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Iknin_Susceil_0x80C0A740/func_80C0AE3C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Iknin_Susceil_0x80C0A740/func_80C0AE3C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Iknin_Susceil_0x80C0A740/func_80C0AE5C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Iknin_Susceil_0x80C0A740/func_80C0AE5C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Iknin_Susceil_0x80C0A740/BgIkninSusceil_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Iknin_Susceil_0x80C0A740/BgIkninSusceil_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Iknin_Susceil_0x80C0A740/BgIkninSusceil_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Iknin_Susceil_0x80C0A740/BgIkninSusceil_Draw.asm") diff --git a/src/overlays/actors/ovl_Bg_Ikninside/z_bg_ikninside.c b/src/overlays/actors/ovl_Bg_Ikninside/z_bg_ikninside.c index 977e92ab4b..756659fdf9 100644 --- a/src/overlays/actors/ovl_Bg_Ikninside/z_bg_ikninside.c +++ b/src/overlays/actors/ovl_Bg_Ikninside/z_bg_ikninside.c @@ -23,16 +23,16 @@ const ActorInit Bg_Ikninside_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikninside_0x80C07110/BgIkninside_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Ikninside_0x80C07110/BgIkninside_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikninside_0x80C07110/BgIkninside_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Ikninside_0x80C07110/BgIkninside_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikninside_0x80C07110/func_80C07220.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Ikninside_0x80C07110/func_80C07220.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikninside_0x80C07110/func_80C07230.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Ikninside_0x80C07110/func_80C07230.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikninside_0x80C07110/func_80C072D0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Ikninside_0x80C07110/func_80C072D0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikninside_0x80C07110/BgIkninside_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Ikninside_0x80C07110/BgIkninside_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikninside_0x80C07110/BgIkninside_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Ikninside_0x80C07110/BgIkninside_Draw.asm") diff --git a/src/overlays/actors/ovl_Bg_Iknv_Doukutu/z_bg_iknv_doukutu.c b/src/overlays/actors/ovl_Bg_Iknv_Doukutu/z_bg_iknv_doukutu.c index 28625c746c..e1a9113261 100644 --- a/src/overlays/actors/ovl_Bg_Iknv_Doukutu/z_bg_iknv_doukutu.c +++ b/src/overlays/actors/ovl_Bg_Iknv_Doukutu/z_bg_iknv_doukutu.c @@ -23,30 +23,30 @@ const ActorInit Bg_Iknv_Doukutu_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Iknv_Doukutu_0x80BD6F10/BgIknvDoukutu_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Iknv_Doukutu_0x80BD6F10/BgIknvDoukutu_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Iknv_Doukutu_0x80BD6F10/BgIknvDoukutu_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Iknv_Doukutu_0x80BD6F10/BgIknvDoukutu_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Iknv_Doukutu_0x80BD6F10/func_80BD716C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Iknv_Doukutu_0x80BD6F10/func_80BD716C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Iknv_Doukutu_0x80BD6F10/func_80BD71BC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Iknv_Doukutu_0x80BD6F10/func_80BD71BC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Iknv_Doukutu_0x80BD6F10/func_80BD7250.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Iknv_Doukutu_0x80BD6F10/func_80BD7250.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Iknv_Doukutu_0x80BD6F10/func_80BD72BC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Iknv_Doukutu_0x80BD6F10/func_80BD72BC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Iknv_Doukutu_0x80BD6F10/func_80BD7360.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Iknv_Doukutu_0x80BD6F10/func_80BD7360.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Iknv_Doukutu_0x80BD6F10/func_80BD73D0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Iknv_Doukutu_0x80BD6F10/func_80BD73D0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Iknv_Doukutu_0x80BD6F10/BgIknvDoukutu_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Iknv_Doukutu_0x80BD6F10/BgIknvDoukutu_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Iknv_Doukutu_0x80BD6F10/BgIknvDoukutu_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Iknv_Doukutu_0x80BD6F10/BgIknvDoukutu_Draw.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Iknv_Doukutu_0x80BD6F10/func_80BD7538.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Iknv_Doukutu_0x80BD6F10/func_80BD7538.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Iknv_Doukutu_0x80BD6F10/func_80BD7768.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Iknv_Doukutu_0x80BD6F10/func_80BD7768.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Iknv_Doukutu_0x80BD6F10/func_80BD7820.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Iknv_Doukutu_0x80BD6F10/func_80BD7820.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Iknv_Doukutu_0x80BD6F10/func_80BD78C4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Iknv_Doukutu_0x80BD6F10/func_80BD78C4.asm") diff --git a/src/overlays/actors/ovl_Bg_Iknv_Obj/z_bg_iknv_obj.c b/src/overlays/actors/ovl_Bg_Iknv_Obj/z_bg_iknv_obj.c index f390aca630..9e15659a39 100644 --- a/src/overlays/actors/ovl_Bg_Iknv_Obj/z_bg_iknv_obj.c +++ b/src/overlays/actors/ovl_Bg_Iknv_Obj/z_bg_iknv_obj.c @@ -23,30 +23,30 @@ const ActorInit Bg_Iknv_Obj_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Iknv_Obj_0x80BD7AB0/BgIknvObj_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Iknv_Obj_0x80BD7AB0/BgIknvObj_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Iknv_Obj_0x80BD7AB0/BgIknvObj_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Iknv_Obj_0x80BD7AB0/BgIknvObj_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Iknv_Obj_0x80BD7AB0/func_80BD7CEC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Iknv_Obj_0x80BD7AB0/func_80BD7CEC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Iknv_Obj_0x80BD7AB0/BgIknvObj_UpdateType0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Iknv_Obj_0x80BD7AB0/BgIknvObj_UpdateType0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Iknv_Obj_0x80BD7AB0/func_80BD7E0C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Iknv_Obj_0x80BD7AB0/func_80BD7E0C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Iknv_Obj_0x80BD7AB0/func_80BD7ED8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Iknv_Obj_0x80BD7AB0/func_80BD7ED8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Iknv_Obj_0x80BD7AB0/func_80BD7F4C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Iknv_Obj_0x80BD7AB0/func_80BD7F4C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Iknv_Obj_0x80BD7AB0/func_80BD7FDC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Iknv_Obj_0x80BD7AB0/func_80BD7FDC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Iknv_Obj_0x80BD7AB0/func_80BD8040.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Iknv_Obj_0x80BD7AB0/func_80BD8040.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Iknv_Obj_0x80BD7AB0/BgIknvObj_UpdateType2.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Iknv_Obj_0x80BD7AB0/BgIknvObj_UpdateType2.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Iknv_Obj_0x80BD7AB0/BgIknvObj_UpdateType1.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Iknv_Obj_0x80BD7AB0/BgIknvObj_UpdateType1.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Iknv_Obj_0x80BD7AB0/BgIknvObj_UpdateDefault.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Iknv_Obj_0x80BD7AB0/BgIknvObj_UpdateDefault.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Iknv_Obj_0x80BD7AB0/BgIknvObj_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Iknv_Obj_0x80BD7AB0/BgIknvObj_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Iknv_Obj_0x80BD7AB0/BgIknvObj_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Iknv_Obj_0x80BD7AB0/BgIknvObj_Draw.asm") 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 301976a1d4..8164b91c16 100644 --- a/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.c +++ b/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.c @@ -23,36 +23,36 @@ const ActorInit Bg_Ingate_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ingate_0x80953A90/func_80953A90.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Ingate_0x80953A90/func_80953A90.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ingate_0x80953A90/func_80953B40.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Ingate_0x80953A90/func_80953B40.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ingate_0x80953A90/func_80953BEC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Ingate_0x80953A90/func_80953BEC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ingate_0x80953A90/func_80953DA8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Ingate_0x80953A90/func_80953DA8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ingate_0x80953A90/func_80953E38.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Ingate_0x80953A90/func_80953E38.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ingate_0x80953A90/func_80953EA4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Ingate_0x80953A90/func_80953EA4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ingate_0x80953A90/func_80953F14.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Ingate_0x80953A90/func_80953F14.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ingate_0x80953A90/func_80953F8C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Ingate_0x80953A90/func_80953F8C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ingate_0x80953A90/func_80953F9C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Ingate_0x80953A90/func_80953F9C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ingate_0x80953A90/func_809541B8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Ingate_0x80953A90/func_809541B8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ingate_0x80953A90/func_809542A0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Ingate_0x80953A90/func_809542A0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ingate_0x80953A90/func_80954340.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Ingate_0x80953A90/func_80954340.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ingate_0x80953A90/func_809543D4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Ingate_0x80953A90/func_809543D4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ingate_0x80953A90/BgIngate_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Ingate_0x80953A90/BgIngate_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ingate_0x80953A90/BgIngate_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Ingate_0x80953A90/BgIngate_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ingate_0x80953A90/BgIngate_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Ingate_0x80953A90/BgIngate_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ingate_0x80953A90/BgIngate_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Ingate_0x80953A90/BgIngate_Draw.asm") diff --git a/src/overlays/actors/ovl_Bg_Inibs_Movebg/z_bg_inibs_movebg.c b/src/overlays/actors/ovl_Bg_Inibs_Movebg/z_bg_inibs_movebg.c index 381a542eeb..9eec3bd71a 100644 --- a/src/overlays/actors/ovl_Bg_Inibs_Movebg/z_bg_inibs_movebg.c +++ b/src/overlays/actors/ovl_Bg_Inibs_Movebg/z_bg_inibs_movebg.c @@ -22,8 +22,8 @@ const ActorInit Bg_Inibs_Movebg_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Inibs_Movebg_0x80B96410/BgInibsMovebg_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Inibs_Movebg_0x80B96410/BgInibsMovebg_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Inibs_Movebg_0x80B96410/BgInibsMovebg_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Inibs_Movebg_0x80B96410/BgInibsMovebg_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Inibs_Movebg_0x80B96410/BgInibsMovebg_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Inibs_Movebg_0x80B96410/BgInibsMovebg_Draw.asm") diff --git a/src/overlays/actors/ovl_Bg_Keikoku_Saku/z_bg_keikoku_saku.c b/src/overlays/actors/ovl_Bg_Keikoku_Saku/z_bg_keikoku_saku.c index 1f2f576e1d..3c89d5bb58 100644 --- a/src/overlays/actors/ovl_Bg_Keikoku_Saku/z_bg_keikoku_saku.c +++ b/src/overlays/actors/ovl_Bg_Keikoku_Saku/z_bg_keikoku_saku.c @@ -23,16 +23,16 @@ const ActorInit Bg_Keikoku_Saku_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Keikoku_Saku_0x80A537D0/BgKeikokuSaku_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Keikoku_Saku_0x80A537D0/BgKeikokuSaku_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Keikoku_Saku_0x80A537D0/BgKeikokuSaku_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Keikoku_Saku_0x80A537D0/BgKeikokuSaku_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Keikoku_Saku_0x80A537D0/func_80A5389C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Keikoku_Saku_0x80A537D0/func_80A5389C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Keikoku_Saku_0x80A537D0/func_80A538E0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Keikoku_Saku_0x80A537D0/func_80A538E0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Keikoku_Saku_0x80A537D0/func_80A53994.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Keikoku_Saku_0x80A537D0/func_80A53994.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Keikoku_Saku_0x80A537D0/BgKeikokuSaku_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Keikoku_Saku_0x80A537D0/BgKeikokuSaku_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Keikoku_Saku_0x80A537D0/BgKeikokuSaku_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Keikoku_Saku_0x80A537D0/BgKeikokuSaku_Draw.asm") diff --git a/src/overlays/actors/ovl_Bg_Keikoku_Spr/z_bg_keikoku_spr.c b/src/overlays/actors/ovl_Bg_Keikoku_Spr/z_bg_keikoku_spr.c index edb58e181a..4eadbb0247 100644 --- a/src/overlays/actors/ovl_Bg_Keikoku_Spr/z_bg_keikoku_spr.c +++ b/src/overlays/actors/ovl_Bg_Keikoku_Spr/z_bg_keikoku_spr.c @@ -23,10 +23,10 @@ const ActorInit Bg_Keikoku_Spr_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Keikoku_Spr_0x808C3A50/BgKeikokuSpr_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Keikoku_Spr_0x808C3A50/BgKeikokuSpr_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Keikoku_Spr_0x808C3A50/BgKeikokuSpr_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Keikoku_Spr_0x808C3A50/BgKeikokuSpr_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Keikoku_Spr_0x808C3A50/BgKeikokuSpr_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Keikoku_Spr_0x808C3A50/BgKeikokuSpr_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Keikoku_Spr_0x808C3A50/BgKeikokuSpr_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Keikoku_Spr_0x808C3A50/BgKeikokuSpr_Draw.asm") diff --git a/src/overlays/actors/ovl_Bg_Kin2_Bombwall/z_bg_kin2_bombwall.c b/src/overlays/actors/ovl_Bg_Kin2_Bombwall/z_bg_kin2_bombwall.c index a40986a19c..c0271cf6de 100644 --- a/src/overlays/actors/ovl_Bg_Kin2_Bombwall/z_bg_kin2_bombwall.c +++ b/src/overlays/actors/ovl_Bg_Kin2_Bombwall/z_bg_kin2_bombwall.c @@ -23,26 +23,26 @@ const ActorInit Bg_Kin2_Bombwall_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Kin2_Bombwall_0x80B6E020/func_80B6E020.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Kin2_Bombwall_0x80B6E020/func_80B6E020.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Kin2_Bombwall_0x80B6E020/func_80B6E090.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Kin2_Bombwall_0x80B6E020/func_80B6E090.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Kin2_Bombwall_0x80B6E020/BgKin2Bombwall_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Kin2_Bombwall_0x80B6E020/BgKin2Bombwall_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Kin2_Bombwall_0x80B6E020/BgKin2Bombwall_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Kin2_Bombwall_0x80B6E020/BgKin2Bombwall_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Kin2_Bombwall_0x80B6E020/func_80B6E4B8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Kin2_Bombwall_0x80B6E020/func_80B6E4B8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Kin2_Bombwall_0x80B6E020/func_80B6E4CC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Kin2_Bombwall_0x80B6E020/func_80B6E4CC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Kin2_Bombwall_0x80B6E020/func_80B6E544.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Kin2_Bombwall_0x80B6E020/func_80B6E544.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Kin2_Bombwall_0x80B6E020/func_80B6E558.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Kin2_Bombwall_0x80B6E020/func_80B6E558.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Kin2_Bombwall_0x80B6E020/func_80B6E5F8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Kin2_Bombwall_0x80B6E020/func_80B6E5F8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Kin2_Bombwall_0x80B6E020/func_80B6E614.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Kin2_Bombwall_0x80B6E020/func_80B6E614.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Kin2_Bombwall_0x80B6E020/BgKin2Bombwall_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Kin2_Bombwall_0x80B6E020/BgKin2Bombwall_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Kin2_Bombwall_0x80B6E020/BgKin2Bombwall_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Kin2_Bombwall_0x80B6E020/BgKin2Bombwall_Draw.asm") diff --git a/src/overlays/actors/ovl_Bg_Kin2_Fence/z_bg_kin2_fence.c b/src/overlays/actors/ovl_Bg_Kin2_Fence/z_bg_kin2_fence.c index 37e8d66fc3..cde65ef707 100644 --- a/src/overlays/actors/ovl_Bg_Kin2_Fence/z_bg_kin2_fence.c +++ b/src/overlays/actors/ovl_Bg_Kin2_Fence/z_bg_kin2_fence.c @@ -23,34 +23,34 @@ const ActorInit Bg_Kin2_Fence_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Kin2_Fence_0x80B6E820/func_80B6E820.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Kin2_Fence_0x80B6E820/func_80B6E820.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Kin2_Fence_0x80B6E820/func_80B6E890.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Kin2_Fence_0x80B6E820/func_80B6E890.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Kin2_Fence_0x80B6E820/BgKin2Fence_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Kin2_Fence_0x80B6E820/BgKin2Fence_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Kin2_Fence_0x80B6E820/BgKin2Fence_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Kin2_Fence_0x80B6E820/BgKin2Fence_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Kin2_Fence_0x80B6E820/func_80B6EADC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Kin2_Fence_0x80B6E820/func_80B6EADC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Kin2_Fence_0x80B6E820/func_80B6EAF4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Kin2_Fence_0x80B6E820/func_80B6EAF4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Kin2_Fence_0x80B6E820/func_80B6EBF4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Kin2_Fence_0x80B6E820/func_80B6EBF4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Kin2_Fence_0x80B6E820/func_80B6EC08.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Kin2_Fence_0x80B6E820/func_80B6EC08.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Kin2_Fence_0x80B6E820/func_80B6EC70.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Kin2_Fence_0x80B6E820/func_80B6EC70.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Kin2_Fence_0x80B6E820/func_80B6EC8C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Kin2_Fence_0x80B6E820/func_80B6EC8C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Kin2_Fence_0x80B6E820/func_80B6ECC4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Kin2_Fence_0x80B6E820/func_80B6ECC4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Kin2_Fence_0x80B6E820/func_80B6ECD8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Kin2_Fence_0x80B6E820/func_80B6ECD8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Kin2_Fence_0x80B6E820/func_80B6ED30.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Kin2_Fence_0x80B6E820/func_80B6ED30.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Kin2_Fence_0x80B6E820/func_80B6ED58.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Kin2_Fence_0x80B6E820/func_80B6ED58.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Kin2_Fence_0x80B6E820/BgKin2Fence_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Kin2_Fence_0x80B6E820/BgKin2Fence_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Kin2_Fence_0x80B6E820/BgKin2Fence_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Kin2_Fence_0x80B6E820/BgKin2Fence_Draw.asm") diff --git a/src/overlays/actors/ovl_Bg_Kin2_Picture/z_bg_kin2_picture.c b/src/overlays/actors/ovl_Bg_Kin2_Picture/z_bg_kin2_picture.c index 7a2f82ea8b..c0a88febf8 100644 --- a/src/overlays/actors/ovl_Bg_Kin2_Picture/z_bg_kin2_picture.c +++ b/src/overlays/actors/ovl_Bg_Kin2_Picture/z_bg_kin2_picture.c @@ -23,36 +23,36 @@ const ActorInit Bg_Kin2_Picture_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Kin2_Picture_0x80B6EFA0/func_80B6EFA0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Kin2_Picture_0x80B6EFA0/func_80B6EFA0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Kin2_Picture_0x80B6EFA0/func_80B6EFEC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Kin2_Picture_0x80B6EFA0/func_80B6EFEC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Kin2_Picture_0x80B6EFA0/func_80B6F098.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Kin2_Picture_0x80B6EFA0/func_80B6F098.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Kin2_Picture_0x80B6EFA0/BgKin2Picture_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Kin2_Picture_0x80B6EFA0/BgKin2Picture_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Kin2_Picture_0x80B6EFA0/BgKin2Picture_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Kin2_Picture_0x80B6EFA0/BgKin2Picture_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Kin2_Picture_0x80B6EFA0/func_80B6F4C0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Kin2_Picture_0x80B6EFA0/func_80B6F4C0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Kin2_Picture_0x80B6EFA0/func_80B6F4D4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Kin2_Picture_0x80B6EFA0/func_80B6F4D4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Kin2_Picture_0x80B6EFA0/func_80B6F5A4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Kin2_Picture_0x80B6EFA0/func_80B6F5A4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Kin2_Picture_0x80B6EFA0/func_80B6F5B8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Kin2_Picture_0x80B6EFA0/func_80B6F5B8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Kin2_Picture_0x80B6EFA0/func_80B6F61C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Kin2_Picture_0x80B6EFA0/func_80B6F61C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Kin2_Picture_0x80B6EFA0/func_80B6F640.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Kin2_Picture_0x80B6EFA0/func_80B6F640.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Kin2_Picture_0x80B6EFA0/func_80B6F708.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Kin2_Picture_0x80B6EFA0/func_80B6F708.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Kin2_Picture_0x80B6EFA0/func_80B6F72C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Kin2_Picture_0x80B6EFA0/func_80B6F72C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Kin2_Picture_0x80B6EFA0/func_80B6F8F8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Kin2_Picture_0x80B6EFA0/func_80B6F8F8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Kin2_Picture_0x80B6EFA0/func_80B6F90C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Kin2_Picture_0x80B6EFA0/func_80B6F90C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Kin2_Picture_0x80B6EFA0/BgKin2Picture_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Kin2_Picture_0x80B6EFA0/BgKin2Picture_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Kin2_Picture_0x80B6EFA0/BgKin2Picture_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Kin2_Picture_0x80B6EFA0/BgKin2Picture_Draw.asm") diff --git a/src/overlays/actors/ovl_Bg_Kin2_Shelf/z_bg_kin2_shelf.c b/src/overlays/actors/ovl_Bg_Kin2_Shelf/z_bg_kin2_shelf.c index ef42524cf9..3e5e854a2f 100644 --- a/src/overlays/actors/ovl_Bg_Kin2_Shelf/z_bg_kin2_shelf.c +++ b/src/overlays/actors/ovl_Bg_Kin2_Shelf/z_bg_kin2_shelf.c @@ -23,34 +23,34 @@ const ActorInit Bg_Kin2_Shelf_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Kin2_Shelf_0x80B6FB30/func_80B6FB30.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Kin2_Shelf_0x80B6FB30/func_80B6FB30.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Kin2_Shelf_0x80B6FB30/func_80B6FCA4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Kin2_Shelf_0x80B6FB30/func_80B6FCA4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Kin2_Shelf_0x80B6FB30/func_80B6FE08.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Kin2_Shelf_0x80B6FB30/func_80B6FE08.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Kin2_Shelf_0x80B6FB30/func_80B6FE48.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Kin2_Shelf_0x80B6FB30/func_80B6FE48.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Kin2_Shelf_0x80B6FB30/func_80B6FEBC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Kin2_Shelf_0x80B6FB30/func_80B6FEBC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Kin2_Shelf_0x80B6FB30/func_80B6FF28.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Kin2_Shelf_0x80B6FB30/func_80B6FF28.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Kin2_Shelf_0x80B6FB30/BgKin2Shelf_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Kin2_Shelf_0x80B6FB30/BgKin2Shelf_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Kin2_Shelf_0x80B6FB30/BgKin2Shelf_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Kin2_Shelf_0x80B6FB30/BgKin2Shelf_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Kin2_Shelf_0x80B6FB30/func_80B700A8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Kin2_Shelf_0x80B6FB30/func_80B700A8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Kin2_Shelf_0x80B6FB30/func_80B700C0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Kin2_Shelf_0x80B6FB30/func_80B700C0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Kin2_Shelf_0x80B6FB30/func_80B70214.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Kin2_Shelf_0x80B6FB30/func_80B70214.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Kin2_Shelf_0x80B6FB30/func_80B70230.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Kin2_Shelf_0x80B6FB30/func_80B70230.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Kin2_Shelf_0x80B6FB30/func_80B70498.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Kin2_Shelf_0x80B6FB30/func_80B70498.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Kin2_Shelf_0x80B6FB30/func_80B704B4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Kin2_Shelf_0x80B6FB30/func_80B704B4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Kin2_Shelf_0x80B6FB30/BgKin2Shelf_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Kin2_Shelf_0x80B6FB30/BgKin2Shelf_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Kin2_Shelf_0x80B6FB30/BgKin2Shelf_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Kin2_Shelf_0x80B6FB30/BgKin2Shelf_Draw.asm") diff --git a/src/overlays/actors/ovl_Bg_Ladder/z_bg_ladder.c b/src/overlays/actors/ovl_Bg_Ladder/z_bg_ladder.c index 153c9f6a49..dc80538f8a 100644 --- a/src/overlays/actors/ovl_Bg_Ladder/z_bg_ladder.c +++ b/src/overlays/actors/ovl_Bg_Ladder/z_bg_ladder.c @@ -23,18 +23,18 @@ const ActorInit Bg_Ladder_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ladder_0x80A4D9F0/BgLadder_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Ladder_0x80A4D9F0/BgLadder_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ladder_0x80A4D9F0/BgLadder_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Ladder_0x80A4D9F0/BgLadder_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ladder_0x80A4D9F0/func_80A4DB88.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Ladder_0x80A4D9F0/func_80A4DB88.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ladder_0x80A4D9F0/func_80A4DBD8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Ladder_0x80A4D9F0/func_80A4DBD8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ladder_0x80A4D9F0/func_80A4DC48.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Ladder_0x80A4D9F0/func_80A4DC48.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ladder_0x80A4D9F0/func_80A4DCCC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Ladder_0x80A4D9F0/func_80A4DCCC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ladder_0x80A4D9F0/BgLadder_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Ladder_0x80A4D9F0/BgLadder_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ladder_0x80A4D9F0/BgLadder_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Ladder_0x80A4D9F0/BgLadder_Draw.asm") diff --git a/src/overlays/actors/ovl_Bg_Last_Bwall/z_bg_last_bwall.c b/src/overlays/actors/ovl_Bg_Last_Bwall/z_bg_last_bwall.c index 1807e23650..aa57ec7bc6 100644 --- a/src/overlays/actors/ovl_Bg_Last_Bwall/z_bg_last_bwall.c +++ b/src/overlays/actors/ovl_Bg_Last_Bwall/z_bg_last_bwall.c @@ -23,26 +23,26 @@ const ActorInit Bg_Last_Bwall_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Last_Bwall_0x80C18240/func_80C18240.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Last_Bwall_0x80C18240/func_80C18240.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Last_Bwall_0x80C18240/BgLastBwall_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Last_Bwall_0x80C18240/BgLastBwall_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Last_Bwall_0x80C18240/BgLastBwall_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Last_Bwall_0x80C18240/BgLastBwall_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Last_Bwall_0x80C18240/func_80C184EC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Last_Bwall_0x80C18240/func_80C184EC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Last_Bwall_0x80C18240/func_80C187E4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Last_Bwall_0x80C18240/func_80C187E4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Last_Bwall_0x80C18240/func_80C187F8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Last_Bwall_0x80C18240/func_80C187F8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Last_Bwall_0x80C18240/func_80C1886C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Last_Bwall_0x80C18240/func_80C1886C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Last_Bwall_0x80C18240/func_80C18884.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Last_Bwall_0x80C18240/func_80C18884.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Last_Bwall_0x80C18240/func_80C188C4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Last_Bwall_0x80C18240/func_80C188C4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Last_Bwall_0x80C18240/func_80C18928.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Last_Bwall_0x80C18240/func_80C18928.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Last_Bwall_0x80C18240/BgLastBwall_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Last_Bwall_0x80C18240/BgLastBwall_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Last_Bwall_0x80C18240/BgLastBwall_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Last_Bwall_0x80C18240/BgLastBwall_Draw.asm") diff --git a/src/overlays/actors/ovl_Bg_Lbfshot/z_bg_lbfshot.c b/src/overlays/actors/ovl_Bg_Lbfshot/z_bg_lbfshot.c index 77ab17e17e..98e8a3f39a 100644 --- a/src/overlays/actors/ovl_Bg_Lbfshot/z_bg_lbfshot.c +++ b/src/overlays/actors/ovl_Bg_Lbfshot/z_bg_lbfshot.c @@ -22,8 +22,8 @@ const ActorInit Bg_Lbfshot_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Lbfshot_0x80C18120/BgLbfshot_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Lbfshot_0x80C18120/BgLbfshot_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Lbfshot_0x80C18120/BgLbfshot_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Lbfshot_0x80C18120/BgLbfshot_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Lbfshot_0x80C18120/BgLbfshot_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Lbfshot_0x80C18120/BgLbfshot_Draw.asm") diff --git a/src/overlays/actors/ovl_Bg_Lotus/z_bg_lotus.c b/src/overlays/actors/ovl_Bg_Lotus/z_bg_lotus.c index c930d57a35..20ef85e48c 100644 --- a/src/overlays/actors/ovl_Bg_Lotus/z_bg_lotus.c +++ b/src/overlays/actors/ovl_Bg_Lotus/z_bg_lotus.c @@ -23,18 +23,18 @@ const ActorInit Bg_Lotus_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Lotus_0x80AD6760/BgLotus_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Lotus_0x80AD6760/BgLotus_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Lotus_0x80AD6760/BgLotus_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Lotus_0x80AD6760/BgLotus_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Lotus_0x80AD6760/func_80AD6830.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Lotus_0x80AD6760/func_80AD6830.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Lotus_0x80AD6760/func_80AD68DC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Lotus_0x80AD6760/func_80AD68DC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Lotus_0x80AD6760/func_80AD6A88.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Lotus_0x80AD6760/func_80AD6A88.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Lotus_0x80AD6760/func_80AD6B68.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Lotus_0x80AD6760/func_80AD6B68.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Lotus_0x80AD6760/BgLotus_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Lotus_0x80AD6760/BgLotus_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Lotus_0x80AD6760/BgLotus_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Lotus_0x80AD6760/BgLotus_Draw.asm") diff --git a/src/overlays/actors/ovl_Bg_Numa_Hana/z_bg_numa_hana.c b/src/overlays/actors/ovl_Bg_Numa_Hana/z_bg_numa_hana.c index 8c826057d4..193c61258b 100644 --- a/src/overlays/actors/ovl_Bg_Numa_Hana/z_bg_numa_hana.c +++ b/src/overlays/actors/ovl_Bg_Numa_Hana/z_bg_numa_hana.c @@ -23,40 +23,40 @@ const ActorInit Bg_Numa_Hana_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Numa_Hana_0x80A1A500/func_80A1A500.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Numa_Hana_0x80A1A500/func_80A1A500.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Numa_Hana_0x80A1A500/func_80A1A56C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Numa_Hana_0x80A1A500/func_80A1A56C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Numa_Hana_0x80A1A500/func_80A1A750.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Numa_Hana_0x80A1A500/func_80A1A750.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Numa_Hana_0x80A1A500/BgNumaHana_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Numa_Hana_0x80A1A500/BgNumaHana_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Numa_Hana_0x80A1A500/BgNumaHana_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Numa_Hana_0x80A1A500/BgNumaHana_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Numa_Hana_0x80A1A500/func_80A1AA14.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Numa_Hana_0x80A1A500/func_80A1AA14.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Numa_Hana_0x80A1A500/func_80A1AA28.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Numa_Hana_0x80A1A500/func_80A1AA28.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Numa_Hana_0x80A1A500/func_80A1AA38.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Numa_Hana_0x80A1A500/func_80A1AA38.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Numa_Hana_0x80A1A500/func_80A1AA4C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Numa_Hana_0x80A1A500/func_80A1AA4C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Numa_Hana_0x80A1A500/func_80A1AAE8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Numa_Hana_0x80A1A500/func_80A1AAE8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Numa_Hana_0x80A1A500/func_80A1AB00.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Numa_Hana_0x80A1A500/func_80A1AB00.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Numa_Hana_0x80A1A500/func_80A1ABD8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Numa_Hana_0x80A1A500/func_80A1ABD8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Numa_Hana_0x80A1A500/func_80A1ABF0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Numa_Hana_0x80A1A500/func_80A1ABF0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Numa_Hana_0x80A1A500/func_80A1ACCC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Numa_Hana_0x80A1A500/func_80A1ACCC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Numa_Hana_0x80A1A500/func_80A1ACE0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Numa_Hana_0x80A1A500/func_80A1ACE0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Numa_Hana_0x80A1A500/func_80A1AE08.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Numa_Hana_0x80A1A500/func_80A1AE08.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Numa_Hana_0x80A1A500/func_80A1AE1C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Numa_Hana_0x80A1A500/func_80A1AE1C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Numa_Hana_0x80A1A500/BgNumaHana_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Numa_Hana_0x80A1A500/BgNumaHana_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Numa_Hana_0x80A1A500/BgNumaHana_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Numa_Hana_0x80A1A500/BgNumaHana_Draw.asm") diff --git a/src/overlays/actors/ovl_Bg_Open_Shutter/z_bg_open_shutter.c b/src/overlays/actors/ovl_Bg_Open_Shutter/z_bg_open_shutter.c index dbfcdc5c9e..b60d65b348 100644 --- a/src/overlays/actors/ovl_Bg_Open_Shutter/z_bg_open_shutter.c +++ b/src/overlays/actors/ovl_Bg_Open_Shutter/z_bg_open_shutter.c @@ -23,20 +23,20 @@ const ActorInit Bg_Open_Shutter_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Open_Shutter_0x80ACAB10/func_80ACAB10.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Open_Shutter_0x80ACAB10/func_80ACAB10.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Open_Shutter_0x80ACAB10/func_80ACABA8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Open_Shutter_0x80ACAB10/func_80ACABA8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Open_Shutter_0x80ACAB10/BgOpenShutter_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Open_Shutter_0x80ACAB10/BgOpenShutter_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Open_Shutter_0x80ACAB10/BgOpenShutter_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Open_Shutter_0x80ACAB10/BgOpenShutter_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Open_Shutter_0x80ACAB10/func_80ACAD88.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Open_Shutter_0x80ACAB10/func_80ACAD88.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Open_Shutter_0x80ACAB10/func_80ACAE5C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Open_Shutter_0x80ACAB10/func_80ACAE5C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Open_Shutter_0x80ACAB10/func_80ACAEF0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Open_Shutter_0x80ACAB10/func_80ACAEF0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Open_Shutter_0x80ACAB10/BgOpenShutter_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Open_Shutter_0x80ACAB10/BgOpenShutter_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Open_Shutter_0x80ACAB10/BgOpenShutter_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Open_Shutter_0x80ACAB10/BgOpenShutter_Draw.asm") diff --git a/src/overlays/actors/ovl_Bg_Open_Spot/z_bg_open_spot.c b/src/overlays/actors/ovl_Bg_Open_Spot/z_bg_open_spot.c index 06bd4fa669..b21f1a4d2a 100644 --- a/src/overlays/actors/ovl_Bg_Open_Spot/z_bg_open_spot.c +++ b/src/overlays/actors/ovl_Bg_Open_Spot/z_bg_open_spot.c @@ -22,10 +22,10 @@ const ActorInit Bg_Open_Spot_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Open_Spot_0x80ACB1E0/BgOpenSpot_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Open_Spot_0x80ACB1E0/BgOpenSpot_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Open_Spot_0x80ACB1E0/BgOpenSpot_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Open_Spot_0x80ACB1E0/BgOpenSpot_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Open_Spot_0x80ACB1E0/BgOpenSpot_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Open_Spot_0x80ACB1E0/BgOpenSpot_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Open_Spot_0x80ACB1E0/func_80ACB2B0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Open_Spot_0x80ACB1E0/func_80ACB2B0.asm") diff --git a/src/overlays/actors/ovl_Bg_Sinkai_Kabe/z_bg_sinkai_kabe.c b/src/overlays/actors/ovl_Bg_Sinkai_Kabe/z_bg_sinkai_kabe.c index f08cdc5231..492a9f5cf8 100644 --- a/src/overlays/actors/ovl_Bg_Sinkai_Kabe/z_bg_sinkai_kabe.c +++ b/src/overlays/actors/ovl_Bg_Sinkai_Kabe/z_bg_sinkai_kabe.c @@ -22,10 +22,10 @@ const ActorInit Bg_Sinkai_Kabe_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Sinkai_Kabe_0x80B6D660/BgSinkaiKabe_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Sinkai_Kabe_0x80B6D660/BgSinkaiKabe_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Sinkai_Kabe_0x80B6D660/BgSinkaiKabe_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Sinkai_Kabe_0x80B6D660/BgSinkaiKabe_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Sinkai_Kabe_0x80B6D660/func_80B6DA20.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Sinkai_Kabe_0x80B6D660/func_80B6DA20.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Sinkai_Kabe_0x80B6D660/BgSinkaiKabe_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Sinkai_Kabe_0x80B6D660/BgSinkaiKabe_Update.asm") diff --git a/src/overlays/actors/ovl_Bg_Spdweb/z_bg_spdweb.c b/src/overlays/actors/ovl_Bg_Spdweb/z_bg_spdweb.c index 73f02c0d18..5ea7155ee0 100644 --- a/src/overlays/actors/ovl_Bg_Spdweb/z_bg_spdweb.c +++ b/src/overlays/actors/ovl_Bg_Spdweb/z_bg_spdweb.c @@ -23,28 +23,28 @@ const ActorInit Bg_Spdweb_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Spdweb_0x809CDEC0/BgSpdweb_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Spdweb_0x809CDEC0/BgSpdweb_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Spdweb_0x809CDEC0/BgSpdweb_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Spdweb_0x809CDEC0/BgSpdweb_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Spdweb_0x809CDEC0/func_809CE068.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Spdweb_0x809CDEC0/func_809CE068.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Spdweb_0x809CDEC0/func_809CE15C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Spdweb_0x809CDEC0/func_809CE15C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Spdweb_0x809CDEC0/func_809CE1D0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Spdweb_0x809CDEC0/func_809CE1D0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Spdweb_0x809CDEC0/func_809CE234.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Spdweb_0x809CDEC0/func_809CE234.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Spdweb_0x809CDEC0/func_809CE4C8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Spdweb_0x809CDEC0/func_809CE4C8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Spdweb_0x809CDEC0/func_809CE830.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Spdweb_0x809CDEC0/func_809CE830.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Spdweb_0x809CDEC0/func_809CEBC0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Spdweb_0x809CDEC0/func_809CEBC0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Spdweb_0x809CDEC0/func_809CEE74.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Spdweb_0x809CDEC0/func_809CEE74.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Spdweb_0x809CDEC0/func_809CEEAC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Spdweb_0x809CDEC0/func_809CEEAC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Spdweb_0x809CDEC0/BgSpdweb_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Spdweb_0x809CDEC0/BgSpdweb_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Spdweb_0x809CDEC0/BgSpdweb_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Spdweb_0x809CDEC0/BgSpdweb_Draw.asm") diff --git a/src/overlays/actors/ovl_Bg_Spout_Fire/z_bg_spout_fire.c b/src/overlays/actors/ovl_Bg_Spout_Fire/z_bg_spout_fire.c index 85d462b17e..e343e83eab 100644 --- a/src/overlays/actors/ovl_Bg_Spout_Fire/z_bg_spout_fire.c +++ b/src/overlays/actors/ovl_Bg_Spout_Fire/z_bg_spout_fire.c @@ -22,22 +22,22 @@ const ActorInit Bg_Spout_Fire_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Spout_Fire_0x80A60B20/BgSpoutFire_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Spout_Fire_0x80A60B20/BgSpoutFire_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Spout_Fire_0x80A60B20/BgSpoutFire_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Spout_Fire_0x80A60B20/BgSpoutFire_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Spout_Fire_0x80A60B20/func_80A60C24.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Spout_Fire_0x80A60B20/func_80A60C24.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Spout_Fire_0x80A60B20/func_80A60C94.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Spout_Fire_0x80A60B20/func_80A60C94.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Spout_Fire_0x80A60B20/func_80A60CDC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Spout_Fire_0x80A60B20/func_80A60CDC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Spout_Fire_0x80A60B20/func_80A60D10.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Spout_Fire_0x80A60B20/func_80A60D10.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Spout_Fire_0x80A60B20/func_80A60DA0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Spout_Fire_0x80A60B20/func_80A60DA0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Spout_Fire_0x80A60B20/func_80A60E08.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Spout_Fire_0x80A60B20/func_80A60E08.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Spout_Fire_0x80A60B20/BgSpoutFire_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Spout_Fire_0x80A60B20/BgSpoutFire_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Spout_Fire_0x80A60B20/func_80A61040.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Spout_Fire_0x80A60B20/func_80A61040.asm") diff --git a/src/overlays/actors/ovl_Bg_Tobira01/z_bg_tobira01.c b/src/overlays/actors/ovl_Bg_Tobira01/z_bg_tobira01.c index a6f6ee0027..b0bf6260b5 100644 --- a/src/overlays/actors/ovl_Bg_Tobira01/z_bg_tobira01.c +++ b/src/overlays/actors/ovl_Bg_Tobira01/z_bg_tobira01.c @@ -23,12 +23,12 @@ const ActorInit Bg_Tobira01_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Tobira01_0x80B12430/func_80B12430.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Tobira01_0x80B12430/func_80B12430.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Tobira01_0x80B12430/BgTobira01_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Tobira01_0x80B12430/BgTobira01_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Tobira01_0x80B12430/BgTobira01_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Tobira01_0x80B12430/BgTobira01_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Tobira01_0x80B12430/BgTobira01_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Tobira01_0x80B12430/BgTobira01_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Tobira01_0x80B12430/BgTobira01_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Tobira01_0x80B12430/BgTobira01_Draw.asm") 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 97738485de..c82d2d7ff9 100644 --- a/src/overlays/actors/ovl_Bg_Umajump/z_bg_umajump.c +++ b/src/overlays/actors/ovl_Bg_Umajump/z_bg_umajump.c @@ -22,20 +22,20 @@ const ActorInit Bg_Umajump_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Umajump_0x80919F30/func_80919F30.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Umajump_0x80919F30/func_80919F30.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Umajump_0x80919F30/func_80919FC8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Umajump_0x80919F30/func_80919FC8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Umajump_0x80919F30/func_8091A044.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Umajump_0x80919F30/func_8091A044.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Umajump_0x80919F30/func_8091A0B8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Umajump_0x80919F30/func_8091A0B8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Umajump_0x80919F30/BgUmajump_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Umajump_0x80919F30/BgUmajump_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Umajump_0x80919F30/BgUmajump_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Umajump_0x80919F30/BgUmajump_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Umajump_0x80919F30/BgUmajump_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Umajump_0x80919F30/BgUmajump_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Umajump_0x80919F30/func_8091A5A0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Umajump_0x80919F30/func_8091A5A0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Bg_Umajump_0x80919F30/func_8091A7B0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Umajump_0x80919F30/func_8091A7B0.asm") diff --git a/src/overlays/actors/ovl_Boss_01/z_boss_01.c b/src/overlays/actors/ovl_Boss_01/z_boss_01.c index 7b56fba826..47326d55bd 100644 --- a/src/overlays/actors/ovl_Boss_01/z_boss_01.c +++ b/src/overlays/actors/ovl_Boss_01/z_boss_01.c @@ -23,152 +23,152 @@ const ActorInit Boss_01_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_01_0x809D0530/func_809D0530.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_01_0x809D0530/func_809D0530.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_01_0x809D0530/func_809D0550.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_01_0x809D0530/func_809D0550.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_01_0x809D0530/func_809D0678.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_01_0x809D0530/func_809D0678.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_01_0x809D0530/func_809D082C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_01_0x809D0530/func_809D082C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_01_0x809D0530/func_809D089C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_01_0x809D0530/func_809D089C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_01_0x809D0530/func_809D092C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_01_0x809D0530/func_809D092C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_01_0x809D0530/func_809D0AA4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_01_0x809D0530/func_809D0AA4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_01_0x809D0530/Boss01_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_01_0x809D0530/Boss01_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_01_0x809D0530/Boss01_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_01_0x809D0530/Boss01_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_01_0x809D0530/func_809D119C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_01_0x809D0530/func_809D119C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_01_0x809D0530/func_809D1258.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_01_0x809D0530/func_809D1258.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_01_0x809D0530/func_809D12B4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_01_0x809D0530/func_809D12B4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_01_0x809D0530/func_809D1AB8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_01_0x809D0530/func_809D1AB8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_01_0x809D0530/func_809D1B2C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_01_0x809D0530/func_809D1B2C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_01_0x809D0530/func_809D1E5C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_01_0x809D0530/func_809D1E5C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_01_0x809D0530/func_809D1E74.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_01_0x809D0530/func_809D1E74.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_01_0x809D0530/func_809D1EA4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_01_0x809D0530/func_809D1EA4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_01_0x809D0530/func_809D20D0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_01_0x809D0530/func_809D20D0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_01_0x809D0530/func_809D2588.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_01_0x809D0530/func_809D2588.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_01_0x809D0530/func_809D25E8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_01_0x809D0530/func_809D25E8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_01_0x809D0530/func_809D2664.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_01_0x809D0530/func_809D2664.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_01_0x809D0530/func_809D26B8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_01_0x809D0530/func_809D26B8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_01_0x809D0530/func_809D2780.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_01_0x809D0530/func_809D2780.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_01_0x809D0530/func_809D27D4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_01_0x809D0530/func_809D27D4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_01_0x809D0530/func_809D2858.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_01_0x809D0530/func_809D2858.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_01_0x809D0530/func_809D2914.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_01_0x809D0530/func_809D2914.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_01_0x809D0530/func_809D2A44.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_01_0x809D0530/func_809D2A44.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_01_0x809D0530/func_809D2AA0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_01_0x809D0530/func_809D2AA0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_01_0x809D0530/func_809D2BCC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_01_0x809D0530/func_809D2BCC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_01_0x809D0530/func_809D2CDC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_01_0x809D0530/func_809D2CDC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_01_0x809D0530/func_809D2DE8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_01_0x809D0530/func_809D2DE8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_01_0x809D0530/func_809D2E4C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_01_0x809D0530/func_809D2E4C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_01_0x809D0530/func_809D3074.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_01_0x809D0530/func_809D3074.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_01_0x809D0530/func_809D30D0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_01_0x809D0530/func_809D30D0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_01_0x809D0530/func_809D32B4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_01_0x809D0530/func_809D32B4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_01_0x809D0530/func_809D3374.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_01_0x809D0530/func_809D3374.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_01_0x809D0530/func_809D3400.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_01_0x809D0530/func_809D3400.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_01_0x809D0530/func_809D345C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_01_0x809D0530/func_809D345C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_01_0x809D0530/func_809D34D4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_01_0x809D0530/func_809D34D4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_01_0x809D0530/func_809D3530.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_01_0x809D0530/func_809D3530.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_01_0x809D0530/func_809D35A8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_01_0x809D0530/func_809D35A8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_01_0x809D0530/func_809D365C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_01_0x809D0530/func_809D365C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_01_0x809D0530/func_809D370C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_01_0x809D0530/func_809D370C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_01_0x809D0530/func_809D3A7C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_01_0x809D0530/func_809D3A7C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_01_0x809D0530/func_809D3ADC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_01_0x809D0530/func_809D3ADC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_01_0x809D0530/func_809D3C10.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_01_0x809D0530/func_809D3C10.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_01_0x809D0530/func_809D3CD0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_01_0x809D0530/func_809D3CD0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_01_0x809D0530/func_809D441C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_01_0x809D0530/func_809D441C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_01_0x809D0530/func_809D4464.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_01_0x809D0530/func_809D4464.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_01_0x809D0530/func_809D44C0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_01_0x809D0530/func_809D44C0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_01_0x809D0530/func_809D4668.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_01_0x809D0530/func_809D4668.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_01_0x809D0530/Boss01_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_01_0x809D0530/Boss01_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_01_0x809D0530/func_809D519C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_01_0x809D0530/func_809D519C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_01_0x809D0530/func_809D5584.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_01_0x809D0530/func_809D5584.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_01_0x809D0530/func_809D55CC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_01_0x809D0530/func_809D55CC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_01_0x809D0530/Boss01_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_01_0x809D0530/Boss01_Draw.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_01_0x809D0530/func_809D5B0C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_01_0x809D0530/func_809D5B0C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_01_0x809D0530/func_809D5BC4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_01_0x809D0530/func_809D5BC4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_01_0x809D0530/func_809D5FB4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_01_0x809D0530/func_809D5FB4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_01_0x809D0530/func_809D606C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_01_0x809D0530/func_809D606C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_01_0x809D0530/func_809D62D4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_01_0x809D0530/func_809D62D4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_01_0x809D0530/func_809D6314.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_01_0x809D0530/func_809D6314.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_01_0x809D0530/func_809D6424.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_01_0x809D0530/func_809D6424.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_01_0x809D0530/func_809D6488.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_01_0x809D0530/func_809D6488.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_01_0x809D0530/func_809D64E0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_01_0x809D0530/func_809D64E0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_01_0x809D0530/func_809D6540.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_01_0x809D0530/func_809D6540.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_01_0x809D0530/func_809D6588.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_01_0x809D0530/func_809D6588.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_01_0x809D0530/func_809D65E0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_01_0x809D0530/func_809D65E0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_01_0x809D0530/func_809D670C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_01_0x809D0530/func_809D670C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_01_0x809D0530/func_809D694C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_01_0x809D0530/func_809D694C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_01_0x809D0530/func_809D6B08.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_01_0x809D0530/func_809D6B08.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_01_0x809D0530/func_809D6BB4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_01_0x809D0530/func_809D6BB4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_01_0x809D0530/func_809D6C98.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_01_0x809D0530/func_809D6C98.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_01_0x809D0530/func_809D6E7C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_01_0x809D0530/func_809D6E7C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_01_0x809D0530/func_809D73D4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_01_0x809D0530/func_809D73D4.asm") diff --git a/src/overlays/actors/ovl_Boss_02/z_boss_02.c b/src/overlays/actors/ovl_Boss_02/z_boss_02.c index 45883ce532..70939bde45 100644 --- a/src/overlays/actors/ovl_Boss_02/z_boss_02.c +++ b/src/overlays/actors/ovl_Boss_02/z_boss_02.c @@ -23,48 +23,48 @@ const ActorInit Boss_02_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_02_0x809DA1D0/func_809DA1D0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_02_0x809DA1D0/func_809DA1D0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_02_0x809DA1D0/func_809DA22C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_02_0x809DA1D0/func_809DA22C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_02_0x809DA1D0/func_809DA24C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_02_0x809DA1D0/func_809DA24C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_02_0x809DA1D0/func_809DA264.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_02_0x809DA1D0/func_809DA264.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_02_0x809DA1D0/func_809DA344.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_02_0x809DA1D0/func_809DA344.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_02_0x809DA1D0/func_809DA460.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_02_0x809DA1D0/func_809DA460.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_02_0x809DA1D0/func_809DA50C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_02_0x809DA1D0/func_809DA50C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_02_0x809DA1D0/Boss02_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_02_0x809DA1D0/Boss02_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_02_0x809DA1D0/Boss02_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_02_0x809DA1D0/Boss02_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_02_0x809DA1D0/func_809DAA74.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_02_0x809DA1D0/func_809DAA74.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_02_0x809DA1D0/func_809DAA98.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_02_0x809DA1D0/func_809DAA98.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_02_0x809DA1D0/func_809DAAA8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_02_0x809DA1D0/func_809DAAA8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_02_0x809DA1D0/func_809DAB78.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_02_0x809DA1D0/func_809DAB78.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_02_0x809DA1D0/func_809DBFB4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_02_0x809DA1D0/func_809DBFB4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_02_0x809DA1D0/func_809DC218.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_02_0x809DA1D0/func_809DC218.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_02_0x809DA1D0/Boss02_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_02_0x809DA1D0/Boss02_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_02_0x809DA1D0/func_809DC78C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_02_0x809DA1D0/func_809DC78C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_02_0x809DA1D0/Boss02_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_02_0x809DA1D0/Boss02_Draw.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_02_0x809DA1D0/func_809DD0A8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_02_0x809DA1D0/func_809DD0A8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_02_0x809DA1D0/func_809DD0CC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_02_0x809DA1D0/func_809DD0CC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_02_0x809DA1D0/func_809DD2F8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_02_0x809DA1D0/func_809DD2F8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_02_0x809DA1D0/func_809DD934.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_02_0x809DA1D0/func_809DD934.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_02_0x809DA1D0/func_809DEAC4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_02_0x809DA1D0/func_809DEAC4.asm") diff --git a/src/overlays/actors/ovl_Boss_03/z_boss_03.c b/src/overlays/actors/ovl_Boss_03/z_boss_03.c index 71ca3c74da..da3b538e98 100644 --- a/src/overlays/actors/ovl_Boss_03/z_boss_03.c +++ b/src/overlays/actors/ovl_Boss_03/z_boss_03.c @@ -23,94 +23,94 @@ const ActorInit Boss_03_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_03_0x809E2760/func_809E2760.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_03_0x809E2760/func_809E2760.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_03_0x809E2760/func_809E2788.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_03_0x809E2760/func_809E2788.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_03_0x809E2760/func_809E2880.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_03_0x809E2760/func_809E2880.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_03_0x809E2760/func_809E299C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_03_0x809E2760/func_809E299C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_03_0x809E2760/func_809E2AB4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_03_0x809E2760/func_809E2AB4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_03_0x809E2760/func_809E2B8C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_03_0x809E2760/func_809E2B8C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_03_0x809E2760/func_809E2C1C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_03_0x809E2760/func_809E2C1C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_03_0x809E2760/func_809E2C3C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_03_0x809E2760/func_809E2C3C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_03_0x809E2760/func_809E2D64.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_03_0x809E2760/func_809E2D64.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_03_0x809E2760/func_809E2DA0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_03_0x809E2760/func_809E2DA0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_03_0x809E2760/Boss03_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_03_0x809E2760/Boss03_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_03_0x809E2760/Boss03_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_03_0x809E2760/Boss03_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_03_0x809E2760/func_809E344C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_03_0x809E2760/func_809E344C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_03_0x809E2760/func_809E34B8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_03_0x809E2760/func_809E34B8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_03_0x809E2760/func_809E38EC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_03_0x809E2760/func_809E38EC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_03_0x809E2760/func_809E3968.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_03_0x809E2760/func_809E3968.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_03_0x809E2760/func_809E3D34.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_03_0x809E2760/func_809E3D34.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_03_0x809E2760/func_809E3D98.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_03_0x809E2760/func_809E3D98.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_03_0x809E2760/func_809E4180.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_03_0x809E2760/func_809E4180.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_03_0x809E2760/func_809E421C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_03_0x809E2760/func_809E421C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_03_0x809E2760/func_809E4674.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_03_0x809E2760/func_809E4674.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_03_0x809E2760/func_809E475C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_03_0x809E2760/func_809E475C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_03_0x809E2760/func_809E4910.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_03_0x809E2760/func_809E4910.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_03_0x809E2760/func_809E497C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_03_0x809E2760/func_809E497C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_03_0x809E2760/func_809E4C34.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_03_0x809E2760/func_809E4C34.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_03_0x809E2760/func_809E4C90.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_03_0x809E2760/func_809E4C90.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_03_0x809E2760/func_809E4E2C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_03_0x809E2760/func_809E4E2C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_03_0x809E2760/func_809E4E80.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_03_0x809E2760/func_809E4E80.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_03_0x809E2760/func_809E5ADC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_03_0x809E2760/func_809E5ADC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_03_0x809E2760/func_809E5B64.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_03_0x809E2760/func_809E5B64.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_03_0x809E2760/func_809E65F4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_03_0x809E2760/func_809E65F4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_03_0x809E2760/func_809E6640.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_03_0x809E2760/func_809E6640.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_03_0x809E2760/func_809E69A4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_03_0x809E2760/func_809E69A4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_03_0x809E2760/func_809E6A38.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_03_0x809E2760/func_809E6A38.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_03_0x809E2760/func_809E6B70.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_03_0x809E2760/func_809E6B70.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_03_0x809E2760/func_809E6BC0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_03_0x809E2760/func_809E6BC0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_03_0x809E2760/func_809E6CB4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_03_0x809E2760/func_809E6CB4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_03_0x809E2760/Boss03_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_03_0x809E2760/Boss03_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_03_0x809E2760/func_809E7920.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_03_0x809E2760/func_809E7920.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_03_0x809E2760/func_809E79C4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_03_0x809E2760/func_809E79C4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_03_0x809E2760/func_809E7AA8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_03_0x809E2760/func_809E7AA8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_03_0x809E2760/Boss03_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_03_0x809E2760/Boss03_Draw.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_03_0x809E2760/func_809E7D00.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_03_0x809E2760/func_809E7D00.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_03_0x809E2760/func_809E81E4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_03_0x809E2760/func_809E81E4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_03_0x809E2760/func_809E8810.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_03_0x809E2760/func_809E8810.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_03_0x809E2760/func_809E8BEC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_03_0x809E2760/func_809E8BEC.asm") diff --git a/src/overlays/actors/ovl_Boss_04/z_boss_04.c b/src/overlays/actors/ovl_Boss_04/z_boss_04.c index ed6cdcb847..a8e15a6ead 100644 --- a/src/overlays/actors/ovl_Boss_04/z_boss_04.c +++ b/src/overlays/actors/ovl_Boss_04/z_boss_04.c @@ -23,36 +23,36 @@ const ActorInit Boss_04_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_04_0x809EC040/func_809EC040.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_04_0x809EC040/func_809EC040.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_04_0x809EC040/Boss04_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_04_0x809EC040/Boss04_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_04_0x809EC040/Boss04_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_04_0x809EC040/Boss04_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_04_0x809EC040/func_809EC544.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_04_0x809EC040/func_809EC544.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_04_0x809EC040/func_809EC568.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_04_0x809EC040/func_809EC568.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_04_0x809EC040/func_809ECD00.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_04_0x809EC040/func_809ECD00.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_04_0x809EC040/func_809ECD18.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_04_0x809EC040/func_809ECD18.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_04_0x809EC040/func_809ECEF4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_04_0x809EC040/func_809ECEF4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_04_0x809EC040/func_809ECF58.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_04_0x809EC040/func_809ECF58.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_04_0x809EC040/func_809ED224.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_04_0x809EC040/func_809ED224.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_04_0x809EC040/func_809ED2A0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_04_0x809EC040/func_809ED2A0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_04_0x809EC040/func_809ED45C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_04_0x809EC040/func_809ED45C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_04_0x809EC040/func_809ED50C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_04_0x809EC040/func_809ED50C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_04_0x809EC040/Boss04_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_04_0x809EC040/Boss04_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_04_0x809EC040/func_809EDCCC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_04_0x809EC040/func_809EDCCC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_04_0x809EC040/func_809EDECC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_04_0x809EC040/func_809EDECC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_04_0x809EC040/Boss04_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_04_0x809EC040/Boss04_Draw.asm") diff --git a/src/overlays/actors/ovl_Boss_05/z_boss_05.c b/src/overlays/actors/ovl_Boss_05/z_boss_05.c index e3d60ecb1f..9389dab737 100644 --- a/src/overlays/actors/ovl_Boss_05/z_boss_05.c +++ b/src/overlays/actors/ovl_Boss_05/z_boss_05.c @@ -23,86 +23,86 @@ const ActorInit Boss_05_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_05_0x809EE4E0/func_809EE4E0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_05_0x809EE4E0/func_809EE4E0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_05_0x809EE4E0/func_809EE668.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_05_0x809EE4E0/func_809EE668.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_05_0x809EE4E0/Boss05_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_05_0x809EE4E0/Boss05_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_05_0x809EE4E0/Boss05_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_05_0x809EE4E0/Boss05_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_05_0x809EE4E0/func_809EECBC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_05_0x809EE4E0/func_809EECBC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_05_0x809EE4E0/func_809EEDD0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_05_0x809EE4E0/func_809EEDD0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_05_0x809EE4E0/func_809EEDE8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_05_0x809EE4E0/func_809EEDE8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_05_0x809EE4E0/func_809EF9BC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_05_0x809EE4E0/func_809EF9BC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_05_0x809EE4E0/func_809EFAB4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_05_0x809EE4E0/func_809EFAB4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_05_0x809EE4E0/func_809EFE50.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_05_0x809EE4E0/func_809EFE50.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_05_0x809EE4E0/func_809F0014.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_05_0x809EE4E0/func_809F0014.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_05_0x809EE4E0/func_809F0058.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_05_0x809EE4E0/func_809F0058.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_05_0x809EE4E0/func_809F00CC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_05_0x809EE4E0/func_809F00CC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_05_0x809EE4E0/func_809F010C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_05_0x809EE4E0/func_809F010C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_05_0x809EE4E0/func_809F01CC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_05_0x809EE4E0/func_809F01CC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_05_0x809EE4E0/func_809F0244.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_05_0x809EE4E0/func_809F0244.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_05_0x809EE4E0/func_809F02D0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_05_0x809EE4E0/func_809F02D0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_05_0x809EE4E0/func_809F0374.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_05_0x809EE4E0/func_809F0374.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_05_0x809EE4E0/func_809F0474.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_05_0x809EE4E0/func_809F0474.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_05_0x809EE4E0/func_809F04C0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_05_0x809EE4E0/func_809F04C0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_05_0x809EE4E0/func_809F0538.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_05_0x809EE4E0/func_809F0538.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_05_0x809EE4E0/func_809F0590.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_05_0x809EE4E0/func_809F0590.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_05_0x809EE4E0/func_809F0650.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_05_0x809EE4E0/func_809F0650.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_05_0x809EE4E0/func_809F06B8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_05_0x809EE4E0/func_809F06B8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_05_0x809EE4E0/func_809F0708.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_05_0x809EE4E0/func_809F0708.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_05_0x809EE4E0/func_809F0780.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_05_0x809EE4E0/func_809F0780.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_05_0x809EE4E0/func_809F0A0C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_05_0x809EE4E0/func_809F0A0C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_05_0x809EE4E0/func_809F0A64.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_05_0x809EE4E0/func_809F0A64.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_05_0x809EE4E0/func_809F0ABC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_05_0x809EE4E0/func_809F0ABC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_05_0x809EE4E0/func_809F0B0C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_05_0x809EE4E0/func_809F0B0C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_05_0x809EE4E0/Boss05_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_05_0x809EE4E0/Boss05_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_05_0x809EE4E0/func_809F1050.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_05_0x809EE4E0/func_809F1050.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_05_0x809EE4E0/func_809F1170.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_05_0x809EE4E0/func_809F1170.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_05_0x809EE4E0/func_809F1284.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_05_0x809EE4E0/func_809F1284.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_05_0x809EE4E0/func_809F12A0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_05_0x809EE4E0/func_809F12A0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_05_0x809EE4E0/func_809F135C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_05_0x809EE4E0/func_809F135C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_05_0x809EE4E0/func_809F1404.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_05_0x809EE4E0/func_809F1404.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_05_0x809EE4E0/func_809F1430.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_05_0x809EE4E0/func_809F1430.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_05_0x809EE4E0/func_809F1464.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_05_0x809EE4E0/func_809F1464.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_05_0x809EE4E0/func_809F14AC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_05_0x809EE4E0/func_809F14AC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_05_0x809EE4E0/func_809F1550.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_05_0x809EE4E0/func_809F1550.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_05_0x809EE4E0/Boss05_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_05_0x809EE4E0/Boss05_Draw.asm") diff --git a/src/overlays/actors/ovl_Boss_06/z_boss_06.c b/src/overlays/actors/ovl_Boss_06/z_boss_06.c index 1385fcec11..5084b07987 100644 --- a/src/overlays/actors/ovl_Boss_06/z_boss_06.c +++ b/src/overlays/actors/ovl_Boss_06/z_boss_06.c @@ -23,32 +23,32 @@ const ActorInit Boss_06_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_06_0x809F2120/func_809F2120.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_06_0x809F2120/func_809F2120.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_06_0x809F2120/func_809F2140.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_06_0x809F2120/func_809F2140.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_06_0x809F2120/Boss06_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_06_0x809F2120/Boss06_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_06_0x809F2120/Boss06_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_06_0x809F2120/Boss06_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_06_0x809F2120/func_809F23CC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_06_0x809F2120/func_809F23CC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_06_0x809F2120/func_809F24A8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_06_0x809F2120/func_809F24A8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_06_0x809F2120/func_809F24C8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_06_0x809F2120/func_809F24C8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_06_0x809F2120/func_809F2B64.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_06_0x809F2120/func_809F2B64.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_06_0x809F2120/func_809F2C44.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_06_0x809F2120/func_809F2C44.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_06_0x809F2120/func_809F2E14.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_06_0x809F2120/func_809F2E14.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_06_0x809F2120/func_809F2E34.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_06_0x809F2120/func_809F2E34.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_06_0x809F2120/func_809F2ED0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_06_0x809F2120/func_809F2ED0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_06_0x809F2120/func_809F2EE8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_06_0x809F2120/func_809F2EE8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_06_0x809F2120/Boss06_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_06_0x809F2120/Boss06_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_06_0x809F2120/Boss06_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_06_0x809F2120/Boss06_Draw.asm") diff --git a/src/overlays/actors/ovl_Boss_07/z_boss_07.c b/src/overlays/actors/ovl_Boss_07/z_boss_07.c index f8f84455f9..a8f698ca70 100644 --- a/src/overlays/actors/ovl_Boss_07/z_boss_07.c +++ b/src/overlays/actors/ovl_Boss_07/z_boss_07.c @@ -23,274 +23,274 @@ const ActorInit Boss_07_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809F4980.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_07_0x809F4980/func_809F4980.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809F49A0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_07_0x809F4980/func_809F49A0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809F49C0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_07_0x809F4980/func_809F49C0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809F4AE8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_07_0x809F4980/func_809F4AE8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809F4BB0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_07_0x809F4980/func_809F4BB0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809F4C40.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_07_0x809F4980/func_809F4C40.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809F4CBC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_07_0x809F4980/func_809F4CBC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809F4D10.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_07_0x809F4980/func_809F4D10.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809F4D54.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_07_0x809F4980/func_809F4D54.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809F4FAC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_07_0x809F4980/func_809F4FAC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809F4FF8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_07_0x809F4980/func_809F4FF8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809F51E8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_07_0x809F4980/func_809F51E8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809F52CC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_07_0x809F4980/func_809F52CC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809F536C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_07_0x809F4980/func_809F536C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809F5494.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_07_0x809F4980/func_809F5494.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/Boss07_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_07_0x809F4980/Boss07_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/Boss07_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_07_0x809F4980/Boss07_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809F5E14.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_07_0x809F4980/func_809F5E14.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809F5E88.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_07_0x809F4980/func_809F5E88.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809F64F4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_07_0x809F4980/func_809F64F4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809F65F4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_07_0x809F4980/func_809F65F4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809F7400.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_07_0x809F4980/func_809F7400.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809F748C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_07_0x809F4980/func_809F748C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809F7688.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_07_0x809F4980/func_809F7688.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809F76D0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_07_0x809F4980/func_809F76D0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809F77A8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_07_0x809F4980/func_809F77A8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809F783C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_07_0x809F4980/func_809F783C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809F7968.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_07_0x809F4980/func_809F7968.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809F7AB4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_07_0x809F4980/func_809F7AB4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809F7BC4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_07_0x809F4980/func_809F7BC4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809F7D2C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_07_0x809F4980/func_809F7D2C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809F805C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_07_0x809F4980/func_809F805C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809F8658.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_07_0x809F4980/func_809F8658.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809F86B8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_07_0x809F4980/func_809F86B8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809F87C8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_07_0x809F4980/func_809F87C8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809F8908.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_07_0x809F4980/func_809F8908.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809F8AB0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_07_0x809F4980/func_809F8AB0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809F8B1C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_07_0x809F4980/func_809F8B1C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809F8D04.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_07_0x809F4980/func_809F8D04.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809F8DEC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_07_0x809F4980/func_809F8DEC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809F8E68.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_07_0x809F4980/func_809F8E68.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809F8EC8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_07_0x809F4980/func_809F8EC8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809F91D4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_07_0x809F4980/func_809F91D4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809F9280.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_07_0x809F4980/func_809F9280.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809F93DC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_07_0x809F4980/func_809F93DC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809F94AC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_07_0x809F4980/func_809F94AC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809F99C4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_07_0x809F4980/func_809F99C4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809F9CEC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_07_0x809F4980/func_809F9CEC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809F9E94.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_07_0x809F4980/func_809F9E94.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/Boss07_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_07_0x809F4980/Boss07_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809FAA44.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_07_0x809F4980/func_809FAA44.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809FB114.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_07_0x809F4980/func_809FB114.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809FB504.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_07_0x809F4980/func_809FB504.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809FB55C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_07_0x809F4980/func_809FB55C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809FB728.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_07_0x809F4980/func_809FB728.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809FB7D4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_07_0x809F4980/func_809FB7D4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809FBB9C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_07_0x809F4980/func_809FBB9C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809FBF94.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_07_0x809F4980/func_809FBF94.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/Boss07_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_07_0x809F4980/Boss07_Draw.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809FC4C0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_07_0x809F4980/func_809FC4C0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809FC8B0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_07_0x809F4980/func_809FC8B0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809FC960.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_07_0x809F4980/func_809FC960.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809FCBC8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_07_0x809F4980/func_809FCBC8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809FCC70.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_07_0x809F4980/func_809FCC70.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809FCCCC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_07_0x809F4980/func_809FCCCC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809FD5F8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_07_0x809F4980/func_809FD5F8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809FD710.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_07_0x809F4980/func_809FD710.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809FD818.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_07_0x809F4980/func_809FD818.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809FD89C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_07_0x809F4980/func_809FD89C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809FD984.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_07_0x809F4980/func_809FD984.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809FDAB0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_07_0x809F4980/func_809FDAB0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809FDB2C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_07_0x809F4980/func_809FDB2C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809FDBA0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_07_0x809F4980/func_809FDBA0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809FDEDC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_07_0x809F4980/func_809FDEDC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809FDF54.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_07_0x809F4980/func_809FDF54.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809FE068.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_07_0x809F4980/func_809FE068.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809FE0E4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_07_0x809F4980/func_809FE0E4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809FE2D4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_07_0x809F4980/func_809FE2D4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809FE348.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_07_0x809F4980/func_809FE348.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809FE4B0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_07_0x809F4980/func_809FE4B0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809FE524.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_07_0x809F4980/func_809FE524.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809FE6B0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_07_0x809F4980/func_809FE6B0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809FE734.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_07_0x809F4980/func_809FE734.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809FEE70.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_07_0x809F4980/func_809FEE70.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809FF0E4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_07_0x809F4980/func_809FF0E4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809FF12C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_07_0x809F4980/func_809FF12C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809FF5CC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_07_0x809F4980/func_809FF5CC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809FF678.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_07_0x809F4980/func_809FF678.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809FF6B0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_07_0x809F4980/func_809FF6B0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809FF810.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_07_0x809F4980/func_809FF810.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809FF900.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_07_0x809F4980/func_809FF900.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809FFA04.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_07_0x809F4980/func_809FFA04.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809FFA80.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_07_0x809F4980/func_809FFA80.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809FFE64.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_07_0x809F4980/func_809FFE64.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809FFEAC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_07_0x809F4980/func_809FFEAC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_80A0021C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_07_0x809F4980/func_80A0021C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_80A00274.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_07_0x809F4980/func_80A00274.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_80A00484.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_07_0x809F4980/func_80A00484.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_80A00554.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_07_0x809F4980/func_80A00554.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_80A006D0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_07_0x809F4980/func_80A006D0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_80A006F4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_07_0x809F4980/func_80A006F4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_80A00720.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_07_0x809F4980/func_80A00720.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_80A016E4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_07_0x809F4980/func_80A016E4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_80A01750.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_07_0x809F4980/func_80A01750.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_80A025AC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_07_0x809F4980/func_80A025AC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_80A0264C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_07_0x809F4980/func_80A0264C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_80A02B30.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_07_0x809F4980/func_80A02B30.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_80A02C54.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_07_0x809F4980/func_80A02C54.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_80A03238.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_07_0x809F4980/func_80A03238.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_80A036C4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_07_0x809F4980/func_80A036C4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_80A03868.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_07_0x809F4980/func_80A03868.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_80A03F18.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_07_0x809F4980/func_80A03F18.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_80A03F5C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_07_0x809F4980/func_80A03F5C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_80A0434C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_07_0x809F4980/func_80A0434C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_80A045A8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_07_0x809F4980/func_80A045A8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_80A04768.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_07_0x809F4980/func_80A04768.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_80A04878.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_07_0x809F4980/func_80A04878.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_80A04890.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_07_0x809F4980/func_80A04890.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_80A04DE0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_07_0x809F4980/func_80A04DE0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_80A04E5C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_07_0x809F4980/func_80A04E5C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_80A055E0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_07_0x809F4980/func_80A055E0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_80A05608.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_07_0x809F4980/func_80A05608.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_80A05694.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_07_0x809F4980/func_80A05694.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_80A057A0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_07_0x809F4980/func_80A057A0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_80A05AF8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_07_0x809F4980/func_80A05AF8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_80A05B50.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_07_0x809F4980/func_80A05B50.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_80A05C88.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_07_0x809F4980/func_80A05C88.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_80A05DDC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_07_0x809F4980/func_80A05DDC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_80A06500.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_07_0x809F4980/func_80A06500.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_80A06990.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_07_0x809F4980/func_80A06990.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_80A06C64.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_07_0x809F4980/func_80A06C64.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_80A06E24.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_07_0x809F4980/func_80A06E24.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_80A06F48.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_07_0x809F4980/func_80A06F48.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_80A07604.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_07_0x809F4980/func_80A07604.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_80A07638.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_07_0x809F4980/func_80A07638.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_80A07740.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_07_0x809F4980/func_80A07740.asm") diff --git a/src/overlays/actors/ovl_Boss_Hakugin/z_boss_hakugin.c b/src/overlays/actors/ovl_Boss_Hakugin/z_boss_hakugin.c index 1e88ac42a2..e9f472d127 100644 --- a/src/overlays/actors/ovl_Boss_Hakugin/z_boss_hakugin.c +++ b/src/overlays/actors/ovl_Boss_Hakugin/z_boss_hakugin.c @@ -23,160 +23,160 @@ const ActorInit Boss_Hakugin_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_Hakugin_0x80B05290/BossHakugin_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_Hakugin_0x80B05290/BossHakugin_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_Hakugin_0x80B05290/BossHakugin_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_Hakugin_0x80B05290/BossHakugin_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_Hakugin_0x80B05290/func_80B0573C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_Hakugin_0x80B05290/func_80B0573C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_Hakugin_0x80B05290/func_80B057A4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_Hakugin_0x80B05290/func_80B057A4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_Hakugin_0x80B05290/func_80B058C0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_Hakugin_0x80B05290/func_80B058C0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_Hakugin_0x80B05290/func_80B05A64.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_Hakugin_0x80B05290/func_80B05A64.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_Hakugin_0x80B05290/func_80B05B04.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_Hakugin_0x80B05290/func_80B05B04.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_Hakugin_0x80B05290/func_80B05CBC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_Hakugin_0x80B05290/func_80B05CBC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_Hakugin_0x80B05290/func_80B05D4C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_Hakugin_0x80B05290/func_80B05D4C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_Hakugin_0x80B05290/func_80B05EE0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_Hakugin_0x80B05290/func_80B05EE0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_Hakugin_0x80B05290/func_80B0607C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_Hakugin_0x80B05290/func_80B0607C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_Hakugin_0x80B05290/func_80B06558.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_Hakugin_0x80B05290/func_80B06558.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_Hakugin_0x80B05290/func_80B06600.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_Hakugin_0x80B05290/func_80B06600.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_Hakugin_0x80B05290/func_80B0696C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_Hakugin_0x80B05290/func_80B0696C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_Hakugin_0x80B05290/func_80B06B20.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_Hakugin_0x80B05290/func_80B06B20.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_Hakugin_0x80B05290/func_80B06C08.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_Hakugin_0x80B05290/func_80B06C08.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_Hakugin_0x80B05290/func_80B06D38.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_Hakugin_0x80B05290/func_80B06D38.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_Hakugin_0x80B05290/func_80B06F48.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_Hakugin_0x80B05290/func_80B06F48.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_Hakugin_0x80B05290/func_80B0728C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_Hakugin_0x80B05290/func_80B0728C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_Hakugin_0x80B05290/func_80B07450.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_Hakugin_0x80B05290/func_80B07450.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_Hakugin_0x80B05290/func_80B07700.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_Hakugin_0x80B05290/func_80B07700.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_Hakugin_0x80B05290/func_80B0791C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_Hakugin_0x80B05290/func_80B0791C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_Hakugin_0x80B05290/func_80B07B88.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_Hakugin_0x80B05290/func_80B07B88.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_Hakugin_0x80B05290/func_80B07BFC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_Hakugin_0x80B05290/func_80B07BFC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_Hakugin_0x80B05290/func_80B07DA4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_Hakugin_0x80B05290/func_80B07DA4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_Hakugin_0x80B05290/func_80B07EEC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_Hakugin_0x80B05290/func_80B07EEC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_Hakugin_0x80B05290/func_80B08018.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_Hakugin_0x80B05290/func_80B08018.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_Hakugin_0x80B05290/func_80B08124.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_Hakugin_0x80B05290/func_80B08124.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_Hakugin_0x80B05290/func_80B0813C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_Hakugin_0x80B05290/func_80B0813C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_Hakugin_0x80B05290/func_80B0825C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_Hakugin_0x80B05290/func_80B0825C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_Hakugin_0x80B05290/func_80B082AC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_Hakugin_0x80B05290/func_80B082AC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_Hakugin_0x80B05290/func_80B08550.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_Hakugin_0x80B05290/func_80B08550.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_Hakugin_0x80B05290/func_80B0863C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_Hakugin_0x80B05290/func_80B0863C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_Hakugin_0x80B05290/func_80B08848.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_Hakugin_0x80B05290/func_80B08848.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_Hakugin_0x80B05290/func_80B08960.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_Hakugin_0x80B05290/func_80B08960.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_Hakugin_0x80B05290/func_80B08C1C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_Hakugin_0x80B05290/func_80B08C1C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_Hakugin_0x80B05290/func_80B08CB8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_Hakugin_0x80B05290/func_80B08CB8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_Hakugin_0x80B05290/func_80B09178.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_Hakugin_0x80B05290/func_80B09178.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_Hakugin_0x80B05290/func_80B091D8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_Hakugin_0x80B05290/func_80B091D8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_Hakugin_0x80B05290/func_80B093C0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_Hakugin_0x80B05290/func_80B093C0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_Hakugin_0x80B05290/func_80B094E0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_Hakugin_0x80B05290/func_80B094E0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_Hakugin_0x80B05290/func_80B09840.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_Hakugin_0x80B05290/func_80B09840.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_Hakugin_0x80B05290/func_80B098BC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_Hakugin_0x80B05290/func_80B098BC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_Hakugin_0x80B05290/func_80B09A94.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_Hakugin_0x80B05290/func_80B09A94.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_Hakugin_0x80B05290/func_80B09C78.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_Hakugin_0x80B05290/func_80B09C78.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_Hakugin_0x80B05290/func_80B09DFC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_Hakugin_0x80B05290/func_80B09DFC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_Hakugin_0x80B05290/func_80B09E20.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_Hakugin_0x80B05290/func_80B09E20.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_Hakugin_0x80B05290/func_80B09E84.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_Hakugin_0x80B05290/func_80B09E84.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_Hakugin_0x80B05290/func_80B09EDC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_Hakugin_0x80B05290/func_80B09EDC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_Hakugin_0x80B05290/func_80B09F7C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_Hakugin_0x80B05290/func_80B09F7C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_Hakugin_0x80B05290/func_80B0A2A4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_Hakugin_0x80B05290/func_80B0A2A4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_Hakugin_0x80B05290/func_80B0A5EC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_Hakugin_0x80B05290/func_80B0A5EC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_Hakugin_0x80B05290/func_80B0A638.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_Hakugin_0x80B05290/func_80B0A638.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_Hakugin_0x80B05290/func_80B0A87C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_Hakugin_0x80B05290/func_80B0A87C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_Hakugin_0x80B05290/func_80B0A8C4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_Hakugin_0x80B05290/func_80B0A8C4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_Hakugin_0x80B05290/func_80B0AC30.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_Hakugin_0x80B05290/func_80B0AC30.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_Hakugin_0x80B05290/func_80B0ADFC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_Hakugin_0x80B05290/func_80B0ADFC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_Hakugin_0x80B05290/func_80B0B238.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_Hakugin_0x80B05290/func_80B0B238.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_Hakugin_0x80B05290/func_80B0B34C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_Hakugin_0x80B05290/func_80B0B34C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_Hakugin_0x80B05290/func_80B0B3F4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_Hakugin_0x80B05290/func_80B0B3F4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_Hakugin_0x80B05290/func_80B0B548.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_Hakugin_0x80B05290/func_80B0B548.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_Hakugin_0x80B05290/func_80B0B660.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_Hakugin_0x80B05290/func_80B0B660.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_Hakugin_0x80B05290/BossHakugin_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_Hakugin_0x80B05290/BossHakugin_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_Hakugin_0x80B05290/func_80B0C000.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_Hakugin_0x80B05290/func_80B0C000.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_Hakugin_0x80B05290/func_80B0C1BC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_Hakugin_0x80B05290/func_80B0C1BC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_Hakugin_0x80B05290/func_80B0C398.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_Hakugin_0x80B05290/func_80B0C398.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_Hakugin_0x80B05290/func_80B0C570.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_Hakugin_0x80B05290/func_80B0C570.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_Hakugin_0x80B05290/func_80B0C7B0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_Hakugin_0x80B05290/func_80B0C7B0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_Hakugin_0x80B05290/func_80B0CAF0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_Hakugin_0x80B05290/func_80B0CAF0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_Hakugin_0x80B05290/func_80B0CCD8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_Hakugin_0x80B05290/func_80B0CCD8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_Hakugin_0x80B05290/func_80B0CF24.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_Hakugin_0x80B05290/func_80B0CF24.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_Hakugin_0x80B05290/BossHakugin_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_Hakugin_0x80B05290/BossHakugin_Draw.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_Hakugin_0x80B05290/func_80B0D2B8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_Hakugin_0x80B05290/func_80B0D2B8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_Hakugin_0x80B05290/func_80B0D69C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_Hakugin_0x80B05290/func_80B0D69C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_Hakugin_0x80B05290/func_80B0D750.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_Hakugin_0x80B05290/func_80B0D750.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_Hakugin_0x80B05290/func_80B0D9CC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_Hakugin_0x80B05290/func_80B0D9CC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_Hakugin_0x80B05290/func_80B0DFA8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_Hakugin_0x80B05290/func_80B0DFA8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_Hakugin_0x80B05290/func_80B0E548.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_Hakugin_0x80B05290/func_80B0E548.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Boss_Hakugin_0x80B05290/func_80B0E5A4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Boss_Hakugin_0x80B05290/func_80B0E5A4.asm") 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 c7e97191bb..013bd9acec 100644 --- a/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c +++ b/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c @@ -22,28 +22,28 @@ const ActorInit Demo_Effect_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Demo_Effect_0x808CD740/DemoEffect_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Demo_Effect_0x808CD740/DemoEffect_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Demo_Effect_0x808CD740/DemoEffect_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Demo_Effect_0x808CD740/DemoEffect_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Demo_Effect_0x808CD740/func_808CD940.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Demo_Effect_0x808CD740/func_808CD940.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Demo_Effect_0x808CD740/func_808CD998.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Demo_Effect_0x808CD740/func_808CD998.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Demo_Effect_0x808CD740/func_808CDAD0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Demo_Effect_0x808CD740/func_808CDAD0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Demo_Effect_0x808CD740/func_808CDBDC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Demo_Effect_0x808CD740/func_808CDBDC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Demo_Effect_0x808CD740/func_808CDCEC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Demo_Effect_0x808CD740/func_808CDCEC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Demo_Effect_0x808CD740/func_808CDD70.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Demo_Effect_0x808CD740/func_808CDD70.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Demo_Effect_0x808CD740/func_808CDDE0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Demo_Effect_0x808CD740/func_808CDDE0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Demo_Effect_0x808CD740/DemoEffect_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Demo_Effect_0x808CD740/DemoEffect_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Demo_Effect_0x808CD740/func_808CDE78.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Demo_Effect_0x808CD740/func_808CDE78.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Demo_Effect_0x808CD740/func_808CDFF8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Demo_Effect_0x808CD740/func_808CDFF8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Demo_Effect_0x808CD740/func_808CE078.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Demo_Effect_0x808CD740/func_808CE078.asm") diff --git a/src/overlays/actors/ovl_Demo_Getitem/z_demo_getitem.c b/src/overlays/actors/ovl_Demo_Getitem/z_demo_getitem.c index 0ce117859a..1a7e7e2783 100644 --- a/src/overlays/actors/ovl_Demo_Getitem/z_demo_getitem.c +++ b/src/overlays/actors/ovl_Demo_Getitem/z_demo_getitem.c @@ -22,14 +22,14 @@ const ActorInit Demo_Getitem_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Demo_Getitem_0x80A4FA40/DemoGetitem_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Demo_Getitem_0x80A4FA40/DemoGetitem_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Demo_Getitem_0x80A4FA40/DemoGetitem_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Demo_Getitem_0x80A4FA40/DemoGetitem_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Demo_Getitem_0x80A4FA40/func_80A4FB10.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Demo_Getitem_0x80A4FA40/func_80A4FB10.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Demo_Getitem_0x80A4FA40/func_80A4FB68.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Demo_Getitem_0x80A4FA40/func_80A4FB68.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Demo_Getitem_0x80A4FA40/DemoGetitem_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Demo_Getitem_0x80A4FA40/DemoGetitem_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Demo_Getitem_0x80A4FA40/func_80A4FCF0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Demo_Getitem_0x80A4FA40/func_80A4FCF0.asm") 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 b51e2e1a53..0481b4e2ef 100644 --- a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c +++ b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c @@ -23,22 +23,22 @@ const ActorInit Demo_Kankyo_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Demo_Kankyo_0x808CE450/func_808CE450.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Demo_Kankyo_0x808CE450/func_808CE450.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Demo_Kankyo_0x808CE450/func_808CE45C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Demo_Kankyo_0x808CE450/func_808CE45C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Demo_Kankyo_0x808CE450/func_808CF06C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Demo_Kankyo_0x808CE450/func_808CF06C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Demo_Kankyo_0x808CE450/func_808CF0CC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Demo_Kankyo_0x808CE450/func_808CF0CC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Demo_Kankyo_0x808CE450/DemoKankyo_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Demo_Kankyo_0x808CE450/DemoKankyo_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Demo_Kankyo_0x808CE450/DemoKankyo_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Demo_Kankyo_0x808CE450/DemoKankyo_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Demo_Kankyo_0x808CE450/DemoKankyo_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Demo_Kankyo_0x808CE450/DemoKankyo_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Demo_Kankyo_0x808CE450/func_808CF970.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Demo_Kankyo_0x808CE450/func_808CF970.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Demo_Kankyo_0x808CE450/func_808CFE04.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Demo_Kankyo_0x808CE450/func_808CFE04.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Demo_Kankyo_0x808CE450/DemoKankyo_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Demo_Kankyo_0x808CE450/DemoKankyo_Draw.asm") diff --git a/src/overlays/actors/ovl_Demo_Moonend/z_demo_moonend.c b/src/overlays/actors/ovl_Demo_Moonend/z_demo_moonend.c index 1babc16308..d24594d8de 100644 --- a/src/overlays/actors/ovl_Demo_Moonend/z_demo_moonend.c +++ b/src/overlays/actors/ovl_Demo_Moonend/z_demo_moonend.c @@ -23,22 +23,22 @@ const ActorInit Demo_Moonend_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Demo_Moonend_0x80C17A10/DemoMoonend_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Demo_Moonend_0x80C17A10/DemoMoonend_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Demo_Moonend_0x80C17A10/DemoMoonend_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Demo_Moonend_0x80C17A10/DemoMoonend_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Demo_Moonend_0x80C17A10/func_80C17B50.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Demo_Moonend_0x80C17A10/func_80C17B50.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Demo_Moonend_0x80C17A10/func_80C17B60.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Demo_Moonend_0x80C17A10/func_80C17B60.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Demo_Moonend_0x80C17A10/func_80C17C48.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Demo_Moonend_0x80C17A10/func_80C17C48.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Demo_Moonend_0x80C17A10/DemoMoonend_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Demo_Moonend_0x80C17A10/DemoMoonend_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Demo_Moonend_0x80C17A10/func_80C17E70.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Demo_Moonend_0x80C17A10/func_80C17E70.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Demo_Moonend_0x80C17A10/func_80C17EE0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Demo_Moonend_0x80C17A10/func_80C17EE0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Demo_Moonend_0x80C17A10/DemoMoonend_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Demo_Moonend_0x80C17A10/DemoMoonend_Draw.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Demo_Moonend_0x80C17A10/func_80C17FCC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Demo_Moonend_0x80C17A10/func_80C17FCC.asm") diff --git a/src/overlays/actors/ovl_Demo_Syoten/z_demo_syoten.c b/src/overlays/actors/ovl_Demo_Syoten/z_demo_syoten.c index 0392bcfb45..894b931bfd 100644 --- a/src/overlays/actors/ovl_Demo_Syoten/z_demo_syoten.c +++ b/src/overlays/actors/ovl_Demo_Syoten/z_demo_syoten.c @@ -23,38 +23,38 @@ const ActorInit Demo_Syoten_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Demo_Syoten_0x80C16480/DemoSyoten_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Demo_Syoten_0x80C16480/DemoSyoten_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Demo_Syoten_0x80C16480/DemoSyoten_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Demo_Syoten_0x80C16480/DemoSyoten_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Demo_Syoten_0x80C16480/func_80C16760.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Demo_Syoten_0x80C16480/func_80C16760.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Demo_Syoten_0x80C16480/func_80C16818.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Demo_Syoten_0x80C16480/func_80C16818.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Demo_Syoten_0x80C16480/func_80C168D0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Demo_Syoten_0x80C16480/func_80C168D0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Demo_Syoten_0x80C16480/func_80C16974.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Demo_Syoten_0x80C16480/func_80C16974.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Demo_Syoten_0x80C16480/func_80C16A64.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Demo_Syoten_0x80C16480/func_80C16A64.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Demo_Syoten_0x80C16480/func_80C16A74.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Demo_Syoten_0x80C16480/func_80C16A74.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Demo_Syoten_0x80C16480/func_80C16BD4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Demo_Syoten_0x80C16480/func_80C16BD4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Demo_Syoten_0x80C16480/func_80C16DD4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Demo_Syoten_0x80C16480/func_80C16DD4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Demo_Syoten_0x80C16480/func_80C16EAC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Demo_Syoten_0x80C16480/func_80C16EAC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Demo_Syoten_0x80C16480/func_80C17008.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Demo_Syoten_0x80C16480/func_80C17008.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Demo_Syoten_0x80C16480/DemoSyoten_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Demo_Syoten_0x80C16480/DemoSyoten_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Demo_Syoten_0x80C16480/func_80C170F8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Demo_Syoten_0x80C16480/func_80C170F8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Demo_Syoten_0x80C16480/func_80C173B4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Demo_Syoten_0x80C16480/func_80C173B4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Demo_Syoten_0x80C16480/func_80C17468.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Demo_Syoten_0x80C16480/func_80C17468.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Demo_Syoten_0x80C16480/DemoSyoten_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Demo_Syoten_0x80C16480/DemoSyoten_Draw.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Demo_Syoten_0x80C16480/func_80C17690.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Demo_Syoten_0x80C16480/func_80C17690.asm") 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 2aa338b031..44420a4cc9 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 @@ -23,20 +23,20 @@ const ActorInit Demo_Tre_Lgt_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Demo_Tre_Lgt_0x808E0E40/DemoTreLgt_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Demo_Tre_Lgt_0x808E0E40/DemoTreLgt_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Demo_Tre_Lgt_0x808E0E40/DemoTreLgt_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Demo_Tre_Lgt_0x808E0E40/DemoTreLgt_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Demo_Tre_Lgt_0x808E0E40/func_808E0EE8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Demo_Tre_Lgt_0x808E0E40/func_808E0EE8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Demo_Tre_Lgt_0x808E0E40/func_808E0EF4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Demo_Tre_Lgt_0x808E0E40/func_808E0EF4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Demo_Tre_Lgt_0x808E0E40/func_808E0F4C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Demo_Tre_Lgt_0x808E0E40/func_808E0F4C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Demo_Tre_Lgt_0x808E0E40/func_808E0FE0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Demo_Tre_Lgt_0x808E0E40/func_808E0FE0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Demo_Tre_Lgt_0x808E0E40/DemoTreLgt_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Demo_Tre_Lgt_0x808E0E40/DemoTreLgt_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Demo_Tre_Lgt_0x808E0E40/func_808E12A4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Demo_Tre_Lgt_0x808E0E40/func_808E12A4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Demo_Tre_Lgt_0x808E0E40/DemoTreLgt_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Demo_Tre_Lgt_0x808E0E40/DemoTreLgt_Draw.asm") diff --git a/src/overlays/actors/ovl_Dm_Ah/z_dm_ah.c b/src/overlays/actors/ovl_Dm_Ah/z_dm_ah.c index 593334483c..a267a38b49 100644 --- a/src/overlays/actors/ovl_Dm_Ah/z_dm_ah.c +++ b/src/overlays/actors/ovl_Dm_Ah/z_dm_ah.c @@ -23,28 +23,28 @@ const ActorInit Dm_Ah_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Ah_0x80C1D410/func_80C1D410.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Ah_0x80C1D410/func_80C1D410.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Ah_0x80C1D410/func_80C1D458.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Ah_0x80C1D410/func_80C1D458.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Ah_0x80C1D410/func_80C1D4D0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Ah_0x80C1D410/func_80C1D4D0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Ah_0x80C1D410/func_80C1D6E0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Ah_0x80C1D410/func_80C1D6E0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Ah_0x80C1D410/func_80C1D78C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Ah_0x80C1D410/func_80C1D78C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Ah_0x80C1D410/func_80C1D7FC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Ah_0x80C1D410/func_80C1D7FC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Ah_0x80C1D410/func_80C1D92C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Ah_0x80C1D410/func_80C1D92C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Ah_0x80C1D410/DmAh_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Ah_0x80C1D410/DmAh_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Ah_0x80C1D410/DmAh_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Ah_0x80C1D410/DmAh_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Ah_0x80C1D410/DmAh_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Ah_0x80C1D410/DmAh_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Ah_0x80C1D410/func_80C1DAD4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Ah_0x80C1D410/func_80C1DAD4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Ah_0x80C1D410/func_80C1DB24.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Ah_0x80C1D410/func_80C1DB24.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Ah_0x80C1D410/DmAh_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Ah_0x80C1D410/DmAh_Draw.asm") diff --git a/src/overlays/actors/ovl_Dm_Al/z_dm_al.c b/src/overlays/actors/ovl_Dm_Al/z_dm_al.c index 26bc057404..4339fb3cb8 100644 --- a/src/overlays/actors/ovl_Dm_Al/z_dm_al.c +++ b/src/overlays/actors/ovl_Dm_Al/z_dm_al.c @@ -23,20 +23,20 @@ const ActorInit Dm_Al_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Al_0x80C1BD90/func_80C1BD90.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Al_0x80C1BD90/func_80C1BD90.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Al_0x80C1BD90/func_80C1BDD8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Al_0x80C1BD90/func_80C1BDD8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Al_0x80C1BD90/DmAl_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Al_0x80C1BD90/DmAl_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Al_0x80C1BD90/DmAl_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Al_0x80C1BD90/DmAl_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Al_0x80C1BD90/DmAl_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Al_0x80C1BD90/DmAl_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Al_0x80C1BD90/func_80C1C028.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Al_0x80C1BD90/func_80C1C028.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Al_0x80C1BD90/func_80C1C064.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Al_0x80C1BD90/func_80C1C064.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Al_0x80C1BD90/func_80C1C11C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Al_0x80C1BD90/func_80C1C11C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Al_0x80C1BD90/DmAl_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Al_0x80C1BD90/DmAl_Draw.asm") diff --git a/src/overlays/actors/ovl_Dm_An/z_dm_an.c b/src/overlays/actors/ovl_Dm_An/z_dm_an.c index ab291f701a..8257ab03bc 100644 --- a/src/overlays/actors/ovl_Dm_An/z_dm_an.c +++ b/src/overlays/actors/ovl_Dm_An/z_dm_an.c @@ -22,32 +22,32 @@ const ActorInit Dm_An_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_An_0x80C1C410/func_80C1C410.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_An_0x80C1C410/func_80C1C410.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_An_0x80C1C410/func_80C1C4D8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_An_0x80C1C410/func_80C1C4D8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_An_0x80C1C410/func_80C1C5B4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_An_0x80C1C410/func_80C1C5B4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_An_0x80C1C410/func_80C1C62C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_An_0x80C1C410/func_80C1C62C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_An_0x80C1C410/func_80C1C83C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_An_0x80C1C410/func_80C1C83C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_An_0x80C1C410/func_80C1C8E8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_An_0x80C1C410/func_80C1C8E8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_An_0x80C1C410/func_80C1C958.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_An_0x80C1C410/func_80C1C958.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_An_0x80C1C410/func_80C1CAB0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_An_0x80C1C410/func_80C1CAB0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_An_0x80C1C410/func_80C1CC80.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_An_0x80C1C410/func_80C1CC80.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_An_0x80C1C410/DmAn_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_An_0x80C1C410/DmAn_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_An_0x80C1C410/DmAn_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_An_0x80C1C410/DmAn_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_An_0x80C1C410/DmAn_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_An_0x80C1C410/DmAn_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_An_0x80C1C410/func_80C1CD80.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_An_0x80C1C410/func_80C1CD80.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_An_0x80C1C410/func_80C1CEFC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_An_0x80C1C410/func_80C1CEFC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_An_0x80C1C410/func_80C1D0B0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_An_0x80C1C410/func_80C1D0B0.asm") diff --git a/src/overlays/actors/ovl_Dm_Bal/z_dm_bal.c b/src/overlays/actors/ovl_Dm_Bal/z_dm_bal.c index 3e6ae9278c..3d34f34307 100644 --- a/src/overlays/actors/ovl_Dm_Bal/z_dm_bal.c +++ b/src/overlays/actors/ovl_Dm_Bal/z_dm_bal.c @@ -23,26 +23,26 @@ const ActorInit Dm_Bal_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Bal_0x80C1E9E0/DmBal_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Bal_0x80C1E9E0/DmBal_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Bal_0x80C1E9E0/DmBal_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Bal_0x80C1E9E0/DmBal_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Bal_0x80C1E9E0/func_80C1EAC4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Bal_0x80C1E9E0/func_80C1EAC4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Bal_0x80C1E9E0/func_80C1EAD8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Bal_0x80C1E9E0/func_80C1EAD8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Bal_0x80C1E9E0/func_80C1EAE8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Bal_0x80C1E9E0/func_80C1EAE8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Bal_0x80C1E9E0/func_80C1EC60.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Bal_0x80C1E9E0/func_80C1EC60.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Bal_0x80C1E9E0/func_80C1ED0C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Bal_0x80C1E9E0/func_80C1ED0C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Bal_0x80C1E9E0/func_80C1ED64.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Bal_0x80C1E9E0/func_80C1ED64.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Bal_0x80C1E9E0/DmBal_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Bal_0x80C1E9E0/DmBal_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Bal_0x80C1E9E0/func_80C1EF80.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Bal_0x80C1E9E0/func_80C1EF80.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Bal_0x80C1E9E0/func_80C1F060.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Bal_0x80C1E9E0/func_80C1F060.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Bal_0x80C1E9E0/DmBal_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Bal_0x80C1E9E0/DmBal_Draw.asm") diff --git a/src/overlays/actors/ovl_Dm_Char00/z_dm_char00.c b/src/overlays/actors/ovl_Dm_Char00/z_dm_char00.c index 9b3bab0b17..06556fff50 100644 --- a/src/overlays/actors/ovl_Dm_Char00/z_dm_char00.c +++ b/src/overlays/actors/ovl_Dm_Char00/z_dm_char00.c @@ -23,54 +23,54 @@ const ActorInit Dm_Char00_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char00_0x80AA5580/func_80AA5580.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Char00_0x80AA5580/func_80AA5580.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char00_0x80AA5580/func_80AA561C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Char00_0x80AA5580/func_80AA561C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char00_0x80AA5580/func_80AA5720.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Char00_0x80AA5580/func_80AA5720.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char00_0x80AA5580/func_80AA575C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Char00_0x80AA5580/func_80AA575C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char00_0x80AA5580/func_80AA5890.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Char00_0x80AA5580/func_80AA5890.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char00_0x80AA5580/func_80AA58CC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Char00_0x80AA5580/func_80AA58CC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char00_0x80AA5580/func_80AA5950.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Char00_0x80AA5580/func_80AA5950.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char00_0x80AA5580/func_80AA5960.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Char00_0x80AA5580/func_80AA5960.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char00_0x80AA5580/func_80AA59E4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Char00_0x80AA5580/func_80AA59E4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char00_0x80AA5580/func_80AA5A6C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Char00_0x80AA5580/func_80AA5A6C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char00_0x80AA5580/func_80AA5AF4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Char00_0x80AA5580/func_80AA5AF4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char00_0x80AA5580/func_80AA5BF8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Char00_0x80AA5580/func_80AA5BF8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char00_0x80AA5580/func_80AA5CD4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Char00_0x80AA5580/func_80AA5CD4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char00_0x80AA5580/func_80AA5D10.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Char00_0x80AA5580/func_80AA5D10.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char00_0x80AA5580/func_80AA5D6C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Char00_0x80AA5580/func_80AA5D6C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char00_0x80AA5580/func_80AA5DC8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Char00_0x80AA5580/func_80AA5DC8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char00_0x80AA5580/func_80AA5E2C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Char00_0x80AA5580/func_80AA5E2C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char00_0x80AA5580/func_80AA5EBC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Char00_0x80AA5580/func_80AA5EBC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char00_0x80AA5580/DmChar00_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Char00_0x80AA5580/DmChar00_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char00_0x80AA5580/DmChar00_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Char00_0x80AA5580/DmChar00_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char00_0x80AA5580/func_80AA62FC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Char00_0x80AA5580/func_80AA62FC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char00_0x80AA5580/func_80AA67F8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Char00_0x80AA5580/func_80AA67F8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char00_0x80AA5580/func_80AA695C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Char00_0x80AA5580/func_80AA695C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char00_0x80AA5580/DmChar00_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Char00_0x80AA5580/DmChar00_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char00_0x80AA5580/func_80AA6A6C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Char00_0x80AA5580/func_80AA6A6C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char00_0x80AA5580/DmChar00_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Char00_0x80AA5580/DmChar00_Draw.asm") diff --git a/src/overlays/actors/ovl_Dm_Char01/z_dm_char01.c b/src/overlays/actors/ovl_Dm_Char01/z_dm_char01.c index 932ecb3135..0201408392 100644 --- a/src/overlays/actors/ovl_Dm_Char01/z_dm_char01.c +++ b/src/overlays/actors/ovl_Dm_Char01/z_dm_char01.c @@ -23,32 +23,32 @@ const ActorInit Dm_Char01_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char01_0x80AA81E0/DmChar01_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Char01_0x80AA81E0/DmChar01_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char01_0x80AA81E0/DmChar01_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Char01_0x80AA81E0/DmChar01_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char01_0x80AA81E0/func_80AA8698.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Char01_0x80AA81E0/func_80AA8698.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char01_0x80AA81E0/func_80AA884C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Char01_0x80AA81E0/func_80AA884C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char01_0x80AA81E0/func_80AA88A8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Char01_0x80AA81E0/func_80AA88A8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char01_0x80AA81E0/func_80AA892C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Char01_0x80AA81E0/func_80AA892C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char01_0x80AA81E0/func_80AA8C28.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Char01_0x80AA81E0/func_80AA8C28.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char01_0x80AA81E0/func_80AA8F0C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Char01_0x80AA81E0/func_80AA8F0C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char01_0x80AA81E0/func_80AA8F1C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Char01_0x80AA81E0/func_80AA8F1C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char01_0x80AA81E0/func_80AA8F2C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Char01_0x80AA81E0/func_80AA8F2C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char01_0x80AA81E0/func_80AA9020.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Char01_0x80AA81E0/func_80AA9020.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char01_0x80AA81E0/func_80AA90AC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Char01_0x80AA81E0/func_80AA90AC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char01_0x80AA81E0/func_80AA90F4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Char01_0x80AA81E0/func_80AA90F4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char01_0x80AA81E0/DmChar01_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Char01_0x80AA81E0/DmChar01_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char01_0x80AA81E0/DmChar01_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Char01_0x80AA81E0/DmChar01_Draw.asm") diff --git a/src/overlays/actors/ovl_Dm_Char02/z_dm_char02.c b/src/overlays/actors/ovl_Dm_Char02/z_dm_char02.c index 2c105ac140..ed694e8af7 100644 --- a/src/overlays/actors/ovl_Dm_Char02/z_dm_char02.c +++ b/src/overlays/actors/ovl_Dm_Char02/z_dm_char02.c @@ -23,24 +23,24 @@ const ActorInit Dm_Char02_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char02_0x80AAAE30/func_80AAAE30.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Char02_0x80AAAE30/func_80AAAE30.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char02_0x80AAAE30/func_80AAAECC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Char02_0x80AAAE30/func_80AAAECC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char02_0x80AAAE30/func_80AAAF2C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Char02_0x80AAAE30/func_80AAAF2C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char02_0x80AAAE30/DmChar02_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Char02_0x80AAAE30/DmChar02_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char02_0x80AAAE30/DmChar02_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Char02_0x80AAAE30/DmChar02_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char02_0x80AAAE30/func_80AAB04C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Char02_0x80AAAE30/func_80AAB04C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char02_0x80AAAE30/DmChar02_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Char02_0x80AAAE30/DmChar02_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char02_0x80AAAE30/func_80AAB23C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Char02_0x80AAAE30/func_80AAB23C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char02_0x80AAAE30/func_80AAB258.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Char02_0x80AAAE30/func_80AAB258.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char02_0x80AAAE30/func_80AAB270.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Char02_0x80AAAE30/func_80AAB270.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char02_0x80AAAE30/DmChar02_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Char02_0x80AAAE30/DmChar02_Draw.asm") diff --git a/src/overlays/actors/ovl_Dm_Char03/z_dm_char03.c b/src/overlays/actors/ovl_Dm_Char03/z_dm_char03.c index b98f2c27f2..dbc8f807ca 100644 --- a/src/overlays/actors/ovl_Dm_Char03/z_dm_char03.c +++ b/src/overlays/actors/ovl_Dm_Char03/z_dm_char03.c @@ -23,30 +23,30 @@ const ActorInit Dm_Char03_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char03_0x80AAB4A0/func_80AAB4A0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Char03_0x80AAB4A0/func_80AAB4A0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char03_0x80AAB4A0/DmChar03_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Char03_0x80AAB4A0/DmChar03_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char03_0x80AAB4A0/DmChar03_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Char03_0x80AAB4A0/DmChar03_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char03_0x80AAB4A0/func_80AAB5F8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Char03_0x80AAB4A0/func_80AAB5F8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char03_0x80AAB4A0/func_80AAB644.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Char03_0x80AAB4A0/func_80AAB644.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char03_0x80AAB4A0/func_80AAB700.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Char03_0x80AAB4A0/func_80AAB700.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char03_0x80AAB4A0/func_80AAB710.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Char03_0x80AAB4A0/func_80AAB710.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char03_0x80AAB4A0/func_80AAB838.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Char03_0x80AAB4A0/func_80AAB838.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char03_0x80AAB4A0/DmChar03_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Char03_0x80AAB4A0/DmChar03_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char03_0x80AAB4A0/func_80AAB974.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Char03_0x80AAB4A0/func_80AAB974.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char03_0x80AAB4A0/func_80AAB990.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Char03_0x80AAB4A0/func_80AAB990.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char03_0x80AAB4A0/func_80AAB9A8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Char03_0x80AAB4A0/func_80AAB9A8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char03_0x80AAB4A0/DmChar03_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Char03_0x80AAB4A0/DmChar03_Draw.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char03_0x80AAB4A0/func_80AABA84.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Char03_0x80AAB4A0/func_80AABA84.asm") diff --git a/src/overlays/actors/ovl_Dm_Char04/z_dm_char04.c b/src/overlays/actors/ovl_Dm_Char04/z_dm_char04.c index 7abd2b8bf0..98e925826c 100644 --- a/src/overlays/actors/ovl_Dm_Char04/z_dm_char04.c +++ b/src/overlays/actors/ovl_Dm_Char04/z_dm_char04.c @@ -23,16 +23,16 @@ const ActorInit Dm_Char04_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char04_0x80AABC40/func_80AABC40.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Char04_0x80AABC40/func_80AABC40.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char04_0x80AABC40/DmChar04_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Char04_0x80AABC40/DmChar04_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char04_0x80AABC40/DmChar04_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Char04_0x80AABC40/DmChar04_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char04_0x80AABC40/func_80AABE34.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Char04_0x80AABC40/func_80AABE34.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char04_0x80AABC40/DmChar04_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Char04_0x80AABC40/DmChar04_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char04_0x80AABC40/func_80AABF74.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Char04_0x80AABC40/func_80AABF74.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char04_0x80AABC40/DmChar04_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Char04_0x80AABC40/DmChar04_Draw.asm") diff --git a/src/overlays/actors/ovl_Dm_Char05/z_dm_char05.c b/src/overlays/actors/ovl_Dm_Char05/z_dm_char05.c index d0e14f6a12..927c5dbcfb 100644 --- a/src/overlays/actors/ovl_Dm_Char05/z_dm_char05.c +++ b/src/overlays/actors/ovl_Dm_Char05/z_dm_char05.c @@ -23,78 +23,78 @@ const ActorInit Dm_Char05_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char05_0x80AAC5A0/func_80AAC5A0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Char05_0x80AAC5A0/func_80AAC5A0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char05_0x80AAC5A0/func_80AAC63C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Char05_0x80AAC5A0/func_80AAC63C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char05_0x80AAC5A0/func_80AAC6E4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Char05_0x80AAC5A0/func_80AAC6E4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char05_0x80AAC5A0/func_80AAC770.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Char05_0x80AAC5A0/func_80AAC770.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char05_0x80AAC5A0/func_80AAC7FC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Char05_0x80AAC5A0/func_80AAC7FC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char05_0x80AAC5A0/func_80AAC888.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Char05_0x80AAC5A0/func_80AAC888.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char05_0x80AAC5A0/DmChar05_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Char05_0x80AAC5A0/DmChar05_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char05_0x80AAC5A0/DmChar05_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Char05_0x80AAC5A0/DmChar05_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char05_0x80AAC5A0/func_80AAC990.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Char05_0x80AAC5A0/func_80AAC990.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char05_0x80AAC5A0/func_80AAC9DC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Char05_0x80AAC5A0/func_80AAC9DC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char05_0x80AAC5A0/func_80AACA98.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Char05_0x80AAC5A0/func_80AACA98.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char05_0x80AAC5A0/func_80AACAE4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Char05_0x80AAC5A0/func_80AACAE4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char05_0x80AAC5A0/func_80AACBE4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Char05_0x80AAC5A0/func_80AACBE4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char05_0x80AAC5A0/func_80AACC48.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Char05_0x80AAC5A0/func_80AACC48.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char05_0x80AAC5A0/func_80AACC6C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Char05_0x80AAC5A0/func_80AACC6C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char05_0x80AAC5A0/func_80AACCD4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Char05_0x80AAC5A0/func_80AACCD4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char05_0x80AAC5A0/func_80AACD0C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Char05_0x80AAC5A0/func_80AACD0C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char05_0x80AAC5A0/func_80AACD1C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Char05_0x80AAC5A0/func_80AACD1C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char05_0x80AAC5A0/func_80AACD68.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Char05_0x80AAC5A0/func_80AACD68.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char05_0x80AAC5A0/func_80AACE10.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Char05_0x80AAC5A0/func_80AACE10.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char05_0x80AAC5A0/func_80AACE5C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Char05_0x80AAC5A0/func_80AACE5C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char05_0x80AAC5A0/func_80AACF04.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Char05_0x80AAC5A0/func_80AACF04.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char05_0x80AAC5A0/func_80AAD3F8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Char05_0x80AAC5A0/func_80AAD3F8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char05_0x80AAC5A0/func_80AAD450.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Char05_0x80AAC5A0/func_80AAD450.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char05_0x80AAC5A0/func_80AAD4A8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Char05_0x80AAC5A0/func_80AAD4A8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char05_0x80AAC5A0/DmChar05_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Char05_0x80AAC5A0/DmChar05_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char05_0x80AAC5A0/func_80AAD964.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Char05_0x80AAC5A0/func_80AAD964.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char05_0x80AAC5A0/func_80AAD980.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Char05_0x80AAC5A0/func_80AAD980.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char05_0x80AAC5A0/func_80AAD998.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Char05_0x80AAC5A0/func_80AAD998.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char05_0x80AAC5A0/func_80AADA90.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Char05_0x80AAC5A0/func_80AADA90.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char05_0x80AAC5A0/func_80AADB4C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Char05_0x80AAC5A0/func_80AADB4C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char05_0x80AAC5A0/func_80AADC00.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Char05_0x80AAC5A0/func_80AADC00.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char05_0x80AAC5A0/DmChar05_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Char05_0x80AAC5A0/DmChar05_Draw.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char05_0x80AAC5A0/func_80AADD9C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Char05_0x80AAC5A0/func_80AADD9C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char05_0x80AAC5A0/func_80AADE78.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Char05_0x80AAC5A0/func_80AADE78.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char05_0x80AAC5A0/func_80AADF54.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Char05_0x80AAC5A0/func_80AADF54.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char05_0x80AAC5A0/func_80AAE030.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Char05_0x80AAC5A0/func_80AAE030.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char05_0x80AAC5A0/func_80AAE114.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Char05_0x80AAC5A0/func_80AAE114.asm") diff --git a/src/overlays/actors/ovl_Dm_Char06/z_dm_char06.c b/src/overlays/actors/ovl_Dm_Char06/z_dm_char06.c index 6430cbac21..33d00e86df 100644 --- a/src/overlays/actors/ovl_Dm_Char06/z_dm_char06.c +++ b/src/overlays/actors/ovl_Dm_Char06/z_dm_char06.c @@ -23,14 +23,14 @@ const ActorInit Dm_Char06_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char06_0x80AAE680/func_80AAE680.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Char06_0x80AAE680/func_80AAE680.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char06_0x80AAE680/DmChar06_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Char06_0x80AAE680/DmChar06_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char06_0x80AAE680/DmChar06_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Char06_0x80AAE680/DmChar06_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char06_0x80AAE680/func_80AAE6F0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Char06_0x80AAE680/func_80AAE6F0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char06_0x80AAE680/DmChar06_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Char06_0x80AAE680/DmChar06_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char06_0x80AAE680/DmChar06_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Char06_0x80AAE680/DmChar06_Draw.asm") diff --git a/src/overlays/actors/ovl_Dm_Char07/z_dm_char07.c b/src/overlays/actors/ovl_Dm_Char07/z_dm_char07.c index 2b5ac9d8cf..5f0f50a108 100644 --- a/src/overlays/actors/ovl_Dm_Char07/z_dm_char07.c +++ b/src/overlays/actors/ovl_Dm_Char07/z_dm_char07.c @@ -23,14 +23,14 @@ const ActorInit Dm_Char07_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char07_0x80AAE9C0/func_80AAE9C0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Char07_0x80AAE9C0/func_80AAE9C0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char07_0x80AAE9C0/DmChar07_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Char07_0x80AAE9C0/DmChar07_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char07_0x80AAE9C0/DmChar07_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Char07_0x80AAE9C0/DmChar07_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char07_0x80AAE9C0/func_80AAEABC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Char07_0x80AAE9C0/func_80AAEABC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char07_0x80AAE9C0/DmChar07_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Char07_0x80AAE9C0/DmChar07_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char07_0x80AAE9C0/DmChar07_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Char07_0x80AAE9C0/DmChar07_Draw.asm") diff --git a/src/overlays/actors/ovl_Dm_Char08/z_dm_char08.c b/src/overlays/actors/ovl_Dm_Char08/z_dm_char08.c index e34fadab88..32f76601a6 100644 --- a/src/overlays/actors/ovl_Dm_Char08/z_dm_char08.c +++ b/src/overlays/actors/ovl_Dm_Char08/z_dm_char08.c @@ -23,56 +23,56 @@ const ActorInit Dm_Char08_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char08_0x80AAF050/func_80AAF050.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Char08_0x80AAF050/func_80AAF050.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char08_0x80AAF050/func_80AAF15C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Char08_0x80AAF050/func_80AAF15C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char08_0x80AAF050/DmChar08_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Char08_0x80AAF050/DmChar08_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char08_0x80AAF050/DmChar08_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Char08_0x80AAF050/DmChar08_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char08_0x80AAF050/func_80AAF610.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Char08_0x80AAF050/func_80AAF610.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char08_0x80AAF050/func_80AAF79C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Char08_0x80AAF050/func_80AAF79C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char08_0x80AAF050/func_80AAF884.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Char08_0x80AAF050/func_80AAF884.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char08_0x80AAF050/func_80AAF8F4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Char08_0x80AAF050/func_80AAF8F4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char08_0x80AAF050/func_80AAFA18.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Char08_0x80AAF050/func_80AAFA18.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char08_0x80AAF050/func_80AAFAC4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Char08_0x80AAF050/func_80AAFAC4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char08_0x80AAF050/func_80AAFAE4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Char08_0x80AAF050/func_80AAFAE4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char08_0x80AAF050/func_80AAFB04.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Char08_0x80AAF050/func_80AAFB04.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char08_0x80AAF050/func_80AAFB94.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Char08_0x80AAF050/func_80AAFB94.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char08_0x80AAF050/func_80AAFBA4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Char08_0x80AAF050/func_80AAFBA4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char08_0x80AAF050/func_80AAFCCC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Char08_0x80AAF050/func_80AAFCCC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char08_0x80AAF050/func_80AAFE78.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Char08_0x80AAF050/func_80AAFE78.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char08_0x80AAF050/func_80AAFE88.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Char08_0x80AAF050/func_80AAFE88.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char08_0x80AAF050/func_80AB01E8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Char08_0x80AAF050/func_80AB01E8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char08_0x80AAF050/func_80AB023C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Char08_0x80AAF050/func_80AB023C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char08_0x80AAF050/func_80AB032C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Char08_0x80AAF050/func_80AB032C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char08_0x80AAF050/func_80AB096C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Char08_0x80AAF050/func_80AB096C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char08_0x80AAF050/func_80AB0A10.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Char08_0x80AAF050/func_80AB0A10.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char08_0x80AAF050/DmChar08_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Char08_0x80AAF050/DmChar08_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char08_0x80AAF050/func_80AB0E3C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Char08_0x80AAF050/func_80AB0E3C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char08_0x80AAF050/func_80AB0E7C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Char08_0x80AAF050/func_80AB0E7C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char08_0x80AAF050/func_80AB0F90.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Char08_0x80AAF050/func_80AB0F90.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char08_0x80AAF050/DmChar08_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Char08_0x80AAF050/DmChar08_Draw.asm") diff --git a/src/overlays/actors/ovl_Dm_Char09/z_dm_char09.c b/src/overlays/actors/ovl_Dm_Char09/z_dm_char09.c index 3e07134fd7..3032036d30 100644 --- a/src/overlays/actors/ovl_Dm_Char09/z_dm_char09.c +++ b/src/overlays/actors/ovl_Dm_Char09/z_dm_char09.c @@ -23,24 +23,24 @@ const ActorInit Dm_Char09_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char09_0x80AB1E10/func_80AB1E10.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Char09_0x80AB1E10/func_80AB1E10.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char09_0x80AB1E10/DmChar09_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Char09_0x80AB1E10/DmChar09_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char09_0x80AB1E10/DmChar09_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Char09_0x80AB1E10/DmChar09_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char09_0x80AB1E10/func_80AB1FA0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Char09_0x80AB1E10/func_80AB1FA0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char09_0x80AB1E10/func_80AB1FDC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Char09_0x80AB1E10/func_80AB1FDC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char09_0x80AB1E10/func_80AB2258.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Char09_0x80AB1E10/func_80AB2258.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char09_0x80AB1E10/func_80AB2268.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Char09_0x80AB1E10/func_80AB2268.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char09_0x80AB1E10/func_80AB24BC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Char09_0x80AB1E10/func_80AB24BC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char09_0x80AB1E10/DmChar09_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Char09_0x80AB1E10/DmChar09_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char09_0x80AB1E10/func_80AB25D8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Char09_0x80AB1E10/func_80AB25D8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char09_0x80AB1E10/DmChar09_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Char09_0x80AB1E10/DmChar09_Draw.asm") diff --git a/src/overlays/actors/ovl_Dm_Gm/z_dm_gm.c b/src/overlays/actors/ovl_Dm_Gm/z_dm_gm.c index 29e25b0147..e494c06f81 100644 --- a/src/overlays/actors/ovl_Dm_Gm/z_dm_gm.c +++ b/src/overlays/actors/ovl_Dm_Gm/z_dm_gm.c @@ -22,32 +22,32 @@ const ActorInit Dm_Gm_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Gm_0x80C24360/func_80C24360.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Gm_0x80C24360/func_80C24360.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Gm_0x80C24360/func_80C24428.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Gm_0x80C24360/func_80C24428.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Gm_0x80C24360/func_80C24504.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Gm_0x80C24360/func_80C24504.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Gm_0x80C24360/func_80C2457C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Gm_0x80C24360/func_80C2457C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Gm_0x80C24360/func_80C2478C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Gm_0x80C24360/func_80C2478C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Gm_0x80C24360/func_80C24838.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Gm_0x80C24360/func_80C24838.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Gm_0x80C24360/func_80C248A8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Gm_0x80C24360/func_80C248A8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Gm_0x80C24360/func_80C24A00.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Gm_0x80C24360/func_80C24A00.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Gm_0x80C24360/func_80C24BD0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Gm_0x80C24360/func_80C24BD0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Gm_0x80C24360/DmGm_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Gm_0x80C24360/DmGm_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Gm_0x80C24360/DmGm_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Gm_0x80C24360/DmGm_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Gm_0x80C24360/DmGm_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Gm_0x80C24360/DmGm_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Gm_0x80C24360/func_80C24CD0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Gm_0x80C24360/func_80C24CD0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Gm_0x80C24360/func_80C24E4C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Gm_0x80C24360/func_80C24E4C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Gm_0x80C24360/func_80C25000.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Gm_0x80C24360/func_80C25000.asm") diff --git a/src/overlays/actors/ovl_Dm_Hina/z_dm_hina.c b/src/overlays/actors/ovl_Dm_Hina/z_dm_hina.c index 87a76217c5..0f6193e59a 100644 --- a/src/overlays/actors/ovl_Dm_Hina/z_dm_hina.c +++ b/src/overlays/actors/ovl_Dm_Hina/z_dm_hina.c @@ -23,22 +23,22 @@ const ActorInit Dm_Hina_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Hina_0x80A1F410/DmHina_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Hina_0x80A1F410/DmHina_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Hina_0x80A1F410/DmHina_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Hina_0x80A1F410/DmHina_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Hina_0x80A1F410/func_80A1F470.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Hina_0x80A1F410/func_80A1F470.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Hina_0x80A1F410/func_80A1F56C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Hina_0x80A1F410/func_80A1F56C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Hina_0x80A1F410/func_80A1F5AC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Hina_0x80A1F410/func_80A1F5AC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Hina_0x80A1F410/func_80A1F63C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Hina_0x80A1F410/func_80A1F63C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Hina_0x80A1F410/func_80A1F75C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Hina_0x80A1F410/func_80A1F75C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Hina_0x80A1F410/DmHina_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Hina_0x80A1F410/DmHina_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Hina_0x80A1F410/func_80A1F9AC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Hina_0x80A1F410/func_80A1F9AC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Hina_0x80A1F410/DmHina_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Hina_0x80A1F410/DmHina_Draw.asm") diff --git a/src/overlays/actors/ovl_Dm_Nb/z_dm_nb.c b/src/overlays/actors/ovl_Dm_Nb/z_dm_nb.c index 73670abb47..c50c22b27c 100644 --- a/src/overlays/actors/ovl_Dm_Nb/z_dm_nb.c +++ b/src/overlays/actors/ovl_Dm_Nb/z_dm_nb.c @@ -23,16 +23,16 @@ const ActorInit Dm_Nb_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Nb_0x80C1DED0/func_80C1DED0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Nb_0x80C1DED0/func_80C1DED0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Nb_0x80C1DED0/func_80C1DF18.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Nb_0x80C1DED0/func_80C1DF18.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Nb_0x80C1DED0/DmNb_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Nb_0x80C1DED0/DmNb_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Nb_0x80C1DED0/DmNb_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Nb_0x80C1DED0/DmNb_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Nb_0x80C1DED0/DmNb_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Nb_0x80C1DED0/DmNb_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Nb_0x80C1DED0/func_80C1E168.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Nb_0x80C1DED0/func_80C1E168.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Nb_0x80C1DED0/DmNb_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Nb_0x80C1DED0/DmNb_Draw.asm") diff --git a/src/overlays/actors/ovl_Dm_Opstage/z_dm_opstage.c b/src/overlays/actors/ovl_Dm_Opstage/z_dm_opstage.c index d8f2bb15bc..9fbbaee946 100644 --- a/src/overlays/actors/ovl_Dm_Opstage/z_dm_opstage.c +++ b/src/overlays/actors/ovl_Dm_Opstage/z_dm_opstage.c @@ -23,14 +23,14 @@ const ActorInit Dm_Opstage_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Opstage_0x80A9F950/func_80A9F950.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Opstage_0x80A9F950/func_80A9F950.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Opstage_0x80A9F950/DmOpstage_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Opstage_0x80A9F950/DmOpstage_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Opstage_0x80A9F950/DmOpstage_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Opstage_0x80A9F950/DmOpstage_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Opstage_0x80A9F950/func_80A9FA58.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Opstage_0x80A9F950/func_80A9FA58.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Opstage_0x80A9F950/DmOpstage_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Opstage_0x80A9F950/DmOpstage_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Opstage_0x80A9F950/DmOpstage_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Opstage_0x80A9F950/DmOpstage_Draw.asm") diff --git a/src/overlays/actors/ovl_Dm_Ravine/z_dm_ravine.c b/src/overlays/actors/ovl_Dm_Ravine/z_dm_ravine.c index d1c18ec06a..1220018347 100644 --- a/src/overlays/actors/ovl_Dm_Ravine/z_dm_ravine.c +++ b/src/overlays/actors/ovl_Dm_Ravine/z_dm_ravine.c @@ -23,12 +23,12 @@ const ActorInit Dm_Ravine_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Ravine_0x80A2E7A0/DmRavine_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Ravine_0x80A2E7A0/DmRavine_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Ravine_0x80A2E7A0/DmRavine_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Ravine_0x80A2E7A0/DmRavine_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Ravine_0x80A2E7A0/func_80A2E838.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Ravine_0x80A2E7A0/func_80A2E838.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Ravine_0x80A2E7A0/DmRavine_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Ravine_0x80A2E7A0/DmRavine_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Ravine_0x80A2E7A0/DmRavine_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Ravine_0x80A2E7A0/DmRavine_Draw.asm") diff --git a/src/overlays/actors/ovl_Dm_Sa/z_dm_sa.c b/src/overlays/actors/ovl_Dm_Sa/z_dm_sa.c index 2524d3aaa6..ac53f53c54 100644 --- a/src/overlays/actors/ovl_Dm_Sa/z_dm_sa.c +++ b/src/overlays/actors/ovl_Dm_Sa/z_dm_sa.c @@ -23,24 +23,24 @@ const ActorInit Dm_Sa_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Sa_0x80A2E960/func_80A2E960.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Sa_0x80A2E960/func_80A2E960.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Sa_0x80A2E960/DmSa_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Sa_0x80A2E960/DmSa_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Sa_0x80A2E960/DmSa_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Sa_0x80A2E960/DmSa_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Sa_0x80A2E960/func_80A2EABC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Sa_0x80A2E960/func_80A2EABC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Sa_0x80A2E960/DmSa_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Sa_0x80A2E960/DmSa_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Sa_0x80A2E960/func_80A2EB10.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Sa_0x80A2E960/func_80A2EB10.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Sa_0x80A2E960/func_80A2EB2C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Sa_0x80A2E960/func_80A2EB2C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Sa_0x80A2E960/func_80A2EB44.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Sa_0x80A2E960/func_80A2EB44.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Sa_0x80A2E960/func_80A2EB58.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Sa_0x80A2E960/func_80A2EB58.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Sa_0x80A2E960/func_80A2EBB0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Sa_0x80A2E960/func_80A2EBB0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Sa_0x80A2E960/DmSa_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Sa_0x80A2E960/DmSa_Draw.asm") diff --git a/src/overlays/actors/ovl_Dm_Statue/z_dm_statue.c b/src/overlays/actors/ovl_Dm_Statue/z_dm_statue.c index f6ae80e924..13257e0633 100644 --- a/src/overlays/actors/ovl_Dm_Statue/z_dm_statue.c +++ b/src/overlays/actors/ovl_Dm_Statue/z_dm_statue.c @@ -23,10 +23,10 @@ const ActorInit Dm_Statue_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Statue_0x80A4C9B0/DmStatue_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Statue_0x80A4C9B0/DmStatue_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Statue_0x80A4C9B0/DmStatue_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Statue_0x80A4C9B0/DmStatue_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Statue_0x80A4C9B0/DmStatue_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Statue_0x80A4C9B0/DmStatue_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Statue_0x80A4C9B0/DmStatue_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Statue_0x80A4C9B0/DmStatue_Draw.asm") diff --git a/src/overlays/actors/ovl_Dm_Stk/z_dm_stk.c b/src/overlays/actors/ovl_Dm_Stk/z_dm_stk.c index 7f277df0fd..07c3500040 100644 --- a/src/overlays/actors/ovl_Dm_Stk/z_dm_stk.c +++ b/src/overlays/actors/ovl_Dm_Stk/z_dm_stk.c @@ -23,88 +23,88 @@ const ActorInit Dm_Stk_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Stk_0x80A9FDB0/func_80A9FDB0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Stk_0x80A9FDB0/func_80A9FDB0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Stk_0x80A9FDB0/func_80A9FE3C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Stk_0x80A9FDB0/func_80A9FE3C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Stk_0x80A9FDB0/func_80A9FED8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Stk_0x80A9FDB0/func_80A9FED8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Stk_0x80A9FDB0/func_80AA00CC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Stk_0x80A9FDB0/func_80AA00CC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Stk_0x80A9FDB0/func_80AA0100.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Stk_0x80A9FDB0/func_80AA0100.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Stk_0x80A9FDB0/func_80AA0158.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Stk_0x80A9FDB0/func_80AA0158.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Stk_0x80A9FDB0/func_80AA01C0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Stk_0x80A9FDB0/func_80AA01C0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Stk_0x80A9FDB0/func_80AA0264.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Stk_0x80A9FDB0/func_80AA0264.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Stk_0x80A9FDB0/func_80AA0420.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Stk_0x80A9FDB0/func_80AA0420.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Stk_0x80A9FDB0/func_80AA05F0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Stk_0x80A9FDB0/func_80AA05F0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Stk_0x80A9FDB0/func_80AA0634.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Stk_0x80A9FDB0/func_80AA0634.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Stk_0x80A9FDB0/func_80AA066C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Stk_0x80A9FDB0/func_80AA066C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Stk_0x80A9FDB0/func_80AA071C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Stk_0x80A9FDB0/func_80AA071C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Stk_0x80A9FDB0/func_80AA076C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Stk_0x80A9FDB0/func_80AA076C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Stk_0x80A9FDB0/func_80AA09DC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Stk_0x80A9FDB0/func_80AA09DC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Stk_0x80A9FDB0/func_80AA0B08.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Stk_0x80A9FDB0/func_80AA0B08.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Stk_0x80A9FDB0/func_80AA0DA8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Stk_0x80A9FDB0/func_80AA0DA8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Stk_0x80A9FDB0/func_80AA0E1C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Stk_0x80A9FDB0/func_80AA0E1C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Stk_0x80A9FDB0/func_80AA0E90.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Stk_0x80A9FDB0/func_80AA0E90.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Stk_0x80A9FDB0/DmStk_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Stk_0x80A9FDB0/DmStk_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Stk_0x80A9FDB0/DmStk_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Stk_0x80A9FDB0/DmStk_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Stk_0x80A9FDB0/func_80AA16F4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Stk_0x80A9FDB0/func_80AA16F4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Stk_0x80A9FDB0/func_80AA1704.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Stk_0x80A9FDB0/func_80AA1704.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Stk_0x80A9FDB0/func_80AA1714.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Stk_0x80A9FDB0/func_80AA1714.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Stk_0x80A9FDB0/func_80AA17F8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Stk_0x80A9FDB0/func_80AA17F8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Stk_0x80A9FDB0/func_80AA18D8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Stk_0x80A9FDB0/func_80AA18D8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Stk_0x80A9FDB0/func_80AA192C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Stk_0x80A9FDB0/func_80AA192C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Stk_0x80A9FDB0/func_80AA1998.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Stk_0x80A9FDB0/func_80AA1998.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Stk_0x80A9FDB0/func_80AA19EC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Stk_0x80A9FDB0/func_80AA19EC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Stk_0x80A9FDB0/func_80AA1A50.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Stk_0x80A9FDB0/func_80AA1A50.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Stk_0x80A9FDB0/func_80AA1AC8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Stk_0x80A9FDB0/func_80AA1AC8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Stk_0x80A9FDB0/func_80AA1AF8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Stk_0x80A9FDB0/func_80AA1AF8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Stk_0x80A9FDB0/func_80AA1B9C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Stk_0x80A9FDB0/func_80AA1B9C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Stk_0x80A9FDB0/func_80AA1C64.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Stk_0x80A9FDB0/func_80AA1C64.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Stk_0x80A9FDB0/func_80AA1D1C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Stk_0x80A9FDB0/func_80AA1D1C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Stk_0x80A9FDB0/func_80AA26CC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Stk_0x80A9FDB0/func_80AA26CC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Stk_0x80A9FDB0/func_80AA2720.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Stk_0x80A9FDB0/func_80AA2720.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Stk_0x80A9FDB0/func_80AA27EC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Stk_0x80A9FDB0/func_80AA27EC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Stk_0x80A9FDB0/DmStk_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Stk_0x80A9FDB0/DmStk_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Stk_0x80A9FDB0/func_80AA2B14.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Stk_0x80A9FDB0/func_80AA2B14.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Stk_0x80A9FDB0/func_80AA2BC0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Stk_0x80A9FDB0/func_80AA2BC0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Stk_0x80A9FDB0/func_80AA33A4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Stk_0x80A9FDB0/func_80AA33A4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Stk_0x80A9FDB0/DmStk_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Stk_0x80A9FDB0/DmStk_Draw.asm") diff --git a/src/overlays/actors/ovl_Dm_Tag/z_dm_tag.c b/src/overlays/actors/ovl_Dm_Tag/z_dm_tag.c index 87ad30a8da..c161bdad15 100644 --- a/src/overlays/actors/ovl_Dm_Tag/z_dm_tag.c +++ b/src/overlays/actors/ovl_Dm_Tag/z_dm_tag.c @@ -22,28 +22,28 @@ const ActorInit Dm_Tag_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Tag_0x80C22350/func_80C22350.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Tag_0x80C22350/func_80C22350.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Tag_0x80C22350/func_80C22400.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Tag_0x80C22350/func_80C22400.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Tag_0x80C22350/func_80C2247C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Tag_0x80C22350/func_80C2247C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Tag_0x80C22350/func_80C224D8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Tag_0x80C22350/func_80C224D8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Tag_0x80C22350/func_80C227E8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Tag_0x80C22350/func_80C227E8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Tag_0x80C22350/func_80C22880.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Tag_0x80C22350/func_80C22880.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Tag_0x80C22350/func_80C2291C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Tag_0x80C22350/func_80C2291C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Tag_0x80C22350/func_80C229AC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Tag_0x80C22350/func_80C229AC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Tag_0x80C22350/func_80C229EC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Tag_0x80C22350/func_80C229EC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Tag_0x80C22350/func_80C229FC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Tag_0x80C22350/func_80C229FC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Tag_0x80C22350/DmTag_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Tag_0x80C22350/DmTag_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Tag_0x80C22350/DmTag_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Tag_0x80C22350/DmTag_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Tag_0x80C22350/DmTag_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Tag_0x80C22350/DmTag_Update.asm") diff --git a/src/overlays/actors/ovl_Dm_Tsg/z_dm_tsg.c b/src/overlays/actors/ovl_Dm_Tsg/z_dm_tsg.c index 4ef45b4d27..79fd5f9e2b 100644 --- a/src/overlays/actors/ovl_Dm_Tsg/z_dm_tsg.c +++ b/src/overlays/actors/ovl_Dm_Tsg/z_dm_tsg.c @@ -23,10 +23,10 @@ const ActorInit Dm_Tsg_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Tsg_0x80A3AC60/DmTsg_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Tsg_0x80A3AC60/DmTsg_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Tsg_0x80A3AC60/DmTsg_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Tsg_0x80A3AC60/DmTsg_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Tsg_0x80A3AC60/DmTsg_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Tsg_0x80A3AC60/DmTsg_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Tsg_0x80A3AC60/DmTsg_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Tsg_0x80A3AC60/DmTsg_Draw.asm") diff --git a/src/overlays/actors/ovl_Dm_Zl/z_dm_zl.c b/src/overlays/actors/ovl_Dm_Zl/z_dm_zl.c index 89d3343e0b..8236f75b05 100644 --- a/src/overlays/actors/ovl_Dm_Zl/z_dm_zl.c +++ b/src/overlays/actors/ovl_Dm_Zl/z_dm_zl.c @@ -23,22 +23,22 @@ const ActorInit Dm_Zl_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Zl_0x80A38190/func_80A38190.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Zl_0x80A38190/func_80A38190.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Zl_0x80A38190/DmZl_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Zl_0x80A38190/DmZl_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Zl_0x80A38190/DmZl_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Zl_0x80A38190/DmZl_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Zl_0x80A38190/func_80A382FC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Zl_0x80A38190/func_80A382FC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Zl_0x80A38190/func_80A3830C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Zl_0x80A38190/func_80A3830C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Zl_0x80A38190/func_80A38468.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Zl_0x80A38190/func_80A38468.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Zl_0x80A38190/DmZl_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Zl_0x80A38190/DmZl_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Zl_0x80A38190/func_80A3862C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Zl_0x80A38190/func_80A3862C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Zl_0x80A38190/func_80A38648.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Zl_0x80A38190/func_80A38648.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Dm_Zl_0x80A38190/DmZl_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Dm_Zl_0x80A38190/DmZl_Draw.asm") 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 50aa8eac10..1f965d1955 100644 --- a/src/overlays/actors/ovl_Door_Ana/z_door_ana.c +++ b/src/overlays/actors/ovl_Door_Ana/z_door_ana.c @@ -23,18 +23,18 @@ const ActorInit Door_Ana_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Door_Ana_0x808E01A0/func_808E01A0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Door_Ana_0x808E01A0/func_808E01A0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Door_Ana_0x808E01A0/DoorAna_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Door_Ana_0x808E01A0/DoorAna_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Door_Ana_0x808E01A0/DoorAna_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Door_Ana_0x808E01A0/DoorAna_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Door_Ana_0x808E01A0/func_808E02A4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Door_Ana_0x808E01A0/func_808E02A4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Door_Ana_0x808E01A0/func_808E03B8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Door_Ana_0x808E01A0/func_808E03B8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Door_Ana_0x808E01A0/func_808E05C4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Door_Ana_0x808E01A0/func_808E05C4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Door_Ana_0x808E01A0/DoorAna_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Door_Ana_0x808E01A0/DoorAna_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Door_Ana_0x808E01A0/DoorAna_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Door_Ana_0x808E01A0/DoorAna_Draw.asm") 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 97a4778a42..93e0f457ea 100644 --- a/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c +++ b/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c @@ -22,52 +22,52 @@ const ActorInit Door_Shutter_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Door_Shutter_0x808A08F0/func_808A08F0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Door_Shutter_0x808A08F0/func_808A08F0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Door_Shutter_0x808A08F0/func_808A0900.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Door_Shutter_0x808A08F0/func_808A0900.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Door_Shutter_0x808A08F0/func_808A0974.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Door_Shutter_0x808A08F0/func_808A0974.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Door_Shutter_0x808A08F0/DoorShutter_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Door_Shutter_0x808A08F0/DoorShutter_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Door_Shutter_0x808A08F0/DoorShutter_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Door_Shutter_0x808A08F0/DoorShutter_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Door_Shutter_0x808A08F0/func_808A0D0C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Door_Shutter_0x808A08F0/func_808A0D0C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Door_Shutter_0x808A08F0/func_808A0D90.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Door_Shutter_0x808A08F0/func_808A0D90.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Door_Shutter_0x808A08F0/func_808A0E28.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Door_Shutter_0x808A08F0/func_808A0E28.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Door_Shutter_0x808A08F0/func_808A0F88.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Door_Shutter_0x808A08F0/func_808A0F88.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Door_Shutter_0x808A08F0/func_808A1080.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Door_Shutter_0x808A08F0/func_808A1080.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Door_Shutter_0x808A08F0/func_808A1090.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Door_Shutter_0x808A08F0/func_808A1090.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Door_Shutter_0x808A08F0/func_808A1288.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Door_Shutter_0x808A08F0/func_808A1288.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Door_Shutter_0x808A08F0/func_808A1340.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Door_Shutter_0x808A08F0/func_808A1340.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Door_Shutter_0x808A08F0/func_808A1478.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Door_Shutter_0x808A08F0/func_808A1478.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Door_Shutter_0x808A08F0/func_808A1548.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Door_Shutter_0x808A08F0/func_808A1548.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Door_Shutter_0x808A08F0/func_808A1618.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Door_Shutter_0x808A08F0/func_808A1618.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Door_Shutter_0x808A08F0/func_808A1684.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Door_Shutter_0x808A08F0/func_808A1684.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Door_Shutter_0x808A08F0/func_808A1784.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Door_Shutter_0x808A08F0/func_808A1784.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Door_Shutter_0x808A08F0/func_808A1884.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Door_Shutter_0x808A08F0/func_808A1884.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Door_Shutter_0x808A08F0/func_808A1A70.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Door_Shutter_0x808A08F0/func_808A1A70.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Door_Shutter_0x808A08F0/func_808A1B48.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Door_Shutter_0x808A08F0/func_808A1B48.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Door_Shutter_0x808A08F0/func_808A1C50.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Door_Shutter_0x808A08F0/func_808A1C50.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Door_Shutter_0x808A08F0/DoorShutter_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Door_Shutter_0x808A08F0/DoorShutter_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Door_Shutter_0x808A08F0/func_808A1D68.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Door_Shutter_0x808A08F0/func_808A1D68.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Door_Shutter_0x808A08F0/func_808A1E14.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Door_Shutter_0x808A08F0/func_808A1E14.asm") diff --git a/src/overlays/actors/ovl_Door_Spiral/z_door_spiral.c b/src/overlays/actors/ovl_Door_Spiral/z_door_spiral.c index 0e37a79925..6955aadddd 100644 --- a/src/overlays/actors/ovl_Door_Spiral/z_door_spiral.c +++ b/src/overlays/actors/ovl_Door_Spiral/z_door_spiral.c @@ -23,26 +23,26 @@ const ActorInit Door_Spiral_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Door_Spiral_0x809A2B60/func_809A2B60.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Door_Spiral_0x809A2B60/func_809A2B60.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Door_Spiral_0x809A2B60/func_809A2B70.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Door_Spiral_0x809A2B60/func_809A2B70.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Door_Spiral_0x809A2B60/func_809A2BF8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Door_Spiral_0x809A2B60/func_809A2BF8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Door_Spiral_0x809A2B60/DoorSpiral_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Door_Spiral_0x809A2B60/DoorSpiral_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Door_Spiral_0x809A2B60/DoorSpiral_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Door_Spiral_0x809A2B60/DoorSpiral_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Door_Spiral_0x809A2B60/func_809A2DB0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Door_Spiral_0x809A2B60/func_809A2DB0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Door_Spiral_0x809A2B60/func_809A2E08.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Door_Spiral_0x809A2B60/func_809A2E08.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Door_Spiral_0x809A2B60/func_809A2EA0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Door_Spiral_0x809A2B60/func_809A2EA0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Door_Spiral_0x809A2B60/func_809A2FF8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Door_Spiral_0x809A2B60/func_809A2FF8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Door_Spiral_0x809A2B60/func_809A3098.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Door_Spiral_0x809A2B60/func_809A3098.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Door_Spiral_0x809A2B60/DoorSpiral_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Door_Spiral_0x809A2B60/DoorSpiral_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Door_Spiral_0x809A2B60/DoorSpiral_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Door_Spiral_0x809A2B60/DoorSpiral_Draw.asm") 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 a18c73f1e2..6e76901565 100644 --- a/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c +++ b/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c @@ -23,84 +23,84 @@ const ActorInit Door_Warp1_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Door_Warp1_0x808B8490/func_808B8490.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Door_Warp1_0x808B8490/func_808B8490.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Door_Warp1_0x808B8490/func_808B849C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Door_Warp1_0x808B8490/func_808B849C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Door_Warp1_0x808B8490/func_808B8568.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Door_Warp1_0x808B8490/func_808B8568.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Door_Warp1_0x808B8490/func_808B866C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Door_Warp1_0x808B8490/func_808B866C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Door_Warp1_0x808B8490/DoorWarp1_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Door_Warp1_0x808B8490/DoorWarp1_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Door_Warp1_0x808B8490/DoorWarp1_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Door_Warp1_0x808B8490/DoorWarp1_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Door_Warp1_0x808B8490/func_808B8924.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Door_Warp1_0x808B8490/func_808B8924.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Door_Warp1_0x808B8490/func_808B8A7C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Door_Warp1_0x808B8490/func_808B8A7C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Door_Warp1_0x808B8490/func_808B8C48.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Door_Warp1_0x808B8490/func_808B8C48.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Door_Warp1_0x808B8490/func_808B8E78.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Door_Warp1_0x808B8490/func_808B8E78.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Door_Warp1_0x808B8490/func_808B900C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Door_Warp1_0x808B8490/func_808B900C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Door_Warp1_0x808B8490/func_808B9094.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Door_Warp1_0x808B8490/func_808B9094.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Door_Warp1_0x808B8490/func_808B90CC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Door_Warp1_0x808B8490/func_808B90CC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Door_Warp1_0x808B8490/func_808B921C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Door_Warp1_0x808B8490/func_808B921C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Door_Warp1_0x808B8490/func_808B93A0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Door_Warp1_0x808B8490/func_808B93A0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Door_Warp1_0x808B8490/func_808B94A4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Door_Warp1_0x808B8490/func_808B94A4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Door_Warp1_0x808B8490/func_808B9524.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Door_Warp1_0x808B8490/func_808B9524.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Door_Warp1_0x808B8490/func_808B958C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Door_Warp1_0x808B8490/func_808B958C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Door_Warp1_0x808B8490/func_808B96A0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Door_Warp1_0x808B8490/func_808B96A0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Door_Warp1_0x808B8490/func_808B96B0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Door_Warp1_0x808B8490/func_808B96B0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Door_Warp1_0x808B8490/func_808B977C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Door_Warp1_0x808B8490/func_808B977C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Door_Warp1_0x808B8490/func_808B9840.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Door_Warp1_0x808B8490/func_808B9840.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Door_Warp1_0x808B8490/func_808B98A8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Door_Warp1_0x808B8490/func_808B98A8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Door_Warp1_0x808B8490/func_808B9B30.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Door_Warp1_0x808B8490/func_808B9B30.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Door_Warp1_0x808B8490/func_808B9BE8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Door_Warp1_0x808B8490/func_808B9BE8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Door_Warp1_0x808B8490/func_808B9CE8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Door_Warp1_0x808B8490/func_808B9CE8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Door_Warp1_0x808B8490/func_808B9E94.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Door_Warp1_0x808B8490/func_808B9E94.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Door_Warp1_0x808B8490/func_808B9ED8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Door_Warp1_0x808B8490/func_808B9ED8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Door_Warp1_0x808B8490/func_808B9F10.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Door_Warp1_0x808B8490/func_808B9F10.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Door_Warp1_0x808B8490/func_808B9FD0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Door_Warp1_0x808B8490/func_808B9FD0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Door_Warp1_0x808B8490/func_808BA10C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Door_Warp1_0x808B8490/func_808BA10C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Door_Warp1_0x808B8490/func_808BA550.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Door_Warp1_0x808B8490/func_808BA550.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Door_Warp1_0x808B8490/func_808BAAF4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Door_Warp1_0x808B8490/func_808BAAF4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Door_Warp1_0x808B8490/func_808BABF4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Door_Warp1_0x808B8490/func_808BABF4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Door_Warp1_0x808B8490/DoorWarp1_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Door_Warp1_0x808B8490/DoorWarp1_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Door_Warp1_0x808B8490/func_808BACCC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Door_Warp1_0x808B8490/func_808BACCC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Door_Warp1_0x808B8490/func_808BAE9C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Door_Warp1_0x808B8490/func_808BAE9C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Door_Warp1_0x808B8490/func_808BB4C4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Door_Warp1_0x808B8490/func_808BB4C4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Door_Warp1_0x808B8490/func_808BB4F4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Door_Warp1_0x808B8490/func_808BB4F4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Door_Warp1_0x808B8490/DoorWarp1_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Door_Warp1_0x808B8490/DoorWarp1_Draw.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Door_Warp1_0x808B8490/func_808BB8D4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Door_Warp1_0x808B8490/func_808BB8D4.asm") diff --git a/src/overlays/actors/ovl_Eff_Change/z_eff_change.c b/src/overlays/actors/ovl_Eff_Change/z_eff_change.c index fab477714a..6ce589054a 100644 --- a/src/overlays/actors/ovl_Eff_Change/z_eff_change.c +++ b/src/overlays/actors/ovl_Eff_Change/z_eff_change.c @@ -22,14 +22,14 @@ const ActorInit Eff_Change_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Eff_Change_0x80A4C490/EffChange_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Eff_Change_0x80A4C490/EffChange_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Eff_Change_0x80A4C490/EffChange_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Eff_Change_0x80A4C490/EffChange_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Eff_Change_0x80A4C490/func_80A4C578.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Eff_Change_0x80A4C490/func_80A4C578.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Eff_Change_0x80A4C490/func_80A4C5CC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Eff_Change_0x80A4C490/func_80A4C5CC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Eff_Change_0x80A4C490/EffChange_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Eff_Change_0x80A4C490/EffChange_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Eff_Change_0x80A4C490/func_80A4C7B0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Eff_Change_0x80A4C490/func_80A4C7B0.asm") 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 32182e0203..1533a60b74 100644 --- a/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.c +++ b/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.c @@ -23,22 +23,22 @@ const ActorInit Eff_Dust_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Eff_Dust_0x80918B40/func_80918B40.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Eff_Dust_0x80918B40/func_80918B40.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Eff_Dust_0x80918B40/EffDust_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Eff_Dust_0x80918B40/EffDust_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Eff_Dust_0x80918B40/EffDust_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Eff_Dust_0x80918B40/EffDust_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Eff_Dust_0x80918B40/func_80918D64.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Eff_Dust_0x80918B40/func_80918D64.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Eff_Dust_0x80918B40/func_80918FE4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Eff_Dust_0x80918B40/func_80918FE4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Eff_Dust_0x80918B40/func_80919230.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Eff_Dust_0x80918B40/func_80919230.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Eff_Dust_0x80918B40/EffDust_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Eff_Dust_0x80918B40/EffDust_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Eff_Dust_0x80918B40/func_80919768.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Eff_Dust_0x80918B40/func_80919768.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Eff_Dust_0x80918B40/func_809199FC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Eff_Dust_0x80918B40/func_809199FC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Eff_Dust_0x80918B40/EffDust_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Eff_Dust_0x80918B40/EffDust_Draw.asm") diff --git a/src/overlays/actors/ovl_Eff_Kamejima_Wave/z_eff_kamejima_wave.c b/src/overlays/actors/ovl_Eff_Kamejima_Wave/z_eff_kamejima_wave.c index a1d418ef1a..af9332ecf8 100644 --- a/src/overlays/actors/ovl_Eff_Kamejima_Wave/z_eff_kamejima_wave.c +++ b/src/overlays/actors/ovl_Eff_Kamejima_Wave/z_eff_kamejima_wave.c @@ -22,20 +22,20 @@ const ActorInit Eff_Kamejima_Wave_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Eff_Kamejima_Wave_0x80BCEB20/EffKamejimaWave_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Eff_Kamejima_Wave_0x80BCEB20/EffKamejimaWave_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Eff_Kamejima_Wave_0x80BCEB20/EffKamejimaWave_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Eff_Kamejima_Wave_0x80BCEB20/EffKamejimaWave_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Eff_Kamejima_Wave_0x80BCEB20/func_80BCEBC0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Eff_Kamejima_Wave_0x80BCEB20/func_80BCEBC0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Eff_Kamejima_Wave_0x80BCEB20/func_80BCEC6C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Eff_Kamejima_Wave_0x80BCEB20/func_80BCEC6C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Eff_Kamejima_Wave_0x80BCEB20/func_80BCED34.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Eff_Kamejima_Wave_0x80BCEB20/func_80BCED34.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Eff_Kamejima_Wave_0x80BCEB20/func_80BCEDE0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Eff_Kamejima_Wave_0x80BCEB20/func_80BCEDE0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Eff_Kamejima_Wave_0x80BCEB20/EffKamejimaWave_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Eff_Kamejima_Wave_0x80BCEB20/EffKamejimaWave_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Eff_Kamejima_Wave_0x80BCEB20/func_80BCEEBC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Eff_Kamejima_Wave_0x80BCEB20/func_80BCEEBC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Eff_Kamejima_Wave_0x80BCEB20/func_80BCEF0C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Eff_Kamejima_Wave_0x80BCEB20/func_80BCEF0C.asm") diff --git a/src/overlays/actors/ovl_Eff_Lastday/z_eff_lastday.c b/src/overlays/actors/ovl_Eff_Lastday/z_eff_lastday.c index 1f757d4513..2b78d16bdc 100644 --- a/src/overlays/actors/ovl_Eff_Lastday/z_eff_lastday.c +++ b/src/overlays/actors/ovl_Eff_Lastday/z_eff_lastday.c @@ -23,20 +23,20 @@ const ActorInit Eff_Lastday_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Eff_Lastday_0x80BEBAC0/EffLastday_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Eff_Lastday_0x80BEBAC0/EffLastday_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Eff_Lastday_0x80BEBAC0/EffLastday_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Eff_Lastday_0x80BEBAC0/EffLastday_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Eff_Lastday_0x80BEBAC0/func_80BEBD0C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Eff_Lastday_0x80BEBAC0/func_80BEBD0C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Eff_Lastday_0x80BEBAC0/func_80BEBDF8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Eff_Lastday_0x80BEBAC0/func_80BEBDF8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Eff_Lastday_0x80BEBAC0/func_80BEBEB8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Eff_Lastday_0x80BEBAC0/func_80BEBEB8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Eff_Lastday_0x80BEBAC0/func_80BEBF78.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Eff_Lastday_0x80BEBAC0/func_80BEBF78.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Eff_Lastday_0x80BEBAC0/EffLastday_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Eff_Lastday_0x80BEBAC0/EffLastday_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Eff_Lastday_0x80BEBAC0/func_80BEC0A4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Eff_Lastday_0x80BEBAC0/func_80BEC0A4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Eff_Lastday_0x80BEBAC0/EffLastday_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Eff_Lastday_0x80BEBAC0/EffLastday_Draw.asm") diff --git a/src/overlays/actors/ovl_Eff_Stk/z_eff_stk.c b/src/overlays/actors/ovl_Eff_Stk/z_eff_stk.c index 0ea1f07807..8504bc2945 100644 --- a/src/overlays/actors/ovl_Eff_Stk/z_eff_stk.c +++ b/src/overlays/actors/ovl_Eff_Stk/z_eff_stk.c @@ -23,12 +23,12 @@ const ActorInit Eff_Stk_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Eff_Stk_0x80BF0D90/EffStk_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Eff_Stk_0x80BF0D90/EffStk_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Eff_Stk_0x80BF0D90/EffStk_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Eff_Stk_0x80BF0D90/EffStk_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Eff_Stk_0x80BF0D90/func_80BF0DE0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Eff_Stk_0x80BF0D90/func_80BF0DE0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Eff_Stk_0x80BF0D90/EffStk_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Eff_Stk_0x80BF0D90/EffStk_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Eff_Stk_0x80BF0D90/EffStk_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Eff_Stk_0x80BF0D90/EffStk_Draw.asm") diff --git a/src/overlays/actors/ovl_Eff_Zoraband/z_eff_zoraband.c b/src/overlays/actors/ovl_Eff_Zoraband/z_eff_zoraband.c index 0d3dfa8588..96e2eab708 100644 --- a/src/overlays/actors/ovl_Eff_Zoraband/z_eff_zoraband.c +++ b/src/overlays/actors/ovl_Eff_Zoraband/z_eff_zoraband.c @@ -23,12 +23,12 @@ const ActorInit Eff_Zoraband_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Eff_Zoraband_0x80C07740/EffZoraband_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Eff_Zoraband_0x80C07740/EffZoraband_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Eff_Zoraband_0x80C07740/EffZoraband_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Eff_Zoraband_0x80C07740/EffZoraband_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Eff_Zoraband_0x80C07740/func_80C07790.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Eff_Zoraband_0x80C07740/func_80C07790.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Eff_Zoraband_0x80C07740/EffZoraband_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Eff_Zoraband_0x80C07740/EffZoraband_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Eff_Zoraband_0x80C07740/EffZoraband_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Eff_Zoraband_0x80C07740/EffZoraband_Draw.asm") 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 d77f7b694e..8e5107c25d 100644 --- a/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.c +++ b/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.c @@ -22,18 +22,18 @@ const ActorInit Elf_Msg_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Elf_Msg_0x8092DF90/func_8092DF90.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Elf_Msg_0x8092DF90/func_8092DF90.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Elf_Msg_0x8092DF90/func_8092DF9C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Elf_Msg_0x8092DF90/func_8092DF9C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Elf_Msg_0x8092DF90/ElfMsg_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Elf_Msg_0x8092DF90/ElfMsg_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Elf_Msg_0x8092DF90/ElfMsg_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Elf_Msg_0x8092DF90/ElfMsg_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Elf_Msg_0x8092DF90/func_8092E1D0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Elf_Msg_0x8092DF90/func_8092E1D0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Elf_Msg_0x8092DF90/func_8092E1FC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Elf_Msg_0x8092DF90/func_8092E1FC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Elf_Msg_0x8092DF90/func_8092E284.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Elf_Msg_0x8092DF90/func_8092E284.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Elf_Msg_0x8092DF90/ElfMsg_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Elf_Msg_0x8092DF90/ElfMsg_Update.asm") 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 ed2d6744c5..70a7964594 100644 --- a/src/overlays/actors/ovl_Elf_Msg2/z_elf_msg2.c +++ b/src/overlays/actors/ovl_Elf_Msg2/z_elf_msg2.c @@ -22,20 +22,20 @@ const ActorInit Elf_Msg2_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Elf_Msg2_0x8096EC40/func_8096EC40.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Elf_Msg2_0x8096EC40/func_8096EC40.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Elf_Msg2_0x8096EC40/func_8096EC4C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Elf_Msg2_0x8096EC40/func_8096EC4C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Elf_Msg2_0x8096EC40/ElfMsg2_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Elf_Msg2_0x8096EC40/ElfMsg2_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Elf_Msg2_0x8096EC40/ElfMsg2_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Elf_Msg2_0x8096EC40/ElfMsg2_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Elf_Msg2_0x8096EC40/func_8096EE50.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Elf_Msg2_0x8096EC40/func_8096EE50.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Elf_Msg2_0x8096EC40/func_8096EE64.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Elf_Msg2_0x8096EC40/func_8096EE64.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Elf_Msg2_0x8096EC40/func_8096EF98.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Elf_Msg2_0x8096EC40/func_8096EF98.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Elf_Msg2_0x8096EC40/func_8096EFD0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Elf_Msg2_0x8096EC40/func_8096EFD0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Elf_Msg2_0x8096EC40/ElfMsg2_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Elf_Msg2_0x8096EC40/ElfMsg2_Update.asm") diff --git a/src/overlays/actors/ovl_Elf_Msg3/z_elf_msg3.c b/src/overlays/actors/ovl_Elf_Msg3/z_elf_msg3.c index 4a67e371d2..f5b8ae75eb 100644 --- a/src/overlays/actors/ovl_Elf_Msg3/z_elf_msg3.c +++ b/src/overlays/actors/ovl_Elf_Msg3/z_elf_msg3.c @@ -22,16 +22,16 @@ const ActorInit Elf_Msg3_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Elf_Msg3_0x80A2CD10/func_80A2CD10.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Elf_Msg3_0x80A2CD10/func_80A2CD10.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Elf_Msg3_0x80A2CD10/func_80A2CD1C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Elf_Msg3_0x80A2CD10/func_80A2CD1C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Elf_Msg3_0x80A2CD10/ElfMsg3_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Elf_Msg3_0x80A2CD10/ElfMsg3_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Elf_Msg3_0x80A2CD10/ElfMsg3_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Elf_Msg3_0x80A2CD10/ElfMsg3_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Elf_Msg3_0x80A2CD10/func_80A2CF50.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Elf_Msg3_0x80A2CD10/func_80A2CF50.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Elf_Msg3_0x80A2CD10/func_80A2CF7C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Elf_Msg3_0x80A2CD10/func_80A2CF7C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Elf_Msg3_0x80A2CD10/ElfMsg3_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Elf_Msg3_0x80A2CD10/ElfMsg3_Update.asm") diff --git a/src/overlays/actors/ovl_Elf_Msg4/z_elf_msg4.c b/src/overlays/actors/ovl_Elf_Msg4/z_elf_msg4.c index 42ab820182..b9d9cdccef 100644 --- a/src/overlays/actors/ovl_Elf_Msg4/z_elf_msg4.c +++ b/src/overlays/actors/ovl_Elf_Msg4/z_elf_msg4.c @@ -22,18 +22,18 @@ const ActorInit Elf_Msg4_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Elf_Msg4_0x80AFD380/func_80AFD380.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Elf_Msg4_0x80AFD380/func_80AFD380.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Elf_Msg4_0x80AFD380/ElfMsg4_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Elf_Msg4_0x80AFD380/ElfMsg4_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Elf_Msg4_0x80AFD380/ElfMsg4_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Elf_Msg4_0x80AFD380/ElfMsg4_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Elf_Msg4_0x80AFD380/func_80AFD5B4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Elf_Msg4_0x80AFD380/func_80AFD5B4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Elf_Msg4_0x80AFD380/func_80AFD5E0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Elf_Msg4_0x80AFD380/func_80AFD5E0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Elf_Msg4_0x80AFD380/func_80AFD668.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Elf_Msg4_0x80AFD380/func_80AFD668.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Elf_Msg4_0x80AFD380/func_80AFD770.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Elf_Msg4_0x80AFD380/func_80AFD770.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Elf_Msg4_0x80AFD380/ElfMsg4_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Elf_Msg4_0x80AFD380/ElfMsg4_Update.asm") diff --git a/src/overlays/actors/ovl_Elf_Msg5/z_elf_msg5.c b/src/overlays/actors/ovl_Elf_Msg5/z_elf_msg5.c index bf0cffbeca..56ef84899f 100644 --- a/src/overlays/actors/ovl_Elf_Msg5/z_elf_msg5.c +++ b/src/overlays/actors/ovl_Elf_Msg5/z_elf_msg5.c @@ -22,12 +22,12 @@ const ActorInit Elf_Msg5_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Elf_Msg5_0x80AFD990/func_80AFD990.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Elf_Msg5_0x80AFD990/func_80AFD990.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Elf_Msg5_0x80AFD990/ElfMsg5_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Elf_Msg5_0x80AFD990/ElfMsg5_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Elf_Msg5_0x80AFD990/ElfMsg5_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Elf_Msg5_0x80AFD990/ElfMsg5_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Elf_Msg5_0x80AFD990/func_80AFDB38.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Elf_Msg5_0x80AFD990/func_80AFDB38.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Elf_Msg5_0x80AFD990/ElfMsg5_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Elf_Msg5_0x80AFD990/ElfMsg5_Update.asm") diff --git a/src/overlays/actors/ovl_Elf_Msg6/z_elf_msg6.c b/src/overlays/actors/ovl_Elf_Msg6/z_elf_msg6.c index 60fd51ba4b..d00ca80ca3 100644 --- a/src/overlays/actors/ovl_Elf_Msg6/z_elf_msg6.c +++ b/src/overlays/actors/ovl_Elf_Msg6/z_elf_msg6.c @@ -22,32 +22,32 @@ const ActorInit Elf_Msg6_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Elf_Msg6_0x80BA15A0/func_80BA15A0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Elf_Msg6_0x80BA15A0/func_80BA15A0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Elf_Msg6_0x80BA15A0/func_80BA165C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Elf_Msg6_0x80BA15A0/func_80BA165C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Elf_Msg6_0x80BA15A0/func_80BA16F4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Elf_Msg6_0x80BA15A0/func_80BA16F4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Elf_Msg6_0x80BA15A0/ElfMsg6_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Elf_Msg6_0x80BA15A0/ElfMsg6_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Elf_Msg6_0x80BA15A0/ElfMsg6_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Elf_Msg6_0x80BA15A0/ElfMsg6_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Elf_Msg6_0x80BA15A0/func_80BA1C00.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Elf_Msg6_0x80BA15A0/func_80BA1C00.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Elf_Msg6_0x80BA15A0/func_80BA1C88.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Elf_Msg6_0x80BA15A0/func_80BA1C88.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Elf_Msg6_0x80BA15A0/func_80BA1CF8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Elf_Msg6_0x80BA15A0/func_80BA1CF8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Elf_Msg6_0x80BA15A0/func_80BA1E30.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Elf_Msg6_0x80BA15A0/func_80BA1E30.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Elf_Msg6_0x80BA15A0/func_80BA1F80.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Elf_Msg6_0x80BA15A0/func_80BA1F80.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Elf_Msg6_0x80BA15A0/func_80BA2038.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Elf_Msg6_0x80BA15A0/func_80BA2038.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Elf_Msg6_0x80BA15A0/func_80BA2048.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Elf_Msg6_0x80BA15A0/func_80BA2048.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Elf_Msg6_0x80BA15A0/func_80BA215C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Elf_Msg6_0x80BA15A0/func_80BA215C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Elf_Msg6_0x80BA15A0/func_80BA21C4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Elf_Msg6_0x80BA15A0/func_80BA21C4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Elf_Msg6_0x80BA15A0/ElfMsg6_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Elf_Msg6_0x80BA15A0/ElfMsg6_Update.asm") diff --git a/src/overlays/actors/ovl_En_Ah/z_en_ah.c b/src/overlays/actors/ovl_En_Ah/z_en_ah.c index 6938df3280..dbc91b08e3 100644 --- a/src/overlays/actors/ovl_En_Ah/z_en_ah.c +++ b/src/overlays/actors/ovl_En_Ah/z_en_ah.c @@ -23,58 +23,58 @@ const ActorInit En_Ah_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ah_0x80BD2A30/func_80BD2A30.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ah_0x80BD2A30/func_80BD2A30.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ah_0x80BD2A30/func_80BD2AE0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ah_0x80BD2A30/func_80BD2AE0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ah_0x80BD2A30/func_80BD2B0C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ah_0x80BD2A30/func_80BD2B0C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ah_0x80BD2A30/func_80BD2BA4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ah_0x80BD2A30/func_80BD2BA4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ah_0x80BD2A30/func_80BD2BE8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ah_0x80BD2A30/func_80BD2BE8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ah_0x80BD2A30/func_80BD2C6C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ah_0x80BD2A30/func_80BD2C6C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ah_0x80BD2A30/func_80BD2DA0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ah_0x80BD2A30/func_80BD2DA0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ah_0x80BD2A30/func_80BD2DC8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ah_0x80BD2A30/func_80BD2DC8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ah_0x80BD2A30/func_80BD2FD0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ah_0x80BD2A30/func_80BD2FD0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ah_0x80BD2A30/func_80BD30C0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ah_0x80BD2A30/func_80BD30C0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ah_0x80BD2A30/func_80BD3118.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ah_0x80BD2A30/func_80BD3118.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ah_0x80BD2A30/func_80BD3198.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ah_0x80BD2A30/func_80BD3198.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ah_0x80BD2A30/func_80BD3294.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ah_0x80BD2A30/func_80BD3294.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ah_0x80BD2A30/func_80BD3320.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ah_0x80BD2A30/func_80BD3320.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ah_0x80BD2A30/func_80BD3374.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ah_0x80BD2A30/func_80BD3374.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ah_0x80BD2A30/func_80BD33FC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ah_0x80BD2A30/func_80BD33FC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ah_0x80BD2A30/func_80BD3484.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ah_0x80BD2A30/func_80BD3484.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ah_0x80BD2A30/func_80BD3548.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ah_0x80BD2A30/func_80BD3548.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ah_0x80BD2A30/func_80BD35BC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ah_0x80BD2A30/func_80BD35BC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ah_0x80BD2A30/func_80BD3658.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ah_0x80BD2A30/func_80BD3658.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ah_0x80BD2A30/func_80BD36B8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ah_0x80BD2A30/func_80BD36B8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ah_0x80BD2A30/func_80BD3768.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ah_0x80BD2A30/func_80BD3768.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ah_0x80BD2A30/EnAh_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ah_0x80BD2A30/EnAh_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ah_0x80BD2A30/EnAh_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ah_0x80BD2A30/EnAh_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ah_0x80BD2A30/EnAh_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ah_0x80BD2A30/EnAh_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ah_0x80BD2A30/func_80BD3AA8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ah_0x80BD2A30/func_80BD3AA8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ah_0x80BD2A30/func_80BD3AF8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ah_0x80BD2A30/func_80BD3AF8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ah_0x80BD2A30/EnAh_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ah_0x80BD2A30/EnAh_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Akindonuts/z_en_akindonuts.c b/src/overlays/actors/ovl_En_Akindonuts/z_en_akindonuts.c index c7c4760647..8b2c3b20a4 100644 --- a/src/overlays/actors/ovl_En_Akindonuts/z_en_akindonuts.c +++ b/src/overlays/actors/ovl_En_Akindonuts/z_en_akindonuts.c @@ -23,92 +23,92 @@ const ActorInit En_Akindonuts_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Akindonuts_0x80BECBE0/func_80BECBE0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Akindonuts_0x80BECBE0/func_80BECBE0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Akindonuts_0x80BECBE0/func_80BECC7C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Akindonuts_0x80BECBE0/func_80BECC7C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Akindonuts_0x80BECBE0/func_80BECD10.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Akindonuts_0x80BECBE0/func_80BECD10.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Akindonuts_0x80BECBE0/func_80BECEAC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Akindonuts_0x80BECBE0/func_80BECEAC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Akindonuts_0x80BECBE0/func_80BECF6C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Akindonuts_0x80BECBE0/func_80BECF6C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Akindonuts_0x80BECBE0/func_80BECFBC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Akindonuts_0x80BECBE0/func_80BECFBC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Akindonuts_0x80BECBE0/func_80BED034.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Akindonuts_0x80BECBE0/func_80BED034.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Akindonuts_0x80BECBE0/func_80BED090.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Akindonuts_0x80BECBE0/func_80BED090.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Akindonuts_0x80BECBE0/func_80BED140.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Akindonuts_0x80BECBE0/func_80BED140.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Akindonuts_0x80BECBE0/func_80BED208.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Akindonuts_0x80BECBE0/func_80BED208.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Akindonuts_0x80BECBE0/func_80BED27C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Akindonuts_0x80BECBE0/func_80BED27C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Akindonuts_0x80BECBE0/func_80BED2FC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Akindonuts_0x80BECBE0/func_80BED2FC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Akindonuts_0x80BECBE0/func_80BED35C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Akindonuts_0x80BECBE0/func_80BED35C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Akindonuts_0x80BECBE0/func_80BED3BC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Akindonuts_0x80BECBE0/func_80BED3BC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Akindonuts_0x80BECBE0/func_80BED680.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Akindonuts_0x80BECBE0/func_80BED680.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Akindonuts_0x80BECBE0/func_80BED8A4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Akindonuts_0x80BECBE0/func_80BED8A4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Akindonuts_0x80BECBE0/func_80BEDB88.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Akindonuts_0x80BECBE0/func_80BEDB88.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Akindonuts_0x80BECBE0/func_80BEDDAC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Akindonuts_0x80BECBE0/func_80BEDDAC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Akindonuts_0x80BECBE0/func_80BEE070.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Akindonuts_0x80BECBE0/func_80BEE070.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Akindonuts_0x80BECBE0/func_80BEE274.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Akindonuts_0x80BECBE0/func_80BEE274.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Akindonuts_0x80BECBE0/func_80BEE530.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Akindonuts_0x80BECBE0/func_80BEE530.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Akindonuts_0x80BECBE0/func_80BEE73C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Akindonuts_0x80BECBE0/func_80BEE73C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Akindonuts_0x80BECBE0/func_80BEE938.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Akindonuts_0x80BECBE0/func_80BEE938.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Akindonuts_0x80BECBE0/func_80BEEB20.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Akindonuts_0x80BECBE0/func_80BEEB20.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Akindonuts_0x80BECBE0/func_80BEEDC0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Akindonuts_0x80BECBE0/func_80BEEDC0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Akindonuts_0x80BECBE0/func_80BEEE10.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Akindonuts_0x80BECBE0/func_80BEEE10.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Akindonuts_0x80BECBE0/func_80BEEFA8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Akindonuts_0x80BECBE0/func_80BEEFA8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Akindonuts_0x80BECBE0/func_80BEF18C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Akindonuts_0x80BECBE0/func_80BEF18C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Akindonuts_0x80BECBE0/func_80BEF20C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Akindonuts_0x80BECBE0/func_80BEF20C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Akindonuts_0x80BECBE0/func_80BEF360.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Akindonuts_0x80BECBE0/func_80BEF360.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Akindonuts_0x80BECBE0/func_80BEF450.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Akindonuts_0x80BECBE0/func_80BEF450.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Akindonuts_0x80BECBE0/func_80BEF4B8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Akindonuts_0x80BECBE0/func_80BEF4B8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Akindonuts_0x80BECBE0/func_80BEF518.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Akindonuts_0x80BECBE0/func_80BEF518.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Akindonuts_0x80BECBE0/func_80BEF770.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Akindonuts_0x80BECBE0/func_80BEF770.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Akindonuts_0x80BECBE0/func_80BEF83C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Akindonuts_0x80BECBE0/func_80BEF83C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Akindonuts_0x80BECBE0/func_80BEF9F0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Akindonuts_0x80BECBE0/func_80BEF9F0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Akindonuts_0x80BECBE0/func_80BEFAF0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Akindonuts_0x80BECBE0/func_80BEFAF0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Akindonuts_0x80BECBE0/func_80BEFD74.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Akindonuts_0x80BECBE0/func_80BEFD74.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Akindonuts_0x80BECBE0/EnAkindonuts_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Akindonuts_0x80BECBE0/EnAkindonuts_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Akindonuts_0x80BECBE0/EnAkindonuts_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Akindonuts_0x80BECBE0/EnAkindonuts_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Akindonuts_0x80BECBE0/EnAkindonuts_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Akindonuts_0x80BECBE0/EnAkindonuts_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Akindonuts_0x80BECBE0/func_80BEFFB4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Akindonuts_0x80BECBE0/func_80BEFFB4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Akindonuts_0x80BECBE0/func_80BF0178.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Akindonuts_0x80BECBE0/func_80BF0178.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Akindonuts_0x80BECBE0/func_80BF0190.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Akindonuts_0x80BECBE0/func_80BF0190.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Akindonuts_0x80BECBE0/EnAkindonuts_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Akindonuts_0x80BECBE0/EnAkindonuts_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Al/z_en_al.c b/src/overlays/actors/ovl_En_Al/z_en_al.c index 0f6637f4d8..6cc44e9ab4 100644 --- a/src/overlays/actors/ovl_En_Al/z_en_al.c +++ b/src/overlays/actors/ovl_En_Al/z_en_al.c @@ -23,70 +23,70 @@ const ActorInit En_Al_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Al_0x80BDE1A0/func_80BDE1A0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Al_0x80BDE1A0/func_80BDE1A0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Al_0x80BDE1A0/func_80BDE250.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Al_0x80BDE1A0/func_80BDE250.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Al_0x80BDE1A0/func_80BDE27C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Al_0x80BDE1A0/func_80BDE27C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Al_0x80BDE1A0/func_80BDE318.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Al_0x80BDE1A0/func_80BDE318.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Al_0x80BDE1A0/func_80BDE384.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Al_0x80BDE1A0/func_80BDE384.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Al_0x80BDE1A0/func_80BDE408.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Al_0x80BDE1A0/func_80BDE408.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Al_0x80BDE1A0/func_80BDE484.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Al_0x80BDE1A0/func_80BDE484.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Al_0x80BDE1A0/func_80BDE4E0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Al_0x80BDE1A0/func_80BDE4E0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Al_0x80BDE1A0/func_80BDE678.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Al_0x80BDE1A0/func_80BDE678.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Al_0x80BDE1A0/func_80BDE7FC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Al_0x80BDE1A0/func_80BDE7FC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Al_0x80BDE1A0/func_80BDE92C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Al_0x80BDE1A0/func_80BDE92C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Al_0x80BDE1A0/func_80BDEA14.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Al_0x80BDE1A0/func_80BDEA14.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Al_0x80BDE1A0/func_80BDEABC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Al_0x80BDE1A0/func_80BDEABC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Al_0x80BDE1A0/func_80BDEC2C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Al_0x80BDE1A0/func_80BDEC2C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Al_0x80BDE1A0/func_80BDED20.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Al_0x80BDE1A0/func_80BDED20.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Al_0x80BDE1A0/func_80BDEE5C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Al_0x80BDE1A0/func_80BDEE5C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Al_0x80BDE1A0/func_80BDEF3C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Al_0x80BDE1A0/func_80BDEF3C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Al_0x80BDE1A0/func_80BDEFE4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Al_0x80BDE1A0/func_80BDEFE4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Al_0x80BDE1A0/func_80BDF064.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Al_0x80BDE1A0/func_80BDF064.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Al_0x80BDE1A0/func_80BDF244.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Al_0x80BDE1A0/func_80BDF244.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Al_0x80BDE1A0/func_80BDF308.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Al_0x80BDE1A0/func_80BDF308.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Al_0x80BDE1A0/func_80BDF390.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Al_0x80BDE1A0/func_80BDF390.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Al_0x80BDE1A0/func_80BDF414.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Al_0x80BDE1A0/func_80BDF414.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Al_0x80BDE1A0/func_80BDF568.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Al_0x80BDE1A0/func_80BDF568.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Al_0x80BDE1A0/func_80BDF578.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Al_0x80BDE1A0/func_80BDF578.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Al_0x80BDE1A0/func_80BDF5E8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Al_0x80BDE1A0/func_80BDF5E8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Al_0x80BDE1A0/func_80BDF6C4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Al_0x80BDE1A0/func_80BDF6C4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Al_0x80BDE1A0/EnAl_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Al_0x80BDE1A0/EnAl_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Al_0x80BDE1A0/EnAl_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Al_0x80BDE1A0/EnAl_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Al_0x80BDE1A0/EnAl_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Al_0x80BDE1A0/EnAl_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Al_0x80BDE1A0/func_80BDF914.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Al_0x80BDE1A0/func_80BDF914.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Al_0x80BDE1A0/func_80BDF950.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Al_0x80BDE1A0/func_80BDF950.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Al_0x80BDE1A0/func_80BDFA34.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Al_0x80BDE1A0/func_80BDFA34.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Al_0x80BDE1A0/EnAl_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Al_0x80BDE1A0/EnAl_Draw.asm") 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 0a3e4031c9..acda64d4e7 100644 --- a/src/overlays/actors/ovl_En_Am/z_en_am.c +++ b/src/overlays/actors/ovl_En_Am/z_en_am.c @@ -23,58 +23,58 @@ const ActorInit En_Am_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Am_0x808AFCD0/EnAm_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Am_0x808AFCD0/EnAm_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Am_0x808AFCD0/EnAm_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Am_0x808AFCD0/EnAm_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Am_0x808AFCD0/func_808AFE38.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Am_0x808AFCD0/func_808AFE38.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Am_0x808AFCD0/func_808AFF9C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Am_0x808AFCD0/func_808AFF9C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Am_0x808AFCD0/func_808B0040.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Am_0x808AFCD0/func_808B0040.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Am_0x808AFCD0/func_808B00D8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Am_0x808AFCD0/func_808B00D8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Am_0x808AFCD0/func_808B0124.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Am_0x808AFCD0/func_808B0124.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Am_0x808AFCD0/func_808B0208.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Am_0x808AFCD0/func_808B0208.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Am_0x808AFCD0/func_808B0358.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Am_0x808AFCD0/func_808B0358.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Am_0x808AFCD0/func_808B03C0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Am_0x808AFCD0/func_808B03C0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Am_0x808AFCD0/func_808B0460.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Am_0x808AFCD0/func_808B0460.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Am_0x808AFCD0/func_808B04A8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Am_0x808AFCD0/func_808B04A8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Am_0x808AFCD0/func_808B04E4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Am_0x808AFCD0/func_808B04E4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Am_0x808AFCD0/func_808B0508.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Am_0x808AFCD0/func_808B0508.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Am_0x808AFCD0/func_808B057C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Am_0x808AFCD0/func_808B057C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Am_0x808AFCD0/func_808B05C8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Am_0x808AFCD0/func_808B05C8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Am_0x808AFCD0/func_808B0640.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Am_0x808AFCD0/func_808B0640.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Am_0x808AFCD0/func_808B066C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Am_0x808AFCD0/func_808B066C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Am_0x808AFCD0/func_808B06D0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Am_0x808AFCD0/func_808B06D0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Am_0x808AFCD0/func_808B07A8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Am_0x808AFCD0/func_808B07A8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Am_0x808AFCD0/func_808B0820.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Am_0x808AFCD0/func_808B0820.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Am_0x808AFCD0/func_808B0894.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Am_0x808AFCD0/func_808B0894.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Am_0x808AFCD0/func_808B0AD0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Am_0x808AFCD0/func_808B0AD0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Am_0x808AFCD0/func_808B0B4C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Am_0x808AFCD0/func_808B0B4C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Am_0x808AFCD0/func_808B0B9C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Am_0x808AFCD0/func_808B0B9C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Am_0x808AFCD0/EnAm_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Am_0x808AFCD0/EnAm_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Am_0x808AFCD0/func_808B0EA4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Am_0x808AFCD0/func_808B0EA4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Am_0x808AFCD0/EnAm_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Am_0x808AFCD0/EnAm_Draw.asm") diff --git a/src/overlays/actors/ovl_En_An/z_en_an.c b/src/overlays/actors/ovl_En_An/z_en_an.c index cf0e890cef..8d706f898d 100644 --- a/src/overlays/actors/ovl_En_An/z_en_an.c +++ b/src/overlays/actors/ovl_En_An/z_en_an.c @@ -22,124 +22,124 @@ const ActorInit En_An_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_An_0x80B53840/func_80B53840.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_An_0x80B53840/func_80B53840.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_An_0x80B53840/func_80B539CC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_An_0x80B53840/func_80B539CC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_An_0x80B53840/func_80B53A7C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_An_0x80B53840/func_80B53A7C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_An_0x80B53840/func_80B53B3C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_An_0x80B53840/func_80B53B3C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_An_0x80B53840/func_80B53BA8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_An_0x80B53840/func_80B53BA8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_An_0x80B53840/func_80B53CE8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_An_0x80B53840/func_80B53CE8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_An_0x80B53840/func_80B53ED4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_An_0x80B53840/func_80B53ED4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_An_0x80B53840/func_80B53F84.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_An_0x80B53840/func_80B53F84.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_An_0x80B53840/func_80B54124.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_An_0x80B53840/func_80B54124.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_An_0x80B53840/func_80B54678.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_An_0x80B53840/func_80B54678.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_An_0x80B53840/func_80B546F4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_An_0x80B53840/func_80B546F4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_An_0x80B53840/func_80B54750.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_An_0x80B53840/func_80B54750.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_An_0x80B53840/func_80B547C8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_An_0x80B53840/func_80B547C8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_An_0x80B53840/func_80B5492C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_An_0x80B53840/func_80B5492C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_An_0x80B53840/func_80B54A94.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_An_0x80B53840/func_80B54A94.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_An_0x80B53840/func_80B54BC4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_An_0x80B53840/func_80B54BC4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_An_0x80B53840/func_80B54C5C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_An_0x80B53840/func_80B54C5C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_An_0x80B53840/func_80B54D18.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_An_0x80B53840/func_80B54D18.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_An_0x80B53840/func_80B54DF4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_An_0x80B53840/func_80B54DF4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_An_0x80B53840/func_80B55180.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_An_0x80B53840/func_80B55180.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_An_0x80B53840/func_80B552E4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_An_0x80B53840/func_80B552E4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_An_0x80B53840/func_80B553AC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_An_0x80B53840/func_80B553AC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_An_0x80B53840/func_80B554E8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_An_0x80B53840/func_80B554E8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_An_0x80B53840/func_80B555C8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_An_0x80B53840/func_80B555C8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_An_0x80B53840/func_80B556F8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_An_0x80B53840/func_80B556F8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_An_0x80B53840/func_80B557AC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_An_0x80B53840/func_80B557AC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_An_0x80B53840/func_80B55860.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_An_0x80B53840/func_80B55860.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_An_0x80B53840/func_80B55914.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_An_0x80B53840/func_80B55914.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_An_0x80B53840/func_80B55D20.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_An_0x80B53840/func_80B55D20.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_An_0x80B53840/func_80B55D98.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_An_0x80B53840/func_80B55D98.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_An_0x80B53840/func_80B55ECC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_An_0x80B53840/func_80B55ECC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_An_0x80B53840/func_80B55F8C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_An_0x80B53840/func_80B55F8C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_An_0x80B53840/func_80B5600C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_An_0x80B53840/func_80B5600C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_An_0x80B53840/func_80B56094.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_An_0x80B53840/func_80B56094.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_An_0x80B53840/func_80B5611C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_An_0x80B53840/func_80B5611C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_An_0x80B53840/func_80B561A4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_An_0x80B53840/func_80B561A4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_An_0x80B53840/func_80B56418.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_An_0x80B53840/func_80B56418.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_An_0x80B53840/func_80B56744.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_An_0x80B53840/func_80B56744.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_An_0x80B53840/func_80B56880.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_An_0x80B53840/func_80B56880.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_An_0x80B53840/func_80B56B00.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_An_0x80B53840/func_80B56B00.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_An_0x80B53840/func_80B56BC0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_An_0x80B53840/func_80B56BC0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_An_0x80B53840/func_80B56CAC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_An_0x80B53840/func_80B56CAC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_An_0x80B53840/func_80B56D28.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_An_0x80B53840/func_80B56D28.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_An_0x80B53840/func_80B56E44.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_An_0x80B53840/func_80B56E44.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_An_0x80B53840/func_80B56EB4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_An_0x80B53840/func_80B56EB4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_An_0x80B53840/func_80B5702C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_An_0x80B53840/func_80B5702C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_An_0x80B53840/func_80B572D4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_An_0x80B53840/func_80B572D4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_An_0x80B53840/func_80B573F4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_An_0x80B53840/func_80B573F4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_An_0x80B53840/func_80B575BC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_An_0x80B53840/func_80B575BC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_An_0x80B53840/func_80B57674.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_An_0x80B53840/func_80B57674.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_An_0x80B53840/func_80B57718.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_An_0x80B53840/func_80B57718.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_An_0x80B53840/func_80B577F0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_An_0x80B53840/func_80B577F0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_An_0x80B53840/func_80B578F8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_An_0x80B53840/func_80B578F8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_An_0x80B53840/func_80B57A44.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_An_0x80B53840/func_80B57A44.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_An_0x80B53840/func_80B57B48.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_An_0x80B53840/func_80B57B48.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_An_0x80B53840/EnAn_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_An_0x80B53840/EnAn_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_An_0x80B53840/EnAn_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_An_0x80B53840/EnAn_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_An_0x80B53840/EnAn_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_An_0x80B53840/EnAn_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_An_0x80B53840/func_80B57EE8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_An_0x80B53840/func_80B57EE8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_An_0x80B53840/func_80B57FC4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_An_0x80B53840/func_80B57FC4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_An_0x80B53840/func_80B580C0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_An_0x80B53840/func_80B580C0.asm") diff --git a/src/overlays/actors/ovl_En_And/z_en_and.c b/src/overlays/actors/ovl_En_And/z_en_and.c index dfe3942f38..0012b1fb59 100644 --- a/src/overlays/actors/ovl_En_And/z_en_and.c +++ b/src/overlays/actors/ovl_En_And/z_en_and.c @@ -23,18 +23,18 @@ const ActorInit En_And_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_And_0x80C18B90/func_80C18B90.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_And_0x80C18B90/func_80C18B90.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_And_0x80C18B90/func_80C18BD8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_And_0x80C18B90/func_80C18BD8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_And_0x80C18B90/func_80C18C50.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_And_0x80C18B90/func_80C18C50.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_And_0x80C18B90/EnAnd_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_And_0x80C18B90/EnAnd_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_And_0x80C18B90/EnAnd_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_And_0x80C18B90/EnAnd_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_And_0x80C18B90/EnAnd_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_And_0x80C18B90/EnAnd_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_And_0x80C18B90/func_80C18ED0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_And_0x80C18B90/func_80C18ED0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_And_0x80C18B90/EnAnd_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_And_0x80C18B90/EnAnd_Draw.asm") 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 9b8068a023..48e8bb31e5 100644 --- a/src/overlays/actors/ovl_En_Ani/z_en_ani.c +++ b/src/overlays/actors/ovl_En_Ani/z_en_ani.c @@ -23,38 +23,38 @@ const ActorInit En_Ani_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ani_0x809679D0/func_809679D0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ani_0x809679D0/func_809679D0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ani_0x809679D0/func_80967A48.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ani_0x809679D0/func_80967A48.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ani_0x809679D0/func_80967AB4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ani_0x809679D0/func_80967AB4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ani_0x809679D0/EnAni_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ani_0x809679D0/EnAni_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ani_0x809679D0/EnAni_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ani_0x809679D0/EnAni_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ani_0x809679D0/func_80967D20.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ani_0x809679D0/func_80967D20.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ani_0x809679D0/func_80967DA0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ani_0x809679D0/func_80967DA0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ani_0x809679D0/func_80967DCC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ani_0x809679D0/func_80967DCC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ani_0x809679D0/func_80967E34.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ani_0x809679D0/func_80967E34.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ani_0x809679D0/func_80967E90.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ani_0x809679D0/func_80967E90.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ani_0x809679D0/func_80967F20.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ani_0x809679D0/func_80967F20.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ani_0x809679D0/func_80967FA4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ani_0x809679D0/func_80967FA4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ani_0x809679D0/func_809680B0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ani_0x809679D0/func_809680B0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ani_0x809679D0/func_80968164.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ani_0x809679D0/func_80968164.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ani_0x809679D0/EnAni_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ani_0x809679D0/EnAni_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ani_0x809679D0/func_80968504.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ani_0x809679D0/func_80968504.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ani_0x809679D0/func_8096854C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ani_0x809679D0/func_8096854C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ani_0x809679D0/EnAni_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ani_0x809679D0/EnAni_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Aob_01/z_en_aob_01.c b/src/overlays/actors/ovl_En_Aob_01/z_en_aob_01.c index 7d9aa3a823..833d8d5df5 100644 --- a/src/overlays/actors/ovl_En_Aob_01/z_en_aob_01.c +++ b/src/overlays/actors/ovl_En_Aob_01/z_en_aob_01.c @@ -23,78 +23,78 @@ const ActorInit En_Aob_01_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Aob_01_0x809C10B0/func_809C10B0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Aob_01_0x809C10B0/func_809C10B0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Aob_01_0x809C10B0/func_809C1124.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Aob_01_0x809C10B0/func_809C1124.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Aob_01_0x809C10B0/func_809C1158.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Aob_01_0x809C10B0/func_809C1158.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Aob_01_0x809C10B0/func_809C11EC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Aob_01_0x809C10B0/func_809C11EC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Aob_01_0x809C10B0/func_809C1304.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Aob_01_0x809C10B0/func_809C1304.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Aob_01_0x809C10B0/func_809C1424.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Aob_01_0x809C10B0/func_809C1424.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Aob_01_0x809C10B0/func_809C14D0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Aob_01_0x809C10B0/func_809C14D0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Aob_01_0x809C10B0/func_809C15BC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Aob_01_0x809C10B0/func_809C15BC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Aob_01_0x809C10B0/func_809C165C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Aob_01_0x809C10B0/func_809C165C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Aob_01_0x809C10B0/func_809C16DC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Aob_01_0x809C10B0/func_809C16DC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Aob_01_0x809C10B0/func_809C1C9C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Aob_01_0x809C10B0/func_809C1C9C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Aob_01_0x809C10B0/func_809C1D64.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Aob_01_0x809C10B0/func_809C1D64.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Aob_01_0x809C10B0/func_809C1EC8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Aob_01_0x809C10B0/func_809C1EC8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Aob_01_0x809C10B0/func_809C2060.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Aob_01_0x809C10B0/func_809C2060.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Aob_01_0x809C10B0/func_809C21E0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Aob_01_0x809C10B0/func_809C21E0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Aob_01_0x809C10B0/func_809C2504.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Aob_01_0x809C10B0/func_809C2504.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Aob_01_0x809C10B0/func_809C2594.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Aob_01_0x809C10B0/func_809C2594.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Aob_01_0x809C10B0/func_809C25E4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Aob_01_0x809C10B0/func_809C25E4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Aob_01_0x809C10B0/func_809C2680.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Aob_01_0x809C10B0/func_809C2680.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Aob_01_0x809C10B0/func_809C26E4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Aob_01_0x809C10B0/func_809C26E4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Aob_01_0x809C10B0/func_809C2730.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Aob_01_0x809C10B0/func_809C2730.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Aob_01_0x809C10B0/func_809C2788.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Aob_01_0x809C10B0/func_809C2788.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Aob_01_0x809C10B0/func_809C2824.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Aob_01_0x809C10B0/func_809C2824.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Aob_01_0x809C10B0/func_809C28B8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Aob_01_0x809C10B0/func_809C28B8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Aob_01_0x809C10B0/func_809C2A64.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Aob_01_0x809C10B0/func_809C2A64.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Aob_01_0x809C10B0/func_809C2BE4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Aob_01_0x809C10B0/func_809C2BE4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Aob_01_0x809C10B0/func_809C2C9C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Aob_01_0x809C10B0/func_809C2C9C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Aob_01_0x809C10B0/func_809C2D0C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Aob_01_0x809C10B0/func_809C2D0C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Aob_01_0x809C10B0/func_809C2EC4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Aob_01_0x809C10B0/func_809C2EC4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Aob_01_0x809C10B0/func_809C2F34.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Aob_01_0x809C10B0/func_809C2F34.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Aob_01_0x809C10B0/func_809C2FA0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Aob_01_0x809C10B0/func_809C2FA0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Aob_01_0x809C10B0/EnAob01_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Aob_01_0x809C10B0/EnAob01_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Aob_01_0x809C10B0/EnAob01_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Aob_01_0x809C10B0/EnAob01_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Aob_01_0x809C10B0/EnAob01_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Aob_01_0x809C10B0/EnAob01_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Aob_01_0x809C10B0/func_809C33D8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Aob_01_0x809C10B0/func_809C33D8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Aob_01_0x809C10B0/func_809C35B4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Aob_01_0x809C10B0/func_809C35B4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Aob_01_0x809C10B0/func_809C35F4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Aob_01_0x809C10B0/func_809C35F4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Aob_01_0x809C10B0/EnAob01_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Aob_01_0x809C10B0/EnAob01_Draw.asm") 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 206d111add..21cad591de 100644 --- a/src/overlays/actors/ovl_En_Arrow/z_en_arrow.c +++ b/src/overlays/actors/ovl_En_Arrow/z_en_arrow.c @@ -23,28 +23,28 @@ const ActorInit En_Arrow_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Arrow_0x8088A240/EnArrow_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Arrow_0x8088A240/EnArrow_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Arrow_0x8088A240/EnArrow_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Arrow_0x8088A240/EnArrow_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Arrow_0x8088A240/func_8088A514.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Arrow_0x8088A240/func_8088A514.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Arrow_0x8088A240/func_8088A594.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Arrow_0x8088A240/func_8088A594.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Arrow_0x8088A240/func_8088A7D8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Arrow_0x8088A240/func_8088A7D8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Arrow_0x8088A240/func_8088A894.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Arrow_0x8088A240/func_8088A894.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Arrow_0x8088A240/func_8088AA98.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Arrow_0x8088A240/func_8088AA98.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Arrow_0x8088A240/func_8088ACE0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Arrow_0x8088A240/func_8088ACE0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Arrow_0x8088A240/func_8088B630.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Arrow_0x8088A240/func_8088B630.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Arrow_0x8088A240/func_8088B6B0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Arrow_0x8088A240/func_8088B6B0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Arrow_0x8088A240/EnArrow_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Arrow_0x8088A240/EnArrow_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Arrow_0x8088A240/func_8088B88C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Arrow_0x8088A240/func_8088B88C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Arrow_0x8088A240/EnArrow_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Arrow_0x8088A240/EnArrow_Draw.asm") 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 99e9e8aaaa..84f5307d83 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 @@ -23,22 +23,22 @@ const ActorInit En_Attack_Niw_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Attack_Niw_0x809580C0/EnAttackNiw_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Attack_Niw_0x809580C0/EnAttackNiw_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Attack_Niw_0x809580C0/EnAttackNiw_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Attack_Niw_0x809580C0/EnAttackNiw_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Attack_Niw_0x809580C0/func_80958228.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Attack_Niw_0x809580C0/func_80958228.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Attack_Niw_0x809580C0/func_809585B0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Attack_Niw_0x809580C0/func_809585B0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Attack_Niw_0x809580C0/func_80958634.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Attack_Niw_0x809580C0/func_80958634.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Attack_Niw_0x809580C0/func_80958974.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Attack_Niw_0x809580C0/func_80958974.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Attack_Niw_0x809580C0/func_80958BE4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Attack_Niw_0x809580C0/func_80958BE4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Attack_Niw_0x809580C0/EnAttackNiw_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Attack_Niw_0x809580C0/EnAttackNiw_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Attack_Niw_0x809580C0/func_80958F6C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Attack_Niw_0x809580C0/func_80958F6C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Attack_Niw_0x809580C0/EnAttackNiw_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Attack_Niw_0x809580C0/EnAttackNiw_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Az/z_en_az.c b/src/overlays/actors/ovl_En_Az/z_en_az.c index 6f4c111f5b..5f8a9dd21a 100644 --- a/src/overlays/actors/ovl_En_Az/z_en_az.c +++ b/src/overlays/actors/ovl_En_Az/z_en_az.c @@ -23,94 +23,94 @@ const ActorInit En_Az_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Az_0x80A94A30/func_80A94A30.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Az_0x80A94A30/func_80A94A30.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Az_0x80A94A30/func_80A94A64.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Az_0x80A94A30/func_80A94A64.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Az_0x80A94A30/func_80A94A90.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Az_0x80A94A30/func_80A94A90.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Az_0x80A94A30/func_80A94AB8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Az_0x80A94A30/func_80A94AB8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Az_0x80A94A30/func_80A94B20.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Az_0x80A94A30/func_80A94B20.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Az_0x80A94A30/func_80A94B98.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Az_0x80A94A30/func_80A94B98.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Az_0x80A94A30/EnAz_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Az_0x80A94A30/EnAz_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Az_0x80A94A30/EnAz_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Az_0x80A94A30/EnAz_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Az_0x80A94A30/func_80A954AC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Az_0x80A94A30/func_80A954AC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Az_0x80A94A30/func_80A95534.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Az_0x80A94A30/func_80A95534.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Az_0x80A94A30/func_80A9565C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Az_0x80A94A30/func_80A9565C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Az_0x80A94A30/func_80A95730.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Az_0x80A94A30/func_80A95730.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Az_0x80A94A30/func_80A958B0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Az_0x80A94A30/func_80A958B0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Az_0x80A94A30/func_80A95B34.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Az_0x80A94A30/func_80A95B34.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Az_0x80A94A30/func_80A95C5C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Az_0x80A94A30/func_80A95C5C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Az_0x80A94A30/func_80A95CEC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Az_0x80A94A30/func_80A95CEC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Az_0x80A94A30/func_80A95DA0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Az_0x80A94A30/func_80A95DA0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Az_0x80A94A30/func_80A95E88.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Az_0x80A94A30/func_80A95E88.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Az_0x80A94A30/func_80A95F94.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Az_0x80A94A30/func_80A95F94.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Az_0x80A94A30/func_80A95FE8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Az_0x80A94A30/func_80A95FE8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Az_0x80A94A30/func_80A9617C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Az_0x80A94A30/func_80A9617C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Az_0x80A94A30/func_80A97114.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Az_0x80A94A30/func_80A97114.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Az_0x80A94A30/func_80A97274.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Az_0x80A94A30/func_80A97274.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Az_0x80A94A30/func_80A973B4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Az_0x80A94A30/func_80A973B4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Az_0x80A94A30/func_80A97410.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Az_0x80A94A30/func_80A97410.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Az_0x80A94A30/func_80A979DC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Az_0x80A94A30/func_80A979DC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Az_0x80A94A30/func_80A979F4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Az_0x80A94A30/func_80A979F4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Az_0x80A94A30/func_80A97A28.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Az_0x80A94A30/func_80A97A28.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Az_0x80A94A30/func_80A97A40.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Az_0x80A94A30/func_80A97A40.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Az_0x80A94A30/func_80A97A9C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Az_0x80A94A30/func_80A97A9C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Az_0x80A94A30/func_80A97AB4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Az_0x80A94A30/func_80A97AB4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Az_0x80A94A30/func_80A97C0C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Az_0x80A94A30/func_80A97C0C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Az_0x80A94A30/func_80A97C24.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Az_0x80A94A30/func_80A97C24.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Az_0x80A94A30/func_80A97C4C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Az_0x80A94A30/func_80A97C4C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Az_0x80A94A30/func_80A97D5C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Az_0x80A94A30/func_80A97D5C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Az_0x80A94A30/func_80A97E48.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Az_0x80A94A30/func_80A97E48.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Az_0x80A94A30/func_80A97EAC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Az_0x80A94A30/func_80A97EAC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Az_0x80A94A30/func_80A97F9C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Az_0x80A94A30/func_80A97F9C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Az_0x80A94A30/func_80A982E0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Az_0x80A94A30/func_80A982E0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Az_0x80A94A30/func_80A98414.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Az_0x80A94A30/func_80A98414.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Az_0x80A94A30/EnAz_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Az_0x80A94A30/EnAz_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Az_0x80A94A30/EnAz_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Az_0x80A94A30/EnAz_Draw.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Az_0x80A94A30/func_80A98DA4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Az_0x80A94A30/func_80A98DA4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Az_0x80A94A30/func_80A98E48.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Az_0x80A94A30/func_80A98E48.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Az_0x80A94A30/func_80A98EFC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Az_0x80A94A30/func_80A98EFC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Az_0x80A94A30/func_80A98F94.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Az_0x80A94A30/func_80A98F94.asm") diff --git a/src/overlays/actors/ovl_En_Baba/z_en_baba.c b/src/overlays/actors/ovl_En_Baba/z_en_baba.c index 598d0b1d93..c8a34f93ed 100644 --- a/src/overlays/actors/ovl_En_Baba/z_en_baba.c +++ b/src/overlays/actors/ovl_En_Baba/z_en_baba.c @@ -23,58 +23,58 @@ const ActorInit En_Baba_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Baba_0x80BA8820/func_80BA8820.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Baba_0x80BA8820/func_80BA8820.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Baba_0x80BA8820/func_80BA886C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Baba_0x80BA8820/func_80BA886C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Baba_0x80BA8820/func_80BA8C4C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Baba_0x80BA8820/func_80BA8C4C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Baba_0x80BA8820/func_80BA8C90.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Baba_0x80BA8820/func_80BA8C90.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Baba_0x80BA8820/func_80BA8D2C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Baba_0x80BA8820/func_80BA8D2C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Baba_0x80BA8820/func_80BA8DF4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Baba_0x80BA8820/func_80BA8DF4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Baba_0x80BA8820/func_80BA8F88.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Baba_0x80BA8820/func_80BA8F88.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Baba_0x80BA8820/func_80BA9110.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Baba_0x80BA8820/func_80BA9110.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Baba_0x80BA8820/func_80BA9160.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Baba_0x80BA8820/func_80BA9160.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Baba_0x80BA8820/func_80BA93AC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Baba_0x80BA8820/func_80BA93AC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Baba_0x80BA8820/func_80BA9480.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Baba_0x80BA8820/func_80BA9480.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Baba_0x80BA8820/func_80BA9758.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Baba_0x80BA8820/func_80BA9758.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Baba_0x80BA8820/func_80BA9848.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Baba_0x80BA8820/func_80BA9848.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Baba_0x80BA8820/func_80BA98EC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Baba_0x80BA8820/func_80BA98EC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Baba_0x80BA8820/func_80BA9AB8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Baba_0x80BA8820/func_80BA9AB8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Baba_0x80BA8820/func_80BA9B24.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Baba_0x80BA8820/func_80BA9B24.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Baba_0x80BA8820/func_80BA9B80.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Baba_0x80BA8820/func_80BA9B80.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Baba_0x80BA8820/func_80BA9CD4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Baba_0x80BA8820/func_80BA9CD4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Baba_0x80BA8820/func_80BA9E00.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Baba_0x80BA8820/func_80BA9E00.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Baba_0x80BA8820/func_80BA9E10.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Baba_0x80BA8820/func_80BA9E10.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Baba_0x80BA8820/func_80BA9E48.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Baba_0x80BA8820/func_80BA9E48.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Baba_0x80BA8820/EnBaba_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Baba_0x80BA8820/EnBaba_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Baba_0x80BA8820/EnBaba_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Baba_0x80BA8820/EnBaba_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Baba_0x80BA8820/EnBaba_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Baba_0x80BA8820/EnBaba_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Baba_0x80BA8820/func_80BA9FB0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Baba_0x80BA8820/func_80BA9FB0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Baba_0x80BA8820/func_80BAA198.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Baba_0x80BA8820/func_80BAA198.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Baba_0x80BA8820/func_80BAA20C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Baba_0x80BA8820/func_80BAA20C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Baba_0x80BA8820/EnBaba_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Baba_0x80BA8820/EnBaba_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Baguo/z_en_baguo.c b/src/overlays/actors/ovl_En_Baguo/z_en_baguo.c index 33c0132b80..0adad488d4 100644 --- a/src/overlays/actors/ovl_En_Baguo/z_en_baguo.c +++ b/src/overlays/actors/ovl_En_Baguo/z_en_baguo.c @@ -22,34 +22,34 @@ const ActorInit En_Baguo_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Baguo_0x80A3B080/EnBaguo_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Baguo_0x80A3B080/EnBaguo_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Baguo_0x80A3B080/EnBaguo_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Baguo_0x80A3B080/EnBaguo_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Baguo_0x80A3B080/func_80A3B220.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Baguo_0x80A3B080/func_80A3B220.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Baguo_0x80A3B080/func_80A3B2CC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Baguo_0x80A3B080/func_80A3B2CC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Baguo_0x80A3B080/func_80A3B3E0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Baguo_0x80A3B080/func_80A3B3E0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Baguo_0x80A3B080/func_80A3B5E0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Baguo_0x80A3B080/func_80A3B5E0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Baguo_0x80A3B080/func_80A3B794.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Baguo_0x80A3B080/func_80A3B794.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Baguo_0x80A3B080/func_80A3B7B8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Baguo_0x80A3B080/func_80A3B7B8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Baguo_0x80A3B080/func_80A3B8F8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Baguo_0x80A3B080/func_80A3B8F8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Baguo_0x80A3B080/func_80A3B958.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Baguo_0x80A3B080/func_80A3B958.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Baguo_0x80A3B080/EnBaguo_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Baguo_0x80A3B080/EnBaguo_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Baguo_0x80A3B080/func_80A3BE24.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Baguo_0x80A3B080/func_80A3BE24.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Baguo_0x80A3B080/func_80A3BE60.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Baguo_0x80A3B080/func_80A3BE60.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Baguo_0x80A3B080/func_80A3BF0C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Baguo_0x80A3B080/func_80A3BF0C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Baguo_0x80A3B080/func_80A3C008.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Baguo_0x80A3B080/func_80A3C008.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Baguo_0x80A3B080/func_80A3C17C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Baguo_0x80A3B080/func_80A3C17C.asm") diff --git a/src/overlays/actors/ovl_En_Baisen/z_en_baisen.c b/src/overlays/actors/ovl_En_Baisen/z_en_baisen.c index 1582b7a00a..fbd04dcf6f 100644 --- a/src/overlays/actors/ovl_En_Baisen/z_en_baisen.c +++ b/src/overlays/actors/ovl_En_Baisen/z_en_baisen.c @@ -23,28 +23,28 @@ const ActorInit En_Baisen_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Baisen_0x80BE84F0/EnBaisen_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Baisen_0x80BE84F0/EnBaisen_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Baisen_0x80BE84F0/EnBaisen_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Baisen_0x80BE84F0/EnBaisen_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Baisen_0x80BE84F0/func_80BE8690.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Baisen_0x80BE84F0/func_80BE8690.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Baisen_0x80BE84F0/func_80BE871C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Baisen_0x80BE84F0/func_80BE871C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Baisen_0x80BE84F0/func_80BE87B0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Baisen_0x80BE84F0/func_80BE87B0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Baisen_0x80BE84F0/func_80BE87FC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Baisen_0x80BE84F0/func_80BE87FC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Baisen_0x80BE84F0/func_80BE887C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Baisen_0x80BE84F0/func_80BE887C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Baisen_0x80BE84F0/func_80BE895C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Baisen_0x80BE84F0/func_80BE895C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Baisen_0x80BE84F0/func_80BE89D8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Baisen_0x80BE84F0/func_80BE89D8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Baisen_0x80BE84F0/func_80BE8AAC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Baisen_0x80BE84F0/func_80BE8AAC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Baisen_0x80BE84F0/EnBaisen_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Baisen_0x80BE84F0/EnBaisen_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Baisen_0x80BE84F0/func_80BE8D3C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Baisen_0x80BE84F0/func_80BE8D3C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Baisen_0x80BE84F0/EnBaisen_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Baisen_0x80BE84F0/EnBaisen_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Bal/z_en_bal.c b/src/overlays/actors/ovl_En_Bal/z_en_bal.c index 7208a508c5..ab5a78c4e9 100644 --- a/src/overlays/actors/ovl_En_Bal/z_en_bal.c +++ b/src/overlays/actors/ovl_En_Bal/z_en_bal.c @@ -23,80 +23,80 @@ const ActorInit En_Bal_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bal_0x80A61810/EnBal_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bal_0x80A61810/EnBal_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bal_0x80A61810/EnBal_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bal_0x80A61810/EnBal_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bal_0x80A61810/func_80A61A18.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bal_0x80A61810/func_80A61A18.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bal_0x80A61810/func_80A61A44.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bal_0x80A61810/func_80A61A44.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bal_0x80A61810/func_80A61A6C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bal_0x80A61810/func_80A61A6C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bal_0x80A61810/func_80A61ADC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bal_0x80A61810/func_80A61ADC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bal_0x80A61810/func_80A61B5C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bal_0x80A61810/func_80A61B5C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bal_0x80A61810/func_80A61C9C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bal_0x80A61810/func_80A61C9C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bal_0x80A61810/func_80A61CE4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bal_0x80A61810/func_80A61CE4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bal_0x80A61810/func_80A61DF8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bal_0x80A61810/func_80A61DF8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bal_0x80A61810/func_80A61E5C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bal_0x80A61810/func_80A61E5C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bal_0x80A61810/func_80A62128.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bal_0x80A61810/func_80A62128.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bal_0x80A61810/func_80A621C4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bal_0x80A61810/func_80A621C4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bal_0x80A61810/func_80A62260.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bal_0x80A61810/func_80A62260.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bal_0x80A61810/func_80A622A0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bal_0x80A61810/func_80A622A0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bal_0x80A61810/func_80A623CC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bal_0x80A61810/func_80A623CC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bal_0x80A61810/func_80A624DC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bal_0x80A61810/func_80A624DC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bal_0x80A61810/func_80A62818.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bal_0x80A61810/func_80A62818.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bal_0x80A61810/func_80A62830.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bal_0x80A61810/func_80A62830.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bal_0x80A61810/func_80A629C4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bal_0x80A61810/func_80A629C4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bal_0x80A61810/func_80A62AC4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bal_0x80A61810/func_80A62AC4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bal_0x80A61810/func_80A62B30.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bal_0x80A61810/func_80A62B30.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bal_0x80A61810/func_80A62B78.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bal_0x80A61810/func_80A62B78.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bal_0x80A61810/func_80A62CF0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bal_0x80A61810/func_80A62CF0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bal_0x80A61810/func_80A62DCC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bal_0x80A61810/func_80A62DCC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bal_0x80A61810/func_80A62ED0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bal_0x80A61810/func_80A62ED0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bal_0x80A61810/func_80A62FAC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bal_0x80A61810/func_80A62FAC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bal_0x80A61810/func_80A63158.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bal_0x80A61810/func_80A63158.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bal_0x80A61810/func_80A634B4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bal_0x80A61810/func_80A634B4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bal_0x80A61810/func_80A634C8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bal_0x80A61810/func_80A634C8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bal_0x80A61810/func_80A635DC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bal_0x80A61810/func_80A635DC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bal_0x80A61810/func_80A635F0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bal_0x80A61810/func_80A635F0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bal_0x80A61810/func_80A636AC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bal_0x80A61810/func_80A636AC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bal_0x80A61810/func_80A637FC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bal_0x80A61810/func_80A637FC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bal_0x80A61810/func_80A63884.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bal_0x80A61810/func_80A63884.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bal_0x80A61810/EnBal_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bal_0x80A61810/EnBal_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bal_0x80A61810/func_80A63A10.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bal_0x80A61810/func_80A63A10.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bal_0x80A61810/func_80A63B94.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bal_0x80A61810/func_80A63B94.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bal_0x80A61810/EnBal_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bal_0x80A61810/EnBal_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Bat/z_en_bat.c b/src/overlays/actors/ovl_En_Bat/z_en_bat.c index 667ec3ff69..df5bd8bc8e 100644 --- a/src/overlays/actors/ovl_En_Bat/z_en_bat.c +++ b/src/overlays/actors/ovl_En_Bat/z_en_bat.c @@ -23,36 +23,36 @@ const ActorInit En_Bat_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bat_0x80A434E0/EnBat_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bat_0x80A434E0/EnBat_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bat_0x80A434E0/EnBat_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bat_0x80A434E0/EnBat_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bat_0x80A434E0/func_80A437CC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bat_0x80A434E0/func_80A437CC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bat_0x80A434E0/func_80A43810.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bat_0x80A434E0/func_80A43810.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bat_0x80A434E0/func_80A43870.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bat_0x80A434E0/func_80A43870.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bat_0x80A434E0/func_80A438D4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bat_0x80A434E0/func_80A438D4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bat_0x80A434E0/func_80A438F8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bat_0x80A434E0/func_80A438F8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bat_0x80A434E0/func_80A4392C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bat_0x80A434E0/func_80A4392C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bat_0x80A434E0/func_80A43CA0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bat_0x80A434E0/func_80A43CA0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bat_0x80A434E0/func_80A43CE8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bat_0x80A434E0/func_80A43CE8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bat_0x80A434E0/func_80A43F60.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bat_0x80A434E0/func_80A43F60.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bat_0x80A434E0/func_80A44114.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bat_0x80A434E0/func_80A44114.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bat_0x80A434E0/func_80A44294.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bat_0x80A434E0/func_80A44294.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bat_0x80A434E0/func_80A4431C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bat_0x80A434E0/func_80A4431C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bat_0x80A434E0/func_80A443D8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bat_0x80A434E0/func_80A443D8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bat_0x80A434E0/EnBat_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bat_0x80A434E0/EnBat_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bat_0x80A434E0/EnBat_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bat_0x80A434E0/EnBat_Draw.asm") 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 4350f63d90..45b6062eb5 100644 --- a/src/overlays/actors/ovl_En_Bb/z_en_bb.c +++ b/src/overlays/actors/ovl_En_Bb/z_en_bb.c @@ -23,56 +23,56 @@ const ActorInit En_Bb_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bb_0x808C1D40/EnBb_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bb_0x808C1D40/EnBb_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bb_0x808C1D40/EnBb_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bb_0x808C1D40/EnBb_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bb_0x808C1D40/func_808C1E94.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bb_0x808C1D40/func_808C1E94.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bb_0x808C1D40/func_808C1F00.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bb_0x808C1D40/func_808C1F00.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bb_0x808C1D40/func_808C1F74.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bb_0x808C1D40/func_808C1F74.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bb_0x808C1D40/func_808C1FF4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bb_0x808C1D40/func_808C1FF4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bb_0x808C1D40/func_808C20D4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bb_0x808C1D40/func_808C20D4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bb_0x808C1D40/func_808C2238.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bb_0x808C1D40/func_808C2238.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bb_0x808C1D40/func_808C2344.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bb_0x808C1D40/func_808C2344.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bb_0x808C1D40/func_808C23EC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bb_0x808C1D40/func_808C23EC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bb_0x808C1D40/func_808C254C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bb_0x808C1D40/func_808C254C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bb_0x808C1D40/func_808C25E0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bb_0x808C1D40/func_808C25E0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bb_0x808C1D40/func_808C272C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bb_0x808C1D40/func_808C272C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bb_0x808C1D40/func_808C28CC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bb_0x808C1D40/func_808C28CC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bb_0x808C1D40/func_808C2A00.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bb_0x808C1D40/func_808C2A00.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bb_0x808C1D40/func_808C2B1C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bb_0x808C1D40/func_808C2B1C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bb_0x808C1D40/func_808C2B94.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bb_0x808C1D40/func_808C2B94.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bb_0x808C1D40/func_808C2BD0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bb_0x808C1D40/func_808C2BD0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bb_0x808C1D40/func_808C2C38.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bb_0x808C1D40/func_808C2C38.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bb_0x808C1D40/func_808C2CB4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bb_0x808C1D40/func_808C2CB4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bb_0x808C1D40/func_808C2CF0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bb_0x808C1D40/func_808C2CF0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bb_0x808C1D40/func_808C2D78.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bb_0x808C1D40/func_808C2D78.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bb_0x808C1D40/func_808C2E34.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bb_0x808C1D40/func_808C2E34.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bb_0x808C1D40/EnBb_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bb_0x808C1D40/EnBb_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bb_0x808C1D40/func_808C32EC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bb_0x808C1D40/func_808C32EC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bb_0x808C1D40/func_808C3324.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bb_0x808C1D40/func_808C3324.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bb_0x808C1D40/EnBb_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bb_0x808C1D40/EnBb_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Bba_01/z_en_bba_01.c b/src/overlays/actors/ovl_En_Bba_01/z_en_bba_01.c index 8a6c9d01e7..393ef16330 100644 --- a/src/overlays/actors/ovl_En_Bba_01/z_en_bba_01.c +++ b/src/overlays/actors/ovl_En_Bba_01/z_en_bba_01.c @@ -23,30 +23,30 @@ const ActorInit En_Bba_01_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bba_01_0x809CC060/func_809CC060.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bba_01_0x809CC060/func_809CC060.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bba_01_0x809CC060/func_809CC1D4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bba_01_0x809CC060/func_809CC1D4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bba_01_0x809CC060/func_809CC270.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bba_01_0x809CC060/func_809CC270.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bba_01_0x809CC060/func_809CC2F0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bba_01_0x809CC060/func_809CC2F0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bba_01_0x809CC060/func_809CC370.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bba_01_0x809CC060/func_809CC370.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bba_01_0x809CC060/func_809CC3A8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bba_01_0x809CC060/func_809CC3A8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bba_01_0x809CC060/func_809CC3CC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bba_01_0x809CC060/func_809CC3CC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bba_01_0x809CC060/EnBba01_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bba_01_0x809CC060/EnBba01_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bba_01_0x809CC060/EnBba01_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bba_01_0x809CC060/EnBba01_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bba_01_0x809CC060/EnBba01_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bba_01_0x809CC060/EnBba01_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bba_01_0x809CC060/func_809CC6F0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bba_01_0x809CC060/func_809CC6F0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bba_01_0x809CC060/func_809CC984.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bba_01_0x809CC060/func_809CC984.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bba_01_0x809CC060/func_809CCA5C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bba_01_0x809CC060/func_809CCA5C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bba_01_0x809CC060/EnBba01_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bba_01_0x809CC060/EnBba01_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Bbfall/z_en_bbfall.c b/src/overlays/actors/ovl_En_Bbfall/z_en_bbfall.c index f357ae98ad..bb0fb668e6 100644 --- a/src/overlays/actors/ovl_En_Bbfall/z_en_bbfall.c +++ b/src/overlays/actors/ovl_En_Bbfall/z_en_bbfall.c @@ -23,62 +23,62 @@ const ActorInit En_Bbfall_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bbfall_0x808BF220/EnBbfall_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bbfall_0x808BF220/EnBbfall_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bbfall_0x808BF220/EnBbfall_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bbfall_0x808BF220/EnBbfall_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bbfall_0x808BF220/func_808BF344.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bbfall_0x808BF220/func_808BF344.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bbfall_0x808BF220/func_808BF3B8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bbfall_0x808BF220/func_808BF3B8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bbfall_0x808BF220/func_808BF438.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bbfall_0x808BF220/func_808BF438.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bbfall_0x808BF220/func_808BF4B4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bbfall_0x808BF220/func_808BF4B4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bbfall_0x808BF220/func_808BF514.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bbfall_0x808BF220/func_808BF514.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bbfall_0x808BF220/func_808BF578.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bbfall_0x808BF220/func_808BF578.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bbfall_0x808BF220/func_808BF5AC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bbfall_0x808BF220/func_808BF5AC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bbfall_0x808BF220/func_808BF5E0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bbfall_0x808BF220/func_808BF5E0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bbfall_0x808BF220/func_808BF734.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bbfall_0x808BF220/func_808BF734.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bbfall_0x808BF220/func_808BF7A0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bbfall_0x808BF220/func_808BF7A0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bbfall_0x808BF220/func_808BF830.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bbfall_0x808BF220/func_808BF830.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bbfall_0x808BF220/func_808BF894.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bbfall_0x808BF220/func_808BF894.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bbfall_0x808BF220/func_808BF8DC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bbfall_0x808BF220/func_808BF8DC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bbfall_0x808BF220/func_808BFA18.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bbfall_0x808BF220/func_808BFA18.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bbfall_0x808BF220/func_808BFA3C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bbfall_0x808BF220/func_808BFA3C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bbfall_0x808BF220/func_808BFAB4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bbfall_0x808BF220/func_808BFAB4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bbfall_0x808BF220/func_808BFB4C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bbfall_0x808BF220/func_808BFB4C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bbfall_0x808BF220/func_808BFCCC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bbfall_0x808BF220/func_808BFCCC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bbfall_0x808BF220/func_808BFE58.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bbfall_0x808BF220/func_808BFE58.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bbfall_0x808BF220/func_808BFF8C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bbfall_0x808BF220/func_808BFF8C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bbfall_0x808BF220/func_808C00A0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bbfall_0x808BF220/func_808C00A0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bbfall_0x808BF220/func_808C013C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bbfall_0x808BF220/func_808C013C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bbfall_0x808BF220/func_808C0178.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bbfall_0x808BF220/func_808C0178.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bbfall_0x808BF220/func_808C01E0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bbfall_0x808BF220/func_808C01E0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bbfall_0x808BF220/EnBbfall_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bbfall_0x808BF220/EnBbfall_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bbfall_0x808BF220/func_808C07D4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bbfall_0x808BF220/func_808C07D4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bbfall_0x808BF220/func_808C080C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bbfall_0x808BF220/func_808C080C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bbfall_0x808BF220/EnBbfall_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bbfall_0x808BF220/EnBbfall_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Bee/z_en_bee.c b/src/overlays/actors/ovl_En_Bee/z_en_bee.c index a8e9c01915..92ab20a9ba 100644 --- a/src/overlays/actors/ovl_En_Bee/z_en_bee.c +++ b/src/overlays/actors/ovl_En_Bee/z_en_bee.c @@ -23,20 +23,20 @@ const ActorInit En_Bee_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bee_0x80B5A720/EnBee_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bee_0x80B5A720/EnBee_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bee_0x80B5A720/EnBee_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bee_0x80B5A720/EnBee_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bee_0x80B5A720/func_80B5A854.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bee_0x80B5A720/func_80B5A854.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bee_0x80B5A720/func_80B5A9E8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bee_0x80B5A720/func_80B5A9E8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bee_0x80B5A720/func_80B5ABC4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bee_0x80B5A720/func_80B5ABC4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bee_0x80B5A720/func_80B5AC3C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bee_0x80B5A720/func_80B5AC3C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bee_0x80B5A720/func_80B5AF80.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bee_0x80B5A720/func_80B5AF80.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bee_0x80B5A720/EnBee_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bee_0x80B5A720/EnBee_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bee_0x80B5A720/EnBee_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bee_0x80B5A720/EnBee_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Bh/z_en_bh.c b/src/overlays/actors/ovl_En_Bh/z_en_bh.c index 575adb889f..f4de30dbb3 100644 --- a/src/overlays/actors/ovl_En_Bh/z_en_bh.c +++ b/src/overlays/actors/ovl_En_Bh/z_en_bh.c @@ -23,12 +23,12 @@ const ActorInit En_Bh_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bh_0x80C22D40/EnBh_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bh_0x80C22D40/EnBh_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bh_0x80C22D40/EnBh_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bh_0x80C22D40/EnBh_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bh_0x80C22D40/func_80C22DEC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bh_0x80C22D40/func_80C22DEC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bh_0x80C22D40/EnBh_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bh_0x80C22D40/EnBh_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bh_0x80C22D40/EnBh_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bh_0x80C22D40/EnBh_Draw.asm") 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 f350d4a1ef..c9ea26d74e 100644 --- a/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.c +++ b/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.c @@ -23,62 +23,62 @@ const ActorInit En_Bigokuta_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigokuta_0x80AC26F0/EnBigokuta_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigokuta_0x80AC26F0/EnBigokuta_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigokuta_0x80AC26F0/EnBigokuta_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigokuta_0x80AC26F0/EnBigokuta_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigokuta_0x80AC26F0/func_80AC28B4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigokuta_0x80AC26F0/func_80AC28B4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigokuta_0x80AC26F0/func_80AC299C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigokuta_0x80AC26F0/func_80AC299C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigokuta_0x80AC26F0/func_80AC2A1C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigokuta_0x80AC26F0/func_80AC2A1C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigokuta_0x80AC26F0/func_80AC2A7C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigokuta_0x80AC26F0/func_80AC2A7C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigokuta_0x80AC26F0/func_80AC2B4C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigokuta_0x80AC26F0/func_80AC2B4C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigokuta_0x80AC26F0/func_80AC2B98.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigokuta_0x80AC26F0/func_80AC2B98.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigokuta_0x80AC26F0/func_80AC2C30.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigokuta_0x80AC26F0/func_80AC2C30.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigokuta_0x80AC26F0/func_80AC2C84.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigokuta_0x80AC26F0/func_80AC2C84.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigokuta_0x80AC26F0/func_80AC2CE8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigokuta_0x80AC26F0/func_80AC2CE8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigokuta_0x80AC26F0/func_80AC2DAC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigokuta_0x80AC26F0/func_80AC2DAC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigokuta_0x80AC26F0/func_80AC2EBC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigokuta_0x80AC26F0/func_80AC2EBC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigokuta_0x80AC26F0/func_80AC2F20.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigokuta_0x80AC26F0/func_80AC2F20.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigokuta_0x80AC26F0/func_80AC2F64.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigokuta_0x80AC26F0/func_80AC2F64.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigokuta_0x80AC26F0/func_80AC3054.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigokuta_0x80AC26F0/func_80AC3054.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigokuta_0x80AC26F0/func_80AC30EC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigokuta_0x80AC26F0/func_80AC30EC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigokuta_0x80AC26F0/func_80AC31EC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigokuta_0x80AC26F0/func_80AC31EC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigokuta_0x80AC26F0/func_80AC33A4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigokuta_0x80AC26F0/func_80AC33A4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigokuta_0x80AC26F0/func_80AC33C0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigokuta_0x80AC26F0/func_80AC33C0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigokuta_0x80AC26F0/func_80AC3460.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigokuta_0x80AC26F0/func_80AC3460.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigokuta_0x80AC26F0/func_80AC34A8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigokuta_0x80AC26F0/func_80AC34A8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigokuta_0x80AC26F0/func_80AC35E8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigokuta_0x80AC26F0/func_80AC35E8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigokuta_0x80AC26F0/func_80AC3650.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigokuta_0x80AC26F0/func_80AC3650.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigokuta_0x80AC26F0/func_80AC3930.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigokuta_0x80AC26F0/func_80AC3930.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigokuta_0x80AC26F0/func_80AC39A0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigokuta_0x80AC26F0/func_80AC39A0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigokuta_0x80AC26F0/EnBigokuta_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigokuta_0x80AC26F0/EnBigokuta_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigokuta_0x80AC26F0/func_80AC3D48.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigokuta_0x80AC26F0/func_80AC3D48.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigokuta_0x80AC26F0/func_80AC4204.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigokuta_0x80AC26F0/func_80AC4204.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigokuta_0x80AC26F0/EnBigokuta_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigokuta_0x80AC26F0/EnBigokuta_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Bigpamet/z_en_bigpamet.c b/src/overlays/actors/ovl_En_Bigpamet/z_en_bigpamet.c index 48af939332..286602dd11 100644 --- a/src/overlays/actors/ovl_En_Bigpamet/z_en_bigpamet.c +++ b/src/overlays/actors/ovl_En_Bigpamet/z_en_bigpamet.c @@ -23,98 +23,98 @@ const ActorInit En_Bigpamet_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpamet_0x80A27520/EnBigpamet_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigpamet_0x80A27520/EnBigpamet_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpamet_0x80A27520/EnBigpamet_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigpamet_0x80A27520/EnBigpamet_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpamet_0x80A27520/func_80A2768C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigpamet_0x80A27520/func_80A2768C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpamet_0x80A27520/func_80A276F4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigpamet_0x80A27520/func_80A276F4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpamet_0x80A27520/func_80A2778C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigpamet_0x80A27520/func_80A2778C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpamet_0x80A27520/func_80A27970.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigpamet_0x80A27520/func_80A27970.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpamet_0x80A27520/func_80A27B58.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigpamet_0x80A27520/func_80A27B58.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpamet_0x80A27520/func_80A27DD8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigpamet_0x80A27520/func_80A27DD8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpamet_0x80A27520/func_80A27FE8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigpamet_0x80A27520/func_80A27FE8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpamet_0x80A27520/func_80A2811C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigpamet_0x80A27520/func_80A2811C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpamet_0x80A27520/func_80A281B4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigpamet_0x80A27520/func_80A281B4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpamet_0x80A27520/func_80A281DC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigpamet_0x80A27520/func_80A281DC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpamet_0x80A27520/func_80A28274.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigpamet_0x80A27520/func_80A28274.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpamet_0x80A27520/func_80A282C8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigpamet_0x80A27520/func_80A282C8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpamet_0x80A27520/func_80A28378.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigpamet_0x80A27520/func_80A28378.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpamet_0x80A27520/func_80A283A0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigpamet_0x80A27520/func_80A283A0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpamet_0x80A27520/func_80A283F0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigpamet_0x80A27520/func_80A283F0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpamet_0x80A27520/func_80A2844C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigpamet_0x80A27520/func_80A2844C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpamet_0x80A27520/func_80A284E4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigpamet_0x80A27520/func_80A284E4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpamet_0x80A27520/func_80A2855C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigpamet_0x80A27520/func_80A2855C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpamet_0x80A27520/func_80A28618.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigpamet_0x80A27520/func_80A28618.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpamet_0x80A27520/func_80A2866C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigpamet_0x80A27520/func_80A2866C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpamet_0x80A27520/func_80A286C0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigpamet_0x80A27520/func_80A286C0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpamet_0x80A27520/func_80A28708.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigpamet_0x80A27520/func_80A28708.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpamet_0x80A27520/func_80A28760.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigpamet_0x80A27520/func_80A28760.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpamet_0x80A27520/func_80A287E8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigpamet_0x80A27520/func_80A287E8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpamet_0x80A27520/func_80A28970.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigpamet_0x80A27520/func_80A28970.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpamet_0x80A27520/func_80A289C8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigpamet_0x80A27520/func_80A289C8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpamet_0x80A27520/func_80A28A28.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigpamet_0x80A27520/func_80A28A28.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpamet_0x80A27520/func_80A28A98.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigpamet_0x80A27520/func_80A28A98.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpamet_0x80A27520/func_80A28B98.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigpamet_0x80A27520/func_80A28B98.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpamet_0x80A27520/func_80A28D0C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigpamet_0x80A27520/func_80A28D0C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpamet_0x80A27520/func_80A28D80.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigpamet_0x80A27520/func_80A28D80.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpamet_0x80A27520/func_80A28DC0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigpamet_0x80A27520/func_80A28DC0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpamet_0x80A27520/func_80A28E40.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigpamet_0x80A27520/func_80A28E40.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpamet_0x80A27520/func_80A28E98.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigpamet_0x80A27520/func_80A28E98.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpamet_0x80A27520/func_80A28ED4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigpamet_0x80A27520/func_80A28ED4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpamet_0x80A27520/func_80A28EE8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigpamet_0x80A27520/func_80A28EE8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpamet_0x80A27520/func_80A29028.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigpamet_0x80A27520/func_80A29028.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpamet_0x80A27520/func_80A29094.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigpamet_0x80A27520/func_80A29094.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpamet_0x80A27520/EnBigpamet_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigpamet_0x80A27520/EnBigpamet_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpamet_0x80A27520/func_80A292A8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigpamet_0x80A27520/func_80A292A8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpamet_0x80A27520/func_80A293E4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigpamet_0x80A27520/func_80A293E4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpamet_0x80A27520/func_80A29494.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigpamet_0x80A27520/func_80A29494.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpamet_0x80A27520/EnBigpamet_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigpamet_0x80A27520/EnBigpamet_Draw.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpamet_0x80A27520/func_80A29580.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigpamet_0x80A27520/func_80A29580.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpamet_0x80A27520/func_80A29628.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigpamet_0x80A27520/func_80A29628.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpamet_0x80A27520/func_80A2966C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigpamet_0x80A27520/func_80A2966C.asm") diff --git a/src/overlays/actors/ovl_En_Bigpo/z_en_bigpo.c b/src/overlays/actors/ovl_En_Bigpo/z_en_bigpo.c index 45d31fa2c1..b843f633f1 100644 --- a/src/overlays/actors/ovl_En_Bigpo/z_en_bigpo.c +++ b/src/overlays/actors/ovl_En_Bigpo/z_en_bigpo.c @@ -22,140 +22,140 @@ const ActorInit En_Bigpo_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpo_0x80B615E0/EnBigpo_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigpo_0x80B615E0/EnBigpo_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpo_0x80B615E0/EnBigpo_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigpo_0x80B615E0/EnBigpo_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpo_0x80B615E0/func_80B61914.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigpo_0x80B615E0/func_80B61914.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpo_0x80B615E0/func_80B619B4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigpo_0x80B615E0/func_80B619B4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpo_0x80B615E0/func_80B619FC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigpo_0x80B615E0/func_80B619FC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpo_0x80B615E0/func_80B61AC8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigpo_0x80B615E0/func_80B61AC8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpo_0x80B615E0/func_80B61AF8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigpo_0x80B615E0/func_80B61AF8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpo_0x80B615E0/func_80B61B38.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigpo_0x80B615E0/func_80B61B38.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpo_0x80B615E0/func_80B61B70.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigpo_0x80B615E0/func_80B61B70.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpo_0x80B615E0/func_80B61C04.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigpo_0x80B615E0/func_80B61C04.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpo_0x80B615E0/func_80B61CFC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigpo_0x80B615E0/func_80B61CFC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpo_0x80B615E0/func_80B61D74.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigpo_0x80B615E0/func_80B61D74.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpo_0x80B615E0/func_80B61DA4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigpo_0x80B615E0/func_80B61DA4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpo_0x80B615E0/func_80B61E9C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigpo_0x80B615E0/func_80B61E9C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpo_0x80B615E0/func_80B61F04.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigpo_0x80B615E0/func_80B61F04.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpo_0x80B615E0/func_80B62034.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigpo_0x80B615E0/func_80B62034.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpo_0x80B615E0/func_80B62084.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigpo_0x80B615E0/func_80B62084.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpo_0x80B615E0/func_80B62154.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigpo_0x80B615E0/func_80B62154.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpo_0x80B615E0/func_80B621CC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigpo_0x80B615E0/func_80B621CC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpo_0x80B615E0/func_80B622E4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigpo_0x80B615E0/func_80B622E4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpo_0x80B615E0/func_80B623BC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigpo_0x80B615E0/func_80B623BC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpo_0x80B615E0/func_80B624F4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigpo_0x80B615E0/func_80B624F4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpo_0x80B615E0/func_80B6259C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigpo_0x80B615E0/func_80B6259C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpo_0x80B615E0/func_80B6275C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigpo_0x80B615E0/func_80B6275C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpo_0x80B615E0/func_80B627B4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigpo_0x80B615E0/func_80B627B4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpo_0x80B615E0/func_80B62814.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigpo_0x80B615E0/func_80B62814.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpo_0x80B615E0/func_80B62830.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigpo_0x80B615E0/func_80B62830.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpo_0x80B615E0/func_80B62900.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigpo_0x80B615E0/func_80B62900.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpo_0x80B615E0/func_80B62920.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigpo_0x80B615E0/func_80B62920.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpo_0x80B615E0/func_80B629E4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigpo_0x80B615E0/func_80B629E4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpo_0x80B615E0/func_80B62A68.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigpo_0x80B615E0/func_80B62A68.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpo_0x80B615E0/func_80B62AD4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigpo_0x80B615E0/func_80B62AD4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpo_0x80B615E0/func_80B62B10.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigpo_0x80B615E0/func_80B62B10.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpo_0x80B615E0/func_80B62E38.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigpo_0x80B615E0/func_80B62E38.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpo_0x80B615E0/func_80B62F10.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigpo_0x80B615E0/func_80B62F10.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpo_0x80B615E0/func_80B62FCC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigpo_0x80B615E0/func_80B62FCC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpo_0x80B615E0/func_80B631F8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigpo_0x80B615E0/func_80B631F8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpo_0x80B615E0/func_80B63264.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigpo_0x80B615E0/func_80B63264.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpo_0x80B615E0/func_80B632BC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigpo_0x80B615E0/func_80B632BC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpo_0x80B615E0/func_80B6330C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigpo_0x80B615E0/func_80B6330C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpo_0x80B615E0/func_80B633E8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigpo_0x80B615E0/func_80B633E8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpo_0x80B615E0/func_80B63410.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigpo_0x80B615E0/func_80B63410.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpo_0x80B615E0/func_80B63450.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigpo_0x80B615E0/func_80B63450.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpo_0x80B615E0/func_80B63474.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigpo_0x80B615E0/func_80B63474.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpo_0x80B615E0/func_80B636D0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigpo_0x80B615E0/func_80B636D0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpo_0x80B615E0/func_80B636E4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigpo_0x80B615E0/func_80B636E4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpo_0x80B615E0/func_80B63758.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigpo_0x80B615E0/func_80B63758.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpo_0x80B615E0/func_80B6382C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigpo_0x80B615E0/func_80B6382C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpo_0x80B615E0/func_80B6383C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigpo_0x80B615E0/func_80B6383C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpo_0x80B615E0/func_80B63854.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigpo_0x80B615E0/func_80B63854.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpo_0x80B615E0/func_80B63888.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigpo_0x80B615E0/func_80B63888.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpo_0x80B615E0/func_80B638AC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigpo_0x80B615E0/func_80B638AC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpo_0x80B615E0/func_80B638D4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigpo_0x80B615E0/func_80B638D4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpo_0x80B615E0/func_80B63964.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigpo_0x80B615E0/func_80B63964.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpo_0x80B615E0/func_80B63980.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigpo_0x80B615E0/func_80B63980.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpo_0x80B615E0/func_80B63A18.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigpo_0x80B615E0/func_80B63A18.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpo_0x80B615E0/func_80B63AC4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigpo_0x80B615E0/func_80B63AC4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpo_0x80B615E0/func_80B63C28.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigpo_0x80B615E0/func_80B63C28.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpo_0x80B615E0/func_80B63D0C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigpo_0x80B615E0/func_80B63D0C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpo_0x80B615E0/func_80B63D88.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigpo_0x80B615E0/func_80B63D88.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpo_0x80B615E0/EnBigpo_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigpo_0x80B615E0/EnBigpo_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpo_0x80B615E0/func_80B64190.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigpo_0x80B615E0/func_80B64190.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpo_0x80B615E0/func_80B641E8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigpo_0x80B615E0/func_80B641E8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpo_0x80B615E0/func_80B64240.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigpo_0x80B615E0/func_80B64240.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpo_0x80B615E0/func_80B64470.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigpo_0x80B615E0/func_80B64470.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpo_0x80B615E0/func_80B6467C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigpo_0x80B615E0/func_80B6467C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpo_0x80B615E0/func_80B64880.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigpo_0x80B615E0/func_80B64880.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpo_0x80B615E0/func_80B64B08.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigpo_0x80B615E0/func_80B64B08.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpo_0x80B615E0/func_80B64DFC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigpo_0x80B615E0/func_80B64DFC.asm") diff --git a/src/overlays/actors/ovl_En_Bigslime/z_en_bigslime.c b/src/overlays/actors/ovl_En_Bigslime/z_en_bigslime.c index 75623b3192..18d5ee4f7e 100644 --- a/src/overlays/actors/ovl_En_Bigslime/z_en_bigslime.c +++ b/src/overlays/actors/ovl_En_Bigslime/z_en_bigslime.c @@ -23,208 +23,208 @@ const ActorInit En_Bigslime_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/EnBigslime_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigslime_0x808E4FC0/EnBigslime_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/EnBigslime_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigslime_0x808E4FC0/EnBigslime_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808E5388.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigslime_0x808E4FC0/func_808E5388.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808E5430.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigslime_0x808E4FC0/func_808E5430.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808E5484.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigslime_0x808E4FC0/func_808E5484.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808E574C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigslime_0x808E4FC0/func_808E574C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808E5988.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigslime_0x808E4FC0/func_808E5988.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808E5A00.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigslime_0x808E4FC0/func_808E5A00.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808E5BB0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigslime_0x808E4FC0/func_808E5BB0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808E5ED4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigslime_0x808E4FC0/func_808E5ED4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808E601C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigslime_0x808E4FC0/func_808E601C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808E616C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigslime_0x808E4FC0/func_808E616C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808E62B8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigslime_0x808E4FC0/func_808E62B8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808E64D4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigslime_0x808E4FC0/func_808E64D4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808E6538.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigslime_0x808E4FC0/func_808E6538.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808E6570.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigslime_0x808E4FC0/func_808E6570.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808E670C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigslime_0x808E4FC0/func_808E670C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808E6828.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigslime_0x808E4FC0/func_808E6828.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808E68AC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigslime_0x808E4FC0/func_808E68AC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808E69AC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigslime_0x808E4FC0/func_808E69AC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808E69F4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigslime_0x808E4FC0/func_808E69F4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808E6A70.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigslime_0x808E4FC0/func_808E6A70.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808E6B08.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigslime_0x808E4FC0/func_808E6B08.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808E6B68.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigslime_0x808E4FC0/func_808E6B68.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808E6C18.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigslime_0x808E4FC0/func_808E6C18.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808E6C44.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigslime_0x808E4FC0/func_808E6C44.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808E6C70.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigslime_0x808E4FC0/func_808E6C70.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808E6CC8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigslime_0x808E4FC0/func_808E6CC8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808E6D58.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigslime_0x808E4FC0/func_808E6D58.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808E6E80.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigslime_0x808E4FC0/func_808E6E80.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808E6F08.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigslime_0x808E4FC0/func_808E6F08.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808E6F50.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigslime_0x808E4FC0/func_808E6F50.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808E6FE0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigslime_0x808E4FC0/func_808E6FE0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808E7048.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigslime_0x808E4FC0/func_808E7048.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808E7154.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigslime_0x808E4FC0/func_808E7154.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808E71FC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigslime_0x808E4FC0/func_808E71FC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808E732C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigslime_0x808E4FC0/func_808E732C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808E7354.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigslime_0x808E4FC0/func_808E7354.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808E75D8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigslime_0x808E4FC0/func_808E75D8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808E7770.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigslime_0x808E4FC0/func_808E7770.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808E7AF8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigslime_0x808E4FC0/func_808E7AF8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808E7B80.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigslime_0x808E4FC0/func_808E7B80.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808E7D68.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigslime_0x808E4FC0/func_808E7D68.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808E8064.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigslime_0x808E4FC0/func_808E8064.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808E836C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigslime_0x808E4FC0/func_808E836C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808E844C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigslime_0x808E4FC0/func_808E844C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808E84DC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigslime_0x808E4FC0/func_808E84DC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808E88B8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigslime_0x808E4FC0/func_808E88B8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808E89CC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigslime_0x808E4FC0/func_808E89CC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808E8C38.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigslime_0x808E4FC0/func_808E8C38.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808E8CCC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigslime_0x808E4FC0/func_808E8CCC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808E90A4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigslime_0x808E4FC0/func_808E90A4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808E91EC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigslime_0x808E4FC0/func_808E91EC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808E9778.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigslime_0x808E4FC0/func_808E9778.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808E97D0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigslime_0x808E4FC0/func_808E97D0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808E994C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigslime_0x808E4FC0/func_808E994C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808E9AE0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigslime_0x808E4FC0/func_808E9AE0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808E9DA8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigslime_0x808E4FC0/func_808E9DA8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808E9DD0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigslime_0x808E4FC0/func_808E9DD0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808E9F38.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigslime_0x808E4FC0/func_808E9F38.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808E9FC0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigslime_0x808E4FC0/func_808E9FC0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808EA14C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigslime_0x808E4FC0/func_808EA14C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808EA1C8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigslime_0x808E4FC0/func_808EA1C8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808EA264.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigslime_0x808E4FC0/func_808EA264.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808EA2D0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigslime_0x808E4FC0/func_808EA2D0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808EA538.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigslime_0x808E4FC0/func_808EA538.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808EA5E8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigslime_0x808E4FC0/func_808EA5E8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808EA748.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigslime_0x808E4FC0/func_808EA748.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808EA7A4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigslime_0x808E4FC0/func_808EA7A4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808EA80C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigslime_0x808E4FC0/func_808EA80C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808EA860.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigslime_0x808E4FC0/func_808EA860.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808EA8FC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigslime_0x808E4FC0/func_808EA8FC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808EA9B8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigslime_0x808E4FC0/func_808EA9B8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808EAA40.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigslime_0x808E4FC0/func_808EAA40.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808EAA8C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigslime_0x808E4FC0/func_808EAA8C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808EAAF8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigslime_0x808E4FC0/func_808EAAF8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808EAB74.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigslime_0x808E4FC0/func_808EAB74.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808EABCC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigslime_0x808E4FC0/func_808EABCC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808EACEC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigslime_0x808E4FC0/func_808EACEC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808EAEBC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigslime_0x808E4FC0/func_808EAEBC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808EB0A8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigslime_0x808E4FC0/func_808EB0A8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808EB178.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigslime_0x808E4FC0/func_808EB178.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808EB24C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigslime_0x808E4FC0/func_808EB24C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808EB328.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigslime_0x808E4FC0/func_808EB328.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808EB574.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigslime_0x808E4FC0/func_808EB574.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808EB690.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigslime_0x808E4FC0/func_808EB690.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808EB708.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigslime_0x808E4FC0/func_808EB708.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808EB7F0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigslime_0x808E4FC0/func_808EB7F0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808EB804.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigslime_0x808E4FC0/func_808EB804.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808EB83C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigslime_0x808E4FC0/func_808EB83C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808EB8B4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigslime_0x808E4FC0/func_808EB8B4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808EB9E8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigslime_0x808E4FC0/func_808EB9E8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808EBBE4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigslime_0x808E4FC0/func_808EBBE4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808EBED0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigslime_0x808E4FC0/func_808EBED0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808EC158.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigslime_0x808E4FC0/func_808EC158.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808EC354.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigslime_0x808E4FC0/func_808EC354.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/EnBigslime_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigslime_0x808E4FC0/EnBigslime_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808EC708.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigslime_0x808E4FC0/func_808EC708.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808EC990.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigslime_0x808E4FC0/func_808EC990.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808ECD14.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigslime_0x808E4FC0/func_808ECD14.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808ED07C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigslime_0x808E4FC0/func_808ED07C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/EnBigslime_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigslime_0x808E4FC0/EnBigslime_Draw.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808ED3F4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bigslime_0x808E4FC0/func_808ED3F4.asm") diff --git a/src/overlays/actors/ovl_En_Bji_01/z_en_bji_01.c b/src/overlays/actors/ovl_En_Bji_01/z_en_bji_01.c index da7963a3af..21278fb6af 100644 --- a/src/overlays/actors/ovl_En_Bji_01/z_en_bji_01.c +++ b/src/overlays/actors/ovl_En_Bji_01/z_en_bji_01.c @@ -23,34 +23,34 @@ const ActorInit En_Bji_01_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bji_01_0x809CCDE0/func_809CCDE0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bji_01_0x809CCDE0/func_809CCDE0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bji_01_0x809CCDE0/func_809CCE98.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bji_01_0x809CCDE0/func_809CCE98.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bji_01_0x809CCDE0/func_809CCEE8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bji_01_0x809CCDE0/func_809CCEE8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bji_01_0x809CCDE0/func_809CD028.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bji_01_0x809CCDE0/func_809CD028.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bji_01_0x809CCDE0/func_809CD328.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bji_01_0x809CCDE0/func_809CD328.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bji_01_0x809CCDE0/func_809CD634.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bji_01_0x809CCDE0/func_809CD634.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bji_01_0x809CCDE0/func_809CD6B0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bji_01_0x809CCDE0/func_809CD6B0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bji_01_0x809CCDE0/func_809CD6C0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bji_01_0x809CCDE0/func_809CD6C0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bji_01_0x809CCDE0/func_809CD70C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bji_01_0x809CCDE0/func_809CD70C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bji_01_0x809CCDE0/func_809CD77C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bji_01_0x809CCDE0/func_809CD77C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bji_01_0x809CCDE0/EnBji01_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bji_01_0x809CCDE0/EnBji01_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bji_01_0x809CCDE0/EnBji01_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bji_01_0x809CCDE0/EnBji01_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bji_01_0x809CCDE0/EnBji01_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bji_01_0x809CCDE0/EnBji01_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bji_01_0x809CCDE0/func_809CDA4C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bji_01_0x809CCDE0/func_809CDA4C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bji_01_0x809CCDE0/func_809CDB04.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bji_01_0x809CCDE0/func_809CDB04.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bji_01_0x809CCDE0/EnBji01_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bji_01_0x809CCDE0/EnBji01_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Bjt/z_en_bjt.c b/src/overlays/actors/ovl_En_Bjt/z_en_bjt.c index 4bf5e9c75f..8b9fb1f9ca 100644 --- a/src/overlays/actors/ovl_En_Bjt/z_en_bjt.c +++ b/src/overlays/actors/ovl_En_Bjt/z_en_bjt.c @@ -23,32 +23,32 @@ const ActorInit En_Bjt_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bjt_0x80BFD2E0/func_80BFD2E0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bjt_0x80BFD2E0/func_80BFD2E0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bjt_0x80BFD2E0/func_80BFD30C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bjt_0x80BFD2E0/func_80BFD30C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bjt_0x80BFD2E0/func_80BFD3A4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bjt_0x80BFD2E0/func_80BFD3A4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bjt_0x80BFD2E0/func_80BFD434.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bjt_0x80BFD2E0/func_80BFD434.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bjt_0x80BFD2E0/func_80BFD4FC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bjt_0x80BFD2E0/func_80BFD4FC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bjt_0x80BFD2E0/func_80BFD5E4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bjt_0x80BFD2E0/func_80BFD5E4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bjt_0x80BFD2E0/func_80BFD6BC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bjt_0x80BFD2E0/func_80BFD6BC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bjt_0x80BFD2E0/func_80BFD8F0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bjt_0x80BFD2E0/func_80BFD8F0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bjt_0x80BFD2E0/func_80BFD984.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bjt_0x80BFD2E0/func_80BFD984.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bjt_0x80BFD2E0/func_80BFDA48.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bjt_0x80BFD2E0/func_80BFDA48.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bjt_0x80BFD2E0/func_80BFDAE8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bjt_0x80BFD2E0/func_80BFDAE8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bjt_0x80BFD2E0/EnBjt_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bjt_0x80BFD2E0/EnBjt_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bjt_0x80BFD2E0/EnBjt_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bjt_0x80BFD2E0/EnBjt_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bjt_0x80BFD2E0/EnBjt_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bjt_0x80BFD2E0/EnBjt_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bjt_0x80BFD2E0/EnBjt_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bjt_0x80BFD2E0/EnBjt_Draw.asm") 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 101131bef7..618732a419 100644 --- a/src/overlays/actors/ovl_En_Bom/z_en_bom.c +++ b/src/overlays/actors/ovl_En_Bom/z_en_bom.c @@ -23,22 +23,22 @@ const ActorInit En_Bom_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bom_0x80870DB0/EnBom_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bom_0x80870DB0/EnBom_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bom_0x80870DB0/EnBom_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bom_0x80870DB0/EnBom_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bom_0x80870DB0/func_80871058.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bom_0x80870DB0/func_80871058.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bom_0x80870DB0/func_808714D4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bom_0x80870DB0/func_808714D4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bom_0x80870DB0/func_808715B8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bom_0x80870DB0/func_808715B8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bom_0x80870DB0/EnBom_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bom_0x80870DB0/EnBom_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bom_0x80870DB0/EnBom_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bom_0x80870DB0/EnBom_Draw.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bom_0x80870DB0/func_80872648.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bom_0x80870DB0/func_80872648.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bom_0x80870DB0/func_808726DC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bom_0x80870DB0/func_808726DC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bom_0x80870DB0/func_80872BC0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bom_0x80870DB0/func_80872BC0.asm") 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 dba77d24ea..0053f31794 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 @@ -23,52 +23,52 @@ const ActorInit En_Bom_Bowl_Man_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bom_Bowl_Man_0x809C4790/EnBomBowlMan_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bom_Bowl_Man_0x809C4790/EnBomBowlMan_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bom_Bowl_Man_0x809C4790/EnBomBowlMan_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bom_Bowl_Man_0x809C4790/EnBomBowlMan_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bom_Bowl_Man_0x809C4790/func_809C493C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bom_Bowl_Man_0x809C4790/func_809C493C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bom_Bowl_Man_0x809C4790/func_809C49CC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bom_Bowl_Man_0x809C4790/func_809C49CC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bom_Bowl_Man_0x809C4790/func_809C4B50.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bom_Bowl_Man_0x809C4790/func_809C4B50.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bom_Bowl_Man_0x809C4790/func_809C4B6C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bom_Bowl_Man_0x809C4790/func_809C4B6C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bom_Bowl_Man_0x809C4790/func_809C4BC4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bom_Bowl_Man_0x809C4790/func_809C4BC4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bom_Bowl_Man_0x809C4790/func_809C4DA4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bom_Bowl_Man_0x809C4790/func_809C4DA4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bom_Bowl_Man_0x809C4790/func_809C51B4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bom_Bowl_Man_0x809C4790/func_809C51B4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bom_Bowl_Man_0x809C4790/func_809C52B4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bom_Bowl_Man_0x809C4790/func_809C52B4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bom_Bowl_Man_0x809C4790/func_809C5310.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bom_Bowl_Man_0x809C4790/func_809C5310.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bom_Bowl_Man_0x809C4790/func_809C53A4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bom_Bowl_Man_0x809C4790/func_809C53A4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bom_Bowl_Man_0x809C4790/func_809C5408.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bom_Bowl_Man_0x809C4790/func_809C5408.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bom_Bowl_Man_0x809C4790/func_809C5524.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bom_Bowl_Man_0x809C4790/func_809C5524.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bom_Bowl_Man_0x809C4790/func_809C5598.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bom_Bowl_Man_0x809C4790/func_809C5598.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bom_Bowl_Man_0x809C4790/func_809C5738.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bom_Bowl_Man_0x809C4790/func_809C5738.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bom_Bowl_Man_0x809C4790/func_809C59A4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bom_Bowl_Man_0x809C4790/func_809C59A4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bom_Bowl_Man_0x809C4790/func_809C59F0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bom_Bowl_Man_0x809C4790/func_809C59F0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bom_Bowl_Man_0x809C4790/func_809C5AA4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bom_Bowl_Man_0x809C4790/func_809C5AA4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bom_Bowl_Man_0x809C4790/func_809C5B1C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bom_Bowl_Man_0x809C4790/func_809C5B1C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bom_Bowl_Man_0x809C4790/func_809C5BA0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bom_Bowl_Man_0x809C4790/func_809C5BA0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bom_Bowl_Man_0x809C4790/func_809C5BF4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bom_Bowl_Man_0x809C4790/func_809C5BF4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bom_Bowl_Man_0x809C4790/EnBomBowlMan_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bom_Bowl_Man_0x809C4790/EnBomBowlMan_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bom_Bowl_Man_0x809C4790/func_809C5F44.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bom_Bowl_Man_0x809C4790/func_809C5F44.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bom_Bowl_Man_0x809C4790/EnBomBowlMan_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bom_Bowl_Man_0x809C4790/EnBomBowlMan_Draw.asm") 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 e8f38af732..6ea02b6e0e 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 @@ -23,32 +23,32 @@ const ActorInit En_Bom_Chu_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bom_Chu_0x808F74B0/EnBomChu_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bom_Chu_0x808F74B0/EnBomChu_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bom_Chu_0x808F74B0/EnBomChu_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bom_Chu_0x808F74B0/EnBomChu_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bom_Chu_0x808F74B0/func_808F75D0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bom_Chu_0x808F74B0/func_808F75D0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bom_Chu_0x808F74B0/func_808F77E4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bom_Chu_0x808F74B0/func_808F77E4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bom_Chu_0x808F74B0/func_808F7868.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bom_Chu_0x808F74B0/func_808F7868.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bom_Chu_0x808F74B0/func_808F7944.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bom_Chu_0x808F74B0/func_808F7944.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bom_Chu_0x808F74B0/func_808F79D4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bom_Chu_0x808F74B0/func_808F79D4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bom_Chu_0x808F74B0/func_808F7A84.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bom_Chu_0x808F74B0/func_808F7A84.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bom_Chu_0x808F74B0/func_808F7E74.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bom_Chu_0x808F74B0/func_808F7E74.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bom_Chu_0x808F74B0/func_808F7FA0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bom_Chu_0x808F74B0/func_808F7FA0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bom_Chu_0x808F74B0/func_808F7FD0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bom_Chu_0x808F74B0/func_808F7FD0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bom_Chu_0x808F74B0/func_808F8080.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bom_Chu_0x808F74B0/func_808F8080.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bom_Chu_0x808F74B0/func_808F818C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bom_Chu_0x808F74B0/func_808F818C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bom_Chu_0x808F74B0/EnBomChu_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bom_Chu_0x808F74B0/EnBomChu_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bom_Chu_0x808F74B0/EnBomChu_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bom_Chu_0x808F74B0/EnBomChu_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Bombal/z_en_bombal.c b/src/overlays/actors/ovl_En_Bombal/z_en_bombal.c index db4f5a2549..5cdbb77946 100644 --- a/src/overlays/actors/ovl_En_Bombal/z_en_bombal.c +++ b/src/overlays/actors/ovl_En_Bombal/z_en_bombal.c @@ -23,24 +23,24 @@ const ActorInit En_Bombal_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bombal_0x80C05A70/EnBombal_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bombal_0x80C05A70/EnBombal_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bombal_0x80C05A70/EnBombal_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bombal_0x80C05A70/EnBombal_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bombal_0x80C05A70/func_80C05B24.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bombal_0x80C05A70/func_80C05B24.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bombal_0x80C05A70/func_80C05B3C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bombal_0x80C05A70/func_80C05B3C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bombal_0x80C05A70/func_80C05C44.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bombal_0x80C05A70/func_80C05C44.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bombal_0x80C05A70/func_80C05DE8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bombal_0x80C05A70/func_80C05DE8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bombal_0x80C05A70/EnBombal_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bombal_0x80C05A70/EnBombal_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bombal_0x80C05A70/EnBombal_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bombal_0x80C05A70/EnBombal_Draw.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bombal_0x80C05A70/func_80C05F90.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bombal_0x80C05A70/func_80C05F90.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bombal_0x80C05A70/func_80C060B8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bombal_0x80C05A70/func_80C060B8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bombal_0x80C05A70/func_80C06208.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bombal_0x80C05A70/func_80C06208.asm") diff --git a/src/overlays/actors/ovl_En_Bombers/z_en_bombers.c b/src/overlays/actors/ovl_En_Bombers/z_en_bombers.c index d6ee246349..d7f5c0ff59 100644 --- a/src/overlays/actors/ovl_En_Bombers/z_en_bombers.c +++ b/src/overlays/actors/ovl_En_Bombers/z_en_bombers.c @@ -23,32 +23,32 @@ const ActorInit En_Bombers_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bombers_0x80C03530/EnBombers_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bombers_0x80C03530/EnBombers_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bombers_0x80C03530/EnBombers_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bombers_0x80C03530/EnBombers_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bombers_0x80C03530/func_80C03824.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bombers_0x80C03530/func_80C03824.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bombers_0x80C03530/func_80C038B4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bombers_0x80C03530/func_80C038B4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bombers_0x80C03530/func_80C039A8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bombers_0x80C03530/func_80C039A8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bombers_0x80C03530/func_80C03ACC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bombers_0x80C03530/func_80C03ACC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bombers_0x80C03530/func_80C03AF4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bombers_0x80C03530/func_80C03AF4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bombers_0x80C03530/func_80C03F64.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bombers_0x80C03530/func_80C03F64.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bombers_0x80C03530/func_80C03FAC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bombers_0x80C03530/func_80C03FAC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bombers_0x80C03530/func_80C042F8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bombers_0x80C03530/func_80C042F8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bombers_0x80C03530/func_80C04354.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bombers_0x80C03530/func_80C04354.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bombers_0x80C03530/func_80C043C8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bombers_0x80C03530/func_80C043C8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bombers_0x80C03530/EnBombers_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bombers_0x80C03530/EnBombers_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bombers_0x80C03530/func_80C045B4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bombers_0x80C03530/func_80C045B4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bombers_0x80C03530/EnBombers_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bombers_0x80C03530/EnBombers_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Bombers2/z_en_bombers2.c b/src/overlays/actors/ovl_En_Bombers2/z_en_bombers2.c index 715c695869..d9f8ddb302 100644 --- a/src/overlays/actors/ovl_En_Bombers2/z_en_bombers2.c +++ b/src/overlays/actors/ovl_En_Bombers2/z_en_bombers2.c @@ -23,26 +23,26 @@ const ActorInit En_Bombers2_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bombers2_0x80C04930/EnBombers2_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bombers2_0x80C04930/EnBombers2_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bombers2_0x80C04930/EnBombers2_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bombers2_0x80C04930/EnBombers2_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bombers2_0x80C04930/func_80C04AAC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bombers2_0x80C04930/func_80C04AAC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bombers2_0x80C04930/func_80C04B40.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bombers2_0x80C04930/func_80C04B40.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bombers2_0x80C04930/func_80C04BA0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bombers2_0x80C04930/func_80C04BA0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bombers2_0x80C04930/func_80C04D00.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bombers2_0x80C04930/func_80C04D00.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bombers2_0x80C04930/func_80C04D8C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bombers2_0x80C04930/func_80C04D8C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bombers2_0x80C04930/func_80C050B8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bombers2_0x80C04930/func_80C050B8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bombers2_0x80C04930/func_80C0520C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bombers2_0x80C04930/func_80C0520C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bombers2_0x80C04930/EnBombers2_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bombers2_0x80C04930/EnBombers2_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bombers2_0x80C04930/func_80C056D4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bombers2_0x80C04930/func_80C056D4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bombers2_0x80C04930/EnBombers2_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bombers2_0x80C04930/EnBombers2_Draw.asm") 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 e692865926..5c0ec70aea 100644 --- a/src/overlays/actors/ovl_En_Bombf/z_en_bombf.c +++ b/src/overlays/actors/ovl_En_Bombf/z_en_bombf.c @@ -23,24 +23,24 @@ const ActorInit En_Bombf_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bombf_0x808AE8C0/func_808AE8C0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bombf_0x808AE8C0/func_808AE8C0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bombf_0x808AE8C0/EnBombf_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bombf_0x808AE8C0/EnBombf_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bombf_0x808AE8C0/EnBombf_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bombf_0x808AE8C0/EnBombf_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bombf_0x808AE8C0/func_808AEAB8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bombf_0x808AE8C0/func_808AEAB8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bombf_0x808AE8C0/func_808AEAE0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bombf_0x808AE8C0/func_808AEAE0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bombf_0x808AE8C0/func_808AEE3C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bombf_0x808AE8C0/func_808AEE3C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bombf_0x808AE8C0/func_808AEF68.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bombf_0x808AE8C0/func_808AEF68.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bombf_0x808AE8C0/func_808AEFD4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bombf_0x808AE8C0/func_808AEFD4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bombf_0x808AE8C0/EnBombf_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bombf_0x808AE8C0/EnBombf_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bombf_0x808AE8C0/func_808AF86C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bombf_0x808AE8C0/func_808AF86C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bombf_0x808AE8C0/EnBombf_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bombf_0x808AE8C0/EnBombf_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Bomjima/z_en_bomjima.c b/src/overlays/actors/ovl_En_Bomjima/z_en_bomjima.c index a4e082ccf1..eb809269e3 100644 --- a/src/overlays/actors/ovl_En_Bomjima/z_en_bomjima.c +++ b/src/overlays/actors/ovl_En_Bomjima/z_en_bomjima.c @@ -23,70 +23,70 @@ const ActorInit En_Bomjima_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bomjima_0x80BFE170/EnBomjima_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bomjima_0x80BFE170/EnBomjima_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bomjima_0x80BFE170/EnBomjima_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bomjima_0x80BFE170/EnBomjima_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bomjima_0x80BFE170/func_80BFE32C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bomjima_0x80BFE170/func_80BFE32C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bomjima_0x80BFE170/func_80BFE494.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bomjima_0x80BFE170/func_80BFE494.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bomjima_0x80BFE170/func_80BFE524.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bomjima_0x80BFE170/func_80BFE524.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bomjima_0x80BFE170/func_80BFE65C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bomjima_0x80BFE170/func_80BFE65C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bomjima_0x80BFE170/func_80BFE67C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bomjima_0x80BFE170/func_80BFE67C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bomjima_0x80BFE170/func_80BFEA94.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bomjima_0x80BFE170/func_80BFEA94.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bomjima_0x80BFE170/func_80BFEB1C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bomjima_0x80BFE170/func_80BFEB1C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bomjima_0x80BFE170/func_80BFEB64.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bomjima_0x80BFE170/func_80BFEB64.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bomjima_0x80BFE170/func_80BFEFF0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bomjima_0x80BFE170/func_80BFEFF0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bomjima_0x80BFE170/func_80BFF03C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bomjima_0x80BFE170/func_80BFF03C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bomjima_0x80BFE170/func_80BFF120.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bomjima_0x80BFE170/func_80BFF120.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bomjima_0x80BFE170/func_80BFF174.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bomjima_0x80BFE170/func_80BFF174.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bomjima_0x80BFE170/func_80BFF3F0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bomjima_0x80BFE170/func_80BFF3F0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bomjima_0x80BFE170/func_80BFF430.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bomjima_0x80BFE170/func_80BFF430.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bomjima_0x80BFE170/func_80BFF4F4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bomjima_0x80BFE170/func_80BFF4F4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bomjima_0x80BFE170/func_80BFF52C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bomjima_0x80BFE170/func_80BFF52C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bomjima_0x80BFE170/func_80BFF6CC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bomjima_0x80BFE170/func_80BFF6CC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bomjima_0x80BFE170/func_80BFF754.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bomjima_0x80BFE170/func_80BFF754.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bomjima_0x80BFE170/func_80BFF9B0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bomjima_0x80BFE170/func_80BFF9B0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bomjima_0x80BFE170/func_80BFFB40.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bomjima_0x80BFE170/func_80BFFB40.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bomjima_0x80BFE170/func_80BFFBC4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bomjima_0x80BFE170/func_80BFFBC4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bomjima_0x80BFE170/func_80BFFCFC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bomjima_0x80BFE170/func_80BFFCFC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bomjima_0x80BFE170/func_80BFFD48.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bomjima_0x80BFE170/func_80BFFD48.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bomjima_0x80BFE170/func_80BFFE48.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bomjima_0x80BFE170/func_80BFFE48.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bomjima_0x80BFE170/func_80BFFF54.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bomjima_0x80BFE170/func_80BFFF54.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bomjima_0x80BFE170/func_80C0011C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bomjima_0x80BFE170/func_80C0011C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bomjima_0x80BFE170/func_80C00168.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bomjima_0x80BFE170/func_80C00168.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bomjima_0x80BFE170/func_80C00234.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bomjima_0x80BFE170/func_80C00234.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bomjima_0x80BFE170/func_80C00284.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bomjima_0x80BFE170/func_80C00284.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bomjima_0x80BFE170/EnBomjima_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bomjima_0x80BFE170/EnBomjima_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bomjima_0x80BFE170/func_80C007F4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bomjima_0x80BFE170/func_80C007F4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bomjima_0x80BFE170/EnBomjima_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bomjima_0x80BFE170/EnBomjima_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Bomjimb/z_en_bomjimb.c b/src/overlays/actors/ovl_En_Bomjimb/z_en_bomjimb.c index 9a03581d4f..af288f131e 100644 --- a/src/overlays/actors/ovl_En_Bomjimb/z_en_bomjimb.c +++ b/src/overlays/actors/ovl_En_Bomjimb/z_en_bomjimb.c @@ -23,66 +23,66 @@ const ActorInit En_Bomjimb_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bomjimb_0x80C00EA0/EnBomjimb_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bomjimb_0x80C00EA0/EnBomjimb_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bomjimb_0x80C00EA0/EnBomjimb_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bomjimb_0x80C00EA0/EnBomjimb_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bomjimb_0x80C00EA0/func_80C0113C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bomjimb_0x80C00EA0/func_80C0113C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bomjimb_0x80C00EA0/func_80C011CC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bomjimb_0x80C00EA0/func_80C011CC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bomjimb_0x80C00EA0/func_80C012E0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bomjimb_0x80C00EA0/func_80C012E0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bomjimb_0x80C00EA0/func_80C012FC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bomjimb_0x80C00EA0/func_80C012FC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bomjimb_0x80C00EA0/func_80C013B4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bomjimb_0x80C00EA0/func_80C013B4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bomjimb_0x80C00EA0/func_80C013F0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bomjimb_0x80C00EA0/func_80C013F0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bomjimb_0x80C00EA0/func_80C01494.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bomjimb_0x80C00EA0/func_80C01494.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bomjimb_0x80C00EA0/func_80C014E4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bomjimb_0x80C00EA0/func_80C014E4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bomjimb_0x80C00EA0/func_80C01984.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bomjimb_0x80C00EA0/func_80C01984.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bomjimb_0x80C00EA0/func_80C01A24.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bomjimb_0x80C00EA0/func_80C01A24.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bomjimb_0x80C00EA0/func_80C01B40.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bomjimb_0x80C00EA0/func_80C01B40.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bomjimb_0x80C00EA0/func_80C01B74.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bomjimb_0x80C00EA0/func_80C01B74.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bomjimb_0x80C00EA0/func_80C01C18.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bomjimb_0x80C00EA0/func_80C01C18.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bomjimb_0x80C00EA0/func_80C01CD0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bomjimb_0x80C00EA0/func_80C01CD0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bomjimb_0x80C00EA0/func_80C01FD4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bomjimb_0x80C00EA0/func_80C01FD4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bomjimb_0x80C00EA0/func_80C0201C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bomjimb_0x80C00EA0/func_80C0201C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bomjimb_0x80C00EA0/func_80C02108.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bomjimb_0x80C00EA0/func_80C02108.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bomjimb_0x80C00EA0/func_80C0217C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bomjimb_0x80C00EA0/func_80C0217C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bomjimb_0x80C00EA0/func_80C0250C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bomjimb_0x80C00EA0/func_80C0250C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bomjimb_0x80C00EA0/func_80C02570.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bomjimb_0x80C00EA0/func_80C02570.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bomjimb_0x80C00EA0/func_80C0267C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bomjimb_0x80C00EA0/func_80C0267C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bomjimb_0x80C00EA0/func_80C02704.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bomjimb_0x80C00EA0/func_80C02704.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bomjimb_0x80C00EA0/func_80C02740.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bomjimb_0x80C00EA0/func_80C02740.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bomjimb_0x80C00EA0/func_80C02A14.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bomjimb_0x80C00EA0/func_80C02A14.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bomjimb_0x80C00EA0/func_80C02BCC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bomjimb_0x80C00EA0/func_80C02BCC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bomjimb_0x80C00EA0/func_80C02CA4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bomjimb_0x80C00EA0/func_80C02CA4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bomjimb_0x80C00EA0/func_80C02DAC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bomjimb_0x80C00EA0/func_80C02DAC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bomjimb_0x80C00EA0/EnBomjimb_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bomjimb_0x80C00EA0/EnBomjimb_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bomjimb_0x80C00EA0/func_80C02FA8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bomjimb_0x80C00EA0/func_80C02FA8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bomjimb_0x80C00EA0/EnBomjimb_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bomjimb_0x80C00EA0/EnBomjimb_Draw.asm") 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 eac123866e..566e786580 100644 --- a/src/overlays/actors/ovl_En_Boom/z_en_boom.c +++ b/src/overlays/actors/ovl_En_Boom/z_en_boom.c @@ -23,16 +23,16 @@ const ActorInit En_Boom_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Boom_0x808A24D0/func_808A24D0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Boom_0x808A24D0/func_808A24D0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Boom_0x808A24D0/func_808A24DC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Boom_0x808A24D0/func_808A24DC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Boom_0x808A24D0/EnBoom_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Boom_0x808A24D0/EnBoom_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Boom_0x808A24D0/EnBoom_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Boom_0x808A24D0/EnBoom_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Boom_0x808A24D0/func_808A2918.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Boom_0x808A24D0/func_808A2918.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Boom_0x808A24D0/EnBoom_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Boom_0x808A24D0/EnBoom_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Boom_0x808A24D0/EnBoom_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Boom_0x808A24D0/EnBoom_Draw.asm") 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 9079bea25e..18209977d0 100644 --- a/src/overlays/actors/ovl_En_Box/z_en_box.c +++ b/src/overlays/actors/ovl_En_Box/z_en_box.c @@ -23,54 +23,54 @@ const ActorInit En_Box_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Box_0x80867BD0/func_80867BD0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Box_0x80867BD0/func_80867BD0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Box_0x80867BD0/func_80867BDC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Box_0x80867BD0/func_80867BDC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Box_0x80867BD0/func_80867C14.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Box_0x80867BD0/func_80867C14.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Box_0x80867BD0/func_80867C8C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Box_0x80867BD0/func_80867C8C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Box_0x80867BD0/func_80867FBC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Box_0x80867BD0/func_80867FBC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Box_0x80867BD0/func_80867FE4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Box_0x80867BD0/func_80867FE4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Box_0x80867BD0/func_8086800C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Box_0x80867BD0/func_8086800C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Box_0x80867BD0/EnBox_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Box_0x80867BD0/EnBox_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Box_0x80867BD0/EnBox_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Box_0x80867BD0/EnBox_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Box_0x80867BD0/func_80868630.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Box_0x80867BD0/func_80868630.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Box_0x80867BD0/func_80868734.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Box_0x80867BD0/func_80868734.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Box_0x80867BD0/func_808687E8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Box_0x80867BD0/func_808687E8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Box_0x80867BD0/func_80868944.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Box_0x80867BD0/func_80868944.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Box_0x80867BD0/func_808689E8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Box_0x80867BD0/func_808689E8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Box_0x80867BD0/func_80868A6C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Box_0x80867BD0/func_80868A6C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Box_0x80867BD0/func_80868AFC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Box_0x80867BD0/func_80868AFC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Box_0x80867BD0/func_80868B74.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Box_0x80867BD0/func_80868B74.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Box_0x80867BD0/func_80868CC8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Box_0x80867BD0/func_80868CC8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Box_0x80867BD0/func_80869020.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Box_0x80867BD0/func_80869020.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Box_0x80867BD0/func_808692E0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Box_0x80867BD0/func_808692E0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Box_0x80867BD0/EnBox_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Box_0x80867BD0/EnBox_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Box_0x80867BD0/func_80869600.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Box_0x80867BD0/func_80869600.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Box_0x80867BD0/func_80869850.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Box_0x80867BD0/func_80869850.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Box_0x80867BD0/func_80869874.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Box_0x80867BD0/func_80869874.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Box_0x80867BD0/func_808698B4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Box_0x80867BD0/func_808698B4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Box_0x80867BD0/EnBox_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Box_0x80867BD0/EnBox_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Bsb/z_en_bsb.c b/src/overlays/actors/ovl_En_Bsb/z_en_bsb.c index 7b22ae6d3d..2a031a5a18 100644 --- a/src/overlays/actors/ovl_En_Bsb/z_en_bsb.c +++ b/src/overlays/actors/ovl_En_Bsb/z_en_bsb.c @@ -23,114 +23,114 @@ const ActorInit En_Bsb_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bsb_0x80C0B290/func_80C0B290.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bsb_0x80C0B290/func_80C0B290.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bsb_0x80C0B290/func_80C0B31C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bsb_0x80C0B290/func_80C0B31C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bsb_0x80C0B290/EnBsb_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bsb_0x80C0B290/EnBsb_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bsb_0x80C0B290/EnBsb_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bsb_0x80C0B290/EnBsb_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bsb_0x80C0B290/func_80C0B888.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bsb_0x80C0B290/func_80C0B888.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bsb_0x80C0B290/func_80C0B970.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bsb_0x80C0B290/func_80C0B970.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bsb_0x80C0B290/func_80C0BA58.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bsb_0x80C0B290/func_80C0BA58.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bsb_0x80C0B290/func_80C0BC30.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bsb_0x80C0B290/func_80C0BC30.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bsb_0x80C0B290/func_80C0BE1C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bsb_0x80C0B290/func_80C0BE1C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bsb_0x80C0B290/func_80C0BF2C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bsb_0x80C0B290/func_80C0BF2C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bsb_0x80C0B290/func_80C0BFE8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bsb_0x80C0B290/func_80C0BFE8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bsb_0x80C0B290/func_80C0C0F4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bsb_0x80C0B290/func_80C0C0F4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bsb_0x80C0B290/func_80C0C238.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bsb_0x80C0B290/func_80C0C238.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bsb_0x80C0B290/func_80C0C32C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bsb_0x80C0B290/func_80C0C32C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bsb_0x80C0B290/func_80C0C364.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bsb_0x80C0B290/func_80C0C364.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bsb_0x80C0B290/func_80C0C430.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bsb_0x80C0B290/func_80C0C430.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bsb_0x80C0B290/func_80C0C484.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bsb_0x80C0B290/func_80C0C484.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bsb_0x80C0B290/func_80C0C610.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bsb_0x80C0B290/func_80C0C610.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bsb_0x80C0B290/func_80C0C6A8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bsb_0x80C0B290/func_80C0C6A8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bsb_0x80C0B290/func_80C0C86C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bsb_0x80C0B290/func_80C0C86C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bsb_0x80C0B290/func_80C0C8EC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bsb_0x80C0B290/func_80C0C8EC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bsb_0x80C0B290/func_80C0CA28.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bsb_0x80C0B290/func_80C0CA28.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bsb_0x80C0B290/func_80C0CB3C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bsb_0x80C0B290/func_80C0CB3C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bsb_0x80C0B290/func_80C0CCCC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bsb_0x80C0B290/func_80C0CCCC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bsb_0x80C0B290/func_80C0CD04.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bsb_0x80C0B290/func_80C0CD04.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bsb_0x80C0B290/func_80C0CD90.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bsb_0x80C0B290/func_80C0CD90.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bsb_0x80C0B290/func_80C0CDE4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bsb_0x80C0B290/func_80C0CDE4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bsb_0x80C0B290/func_80C0CF4C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bsb_0x80C0B290/func_80C0CF4C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bsb_0x80C0B290/func_80C0CFDC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bsb_0x80C0B290/func_80C0CFDC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bsb_0x80C0B290/func_80C0D00C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bsb_0x80C0B290/func_80C0D00C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bsb_0x80C0B290/func_80C0D10C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bsb_0x80C0B290/func_80C0D10C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bsb_0x80C0B290/func_80C0D214.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bsb_0x80C0B290/func_80C0D214.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bsb_0x80C0B290/func_80C0D27C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bsb_0x80C0B290/func_80C0D27C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bsb_0x80C0B290/func_80C0D334.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bsb_0x80C0B290/func_80C0D334.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bsb_0x80C0B290/func_80C0D384.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bsb_0x80C0B290/func_80C0D384.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bsb_0x80C0B290/func_80C0D3C0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bsb_0x80C0B290/func_80C0D3C0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bsb_0x80C0B290/func_80C0D51C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bsb_0x80C0B290/func_80C0D51C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bsb_0x80C0B290/func_80C0D964.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bsb_0x80C0B290/func_80C0D964.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bsb_0x80C0B290/func_80C0D9B4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bsb_0x80C0B290/func_80C0D9B4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bsb_0x80C0B290/func_80C0DA58.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bsb_0x80C0B290/func_80C0DA58.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bsb_0x80C0B290/func_80C0DB18.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bsb_0x80C0B290/func_80C0DB18.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bsb_0x80C0B290/func_80C0E178.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bsb_0x80C0B290/func_80C0E178.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bsb_0x80C0B290/func_80C0E1C0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bsb_0x80C0B290/func_80C0E1C0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bsb_0x80C0B290/func_80C0E3B8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bsb_0x80C0B290/func_80C0E3B8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bsb_0x80C0B290/func_80C0E480.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bsb_0x80C0B290/func_80C0E480.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bsb_0x80C0B290/func_80C0E4FC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bsb_0x80C0B290/func_80C0E4FC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bsb_0x80C0B290/func_80C0E618.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bsb_0x80C0B290/func_80C0E618.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bsb_0x80C0B290/func_80C0E9CC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bsb_0x80C0B290/func_80C0E9CC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bsb_0x80C0B290/EnBsb_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bsb_0x80C0B290/EnBsb_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bsb_0x80C0B290/func_80C0EEA0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bsb_0x80C0B290/func_80C0EEA0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bsb_0x80C0B290/func_80C0F078.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bsb_0x80C0B290/func_80C0F078.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bsb_0x80C0B290/func_80C0F170.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bsb_0x80C0B290/func_80C0F170.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bsb_0x80C0B290/EnBsb_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bsb_0x80C0B290/EnBsb_Draw.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bsb_0x80C0B290/func_80C0F544.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bsb_0x80C0B290/func_80C0F544.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bsb_0x80C0B290/func_80C0F640.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bsb_0x80C0B290/func_80C0F640.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bsb_0x80C0B290/func_80C0F758.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bsb_0x80C0B290/func_80C0F758.asm") diff --git a/src/overlays/actors/ovl_En_Bu/z_en_bu.c b/src/overlays/actors/ovl_En_Bu/z_en_bu.c index 4a1187f8cf..63c4d14bea 100644 --- a/src/overlays/actors/ovl_En_Bu/z_en_bu.c +++ b/src/overlays/actors/ovl_En_Bu/z_en_bu.c @@ -23,12 +23,12 @@ const ActorInit En_Bu_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bu_0x809ACD90/EnBu_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bu_0x809ACD90/EnBu_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bu_0x809ACD90/EnBu_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bu_0x809ACD90/EnBu_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bu_0x809ACD90/func_809ACDB8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bu_0x809ACD90/func_809ACDB8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bu_0x809ACD90/EnBu_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bu_0x809ACD90/EnBu_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bu_0x809ACD90/EnBu_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bu_0x809ACD90/EnBu_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Bubble/z_en_bubble.c b/src/overlays/actors/ovl_En_Bubble/z_en_bubble.c index 95f4a40ef8..79e1371831 100644 --- a/src/overlays/actors/ovl_En_Bubble/z_en_bubble.c +++ b/src/overlays/actors/ovl_En_Bubble/z_en_bubble.c @@ -23,44 +23,44 @@ const ActorInit En_Bubble_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bubble_0x8089F4E0/func_8089F4E0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bubble_0x8089F4E0/func_8089F4E0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bubble_0x8089F4E0/func_8089F59C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bubble_0x8089F4E0/func_8089F59C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bubble_0x8089F4E0/func_8089F5D0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bubble_0x8089F4E0/func_8089F5D0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bubble_0x8089F4E0/func_8089F5F4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bubble_0x8089F4E0/func_8089F5F4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bubble_0x8089F4E0/func_8089F660.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bubble_0x8089F4E0/func_8089F660.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bubble_0x8089F4E0/func_8089F8BC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bubble_0x8089F4E0/func_8089F8BC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bubble_0x8089F4E0/func_8089F908.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bubble_0x8089F4E0/func_8089F908.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bubble_0x8089F4E0/func_8089F95C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bubble_0x8089F4E0/func_8089F95C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bubble_0x8089F4E0/func_8089F9E4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bubble_0x8089F4E0/func_8089F9E4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bubble_0x8089F4E0/func_8089FA54.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bubble_0x8089F4E0/func_8089FA54.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bubble_0x8089F4E0/func_8089FF30.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bubble_0x8089F4E0/func_8089FF30.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bubble_0x8089F4E0/func_8089FFCC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bubble_0x8089F4E0/func_8089FFCC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bubble_0x8089F4E0/func_808A005C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bubble_0x8089F4E0/func_808A005C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bubble_0x8089F4E0/EnBubble_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bubble_0x8089F4E0/EnBubble_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bubble_0x8089F4E0/EnBubble_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bubble_0x8089F4E0/EnBubble_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bubble_0x8089F4E0/func_808A029C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bubble_0x8089F4E0/func_808A029C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bubble_0x8089F4E0/func_808A0350.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bubble_0x8089F4E0/func_808A0350.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bubble_0x8089F4E0/func_808A03A0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bubble_0x8089F4E0/func_808A03A0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bubble_0x8089F4E0/func_808A03E8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bubble_0x8089F4E0/func_808A03E8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bubble_0x8089F4E0/EnBubble_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bubble_0x8089F4E0/EnBubble_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Bubble_0x8089F4E0/EnBubble_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bubble_0x8089F4E0/EnBubble_Draw.asm") 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 c9666be485..10efd6b03d 100644 --- a/src/overlays/actors/ovl_En_Butte/z_en_butte.c +++ b/src/overlays/actors/ovl_En_Butte/z_en_butte.c @@ -23,40 +23,40 @@ const ActorInit En_Butte_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Butte_0x8091C0A0/func_8091C0A0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Butte_0x8091C0A0/func_8091C0A0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Butte_0x8091C0A0/func_8091C124.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Butte_0x8091C0A0/func_8091C124.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Butte_0x8091C0A0/func_8091C140.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Butte_0x8091C0A0/func_8091C140.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Butte_0x8091C0A0/func_8091C178.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Butte_0x8091C0A0/func_8091C178.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Butte_0x8091C0A0/EnButte_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Butte_0x8091C0A0/EnButte_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Butte_0x8091C0A0/EnButte_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Butte_0x8091C0A0/EnButte_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Butte_0x8091C0A0/func_8091C524.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Butte_0x8091C0A0/func_8091C524.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Butte_0x8091C0A0/func_8091C5EC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Butte_0x8091C0A0/func_8091C5EC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Butte_0x8091C0A0/func_8091C6B4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Butte_0x8091C0A0/func_8091C6B4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Butte_0x8091C0A0/func_8091C748.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Butte_0x8091C0A0/func_8091C748.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Butte_0x8091C0A0/func_8091C794.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Butte_0x8091C0A0/func_8091C794.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Butte_0x8091C0A0/func_8091CB68.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Butte_0x8091C0A0/func_8091CB68.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Butte_0x8091C0A0/func_8091CBB4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Butte_0x8091C0A0/func_8091CBB4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Butte_0x8091C0A0/func_8091CF64.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Butte_0x8091C0A0/func_8091CF64.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Butte_0x8091C0A0/func_8091CFB4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Butte_0x8091C0A0/func_8091CFB4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Butte_0x8091C0A0/func_8091D070.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Butte_0x8091C0A0/func_8091D070.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Butte_0x8091C0A0/func_8091D090.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Butte_0x8091C0A0/func_8091D090.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Butte_0x8091C0A0/EnButte_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Butte_0x8091C0A0/EnButte_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Butte_0x8091C0A0/EnButte_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Butte_0x8091C0A0/EnButte_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Cha/z_en_cha.c b/src/overlays/actors/ovl_En_Cha/z_en_cha.c index 2c2ccdb3bf..5319ab3d68 100644 --- a/src/overlays/actors/ovl_En_Cha/z_en_cha.c +++ b/src/overlays/actors/ovl_En_Cha/z_en_cha.c @@ -23,14 +23,14 @@ const ActorInit En_Cha_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Cha_0x80BEB520/EnCha_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Cha_0x80BEB520/EnCha_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Cha_0x80BEB520/EnCha_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Cha_0x80BEB520/EnCha_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Cha_0x80BEB520/func_80BEB5DC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Cha_0x80BEB520/func_80BEB5DC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Cha_0x80BEB520/func_80BEB654.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Cha_0x80BEB520/func_80BEB654.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Cha_0x80BEB520/EnCha_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Cha_0x80BEB520/EnCha_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Cha_0x80BEB520/EnCha_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Cha_0x80BEB520/EnCha_Draw.asm") 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 20c5876059..6a4635c6ab 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 @@ -23,32 +23,32 @@ const ActorInit En_Clear_Tag_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Clear_Tag_0x80947F60/func_80947F60.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Clear_Tag_0x80947F60/func_80947F60.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Clear_Tag_0x80947F60/func_809480C8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Clear_Tag_0x80947F60/func_809480C8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Clear_Tag_0x80947F60/func_80948264.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Clear_Tag_0x80947F60/func_80948264.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Clear_Tag_0x80947F60/func_809484EC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Clear_Tag_0x80947F60/func_809484EC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Clear_Tag_0x80947F60/func_809485A8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Clear_Tag_0x80947F60/func_809485A8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Clear_Tag_0x80947F60/func_80948788.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Clear_Tag_0x80947F60/func_80948788.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Clear_Tag_0x80947F60/func_8094899C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Clear_Tag_0x80947F60/func_8094899C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Clear_Tag_0x80947F60/func_80948A54.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Clear_Tag_0x80947F60/func_80948A54.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Clear_Tag_0x80947F60/EnClearTag_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Clear_Tag_0x80947F60/EnClearTag_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Clear_Tag_0x80947F60/EnClearTag_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Clear_Tag_0x80947F60/EnClearTag_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Clear_Tag_0x80947F60/func_80949288.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Clear_Tag_0x80947F60/func_80949288.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Clear_Tag_0x80947F60/EnClearTag_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Clear_Tag_0x80947F60/EnClearTag_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Clear_Tag_0x80947F60/EnClearTag_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Clear_Tag_0x80947F60/EnClearTag_Draw.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Clear_Tag_0x80947F60/func_809495F8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Clear_Tag_0x80947F60/func_809495F8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Clear_Tag_0x80947F60/func_80949BD4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Clear_Tag_0x80947F60/func_80949BD4.asm") diff --git a/src/overlays/actors/ovl_En_Cne_01/z_en_cne_01.c b/src/overlays/actors/ovl_En_Cne_01/z_en_cne_01.c index b4b5adaa73..6b6b0b6c60 100644 --- a/src/overlays/actors/ovl_En_Cne_01/z_en_cne_01.c +++ b/src/overlays/actors/ovl_En_Cne_01/z_en_cne_01.c @@ -23,30 +23,30 @@ const ActorInit En_Cne_01_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Cne_01_0x809CB290/func_809CB290.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Cne_01_0x809CB290/func_809CB290.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Cne_01_0x809CB290/func_809CB404.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Cne_01_0x809CB290/func_809CB404.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Cne_01_0x809CB290/func_809CB4A0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Cne_01_0x809CB290/func_809CB4A0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Cne_01_0x809CB290/func_809CB520.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Cne_01_0x809CB290/func_809CB520.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Cne_01_0x809CB290/func_809CB5A0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Cne_01_0x809CB290/func_809CB5A0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Cne_01_0x809CB290/func_809CB5D8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Cne_01_0x809CB290/func_809CB5D8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Cne_01_0x809CB290/func_809CB5FC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Cne_01_0x809CB290/func_809CB5FC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Cne_01_0x809CB290/EnCne01_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Cne_01_0x809CB290/EnCne01_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Cne_01_0x809CB290/EnCne01_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Cne_01_0x809CB290/EnCne01_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Cne_01_0x809CB290/EnCne01_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Cne_01_0x809CB290/EnCne01_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Cne_01_0x809CB290/func_809CB920.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Cne_01_0x809CB290/func_809CB920.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Cne_01_0x809CB290/func_809CBBC8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Cne_01_0x809CB290/func_809CBBC8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Cne_01_0x809CB290/func_809CBCA0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Cne_01_0x809CB290/func_809CBCA0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Cne_01_0x809CB290/EnCne01_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Cne_01_0x809CB290/EnCne01_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Col_Man/z_en_col_man.c b/src/overlays/actors/ovl_En_Col_Man/z_en_col_man.c index 22f23088f4..c16f8b21f9 100644 --- a/src/overlays/actors/ovl_En_Col_Man/z_en_col_man.c +++ b/src/overlays/actors/ovl_En_Col_Man/z_en_col_man.c @@ -22,30 +22,30 @@ const ActorInit En_Col_Man_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Col_Man_0x80AFDC40/EnColMan_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Col_Man_0x80AFDC40/EnColMan_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Col_Man_0x80AFDC40/EnColMan_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Col_Man_0x80AFDC40/EnColMan_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Col_Man_0x80AFDC40/func_80AFDD60.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Col_Man_0x80AFDC40/func_80AFDD60.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Col_Man_0x80AFDC40/func_80AFDE00.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Col_Man_0x80AFDC40/func_80AFDE00.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Col_Man_0x80AFDC40/func_80AFDF00.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Col_Man_0x80AFDC40/func_80AFDF00.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Col_Man_0x80AFDC40/func_80AFDF60.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Col_Man_0x80AFDC40/func_80AFDF60.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Col_Man_0x80AFDC40/func_80AFDFB4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Col_Man_0x80AFDC40/func_80AFDFB4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Col_Man_0x80AFDC40/func_80AFE234.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Col_Man_0x80AFDC40/func_80AFE234.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Col_Man_0x80AFDC40/func_80AFE25C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Col_Man_0x80AFDC40/func_80AFE25C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Col_Man_0x80AFDC40/EnColMan_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Col_Man_0x80AFDC40/EnColMan_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Col_Man_0x80AFDC40/func_80AFE414.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Col_Man_0x80AFDC40/func_80AFE414.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Col_Man_0x80AFDC40/func_80AFE4AC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Col_Man_0x80AFDC40/func_80AFE4AC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Col_Man_0x80AFDC40/func_80AFE584.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Col_Man_0x80AFDC40/func_80AFE584.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Col_Man_0x80AFDC40/func_80AFE650.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Col_Man_0x80AFDC40/func_80AFE650.asm") diff --git a/src/overlays/actors/ovl_En_Cow/z_en_cow.c b/src/overlays/actors/ovl_En_Cow/z_en_cow.c index ac7f0b3511..96ee10c891 100644 --- a/src/overlays/actors/ovl_En_Cow/z_en_cow.c +++ b/src/overlays/actors/ovl_En_Cow/z_en_cow.c @@ -23,42 +23,42 @@ const ActorInit En_Cow_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Cow_0x8099C290/func_8099C290.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Cow_0x8099C290/func_8099C290.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Cow_0x8099C290/func_8099C328.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Cow_0x8099C290/func_8099C328.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Cow_0x8099C290/func_8099C41C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Cow_0x8099C290/func_8099C41C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Cow_0x8099C290/EnCow_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Cow_0x8099C290/EnCow_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Cow_0x8099C290/EnCow_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Cow_0x8099C290/EnCow_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Cow_0x8099C290/func_8099C880.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Cow_0x8099C290/func_8099C880.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Cow_0x8099C290/func_8099CAA8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Cow_0x8099C290/func_8099CAA8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Cow_0x8099C290/func_8099CB20.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Cow_0x8099C290/func_8099CB20.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Cow_0x8099C290/func_8099CB68.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Cow_0x8099C290/func_8099CB68.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Cow_0x8099C290/func_8099CBCC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Cow_0x8099C290/func_8099CBCC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Cow_0x8099C290/func_8099CC68.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Cow_0x8099C290/func_8099CC68.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Cow_0x8099C290/func_8099CCF8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Cow_0x8099C290/func_8099CCF8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Cow_0x8099C290/func_8099CDA0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Cow_0x8099C290/func_8099CDA0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Cow_0x8099C290/func_8099CFAC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Cow_0x8099C290/func_8099CFAC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Cow_0x8099C290/EnCow_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Cow_0x8099C290/EnCow_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Cow_0x8099C290/func_8099D3C0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Cow_0x8099C290/func_8099D3C0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Cow_0x8099C290/func_8099D4AC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Cow_0x8099C290/func_8099D4AC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Cow_0x8099C290/func_8099D4FC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Cow_0x8099C290/func_8099D4FC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Cow_0x8099C290/EnCow_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Cow_0x8099C290/EnCow_Draw.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Cow_0x8099C290/func_8099D59C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Cow_0x8099C290/func_8099D59C.asm") 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 99a568383c..1ff1f1931c 100644 --- a/src/overlays/actors/ovl_En_Crow/z_en_crow.c +++ b/src/overlays/actors/ovl_En_Crow/z_en_crow.c @@ -23,42 +23,42 @@ const ActorInit En_Crow_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Crow_0x8099AB30/EnCrow_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Crow_0x8099AB30/EnCrow_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Crow_0x8099AB30/EnCrow_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Crow_0x8099AB30/EnCrow_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Crow_0x8099AB30/func_8099AC58.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Crow_0x8099AB30/func_8099AC58.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Crow_0x8099AB30/func_8099AC8C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Crow_0x8099AB30/func_8099AC8C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Crow_0x8099AB30/func_8099B098.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Crow_0x8099AB30/func_8099B098.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Crow_0x8099AB30/func_8099B0CC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Crow_0x8099AB30/func_8099B0CC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Crow_0x8099AB30/func_8099B318.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Crow_0x8099AB30/func_8099B318.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Crow_0x8099AB30/func_8099B384.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Crow_0x8099AB30/func_8099B384.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Crow_0x8099AB30/func_8099B584.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Crow_0x8099AB30/func_8099B584.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Crow_0x8099AB30/func_8099B6AC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Crow_0x8099AB30/func_8099B6AC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Crow_0x8099AB30/func_8099B6C4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Crow_0x8099AB30/func_8099B6C4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Crow_0x8099AB30/func_8099B778.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Crow_0x8099AB30/func_8099B778.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Crow_0x8099AB30/func_8099B838.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Crow_0x8099AB30/func_8099B838.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Crow_0x8099AB30/func_8099B8EC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Crow_0x8099AB30/func_8099B8EC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Crow_0x8099AB30/func_8099B9E8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Crow_0x8099AB30/func_8099B9E8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Crow_0x8099AB30/func_8099BAB4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Crow_0x8099AB30/func_8099BAB4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Crow_0x8099AB30/EnCrow_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Crow_0x8099AB30/EnCrow_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Crow_0x8099AB30/func_8099BE48.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Crow_0x8099AB30/func_8099BE48.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Crow_0x8099AB30/func_8099BF20.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Crow_0x8099AB30/func_8099BF20.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Crow_0x8099AB30/EnCrow_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Crow_0x8099AB30/EnCrow_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Dai/z_en_dai.c b/src/overlays/actors/ovl_En_Dai/z_en_dai.c index 5c98d36fe1..1966d28b7f 100644 --- a/src/overlays/actors/ovl_En_Dai/z_en_dai.c +++ b/src/overlays/actors/ovl_En_Dai/z_en_dai.c @@ -23,56 +23,56 @@ const ActorInit En_Dai_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dai_0x80B3DFF0/func_80B3DFF0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dai_0x80B3DFF0/func_80B3DFF0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dai_0x80B3DFF0/func_80B3E168.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dai_0x80B3DFF0/func_80B3E168.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dai_0x80B3DFF0/func_80B3E460.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dai_0x80B3DFF0/func_80B3E460.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dai_0x80B3DFF0/func_80B3E5B4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dai_0x80B3DFF0/func_80B3E5B4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dai_0x80B3DFF0/func_80B3E5DC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dai_0x80B3DFF0/func_80B3E5DC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dai_0x80B3DFF0/func_80B3E69C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dai_0x80B3DFF0/func_80B3E69C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dai_0x80B3DFF0/func_80B3E7C8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dai_0x80B3DFF0/func_80B3E7C8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dai_0x80B3DFF0/func_80B3E834.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dai_0x80B3DFF0/func_80B3E834.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dai_0x80B3DFF0/func_80B3E8BC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dai_0x80B3DFF0/func_80B3E8BC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dai_0x80B3DFF0/func_80B3E96C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dai_0x80B3DFF0/func_80B3E96C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dai_0x80B3DFF0/func_80B3EC10.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dai_0x80B3DFF0/func_80B3EC10.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dai_0x80B3DFF0/func_80B3EC84.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dai_0x80B3DFF0/func_80B3EC84.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dai_0x80B3DFF0/func_80B3ED88.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dai_0x80B3DFF0/func_80B3ED88.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dai_0x80B3DFF0/func_80B3EE8C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dai_0x80B3DFF0/func_80B3EE8C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dai_0x80B3DFF0/func_80B3EEDC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dai_0x80B3DFF0/func_80B3EEDC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dai_0x80B3DFF0/func_80B3EF90.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dai_0x80B3DFF0/func_80B3EF90.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dai_0x80B3DFF0/func_80B3F00C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dai_0x80B3DFF0/func_80B3F00C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dai_0x80B3DFF0/func_80B3F044.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dai_0x80B3DFF0/func_80B3F044.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dai_0x80B3DFF0/EnDai_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dai_0x80B3DFF0/EnDai_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dai_0x80B3DFF0/EnDai_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dai_0x80B3DFF0/EnDai_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dai_0x80B3DFF0/EnDai_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dai_0x80B3DFF0/EnDai_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dai_0x80B3DFF0/func_80B3F598.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dai_0x80B3DFF0/func_80B3F598.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dai_0x80B3DFF0/func_80B3F614.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dai_0x80B3DFF0/func_80B3F614.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dai_0x80B3DFF0/func_80B3F6EC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dai_0x80B3DFF0/func_80B3F6EC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dai_0x80B3DFF0/func_80B3F78C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dai_0x80B3DFF0/func_80B3F78C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dai_0x80B3DFF0/func_80B3F920.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dai_0x80B3DFF0/func_80B3F920.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dai_0x80B3DFF0/EnDai_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dai_0x80B3DFF0/EnDai_Draw.asm") 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 dfc158eee0..d60d8794ee 100644 --- a/src/overlays/actors/ovl_En_Daiku/z_en_daiku.c +++ b/src/overlays/actors/ovl_En_Daiku/z_en_daiku.c @@ -23,26 +23,26 @@ const ActorInit En_Daiku_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Daiku_0x809434B0/EnDaiku_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Daiku_0x809434B0/EnDaiku_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Daiku_0x809434B0/EnDaiku_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Daiku_0x809434B0/EnDaiku_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Daiku_0x809434B0/func_8094373C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Daiku_0x809434B0/func_8094373C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Daiku_0x809434B0/func_809437C8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Daiku_0x809434B0/func_809437C8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Daiku_0x809434B0/func_80943820.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Daiku_0x809434B0/func_80943820.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Daiku_0x809434B0/func_809438F8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Daiku_0x809434B0/func_809438F8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Daiku_0x809434B0/func_80943BC0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Daiku_0x809434B0/func_80943BC0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Daiku_0x809434B0/func_80943BDC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Daiku_0x809434B0/func_80943BDC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Daiku_0x809434B0/EnDaiku_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Daiku_0x809434B0/EnDaiku_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Daiku_0x809434B0/func_80943E18.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Daiku_0x809434B0/func_80943E18.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Daiku_0x809434B0/func_80943E60.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Daiku_0x809434B0/func_80943E60.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Daiku_0x809434B0/EnDaiku_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Daiku_0x809434B0/EnDaiku_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Daiku2/z_en_daiku2.c b/src/overlays/actors/ovl_En_Daiku2/z_en_daiku2.c index 2ac2184365..e9e8ef81bb 100644 --- a/src/overlays/actors/ovl_En_Daiku2/z_en_daiku2.c +++ b/src/overlays/actors/ovl_En_Daiku2/z_en_daiku2.c @@ -23,44 +23,44 @@ const ActorInit En_Daiku2_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Daiku2_0x80BE61D0/func_80BE61D0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Daiku2_0x80BE61D0/func_80BE61D0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Daiku2_0x80BE61D0/EnDaiku2_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Daiku2_0x80BE61D0/EnDaiku2_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Daiku2_0x80BE61D0/EnDaiku2_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Daiku2_0x80BE61D0/EnDaiku2_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Daiku2_0x80BE61D0/func_80BE6408.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Daiku2_0x80BE61D0/func_80BE6408.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Daiku2_0x80BE61D0/func_80BE64C0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Daiku2_0x80BE61D0/func_80BE64C0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Daiku2_0x80BE61D0/func_80BE65B4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Daiku2_0x80BE61D0/func_80BE65B4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Daiku2_0x80BE61D0/func_80BE66E4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Daiku2_0x80BE61D0/func_80BE66E4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Daiku2_0x80BE61D0/func_80BE6B40.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Daiku2_0x80BE61D0/func_80BE6B40.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Daiku2_0x80BE61D0/func_80BE6BC0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Daiku2_0x80BE61D0/func_80BE6BC0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Daiku2_0x80BE61D0/func_80BE6CFC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Daiku2_0x80BE61D0/func_80BE6CFC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Daiku2_0x80BE61D0/func_80BE6D40.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Daiku2_0x80BE61D0/func_80BE6D40.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Daiku2_0x80BE61D0/func_80BE6EB0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Daiku2_0x80BE61D0/func_80BE6EB0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Daiku2_0x80BE61D0/func_80BE6EF0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Daiku2_0x80BE61D0/func_80BE6EF0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Daiku2_0x80BE61D0/func_80BE71A0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Daiku2_0x80BE61D0/func_80BE71A0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Daiku2_0x80BE61D0/func_80BE71D8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Daiku2_0x80BE61D0/func_80BE71D8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Daiku2_0x80BE61D0/EnDaiku2_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Daiku2_0x80BE61D0/EnDaiku2_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Daiku2_0x80BE61D0/func_80BE738C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Daiku2_0x80BE61D0/func_80BE738C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Daiku2_0x80BE61D0/EnDaiku2_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Daiku2_0x80BE61D0/EnDaiku2_Draw.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Daiku2_0x80BE61D0/func_80BE7504.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Daiku2_0x80BE61D0/func_80BE7504.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Daiku2_0x80BE61D0/func_80BE7600.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Daiku2_0x80BE61D0/func_80BE7600.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Daiku2_0x80BE61D0/func_80BE7718.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Daiku2_0x80BE61D0/func_80BE7718.asm") diff --git a/src/overlays/actors/ovl_En_Death/z_en_death.c b/src/overlays/actors/ovl_En_Death/z_en_death.c index e157920150..cc2a02936d 100644 --- a/src/overlays/actors/ovl_En_Death/z_en_death.c +++ b/src/overlays/actors/ovl_En_Death/z_en_death.c @@ -23,118 +23,118 @@ const ActorInit En_Death_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Death_0x808C4F80/EnDeath_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Death_0x808C4F80/EnDeath_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Death_0x808C4F80/EnDeath_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Death_0x808C4F80/EnDeath_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Death_0x808C4F80/func_808C5310.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Death_0x808C4F80/func_808C5310.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Death_0x808C4F80/func_808C5394.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Death_0x808C4F80/func_808C5394.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Death_0x808C4F80/func_808C5428.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Death_0x808C4F80/func_808C5428.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Death_0x808C4F80/func_808C54F0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Death_0x808C4F80/func_808C54F0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Death_0x808C4F80/func_808C566C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Death_0x808C4F80/func_808C566C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Death_0x808C4F80/func_808C571C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Death_0x808C4F80/func_808C571C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Death_0x808C4F80/func_808C589C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Death_0x808C4F80/func_808C589C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Death_0x808C4F80/func_808C597C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Death_0x808C4F80/func_808C597C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Death_0x808C4F80/func_808C5AB8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Death_0x808C4F80/func_808C5AB8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Death_0x808C4F80/func_808C5C0C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Death_0x808C4F80/func_808C5C0C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Death_0x808C4F80/func_808C5CB4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Death_0x808C4F80/func_808C5CB4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Death_0x808C4F80/func_808C5D6C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Death_0x808C4F80/func_808C5D6C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Death_0x808C4F80/func_808C5E90.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Death_0x808C4F80/func_808C5E90.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Death_0x808C4F80/func_808C5F58.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Death_0x808C4F80/func_808C5F58.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Death_0x808C4F80/func_808C6070.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Death_0x808C4F80/func_808C6070.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Death_0x808C4F80/func_808C645C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Death_0x808C4F80/func_808C645C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Death_0x808C4F80/func_808C64DC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Death_0x808C4F80/func_808C64DC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Death_0x808C4F80/func_808C6620.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Death_0x808C4F80/func_808C6620.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Death_0x808C4F80/func_808C66A8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Death_0x808C4F80/func_808C66A8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Death_0x808C4F80/func_808C67C8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Death_0x808C4F80/func_808C67C8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Death_0x808C4F80/func_808C682C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Death_0x808C4F80/func_808C682C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Death_0x808C4F80/func_808C68B8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Death_0x808C4F80/func_808C68B8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Death_0x808C4F80/func_808C692C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Death_0x808C4F80/func_808C692C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Death_0x808C4F80/func_808C6A08.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Death_0x808C4F80/func_808C6A08.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Death_0x808C4F80/func_808C6AB0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Death_0x808C4F80/func_808C6AB0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Death_0x808C4F80/func_808C6C5C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Death_0x808C4F80/func_808C6C5C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Death_0x808C4F80/func_808C6CDC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Death_0x808C4F80/func_808C6CDC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Death_0x808C4F80/func_808C6D40.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Death_0x808C4F80/func_808C6D40.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Death_0x808C4F80/func_808C6F6C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Death_0x808C4F80/func_808C6F6C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Death_0x808C4F80/func_808C70D8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Death_0x808C4F80/func_808C70D8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Death_0x808C4F80/func_808C72AC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Death_0x808C4F80/func_808C72AC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Death_0x808C4F80/func_808C74A4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Death_0x808C4F80/func_808C74A4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Death_0x808C4F80/func_808C74F8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Death_0x808C4F80/func_808C74F8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Death_0x808C4F80/func_808C7800.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Death_0x808C4F80/func_808C7800.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Death_0x808C4F80/func_808C7888.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Death_0x808C4F80/func_808C7888.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Death_0x808C4F80/func_808C7A30.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Death_0x808C4F80/func_808C7A30.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Death_0x808C4F80/func_808C7AAC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Death_0x808C4F80/func_808C7AAC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Death_0x808C4F80/func_808C7AEC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Death_0x808C4F80/func_808C7AEC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Death_0x808C4F80/func_808C7B88.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Death_0x808C4F80/func_808C7B88.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Death_0x808C4F80/func_808C7C04.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Death_0x808C4F80/func_808C7C04.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Death_0x808C4F80/func_808C7C88.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Death_0x808C4F80/func_808C7C88.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Death_0x808C4F80/func_808C7CFC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Death_0x808C4F80/func_808C7CFC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Death_0x808C4F80/func_808C7D34.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Death_0x808C4F80/func_808C7D34.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Death_0x808C4F80/func_808C7DB8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Death_0x808C4F80/func_808C7DB8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Death_0x808C4F80/func_808C7DCC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Death_0x808C4F80/func_808C7DCC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Death_0x808C4F80/func_808C7E24.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Death_0x808C4F80/func_808C7E24.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Death_0x808C4F80/func_808C7EDC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Death_0x808C4F80/func_808C7EDC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Death_0x808C4F80/EnDeath_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Death_0x808C4F80/EnDeath_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Death_0x808C4F80/func_808C84A4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Death_0x808C4F80/func_808C84A4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Death_0x808C4F80/func_808C8690.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Death_0x808C4F80/func_808C8690.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Death_0x808C4F80/func_808C882C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Death_0x808C4F80/func_808C882C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Death_0x808C4F80/func_808C8D18.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Death_0x808C4F80/func_808C8D18.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Death_0x808C4F80/func_808C9160.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Death_0x808C4F80/func_808C9160.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Death_0x808C4F80/func_808C9220.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Death_0x808C4F80/func_808C9220.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Death_0x808C4F80/func_808C9340.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Death_0x808C4F80/func_808C9340.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Death_0x808C4F80/EnDeath_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Death_0x808C4F80/EnDeath_Draw.asm") 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 d4669fe3ba..f26c729cdf 100644 --- a/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.c +++ b/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.c @@ -23,92 +23,92 @@ const ActorInit En_Dekubaba_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dekubaba_0x808B1330/EnDekubaba_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dekubaba_0x808B1330/EnDekubaba_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dekubaba_0x808B1330/EnDekubaba_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dekubaba_0x808B1330/EnDekubaba_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dekubaba_0x808B1330/func_808B1530.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dekubaba_0x808B1330/func_808B1530.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dekubaba_0x808B1330/func_808B15B8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dekubaba_0x808B1330/func_808B15B8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dekubaba_0x808B1330/func_808B16BC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dekubaba_0x808B1330/func_808B16BC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dekubaba_0x808B1330/func_808B1798.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dekubaba_0x808B1330/func_808B1798.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dekubaba_0x808B1330/func_808B1814.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dekubaba_0x808B1330/func_808B1814.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dekubaba_0x808B1330/func_808B18A8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dekubaba_0x808B1330/func_808B18A8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dekubaba_0x808B1330/func_808B1B14.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dekubaba_0x808B1330/func_808B1B14.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dekubaba_0x808B1330/func_808B1BC0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dekubaba_0x808B1330/func_808B1BC0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dekubaba_0x808B1330/func_808B1CF0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dekubaba_0x808B1330/func_808B1CF0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dekubaba_0x808B1330/func_808B2158.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dekubaba_0x808B1330/func_808B2158.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dekubaba_0x808B1330/func_808B2240.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dekubaba_0x808B1330/func_808B2240.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dekubaba_0x808B1330/func_808B2608.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dekubaba_0x808B1330/func_808B2608.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dekubaba_0x808B1330/func_808B2660.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dekubaba_0x808B1330/func_808B2660.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dekubaba_0x808B1330/func_808B2890.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dekubaba_0x808B1330/func_808B2890.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dekubaba_0x808B1330/func_808B28B4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dekubaba_0x808B1330/func_808B28B4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dekubaba_0x808B1330/func_808B2980.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dekubaba_0x808B1330/func_808B2980.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dekubaba_0x808B1330/func_808B29C4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dekubaba_0x808B1330/func_808B29C4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dekubaba_0x808B1330/func_808B2C40.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dekubaba_0x808B1330/func_808B2C40.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dekubaba_0x808B1330/func_808B2CB8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dekubaba_0x808B1330/func_808B2CB8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dekubaba_0x808B1330/func_808B3044.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dekubaba_0x808B1330/func_808B3044.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dekubaba_0x808B1330/func_808B3078.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dekubaba_0x808B1330/func_808B3078.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dekubaba_0x808B1330/func_808B3170.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dekubaba_0x808B1330/func_808B3170.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dekubaba_0x808B1330/func_808B3280.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dekubaba_0x808B1330/func_808B3280.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dekubaba_0x808B1330/func_808B3390.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dekubaba_0x808B1330/func_808B3390.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dekubaba_0x808B1330/func_808B3404.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dekubaba_0x808B1330/func_808B3404.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dekubaba_0x808B1330/func_808B3768.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dekubaba_0x808B1330/func_808B3768.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dekubaba_0x808B1330/func_808B37E8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dekubaba_0x808B1330/func_808B37E8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dekubaba_0x808B1330/func_808B39AC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dekubaba_0x808B1330/func_808B39AC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dekubaba_0x808B1330/func_808B3B48.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dekubaba_0x808B1330/func_808B3B48.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dekubaba_0x808B1330/func_808B3BE4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dekubaba_0x808B1330/func_808B3BE4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dekubaba_0x808B1330/func_808B3C50.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dekubaba_0x808B1330/func_808B3C50.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dekubaba_0x808B1330/func_808B3D74.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dekubaba_0x808B1330/func_808B3D74.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dekubaba_0x808B1330/func_808B3DA8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dekubaba_0x808B1330/func_808B3DA8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dekubaba_0x808B1330/func_808B3E40.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dekubaba_0x808B1330/func_808B3E40.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dekubaba_0x808B1330/func_808B3EE8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dekubaba_0x808B1330/func_808B3EE8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dekubaba_0x808B1330/func_808B3F50.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dekubaba_0x808B1330/func_808B3F50.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dekubaba_0x808B1330/EnDekubaba_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dekubaba_0x808B1330/EnDekubaba_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dekubaba_0x808B1330/func_808B4548.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dekubaba_0x808B1330/func_808B4548.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dekubaba_0x808B1330/func_808B465C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dekubaba_0x808B1330/func_808B465C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dekubaba_0x808B1330/func_808B48FC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dekubaba_0x808B1330/func_808B48FC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dekubaba_0x808B1330/func_808B49C8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dekubaba_0x808B1330/func_808B49C8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dekubaba_0x808B1330/func_808B4ABC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dekubaba_0x808B1330/func_808B4ABC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dekubaba_0x808B1330/EnDekubaba_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dekubaba_0x808B1330/EnDekubaba_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.c b/src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.c index 6bd6a1f8d4..3ee9d924a4 100644 --- a/src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.c +++ b/src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.c @@ -23,70 +23,70 @@ const ActorInit En_Dekunuts_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dekunuts_0x808BD1E0/EnDekunuts_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dekunuts_0x808BD1E0/EnDekunuts_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dekunuts_0x808BD1E0/EnDekunuts_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dekunuts_0x808BD1E0/EnDekunuts_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dekunuts_0x808BD1E0/func_808BD348.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dekunuts_0x808BD1E0/func_808BD348.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dekunuts_0x808BD1E0/func_808BD3B4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dekunuts_0x808BD1E0/func_808BD3B4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dekunuts_0x808BD1E0/func_808BD428.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dekunuts_0x808BD1E0/func_808BD428.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dekunuts_0x808BD1E0/func_808BD49C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dekunuts_0x808BD1E0/func_808BD49C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dekunuts_0x808BD1E0/func_808BD78C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dekunuts_0x808BD1E0/func_808BD78C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dekunuts_0x808BD1E0/func_808BD7D4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dekunuts_0x808BD1E0/func_808BD7D4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dekunuts_0x808BD1E0/func_808BD870.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dekunuts_0x808BD1E0/func_808BD870.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dekunuts_0x808BD1E0/func_808BD8D8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dekunuts_0x808BD1E0/func_808BD8D8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dekunuts_0x808BD1E0/func_808BDA08.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dekunuts_0x808BD1E0/func_808BDA08.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dekunuts_0x808BD1E0/func_808BDA4C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dekunuts_0x808BD1E0/func_808BDA4C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dekunuts_0x808BD1E0/func_808BDC9C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dekunuts_0x808BD1E0/func_808BDC9C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dekunuts_0x808BD1E0/func_808BDCF0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dekunuts_0x808BD1E0/func_808BDCF0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dekunuts_0x808BD1E0/func_808BDD54.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dekunuts_0x808BD1E0/func_808BDD54.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dekunuts_0x808BD1E0/func_808BDE7C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dekunuts_0x808BD1E0/func_808BDE7C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dekunuts_0x808BD1E0/func_808BDEF8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dekunuts_0x808BD1E0/func_808BDEF8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dekunuts_0x808BD1E0/func_808BDF60.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dekunuts_0x808BD1E0/func_808BDF60.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dekunuts_0x808BD1E0/func_808BDFB8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dekunuts_0x808BD1E0/func_808BDFB8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dekunuts_0x808BD1E0/func_808BE1CC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dekunuts_0x808BD1E0/func_808BE1CC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dekunuts_0x808BD1E0/func_808BE22C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dekunuts_0x808BD1E0/func_808BE22C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dekunuts_0x808BD1E0/func_808BE294.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dekunuts_0x808BD1E0/func_808BE294.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dekunuts_0x808BD1E0/func_808BE358.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dekunuts_0x808BD1E0/func_808BE358.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dekunuts_0x808BD1E0/func_808BE3A8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dekunuts_0x808BD1E0/func_808BE3A8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dekunuts_0x808BD1E0/func_808BE3FC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dekunuts_0x808BD1E0/func_808BE3FC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dekunuts_0x808BD1E0/func_808BE484.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dekunuts_0x808BD1E0/func_808BE484.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dekunuts_0x808BD1E0/func_808BE4D4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dekunuts_0x808BD1E0/func_808BE4D4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dekunuts_0x808BD1E0/func_808BE680.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dekunuts_0x808BD1E0/func_808BE680.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dekunuts_0x808BD1E0/func_808BE6C4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dekunuts_0x808BD1E0/func_808BE6C4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dekunuts_0x808BD1E0/func_808BE73C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dekunuts_0x808BD1E0/func_808BE73C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dekunuts_0x808BD1E0/EnDekunuts_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dekunuts_0x808BD1E0/EnDekunuts_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dekunuts_0x808BD1E0/func_808BEBD0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dekunuts_0x808BD1E0/func_808BEBD0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dekunuts_0x808BD1E0/func_808BED30.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dekunuts_0x808BD1E0/func_808BED30.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dekunuts_0x808BD1E0/EnDekunuts_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dekunuts_0x808BD1E0/EnDekunuts_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Demo_heishi/z_en_demo_heishi.c b/src/overlays/actors/ovl_En_Demo_heishi/z_en_demo_heishi.c index e30bc12033..3d935b34e2 100644 --- a/src/overlays/actors/ovl_En_Demo_heishi/z_en_demo_heishi.c +++ b/src/overlays/actors/ovl_En_Demo_heishi/z_en_demo_heishi.c @@ -23,24 +23,24 @@ const ActorInit En_Demo_heishi_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Demo_heishi_0x80BE9510/EnDemoheishi_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Demo_heishi_0x80BE9510/EnDemoheishi_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Demo_heishi_0x80BE9510/EnDemoheishi_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Demo_heishi_0x80BE9510/EnDemoheishi_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Demo_heishi_0x80BE9510/func_80BE95EC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Demo_heishi_0x80BE9510/func_80BE95EC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Demo_heishi_0x80BE9510/func_80BE9678.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Demo_heishi_0x80BE9510/func_80BE9678.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Demo_heishi_0x80BE9510/func_80BE970C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Demo_heishi_0x80BE9510/func_80BE970C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Demo_heishi_0x80BE9510/func_80BE975C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Demo_heishi_0x80BE9510/func_80BE975C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Demo_heishi_0x80BE9510/func_80BE97F0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Demo_heishi_0x80BE9510/func_80BE97F0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Demo_heishi_0x80BE9510/func_80BE980C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Demo_heishi_0x80BE9510/func_80BE980C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Demo_heishi_0x80BE9510/EnDemoheishi_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Demo_heishi_0x80BE9510/EnDemoheishi_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Demo_heishi_0x80BE9510/func_80BE9974.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Demo_heishi_0x80BE9510/func_80BE9974.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Demo_heishi_0x80BE9510/EnDemoheishi_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Demo_heishi_0x80BE9510/EnDemoheishi_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Dg/z_en_dg.c b/src/overlays/actors/ovl_En_Dg/z_en_dg.c index edb9304e8a..56f41aa316 100644 --- a/src/overlays/actors/ovl_En_Dg/z_en_dg.c +++ b/src/overlays/actors/ovl_En_Dg/z_en_dg.c @@ -23,100 +23,100 @@ const ActorInit En_Dg_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dg_0x80989140/func_80989140.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dg_0x80989140/func_80989140.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dg_0x80989140/func_80989204.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dg_0x80989140/func_80989204.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dg_0x80989140/func_8098933C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dg_0x80989140/func_8098933C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dg_0x80989140/func_80989418.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dg_0x80989140/func_80989418.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dg_0x80989140/func_809895B4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dg_0x80989140/func_809895B4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dg_0x80989140/func_80989674.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dg_0x80989140/func_80989674.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dg_0x80989140/func_80989864.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dg_0x80989140/func_80989864.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dg_0x80989140/func_80989974.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dg_0x80989140/func_80989974.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dg_0x80989140/func_809899C8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dg_0x80989140/func_809899C8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dg_0x80989140/func_80989A08.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dg_0x80989140/func_80989A08.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dg_0x80989140/func_80989A48.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dg_0x80989140/func_80989A48.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dg_0x80989140/func_80989A9C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dg_0x80989140/func_80989A9C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dg_0x80989140/func_80989ADC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dg_0x80989140/func_80989ADC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dg_0x80989140/func_80989BF8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dg_0x80989140/func_80989BF8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dg_0x80989140/func_80989D38.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dg_0x80989140/func_80989D38.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dg_0x80989140/func_80989E18.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dg_0x80989140/func_80989E18.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dg_0x80989140/func_80989FC8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dg_0x80989140/func_80989FC8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dg_0x80989140/func_8098A064.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dg_0x80989140/func_8098A064.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dg_0x80989140/func_8098A1B4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dg_0x80989140/func_8098A1B4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dg_0x80989140/func_8098A234.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dg_0x80989140/func_8098A234.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dg_0x80989140/func_8098A468.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dg_0x80989140/func_8098A468.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dg_0x80989140/func_8098A55C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dg_0x80989140/func_8098A55C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dg_0x80989140/func_8098A618.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dg_0x80989140/func_8098A618.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dg_0x80989140/func_8098A70C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dg_0x80989140/func_8098A70C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dg_0x80989140/func_8098A89C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dg_0x80989140/func_8098A89C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dg_0x80989140/func_8098A938.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dg_0x80989140/func_8098A938.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dg_0x80989140/func_8098AAAC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dg_0x80989140/func_8098AAAC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dg_0x80989140/func_8098AB48.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dg_0x80989140/func_8098AB48.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dg_0x80989140/func_8098AC34.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dg_0x80989140/func_8098AC34.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dg_0x80989140/func_8098AE58.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dg_0x80989140/func_8098AE58.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dg_0x80989140/func_8098AF44.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dg_0x80989140/func_8098AF44.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dg_0x80989140/func_8098AF98.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dg_0x80989140/func_8098AF98.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dg_0x80989140/func_8098B004.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dg_0x80989140/func_8098B004.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dg_0x80989140/func_8098B198.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dg_0x80989140/func_8098B198.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dg_0x80989140/func_8098B28C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dg_0x80989140/func_8098B28C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dg_0x80989140/func_8098B390.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dg_0x80989140/func_8098B390.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dg_0x80989140/func_8098B464.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dg_0x80989140/func_8098B464.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dg_0x80989140/func_8098B560.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dg_0x80989140/func_8098B560.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dg_0x80989140/func_8098B88C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dg_0x80989140/func_8098B88C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dg_0x80989140/func_8098BA64.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dg_0x80989140/func_8098BA64.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dg_0x80989140/func_8098BB10.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dg_0x80989140/func_8098BB10.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dg_0x80989140/func_8098BBEC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dg_0x80989140/func_8098BBEC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dg_0x80989140/func_8098BC54.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dg_0x80989140/func_8098BC54.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dg_0x80989140/EnDg_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dg_0x80989140/EnDg_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dg_0x80989140/EnDg_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dg_0x80989140/EnDg_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dg_0x80989140/EnDg_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dg_0x80989140/EnDg_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dg_0x80989140/func_8098BFB8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dg_0x80989140/func_8098BFB8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dg_0x80989140/func_8098BFD4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dg_0x80989140/func_8098BFD4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dg_0x80989140/EnDg_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dg_0x80989140/EnDg_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Dinofos/z_en_dinofos.c b/src/overlays/actors/ovl_En_Dinofos/z_en_dinofos.c index 69318cbcb0..a34a2cfde6 100644 --- a/src/overlays/actors/ovl_En_Dinofos/z_en_dinofos.c +++ b/src/overlays/actors/ovl_En_Dinofos/z_en_dinofos.c @@ -23,122 +23,122 @@ const ActorInit En_Dinofos_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dinofos_0x8089A6E0/EnDinofos_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dinofos_0x8089A6E0/EnDinofos_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dinofos_0x8089A6E0/EnDinofos_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dinofos_0x8089A6E0/EnDinofos_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dinofos_0x8089A6E0/func_8089A900.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dinofos_0x8089A6E0/func_8089A900.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dinofos_0x8089A6E0/func_8089A968.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dinofos_0x8089A6E0/func_8089A968.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dinofos_0x8089A6E0/func_8089A9B0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dinofos_0x8089A6E0/func_8089A9B0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dinofos_0x8089A6E0/func_8089ABF4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dinofos_0x8089A6E0/func_8089ABF4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dinofos_0x8089A6E0/func_8089AC70.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dinofos_0x8089A6E0/func_8089AC70.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dinofos_0x8089A6E0/func_8089ACEC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dinofos_0x8089A6E0/func_8089ACEC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dinofos_0x8089A6E0/func_8089AD70.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dinofos_0x8089A6E0/func_8089AD70.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dinofos_0x8089A6E0/func_8089AE00.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dinofos_0x8089A6E0/func_8089AE00.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dinofos_0x8089A6E0/func_8089B100.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dinofos_0x8089A6E0/func_8089B100.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dinofos_0x8089A6E0/func_8089B288.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dinofos_0x8089A6E0/func_8089B288.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dinofos_0x8089A6E0/func_8089B320.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dinofos_0x8089A6E0/func_8089B320.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dinofos_0x8089A6E0/func_8089B3D4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dinofos_0x8089A6E0/func_8089B3D4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dinofos_0x8089A6E0/func_8089B4A4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dinofos_0x8089A6E0/func_8089B4A4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dinofos_0x8089A6E0/func_8089B580.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dinofos_0x8089A6E0/func_8089B580.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dinofos_0x8089A6E0/func_8089B6E8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dinofos_0x8089A6E0/func_8089B6E8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dinofos_0x8089A6E0/func_8089B72C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dinofos_0x8089A6E0/func_8089B72C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dinofos_0x8089A6E0/func_8089B7B0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dinofos_0x8089A6E0/func_8089B7B0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dinofos_0x8089A6E0/func_8089B834.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dinofos_0x8089A6E0/func_8089B834.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dinofos_0x8089A6E0/func_8089B8B0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dinofos_0x8089A6E0/func_8089B8B0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dinofos_0x8089A6E0/func_8089B98C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dinofos_0x8089A6E0/func_8089B98C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dinofos_0x8089A6E0/func_8089BAC0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dinofos_0x8089A6E0/func_8089BAC0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dinofos_0x8089A6E0/func_8089BB60.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dinofos_0x8089A6E0/func_8089BB60.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dinofos_0x8089A6E0/func_8089BBB4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dinofos_0x8089A6E0/func_8089BBB4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dinofos_0x8089A6E0/func_8089BD28.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dinofos_0x8089A6E0/func_8089BD28.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dinofos_0x8089A6E0/func_8089C024.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dinofos_0x8089A6E0/func_8089C024.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dinofos_0x8089A6E0/func_8089C0DC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dinofos_0x8089A6E0/func_8089C0DC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dinofos_0x8089A6E0/func_8089C164.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dinofos_0x8089A6E0/func_8089C164.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dinofos_0x8089A6E0/func_8089C1F8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dinofos_0x8089A6E0/func_8089C1F8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dinofos_0x8089A6E0/func_8089C244.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dinofos_0x8089A6E0/func_8089C244.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dinofos_0x8089A6E0/func_8089C2A8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dinofos_0x8089A6E0/func_8089C2A8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dinofos_0x8089A6E0/func_8089C398.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dinofos_0x8089A6E0/func_8089C398.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dinofos_0x8089A6E0/func_8089C44C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dinofos_0x8089A6E0/func_8089C44C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dinofos_0x8089A6E0/func_8089C4F8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dinofos_0x8089A6E0/func_8089C4F8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dinofos_0x8089A6E0/func_8089C56C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dinofos_0x8089A6E0/func_8089C56C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dinofos_0x8089A6E0/func_8089C690.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dinofos_0x8089A6E0/func_8089C690.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dinofos_0x8089A6E0/func_8089C724.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dinofos_0x8089A6E0/func_8089C724.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dinofos_0x8089A6E0/func_8089C784.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dinofos_0x8089A6E0/func_8089C784.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dinofos_0x8089A6E0/func_8089C7B8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dinofos_0x8089A6E0/func_8089C7B8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dinofos_0x8089A6E0/func_8089C87C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dinofos_0x8089A6E0/func_8089C87C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dinofos_0x8089A6E0/func_8089C938.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dinofos_0x8089A6E0/func_8089C938.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dinofos_0x8089A6E0/func_8089CA14.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dinofos_0x8089A6E0/func_8089CA14.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dinofos_0x8089A6E0/func_8089CA74.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dinofos_0x8089A6E0/func_8089CA74.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dinofos_0x8089A6E0/func_8089CB10.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dinofos_0x8089A6E0/func_8089CB10.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dinofos_0x8089A6E0/func_8089CBEC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dinofos_0x8089A6E0/func_8089CBEC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dinofos_0x8089A6E0/func_8089CF00.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dinofos_0x8089A6E0/func_8089CF00.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dinofos_0x8089A6E0/func_8089CF70.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dinofos_0x8089A6E0/func_8089CF70.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dinofos_0x8089A6E0/func_8089CFAC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dinofos_0x8089A6E0/func_8089CFAC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dinofos_0x8089A6E0/func_8089D018.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dinofos_0x8089A6E0/func_8089D018.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dinofos_0x8089A6E0/func_8089D11C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dinofos_0x8089A6E0/func_8089D11C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dinofos_0x8089A6E0/func_8089D1E0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dinofos_0x8089A6E0/func_8089D1E0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dinofos_0x8089A6E0/func_8089D2E0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dinofos_0x8089A6E0/func_8089D2E0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dinofos_0x8089A6E0/func_8089D318.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dinofos_0x8089A6E0/func_8089D318.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dinofos_0x8089A6E0/func_8089D42C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dinofos_0x8089A6E0/func_8089D42C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dinofos_0x8089A6E0/func_8089D60C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dinofos_0x8089A6E0/func_8089D60C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dinofos_0x8089A6E0/EnDinofos_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dinofos_0x8089A6E0/EnDinofos_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dinofos_0x8089A6E0/func_8089DC4C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dinofos_0x8089A6E0/func_8089DC4C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dinofos_0x8089A6E0/func_8089DC84.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dinofos_0x8089A6E0/func_8089DC84.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dinofos_0x8089A6E0/EnDinofos_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dinofos_0x8089A6E0/EnDinofos_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Dnb/z_en_dnb.c b/src/overlays/actors/ovl_En_Dnb/z_en_dnb.c index 48e00f59b9..00f85bb1b3 100644 --- a/src/overlays/actors/ovl_En_Dnb/z_en_dnb.c +++ b/src/overlays/actors/ovl_En_Dnb/z_en_dnb.c @@ -23,28 +23,28 @@ const ActorInit En_Dnb_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dnb_0x80A4FDD0/func_80A4FDD0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dnb_0x80A4FDD0/func_80A4FDD0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dnb_0x80A4FDD0/func_80A4FEBC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dnb_0x80A4FDD0/func_80A4FEBC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dnb_0x80A4FDD0/func_80A4FFE8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dnb_0x80A4FDD0/func_80A4FFE8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dnb_0x80A4FDD0/func_80A500F8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dnb_0x80A4FDD0/func_80A500F8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dnb_0x80A4FDD0/EnDnb_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dnb_0x80A4FDD0/EnDnb_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dnb_0x80A4FDD0/EnDnb_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dnb_0x80A4FDD0/EnDnb_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dnb_0x80A4FDD0/EnDnb_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dnb_0x80A4FDD0/EnDnb_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dnb_0x80A4FDD0/func_80A50510.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dnb_0x80A4FDD0/func_80A50510.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dnb_0x80A4FDD0/func_80A5063C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dnb_0x80A4FDD0/func_80A5063C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dnb_0x80A4FDD0/EnDnb_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dnb_0x80A4FDD0/EnDnb_Draw.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dnb_0x80A4FDD0/func_80A507C0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dnb_0x80A4FDD0/func_80A507C0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dnb_0x80A4FDD0/func_80A5086C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dnb_0x80A4FDD0/func_80A5086C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dnb_0x80A4FDD0/func_80A50950.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dnb_0x80A4FDD0/func_80A50950.asm") diff --git a/src/overlays/actors/ovl_En_Dnh/z_en_dnh.c b/src/overlays/actors/ovl_En_Dnh/z_en_dnh.c index 0b5f2ef38e..3db07bcb3a 100644 --- a/src/overlays/actors/ovl_En_Dnh/z_en_dnh.c +++ b/src/overlays/actors/ovl_En_Dnh/z_en_dnh.c @@ -23,24 +23,24 @@ const ActorInit En_Dnh_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dnh_0x80A50D40/func_80A50D40.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dnh_0x80A50D40/func_80A50D40.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dnh_0x80A50D40/func_80A50DF8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dnh_0x80A50D40/func_80A50DF8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dnh_0x80A50D40/func_80A50E40.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dnh_0x80A50D40/func_80A50E40.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dnh_0x80A50D40/func_80A50EC0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dnh_0x80A50D40/func_80A50EC0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dnh_0x80A50D40/func_80A50F38.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dnh_0x80A50D40/func_80A50F38.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dnh_0x80A50D40/func_80A50F9C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dnh_0x80A50D40/func_80A50F9C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dnh_0x80A50D40/EnDnh_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dnh_0x80A50D40/EnDnh_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dnh_0x80A50D40/EnDnh_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dnh_0x80A50D40/EnDnh_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dnh_0x80A50D40/EnDnh_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dnh_0x80A50D40/EnDnh_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dnh_0x80A50D40/func_80A51168.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dnh_0x80A50D40/func_80A51168.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dnh_0x80A50D40/EnDnh_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dnh_0x80A50D40/EnDnh_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Dnk/z_en_dnk.c b/src/overlays/actors/ovl_En_Dnk/z_en_dnk.c index 5a9c3e6e68..1bec503d04 100644 --- a/src/overlays/actors/ovl_En_Dnk/z_en_dnk.c +++ b/src/overlays/actors/ovl_En_Dnk/z_en_dnk.c @@ -22,36 +22,36 @@ const ActorInit En_Dnk_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dnk_0x80A514F0/func_80A514F0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dnk_0x80A514F0/func_80A514F0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dnk_0x80A514F0/func_80A515C4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dnk_0x80A514F0/func_80A515C4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dnk_0x80A514F0/func_80A51648.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dnk_0x80A514F0/func_80A51648.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dnk_0x80A514F0/func_80A51890.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dnk_0x80A514F0/func_80A51890.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dnk_0x80A514F0/func_80A518DC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dnk_0x80A514F0/func_80A518DC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dnk_0x80A514F0/EnDnk_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dnk_0x80A514F0/EnDnk_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dnk_0x80A514F0/EnDnk_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dnk_0x80A514F0/EnDnk_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dnk_0x80A514F0/EnDnk_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dnk_0x80A514F0/EnDnk_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dnk_0x80A514F0/func_80A51A78.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dnk_0x80A514F0/func_80A51A78.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dnk_0x80A514F0/func_80A51AA4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dnk_0x80A514F0/func_80A51AA4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dnk_0x80A514F0/func_80A51CB8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dnk_0x80A514F0/func_80A51CB8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dnk_0x80A514F0/func_80A51D78.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dnk_0x80A514F0/func_80A51D78.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dnk_0x80A514F0/func_80A51DA4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dnk_0x80A514F0/func_80A51DA4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dnk_0x80A514F0/func_80A51FC0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dnk_0x80A514F0/func_80A51FC0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dnk_0x80A514F0/func_80A52018.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dnk_0x80A514F0/func_80A52018.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dnk_0x80A514F0/func_80A52074.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dnk_0x80A514F0/func_80A52074.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dnk_0x80A514F0/func_80A52134.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dnk_0x80A514F0/func_80A52134.asm") diff --git a/src/overlays/actors/ovl_En_Dno/z_en_dno.c b/src/overlays/actors/ovl_En_Dno/z_en_dno.c index 3f652b2499..def9102696 100644 --- a/src/overlays/actors/ovl_En_Dno/z_en_dno.c +++ b/src/overlays/actors/ovl_En_Dno/z_en_dno.c @@ -23,74 +23,74 @@ const ActorInit En_Dno_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dno_0x80A711D0/func_80A711D0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dno_0x80A711D0/func_80A711D0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dno_0x80A711D0/func_80A71424.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dno_0x80A711D0/func_80A71424.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dno_0x80A711D0/func_80A714B4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dno_0x80A711D0/func_80A714B4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dno_0x80A711D0/func_80A7153C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dno_0x80A711D0/func_80A7153C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dno_0x80A711D0/func_80A715DC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dno_0x80A711D0/func_80A715DC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dno_0x80A711D0/func_80A71788.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dno_0x80A711D0/func_80A71788.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dno_0x80A711D0/EnDno_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dno_0x80A711D0/EnDno_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dno_0x80A711D0/EnDno_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dno_0x80A711D0/EnDno_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dno_0x80A711D0/func_80A71B04.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dno_0x80A711D0/func_80A71B04.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dno_0x80A711D0/func_80A71B58.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dno_0x80A711D0/func_80A71B58.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dno_0x80A711D0/func_80A71B68.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dno_0x80A711D0/func_80A71B68.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dno_0x80A711D0/func_80A71C3C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dno_0x80A711D0/func_80A71C3C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dno_0x80A711D0/func_80A71E54.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dno_0x80A711D0/func_80A71E54.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dno_0x80A711D0/func_80A71F18.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dno_0x80A711D0/func_80A71F18.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dno_0x80A711D0/func_80A72438.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dno_0x80A711D0/func_80A72438.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dno_0x80A711D0/func_80A724B8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dno_0x80A711D0/func_80A724B8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dno_0x80A711D0/func_80A7256C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dno_0x80A711D0/func_80A7256C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dno_0x80A711D0/func_80A72598.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dno_0x80A711D0/func_80A72598.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dno_0x80A711D0/func_80A725E0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dno_0x80A711D0/func_80A725E0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dno_0x80A711D0/func_80A725F8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dno_0x80A711D0/func_80A725F8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dno_0x80A711D0/func_80A72AE4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dno_0x80A711D0/func_80A72AE4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dno_0x80A711D0/func_80A72B3C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dno_0x80A711D0/func_80A72B3C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dno_0x80A711D0/func_80A72B84.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dno_0x80A711D0/func_80A72B84.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dno_0x80A711D0/func_80A72BA4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dno_0x80A711D0/func_80A72BA4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dno_0x80A711D0/func_80A72C04.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dno_0x80A711D0/func_80A72C04.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dno_0x80A711D0/func_80A72CF8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dno_0x80A711D0/func_80A72CF8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dno_0x80A711D0/func_80A72D8C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dno_0x80A711D0/func_80A72D8C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dno_0x80A711D0/func_80A72FAC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dno_0x80A711D0/func_80A72FAC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dno_0x80A711D0/func_80A730A0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dno_0x80A711D0/func_80A730A0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dno_0x80A711D0/func_80A73244.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dno_0x80A711D0/func_80A73244.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dno_0x80A711D0/func_80A732C8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dno_0x80A711D0/func_80A732C8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dno_0x80A711D0/func_80A73408.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dno_0x80A711D0/func_80A73408.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dno_0x80A711D0/EnDno_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dno_0x80A711D0/EnDno_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dno_0x80A711D0/EnDno_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dno_0x80A711D0/EnDno_Draw.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dno_0x80A711D0/func_80A7361C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dno_0x80A711D0/func_80A7361C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dno_0x80A711D0/func_80A73654.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dno_0x80A711D0/func_80A73654.asm") diff --git a/src/overlays/actors/ovl_En_Dnp/z_en_dnp.c b/src/overlays/actors/ovl_En_Dnp/z_en_dnp.c index 70384212f3..6da84483cf 100644 --- a/src/overlays/actors/ovl_En_Dnp/z_en_dnp.c +++ b/src/overlays/actors/ovl_En_Dnp/z_en_dnp.c @@ -23,44 +23,44 @@ const ActorInit En_Dnp_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dnp_0x80B3CA20/func_80B3CA20.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dnp_0x80B3CA20/func_80B3CA20.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dnp_0x80B3CA20/func_80B3CC38.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dnp_0x80B3CA20/func_80B3CC38.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dnp_0x80B3CA20/func_80B3CC80.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dnp_0x80B3CA20/func_80B3CC80.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dnp_0x80B3CA20/func_80B3CD1C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dnp_0x80B3CA20/func_80B3CD1C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dnp_0x80B3CA20/func_80B3CDA4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dnp_0x80B3CA20/func_80B3CDA4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dnp_0x80B3CA20/func_80B3CEC0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dnp_0x80B3CA20/func_80B3CEC0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dnp_0x80B3CA20/func_80B3CF60.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dnp_0x80B3CA20/func_80B3CF60.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dnp_0x80B3CA20/func_80B3D044.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dnp_0x80B3CA20/func_80B3D044.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dnp_0x80B3CA20/func_80B3D11C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dnp_0x80B3CA20/func_80B3D11C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dnp_0x80B3CA20/func_80B3D2D4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dnp_0x80B3CA20/func_80B3D2D4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dnp_0x80B3CA20/func_80B3D338.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dnp_0x80B3CA20/func_80B3D338.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dnp_0x80B3CA20/func_80B3D3F8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dnp_0x80B3CA20/func_80B3D3F8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dnp_0x80B3CA20/func_80B3D47C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dnp_0x80B3CA20/func_80B3D47C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dnp_0x80B3CA20/func_80B3D558.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dnp_0x80B3CA20/func_80B3D558.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dnp_0x80B3CA20/EnDnp_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dnp_0x80B3CA20/EnDnp_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dnp_0x80B3CA20/EnDnp_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dnp_0x80B3CA20/EnDnp_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dnp_0x80B3CA20/EnDnp_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dnp_0x80B3CA20/EnDnp_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dnp_0x80B3CA20/func_80B3D974.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dnp_0x80B3CA20/func_80B3D974.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dnp_0x80B3CA20/func_80B3DA88.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dnp_0x80B3CA20/func_80B3DA88.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dnp_0x80B3CA20/func_80B3DAA0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dnp_0x80B3CA20/func_80B3DAA0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dnp_0x80B3CA20/EnDnp_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dnp_0x80B3CA20/EnDnp_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Dnq/z_en_dnq.c b/src/overlays/actors/ovl_En_Dnq/z_en_dnq.c index d4d4bf00aa..de3b07e3d0 100644 --- a/src/overlays/actors/ovl_En_Dnq/z_en_dnq.c +++ b/src/overlays/actors/ovl_En_Dnq/z_en_dnq.c @@ -23,38 +23,38 @@ const ActorInit En_Dnq_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dnq_0x80A52530/func_80A52530.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dnq_0x80A52530/func_80A52530.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dnq_0x80A52530/func_80A5257C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dnq_0x80A52530/func_80A5257C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dnq_0x80A52530/func_80A52604.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dnq_0x80A52530/func_80A52604.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dnq_0x80A52530/func_80A52648.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dnq_0x80A52530/func_80A52648.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dnq_0x80A52530/func_80A526F8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dnq_0x80A52530/func_80A526F8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dnq_0x80A52530/func_80A52944.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dnq_0x80A52530/func_80A52944.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dnq_0x80A52530/func_80A52A78.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dnq_0x80A52530/func_80A52A78.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dnq_0x80A52530/func_80A52B68.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dnq_0x80A52530/func_80A52B68.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dnq_0x80A52530/func_80A52C6C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dnq_0x80A52530/func_80A52C6C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dnq_0x80A52530/func_80A52CF8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dnq_0x80A52530/func_80A52CF8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dnq_0x80A52530/func_80A52D44.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dnq_0x80A52530/func_80A52D44.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dnq_0x80A52530/func_80A52DC8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dnq_0x80A52530/func_80A52DC8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dnq_0x80A52530/func_80A52FB8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dnq_0x80A52530/func_80A52FB8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dnq_0x80A52530/func_80A53038.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dnq_0x80A52530/func_80A53038.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dnq_0x80A52530/EnDnq_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dnq_0x80A52530/EnDnq_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dnq_0x80A52530/EnDnq_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dnq_0x80A52530/EnDnq_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dnq_0x80A52530/EnDnq_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dnq_0x80A52530/EnDnq_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dnq_0x80A52530/EnDnq_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dnq_0x80A52530/EnDnq_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Dns/z_en_dns.c b/src/overlays/actors/ovl_En_Dns/z_en_dns.c index bd36c37c67..82a8ced439 100644 --- a/src/overlays/actors/ovl_En_Dns/z_en_dns.c +++ b/src/overlays/actors/ovl_En_Dns/z_en_dns.c @@ -23,56 +23,56 @@ const ActorInit En_Dns_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dns_0x8092C5C0/func_8092C5C0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dns_0x8092C5C0/func_8092C5C0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dns_0x8092C5C0/func_8092C63C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dns_0x8092C5C0/func_8092C63C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dns_0x8092C5C0/func_8092C6FC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dns_0x8092C5C0/func_8092C6FC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dns_0x8092C5C0/func_8092C740.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dns_0x8092C5C0/func_8092C740.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dns_0x8092C5C0/func_8092C86C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dns_0x8092C5C0/func_8092C86C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dns_0x8092C5C0/func_8092C934.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dns_0x8092C5C0/func_8092C934.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dns_0x8092C5C0/func_8092C9BC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dns_0x8092C5C0/func_8092C9BC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dns_0x8092C5C0/func_8092CA74.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dns_0x8092C5C0/func_8092CA74.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dns_0x8092C5C0/func_8092CAD0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dns_0x8092C5C0/func_8092CAD0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dns_0x8092C5C0/func_8092CB98.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dns_0x8092C5C0/func_8092CB98.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dns_0x8092C5C0/func_8092CC68.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dns_0x8092C5C0/func_8092CC68.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dns_0x8092C5C0/func_8092CCEC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dns_0x8092C5C0/func_8092CCEC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dns_0x8092C5C0/func_8092CE38.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dns_0x8092C5C0/func_8092CE38.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dns_0x8092C5C0/func_8092D068.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dns_0x8092C5C0/func_8092D068.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dns_0x8092C5C0/func_8092D108.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dns_0x8092C5C0/func_8092D108.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dns_0x8092C5C0/func_8092D1B8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dns_0x8092C5C0/func_8092D1B8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dns_0x8092C5C0/func_8092D320.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dns_0x8092C5C0/func_8092D320.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dns_0x8092C5C0/func_8092D330.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dns_0x8092C5C0/func_8092D330.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dns_0x8092C5C0/func_8092D4D8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dns_0x8092C5C0/func_8092D4D8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dns_0x8092C5C0/func_8092D5E8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dns_0x8092C5C0/func_8092D5E8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dns_0x8092C5C0/EnDns_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dns_0x8092C5C0/EnDns_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dns_0x8092C5C0/EnDns_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dns_0x8092C5C0/EnDns_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dns_0x8092C5C0/EnDns_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dns_0x8092C5C0/EnDns_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dns_0x8092C5C0/func_8092D954.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dns_0x8092C5C0/func_8092D954.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dns_0x8092C5C0/func_8092DA68.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dns_0x8092C5C0/func_8092DA68.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dns_0x8092C5C0/func_8092DA94.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dns_0x8092C5C0/func_8092DA94.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dns_0x8092C5C0/EnDns_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dns_0x8092C5C0/EnDns_Draw.asm") 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 728d2ca77d..fdb050e53f 100644 --- a/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c +++ b/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c @@ -23,68 +23,68 @@ const ActorInit En_Dodongo_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dodongo_0x80876670/EnDodongo_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dodongo_0x80876670/EnDodongo_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dodongo_0x80876670/EnDodongo_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dodongo_0x80876670/EnDodongo_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dodongo_0x80876670/func_80876930.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dodongo_0x80876670/func_80876930.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dodongo_0x80876670/func_80876B08.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dodongo_0x80876670/func_80876B08.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dodongo_0x80876670/func_80876BD0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dodongo_0x80876670/func_80876BD0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dodongo_0x80876670/func_80876CAC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dodongo_0x80876670/func_80876CAC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dodongo_0x80876670/func_80876D28.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dodongo_0x80876670/func_80876D28.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dodongo_0x80876670/func_80876DC4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dodongo_0x80876670/func_80876DC4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dodongo_0x80876670/func_8087721C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dodongo_0x80876670/func_8087721C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dodongo_0x80876670/func_80877278.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dodongo_0x80876670/func_80877278.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dodongo_0x80876670/func_808773C4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dodongo_0x80876670/func_808773C4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dodongo_0x80876670/func_80877424.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dodongo_0x80876670/func_80877424.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dodongo_0x80876670/func_80877494.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dodongo_0x80876670/func_80877494.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dodongo_0x80876670/func_80877500.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dodongo_0x80876670/func_80877500.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dodongo_0x80876670/func_808777A8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dodongo_0x80876670/func_808777A8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dodongo_0x80876670/func_8087784C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dodongo_0x80876670/func_8087784C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dodongo_0x80876670/func_80877D50.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dodongo_0x80876670/func_80877D50.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dodongo_0x80876670/func_80877D90.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dodongo_0x80876670/func_80877D90.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dodongo_0x80876670/func_80877DE0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dodongo_0x80876670/func_80877DE0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dodongo_0x80876670/func_80877E60.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dodongo_0x80876670/func_80877E60.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dodongo_0x80876670/func_80878354.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dodongo_0x80876670/func_80878354.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dodongo_0x80876670/func_80878424.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dodongo_0x80876670/func_80878424.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dodongo_0x80876670/func_80878594.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dodongo_0x80876670/func_80878594.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dodongo_0x80876670/func_808785B0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dodongo_0x80876670/func_808785B0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dodongo_0x80876670/func_8087864C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dodongo_0x80876670/func_8087864C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dodongo_0x80876670/func_808786C8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dodongo_0x80876670/func_808786C8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dodongo_0x80876670/func_80878724.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dodongo_0x80876670/func_80878724.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dodongo_0x80876670/func_808787B0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dodongo_0x80876670/func_808787B0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dodongo_0x80876670/func_80878910.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dodongo_0x80876670/func_80878910.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dodongo_0x80876670/EnDodongo_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dodongo_0x80876670/EnDodongo_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dodongo_0x80876670/func_80878E44.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dodongo_0x80876670/func_80878E44.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dodongo_0x80876670/func_80878EB4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dodongo_0x80876670/func_80878EB4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dodongo_0x80876670/EnDodongo_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dodongo_0x80876670/EnDodongo_Draw.asm") 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 9db5951aec..d623359327 100644 --- a/src/overlays/actors/ovl_En_Door/z_en_door.c +++ b/src/overlays/actors/ovl_En_Door/z_en_door.c @@ -23,24 +23,24 @@ const ActorInit En_Door_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Door_0x80866800/EnDoor_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Door_0x80866800/EnDoor_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Door_0x80866800/EnDoor_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Door_0x80866800/EnDoor_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Door_0x80866800/func_80866A5C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Door_0x80866800/func_80866A5C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Door_0x80866800/func_80866B20.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Door_0x80866800/func_80866B20.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Door_0x80866800/func_80866F94.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Door_0x80866800/func_80866F94.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Door_0x80866800/func_8086704C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Door_0x80866800/func_8086704C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Door_0x80866800/func_80867080.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Door_0x80866800/func_80867080.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Door_0x80866800/func_808670F0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Door_0x80866800/func_808670F0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Door_0x80866800/func_80867144.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Door_0x80866800/func_80867144.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Door_0x80866800/EnDoor_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Door_0x80866800/EnDoor_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Door_0x80866800/func_80867350.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Door_0x80866800/func_80867350.asm") diff --git a/src/overlays/actors/ovl_En_Door_Etc/z_en_door_etc.c b/src/overlays/actors/ovl_En_Door_Etc/z_en_door_etc.c index 2401189128..2ab4a2d6a7 100644 --- a/src/overlays/actors/ovl_En_Door_Etc/z_en_door_etc.c +++ b/src/overlays/actors/ovl_En_Door_Etc/z_en_door_etc.c @@ -22,22 +22,22 @@ const ActorInit En_Door_Etc_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Door_Etc_0x80AC1ED0/EnDoorEtc_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Door_Etc_0x80AC1ED0/EnDoorEtc_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Door_Etc_0x80AC1ED0/EnDoorEtc_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Door_Etc_0x80AC1ED0/EnDoorEtc_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Door_Etc_0x80AC1ED0/func_80AC2044.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Door_Etc_0x80AC1ED0/func_80AC2044.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Door_Etc_0x80AC1ED0/func_80AC20A8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Door_Etc_0x80AC1ED0/func_80AC20A8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Door_Etc_0x80AC1ED0/func_80AC2118.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Door_Etc_0x80AC1ED0/func_80AC2118.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Door_Etc_0x80AC1ED0/func_80AC2154.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Door_Etc_0x80AC1ED0/func_80AC2154.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Door_Etc_0x80AC1ED0/func_80AC21A0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Door_Etc_0x80AC1ED0/func_80AC21A0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Door_Etc_0x80AC1ED0/func_80AC2354.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Door_Etc_0x80AC1ED0/func_80AC2354.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Door_Etc_0x80AC1ED0/EnDoorEtc_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Door_Etc_0x80AC1ED0/EnDoorEtc_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Door_Etc_0x80AC1ED0/func_80AC24A8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Door_Etc_0x80AC1ED0/func_80AC24A8.asm") diff --git a/src/overlays/actors/ovl_En_Dragon/z_en_dragon.c b/src/overlays/actors/ovl_En_Dragon/z_en_dragon.c index ccc289a26c..41a51ced53 100644 --- a/src/overlays/actors/ovl_En_Dragon/z_en_dragon.c +++ b/src/overlays/actors/ovl_En_Dragon/z_en_dragon.c @@ -23,44 +23,44 @@ const ActorInit En_Dragon_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dragon_0x80B5E890/EnDragon_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dragon_0x80B5E890/EnDragon_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dragon_0x80B5E890/EnDragon_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dragon_0x80B5E890/EnDragon_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dragon_0x80B5E890/func_80B5EAA0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dragon_0x80B5E890/func_80B5EAA0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dragon_0x80B5E890/func_80B5EB40.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dragon_0x80B5E890/func_80B5EB40.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dragon_0x80B5E890/func_80B5ED90.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dragon_0x80B5E890/func_80B5ED90.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dragon_0x80B5E890/func_80B5EDF0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dragon_0x80B5E890/func_80B5EDF0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dragon_0x80B5E890/func_80B5EE3C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dragon_0x80B5E890/func_80B5EE3C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dragon_0x80B5E890/func_80B5EF88.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dragon_0x80B5E890/func_80B5EF88.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dragon_0x80B5E890/func_80B5EFD0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dragon_0x80B5E890/func_80B5EFD0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dragon_0x80B5E890/func_80B5F3A4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dragon_0x80B5E890/func_80B5F3A4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dragon_0x80B5E890/func_80B5F418.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dragon_0x80B5E890/func_80B5F418.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dragon_0x80B5E890/func_80B5F508.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dragon_0x80B5E890/func_80B5F508.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dragon_0x80B5E890/func_80B5F888.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dragon_0x80B5E890/func_80B5F888.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dragon_0x80B5E890/func_80B5F8D8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dragon_0x80B5E890/func_80B5F8D8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dragon_0x80B5E890/func_80B5FCC0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dragon_0x80B5E890/func_80B5FCC0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dragon_0x80B5E890/func_80B5FD68.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dragon_0x80B5E890/func_80B5FD68.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dragon_0x80B5E890/func_80B60138.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dragon_0x80B5E890/func_80B60138.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dragon_0x80B5E890/EnDragon_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dragon_0x80B5E890/EnDragon_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dragon_0x80B5E890/func_80B6043C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dragon_0x80B5E890/func_80B6043C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dragon_0x80B5E890/func_80B60494.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dragon_0x80B5E890/func_80B60494.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dragon_0x80B5E890/EnDragon_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dragon_0x80B5E890/EnDragon_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Drs/z_en_drs.c b/src/overlays/actors/ovl_En_Drs/z_en_drs.c index 6988f88f5c..ddbdd6f4b1 100644 --- a/src/overlays/actors/ovl_En_Drs/z_en_drs.c +++ b/src/overlays/actors/ovl_En_Drs/z_en_drs.c @@ -22,18 +22,18 @@ const ActorInit En_Drs_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Drs_0x80C1E290/func_80C1E290.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Drs_0x80C1E290/func_80C1E290.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Drs_0x80C1E290/func_80C1E2D4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Drs_0x80C1E290/func_80C1E2D4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Drs_0x80C1E290/func_80C1E3DC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Drs_0x80C1E290/func_80C1E3DC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Drs_0x80C1E290/EnDrs_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Drs_0x80C1E290/EnDrs_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Drs_0x80C1E290/EnDrs_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Drs_0x80C1E290/EnDrs_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Drs_0x80C1E290/EnDrs_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Drs_0x80C1E290/EnDrs_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Drs_0x80C1E290/func_80C1E4B0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Drs_0x80C1E290/func_80C1E4B0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Drs_0x80C1E290/func_80C1E568.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Drs_0x80C1E290/func_80C1E568.asm") diff --git a/src/overlays/actors/ovl_En_Ds2n/z_en_ds2n.c b/src/overlays/actors/ovl_En_Ds2n/z_en_ds2n.c index 6d3f8055ef..6ff43a41ea 100644 --- a/src/overlays/actors/ovl_En_Ds2n/z_en_ds2n.c +++ b/src/overlays/actors/ovl_En_Ds2n/z_en_ds2n.c @@ -23,20 +23,20 @@ const ActorInit En_Ds2n_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ds2n_0x80AE1650/func_80AE1650.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ds2n_0x80AE1650/func_80AE1650.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ds2n_0x80AE1650/func_80AE16A0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ds2n_0x80AE1650/func_80AE16A0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ds2n_0x80AE1650/func_80AE16D8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ds2n_0x80AE1650/func_80AE16D8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ds2n_0x80AE1650/EnDs2n_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ds2n_0x80AE1650/EnDs2n_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ds2n_0x80AE1650/EnDs2n_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ds2n_0x80AE1650/EnDs2n_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ds2n_0x80AE1650/EnDs2n_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ds2n_0x80AE1650/EnDs2n_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ds2n_0x80AE1650/func_80AE1874.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ds2n_0x80AE1650/func_80AE1874.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ds2n_0x80AE1650/func_80AE18B4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ds2n_0x80AE1650/func_80AE18B4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ds2n_0x80AE1650/EnDs2n_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ds2n_0x80AE1650/EnDs2n_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Dt/z_en_dt.c b/src/overlays/actors/ovl_En_Dt/z_en_dt.c index 9b0d377e0c..5d77da3a7f 100644 --- a/src/overlays/actors/ovl_En_Dt/z_en_dt.c +++ b/src/overlays/actors/ovl_En_Dt/z_en_dt.c @@ -23,46 +23,46 @@ const ActorInit En_Dt_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dt_0x80BE9B20/EnDt_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dt_0x80BE9B20/EnDt_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dt_0x80BE9B20/EnDt_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dt_0x80BE9B20/EnDt_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dt_0x80BE9B20/func_80BE9C74.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dt_0x80BE9B20/func_80BE9C74.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dt_0x80BE9B20/func_80BE9CE8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dt_0x80BE9B20/func_80BE9CE8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dt_0x80BE9B20/func_80BE9D9C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dt_0x80BE9B20/func_80BE9D9C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dt_0x80BE9B20/func_80BE9DF8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dt_0x80BE9B20/func_80BE9DF8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dt_0x80BE9B20/func_80BE9E94.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dt_0x80BE9B20/func_80BE9E94.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dt_0x80BE9B20/func_80BE9EF8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dt_0x80BE9B20/func_80BE9EF8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dt_0x80BE9B20/func_80BEA088.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dt_0x80BE9B20/func_80BEA088.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dt_0x80BE9B20/func_80BEA254.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dt_0x80BE9B20/func_80BEA254.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dt_0x80BE9B20/func_80BEA394.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dt_0x80BE9B20/func_80BEA394.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dt_0x80BE9B20/func_80BEA8F0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dt_0x80BE9B20/func_80BEA8F0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dt_0x80BE9B20/func_80BEAAF8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dt_0x80BE9B20/func_80BEAAF8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dt_0x80BE9B20/func_80BEAB44.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dt_0x80BE9B20/func_80BEAB44.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dt_0x80BE9B20/func_80BEABF8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dt_0x80BE9B20/func_80BEABF8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dt_0x80BE9B20/func_80BEAC84.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dt_0x80BE9B20/func_80BEAC84.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dt_0x80BE9B20/func_80BEAD2C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dt_0x80BE9B20/func_80BEAD2C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dt_0x80BE9B20/func_80BEADB8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dt_0x80BE9B20/func_80BEADB8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dt_0x80BE9B20/func_80BEADD4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dt_0x80BE9B20/func_80BEADD4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dt_0x80BE9B20/EnDt_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dt_0x80BE9B20/EnDt_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dt_0x80BE9B20/func_80BEB06C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dt_0x80BE9B20/func_80BEB06C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Dt_0x80BE9B20/EnDt_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Dt_0x80BE9B20/EnDt_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Egblock/z_en_egblock.c b/src/overlays/actors/ovl_En_Egblock/z_en_egblock.c index 76b3b1fee2..89712dd2c2 100644 --- a/src/overlays/actors/ovl_En_Egblock/z_en_egblock.c +++ b/src/overlays/actors/ovl_En_Egblock/z_en_egblock.c @@ -23,22 +23,22 @@ const ActorInit En_Egblock_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Egblock_0x80ABA7A0/EnEgblock_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Egblock_0x80ABA7A0/EnEgblock_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Egblock_0x80ABA7A0/EnEgblock_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Egblock_0x80ABA7A0/EnEgblock_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Egblock_0x80ABA7A0/func_80ABA8A4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Egblock_0x80ABA7A0/func_80ABA8A4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Egblock_0x80ABA7A0/func_80ABA988.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Egblock_0x80ABA7A0/func_80ABA988.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Egblock_0x80ABA7A0/func_80ABA9B8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Egblock_0x80ABA7A0/func_80ABA9B8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Egblock_0x80ABA7A0/EnEgblock_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Egblock_0x80ABA7A0/EnEgblock_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Egblock_0x80ABA7A0/EnEgblock_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Egblock_0x80ABA7A0/EnEgblock_Draw.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Egblock_0x80ABA7A0/func_80ABAAF4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Egblock_0x80ABA7A0/func_80ABAAF4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Egblock_0x80ABA7A0/func_80ABACB4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Egblock_0x80ABA7A0/func_80ABACB4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Egblock_0x80ABA7A0/func_80ABAE64.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Egblock_0x80ABA7A0/func_80ABAE64.asm") diff --git a/src/overlays/actors/ovl_En_Egol/z_en_egol.c b/src/overlays/actors/ovl_En_Egol/z_en_egol.c index 1cb22062d7..535f32a3ac 100644 --- a/src/overlays/actors/ovl_En_Egol/z_en_egol.c +++ b/src/overlays/actors/ovl_En_Egol/z_en_egol.c @@ -23,86 +23,86 @@ const ActorInit En_Egol_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Egol_0x80A7C990/func_80A7C990.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Egol_0x80A7C990/func_80A7C990.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Egol_0x80A7C990/func_80A7CA18.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Egol_0x80A7C990/func_80A7CA18.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Egol_0x80A7C990/func_80A7CBC4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Egol_0x80A7C990/func_80A7CBC4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Egol_0x80A7C990/func_80A7CD08.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Egol_0x80A7C990/func_80A7CD08.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Egol_0x80A7C990/EnEgol_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Egol_0x80A7C990/EnEgol_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Egol_0x80A7C990/EnEgol_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Egol_0x80A7C990/EnEgol_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Egol_0x80A7C990/func_80A7D140.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Egol_0x80A7C990/func_80A7D140.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Egol_0x80A7C990/func_80A7D168.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Egol_0x80A7C990/func_80A7D168.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Egol_0x80A7C990/func_80A7D1E4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Egol_0x80A7C990/func_80A7D1E4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Egol_0x80A7C990/func_80A7D240.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Egol_0x80A7C990/func_80A7D240.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Egol_0x80A7C990/func_80A7D27C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Egol_0x80A7C990/func_80A7D27C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Egol_0x80A7C990/func_80A7D2C4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Egol_0x80A7C990/func_80A7D2C4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Egol_0x80A7C990/func_80A7D710.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Egol_0x80A7C990/func_80A7D710.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Egol_0x80A7C990/func_80A7D780.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Egol_0x80A7C990/func_80A7D780.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Egol_0x80A7C990/func_80A7DAAC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Egol_0x80A7C990/func_80A7DAAC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Egol_0x80A7C990/func_80A7DAF0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Egol_0x80A7C990/func_80A7DAF0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Egol_0x80A7C990/func_80A7E2E8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Egol_0x80A7C990/func_80A7E2E8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Egol_0x80A7C990/func_80A7E344.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Egol_0x80A7C990/func_80A7E344.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Egol_0x80A7C990/func_80A7E478.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Egol_0x80A7C990/func_80A7E478.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Egol_0x80A7C990/func_80A7E4B4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Egol_0x80A7C990/func_80A7E4B4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Egol_0x80A7C990/func_80A7E7EC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Egol_0x80A7C990/func_80A7E7EC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Egol_0x80A7C990/func_80A7E820.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Egol_0x80A7C990/func_80A7E820.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Egol_0x80A7C990/func_80A7E924.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Egol_0x80A7C990/func_80A7E924.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Egol_0x80A7C990/func_80A7E970.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Egol_0x80A7C990/func_80A7E970.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Egol_0x80A7C990/func_80A7E9D0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Egol_0x80A7C990/func_80A7E9D0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Egol_0x80A7C990/func_80A7EA28.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Egol_0x80A7C990/func_80A7EA28.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Egol_0x80A7C990/func_80A7EA88.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Egol_0x80A7C990/func_80A7EA88.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Egol_0x80A7C990/func_80A7EAD8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Egol_0x80A7C990/func_80A7EAD8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Egol_0x80A7C990/func_80A7EB14.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Egol_0x80A7C990/func_80A7EB14.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Egol_0x80A7C990/func_80A7EB54.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Egol_0x80A7C990/func_80A7EB54.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Egol_0x80A7C990/func_80A7EB90.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Egol_0x80A7C990/func_80A7EB90.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Egol_0x80A7C990/func_80A7EBDC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Egol_0x80A7C990/func_80A7EBDC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Egol_0x80A7C990/func_80A7EC84.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Egol_0x80A7C990/func_80A7EC84.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Egol_0x80A7C990/func_80A7ED14.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Egol_0x80A7C990/func_80A7ED14.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Egol_0x80A7C990/func_80A7EFB8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Egol_0x80A7C990/func_80A7EFB8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Egol_0x80A7C990/EnEgol_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Egol_0x80A7C990/EnEgol_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Egol_0x80A7C990/func_80A7F8E8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Egol_0x80A7C990/func_80A7F8E8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Egol_0x80A7C990/func_80A7FAFC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Egol_0x80A7C990/func_80A7FAFC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Egol_0x80A7C990/EnEgol_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Egol_0x80A7C990/EnEgol_Draw.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Egol_0x80A7C990/func_80A80508.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Egol_0x80A7C990/func_80A80508.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Egol_0x80A7C990/func_80A80750.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Egol_0x80A7C990/func_80A80750.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Egol_0x80A7C990/func_80A80904.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Egol_0x80A7C990/func_80A80904.asm") 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 9644280841..b381c547b7 100644 --- a/src/overlays/actors/ovl_En_Elf/z_en_elf.c +++ b/src/overlays/actors/ovl_En_Elf/z_en_elf.c @@ -23,94 +23,94 @@ const ActorInit En_Elf_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Elf_0x8088C510/func_8088C510.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Elf_0x8088C510/func_8088C510.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Elf_0x8088C510/func_8088C51C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Elf_0x8088C510/func_8088C51C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Elf_0x8088C510/func_8088C804.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Elf_0x8088C510/func_8088C804.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Elf_0x8088C510/func_8088C858.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Elf_0x8088C510/func_8088C858.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Elf_0x8088C510/func_8088C920.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Elf_0x8088C510/func_8088C920.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Elf_0x8088C510/func_8088C9CC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Elf_0x8088C510/func_8088C9CC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Elf_0x8088C510/func_8088CBAC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Elf_0x8088C510/func_8088CBAC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Elf_0x8088C510/func_8088CC48.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Elf_0x8088C510/func_8088CC48.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Elf_0x8088C510/func_8088CD3C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Elf_0x8088C510/func_8088CD3C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Elf_0x8088C510/EnElf_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Elf_0x8088C510/EnElf_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Elf_0x8088C510/EnElf_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Elf_0x8088C510/EnElf_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Elf_0x8088C510/func_8088D3EC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Elf_0x8088C510/func_8088D3EC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Elf_0x8088C510/func_8088D470.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Elf_0x8088C510/func_8088D470.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Elf_0x8088C510/func_8088D504.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Elf_0x8088C510/func_8088D504.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Elf_0x8088C510/func_8088D5A0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Elf_0x8088C510/func_8088D5A0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Elf_0x8088C510/func_8088D660.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Elf_0x8088C510/func_8088D660.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Elf_0x8088C510/func_8088D7F8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Elf_0x8088C510/func_8088D7F8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Elf_0x8088C510/func_8088D864.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Elf_0x8088C510/func_8088D864.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Elf_0x8088C510/func_8088D8D0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Elf_0x8088C510/func_8088D8D0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Elf_0x8088C510/func_8088D9BC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Elf_0x8088C510/func_8088D9BC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Elf_0x8088C510/func_8088DB4C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Elf_0x8088C510/func_8088DB4C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Elf_0x8088C510/func_8088DCA4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Elf_0x8088C510/func_8088DCA4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Elf_0x8088C510/func_8088DD34.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Elf_0x8088C510/func_8088DD34.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Elf_0x8088C510/func_8088E018.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Elf_0x8088C510/func_8088E018.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Elf_0x8088C510/func_8088E0E0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Elf_0x8088C510/func_8088E0E0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Elf_0x8088C510/func_8088E0F0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Elf_0x8088C510/func_8088E0F0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Elf_0x8088C510/func_8088E304.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Elf_0x8088C510/func_8088E304.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Elf_0x8088C510/func_8088E484.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Elf_0x8088C510/func_8088E484.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Elf_0x8088C510/func_8088E5A8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Elf_0x8088C510/func_8088E5A8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Elf_0x8088C510/func_8088E60C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Elf_0x8088C510/func_8088E60C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Elf_0x8088C510/func_8088E850.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Elf_0x8088C510/func_8088E850.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Elf_0x8088C510/func_8088EF18.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Elf_0x8088C510/func_8088EF18.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Elf_0x8088C510/func_8088EFA4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Elf_0x8088C510/func_8088EFA4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Elf_0x8088C510/func_8088F214.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Elf_0x8088C510/func_8088F214.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Elf_0x8088C510/func_8088F5F4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Elf_0x8088C510/func_8088F5F4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Elf_0x8088C510/func_8088F9E4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Elf_0x8088C510/func_8088F9E4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Elf_0x8088C510/func_8088FA38.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Elf_0x8088C510/func_8088FA38.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Elf_0x8088C510/func_8088FC34.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Elf_0x8088C510/func_8088FC34.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Elf_0x8088C510/func_8088FD04.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Elf_0x8088C510/func_8088FD04.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Elf_0x8088C510/func_8088FDCC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Elf_0x8088C510/func_8088FDCC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Elf_0x8088C510/func_8088FE64.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Elf_0x8088C510/func_8088FE64.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Elf_0x8088C510/func_8089010C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Elf_0x8088C510/func_8089010C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Elf_0x8088C510/EnElf_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Elf_0x8088C510/EnElf_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Elf_0x8088C510/func_80890494.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Elf_0x8088C510/func_80890494.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Elf_0x8088C510/EnElf_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Elf_0x8088C510/EnElf_Draw.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Elf_0x8088C510/func_808908D0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Elf_0x8088C510/func_808908D0.asm") diff --git a/src/overlays/actors/ovl_En_Elfbub/z_en_elfbub.c b/src/overlays/actors/ovl_En_Elfbub/z_en_elfbub.c index 07c0c512bf..45137e9831 100644 --- a/src/overlays/actors/ovl_En_Elfbub/z_en_elfbub.c +++ b/src/overlays/actors/ovl_En_Elfbub/z_en_elfbub.c @@ -23,14 +23,14 @@ const ActorInit En_Elfbub_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Elfbub_0x80ACDCD0/EnElfbub_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Elfbub_0x80ACDCD0/EnElfbub_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Elfbub_0x80ACDCD0/EnElfbub_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Elfbub_0x80ACDCD0/EnElfbub_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Elfbub_0x80ACDCD0/func_80ACDE60.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Elfbub_0x80ACDCD0/func_80ACDE60.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Elfbub_0x80ACDCD0/func_80ACE030.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Elfbub_0x80ACDCD0/func_80ACE030.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Elfbub_0x80ACDCD0/EnElfbub_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Elfbub_0x80ACDCD0/EnElfbub_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Elfbub_0x80ACDCD0/EnElfbub_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Elfbub_0x80ACDCD0/EnElfbub_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Elfgrp/z_en_elfgrp.c b/src/overlays/actors/ovl_En_Elfgrp/z_en_elfgrp.c index 1eaa193e8b..bd37759da4 100644 --- a/src/overlays/actors/ovl_En_Elfgrp/z_en_elfgrp.c +++ b/src/overlays/actors/ovl_En_Elfgrp/z_en_elfgrp.c @@ -22,52 +22,52 @@ const ActorInit En_Elfgrp_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Elfgrp_0x80A396B0/func_80A396B0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Elfgrp_0x80A396B0/func_80A396B0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Elfgrp_0x80A396B0/EnElfgrp_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Elfgrp_0x80A396B0/EnElfgrp_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Elfgrp_0x80A396B0/EnElfgrp_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Elfgrp_0x80A396B0/EnElfgrp_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Elfgrp_0x80A396B0/func_80A39BD0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Elfgrp_0x80A396B0/func_80A39BD0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Elfgrp_0x80A396B0/func_80A39C1C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Elfgrp_0x80A396B0/func_80A39C1C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Elfgrp_0x80A396B0/func_80A39CD4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Elfgrp_0x80A396B0/func_80A39CD4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Elfgrp_0x80A396B0/func_80A39DC8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Elfgrp_0x80A396B0/func_80A39DC8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Elfgrp_0x80A396B0/func_80A39F50.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Elfgrp_0x80A396B0/func_80A39F50.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Elfgrp_0x80A396B0/func_80A39FBC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Elfgrp_0x80A396B0/func_80A39FBC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Elfgrp_0x80A396B0/func_80A3A044.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Elfgrp_0x80A396B0/func_80A3A044.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Elfgrp_0x80A396B0/func_80A3A0AC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Elfgrp_0x80A396B0/func_80A3A0AC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Elfgrp_0x80A396B0/func_80A3A0F4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Elfgrp_0x80A396B0/func_80A3A0F4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Elfgrp_0x80A396B0/func_80A3A210.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Elfgrp_0x80A396B0/func_80A3A210.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Elfgrp_0x80A396B0/func_80A3A274.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Elfgrp_0x80A396B0/func_80A3A274.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Elfgrp_0x80A396B0/func_80A3A398.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Elfgrp_0x80A396B0/func_80A3A398.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Elfgrp_0x80A396B0/func_80A3A484.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Elfgrp_0x80A396B0/func_80A3A484.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Elfgrp_0x80A396B0/func_80A3A4AC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Elfgrp_0x80A396B0/func_80A3A4AC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Elfgrp_0x80A396B0/func_80A3A520.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Elfgrp_0x80A396B0/func_80A3A520.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Elfgrp_0x80A396B0/func_80A3A600.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Elfgrp_0x80A396B0/func_80A3A600.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Elfgrp_0x80A396B0/func_80A3A610.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Elfgrp_0x80A396B0/func_80A3A610.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Elfgrp_0x80A396B0/func_80A3A6F4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Elfgrp_0x80A396B0/func_80A3A6F4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Elfgrp_0x80A396B0/func_80A3A77C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Elfgrp_0x80A396B0/func_80A3A77C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Elfgrp_0x80A396B0/func_80A3A7FC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Elfgrp_0x80A396B0/func_80A3A7FC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Elfgrp_0x80A396B0/func_80A3A8F8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Elfgrp_0x80A396B0/func_80A3A8F8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Elfgrp_0x80A396B0/EnElfgrp_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Elfgrp_0x80A396B0/EnElfgrp_Update.asm") diff --git a/src/overlays/actors/ovl_En_Elforg/z_en_elforg.c b/src/overlays/actors/ovl_En_Elforg/z_en_elforg.c index a34b675a24..cf2f8e10f7 100644 --- a/src/overlays/actors/ovl_En_Elforg/z_en_elforg.c +++ b/src/overlays/actors/ovl_En_Elforg/z_en_elforg.c @@ -23,52 +23,52 @@ const ActorInit En_Elforg_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Elforg_0x80ACC470/func_80ACC470.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Elforg_0x80ACC470/func_80ACC470.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Elforg_0x80ACC470/EnElforg_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Elforg_0x80ACC470/EnElforg_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Elforg_0x80ACC470/EnElforg_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Elforg_0x80ACC470/EnElforg_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Elforg_0x80ACC470/func_80ACC7E4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Elforg_0x80ACC470/func_80ACC7E4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Elforg_0x80ACC470/func_80ACC8D4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Elforg_0x80ACC470/func_80ACC8D4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Elforg_0x80ACC470/func_80ACC934.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Elforg_0x80ACC470/func_80ACC934.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Elforg_0x80ACC470/func_80ACC994.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Elforg_0x80ACC470/func_80ACC994.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Elforg_0x80ACC470/func_80ACCAC0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Elforg_0x80ACC470/func_80ACCAC0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Elforg_0x80ACC470/func_80ACCBB8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Elforg_0x80ACC470/func_80ACCBB8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Elforg_0x80ACC470/func_80ACCBD0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Elforg_0x80ACC470/func_80ACCBD0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Elforg_0x80ACC470/func_80ACCC98.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Elforg_0x80ACC470/func_80ACCC98.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Elforg_0x80ACC470/func_80ACCE4C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Elforg_0x80ACC470/func_80ACCE4C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Elforg_0x80ACC470/func_80ACCEB0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Elforg_0x80ACC470/func_80ACCEB0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Elforg_0x80ACC470/func_80ACD088.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Elforg_0x80ACC470/func_80ACD088.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Elforg_0x80ACC470/func_80ACD164.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Elforg_0x80ACC470/func_80ACD164.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Elforg_0x80ACC470/func_80ACD1B0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Elforg_0x80ACC470/func_80ACD1B0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Elforg_0x80ACC470/func_80ACD1F0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Elforg_0x80ACC470/func_80ACD1F0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Elforg_0x80ACC470/func_80ACD2E4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Elforg_0x80ACC470/func_80ACD2E4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Elforg_0x80ACC470/func_80ACD59C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Elforg_0x80ACC470/func_80ACD59C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Elforg_0x80ACC470/func_80ACD610.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Elforg_0x80ACC470/func_80ACD610.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Elforg_0x80ACC470/func_80ACD6A8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Elforg_0x80ACC470/func_80ACD6A8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Elforg_0x80ACC470/func_80ACD6EC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Elforg_0x80ACC470/func_80ACD6EC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Elforg_0x80ACC470/EnElforg_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Elforg_0x80ACC470/EnElforg_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Elforg_0x80ACC470/func_80ACD878.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Elforg_0x80ACC470/func_80ACD878.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Elforg_0x80ACC470/EnElforg_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Elforg_0x80ACC470/EnElforg_Draw.asm") 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 07ff643fce..3bc4a177e9 100644 --- a/src/overlays/actors/ovl_En_Encount1/z_en_encount1.c +++ b/src/overlays/actors/ovl_En_Encount1/z_en_encount1.c @@ -21,8 +21,8 @@ const ActorInit En_Encount1_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Encount1_0x808E0830/EnEncount1_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Encount1_0x808E0830/EnEncount1_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Encount1_0x808E0830/func_808E0954.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Encount1_0x808E0830/func_808E0954.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Encount1_0x808E0830/EnEncount1_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Encount1_0x808E0830/EnEncount1_Update.asm") 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 6bb4eb334c..96703320fb 100644 --- a/src/overlays/actors/ovl_En_Encount2/z_en_encount2.c +++ b/src/overlays/actors/ovl_En_Encount2/z_en_encount2.c @@ -23,24 +23,24 @@ const ActorInit En_Encount2_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Encount2_0x808E1560/EnEncount2_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Encount2_0x808E1560/EnEncount2_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Encount2_0x808E1560/EnEncount2_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Encount2_0x808E1560/EnEncount2_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Encount2_0x808E1560/func_808E16FC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Encount2_0x808E1560/func_808E16FC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Encount2_0x808E1560/func_808E1714.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Encount2_0x808E1560/func_808E1714.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Encount2_0x808E1560/func_808E17C4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Encount2_0x808E1560/func_808E17C4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Encount2_0x808E1560/func_808E18A8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Encount2_0x808E1560/func_808E18A8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Encount2_0x808E1560/EnEncount2_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Encount2_0x808E1560/EnEncount2_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Encount2_0x808E1560/EnEncount2_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Encount2_0x808E1560/EnEncount2_Draw.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Encount2_0x808E1560/func_808E1A24.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Encount2_0x808E1560/func_808E1A24.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Encount2_0x808E1560/func_808E1B4C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Encount2_0x808E1560/func_808E1B4C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Encount2_0x808E1560/func_808E1C9C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Encount2_0x808E1560/func_808E1C9C.asm") diff --git a/src/overlays/actors/ovl_En_Encount3/z_en_encount3.c b/src/overlays/actors/ovl_En_Encount3/z_en_encount3.c index dcd1db4160..acc930d24b 100644 --- a/src/overlays/actors/ovl_En_Encount3/z_en_encount3.c +++ b/src/overlays/actors/ovl_En_Encount3/z_en_encount3.c @@ -23,18 +23,18 @@ const ActorInit En_Encount3_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Encount3_0x809ACF40/EnEncount3_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Encount3_0x809ACF40/EnEncount3_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Encount3_0x809ACF40/EnEncount3_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Encount3_0x809ACF40/EnEncount3_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Encount3_0x809ACF40/func_809AD058.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Encount3_0x809ACF40/func_809AD058.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Encount3_0x809ACF40/func_809AD084.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Encount3_0x809ACF40/func_809AD084.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Encount3_0x809ACF40/func_809AD194.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Encount3_0x809ACF40/func_809AD194.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Encount3_0x809ACF40/func_809AD1EC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Encount3_0x809ACF40/func_809AD1EC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Encount3_0x809ACF40/EnEncount3_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Encount3_0x809ACF40/EnEncount3_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Encount3_0x809ACF40/EnEncount3_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Encount3_0x809ACF40/EnEncount3_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Encount4/z_en_encount4.c b/src/overlays/actors/ovl_En_Encount4/z_en_encount4.c index c2dfcdbcf8..e506d99d32 100644 --- a/src/overlays/actors/ovl_En_Encount4/z_en_encount4.c +++ b/src/overlays/actors/ovl_En_Encount4/z_en_encount4.c @@ -22,18 +22,18 @@ const ActorInit En_Encount4_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Encount4_0x809C3F30/EnEncount4_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Encount4_0x809C3F30/EnEncount4_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Encount4_0x809C3F30/EnEncount4_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Encount4_0x809C3F30/EnEncount4_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Encount4_0x809C3F30/func_809C3FD8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Encount4_0x809C3F30/func_809C3FD8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Encount4_0x809C3F30/func_809C4078.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Encount4_0x809C3F30/func_809C4078.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Encount4_0x809C3F30/func_809C42A8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Encount4_0x809C3F30/func_809C42A8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Encount4_0x809C3F30/func_809C4598.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Encount4_0x809C3F30/func_809C4598.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Encount4_0x809C3F30/func_809C464C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Encount4_0x809C3F30/func_809C464C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Encount4_0x809C3F30/EnEncount4_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Encount4_0x809C3F30/EnEncount4_Update.asm") diff --git a/src/overlays/actors/ovl_En_Ending_Hero6/z_en_ending_hero6.c b/src/overlays/actors/ovl_En_Ending_Hero6/z_en_ending_hero6.c index e8323ef662..b3e2c6f0ef 100644 --- a/src/overlays/actors/ovl_En_Ending_Hero6/z_en_ending_hero6.c +++ b/src/overlays/actors/ovl_En_Ending_Hero6/z_en_ending_hero6.c @@ -23,18 +23,18 @@ const ActorInit En_Ending_Hero6_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ending_Hero6_0x80C23C90/EnEndingHero6_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ending_Hero6_0x80C23C90/EnEndingHero6_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ending_Hero6_0x80C23C90/EnEndingHero6_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ending_Hero6_0x80C23C90/EnEndingHero6_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ending_Hero6_0x80C23C90/func_80C23D60.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ending_Hero6_0x80C23C90/func_80C23D60.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ending_Hero6_0x80C23C90/func_80C23DDC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ending_Hero6_0x80C23C90/func_80C23DDC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ending_Hero6_0x80C23C90/func_80C23E18.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ending_Hero6_0x80C23C90/func_80C23E18.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ending_Hero6_0x80C23C90/EnEndingHero6_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ending_Hero6_0x80C23C90/EnEndingHero6_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ending_Hero6_0x80C23C90/func_80C23F14.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ending_Hero6_0x80C23C90/func_80C23F14.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ending_Hero6_0x80C23C90/EnEndingHero6_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ending_Hero6_0x80C23C90/EnEndingHero6_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Estone/z_en_estone.c b/src/overlays/actors/ovl_En_Estone/z_en_estone.c index cbf22cdd23..2ab8cff3a3 100644 --- a/src/overlays/actors/ovl_En_Estone/z_en_estone.c +++ b/src/overlays/actors/ovl_En_Estone/z_en_estone.c @@ -23,20 +23,20 @@ const ActorInit En_Estone_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Estone_0x80A99EA0/EnEstone_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Estone_0x80A99EA0/EnEstone_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Estone_0x80A99EA0/EnEstone_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Estone_0x80A99EA0/EnEstone_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Estone_0x80A99EA0/func_80A9A1DC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Estone_0x80A99EA0/func_80A9A1DC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Estone_0x80A99EA0/func_80A9A4B0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Estone_0x80A99EA0/func_80A9A4B0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Estone_0x80A99EA0/EnEstone_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Estone_0x80A99EA0/EnEstone_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Estone_0x80A99EA0/EnEstone_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Estone_0x80A99EA0/EnEstone_Draw.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Estone_0x80A99EA0/func_80A9A774.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Estone_0x80A99EA0/func_80A9A774.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Estone_0x80A99EA0/func_80A9A870.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Estone_0x80A99EA0/func_80A9A870.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Estone_0x80A99EA0/func_80A9A9C0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Estone_0x80A99EA0/func_80A9A9C0.asm") diff --git a/src/overlays/actors/ovl_En_Fall/z_en_fall.c b/src/overlays/actors/ovl_En_Fall/z_en_fall.c index 4f62c57742..f139b294c0 100644 --- a/src/overlays/actors/ovl_En_Fall/z_en_fall.c +++ b/src/overlays/actors/ovl_En_Fall/z_en_fall.c @@ -22,64 +22,64 @@ const ActorInit En_Fall_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fall_0x80A6BF90/func_80A6BF90.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fall_0x80A6BF90/func_80A6BF90.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fall_0x80A6BF90/func_80A6C1DC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fall_0x80A6BF90/func_80A6C1DC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fall_0x80A6BF90/EnFall_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fall_0x80A6BF90/EnFall_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fall_0x80A6BF90/EnFall_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fall_0x80A6BF90/EnFall_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fall_0x80A6BF90/func_80A6C3AC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fall_0x80A6BF90/func_80A6C3AC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fall_0x80A6BF90/func_80A6C3FC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fall_0x80A6BF90/func_80A6C3FC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fall_0x80A6BF90/func_80A6C7C0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fall_0x80A6BF90/func_80A6C7C0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fall_0x80A6BF90/func_80A6C9A8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fall_0x80A6BF90/func_80A6C9A8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fall_0x80A6BF90/func_80A6CA9C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fall_0x80A6BF90/func_80A6CA9C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fall_0x80A6BF90/func_80A6CB74.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fall_0x80A6BF90/func_80A6CB74.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fall_0x80A6BF90/func_80A6CD38.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fall_0x80A6BF90/func_80A6CD38.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fall_0x80A6BF90/func_80A6CD74.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fall_0x80A6BF90/func_80A6CD74.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fall_0x80A6BF90/func_80A6CECC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fall_0x80A6BF90/func_80A6CECC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fall_0x80A6BF90/func_80A6CF60.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fall_0x80A6BF90/func_80A6CF60.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fall_0x80A6BF90/func_80A6CF70.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fall_0x80A6BF90/func_80A6CF70.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fall_0x80A6BF90/EnFall_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fall_0x80A6BF90/EnFall_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fall_0x80A6BF90/func_80A6D100.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fall_0x80A6BF90/func_80A6D100.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fall_0x80A6BF90/func_80A6D220.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fall_0x80A6BF90/func_80A6D220.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fall_0x80A6BF90/func_80A6D444.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fall_0x80A6BF90/func_80A6D444.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fall_0x80A6BF90/func_80A6D504.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fall_0x80A6BF90/func_80A6D504.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fall_0x80A6BF90/func_80A6D698.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fall_0x80A6BF90/func_80A6D698.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fall_0x80A6BF90/func_80A6D75C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fall_0x80A6BF90/func_80A6D75C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fall_0x80A6BF90/func_80A6D88C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fall_0x80A6BF90/func_80A6D88C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fall_0x80A6BF90/func_80A6D98C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fall_0x80A6BF90/func_80A6D98C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fall_0x80A6BF90/func_80A6DA7C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fall_0x80A6BF90/func_80A6DA7C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fall_0x80A6BF90/func_80A6DC20.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fall_0x80A6BF90/func_80A6DC20.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fall_0x80A6BF90/func_80A6DC40.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fall_0x80A6BF90/func_80A6DC40.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fall_0x80A6BF90/func_80A6DD3C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fall_0x80A6BF90/func_80A6DD3C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fall_0x80A6BF90/func_80A6E07C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fall_0x80A6BF90/func_80A6E07C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fall_0x80A6BF90/func_80A6E214.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fall_0x80A6BF90/func_80A6E214.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fall_0x80A6BF90/func_80A6E37C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fall_0x80A6BF90/func_80A6E37C.asm") diff --git a/src/overlays/actors/ovl_En_Fall2/z_en_fall2.c b/src/overlays/actors/ovl_En_Fall2/z_en_fall2.c index b3783d6c54..eeb7abe6f9 100644 --- a/src/overlays/actors/ovl_En_Fall2/z_en_fall2.c +++ b/src/overlays/actors/ovl_En_Fall2/z_en_fall2.c @@ -23,20 +23,20 @@ const ActorInit En_Fall2_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fall2_0x80C1B640/EnFall2_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fall2_0x80C1B640/EnFall2_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fall2_0x80C1B640/EnFall2_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fall2_0x80C1B640/EnFall2_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fall2_0x80C1B640/func_80C1B724.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fall2_0x80C1B640/func_80C1B724.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fall2_0x80C1B640/func_80C1B8A4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fall2_0x80C1B640/func_80C1B8A4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fall2_0x80C1B640/func_80C1B8B4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fall2_0x80C1B640/func_80C1B8B4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fall2_0x80C1B640/func_80C1B8F0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fall2_0x80C1B640/func_80C1B8F0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fall2_0x80C1B640/func_80C1B9D4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fall2_0x80C1B640/func_80C1B9D4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fall2_0x80C1B640/EnFall2_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fall2_0x80C1B640/EnFall2_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fall2_0x80C1B640/EnFall2_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fall2_0x80C1B640/EnFall2_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Famos/z_en_famos.c b/src/overlays/actors/ovl_En_Famos/z_en_famos.c index f9f699bc84..7aba677245 100644 --- a/src/overlays/actors/ovl_En_Famos/z_en_famos.c +++ b/src/overlays/actors/ovl_En_Famos/z_en_famos.c @@ -23,84 +23,84 @@ const ActorInit En_Famos_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Famos_0x808AC920/EnFamos_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Famos_0x808AC920/EnFamos_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Famos_0x808AC920/EnFamos_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Famos_0x808AC920/EnFamos_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Famos_0x808AC920/func_808ACB58.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Famos_0x808AC920/func_808ACB58.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Famos_0x808AC920/func_808ACD2C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Famos_0x808AC920/func_808ACD2C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Famos_0x808AC920/func_808ACF1C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Famos_0x808AC920/func_808ACF1C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Famos_0x808AC920/func_808ACF98.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Famos_0x808AC920/func_808ACF98.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Famos_0x808AC920/func_808AD05C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Famos_0x808AC920/func_808AD05C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Famos_0x808AC920/func_808AD170.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Famos_0x808AC920/func_808AD170.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Famos_0x808AC920/func_808AD18C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Famos_0x808AC920/func_808AD18C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Famos_0x808AC920/func_808AD1F0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Famos_0x808AC920/func_808AD1F0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Famos_0x808AC920/func_808AD294.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Famos_0x808AC920/func_808AD294.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Famos_0x808AC920/func_808AD31C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Famos_0x808AC920/func_808AD31C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Famos_0x808AC920/func_808AD378.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Famos_0x808AC920/func_808AD378.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Famos_0x808AC920/func_808AD3E8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Famos_0x808AC920/func_808AD3E8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Famos_0x808AC920/func_808AD42C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Famos_0x808AC920/func_808AD42C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Famos_0x808AC920/func_808AD54C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Famos_0x808AC920/func_808AD54C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Famos_0x808AC920/func_808AD5B0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Famos_0x808AC920/func_808AD5B0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Famos_0x808AC920/func_808AD66C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Famos_0x808AC920/func_808AD66C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Famos_0x808AC920/func_808AD68C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Famos_0x808AC920/func_808AD68C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Famos_0x808AC920/func_808AD7EC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Famos_0x808AC920/func_808AD7EC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Famos_0x808AC920/func_808AD840.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Famos_0x808AC920/func_808AD840.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Famos_0x808AC920/func_808AD888.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Famos_0x808AC920/func_808AD888.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Famos_0x808AC920/func_808AD8B8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Famos_0x808AC920/func_808AD8B8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Famos_0x808AC920/func_808ADA74.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Famos_0x808AC920/func_808ADA74.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Famos_0x808AC920/func_808ADAE8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Famos_0x808AC920/func_808ADAE8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Famos_0x808AC920/func_808ADB4C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Famos_0x808AC920/func_808ADB4C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Famos_0x808AC920/func_808ADB70.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Famos_0x808AC920/func_808ADB70.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Famos_0x808AC920/func_808ADC40.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Famos_0x808AC920/func_808ADC40.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Famos_0x808AC920/func_808ADC64.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Famos_0x808AC920/func_808ADC64.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Famos_0x808AC920/func_808ADD20.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Famos_0x808AC920/func_808ADD20.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Famos_0x808AC920/func_808ADDA8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Famos_0x808AC920/func_808ADDA8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Famos_0x808AC920/func_808ADE00.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Famos_0x808AC920/func_808ADE00.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Famos_0x808AC920/func_808ADE74.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Famos_0x808AC920/func_808ADE74.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Famos_0x808AC920/func_808ADFA4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Famos_0x808AC920/func_808ADFA4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Famos_0x808AC920/func_808ADFF0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Famos_0x808AC920/func_808ADFF0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Famos_0x808AC920/func_808AE030.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Famos_0x808AC920/func_808AE030.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Famos_0x808AC920/EnFamos_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Famos_0x808AC920/EnFamos_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Famos_0x808AC920/func_808AE304.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Famos_0x808AC920/func_808AE304.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Famos_0x808AC920/func_808AE3A8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Famos_0x808AC920/func_808AE3A8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Famos_0x808AC920/func_808AE3FC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Famos_0x808AC920/func_808AE3FC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Famos_0x808AC920/EnFamos_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Famos_0x808AC920/EnFamos_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Fg/z_en_fg.c b/src/overlays/actors/ovl_En_Fg/z_en_fg.c index 33b9154a4a..3c19b93b95 100644 --- a/src/overlays/actors/ovl_En_Fg/z_en_fg.c +++ b/src/overlays/actors/ovl_En_Fg/z_en_fg.c @@ -23,38 +23,38 @@ const ActorInit En_Fg_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fg_0x80A2D280/func_80A2D280.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fg_0x80A2D280/func_80A2D280.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fg_0x80A2D280/func_80A2D348.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fg_0x80A2D280/func_80A2D348.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fg_0x80A2D280/func_80A2D3D4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fg_0x80A2D280/func_80A2D3D4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fg_0x80A2D280/func_80A2D400.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fg_0x80A2D280/func_80A2D400.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fg_0x80A2D280/func_80A2D42C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fg_0x80A2D280/func_80A2D42C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fg_0x80A2D280/func_80A2D4B8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fg_0x80A2D280/func_80A2D4B8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fg_0x80A2D280/func_80A2D778.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fg_0x80A2D280/func_80A2D778.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fg_0x80A2D280/func_80A2D9CC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fg_0x80A2D280/func_80A2D9CC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fg_0x80A2D280/func_80A2D9DC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fg_0x80A2D280/func_80A2D9DC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fg_0x80A2D280/EnFg_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fg_0x80A2D280/EnFg_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fg_0x80A2D280/EnFg_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fg_0x80A2D280/EnFg_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fg_0x80A2D280/EnFg_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fg_0x80A2D280/EnFg_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fg_0x80A2D280/func_80A2DCE0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fg_0x80A2D280/func_80A2DCE0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fg_0x80A2D280/func_80A2DD34.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fg_0x80A2D280/func_80A2DD34.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fg_0x80A2D280/EnFg_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fg_0x80A2D280/EnFg_Draw.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fg_0x80A2D280/func_80A2DFC4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fg_0x80A2D280/func_80A2DFC4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fg_0x80A2D280/func_80A2E0A0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fg_0x80A2D280/func_80A2E0A0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fg_0x80A2D280/func_80A2E268.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fg_0x80A2D280/func_80A2E268.asm") 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 5485d1bd1c..18c4e6826e 100644 --- a/src/overlays/actors/ovl_En_Firefly/z_en_firefly.c +++ b/src/overlays/actors/ovl_En_Firefly/z_en_firefly.c @@ -23,62 +23,62 @@ const ActorInit En_Firefly_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Firefly_0x808796F0/EnFirefly_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Firefly_0x808796F0/EnFirefly_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Firefly_0x808796F0/EnFirefly_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Firefly_0x808796F0/EnFirefly_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Firefly_0x808796F0/func_808798C4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Firefly_0x808796F0/func_808798C4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Firefly_0x808796F0/func_80879930.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Firefly_0x808796F0/func_80879930.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Firefly_0x808796F0/func_80879950.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Firefly_0x808796F0/func_80879950.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Firefly_0x808796F0/func_8087997C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Firefly_0x808796F0/func_8087997C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Firefly_0x808796F0/func_80879A98.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Firefly_0x808796F0/func_80879A98.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Firefly_0x808796F0/func_80879C14.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Firefly_0x808796F0/func_80879C14.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Firefly_0x808796F0/func_80879CC0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Firefly_0x808796F0/func_80879CC0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Firefly_0x808796F0/func_80879F28.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Firefly_0x808796F0/func_80879F28.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Firefly_0x808796F0/func_8087A110.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Firefly_0x808796F0/func_8087A110.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Firefly_0x808796F0/func_8087A1C8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Firefly_0x808796F0/func_8087A1C8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Firefly_0x808796F0/func_8087A1EC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Firefly_0x808796F0/func_8087A1EC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Firefly_0x808796F0/func_8087A268.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Firefly_0x808796F0/func_8087A268.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Firefly_0x808796F0/func_8087A2D8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Firefly_0x808796F0/func_8087A2D8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Firefly_0x808796F0/func_8087A50C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Firefly_0x808796F0/func_8087A50C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Firefly_0x808796F0/func_8087A548.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Firefly_0x808796F0/func_8087A548.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Firefly_0x808796F0/func_8087A5DC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Firefly_0x808796F0/func_8087A5DC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Firefly_0x808796F0/func_8087A60C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Firefly_0x808796F0/func_8087A60C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Firefly_0x808796F0/func_8087A774.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Firefly_0x808796F0/func_8087A774.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Firefly_0x808796F0/func_8087A818.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Firefly_0x808796F0/func_8087A818.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Firefly_0x808796F0/func_8087A8FC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Firefly_0x808796F0/func_8087A8FC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Firefly_0x808796F0/func_8087A920.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Firefly_0x808796F0/func_8087A920.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Firefly_0x808796F0/func_8087A9E0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Firefly_0x808796F0/func_8087A9E0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Firefly_0x808796F0/func_8087AA1C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Firefly_0x808796F0/func_8087AA1C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Firefly_0x808796F0/func_8087AAF4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Firefly_0x808796F0/func_8087AAF4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Firefly_0x808796F0/EnFirefly_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Firefly_0x808796F0/EnFirefly_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Firefly_0x808796F0/func_8087AF48.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Firefly_0x808796F0/func_8087AF48.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Firefly_0x808796F0/func_8087AF98.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Firefly_0x808796F0/func_8087AF98.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Firefly_0x808796F0/EnFirefly_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Firefly_0x808796F0/EnFirefly_Draw.asm") 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 a038600167..493eba2d90 100644 --- a/src/overlays/actors/ovl_En_Fish/z_en_fish.c +++ b/src/overlays/actors/ovl_En_Fish/z_en_fish.c @@ -23,74 +23,74 @@ const ActorInit En_Fish_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fish_0x8091D630/func_8091D630.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fish_0x8091D630/func_8091D630.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fish_0x8091D630/func_8091D660.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fish_0x8091D630/func_8091D660.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fish_0x8091D630/func_8091D6C4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fish_0x8091D630/func_8091D6C4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fish_0x8091D630/func_8091D728.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fish_0x8091D630/func_8091D728.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fish_0x8091D630/func_8091D7C4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fish_0x8091D630/func_8091D7C4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fish_0x8091D630/func_8091D840.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fish_0x8091D630/func_8091D840.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fish_0x8091D630/func_8091D904.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fish_0x8091D630/func_8091D904.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fish_0x8091D630/func_8091D944.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fish_0x8091D630/func_8091D944.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fish_0x8091D630/func_8091DA14.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fish_0x8091D630/func_8091DA14.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fish_0x8091D630/EnFish_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fish_0x8091D630/EnFish_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fish_0x8091D630/EnFish_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fish_0x8091D630/EnFish_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fish_0x8091D630/func_8091DD48.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fish_0x8091D630/func_8091DD48.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fish_0x8091D630/func_8091DDF4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fish_0x8091D630/func_8091DDF4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fish_0x8091D630/func_8091DEE4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fish_0x8091D630/func_8091DEE4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fish_0x8091D630/func_8091DF68.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fish_0x8091D630/func_8091DF68.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fish_0x8091D630/func_8091E070.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fish_0x8091D630/func_8091E070.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fish_0x8091D630/func_8091E128.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fish_0x8091D630/func_8091E128.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fish_0x8091D630/func_8091E2E0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fish_0x8091D630/func_8091E2E0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fish_0x8091D630/func_8091E34C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fish_0x8091D630/func_8091E34C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fish_0x8091D630/func_8091E5EC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fish_0x8091D630/func_8091E5EC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fish_0x8091D630/func_8091E658.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fish_0x8091D630/func_8091E658.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fish_0x8091D630/func_8091E810.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fish_0x8091D630/func_8091E810.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fish_0x8091D630/func_8091E880.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fish_0x8091D630/func_8091E880.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fish_0x8091D630/func_8091E9A4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fish_0x8091D630/func_8091E9A4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fish_0x8091D630/func_8091EAF0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fish_0x8091D630/func_8091EAF0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fish_0x8091D630/func_8091ECF4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fish_0x8091D630/func_8091ECF4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fish_0x8091D630/func_8091ED70.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fish_0x8091D630/func_8091ED70.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fish_0x8091D630/func_8091EF30.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fish_0x8091D630/func_8091EF30.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fish_0x8091D630/func_8091EFE8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fish_0x8091D630/func_8091EFE8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fish_0x8091D630/func_8091F344.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fish_0x8091D630/func_8091F344.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fish_0x8091D630/func_8091F3BC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fish_0x8091D630/func_8091F3BC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fish_0x8091D630/func_8091F5A4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fish_0x8091D630/func_8091F5A4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fish_0x8091D630/func_8091F830.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fish_0x8091D630/func_8091F830.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fish_0x8091D630/EnFish_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fish_0x8091D630/EnFish_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fish_0x8091D630/func_8091F994.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fish_0x8091D630/func_8091F994.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fish_0x8091D630/EnFish_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fish_0x8091D630/EnFish_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Fish2/z_en_fish2.c b/src/overlays/actors/ovl_En_Fish2/z_en_fish2.c index 61ea4baef7..b72a7f634b 100644 --- a/src/overlays/actors/ovl_En_Fish2/z_en_fish2.c +++ b/src/overlays/actors/ovl_En_Fish2/z_en_fish2.c @@ -23,70 +23,70 @@ const ActorInit En_Fish2_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fish2_0x80B28370/func_80B28370.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fish2_0x80B28370/func_80B28370.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fish2_0x80B28370/func_80B28478.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fish2_0x80B28370/func_80B28478.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fish2_0x80B28370/EnFish2_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fish2_0x80B28370/EnFish2_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fish2_0x80B28370/EnFish2_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fish2_0x80B28370/EnFish2_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fish2_0x80B28370/func_80B287F4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fish2_0x80B28370/func_80B287F4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fish2_0x80B28370/func_80B288E8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fish2_0x80B28370/func_80B288E8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fish2_0x80B28370/func_80B2899C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fish2_0x80B28370/func_80B2899C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fish2_0x80B28370/func_80B289DC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fish2_0x80B28370/func_80B289DC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fish2_0x80B28370/func_80B28B5C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fish2_0x80B28370/func_80B28B5C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fish2_0x80B28370/func_80B28C14.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fish2_0x80B28370/func_80B28C14.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fish2_0x80B28370/func_80B29128.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fish2_0x80B28370/func_80B29128.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fish2_0x80B28370/func_80B2913C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fish2_0x80B28370/func_80B2913C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fish2_0x80B28370/func_80B29194.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fish2_0x80B28370/func_80B29194.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fish2_0x80B28370/func_80B29250.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fish2_0x80B28370/func_80B29250.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fish2_0x80B28370/func_80B2938C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fish2_0x80B28370/func_80B2938C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fish2_0x80B28370/func_80B293C4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fish2_0x80B28370/func_80B293C4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fish2_0x80B28370/func_80B2951C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fish2_0x80B28370/func_80B2951C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fish2_0x80B28370/func_80B295A4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fish2_0x80B28370/func_80B295A4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fish2_0x80B28370/func_80B29778.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fish2_0x80B28370/func_80B29778.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fish2_0x80B28370/func_80B297FC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fish2_0x80B28370/func_80B297FC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fish2_0x80B28370/func_80B29E5C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fish2_0x80B28370/func_80B29E5C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fish2_0x80B28370/func_80B29EE4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fish2_0x80B28370/func_80B29EE4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fish2_0x80B28370/func_80B2A01C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fish2_0x80B28370/func_80B2A01C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fish2_0x80B28370/func_80B2A094.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fish2_0x80B28370/func_80B2A094.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fish2_0x80B28370/func_80B2A23C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fish2_0x80B28370/func_80B2A23C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fish2_0x80B28370/func_80B2A448.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fish2_0x80B28370/func_80B2A448.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fish2_0x80B28370/func_80B2A498.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fish2_0x80B28370/func_80B2A498.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fish2_0x80B28370/EnFish2_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fish2_0x80B28370/EnFish2_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fish2_0x80B28370/func_80B2ABF4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fish2_0x80B28370/func_80B2ABF4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fish2_0x80B28370/func_80B2AC20.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fish2_0x80B28370/func_80B2AC20.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fish2_0x80B28370/EnFish2_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fish2_0x80B28370/EnFish2_Draw.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fish2_0x80B28370/func_80B2ADB0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fish2_0x80B28370/func_80B2ADB0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fish2_0x80B28370/func_80B2AF80.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fish2_0x80B28370/func_80B2AF80.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fish2_0x80B28370/func_80B2B180.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fish2_0x80B28370/func_80B2B180.asm") 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 5250d20506..40ae14c092 100644 --- a/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c +++ b/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c @@ -23,118 +23,118 @@ const ActorInit En_Floormas_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Floormas_0x808D0680/EnFloormas_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Floormas_0x808D0680/EnFloormas_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Floormas_0x808D0680/EnFloormas_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Floormas_0x808D0680/EnFloormas_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Floormas_0x808D0680/func_808D08D0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Floormas_0x808D0680/func_808D08D0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Floormas_0x808D0680/func_808D0908.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Floormas_0x808D0680/func_808D0908.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Floormas_0x808D0680/func_808D0930.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Floormas_0x808D0680/func_808D0930.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Floormas_0x808D0680/func_808D09CC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Floormas_0x808D0680/func_808D09CC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Floormas_0x808D0680/func_808D0A48.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Floormas_0x808D0680/func_808D0A48.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Floormas_0x808D0680/func_808D0B08.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Floormas_0x808D0680/func_808D0B08.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Floormas_0x808D0680/func_808D0B50.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Floormas_0x808D0680/func_808D0B50.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Floormas_0x808D0680/func_808D0C14.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Floormas_0x808D0680/func_808D0C14.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Floormas_0x808D0680/func_808D0C58.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Floormas_0x808D0680/func_808D0C58.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Floormas_0x808D0680/func_808D0CE4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Floormas_0x808D0680/func_808D0CE4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Floormas_0x808D0680/func_808D0D70.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Floormas_0x808D0680/func_808D0D70.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Floormas_0x808D0680/func_808D0ECC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Floormas_0x808D0680/func_808D0ECC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Floormas_0x808D0680/func_808D0F14.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Floormas_0x808D0680/func_808D0F14.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Floormas_0x808D0680/func_808D0F50.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Floormas_0x808D0680/func_808D0F50.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Floormas_0x808D0680/func_808D0F80.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Floormas_0x808D0680/func_808D0F80.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Floormas_0x808D0680/func_808D108C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Floormas_0x808D0680/func_808D108C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Floormas_0x808D0680/func_808D11BC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Floormas_0x808D0680/func_808D11BC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Floormas_0x808D0680/func_808D1380.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Floormas_0x808D0680/func_808D1380.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Floormas_0x808D0680/func_808D1458.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Floormas_0x808D0680/func_808D1458.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Floormas_0x808D0680/func_808D14DC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Floormas_0x808D0680/func_808D14DC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Floormas_0x808D0680/func_808D161C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Floormas_0x808D0680/func_808D161C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Floormas_0x808D0680/func_808D1650.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Floormas_0x808D0680/func_808D1650.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Floormas_0x808D0680/func_808D1740.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Floormas_0x808D0680/func_808D1740.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Floormas_0x808D0680/func_808D17EC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Floormas_0x808D0680/func_808D17EC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Floormas_0x808D0680/func_808D19D4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Floormas_0x808D0680/func_808D19D4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Floormas_0x808D0680/func_808D1B44.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Floormas_0x808D0680/func_808D1B44.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Floormas_0x808D0680/func_808D1BCC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Floormas_0x808D0680/func_808D1BCC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Floormas_0x808D0680/func_808D1C1C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Floormas_0x808D0680/func_808D1C1C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Floormas_0x808D0680/func_808D1D0C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Floormas_0x808D0680/func_808D1D0C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Floormas_0x808D0680/func_808D1D6C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Floormas_0x808D0680/func_808D1D6C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Floormas_0x808D0680/func_808D1ED4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Floormas_0x808D0680/func_808D1ED4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Floormas_0x808D0680/func_808D1F7C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Floormas_0x808D0680/func_808D1F7C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Floormas_0x808D0680/func_808D1FD4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Floormas_0x808D0680/func_808D1FD4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Floormas_0x808D0680/func_808D2040.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Floormas_0x808D0680/func_808D2040.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Floormas_0x808D0680/func_808D217C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Floormas_0x808D0680/func_808D217C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Floormas_0x808D0680/func_808D22C8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Floormas_0x808D0680/func_808D22C8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Floormas_0x808D0680/func_808D2484.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Floormas_0x808D0680/func_808D2484.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Floormas_0x808D0680/func_808D24F0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Floormas_0x808D0680/func_808D24F0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Floormas_0x808D0680/func_808D2700.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Floormas_0x808D0680/func_808D2700.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Floormas_0x808D0680/func_808D2764.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Floormas_0x808D0680/func_808D2764.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Floormas_0x808D0680/func_808D2A20.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Floormas_0x808D0680/func_808D2A20.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Floormas_0x808D0680/func_808D2AA8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Floormas_0x808D0680/func_808D2AA8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Floormas_0x808D0680/func_808D2AB8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Floormas_0x808D0680/func_808D2AB8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Floormas_0x808D0680/func_808D2AF4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Floormas_0x808D0680/func_808D2AF4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Floormas_0x808D0680/func_808D2B18.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Floormas_0x808D0680/func_808D2B18.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Floormas_0x808D0680/func_808D2C08.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Floormas_0x808D0680/func_808D2C08.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Floormas_0x808D0680/func_808D2CDC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Floormas_0x808D0680/func_808D2CDC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Floormas_0x808D0680/func_808D2D30.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Floormas_0x808D0680/func_808D2D30.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Floormas_0x808D0680/func_808D2D6C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Floormas_0x808D0680/func_808D2D6C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Floormas_0x808D0680/func_808D2DC0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Floormas_0x808D0680/func_808D2DC0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Floormas_0x808D0680/func_808D2E34.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Floormas_0x808D0680/func_808D2E34.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Floormas_0x808D0680/EnFloormas_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Floormas_0x808D0680/EnFloormas_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Floormas_0x808D0680/func_808D3488.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Floormas_0x808D0680/func_808D3488.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Floormas_0x808D0680/func_808D34C4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Floormas_0x808D0680/func_808D34C4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Floormas_0x808D0680/EnFloormas_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Floormas_0x808D0680/EnFloormas_Draw.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Floormas_0x808D0680/func_808D3754.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Floormas_0x808D0680/func_808D3754.asm") 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 78c2d4b722..8f4bea25fa 100644 --- a/src/overlays/actors/ovl_En_Fr/z_en_fr.c +++ b/src/overlays/actors/ovl_En_Fr/z_en_fr.c @@ -22,8 +22,8 @@ const ActorInit En_Fr_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fr_0x808FC550/EnFr_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fr_0x808FC550/EnFr_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fr_0x808FC550/EnFr_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fr_0x808FC550/EnFr_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fr_0x808FC550/EnFr_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fr_0x808FC550/EnFr_Update.asm") diff --git a/src/overlays/actors/ovl_En_Fsn/z_en_fsn.c b/src/overlays/actors/ovl_En_Fsn/z_en_fsn.c index e32d6c7fae..75a71a201a 100644 --- a/src/overlays/actors/ovl_En_Fsn/z_en_fsn.c +++ b/src/overlays/actors/ovl_En_Fsn/z_en_fsn.c @@ -23,128 +23,128 @@ const ActorInit En_Fsn_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fsn_0x80AE1B70/func_80AE1B70.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fsn_0x80AE1B70/func_80AE1B70.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fsn_0x80AE1B70/func_80AE1BF0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fsn_0x80AE1B70/func_80AE1BF0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fsn_0x80AE1B70/func_80AE1C54.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fsn_0x80AE1B70/func_80AE1C54.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fsn_0x80AE1B70/func_80AE1E58.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fsn_0x80AE1B70/func_80AE1E58.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fsn_0x80AE1B70/func_80AE1EF4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fsn_0x80AE1B70/func_80AE1EF4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fsn_0x80AE1B70/func_80AE1F5C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fsn_0x80AE1B70/func_80AE1F5C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fsn_0x80AE1B70/func_80AE2028.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fsn_0x80AE1B70/func_80AE2028.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fsn_0x80AE1B70/func_80AE2074.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fsn_0x80AE1B70/func_80AE2074.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fsn_0x80AE1B70/func_80AE21C8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fsn_0x80AE1B70/func_80AE21C8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fsn_0x80AE1B70/func_80AE2234.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fsn_0x80AE1B70/func_80AE2234.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fsn_0x80AE1B70/func_80AE2298.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fsn_0x80AE1B70/func_80AE2298.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fsn_0x80AE1B70/func_80AE2340.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fsn_0x80AE1B70/func_80AE2340.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fsn_0x80AE1B70/func_80AE2438.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fsn_0x80AE1B70/func_80AE2438.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fsn_0x80AE1B70/func_80AE2524.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fsn_0x80AE1B70/func_80AE2524.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fsn_0x80AE1B70/func_80AE25D4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fsn_0x80AE1B70/func_80AE25D4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fsn_0x80AE1B70/func_80AE2670.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fsn_0x80AE1B70/func_80AE2670.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fsn_0x80AE1B70/func_80AE26D4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fsn_0x80AE1B70/func_80AE26D4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fsn_0x80AE1B70/func_80AE2760.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fsn_0x80AE1B70/func_80AE2760.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fsn_0x80AE1B70/func_80AE28B0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fsn_0x80AE1B70/func_80AE28B0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fsn_0x80AE1B70/func_80AE2974.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fsn_0x80AE1B70/func_80AE2974.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fsn_0x80AE1B70/func_80AE2A98.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fsn_0x80AE1B70/func_80AE2A98.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fsn_0x80AE1B70/func_80AE2B44.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fsn_0x80AE1B70/func_80AE2B44.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fsn_0x80AE1B70/func_80AE2BE0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fsn_0x80AE1B70/func_80AE2BE0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fsn_0x80AE1B70/func_80AE2C6C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fsn_0x80AE1B70/func_80AE2C6C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fsn_0x80AE1B70/func_80AE2CFC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fsn_0x80AE1B70/func_80AE2CFC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fsn_0x80AE1B70/func_80AE2DC8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fsn_0x80AE1B70/func_80AE2DC8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fsn_0x80AE1B70/func_80AE2F78.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fsn_0x80AE1B70/func_80AE2F78.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fsn_0x80AE1B70/func_80AE30F8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fsn_0x80AE1B70/func_80AE30F8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fsn_0x80AE1B70/func_80AE32D4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fsn_0x80AE1B70/func_80AE32D4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fsn_0x80AE1B70/func_80AE3474.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fsn_0x80AE1B70/func_80AE3474.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fsn_0x80AE1B70/func_80AE352C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fsn_0x80AE1B70/func_80AE352C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fsn_0x80AE1B70/func_80AE3644.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fsn_0x80AE1B70/func_80AE3644.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fsn_0x80AE1B70/func_80AE3880.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fsn_0x80AE1B70/func_80AE3880.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fsn_0x80AE1B70/func_80AE38E0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fsn_0x80AE1B70/func_80AE38E0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fsn_0x80AE1B70/func_80AE3A68.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fsn_0x80AE1B70/func_80AE3A68.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fsn_0x80AE1B70/func_80AE3BC4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fsn_0x80AE1B70/func_80AE3BC4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fsn_0x80AE1B70/func_80AE3CF0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fsn_0x80AE1B70/func_80AE3CF0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fsn_0x80AE1B70/func_80AE3D50.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fsn_0x80AE1B70/func_80AE3D50.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fsn_0x80AE1B70/func_80AE3E4C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fsn_0x80AE1B70/func_80AE3E4C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fsn_0x80AE1B70/func_80AE3F40.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fsn_0x80AE1B70/func_80AE3F40.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fsn_0x80AE1B70/func_80AE4028.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fsn_0x80AE1B70/func_80AE4028.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fsn_0x80AE1B70/func_80AE4120.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fsn_0x80AE1B70/func_80AE4120.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fsn_0x80AE1B70/func_80AE41FC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fsn_0x80AE1B70/func_80AE41FC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fsn_0x80AE1B70/func_80AE4424.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fsn_0x80AE1B70/func_80AE4424.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fsn_0x80AE1B70/func_80AE44DC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fsn_0x80AE1B70/func_80AE44DC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fsn_0x80AE1B70/func_80AE45C4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fsn_0x80AE1B70/func_80AE45C4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fsn_0x80AE1B70/func_80AE4638.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fsn_0x80AE1B70/func_80AE4638.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fsn_0x80AE1B70/func_80AE4828.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fsn_0x80AE1B70/func_80AE4828.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fsn_0x80AE1B70/func_80AE4A1C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fsn_0x80AE1B70/func_80AE4A1C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fsn_0x80AE1B70/func_80AE4B20.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fsn_0x80AE1B70/func_80AE4B20.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fsn_0x80AE1B70/func_80AE4B70.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fsn_0x80AE1B70/func_80AE4B70.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fsn_0x80AE1B70/func_80AE4BF4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fsn_0x80AE1B70/func_80AE4BF4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fsn_0x80AE1B70/func_80AE4CD8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fsn_0x80AE1B70/func_80AE4CD8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fsn_0x80AE1B70/func_80AE4D28.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fsn_0x80AE1B70/func_80AE4D28.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fsn_0x80AE1B70/EnFsn_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fsn_0x80AE1B70/EnFsn_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fsn_0x80AE1B70/EnFsn_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fsn_0x80AE1B70/EnFsn_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fsn_0x80AE1B70/EnFsn_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fsn_0x80AE1B70/EnFsn_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fsn_0x80AE1B70/func_80AE502C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fsn_0x80AE1B70/func_80AE502C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fsn_0x80AE1B70/func_80AE52A4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fsn_0x80AE1B70/func_80AE52A4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fsn_0x80AE1B70/func_80AE5440.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fsn_0x80AE1B70/func_80AE5440.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fsn_0x80AE1B70/func_80AE57E8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fsn_0x80AE1B70/func_80AE57E8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fsn_0x80AE1B70/func_80AE5910.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fsn_0x80AE1B70/func_80AE5910.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fsn_0x80AE1B70/EnFsn_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fsn_0x80AE1B70/EnFsn_Draw.asm") 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 f667d7b528..dbad179fca 100644 --- a/src/overlays/actors/ovl_En_Fu/z_en_fu.c +++ b/src/overlays/actors/ovl_En_Fu/z_en_fu.c @@ -23,112 +23,112 @@ const ActorInit En_Fu_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_0x809616E0/func_809616E0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fu_0x809616E0/func_809616E0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_0x809616E0/func_809619D0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fu_0x809616E0/func_809619D0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_0x809616E0/EnFu_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fu_0x809616E0/EnFu_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_0x809616E0/EnFu_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fu_0x809616E0/EnFu_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_0x809616E0/func_80961D10.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fu_0x809616E0/func_80961D10.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_0x809616E0/func_80961D7C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fu_0x809616E0/func_80961D7C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_0x809616E0/func_80961E88.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fu_0x809616E0/func_80961E88.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_0x809616E0/func_80961EC8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fu_0x809616E0/func_80961EC8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_0x809616E0/func_80961F00.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fu_0x809616E0/func_80961F00.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_0x809616E0/func_80961F38.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fu_0x809616E0/func_80961F38.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_0x809616E0/func_8096209C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fu_0x809616E0/func_8096209C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_0x809616E0/func_809622FC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fu_0x809616E0/func_809622FC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_0x809616E0/func_80962340.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fu_0x809616E0/func_80962340.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_0x809616E0/func_80962588.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fu_0x809616E0/func_80962588.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_0x809616E0/func_80962660.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fu_0x809616E0/func_80962660.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_0x809616E0/func_809628BC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fu_0x809616E0/func_809628BC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_0x809616E0/func_809628D0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fu_0x809616E0/func_809628D0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_0x809616E0/func_809629F8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fu_0x809616E0/func_809629F8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_0x809616E0/func_80962A10.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fu_0x809616E0/func_80962A10.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_0x809616E0/func_80962BA8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fu_0x809616E0/func_80962BA8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_0x809616E0/func_80962BCC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fu_0x809616E0/func_80962BCC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_0x809616E0/func_80962D48.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fu_0x809616E0/func_80962D48.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_0x809616E0/func_80962D60.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fu_0x809616E0/func_80962D60.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_0x809616E0/func_80962EBC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fu_0x809616E0/func_80962EBC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_0x809616E0/func_80962F10.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fu_0x809616E0/func_80962F10.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_0x809616E0/func_80962F4C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fu_0x809616E0/func_80962F4C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_0x809616E0/func_80963258.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fu_0x809616E0/func_80963258.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_0x809616E0/func_8096326C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fu_0x809616E0/func_8096326C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_0x809616E0/func_809632D0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fu_0x809616E0/func_809632D0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_0x809616E0/func_80963350.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fu_0x809616E0/func_80963350.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_0x809616E0/func_80963540.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fu_0x809616E0/func_80963540.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_0x809616E0/func_80963560.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fu_0x809616E0/func_80963560.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_0x809616E0/func_80963610.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fu_0x809616E0/func_80963610.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_0x809616E0/func_80963630.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fu_0x809616E0/func_80963630.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_0x809616E0/func_80963810.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fu_0x809616E0/func_80963810.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_0x809616E0/func_809638F8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fu_0x809616E0/func_809638F8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_0x809616E0/func_809639D0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fu_0x809616E0/func_809639D0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_0x809616E0/func_80963DE4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fu_0x809616E0/func_80963DE4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_0x809616E0/func_80963EAC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fu_0x809616E0/func_80963EAC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_0x809616E0/func_80963F44.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fu_0x809616E0/func_80963F44.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_0x809616E0/func_80963F88.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fu_0x809616E0/func_80963F88.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_0x809616E0/func_80963FF8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fu_0x809616E0/func_80963FF8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_0x809616E0/func_80964034.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fu_0x809616E0/func_80964034.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_0x809616E0/func_809640D8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fu_0x809616E0/func_809640D8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_0x809616E0/func_8096413C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fu_0x809616E0/func_8096413C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_0x809616E0/func_80964190.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fu_0x809616E0/func_80964190.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_0x809616E0/func_8096426C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fu_0x809616E0/func_8096426C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_0x809616E0/func_809642E0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fu_0x809616E0/func_809642E0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_0x809616E0/EnFu_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fu_0x809616E0/EnFu_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_0x809616E0/func_809643FC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fu_0x809616E0/func_809643FC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_0x809616E0/func_8096450C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fu_0x809616E0/func_8096450C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_0x809616E0/EnFu_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fu_0x809616E0/EnFu_Draw.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_0x809616E0/func_80964694.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fu_0x809616E0/func_80964694.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_0x809616E0/func_809647EC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fu_0x809616E0/func_809647EC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_0x809616E0/func_80964950.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fu_0x809616E0/func_80964950.asm") diff --git a/src/overlays/actors/ovl_En_Fu_Kago/z_en_fu_kago.c b/src/overlays/actors/ovl_En_Fu_Kago/z_en_fu_kago.c index 255d6ef65e..4fda0b9b6e 100644 --- a/src/overlays/actors/ovl_En_Fu_Kago/z_en_fu_kago.c +++ b/src/overlays/actors/ovl_En_Fu_Kago/z_en_fu_kago.c @@ -23,32 +23,32 @@ const ActorInit En_Fu_Kago_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_Kago_0x80ACF780/EnFuKago_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fu_Kago_0x80ACF780/EnFuKago_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_Kago_0x80ACF780/EnFuKago_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fu_Kago_0x80ACF780/EnFuKago_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_Kago_0x80ACF780/func_80ACF8B8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fu_Kago_0x80ACF780/func_80ACF8B8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_Kago_0x80ACF780/func_80ACF994.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fu_Kago_0x80ACF780/func_80ACF994.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_Kago_0x80ACF780/func_80ACF9A8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fu_Kago_0x80ACF780/func_80ACF9A8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_Kago_0x80ACF780/func_80ACF9DC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fu_Kago_0x80ACF780/func_80ACF9DC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_Kago_0x80ACF780/func_80ACF9FC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fu_Kago_0x80ACF780/func_80ACF9FC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_Kago_0x80ACF780/func_80ACFA78.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fu_Kago_0x80ACF780/func_80ACFA78.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_Kago_0x80ACF780/func_80ACFDAC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fu_Kago_0x80ACF780/func_80ACFDAC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_Kago_0x80ACF780/func_80AD0028.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fu_Kago_0x80ACF780/func_80AD0028.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_Kago_0x80ACF780/func_80AD0274.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fu_Kago_0x80ACF780/func_80AD0274.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_Kago_0x80ACF780/func_80AD0288.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fu_Kago_0x80ACF780/func_80AD0288.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_Kago_0x80ACF780/EnFuKago_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fu_Kago_0x80ACF780/EnFuKago_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_Kago_0x80ACF780/func_80AD0340.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fu_Kago_0x80ACF780/func_80AD0340.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_Kago_0x80ACF780/EnFuKago_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fu_Kago_0x80ACF780/EnFuKago_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Fu_Mato/z_en_fu_mato.c b/src/overlays/actors/ovl_En_Fu_Mato/z_en_fu_mato.c index ac59be1870..bf256d6335 100644 --- a/src/overlays/actors/ovl_En_Fu_Mato/z_en_fu_mato.c +++ b/src/overlays/actors/ovl_En_Fu_Mato/z_en_fu_mato.c @@ -23,38 +23,38 @@ const ActorInit En_Fu_Mato_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_Mato_0x80ACE330/EnFuMato_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fu_Mato_0x80ACE330/EnFuMato_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_Mato_0x80ACE330/EnFuMato_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fu_Mato_0x80ACE330/EnFuMato_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_Mato_0x80ACE330/func_80ACE4B4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fu_Mato_0x80ACE330/func_80ACE4B4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_Mato_0x80ACE330/func_80ACE4C8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fu_Mato_0x80ACE330/func_80ACE4C8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_Mato_0x80ACE330/func_80ACE508.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fu_Mato_0x80ACE330/func_80ACE508.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_Mato_0x80ACE330/func_80ACE51C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fu_Mato_0x80ACE330/func_80ACE51C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_Mato_0x80ACE330/func_80ACE680.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fu_Mato_0x80ACE330/func_80ACE680.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_Mato_0x80ACE330/func_80ACE718.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fu_Mato_0x80ACE330/func_80ACE718.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_Mato_0x80ACE330/func_80ACE850.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fu_Mato_0x80ACE330/func_80ACE850.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_Mato_0x80ACE330/func_80ACEB2C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fu_Mato_0x80ACE330/func_80ACEB2C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_Mato_0x80ACE330/func_80ACECFC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fu_Mato_0x80ACE330/func_80ACECFC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_Mato_0x80ACE330/func_80ACEFC4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fu_Mato_0x80ACE330/func_80ACEFC4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_Mato_0x80ACE330/func_80ACEFD8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fu_Mato_0x80ACE330/func_80ACEFD8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_Mato_0x80ACE330/func_80ACF04C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fu_Mato_0x80ACE330/func_80ACF04C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_Mato_0x80ACE330/EnFuMato_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fu_Mato_0x80ACE330/EnFuMato_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_Mato_0x80ACE330/func_80ACF1F4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fu_Mato_0x80ACE330/func_80ACF1F4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_Mato_0x80ACE330/func_80ACF3F4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fu_Mato_0x80ACE330/func_80ACF3F4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_Mato_0x80ACE330/EnFuMato_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fu_Mato_0x80ACE330/EnFuMato_Draw.asm") 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 06b71d4c46..efbbc14700 100644 --- a/src/overlays/actors/ovl_En_Fz/z_en_fz.c +++ b/src/overlays/actors/ovl_En_Fz/z_en_fz.c @@ -23,80 +23,80 @@ const ActorInit En_Fz_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fz_0x80932490/EnFz_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fz_0x80932490/EnFz_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fz_0x80932490/EnFz_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fz_0x80932490/EnFz_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fz_0x80932490/func_80932784.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fz_0x80932490/func_80932784.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fz_0x80932490/func_809328A4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fz_0x80932490/func_809328A4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fz_0x80932490/func_809328F4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fz_0x80932490/func_809328F4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fz_0x80932490/func_80932AE8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fz_0x80932490/func_80932AE8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fz_0x80932490/func_80932AF4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fz_0x80932490/func_80932AF4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fz_0x80932490/func_80932BD4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fz_0x80932490/func_80932BD4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fz_0x80932490/func_80932C98.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fz_0x80932490/func_80932C98.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fz_0x80932490/func_80933014.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fz_0x80932490/func_80933014.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fz_0x80932490/func_809330D4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fz_0x80932490/func_809330D4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fz_0x80932490/func_80933104.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fz_0x80932490/func_80933104.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fz_0x80932490/func_80933184.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fz_0x80932490/func_80933184.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fz_0x80932490/func_809331F8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fz_0x80932490/func_809331F8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fz_0x80932490/func_80933248.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fz_0x80932490/func_80933248.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fz_0x80932490/func_80933274.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fz_0x80932490/func_80933274.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fz_0x80932490/func_80933324.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fz_0x80932490/func_80933324.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fz_0x80932490/func_80933368.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fz_0x80932490/func_80933368.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fz_0x80932490/func_809333A4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fz_0x80932490/func_809333A4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fz_0x80932490/func_809333D8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fz_0x80932490/func_809333D8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fz_0x80932490/func_80933414.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fz_0x80932490/func_80933414.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fz_0x80932490/func_80933444.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fz_0x80932490/func_80933444.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fz_0x80932490/func_80933480.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fz_0x80932490/func_80933480.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fz_0x80932490/func_809334B8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fz_0x80932490/func_809334B8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fz_0x80932490/func_809336C0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fz_0x80932490/func_809336C0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fz_0x80932490/func_80933760.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fz_0x80932490/func_80933760.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fz_0x80932490/func_80933790.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fz_0x80932490/func_80933790.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fz_0x80932490/func_809337D4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fz_0x80932490/func_809337D4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fz_0x80932490/func_8093389C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fz_0x80932490/func_8093389C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fz_0x80932490/func_809338E0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fz_0x80932490/func_809338E0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fz_0x80932490/func_80933AF4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fz_0x80932490/func_80933AF4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fz_0x80932490/func_80933B38.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fz_0x80932490/func_80933B38.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fz_0x80932490/func_80933B48.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fz_0x80932490/func_80933B48.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fz_0x80932490/EnFz_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fz_0x80932490/EnFz_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fz_0x80932490/EnFz_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fz_0x80932490/EnFz_Draw.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fz_0x80932490/func_80934018.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fz_0x80932490/func_80934018.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fz_0x80932490/func_809340BC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fz_0x80932490/func_809340BC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fz_0x80932490/func_80934178.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fz_0x80932490/func_80934178.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Fz_0x80932490/func_80934464.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Fz_0x80932490/func_80934464.asm") diff --git a/src/overlays/actors/ovl_En_Gakufu/z_en_gakufu.c b/src/overlays/actors/ovl_En_Gakufu/z_en_gakufu.c index ed391d2ff6..b8afb9fe10 100644 --- a/src/overlays/actors/ovl_En_Gakufu/z_en_gakufu.c +++ b/src/overlays/actors/ovl_En_Gakufu/z_en_gakufu.c @@ -23,26 +23,26 @@ const ActorInit En_Gakufu_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gakufu_0x80AFC960/func_80AFC960.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gakufu_0x80AFC960/func_80AFC960.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gakufu_0x80AFC960/EnGakufu_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gakufu_0x80AFC960/EnGakufu_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gakufu_0x80AFC960/EnGakufu_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gakufu_0x80AFC960/EnGakufu_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gakufu_0x80AFC960/func_80AFCB94.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gakufu_0x80AFC960/func_80AFCB94.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gakufu_0x80AFC960/func_80AFCBD4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gakufu_0x80AFC960/func_80AFCBD4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gakufu_0x80AFC960/func_80AFCC14.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gakufu_0x80AFC960/func_80AFCC14.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gakufu_0x80AFC960/func_80AFCC24.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gakufu_0x80AFC960/func_80AFCC24.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gakufu_0x80AFC960/func_80AFCC58.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gakufu_0x80AFC960/func_80AFCC58.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gakufu_0x80AFC960/func_80AFCD44.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gakufu_0x80AFC960/func_80AFCD44.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gakufu_0x80AFC960/func_80AFCDC8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gakufu_0x80AFC960/func_80AFCDC8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gakufu_0x80AFC960/EnGakufu_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gakufu_0x80AFC960/EnGakufu_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gakufu_0x80AFC960/EnGakufu_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gakufu_0x80AFC960/EnGakufu_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Gamelupy/z_en_gamelupy.c b/src/overlays/actors/ovl_En_Gamelupy/z_en_gamelupy.c index b5768f839f..f69a02df3e 100644 --- a/src/overlays/actors/ovl_En_Gamelupy/z_en_gamelupy.c +++ b/src/overlays/actors/ovl_En_Gamelupy/z_en_gamelupy.c @@ -23,26 +23,26 @@ const ActorInit En_Gamelupy_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gamelupy_0x80AF6760/EnGamelupy_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gamelupy_0x80AF6760/EnGamelupy_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gamelupy_0x80AF6760/EnGamelupy_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gamelupy_0x80AF6760/EnGamelupy_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gamelupy_0x80AF6760/func_80AF6854.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gamelupy_0x80AF6760/func_80AF6854.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gamelupy_0x80AF6760/func_80AF6944.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gamelupy_0x80AF6760/func_80AF6944.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gamelupy_0x80AF6760/func_80AF6958.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gamelupy_0x80AF6760/func_80AF6958.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gamelupy_0x80AF6760/func_80AF6994.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gamelupy_0x80AF6760/func_80AF6994.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gamelupy_0x80AF6760/func_80AF69A8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gamelupy_0x80AF6760/func_80AF69A8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gamelupy_0x80AF6760/func_80AF6A38.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gamelupy_0x80AF6760/func_80AF6A38.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gamelupy_0x80AF6760/func_80AF6A78.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gamelupy_0x80AF6760/func_80AF6A78.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gamelupy_0x80AF6760/func_80AF6B40.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gamelupy_0x80AF6760/func_80AF6B40.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gamelupy_0x80AF6760/EnGamelupy_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gamelupy_0x80AF6760/EnGamelupy_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gamelupy_0x80AF6760/EnGamelupy_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gamelupy_0x80AF6760/EnGamelupy_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Gb2/z_en_gb2.c b/src/overlays/actors/ovl_En_Gb2/z_en_gb2.c index 590d6573ae..828ef240da 100644 --- a/src/overlays/actors/ovl_En_Gb2/z_en_gb2.c +++ b/src/overlays/actors/ovl_En_Gb2/z_en_gb2.c @@ -23,78 +23,78 @@ const ActorInit En_Gb2_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gb2_0x80B0F5E0/func_80B0F5E0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gb2_0x80B0F5E0/func_80B0F5E0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gb2_0x80B0F5E0/func_80B0F660.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gb2_0x80B0F5E0/func_80B0F660.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gb2_0x80B0F5E0/func_80B0F6DC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gb2_0x80B0F5E0/func_80B0F6DC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gb2_0x80B0F5E0/func_80B0F728.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gb2_0x80B0F5E0/func_80B0F728.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gb2_0x80B0F5E0/func_80B0F7FC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gb2_0x80B0F5E0/func_80B0F7FC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gb2_0x80B0F5E0/func_80B0F8F8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gb2_0x80B0F5E0/func_80B0F8F8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gb2_0x80B0F5E0/func_80B0F97C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gb2_0x80B0F5E0/func_80B0F97C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gb2_0x80B0F5E0/func_80B0FA04.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gb2_0x80B0F5E0/func_80B0FA04.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gb2_0x80B0F5E0/func_80B0FA48.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gb2_0x80B0F5E0/func_80B0FA48.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gb2_0x80B0F5E0/func_80B0FB24.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gb2_0x80B0F5E0/func_80B0FB24.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gb2_0x80B0F5E0/func_80B0FBF0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gb2_0x80B0F5E0/func_80B0FBF0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gb2_0x80B0F5E0/func_80B0FD8C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gb2_0x80B0F5E0/func_80B0FD8C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gb2_0x80B0F5E0/func_80B0FE18.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gb2_0x80B0F5E0/func_80B0FE18.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gb2_0x80B0F5E0/func_80B0FE7C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gb2_0x80B0F5E0/func_80B0FE7C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gb2_0x80B0F5E0/func_80B0FEBC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gb2_0x80B0F5E0/func_80B0FEBC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gb2_0x80B0F5E0/func_80B0FFA8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gb2_0x80B0F5E0/func_80B0FFA8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gb2_0x80B0F5E0/func_80B10240.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gb2_0x80B0F5E0/func_80B10240.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gb2_0x80B0F5E0/func_80B10344.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gb2_0x80B0F5E0/func_80B10344.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gb2_0x80B0F5E0/func_80B10584.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gb2_0x80B0F5E0/func_80B10584.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gb2_0x80B0F5E0/func_80B10634.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gb2_0x80B0F5E0/func_80B10634.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gb2_0x80B0F5E0/func_80B10868.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gb2_0x80B0F5E0/func_80B10868.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gb2_0x80B0F5E0/func_80B10924.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gb2_0x80B0F5E0/func_80B10924.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gb2_0x80B0F5E0/func_80B109DC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gb2_0x80B0F5E0/func_80B109DC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gb2_0x80B0F5E0/func_80B10A48.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gb2_0x80B0F5E0/func_80B10A48.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gb2_0x80B0F5E0/func_80B10B5C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gb2_0x80B0F5E0/func_80B10B5C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gb2_0x80B0F5E0/func_80B10DAC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gb2_0x80B0F5E0/func_80B10DAC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gb2_0x80B0F5E0/func_80B10E98.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gb2_0x80B0F5E0/func_80B10E98.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gb2_0x80B0F5E0/func_80B11048.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gb2_0x80B0F5E0/func_80B11048.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gb2_0x80B0F5E0/func_80B110F8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gb2_0x80B0F5E0/func_80B110F8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gb2_0x80B0F5E0/func_80B111AC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gb2_0x80B0F5E0/func_80B111AC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gb2_0x80B0F5E0/func_80B11268.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gb2_0x80B0F5E0/func_80B11268.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gb2_0x80B0F5E0/func_80B11344.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gb2_0x80B0F5E0/func_80B11344.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gb2_0x80B0F5E0/EnGb2_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gb2_0x80B0F5E0/EnGb2_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gb2_0x80B0F5E0/EnGb2_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gb2_0x80B0F5E0/EnGb2_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gb2_0x80B0F5E0/EnGb2_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gb2_0x80B0F5E0/EnGb2_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gb2_0x80B0F5E0/func_80B1179C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gb2_0x80B0F5E0/func_80B1179C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gb2_0x80B0F5E0/func_80B117FC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gb2_0x80B0F5E0/func_80B117FC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gb2_0x80B0F5E0/EnGb2_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gb2_0x80B0F5E0/EnGb2_Draw.asm") 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 61476aa6da..69cad4a6e9 100644 --- a/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c +++ b/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c @@ -23,32 +23,32 @@ const ActorInit En_Ge1_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ge1_0x80945650/EnGe1_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ge1_0x80945650/EnGe1_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ge1_0x80945650/EnGe1_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ge1_0x80945650/EnGe1_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ge1_0x80945650/func_809457EC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ge1_0x80945650/func_809457EC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ge1_0x80945650/func_80945924.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ge1_0x80945650/func_80945924.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ge1_0x80945650/func_80945A00.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ge1_0x80945650/func_80945A00.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ge1_0x80945650/func_80945A9C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ge1_0x80945650/func_80945A9C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ge1_0x80945650/func_80945B60.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ge1_0x80945650/func_80945B60.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ge1_0x80945650/func_80945C50.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ge1_0x80945650/func_80945C50.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ge1_0x80945650/func_80945CAC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ge1_0x80945650/func_80945CAC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ge1_0x80945650/func_80945CE4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ge1_0x80945650/func_80945CE4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ge1_0x80945650/EnGe1_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ge1_0x80945650/EnGe1_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ge1_0x80945650/func_80946190.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ge1_0x80945650/func_80946190.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ge1_0x80945650/func_80946238.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ge1_0x80945650/func_80946238.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ge1_0x80945650/func_80946368.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ge1_0x80945650/func_80946368.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ge1_0x80945650/EnGe1_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ge1_0x80945650/EnGe1_Draw.asm") 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 8e4f490be8..1a55c87ee1 100644 --- a/src/overlays/actors/ovl_En_Ge2/z_en_ge2.c +++ b/src/overlays/actors/ovl_En_Ge2/z_en_ge2.c @@ -23,62 +23,62 @@ const ActorInit En_Ge2_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ge2_0x80B8B2D0/EnGe2_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ge2_0x80B8B2D0/EnGe2_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ge2_0x80B8B2D0/EnGe2_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ge2_0x80B8B2D0/EnGe2_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ge2_0x80B8B2D0/func_80B8B514.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ge2_0x80B8B2D0/func_80B8B514.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ge2_0x80B8B2D0/func_80B8B5AC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ge2_0x80B8B2D0/func_80B8B5AC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ge2_0x80B8B2D0/func_80B8B6B4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ge2_0x80B8B2D0/func_80B8B6B4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ge2_0x80B8B2D0/func_80B8B7A8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ge2_0x80B8B2D0/func_80B8B7A8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ge2_0x80B8B2D0/func_80B8B848.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ge2_0x80B8B2D0/func_80B8B848.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ge2_0x80B8B2D0/func_80B8B90C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ge2_0x80B8B2D0/func_80B8B90C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ge2_0x80B8B2D0/func_80B8BA40.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ge2_0x80B8B2D0/func_80B8BA40.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ge2_0x80B8B2D0/func_80B8BB3C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ge2_0x80B8B2D0/func_80B8BB3C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ge2_0x80B8B2D0/func_80B8BC1C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ge2_0x80B8B2D0/func_80B8BC1C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ge2_0x80B8B2D0/func_80B8BC78.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ge2_0x80B8B2D0/func_80B8BC78.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ge2_0x80B8B2D0/func_80B8BCEC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ge2_0x80B8B2D0/func_80B8BCEC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ge2_0x80B8B2D0/func_80B8BD38.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ge2_0x80B8B2D0/func_80B8BD38.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ge2_0x80B8B2D0/func_80B8BD90.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ge2_0x80B8B2D0/func_80B8BD90.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ge2_0x80B8B2D0/func_80B8BE08.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ge2_0x80B8B2D0/func_80B8BE08.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ge2_0x80B8B2D0/func_80B8BF04.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ge2_0x80B8B2D0/func_80B8BF04.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ge2_0x80B8B2D0/func_80B8BFC8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ge2_0x80B8B2D0/func_80B8BFC8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ge2_0x80B8B2D0/func_80B8C048.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ge2_0x80B8B2D0/func_80B8C048.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ge2_0x80B8B2D0/func_80B8C0B0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ge2_0x80B8B2D0/func_80B8C0B0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ge2_0x80B8B2D0/func_80B8C13C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ge2_0x80B8B2D0/func_80B8C13C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ge2_0x80B8B2D0/func_80B8C45C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ge2_0x80B8B2D0/func_80B8C45C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ge2_0x80B8B2D0/func_80B8C59C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ge2_0x80B8B2D0/func_80B8C59C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ge2_0x80B8B2D0/func_80B8C644.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ge2_0x80B8B2D0/func_80B8C644.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ge2_0x80B8B2D0/func_80B8C9B8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ge2_0x80B8B2D0/func_80B8C9B8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ge2_0x80B8B2D0/EnGe2_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ge2_0x80B8B2D0/EnGe2_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ge2_0x80B8B2D0/func_80B8CC0C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ge2_0x80B8B2D0/func_80B8CC0C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ge2_0x80B8B2D0/func_80B8CCB4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ge2_0x80B8B2D0/func_80B8CCB4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ge2_0x80B8B2D0/func_80B8CCFC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ge2_0x80B8B2D0/func_80B8CCFC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ge2_0x80B8B2D0/EnGe2_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ge2_0x80B8B2D0/EnGe2_Draw.asm") 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 440f5931d2..4abeaf88e6 100644 --- a/src/overlays/actors/ovl_En_Ge3/z_en_ge3.c +++ b/src/overlays/actors/ovl_En_Ge3/z_en_ge3.c @@ -23,36 +23,36 @@ const ActorInit En_Ge3_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ge3_0x8099FEB0/EnGe3_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ge3_0x8099FEB0/EnGe3_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ge3_0x8099FEB0/EnGe3_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ge3_0x8099FEB0/EnGe3_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ge3_0x8099FEB0/func_809A0070.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ge3_0x8099FEB0/func_809A0070.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ge3_0x8099FEB0/func_809A00F8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ge3_0x8099FEB0/func_809A00F8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ge3_0x8099FEB0/func_809A020C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ge3_0x8099FEB0/func_809A020C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ge3_0x8099FEB0/func_809A024C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ge3_0x8099FEB0/func_809A024C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ge3_0x8099FEB0/func_809A0350.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ge3_0x8099FEB0/func_809A0350.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ge3_0x8099FEB0/func_809A03AC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ge3_0x8099FEB0/func_809A03AC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ge3_0x8099FEB0/func_809A03FC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ge3_0x8099FEB0/func_809A03FC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ge3_0x8099FEB0/func_809A04D0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ge3_0x8099FEB0/func_809A04D0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ge3_0x8099FEB0/func_809A0820.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ge3_0x8099FEB0/func_809A0820.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ge3_0x8099FEB0/func_809A08A4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ge3_0x8099FEB0/func_809A08A4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ge3_0x8099FEB0/EnGe3_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ge3_0x8099FEB0/EnGe3_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ge3_0x8099FEB0/func_809A096C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ge3_0x8099FEB0/func_809A096C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ge3_0x8099FEB0/func_809A0A14.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ge3_0x8099FEB0/func_809A0A14.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ge3_0x8099FEB0/func_809A0C60.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ge3_0x8099FEB0/func_809A0C60.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ge3_0x8099FEB0/EnGe3_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ge3_0x8099FEB0/EnGe3_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Geg/z_en_geg.c b/src/overlays/actors/ovl_En_Geg/z_en_geg.c index a11e6d3b06..943378a19b 100644 --- a/src/overlays/actors/ovl_En_Geg/z_en_geg.c +++ b/src/overlays/actors/ovl_En_Geg/z_en_geg.c @@ -23,76 +23,76 @@ const ActorInit En_Geg_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Geg_0x80BB16D0/func_80BB16D0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Geg_0x80BB16D0/func_80BB16D0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Geg_0x80BB16D0/func_80BB178C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Geg_0x80BB16D0/func_80BB178C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Geg_0x80BB16D0/func_80BB18FC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Geg_0x80BB16D0/func_80BB18FC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Geg_0x80BB16D0/func_80BB19C0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Geg_0x80BB16D0/func_80BB19C0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Geg_0x80BB16D0/func_80BB1B14.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Geg_0x80BB16D0/func_80BB1B14.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Geg_0x80BB16D0/func_80BB1C1C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Geg_0x80BB16D0/func_80BB1C1C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Geg_0x80BB16D0/func_80BB1C8C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Geg_0x80BB16D0/func_80BB1C8C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Geg_0x80BB16D0/func_80BB1D04.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Geg_0x80BB16D0/func_80BB1D04.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Geg_0x80BB16D0/func_80BB1D64.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Geg_0x80BB16D0/func_80BB1D64.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Geg_0x80BB16D0/func_80BB1FCC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Geg_0x80BB16D0/func_80BB1FCC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Geg_0x80BB16D0/func_80BB2020.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Geg_0x80BB16D0/func_80BB2020.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Geg_0x80BB16D0/func_80BB2088.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Geg_0x80BB16D0/func_80BB2088.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Geg_0x80BB16D0/func_80BB217C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Geg_0x80BB16D0/func_80BB217C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Geg_0x80BB16D0/func_80BB221C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Geg_0x80BB16D0/func_80BB221C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Geg_0x80BB16D0/func_80BB2520.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Geg_0x80BB16D0/func_80BB2520.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Geg_0x80BB16D0/func_80BB26EC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Geg_0x80BB16D0/func_80BB26EC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Geg_0x80BB16D0/func_80BB27D4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Geg_0x80BB16D0/func_80BB27D4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Geg_0x80BB16D0/func_80BB2944.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Geg_0x80BB16D0/func_80BB2944.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Geg_0x80BB16D0/func_80BB2A54.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Geg_0x80BB16D0/func_80BB2A54.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Geg_0x80BB16D0/func_80BB2B1C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Geg_0x80BB16D0/func_80BB2B1C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Geg_0x80BB16D0/func_80BB2E00.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Geg_0x80BB16D0/func_80BB2E00.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Geg_0x80BB16D0/func_80BB2F7C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Geg_0x80BB16D0/func_80BB2F7C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Geg_0x80BB16D0/func_80BB30B4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Geg_0x80BB16D0/func_80BB30B4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Geg_0x80BB16D0/func_80BB31B8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Geg_0x80BB16D0/func_80BB31B8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Geg_0x80BB16D0/func_80BB32AC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Geg_0x80BB16D0/func_80BB32AC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Geg_0x80BB16D0/func_80BB3318.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Geg_0x80BB16D0/func_80BB3318.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Geg_0x80BB16D0/func_80BB347C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Geg_0x80BB16D0/func_80BB347C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Geg_0x80BB16D0/EnGeg_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Geg_0x80BB16D0/EnGeg_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Geg_0x80BB16D0/EnGeg_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Geg_0x80BB16D0/EnGeg_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Geg_0x80BB16D0/EnGeg_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Geg_0x80BB16D0/EnGeg_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Geg_0x80BB16D0/func_80BB3728.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Geg_0x80BB16D0/func_80BB3728.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Geg_0x80BB16D0/func_80BB3860.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Geg_0x80BB16D0/func_80BB3860.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Geg_0x80BB16D0/func_80BB387C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Geg_0x80BB16D0/func_80BB387C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Geg_0x80BB16D0/func_80BB39F8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Geg_0x80BB16D0/func_80BB39F8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Geg_0x80BB16D0/func_80BB3BE0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Geg_0x80BB16D0/func_80BB3BE0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Geg_0x80BB16D0/func_80BB3CB4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Geg_0x80BB16D0/func_80BB3CB4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Geg_0x80BB16D0/EnGeg_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Geg_0x80BB16D0/EnGeg_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Gg/z_en_gg.c b/src/overlays/actors/ovl_En_Gg/z_en_gg.c index e9a64eb114..b0a5f18622 100644 --- a/src/overlays/actors/ovl_En_Gg/z_en_gg.c +++ b/src/overlays/actors/ovl_En_Gg/z_en_gg.c @@ -23,54 +23,54 @@ const ActorInit En_Gg_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gg_0x80B34F70/func_80B34F70.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gg_0x80B34F70/func_80B34F70.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gg_0x80B34F70/func_80B34FB4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gg_0x80B34F70/func_80B34FB4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gg_0x80B34F70/func_80B35108.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gg_0x80B34F70/func_80B35108.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gg_0x80B34F70/func_80B351A4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gg_0x80B34F70/func_80B351A4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gg_0x80B34F70/func_80B35250.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gg_0x80B34F70/func_80B35250.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gg_0x80B34F70/func_80B352A4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gg_0x80B34F70/func_80B352A4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gg_0x80B34F70/func_80B35450.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gg_0x80B34F70/func_80B35450.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gg_0x80B34F70/func_80B3556C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gg_0x80B34F70/func_80B3556C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gg_0x80B34F70/func_80B35634.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gg_0x80B34F70/func_80B35634.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gg_0x80B34F70/func_80B357F0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gg_0x80B34F70/func_80B357F0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gg_0x80B34F70/func_80B3584C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gg_0x80B34F70/func_80B3584C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gg_0x80B34F70/func_80B358D8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gg_0x80B34F70/func_80B358D8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gg_0x80B34F70/func_80B35968.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gg_0x80B34F70/func_80B35968.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gg_0x80B34F70/func_80B359DC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gg_0x80B34F70/func_80B359DC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gg_0x80B34F70/func_80B35B24.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gg_0x80B34F70/func_80B35B24.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gg_0x80B34F70/func_80B35B44.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gg_0x80B34F70/func_80B35B44.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gg_0x80B34F70/func_80B35C84.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gg_0x80B34F70/func_80B35C84.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gg_0x80B34F70/func_80B3610C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gg_0x80B34F70/func_80B3610C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gg_0x80B34F70/func_80B363E8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gg_0x80B34F70/func_80B363E8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gg_0x80B34F70/func_80B364D4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gg_0x80B34F70/func_80B364D4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gg_0x80B34F70/EnGg_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gg_0x80B34F70/EnGg_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gg_0x80B34F70/EnGg_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gg_0x80B34F70/EnGg_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gg_0x80B34F70/EnGg_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gg_0x80B34F70/EnGg_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gg_0x80B34F70/func_80B368B0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gg_0x80B34F70/func_80B368B0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gg_0x80B34F70/func_80B368F0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gg_0x80B34F70/func_80B368F0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gg_0x80B34F70/EnGg_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gg_0x80B34F70/EnGg_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Gg2/z_en_gg2.c b/src/overlays/actors/ovl_En_Gg2/z_en_gg2.c index 45724cba29..2725f9d4c7 100644 --- a/src/overlays/actors/ovl_En_Gg2/z_en_gg2.c +++ b/src/overlays/actors/ovl_En_Gg2/z_en_gg2.c @@ -23,44 +23,44 @@ const ActorInit En_Gg2_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gg2_0x80B3AC50/func_80B3AC50.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gg2_0x80B3AC50/func_80B3AC50.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gg2_0x80B3AC50/func_80B3AC94.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gg2_0x80B3AC50/func_80B3AC94.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gg2_0x80B3AC50/func_80B3ADD8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gg2_0x80B3AC50/func_80B3ADD8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gg2_0x80B3AC50/func_80B3AE60.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gg2_0x80B3AC50/func_80B3AE60.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gg2_0x80B3AC50/func_80B3AFB0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gg2_0x80B3AC50/func_80B3AFB0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gg2_0x80B3AC50/func_80B3B05C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gg2_0x80B3AC50/func_80B3B05C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gg2_0x80B3AC50/func_80B3B0A0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gg2_0x80B3AC50/func_80B3B0A0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gg2_0x80B3AC50/func_80B3B120.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gg2_0x80B3AC50/func_80B3B120.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gg2_0x80B3AC50/func_80B3B21C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gg2_0x80B3AC50/func_80B3B21C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gg2_0x80B3AC50/func_80B3B294.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gg2_0x80B3AC50/func_80B3B294.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gg2_0x80B3AC50/func_80B3B4B0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gg2_0x80B3AC50/func_80B3B4B0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gg2_0x80B3AC50/func_80B3B5D4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gg2_0x80B3AC50/func_80B3B5D4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gg2_0x80B3AC50/func_80B3B648.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gg2_0x80B3AC50/func_80B3B648.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gg2_0x80B3AC50/func_80B3B7E4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gg2_0x80B3AC50/func_80B3B7E4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gg2_0x80B3AC50/func_80B3B8A4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gg2_0x80B3AC50/func_80B3B8A4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gg2_0x80B3AC50/EnGg2_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gg2_0x80B3AC50/EnGg2_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gg2_0x80B3AC50/EnGg2_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gg2_0x80B3AC50/EnGg2_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gg2_0x80B3AC50/EnGg2_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gg2_0x80B3AC50/EnGg2_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gg2_0x80B3AC50/func_80B3BD44.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gg2_0x80B3AC50/func_80B3BD44.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gg2_0x80B3AC50/func_80B3BDC0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gg2_0x80B3AC50/func_80B3BDC0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gg2_0x80B3AC50/EnGg2_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gg2_0x80B3AC50/EnGg2_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Giant/z_en_giant.c b/src/overlays/actors/ovl_En_Giant/z_en_giant.c index d993524d42..eef68a2488 100644 --- a/src/overlays/actors/ovl_En_Giant/z_en_giant.c +++ b/src/overlays/actors/ovl_En_Giant/z_en_giant.c @@ -23,36 +23,36 @@ const ActorInit En_Giant_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Giant_0x80B01990/func_80B01990.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Giant_0x80B01990/func_80B01990.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Giant_0x80B01990/func_80B01A74.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Giant_0x80B01990/func_80B01A74.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Giant_0x80B01990/EnGiant_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Giant_0x80B01990/EnGiant_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Giant_0x80B01990/EnGiant_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Giant_0x80B01990/EnGiant_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Giant_0x80B01990/func_80B01E84.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Giant_0x80B01990/func_80B01E84.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Giant_0x80B01990/func_80B01EE8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Giant_0x80B01990/func_80B01EE8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Giant_0x80B01990/func_80B020A0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Giant_0x80B01990/func_80B020A0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Giant_0x80B01990/func_80B0211C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Giant_0x80B01990/func_80B0211C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Giant_0x80B01990/func_80B02234.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Giant_0x80B01990/func_80B02234.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Giant_0x80B01990/func_80B02354.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Giant_0x80B01990/func_80B02354.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Giant_0x80B01990/func_80B023D0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Giant_0x80B01990/func_80B023D0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Giant_0x80B01990/func_80B024AC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Giant_0x80B01990/func_80B024AC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Giant_0x80B01990/func_80B024D8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Giant_0x80B01990/func_80B024D8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Giant_0x80B01990/EnGiant_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Giant_0x80B01990/EnGiant_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Giant_0x80B01990/func_80B02688.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Giant_0x80B01990/func_80B02688.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Giant_0x80B01990/func_80B026C4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Giant_0x80B01990/func_80B026C4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Giant_0x80B01990/EnGiant_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Giant_0x80B01990/EnGiant_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Ginko_Man/z_en_ginko_man.c b/src/overlays/actors/ovl_En_Ginko_Man/z_en_ginko_man.c index 8c4b754ac8..18da9b6274 100644 --- a/src/overlays/actors/ovl_En_Ginko_Man/z_en_ginko_man.c +++ b/src/overlays/actors/ovl_En_Ginko_Man/z_en_ginko_man.c @@ -23,44 +23,44 @@ const ActorInit En_Ginko_Man_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ginko_Man_0x80A644A0/EnGinkoMan_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ginko_Man_0x80A644A0/EnGinkoMan_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ginko_Man_0x80A644A0/EnGinkoMan_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ginko_Man_0x80A644A0/EnGinkoMan_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ginko_Man_0x80A644A0/func_80A64554.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ginko_Man_0x80A644A0/func_80A64554.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ginko_Man_0x80A644A0/func_80A645A4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ginko_Man_0x80A644A0/func_80A645A4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ginko_Man_0x80A644A0/func_80A646F4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ginko_Man_0x80A644A0/func_80A646F4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ginko_Man_0x80A644A0/func_80A64DC4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ginko_Man_0x80A644A0/func_80A64DC4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ginko_Man_0x80A644A0/func_80A65364.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ginko_Man_0x80A644A0/func_80A65364.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ginko_Man_0x80A644A0/func_80A65490.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ginko_Man_0x80A644A0/func_80A65490.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ginko_Man_0x80A644A0/func_80A654A4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ginko_Man_0x80A644A0/func_80A654A4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ginko_Man_0x80A644A0/func_80A6557C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ginko_Man_0x80A644A0/func_80A6557C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ginko_Man_0x80A644A0/func_80A65590.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ginko_Man_0x80A644A0/func_80A65590.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ginko_Man_0x80A644A0/func_80A656C4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ginko_Man_0x80A644A0/func_80A656C4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ginko_Man_0x80A644A0/func_80A656D8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ginko_Man_0x80A644A0/func_80A656D8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ginko_Man_0x80A644A0/func_80A65800.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ginko_Man_0x80A644A0/func_80A65800.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ginko_Man_0x80A644A0/func_80A65844.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ginko_Man_0x80A644A0/func_80A65844.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ginko_Man_0x80A644A0/func_80A65988.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ginko_Man_0x80A644A0/func_80A65988.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ginko_Man_0x80A644A0/func_80A65A5C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ginko_Man_0x80A644A0/func_80A65A5C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ginko_Man_0x80A644A0/EnGinkoMan_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ginko_Man_0x80A644A0/EnGinkoMan_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ginko_Man_0x80A644A0/func_80A65B44.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ginko_Man_0x80A644A0/func_80A65B44.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ginko_Man_0x80A644A0/func_80A65C18.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ginko_Man_0x80A644A0/func_80A65C18.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ginko_Man_0x80A644A0/EnGinkoMan_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ginko_Man_0x80A644A0/EnGinkoMan_Draw.asm") 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 c62e2fc409..9cf61e3248 100644 --- a/src/overlays/actors/ovl_En_GirlA/z_en_girla.c +++ b/src/overlays/actors/ovl_En_GirlA/z_en_girla.c @@ -22,88 +22,88 @@ const ActorInit En_GirlA_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_GirlA_0x80863870/func_80863870.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_GirlA_0x80863870/func_80863870.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_GirlA_0x80863870/func_8086387C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_GirlA_0x80863870/func_8086387C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_GirlA_0x80863870/EnGirlA_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_GirlA_0x80863870/EnGirlA_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_GirlA_0x80863870/EnGirlA_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_GirlA_0x80863870/EnGirlA_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_GirlA_0x80863870/func_80863950.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_GirlA_0x80863870/func_80863950.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_GirlA_0x80863870/func_808639B0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_GirlA_0x80863870/func_808639B0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_GirlA_0x80863870/func_80863A10.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_GirlA_0x80863870/func_80863A10.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_GirlA_0x80863870/func_80863AAC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_GirlA_0x80863870/func_80863AAC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_GirlA_0x80863870/func_80863B4C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_GirlA_0x80863870/func_80863B4C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_GirlA_0x80863870/func_80863C08.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_GirlA_0x80863870/func_80863C08.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_GirlA_0x80863870/func_80863C6C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_GirlA_0x80863870/func_80863C6C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_GirlA_0x80863870/func_80863D28.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_GirlA_0x80863870/func_80863D28.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_GirlA_0x80863870/func_80863D60.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_GirlA_0x80863870/func_80863D60.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_GirlA_0x80863870/func_80863DC8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_GirlA_0x80863870/func_80863DC8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_GirlA_0x80863870/func_80863E48.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_GirlA_0x80863870/func_80863E48.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_GirlA_0x80863870/func_80863EC8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_GirlA_0x80863870/func_80863EC8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_GirlA_0x80863870/func_80863F94.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_GirlA_0x80863870/func_80863F94.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_GirlA_0x80863870/func_80864034.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_GirlA_0x80863870/func_80864034.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_GirlA_0x80863870/func_8086406C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_GirlA_0x80863870/func_8086406C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_GirlA_0x80863870/func_808640A4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_GirlA_0x80863870/func_808640A4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_GirlA_0x80863870/func_80864108.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_GirlA_0x80863870/func_80864108.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_GirlA_0x80863870/func_80864168.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_GirlA_0x80863870/func_80864168.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_GirlA_0x80863870/func_80864210.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_GirlA_0x80863870/func_80864210.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_GirlA_0x80863870/func_8086425C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_GirlA_0x80863870/func_8086425C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_GirlA_0x80863870/func_808642D4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_GirlA_0x80863870/func_808642D4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_GirlA_0x80863870/func_80864320.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_GirlA_0x80863870/func_80864320.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_GirlA_0x80863870/func_8086436C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_GirlA_0x80863870/func_8086436C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_GirlA_0x80863870/func_808643B8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_GirlA_0x80863870/func_808643B8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_GirlA_0x80863870/func_8086444C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_GirlA_0x80863870/func_8086444C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_GirlA_0x80863870/func_808644A4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_GirlA_0x80863870/func_808644A4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_GirlA_0x80863870/func_80864558.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_GirlA_0x80863870/func_80864558.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_GirlA_0x80863870/func_808645A4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_GirlA_0x80863870/func_808645A4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_GirlA_0x80863870/func_80864658.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_GirlA_0x80863870/func_80864658.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_GirlA_0x80863870/func_808646A4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_GirlA_0x80863870/func_808646A4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_GirlA_0x80863870/func_808646E4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_GirlA_0x80863870/func_808646E4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_GirlA_0x80863870/func_808646F4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_GirlA_0x80863870/func_808646F4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_GirlA_0x80863870/func_8086472C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_GirlA_0x80863870/func_8086472C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_GirlA_0x80863870/func_80864744.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_GirlA_0x80863870/func_80864744.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_GirlA_0x80863870/func_80864760.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_GirlA_0x80863870/func_80864760.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_GirlA_0x80863870/func_80864774.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_GirlA_0x80863870/func_80864774.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_GirlA_0x80863870/func_808648F8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_GirlA_0x80863870/func_808648F8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_GirlA_0x80863870/EnGirlA_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_GirlA_0x80863870/EnGirlA_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_GirlA_0x80863870/func_808649C8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_GirlA_0x80863870/func_808649C8.asm") diff --git a/src/overlays/actors/ovl_En_Gk/z_en_gk.c b/src/overlays/actors/ovl_En_Gk/z_en_gk.c index 022eca47b0..9acc323559 100644 --- a/src/overlays/actors/ovl_En_Gk/z_en_gk.c +++ b/src/overlays/actors/ovl_En_Gk/z_en_gk.c @@ -23,80 +23,80 @@ const ActorInit En_Gk_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gk_0x80B50410/func_80B50410.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gk_0x80B50410/func_80B50410.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gk_0x80B50410/func_80B50710.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gk_0x80B50410/func_80B50710.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gk_0x80B50410/func_80B507A0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gk_0x80B50410/func_80B507A0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gk_0x80B50410/func_80B50854.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gk_0x80B50410/func_80B50854.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gk_0x80B50410/func_80B50954.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gk_0x80B50410/func_80B50954.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gk_0x80B50410/func_80B509A8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gk_0x80B50410/func_80B509A8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gk_0x80B50410/func_80B50B38.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gk_0x80B50410/func_80B50B38.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gk_0x80B50410/func_80B50C78.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gk_0x80B50410/func_80B50C78.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gk_0x80B50410/func_80B50E14.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gk_0x80B50410/func_80B50E14.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gk_0x80B50410/func_80B50ED4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gk_0x80B50410/func_80B50ED4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gk_0x80B50410/func_80B5100C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gk_0x80B50410/func_80B5100C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gk_0x80B50410/func_80B5123C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gk_0x80B50410/func_80B5123C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gk_0x80B50410/func_80B51308.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gk_0x80B50410/func_80B51308.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gk_0x80B50410/func_80B51398.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gk_0x80B50410/func_80B51398.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gk_0x80B50410/func_80B51410.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gk_0x80B50410/func_80B51410.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gk_0x80B50410/func_80B51510.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gk_0x80B50410/func_80B51510.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gk_0x80B50410/func_80B51698.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gk_0x80B50410/func_80B51698.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gk_0x80B50410/func_80B51760.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gk_0x80B50410/func_80B51760.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gk_0x80B50410/func_80B51970.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gk_0x80B50410/func_80B51970.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gk_0x80B50410/func_80B51B40.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gk_0x80B50410/func_80B51B40.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gk_0x80B50410/func_80B51D9C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gk_0x80B50410/func_80B51D9C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gk_0x80B50410/func_80B51EA4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gk_0x80B50410/func_80B51EA4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gk_0x80B50410/func_80B51FD0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gk_0x80B50410/func_80B51FD0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gk_0x80B50410/func_80B5202C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gk_0x80B50410/func_80B5202C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gk_0x80B50410/func_80B5216C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gk_0x80B50410/func_80B5216C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gk_0x80B50410/func_80B521E8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gk_0x80B50410/func_80B521E8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gk_0x80B50410/func_80B5227C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gk_0x80B50410/func_80B5227C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gk_0x80B50410/func_80B52340.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gk_0x80B50410/func_80B52340.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gk_0x80B50410/func_80B52430.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gk_0x80B50410/func_80B52430.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gk_0x80B50410/func_80B5253C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gk_0x80B50410/func_80B5253C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gk_0x80B50410/func_80B525E0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gk_0x80B50410/func_80B525E0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gk_0x80B50410/func_80B52654.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gk_0x80B50410/func_80B52654.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gk_0x80B50410/EnGk_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gk_0x80B50410/EnGk_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gk_0x80B50410/EnGk_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gk_0x80B50410/EnGk_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gk_0x80B50410/EnGk_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gk_0x80B50410/EnGk_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gk_0x80B50410/func_80B52AD4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gk_0x80B50410/func_80B52AD4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gk_0x80B50410/func_80B52AF0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gk_0x80B50410/func_80B52AF0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gk_0x80B50410/func_80B52D8C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gk_0x80B50410/func_80B52D8C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gk_0x80B50410/EnGk_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gk_0x80B50410/EnGk_Draw.asm") 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 275e068c2c..6260640ba3 100644 --- a/src/overlays/actors/ovl_En_Gm/z_en_gm.c +++ b/src/overlays/actors/ovl_En_Gm/z_en_gm.c @@ -23,104 +23,104 @@ const ActorInit En_Gm_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gm_0x8094DEE0/func_8094DEE0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gm_0x8094DEE0/func_8094DEE0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gm_0x8094DEE0/func_8094DF90.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gm_0x8094DEE0/func_8094DF90.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gm_0x8094DEE0/func_8094DFF8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gm_0x8094DEE0/func_8094DFF8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gm_0x8094DEE0/func_8094E054.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gm_0x8094DEE0/func_8094E054.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gm_0x8094DEE0/func_8094E0F8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gm_0x8094DEE0/func_8094E0F8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gm_0x8094DEE0/func_8094E1DC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gm_0x8094DEE0/func_8094E1DC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gm_0x8094DEE0/func_8094E278.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gm_0x8094DEE0/func_8094E278.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gm_0x8094DEE0/func_8094E2D0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gm_0x8094DEE0/func_8094E2D0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gm_0x8094DEE0/func_8094E454.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gm_0x8094DEE0/func_8094E454.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gm_0x8094DEE0/func_8094E4D0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gm_0x8094DEE0/func_8094E4D0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gm_0x8094DEE0/func_8094E52C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gm_0x8094DEE0/func_8094E52C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gm_0x8094DEE0/func_8094E69C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gm_0x8094DEE0/func_8094E69C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gm_0x8094DEE0/func_8094EA34.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gm_0x8094DEE0/func_8094EA34.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gm_0x8094DEE0/func_8094EB1C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gm_0x8094DEE0/func_8094EB1C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gm_0x8094DEE0/func_8094EDBC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gm_0x8094DEE0/func_8094EDBC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gm_0x8094DEE0/func_8094EE84.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gm_0x8094DEE0/func_8094EE84.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gm_0x8094DEE0/func_8094EFC4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gm_0x8094DEE0/func_8094EFC4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gm_0x8094DEE0/func_8094F074.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gm_0x8094DEE0/func_8094F074.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gm_0x8094DEE0/func_8094F0E0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gm_0x8094DEE0/func_8094F0E0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gm_0x8094DEE0/func_8094F2E8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gm_0x8094DEE0/func_8094F2E8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gm_0x8094DEE0/func_8094F3D0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gm_0x8094DEE0/func_8094F3D0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gm_0x8094DEE0/func_8094F4EC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gm_0x8094DEE0/func_8094F4EC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gm_0x8094DEE0/func_8094F53C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gm_0x8094DEE0/func_8094F53C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gm_0x8094DEE0/func_8094F7D0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gm_0x8094DEE0/func_8094F7D0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gm_0x8094DEE0/func_8094F904.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gm_0x8094DEE0/func_8094F904.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gm_0x8094DEE0/func_8094FAC4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gm_0x8094DEE0/func_8094FAC4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gm_0x8094DEE0/func_8094FCC4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gm_0x8094DEE0/func_8094FCC4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gm_0x8094DEE0/func_8094FD88.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gm_0x8094DEE0/func_8094FD88.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gm_0x8094DEE0/func_8094FE10.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gm_0x8094DEE0/func_8094FE10.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gm_0x8094DEE0/func_8094FF04.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gm_0x8094DEE0/func_8094FF04.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gm_0x8094DEE0/func_80950088.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gm_0x8094DEE0/func_80950088.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gm_0x8094DEE0/func_80950120.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gm_0x8094DEE0/func_80950120.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gm_0x8094DEE0/func_809501B8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gm_0x8094DEE0/func_809501B8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gm_0x8094DEE0/func_80950280.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gm_0x8094DEE0/func_80950280.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gm_0x8094DEE0/func_80950388.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gm_0x8094DEE0/func_80950388.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gm_0x8094DEE0/func_809503F8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gm_0x8094DEE0/func_809503F8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gm_0x8094DEE0/func_80950490.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gm_0x8094DEE0/func_80950490.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gm_0x8094DEE0/func_80950690.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gm_0x8094DEE0/func_80950690.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gm_0x8094DEE0/func_80950804.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gm_0x8094DEE0/func_80950804.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gm_0x8094DEE0/func_8095097C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gm_0x8094DEE0/func_8095097C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gm_0x8094DEE0/func_80950C24.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gm_0x8094DEE0/func_80950C24.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gm_0x8094DEE0/func_80950CDC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gm_0x8094DEE0/func_80950CDC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gm_0x8094DEE0/func_80950DB8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gm_0x8094DEE0/func_80950DB8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gm_0x8094DEE0/func_80950F2C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gm_0x8094DEE0/func_80950F2C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gm_0x8094DEE0/EnGm_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gm_0x8094DEE0/EnGm_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gm_0x8094DEE0/EnGm_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gm_0x8094DEE0/EnGm_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gm_0x8094DEE0/EnGm_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gm_0x8094DEE0/EnGm_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gm_0x8094DEE0/func_809513AC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gm_0x8094DEE0/func_809513AC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gm_0x8094DEE0/func_809514BC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gm_0x8094DEE0/func_809514BC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gm_0x8094DEE0/func_80951594.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gm_0x8094DEE0/func_80951594.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gm_0x8094DEE0/EnGm_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gm_0x8094DEE0/EnGm_Draw.asm") 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 b0e4c6ed74..c2e69cb8ac 100644 --- a/src/overlays/actors/ovl_En_Go/z_en_go.c +++ b/src/overlays/actors/ovl_En_Go/z_en_go.c @@ -22,142 +22,142 @@ const ActorInit En_Go_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Go_0x80A10FD0/func_80A10FD0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Go_0x80A10FD0/func_80A10FD0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Go_0x80A10FD0/func_80A11144.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Go_0x80A10FD0/func_80A11144.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Go_0x80A10FD0/func_80A1143C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Go_0x80A10FD0/func_80A1143C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Go_0x80A10FD0/func_80A115B4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Go_0x80A10FD0/func_80A115B4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Go_0x80A10FD0/func_80A118F8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Go_0x80A10FD0/func_80A118F8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Go_0x80A10FD0/func_80A11BF8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Go_0x80A10FD0/func_80A11BF8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Go_0x80A10FD0/func_80A11EC0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Go_0x80A10FD0/func_80A11EC0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Go_0x80A10FD0/func_80A1203C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Go_0x80A10FD0/func_80A1203C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Go_0x80A10FD0/func_80A1213C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Go_0x80A10FD0/func_80A1213C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Go_0x80A10FD0/func_80A121F4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Go_0x80A10FD0/func_80A121F4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Go_0x80A10FD0/func_80A1222C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Go_0x80A10FD0/func_80A1222C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Go_0x80A10FD0/func_80A122EC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Go_0x80A10FD0/func_80A122EC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Go_0x80A10FD0/func_80A123A0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Go_0x80A10FD0/func_80A123A0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Go_0x80A10FD0/func_80A124A0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Go_0x80A10FD0/func_80A124A0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Go_0x80A10FD0/func_80A124FC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Go_0x80A10FD0/func_80A124FC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Go_0x80A10FD0/func_80A125BC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Go_0x80A10FD0/func_80A125BC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Go_0x80A10FD0/func_80A12660.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Go_0x80A10FD0/func_80A12660.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Go_0x80A10FD0/func_80A126BC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Go_0x80A10FD0/func_80A126BC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Go_0x80A10FD0/func_80A12774.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Go_0x80A10FD0/func_80A12774.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Go_0x80A10FD0/func_80A12868.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Go_0x80A10FD0/func_80A12868.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Go_0x80A10FD0/func_80A12954.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Go_0x80A10FD0/func_80A12954.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Go_0x80A10FD0/func_80A12A64.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Go_0x80A10FD0/func_80A12A64.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Go_0x80A10FD0/func_80A12B78.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Go_0x80A10FD0/func_80A12B78.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Go_0x80A10FD0/func_80A12C48.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Go_0x80A10FD0/func_80A12C48.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Go_0x80A10FD0/func_80A12D6C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Go_0x80A10FD0/func_80A12D6C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Go_0x80A10FD0/func_80A12DF4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Go_0x80A10FD0/func_80A12DF4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Go_0x80A10FD0/func_80A12E80.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Go_0x80A10FD0/func_80A12E80.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Go_0x80A10FD0/func_80A12FE8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Go_0x80A10FD0/func_80A12FE8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Go_0x80A10FD0/func_80A131F8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Go_0x80A10FD0/func_80A131F8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Go_0x80A10FD0/func_80A132C8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Go_0x80A10FD0/func_80A132C8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Go_0x80A10FD0/func_80A133A8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Go_0x80A10FD0/func_80A133A8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Go_0x80A10FD0/func_80A13400.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Go_0x80A10FD0/func_80A13400.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Go_0x80A10FD0/func_80A134B0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Go_0x80A10FD0/func_80A134B0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Go_0x80A10FD0/func_80A134F4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Go_0x80A10FD0/func_80A134F4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Go_0x80A10FD0/func_80A13564.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Go_0x80A10FD0/func_80A13564.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Go_0x80A10FD0/func_80A136B8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Go_0x80A10FD0/func_80A136B8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Go_0x80A10FD0/func_80A13728.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Go_0x80A10FD0/func_80A13728.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Go_0x80A10FD0/func_80A137C0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Go_0x80A10FD0/func_80A137C0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Go_0x80A10FD0/func_80A139E4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Go_0x80A10FD0/func_80A139E4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Go_0x80A10FD0/func_80A13B1C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Go_0x80A10FD0/func_80A13B1C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Go_0x80A10FD0/func_80A13E80.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Go_0x80A10FD0/func_80A13E80.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Go_0x80A10FD0/func_80A14018.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Go_0x80A10FD0/func_80A14018.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Go_0x80A10FD0/func_80A14104.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Go_0x80A10FD0/func_80A14104.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Go_0x80A10FD0/func_80A141D4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Go_0x80A10FD0/func_80A141D4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Go_0x80A10FD0/func_80A1428C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Go_0x80A10FD0/func_80A1428C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Go_0x80A10FD0/func_80A14324.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Go_0x80A10FD0/func_80A14324.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Go_0x80A10FD0/func_80A143A8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Go_0x80A10FD0/func_80A143A8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Go_0x80A10FD0/func_80A14430.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Go_0x80A10FD0/func_80A14430.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Go_0x80A10FD0/func_80A1449C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Go_0x80A10FD0/func_80A1449C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Go_0x80A10FD0/func_80A144F4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Go_0x80A10FD0/func_80A144F4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Go_0x80A10FD0/func_80A145AC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Go_0x80A10FD0/func_80A145AC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Go_0x80A10FD0/func_80A14668.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Go_0x80A10FD0/func_80A14668.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Go_0x80A10FD0/func_80A146CC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Go_0x80A10FD0/func_80A146CC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Go_0x80A10FD0/func_80A14798.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Go_0x80A10FD0/func_80A14798.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Go_0x80A10FD0/func_80A149B0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Go_0x80A10FD0/func_80A149B0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Go_0x80A10FD0/func_80A14B30.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Go_0x80A10FD0/func_80A14B30.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Go_0x80A10FD0/func_80A14E14.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Go_0x80A10FD0/func_80A14E14.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Go_0x80A10FD0/func_80A14E74.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Go_0x80A10FD0/func_80A14E74.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Go_0x80A10FD0/func_80A14EB0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Go_0x80A10FD0/func_80A14EB0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Go_0x80A10FD0/func_80A14FC8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Go_0x80A10FD0/func_80A14FC8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Go_0x80A10FD0/func_80A153FC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Go_0x80A10FD0/func_80A153FC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Go_0x80A10FD0/func_80A15684.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Go_0x80A10FD0/func_80A15684.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Go_0x80A10FD0/func_80A157C4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Go_0x80A10FD0/func_80A157C4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Go_0x80A10FD0/EnGo_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Go_0x80A10FD0/EnGo_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Go_0x80A10FD0/EnGo_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Go_0x80A10FD0/EnGo_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Go_0x80A10FD0/EnGo_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Go_0x80A10FD0/EnGo_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Go_0x80A10FD0/func_80A15B80.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Go_0x80A10FD0/func_80A15B80.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Go_0x80A10FD0/func_80A15D04.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Go_0x80A10FD0/func_80A15D04.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Go_0x80A10FD0/func_80A15E38.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Go_0x80A10FD0/func_80A15E38.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Go_0x80A10FD0/func_80A15FEC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Go_0x80A10FD0/func_80A15FEC.asm") 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 1a7f365975..2984dc9f03 100644 --- a/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c +++ b/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c @@ -23,106 +23,106 @@ const ActorInit En_Goroiwa_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Goroiwa_0x8093E8A0/func_8093E8A0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Goroiwa_0x8093E8A0/func_8093E8A0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Goroiwa_0x8093E8A0/func_8093E91C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Goroiwa_0x8093E8A0/func_8093E91C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Goroiwa_0x8093E8A0/func_8093E938.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Goroiwa_0x8093E8A0/func_8093E938.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Goroiwa_0x8093E8A0/func_8093E9B0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Goroiwa_0x8093E8A0/func_8093E9B0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Goroiwa_0x8093E8A0/func_8093EAB0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Goroiwa_0x8093E8A0/func_8093EAB0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Goroiwa_0x8093E8A0/func_8093EAD4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Goroiwa_0x8093E8A0/func_8093EAD4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Goroiwa_0x8093E8A0/func_8093EB58.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Goroiwa_0x8093E8A0/func_8093EB58.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Goroiwa_0x8093E8A0/func_8093EB74.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Goroiwa_0x8093E8A0/func_8093EB74.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Goroiwa_0x8093E8A0/func_8093EC50.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Goroiwa_0x8093E8A0/func_8093EC50.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Goroiwa_0x8093E8A0/func_8093ECD4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Goroiwa_0x8093E8A0/func_8093ECD4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Goroiwa_0x8093E8A0/func_8093ED80.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Goroiwa_0x8093E8A0/func_8093ED80.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Goroiwa_0x8093E8A0/func_8093EDB0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Goroiwa_0x8093E8A0/func_8093EDB0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Goroiwa_0x8093E8A0/func_8093EDD8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Goroiwa_0x8093E8A0/func_8093EDD8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Goroiwa_0x8093E8A0/func_8093EE18.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Goroiwa_0x8093E8A0/func_8093EE18.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Goroiwa_0x8093E8A0/func_8093EE64.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Goroiwa_0x8093E8A0/func_8093EE64.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Goroiwa_0x8093E8A0/func_8093EEBC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Goroiwa_0x8093E8A0/func_8093EEBC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Goroiwa_0x8093E8A0/func_8093EEDC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Goroiwa_0x8093E8A0/func_8093EEDC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Goroiwa_0x8093E8A0/func_8093EF54.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Goroiwa_0x8093E8A0/func_8093EF54.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Goroiwa_0x8093E8A0/func_8093F198.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Goroiwa_0x8093E8A0/func_8093F198.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Goroiwa_0x8093E8A0/func_8093F34C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Goroiwa_0x8093E8A0/func_8093F34C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Goroiwa_0x8093E8A0/func_8093F498.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Goroiwa_0x8093E8A0/func_8093F498.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Goroiwa_0x8093E8A0/func_8093F5EC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Goroiwa_0x8093E8A0/func_8093F5EC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Goroiwa_0x8093E8A0/func_8093F6F8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Goroiwa_0x8093E8A0/func_8093F6F8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Goroiwa_0x8093E8A0/func_8093FAA4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Goroiwa_0x8093E8A0/func_8093FAA4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Goroiwa_0x8093E8A0/func_8093FC00.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Goroiwa_0x8093E8A0/func_8093FC00.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Goroiwa_0x8093E8A0/func_8093FC6C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Goroiwa_0x8093E8A0/func_8093FC6C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Goroiwa_0x8093E8A0/func_80940090.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Goroiwa_0x8093E8A0/func_80940090.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Goroiwa_0x8093E8A0/func_80940588.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Goroiwa_0x8093E8A0/func_80940588.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Goroiwa_0x8093E8A0/func_80940A1C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Goroiwa_0x8093E8A0/func_80940A1C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Goroiwa_0x8093E8A0/func_80940E38.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Goroiwa_0x8093E8A0/func_80940E38.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Goroiwa_0x8093E8A0/func_80941060.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Goroiwa_0x8093E8A0/func_80941060.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Goroiwa_0x8093E8A0/func_80941274.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Goroiwa_0x8093E8A0/func_80941274.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Goroiwa_0x8093E8A0/EnGoroiwa_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Goroiwa_0x8093E8A0/EnGoroiwa_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Goroiwa_0x8093E8A0/EnGoroiwa_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Goroiwa_0x8093E8A0/EnGoroiwa_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Goroiwa_0x8093E8A0/func_8094156C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Goroiwa_0x8093E8A0/func_8094156C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Goroiwa_0x8093E8A0/func_809419D0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Goroiwa_0x8093E8A0/func_809419D0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Goroiwa_0x8093E8A0/func_80941A10.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Goroiwa_0x8093E8A0/func_80941A10.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Goroiwa_0x8093E8A0/func_80941DB4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Goroiwa_0x8093E8A0/func_80941DB4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Goroiwa_0x8093E8A0/func_80941E28.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Goroiwa_0x8093E8A0/func_80941E28.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Goroiwa_0x8093E8A0/func_80941EB4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Goroiwa_0x8093E8A0/func_80941EB4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Goroiwa_0x8093E8A0/func_80941F10.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Goroiwa_0x8093E8A0/func_80941F10.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Goroiwa_0x8093E8A0/func_80941F54.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Goroiwa_0x8093E8A0/func_80941F54.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Goroiwa_0x8093E8A0/func_80941FA4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Goroiwa_0x8093E8A0/func_80941FA4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Goroiwa_0x8093E8A0/func_80942084.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Goroiwa_0x8093E8A0/func_80942084.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Goroiwa_0x8093E8A0/func_809420F0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Goroiwa_0x8093E8A0/func_809420F0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Goroiwa_0x8093E8A0/func_809421E0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Goroiwa_0x8093E8A0/func_809421E0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Goroiwa_0x8093E8A0/func_8094220C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Goroiwa_0x8093E8A0/func_8094220C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Goroiwa_0x8093E8A0/func_809425CC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Goroiwa_0x8093E8A0/func_809425CC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Goroiwa_0x8093E8A0/func_80942604.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Goroiwa_0x8093E8A0/func_80942604.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Goroiwa_0x8093E8A0/EnGoroiwa_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Goroiwa_0x8093E8A0/EnGoroiwa_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Goroiwa_0x8093E8A0/func_80942B1C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Goroiwa_0x8093E8A0/func_80942B1C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Goroiwa_0x8093E8A0/EnGoroiwa_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Goroiwa_0x8093E8A0/EnGoroiwa_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Grasshopper/z_en_grasshopper.c b/src/overlays/actors/ovl_En_Grasshopper/z_en_grasshopper.c index 4ae601eb33..26ebf15fb9 100644 --- a/src/overlays/actors/ovl_En_Grasshopper/z_en_grasshopper.c +++ b/src/overlays/actors/ovl_En_Grasshopper/z_en_grasshopper.c @@ -23,66 +23,66 @@ const ActorInit En_Grasshopper_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Grasshopper_0x809A6280/EnGrasshopper_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Grasshopper_0x809A6280/EnGrasshopper_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Grasshopper_0x809A6280/EnGrasshopper_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Grasshopper_0x809A6280/EnGrasshopper_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Grasshopper_0x809A6280/func_809A6524.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Grasshopper_0x809A6280/func_809A6524.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Grasshopper_0x809A6280/func_809A65D8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Grasshopper_0x809A6280/func_809A65D8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Grasshopper_0x809A6280/func_809A6628.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Grasshopper_0x809A6280/func_809A6628.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Grasshopper_0x809A6280/func_809A6668.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Grasshopper_0x809A6280/func_809A6668.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Grasshopper_0x809A6280/func_809A6754.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Grasshopper_0x809A6280/func_809A6754.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Grasshopper_0x809A6280/func_809A67A4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Grasshopper_0x809A6280/func_809A67A4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Grasshopper_0x809A6280/func_809A6B6C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Grasshopper_0x809A6280/func_809A6B6C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Grasshopper_0x809A6280/func_809A6E18.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Grasshopper_0x809A6280/func_809A6E18.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Grasshopper_0x809A6280/func_809A6E74.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Grasshopper_0x809A6280/func_809A6E74.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Grasshopper_0x809A6280/func_809A6F8C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Grasshopper_0x809A6280/func_809A6F8C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Grasshopper_0x809A6280/func_809A700C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Grasshopper_0x809A6280/func_809A700C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Grasshopper_0x809A6280/func_809A7134.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Grasshopper_0x809A6280/func_809A7134.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Grasshopper_0x809A6280/func_809A71CC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Grasshopper_0x809A6280/func_809A71CC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Grasshopper_0x809A6280/func_809A7494.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Grasshopper_0x809A6280/func_809A7494.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Grasshopper_0x809A6280/func_809A753C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Grasshopper_0x809A6280/func_809A753C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Grasshopper_0x809A6280/func_809A7844.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Grasshopper_0x809A6280/func_809A7844.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Grasshopper_0x809A6280/func_809A78EC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Grasshopper_0x809A6280/func_809A78EC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Grasshopper_0x809A6280/func_809A797C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Grasshopper_0x809A6280/func_809A797C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Grasshopper_0x809A6280/func_809A7A8C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Grasshopper_0x809A6280/func_809A7A8C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Grasshopper_0x809A6280/func_809A7AE4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Grasshopper_0x809A6280/func_809A7AE4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Grasshopper_0x809A6280/func_809A7BBC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Grasshopper_0x809A6280/func_809A7BBC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Grasshopper_0x809A6280/func_809A7C98.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Grasshopper_0x809A6280/func_809A7C98.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Grasshopper_0x809A6280/func_809A7CE0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Grasshopper_0x809A6280/func_809A7CE0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Grasshopper_0x809A6280/func_809A8044.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Grasshopper_0x809A6280/func_809A8044.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Grasshopper_0x809A6280/EnGrasshopper_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Grasshopper_0x809A6280/EnGrasshopper_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Grasshopper_0x809A6280/func_809A847C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Grasshopper_0x809A6280/func_809A847C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Grasshopper_0x809A6280/EnGrasshopper_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Grasshopper_0x809A6280/EnGrasshopper_Draw.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Grasshopper_0x809A6280/func_809A8870.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Grasshopper_0x809A6280/func_809A8870.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Grasshopper_0x809A6280/func_809A8924.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Grasshopper_0x809A6280/func_809A8924.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Grasshopper_0x809A6280/func_809A8A64.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Grasshopper_0x809A6280/func_809A8A64.asm") 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 a2e1fef884..4640ae0525 100644 --- a/src/overlays/actors/ovl_En_Gs/z_en_gs.c +++ b/src/overlays/actors/ovl_En_Gs/z_en_gs.c @@ -23,64 +23,64 @@ const ActorInit En_Gs_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gs_0x80997A90/func_80997A90.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gs_0x80997A90/func_80997A90.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gs_0x80997A90/func_80997AFC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gs_0x80997A90/func_80997AFC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gs_0x80997A90/EnGs_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gs_0x80997A90/EnGs_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gs_0x80997A90/EnGs_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gs_0x80997A90/EnGs_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gs_0x80997A90/func_80997D14.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gs_0x80997A90/func_80997D14.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gs_0x80997A90/func_80997D38.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gs_0x80997A90/func_80997D38.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gs_0x80997A90/func_80997DEC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gs_0x80997A90/func_80997DEC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gs_0x80997A90/func_80997E4C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gs_0x80997A90/func_80997E4C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gs_0x80997A90/func_80997FF0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gs_0x80997A90/func_80997FF0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gs_0x80997A90/func_80998040.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gs_0x80997A90/func_80998040.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gs_0x80997A90/func_8099807C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gs_0x80997A90/func_8099807C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gs_0x80997A90/func_80998300.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gs_0x80997A90/func_80998300.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gs_0x80997A90/func_80998334.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gs_0x80997A90/func_80998334.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gs_0x80997A90/func_809984F4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gs_0x80997A90/func_809984F4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gs_0x80997A90/func_809985B8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gs_0x80997A90/func_809985B8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gs_0x80997A90/func_80998704.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gs_0x80997A90/func_80998704.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gs_0x80997A90/func_8099874C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gs_0x80997A90/func_8099874C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gs_0x80997A90/func_809989B4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gs_0x80997A90/func_809989B4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gs_0x80997A90/func_809989F4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gs_0x80997A90/func_809989F4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gs_0x80997A90/func_80998A48.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gs_0x80997A90/func_80998A48.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gs_0x80997A90/func_80998BBC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gs_0x80997A90/func_80998BBC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gs_0x80997A90/func_80998D44.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gs_0x80997A90/func_80998D44.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gs_0x80997A90/func_80998F9C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gs_0x80997A90/func_80998F9C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gs_0x80997A90/func_80999584.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gs_0x80997A90/func_80999584.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gs_0x80997A90/func_809995A4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gs_0x80997A90/func_809995A4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gs_0x80997A90/func_80999A8C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gs_0x80997A90/func_80999A8C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gs_0x80997A90/func_80999AC0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gs_0x80997A90/func_80999AC0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gs_0x80997A90/func_80999B34.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gs_0x80997A90/func_80999B34.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gs_0x80997A90/func_80999BC8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gs_0x80997A90/func_80999BC8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gs_0x80997A90/EnGs_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gs_0x80997A90/EnGs_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Gs_0x80997A90/EnGs_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Gs_0x80997A90/EnGs_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Guard_Nuts/z_en_guard_nuts.c b/src/overlays/actors/ovl_En_Guard_Nuts/z_en_guard_nuts.c index 2a4c24eea3..22f0be0119 100644 --- a/src/overlays/actors/ovl_En_Guard_Nuts/z_en_guard_nuts.c +++ b/src/overlays/actors/ovl_En_Guard_Nuts/z_en_guard_nuts.c @@ -23,28 +23,28 @@ const ActorInit En_Guard_Nuts_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Guard_Nuts_0x80ABB0E0/EnGuardNuts_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Guard_Nuts_0x80ABB0E0/EnGuardNuts_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Guard_Nuts_0x80ABB0E0/EnGuardNuts_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Guard_Nuts_0x80ABB0E0/EnGuardNuts_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Guard_Nuts_0x80ABB0E0/func_80ABB210.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Guard_Nuts_0x80ABB0E0/func_80ABB210.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Guard_Nuts_0x80ABB0E0/func_80ABB29C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Guard_Nuts_0x80ABB0E0/func_80ABB29C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Guard_Nuts_0x80ABB0E0/func_80ABB2D4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Guard_Nuts_0x80ABB0E0/func_80ABB2D4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Guard_Nuts_0x80ABB0E0/func_80ABB540.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Guard_Nuts_0x80ABB0E0/func_80ABB540.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Guard_Nuts_0x80ABB0E0/func_80ABB590.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Guard_Nuts_0x80ABB0E0/func_80ABB590.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Guard_Nuts_0x80ABB0E0/func_80ABB854.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Guard_Nuts_0x80ABB0E0/func_80ABB854.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Guard_Nuts_0x80ABB0E0/func_80ABB91C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Guard_Nuts_0x80ABB0E0/func_80ABB91C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Guard_Nuts_0x80ABB0E0/func_80ABB990.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Guard_Nuts_0x80ABB0E0/func_80ABB990.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Guard_Nuts_0x80ABB0E0/EnGuardNuts_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Guard_Nuts_0x80ABB0E0/EnGuardNuts_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Guard_Nuts_0x80ABB0E0/func_80ABBC60.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Guard_Nuts_0x80ABB0E0/func_80ABBC60.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Guard_Nuts_0x80ABB0E0/EnGuardNuts_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Guard_Nuts_0x80ABB0E0/EnGuardNuts_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Guruguru/z_en_guruguru.c b/src/overlays/actors/ovl_En_Guruguru/z_en_guruguru.c index 8b35f32075..64203fd85b 100644 --- a/src/overlays/actors/ovl_En_Guruguru/z_en_guruguru.c +++ b/src/overlays/actors/ovl_En_Guruguru/z_en_guruguru.c @@ -23,30 +23,30 @@ const ActorInit En_Guruguru_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Guruguru_0x80BC6BF0/EnGuruguru_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Guruguru_0x80BC6BF0/EnGuruguru_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Guruguru_0x80BC6BF0/EnGuruguru_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Guruguru_0x80BC6BF0/EnGuruguru_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Guruguru_0x80BC6BF0/func_80BC6D64.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Guruguru_0x80BC6BF0/func_80BC6D64.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Guruguru_0x80BC6BF0/func_80BC6E00.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Guruguru_0x80BC6BF0/func_80BC6E00.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Guruguru_0x80BC6BF0/func_80BC6E10.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Guruguru_0x80BC6BF0/func_80BC6E10.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Guruguru_0x80BC6BF0/func_80BC6F14.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Guruguru_0x80BC6BF0/func_80BC6F14.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Guruguru_0x80BC6BF0/func_80BC701C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Guruguru_0x80BC6BF0/func_80BC701C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Guruguru_0x80BC6BF0/func_80BC7068.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Guruguru_0x80BC6BF0/func_80BC7068.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Guruguru_0x80BC6BF0/func_80BC73F4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Guruguru_0x80BC6BF0/func_80BC73F4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Guruguru_0x80BC6BF0/func_80BC7440.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Guruguru_0x80BC6BF0/func_80BC7440.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Guruguru_0x80BC6BF0/func_80BC7520.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Guruguru_0x80BC6BF0/func_80BC7520.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Guruguru_0x80BC6BF0/EnGuruguru_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Guruguru_0x80BC6BF0/EnGuruguru_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Guruguru_0x80BC6BF0/func_80BC77EC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Guruguru_0x80BC6BF0/func_80BC77EC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Guruguru_0x80BC6BF0/EnGuruguru_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Guruguru_0x80BC6BF0/EnGuruguru_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Hakurock/z_en_hakurock.c b/src/overlays/actors/ovl_En_Hakurock/z_en_hakurock.c index a20e2af40b..a3fdcac50e 100644 --- a/src/overlays/actors/ovl_En_Hakurock/z_en_hakurock.c +++ b/src/overlays/actors/ovl_En_Hakurock/z_en_hakurock.c @@ -22,36 +22,36 @@ const ActorInit En_Hakurock_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Hakurock_0x80B21B00/EnHakurock_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Hakurock_0x80B21B00/EnHakurock_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Hakurock_0x80B21B00/EnHakurock_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Hakurock_0x80B21B00/EnHakurock_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Hakurock_0x80B21B00/func_80B21BE0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Hakurock_0x80B21B00/func_80B21BE0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Hakurock_0x80B21B00/func_80B21EA4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Hakurock_0x80B21B00/func_80B21EA4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Hakurock_0x80B21B00/func_80B21FFC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Hakurock_0x80B21B00/func_80B21FFC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Hakurock_0x80B21B00/func_80B22040.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Hakurock_0x80B21B00/func_80B22040.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Hakurock_0x80B21B00/func_80B220A8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Hakurock_0x80B21B00/func_80B220A8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Hakurock_0x80B21B00/func_80B221E8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Hakurock_0x80B21B00/func_80B221E8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Hakurock_0x80B21B00/func_80B222AC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Hakurock_0x80B21B00/func_80B222AC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Hakurock_0x80B21B00/func_80B2242C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Hakurock_0x80B21B00/func_80B2242C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Hakurock_0x80B21B00/func_80B224C0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Hakurock_0x80B21B00/func_80B224C0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Hakurock_0x80B21B00/func_80B22500.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Hakurock_0x80B21B00/func_80B22500.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Hakurock_0x80B21B00/func_80B226AC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Hakurock_0x80B21B00/func_80B226AC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Hakurock_0x80B21B00/func_80B22750.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Hakurock_0x80B21B00/func_80B22750.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Hakurock_0x80B21B00/EnHakurock_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Hakurock_0x80B21B00/EnHakurock_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Hakurock_0x80B21B00/func_80B228F4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Hakurock_0x80B21B00/func_80B228F4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Hakurock_0x80B21B00/func_80B229A4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Hakurock_0x80B21B00/func_80B229A4.asm") diff --git a/src/overlays/actors/ovl_En_Hanabi/z_en_hanabi.c b/src/overlays/actors/ovl_En_Hanabi/z_en_hanabi.c index 0a60691927..89f80a5319 100644 --- a/src/overlays/actors/ovl_En_Hanabi/z_en_hanabi.c +++ b/src/overlays/actors/ovl_En_Hanabi/z_en_hanabi.c @@ -22,36 +22,36 @@ const ActorInit En_Hanabi_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Hanabi_0x80B22C00/func_80B22C00.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Hanabi_0x80B22C00/func_80B22C00.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Hanabi_0x80B22C00/func_80B22C2C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Hanabi_0x80B22C00/func_80B22C2C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Hanabi_0x80B22C00/func_80B22C80.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Hanabi_0x80B22C00/func_80B22C80.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Hanabi_0x80B22C00/func_80B22E0C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Hanabi_0x80B22C00/func_80B22E0C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Hanabi_0x80B22C00/func_80B22F34.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Hanabi_0x80B22C00/func_80B22F34.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Hanabi_0x80B22C00/func_80B22FA8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Hanabi_0x80B22C00/func_80B22FA8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Hanabi_0x80B22C00/EnHanabi_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Hanabi_0x80B22C00/EnHanabi_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Hanabi_0x80B22C00/EnHanabi_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Hanabi_0x80B22C00/EnHanabi_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Hanabi_0x80B22C00/func_80B234C8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Hanabi_0x80B22C00/func_80B234C8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Hanabi_0x80B22C00/func_80B235CC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Hanabi_0x80B22C00/func_80B235CC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Hanabi_0x80B22C00/func_80B236C8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Hanabi_0x80B22C00/func_80B236C8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Hanabi_0x80B22C00/func_80B23894.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Hanabi_0x80B22C00/func_80B23894.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Hanabi_0x80B22C00/func_80B238D4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Hanabi_0x80B22C00/func_80B238D4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Hanabi_0x80B22C00/func_80B23910.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Hanabi_0x80B22C00/func_80B23910.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Hanabi_0x80B22C00/func_80B23934.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Hanabi_0x80B22C00/func_80B23934.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Hanabi_0x80B22C00/EnHanabi_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Hanabi_0x80B22C00/EnHanabi_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Hanabi_0x80B22C00/func_80B23A38.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Hanabi_0x80B22C00/func_80B23A38.asm") 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 3c1aea60f6..286a131db7 100644 --- a/src/overlays/actors/ovl_En_Hata/z_en_hata.c +++ b/src/overlays/actors/ovl_En_Hata/z_en_hata.c @@ -23,12 +23,12 @@ const ActorInit En_Hata_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Hata_0x8089E8E0/EnHata_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Hata_0x8089E8E0/EnHata_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Hata_0x8089E8E0/EnHata_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Hata_0x8089E8E0/EnHata_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Hata_0x8089E8E0/EnHata_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Hata_0x8089E8E0/EnHata_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Hata_0x8089E8E0/func_8089EC68.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Hata_0x8089E8E0/func_8089EC68.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Hata_0x8089E8E0/EnHata_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Hata_0x8089E8E0/EnHata_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Heishi/z_en_heishi.c b/src/overlays/actors/ovl_En_Heishi/z_en_heishi.c index 1b2d316250..050ecc5680 100644 --- a/src/overlays/actors/ovl_En_Heishi/z_en_heishi.c +++ b/src/overlays/actors/ovl_En_Heishi/z_en_heishi.c @@ -23,20 +23,20 @@ const ActorInit En_Heishi_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Heishi_0x80BE8F20/EnHeishi_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Heishi_0x80BE8F20/EnHeishi_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Heishi_0x80BE8F20/EnHeishi_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Heishi_0x80BE8F20/EnHeishi_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Heishi_0x80BE8F20/func_80BE90BC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Heishi_0x80BE8F20/func_80BE90BC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Heishi_0x80BE8F20/func_80BE9148.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Heishi_0x80BE8F20/func_80BE9148.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Heishi_0x80BE8F20/func_80BE91DC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Heishi_0x80BE8F20/func_80BE91DC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Heishi_0x80BE8F20/func_80BE9214.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Heishi_0x80BE8F20/func_80BE9214.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Heishi_0x80BE8F20/EnHeishi_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Heishi_0x80BE8F20/EnHeishi_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Heishi_0x80BE8F20/func_80BE9380.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Heishi_0x80BE8F20/func_80BE9380.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Heishi_0x80BE8F20/EnHeishi_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Heishi_0x80BE8F20/EnHeishi_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Hg/z_en_hg.c b/src/overlays/actors/ovl_En_Hg/z_en_hg.c index 43971092cf..a6be4d0a03 100644 --- a/src/overlays/actors/ovl_En_Hg/z_en_hg.c +++ b/src/overlays/actors/ovl_En_Hg/z_en_hg.c @@ -23,46 +23,46 @@ const ActorInit En_Hg_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Hg_0x80BCF1D0/EnHg_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Hg_0x80BCF1D0/EnHg_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Hg_0x80BCF1D0/EnHg_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Hg_0x80BCF1D0/EnHg_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Hg_0x80BCF1D0/func_80BCF354.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Hg_0x80BCF1D0/func_80BCF354.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Hg_0x80BCF1D0/func_80BCF398.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Hg_0x80BCF1D0/func_80BCF398.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Hg_0x80BCF1D0/func_80BCF468.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Hg_0x80BCF1D0/func_80BCF468.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Hg_0x80BCF1D0/func_80BCF4AC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Hg_0x80BCF1D0/func_80BCF4AC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Hg_0x80BCF1D0/func_80BCF5F0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Hg_0x80BCF1D0/func_80BCF5F0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Hg_0x80BCF1D0/func_80BCF634.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Hg_0x80BCF1D0/func_80BCF634.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Hg_0x80BCF1D0/func_80BCF68C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Hg_0x80BCF1D0/func_80BCF68C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Hg_0x80BCF1D0/func_80BCF6D0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Hg_0x80BCF1D0/func_80BCF6D0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Hg_0x80BCF1D0/func_80BCF710.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Hg_0x80BCF1D0/func_80BCF710.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Hg_0x80BCF1D0/func_80BCF778.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Hg_0x80BCF1D0/func_80BCF778.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Hg_0x80BCF1D0/func_80BCF7D8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Hg_0x80BCF1D0/func_80BCF7D8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Hg_0x80BCF1D0/func_80BCF88C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Hg_0x80BCF1D0/func_80BCF88C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Hg_0x80BCF1D0/func_80BCF8A0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Hg_0x80BCF1D0/func_80BCF8A0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Hg_0x80BCF1D0/func_80BCF93C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Hg_0x80BCF1D0/func_80BCF93C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Hg_0x80BCF1D0/func_80BCF95C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Hg_0x80BCF1D0/func_80BCF95C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Hg_0x80BCF1D0/func_80BCFC0C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Hg_0x80BCF1D0/func_80BCFC0C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Hg_0x80BCF1D0/EnHg_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Hg_0x80BCF1D0/EnHg_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Hg_0x80BCF1D0/func_80BCFE54.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Hg_0x80BCF1D0/func_80BCFE54.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Hg_0x80BCF1D0/func_80BCFE70.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Hg_0x80BCF1D0/func_80BCFE70.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Hg_0x80BCF1D0/EnHg_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Hg_0x80BCF1D0/EnHg_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Hgo/z_en_hgo.c b/src/overlays/actors/ovl_En_Hgo/z_en_hgo.c index 647e5ac1ad..f133a864d1 100644 --- a/src/overlays/actors/ovl_En_Hgo/z_en_hgo.c +++ b/src/overlays/actors/ovl_En_Hgo/z_en_hgo.c @@ -23,36 +23,36 @@ const ActorInit En_Hgo_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Hgo_0x80BD02B0/EnHgo_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Hgo_0x80BD02B0/EnHgo_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Hgo_0x80BD02B0/EnHgo_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Hgo_0x80BD02B0/EnHgo_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Hgo_0x80BD02B0/func_80BD03EC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Hgo_0x80BD02B0/func_80BD03EC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Hgo_0x80BD02B0/func_80BD0410.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Hgo_0x80BD02B0/func_80BD0410.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Hgo_0x80BD02B0/func_80BD0420.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Hgo_0x80BD02B0/func_80BD0420.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Hgo_0x80BD02B0/func_80BD0434.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Hgo_0x80BD02B0/func_80BD0434.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Hgo_0x80BD02B0/func_80BD049C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Hgo_0x80BD02B0/func_80BD049C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Hgo_0x80BD02B0/func_80BD04E0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Hgo_0x80BD02B0/func_80BD04E0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Hgo_0x80BD02B0/func_80BD064C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Hgo_0x80BD02B0/func_80BD064C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Hgo_0x80BD02B0/func_80BD0660.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Hgo_0x80BD02B0/func_80BD0660.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Hgo_0x80BD02B0/func_80BD06FC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Hgo_0x80BD02B0/func_80BD06FC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Hgo_0x80BD02B0/func_80BD0898.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Hgo_0x80BD02B0/func_80BD0898.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Hgo_0x80BD02B0/func_80BD0B8C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Hgo_0x80BD02B0/func_80BD0B8C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Hgo_0x80BD02B0/EnHgo_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Hgo_0x80BD02B0/EnHgo_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Hgo_0x80BD02B0/func_80BD0CF0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Hgo_0x80BD02B0/func_80BD0CF0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Hgo_0x80BD02B0/func_80BD0D38.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Hgo_0x80BD02B0/func_80BD0D38.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Hgo_0x80BD02B0/EnHgo_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Hgo_0x80BD02B0/EnHgo_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Hidden_Nuts/z_en_hidden_nuts.c b/src/overlays/actors/ovl_En_Hidden_Nuts/z_en_hidden_nuts.c index d402ccae0c..8fe2bce87f 100644 --- a/src/overlays/actors/ovl_En_Hidden_Nuts/z_en_hidden_nuts.c +++ b/src/overlays/actors/ovl_En_Hidden_Nuts/z_en_hidden_nuts.c @@ -23,38 +23,38 @@ const ActorInit En_Hidden_Nuts_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Hidden_Nuts_0x80BDB040/EnHiddenNuts_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Hidden_Nuts_0x80BDB040/EnHiddenNuts_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Hidden_Nuts_0x80BDB040/EnHiddenNuts_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Hidden_Nuts_0x80BDB040/EnHiddenNuts_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Hidden_Nuts_0x80BDB040/func_80BDB1B4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Hidden_Nuts_0x80BDB040/func_80BDB1B4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Hidden_Nuts_0x80BDB040/func_80BDB268.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Hidden_Nuts_0x80BDB040/func_80BDB268.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Hidden_Nuts_0x80BDB040/func_80BDB2B8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Hidden_Nuts_0x80BDB040/func_80BDB2B8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Hidden_Nuts_0x80BDB040/func_80BDB580.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Hidden_Nuts_0x80BDB040/func_80BDB580.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Hidden_Nuts_0x80BDB040/func_80BDB59C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Hidden_Nuts_0x80BDB040/func_80BDB59C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Hidden_Nuts_0x80BDB040/func_80BDB788.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Hidden_Nuts_0x80BDB040/func_80BDB788.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Hidden_Nuts_0x80BDB040/func_80BDB7E8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Hidden_Nuts_0x80BDB040/func_80BDB7E8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Hidden_Nuts_0x80BDB040/func_80BDB8F4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Hidden_Nuts_0x80BDB040/func_80BDB8F4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Hidden_Nuts_0x80BDB040/func_80BDB930.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Hidden_Nuts_0x80BDB040/func_80BDB930.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Hidden_Nuts_0x80BDB040/func_80BDB978.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Hidden_Nuts_0x80BDB040/func_80BDB978.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Hidden_Nuts_0x80BDB040/func_80BDBA28.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Hidden_Nuts_0x80BDB040/func_80BDBA28.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Hidden_Nuts_0x80BDB040/func_80BDBB48.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Hidden_Nuts_0x80BDB040/func_80BDBB48.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Hidden_Nuts_0x80BDB040/func_80BDBE70.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Hidden_Nuts_0x80BDB040/func_80BDBE70.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Hidden_Nuts_0x80BDB040/func_80BDBED4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Hidden_Nuts_0x80BDB040/func_80BDBED4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Hidden_Nuts_0x80BDB040/EnHiddenNuts_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Hidden_Nuts_0x80BDB040/EnHiddenNuts_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Hidden_Nuts_0x80BDB040/EnHiddenNuts_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Hidden_Nuts_0x80BDB040/EnHiddenNuts_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Hint_Skb/z_en_hint_skb.c b/src/overlays/actors/ovl_En_Hint_Skb/z_en_hint_skb.c index 9b1ecd4bac..2f1350f36b 100644 --- a/src/overlays/actors/ovl_En_Hint_Skb/z_en_hint_skb.c +++ b/src/overlays/actors/ovl_En_Hint_Skb/z_en_hint_skb.c @@ -23,78 +23,78 @@ const ActorInit En_Hint_Skb_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Hint_Skb_0x80C1FCF0/EnHintSkb_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Hint_Skb_0x80C1FCF0/EnHintSkb_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Hint_Skb_0x80C1FCF0/EnHintSkb_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Hint_Skb_0x80C1FCF0/EnHintSkb_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Hint_Skb_0x80C1FCF0/func_80C1FE0C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Hint_Skb_0x80C1FCF0/func_80C1FE0C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Hint_Skb_0x80C1FCF0/func_80C1FE20.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Hint_Skb_0x80C1FCF0/func_80C1FE20.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Hint_Skb_0x80C1FCF0/func_80C1FE30.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Hint_Skb_0x80C1FCF0/func_80C1FE30.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Hint_Skb_0x80C1FCF0/func_80C1FE80.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Hint_Skb_0x80C1FCF0/func_80C1FE80.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Hint_Skb_0x80C1FCF0/func_80C1FF30.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Hint_Skb_0x80C1FCF0/func_80C1FF30.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Hint_Skb_0x80C1FCF0/func_80C1FF88.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Hint_Skb_0x80C1FCF0/func_80C1FF88.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Hint_Skb_0x80C1FCF0/func_80C2003C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Hint_Skb_0x80C1FCF0/func_80C2003C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Hint_Skb_0x80C1FCF0/func_80C200B8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Hint_Skb_0x80C1FCF0/func_80C200B8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Hint_Skb_0x80C1FCF0/func_80C2011C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Hint_Skb_0x80C1FCF0/func_80C2011C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Hint_Skb_0x80C1FCF0/func_80C2016C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Hint_Skb_0x80C1FCF0/func_80C2016C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Hint_Skb_0x80C1FCF0/func_80C20274.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Hint_Skb_0x80C1FCF0/func_80C20274.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Hint_Skb_0x80C1FCF0/func_80C20334.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Hint_Skb_0x80C1FCF0/func_80C20334.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Hint_Skb_0x80C1FCF0/func_80C20484.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Hint_Skb_0x80C1FCF0/func_80C20484.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Hint_Skb_0x80C1FCF0/func_80C204F0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Hint_Skb_0x80C1FCF0/func_80C204F0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Hint_Skb_0x80C1FCF0/func_80C20540.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Hint_Skb_0x80C1FCF0/func_80C20540.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Hint_Skb_0x80C1FCF0/func_80C20590.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Hint_Skb_0x80C1FCF0/func_80C20590.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Hint_Skb_0x80C1FCF0/func_80C2066C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Hint_Skb_0x80C1FCF0/func_80C2066C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Hint_Skb_0x80C1FCF0/func_80C2069C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Hint_Skb_0x80C1FCF0/func_80C2069C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Hint_Skb_0x80C1FCF0/func_80C2075C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Hint_Skb_0x80C1FCF0/func_80C2075C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Hint_Skb_0x80C1FCF0/func_80C2077C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Hint_Skb_0x80C1FCF0/func_80C2077C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Hint_Skb_0x80C1FCF0/func_80C208BC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Hint_Skb_0x80C1FCF0/func_80C208BC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Hint_Skb_0x80C1FCF0/func_80C208D0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Hint_Skb_0x80C1FCF0/func_80C208D0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Hint_Skb_0x80C1FCF0/func_80C20A74.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Hint_Skb_0x80C1FCF0/func_80C20A74.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Hint_Skb_0x80C1FCF0/func_80C20B88.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Hint_Skb_0x80C1FCF0/func_80C20B88.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Hint_Skb_0x80C1FCF0/func_80C20C24.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Hint_Skb_0x80C1FCF0/func_80C20C24.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Hint_Skb_0x80C1FCF0/func_80C20D64.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Hint_Skb_0x80C1FCF0/func_80C20D64.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Hint_Skb_0x80C1FCF0/func_80C20E90.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Hint_Skb_0x80C1FCF0/func_80C20E90.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Hint_Skb_0x80C1FCF0/func_80C21250.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Hint_Skb_0x80C1FCF0/func_80C21250.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Hint_Skb_0x80C1FCF0/func_80C21320.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Hint_Skb_0x80C1FCF0/func_80C21320.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Hint_Skb_0x80C1FCF0/func_80C21414.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Hint_Skb_0x80C1FCF0/func_80C21414.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Hint_Skb_0x80C1FCF0/func_80C21468.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Hint_Skb_0x80C1FCF0/func_80C21468.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Hint_Skb_0x80C1FCF0/func_80C215E4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Hint_Skb_0x80C1FCF0/func_80C215E4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Hint_Skb_0x80C1FCF0/EnHintSkb_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Hint_Skb_0x80C1FCF0/EnHintSkb_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Hint_Skb_0x80C1FCF0/func_80C21858.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Hint_Skb_0x80C1FCF0/func_80C21858.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Hint_Skb_0x80C1FCF0/func_80C219D4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Hint_Skb_0x80C1FCF0/func_80C219D4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Hint_Skb_0x80C1FCF0/EnHintSkb_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Hint_Skb_0x80C1FCF0/EnHintSkb_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Hit_Tag/z_en_hit_tag.c b/src/overlays/actors/ovl_En_Hit_Tag/z_en_hit_tag.c index 881c87b35e..bfa50f71a7 100644 --- a/src/overlays/actors/ovl_En_Hit_Tag/z_en_hit_tag.c +++ b/src/overlays/actors/ovl_En_Hit_Tag/z_en_hit_tag.c @@ -22,10 +22,10 @@ const ActorInit En_Hit_Tag_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Hit_Tag_0x80BE2030/EnHitTag_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Hit_Tag_0x80BE2030/EnHitTag_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Hit_Tag_0x80BE2030/EnHitTag_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Hit_Tag_0x80BE2030/EnHitTag_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Hit_Tag_0x80BE2030/func_80BE20E8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Hit_Tag_0x80BE2030/func_80BE20E8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Hit_Tag_0x80BE2030/EnHitTag_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Hit_Tag_0x80BE2030/EnHitTag_Update.asm") 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 bb3e22b504..d6aecaf4a6 100644 --- a/src/overlays/actors/ovl_En_Holl/z_en_holl.c +++ b/src/overlays/actors/ovl_En_Holl/z_en_holl.c @@ -23,26 +23,26 @@ const ActorInit En_Holl_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Holl_0x80899960/func_80899960.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Holl_0x80899960/func_80899960.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Holl_0x80899960/func_808999B0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Holl_0x80899960/func_808999B0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Holl_0x80899960/EnHoll_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Holl_0x80899960/EnHoll_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Holl_0x80899960/EnHoll_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Holl_0x80899960/EnHoll_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Holl_0x80899960/func_80899ACC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Holl_0x80899960/func_80899ACC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Holl_0x80899960/func_80899B88.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Holl_0x80899960/func_80899B88.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Holl_0x80899960/func_80899F30.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Holl_0x80899960/func_80899F30.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Holl_0x80899960/func_8089A0C0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Holl_0x80899960/func_8089A0C0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Holl_0x80899960/func_8089A238.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Holl_0x80899960/func_8089A238.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Holl_0x80899960/func_8089A330.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Holl_0x80899960/func_8089A330.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Holl_0x80899960/EnHoll_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Holl_0x80899960/EnHoll_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Holl_0x80899960/EnHoll_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Holl_0x80899960/EnHoll_Draw.asm") 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 f0739f4a33..1ad212a69a 100644 --- a/src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.c +++ b/src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.c @@ -23,84 +23,84 @@ const ActorInit En_Honotrap_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Honotrap_0x8092E510/func_8092E510.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Honotrap_0x8092E510/func_8092E510.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Honotrap_0x8092E510/func_8092E5A4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Honotrap_0x8092E510/func_8092E5A4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Honotrap_0x8092E510/func_8092E638.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Honotrap_0x8092E510/func_8092E638.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Honotrap_0x8092E510/func_8092E840.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Honotrap_0x8092E510/func_8092E840.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Honotrap_0x8092E510/func_8092E988.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Honotrap_0x8092E510/func_8092E988.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Honotrap_0x8092E510/EnHonotrap_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Honotrap_0x8092E510/EnHonotrap_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Honotrap_0x8092E510/EnHonotrap_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Honotrap_0x8092E510/EnHonotrap_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Honotrap_0x8092E510/func_8092EBC0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Honotrap_0x8092E510/func_8092EBC0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Honotrap_0x8092E510/func_8092EBDC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Honotrap_0x8092E510/func_8092EBDC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Honotrap_0x8092E510/func_8092EC9C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Honotrap_0x8092E510/func_8092EC9C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Honotrap_0x8092E510/func_8092ECF0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Honotrap_0x8092E510/func_8092ECF0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Honotrap_0x8092E510/func_8092EDC0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Honotrap_0x8092E510/func_8092EDC0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Honotrap_0x8092E510/func_8092EDD8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Honotrap_0x8092E510/func_8092EDD8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Honotrap_0x8092E510/func_8092EE08.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Honotrap_0x8092E510/func_8092EE08.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Honotrap_0x8092E510/func_8092EE1C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Honotrap_0x8092E510/func_8092EE1C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Honotrap_0x8092E510/func_8092EE68.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Honotrap_0x8092E510/func_8092EE68.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Honotrap_0x8092E510/func_8092EE90.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Honotrap_0x8092E510/func_8092EE90.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Honotrap_0x8092E510/func_8092EF3C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Honotrap_0x8092E510/func_8092EF3C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Honotrap_0x8092E510/func_8092EF98.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Honotrap_0x8092E510/func_8092EF98.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Honotrap_0x8092E510/func_8092F05C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Honotrap_0x8092E510/func_8092F05C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Honotrap_0x8092E510/func_8092F074.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Honotrap_0x8092E510/func_8092F074.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Honotrap_0x8092E510/func_8092F0A4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Honotrap_0x8092E510/func_8092F0A4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Honotrap_0x8092E510/func_8092F0B8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Honotrap_0x8092E510/func_8092F0B8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Honotrap_0x8092E510/func_8092F0F8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Honotrap_0x8092E510/func_8092F0F8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Honotrap_0x8092E510/func_8092F10C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Honotrap_0x8092E510/func_8092F10C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Honotrap_0x8092E510/func_8092F1A0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Honotrap_0x8092E510/func_8092F1A0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Honotrap_0x8092E510/func_8092F208.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Honotrap_0x8092E510/func_8092F208.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Honotrap_0x8092E510/func_8092F34C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Honotrap_0x8092E510/func_8092F34C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Honotrap_0x8092E510/func_8092F3D8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Honotrap_0x8092E510/func_8092F3D8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Honotrap_0x8092E510/func_8092F5AC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Honotrap_0x8092E510/func_8092F5AC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Honotrap_0x8092E510/func_8092F5EC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Honotrap_0x8092E510/func_8092F5EC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Honotrap_0x8092E510/func_8092F7A8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Honotrap_0x8092E510/func_8092F7A8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Honotrap_0x8092E510/func_8092F7BC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Honotrap_0x8092E510/func_8092F7BC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Honotrap_0x8092E510/func_8092F854.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Honotrap_0x8092E510/func_8092F854.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Honotrap_0x8092E510/func_8092F878.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Honotrap_0x8092E510/func_8092F878.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Honotrap_0x8092E510/EnHonotrap_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Honotrap_0x8092E510/EnHonotrap_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Honotrap_0x8092E510/func_8092FE44.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Honotrap_0x8092E510/func_8092FE44.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Honotrap_0x8092E510/func_8092FEFC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Honotrap_0x8092E510/func_8092FEFC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Honotrap_0x8092E510/EnHonotrap_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Honotrap_0x8092E510/EnHonotrap_Draw.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Honotrap_0x8092E510/func_80930030.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Honotrap_0x8092E510/func_80930030.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Honotrap_0x8092E510/func_80930190.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Honotrap_0x8092E510/func_80930190.asm") 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 61b2061a04..2d6b5877b0 100644 --- a/src/overlays/actors/ovl_En_Horse/z_en_horse.c +++ b/src/overlays/actors/ovl_En_Horse/z_en_horse.c @@ -23,316 +23,316 @@ const ActorInit En_Horse_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_8087B730.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_0x8087B730/func_8087B730.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_8087B784.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_0x8087B730/func_8087B784.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_8087B7C0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_0x8087B730/func_8087B7C0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_8087C0AC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_0x8087B730/func_8087C0AC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_8087C178.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_0x8087B730/func_8087C178.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_8087C1C0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_0x8087B730/func_8087C1C0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_8087C208.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_0x8087B730/func_8087C208.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_8087C288.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_0x8087B730/func_8087C288.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_8087C2B8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_0x8087B730/func_8087C2B8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_8087C38C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_0x8087B730/func_8087C38C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_8087C43C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_0x8087B730/func_8087C43C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_8087C590.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_0x8087B730/func_8087C590.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_8087C8B8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_0x8087B730/func_8087C8B8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_8087C8D0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_0x8087B730/func_8087C8D0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_8087C8E0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_0x8087B730/func_8087C8E0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_8087C9D4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_0x8087B730/func_8087C9D4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_8087C9EC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_0x8087B730/func_8087C9EC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_8087C9F8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_0x8087B730/func_8087C9F8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_8087CA04.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_0x8087B730/func_8087CA04.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/EnHorse_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_0x8087B730/EnHorse_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_8087D540.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_0x8087B730/func_8087D540.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/EnHorse_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_0x8087B730/EnHorse_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_8087D70C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_0x8087B730/func_8087D70C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_8087D75C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_0x8087B730/func_8087D75C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_8087D814.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_0x8087B730/func_8087D814.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_8087D988.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_0x8087B730/func_8087D988.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_8087DDEC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_0x8087B730/func_8087DDEC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_8087DE28.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_0x8087B730/func_8087DE28.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_8087DF64.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_0x8087B730/func_8087DF64.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_8087E080.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_0x8087B730/func_8087E080.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_8087E0A4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_0x8087B730/func_8087E0A4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_8087E18C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_0x8087B730/func_8087E18C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_8087E2A8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_0x8087B730/func_8087E2A8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_8087E350.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_0x8087B730/func_8087E350.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_8087E564.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_0x8087B730/func_8087E564.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_8087E5B4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_0x8087B730/func_8087E5B4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_8087E5D8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_0x8087B730/func_8087E5D8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_8087E684.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_0x8087B730/func_8087E684.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_8087E6D8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_0x8087B730/func_8087E6D8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_8087E92C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_0x8087B730/func_8087E92C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_8087E9D0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_0x8087B730/func_8087E9D0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_8087EA1C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_0x8087B730/func_8087EA1C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_8087EB54.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_0x8087B730/func_8087EB54.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_8087EB78.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_0x8087B730/func_8087EB78.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_8087EC20.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_0x8087B730/func_8087EC20.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_8087EC78.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_0x8087B730/func_8087EC78.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_8087ED10.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_0x8087B730/func_8087ED10.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_8087EEC4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_0x8087B730/func_8087EEC4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_8087F078.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_0x8087B730/func_8087F078.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_8087F1FC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_0x8087B730/func_8087F1FC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_8087F39C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_0x8087B730/func_8087F39C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_8087F590.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_0x8087B730/func_8087F590.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_8087F5B4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_0x8087B730/func_8087F5B4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_8087F658.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_0x8087B730/func_8087F658.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_8087F9A0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_0x8087B730/func_8087F9A0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_8087F9C4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_0x8087B730/func_8087F9C4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_8087FB08.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_0x8087B730/func_8087FB08.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_8087FB14.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_0x8087B730/func_8087FB14.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_8087FD94.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_0x8087B730/func_8087FD94.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_8087FDB8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_0x8087B730/func_8087FDB8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_8087FF08.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_0x8087B730/func_8087FF08.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_8087FF14.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_0x8087B730/func_8087FF14.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_808801A8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_0x8087B730/func_808801A8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_808801F8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_0x8087B730/func_808801F8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_808802D0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_0x8087B730/func_808802D0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_808804A4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_0x8087B730/func_808804A4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_808804CC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_0x8087B730/func_808804CC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_80880500.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_0x8087B730/func_80880500.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_80880534.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_0x8087B730/func_80880534.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_808806DC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_0x8087B730/func_808806DC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_80880844.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_0x8087B730/func_80880844.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_80880978.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_0x8087B730/func_80880978.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_80880D50.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_0x8087B730/func_80880D50.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_80880DA8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_0x8087B730/func_80880DA8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_80880E00.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_0x8087B730/func_80880E00.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_80881128.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_0x8087B730/func_80881128.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_8088126C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_0x8087B730/func_8088126C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_80881290.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_0x8087B730/func_80881290.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_80881398.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_0x8087B730/func_80881398.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_8088159C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_0x8087B730/func_8088159C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_80881634.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_0x8087B730/func_80881634.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_8088168C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_0x8087B730/func_8088168C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_808819D8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_0x8087B730/func_808819D8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_80881BDC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_0x8087B730/func_80881BDC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_80881C54.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_0x8087B730/func_80881C54.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_80881DA4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_0x8087B730/func_80881DA4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_80881DC8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_0x8087B730/func_80881DC8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_80881F10.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_0x8087B730/func_80881F10.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_80881F48.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_0x8087B730/func_80881F48.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_808821C8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_0x8087B730/func_808821C8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_808822CC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_0x8087B730/func_808822CC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_8088247C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_0x8087B730/func_8088247C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_80882564.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_0x8087B730/func_80882564.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_808826B4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_0x8087B730/func_808826B4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_80882820.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_0x8087B730/func_80882820.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_808829D0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_0x8087B730/func_808829D0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_808829F4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_0x8087B730/func_808829F4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_80882A44.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_0x8087B730/func_80882A44.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_80882B9C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_0x8087B730/func_80882B9C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_80882D8C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_0x8087B730/func_80882D8C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_80882DC0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_0x8087B730/func_80882DC0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_80883104.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_0x8087B730/func_80883104.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_80883308.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_0x8087B730/func_80883308.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_80883B70.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_0x8087B730/func_80883B70.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_80883BEC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_0x8087B730/func_80883BEC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_80883CB0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_0x8087B730/func_80883CB0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_80883D64.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_0x8087B730/func_80883D64.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_80883DE0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_0x8087B730/func_80883DE0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_80883E10.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_0x8087B730/func_80883E10.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_80883EA0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_0x8087B730/func_80883EA0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_80883F18.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_0x8087B730/func_80883F18.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_80883F98.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_0x8087B730/func_80883F98.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_80884010.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_0x8087B730/func_80884010.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_808840C4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_0x8087B730/func_808840C4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_80884194.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_0x8087B730/func_80884194.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_8088424C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_0x8087B730/func_8088424C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_80884314.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_0x8087B730/func_80884314.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_808843B4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_0x8087B730/func_808843B4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_80884444.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_0x8087B730/func_80884444.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_808844E0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_0x8087B730/func_808844E0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_80884564.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_0x8087B730/func_80884564.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_80884604.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_0x8087B730/func_80884604.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_808846B4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_0x8087B730/func_808846B4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_808846DC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_0x8087B730/func_808846DC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_808846F0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_0x8087B730/func_808846F0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_80884718.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_0x8087B730/func_80884718.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_80884868.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_0x8087B730/func_80884868.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_808848C8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_0x8087B730/func_808848C8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_80884994.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_0x8087B730/func_80884994.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_80884A40.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_0x8087B730/func_80884A40.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_80884D04.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_0x8087B730/func_80884D04.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_80884E0C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_0x8087B730/func_80884E0C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_80885060.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_0x8087B730/func_80885060.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_808850DC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_0x8087B730/func_808850DC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_80885220.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_0x8087B730/func_80885220.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_808853E0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_0x8087B730/func_808853E0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_8088598C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_0x8087B730/func_8088598C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_80885A80.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_0x8087B730/func_80885A80.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_80885AF4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_0x8087B730/func_80885AF4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_80885B4C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_0x8087B730/func_80885B4C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_80885C90.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_0x8087B730/func_80885C90.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_80885DA4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_0x8087B730/func_80885DA4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_80886C00.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_0x8087B730/func_80886C00.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_80886DC4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_0x8087B730/func_80886DC4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_80886FA8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_0x8087B730/func_80886FA8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_808870A4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_0x8087B730/func_808870A4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_808871A0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_0x8087B730/func_808871A0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_80887270.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_0x8087B730/func_80887270.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/EnHorse_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_0x8087B730/EnHorse_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_80887D20.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_0x8087B730/func_80887D20.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_80887D60.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_0x8087B730/func_80887D60.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_80887E64.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_0x8087B730/func_80887E64.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_80887EBC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_0x8087B730/func_80887EBC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_80887F58.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_0x8087B730/func_80887F58.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_80888C48.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_0x8087B730/func_80888C48.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_80888D18.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_0x8087B730/func_80888D18.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/EnHorse_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_0x8087B730/EnHorse_Draw.asm") 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 67590eaa71..92c1a9f549 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 @@ -23,48 +23,48 @@ const ActorInit En_Horse_Game_Check_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_Game_Check_0x808F8AA0/func_808F8AA0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_Game_Check_0x808F8AA0/func_808F8AA0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_Game_Check_0x808F8AA0/func_808F8C24.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_Game_Check_0x808F8AA0/func_808F8C24.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_Game_Check_0x808F8AA0/func_808F8C5C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_Game_Check_0x808F8AA0/func_808F8C5C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_Game_Check_0x808F8AA0/func_808F8C70.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_Game_Check_0x808F8AA0/func_808F8C70.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_Game_Check_0x808F8AA0/func_808F8CCC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_Game_Check_0x808F8AA0/func_808F8CCC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_Game_Check_0x808F8AA0/func_808F8E94.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_Game_Check_0x808F8AA0/func_808F8E94.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_Game_Check_0x808F8AA0/func_808F8EB0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_Game_Check_0x808F8AA0/func_808F8EB0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_Game_Check_0x808F8AA0/func_808F8FAC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_Game_Check_0x808F8AA0/func_808F8FAC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_Game_Check_0x808F8AA0/func_808F96E4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_Game_Check_0x808F8AA0/func_808F96E4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_Game_Check_0x808F8AA0/func_808F9830.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_Game_Check_0x808F8AA0/func_808F9830.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_Game_Check_0x808F8AA0/func_808F9868.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_Game_Check_0x808F8AA0/func_808F9868.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_Game_Check_0x808F8AA0/func_808F987C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_Game_Check_0x808F8AA0/func_808F987C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_Game_Check_0x808F8AA0/func_808F990C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_Game_Check_0x808F8AA0/func_808F990C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_Game_Check_0x808F8AA0/func_808F9944.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_Game_Check_0x808F8AA0/func_808F9944.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_Game_Check_0x808F8AA0/func_808F9958.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_Game_Check_0x808F8AA0/func_808F9958.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_Game_Check_0x808F8AA0/func_808F999C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_Game_Check_0x808F8AA0/func_808F999C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_Game_Check_0x808F8AA0/func_808F99B0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_Game_Check_0x808F8AA0/func_808F99B0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_Game_Check_0x808F8AA0/func_808F99C4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_Game_Check_0x808F8AA0/func_808F99C4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_Game_Check_0x808F8AA0/func_808F99D8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_Game_Check_0x808F8AA0/func_808F99D8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_Game_Check_0x808F8AA0/EnHorseGameCheck_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_Game_Check_0x808F8AA0/EnHorseGameCheck_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_Game_Check_0x808F8AA0/EnHorseGameCheck_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_Game_Check_0x808F8AA0/EnHorseGameCheck_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_Game_Check_0x808F8AA0/EnHorseGameCheck_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_Game_Check_0x808F8AA0/EnHorseGameCheck_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_Game_Check_0x808F8AA0/EnHorseGameCheck_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_Game_Check_0x808F8AA0/EnHorseGameCheck_Draw.asm") 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 ce6eb9fbb1..ce5d666bbe 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 @@ -23,46 +23,46 @@ const ActorInit En_Horse_Link_Child_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_Link_Child_0x808DE5C0/func_808DE5C0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_Link_Child_0x808DE5C0/func_808DE5C0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_Link_Child_0x808DE5C0/func_808DE660.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_Link_Child_0x808DE5C0/func_808DE660.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_Link_Child_0x808DE5C0/func_808DE728.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_Link_Child_0x808DE5C0/func_808DE728.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_Link_Child_0x808DE5C0/EnHorseLinkChild_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_Link_Child_0x808DE5C0/EnHorseLinkChild_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_Link_Child_0x808DE5C0/EnHorseLinkChild_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_Link_Child_0x808DE5C0/EnHorseLinkChild_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_Link_Child_0x808DE5C0/func_808DE9A8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_Link_Child_0x808DE5C0/func_808DE9A8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_Link_Child_0x808DE5C0/func_808DEA0C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_Link_Child_0x808DE5C0/func_808DEA0C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_Link_Child_0x808DE5C0/func_808DEA54.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_Link_Child_0x808DE5C0/func_808DEA54.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_Link_Child_0x808DE5C0/func_808DEB14.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_Link_Child_0x808DE5C0/func_808DEB14.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_Link_Child_0x808DE5C0/func_808DECA0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_Link_Child_0x808DE5C0/func_808DECA0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_Link_Child_0x808DE5C0/func_808DED40.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_Link_Child_0x808DE5C0/func_808DED40.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_Link_Child_0x808DE5C0/func_808DEFE8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_Link_Child_0x808DE5C0/func_808DEFE8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_Link_Child_0x808DE5C0/func_808DF088.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_Link_Child_0x808DE5C0/func_808DF088.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_Link_Child_0x808DE5C0/func_808DF194.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_Link_Child_0x808DE5C0/func_808DF194.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_Link_Child_0x808DE5C0/func_808DF560.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_Link_Child_0x808DE5C0/func_808DF560.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_Link_Child_0x808DE5C0/func_808DF620.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_Link_Child_0x808DE5C0/func_808DF620.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_Link_Child_0x808DE5C0/func_808DF788.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_Link_Child_0x808DE5C0/func_808DF788.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_Link_Child_0x808DE5C0/func_808DF838.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_Link_Child_0x808DE5C0/func_808DF838.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_Link_Child_0x808DE5C0/EnHorseLinkChild_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_Link_Child_0x808DE5C0/EnHorseLinkChild_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_Link_Child_0x808DE5C0/func_808DFC3C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_Link_Child_0x808DE5C0/func_808DFC3C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_Link_Child_0x808DE5C0/func_808DFDC8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_Link_Child_0x808DE5C0/func_808DFDC8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_Link_Child_0x808DE5C0/EnHorseLinkChild_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Horse_Link_Child_0x808DE5C0/EnHorseLinkChild_Draw.asm") 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 5ac09f45e6..46fe6de1de 100644 --- a/src/overlays/actors/ovl_En_Hs/z_en_hs.c +++ b/src/overlays/actors/ovl_En_Hs/z_en_hs.c @@ -23,38 +23,38 @@ const ActorInit En_Hs_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Hs_0x80952C50/func_80952C50.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Hs_0x80952C50/func_80952C50.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Hs_0x80952C50/EnHs_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Hs_0x80952C50/EnHs_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Hs_0x80952C50/EnHs_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Hs_0x80952C50/EnHs_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Hs_0x80952C50/func_80952DFC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Hs_0x80952C50/func_80952DFC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Hs_0x80952C50/func_80952E50.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Hs_0x80952C50/func_80952E50.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Hs_0x80952C50/func_80952F00.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Hs_0x80952C50/func_80952F00.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Hs_0x80952C50/func_80952FE0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Hs_0x80952C50/func_80952FE0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Hs_0x80952C50/func_80953098.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Hs_0x80952C50/func_80953098.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Hs_0x80952C50/func_80953180.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Hs_0x80952C50/func_80953180.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Hs_0x80952C50/func_809532C0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Hs_0x80952C50/func_809532C0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Hs_0x80952C50/func_809532D0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Hs_0x80952C50/func_809532D0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Hs_0x80952C50/func_80953354.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Hs_0x80952C50/func_80953354.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Hs_0x80952C50/func_809533A0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Hs_0x80952C50/func_809533A0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Hs_0x80952C50/func_8095345C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Hs_0x80952C50/func_8095345C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Hs_0x80952C50/EnHs_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Hs_0x80952C50/EnHs_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Hs_0x80952C50/func_8095376C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Hs_0x80952C50/func_8095376C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Hs_0x80952C50/func_80953848.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Hs_0x80952C50/func_80953848.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Hs_0x80952C50/EnHs_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Hs_0x80952C50/EnHs_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Ig/z_en_ig.c b/src/overlays/actors/ovl_En_Ig/z_en_ig.c index aeca18f5ea..dd34f58278 100644 --- a/src/overlays/actors/ovl_En_Ig/z_en_ig.c +++ b/src/overlays/actors/ovl_En_Ig/z_en_ig.c @@ -23,78 +23,78 @@ const ActorInit En_Ig_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ig_0x80BF1150/func_80BF1150.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ig_0x80BF1150/func_80BF1150.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ig_0x80BF1150/func_80BF1200.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ig_0x80BF1150/func_80BF1200.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ig_0x80BF1150/func_80BF1258.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ig_0x80BF1150/func_80BF1258.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ig_0x80BF1150/func_80BF1284.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ig_0x80BF1150/func_80BF1284.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ig_0x80BF1150/func_80BF1354.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ig_0x80BF1150/func_80BF1354.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ig_0x80BF1150/func_80BF13E4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ig_0x80BF1150/func_80BF13E4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ig_0x80BF1150/func_80BF146C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ig_0x80BF1150/func_80BF146C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ig_0x80BF1150/func_80BF14B0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ig_0x80BF1150/func_80BF14B0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ig_0x80BF1150/func_80BF15EC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ig_0x80BF1150/func_80BF15EC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ig_0x80BF1150/func_80BF16C8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ig_0x80BF1150/func_80BF16C8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ig_0x80BF1150/func_80BF1744.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ig_0x80BF1150/func_80BF1744.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ig_0x80BF1150/func_80BF17BC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ig_0x80BF1150/func_80BF17BC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ig_0x80BF1150/func_80BF1920.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ig_0x80BF1150/func_80BF1920.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ig_0x80BF1150/func_80BF19A0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ig_0x80BF1150/func_80BF19A0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ig_0x80BF1150/func_80BF1A60.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ig_0x80BF1150/func_80BF1A60.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ig_0x80BF1150/func_80BF1AE0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ig_0x80BF1150/func_80BF1AE0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ig_0x80BF1150/func_80BF1B40.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ig_0x80BF1150/func_80BF1B40.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ig_0x80BF1150/func_80BF1C44.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ig_0x80BF1150/func_80BF1C44.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ig_0x80BF1150/func_80BF1D78.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ig_0x80BF1150/func_80BF1D78.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ig_0x80BF1150/func_80BF1DF4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ig_0x80BF1150/func_80BF1DF4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ig_0x80BF1150/func_80BF1FA8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ig_0x80BF1150/func_80BF1FA8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ig_0x80BF1150/func_80BF219C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ig_0x80BF1150/func_80BF219C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ig_0x80BF1150/func_80BF2368.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ig_0x80BF1150/func_80BF2368.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ig_0x80BF1150/func_80BF2400.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ig_0x80BF1150/func_80BF2400.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ig_0x80BF1150/func_80BF2470.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ig_0x80BF1150/func_80BF2470.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ig_0x80BF1150/func_80BF25E8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ig_0x80BF1150/func_80BF25E8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ig_0x80BF1150/func_80BF2890.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ig_0x80BF1150/func_80BF2890.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ig_0x80BF1150/func_80BF293C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ig_0x80BF1150/func_80BF293C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ig_0x80BF1150/func_80BF2A50.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ig_0x80BF1150/func_80BF2A50.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ig_0x80BF1150/func_80BF2AF8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ig_0x80BF1150/func_80BF2AF8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ig_0x80BF1150/func_80BF2BD4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ig_0x80BF1150/func_80BF2BD4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ig_0x80BF1150/EnIg_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ig_0x80BF1150/EnIg_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ig_0x80BF1150/EnIg_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ig_0x80BF1150/EnIg_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ig_0x80BF1150/EnIg_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ig_0x80BF1150/EnIg_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ig_0x80BF1150/func_80BF2EDC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ig_0x80BF1150/func_80BF2EDC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ig_0x80BF1150/func_80BF2EFC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ig_0x80BF1150/func_80BF2EFC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ig_0x80BF1150/func_80BF302C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ig_0x80BF1150/func_80BF302C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ig_0x80BF1150/EnIg_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ig_0x80BF1150/EnIg_Draw.asm") 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 2bfbe1928c..d61193cdbe 100644 --- a/src/overlays/actors/ovl_En_Ik/z_en_ik.c +++ b/src/overlays/actors/ovl_En_Ik/z_en_ik.c @@ -23,84 +23,84 @@ const ActorInit En_Ik_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ik_0x80929910/EnIk_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ik_0x80929910/EnIk_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ik_0x80929910/EnIk_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ik_0x80929910/EnIk_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ik_0x80929910/func_80929AF8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ik_0x80929910/func_80929AF8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ik_0x80929910/func_80929B6C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ik_0x80929910/func_80929B6C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ik_0x80929910/func_80929BEC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ik_0x80929910/func_80929BEC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ik_0x80929910/func_80929C80.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ik_0x80929910/func_80929C80.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ik_0x80929910/func_80929D04.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ik_0x80929910/func_80929D04.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ik_0x80929910/func_80929E2C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ik_0x80929910/func_80929E2C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ik_0x80929910/func_80929E88.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ik_0x80929910/func_80929E88.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ik_0x80929910/func_80929F20.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ik_0x80929910/func_80929F20.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ik_0x80929910/func_80929FC8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ik_0x80929910/func_80929FC8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ik_0x80929910/func_8092A020.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ik_0x80929910/func_8092A020.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ik_0x80929910/func_8092A124.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ik_0x80929910/func_8092A124.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ik_0x80929910/func_8092A188.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ik_0x80929910/func_8092A188.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ik_0x80929910/func_8092A28C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ik_0x80929910/func_8092A28C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ik_0x80929910/func_8092A33C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ik_0x80929910/func_8092A33C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ik_0x80929910/func_8092A570.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ik_0x80929910/func_8092A570.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ik_0x80929910/func_8092A5BC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ik_0x80929910/func_8092A5BC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ik_0x80929910/func_8092A680.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ik_0x80929910/func_8092A680.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ik_0x80929910/func_8092A754.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ik_0x80929910/func_8092A754.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ik_0x80929910/func_8092A8D8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ik_0x80929910/func_8092A8D8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ik_0x80929910/func_8092A994.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ik_0x80929910/func_8092A994.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ik_0x80929910/func_8092AA6C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ik_0x80929910/func_8092AA6C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ik_0x80929910/func_8092AB14.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ik_0x80929910/func_8092AB14.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ik_0x80929910/func_8092AB50.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ik_0x80929910/func_8092AB50.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ik_0x80929910/func_8092ABD8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ik_0x80929910/func_8092ABD8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ik_0x80929910/func_8092AC4C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ik_0x80929910/func_8092AC4C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ik_0x80929910/func_8092ACFC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ik_0x80929910/func_8092ACFC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ik_0x80929910/func_8092ADB4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ik_0x80929910/func_8092ADB4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ik_0x80929910/func_8092AE14.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ik_0x80929910/func_8092AE14.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ik_0x80929910/func_8092AFB4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ik_0x80929910/func_8092AFB4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ik_0x80929910/func_8092AFD4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ik_0x80929910/func_8092AFD4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ik_0x80929910/func_8092B03C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ik_0x80929910/func_8092B03C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ik_0x80929910/func_8092B098.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ik_0x80929910/func_8092B098.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ik_0x80929910/func_8092B1B4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ik_0x80929910/func_8092B1B4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ik_0x80929910/func_8092B46C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ik_0x80929910/func_8092B46C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ik_0x80929910/EnIk_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ik_0x80929910/EnIk_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ik_0x80929910/func_8092B900.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ik_0x80929910/func_8092B900.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ik_0x80929910/func_8092B93C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ik_0x80929910/func_8092B93C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ik_0x80929910/func_8092BC6C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ik_0x80929910/func_8092BC6C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ik_0x80929910/EnIk_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ik_0x80929910/EnIk_Draw.asm") 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 6d5d765cc2..7b8c9cb38e 100644 --- a/src/overlays/actors/ovl_En_In/z_en_in.c +++ b/src/overlays/actors/ovl_En_In/z_en_in.c @@ -23,90 +23,90 @@ const ActorInit En_In_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_In_0x808F30B0/func_808F30B0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_In_0x808F30B0/func_808F30B0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_In_0x808F30B0/func_808F3178.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_In_0x808F30B0/func_808F3178.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_In_0x808F30B0/func_808F322C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_In_0x808F30B0/func_808F322C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_In_0x808F30B0/func_808F32A0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_In_0x808F30B0/func_808F32A0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_In_0x808F30B0/func_808F3310.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_In_0x808F30B0/func_808F3310.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_In_0x808F30B0/func_808F3334.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_In_0x808F30B0/func_808F3334.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_In_0x808F30B0/func_808F33B8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_In_0x808F30B0/func_808F33B8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_In_0x808F30B0/func_808F3414.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_In_0x808F30B0/func_808F3414.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_In_0x808F30B0/func_808F35AC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_In_0x808F30B0/func_808F35AC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_In_0x808F30B0/func_808F35D8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_In_0x808F30B0/func_808F35D8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_In_0x808F30B0/func_808F3608.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_In_0x808F30B0/func_808F3608.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_In_0x808F30B0/func_808F3618.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_In_0x808F30B0/func_808F3618.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_In_0x808F30B0/func_808F3690.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_In_0x808F30B0/func_808F3690.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_In_0x808F30B0/func_808F374C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_In_0x808F30B0/func_808F374C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_In_0x808F30B0/func_808F38F8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_In_0x808F30B0/func_808F38F8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_In_0x808F30B0/func_808F395C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_In_0x808F30B0/func_808F395C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_In_0x808F30B0/func_808F39DC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_In_0x808F30B0/func_808F39DC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_In_0x808F30B0/func_808F3AD4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_In_0x808F30B0/func_808F3AD4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_In_0x808F30B0/func_808F3B40.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_In_0x808F30B0/func_808F3B40.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_In_0x808F30B0/func_808F3BD4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_In_0x808F30B0/func_808F3BD4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_In_0x808F30B0/func_808F3C40.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_In_0x808F30B0/func_808F3C40.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_In_0x808F30B0/func_808F3CD4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_In_0x808F30B0/func_808F3CD4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_In_0x808F30B0/func_808F3D40.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_In_0x808F30B0/func_808F3D40.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_In_0x808F30B0/func_808F3DD4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_In_0x808F30B0/func_808F3DD4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_In_0x808F30B0/func_808F4054.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_In_0x808F30B0/func_808F4054.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_In_0x808F30B0/func_808F4108.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_In_0x808F30B0/func_808F4108.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_In_0x808F30B0/func_808F4150.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_In_0x808F30B0/func_808F4150.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_In_0x808F30B0/func_808F4270.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_In_0x808F30B0/func_808F4270.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_In_0x808F30B0/func_808F43E0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_In_0x808F30B0/func_808F43E0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_In_0x808F30B0/func_808F4414.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_In_0x808F30B0/func_808F4414.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_In_0x808F30B0/func_808F5674.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_In_0x808F30B0/func_808F5674.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_In_0x808F30B0/func_808F5728.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_In_0x808F30B0/func_808F5728.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_In_0x808F30B0/func_808F5994.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_In_0x808F30B0/func_808F5994.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_In_0x808F30B0/func_808F5A34.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_In_0x808F30B0/func_808F5A34.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_In_0x808F30B0/func_808F5A94.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_In_0x808F30B0/func_808F5A94.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_In_0x808F30B0/func_808F5B58.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_In_0x808F30B0/func_808F5B58.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_In_0x808F30B0/func_808F5C98.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_In_0x808F30B0/func_808F5C98.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_In_0x808F30B0/EnIn_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_In_0x808F30B0/EnIn_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_In_0x808F30B0/EnIn_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_In_0x808F30B0/EnIn_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_In_0x808F30B0/EnIn_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_In_0x808F30B0/EnIn_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_In_0x808F30B0/func_808F6334.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_In_0x808F30B0/func_808F6334.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_In_0x808F30B0/func_808F64A0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_In_0x808F30B0/func_808F64A0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_In_0x808F30B0/func_808F67F8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_In_0x808F30B0/func_808F67F8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_In_0x808F30B0/EnIn_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_In_0x808F30B0/EnIn_Draw.asm") 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 1cb6d2d6d5..5ae8a87ff1 100644 --- a/src/overlays/actors/ovl_En_Insect/z_en_insect.c +++ b/src/overlays/actors/ovl_En_Insect/z_en_insect.c @@ -23,46 +23,46 @@ const ActorInit En_Insect_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Insect_0x8091A8A0/func_8091A8A0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Insect_0x8091A8A0/func_8091A8A0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Insect_0x8091A8A0/func_8091A8C4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Insect_0x8091A8A0/func_8091A8C4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Insect_0x8091A8A0/func_8091A8F4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Insect_0x8091A8A0/func_8091A8F4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Insect_0x8091A8A0/func_8091A9E4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Insect_0x8091A8A0/func_8091A9E4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Insect_0x8091A8A0/EnInsect_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Insect_0x8091A8A0/EnInsect_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Insect_0x8091A8A0/EnInsect_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Insect_0x8091A8A0/EnInsect_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Insect_0x8091A8A0/func_8091AC78.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Insect_0x8091A8A0/func_8091AC78.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Insect_0x8091A8A0/func_8091ACC4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Insect_0x8091A8A0/func_8091ACC4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Insect_0x8091A8A0/func_8091AE10.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Insect_0x8091A8A0/func_8091AE10.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Insect_0x8091A8A0/func_8091AE5C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Insect_0x8091A8A0/func_8091AE5C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Insect_0x8091A8A0/func_8091B030.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Insect_0x8091A8A0/func_8091B030.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Insect_0x8091A8A0/func_8091B07C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Insect_0x8091A8A0/func_8091B07C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Insect_0x8091A8A0/func_8091B274.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Insect_0x8091A8A0/func_8091B274.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Insect_0x8091A8A0/func_8091B2D8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Insect_0x8091A8A0/func_8091B2D8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Insect_0x8091A8A0/func_8091B3D0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Insect_0x8091A8A0/func_8091B3D0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Insect_0x8091A8A0/func_8091B440.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Insect_0x8091A8A0/func_8091B440.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Insect_0x8091A8A0/func_8091B618.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Insect_0x8091A8A0/func_8091B618.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Insect_0x8091A8A0/func_8091B670.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Insect_0x8091A8A0/func_8091B670.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Insect_0x8091A8A0/func_8091B928.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Insect_0x8091A8A0/func_8091B928.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Insect_0x8091A8A0/func_8091B984.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Insect_0x8091A8A0/func_8091B984.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Insect_0x8091A8A0/EnInsect_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Insect_0x8091A8A0/EnInsect_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Insect_0x8091A8A0/EnInsect_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Insect_0x8091A8A0/EnInsect_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Invadepoh/z_en_invadepoh.c b/src/overlays/actors/ovl_En_Invadepoh/z_en_invadepoh.c index 2b35e80df4..2ecbf4d529 100644 --- a/src/overlays/actors/ovl_En_Invadepoh/z_en_invadepoh.c +++ b/src/overlays/actors/ovl_En_Invadepoh/z_en_invadepoh.c @@ -22,490 +22,490 @@ const ActorInit En_Invadepoh_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B439B0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B439B0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B43A24.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B43A24.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B43A74.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B43A74.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B43A9C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B43A9C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B43AB0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B43AB0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B43AF0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B43AF0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B43B80.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B43B80.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B43BC8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B43BC8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B43DD4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B43DD4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B43E6C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B43E6C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B43F0C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B43F0C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B43F70.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B43F70.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B44024.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B44024.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4407C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B4407C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B440B8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B440B8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B44234.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B44234.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B442E4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B442E4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B443A0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B443A0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B444BC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B444BC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B444F4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B444F4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B44514.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B44514.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B44540.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B44540.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B44570.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B44570.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B44620.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B44620.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B44640.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B44640.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B44664.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B44664.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B44690.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B44690.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B446D0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B446D0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B44700.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B44700.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B447C0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B447C0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B44A90.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B44A90.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B44B78.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B44B78.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B44B84.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B44B84.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B44C24.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B44C24.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B44C80.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B44C80.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B44E90.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B44E90.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B44EFC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B44EFC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B44F58.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B44F58.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B44FEC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B44FEC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B45080.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B45080.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B450C0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B450C0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4516C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B4516C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B451A0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B451A0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B452EC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B452EC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B453F4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B453F4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B45460.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B45460.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B454BC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B454BC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B45518.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B45518.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B45550.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B45550.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4560C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B4560C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B45648.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B45648.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B456A8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B456A8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B457A0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B457A0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B458D8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B458D8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B45980.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B45980.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B459E8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B459E8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B45A4C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B45A4C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B45A94.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B45A94.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B45B1C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B45B1C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B45BB8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B45BB8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B45C04.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B45C04.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B45CE0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B45CE0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B45EC8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B45EC8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B46118.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B46118.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B46184.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B46184.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B461DC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B461DC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4627C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B4627C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B46414.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B46414.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B46520.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B46520.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B465CC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B465CC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B46644.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B46644.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B468B4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B468B4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B469C4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B469C4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B46A80.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B46A80.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/EnInvadepoh_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/EnInvadepoh_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B46BB0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B46BB0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B46BC0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B46BC0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B46C08.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B46C08.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B46C34.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B46C34.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B46C50.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B46C50.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B46C7C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B46C7C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B46C94.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B46C94.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B46CC0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B46CC0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B46CF4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B46CF4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B46D28.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B46D28.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/EnInvadepoh_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/EnInvadepoh_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B46DA8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B46DA8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B46DC8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B46DC8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B46E20.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B46E20.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B46E44.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B46E44.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B46EC0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B46EC0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B46EE8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B46EE8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B46F88.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B46F88.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B46FA8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B46FA8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B47064.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B47064.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B47084.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B47084.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B470E0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B470E0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B47108.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B47108.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B471C0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B471C0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B471E0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B471E0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B47248.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B47248.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B47268.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B47268.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B47278.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B47278.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B47298.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B47298.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B47304.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B47304.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B47324.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B47324.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/EnInvadepoh_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/EnInvadepoh_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B47380.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B47380.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B473E4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B473E4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B47478.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B47478.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B474DC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B474DC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B47568.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B47568.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B47600.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B47600.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4770C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B4770C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B477B4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B477B4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B47830.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B47830.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B478F4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B478F4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B47938.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B47938.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B479E8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B479E8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B47BAC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B47BAC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B47D30.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B47D30.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B47FA8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B47FA8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B48060.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B48060.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B481C4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B481C4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4827C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B4827C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B482D4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B482D4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B48324.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B48324.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B48374.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B48374.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B483CC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B483CC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4843C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B4843C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B484EC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B484EC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B48588.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B48588.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B48610.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B48610.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B48620.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B48620.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4873C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B4873C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B487B4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B487B4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B48848.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B48848.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B48948.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B48948.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B48AD4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B48AD4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B48DE4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B48DE4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B48E4C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B48E4C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B48FB0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B48FB0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B490F0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B490F0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B491EC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B491EC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B49228.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B49228.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B492FC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B492FC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4934C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B4934C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B49404.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B49404.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B49454.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B49454.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B49628.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B49628.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B49670.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B49670.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B497A4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B497A4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B497EC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B497EC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B49904.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B49904.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4994C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B4994C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B499BC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B499BC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B49A00.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B49A00.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B49B1C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B49B1C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B49BD0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B49BD0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B49C38.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B49C38.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B49DA0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B49DA0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B49DFC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B49DFC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B49F88.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B49F88.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4A168.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B4A168.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4A1B8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B4A1B8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4A2C0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B4A2C0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4A350.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B4A350.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4A570.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B4A570.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4A5E4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B4A5E4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4A614.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B4A614.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4A67C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B4A67C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4A7C0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B4A7C0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4A81C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B4A81C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4A9C8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B4A9C8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4AB8C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B4AB8C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4ABDC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B4ABDC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4ACDC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B4ACDC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4ACF0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B4ACF0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4AD3C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B4AD3C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4AD60.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B4AD60.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4ADB8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B4ADB8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4ADCC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B4ADCC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4AEC0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B4AEC0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4AEDC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B4AEDC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4AF80.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B4AF80.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4AF94.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B4AF94.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4B024.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B4B024.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4B048.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B4B048.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4B0C4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B4B0C4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4B218.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B4B218.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4B3DC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B4B3DC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4B430.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B4B430.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4B484.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B4B484.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4B510.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B4B510.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4B564.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B4B564.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4B724.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B4B724.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4B768.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B4B768.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4B820.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B4B820.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4B864.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B4B864.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4B8BC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B4B8BC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4BA30.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B4BA30.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4BA84.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B4BA84.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4BBE0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B4BBE0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4BC4C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B4BC4C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4BFFC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B4BFFC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4C058.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B4C058.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4C1BC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B4C1BC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4C218.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B4C218.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4C3A0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B4C3A0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4C568.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B4C568.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4C5C0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B4C5C0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4C6C8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B4C6C8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4C730.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B4C730.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4CAB0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B4CAB0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4CB0C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B4CB0C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4CC70.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B4CC70.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4CCCC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B4CCCC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4CE54.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B4CE54.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4CFFC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B4CFFC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4D054.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B4D054.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4D15C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B4D15C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4D290.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B4D290.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4D3E4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B4D3E4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4D480.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B4D480.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4D670.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B4D670.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4D760.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B4D760.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4D7B8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B4D7B8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4D9B4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B4D9B4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4D9D8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B4D9D8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4D9F4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B4D9F4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4DB14.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B4DB14.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4E120.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B4E120.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4E158.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B4E158.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4E1B0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B4E1B0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4E200.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B4E200.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4E2AC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B4E2AC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4E324.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B4E324.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4E3F0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B4E3F0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4E5B0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B4E5B0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4E61C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B4E61C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4E660.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B4E660.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4E6E4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B4E6E4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4E784.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B4E784.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4E7BC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_0x80B439B0/func_80B4E7BC.asm") diff --git a/src/overlays/actors/ovl_En_Invadepoh_Demo/z_en_invadepoh_demo.c b/src/overlays/actors/ovl_En_Invadepoh_Demo/z_en_invadepoh_demo.c index 3fbb7f9d4a..e38c09e11b 100644 --- a/src/overlays/actors/ovl_En_Invadepoh_Demo/z_en_invadepoh_demo.c +++ b/src/overlays/actors/ovl_En_Invadepoh_Demo/z_en_invadepoh_demo.c @@ -23,74 +23,74 @@ const ActorInit En_Invadepoh_Demo_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_Demo_0x80C192A0/func_80C192A0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_Demo_0x80C192A0/func_80C192A0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_Demo_0x80C192A0/func_80C192B0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_Demo_0x80C192A0/func_80C192B0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_Demo_0x80C192A0/func_80C19334.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_Demo_0x80C192A0/func_80C19334.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_Demo_0x80C192A0/func_80C193A8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_Demo_0x80C192A0/func_80C193A8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_Demo_0x80C192A0/func_80C19454.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_Demo_0x80C192A0/func_80C19454.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_Demo_0x80C192A0/func_80C19498.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_Demo_0x80C192A0/func_80C19498.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_Demo_0x80C192A0/func_80C1950C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_Demo_0x80C192A0/func_80C1950C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_Demo_0x80C192A0/func_80C19548.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_Demo_0x80C192A0/func_80C19548.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_Demo_0x80C192A0/func_80C19564.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_Demo_0x80C192A0/func_80C19564.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_Demo_0x80C192A0/func_80C19590.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_Demo_0x80C192A0/func_80C19590.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_Demo_0x80C192A0/func_80C1965C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_Demo_0x80C192A0/func_80C1965C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_Demo_0x80C192A0/func_80C19688.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_Demo_0x80C192A0/func_80C19688.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_Demo_0x80C192A0/func_80C19754.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_Demo_0x80C192A0/func_80C19754.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_Demo_0x80C192A0/func_80C1985C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_Demo_0x80C192A0/func_80C1985C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_Demo_0x80C192A0/func_80C1987C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_Demo_0x80C192A0/func_80C1987C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_Demo_0x80C192A0/func_80C199BC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_Demo_0x80C192A0/func_80C199BC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_Demo_0x80C192A0/func_80C199EC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_Demo_0x80C192A0/func_80C199EC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_Demo_0x80C192A0/func_80C19AB4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_Demo_0x80C192A0/func_80C19AB4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_Demo_0x80C192A0/func_80C19D00.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_Demo_0x80C192A0/func_80C19D00.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_Demo_0x80C192A0/func_80C19D48.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_Demo_0x80C192A0/func_80C19D48.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_Demo_0x80C192A0/func_80C19E04.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_Demo_0x80C192A0/func_80C19E04.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_Demo_0x80C192A0/func_80C19EC0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_Demo_0x80C192A0/func_80C19EC0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_Demo_0x80C192A0/func_80C19F7C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_Demo_0x80C192A0/func_80C19F7C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_Demo_0x80C192A0/func_80C1A038.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_Demo_0x80C192A0/func_80C1A038.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_Demo_0x80C192A0/func_80C1A070.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_Demo_0x80C192A0/func_80C1A070.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_Demo_0x80C192A0/func_80C1A168.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_Demo_0x80C192A0/func_80C1A168.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_Demo_0x80C192A0/func_80C1A244.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_Demo_0x80C192A0/func_80C1A244.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_Demo_0x80C192A0/func_80C1A590.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_Demo_0x80C192A0/func_80C1A590.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_Demo_0x80C192A0/func_80C1A650.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_Demo_0x80C192A0/func_80C1A650.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_Demo_0x80C192A0/func_80C1A670.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_Demo_0x80C192A0/func_80C1A670.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_Demo_0x80C192A0/func_80C1A6C8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_Demo_0x80C192A0/func_80C1A6C8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_Demo_0x80C192A0/func_80C1A854.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_Demo_0x80C192A0/func_80C1A854.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_Demo_0x80C192A0/EnInvadepohDemo_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_Demo_0x80C192A0/EnInvadepohDemo_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_Demo_0x80C192A0/EnInvadepohDemo_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_Demo_0x80C192A0/EnInvadepohDemo_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_Demo_0x80C192A0/EnInvadepohDemo_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_Demo_0x80C192A0/EnInvadepohDemo_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_Demo_0x80C192A0/EnInvadepohDemo_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invadepoh_Demo_0x80C192A0/EnInvadepohDemo_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Invisible_Ruppe/z_en_invisible_ruppe.c b/src/overlays/actors/ovl_En_Invisible_Ruppe/z_en_invisible_ruppe.c index 707eb988b8..c7a7615f1e 100644 --- a/src/overlays/actors/ovl_En_Invisible_Ruppe/z_en_invisible_ruppe.c +++ b/src/overlays/actors/ovl_En_Invisible_Ruppe/z_en_invisible_ruppe.c @@ -22,14 +22,14 @@ const ActorInit En_Invisible_Ruppe_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invisible_Ruppe_0x80C258A0/func_80C258A0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invisible_Ruppe_0x80C258A0/func_80C258A0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invisible_Ruppe_0x80C258A0/func_80C2590C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invisible_Ruppe_0x80C258A0/func_80C2590C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invisible_Ruppe_0x80C258A0/func_80C259E8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invisible_Ruppe_0x80C258A0/func_80C259E8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invisible_Ruppe_0x80C258A0/EnInvisibleRuppe_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invisible_Ruppe_0x80C258A0/EnInvisibleRuppe_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invisible_Ruppe_0x80C258A0/EnInvisibleRuppe_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invisible_Ruppe_0x80C258A0/EnInvisibleRuppe_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Invisible_Ruppe_0x80C258A0/EnInvisibleRuppe_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Invisible_Ruppe_0x80C258A0/EnInvisibleRuppe_Update.asm") 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 3fcb21da6c..72f2d9d34d 100644 --- a/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c +++ b/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c @@ -22,64 +22,64 @@ const ActorInit En_Ishi_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ishi_0x8095D6E0/func_8095D6E0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ishi_0x8095D6E0/func_8095D6E0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ishi_0x8095D6E0/func_8095D758.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ishi_0x8095D6E0/func_8095D758.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ishi_0x8095D6E0/func_8095D804.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ishi_0x8095D6E0/func_8095D804.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ishi_0x8095D6E0/func_8095DABC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ishi_0x8095D6E0/func_8095DABC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ishi_0x8095D6E0/func_8095DDA8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ishi_0x8095D6E0/func_8095DDA8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ishi_0x8095D6E0/func_8095DE9C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ishi_0x8095D6E0/func_8095DE9C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ishi_0x8095D6E0/func_8095DF90.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ishi_0x8095D6E0/func_8095DF90.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ishi_0x8095D6E0/func_8095DFF0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ishi_0x8095D6E0/func_8095DFF0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ishi_0x8095D6E0/func_8095E14C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ishi_0x8095D6E0/func_8095E14C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ishi_0x8095D6E0/func_8095E180.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ishi_0x8095D6E0/func_8095E180.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ishi_0x8095D6E0/func_8095E204.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ishi_0x8095D6E0/func_8095E204.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ishi_0x8095D6E0/func_8095E2B0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ishi_0x8095D6E0/func_8095E2B0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ishi_0x8095D6E0/EnIshi_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ishi_0x8095D6E0/EnIshi_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ishi_0x8095D6E0/EnIshi_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ishi_0x8095D6E0/EnIshi_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ishi_0x8095D6E0/func_8095E5AC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ishi_0x8095D6E0/func_8095E5AC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ishi_0x8095D6E0/func_8095E5C0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ishi_0x8095D6E0/func_8095E5C0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ishi_0x8095D6E0/func_8095E64C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ishi_0x8095D6E0/func_8095E64C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ishi_0x8095D6E0/func_8095E660.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ishi_0x8095D6E0/func_8095E660.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ishi_0x8095D6E0/func_8095E934.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ishi_0x8095D6E0/func_8095E934.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ishi_0x8095D6E0/func_8095E95C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ishi_0x8095D6E0/func_8095E95C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ishi_0x8095D6E0/func_8095EA70.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ishi_0x8095D6E0/func_8095EA70.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ishi_0x8095D6E0/func_8095EBDC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ishi_0x8095D6E0/func_8095EBDC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ishi_0x8095D6E0/func_8095F060.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ishi_0x8095D6E0/func_8095F060.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ishi_0x8095D6E0/func_8095F0A4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ishi_0x8095D6E0/func_8095F0A4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ishi_0x8095D6E0/func_8095F180.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ishi_0x8095D6E0/func_8095F180.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ishi_0x8095D6E0/func_8095F194.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ishi_0x8095D6E0/func_8095F194.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ishi_0x8095D6E0/EnIshi_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ishi_0x8095D6E0/EnIshi_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ishi_0x8095D6E0/func_8095F210.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ishi_0x8095D6E0/func_8095F210.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ishi_0x8095D6E0/func_8095F36C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ishi_0x8095D6E0/func_8095F36C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ishi_0x8095D6E0/func_8095F61C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ishi_0x8095D6E0/func_8095F61C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ishi_0x8095D6E0/func_8095F654.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ishi_0x8095D6E0/func_8095F654.asm") diff --git a/src/overlays/actors/ovl_En_Ja/z_en_ja.c b/src/overlays/actors/ovl_En_Ja/z_en_ja.c index e1226239b5..ae87151dee 100644 --- a/src/overlays/actors/ovl_En_Ja/z_en_ja.c +++ b/src/overlays/actors/ovl_En_Ja/z_en_ja.c @@ -23,62 +23,62 @@ const ActorInit En_Ja_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ja_0x80BC1900/func_80BC1900.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ja_0x80BC1900/func_80BC1900.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ja_0x80BC1900/func_80BC192C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ja_0x80BC1900/func_80BC192C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ja_0x80BC1900/func_80BC1984.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ja_0x80BC1900/func_80BC1984.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ja_0x80BC1900/func_80BC19FC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ja_0x80BC1900/func_80BC19FC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ja_0x80BC1900/func_80BC1A68.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ja_0x80BC1900/func_80BC1A68.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ja_0x80BC1900/func_80BC1AE0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ja_0x80BC1900/func_80BC1AE0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ja_0x80BC1900/func_80BC1B50.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ja_0x80BC1900/func_80BC1B50.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ja_0x80BC1900/func_80BC1B60.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ja_0x80BC1900/func_80BC1B60.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ja_0x80BC1900/func_80BC1D70.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ja_0x80BC1900/func_80BC1D70.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ja_0x80BC1900/func_80BC1E40.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ja_0x80BC1900/func_80BC1E40.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ja_0x80BC1900/func_80BC1FC8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ja_0x80BC1900/func_80BC1FC8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ja_0x80BC1900/func_80BC203C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ja_0x80BC1900/func_80BC203C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ja_0x80BC1900/func_80BC20D0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ja_0x80BC1900/func_80BC20D0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ja_0x80BC1900/func_80BC213C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ja_0x80BC1900/func_80BC213C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ja_0x80BC1900/func_80BC2150.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ja_0x80BC1900/func_80BC2150.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ja_0x80BC1900/func_80BC21A8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ja_0x80BC1900/func_80BC21A8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ja_0x80BC1900/func_80BC2274.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ja_0x80BC1900/func_80BC2274.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ja_0x80BC1900/func_80BC22F4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ja_0x80BC1900/func_80BC22F4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ja_0x80BC1900/EnJa_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ja_0x80BC1900/EnJa_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ja_0x80BC1900/EnJa_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ja_0x80BC1900/EnJa_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ja_0x80BC1900/EnJa_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ja_0x80BC1900/EnJa_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ja_0x80BC1900/func_80BC25E0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ja_0x80BC1900/func_80BC25E0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ja_0x80BC1900/func_80BC2620.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ja_0x80BC1900/func_80BC2620.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ja_0x80BC1900/func_80BC2B30.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ja_0x80BC1900/func_80BC2B30.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ja_0x80BC1900/EnJa_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ja_0x80BC1900/EnJa_Draw.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ja_0x80BC1900/func_80BC2EA4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ja_0x80BC1900/func_80BC2EA4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ja_0x80BC1900/func_80BC3154.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ja_0x80BC1900/func_80BC3154.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ja_0x80BC1900/func_80BC32D8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ja_0x80BC1900/func_80BC32D8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ja_0x80BC1900/func_80BC33C0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ja_0x80BC1900/func_80BC33C0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ja_0x80BC1900/func_80BC3594.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ja_0x80BC1900/func_80BC3594.asm") diff --git a/src/overlays/actors/ovl_En_Jc_Mato/z_en_jc_mato.c b/src/overlays/actors/ovl_En_Jc_Mato/z_en_jc_mato.c index b6af78d53b..cb446a5ccc 100644 --- a/src/overlays/actors/ovl_En_Jc_Mato/z_en_jc_mato.c +++ b/src/overlays/actors/ovl_En_Jc_Mato/z_en_jc_mato.c @@ -23,16 +23,16 @@ const ActorInit En_Jc_Mato_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Jc_Mato_0x80B9DEE0/func_80B9DEE0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Jc_Mato_0x80B9DEE0/func_80B9DEE0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Jc_Mato_0x80B9DEE0/func_80B9DFC8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Jc_Mato_0x80B9DEE0/func_80B9DFC8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Jc_Mato_0x80B9DEE0/func_80B9DFDC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Jc_Mato_0x80B9DEE0/func_80B9DFDC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Jc_Mato_0x80B9DEE0/EnJcMato_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Jc_Mato_0x80B9DEE0/EnJcMato_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Jc_Mato_0x80B9DEE0/EnJcMato_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Jc_Mato_0x80B9DEE0/EnJcMato_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Jc_Mato_0x80B9DEE0/EnJcMato_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Jc_Mato_0x80B9DEE0/EnJcMato_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Jc_Mato_0x80B9DEE0/EnJcMato_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Jc_Mato_0x80B9DEE0/EnJcMato_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Jg/z_en_jg.c b/src/overlays/actors/ovl_En_Jg/z_en_jg.c index 55586a9546..32c8fc5195 100644 --- a/src/overlays/actors/ovl_En_Jg/z_en_jg.c +++ b/src/overlays/actors/ovl_En_Jg/z_en_jg.c @@ -23,62 +23,62 @@ const ActorInit En_Jg_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Jg_0x80B73A90/func_80B73A90.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Jg_0x80B73A90/func_80B73A90.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Jg_0x80B73A90/func_80B73AE4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Jg_0x80B73A90/func_80B73AE4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Jg_0x80B73A90/func_80B73B98.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Jg_0x80B73A90/func_80B73B98.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Jg_0x80B73A90/func_80B73C58.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Jg_0x80B73A90/func_80B73C58.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Jg_0x80B73A90/func_80B73DF4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Jg_0x80B73A90/func_80B73DF4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Jg_0x80B73A90/func_80B73E3C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Jg_0x80B73A90/func_80B73E3C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Jg_0x80B73A90/func_80B73F1C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Jg_0x80B73A90/func_80B73F1C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Jg_0x80B73A90/func_80B7406C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Jg_0x80B73A90/func_80B7406C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Jg_0x80B73A90/func_80B7408C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Jg_0x80B73A90/func_80B7408C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Jg_0x80B73A90/func_80B74134.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Jg_0x80B73A90/func_80B74134.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Jg_0x80B73A90/func_80B741F8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Jg_0x80B73A90/func_80B741F8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Jg_0x80B73A90/func_80B742F8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Jg_0x80B73A90/func_80B742F8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Jg_0x80B73A90/func_80B74440.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Jg_0x80B73A90/func_80B74440.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Jg_0x80B73A90/func_80B74550.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Jg_0x80B73A90/func_80B74550.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Jg_0x80B73A90/func_80B747C8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Jg_0x80B73A90/func_80B747C8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Jg_0x80B73A90/func_80B74840.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Jg_0x80B73A90/func_80B74840.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Jg_0x80B73A90/func_80B749D0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Jg_0x80B73A90/func_80B749D0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Jg_0x80B73A90/func_80B74AD8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Jg_0x80B73A90/func_80B74AD8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Jg_0x80B73A90/func_80B74B54.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Jg_0x80B73A90/func_80B74B54.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Jg_0x80B73A90/func_80B74BC8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Jg_0x80B73A90/func_80B74BC8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Jg_0x80B73A90/func_80B74E5C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Jg_0x80B73A90/func_80B74E5C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Jg_0x80B73A90/func_80B750A0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Jg_0x80B73A90/func_80B750A0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Jg_0x80B73A90/func_80B7517C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Jg_0x80B73A90/func_80B7517C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Jg_0x80B73A90/func_80B751F8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Jg_0x80B73A90/func_80B751F8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Jg_0x80B73A90/EnJg_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Jg_0x80B73A90/EnJg_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Jg_0x80B73A90/EnJg_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Jg_0x80B73A90/EnJg_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Jg_0x80B73A90/EnJg_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Jg_0x80B73A90/EnJg_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Jg_0x80B73A90/func_80B75658.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Jg_0x80B73A90/func_80B75658.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Jg_0x80B73A90/func_80B75708.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Jg_0x80B73A90/func_80B75708.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Jg_0x80B73A90/EnJg_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Jg_0x80B73A90/EnJg_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Jgame_Tsn/z_en_jgame_tsn.c b/src/overlays/actors/ovl_En_Jgame_Tsn/z_en_jgame_tsn.c index 0b6854d9bb..349f0521ab 100644 --- a/src/overlays/actors/ovl_En_Jgame_Tsn/z_en_jgame_tsn.c +++ b/src/overlays/actors/ovl_En_Jgame_Tsn/z_en_jgame_tsn.c @@ -23,68 +23,68 @@ const ActorInit En_Jgame_Tsn_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Jgame_Tsn_0x80C13930/EnJgameTsn_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Jgame_Tsn_0x80C13930/EnJgameTsn_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Jgame_Tsn_0x80C13930/func_80C13A2C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Jgame_Tsn_0x80C13930/func_80C13A2C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Jgame_Tsn_0x80C13930/EnJgameTsn_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Jgame_Tsn_0x80C13930/EnJgameTsn_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Jgame_Tsn_0x80C13930/func_80C13B74.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Jgame_Tsn_0x80C13930/func_80C13B74.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Jgame_Tsn_0x80C13930/func_80C13BB8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Jgame_Tsn_0x80C13930/func_80C13BB8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Jgame_Tsn_0x80C13930/func_80C13E6C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Jgame_Tsn_0x80C13930/func_80C13E6C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Jgame_Tsn_0x80C13930/func_80C13E90.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Jgame_Tsn_0x80C13930/func_80C13E90.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Jgame_Tsn_0x80C13930/func_80C13F88.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Jgame_Tsn_0x80C13930/func_80C13F88.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Jgame_Tsn_0x80C13930/func_80C13F9C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Jgame_Tsn_0x80C13930/func_80C13F9C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Jgame_Tsn_0x80C13930/func_80C14030.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Jgame_Tsn_0x80C13930/func_80C14030.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Jgame_Tsn_0x80C13930/func_80C14044.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Jgame_Tsn_0x80C13930/func_80C14044.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Jgame_Tsn_0x80C13930/func_80C1410C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Jgame_Tsn_0x80C13930/func_80C1410C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Jgame_Tsn_0x80C13930/func_80C1418C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Jgame_Tsn_0x80C13930/func_80C1418C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Jgame_Tsn_0x80C13930/func_80C141DC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Jgame_Tsn_0x80C13930/func_80C141DC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Jgame_Tsn_0x80C13930/func_80C14230.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Jgame_Tsn_0x80C13930/func_80C14230.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Jgame_Tsn_0x80C13930/func_80C144E4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Jgame_Tsn_0x80C13930/func_80C144E4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Jgame_Tsn_0x80C13930/func_80C144F8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Jgame_Tsn_0x80C13930/func_80C144F8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Jgame_Tsn_0x80C13930/func_80C14540.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Jgame_Tsn_0x80C13930/func_80C14540.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Jgame_Tsn_0x80C13930/func_80C14554.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Jgame_Tsn_0x80C13930/func_80C14554.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Jgame_Tsn_0x80C13930/func_80C145FC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Jgame_Tsn_0x80C13930/func_80C145FC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Jgame_Tsn_0x80C13930/func_80C14610.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Jgame_Tsn_0x80C13930/func_80C14610.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Jgame_Tsn_0x80C13930/func_80C14684.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Jgame_Tsn_0x80C13930/func_80C14684.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Jgame_Tsn_0x80C13930/func_80C1476C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Jgame_Tsn_0x80C13930/func_80C1476C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Jgame_Tsn_0x80C13930/func_80C147B4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Jgame_Tsn_0x80C13930/func_80C147B4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Jgame_Tsn_0x80C13930/func_80C14960.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Jgame_Tsn_0x80C13930/func_80C14960.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Jgame_Tsn_0x80C13930/func_80C149B0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Jgame_Tsn_0x80C13930/func_80C149B0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Jgame_Tsn_0x80C13930/func_80C14BCC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Jgame_Tsn_0x80C13930/func_80C14BCC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Jgame_Tsn_0x80C13930/func_80C14D14.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Jgame_Tsn_0x80C13930/func_80C14D14.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Jgame_Tsn_0x80C13930/func_80C14D58.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Jgame_Tsn_0x80C13930/func_80C14D58.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Jgame_Tsn_0x80C13930/EnJgameTsn_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Jgame_Tsn_0x80C13930/EnJgameTsn_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Jgame_Tsn_0x80C13930/func_80C14E64.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Jgame_Tsn_0x80C13930/func_80C14E64.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Jgame_Tsn_0x80C13930/func_80C14EE4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Jgame_Tsn_0x80C13930/func_80C14EE4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Jgame_Tsn_0x80C13930/EnJgameTsn_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Jgame_Tsn_0x80C13930/EnJgameTsn_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Js/z_en_js.c b/src/overlays/actors/ovl_En_Js/z_en_js.c index e523f8fff3..43f8cf05d1 100644 --- a/src/overlays/actors/ovl_En_Js/z_en_js.c +++ b/src/overlays/actors/ovl_En_Js/z_en_js.c @@ -23,74 +23,74 @@ const ActorInit En_Js_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Js_0x809687B0/EnJs_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Js_0x809687B0/EnJs_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Js_0x809687B0/EnJs_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Js_0x809687B0/EnJs_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Js_0x809687B0/func_80968A5C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Js_0x809687B0/func_80968A5C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Js_0x809687B0/func_80968B18.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Js_0x809687B0/func_80968B18.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Js_0x809687B0/func_80968B8C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Js_0x809687B0/func_80968B8C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Js_0x809687B0/func_80968CB8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Js_0x809687B0/func_80968CB8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Js_0x809687B0/func_80968DD0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Js_0x809687B0/func_80968DD0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Js_0x809687B0/func_80968E38.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Js_0x809687B0/func_80968E38.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Js_0x809687B0/func_80968F48.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Js_0x809687B0/func_80968F48.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Js_0x809687B0/func_809691B8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Js_0x809687B0/func_809691B8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Js_0x809687B0/func_809692A8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Js_0x809687B0/func_809692A8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Js_0x809687B0/func_8096933C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Js_0x809687B0/func_8096933C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Js_0x809687B0/func_80969400.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Js_0x809687B0/func_80969400.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Js_0x809687B0/func_80969494.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Js_0x809687B0/func_80969494.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Js_0x809687B0/func_809694E8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Js_0x809687B0/func_809694E8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Js_0x809687B0/func_80969530.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Js_0x809687B0/func_80969530.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Js_0x809687B0/func_809695FC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Js_0x809687B0/func_809695FC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Js_0x809687B0/func_80969688.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Js_0x809687B0/func_80969688.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Js_0x809687B0/func_809696EC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Js_0x809687B0/func_809696EC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Js_0x809687B0/func_8096971C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Js_0x809687B0/func_8096971C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Js_0x809687B0/func_80969748.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Js_0x809687B0/func_80969748.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Js_0x809687B0/func_80969898.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Js_0x809687B0/func_80969898.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Js_0x809687B0/func_80969AA0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Js_0x809687B0/func_80969AA0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Js_0x809687B0/func_80969B5C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Js_0x809687B0/func_80969B5C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Js_0x809687B0/func_80969C54.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Js_0x809687B0/func_80969C54.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Js_0x809687B0/func_80969DA4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Js_0x809687B0/func_80969DA4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Js_0x809687B0/func_8096A080.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Js_0x809687B0/func_8096A080.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Js_0x809687B0/func_8096A104.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Js_0x809687B0/func_8096A104.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Js_0x809687B0/func_8096A184.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Js_0x809687B0/func_8096A184.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Js_0x809687B0/func_8096A1E8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Js_0x809687B0/func_8096A1E8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Js_0x809687B0/func_8096A2C0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Js_0x809687B0/func_8096A2C0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Js_0x809687B0/func_8096A38C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Js_0x809687B0/func_8096A38C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Js_0x809687B0/func_8096A6F4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Js_0x809687B0/func_8096A6F4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Js_0x809687B0/EnJs_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Js_0x809687B0/EnJs_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Js_0x809687B0/func_8096A9F4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Js_0x809687B0/func_8096A9F4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Js_0x809687B0/EnJs_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Js_0x809687B0/EnJs_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Jso/z_en_jso.c b/src/overlays/actors/ovl_En_Jso/z_en_jso.c index 57e679b1dc..56bdd5793e 100644 --- a/src/overlays/actors/ovl_En_Jso/z_en_jso.c +++ b/src/overlays/actors/ovl_En_Jso/z_en_jso.c @@ -22,84 +22,84 @@ const ActorInit En_Jso_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Jso_0x809AD8E0/EnJso_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Jso_0x809AD8E0/EnJso_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Jso_0x809AD8E0/EnJso_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Jso_0x809AD8E0/EnJso_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Jso_0x809AD8E0/func_809ADBC8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Jso_0x809AD8E0/func_809ADBC8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Jso_0x809AD8E0/func_809ADC7C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Jso_0x809AD8E0/func_809ADC7C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Jso_0x809AD8E0/func_809ADCB8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Jso_0x809AD8E0/func_809ADCB8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Jso_0x809AD8E0/func_809AE754.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Jso_0x809AD8E0/func_809AE754.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Jso_0x809AD8E0/func_809AE87C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Jso_0x809AD8E0/func_809AE87C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Jso_0x809AD8E0/func_809AE9B0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Jso_0x809AD8E0/func_809AE9B0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Jso_0x809AD8E0/func_809AEA08.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Jso_0x809AD8E0/func_809AEA08.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Jso_0x809AD8E0/func_809AECA8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Jso_0x809AD8E0/func_809AECA8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Jso_0x809AD8E0/func_809AED00.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Jso_0x809AD8E0/func_809AED00.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Jso_0x809AD8E0/func_809AED54.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Jso_0x809AD8E0/func_809AED54.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Jso_0x809AD8E0/func_809AEDAC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Jso_0x809AD8E0/func_809AEDAC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Jso_0x809AD8E0/func_809AEE44.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Jso_0x809AD8E0/func_809AEE44.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Jso_0x809AD8E0/func_809AEEC0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Jso_0x809AD8E0/func_809AEEC0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Jso_0x809AD8E0/func_809AF064.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Jso_0x809AD8E0/func_809AF064.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Jso_0x809AD8E0/func_809AF110.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Jso_0x809AD8E0/func_809AF110.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Jso_0x809AD8E0/func_809AF28C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Jso_0x809AD8E0/func_809AF28C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Jso_0x809AD8E0/func_809AF2F8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Jso_0x809AD8E0/func_809AF2F8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Jso_0x809AD8E0/func_809AF368.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Jso_0x809AD8E0/func_809AF368.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Jso_0x809AD8E0/func_809AF3C0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Jso_0x809AD8E0/func_809AF3C0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Jso_0x809AD8E0/func_809AF3FC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Jso_0x809AD8E0/func_809AF3FC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Jso_0x809AD8E0/func_809AF440.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Jso_0x809AD8E0/func_809AF440.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Jso_0x809AD8E0/func_809AF470.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Jso_0x809AD8E0/func_809AF470.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Jso_0x809AD8E0/func_809AF53C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Jso_0x809AD8E0/func_809AF53C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Jso_0x809AD8E0/func_809AF5F8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Jso_0x809AD8E0/func_809AF5F8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Jso_0x809AD8E0/func_809AF714.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Jso_0x809AD8E0/func_809AF714.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Jso_0x809AD8E0/func_809AF76C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Jso_0x809AD8E0/func_809AF76C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Jso_0x809AD8E0/func_809AF7F4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Jso_0x809AD8E0/func_809AF7F4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Jso_0x809AD8E0/func_809AF8D0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Jso_0x809AD8E0/func_809AF8D0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Jso_0x809AD8E0/func_809AF99C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Jso_0x809AD8E0/func_809AF99C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Jso_0x809AD8E0/func_809AFA58.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Jso_0x809AD8E0/func_809AFA58.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Jso_0x809AD8E0/func_809AFAF4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Jso_0x809AD8E0/func_809AFAF4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Jso_0x809AD8E0/func_809AFC10.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Jso_0x809AD8E0/func_809AFC10.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Jso_0x809AD8E0/func_809AFE38.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Jso_0x809AD8E0/func_809AFE38.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Jso_0x809AD8E0/func_809B0034.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Jso_0x809AD8E0/func_809B0034.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Jso_0x809AD8E0/EnJso_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Jso_0x809AD8E0/EnJso_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Jso_0x809AD8E0/func_809B0734.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Jso_0x809AD8E0/func_809B0734.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Jso_0x809AD8E0/func_809B0820.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Jso_0x809AD8E0/func_809B0820.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Jso_0x809AD8E0/func_809B0B70.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Jso_0x809AD8E0/func_809B0B70.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Jso_0x809AD8E0/func_809B0BB0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Jso_0x809AD8E0/func_809B0BB0.asm") diff --git a/src/overlays/actors/ovl_En_Jso2/z_en_jso2.c b/src/overlays/actors/ovl_En_Jso2/z_en_jso2.c index 4f5ea6a096..9faadd04a3 100644 --- a/src/overlays/actors/ovl_En_Jso2/z_en_jso2.c +++ b/src/overlays/actors/ovl_En_Jso2/z_en_jso2.c @@ -23,92 +23,92 @@ const ActorInit En_Jso2_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Jso2_0x80A773C0/EnJso2_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Jso2_0x80A773C0/EnJso2_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Jso2_0x80A773C0/EnJso2_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Jso2_0x80A773C0/EnJso2_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Jso2_0x80A773C0/func_80A776E0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Jso2_0x80A773C0/func_80A776E0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Jso2_0x80A773C0/func_80A77790.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Jso2_0x80A773C0/func_80A77790.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Jso2_0x80A773C0/func_80A77880.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Jso2_0x80A773C0/func_80A77880.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Jso2_0x80A773C0/func_80A778D8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Jso2_0x80A773C0/func_80A778D8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Jso2_0x80A773C0/func_80A778F8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Jso2_0x80A773C0/func_80A778F8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Jso2_0x80A773C0/func_80A78588.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Jso2_0x80A773C0/func_80A78588.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Jso2_0x80A773C0/func_80A785E4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Jso2_0x80A773C0/func_80A785E4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Jso2_0x80A773C0/func_80A787FC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Jso2_0x80A773C0/func_80A787FC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Jso2_0x80A773C0/func_80A78868.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Jso2_0x80A773C0/func_80A78868.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Jso2_0x80A773C0/func_80A78A70.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Jso2_0x80A773C0/func_80A78A70.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Jso2_0x80A773C0/func_80A78ACC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Jso2_0x80A773C0/func_80A78ACC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Jso2_0x80A773C0/func_80A78B04.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Jso2_0x80A773C0/func_80A78B04.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Jso2_0x80A773C0/func_80A78B70.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Jso2_0x80A773C0/func_80A78B70.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Jso2_0x80A773C0/func_80A78C08.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Jso2_0x80A773C0/func_80A78C08.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Jso2_0x80A773C0/func_80A78C7C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Jso2_0x80A773C0/func_80A78C7C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Jso2_0x80A773C0/func_80A78E8C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Jso2_0x80A773C0/func_80A78E8C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Jso2_0x80A773C0/func_80A78F04.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Jso2_0x80A773C0/func_80A78F04.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Jso2_0x80A773C0/func_80A78F80.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Jso2_0x80A773C0/func_80A78F80.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Jso2_0x80A773C0/func_80A79038.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Jso2_0x80A773C0/func_80A79038.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Jso2_0x80A773C0/func_80A790E4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Jso2_0x80A773C0/func_80A790E4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Jso2_0x80A773C0/func_80A7919C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Jso2_0x80A773C0/func_80A7919C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Jso2_0x80A773C0/func_80A79300.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Jso2_0x80A773C0/func_80A79300.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Jso2_0x80A773C0/func_80A79364.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Jso2_0x80A773C0/func_80A79364.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Jso2_0x80A773C0/func_80A79450.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Jso2_0x80A773C0/func_80A79450.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Jso2_0x80A773C0/func_80A794C8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Jso2_0x80A773C0/func_80A794C8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Jso2_0x80A773C0/func_80A79524.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Jso2_0x80A773C0/func_80A79524.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Jso2_0x80A773C0/func_80A79600.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Jso2_0x80A773C0/func_80A79600.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Jso2_0x80A773C0/func_80A796BC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Jso2_0x80A773C0/func_80A796BC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Jso2_0x80A773C0/func_80A7980C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Jso2_0x80A773C0/func_80A7980C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Jso2_0x80A773C0/func_80A79864.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Jso2_0x80A773C0/func_80A79864.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Jso2_0x80A773C0/func_80A798C8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Jso2_0x80A773C0/func_80A798C8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Jso2_0x80A773C0/func_80A7998C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Jso2_0x80A773C0/func_80A7998C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Jso2_0x80A773C0/func_80A79A84.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Jso2_0x80A773C0/func_80A79A84.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Jso2_0x80A773C0/func_80A79B60.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Jso2_0x80A773C0/func_80A79B60.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Jso2_0x80A773C0/func_80A79BA0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Jso2_0x80A773C0/func_80A79BA0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Jso2_0x80A773C0/func_80A7A0D0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Jso2_0x80A773C0/func_80A7A0D0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Jso2_0x80A773C0/func_80A7A124.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Jso2_0x80A773C0/func_80A7A124.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Jso2_0x80A773C0/func_80A7A2EC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Jso2_0x80A773C0/func_80A7A2EC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Jso2_0x80A773C0/func_80A7A360.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Jso2_0x80A773C0/func_80A7A360.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Jso2_0x80A773C0/EnJso2_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Jso2_0x80A773C0/EnJso2_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Jso2_0x80A773C0/func_80A7AA48.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Jso2_0x80A773C0/func_80A7AA48.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Jso2_0x80A773C0/func_80A7AA9C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Jso2_0x80A773C0/func_80A7AA9C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Jso2_0x80A773C0/EnJso2_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Jso2_0x80A773C0/EnJso2_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Kaizoku/z_en_kaizoku.c b/src/overlays/actors/ovl_En_Kaizoku/z_en_kaizoku.c index 6f6c016d77..d2d5225bf1 100644 --- a/src/overlays/actors/ovl_En_Kaizoku/z_en_kaizoku.c +++ b/src/overlays/actors/ovl_En_Kaizoku/z_en_kaizoku.c @@ -22,98 +22,98 @@ const ActorInit En_Kaizoku_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kaizoku_0x80B85590/EnKaizoku_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kaizoku_0x80B85590/EnKaizoku_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kaizoku_0x80B85590/EnKaizoku_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kaizoku_0x80B85590/EnKaizoku_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kaizoku_0x80B85590/func_80B85858.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kaizoku_0x80B85590/func_80B85858.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kaizoku_0x80B85590/func_80B85900.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kaizoku_0x80B85590/func_80B85900.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kaizoku_0x80B85590/func_80B85A00.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kaizoku_0x80B85590/func_80B85A00.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kaizoku_0x80B85590/func_80B85E18.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kaizoku_0x80B85590/func_80B85E18.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kaizoku_0x80B85590/func_80B85EA0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kaizoku_0x80B85590/func_80B85EA0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kaizoku_0x80B85590/func_80B85F48.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kaizoku_0x80B85590/func_80B85F48.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kaizoku_0x80B85590/func_80B85FA8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kaizoku_0x80B85590/func_80B85FA8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kaizoku_0x80B85590/func_80B86804.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kaizoku_0x80B85590/func_80B86804.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kaizoku_0x80B85590/func_80B868B8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kaizoku_0x80B85590/func_80B868B8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kaizoku_0x80B85590/func_80B86B58.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kaizoku_0x80B85590/func_80B86B58.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kaizoku_0x80B85590/func_80B86B74.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kaizoku_0x80B85590/func_80B86B74.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kaizoku_0x80B85590/func_80B872A4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kaizoku_0x80B85590/func_80B872A4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kaizoku_0x80B85590/func_80B872F4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kaizoku_0x80B85590/func_80B872F4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kaizoku_0x80B85590/func_80B874D8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kaizoku_0x80B85590/func_80B874D8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kaizoku_0x80B85590/func_80B8760C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kaizoku_0x80B85590/func_80B8760C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kaizoku_0x80B85590/func_80B87900.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kaizoku_0x80B85590/func_80B87900.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kaizoku_0x80B85590/func_80B8798C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kaizoku_0x80B85590/func_80B8798C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kaizoku_0x80B85590/func_80B87C7C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kaizoku_0x80B85590/func_80B87C7C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kaizoku_0x80B85590/func_80B87CF8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kaizoku_0x80B85590/func_80B87CF8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kaizoku_0x80B85590/func_80B87D3C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kaizoku_0x80B85590/func_80B87D3C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kaizoku_0x80B85590/func_80B87E28.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kaizoku_0x80B85590/func_80B87E28.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kaizoku_0x80B85590/func_80B87E9C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kaizoku_0x80B85590/func_80B87E9C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kaizoku_0x80B85590/func_80B87F70.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kaizoku_0x80B85590/func_80B87F70.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kaizoku_0x80B85590/func_80B87FDC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kaizoku_0x80B85590/func_80B87FDC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kaizoku_0x80B85590/func_80B88214.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kaizoku_0x80B85590/func_80B88214.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kaizoku_0x80B85590/func_80B88278.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kaizoku_0x80B85590/func_80B88278.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kaizoku_0x80B85590/func_80B8833C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kaizoku_0x80B85590/func_80B8833C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kaizoku_0x80B85590/func_80B88378.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kaizoku_0x80B85590/func_80B88378.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kaizoku_0x80B85590/func_80B88770.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kaizoku_0x80B85590/func_80B88770.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kaizoku_0x80B85590/func_80B887AC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kaizoku_0x80B85590/func_80B887AC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kaizoku_0x80B85590/func_80B88910.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kaizoku_0x80B85590/func_80B88910.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kaizoku_0x80B85590/func_80B88964.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kaizoku_0x80B85590/func_80B88964.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kaizoku_0x80B85590/func_80B88CD8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kaizoku_0x80B85590/func_80B88CD8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kaizoku_0x80B85590/func_80B88D6C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kaizoku_0x80B85590/func_80B88D6C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kaizoku_0x80B85590/func_80B891B8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kaizoku_0x80B85590/func_80B891B8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kaizoku_0x80B85590/func_80B89280.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kaizoku_0x80B85590/func_80B89280.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kaizoku_0x80B85590/func_80B893CC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kaizoku_0x80B85590/func_80B893CC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kaizoku_0x80B85590/func_80B894C0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kaizoku_0x80B85590/func_80B894C0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kaizoku_0x80B85590/func_80B8960C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kaizoku_0x80B85590/func_80B8960C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kaizoku_0x80B85590/func_80B8971C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kaizoku_0x80B85590/func_80B8971C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kaizoku_0x80B85590/func_80B89A08.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kaizoku_0x80B85590/func_80B89A08.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kaizoku_0x80B85590/EnKaizoku_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kaizoku_0x80B85590/EnKaizoku_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kaizoku_0x80B85590/func_80B8A318.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kaizoku_0x80B85590/func_80B8A318.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kaizoku_0x80B85590/func_80B8A468.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kaizoku_0x80B85590/func_80B8A468.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kaizoku_0x80B85590/func_80B8A6B0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kaizoku_0x80B85590/func_80B8A6B0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kaizoku_0x80B85590/func_80B8A718.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kaizoku_0x80B85590/func_80B8A718.asm") diff --git a/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c b/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c index 98d6a68083..90537a5844 100644 --- a/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c +++ b/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c @@ -23,74 +23,74 @@ const ActorInit En_Kakasi_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kakasi_0x8096F5E0/EnKakasi_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kakasi_0x8096F5E0/EnKakasi_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kakasi_0x8096F5E0/EnKakasi_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kakasi_0x8096F5E0/EnKakasi_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kakasi_0x8096F5E0/func_8096F800.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kakasi_0x8096F5E0/func_8096F800.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kakasi_0x8096F5E0/func_8096F88C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kakasi_0x8096F5E0/func_8096F88C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kakasi_0x8096F5E0/func_8096F8D8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kakasi_0x8096F5E0/func_8096F8D8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kakasi_0x8096F5E0/func_8096FA18.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kakasi_0x8096F5E0/func_8096FA18.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kakasi_0x8096F5E0/func_8096FAAC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kakasi_0x8096F5E0/func_8096FAAC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kakasi_0x8096F5E0/func_8096FBB8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kakasi_0x8096F5E0/func_8096FBB8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kakasi_0x8096F5E0/func_8096FC8C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kakasi_0x8096F5E0/func_8096FC8C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kakasi_0x8096F5E0/func_8096FCC4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kakasi_0x8096F5E0/func_8096FCC4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kakasi_0x8096F5E0/func_8096FDE8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kakasi_0x8096F5E0/func_8096FDE8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kakasi_0x8096F5E0/func_8096FE00.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kakasi_0x8096F5E0/func_8096FE00.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kakasi_0x8096F5E0/func_80970008.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kakasi_0x8096F5E0/func_80970008.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kakasi_0x8096F5E0/func_8097006C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kakasi_0x8096F5E0/func_8097006C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kakasi_0x8096F5E0/func_809705E4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kakasi_0x8096F5E0/func_809705E4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kakasi_0x8096F5E0/func_80970658.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kakasi_0x8096F5E0/func_80970658.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kakasi_0x8096F5E0/func_80970740.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kakasi_0x8096F5E0/func_80970740.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kakasi_0x8096F5E0/func_80970978.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kakasi_0x8096F5E0/func_80970978.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kakasi_0x8096F5E0/func_80970A10.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kakasi_0x8096F5E0/func_80970A10.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kakasi_0x8096F5E0/func_80970A9C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kakasi_0x8096F5E0/func_80970A9C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kakasi_0x8096F5E0/func_80970F20.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kakasi_0x8096F5E0/func_80970F20.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kakasi_0x8096F5E0/func_80970FF8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kakasi_0x8096F5E0/func_80970FF8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kakasi_0x8096F5E0/func_80971064.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kakasi_0x8096F5E0/func_80971064.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kakasi_0x8096F5E0/func_80971430.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kakasi_0x8096F5E0/func_80971430.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kakasi_0x8096F5E0/func_80971440.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kakasi_0x8096F5E0/func_80971440.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kakasi_0x8096F5E0/func_809714BC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kakasi_0x8096F5E0/func_809714BC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kakasi_0x8096F5E0/func_80971794.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kakasi_0x8096F5E0/func_80971794.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kakasi_0x8096F5E0/func_809717D0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kakasi_0x8096F5E0/func_809717D0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kakasi_0x8096F5E0/func_8097185C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kakasi_0x8096F5E0/func_8097185C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kakasi_0x8096F5E0/func_8097193C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kakasi_0x8096F5E0/func_8097193C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kakasi_0x8096F5E0/func_80971A38.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kakasi_0x8096F5E0/func_80971A38.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kakasi_0x8096F5E0/func_80971A64.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kakasi_0x8096F5E0/func_80971A64.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kakasi_0x8096F5E0/func_80971AD4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kakasi_0x8096F5E0/func_80971AD4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kakasi_0x8096F5E0/EnKakasi_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kakasi_0x8096F5E0/EnKakasi_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kakasi_0x8096F5E0/func_80971CE0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kakasi_0x8096F5E0/func_80971CE0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kakasi_0x8096F5E0/EnKakasi_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kakasi_0x8096F5E0/EnKakasi_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Kame/z_en_kame.c b/src/overlays/actors/ovl_En_Kame/z_en_kame.c index 51f3a70d47..61b5c38acd 100644 --- a/src/overlays/actors/ovl_En_Kame/z_en_kame.c +++ b/src/overlays/actors/ovl_En_Kame/z_en_kame.c @@ -23,82 +23,82 @@ const ActorInit En_Kame_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kame_0x80AD6DD0/EnKame_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kame_0x80AD6DD0/EnKame_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kame_0x80AD6DD0/EnKame_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kame_0x80AD6DD0/EnKame_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kame_0x80AD6DD0/func_80AD6F34.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kame_0x80AD6DD0/func_80AD6F34.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kame_0x80AD6DD0/func_80AD6F9C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kame_0x80AD6DD0/func_80AD6F9C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kame_0x80AD6DD0/func_80AD7018.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kame_0x80AD6DD0/func_80AD7018.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kame_0x80AD6DD0/func_80AD70A0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kame_0x80AD6DD0/func_80AD70A0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kame_0x80AD6DD0/func_80AD70EC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kame_0x80AD6DD0/func_80AD70EC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kame_0x80AD6DD0/func_80AD71B4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kame_0x80AD6DD0/func_80AD71B4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kame_0x80AD6DD0/func_80AD7254.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kame_0x80AD6DD0/func_80AD7254.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kame_0x80AD6DD0/func_80AD73A8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kame_0x80AD6DD0/func_80AD73A8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kame_0x80AD6DD0/func_80AD7424.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kame_0x80AD6DD0/func_80AD7424.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kame_0x80AD6DD0/func_80AD7568.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kame_0x80AD6DD0/func_80AD7568.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kame_0x80AD6DD0/func_80AD75A8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kame_0x80AD6DD0/func_80AD75A8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kame_0x80AD6DD0/func_80AD76CC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kame_0x80AD6DD0/func_80AD76CC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kame_0x80AD6DD0/func_80AD7798.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kame_0x80AD6DD0/func_80AD7798.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kame_0x80AD6DD0/func_80AD792C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kame_0x80AD6DD0/func_80AD792C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kame_0x80AD6DD0/func_80AD7948.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kame_0x80AD6DD0/func_80AD7948.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kame_0x80AD6DD0/func_80AD7B18.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kame_0x80AD6DD0/func_80AD7B18.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kame_0x80AD6DD0/func_80AD7B90.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kame_0x80AD6DD0/func_80AD7B90.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kame_0x80AD6DD0/func_80AD7C54.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kame_0x80AD6DD0/func_80AD7C54.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kame_0x80AD6DD0/func_80AD7D40.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kame_0x80AD6DD0/func_80AD7D40.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kame_0x80AD6DD0/func_80AD7DA4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kame_0x80AD6DD0/func_80AD7DA4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kame_0x80AD6DD0/func_80AD7E0C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kame_0x80AD6DD0/func_80AD7E0C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kame_0x80AD6DD0/func_80AD7EC0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kame_0x80AD6DD0/func_80AD7EC0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kame_0x80AD6DD0/func_80AD7F10.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kame_0x80AD6DD0/func_80AD7F10.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kame_0x80AD6DD0/func_80AD7FA4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kame_0x80AD6DD0/func_80AD7FA4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kame_0x80AD6DD0/func_80AD7FF8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kame_0x80AD6DD0/func_80AD7FF8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kame_0x80AD6DD0/func_80AD8060.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kame_0x80AD6DD0/func_80AD8060.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kame_0x80AD6DD0/func_80AD810C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kame_0x80AD6DD0/func_80AD810C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kame_0x80AD6DD0/func_80AD8148.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kame_0x80AD6DD0/func_80AD8148.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kame_0x80AD6DD0/func_80AD825C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kame_0x80AD6DD0/func_80AD825C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kame_0x80AD6DD0/func_80AD8364.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kame_0x80AD6DD0/func_80AD8364.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kame_0x80AD6DD0/func_80AD8388.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kame_0x80AD6DD0/func_80AD8388.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kame_0x80AD6DD0/func_80AD84C0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kame_0x80AD6DD0/func_80AD84C0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kame_0x80AD6DD0/EnKame_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kame_0x80AD6DD0/EnKame_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kame_0x80AD6DD0/func_80AD8A48.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kame_0x80AD6DD0/func_80AD8A48.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kame_0x80AD6DD0/func_80AD8AF8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kame_0x80AD6DD0/func_80AD8AF8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kame_0x80AD6DD0/EnKame_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kame_0x80AD6DD0/EnKame_Draw.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kame_0x80AD6DD0/func_80AD8CEC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kame_0x80AD6DD0/func_80AD8CEC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kame_0x80AD6DD0/func_80AD8D64.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kame_0x80AD6DD0/func_80AD8D64.asm") 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 bf17828edb..c23ddd1d05 100644 --- a/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c +++ b/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c @@ -23,14 +23,14 @@ const ActorInit En_Kanban_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kanban_0x80954960/func_80954960.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kanban_0x80954960/func_80954960.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kanban_0x80954960/EnKanban_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kanban_0x80954960/EnKanban_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kanban_0x80954960/EnKanban_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kanban_0x80954960/EnKanban_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kanban_0x80954960/func_80954BE8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kanban_0x80954960/func_80954BE8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kanban_0x80954960/EnKanban_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kanban_0x80954960/EnKanban_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kanban_0x80954960/EnKanban_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kanban_0x80954960/EnKanban_Draw.asm") 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 6826bdadc5..f58e9a2255 100644 --- a/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.c +++ b/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.c @@ -23,62 +23,62 @@ const ActorInit En_Karebaba_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Karebaba_0x808F1200/EnKarebaba_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Karebaba_0x808F1200/EnKarebaba_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Karebaba_0x808F1200/EnKarebaba_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Karebaba_0x808F1200/EnKarebaba_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Karebaba_0x808F1200/func_808F1374.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Karebaba_0x808F1200/func_808F1374.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Karebaba_0x808F1200/func_808F13FC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Karebaba_0x808F1200/func_808F13FC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Karebaba_0x808F1200/func_808F152C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Karebaba_0x808F1200/func_808F152C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Karebaba_0x808F1200/func_808F155C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Karebaba_0x808F1200/func_808F155C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Karebaba_0x808F1200/func_808F15B0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Karebaba_0x808F1200/func_808F15B0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Karebaba_0x808F1200/func_808F1648.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Karebaba_0x808F1200/func_808F1648.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Karebaba_0x808F1200/func_808F169C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Karebaba_0x808F1200/func_808F169C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Karebaba_0x808F1200/func_808F16FC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Karebaba_0x808F1200/func_808F16FC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Karebaba_0x808F1200/func_808F1778.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Karebaba_0x808F1200/func_808F1778.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Karebaba_0x808F1200/func_808F1878.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Karebaba_0x808F1200/func_808F1878.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Karebaba_0x808F1200/func_808F190C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Karebaba_0x808F1200/func_808F190C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Karebaba_0x808F1200/func_808F1A3C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Karebaba_0x808F1200/func_808F1A3C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Karebaba_0x808F1200/func_808F1A58.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Karebaba_0x808F1200/func_808F1A58.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Karebaba_0x808F1200/func_808F1BF8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Karebaba_0x808F1200/func_808F1BF8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Karebaba_0x808F1200/func_808F1C84.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Karebaba_0x808F1200/func_808F1C84.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Karebaba_0x808F1200/func_808F1FAC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Karebaba_0x808F1200/func_808F1FAC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Karebaba_0x808F1200/func_808F200C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Karebaba_0x808F1200/func_808F200C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Karebaba_0x808F1200/func_808F20FC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Karebaba_0x808F1200/func_808F20FC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Karebaba_0x808F1200/func_808F21A4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Karebaba_0x808F1200/func_808F21A4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Karebaba_0x808F1200/func_808F220C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Karebaba_0x808F1200/func_808F220C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Karebaba_0x808F1200/func_808F228C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Karebaba_0x808F1200/func_808F228C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Karebaba_0x808F1200/func_808F238C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Karebaba_0x808F1200/func_808F238C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Karebaba_0x808F1200/func_808F241C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Karebaba_0x808F1200/func_808F241C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Karebaba_0x808F1200/func_808F24F8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Karebaba_0x808F1200/func_808F24F8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Karebaba_0x808F1200/func_808F254C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Karebaba_0x808F1200/func_808F254C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Karebaba_0x808F1200/EnKarebaba_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Karebaba_0x808F1200/EnKarebaba_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Karebaba_0x808F1200/func_808F280C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Karebaba_0x808F1200/func_808F280C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Karebaba_0x808F1200/EnKarebaba_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Karebaba_0x808F1200/EnKarebaba_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Kbt/z_en_kbt.c b/src/overlays/actors/ovl_En_Kbt/z_en_kbt.c index 88e17577b4..e8b3dfd0fd 100644 --- a/src/overlays/actors/ovl_En_Kbt/z_en_kbt.c +++ b/src/overlays/actors/ovl_En_Kbt/z_en_kbt.c @@ -23,32 +23,32 @@ const ActorInit En_Kbt_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kbt_0x80B33D30/EnKbt_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kbt_0x80B33D30/EnKbt_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kbt_0x80B33D30/EnKbt_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kbt_0x80B33D30/EnKbt_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kbt_0x80B33D30/func_80B33E64.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kbt_0x80B33D30/func_80B33E64.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kbt_0x80B33D30/func_80B33E8C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kbt_0x80B33D30/func_80B33E8C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kbt_0x80B33D30/func_80B33EF0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kbt_0x80B33D30/func_80B33EF0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kbt_0x80B33D30/func_80B3403C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kbt_0x80B33D30/func_80B3403C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kbt_0x80B33D30/func_80B34078.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kbt_0x80B33D30/func_80B34078.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kbt_0x80B33D30/func_80B3415C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kbt_0x80B33D30/func_80B3415C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kbt_0x80B33D30/func_80B34314.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kbt_0x80B33D30/func_80B34314.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kbt_0x80B33D30/func_80B34574.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kbt_0x80B33D30/func_80B34574.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kbt_0x80B33D30/func_80B34598.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kbt_0x80B33D30/func_80B34598.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kbt_0x80B33D30/EnKbt_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kbt_0x80B33D30/EnKbt_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kbt_0x80B33D30/func_80B349C8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kbt_0x80B33D30/func_80B349C8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kbt_0x80B33D30/func_80B34A00.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kbt_0x80B33D30/func_80B34A00.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kbt_0x80B33D30/EnKbt_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kbt_0x80B33D30/EnKbt_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Kendo_Js/z_en_kendo_js.c b/src/overlays/actors/ovl_En_Kendo_Js/z_en_kendo_js.c index c9bf5829fa..2b416cb5a7 100644 --- a/src/overlays/actors/ovl_En_Kendo_Js/z_en_kendo_js.c +++ b/src/overlays/actors/ovl_En_Kendo_Js/z_en_kendo_js.c @@ -23,68 +23,68 @@ const ActorInit En_Kendo_Js_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kendo_Js_0x80B262A0/EnKendoJs_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kendo_Js_0x80B262A0/EnKendoJs_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kendo_Js_0x80B262A0/EnKendoJs_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kendo_Js_0x80B262A0/EnKendoJs_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kendo_Js_0x80B262A0/func_80B26538.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kendo_Js_0x80B262A0/func_80B26538.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kendo_Js_0x80B262A0/func_80B2654C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kendo_Js_0x80B262A0/func_80B2654C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kendo_Js_0x80B262A0/func_80B26758.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kendo_Js_0x80B262A0/func_80B26758.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kendo_Js_0x80B262A0/func_80B269A4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kendo_Js_0x80B262A0/func_80B269A4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kendo_Js_0x80B262A0/func_80B26AE8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kendo_Js_0x80B262A0/func_80B26AE8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kendo_Js_0x80B262A0/func_80B26AFC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kendo_Js_0x80B262A0/func_80B26AFC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kendo_Js_0x80B262A0/func_80B26BF8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kendo_Js_0x80B262A0/func_80B26BF8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kendo_Js_0x80B262A0/func_80B26EB4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kendo_Js_0x80B262A0/func_80B26EB4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kendo_Js_0x80B262A0/func_80B26F14.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kendo_Js_0x80B262A0/func_80B26F14.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kendo_Js_0x80B262A0/func_80B26F6C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kendo_Js_0x80B262A0/func_80B26F6C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kendo_Js_0x80B262A0/func_80B2701C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kendo_Js_0x80B262A0/func_80B2701C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kendo_Js_0x80B262A0/func_80B27030.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kendo_Js_0x80B262A0/func_80B27030.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kendo_Js_0x80B262A0/func_80B2714C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kendo_Js_0x80B262A0/func_80B2714C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kendo_Js_0x80B262A0/func_80B27188.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kendo_Js_0x80B262A0/func_80B27188.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kendo_Js_0x80B262A0/func_80B273D0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kendo_Js_0x80B262A0/func_80B273D0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kendo_Js_0x80B262A0/func_80B2740C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kendo_Js_0x80B262A0/func_80B2740C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kendo_Js_0x80B262A0/func_80B274BC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kendo_Js_0x80B262A0/func_80B274BC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kendo_Js_0x80B262A0/func_80B276C4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kendo_Js_0x80B262A0/func_80B276C4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kendo_Js_0x80B262A0/func_80B276D8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kendo_Js_0x80B262A0/func_80B276D8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kendo_Js_0x80B262A0/func_80B27760.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kendo_Js_0x80B262A0/func_80B27760.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kendo_Js_0x80B262A0/func_80B27774.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kendo_Js_0x80B262A0/func_80B27774.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kendo_Js_0x80B262A0/func_80B2783C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kendo_Js_0x80B262A0/func_80B2783C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kendo_Js_0x80B262A0/func_80B27880.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kendo_Js_0x80B262A0/func_80B27880.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kendo_Js_0x80B262A0/func_80B278C4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kendo_Js_0x80B262A0/func_80B278C4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kendo_Js_0x80B262A0/func_80B279AC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kendo_Js_0x80B262A0/func_80B279AC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kendo_Js_0x80B262A0/func_80B279F0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kendo_Js_0x80B262A0/func_80B279F0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kendo_Js_0x80B262A0/func_80B27A90.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kendo_Js_0x80B262A0/func_80B27A90.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kendo_Js_0x80B262A0/EnKendoJs_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kendo_Js_0x80B262A0/EnKendoJs_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kendo_Js_0x80B262A0/func_80B27B54.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kendo_Js_0x80B262A0/func_80B27B54.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kendo_Js_0x80B262A0/func_80B27B8C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kendo_Js_0x80B262A0/func_80B27B8C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kendo_Js_0x80B262A0/EnKendoJs_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kendo_Js_0x80B262A0/EnKendoJs_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Kgy/z_en_kgy.c b/src/overlays/actors/ovl_En_Kgy/z_en_kgy.c index 5c9c8236a3..eccaff2398 100644 --- a/src/overlays/actors/ovl_En_Kgy/z_en_kgy.c +++ b/src/overlays/actors/ovl_En_Kgy/z_en_kgy.c @@ -23,100 +23,100 @@ const ActorInit En_Kgy_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kgy_0x80B40800/EnKgy_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kgy_0x80B40800/EnKgy_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kgy_0x80B40800/EnKgy_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kgy_0x80B40800/EnKgy_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kgy_0x80B40800/func_80B40B38.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kgy_0x80B40800/func_80B40B38.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kgy_0x80B40800/func_80B40BC0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kgy_0x80B40800/func_80B40BC0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kgy_0x80B40800/func_80B40BFC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kgy_0x80B40800/func_80B40BFC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kgy_0x80B40800/func_80B40C38.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kgy_0x80B40800/func_80B40C38.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kgy_0x80B40800/func_80B40C74.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kgy_0x80B40800/func_80B40C74.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kgy_0x80B40800/func_80B40D00.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kgy_0x80B40800/func_80B40D00.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kgy_0x80B40800/func_80B40D30.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kgy_0x80B40800/func_80B40D30.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kgy_0x80B40800/func_80B40D64.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kgy_0x80B40800/func_80B40D64.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kgy_0x80B40800/func_80B40D8C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kgy_0x80B40800/func_80B40D8C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kgy_0x80B40800/func_80B40DB4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kgy_0x80B40800/func_80B40DB4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kgy_0x80B40800/func_80B40E18.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kgy_0x80B40800/func_80B40E18.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kgy_0x80B40800/func_80B40E38.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kgy_0x80B40800/func_80B40E38.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kgy_0x80B40800/func_80B40E54.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kgy_0x80B40800/func_80B40E54.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kgy_0x80B40800/func_80B40E74.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kgy_0x80B40800/func_80B40E74.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kgy_0x80B40800/func_80B40EBC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kgy_0x80B40800/func_80B40EBC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kgy_0x80B40800/func_80B40EE8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kgy_0x80B40800/func_80B40EE8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kgy_0x80B40800/func_80B411DC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kgy_0x80B40800/func_80B411DC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kgy_0x80B40800/func_80B41368.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kgy_0x80B40800/func_80B41368.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kgy_0x80B40800/func_80B413C8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kgy_0x80B40800/func_80B413C8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kgy_0x80B40800/func_80B41460.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kgy_0x80B40800/func_80B41460.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kgy_0x80B40800/func_80B41528.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kgy_0x80B40800/func_80B41528.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kgy_0x80B40800/func_80B415A8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kgy_0x80B40800/func_80B415A8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kgy_0x80B40800/func_80B4163C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kgy_0x80B40800/func_80B4163C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kgy_0x80B40800/func_80B417B8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kgy_0x80B40800/func_80B417B8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kgy_0x80B40800/func_80B41858.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kgy_0x80B40800/func_80B41858.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kgy_0x80B40800/func_80B418C4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kgy_0x80B40800/func_80B418C4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kgy_0x80B40800/func_80B419B0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kgy_0x80B40800/func_80B419B0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kgy_0x80B40800/func_80B41A48.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kgy_0x80B40800/func_80B41A48.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kgy_0x80B40800/func_80B41ACC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kgy_0x80B40800/func_80B41ACC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kgy_0x80B40800/func_80B41C30.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kgy_0x80B40800/func_80B41C30.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kgy_0x80B40800/func_80B41C54.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kgy_0x80B40800/func_80B41C54.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kgy_0x80B40800/func_80B41CBC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kgy_0x80B40800/func_80B41CBC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kgy_0x80B40800/func_80B41D64.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kgy_0x80B40800/func_80B41D64.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kgy_0x80B40800/func_80B41E18.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kgy_0x80B40800/func_80B41E18.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kgy_0x80B40800/func_80B42508.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kgy_0x80B40800/func_80B42508.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kgy_0x80B40800/func_80B425A0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kgy_0x80B40800/func_80B425A0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kgy_0x80B40800/func_80B42660.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kgy_0x80B40800/func_80B42660.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kgy_0x80B40800/func_80B42714.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kgy_0x80B40800/func_80B42714.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kgy_0x80B40800/func_80B427C8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kgy_0x80B40800/func_80B427C8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kgy_0x80B40800/func_80B4296C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kgy_0x80B40800/func_80B4296C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kgy_0x80B40800/func_80B42A8C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kgy_0x80B40800/func_80B42A8C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kgy_0x80B40800/func_80B42D28.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kgy_0x80B40800/func_80B42D28.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kgy_0x80B40800/EnKgy_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kgy_0x80B40800/EnKgy_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kgy_0x80B40800/func_80B42FA0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kgy_0x80B40800/func_80B42FA0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kgy_0x80B40800/func_80B43008.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kgy_0x80B40800/func_80B43008.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kgy_0x80B40800/func_80B43074.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kgy_0x80B40800/func_80B43074.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kgy_0x80B40800/EnKgy_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kgy_0x80B40800/EnKgy_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Kitan/z_en_kitan.c b/src/overlays/actors/ovl_En_Kitan/z_en_kitan.c index 15b7302217..f1c4979ad2 100644 --- a/src/overlays/actors/ovl_En_Kitan/z_en_kitan.c +++ b/src/overlays/actors/ovl_En_Kitan/z_en_kitan.c @@ -22,36 +22,36 @@ const ActorInit En_Kitan_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kitan_0x80C090D0/EnKitan_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kitan_0x80C090D0/EnKitan_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kitan_0x80C090D0/EnKitan_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kitan_0x80C090D0/EnKitan_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kitan_0x80C090D0/func_80C0923C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kitan_0x80C090D0/func_80C0923C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kitan_0x80C090D0/func_80C09390.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kitan_0x80C090D0/func_80C09390.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kitan_0x80C090D0/func_80C09418.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kitan_0x80C090D0/func_80C09418.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kitan_0x80C090D0/func_80C094A8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kitan_0x80C090D0/func_80C094A8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kitan_0x80C090D0/func_80C09518.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kitan_0x80C090D0/func_80C09518.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kitan_0x80C090D0/func_80C095C8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kitan_0x80C090D0/func_80C095C8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kitan_0x80C090D0/func_80C09648.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kitan_0x80C090D0/func_80C09648.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kitan_0x80C090D0/func_80C09708.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kitan_0x80C090D0/func_80C09708.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kitan_0x80C090D0/func_80C09990.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kitan_0x80C090D0/func_80C09990.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kitan_0x80C090D0/func_80C09AA4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kitan_0x80C090D0/func_80C09AA4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kitan_0x80C090D0/func_80C09B50.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kitan_0x80C090D0/func_80C09B50.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kitan_0x80C090D0/EnKitan_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kitan_0x80C090D0/EnKitan_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kitan_0x80C090D0/func_80C09C74.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kitan_0x80C090D0/func_80C09C74.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kitan_0x80C090D0/func_80C09C90.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kitan_0x80C090D0/func_80C09C90.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kitan_0x80C090D0/func_80C09CD0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kitan_0x80C090D0/func_80C09CD0.asm") diff --git a/src/overlays/actors/ovl_En_Knight/z_en_knight.c b/src/overlays/actors/ovl_En_Knight/z_en_knight.c index 559ace60f7..ed8be3a547 100644 --- a/src/overlays/actors/ovl_En_Knight/z_en_knight.c +++ b/src/overlays/actors/ovl_En_Knight/z_en_knight.c @@ -23,192 +23,192 @@ const ActorInit En_Knight_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809B20F0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Knight_0x809B20F0/func_809B20F0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809B21F4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Knight_0x809B20F0/func_809B21F4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809B22CC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Knight_0x809B20F0/func_809B22CC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/EnKnight_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Knight_0x809B20F0/EnKnight_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/EnKnight_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Knight_0x809B20F0/EnKnight_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809B2DD0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Knight_0x809B20F0/func_809B2DD0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809B2F54.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Knight_0x809B20F0/func_809B2F54.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809B316C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Knight_0x809B20F0/func_809B316C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809B31E8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Knight_0x809B20F0/func_809B31E8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809B329C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Knight_0x809B20F0/func_809B329C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809B331C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Knight_0x809B20F0/func_809B331C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809B3394.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Knight_0x809B20F0/func_809B3394.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809B33F0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Knight_0x809B20F0/func_809B33F0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809B35BC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Knight_0x809B20F0/func_809B35BC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809B3618.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Knight_0x809B20F0/func_809B3618.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809B37C8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Knight_0x809B20F0/func_809B37C8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809B3834.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Knight_0x809B20F0/func_809B3834.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809B389C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Knight_0x809B20F0/func_809B389C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809B3958.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Knight_0x809B20F0/func_809B3958.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809B3A7C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Knight_0x809B20F0/func_809B3A7C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809B3B94.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Knight_0x809B20F0/func_809B3B94.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809B3CD0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Knight_0x809B20F0/func_809B3CD0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809B3DAC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Knight_0x809B20F0/func_809B3DAC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809B3E9C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Knight_0x809B20F0/func_809B3E9C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809B3F0C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Knight_0x809B20F0/func_809B3F0C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809B4024.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Knight_0x809B20F0/func_809B4024.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809B40E8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Knight_0x809B20F0/func_809B40E8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809B41D8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Knight_0x809B20F0/func_809B41D8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809B41F8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Knight_0x809B20F0/func_809B41F8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809B42B8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Knight_0x809B20F0/func_809B42B8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809B4308.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Knight_0x809B20F0/func_809B4308.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809B47EC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Knight_0x809B20F0/func_809B47EC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809B4880.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Knight_0x809B20F0/func_809B4880.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809B4BFC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Knight_0x809B20F0/func_809B4BFC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809B4C58.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Knight_0x809B20F0/func_809B4C58.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809B4E84.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Knight_0x809B20F0/func_809B4E84.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809B4ED8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Knight_0x809B20F0/func_809B4ED8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809B4F90.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Knight_0x809B20F0/func_809B4F90.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809B5058.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Knight_0x809B20F0/func_809B5058.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809B51DC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Knight_0x809B20F0/func_809B51DC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809B52E8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Knight_0x809B20F0/func_809B52E8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809B5634.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Knight_0x809B20F0/func_809B5634.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809B5698.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Knight_0x809B20F0/func_809B5698.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809B58D4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Knight_0x809B20F0/func_809B58D4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809B592C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Knight_0x809B20F0/func_809B592C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809B59FC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Knight_0x809B20F0/func_809B59FC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809B5B08.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Knight_0x809B20F0/func_809B5B08.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809B5D38.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Knight_0x809B20F0/func_809B5D38.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809B5D54.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Knight_0x809B20F0/func_809B5D54.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809B5E90.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Knight_0x809B20F0/func_809B5E90.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809B5ED0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Knight_0x809B20F0/func_809B5ED0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809B5FA8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Knight_0x809B20F0/func_809B5FA8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809B601C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Knight_0x809B20F0/func_809B601C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809B631C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Knight_0x809B20F0/func_809B631C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809B638C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Knight_0x809B20F0/func_809B638C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809B6528.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Knight_0x809B20F0/func_809B6528.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809B6574.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Knight_0x809B20F0/func_809B6574.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809B6764.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Knight_0x809B20F0/func_809B6764.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809B6C04.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Knight_0x809B20F0/func_809B6C04.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809B6C54.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Knight_0x809B20F0/func_809B6C54.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809B6D38.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Knight_0x809B20F0/func_809B6D38.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809B6D94.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Knight_0x809B20F0/func_809B6D94.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809B6EC8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Knight_0x809B20F0/func_809B6EC8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809B6F40.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Knight_0x809B20F0/func_809B6F40.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809B7190.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Knight_0x809B20F0/func_809B7190.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809B71DC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Knight_0x809B20F0/func_809B71DC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809B7708.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Knight_0x809B20F0/func_809B7708.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809B7778.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Knight_0x809B20F0/func_809B7778.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809B78A4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Knight_0x809B20F0/func_809B78A4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809B7950.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Knight_0x809B20F0/func_809B7950.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809B842C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Knight_0x809B20F0/func_809B842C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809B8458.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Knight_0x809B20F0/func_809B8458.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809B9A18.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Knight_0x809B20F0/func_809B9A18.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809B9D24.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Knight_0x809B20F0/func_809B9D24.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809B9E00.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Knight_0x809B20F0/func_809B9E00.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809B9F8C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Knight_0x809B20F0/func_809B9F8C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809BA058.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Knight_0x809B20F0/func_809BA058.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809BA0CC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Knight_0x809B20F0/func_809BA0CC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809BA940.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Knight_0x809B20F0/func_809BA940.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809BA978.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Knight_0x809B20F0/func_809BA978.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/EnKnight_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Knight_0x809B20F0/EnKnight_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809BC2C4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Knight_0x809B20F0/func_809BC2C4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809BC67C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Knight_0x809B20F0/func_809BC67C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809BC720.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Knight_0x809B20F0/func_809BC720.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809BC8B4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Knight_0x809B20F0/func_809BC8B4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809BCA80.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Knight_0x809B20F0/func_809BCA80.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809BCAD8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Knight_0x809B20F0/func_809BCAD8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809BCB54.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Knight_0x809B20F0/func_809BCB54.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809BCB78.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Knight_0x809B20F0/func_809BCB78.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/EnKnight_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Knight_0x809B20F0/EnKnight_Draw.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809BD1AC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Knight_0x809B20F0/func_809BD1AC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809BD260.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Knight_0x809B20F0/func_809BD260.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809BD29C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Knight_0x809B20F0/func_809BD29C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809BD490.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Knight_0x809B20F0/func_809BD490.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809BD858.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Knight_0x809B20F0/func_809BD858.asm") diff --git a/src/overlays/actors/ovl_En_Kujiya/z_en_kujiya.c b/src/overlays/actors/ovl_En_Kujiya/z_en_kujiya.c index a86a46e415..63adb36c2d 100644 --- a/src/overlays/actors/ovl_En_Kujiya/z_en_kujiya.c +++ b/src/overlays/actors/ovl_En_Kujiya/z_en_kujiya.c @@ -23,44 +23,44 @@ const ActorInit En_Kujiya_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kujiya_0x80BB08E0/EnKujiya_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kujiya_0x80BB08E0/EnKujiya_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kujiya_0x80BB08E0/EnKujiya_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kujiya_0x80BB08E0/EnKujiya_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kujiya_0x80BB08E0/func_80BB09A8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kujiya_0x80BB08E0/func_80BB09A8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kujiya_0x80BB08E0/func_80BB09BC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kujiya_0x80BB08E0/func_80BB09BC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kujiya_0x80BB08E0/func_80BB0B28.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kujiya_0x80BB08E0/func_80BB0B28.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kujiya_0x80BB08E0/func_80BB0BF8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kujiya_0x80BB08E0/func_80BB0BF8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kujiya_0x80BB08E0/func_80BB0E44.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kujiya_0x80BB08E0/func_80BB0E44.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kujiya_0x80BB08E0/func_80BB0E58.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kujiya_0x80BB08E0/func_80BB0E58.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kujiya_0x80BB08E0/func_80BB0F24.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kujiya_0x80BB08E0/func_80BB0F24.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kujiya_0x80BB08E0/func_80BB0F38.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kujiya_0x80BB08E0/func_80BB0F38.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kujiya_0x80BB08E0/func_80BB0F94.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kujiya_0x80BB08E0/func_80BB0F94.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kujiya_0x80BB08E0/func_80BB0FA8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kujiya_0x80BB08E0/func_80BB0FA8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kujiya_0x80BB08E0/func_80BB0FF8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kujiya_0x80BB08E0/func_80BB0FF8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kujiya_0x80BB08E0/func_80BB1088.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kujiya_0x80BB08E0/func_80BB1088.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kujiya_0x80BB08E0/func_80BB10F8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kujiya_0x80BB08E0/func_80BB10F8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kujiya_0x80BB08E0/func_80BB1168.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kujiya_0x80BB08E0/func_80BB1168.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kujiya_0x80BB08E0/func_80BB1180.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kujiya_0x80BB08E0/func_80BB1180.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kujiya_0x80BB08E0/func_80BB1250.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kujiya_0x80BB08E0/func_80BB1250.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kujiya_0x80BB08E0/func_80BB1268.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kujiya_0x80BB08E0/func_80BB1268.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kujiya_0x80BB08E0/EnKujiya_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kujiya_0x80BB08E0/EnKujiya_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kujiya_0x80BB08E0/EnKujiya_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kujiya_0x80BB08E0/EnKujiya_Draw.asm") 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 9406852a10..19a8e59e89 100644 --- a/src/overlays/actors/ovl_En_Kusa/z_en_kusa.c +++ b/src/overlays/actors/ovl_En_Kusa/z_en_kusa.c @@ -22,64 +22,64 @@ const ActorInit En_Kusa_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa_0x809349E0/func_809349E0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kusa_0x809349E0/func_809349E0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa_0x809349E0/func_80934AB4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kusa_0x809349E0/func_80934AB4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa_0x809349E0/func_80934F58.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kusa_0x809349E0/func_80934F58.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa_0x809349E0/func_80934FFC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kusa_0x809349E0/func_80934FFC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa_0x809349E0/func_809350C4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kusa_0x809349E0/func_809350C4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa_0x809349E0/func_809350F8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kusa_0x809349E0/func_809350F8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa_0x809349E0/func_8093517C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kusa_0x809349E0/func_8093517C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa_0x809349E0/func_809351A0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kusa_0x809349E0/func_809351A0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa_0x809349E0/func_809354F8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kusa_0x809349E0/func_809354F8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa_0x809349E0/func_809355A4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kusa_0x809349E0/func_809355A4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa_0x809349E0/func_8093561C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kusa_0x809349E0/func_8093561C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa_0x809349E0/EnKusa_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kusa_0x809349E0/EnKusa_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa_0x809349E0/EnKusa_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kusa_0x809349E0/EnKusa_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa_0x809349E0/func_809358C4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kusa_0x809349E0/func_809358C4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa_0x809349E0/func_809358D8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kusa_0x809349E0/func_809358D8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa_0x809349E0/func_80935988.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kusa_0x809349E0/func_80935988.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa_0x809349E0/func_809359AC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kusa_0x809349E0/func_809359AC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa_0x809349E0/func_80935B94.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kusa_0x809349E0/func_80935B94.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa_0x809349E0/func_80935BBC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kusa_0x809349E0/func_80935BBC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa_0x809349E0/func_80935CE8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kusa_0x809349E0/func_80935CE8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa_0x809349E0/func_80935D64.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kusa_0x809349E0/func_80935D64.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa_0x809349E0/func_80936120.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kusa_0x809349E0/func_80936120.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa_0x809349E0/func_80936168.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kusa_0x809349E0/func_80936168.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa_0x809349E0/func_809361A4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kusa_0x809349E0/func_809361A4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa_0x809349E0/func_809361B4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kusa_0x809349E0/func_809361B4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa_0x809349E0/func_80936220.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kusa_0x809349E0/func_80936220.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa_0x809349E0/func_80936290.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kusa_0x809349E0/func_80936290.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa_0x809349E0/func_809362D8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kusa_0x809349E0/func_809362D8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa_0x809349E0/EnKusa_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kusa_0x809349E0/EnKusa_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa_0x809349E0/func_80936414.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kusa_0x809349E0/func_80936414.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa_0x809349E0/func_809365CC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kusa_0x809349E0/func_809365CC.asm") diff --git a/src/overlays/actors/ovl_En_Kusa2/z_en_kusa2.c b/src/overlays/actors/ovl_En_Kusa2/z_en_kusa2.c index 804e8b9c58..61994aa5ec 100644 --- a/src/overlays/actors/ovl_En_Kusa2/z_en_kusa2.c +++ b/src/overlays/actors/ovl_En_Kusa2/z_en_kusa2.c @@ -23,124 +23,124 @@ const ActorInit En_Kusa2_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa2_0x80A5B160/func_80A5B160.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kusa2_0x80A5B160/func_80A5B160.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa2_0x80A5B160/func_80A5B334.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kusa2_0x80A5B160/func_80A5B334.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa2_0x80A5B160/func_80A5B3BC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kusa2_0x80A5B160/func_80A5B3BC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa2_0x80A5B160/func_80A5B490.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kusa2_0x80A5B160/func_80A5B490.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa2_0x80A5B160/func_80A5B508.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kusa2_0x80A5B160/func_80A5B508.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa2_0x80A5B160/func_80A5B954.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kusa2_0x80A5B160/func_80A5B954.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa2_0x80A5B160/func_80A5BA58.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kusa2_0x80A5B160/func_80A5BA58.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa2_0x80A5B160/func_80A5BAFC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kusa2_0x80A5B160/func_80A5BAFC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa2_0x80A5B160/func_80A5BB40.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kusa2_0x80A5B160/func_80A5BB40.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa2_0x80A5B160/func_80A5BD14.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kusa2_0x80A5B160/func_80A5BD14.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa2_0x80A5B160/func_80A5BD94.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kusa2_0x80A5B160/func_80A5BD94.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa2_0x80A5B160/func_80A5BDB0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kusa2_0x80A5B160/func_80A5BDB0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa2_0x80A5B160/func_80A5BF38.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kusa2_0x80A5B160/func_80A5BF38.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa2_0x80A5B160/func_80A5BF60.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kusa2_0x80A5B160/func_80A5BF60.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa2_0x80A5B160/func_80A5BF84.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kusa2_0x80A5B160/func_80A5BF84.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa2_0x80A5B160/func_80A5BFD8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kusa2_0x80A5B160/func_80A5BFD8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa2_0x80A5B160/func_80A5C074.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kusa2_0x80A5B160/func_80A5C074.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa2_0x80A5B160/func_80A5C0B8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kusa2_0x80A5B160/func_80A5C0B8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa2_0x80A5B160/func_80A5C104.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kusa2_0x80A5B160/func_80A5C104.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa2_0x80A5B160/func_80A5C2FC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kusa2_0x80A5B160/func_80A5C2FC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa2_0x80A5B160/func_80A5C410.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kusa2_0x80A5B160/func_80A5C410.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa2_0x80A5B160/func_80A5C70C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kusa2_0x80A5B160/func_80A5C70C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa2_0x80A5B160/func_80A5C718.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kusa2_0x80A5B160/func_80A5C718.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa2_0x80A5B160/func_80A5C7F0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kusa2_0x80A5B160/func_80A5C7F0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa2_0x80A5B160/func_80A5C918.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kusa2_0x80A5B160/func_80A5C918.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa2_0x80A5B160/func_80A5CAD4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kusa2_0x80A5B160/func_80A5CAD4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa2_0x80A5B160/func_80A5CAF4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kusa2_0x80A5B160/func_80A5CAF4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa2_0x80A5B160/func_80A5CB74.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kusa2_0x80A5B160/func_80A5CB74.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa2_0x80A5B160/func_80A5CCD4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kusa2_0x80A5B160/func_80A5CCD4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa2_0x80A5B160/func_80A5CD0C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kusa2_0x80A5B160/func_80A5CD0C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa2_0x80A5B160/func_80A5CF44.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kusa2_0x80A5B160/func_80A5CF44.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa2_0x80A5B160/func_80A5D178.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kusa2_0x80A5B160/func_80A5D178.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa2_0x80A5B160/EnKusa2_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kusa2_0x80A5B160/EnKusa2_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa2_0x80A5B160/EnKusa2_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kusa2_0x80A5B160/EnKusa2_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa2_0x80A5B160/func_80A5D5E0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kusa2_0x80A5B160/func_80A5D5E0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa2_0x80A5B160/func_80A5D5F4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kusa2_0x80A5B160/func_80A5D5F4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa2_0x80A5B160/func_80A5D618.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kusa2_0x80A5B160/func_80A5D618.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa2_0x80A5B160/func_80A5D62C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kusa2_0x80A5B160/func_80A5D62C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa2_0x80A5B160/func_80A5D6B0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kusa2_0x80A5B160/func_80A5D6B0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa2_0x80A5B160/func_80A5D6C4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kusa2_0x80A5B160/func_80A5D6C4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa2_0x80A5B160/func_80A5D754.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kusa2_0x80A5B160/func_80A5D754.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa2_0x80A5B160/func_80A5D794.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kusa2_0x80A5B160/func_80A5D794.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa2_0x80A5B160/func_80A5D7A4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kusa2_0x80A5B160/func_80A5D7A4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa2_0x80A5B160/func_80A5D7C4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kusa2_0x80A5B160/func_80A5D7C4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa2_0x80A5B160/func_80A5D964.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kusa2_0x80A5B160/func_80A5D964.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa2_0x80A5B160/func_80A5D9C8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kusa2_0x80A5B160/func_80A5D9C8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa2_0x80A5B160/func_80A5DC70.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kusa2_0x80A5B160/func_80A5DC70.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa2_0x80A5B160/func_80A5DC98.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kusa2_0x80A5B160/func_80A5DC98.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa2_0x80A5B160/func_80A5DE18.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kusa2_0x80A5B160/func_80A5DE18.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa2_0x80A5B160/func_80A5DEB4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kusa2_0x80A5B160/func_80A5DEB4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa2_0x80A5B160/func_80A5E1D8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kusa2_0x80A5B160/func_80A5E1D8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa2_0x80A5B160/func_80A5E210.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kusa2_0x80A5B160/func_80A5E210.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa2_0x80A5B160/func_80A5E418.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kusa2_0x80A5B160/func_80A5E418.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa2_0x80A5B160/func_80A5E4BC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kusa2_0x80A5B160/func_80A5E4BC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa2_0x80A5B160/func_80A5E604.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kusa2_0x80A5B160/func_80A5E604.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa2_0x80A5B160/EnKusa2_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kusa2_0x80A5B160/EnKusa2_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa2_0x80A5B160/func_80A5E6F0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kusa2_0x80A5B160/func_80A5E6F0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa2_0x80A5B160/func_80A5E80C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kusa2_0x80A5B160/func_80A5E80C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa2_0x80A5B160/EnKusa2_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kusa2_0x80A5B160/EnKusa2_Draw.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa2_0x80A5B160/func_80A5E9B4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kusa2_0x80A5B160/func_80A5E9B4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa2_0x80A5B160/func_80A5EA48.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Kusa2_0x80A5B160/func_80A5EA48.asm") diff --git a/src/overlays/actors/ovl_En_Lift_Nuts/z_en_lift_nuts.c b/src/overlays/actors/ovl_En_Lift_Nuts/z_en_lift_nuts.c index a7398101ee..dad932ee92 100644 --- a/src/overlays/actors/ovl_En_Lift_Nuts/z_en_lift_nuts.c +++ b/src/overlays/actors/ovl_En_Lift_Nuts/z_en_lift_nuts.c @@ -23,94 +23,94 @@ const ActorInit En_Lift_Nuts_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Lift_Nuts_0x80AE9A20/func_80AE9A20.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Lift_Nuts_0x80AE9A20/func_80AE9A20.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Lift_Nuts_0x80AE9A20/func_80AE9A80.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Lift_Nuts_0x80AE9A20/func_80AE9A80.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Lift_Nuts_0x80AE9A20/func_80AE9AC4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Lift_Nuts_0x80AE9A20/func_80AE9AC4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Lift_Nuts_0x80AE9A20/func_80AE9B4C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Lift_Nuts_0x80AE9A20/func_80AE9B4C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Lift_Nuts_0x80AE9A20/func_80AE9B8C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Lift_Nuts_0x80AE9A20/func_80AE9B8C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Lift_Nuts_0x80AE9A20/func_80AE9BCC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Lift_Nuts_0x80AE9A20/func_80AE9BCC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Lift_Nuts_0x80AE9A20/EnLiftNuts_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Lift_Nuts_0x80AE9A20/EnLiftNuts_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Lift_Nuts_0x80AE9A20/EnLiftNuts_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Lift_Nuts_0x80AE9A20/EnLiftNuts_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Lift_Nuts_0x80AE9A20/func_80AE9F28.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Lift_Nuts_0x80AE9A20/func_80AE9F28.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Lift_Nuts_0x80AE9A20/func_80AE9F70.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Lift_Nuts_0x80AE9A20/func_80AE9F70.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Lift_Nuts_0x80AE9A20/func_80AE9FC8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Lift_Nuts_0x80AE9A20/func_80AE9FC8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Lift_Nuts_0x80AE9A20/func_80AEA044.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Lift_Nuts_0x80AE9A20/func_80AEA044.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Lift_Nuts_0x80AE9A20/func_80AEA0B4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Lift_Nuts_0x80AE9A20/func_80AEA0B4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Lift_Nuts_0x80AE9A20/func_80AEA128.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Lift_Nuts_0x80AE9A20/func_80AEA128.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Lift_Nuts_0x80AE9A20/func_80AEA1A0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Lift_Nuts_0x80AE9A20/func_80AEA1A0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Lift_Nuts_0x80AE9A20/func_80AEA7A4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Lift_Nuts_0x80AE9A20/func_80AEA7A4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Lift_Nuts_0x80AE9A20/func_80AEA910.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Lift_Nuts_0x80AE9A20/func_80AEA910.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Lift_Nuts_0x80AE9A20/func_80AEABF0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Lift_Nuts_0x80AE9A20/func_80AEABF0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Lift_Nuts_0x80AE9A20/func_80AEAC64.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Lift_Nuts_0x80AE9A20/func_80AEAC64.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Lift_Nuts_0x80AE9A20/func_80AEACF8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Lift_Nuts_0x80AE9A20/func_80AEACF8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Lift_Nuts_0x80AE9A20/func_80AEAEAC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Lift_Nuts_0x80AE9A20/func_80AEAEAC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Lift_Nuts_0x80AE9A20/func_80AEAF14.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Lift_Nuts_0x80AE9A20/func_80AEAF14.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Lift_Nuts_0x80AE9A20/func_80AEAF8C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Lift_Nuts_0x80AE9A20/func_80AEAF8C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Lift_Nuts_0x80AE9A20/func_80AEAFA0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Lift_Nuts_0x80AE9A20/func_80AEAFA0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Lift_Nuts_0x80AE9A20/func_80AEB114.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Lift_Nuts_0x80AE9A20/func_80AEB114.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Lift_Nuts_0x80AE9A20/func_80AEB148.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Lift_Nuts_0x80AE9A20/func_80AEB148.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Lift_Nuts_0x80AE9A20/func_80AEB1C8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Lift_Nuts_0x80AE9A20/func_80AEB1C8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Lift_Nuts_0x80AE9A20/func_80AEB230.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Lift_Nuts_0x80AE9A20/func_80AEB230.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Lift_Nuts_0x80AE9A20/func_80AEB280.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Lift_Nuts_0x80AE9A20/func_80AEB280.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Lift_Nuts_0x80AE9A20/func_80AEB294.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Lift_Nuts_0x80AE9A20/func_80AEB294.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Lift_Nuts_0x80AE9A20/func_80AEB3E0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Lift_Nuts_0x80AE9A20/func_80AEB3E0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Lift_Nuts_0x80AE9A20/func_80AEB428.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Lift_Nuts_0x80AE9A20/func_80AEB428.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Lift_Nuts_0x80AE9A20/func_80AEB584.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Lift_Nuts_0x80AE9A20/func_80AEB584.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Lift_Nuts_0x80AE9A20/func_80AEB598.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Lift_Nuts_0x80AE9A20/func_80AEB598.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Lift_Nuts_0x80AE9A20/func_80AEB684.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Lift_Nuts_0x80AE9A20/func_80AEB684.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Lift_Nuts_0x80AE9A20/func_80AEB698.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Lift_Nuts_0x80AE9A20/func_80AEB698.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Lift_Nuts_0x80AE9A20/func_80AEB828.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Lift_Nuts_0x80AE9A20/func_80AEB828.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Lift_Nuts_0x80AE9A20/func_80AEB8A4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Lift_Nuts_0x80AE9A20/func_80AEB8A4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Lift_Nuts_0x80AE9A20/func_80AEB934.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Lift_Nuts_0x80AE9A20/func_80AEB934.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Lift_Nuts_0x80AE9A20/func_80AEB974.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Lift_Nuts_0x80AE9A20/func_80AEB974.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Lift_Nuts_0x80AE9A20/func_80AEB9E0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Lift_Nuts_0x80AE9A20/func_80AEB9E0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Lift_Nuts_0x80AE9A20/func_80AEBB30.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Lift_Nuts_0x80AE9A20/func_80AEBB30.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Lift_Nuts_0x80AE9A20/EnLiftNuts_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Lift_Nuts_0x80AE9A20/EnLiftNuts_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Lift_Nuts_0x80AE9A20/func_80AEBC18.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Lift_Nuts_0x80AE9A20/func_80AEBC18.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Lift_Nuts_0x80AE9A20/func_80AEBC90.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Lift_Nuts_0x80AE9A20/func_80AEBC90.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Lift_Nuts_0x80AE9A20/EnLiftNuts_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Lift_Nuts_0x80AE9A20/EnLiftNuts_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Light/z_en_light.c b/src/overlays/actors/ovl_En_Light/z_en_light.c index a029a8b35a..85f8b9c7f9 100644 --- a/src/overlays/actors/ovl_En_Light/z_en_light.c +++ b/src/overlays/actors/ovl_En_Light/z_en_light.c @@ -23,14 +23,14 @@ const ActorInit En_Light_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Light_0x80865990/EnLight_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Light_0x80865990/EnLight_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Light_0x80865990/EnLight_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Light_0x80865990/EnLight_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Light_0x80865990/func_80865BF8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Light_0x80865990/func_80865BF8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Light_0x80865990/EnLight_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Light_0x80865990/EnLight_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Light_0x80865990/func_80865F38.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Light_0x80865990/func_80865F38.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Light_0x80865990/EnLight_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Light_0x80865990/EnLight_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Look_Nuts/z_en_look_nuts.c b/src/overlays/actors/ovl_En_Look_Nuts/z_en_look_nuts.c index 866e716a1c..c21e3384b0 100644 --- a/src/overlays/actors/ovl_En_Look_Nuts/z_en_look_nuts.c +++ b/src/overlays/actors/ovl_En_Look_Nuts/z_en_look_nuts.c @@ -23,26 +23,26 @@ const ActorInit En_Look_Nuts_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Look_Nuts_0x80A678B0/EnLookNuts_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Look_Nuts_0x80A678B0/EnLookNuts_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Look_Nuts_0x80A678B0/EnLookNuts_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Look_Nuts_0x80A678B0/EnLookNuts_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Look_Nuts_0x80A678B0/func_80A67A34.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Look_Nuts_0x80A678B0/func_80A67A34.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Look_Nuts_0x80A678B0/func_80A67AA8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Look_Nuts_0x80A678B0/func_80A67AA8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Look_Nuts_0x80A678B0/func_80A67C48.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Look_Nuts_0x80A678B0/func_80A67C48.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Look_Nuts_0x80A678B0/func_80A67D0C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Look_Nuts_0x80A678B0/func_80A67D0C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Look_Nuts_0x80A678B0/func_80A67F30.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Look_Nuts_0x80A678B0/func_80A67F30.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Look_Nuts_0x80A678B0/func_80A67FC4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Look_Nuts_0x80A678B0/func_80A67FC4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Look_Nuts_0x80A678B0/func_80A68080.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Look_Nuts_0x80A678B0/func_80A68080.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Look_Nuts_0x80A678B0/func_80A680FC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Look_Nuts_0x80A678B0/func_80A680FC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Look_Nuts_0x80A678B0/EnLookNuts_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Look_Nuts_0x80A678B0/EnLookNuts_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Look_Nuts_0x80A678B0/EnLookNuts_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Look_Nuts_0x80A678B0/EnLookNuts_Draw.asm") diff --git a/src/overlays/actors/ovl_En_M_Fire1/z_en_m_fire1.c b/src/overlays/actors/ovl_En_M_Fire1/z_en_m_fire1.c index 841fa3dbb8..4d0c56e93d 100644 --- a/src/overlays/actors/ovl_En_M_Fire1/z_en_m_fire1.c +++ b/src/overlays/actors/ovl_En_M_Fire1/z_en_m_fire1.c @@ -22,8 +22,8 @@ const ActorInit En_M_Fire1_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_M_Fire1_0x808B5230/EnMFire1_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_M_Fire1_0x808B5230/EnMFire1_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_M_Fire1_0x808B5230/EnMFire1_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_M_Fire1_0x808B5230/EnMFire1_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_M_Fire1_0x808B5230/EnMFire1_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_M_Fire1_0x808B5230/EnMFire1_Update.asm") diff --git a/src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.c b/src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.c index 24f1bb9a62..8556018f59 100644 --- a/src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.c +++ b/src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.c @@ -23,28 +23,28 @@ const ActorInit En_M_Thunder_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_M_Thunder_0x808B53C0/func_808B53C0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_M_Thunder_0x808B53C0/func_808B53C0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_M_Thunder_0x808B53C0/EnMThunder_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_M_Thunder_0x808B53C0/EnMThunder_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_M_Thunder_0x808B53C0/EnMThunder_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_M_Thunder_0x808B53C0/EnMThunder_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_M_Thunder_0x808B53C0/func_808B5890.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_M_Thunder_0x808B53C0/func_808B5890.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_M_Thunder_0x808B53C0/func_808B58CC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_M_Thunder_0x808B53C0/func_808B58CC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_M_Thunder_0x808B53C0/func_808B5984.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_M_Thunder_0x808B53C0/func_808B5984.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_M_Thunder_0x808B53C0/func_808B5EEC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_M_Thunder_0x808B53C0/func_808B5EEC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_M_Thunder_0x808B53C0/func_808B5F68.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_M_Thunder_0x808B53C0/func_808B5F68.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_M_Thunder_0x808B53C0/func_808B60D4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_M_Thunder_0x808B53C0/func_808B60D4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_M_Thunder_0x808B53C0/func_808B6310.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_M_Thunder_0x808B53C0/func_808B6310.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_M_Thunder_0x808B53C0/EnMThunder_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_M_Thunder_0x808B53C0/EnMThunder_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_M_Thunder_0x808B53C0/func_808B65BC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_M_Thunder_0x808B53C0/func_808B65BC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_M_Thunder_0x808B53C0/EnMThunder_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_M_Thunder_0x808B53C0/EnMThunder_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Ma4/z_en_ma4.c b/src/overlays/actors/ovl_En_Ma4/z_en_ma4.c index 1ee724ad76..af3e455f6a 100644 --- a/src/overlays/actors/ovl_En_Ma4/z_en_ma4.c +++ b/src/overlays/actors/ovl_En_Ma4/z_en_ma4.c @@ -23,76 +23,76 @@ const ActorInit En_Ma4_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ma4_0x80ABDCA0/func_80ABDCA0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ma4_0x80ABDCA0/func_80ABDCA0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ma4_0x80ABDCA0/func_80ABDD2C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ma4_0x80ABDCA0/func_80ABDD2C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ma4_0x80ABDCA0/func_80ABDD9C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ma4_0x80ABDCA0/func_80ABDD9C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ma4_0x80ABDCA0/func_80ABDE60.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ma4_0x80ABDCA0/func_80ABDE60.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ma4_0x80ABDCA0/EnMa4_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ma4_0x80ABDCA0/EnMa4_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ma4_0x80ABDCA0/EnMa4_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ma4_0x80ABDCA0/EnMa4_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ma4_0x80ABDCA0/func_80ABE1C4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ma4_0x80ABDCA0/func_80ABE1C4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ma4_0x80ABDCA0/func_80ABE4A4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ma4_0x80ABDCA0/func_80ABE4A4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ma4_0x80ABDCA0/func_80ABE560.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ma4_0x80ABDCA0/func_80ABE560.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ma4_0x80ABDCA0/func_80ABE6C8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ma4_0x80ABDCA0/func_80ABE6C8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ma4_0x80ABDCA0/func_80ABEB6C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ma4_0x80ABDCA0/func_80ABEB6C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ma4_0x80ABDCA0/func_80ABEF34.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ma4_0x80ABDCA0/func_80ABEF34.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ma4_0x80ABDCA0/func_80ABEF8C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ma4_0x80ABDCA0/func_80ABEF8C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ma4_0x80ABDCA0/func_80ABF070.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ma4_0x80ABDCA0/func_80ABF070.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ma4_0x80ABDCA0/func_80ABF084.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ma4_0x80ABDCA0/func_80ABF084.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ma4_0x80ABDCA0/func_80ABF0D8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ma4_0x80ABDCA0/func_80ABF0D8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ma4_0x80ABDCA0/func_80ABF160.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ma4_0x80ABDCA0/func_80ABF160.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ma4_0x80ABDCA0/func_80ABF198.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ma4_0x80ABDCA0/func_80ABF198.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ma4_0x80ABDCA0/func_80ABF218.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ma4_0x80ABDCA0/func_80ABF218.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ma4_0x80ABDCA0/func_80ABF254.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ma4_0x80ABDCA0/func_80ABF254.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ma4_0x80ABDCA0/func_80ABF2FC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ma4_0x80ABDCA0/func_80ABF2FC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ma4_0x80ABDCA0/func_80ABF354.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ma4_0x80ABDCA0/func_80ABF354.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ma4_0x80ABDCA0/func_80ABF494.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ma4_0x80ABDCA0/func_80ABF494.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ma4_0x80ABDCA0/func_80ABF4A8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ma4_0x80ABDCA0/func_80ABF4A8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ma4_0x80ABDCA0/func_80ABF51C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ma4_0x80ABDCA0/func_80ABF51C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ma4_0x80ABDCA0/func_80ABF534.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ma4_0x80ABDCA0/func_80ABF534.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ma4_0x80ABDCA0/func_80ABF69C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ma4_0x80ABDCA0/func_80ABF69C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ma4_0x80ABDCA0/func_80ABF6B0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ma4_0x80ABDCA0/func_80ABF6B0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ma4_0x80ABDCA0/func_80ABF760.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ma4_0x80ABDCA0/func_80ABF760.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ma4_0x80ABDCA0/func_80ABF774.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ma4_0x80ABDCA0/func_80ABF774.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ma4_0x80ABDCA0/func_80ABF7C8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ma4_0x80ABDCA0/func_80ABF7C8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ma4_0x80ABDCA0/func_80ABFCAC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ma4_0x80ABDCA0/func_80ABFCAC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ma4_0x80ABDCA0/func_80ABFCD4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ma4_0x80ABDCA0/func_80ABFCD4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ma4_0x80ABDCA0/EnMa4_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ma4_0x80ABDCA0/EnMa4_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ma4_0x80ABDCA0/func_80ABFD9C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ma4_0x80ABDCA0/func_80ABFD9C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ma4_0x80ABDCA0/func_80ABFE48.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ma4_0x80ABDCA0/func_80ABFE48.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ma4_0x80ABDCA0/EnMa4_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ma4_0x80ABDCA0/EnMa4_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Ma_Yto/z_en_ma_yto.c b/src/overlays/actors/ovl_En_Ma_Yto/z_en_ma_yto.c index 31f3caff3e..008c707c7a 100644 --- a/src/overlays/actors/ovl_En_Ma_Yto/z_en_ma_yto.c +++ b/src/overlays/actors/ovl_En_Ma_Yto/z_en_ma_yto.c @@ -23,124 +23,124 @@ const ActorInit En_Ma_Yto_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yto_0x80B8E520/EnMaYto_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ma_Yto_0x80B8E520/EnMaYto_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yto_0x80B8E520/func_80B8E6E0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ma_Yto_0x80B8E520/func_80B8E6E0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yto_0x80B8E520/func_80B8E84C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ma_Yto_0x80B8E520/func_80B8E84C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yto_0x80B8E520/func_80B8E938.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ma_Yto_0x80B8E520/func_80B8E938.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yto_0x80B8E520/func_80B8EA38.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ma_Yto_0x80B8E520/func_80B8EA38.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yto_0x80B8E520/func_80B8EABC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ma_Yto_0x80B8E520/func_80B8EABC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yto_0x80B8E520/EnMaYto_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ma_Yto_0x80B8E520/EnMaYto_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yto_0x80B8E520/func_80B8EBDC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ma_Yto_0x80B8E520/func_80B8EBDC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yto_0x80B8E520/func_80B8EBF0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ma_Yto_0x80B8E520/func_80B8EBF0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yto_0x80B8E520/func_80B8EC30.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ma_Yto_0x80B8E520/func_80B8EC30.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yto_0x80B8E520/func_80B8ECAC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ma_Yto_0x80B8E520/func_80B8ECAC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yto_0x80B8E520/func_80B8ED8C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ma_Yto_0x80B8E520/func_80B8ED8C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yto_0x80B8E520/func_80B8EDC8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ma_Yto_0x80B8E520/func_80B8EDC8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yto_0x80B8E520/func_80B8EEAC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ma_Yto_0x80B8E520/func_80B8EEAC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yto_0x80B8E520/func_80B8EF4C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ma_Yto_0x80B8E520/func_80B8EF4C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yto_0x80B8E520/func_80B8F074.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ma_Yto_0x80B8E520/func_80B8F074.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yto_0x80B8E520/func_80B8F108.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ma_Yto_0x80B8E520/func_80B8F108.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yto_0x80B8E520/func_80B8F254.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ma_Yto_0x80B8E520/func_80B8F254.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yto_0x80B8E520/func_80B8F2D8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ma_Yto_0x80B8E520/func_80B8F2D8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yto_0x80B8E520/func_80B8F360.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ma_Yto_0x80B8E520/func_80B8F360.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yto_0x80B8E520/func_80B8F400.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ma_Yto_0x80B8E520/func_80B8F400.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yto_0x80B8E520/func_80B8F744.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ma_Yto_0x80B8E520/func_80B8F744.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yto_0x80B8E520/func_80B8F7F4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ma_Yto_0x80B8E520/func_80B8F7F4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yto_0x80B8E520/func_80B8F918.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ma_Yto_0x80B8E520/func_80B8F918.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yto_0x80B8E520/func_80B8F998.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ma_Yto_0x80B8E520/func_80B8F998.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yto_0x80B8E520/func_80B8FA14.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ma_Yto_0x80B8E520/func_80B8FA14.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yto_0x80B8E520/func_80B8FE04.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ma_Yto_0x80B8E520/func_80B8FE04.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yto_0x80B8E520/func_80B8FE74.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ma_Yto_0x80B8E520/func_80B8FE74.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yto_0x80B8E520/func_80B8FF80.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ma_Yto_0x80B8E520/func_80B8FF80.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yto_0x80B8E520/func_80B8FF94.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ma_Yto_0x80B8E520/func_80B8FF94.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yto_0x80B8E520/func_80B9000C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ma_Yto_0x80B8E520/func_80B9000C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yto_0x80B8E520/func_80B900AC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ma_Yto_0x80B8E520/func_80B900AC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yto_0x80B8E520/func_80B900C0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ma_Yto_0x80B8E520/func_80B900C0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yto_0x80B8E520/func_80B90170.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ma_Yto_0x80B8E520/func_80B90170.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yto_0x80B8E520/func_80B90184.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ma_Yto_0x80B8E520/func_80B90184.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yto_0x80B8E520/func_80B902B8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ma_Yto_0x80B8E520/func_80B902B8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yto_0x80B8E520/func_80B902CC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ma_Yto_0x80B8E520/func_80B902CC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yto_0x80B8E520/func_80B90340.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ma_Yto_0x80B8E520/func_80B90340.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yto_0x80B8E520/func_80B9037C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ma_Yto_0x80B8E520/func_80B9037C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yto_0x80B8E520/func_80B904D0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ma_Yto_0x80B8E520/func_80B904D0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yto_0x80B8E520/func_80B904E4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ma_Yto_0x80B8E520/func_80B904E4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yto_0x80B8E520/func_80B9059C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ma_Yto_0x80B8E520/func_80B9059C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yto_0x80B8E520/func_80B905B0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ma_Yto_0x80B8E520/func_80B905B0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yto_0x80B8E520/func_80B9061C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ma_Yto_0x80B8E520/func_80B9061C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yto_0x80B8E520/func_80B9083C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ma_Yto_0x80B8E520/func_80B9083C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yto_0x80B8E520/func_80B90A78.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ma_Yto_0x80B8E520/func_80B90A78.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yto_0x80B8E520/func_80B90C08.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ma_Yto_0x80B8E520/func_80B90C08.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yto_0x80B8E520/func_80B90C78.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ma_Yto_0x80B8E520/func_80B90C78.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yto_0x80B8E520/func_80B90D98.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ma_Yto_0x80B8E520/func_80B90D98.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yto_0x80B8E520/func_80B90DF0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ma_Yto_0x80B8E520/func_80B90DF0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yto_0x80B8E520/func_80B90E50.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ma_Yto_0x80B8E520/func_80B90E50.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yto_0x80B8E520/func_80B90E84.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ma_Yto_0x80B8E520/func_80B90E84.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yto_0x80B8E520/func_80B90EC8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ma_Yto_0x80B8E520/func_80B90EC8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yto_0x80B8E520/func_80B90EF0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ma_Yto_0x80B8E520/func_80B90EF0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yto_0x80B8E520/func_80B90F84.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ma_Yto_0x80B8E520/func_80B90F84.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yto_0x80B8E520/func_80B91014.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ma_Yto_0x80B8E520/func_80B91014.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yto_0x80B8E520/func_80B9109C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ma_Yto_0x80B8E520/func_80B9109C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yto_0x80B8E520/EnMaYto_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ma_Yto_0x80B8E520/EnMaYto_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yto_0x80B8E520/func_80B91154.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ma_Yto_0x80B8E520/func_80B91154.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yto_0x80B8E520/func_80B91250.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ma_Yto_0x80B8E520/func_80B91250.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yto_0x80B8E520/EnMaYto_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ma_Yto_0x80B8E520/EnMaYto_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Ma_Yts/z_en_ma_yts.c b/src/overlays/actors/ovl_En_Ma_Yts/z_en_ma_yts.c index 017b4ac6e3..e0f3d599d0 100644 --- a/src/overlays/actors/ovl_En_Ma_Yts/z_en_ma_yts.c +++ b/src/overlays/actors/ovl_En_Ma_Yts/z_en_ma_yts.c @@ -23,46 +23,46 @@ const ActorInit En_Ma_Yts_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yts_0x80B8D030/func_80B8D030.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ma_Yts_0x80B8D030/func_80B8D030.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yts_0x80B8D030/func_80B8D0BC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ma_Yts_0x80B8D030/func_80B8D0BC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yts_0x80B8D030/func_80B8D12C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ma_Yts_0x80B8D030/func_80B8D12C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yts_0x80B8D030/func_80B8D1E8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ma_Yts_0x80B8D030/func_80B8D1E8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yts_0x80B8D030/func_80B8D2D8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ma_Yts_0x80B8D030/func_80B8D2D8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yts_0x80B8D030/EnMaYts_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ma_Yts_0x80B8D030/EnMaYts_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yts_0x80B8D030/EnMaYts_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ma_Yts_0x80B8D030/EnMaYts_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yts_0x80B8D030/func_80B8D698.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ma_Yts_0x80B8D030/func_80B8D698.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yts_0x80B8D030/func_80B8D6AC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ma_Yts_0x80B8D030/func_80B8D6AC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yts_0x80B8D030/func_80B8D6BC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ma_Yts_0x80B8D030/func_80B8D6BC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yts_0x80B8D030/func_80B8D6F8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ma_Yts_0x80B8D030/func_80B8D6F8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yts_0x80B8D030/func_80B8D95C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ma_Yts_0x80B8D030/func_80B8D95C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yts_0x80B8D030/func_80B8D970.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ma_Yts_0x80B8D030/func_80B8D970.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yts_0x80B8D030/func_80B8D9E4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ma_Yts_0x80B8D030/func_80B8D9E4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yts_0x80B8D030/func_80B8DA28.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ma_Yts_0x80B8D030/func_80B8DA28.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yts_0x80B8D030/func_80B8DBB8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ma_Yts_0x80B8D030/func_80B8DBB8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yts_0x80B8D030/func_80B8DD88.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ma_Yts_0x80B8D030/func_80B8DD88.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yts_0x80B8D030/EnMaYts_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ma_Yts_0x80B8D030/EnMaYts_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yts_0x80B8D030/func_80B8DE44.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ma_Yts_0x80B8D030/func_80B8DE44.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yts_0x80B8D030/func_80B8DF18.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ma_Yts_0x80B8D030/func_80B8DF18.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yts_0x80B8D030/EnMaYts_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ma_Yts_0x80B8D030/EnMaYts_Draw.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yts_0x80B8D030/func_80B8E0BC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ma_Yts_0x80B8D030/func_80B8E0BC.asm") 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 43252b85f4..eb29dc7fd9 100644 --- a/src/overlays/actors/ovl_En_Mag/z_en_mag.c +++ b/src/overlays/actors/ovl_En_Mag/z_en_mag.c @@ -23,24 +23,24 @@ const ActorInit En_Mag_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mag_0x8096B310/EnMag_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mag_0x8096B310/EnMag_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mag_0x8096B310/EnMag_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mag_0x8096B310/EnMag_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mag_0x8096B310/func_8096B604.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mag_0x8096B310/func_8096B604.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mag_0x8096B310/EnMag_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mag_0x8096B310/EnMag_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mag_0x8096B310/func_8096C998.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mag_0x8096B310/func_8096C998.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mag_0x8096B310/func_8096CBB0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mag_0x8096B310/func_8096CBB0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mag_0x8096B310/func_8096CDC8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mag_0x8096B310/func_8096CDC8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mag_0x8096B310/func_8096D230.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mag_0x8096B310/func_8096D230.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mag_0x8096B310/func_8096D60C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mag_0x8096B310/func_8096D60C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mag_0x8096B310/func_8096D74C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mag_0x8096B310/func_8096D74C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mag_0x8096B310/EnMag_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mag_0x8096B310/EnMag_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Maruta/z_en_maruta.c b/src/overlays/actors/ovl_En_Maruta/z_en_maruta.c index 91e0c9f87c..03b054b324 100644 --- a/src/overlays/actors/ovl_En_Maruta/z_en_maruta.c +++ b/src/overlays/actors/ovl_En_Maruta/z_en_maruta.c @@ -23,60 +23,60 @@ const ActorInit En_Maruta_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Maruta_0x80B37080/EnMaruta_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Maruta_0x80B37080/EnMaruta_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Maruta_0x80B37080/EnMaruta_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Maruta_0x80B37080/EnMaruta_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Maruta_0x80B37080/func_80B372B8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Maruta_0x80B37080/func_80B372B8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Maruta_0x80B37080/func_80B372CC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Maruta_0x80B37080/func_80B372CC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Maruta_0x80B37080/func_80B37364.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Maruta_0x80B37080/func_80B37364.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Maruta_0x80B37080/func_80B3738C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Maruta_0x80B37080/func_80B3738C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Maruta_0x80B37080/func_80B373F4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Maruta_0x80B37080/func_80B373F4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Maruta_0x80B37080/func_80B37428.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Maruta_0x80B37080/func_80B37428.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Maruta_0x80B37080/func_80B374B8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Maruta_0x80B37080/func_80B374B8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Maruta_0x80B37080/func_80B374FC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Maruta_0x80B37080/func_80B374FC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Maruta_0x80B37080/func_80B37590.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Maruta_0x80B37080/func_80B37590.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Maruta_0x80B37080/func_80B37950.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Maruta_0x80B37080/func_80B37950.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Maruta_0x80B37080/func_80B37998.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Maruta_0x80B37080/func_80B37998.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Maruta_0x80B37080/func_80B379C0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Maruta_0x80B37080/func_80B379C0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Maruta_0x80B37080/func_80B37A14.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Maruta_0x80B37080/func_80B37A14.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Maruta_0x80B37080/func_80B37A64.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Maruta_0x80B37080/func_80B37A64.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Maruta_0x80B37080/func_80B37A8C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Maruta_0x80B37080/func_80B37A8C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Maruta_0x80B37080/func_80B37AA0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Maruta_0x80B37080/func_80B37AA0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Maruta_0x80B37080/func_80B37B78.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Maruta_0x80B37080/func_80B37B78.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Maruta_0x80B37080/func_80B37C04.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Maruta_0x80B37080/func_80B37C04.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Maruta_0x80B37080/func_80B37C60.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Maruta_0x80B37080/func_80B37C60.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Maruta_0x80B37080/func_80B37CA0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Maruta_0x80B37080/func_80B37CA0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Maruta_0x80B37080/func_80B37EC0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Maruta_0x80B37080/func_80B37EC0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Maruta_0x80B37080/func_80B38028.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Maruta_0x80B37080/func_80B38028.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Maruta_0x80B37080/func_80B38060.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Maruta_0x80B37080/func_80B38060.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Maruta_0x80B37080/func_80B3828C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Maruta_0x80B37080/func_80B3828C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Maruta_0x80B37080/func_80B382E4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Maruta_0x80B37080/func_80B382E4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Maruta_0x80B37080/EnMaruta_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Maruta_0x80B37080/EnMaruta_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Maruta_0x80B37080/EnMaruta_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Maruta_0x80B37080/EnMaruta_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Minideath/z_en_minideath.c b/src/overlays/actors/ovl_En_Minideath/z_en_minideath.c index 7aa4c4917c..50f1c8e86d 100644 --- a/src/overlays/actors/ovl_En_Minideath/z_en_minideath.c +++ b/src/overlays/actors/ovl_En_Minideath/z_en_minideath.c @@ -22,72 +22,72 @@ const ActorInit En_Minideath_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Minideath_0x808CA0B0/EnMinideath_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Minideath_0x808CA0B0/EnMinideath_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Minideath_0x808CA0B0/EnMinideath_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Minideath_0x808CA0B0/EnMinideath_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Minideath_0x808CA0B0/func_808CA268.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Minideath_0x808CA0B0/func_808CA268.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Minideath_0x808CA0B0/func_808CA308.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Minideath_0x808CA0B0/func_808CA308.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Minideath_0x808CA0B0/func_808CA34C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Minideath_0x808CA0B0/func_808CA34C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Minideath_0x808CA0B0/func_808CA458.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Minideath_0x808CA0B0/func_808CA458.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Minideath_0x808CA0B0/func_808CA7D4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Minideath_0x808CA0B0/func_808CA7D4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Minideath_0x808CA0B0/func_808CA860.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Minideath_0x808CA0B0/func_808CA860.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Minideath_0x808CA0B0/func_808CA8E0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Minideath_0x808CA0B0/func_808CA8E0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Minideath_0x808CA0B0/func_808CA8F4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Minideath_0x808CA0B0/func_808CA8F4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Minideath_0x808CA0B0/func_808CAAC8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Minideath_0x808CA0B0/func_808CAAC8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Minideath_0x808CA0B0/func_808CAAEC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Minideath_0x808CA0B0/func_808CAAEC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Minideath_0x808CA0B0/func_808CAB90.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Minideath_0x808CA0B0/func_808CAB90.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Minideath_0x808CA0B0/func_808CABB0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Minideath_0x808CA0B0/func_808CABB0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Minideath_0x808CA0B0/func_808CAC54.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Minideath_0x808CA0B0/func_808CAC54.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Minideath_0x808CA0B0/func_808CACD8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Minideath_0x808CA0B0/func_808CACD8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Minideath_0x808CA0B0/func_808CAE00.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Minideath_0x808CA0B0/func_808CAE00.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Minideath_0x808CA0B0/func_808CAE18.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Minideath_0x808CA0B0/func_808CAE18.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Minideath_0x808CA0B0/func_808CAF08.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Minideath_0x808CA0B0/func_808CAF08.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Minideath_0x808CA0B0/func_808CAF68.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Minideath_0x808CA0B0/func_808CAF68.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Minideath_0x808CA0B0/func_808CB07C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Minideath_0x808CA0B0/func_808CB07C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Minideath_0x808CA0B0/func_808CB094.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Minideath_0x808CA0B0/func_808CB094.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Minideath_0x808CA0B0/func_808CB0C8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Minideath_0x808CA0B0/func_808CB0C8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Minideath_0x808CA0B0/func_808CB22C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Minideath_0x808CA0B0/func_808CB22C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Minideath_0x808CA0B0/func_808CB418.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Minideath_0x808CA0B0/func_808CB418.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Minideath_0x808CA0B0/func_808CB454.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Minideath_0x808CA0B0/func_808CB454.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Minideath_0x808CA0B0/func_808CB524.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Minideath_0x808CA0B0/func_808CB524.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Minideath_0x808CA0B0/func_808CB59C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Minideath_0x808CA0B0/func_808CB59C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Minideath_0x808CA0B0/func_808CB6A8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Minideath_0x808CA0B0/func_808CB6A8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Minideath_0x808CA0B0/func_808CB6D4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Minideath_0x808CA0B0/func_808CB6D4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Minideath_0x808CA0B0/func_808CB7B8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Minideath_0x808CA0B0/func_808CB7B8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Minideath_0x808CA0B0/func_808CB7CC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Minideath_0x808CA0B0/func_808CB7CC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Minideath_0x808CA0B0/func_808CB810.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Minideath_0x808CA0B0/func_808CB810.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Minideath_0x808CA0B0/func_808CB8F4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Minideath_0x808CA0B0/func_808CB8F4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Minideath_0x808CA0B0/EnMinideath_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Minideath_0x808CA0B0/EnMinideath_Update.asm") diff --git a/src/overlays/actors/ovl_En_Minifrog/z_en_minifrog.c b/src/overlays/actors/ovl_En_Minifrog/z_en_minifrog.c index 07b36d5602..12fefbe030 100644 --- a/src/overlays/actors/ovl_En_Minifrog/z_en_minifrog.c +++ b/src/overlays/actors/ovl_En_Minifrog/z_en_minifrog.c @@ -23,58 +23,58 @@ const ActorInit En_Minifrog_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Minifrog_0x808A3670/EnMinifrog_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Minifrog_0x808A3670/EnMinifrog_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Minifrog_0x808A3670/EnMinifrog_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Minifrog_0x808A3670/EnMinifrog_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Minifrog_0x808A3670/func_808A3930.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Minifrog_0x808A3670/func_808A3930.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Minifrog_0x808A3670/func_808A3980.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Minifrog_0x808A3670/func_808A3980.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Minifrog_0x808A3670/func_808A39EC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Minifrog_0x808A3670/func_808A39EC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Minifrog_0x808A3670/func_808A3A44.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Minifrog_0x808A3670/func_808A3A44.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Minifrog_0x808A3670/func_808A3B04.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Minifrog_0x808A3670/func_808A3B04.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Minifrog_0x808A3670/func_808A3B3C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Minifrog_0x808A3670/func_808A3B3C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Minifrog_0x808A3670/func_808A3B74.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Minifrog_0x808A3670/func_808A3B74.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Minifrog_0x808A3670/func_808A3DA8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Minifrog_0x808A3670/func_808A3DA8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Minifrog_0x808A3670/func_808A3F88.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Minifrog_0x808A3670/func_808A3F88.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Minifrog_0x808A3670/func_808A4040.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Minifrog_0x808A3670/func_808A4040.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Minifrog_0x808A3670/func_808A410C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Minifrog_0x808A3670/func_808A410C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Minifrog_0x808A3670/func_808A41A0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Minifrog_0x808A3670/func_808A41A0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Minifrog_0x808A3670/func_808A4214.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Minifrog_0x808A3670/func_808A4214.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Minifrog_0x808A3670/func_808A42D8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Minifrog_0x808A3670/func_808A42D8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Minifrog_0x808A3670/func_808A4328.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Minifrog_0x808A3670/func_808A4328.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Minifrog_0x808A3670/func_808A43A4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Minifrog_0x808A3670/func_808A43A4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Minifrog_0x808A3670/func_808A44BC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Minifrog_0x808A3670/func_808A44BC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Minifrog_0x808A3670/func_808A45A8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Minifrog_0x808A3670/func_808A45A8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Minifrog_0x808A3670/func_808A4634.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Minifrog_0x808A3670/func_808A4634.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Minifrog_0x808A3670/func_808A46E8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Minifrog_0x808A3670/func_808A46E8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Minifrog_0x808A3670/func_808A4914.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Minifrog_0x808A3670/func_808A4914.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Minifrog_0x808A3670/EnMinifrog_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Minifrog_0x808A3670/EnMinifrog_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Minifrog_0x808A3670/func_808A4AC8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Minifrog_0x808A3670/func_808A4AC8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Minifrog_0x808A3670/func_808A4AF8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Minifrog_0x808A3670/func_808A4AF8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Minifrog_0x808A3670/func_808A4B3C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Minifrog_0x808A3670/func_808A4B3C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Minifrog_0x808A3670/EnMinifrog_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Minifrog_0x808A3670/EnMinifrog_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Minislime/z_en_minislime.c b/src/overlays/actors/ovl_En_Minislime/z_en_minislime.c index 81877f9824..109349a7e6 100644 --- a/src/overlays/actors/ovl_En_Minislime/z_en_minislime.c +++ b/src/overlays/actors/ovl_En_Minislime/z_en_minislime.c @@ -22,76 +22,76 @@ const ActorInit En_Minislime_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Minislime_0x809838F0/EnMinislime_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Minislime_0x809838F0/EnMinislime_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Minislime_0x809838F0/EnMinislime_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Minislime_0x809838F0/EnMinislime_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Minislime_0x809838F0/func_8098399C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Minislime_0x809838F0/func_8098399C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Minislime_0x809838F0/func_80983B38.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Minislime_0x809838F0/func_80983B38.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Minislime_0x809838F0/func_80983DBC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Minislime_0x809838F0/func_80983DBC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Minislime_0x809838F0/func_80983E9C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Minislime_0x809838F0/func_80983E9C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Minislime_0x809838F0/func_80983EB4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Minislime_0x809838F0/func_80983EB4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Minislime_0x809838F0/func_80983F1C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Minislime_0x809838F0/func_80983F1C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Minislime_0x809838F0/func_80984030.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Minislime_0x809838F0/func_80984030.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Minislime_0x809838F0/func_809840A8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Minislime_0x809838F0/func_809840A8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Minislime_0x809838F0/func_8098419C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Minislime_0x809838F0/func_8098419C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Minislime_0x809838F0/func_8098420C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Minislime_0x809838F0/func_8098420C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Minislime_0x809838F0/func_80984248.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Minislime_0x809838F0/func_80984248.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Minislime_0x809838F0/func_80984410.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Minislime_0x809838F0/func_80984410.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Minislime_0x809838F0/func_80984450.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Minislime_0x809838F0/func_80984450.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Minislime_0x809838F0/func_809844FC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Minislime_0x809838F0/func_809844FC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Minislime_0x809838F0/func_809845A4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Minislime_0x809838F0/func_809845A4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Minislime_0x809838F0/func_8098470C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Minislime_0x809838F0/func_8098470C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Minislime_0x809838F0/func_80984748.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Minislime_0x809838F0/func_80984748.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Minislime_0x809838F0/func_80984964.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Minislime_0x809838F0/func_80984964.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Minislime_0x809838F0/func_809849C4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Minislime_0x809838F0/func_809849C4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Minislime_0x809838F0/func_80984B34.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Minislime_0x809838F0/func_80984B34.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Minislime_0x809838F0/func_80984C28.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Minislime_0x809838F0/func_80984C28.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Minislime_0x809838F0/func_80984CA8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Minislime_0x809838F0/func_80984CA8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Minislime_0x809838F0/func_80984D08.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Minislime_0x809838F0/func_80984D08.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Minislime_0x809838F0/func_80984E38.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Minislime_0x809838F0/func_80984E38.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Minislime_0x809838F0/func_80984ECC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Minislime_0x809838F0/func_80984ECC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Minislime_0x809838F0/func_80985018.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Minislime_0x809838F0/func_80985018.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Minislime_0x809838F0/func_80985088.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Minislime_0x809838F0/func_80985088.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Minislime_0x809838F0/func_80985154.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Minislime_0x809838F0/func_80985154.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Minislime_0x809838F0/func_80985168.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Minislime_0x809838F0/func_80985168.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Minislime_0x809838F0/func_8098518C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Minislime_0x809838F0/func_8098518C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Minislime_0x809838F0/func_809851E8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Minislime_0x809838F0/func_809851E8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Minislime_0x809838F0/func_809852DC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Minislime_0x809838F0/func_809852DC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Minislime_0x809838F0/func_8098537C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Minislime_0x809838F0/func_8098537C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Minislime_0x809838F0/func_80985480.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Minislime_0x809838F0/func_80985480.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Minislime_0x809838F0/EnMinislime_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Minislime_0x809838F0/EnMinislime_Update.asm") 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 9d897bf4bd..89df3f86d0 100644 --- a/src/overlays/actors/ovl_En_Mk/z_en_mk.c +++ b/src/overlays/actors/ovl_En_Mk/z_en_mk.c @@ -23,36 +23,36 @@ const ActorInit En_Mk_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mk_0x809592E0/func_809592E0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mk_0x809592E0/func_809592E0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mk_0x809592E0/EnMk_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mk_0x809592E0/EnMk_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mk_0x809592E0/EnMk_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mk_0x809592E0/EnMk_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mk_0x809592E0/func_80959524.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mk_0x809592E0/func_80959524.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mk_0x809592E0/func_8095954C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mk_0x809592E0/func_8095954C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mk_0x809592E0/func_80959624.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mk_0x809592E0/func_80959624.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mk_0x809592E0/func_809596A0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mk_0x809592E0/func_809596A0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mk_0x809592E0/func_80959774.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mk_0x809592E0/func_80959774.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mk_0x809592E0/func_80959844.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mk_0x809592E0/func_80959844.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mk_0x809592E0/func_80959A24.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mk_0x809592E0/func_80959A24.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mk_0x809592E0/func_80959C94.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mk_0x809592E0/func_80959C94.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mk_0x809592E0/func_80959D28.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mk_0x809592E0/func_80959D28.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mk_0x809592E0/func_80959E18.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mk_0x809592E0/func_80959E18.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mk_0x809592E0/EnMk_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mk_0x809592E0/EnMk_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mk_0x809592E0/func_8095A150.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mk_0x809592E0/func_8095A150.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mk_0x809592E0/func_8095A198.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mk_0x809592E0/func_8095A198.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mk_0x809592E0/EnMk_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mk_0x809592E0/EnMk_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Mkk/z_en_mkk.c b/src/overlays/actors/ovl_En_Mkk/z_en_mkk.c index aefc609afe..4099155e08 100644 --- a/src/overlays/actors/ovl_En_Mkk/z_en_mkk.c +++ b/src/overlays/actors/ovl_En_Mkk/z_en_mkk.c @@ -23,48 +23,48 @@ const ActorInit En_Mkk_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mkk_0x80A4DED0/EnMkk_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mkk_0x80A4DED0/EnMkk_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mkk_0x80A4DED0/EnMkk_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mkk_0x80A4DED0/EnMkk_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mkk_0x80A4DED0/func_80A4E0CC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mkk_0x80A4DED0/func_80A4E0CC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mkk_0x80A4DED0/func_80A4E100.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mkk_0x80A4DED0/func_80A4E100.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mkk_0x80A4DED0/func_80A4E190.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mkk_0x80A4DED0/func_80A4E190.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mkk_0x80A4DED0/func_80A4E1F0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mkk_0x80A4DED0/func_80A4E1F0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mkk_0x80A4DED0/func_80A4E22C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mkk_0x80A4DED0/func_80A4E22C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mkk_0x80A4DED0/func_80A4E2B8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mkk_0x80A4DED0/func_80A4E2B8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mkk_0x80A4DED0/func_80A4E2E8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mkk_0x80A4DED0/func_80A4E2E8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mkk_0x80A4DED0/func_80A4E58C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mkk_0x80A4DED0/func_80A4E58C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mkk_0x80A4DED0/func_80A4E60C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mkk_0x80A4DED0/func_80A4E60C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mkk_0x80A4DED0/func_80A4E67C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mkk_0x80A4DED0/func_80A4E67C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mkk_0x80A4DED0/func_80A4E72C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mkk_0x80A4DED0/func_80A4E72C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mkk_0x80A4DED0/func_80A4E84C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mkk_0x80A4DED0/func_80A4E84C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mkk_0x80A4DED0/func_80A4EBBC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mkk_0x80A4DED0/func_80A4EBBC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mkk_0x80A4DED0/EnMkk_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mkk_0x80A4DED0/EnMkk_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mkk_0x80A4DED0/func_80A4EDF0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mkk_0x80A4DED0/func_80A4EDF0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mkk_0x80A4DED0/func_80A4EE48.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mkk_0x80A4DED0/func_80A4EE48.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mkk_0x80A4DED0/func_80A4EEF4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mkk_0x80A4DED0/func_80A4EEF4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mkk_0x80A4DED0/func_80A4EF74.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mkk_0x80A4DED0/func_80A4EF74.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mkk_0x80A4DED0/func_80A4F16C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mkk_0x80A4DED0/func_80A4F16C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mkk_0x80A4DED0/EnMkk_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mkk_0x80A4DED0/EnMkk_Draw.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mkk_0x80A4DED0/func_80A4F4C8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mkk_0x80A4DED0/func_80A4F4C8.asm") 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 bb38cd7ac0..52b37b4223 100644 --- a/src/overlays/actors/ovl_En_Mm/z_en_mm.c +++ b/src/overlays/actors/ovl_En_Mm/z_en_mm.c @@ -23,20 +23,20 @@ const ActorInit En_Mm_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mm_0x80965BB0/func_80965BB0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mm_0x80965BB0/func_80965BB0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mm_0x80965BB0/func_80965BBC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mm_0x80965BB0/func_80965BBC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mm_0x80965BB0/EnMm_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mm_0x80965BB0/EnMm_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mm_0x80965BB0/EnMm_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mm_0x80965BB0/EnMm_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mm_0x80965BB0/func_80965D3C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mm_0x80965BB0/func_80965D3C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mm_0x80965BB0/func_80965DB4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mm_0x80965BB0/func_80965DB4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mm_0x80965BB0/func_8096611C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mm_0x80965BB0/func_8096611C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mm_0x80965BB0/EnMm_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mm_0x80965BB0/EnMm_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mm_0x80965BB0/EnMm_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mm_0x80965BB0/EnMm_Draw.asm") 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 84df32a1dc..4befb5c590 100644 --- a/src/overlays/actors/ovl_En_Mm2/z_en_mm2.c +++ b/src/overlays/actors/ovl_En_Mm2/z_en_mm2.c @@ -23,14 +23,14 @@ const ActorInit En_Mm2_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mm2_0x809A2030/EnMm2_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mm2_0x809A2030/EnMm2_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mm2_0x809A2030/EnMm2_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mm2_0x809A2030/EnMm2_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mm2_0x809A2030/func_809A2080.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mm2_0x809A2030/func_809A2080.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mm2_0x809A2030/func_809A20FC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mm2_0x809A2030/func_809A20FC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mm2_0x809A2030/EnMm2_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mm2_0x809A2030/EnMm2_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mm2_0x809A2030/EnMm2_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mm2_0x809A2030/EnMm2_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Mm3/z_en_mm3.c b/src/overlays/actors/ovl_En_Mm3/z_en_mm3.c index af04b5c4d6..21635eea92 100644 --- a/src/overlays/actors/ovl_En_Mm3/z_en_mm3.c +++ b/src/overlays/actors/ovl_En_Mm3/z_en_mm3.c @@ -23,44 +23,44 @@ const ActorInit En_Mm3_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mm3_0x80A6F0A0/EnMm3_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mm3_0x80A6F0A0/EnMm3_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mm3_0x80A6F0A0/EnMm3_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mm3_0x80A6F0A0/EnMm3_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mm3_0x80A6F0A0/func_80A6F22C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mm3_0x80A6F0A0/func_80A6F22C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mm3_0x80A6F0A0/func_80A6F270.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mm3_0x80A6F0A0/func_80A6F270.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mm3_0x80A6F0A0/func_80A6F2C8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mm3_0x80A6F0A0/func_80A6F2C8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mm3_0x80A6F0A0/func_80A6F3B4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mm3_0x80A6F0A0/func_80A6F3B4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mm3_0x80A6F0A0/func_80A6F5E4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mm3_0x80A6F0A0/func_80A6F5E4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mm3_0x80A6F0A0/func_80A6F9C8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mm3_0x80A6F0A0/func_80A6F9C8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mm3_0x80A6F0A0/func_80A6F9DC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mm3_0x80A6F0A0/func_80A6F9DC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mm3_0x80A6F0A0/func_80A6FBA0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mm3_0x80A6F0A0/func_80A6FBA0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mm3_0x80A6F0A0/func_80A6FBFC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mm3_0x80A6F0A0/func_80A6FBFC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mm3_0x80A6F0A0/func_80A6FE1C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mm3_0x80A6F0A0/func_80A6FE1C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mm3_0x80A6F0A0/func_80A6FE30.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mm3_0x80A6F0A0/func_80A6FE30.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mm3_0x80A6F0A0/func_80A6FED8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mm3_0x80A6F0A0/func_80A6FED8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mm3_0x80A6F0A0/func_80A6FEEC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mm3_0x80A6F0A0/func_80A6FEEC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mm3_0x80A6F0A0/func_80A6FFAC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mm3_0x80A6F0A0/func_80A6FFAC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mm3_0x80A6F0A0/func_80A70084.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mm3_0x80A6F0A0/func_80A70084.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mm3_0x80A6F0A0/EnMm3_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mm3_0x80A6F0A0/EnMm3_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mm3_0x80A6F0A0/func_80A701E0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mm3_0x80A6F0A0/func_80A701E0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mm3_0x80A6F0A0/func_80A702B0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mm3_0x80A6F0A0/func_80A702B0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mm3_0x80A6F0A0/EnMm3_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mm3_0x80A6F0A0/EnMm3_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Mnk/z_en_mnk.c b/src/overlays/actors/ovl_En_Mnk/z_en_mnk.c index c8f727e821..1ceba4cb92 100644 --- a/src/overlays/actors/ovl_En_Mnk/z_en_mnk.c +++ b/src/overlays/actors/ovl_En_Mnk/z_en_mnk.c @@ -23,174 +23,174 @@ const ActorInit En_Mnk_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB4D10.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mnk_0x80AB4D10/func_80AB4D10.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB4E34.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mnk_0x80AB4D10/func_80AB4E34.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB4E58.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mnk_0x80AB4D10/func_80AB4E58.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB4E88.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mnk_0x80AB4D10/func_80AB4E88.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB4F68.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mnk_0x80AB4D10/func_80AB4F68.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB4F8C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mnk_0x80AB4D10/func_80AB4F8C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB50B0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mnk_0x80AB4D10/func_80AB50B0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB50D4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mnk_0x80AB4D10/func_80AB50D4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB5148.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mnk_0x80AB4D10/func_80AB5148.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB51C8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mnk_0x80AB4D10/func_80AB51C8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB52E8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mnk_0x80AB4D10/func_80AB52E8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/EnMnk_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mnk_0x80AB4D10/EnMnk_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/EnMnk_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mnk_0x80AB4D10/EnMnk_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB5A64.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mnk_0x80AB4D10/func_80AB5A64.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB5B38.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mnk_0x80AB4D10/func_80AB5B38.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB5B84.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mnk_0x80AB4D10/func_80AB5B84.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB5BCC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mnk_0x80AB4D10/func_80AB5BCC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB5C14.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mnk_0x80AB4D10/func_80AB5C14.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB5C74.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mnk_0x80AB4D10/func_80AB5C74.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB5CD8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mnk_0x80AB4D10/func_80AB5CD8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB5F6C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mnk_0x80AB4D10/func_80AB5F6C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB60FC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mnk_0x80AB4D10/func_80AB60FC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB61E8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mnk_0x80AB4D10/func_80AB61E8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB6304.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mnk_0x80AB4D10/func_80AB6304.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB63CC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mnk_0x80AB4D10/func_80AB63CC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB64B8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mnk_0x80AB4D10/func_80AB64B8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB65F4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mnk_0x80AB4D10/func_80AB65F4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB675C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mnk_0x80AB4D10/func_80AB675C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB6870.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mnk_0x80AB4D10/func_80AB6870.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB6920.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mnk_0x80AB4D10/func_80AB6920.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB69C8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mnk_0x80AB4D10/func_80AB69C8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB6AF8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mnk_0x80AB4D10/func_80AB6AF8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB6B78.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mnk_0x80AB4D10/func_80AB6B78.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB6BE4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mnk_0x80AB4D10/func_80AB6BE4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB6E08.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mnk_0x80AB4D10/func_80AB6E08.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB6EB0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mnk_0x80AB4D10/func_80AB6EB0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB6F98.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mnk_0x80AB4D10/func_80AB6F98.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB7108.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mnk_0x80AB4D10/func_80AB7108.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB7204.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mnk_0x80AB4D10/func_80AB7204.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB72BC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mnk_0x80AB4D10/func_80AB72BC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB7354.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mnk_0x80AB4D10/func_80AB7354.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB740C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mnk_0x80AB4D10/func_80AB740C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB7488.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mnk_0x80AB4D10/func_80AB7488.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB7504.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mnk_0x80AB4D10/func_80AB7504.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB75A4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mnk_0x80AB4D10/func_80AB75A4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB7620.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mnk_0x80AB4D10/func_80AB7620.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB76B0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mnk_0x80AB4D10/func_80AB76B0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB794C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mnk_0x80AB4D10/func_80AB794C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB7AC8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mnk_0x80AB4D10/func_80AB7AC8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB7B20.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mnk_0x80AB4D10/func_80AB7B20.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB7DCC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mnk_0x80AB4D10/func_80AB7DCC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB7E50.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mnk_0x80AB4D10/func_80AB7E50.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB8040.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mnk_0x80AB4D10/func_80AB8040.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB80BC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mnk_0x80AB4D10/func_80AB80BC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB81D8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mnk_0x80AB4D10/func_80AB81D8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB8478.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mnk_0x80AB4D10/func_80AB8478.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB852C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mnk_0x80AB4D10/func_80AB852C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB85C8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mnk_0x80AB4D10/func_80AB85C8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB8644.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mnk_0x80AB4D10/func_80AB8644.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB86AC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mnk_0x80AB4D10/func_80AB86AC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB8750.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mnk_0x80AB4D10/func_80AB8750.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB8878.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mnk_0x80AB4D10/func_80AB8878.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB8968.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mnk_0x80AB4D10/func_80AB8968.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB89F8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mnk_0x80AB4D10/func_80AB89F8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB8A74.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mnk_0x80AB4D10/func_80AB8A74.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB8B18.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mnk_0x80AB4D10/func_80AB8B18.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB8BD4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mnk_0x80AB4D10/func_80AB8BD4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB8C60.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mnk_0x80AB4D10/func_80AB8C60.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB8CFC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mnk_0x80AB4D10/func_80AB8CFC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB8E4C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mnk_0x80AB4D10/func_80AB8E4C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB8EF4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mnk_0x80AB4D10/func_80AB8EF4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB8FD8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mnk_0x80AB4D10/func_80AB8FD8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB9084.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mnk_0x80AB4D10/func_80AB9084.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB92CC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mnk_0x80AB4D10/func_80AB92CC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB94E4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mnk_0x80AB4D10/func_80AB94E4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/EnMnk_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mnk_0x80AB4D10/EnMnk_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB96A0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mnk_0x80AB4D10/func_80AB96A0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB96E8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mnk_0x80AB4D10/func_80AB96E8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB9708.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mnk_0x80AB4D10/func_80AB9708.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB973C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mnk_0x80AB4D10/func_80AB973C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB977C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mnk_0x80AB4D10/func_80AB977C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB97B4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mnk_0x80AB4D10/func_80AB97B4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB99D4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mnk_0x80AB4D10/func_80AB99D4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/EnMnk_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mnk_0x80AB4D10/EnMnk_Draw.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB9BAC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mnk_0x80AB4D10/func_80AB9BAC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB9C4C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mnk_0x80AB4D10/func_80AB9C4C.asm") diff --git a/src/overlays/actors/ovl_En_Ms/z_en_ms.c b/src/overlays/actors/ovl_En_Ms/z_en_ms.c index 6f6c18f9aa..1c6863cf65 100644 --- a/src/overlays/actors/ovl_En_Ms/z_en_ms.c +++ b/src/overlays/actors/ovl_En_Ms/z_en_ms.c @@ -23,18 +23,18 @@ const ActorInit En_Ms_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ms_0x80952620/EnMs_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ms_0x80952620/EnMs_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ms_0x80952620/EnMs_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ms_0x80952620/EnMs_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ms_0x80952620/func_80952734.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ms_0x80952620/func_80952734.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ms_0x80952620/func_809527F8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ms_0x80952620/func_809527F8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ms_0x80952620/func_809529AC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ms_0x80952620/func_809529AC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ms_0x80952620/func_80952A1C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ms_0x80952620/func_80952A1C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ms_0x80952620/EnMs_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ms_0x80952620/EnMs_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ms_0x80952620/EnMs_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ms_0x80952620/EnMs_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Mt_tag/z_en_mt_tag.c b/src/overlays/actors/ovl_En_Mt_tag/z_en_mt_tag.c index ae56ceea69..d898f4a93e 100644 --- a/src/overlays/actors/ovl_En_Mt_tag/z_en_mt_tag.c +++ b/src/overlays/actors/ovl_En_Mt_tag/z_en_mt_tag.c @@ -22,40 +22,40 @@ const ActorInit En_Mt_tag_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mt_tag_0x809CF350/func_809CF350.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mt_tag_0x809CF350/func_809CF350.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mt_tag_0x809CF350/func_809CF394.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mt_tag_0x809CF350/func_809CF394.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mt_tag_0x809CF350/func_809CF444.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mt_tag_0x809CF350/func_809CF444.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mt_tag_0x809CF350/func_809CF4EC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mt_tag_0x809CF350/func_809CF4EC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mt_tag_0x809CF350/func_809CF67C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mt_tag_0x809CF350/func_809CF67C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mt_tag_0x809CF350/func_809CF848.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mt_tag_0x809CF350/func_809CF848.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mt_tag_0x809CF350/func_809CF8EC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mt_tag_0x809CF350/func_809CF8EC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mt_tag_0x809CF350/func_809CF950.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mt_tag_0x809CF350/func_809CF950.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mt_tag_0x809CF350/func_809CF9A0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mt_tag_0x809CF350/func_809CF9A0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mt_tag_0x809CF350/func_809CFA00.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mt_tag_0x809CF350/func_809CFA00.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mt_tag_0x809CF350/func_809CFA54.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mt_tag_0x809CF350/func_809CFA54.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mt_tag_0x809CF350/func_809CFBC4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mt_tag_0x809CF350/func_809CFBC4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mt_tag_0x809CF350/func_809CFC38.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mt_tag_0x809CF350/func_809CFC38.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mt_tag_0x809CF350/func_809CFD98.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mt_tag_0x809CF350/func_809CFD98.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mt_tag_0x809CF350/func_809CFE28.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mt_tag_0x809CF350/func_809CFE28.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mt_tag_0x809CF350/func_809CFF94.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mt_tag_0x809CF350/func_809CFF94.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mt_tag_0x809CF350/EnMttag_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mt_tag_0x809CF350/EnMttag_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mt_tag_0x809CF350/EnMttag_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mt_tag_0x809CF350/EnMttag_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mt_tag_0x809CF350/EnMttag_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mt_tag_0x809CF350/EnMttag_Update.asm") diff --git a/src/overlays/actors/ovl_En_Mushi2/z_en_mushi2.c b/src/overlays/actors/ovl_En_Mushi2/z_en_mushi2.c index 666899f9f5..f1013ec8f9 100644 --- a/src/overlays/actors/ovl_En_Mushi2/z_en_mushi2.c +++ b/src/overlays/actors/ovl_En_Mushi2/z_en_mushi2.c @@ -23,106 +23,106 @@ const ActorInit En_Mushi2_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mushi2_0x80A687A0/func_80A687A0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mushi2_0x80A687A0/func_80A687A0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mushi2_0x80A687A0/func_80A68808.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mushi2_0x80A687A0/func_80A68808.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mushi2_0x80A687A0/func_80A68860.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mushi2_0x80A687A0/func_80A68860.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mushi2_0x80A687A0/func_80A68910.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mushi2_0x80A687A0/func_80A68910.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mushi2_0x80A687A0/func_80A68A78.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mushi2_0x80A687A0/func_80A68A78.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mushi2_0x80A687A0/func_80A68B3C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mushi2_0x80A687A0/func_80A68B3C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mushi2_0x80A687A0/func_80A68B6C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mushi2_0x80A687A0/func_80A68B6C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mushi2_0x80A687A0/func_80A68BA0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mushi2_0x80A687A0/func_80A68BA0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mushi2_0x80A687A0/func_80A68BC8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mushi2_0x80A687A0/func_80A68BC8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mushi2_0x80A687A0/func_80A68C5C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mushi2_0x80A687A0/func_80A68C5C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mushi2_0x80A687A0/func_80A68CE4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mushi2_0x80A687A0/func_80A68CE4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mushi2_0x80A687A0/func_80A68DD4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mushi2_0x80A687A0/func_80A68DD4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mushi2_0x80A687A0/func_80A68ED8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mushi2_0x80A687A0/func_80A68ED8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mushi2_0x80A687A0/func_80A68F24.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mushi2_0x80A687A0/func_80A68F24.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mushi2_0x80A687A0/func_80A68F9C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mushi2_0x80A687A0/func_80A68F9C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mushi2_0x80A687A0/func_80A690C4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mushi2_0x80A687A0/func_80A690C4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mushi2_0x80A687A0/func_80A691EC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mushi2_0x80A687A0/func_80A691EC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mushi2_0x80A687A0/func_80A69388.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mushi2_0x80A687A0/func_80A69388.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mushi2_0x80A687A0/func_80A69424.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mushi2_0x80A687A0/func_80A69424.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mushi2_0x80A687A0/func_80A69468.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mushi2_0x80A687A0/func_80A69468.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mushi2_0x80A687A0/func_80A6958C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mushi2_0x80A687A0/func_80A6958C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mushi2_0x80A687A0/func_80A6969C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mushi2_0x80A687A0/func_80A6969C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mushi2_0x80A687A0/func_80A697C4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mushi2_0x80A687A0/func_80A697C4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mushi2_0x80A687A0/func_80A699E4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mushi2_0x80A687A0/func_80A699E4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mushi2_0x80A687A0/func_80A69AA8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mushi2_0x80A687A0/func_80A69AA8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mushi2_0x80A687A0/func_80A69ADC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mushi2_0x80A687A0/func_80A69ADC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mushi2_0x80A687A0/func_80A69CE0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mushi2_0x80A687A0/func_80A69CE0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mushi2_0x80A687A0/func_80A69D3C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mushi2_0x80A687A0/func_80A69D3C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mushi2_0x80A687A0/func_80A69EE4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mushi2_0x80A687A0/func_80A69EE4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mushi2_0x80A687A0/func_80A69F5C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mushi2_0x80A687A0/func_80A69F5C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mushi2_0x80A687A0/func_80A6A024.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mushi2_0x80A687A0/func_80A6A024.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mushi2_0x80A687A0/func_80A6A058.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mushi2_0x80A687A0/func_80A6A058.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mushi2_0x80A687A0/func_80A6A094.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mushi2_0x80A687A0/func_80A6A094.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mushi2_0x80A687A0/func_80A6A0D8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mushi2_0x80A687A0/func_80A6A0D8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mushi2_0x80A687A0/EnMushi2_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mushi2_0x80A687A0/EnMushi2_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mushi2_0x80A687A0/EnMushi2_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mushi2_0x80A687A0/EnMushi2_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mushi2_0x80A687A0/func_80A6A300.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mushi2_0x80A687A0/func_80A6A300.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mushi2_0x80A687A0/func_80A6A36C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mushi2_0x80A687A0/func_80A6A36C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mushi2_0x80A687A0/func_80A6A508.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mushi2_0x80A687A0/func_80A6A508.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mushi2_0x80A687A0/func_80A6A5C0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mushi2_0x80A687A0/func_80A6A5C0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mushi2_0x80A687A0/func_80A6A794.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mushi2_0x80A687A0/func_80A6A794.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mushi2_0x80A687A0/func_80A6A824.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mushi2_0x80A687A0/func_80A6A824.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mushi2_0x80A687A0/func_80A6A984.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mushi2_0x80A687A0/func_80A6A984.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mushi2_0x80A687A0/func_80A6A9E4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mushi2_0x80A687A0/func_80A6A9E4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mushi2_0x80A687A0/func_80A6AAA4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mushi2_0x80A687A0/func_80A6AAA4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mushi2_0x80A687A0/func_80A6AB08.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mushi2_0x80A687A0/func_80A6AB08.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mushi2_0x80A687A0/func_80A6AE14.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mushi2_0x80A687A0/func_80A6AE14.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mushi2_0x80A687A0/func_80A6AE7C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mushi2_0x80A687A0/func_80A6AE7C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mushi2_0x80A687A0/func_80A6B078.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mushi2_0x80A687A0/func_80A6B078.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mushi2_0x80A687A0/func_80A6B0D8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mushi2_0x80A687A0/func_80A6B0D8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mushi2_0x80A687A0/EnMushi2_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mushi2_0x80A687A0/EnMushi2_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Mushi2_0x80A687A0/EnMushi2_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Mushi2_0x80A687A0/EnMushi2_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Muto/z_en_muto.c b/src/overlays/actors/ovl_En_Muto/z_en_muto.c index c04adf103f..ee4036e673 100644 --- a/src/overlays/actors/ovl_En_Muto/z_en_muto.c +++ b/src/overlays/actors/ovl_En_Muto/z_en_muto.c @@ -23,24 +23,24 @@ const ActorInit En_Muto_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Muto_0x80BE7B00/EnMuto_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Muto_0x80BE7B00/EnMuto_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Muto_0x80BE7B00/EnMuto_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Muto_0x80BE7B00/EnMuto_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Muto_0x80BE7B00/func_80BE7C94.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Muto_0x80BE7B00/func_80BE7C94.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Muto_0x80BE7B00/func_80BE7D20.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Muto_0x80BE7B00/func_80BE7D20.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Muto_0x80BE7B00/func_80BE7DB4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Muto_0x80BE7B00/func_80BE7DB4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Muto_0x80BE7B00/func_80BE7DEC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Muto_0x80BE7B00/func_80BE7DEC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Muto_0x80BE7B00/func_80BE7F88.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Muto_0x80BE7B00/func_80BE7F88.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Muto_0x80BE7B00/func_80BE7FEC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Muto_0x80BE7B00/func_80BE7FEC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Muto_0x80BE7B00/EnMuto_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Muto_0x80BE7B00/EnMuto_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Muto_0x80BE7B00/func_80BE8328.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Muto_0x80BE7B00/func_80BE8328.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Muto_0x80BE7B00/EnMuto_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Muto_0x80BE7B00/EnMuto_Draw.asm") 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 c2ef013c83..e6f00e6f95 100644 --- a/src/overlays/actors/ovl_En_Nb/z_en_nb.c +++ b/src/overlays/actors/ovl_En_Nb/z_en_nb.c @@ -23,64 +23,64 @@ const ActorInit En_Nb_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Nb_0x80BBFDB0/func_80BBFDB0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Nb_0x80BBFDB0/func_80BBFDB0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Nb_0x80BBFDB0/func_80BBFE60.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Nb_0x80BBFDB0/func_80BBFE60.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Nb_0x80BBFDB0/func_80BBFE8C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Nb_0x80BBFDB0/func_80BBFE8C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Nb_0x80BBFDB0/func_80BBFF24.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Nb_0x80BBFDB0/func_80BBFF24.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Nb_0x80BBFDB0/func_80BBFF90.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Nb_0x80BBFDB0/func_80BBFF90.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Nb_0x80BBFDB0/func_80BBFFD4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Nb_0x80BBFDB0/func_80BBFFD4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Nb_0x80BBFDB0/func_80BC0050.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Nb_0x80BBFDB0/func_80BC0050.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Nb_0x80BBFDB0/func_80BC00AC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Nb_0x80BBFDB0/func_80BC00AC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Nb_0x80BBFDB0/func_80BC01DC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Nb_0x80BBFDB0/func_80BC01DC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Nb_0x80BBFDB0/func_80BC045C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Nb_0x80BBFDB0/func_80BC045C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Nb_0x80BBFDB0/func_80BC04FC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Nb_0x80BBFDB0/func_80BC04FC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Nb_0x80BBFDB0/func_80BC05A8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Nb_0x80BBFDB0/func_80BC05A8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Nb_0x80BBFDB0/func_80BC06C4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Nb_0x80BBFDB0/func_80BC06C4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Nb_0x80BBFDB0/func_80BC0800.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Nb_0x80BBFDB0/func_80BC0800.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Nb_0x80BBFDB0/func_80BC08E0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Nb_0x80BBFDB0/func_80BC08E0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Nb_0x80BBFDB0/func_80BC0978.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Nb_0x80BBFDB0/func_80BC0978.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Nb_0x80BBFDB0/func_80BC0A18.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Nb_0x80BBFDB0/func_80BC0A18.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Nb_0x80BBFDB0/func_80BC0B98.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Nb_0x80BBFDB0/func_80BC0B98.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Nb_0x80BBFDB0/func_80BC0C0C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Nb_0x80BBFDB0/func_80BC0C0C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Nb_0x80BBFDB0/func_80BC0C80.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Nb_0x80BBFDB0/func_80BC0C80.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Nb_0x80BBFDB0/func_80BC0D08.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Nb_0x80BBFDB0/func_80BC0D08.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Nb_0x80BBFDB0/func_80BC0D1C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Nb_0x80BBFDB0/func_80BC0D1C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Nb_0x80BBFDB0/func_80BC0D84.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Nb_0x80BBFDB0/func_80BC0D84.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Nb_0x80BBFDB0/func_80BC0EAC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Nb_0x80BBFDB0/func_80BC0EAC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Nb_0x80BBFDB0/EnNb_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Nb_0x80BBFDB0/EnNb_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Nb_0x80BBFDB0/EnNb_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Nb_0x80BBFDB0/EnNb_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Nb_0x80BBFDB0/EnNb_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Nb_0x80BBFDB0/EnNb_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Nb_0x80BBFDB0/func_80BC1174.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Nb_0x80BBFDB0/func_80BC1174.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Nb_0x80BBFDB0/func_80BC11B4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Nb_0x80BBFDB0/func_80BC11B4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Nb_0x80BBFDB0/func_80BC1278.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Nb_0x80BBFDB0/func_80BC1278.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Nb_0x80BBFDB0/EnNb_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Nb_0x80BBFDB0/EnNb_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Neo_Reeba/z_en_neo_reeba.c b/src/overlays/actors/ovl_En_Neo_Reeba/z_en_neo_reeba.c index f72b629d4b..a8b6938ee7 100644 --- a/src/overlays/actors/ovl_En_Neo_Reeba/z_en_neo_reeba.c +++ b/src/overlays/actors/ovl_En_Neo_Reeba/z_en_neo_reeba.c @@ -23,68 +23,68 @@ const ActorInit En_Neo_Reeba_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Neo_Reeba_0x80B7C890/EnNeoReeba_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Neo_Reeba_0x80B7C890/EnNeoReeba_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Neo_Reeba_0x80B7C890/EnNeoReeba_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Neo_Reeba_0x80B7C890/EnNeoReeba_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Neo_Reeba_0x80B7C890/func_80B7CA34.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Neo_Reeba_0x80B7C890/func_80B7CA34.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Neo_Reeba_0x80B7C890/func_80B7CA70.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Neo_Reeba_0x80B7C890/func_80B7CA70.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Neo_Reeba_0x80B7C890/func_80B7CB3C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Neo_Reeba_0x80B7C890/func_80B7CB3C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Neo_Reeba_0x80B7C890/func_80B7CB88.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Neo_Reeba_0x80B7C890/func_80B7CB88.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Neo_Reeba_0x80B7C890/func_80B7CCE0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Neo_Reeba_0x80B7C890/func_80B7CCE0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Neo_Reeba_0x80B7C890/func_80B7CD28.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Neo_Reeba_0x80B7C890/func_80B7CD28.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Neo_Reeba_0x80B7C890/func_80B7CE34.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Neo_Reeba_0x80B7C890/func_80B7CE34.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Neo_Reeba_0x80B7C890/func_80B7CE94.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Neo_Reeba_0x80B7C890/func_80B7CE94.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Neo_Reeba_0x80B7C890/func_80B7CFA0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Neo_Reeba_0x80B7C890/func_80B7CFA0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Neo_Reeba_0x80B7C890/func_80B7CFFC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Neo_Reeba_0x80B7C890/func_80B7CFFC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Neo_Reeba_0x80B7C890/func_80B7D130.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Neo_Reeba_0x80B7C890/func_80B7D130.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Neo_Reeba_0x80B7C890/func_80B7D150.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Neo_Reeba_0x80B7C890/func_80B7D150.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Neo_Reeba_0x80B7C890/func_80B7D254.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Neo_Reeba_0x80B7C890/func_80B7D254.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Neo_Reeba_0x80B7C890/func_80B7D2E4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Neo_Reeba_0x80B7C890/func_80B7D2E4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Neo_Reeba_0x80B7C890/func_80B7D360.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Neo_Reeba_0x80B7C890/func_80B7D360.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Neo_Reeba_0x80B7C890/func_80B7D398.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Neo_Reeba_0x80B7C890/func_80B7D398.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Neo_Reeba_0x80B7C890/func_80B7D3EC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Neo_Reeba_0x80B7C890/func_80B7D3EC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Neo_Reeba_0x80B7C890/func_80B7D47C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Neo_Reeba_0x80B7C890/func_80B7D47C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Neo_Reeba_0x80B7C890/func_80B7D4FC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Neo_Reeba_0x80B7C890/func_80B7D4FC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Neo_Reeba_0x80B7C890/func_80B7D5A4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Neo_Reeba_0x80B7C890/func_80B7D5A4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Neo_Reeba_0x80B7C890/func_80B7D6D0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Neo_Reeba_0x80B7C890/func_80B7D6D0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Neo_Reeba_0x80B7C890/func_80B7D788.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Neo_Reeba_0x80B7C890/func_80B7D788.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Neo_Reeba_0x80B7C890/func_80B7D9B8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Neo_Reeba_0x80B7C890/func_80B7D9B8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Neo_Reeba_0x80B7C890/func_80B7DC80.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Neo_Reeba_0x80B7C890/func_80B7DC80.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Neo_Reeba_0x80B7C890/func_80B7DD7C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Neo_Reeba_0x80B7C890/func_80B7DD7C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Neo_Reeba_0x80B7C890/func_80B7DF34.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Neo_Reeba_0x80B7C890/func_80B7DF34.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Neo_Reeba_0x80B7C890/func_80B7E0BC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Neo_Reeba_0x80B7C890/func_80B7E0BC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Neo_Reeba_0x80B7C890/func_80B7E260.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Neo_Reeba_0x80B7C890/func_80B7E260.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Neo_Reeba_0x80B7C890/EnNeoReeba_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Neo_Reeba_0x80B7C890/EnNeoReeba_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Neo_Reeba_0x80B7C890/func_80B7E378.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Neo_Reeba_0x80B7C890/func_80B7E378.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Neo_Reeba_0x80B7C890/EnNeoReeba_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Neo_Reeba_0x80B7C890/EnNeoReeba_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Nimotsu/z_en_nimotsu.c b/src/overlays/actors/ovl_En_Nimotsu/z_en_nimotsu.c index 6e52dd56ce..89c8b13bf7 100644 --- a/src/overlays/actors/ovl_En_Nimotsu/z_en_nimotsu.c +++ b/src/overlays/actors/ovl_En_Nimotsu/z_en_nimotsu.c @@ -23,12 +23,12 @@ const ActorInit En_Nimotsu_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Nimotsu_0x80BE1C80/func_80BE1C80.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Nimotsu_0x80BE1C80/func_80BE1C80.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Nimotsu_0x80BE1C80/EnNimotsu_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Nimotsu_0x80BE1C80/EnNimotsu_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Nimotsu_0x80BE1C80/EnNimotsu_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Nimotsu_0x80BE1C80/EnNimotsu_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Nimotsu_0x80BE1C80/EnNimotsu_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Nimotsu_0x80BE1C80/EnNimotsu_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Nimotsu_0x80BE1C80/EnNimotsu_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Nimotsu_0x80BE1C80/EnNimotsu_Draw.asm") 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 86d1a97af3..2ab1f5955b 100644 --- a/src/overlays/actors/ovl_En_Niw/z_en_niw.c +++ b/src/overlays/actors/ovl_En_Niw/z_en_niw.c @@ -23,50 +23,50 @@ const ActorInit En_Niw_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Niw_0x80891060/EnNiw_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Niw_0x80891060/EnNiw_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Niw_0x80891060/EnNiw_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Niw_0x80891060/EnNiw_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Niw_0x80891060/func_80891320.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Niw_0x80891060/func_80891320.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Niw_0x80891060/func_808916B0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Niw_0x80891060/func_808916B0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Niw_0x80891060/func_808917F8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Niw_0x80891060/func_808917F8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Niw_0x80891060/func_80891974.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Niw_0x80891060/func_80891974.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Niw_0x80891060/func_808919E8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Niw_0x80891060/func_808919E8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Niw_0x80891060/func_80891D78.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Niw_0x80891060/func_80891D78.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Niw_0x80891060/func_80891F60.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Niw_0x80891060/func_80891F60.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Niw_0x80891060/func_808920A0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Niw_0x80891060/func_808920A0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Niw_0x80891060/func_80892248.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Niw_0x80891060/func_80892248.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Niw_0x80891060/func_80892274.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Niw_0x80891060/func_80892274.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Niw_0x80891060/func_808922D0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Niw_0x80891060/func_808922D0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Niw_0x80891060/func_80892390.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Niw_0x80891060/func_80892390.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Niw_0x80891060/func_80892414.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Niw_0x80891060/func_80892414.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Niw_0x80891060/func_808924B0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Niw_0x80891060/func_808924B0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Niw_0x80891060/func_808925F8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Niw_0x80891060/func_808925F8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Niw_0x80891060/func_8089262C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Niw_0x80891060/func_8089262C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Niw_0x80891060/EnNiw_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Niw_0x80891060/EnNiw_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Niw_0x80891060/func_80892E70.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Niw_0x80891060/func_80892E70.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Niw_0x80891060/EnNiw_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Niw_0x80891060/EnNiw_Draw.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Niw_0x80891060/func_80893008.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Niw_0x80891060/func_80893008.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Niw_0x80891060/func_808930FC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Niw_0x80891060/func_808930FC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Niw_0x80891060/func_808932B0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Niw_0x80891060/func_808932B0.asm") 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 f85e9dd571..2648a7ca85 100644 --- a/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.c +++ b/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.c @@ -23,12 +23,12 @@ const ActorInit En_Nutsball_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Nutsball_0x80985C40/EnNutsball_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Nutsball_0x80985C40/EnNutsball_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Nutsball_0x80985C40/EnNutsball_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Nutsball_0x80985C40/EnNutsball_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Nutsball_0x80985C40/func_80985D3C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Nutsball_0x80985C40/func_80985D3C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Nutsball_0x80985C40/EnNutsball_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Nutsball_0x80985C40/EnNutsball_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Nutsball_0x80985C40/EnNutsball_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Nutsball_0x80985C40/EnNutsball_Draw.asm") 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 bb0f7884e6..bdedf3dffa 100644 --- a/src/overlays/actors/ovl_En_Nwc/z_en_nwc.c +++ b/src/overlays/actors/ovl_En_Nwc/z_en_nwc.c @@ -23,42 +23,42 @@ const ActorInit En_Nwc_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Nwc_0x809441E0/EnNwc_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Nwc_0x809441E0/EnNwc_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Nwc_0x809441E0/EnNwc_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Nwc_0x809441E0/EnNwc_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Nwc_0x809441E0/func_80944320.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Nwc_0x809441E0/func_80944320.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Nwc_0x809441E0/func_80944554.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Nwc_0x809441E0/func_80944554.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Nwc_0x809441E0/func_80944590.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Nwc_0x809441E0/func_80944590.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Nwc_0x809441E0/func_809445D4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Nwc_0x809441E0/func_809445D4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Nwc_0x809441E0/func_80944630.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Nwc_0x809441E0/func_80944630.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Nwc_0x809441E0/func_809447A8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Nwc_0x809441E0/func_809447A8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Nwc_0x809441E0/func_80944818.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Nwc_0x809441E0/func_80944818.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Nwc_0x809441E0/func_809448A4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Nwc_0x809441E0/func_809448A4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Nwc_0x809441E0/func_809449D0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Nwc_0x809441E0/func_809449D0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Nwc_0x809441E0/func_80944A50.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Nwc_0x809441E0/func_80944A50.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Nwc_0x809441E0/func_80944E44.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Nwc_0x809441E0/func_80944E44.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Nwc_0x809441E0/func_80944EFC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Nwc_0x809441E0/func_80944EFC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Nwc_0x809441E0/func_80944FA8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Nwc_0x809441E0/func_80944FA8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Nwc_0x809441E0/func_8094506C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Nwc_0x809441E0/func_8094506C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Nwc_0x809441E0/EnNwc_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Nwc_0x809441E0/EnNwc_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Nwc_0x809441E0/EnNwc_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Nwc_0x809441E0/EnNwc_Draw.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Nwc_0x809441E0/func_8094529C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Nwc_0x809441E0/func_8094529C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Nwc_0x809441E0/func_80945310.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Nwc_0x809441E0/func_80945310.asm") 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 3defb5b6e6..19c40544e5 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 @@ -22,12 +22,12 @@ const ActorInit En_Okarina_Tag_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Okarina_Tag_0x8093E420/EnOkarinaTag_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Okarina_Tag_0x8093E420/EnOkarinaTag_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Okarina_Tag_0x8093E420/EnOkarinaTag_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Okarina_Tag_0x8093E420/EnOkarinaTag_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Okarina_Tag_0x8093E420/func_8093E518.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Okarina_Tag_0x8093E420/func_8093E518.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Okarina_Tag_0x8093E420/func_8093E68C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Okarina_Tag_0x8093E420/func_8093E68C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Okarina_Tag_0x8093E420/EnOkarinaTag_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Okarina_Tag_0x8093E420/EnOkarinaTag_Update.asm") 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 ee7634e331..b7412aec6d 100644 --- a/src/overlays/actors/ovl_En_Okuta/z_en_okuta.c +++ b/src/overlays/actors/ovl_En_Okuta/z_en_okuta.c @@ -23,78 +23,78 @@ const ActorInit En_Okuta_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Okuta_0x8086DE20/EnOkuta_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Okuta_0x8086DE20/EnOkuta_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Okuta_0x8086DE20/EnOkuta_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Okuta_0x8086DE20/EnOkuta_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Okuta_0x8086DE20/func_8086E084.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Okuta_0x8086DE20/func_8086E084.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Okuta_0x8086DE20/func_8086E0F0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Okuta_0x8086DE20/func_8086E0F0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Okuta_0x8086DE20/func_8086E168.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Okuta_0x8086DE20/func_8086E168.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Okuta_0x8086DE20/func_8086E214.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Okuta_0x8086DE20/func_8086E214.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Okuta_0x8086DE20/func_8086E27C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Okuta_0x8086DE20/func_8086E27C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Okuta_0x8086DE20/func_8086E2C0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Okuta_0x8086DE20/func_8086E2C0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Okuta_0x8086DE20/func_8086E378.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Okuta_0x8086DE20/func_8086E378.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Okuta_0x8086DE20/func_8086E3B8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Okuta_0x8086DE20/func_8086E3B8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Okuta_0x8086DE20/func_8086E4FC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Okuta_0x8086DE20/func_8086E4FC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Okuta_0x8086DE20/func_8086E52C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Okuta_0x8086DE20/func_8086E52C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Okuta_0x8086DE20/func_8086E5E8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Okuta_0x8086DE20/func_8086E5E8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Okuta_0x8086DE20/func_8086E658.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Okuta_0x8086DE20/func_8086E658.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Okuta_0x8086DE20/func_8086E7A8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Okuta_0x8086DE20/func_8086E7A8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Okuta_0x8086DE20/func_8086E7E8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Okuta_0x8086DE20/func_8086E7E8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Okuta_0x8086DE20/func_8086E8E8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Okuta_0x8086DE20/func_8086E8E8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Okuta_0x8086DE20/func_8086E948.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Okuta_0x8086DE20/func_8086E948.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Okuta_0x8086DE20/func_8086EAE0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Okuta_0x8086DE20/func_8086EAE0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Okuta_0x8086DE20/func_8086EC00.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Okuta_0x8086DE20/func_8086EC00.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Okuta_0x8086DE20/func_8086EE8C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Okuta_0x8086DE20/func_8086EE8C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Okuta_0x8086DE20/func_8086EF14.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Okuta_0x8086DE20/func_8086EF14.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Okuta_0x8086DE20/func_8086EF90.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Okuta_0x8086DE20/func_8086EF90.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Okuta_0x8086DE20/func_8086EFE8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Okuta_0x8086DE20/func_8086EFE8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Okuta_0x8086DE20/func_8086F2FC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Okuta_0x8086DE20/func_8086F2FC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Okuta_0x8086DE20/func_8086F434.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Okuta_0x8086DE20/func_8086F434.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Okuta_0x8086DE20/func_8086F4B0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Okuta_0x8086DE20/func_8086F4B0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Okuta_0x8086DE20/func_8086F4F4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Okuta_0x8086DE20/func_8086F4F4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Okuta_0x8086DE20/func_8086F57C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Okuta_0x8086DE20/func_8086F57C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Okuta_0x8086DE20/func_8086F694.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Okuta_0x8086DE20/func_8086F694.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Okuta_0x8086DE20/func_8086F8FC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Okuta_0x8086DE20/func_8086F8FC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Okuta_0x8086DE20/func_8086FCA4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Okuta_0x8086DE20/func_8086FCA4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Okuta_0x8086DE20/EnOkuta_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Okuta_0x8086DE20/EnOkuta_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Okuta_0x8086DE20/func_808700C0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Okuta_0x8086DE20/func_808700C0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Okuta_0x8086DE20/func_80870254.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Okuta_0x8086DE20/func_80870254.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Okuta_0x8086DE20/func_808704DC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Okuta_0x8086DE20/func_808704DC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Okuta_0x8086DE20/func_808705C8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Okuta_0x8086DE20/func_808705C8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Okuta_0x8086DE20/EnOkuta_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Okuta_0x8086DE20/EnOkuta_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Onpuman/z_en_onpuman.c b/src/overlays/actors/ovl_En_Onpuman/z_en_onpuman.c index 363fd2be96..696ce45f6d 100644 --- a/src/overlays/actors/ovl_En_Onpuman/z_en_onpuman.c +++ b/src/overlays/actors/ovl_En_Onpuman/z_en_onpuman.c @@ -22,18 +22,18 @@ const ActorInit En_Onpuman_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Onpuman_0x80B11E60/EnOnpuman_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Onpuman_0x80B11E60/EnOnpuman_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Onpuman_0x80B11E60/EnOnpuman_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Onpuman_0x80B11E60/EnOnpuman_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Onpuman_0x80B11E60/func_80B11F44.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Onpuman_0x80B11E60/func_80B11F44.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Onpuman_0x80B11E60/func_80B11F78.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Onpuman_0x80B11E60/func_80B11F78.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Onpuman_0x80B11E60/func_80B1202C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Onpuman_0x80B11E60/func_80B1202C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Onpuman_0x80B11E60/func_80B1217C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Onpuman_0x80B11E60/func_80B1217C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Onpuman_0x80B11E60/func_80B121D8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Onpuman_0x80B11E60/func_80B121D8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Onpuman_0x80B11E60/EnOnpuman_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Onpuman_0x80B11E60/EnOnpuman_Update.asm") diff --git a/src/overlays/actors/ovl_En_Osk/z_en_osk.c b/src/overlays/actors/ovl_En_Osk/z_en_osk.c index eff1707a5a..8d7e9d0645 100644 --- a/src/overlays/actors/ovl_En_Osk/z_en_osk.c +++ b/src/overlays/actors/ovl_En_Osk/z_en_osk.c @@ -23,38 +23,38 @@ const ActorInit En_Osk_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Osk_0x80BF5C20/EnOsk_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Osk_0x80BF5C20/EnOsk_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Osk_0x80BF5C20/EnOsk_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Osk_0x80BF5C20/EnOsk_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Osk_0x80BF5C20/func_80BF5E00.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Osk_0x80BF5C20/func_80BF5E00.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Osk_0x80BF5C20/func_80BF5E68.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Osk_0x80BF5C20/func_80BF5E68.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Osk_0x80BF5C20/func_80BF5EBC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Osk_0x80BF5C20/func_80BF5EBC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Osk_0x80BF5C20/func_80BF5F60.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Osk_0x80BF5C20/func_80BF5F60.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Osk_0x80BF5C20/func_80BF5F70.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Osk_0x80BF5C20/func_80BF5F70.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Osk_0x80BF5C20/func_80BF609C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Osk_0x80BF5C20/func_80BF609C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Osk_0x80BF5C20/func_80BF61EC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Osk_0x80BF5C20/func_80BF61EC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Osk_0x80BF5C20/func_80BF6314.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Osk_0x80BF5C20/func_80BF6314.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Osk_0x80BF5C20/func_80BF6478.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Osk_0x80BF5C20/func_80BF6478.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Osk_0x80BF5C20/func_80BF656C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Osk_0x80BF5C20/func_80BF656C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Osk_0x80BF5C20/func_80BF67A8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Osk_0x80BF5C20/func_80BF67A8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Osk_0x80BF5C20/func_80BF68E0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Osk_0x80BF5C20/func_80BF68E0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Osk_0x80BF5C20/func_80BF6A20.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Osk_0x80BF5C20/func_80BF6A20.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Osk_0x80BF5C20/EnOsk_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Osk_0x80BF5C20/EnOsk_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Osk_0x80BF5C20/func_80BF6C54.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Osk_0x80BF5C20/func_80BF6C54.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Osk_0x80BF5C20/EnOsk_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Osk_0x80BF5C20/EnOsk_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Osn/z_en_osn.c b/src/overlays/actors/ovl_En_Osn/z_en_osn.c index 21b5dde8b6..ffd902f601 100644 --- a/src/overlays/actors/ovl_En_Osn/z_en_osn.c +++ b/src/overlays/actors/ovl_En_Osn/z_en_osn.c @@ -23,44 +23,44 @@ const ActorInit En_Osn_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Osn_0x80AD0830/func_80AD0830.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Osn_0x80AD0830/func_80AD0830.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Osn_0x80AD0830/func_80AD08B0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Osn_0x80AD0830/func_80AD08B0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Osn_0x80AD0830/func_80AD0998.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Osn_0x80AD0830/func_80AD0998.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Osn_0x80AD0830/func_80AD0A24.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Osn_0x80AD0830/func_80AD0A24.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Osn_0x80AD0830/func_80AD0AB0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Osn_0x80AD0830/func_80AD0AB0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Osn_0x80AD0830/func_80AD0B38.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Osn_0x80AD0830/func_80AD0B38.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Osn_0x80AD0830/func_80AD0E10.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Osn_0x80AD0830/func_80AD0E10.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Osn_0x80AD0830/func_80AD10FC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Osn_0x80AD0830/func_80AD10FC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Osn_0x80AD0830/func_80AD1398.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Osn_0x80AD0830/func_80AD1398.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Osn_0x80AD0830/func_80AD144C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Osn_0x80AD0830/func_80AD144C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Osn_0x80AD0830/func_80AD14C8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Osn_0x80AD0830/func_80AD14C8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Osn_0x80AD0830/func_80AD1634.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Osn_0x80AD0830/func_80AD1634.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Osn_0x80AD0830/func_80AD16A8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Osn_0x80AD0830/func_80AD16A8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Osn_0x80AD0830/func_80AD19A0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Osn_0x80AD0830/func_80AD19A0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Osn_0x80AD0830/func_80AD1A4C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Osn_0x80AD0830/func_80AD1A4C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Osn_0x80AD0830/EnOsn_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Osn_0x80AD0830/EnOsn_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Osn_0x80AD0830/EnOsn_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Osn_0x80AD0830/EnOsn_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Osn_0x80AD0830/EnOsn_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Osn_0x80AD0830/EnOsn_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Osn_0x80AD0830/func_80AD1DA8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Osn_0x80AD0830/func_80AD1DA8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Osn_0x80AD0830/func_80AD1E28.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Osn_0x80AD0830/func_80AD1E28.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Osn_0x80AD0830/EnOsn_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Osn_0x80AD0830/EnOsn_Draw.asm") 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 ee52b0b44d..b24969e6e9 100644 --- a/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c +++ b/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c @@ -22,138 +22,138 @@ const ActorInit En_Ossan_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ossan_0x808A80A0/func_808A80A0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ossan_0x808A80A0/func_808A80A0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ossan_0x808A80A0/func_808A80AC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ossan_0x808A80A0/func_808A80AC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ossan_0x808A80A0/func_808A812C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ossan_0x808A80A0/func_808A812C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ossan_0x808A80A0/func_808A8218.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ossan_0x808A80A0/func_808A8218.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ossan_0x808A80A0/func_808A82F4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ossan_0x808A80A0/func_808A82F4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ossan_0x808A80A0/EnOssan_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ossan_0x808A80A0/EnOssan_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ossan_0x808A80A0/EnOssan_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ossan_0x808A80A0/EnOssan_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ossan_0x808A80A0/func_808A849C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ossan_0x808A80A0/func_808A849C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ossan_0x808A80A0/func_808A8500.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ossan_0x808A80A0/func_808A8500.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ossan_0x808A80A0/func_808A85FC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ossan_0x808A80A0/func_808A85FC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ossan_0x808A80A0/func_808A8644.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ossan_0x808A80A0/func_808A8644.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ossan_0x808A80A0/func_808A86A8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ossan_0x808A80A0/func_808A86A8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ossan_0x808A80A0/func_808A8708.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ossan_0x808A80A0/func_808A8708.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ossan_0x808A80A0/func_808A875C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ossan_0x808A80A0/func_808A875C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ossan_0x808A80A0/func_808A8798.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ossan_0x808A80A0/func_808A8798.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ossan_0x808A80A0/func_808A890C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ossan_0x808A80A0/func_808A890C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ossan_0x808A80A0/func_808A8B74.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ossan_0x808A80A0/func_808A8B74.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ossan_0x808A80A0/func_808A8CC0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ossan_0x808A80A0/func_808A8CC0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ossan_0x808A80A0/func_808A8DF8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ossan_0x808A80A0/func_808A8DF8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ossan_0x808A80A0/func_808A8E84.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ossan_0x808A80A0/func_808A8E84.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ossan_0x808A80A0/func_808A8EEC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ossan_0x808A80A0/func_808A8EEC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ossan_0x808A80A0/func_808A90A4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ossan_0x808A80A0/func_808A90A4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ossan_0x808A80A0/func_808A91B4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ossan_0x808A80A0/func_808A91B4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ossan_0x808A80A0/func_808A935C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ossan_0x808A80A0/func_808A935C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ossan_0x808A80A0/func_808A9400.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ossan_0x808A80A0/func_808A9400.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ossan_0x808A80A0/func_808A94FC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ossan_0x808A80A0/func_808A94FC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ossan_0x808A80A0/func_808A95F8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ossan_0x808A80A0/func_808A95F8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ossan_0x808A80A0/func_808A980C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ossan_0x808A80A0/func_808A980C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ossan_0x808A80A0/func_808A98E4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ossan_0x808A80A0/func_808A98E4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ossan_0x808A80A0/func_808A9AB8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ossan_0x808A80A0/func_808A9AB8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ossan_0x808A80A0/func_808A9C8C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ossan_0x808A80A0/func_808A9C8C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ossan_0x808A80A0/func_808A9D64.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ossan_0x808A80A0/func_808A9D64.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ossan_0x808A80A0/func_808A9E20.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ossan_0x808A80A0/func_808A9E20.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ossan_0x808A80A0/func_808A9E5C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ossan_0x808A80A0/func_808A9E5C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ossan_0x808A80A0/func_808A9E98.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ossan_0x808A80A0/func_808A9E98.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ossan_0x808A80A0/func_808AA0C8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ossan_0x808A80A0/func_808AA0C8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ossan_0x808A80A0/func_808AA1B0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ossan_0x808A80A0/func_808AA1B0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ossan_0x808A80A0/func_808AA224.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ossan_0x808A80A0/func_808AA224.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ossan_0x808A80A0/func_808AA2C8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ossan_0x808A80A0/func_808AA2C8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ossan_0x808A80A0/func_808AA33C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ossan_0x808A80A0/func_808AA33C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ossan_0x808A80A0/func_808AA404.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ossan_0x808A80A0/func_808AA404.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ossan_0x808A80A0/func_808AA5E8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ossan_0x808A80A0/func_808AA5E8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ossan_0x808A80A0/func_808AA6D8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ossan_0x808A80A0/func_808AA6D8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ossan_0x808A80A0/func_808AA79C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ossan_0x808A80A0/func_808AA79C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ossan_0x808A80A0/func_808AA7C0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ossan_0x808A80A0/func_808AA7C0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ossan_0x808A80A0/func_808AA85C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ossan_0x808A80A0/func_808AA85C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ossan_0x808A80A0/func_808AA8E8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ossan_0x808A80A0/func_808AA8E8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ossan_0x808A80A0/func_808AAA64.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ossan_0x808A80A0/func_808AAA64.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ossan_0x808A80A0/func_808AAB30.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ossan_0x808A80A0/func_808AAB30.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ossan_0x808A80A0/func_808AACE0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ossan_0x808A80A0/func_808AACE0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ossan_0x808A80A0/func_808AAD14.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ossan_0x808A80A0/func_808AAD14.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ossan_0x808A80A0/func_808AADB4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ossan_0x808A80A0/func_808AADB4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ossan_0x808A80A0/func_808AAE1C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ossan_0x808A80A0/func_808AAE1C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ossan_0x808A80A0/func_808AAE84.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ossan_0x808A80A0/func_808AAE84.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ossan_0x808A80A0/func_808AAFB0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ossan_0x808A80A0/func_808AAFB0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ossan_0x808A80A0/func_808AB0B0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ossan_0x808A80A0/func_808AB0B0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ossan_0x808A80A0/func_808AB16C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ossan_0x808A80A0/func_808AB16C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ossan_0x808A80A0/func_808AB404.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ossan_0x808A80A0/func_808AB404.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ossan_0x808A80A0/EnOssan_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ossan_0x808A80A0/EnOssan_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ossan_0x808A80A0/func_808AB52C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ossan_0x808A80A0/func_808AB52C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ossan_0x808A80A0/func_808AB78C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ossan_0x808A80A0/func_808AB78C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ossan_0x808A80A0/func_808AB928.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ossan_0x808A80A0/func_808AB928.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ossan_0x808A80A0/func_808ABCD0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ossan_0x808A80A0/func_808ABCD0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ossan_0x808A80A0/func_808ABD10.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ossan_0x808A80A0/func_808ABD10.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ossan_0x808A80A0/func_808ABD60.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ossan_0x808A80A0/func_808ABD60.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ossan_0x808A80A0/func_808ABE18.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ossan_0x808A80A0/func_808ABE18.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ossan_0x808A80A0/func_808ABE58.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ossan_0x808A80A0/func_808ABE58.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ossan_0x808A80A0/func_808ABF30.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ossan_0x808A80A0/func_808ABF30.asm") diff --git a/src/overlays/actors/ovl_En_Ot/z_en_ot.c b/src/overlays/actors/ovl_En_Ot/z_en_ot.c index 32ae3f22ff..0c740bae1c 100644 --- a/src/overlays/actors/ovl_En_Ot/z_en_ot.c +++ b/src/overlays/actors/ovl_En_Ot/z_en_ot.c @@ -23,104 +23,104 @@ const ActorInit En_Ot_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ot_0x80B5B2E0/func_80B5B2E0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ot_0x80B5B2E0/func_80B5B2E0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ot_0x80B5B2E0/EnOt_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ot_0x80B5B2E0/EnOt_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ot_0x80B5B2E0/EnOt_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ot_0x80B5B2E0/EnOt_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ot_0x80B5B2E0/func_80B5BAAC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ot_0x80B5B2E0/func_80B5BAAC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ot_0x80B5B2E0/func_80B5BB38.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ot_0x80B5B2E0/func_80B5BB38.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ot_0x80B5B2E0/func_80B5BDA8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ot_0x80B5B2E0/func_80B5BDA8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ot_0x80B5B2E0/func_80B5BE04.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ot_0x80B5B2E0/func_80B5BE04.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ot_0x80B5B2E0/func_80B5BE88.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ot_0x80B5B2E0/func_80B5BE88.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ot_0x80B5B2E0/func_80B5BED4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ot_0x80B5B2E0/func_80B5BED4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ot_0x80B5B2E0/func_80B5BF60.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ot_0x80B5B2E0/func_80B5BF60.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ot_0x80B5B2E0/func_80B5BFB8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ot_0x80B5B2E0/func_80B5BFB8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ot_0x80B5B2E0/func_80B5C154.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ot_0x80B5B2E0/func_80B5C154.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ot_0x80B5B2E0/func_80B5C1CC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ot_0x80B5B2E0/func_80B5C1CC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ot_0x80B5B2E0/func_80B5C244.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ot_0x80B5B2E0/func_80B5C244.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ot_0x80B5B2E0/func_80B5C25C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ot_0x80B5B2E0/func_80B5C25C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ot_0x80B5B2E0/func_80B5C3B8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ot_0x80B5B2E0/func_80B5C3B8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ot_0x80B5B2E0/func_80B5C3D8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ot_0x80B5B2E0/func_80B5C3D8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ot_0x80B5B2E0/func_80B5C634.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ot_0x80B5B2E0/func_80B5C634.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ot_0x80B5B2E0/func_80B5C64C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ot_0x80B5B2E0/func_80B5C64C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ot_0x80B5B2E0/func_80B5C684.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ot_0x80B5B2E0/func_80B5C684.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ot_0x80B5B2E0/func_80B5C6DC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ot_0x80B5B2E0/func_80B5C6DC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ot_0x80B5B2E0/func_80B5C910.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ot_0x80B5B2E0/func_80B5C910.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ot_0x80B5B2E0/func_80B5C950.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ot_0x80B5B2E0/func_80B5C950.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ot_0x80B5B2E0/func_80B5C9A8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ot_0x80B5B2E0/func_80B5C9A8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ot_0x80B5B2E0/func_80B5C9C0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ot_0x80B5B2E0/func_80B5C9C0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ot_0x80B5B2E0/func_80B5C9D0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ot_0x80B5B2E0/func_80B5C9D0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ot_0x80B5B2E0/func_80B5CA30.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ot_0x80B5B2E0/func_80B5CA30.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ot_0x80B5B2E0/func_80B5CAD0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ot_0x80B5B2E0/func_80B5CAD0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ot_0x80B5B2E0/func_80B5CB0C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ot_0x80B5B2E0/func_80B5CB0C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ot_0x80B5B2E0/func_80B5CBA0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ot_0x80B5B2E0/func_80B5CBA0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ot_0x80B5B2E0/func_80B5CBEC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ot_0x80B5B2E0/func_80B5CBEC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ot_0x80B5B2E0/func_80B5CC88.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ot_0x80B5B2E0/func_80B5CC88.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ot_0x80B5B2E0/func_80B5CCA0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ot_0x80B5B2E0/func_80B5CCA0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ot_0x80B5B2E0/func_80B5CCF4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ot_0x80B5B2E0/func_80B5CCF4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ot_0x80B5B2E0/func_80B5CD40.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ot_0x80B5B2E0/func_80B5CD40.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ot_0x80B5B2E0/func_80B5CE6C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ot_0x80B5B2E0/func_80B5CE6C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ot_0x80B5B2E0/func_80B5CEC8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ot_0x80B5B2E0/func_80B5CEC8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ot_0x80B5B2E0/func_80B5D114.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ot_0x80B5B2E0/func_80B5D114.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ot_0x80B5B2E0/func_80B5D160.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ot_0x80B5B2E0/func_80B5D160.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ot_0x80B5B2E0/func_80B5D37C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ot_0x80B5B2E0/func_80B5D37C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ot_0x80B5B2E0/func_80B5D470.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ot_0x80B5B2E0/func_80B5D470.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ot_0x80B5B2E0/func_80B5D648.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ot_0x80B5B2E0/func_80B5D648.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ot_0x80B5B2E0/func_80B5D750.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ot_0x80B5B2E0/func_80B5D750.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ot_0x80B5B2E0/EnOt_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ot_0x80B5B2E0/EnOt_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ot_0x80B5B2E0/func_80B5DAEC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ot_0x80B5B2E0/func_80B5DAEC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ot_0x80B5B2E0/func_80B5DB6C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ot_0x80B5B2E0/func_80B5DB6C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ot_0x80B5B2E0/EnOt_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ot_0x80B5B2E0/EnOt_Draw.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ot_0x80B5B2E0/func_80B5DECC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ot_0x80B5B2E0/func_80B5DECC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ot_0x80B5B2E0/func_80B5DF58.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ot_0x80B5B2E0/func_80B5DF58.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ot_0x80B5B2E0/func_80B5E078.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ot_0x80B5B2E0/func_80B5E078.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ot_0x80B5B2E0/func_80B5E1D8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ot_0x80B5B2E0/func_80B5E1D8.asm") 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 dd6dc9c126..8f9b6e0fe7 100644 --- a/src/overlays/actors/ovl_En_Owl/z_en_owl.c +++ b/src/overlays/actors/ovl_En_Owl/z_en_owl.c @@ -23,110 +23,110 @@ const ActorInit En_Owl_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Owl_0x8095A510/func_8095A510.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Owl_0x8095A510/func_8095A510.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Owl_0x8095A510/EnOwl_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Owl_0x8095A510/EnOwl_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Owl_0x8095A510/EnOwl_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Owl_0x8095A510/EnOwl_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Owl_0x8095A510/func_8095A920.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Owl_0x8095A510/func_8095A920.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Owl_0x8095A510/func_8095A978.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Owl_0x8095A510/func_8095A978.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Owl_0x8095A510/func_8095A9FC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Owl_0x8095A510/func_8095A9FC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Owl_0x8095A510/func_8095AA70.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Owl_0x8095A510/func_8095AA70.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Owl_0x8095A510/func_8095AAD0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Owl_0x8095A510/func_8095AAD0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Owl_0x8095A510/func_8095AB1C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Owl_0x8095A510/func_8095AB1C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Owl_0x8095A510/func_8095AB4C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Owl_0x8095A510/func_8095AB4C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Owl_0x8095A510/func_8095ABA8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Owl_0x8095A510/func_8095ABA8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Owl_0x8095A510/func_8095ABF0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Owl_0x8095A510/func_8095ABF0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Owl_0x8095A510/func_8095AC50.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Owl_0x8095A510/func_8095AC50.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Owl_0x8095A510/func_8095ACEC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Owl_0x8095A510/func_8095ACEC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Owl_0x8095A510/func_8095AD54.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Owl_0x8095A510/func_8095AD54.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Owl_0x8095A510/func_8095AE00.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Owl_0x8095A510/func_8095AE00.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Owl_0x8095A510/func_8095AE60.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Owl_0x8095A510/func_8095AE60.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Owl_0x8095A510/func_8095AEC0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Owl_0x8095A510/func_8095AEC0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Owl_0x8095A510/func_8095AF2C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Owl_0x8095A510/func_8095AF2C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Owl_0x8095A510/func_8095AFEC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Owl_0x8095A510/func_8095AFEC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Owl_0x8095A510/func_8095B06C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Owl_0x8095A510/func_8095B06C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Owl_0x8095A510/func_8095B0C8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Owl_0x8095A510/func_8095B0C8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Owl_0x8095A510/func_8095B158.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Owl_0x8095A510/func_8095B158.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Owl_0x8095A510/func_8095B1E4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Owl_0x8095A510/func_8095B1E4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Owl_0x8095A510/func_8095B254.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Owl_0x8095A510/func_8095B254.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Owl_0x8095A510/func_8095B2F8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Owl_0x8095A510/func_8095B2F8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Owl_0x8095A510/func_8095B3DC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Owl_0x8095A510/func_8095B3DC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Owl_0x8095A510/func_8095B480.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Owl_0x8095A510/func_8095B480.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Owl_0x8095A510/func_8095B574.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Owl_0x8095A510/func_8095B574.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Owl_0x8095A510/func_8095B650.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Owl_0x8095A510/func_8095B650.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Owl_0x8095A510/func_8095B6C8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Owl_0x8095A510/func_8095B6C8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Owl_0x8095A510/func_8095B76C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Owl_0x8095A510/func_8095B76C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Owl_0x8095A510/func_8095B960.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Owl_0x8095A510/func_8095B960.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Owl_0x8095A510/func_8095B9FC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Owl_0x8095A510/func_8095B9FC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Owl_0x8095A510/func_8095BA84.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Owl_0x8095A510/func_8095BA84.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Owl_0x8095A510/func_8095BE0C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Owl_0x8095A510/func_8095BE0C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Owl_0x8095A510/func_8095BF20.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Owl_0x8095A510/func_8095BF20.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Owl_0x8095A510/func_8095BF58.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Owl_0x8095A510/func_8095BF58.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Owl_0x8095A510/func_8095BF78.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Owl_0x8095A510/func_8095BF78.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Owl_0x8095A510/func_8095C09C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Owl_0x8095A510/func_8095C09C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Owl_0x8095A510/func_8095C1C8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Owl_0x8095A510/func_8095C1C8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Owl_0x8095A510/func_8095C258.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Owl_0x8095A510/func_8095C258.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Owl_0x8095A510/func_8095C328.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Owl_0x8095A510/func_8095C328.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Owl_0x8095A510/func_8095C408.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Owl_0x8095A510/func_8095C408.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Owl_0x8095A510/func_8095C484.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Owl_0x8095A510/func_8095C484.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Owl_0x8095A510/func_8095C510.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Owl_0x8095A510/func_8095C510.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Owl_0x8095A510/func_8095C568.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Owl_0x8095A510/func_8095C568.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Owl_0x8095A510/EnOwl_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Owl_0x8095A510/EnOwl_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Owl_0x8095A510/func_8095CCF4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Owl_0x8095A510/func_8095CCF4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Owl_0x8095A510/func_8095CE18.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Owl_0x8095A510/func_8095CE18.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Owl_0x8095A510/func_8095CF44.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Owl_0x8095A510/func_8095CF44.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Owl_0x8095A510/EnOwl_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Owl_0x8095A510/EnOwl_Draw.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Owl_0x8095A510/func_8095D074.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Owl_0x8095A510/func_8095D074.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Owl_0x8095A510/func_8095D24C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Owl_0x8095A510/func_8095D24C.asm") diff --git a/src/overlays/actors/ovl_En_Pamera/z_en_pamera.c b/src/overlays/actors/ovl_En_Pamera/z_en_pamera.c index a59d7b296a..531dc71aa7 100644 --- a/src/overlays/actors/ovl_En_Pamera/z_en_pamera.c +++ b/src/overlays/actors/ovl_En_Pamera/z_en_pamera.c @@ -23,118 +23,118 @@ const ActorInit En_Pamera_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pamera_0x80BD82B0/EnPamera_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pamera_0x80BD82B0/EnPamera_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pamera_0x80BD82B0/func_80BD84F0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pamera_0x80BD82B0/func_80BD84F0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pamera_0x80BD82B0/func_80BD8588.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pamera_0x80BD82B0/func_80BD8588.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pamera_0x80BD82B0/func_80BD8658.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pamera_0x80BD82B0/func_80BD8658.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pamera_0x80BD82B0/EnPamera_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pamera_0x80BD82B0/EnPamera_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pamera_0x80BD82B0/func_80BD8700.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pamera_0x80BD82B0/func_80BD8700.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pamera_0x80BD82B0/func_80BD8758.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pamera_0x80BD82B0/func_80BD8758.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pamera_0x80BD82B0/func_80BD8908.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pamera_0x80BD82B0/func_80BD8908.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pamera_0x80BD82B0/func_80BD8964.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pamera_0x80BD82B0/func_80BD8964.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pamera_0x80BD82B0/func_80BD8A38.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pamera_0x80BD82B0/func_80BD8A38.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pamera_0x80BD82B0/func_80BD8A7C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pamera_0x80BD82B0/func_80BD8A7C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pamera_0x80BD82B0/func_80BD8B50.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pamera_0x80BD82B0/func_80BD8B50.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pamera_0x80BD82B0/func_80BD8B70.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pamera_0x80BD82B0/func_80BD8B70.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pamera_0x80BD82B0/func_80BD8CCC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pamera_0x80BD82B0/func_80BD8CCC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pamera_0x80BD82B0/func_80BD8D1C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pamera_0x80BD82B0/func_80BD8D1C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pamera_0x80BD82B0/func_80BD8D80.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pamera_0x80BD82B0/func_80BD8D80.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pamera_0x80BD82B0/func_80BD8DB0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pamera_0x80BD82B0/func_80BD8DB0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pamera_0x80BD82B0/func_80BD8F0C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pamera_0x80BD82B0/func_80BD8F0C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pamera_0x80BD82B0/func_80BD8F60.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pamera_0x80BD82B0/func_80BD8F60.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pamera_0x80BD82B0/func_80BD8FF0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pamera_0x80BD82B0/func_80BD8FF0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pamera_0x80BD82B0/func_80BD909C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pamera_0x80BD82B0/func_80BD909C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pamera_0x80BD82B0/func_80BD90AC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pamera_0x80BD82B0/func_80BD90AC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pamera_0x80BD82B0/func_80BD9234.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pamera_0x80BD82B0/func_80BD9234.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pamera_0x80BD82B0/func_80BD92D0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pamera_0x80BD82B0/func_80BD92D0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pamera_0x80BD82B0/func_80BD9338.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pamera_0x80BD82B0/func_80BD9338.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pamera_0x80BD82B0/func_80BD9384.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pamera_0x80BD82B0/func_80BD9384.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pamera_0x80BD82B0/func_80BD93CC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pamera_0x80BD82B0/func_80BD93CC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pamera_0x80BD82B0/func_80BD93F4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pamera_0x80BD82B0/func_80BD93F4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pamera_0x80BD82B0/func_80BD94E0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pamera_0x80BD82B0/func_80BD94E0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pamera_0x80BD82B0/EnPamera_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pamera_0x80BD82B0/EnPamera_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pamera_0x80BD82B0/func_80BD9648.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pamera_0x80BD82B0/func_80BD9648.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pamera_0x80BD82B0/func_80BD9690.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pamera_0x80BD82B0/func_80BD9690.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pamera_0x80BD82B0/EnPamera_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pamera_0x80BD82B0/EnPamera_Draw.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pamera_0x80BD82B0/func_80BD9840.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pamera_0x80BD82B0/func_80BD9840.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pamera_0x80BD82B0/func_80BD9904.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pamera_0x80BD82B0/func_80BD9904.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pamera_0x80BD82B0/func_80BD9928.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pamera_0x80BD82B0/func_80BD9928.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pamera_0x80BD82B0/func_80BD9938.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pamera_0x80BD82B0/func_80BD9938.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pamera_0x80BD82B0/func_80BD994C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pamera_0x80BD82B0/func_80BD994C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pamera_0x80BD82B0/func_80BD9A9C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pamera_0x80BD82B0/func_80BD9A9C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pamera_0x80BD82B0/func_80BD9AB0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pamera_0x80BD82B0/func_80BD9AB0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pamera_0x80BD82B0/func_80BD9B4C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pamera_0x80BD82B0/func_80BD9B4C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pamera_0x80BD82B0/func_80BD9C70.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pamera_0x80BD82B0/func_80BD9C70.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pamera_0x80BD82B0/func_80BD9CB8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pamera_0x80BD82B0/func_80BD9CB8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pamera_0x80BD82B0/func_80BD9E60.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pamera_0x80BD82B0/func_80BD9E60.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pamera_0x80BD82B0/func_80BD9E78.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pamera_0x80BD82B0/func_80BD9E78.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pamera_0x80BD82B0/func_80BD9E88.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pamera_0x80BD82B0/func_80BD9E88.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pamera_0x80BD82B0/func_80BD9ED0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pamera_0x80BD82B0/func_80BD9ED0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pamera_0x80BD82B0/func_80BD9EE0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pamera_0x80BD82B0/func_80BD9EE0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pamera_0x80BD82B0/func_80BD9F3C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pamera_0x80BD82B0/func_80BD9F3C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pamera_0x80BD82B0/func_80BDA038.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pamera_0x80BD82B0/func_80BDA038.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pamera_0x80BD82B0/func_80BDA090.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pamera_0x80BD82B0/func_80BDA090.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pamera_0x80BD82B0/func_80BDA0A0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pamera_0x80BD82B0/func_80BDA0A0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pamera_0x80BD82B0/func_80BDA0FC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pamera_0x80BD82B0/func_80BDA0FC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pamera_0x80BD82B0/func_80BDA170.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pamera_0x80BD82B0/func_80BDA170.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pamera_0x80BD82B0/func_80BDA1C8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pamera_0x80BD82B0/func_80BDA1C8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pamera_0x80BD82B0/func_80BDA288.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pamera_0x80BD82B0/func_80BDA288.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pamera_0x80BD82B0/func_80BDA2E0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pamera_0x80BD82B0/func_80BDA2E0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pamera_0x80BD82B0/func_80BDA344.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pamera_0x80BD82B0/func_80BDA344.asm") diff --git a/src/overlays/actors/ovl_En_Pametfrog/z_en_pametfrog.c b/src/overlays/actors/ovl_En_Pametfrog/z_en_pametfrog.c index 2bc26fe5b7..a4fd05f660 100644 --- a/src/overlays/actors/ovl_En_Pametfrog/z_en_pametfrog.c +++ b/src/overlays/actors/ovl_En_Pametfrog/z_en_pametfrog.c @@ -23,142 +23,142 @@ const ActorInit En_Pametfrog_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pametfrog_0x80869D90/EnPametfrog_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pametfrog_0x80869D90/EnPametfrog_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pametfrog_0x80869D90/EnPametfrog_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pametfrog_0x80869D90/EnPametfrog_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pametfrog_0x80869D90/func_80869FBC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pametfrog_0x80869D90/func_80869FBC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pametfrog_0x80869D90/func_8086A024.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pametfrog_0x80869D90/func_8086A024.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pametfrog_0x80869D90/func_8086A068.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pametfrog_0x80869D90/func_8086A068.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pametfrog_0x80869D90/func_8086A0F4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pametfrog_0x80869D90/func_8086A0F4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pametfrog_0x80869D90/func_8086A1A0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pametfrog_0x80869D90/func_8086A1A0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pametfrog_0x80869D90/func_8086A238.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pametfrog_0x80869D90/func_8086A238.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pametfrog_0x80869D90/func_8086A2CC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pametfrog_0x80869D90/func_8086A2CC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pametfrog_0x80869D90/func_8086A428.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pametfrog_0x80869D90/func_8086A428.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pametfrog_0x80869D90/func_8086A4E4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pametfrog_0x80869D90/func_8086A4E4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pametfrog_0x80869D90/func_8086A554.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pametfrog_0x80869D90/func_8086A554.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pametfrog_0x80869D90/func_8086A6B0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pametfrog_0x80869D90/func_8086A6B0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pametfrog_0x80869D90/func_8086A724.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pametfrog_0x80869D90/func_8086A724.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pametfrog_0x80869D90/func_8086A80C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pametfrog_0x80869D90/func_8086A80C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pametfrog_0x80869D90/func_8086A878.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pametfrog_0x80869D90/func_8086A878.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pametfrog_0x80869D90/func_8086A8C0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pametfrog_0x80869D90/func_8086A8C0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pametfrog_0x80869D90/func_8086A964.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pametfrog_0x80869D90/func_8086A964.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pametfrog_0x80869D90/func_8086AA60.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pametfrog_0x80869D90/func_8086AA60.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pametfrog_0x80869D90/func_8086AAA8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pametfrog_0x80869D90/func_8086AAA8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pametfrog_0x80869D90/func_8086AB04.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pametfrog_0x80869D90/func_8086AB04.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pametfrog_0x80869D90/func_8086AB68.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pametfrog_0x80869D90/func_8086AB68.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pametfrog_0x80869D90/func_8086AC0C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pametfrog_0x80869D90/func_8086AC0C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pametfrog_0x80869D90/func_8086AD34.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pametfrog_0x80869D90/func_8086AD34.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pametfrog_0x80869D90/func_8086AE48.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pametfrog_0x80869D90/func_8086AE48.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pametfrog_0x80869D90/func_8086AEC8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pametfrog_0x80869D90/func_8086AEC8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pametfrog_0x80869D90/func_8086AFC8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pametfrog_0x80869D90/func_8086AFC8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pametfrog_0x80869D90/func_8086B140.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pametfrog_0x80869D90/func_8086B140.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pametfrog_0x80869D90/func_8086B478.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pametfrog_0x80869D90/func_8086B478.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pametfrog_0x80869D90/func_8086B570.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pametfrog_0x80869D90/func_8086B570.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pametfrog_0x80869D90/func_8086B66C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pametfrog_0x80869D90/func_8086B66C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pametfrog_0x80869D90/func_8086B794.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pametfrog_0x80869D90/func_8086B794.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pametfrog_0x80869D90/func_8086B864.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pametfrog_0x80869D90/func_8086B864.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pametfrog_0x80869D90/func_8086B8CC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pametfrog_0x80869D90/func_8086B8CC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pametfrog_0x80869D90/func_8086B9D0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pametfrog_0x80869D90/func_8086B9D0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pametfrog_0x80869D90/func_8086BA6C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pametfrog_0x80869D90/func_8086BA6C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pametfrog_0x80869D90/func_8086BB4C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pametfrog_0x80869D90/func_8086BB4C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pametfrog_0x80869D90/func_8086BB9C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pametfrog_0x80869D90/func_8086BB9C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pametfrog_0x80869D90/func_8086BBE0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pametfrog_0x80869D90/func_8086BBE0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pametfrog_0x80869D90/func_8086BDA8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pametfrog_0x80869D90/func_8086BDA8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pametfrog_0x80869D90/func_8086BE60.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pametfrog_0x80869D90/func_8086BE60.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pametfrog_0x80869D90/func_8086BEEC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pametfrog_0x80869D90/func_8086BEEC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pametfrog_0x80869D90/func_8086BF90.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pametfrog_0x80869D90/func_8086BF90.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pametfrog_0x80869D90/func_8086C088.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pametfrog_0x80869D90/func_8086C088.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pametfrog_0x80869D90/func_8086C0CC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pametfrog_0x80869D90/func_8086C0CC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pametfrog_0x80869D90/func_8086C1AC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pametfrog_0x80869D90/func_8086C1AC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pametfrog_0x80869D90/func_8086C274.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pametfrog_0x80869D90/func_8086C274.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pametfrog_0x80869D90/func_8086C4B8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pametfrog_0x80869D90/func_8086C4B8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pametfrog_0x80869D90/func_8086C5A8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pametfrog_0x80869D90/func_8086C5A8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pametfrog_0x80869D90/func_8086C618.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pametfrog_0x80869D90/func_8086C618.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pametfrog_0x80869D90/func_8086C6D0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pametfrog_0x80869D90/func_8086C6D0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pametfrog_0x80869D90/func_8086C72C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pametfrog_0x80869D90/func_8086C72C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pametfrog_0x80869D90/func_8086C7C8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pametfrog_0x80869D90/func_8086C7C8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pametfrog_0x80869D90/func_8086C81C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pametfrog_0x80869D90/func_8086C81C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pametfrog_0x80869D90/func_8086C94C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pametfrog_0x80869D90/func_8086C94C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pametfrog_0x80869D90/func_8086C99C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pametfrog_0x80869D90/func_8086C99C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pametfrog_0x80869D90/func_8086CB4C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pametfrog_0x80869D90/func_8086CB4C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pametfrog_0x80869D90/func_8086CC04.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pametfrog_0x80869D90/func_8086CC04.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pametfrog_0x80869D90/func_8086CC84.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pametfrog_0x80869D90/func_8086CC84.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pametfrog_0x80869D90/func_8086CD04.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pametfrog_0x80869D90/func_8086CD04.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pametfrog_0x80869D90/func_8086CD6C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pametfrog_0x80869D90/func_8086CD6C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pametfrog_0x80869D90/func_8086CEB4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pametfrog_0x80869D90/func_8086CEB4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pametfrog_0x80869D90/func_8086CEF0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pametfrog_0x80869D90/func_8086CEF0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pametfrog_0x80869D90/func_8086D084.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pametfrog_0x80869D90/func_8086D084.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pametfrog_0x80869D90/func_8086D140.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pametfrog_0x80869D90/func_8086D140.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pametfrog_0x80869D90/func_8086D1E8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pametfrog_0x80869D90/func_8086D1E8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pametfrog_0x80869D90/func_8086D230.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pametfrog_0x80869D90/func_8086D230.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pametfrog_0x80869D90/EnPametfrog_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pametfrog_0x80869D90/EnPametfrog_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pametfrog_0x80869D90/func_8086D730.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pametfrog_0x80869D90/func_8086D730.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pametfrog_0x80869D90/EnPametfrog_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pametfrog_0x80869D90/EnPametfrog_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Paper/z_en_paper.c b/src/overlays/actors/ovl_En_Paper/z_en_paper.c index f59247039c..820fba233e 100644 --- a/src/overlays/actors/ovl_En_Paper/z_en_paper.c +++ b/src/overlays/actors/ovl_En_Paper/z_en_paper.c @@ -23,24 +23,24 @@ const ActorInit En_Paper_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Paper_0x80C1F3D0/EnPaper_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Paper_0x80C1F3D0/EnPaper_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Paper_0x80C1F3D0/EnPaper_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Paper_0x80C1F3D0/EnPaper_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Paper_0x80C1F3D0/func_80C1F46C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Paper_0x80C1F3D0/func_80C1F46C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Paper_0x80C1F3D0/func_80C1F480.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Paper_0x80C1F3D0/func_80C1F480.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Paper_0x80C1F3D0/func_80C1F4E8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Paper_0x80C1F3D0/func_80C1F4E8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Paper_0x80C1F3D0/func_80C1F4FC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Paper_0x80C1F3D0/func_80C1F4FC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Paper_0x80C1F3D0/func_80C1F55C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Paper_0x80C1F3D0/func_80C1F55C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Paper_0x80C1F3D0/func_80C1F6E0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Paper_0x80C1F3D0/func_80C1F6E0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Paper_0x80C1F3D0/func_80C1F87C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Paper_0x80C1F3D0/func_80C1F87C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Paper_0x80C1F3D0/EnPaper_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Paper_0x80C1F3D0/EnPaper_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Paper_0x80C1F3D0/EnPaper_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Paper_0x80C1F3D0/EnPaper_Draw.asm") 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 dd5db652db..50d3766ddd 100644 --- a/src/overlays/actors/ovl_En_Part/z_en_part.c +++ b/src/overlays/actors/ovl_En_Part/z_en_part.c @@ -23,14 +23,14 @@ const ActorInit En_Part_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Part_0x80865370/EnPart_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Part_0x80865370/EnPart_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Part_0x80865370/EnPart_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Part_0x80865370/EnPart_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Part_0x80865370/func_80865390.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Part_0x80865370/func_80865390.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Part_0x80865370/func_808654C4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Part_0x80865370/func_808654C4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Part_0x80865370/EnPart_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Part_0x80865370/EnPart_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Part_0x80865370/EnPart_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Part_0x80865370/EnPart_Draw.asm") 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 849964c35d..7a937d906f 100644 --- a/src/overlays/actors/ovl_En_Peehat/z_en_peehat.c +++ b/src/overlays/actors/ovl_En_Peehat/z_en_peehat.c @@ -23,68 +23,68 @@ const ActorInit En_Peehat_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Peehat_0x80896F30/EnPeehat_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Peehat_0x80896F30/EnPeehat_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Peehat_0x80896F30/EnPeehat_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Peehat_0x80896F30/EnPeehat_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Peehat_0x80896F30/func_80897170.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Peehat_0x80896F30/func_80897170.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Peehat_0x80896F30/func_808971DC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Peehat_0x80896F30/func_808971DC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Peehat_0x80896F30/func_80897258.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Peehat_0x80896F30/func_80897258.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Peehat_0x80896F30/func_80897390.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Peehat_0x80896F30/func_80897390.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Peehat_0x80896F30/func_80897498.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Peehat_0x80896F30/func_80897498.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Peehat_0x80896F30/func_80897520.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Peehat_0x80896F30/func_80897520.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Peehat_0x80896F30/func_80897648.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Peehat_0x80896F30/func_80897648.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Peehat_0x80896F30/func_808976DC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Peehat_0x80896F30/func_808976DC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Peehat_0x80896F30/func_80897864.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Peehat_0x80896F30/func_80897864.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Peehat_0x80896F30/func_80897910.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Peehat_0x80896F30/func_80897910.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Peehat_0x80896F30/func_80897A34.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Peehat_0x80896F30/func_80897A34.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Peehat_0x80896F30/func_80897A94.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Peehat_0x80896F30/func_80897A94.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Peehat_0x80896F30/func_80897D00.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Peehat_0x80896F30/func_80897D00.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Peehat_0x80896F30/func_80897D48.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Peehat_0x80896F30/func_80897D48.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Peehat_0x80896F30/func_80897EAC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Peehat_0x80896F30/func_80897EAC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Peehat_0x80896F30/func_80897F44.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Peehat_0x80896F30/func_80897F44.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Peehat_0x80896F30/func_80898124.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Peehat_0x80896F30/func_80898124.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Peehat_0x80896F30/func_80898144.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Peehat_0x80896F30/func_80898144.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Peehat_0x80896F30/func_808982E0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Peehat_0x80896F30/func_808982E0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Peehat_0x80896F30/func_80898338.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Peehat_0x80896F30/func_80898338.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Peehat_0x80896F30/func_80898414.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Peehat_0x80896F30/func_80898414.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Peehat_0x80896F30/func_80898454.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Peehat_0x80896F30/func_80898454.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Peehat_0x80896F30/func_808984E0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Peehat_0x80896F30/func_808984E0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Peehat_0x80896F30/func_80898594.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Peehat_0x80896F30/func_80898594.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Peehat_0x80896F30/func_80898654.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Peehat_0x80896F30/func_80898654.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Peehat_0x80896F30/func_808986A4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Peehat_0x80896F30/func_808986A4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Peehat_0x80896F30/func_8089874C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Peehat_0x80896F30/func_8089874C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Peehat_0x80896F30/EnPeehat_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Peehat_0x80896F30/EnPeehat_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Peehat_0x80896F30/func_80898E74.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Peehat_0x80896F30/func_80898E74.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Peehat_0x80896F30/func_80899024.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Peehat_0x80896F30/func_80899024.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Peehat_0x80896F30/EnPeehat_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Peehat_0x80896F30/EnPeehat_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Pm/z_en_pm.c b/src/overlays/actors/ovl_En_Pm/z_en_pm.c index 6323b9e365..1d52633c77 100644 --- a/src/overlays/actors/ovl_En_Pm/z_en_pm.c +++ b/src/overlays/actors/ovl_En_Pm/z_en_pm.c @@ -23,102 +23,102 @@ const ActorInit En_Pm_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pm_0x80AF7B40/func_80AF7B40.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pm_0x80AF7B40/func_80AF7B40.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pm_0x80AF7B40/func_80AF7BAC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pm_0x80AF7B40/func_80AF7BAC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pm_0x80AF7B40/func_80AF7CB0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pm_0x80AF7B40/func_80AF7CB0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pm_0x80AF7B40/func_80AF7D60.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pm_0x80AF7B40/func_80AF7D60.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pm_0x80AF7B40/func_80AF7DC4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pm_0x80AF7B40/func_80AF7DC4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pm_0x80AF7B40/func_80AF7E6C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pm_0x80AF7B40/func_80AF7E6C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pm_0x80AF7B40/func_80AF7E98.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pm_0x80AF7B40/func_80AF7E98.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pm_0x80AF7B40/func_80AF7F68.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pm_0x80AF7B40/func_80AF7F68.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pm_0x80AF7B40/func_80AF8040.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pm_0x80AF7B40/func_80AF8040.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pm_0x80AF7B40/func_80AF80F4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pm_0x80AF7B40/func_80AF80F4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pm_0x80AF7B40/func_80AF8170.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pm_0x80AF7B40/func_80AF8170.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pm_0x80AF7B40/func_80AF81E8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pm_0x80AF7B40/func_80AF81E8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pm_0x80AF7B40/func_80AF8348.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pm_0x80AF7B40/func_80AF8348.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pm_0x80AF7B40/func_80AF8478.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pm_0x80AF7B40/func_80AF8478.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pm_0x80AF7B40/func_80AF8540.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pm_0x80AF7B40/func_80AF8540.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pm_0x80AF7B40/func_80AF86F0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pm_0x80AF7B40/func_80AF86F0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pm_0x80AF7B40/func_80AF87C4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pm_0x80AF7B40/func_80AF87C4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pm_0x80AF7B40/func_80AF8890.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pm_0x80AF7B40/func_80AF8890.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pm_0x80AF7B40/func_80AF898C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pm_0x80AF7B40/func_80AF898C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pm_0x80AF7B40/func_80AF8AC8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pm_0x80AF7B40/func_80AF8AC8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pm_0x80AF7B40/func_80AF8BA8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pm_0x80AF7B40/func_80AF8BA8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pm_0x80AF7B40/func_80AF8C68.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pm_0x80AF7B40/func_80AF8C68.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pm_0x80AF7B40/func_80AF8D84.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pm_0x80AF7B40/func_80AF8D84.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pm_0x80AF7B40/func_80AF8DD4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pm_0x80AF7B40/func_80AF8DD4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pm_0x80AF7B40/func_80AF8ED4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pm_0x80AF7B40/func_80AF8ED4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pm_0x80AF7B40/func_80AF9008.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pm_0x80AF7B40/func_80AF9008.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pm_0x80AF7B40/func_80AF91E8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pm_0x80AF7B40/func_80AF91E8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pm_0x80AF7B40/func_80AF94AC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pm_0x80AF7B40/func_80AF94AC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pm_0x80AF7B40/func_80AF95E8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pm_0x80AF7B40/func_80AF95E8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pm_0x80AF7B40/func_80AF98A0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pm_0x80AF7B40/func_80AF98A0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pm_0x80AF7B40/func_80AF992C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pm_0x80AF7B40/func_80AF992C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pm_0x80AF7B40/func_80AF9A0C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pm_0x80AF7B40/func_80AF9A0C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pm_0x80AF7B40/func_80AF9AB0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pm_0x80AF7B40/func_80AF9AB0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pm_0x80AF7B40/func_80AF9B54.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pm_0x80AF7B40/func_80AF9B54.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pm_0x80AF7B40/func_80AF9BF8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pm_0x80AF7B40/func_80AF9BF8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pm_0x80AF7B40/func_80AF9D04.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pm_0x80AF7B40/func_80AF9D04.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pm_0x80AF7B40/func_80AF9E7C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pm_0x80AF7B40/func_80AF9E7C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pm_0x80AF7B40/func_80AFA170.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pm_0x80AF7B40/func_80AFA170.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pm_0x80AF7B40/func_80AFA334.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pm_0x80AF7B40/func_80AFA334.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pm_0x80AF7B40/func_80AFA438.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pm_0x80AF7B40/func_80AFA438.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pm_0x80AF7B40/func_80AFA4D0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pm_0x80AF7B40/func_80AFA4D0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pm_0x80AF7B40/func_80AFA5FC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pm_0x80AF7B40/func_80AFA5FC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pm_0x80AF7B40/func_80AFA724.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pm_0x80AF7B40/func_80AFA724.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pm_0x80AF7B40/EnPm_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pm_0x80AF7B40/EnPm_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pm_0x80AF7B40/EnPm_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pm_0x80AF7B40/EnPm_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pm_0x80AF7B40/EnPm_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pm_0x80AF7B40/EnPm_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pm_0x80AF7B40/func_80AFAA04.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pm_0x80AF7B40/func_80AFAA04.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pm_0x80AF7B40/func_80AFAA44.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pm_0x80AF7B40/func_80AFAA44.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pm_0x80AF7B40/func_80AFABAC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pm_0x80AF7B40/func_80AFABAC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pm_0x80AF7B40/EnPm_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pm_0x80AF7B40/EnPm_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Po_Composer/z_en_po_composer.c b/src/overlays/actors/ovl_En_Po_Composer/z_en_po_composer.c index 6dc9ec395a..0153527c2d 100644 --- a/src/overlays/actors/ovl_En_Po_Composer/z_en_po_composer.c +++ b/src/overlays/actors/ovl_En_Po_Composer/z_en_po_composer.c @@ -23,70 +23,70 @@ const ActorInit En_Po_Composer_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Composer_0x80BC4F30/EnPoComposer_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Po_Composer_0x80BC4F30/EnPoComposer_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Composer_0x80BC4F30/EnPoComposer_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Po_Composer_0x80BC4F30/EnPoComposer_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Composer_0x80BC4F30/func_80BC5250.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Po_Composer_0x80BC4F30/func_80BC5250.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Composer_0x80BC4F30/func_80BC5294.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Po_Composer_0x80BC4F30/func_80BC5294.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Composer_0x80BC4F30/func_80BC52D4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Po_Composer_0x80BC4F30/func_80BC52D4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Composer_0x80BC4F30/func_80BC52F0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Po_Composer_0x80BC4F30/func_80BC52F0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Composer_0x80BC4F30/func_80BC538C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Po_Composer_0x80BC4F30/func_80BC538C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Composer_0x80BC4F30/func_80BC53A0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Po_Composer_0x80BC4F30/func_80BC53A0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Composer_0x80BC4F30/func_80BC53B0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Po_Composer_0x80BC4F30/func_80BC53B0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Composer_0x80BC4F30/func_80BC5404.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Po_Composer_0x80BC4F30/func_80BC5404.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Composer_0x80BC4F30/func_80BC552C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Po_Composer_0x80BC4F30/func_80BC552C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Composer_0x80BC4F30/func_80BC5570.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Po_Composer_0x80BC4F30/func_80BC5570.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Composer_0x80BC4F30/func_80BC5580.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Po_Composer_0x80BC4F30/func_80BC5580.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Composer_0x80BC4F30/func_80BC55E0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Po_Composer_0x80BC4F30/func_80BC55E0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Composer_0x80BC4F30/func_80BC562C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Po_Composer_0x80BC4F30/func_80BC562C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Composer_0x80BC4F30/func_80BC5670.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Po_Composer_0x80BC4F30/func_80BC5670.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Composer_0x80BC4F30/func_80BC5680.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Po_Composer_0x80BC4F30/func_80BC5680.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Composer_0x80BC4F30/func_80BC56D0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Po_Composer_0x80BC4F30/func_80BC56D0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Composer_0x80BC4F30/func_80BC5738.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Po_Composer_0x80BC4F30/func_80BC5738.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Composer_0x80BC4F30/func_80BC5780.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Po_Composer_0x80BC4F30/func_80BC5780.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Composer_0x80BC4F30/func_80BC57E8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Po_Composer_0x80BC4F30/func_80BC57E8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Composer_0x80BC4F30/func_80BC5830.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Po_Composer_0x80BC4F30/func_80BC5830.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Composer_0x80BC4F30/func_80BC5898.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Po_Composer_0x80BC4F30/func_80BC5898.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Composer_0x80BC4F30/func_80BC58E0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Po_Composer_0x80BC4F30/func_80BC58E0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Composer_0x80BC4F30/func_80BC59BC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Po_Composer_0x80BC4F30/func_80BC59BC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Composer_0x80BC4F30/func_80BC59EC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Po_Composer_0x80BC4F30/func_80BC59EC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Composer_0x80BC4F30/func_80BC5CC8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Po_Composer_0x80BC4F30/func_80BC5CC8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Composer_0x80BC4F30/func_80BC5D34.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Po_Composer_0x80BC4F30/func_80BC5D34.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Composer_0x80BC4F30/func_80BC5DEC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Po_Composer_0x80BC4F30/func_80BC5DEC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Composer_0x80BC4F30/func_80BC5FE8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Po_Composer_0x80BC4F30/func_80BC5FE8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Composer_0x80BC4F30/EnPoComposer_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Po_Composer_0x80BC4F30/EnPoComposer_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Composer_0x80BC4F30/func_80BC60BC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Po_Composer_0x80BC4F30/func_80BC60BC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Composer_0x80BC4F30/func_80BC617C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Po_Composer_0x80BC4F30/func_80BC617C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Composer_0x80BC4F30/EnPoComposer_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Po_Composer_0x80BC4F30/EnPoComposer_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Po_Fusen/z_en_po_fusen.c b/src/overlays/actors/ovl_En_Po_Fusen/z_en_po_fusen.c index 0614135bde..135cf9f7f1 100644 --- a/src/overlays/actors/ovl_En_Po_Fusen/z_en_po_fusen.c +++ b/src/overlays/actors/ovl_En_Po_Fusen/z_en_po_fusen.c @@ -23,32 +23,32 @@ const ActorInit En_Po_Fusen_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Fusen_0x80AC1270/EnPoFusen_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Po_Fusen_0x80AC1270/EnPoFusen_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Fusen_0x80AC1270/EnPoFusen_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Po_Fusen_0x80AC1270/EnPoFusen_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Fusen_0x80AC1270/func_80AC1450.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Po_Fusen_0x80AC1270/func_80AC1450.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Fusen_0x80AC1270/func_80AC14A4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Po_Fusen_0x80AC1270/func_80AC14A4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Fusen_0x80AC1270/func_80AC1574.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Po_Fusen_0x80AC1270/func_80AC1574.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Fusen_0x80AC1270/func_80AC158C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Po_Fusen_0x80AC1270/func_80AC158C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Fusen_0x80AC1270/func_80AC18EC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Po_Fusen_0x80AC1270/func_80AC18EC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Fusen_0x80AC1270/func_80AC192C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Po_Fusen_0x80AC1270/func_80AC192C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Fusen_0x80AC1270/func_80AC19B0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Po_Fusen_0x80AC1270/func_80AC19B0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Fusen_0x80AC1270/func_80AC19DC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Po_Fusen_0x80AC1270/func_80AC19DC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Fusen_0x80AC1270/EnPoFusen_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Po_Fusen_0x80AC1270/EnPoFusen_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Fusen_0x80AC1270/func_80AC1A68.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Po_Fusen_0x80AC1270/func_80AC1A68.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Fusen_0x80AC1270/func_80AC1CE8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Po_Fusen_0x80AC1270/func_80AC1CE8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Fusen_0x80AC1270/func_80AC1D00.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Po_Fusen_0x80AC1270/func_80AC1D00.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Fusen_0x80AC1270/EnPoFusen_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Po_Fusen_0x80AC1270/EnPoFusen_Draw.asm") 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 a1263f9e04..0d665e3980 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 @@ -23,92 +23,92 @@ const ActorInit En_Po_Sisters_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Sisters_0x80B1A3B0/EnPoSisters_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Po_Sisters_0x80B1A3B0/EnPoSisters_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Sisters_0x80B1A3B0/EnPoSisters_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Po_Sisters_0x80B1A3B0/EnPoSisters_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Sisters_0x80B1A3B0/func_80B1A648.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Po_Sisters_0x80B1A3B0/func_80B1A648.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Sisters_0x80B1A3B0/func_80B1A768.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Po_Sisters_0x80B1A3B0/func_80B1A768.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Sisters_0x80B1A3B0/func_80B1A894.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Po_Sisters_0x80B1A3B0/func_80B1A894.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Sisters_0x80B1A3B0/func_80B1A9B0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Po_Sisters_0x80B1A3B0/func_80B1A9B0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Sisters_0x80B1A3B0/func_80B1AA88.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Po_Sisters_0x80B1A3B0/func_80B1AA88.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Sisters_0x80B1A3B0/func_80B1AAE8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Po_Sisters_0x80B1A3B0/func_80B1AAE8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Sisters_0x80B1A3B0/func_80B1AB5C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Po_Sisters_0x80B1A3B0/func_80B1AB5C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Sisters_0x80B1A3B0/func_80B1ABB8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Po_Sisters_0x80B1A3B0/func_80B1ABB8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Sisters_0x80B1A3B0/func_80B1AC40.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Po_Sisters_0x80B1A3B0/func_80B1AC40.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Sisters_0x80B1A3B0/func_80B1ACB8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Po_Sisters_0x80B1A3B0/func_80B1ACB8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Sisters_0x80B1A3B0/func_80B1AE28.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Po_Sisters_0x80B1A3B0/func_80B1AE28.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Sisters_0x80B1A3B0/func_80B1AE3C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Po_Sisters_0x80B1A3B0/func_80B1AE3C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Sisters_0x80B1A3B0/func_80B1AF8C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Po_Sisters_0x80B1A3B0/func_80B1AF8C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Sisters_0x80B1A3B0/func_80B1B020.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Po_Sisters_0x80B1A3B0/func_80B1B020.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Sisters_0x80B1A3B0/func_80B1B0E0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Po_Sisters_0x80B1A3B0/func_80B1B0E0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Sisters_0x80B1A3B0/func_80B1B168.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Po_Sisters_0x80B1A3B0/func_80B1B168.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Sisters_0x80B1A3B0/func_80B1B280.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Po_Sisters_0x80B1A3B0/func_80B1B280.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Sisters_0x80B1A3B0/func_80B1B2F0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Po_Sisters_0x80B1A3B0/func_80B1B2F0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Sisters_0x80B1A3B0/func_80B1B3A8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Po_Sisters_0x80B1A3B0/func_80B1B3A8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Sisters_0x80B1A3B0/func_80B1B444.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Po_Sisters_0x80B1A3B0/func_80B1B444.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Sisters_0x80B1A3B0/func_80B1B5B4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Po_Sisters_0x80B1A3B0/func_80B1B5B4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Sisters_0x80B1A3B0/func_80B1B628.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Po_Sisters_0x80B1A3B0/func_80B1B628.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Sisters_0x80B1A3B0/func_80B1B70C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Po_Sisters_0x80B1A3B0/func_80B1B70C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Sisters_0x80B1A3B0/func_80B1B7BC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Po_Sisters_0x80B1A3B0/func_80B1B7BC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Sisters_0x80B1A3B0/func_80B1B860.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Po_Sisters_0x80B1A3B0/func_80B1B860.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Sisters_0x80B1A3B0/func_80B1B940.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Po_Sisters_0x80B1A3B0/func_80B1B940.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Sisters_0x80B1A3B0/func_80B1BA3C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Po_Sisters_0x80B1A3B0/func_80B1BA3C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Sisters_0x80B1A3B0/func_80B1BA90.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Po_Sisters_0x80B1A3B0/func_80B1BA90.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Sisters_0x80B1A3B0/func_80B1BC4C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Po_Sisters_0x80B1A3B0/func_80B1BC4C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Sisters_0x80B1A3B0/func_80B1BCA0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Po_Sisters_0x80B1A3B0/func_80B1BCA0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Sisters_0x80B1A3B0/func_80B1BCF0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Po_Sisters_0x80B1A3B0/func_80B1BCF0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Sisters_0x80B1A3B0/func_80B1BE4C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Po_Sisters_0x80B1A3B0/func_80B1BE4C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Sisters_0x80B1A3B0/func_80B1BF2C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Po_Sisters_0x80B1A3B0/func_80B1BF2C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Sisters_0x80B1A3B0/func_80B1C030.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Po_Sisters_0x80B1A3B0/func_80B1C030.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Sisters_0x80B1A3B0/func_80B1C0A4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Po_Sisters_0x80B1A3B0/func_80B1C0A4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Sisters_0x80B1A3B0/func_80B1C2E8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Po_Sisters_0x80B1A3B0/func_80B1C2E8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Sisters_0x80B1A3B0/func_80B1C340.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Po_Sisters_0x80B1A3B0/func_80B1C340.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Sisters_0x80B1A3B0/func_80B1C408.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Po_Sisters_0x80B1A3B0/func_80B1C408.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Sisters_0x80B1A3B0/EnPoSisters_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Po_Sisters_0x80B1A3B0/EnPoSisters_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Sisters_0x80B1A3B0/func_80B1C974.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Po_Sisters_0x80B1A3B0/func_80B1C974.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Sisters_0x80B1A3B0/func_80B1CB44.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Po_Sisters_0x80B1A3B0/func_80B1CB44.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Sisters_0x80B1A3B0/func_80B1CD34.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Po_Sisters_0x80B1A3B0/func_80B1CD34.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Sisters_0x80B1A3B0/EnPoSisters_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Po_Sisters_0x80B1A3B0/EnPoSisters_Draw.asm") 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 847d016f0b..0f9921fd27 100644 --- a/src/overlays/actors/ovl_En_Poh/z_en_poh.c +++ b/src/overlays/actors/ovl_En_Poh/z_en_poh.c @@ -23,96 +23,96 @@ const ActorInit En_Poh_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Poh_0x80B2C6F0/EnPoh_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Poh_0x80B2C6F0/EnPoh_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Poh_0x80B2C6F0/EnPoh_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Poh_0x80B2C6F0/EnPoh_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Poh_0x80B2C6F0/func_80B2C910.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Poh_0x80B2C6F0/func_80B2C910.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Poh_0x80B2C6F0/func_80B2C9B8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Poh_0x80B2C6F0/func_80B2C9B8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Poh_0x80B2C6F0/func_80B2CA4C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Poh_0x80B2C6F0/func_80B2CA4C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Poh_0x80B2C6F0/func_80B2CAA4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Poh_0x80B2C6F0/func_80B2CAA4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Poh_0x80B2C6F0/func_80B2CB60.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Poh_0x80B2C6F0/func_80B2CB60.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Poh_0x80B2C6F0/func_80B2CBBC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Poh_0x80B2C6F0/func_80B2CBBC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Poh_0x80B2C6F0/func_80B2CD14.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Poh_0x80B2C6F0/func_80B2CD14.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Poh_0x80B2C6F0/func_80B2CD64.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Poh_0x80B2C6F0/func_80B2CD64.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Poh_0x80B2C6F0/func_80B2CEC8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Poh_0x80B2C6F0/func_80B2CEC8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Poh_0x80B2C6F0/func_80B2CF28.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Poh_0x80B2C6F0/func_80B2CF28.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Poh_0x80B2C6F0/func_80B2CFF8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Poh_0x80B2C6F0/func_80B2CFF8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Poh_0x80B2C6F0/func_80B2D07C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Poh_0x80B2C6F0/func_80B2D07C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Poh_0x80B2C6F0/func_80B2D0E8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Poh_0x80B2C6F0/func_80B2D0E8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Poh_0x80B2C6F0/func_80B2D140.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Poh_0x80B2C6F0/func_80B2D140.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Poh_0x80B2C6F0/func_80B2D2C0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Poh_0x80B2C6F0/func_80B2D2C0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Poh_0x80B2C6F0/func_80B2D300.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Poh_0x80B2C6F0/func_80B2D300.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Poh_0x80B2C6F0/func_80B2D5DC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Poh_0x80B2C6F0/func_80B2D5DC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Poh_0x80B2C6F0/func_80B2D628.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Poh_0x80B2C6F0/func_80B2D628.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Poh_0x80B2C6F0/func_80B2D694.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Poh_0x80B2C6F0/func_80B2D694.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Poh_0x80B2C6F0/func_80B2D6EC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Poh_0x80B2C6F0/func_80B2D6EC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Poh_0x80B2C6F0/func_80B2D76C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Poh_0x80B2C6F0/func_80B2D76C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Poh_0x80B2C6F0/func_80B2D7D4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Poh_0x80B2C6F0/func_80B2D7D4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Poh_0x80B2C6F0/func_80B2D924.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Poh_0x80B2C6F0/func_80B2D924.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Poh_0x80B2C6F0/func_80B2D980.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Poh_0x80B2C6F0/func_80B2D980.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Poh_0x80B2C6F0/func_80B2DAD0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Poh_0x80B2C6F0/func_80B2DAD0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Poh_0x80B2C6F0/func_80B2DB44.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Poh_0x80B2C6F0/func_80B2DB44.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Poh_0x80B2C6F0/func_80B2DC50.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Poh_0x80B2C6F0/func_80B2DC50.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Poh_0x80B2C6F0/func_80B2DD2C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Poh_0x80B2C6F0/func_80B2DD2C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Poh_0x80B2C6F0/func_80B2DDF8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Poh_0x80B2C6F0/func_80B2DDF8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Poh_0x80B2C6F0/func_80B2E0B0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Poh_0x80B2C6F0/func_80B2E0B0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Poh_0x80B2C6F0/func_80B2E180.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Poh_0x80B2C6F0/func_80B2E180.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Poh_0x80B2C6F0/func_80B2E1D8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Poh_0x80B2C6F0/func_80B2E1D8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Poh_0x80B2C6F0/func_80B2E230.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Poh_0x80B2C6F0/func_80B2E230.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Poh_0x80B2C6F0/func_80B2E3B0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Poh_0x80B2C6F0/func_80B2E3B0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Poh_0x80B2C6F0/func_80B2E3F8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Poh_0x80B2C6F0/func_80B2E3F8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Poh_0x80B2C6F0/func_80B2E438.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Poh_0x80B2C6F0/func_80B2E438.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Poh_0x80B2C6F0/func_80B2E55C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Poh_0x80B2C6F0/func_80B2E55C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Poh_0x80B2C6F0/func_80B2E6C0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Poh_0x80B2C6F0/func_80B2E6C0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Poh_0x80B2C6F0/func_80B2E8E0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Poh_0x80B2C6F0/func_80B2E8E0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Poh_0x80B2C6F0/EnPoh_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Poh_0x80B2C6F0/EnPoh_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Poh_0x80B2C6F0/func_80B2ED14.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Poh_0x80B2C6F0/func_80B2ED14.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Poh_0x80B2C6F0/func_80B2EDD0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Poh_0x80B2C6F0/func_80B2EDD0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Poh_0x80B2C6F0/EnPoh_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Poh_0x80B2C6F0/EnPoh_Draw.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Poh_0x80B2C6F0/func_80B2F328.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Poh_0x80B2C6F0/func_80B2F328.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Poh_0x80B2C6F0/func_80B2F37C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Poh_0x80B2C6F0/func_80B2F37C.asm") diff --git a/src/overlays/actors/ovl_En_Pp/z_en_pp.c b/src/overlays/actors/ovl_En_Pp/z_en_pp.c index 5d521ecbbf..2d0ec272eb 100644 --- a/src/overlays/actors/ovl_En_Pp/z_en_pp.c +++ b/src/overlays/actors/ovl_En_Pp/z_en_pp.c @@ -23,70 +23,70 @@ const ActorInit En_Pp_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pp_0x80B1DEB0/EnPp_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pp_0x80B1DEB0/EnPp_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pp_0x80B1DEB0/EnPp_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pp_0x80B1DEB0/EnPp_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pp_0x80B1DEB0/func_80B1E29C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pp_0x80B1DEB0/func_80B1E29C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pp_0x80B1DEB0/func_80B1E3D4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pp_0x80B1DEB0/func_80B1E3D4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pp_0x80B1DEB0/func_80B1E5A8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pp_0x80B1DEB0/func_80B1E5A8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pp_0x80B1DEB0/func_80B1E680.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pp_0x80B1DEB0/func_80B1E680.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pp_0x80B1DEB0/func_80B1E778.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pp_0x80B1DEB0/func_80B1E778.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pp_0x80B1DEB0/func_80B1E958.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pp_0x80B1DEB0/func_80B1E958.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pp_0x80B1DEB0/func_80B1E970.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pp_0x80B1DEB0/func_80B1E970.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pp_0x80B1DEB0/func_80B1EBD8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pp_0x80B1DEB0/func_80B1EBD8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pp_0x80B1DEB0/func_80B1EC24.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pp_0x80B1DEB0/func_80B1EC24.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pp_0x80B1DEB0/func_80B1EFFC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pp_0x80B1DEB0/func_80B1EFFC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pp_0x80B1DEB0/func_80B1F048.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pp_0x80B1DEB0/func_80B1F048.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pp_0x80B1DEB0/func_80B1F0A4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pp_0x80B1DEB0/func_80B1F0A4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pp_0x80B1DEB0/func_80B1F188.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pp_0x80B1DEB0/func_80B1F188.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pp_0x80B1DEB0/func_80B1F244.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pp_0x80B1DEB0/func_80B1F244.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pp_0x80B1DEB0/func_80B1F29C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pp_0x80B1DEB0/func_80B1F29C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pp_0x80B1DEB0/func_80B1F4A0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pp_0x80B1DEB0/func_80B1F4A0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pp_0x80B1DEB0/func_80B1F560.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pp_0x80B1DEB0/func_80B1F560.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pp_0x80B1DEB0/func_80B1F664.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pp_0x80B1DEB0/func_80B1F664.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pp_0x80B1DEB0/func_80B1F6B4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pp_0x80B1DEB0/func_80B1F6B4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pp_0x80B1DEB0/func_80B1F770.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pp_0x80B1DEB0/func_80B1F770.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pp_0x80B1DEB0/func_80B1F940.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pp_0x80B1DEB0/func_80B1F940.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pp_0x80B1DEB0/func_80B1FAD0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pp_0x80B1DEB0/func_80B1FAD0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pp_0x80B1DEB0/func_80B1FC7C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pp_0x80B1DEB0/func_80B1FC7C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pp_0x80B1DEB0/func_80B1FF20.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pp_0x80B1DEB0/func_80B1FF20.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pp_0x80B1DEB0/func_80B20030.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pp_0x80B1DEB0/func_80B20030.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pp_0x80B1DEB0/func_80B202B8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pp_0x80B1DEB0/func_80B202B8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pp_0x80B1DEB0/func_80B203BC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pp_0x80B1DEB0/func_80B203BC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pp_0x80B1DEB0/func_80B20668.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pp_0x80B1DEB0/func_80B20668.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pp_0x80B1DEB0/EnPp_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pp_0x80B1DEB0/EnPp_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pp_0x80B1DEB0/func_80B20E6C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pp_0x80B1DEB0/func_80B20E6C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pp_0x80B1DEB0/func_80B20F70.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pp_0x80B1DEB0/func_80B20F70.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pp_0x80B1DEB0/EnPp_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pp_0x80B1DEB0/EnPp_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Pr/z_en_pr.c b/src/overlays/actors/ovl_En_Pr/z_en_pr.c index 5de627b3a7..238540c45d 100644 --- a/src/overlays/actors/ovl_En_Pr/z_en_pr.c +++ b/src/overlays/actors/ovl_En_Pr/z_en_pr.c @@ -23,50 +23,50 @@ const ActorInit En_Pr_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pr_0x80A32210/EnPr_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pr_0x80A32210/EnPr_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pr_0x80A32210/EnPr_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pr_0x80A32210/EnPr_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pr_0x80A32210/func_80A3242C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pr_0x80A32210/func_80A3242C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pr_0x80A32210/func_80A324E0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pr_0x80A32210/func_80A324E0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pr_0x80A32210/func_80A325E4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pr_0x80A32210/func_80A325E4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pr_0x80A32210/func_80A326F0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pr_0x80A32210/func_80A326F0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pr_0x80A32210/func_80A32740.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pr_0x80A32210/func_80A32740.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pr_0x80A32210/func_80A32854.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pr_0x80A32210/func_80A32854.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pr_0x80A32210/func_80A3289C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pr_0x80A32210/func_80A3289C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pr_0x80A32210/func_80A3295C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pr_0x80A32210/func_80A3295C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pr_0x80A32210/func_80A32984.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pr_0x80A32210/func_80A32984.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pr_0x80A32210/func_80A32A40.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pr_0x80A32210/func_80A32A40.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pr_0x80A32210/func_80A32AF8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pr_0x80A32210/func_80A32AF8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pr_0x80A32210/func_80A32B20.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pr_0x80A32210/func_80A32B20.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pr_0x80A32210/func_80A32CDC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pr_0x80A32210/func_80A32CDC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pr_0x80A32210/func_80A32D28.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pr_0x80A32210/func_80A32D28.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pr_0x80A32210/func_80A32E60.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pr_0x80A32210/func_80A32E60.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pr_0x80A32210/func_80A32EA4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pr_0x80A32210/func_80A32EA4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pr_0x80A32210/func_80A32F48.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pr_0x80A32210/func_80A32F48.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pr_0x80A32210/func_80A33098.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pr_0x80A32210/func_80A33098.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pr_0x80A32210/EnPr_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pr_0x80A32210/EnPr_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pr_0x80A32210/func_80A3357C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pr_0x80A32210/func_80A3357C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pr_0x80A32210/func_80A335B4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pr_0x80A32210/func_80A335B4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pr_0x80A32210/EnPr_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pr_0x80A32210/EnPr_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Pr2/z_en_pr2.c b/src/overlays/actors/ovl_En_Pr2/z_en_pr2.c index 099180eebc..83eaf4425a 100644 --- a/src/overlays/actors/ovl_En_Pr2/z_en_pr2.c +++ b/src/overlays/actors/ovl_En_Pr2/z_en_pr2.c @@ -23,40 +23,40 @@ const ActorInit En_Pr2_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pr2_0x80A73FA0/EnPr2_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pr2_0x80A73FA0/EnPr2_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pr2_0x80A73FA0/EnPr2_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pr2_0x80A73FA0/EnPr2_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pr2_0x80A73FA0/func_80A7429C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pr2_0x80A73FA0/func_80A7429C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pr2_0x80A73FA0/func_80A7436C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pr2_0x80A73FA0/func_80A7436C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pr2_0x80A73FA0/func_80A74510.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pr2_0x80A73FA0/func_80A74510.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pr2_0x80A73FA0/func_80A745C4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pr2_0x80A73FA0/func_80A745C4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pr2_0x80A73FA0/func_80A745FC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pr2_0x80A73FA0/func_80A745FC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pr2_0x80A73FA0/func_80A74888.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pr2_0x80A73FA0/func_80A74888.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pr2_0x80A73FA0/func_80A748E8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pr2_0x80A73FA0/func_80A748E8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pr2_0x80A73FA0/func_80A74DEC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pr2_0x80A73FA0/func_80A74DEC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pr2_0x80A73FA0/func_80A74E90.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pr2_0x80A73FA0/func_80A74E90.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pr2_0x80A73FA0/func_80A751B4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pr2_0x80A73FA0/func_80A751B4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pr2_0x80A73FA0/func_80A75310.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pr2_0x80A73FA0/func_80A75310.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pr2_0x80A73FA0/func_80A755D8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pr2_0x80A73FA0/func_80A755D8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pr2_0x80A73FA0/EnPr2_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pr2_0x80A73FA0/EnPr2_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pr2_0x80A73FA0/func_80A758E8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pr2_0x80A73FA0/func_80A758E8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pr2_0x80A73FA0/func_80A75950.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pr2_0x80A73FA0/func_80A75950.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pr2_0x80A73FA0/func_80A759D8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pr2_0x80A73FA0/func_80A759D8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pr2_0x80A73FA0/EnPr2_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pr2_0x80A73FA0/EnPr2_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Prz/z_en_prz.c b/src/overlays/actors/ovl_En_Prz/z_en_prz.c index 8f627fdc99..3957b7c662 100644 --- a/src/overlays/actors/ovl_En_Prz/z_en_prz.c +++ b/src/overlays/actors/ovl_En_Prz/z_en_prz.c @@ -23,38 +23,38 @@ const ActorInit En_Prz_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Prz_0x80A75DC0/EnPrz_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Prz_0x80A75DC0/EnPrz_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Prz_0x80A75DC0/EnPrz_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Prz_0x80A75DC0/EnPrz_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Prz_0x80A75DC0/func_80A75F18.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Prz_0x80A75DC0/func_80A75F18.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Prz_0x80A75DC0/func_80A75FA4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Prz_0x80A75DC0/func_80A75FA4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Prz_0x80A75DC0/func_80A76070.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Prz_0x80A75DC0/func_80A76070.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Prz_0x80A75DC0/func_80A762C0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Prz_0x80A75DC0/func_80A762C0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Prz_0x80A75DC0/func_80A76388.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Prz_0x80A75DC0/func_80A76388.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Prz_0x80A75DC0/func_80A763E8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Prz_0x80A75DC0/func_80A763E8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Prz_0x80A75DC0/func_80A76604.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Prz_0x80A75DC0/func_80A76604.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Prz_0x80A75DC0/func_80A76634.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Prz_0x80A75DC0/func_80A76634.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Prz_0x80A75DC0/func_80A76748.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Prz_0x80A75DC0/func_80A76748.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Prz_0x80A75DC0/func_80A767A8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Prz_0x80A75DC0/func_80A767A8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Prz_0x80A75DC0/func_80A76A1C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Prz_0x80A75DC0/func_80A76A1C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Prz_0x80A75DC0/func_80A76B14.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Prz_0x80A75DC0/func_80A76B14.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Prz_0x80A75DC0/EnPrz_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Prz_0x80A75DC0/EnPrz_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Prz_0x80A75DC0/func_80A76F70.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Prz_0x80A75DC0/func_80A76F70.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Prz_0x80A75DC0/func_80A76FCC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Prz_0x80A75DC0/func_80A76FCC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Prz_0x80A75DC0/EnPrz_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Prz_0x80A75DC0/EnPrz_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Pst/z_en_pst.c b/src/overlays/actors/ovl_En_Pst/z_en_pst.c index 3573f7b8c5..137903cb72 100644 --- a/src/overlays/actors/ovl_En_Pst/z_en_pst.c +++ b/src/overlays/actors/ovl_En_Pst/z_en_pst.c @@ -23,34 +23,34 @@ const ActorInit En_Pst_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pst_0x80B2B830/func_80B2B830.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pst_0x80B2B830/func_80B2B830.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pst_0x80B2B830/func_80B2B874.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pst_0x80B2B830/func_80B2B874.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pst_0x80B2B830/func_80B2B8F4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pst_0x80B2B830/func_80B2B8F4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pst_0x80B2B830/func_80B2B974.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pst_0x80B2B830/func_80B2B974.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pst_0x80B2B830/func_80B2BAA4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pst_0x80B2B830/func_80B2BAA4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pst_0x80B2B830/func_80B2BBFC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pst_0x80B2B830/func_80B2BBFC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pst_0x80B2B830/func_80B2BCF8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pst_0x80B2B830/func_80B2BCF8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pst_0x80B2B830/func_80B2BD30.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pst_0x80B2B830/func_80B2BD30.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pst_0x80B2B830/func_80B2BD88.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pst_0x80B2B830/func_80B2BD88.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pst_0x80B2B830/func_80B2BD98.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pst_0x80B2B830/func_80B2BD98.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pst_0x80B2B830/func_80B2BE54.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pst_0x80B2B830/func_80B2BE54.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pst_0x80B2B830/EnPst_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pst_0x80B2B830/EnPst_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pst_0x80B2B830/EnPst_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pst_0x80B2B830/EnPst_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pst_0x80B2B830/EnPst_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pst_0x80B2B830/EnPst_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pst_0x80B2B830/func_80B2C11C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pst_0x80B2B830/func_80B2C11C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Pst_0x80B2B830/EnPst_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Pst_0x80B2B830/EnPst_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Racedog/z_en_racedog.c b/src/overlays/actors/ovl_En_Racedog/z_en_racedog.c index ca9292565d..71f08681f9 100644 --- a/src/overlays/actors/ovl_En_Racedog/z_en_racedog.c +++ b/src/overlays/actors/ovl_En_Racedog/z_en_racedog.c @@ -23,48 +23,48 @@ const ActorInit En_Racedog_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Racedog_0x80B24630/func_80B24630.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Racedog_0x80B24630/func_80B24630.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Racedog_0x80B24630/func_80B246F4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Racedog_0x80B24630/func_80B246F4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Racedog_0x80B24630/func_80B2478C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Racedog_0x80B24630/func_80B2478C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Racedog_0x80B24630/func_80B248B8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Racedog_0x80B24630/func_80B248B8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Racedog_0x80B24630/EnRacedog_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Racedog_0x80B24630/EnRacedog_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Racedog_0x80B24630/EnRacedog_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Racedog_0x80B24630/EnRacedog_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Racedog_0x80B24630/func_80B24C14.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Racedog_0x80B24630/func_80B24C14.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Racedog_0x80B24630/func_80B24CB4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Racedog_0x80B24630/func_80B24CB4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Racedog_0x80B24630/func_80B24E14.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Racedog_0x80B24630/func_80B24E14.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Racedog_0x80B24630/func_80B24F08.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Racedog_0x80B24630/func_80B24F08.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Racedog_0x80B24630/func_80B251EC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Racedog_0x80B24630/func_80B251EC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Racedog_0x80B24630/func_80B252F8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Racedog_0x80B24630/func_80B252F8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Racedog_0x80B24630/func_80B2538C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Racedog_0x80B24630/func_80B2538C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Racedog_0x80B24630/func_80B25448.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Racedog_0x80B24630/func_80B25448.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Racedog_0x80B24630/func_80B25490.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Racedog_0x80B24630/func_80B25490.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Racedog_0x80B24630/func_80B255AC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Racedog_0x80B24630/func_80B255AC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Racedog_0x80B24630/func_80B256BC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Racedog_0x80B24630/func_80B256BC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Racedog_0x80B24630/EnRacedog_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Racedog_0x80B24630/EnRacedog_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Racedog_0x80B24630/func_80B2583C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Racedog_0x80B24630/func_80B2583C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Racedog_0x80B24630/func_80B258D8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Racedog_0x80B24630/func_80B258D8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Racedog_0x80B24630/func_80B25A74.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Racedog_0x80B24630/func_80B25A74.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Racedog_0x80B24630/func_80B25A90.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Racedog_0x80B24630/func_80B25A90.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Racedog_0x80B24630/EnRacedog_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Racedog_0x80B24630/EnRacedog_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Raf/z_en_raf.c b/src/overlays/actors/ovl_En_Raf/z_en_raf.c index d3b1bf6e6e..a78703154c 100644 --- a/src/overlays/actors/ovl_En_Raf/z_en_raf.c +++ b/src/overlays/actors/ovl_En_Raf/z_en_raf.c @@ -23,56 +23,56 @@ const ActorInit En_Raf_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Raf_0x80A16D40/func_80A16D40.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Raf_0x80A16D40/func_80A16D40.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Raf_0x80A16D40/func_80A16D6C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Raf_0x80A16D40/func_80A16D6C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Raf_0x80A16D40/EnRaf_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Raf_0x80A16D40/EnRaf_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Raf_0x80A16D40/EnRaf_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Raf_0x80A16D40/EnRaf_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Raf_0x80A16D40/func_80A17060.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Raf_0x80A16D40/func_80A17060.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Raf_0x80A16D40/func_80A1712C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Raf_0x80A16D40/func_80A1712C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Raf_0x80A16D40/func_80A171D8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Raf_0x80A16D40/func_80A171D8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Raf_0x80A16D40/func_80A17414.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Raf_0x80A16D40/func_80A17414.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Raf_0x80A16D40/func_80A17464.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Raf_0x80A16D40/func_80A17464.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Raf_0x80A16D40/func_80A17530.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Raf_0x80A16D40/func_80A17530.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Raf_0x80A16D40/func_80A175E4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Raf_0x80A16D40/func_80A175E4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Raf_0x80A16D40/func_80A17848.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Raf_0x80A16D40/func_80A17848.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Raf_0x80A16D40/func_80A178A0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Raf_0x80A16D40/func_80A178A0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Raf_0x80A16D40/func_80A179C8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Raf_0x80A16D40/func_80A179C8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Raf_0x80A16D40/func_80A17C6C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Raf_0x80A16D40/func_80A17C6C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Raf_0x80A16D40/func_80A17D14.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Raf_0x80A16D40/func_80A17D14.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Raf_0x80A16D40/func_80A17D54.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Raf_0x80A16D40/func_80A17D54.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Raf_0x80A16D40/func_80A17DDC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Raf_0x80A16D40/func_80A17DDC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Raf_0x80A16D40/func_80A17E1C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Raf_0x80A16D40/func_80A17E1C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Raf_0x80A16D40/func_80A18080.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Raf_0x80A16D40/func_80A18080.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Raf_0x80A16D40/func_80A180B4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Raf_0x80A16D40/func_80A180B4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Raf_0x80A16D40/EnRaf_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Raf_0x80A16D40/EnRaf_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Raf_0x80A16D40/func_80A1859C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Raf_0x80A16D40/func_80A1859C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Raf_0x80A16D40/EnRaf_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Raf_0x80A16D40/EnRaf_Draw.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Raf_0x80A16D40/func_80A18A90.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Raf_0x80A16D40/func_80A18A90.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Raf_0x80A16D40/func_80A18B8C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Raf_0x80A16D40/func_80A18B8C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Raf_0x80A16D40/func_80A18DA0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Raf_0x80A16D40/func_80A18DA0.asm") diff --git a/src/overlays/actors/ovl_En_Rail_Skb/z_en_rail_skb.c b/src/overlays/actors/ovl_En_Rail_Skb/z_en_rail_skb.c index 2dae27eb70..a2d519a14b 100644 --- a/src/overlays/actors/ovl_En_Rail_Skb/z_en_rail_skb.c +++ b/src/overlays/actors/ovl_En_Rail_Skb/z_en_rail_skb.c @@ -23,106 +23,106 @@ const ActorInit En_Rail_Skb_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rail_Skb_0x80B708C0/func_80B708C0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rail_Skb_0x80B708C0/func_80B708C0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rail_Skb_0x80B708C0/func_80B70AB4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rail_Skb_0x80B708C0/func_80B70AB4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rail_Skb_0x80B708C0/func_80B70B04.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rail_Skb_0x80B708C0/func_80B70B04.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rail_Skb_0x80B708C0/func_80B70D24.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rail_Skb_0x80B708C0/func_80B70D24.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rail_Skb_0x80B708C0/EnRailSkb_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rail_Skb_0x80B708C0/EnRailSkb_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rail_Skb_0x80B708C0/EnRailSkb_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rail_Skb_0x80B708C0/EnRailSkb_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rail_Skb_0x80B708C0/func_80B70FA0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rail_Skb_0x80B708C0/func_80B70FA0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rail_Skb_0x80B708C0/func_80B70FF8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rail_Skb_0x80B708C0/func_80B70FF8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rail_Skb_0x80B708C0/func_80B710AC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rail_Skb_0x80B708C0/func_80B710AC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rail_Skb_0x80B708C0/func_80B710E4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rail_Skb_0x80B708C0/func_80B710E4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rail_Skb_0x80B708C0/func_80B71114.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rail_Skb_0x80B708C0/func_80B71114.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rail_Skb_0x80B708C0/func_80B7114C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rail_Skb_0x80B708C0/func_80B7114C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rail_Skb_0x80B708C0/func_80B71228.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rail_Skb_0x80B708C0/func_80B71228.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rail_Skb_0x80B708C0/func_80B7123C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rail_Skb_0x80B708C0/func_80B7123C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rail_Skb_0x80B708C0/func_80B712FC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rail_Skb_0x80B708C0/func_80B712FC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rail_Skb_0x80B708C0/func_80B71314.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rail_Skb_0x80B708C0/func_80B71314.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rail_Skb_0x80B708C0/func_80B71354.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rail_Skb_0x80B708C0/func_80B71354.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rail_Skb_0x80B708C0/func_80B713A4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rail_Skb_0x80B708C0/func_80B713A4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rail_Skb_0x80B708C0/func_80B71488.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rail_Skb_0x80B708C0/func_80B71488.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rail_Skb_0x80B708C0/func_80B714D8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rail_Skb_0x80B708C0/func_80B714D8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rail_Skb_0x80B708C0/func_80B7151C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rail_Skb_0x80B708C0/func_80B7151C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rail_Skb_0x80B708C0/func_80B715AC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rail_Skb_0x80B708C0/func_80B715AC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rail_Skb_0x80B708C0/func_80B71650.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rail_Skb_0x80B708C0/func_80B71650.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rail_Skb_0x80B708C0/func_80B716A8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rail_Skb_0x80B708C0/func_80B716A8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rail_Skb_0x80B708C0/func_80B717C8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rail_Skb_0x80B708C0/func_80B717C8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rail_Skb_0x80B708C0/func_80B717E0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rail_Skb_0x80B708C0/func_80B717E0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rail_Skb_0x80B708C0/func_80B718B0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rail_Skb_0x80B708C0/func_80B718B0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rail_Skb_0x80B708C0/func_80B718C4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rail_Skb_0x80B708C0/func_80B718C4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rail_Skb_0x80B708C0/func_80B71910.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rail_Skb_0x80B708C0/func_80B71910.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rail_Skb_0x80B708C0/func_80B71954.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rail_Skb_0x80B708C0/func_80B71954.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rail_Skb_0x80B708C0/func_80B71A08.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rail_Skb_0x80B708C0/func_80B71A08.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rail_Skb_0x80B708C0/func_80B71A58.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rail_Skb_0x80B708C0/func_80B71A58.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rail_Skb_0x80B708C0/func_80B71B6C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rail_Skb_0x80B708C0/func_80B71B6C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rail_Skb_0x80B708C0/func_80B71BB8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rail_Skb_0x80B708C0/func_80B71BB8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rail_Skb_0x80B708C0/func_80B71D8C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rail_Skb_0x80B708C0/func_80B71D8C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rail_Skb_0x80B708C0/func_80B71DF0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rail_Skb_0x80B708C0/func_80B71DF0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rail_Skb_0x80B708C0/func_80B71EA8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rail_Skb_0x80B708C0/func_80B71EA8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rail_Skb_0x80B708C0/func_80B71F3C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rail_Skb_0x80B708C0/func_80B71F3C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rail_Skb_0x80B708C0/func_80B72100.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rail_Skb_0x80B708C0/func_80B72100.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rail_Skb_0x80B708C0/func_80B72190.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rail_Skb_0x80B708C0/func_80B72190.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rail_Skb_0x80B708C0/func_80B723F8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rail_Skb_0x80B708C0/func_80B723F8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rail_Skb_0x80B708C0/func_80B72430.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rail_Skb_0x80B708C0/func_80B72430.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rail_Skb_0x80B708C0/func_80B725C0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rail_Skb_0x80B708C0/func_80B725C0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rail_Skb_0x80B708C0/func_80B726B4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rail_Skb_0x80B708C0/func_80B726B4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rail_Skb_0x80B708C0/func_80B72830.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rail_Skb_0x80B708C0/func_80B72830.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rail_Skb_0x80B708C0/func_80B7285C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rail_Skb_0x80B708C0/func_80B7285C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rail_Skb_0x80B708C0/func_80B72880.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rail_Skb_0x80B708C0/func_80B72880.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rail_Skb_0x80B708C0/func_80B72970.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rail_Skb_0x80B708C0/func_80B72970.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rail_Skb_0x80B708C0/EnRailSkb_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rail_Skb_0x80B708C0/EnRailSkb_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rail_Skb_0x80B708C0/func_80B72E88.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rail_Skb_0x80B708C0/func_80B72E88.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rail_Skb_0x80B708C0/func_80B7302C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rail_Skb_0x80B708C0/func_80B7302C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rail_Skb_0x80B708C0/EnRailSkb_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rail_Skb_0x80B708C0/EnRailSkb_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Railgibud/z_en_railgibud.c b/src/overlays/actors/ovl_En_Railgibud/z_en_railgibud.c index e030f6451b..5892609ae0 100644 --- a/src/overlays/actors/ovl_En_Railgibud/z_en_railgibud.c +++ b/src/overlays/actors/ovl_En_Railgibud/z_en_railgibud.c @@ -23,102 +23,102 @@ const ActorInit En_Railgibud_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Railgibud_0x80BA5400/func_80BA5400.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Railgibud_0x80BA5400/func_80BA5400.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Railgibud_0x80BA5400/EnRailgibud_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Railgibud_0x80BA5400/EnRailgibud_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Railgibud_0x80BA5400/EnRailgibud_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Railgibud_0x80BA5400/EnRailgibud_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Railgibud_0x80BA5400/func_80BA57A8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Railgibud_0x80BA5400/func_80BA57A8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Railgibud_0x80BA5400/func_80BA57F8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Railgibud_0x80BA5400/func_80BA57F8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Railgibud_0x80BA5400/func_80BA59F0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Railgibud_0x80BA5400/func_80BA59F0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Railgibud_0x80BA5400/func_80BA5A34.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Railgibud_0x80BA5400/func_80BA5A34.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Railgibud_0x80BA5400/func_80BA5AF0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Railgibud_0x80BA5400/func_80BA5AF0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Railgibud_0x80BA5400/func_80BA5B64.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Railgibud_0x80BA5400/func_80BA5B64.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Railgibud_0x80BA5400/func_80BA5DBC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Railgibud_0x80BA5400/func_80BA5DBC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Railgibud_0x80BA5400/func_80BA5E18.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Railgibud_0x80BA5400/func_80BA5E18.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Railgibud_0x80BA5400/func_80BA6054.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Railgibud_0x80BA5400/func_80BA6054.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Railgibud_0x80BA5400/func_80BA60B0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Railgibud_0x80BA5400/func_80BA60B0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Railgibud_0x80BA5400/func_80BA6158.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Railgibud_0x80BA5400/func_80BA6158.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Railgibud_0x80BA5400/func_80BA61A0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Railgibud_0x80BA5400/func_80BA61A0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Railgibud_0x80BA5400/func_80BA6284.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Railgibud_0x80BA5400/func_80BA6284.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Railgibud_0x80BA5400/func_80BA62D4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Railgibud_0x80BA5400/func_80BA62D4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Railgibud_0x80BA5400/func_80BA6440.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Railgibud_0x80BA5400/func_80BA6440.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Railgibud_0x80BA5400/func_80BA64AC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Railgibud_0x80BA5400/func_80BA64AC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Railgibud_0x80BA5400/func_80BA6584.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Railgibud_0x80BA5400/func_80BA6584.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Railgibud_0x80BA5400/func_80BA6604.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Railgibud_0x80BA5400/func_80BA6604.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Railgibud_0x80BA5400/func_80BA6664.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Railgibud_0x80BA5400/func_80BA6664.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Railgibud_0x80BA5400/func_80BA66C8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Railgibud_0x80BA5400/func_80BA66C8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Railgibud_0x80BA5400/func_80BA6800.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Railgibud_0x80BA5400/func_80BA6800.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Railgibud_0x80BA5400/func_80BA6974.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Railgibud_0x80BA5400/func_80BA6974.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Railgibud_0x80BA5400/func_80BA6B30.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Railgibud_0x80BA5400/func_80BA6B30.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Railgibud_0x80BA5400/func_80BA6B9C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Railgibud_0x80BA5400/func_80BA6B9C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Railgibud_0x80BA5400/func_80BA6D10.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Railgibud_0x80BA5400/func_80BA6D10.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Railgibud_0x80BA5400/func_80BA6DAC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Railgibud_0x80BA5400/func_80BA6DAC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Railgibud_0x80BA5400/func_80BA6DF8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Railgibud_0x80BA5400/func_80BA6DF8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Railgibud_0x80BA5400/func_80BA7088.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Railgibud_0x80BA5400/func_80BA7088.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Railgibud_0x80BA5400/func_80BA71E4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Railgibud_0x80BA5400/func_80BA71E4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Railgibud_0x80BA5400/func_80BA7234.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Railgibud_0x80BA5400/func_80BA7234.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Railgibud_0x80BA5400/func_80BA7388.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Railgibud_0x80BA5400/func_80BA7388.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Railgibud_0x80BA5400/func_80BA7434.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Railgibud_0x80BA5400/func_80BA7434.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Railgibud_0x80BA5400/func_80BA7578.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Railgibud_0x80BA5400/func_80BA7578.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Railgibud_0x80BA5400/func_80BA76C4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Railgibud_0x80BA5400/func_80BA76C4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Railgibud_0x80BA5400/EnRailgibud_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Railgibud_0x80BA5400/EnRailgibud_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Railgibud_0x80BA5400/func_80BA7878.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Railgibud_0x80BA5400/func_80BA7878.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Railgibud_0x80BA5400/func_80BA789C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Railgibud_0x80BA5400/func_80BA789C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Railgibud_0x80BA5400/func_80BA78F8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Railgibud_0x80BA5400/func_80BA78F8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Railgibud_0x80BA5400/EnRailgibud_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Railgibud_0x80BA5400/EnRailgibud_Draw.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Railgibud_0x80BA5400/func_80BA7B6C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Railgibud_0x80BA5400/func_80BA7B6C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Railgibud_0x80BA5400/func_80BA7C78.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Railgibud_0x80BA5400/func_80BA7C78.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Railgibud_0x80BA5400/func_80BA7CF0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Railgibud_0x80BA5400/func_80BA7CF0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Railgibud_0x80BA5400/func_80BA7D04.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Railgibud_0x80BA5400/func_80BA7D04.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Railgibud_0x80BA5400/func_80BA7D14.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Railgibud_0x80BA5400/func_80BA7D14.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Railgibud_0x80BA5400/func_80BA7D30.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Railgibud_0x80BA5400/func_80BA7D30.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Railgibud_0x80BA5400/func_80BA7DC8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Railgibud_0x80BA5400/func_80BA7DC8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Railgibud_0x80BA5400/func_80BA8050.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Railgibud_0x80BA5400/func_80BA8050.asm") diff --git a/src/overlays/actors/ovl_En_Rat/z_en_rat.c b/src/overlays/actors/ovl_En_Rat/z_en_rat.c index 0cb88abfb9..70f31d29fa 100644 --- a/src/overlays/actors/ovl_En_Rat/z_en_rat.c +++ b/src/overlays/actors/ovl_En_Rat/z_en_rat.c @@ -23,60 +23,60 @@ const ActorInit En_Rat_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rat_0x80A56150/EnRat_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rat_0x80A56150/EnRat_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rat_0x80A56150/EnRat_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rat_0x80A56150/EnRat_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rat_0x80A56150/func_80A563CC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rat_0x80A56150/func_80A563CC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rat_0x80A56150/func_80A56444.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rat_0x80A56150/func_80A56444.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rat_0x80A56150/func_80A5665C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rat_0x80A56150/func_80A5665C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rat_0x80A56150/func_80A566E0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rat_0x80A56150/func_80A566E0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rat_0x80A56150/func_80A56994.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rat_0x80A56150/func_80A56994.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rat_0x80A56150/func_80A56AFC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rat_0x80A56150/func_80A56AFC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rat_0x80A56150/func_80A56EB8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rat_0x80A56150/func_80A56EB8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rat_0x80A56150/func_80A56F68.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rat_0x80A56150/func_80A56F68.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rat_0x80A56150/func_80A57010.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rat_0x80A56150/func_80A57010.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rat_0x80A56150/func_80A57118.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rat_0x80A56150/func_80A57118.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rat_0x80A56150/func_80A57180.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rat_0x80A56150/func_80A57180.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rat_0x80A56150/func_80A5723C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rat_0x80A56150/func_80A5723C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rat_0x80A56150/func_80A57330.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rat_0x80A56150/func_80A57330.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rat_0x80A56150/func_80A57384.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rat_0x80A56150/func_80A57384.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rat_0x80A56150/func_80A57488.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rat_0x80A56150/func_80A57488.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rat_0x80A56150/func_80A574E8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rat_0x80A56150/func_80A574E8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rat_0x80A56150/func_80A57570.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rat_0x80A56150/func_80A57570.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rat_0x80A56150/func_80A575F4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rat_0x80A56150/func_80A575F4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rat_0x80A56150/func_80A5764C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rat_0x80A56150/func_80A5764C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rat_0x80A56150/func_80A57918.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rat_0x80A56150/func_80A57918.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rat_0x80A56150/func_80A57984.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rat_0x80A56150/func_80A57984.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rat_0x80A56150/func_80A57A08.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rat_0x80A56150/func_80A57A08.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rat_0x80A56150/func_80A57A9C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rat_0x80A56150/func_80A57A9C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rat_0x80A56150/EnRat_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rat_0x80A56150/EnRat_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rat_0x80A56150/func_80A57F10.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rat_0x80A56150/func_80A57F10.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rat_0x80A56150/func_80A57F4C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rat_0x80A56150/func_80A57F4C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rat_0x80A56150/EnRat_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rat_0x80A56150/EnRat_Draw.asm") 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 935c387bfe..3265b84b41 100644 --- a/src/overlays/actors/ovl_En_Rd/z_en_rd.c +++ b/src/overlays/actors/ovl_En_Rd/z_en_rd.c @@ -23,100 +23,100 @@ const ActorInit En_Rd_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rd_0x808D3E20/EnRd_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rd_0x808D3E20/EnRd_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rd_0x808D3E20/EnRd_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rd_0x808D3E20/EnRd_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rd_0x808D3E20/func_808D4190.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rd_0x808D3E20/func_808D4190.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rd_0x808D3E20/func_808D41FC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rd_0x808D3E20/func_808D41FC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rd_0x808D3E20/func_808D4260.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rd_0x808D3E20/func_808D4260.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rd_0x808D3E20/func_808D4308.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rd_0x808D3E20/func_808D4308.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rd_0x808D3E20/func_808D43AC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rd_0x808D3E20/func_808D43AC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rd_0x808D3E20/func_808D45D4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rd_0x808D3E20/func_808D45D4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rd_0x808D3E20/func_808D4660.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rd_0x808D3E20/func_808D4660.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rd_0x808D3E20/func_808D47DC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rd_0x808D3E20/func_808D47DC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rd_0x808D3E20/func_808D4868.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rd_0x808D3E20/func_808D4868.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rd_0x808D3E20/func_808D49E4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rd_0x808D3E20/func_808D49E4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rd_0x808D3E20/func_808D4A90.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rd_0x808D3E20/func_808D4A90.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rd_0x808D3E20/func_808D4B20.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rd_0x808D3E20/func_808D4B20.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rd_0x808D3E20/func_808D4CA8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rd_0x808D3E20/func_808D4CA8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rd_0x808D3E20/func_808D4DC4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rd_0x808D3E20/func_808D4DC4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rd_0x808D3E20/func_808D4E60.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rd_0x808D3E20/func_808D4E60.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rd_0x808D3E20/func_808D4FE0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rd_0x808D3E20/func_808D4FE0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rd_0x808D3E20/func_808D506C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rd_0x808D3E20/func_808D506C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rd_0x808D3E20/func_808D53C0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rd_0x808D3E20/func_808D53C0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rd_0x808D3E20/func_808D5440.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rd_0x808D3E20/func_808D5440.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rd_0x808D3E20/func_808D5660.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rd_0x808D3E20/func_808D5660.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rd_0x808D3E20/func_808D56E4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rd_0x808D3E20/func_808D56E4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rd_0x808D3E20/func_808D586C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rd_0x808D3E20/func_808D586C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rd_0x808D3E20/func_808D58CC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rd_0x808D3E20/func_808D58CC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rd_0x808D3E20/func_808D5C54.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rd_0x808D3E20/func_808D5C54.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rd_0x808D3E20/func_808D5CCC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rd_0x808D3E20/func_808D5CCC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rd_0x808D3E20/func_808D5D88.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rd_0x808D3E20/func_808D5D88.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rd_0x808D3E20/func_808D5DF4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rd_0x808D3E20/func_808D5DF4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rd_0x808D3E20/func_808D5E98.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rd_0x808D3E20/func_808D5E98.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rd_0x808D3E20/func_808D5F18.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rd_0x808D3E20/func_808D5F18.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rd_0x808D3E20/func_808D6008.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rd_0x808D3E20/func_808D6008.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rd_0x808D3E20/func_808D6054.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rd_0x808D3E20/func_808D6054.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rd_0x808D3E20/func_808D60B0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rd_0x808D3E20/func_808D60B0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rd_0x808D3E20/func_808D6130.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rd_0x808D3E20/func_808D6130.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rd_0x808D3E20/func_808D616C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rd_0x808D3E20/func_808D616C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rd_0x808D3E20/func_808D6200.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rd_0x808D3E20/func_808D6200.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rd_0x808D3E20/func_808D6310.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rd_0x808D3E20/func_808D6310.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rd_0x808D3E20/func_808D6388.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rd_0x808D3E20/func_808D6388.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rd_0x808D3E20/func_808D64D0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rd_0x808D3E20/func_808D64D0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rd_0x808D3E20/func_808D65BC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rd_0x808D3E20/func_808D65BC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rd_0x808D3E20/func_808D66A0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rd_0x808D3E20/func_808D66A0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rd_0x808D3E20/func_808D6814.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rd_0x808D3E20/func_808D6814.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rd_0x808D3E20/func_808D6A94.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rd_0x808D3E20/func_808D6A94.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rd_0x808D3E20/func_808D6B64.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rd_0x808D3E20/func_808D6B64.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rd_0x808D3E20/EnRd_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rd_0x808D3E20/EnRd_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rd_0x808D3E20/func_808D6DA0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rd_0x808D3E20/func_808D6DA0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rd_0x808D3E20/func_808D6DFC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rd_0x808D3E20/func_808D6DFC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rd_0x808D3E20/EnRd_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rd_0x808D3E20/EnRd_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Recepgirl/z_en_recepgirl.c b/src/overlays/actors/ovl_En_Recepgirl/z_en_recepgirl.c index 09bdc36a6b..4f029197b1 100644 --- a/src/overlays/actors/ovl_En_Recepgirl/z_en_recepgirl.c +++ b/src/overlays/actors/ovl_En_Recepgirl/z_en_recepgirl.c @@ -23,24 +23,24 @@ const ActorInit En_Recepgirl_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Recepgirl_0x80C0FFD0/EnRecepgirl_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Recepgirl_0x80C0FFD0/EnRecepgirl_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Recepgirl_0x80C0FFD0/EnRecepgirl_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Recepgirl_0x80C0FFD0/EnRecepgirl_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Recepgirl_0x80C0FFD0/func_80C100DC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Recepgirl_0x80C0FFD0/func_80C100DC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Recepgirl_0x80C0FFD0/func_80C10148.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Recepgirl_0x80C0FFD0/func_80C10148.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Recepgirl_0x80C0FFD0/func_80C1019C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Recepgirl_0x80C0FFD0/func_80C1019C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Recepgirl_0x80C0FFD0/func_80C10290.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Recepgirl_0x80C0FFD0/func_80C10290.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Recepgirl_0x80C0FFD0/func_80C102D4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Recepgirl_0x80C0FFD0/func_80C102D4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Recepgirl_0x80C0FFD0/EnRecepgirl_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Recepgirl_0x80C0FFD0/EnRecepgirl_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Recepgirl_0x80C0FFD0/func_80C10558.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Recepgirl_0x80C0FFD0/func_80C10558.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Recepgirl_0x80C0FFD0/func_80C10590.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Recepgirl_0x80C0FFD0/func_80C10590.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Recepgirl_0x80C0FFD0/EnRecepgirl_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Recepgirl_0x80C0FFD0/EnRecepgirl_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Rg/z_en_rg.c b/src/overlays/actors/ovl_En_Rg/z_en_rg.c index 44ef9d595a..c80f9e0aba 100644 --- a/src/overlays/actors/ovl_En_Rg/z_en_rg.c +++ b/src/overlays/actors/ovl_En_Rg/z_en_rg.c @@ -23,64 +23,64 @@ const ActorInit En_Rg_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rg_0x80BF3920/func_80BF3920.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rg_0x80BF3920/func_80BF3920.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rg_0x80BF3920/func_80BF3C64.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rg_0x80BF3920/func_80BF3C64.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rg_0x80BF3920/func_80BF3DA0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rg_0x80BF3920/func_80BF3DA0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rg_0x80BF3920/func_80BF3DC4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rg_0x80BF3920/func_80BF3DC4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rg_0x80BF3920/func_80BF3E88.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rg_0x80BF3920/func_80BF3E88.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rg_0x80BF3920/func_80BF3ED4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rg_0x80BF3920/func_80BF3ED4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rg_0x80BF3920/func_80BF3F14.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rg_0x80BF3920/func_80BF3F14.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rg_0x80BF3920/func_80BF3FF8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rg_0x80BF3920/func_80BF3FF8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rg_0x80BF3920/func_80BF4024.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rg_0x80BF3920/func_80BF4024.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rg_0x80BF3920/func_80BF409C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rg_0x80BF3920/func_80BF409C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rg_0x80BF3920/func_80BF40F4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rg_0x80BF3920/func_80BF40F4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rg_0x80BF3920/func_80BF416C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rg_0x80BF3920/func_80BF416C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rg_0x80BF3920/func_80BF4220.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rg_0x80BF3920/func_80BF4220.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rg_0x80BF3920/func_80BF42BC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rg_0x80BF3920/func_80BF42BC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rg_0x80BF3920/func_80BF43FC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rg_0x80BF3920/func_80BF43FC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rg_0x80BF3920/func_80BF4560.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rg_0x80BF3920/func_80BF4560.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rg_0x80BF3920/func_80BF45B4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rg_0x80BF3920/func_80BF45B4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rg_0x80BF3920/func_80BF47AC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rg_0x80BF3920/func_80BF47AC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rg_0x80BF3920/func_80BF4934.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rg_0x80BF3920/func_80BF4934.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rg_0x80BF3920/func_80BF4964.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rg_0x80BF3920/func_80BF4964.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rg_0x80BF3920/func_80BF4AB8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rg_0x80BF3920/func_80BF4AB8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rg_0x80BF3920/func_80BF4D64.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rg_0x80BF3920/func_80BF4D64.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rg_0x80BF3920/func_80BF4DA8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rg_0x80BF3920/func_80BF4DA8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rg_0x80BF3920/func_80BF4EBC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rg_0x80BF3920/func_80BF4EBC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rg_0x80BF3920/func_80BF4FC4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rg_0x80BF3920/func_80BF4FC4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rg_0x80BF3920/EnRg_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rg_0x80BF3920/EnRg_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rg_0x80BF3920/EnRg_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rg_0x80BF3920/EnRg_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rg_0x80BF3920/EnRg_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rg_0x80BF3920/EnRg_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rg_0x80BF3920/func_80BF547C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rg_0x80BF3920/func_80BF547C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rg_0x80BF3920/func_80BF5588.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rg_0x80BF3920/func_80BF5588.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rg_0x80BF3920/EnRg_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rg_0x80BF3920/EnRg_Draw.asm") 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 547f4eff02..8323eb55b5 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 @@ -22,8 +22,8 @@ const ActorInit En_River_Sound_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_River_Sound_0x808A7E30/EnRiverSound_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_River_Sound_0x808A7E30/EnRiverSound_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_River_Sound_0x808A7E30/EnRiverSound_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_River_Sound_0x808A7E30/EnRiverSound_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_River_Sound_0x808A7E30/EnRiverSound_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_River_Sound_0x808A7E30/EnRiverSound_Draw.asm") 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 0399722002..0706bab8f9 100644 --- a/src/overlays/actors/ovl_En_Rr/z_en_rr.c +++ b/src/overlays/actors/ovl_En_Rr/z_en_rr.c @@ -23,62 +23,62 @@ const ActorInit En_Rr_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rr_0x808F9E00/EnRr_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rr_0x808F9E00/EnRr_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rr_0x808F9E00/EnRr_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rr_0x808F9E00/EnRr_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rr_0x808F9E00/func_808FA01C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rr_0x808F9E00/func_808FA01C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rr_0x808F9E00/func_808FA11C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rr_0x808F9E00/func_808FA11C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rr_0x808F9E00/func_808FA19C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rr_0x808F9E00/func_808FA19C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rr_0x808F9E00/func_808FA238.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rr_0x808F9E00/func_808FA238.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rr_0x808F9E00/func_808FA260.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rr_0x808F9E00/func_808FA260.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rr_0x808F9E00/func_808FA344.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rr_0x808F9E00/func_808FA344.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rr_0x808F9E00/func_808FA3F8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rr_0x808F9E00/func_808FA3F8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rr_0x808F9E00/func_808FA4F4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rr_0x808F9E00/func_808FA4F4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rr_0x808F9E00/func_808FA6B8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rr_0x808F9E00/func_808FA6B8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rr_0x808F9E00/func_808FA7AC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rr_0x808F9E00/func_808FA7AC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rr_0x808F9E00/func_808FA870.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rr_0x808F9E00/func_808FA870.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rr_0x808F9E00/func_808FA910.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rr_0x808F9E00/func_808FA910.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rr_0x808F9E00/func_808FA9CC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rr_0x808F9E00/func_808FA9CC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rr_0x808F9E00/func_808FAA94.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rr_0x808F9E00/func_808FAA94.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rr_0x808F9E00/func_808FAC80.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rr_0x808F9E00/func_808FAC80.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rr_0x808F9E00/func_808FAD1C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rr_0x808F9E00/func_808FAD1C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rr_0x808F9E00/func_808FAE50.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rr_0x808F9E00/func_808FAE50.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rr_0x808F9E00/func_808FAF94.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rr_0x808F9E00/func_808FAF94.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rr_0x808F9E00/func_808FB088.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rr_0x808F9E00/func_808FB088.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rr_0x808F9E00/func_808FB1C0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rr_0x808F9E00/func_808FB1C0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rr_0x808F9E00/func_808FB2C0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rr_0x808F9E00/func_808FB2C0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rr_0x808F9E00/func_808FB398.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rr_0x808F9E00/func_808FB398.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rr_0x808F9E00/func_808FB42C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rr_0x808F9E00/func_808FB42C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rr_0x808F9E00/func_808FB680.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rr_0x808F9E00/func_808FB680.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rr_0x808F9E00/func_808FB710.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rr_0x808F9E00/func_808FB710.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rr_0x808F9E00/func_808FB794.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rr_0x808F9E00/func_808FB794.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rr_0x808F9E00/EnRr_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rr_0x808F9E00/EnRr_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rr_0x808F9E00/EnRr_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rr_0x808F9E00/EnRr_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Ru/z_en_ru.c b/src/overlays/actors/ovl_En_Ru/z_en_ru.c index 54543798b7..7e9d93464a 100644 --- a/src/overlays/actors/ovl_En_Ru/z_en_ru.c +++ b/src/overlays/actors/ovl_En_Ru/z_en_ru.c @@ -23,26 +23,26 @@ const ActorInit En_Ru_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ru_0x80A389A0/func_80A389A0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ru_0x80A389A0/func_80A389A0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ru_0x80A389A0/func_80A38A68.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ru_0x80A389A0/func_80A38A68.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ru_0x80A389A0/func_80A38B7C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ru_0x80A389A0/func_80A38B7C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ru_0x80A389A0/func_80A38BF0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ru_0x80A389A0/func_80A38BF0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ru_0x80A389A0/func_80A38C70.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ru_0x80A389A0/func_80A38C70.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ru_0x80A389A0/func_80A38DF4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ru_0x80A389A0/func_80A38DF4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ru_0x80A389A0/EnRu_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ru_0x80A389A0/EnRu_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ru_0x80A389A0/EnRu_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ru_0x80A389A0/EnRu_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ru_0x80A389A0/EnRu_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ru_0x80A389A0/EnRu_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ru_0x80A389A0/func_80A38FB4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ru_0x80A389A0/func_80A38FB4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ru_0x80A389A0/func_80A390F8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ru_0x80A389A0/func_80A390F8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ru_0x80A389A0/EnRu_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ru_0x80A389A0/EnRu_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Ruppecrow/z_en_ruppecrow.c b/src/overlays/actors/ovl_En_Ruppecrow/z_en_ruppecrow.c index 1cdde4b3b3..8f85c888b4 100644 --- a/src/overlays/actors/ovl_En_Ruppecrow/z_en_ruppecrow.c +++ b/src/overlays/actors/ovl_En_Ruppecrow/z_en_ruppecrow.c @@ -23,46 +23,46 @@ const ActorInit En_Ruppecrow_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ruppecrow_0x80BE2260/func_80BE2260.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ruppecrow_0x80BE2260/func_80BE2260.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ruppecrow_0x80BE2260/func_80BE2330.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ruppecrow_0x80BE2260/func_80BE2330.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ruppecrow_0x80BE2260/func_80BE24CC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ruppecrow_0x80BE2260/func_80BE24CC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ruppecrow_0x80BE2260/func_80BE2668.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ruppecrow_0x80BE2260/func_80BE2668.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ruppecrow_0x80BE2260/func_80BE2728.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ruppecrow_0x80BE2260/func_80BE2728.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ruppecrow_0x80BE2260/func_80BE2794.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ruppecrow_0x80BE2260/func_80BE2794.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ruppecrow_0x80BE2260/func_80BE2808.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ruppecrow_0x80BE2260/func_80BE2808.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ruppecrow_0x80BE2260/func_80BE2874.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ruppecrow_0x80BE2260/func_80BE2874.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ruppecrow_0x80BE2260/func_80BE2B80.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ruppecrow_0x80BE2260/func_80BE2B80.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ruppecrow_0x80BE2260/func_80BE2D4C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ruppecrow_0x80BE2260/func_80BE2D4C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ruppecrow_0x80BE2260/func_80BE2E18.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ruppecrow_0x80BE2260/func_80BE2E18.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ruppecrow_0x80BE2260/func_80BE2F6C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ruppecrow_0x80BE2260/func_80BE2F6C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ruppecrow_0x80BE2260/func_80BE30F4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ruppecrow_0x80BE2260/func_80BE30F4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ruppecrow_0x80BE2260/func_80BE3178.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ruppecrow_0x80BE2260/func_80BE3178.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ruppecrow_0x80BE2260/func_80BE32DC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ruppecrow_0x80BE2260/func_80BE32DC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ruppecrow_0x80BE2260/func_80BE3354.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ruppecrow_0x80BE2260/func_80BE3354.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ruppecrow_0x80BE2260/func_80BE348C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ruppecrow_0x80BE2260/func_80BE348C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ruppecrow_0x80BE2260/func_80BE35A4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ruppecrow_0x80BE2260/func_80BE35A4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ruppecrow_0x80BE2260/EnRuppecrow_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ruppecrow_0x80BE2260/EnRuppecrow_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ruppecrow_0x80BE2260/EnRuppecrow_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ruppecrow_0x80BE2260/EnRuppecrow_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ruppecrow_0x80BE2260/EnRuppecrow_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ruppecrow_0x80BE2260/EnRuppecrow_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ruppecrow_0x80BE2260/EnRuppecrow_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ruppecrow_0x80BE2260/EnRuppecrow_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Rz/z_en_rz.c b/src/overlays/actors/ovl_En_Rz/z_en_rz.c index 1cc3141ee6..80a1b30ef5 100644 --- a/src/overlays/actors/ovl_En_Rz/z_en_rz.c +++ b/src/overlays/actors/ovl_En_Rz/z_en_rz.c @@ -23,66 +23,66 @@ const ActorInit En_Rz_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rz_0x80BFB480/EnRz_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rz_0x80BFB480/EnRz_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rz_0x80BFB480/func_80BFB780.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rz_0x80BFB480/func_80BFB780.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rz_0x80BFB480/func_80BFB864.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rz_0x80BFB480/func_80BFB864.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rz_0x80BFB480/func_80BFB9E4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rz_0x80BFB480/func_80BFB9E4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rz_0x80BFB480/func_80BFBA1C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rz_0x80BFB480/func_80BFBA1C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rz_0x80BFB480/func_80BFBA50.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rz_0x80BFB480/func_80BFBA50.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rz_0x80BFB480/func_80BFBB44.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rz_0x80BFB480/func_80BFBB44.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rz_0x80BFB480/func_80BFBC78.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rz_0x80BFB480/func_80BFBC78.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rz_0x80BFB480/func_80BFBCEC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rz_0x80BFB480/func_80BFBCEC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rz_0x80BFB480/func_80BFBD54.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rz_0x80BFB480/func_80BFBD54.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rz_0x80BFB480/func_80BFBDA0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rz_0x80BFB480/func_80BFBDA0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rz_0x80BFB480/func_80BFBDFC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rz_0x80BFB480/func_80BFBDFC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rz_0x80BFB480/EnRz_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rz_0x80BFB480/EnRz_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rz_0x80BFB480/func_80BFBE70.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rz_0x80BFB480/func_80BFBE70.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rz_0x80BFB480/func_80BFBFAC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rz_0x80BFB480/func_80BFBFAC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rz_0x80BFB480/func_80BFC058.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rz_0x80BFB480/func_80BFC058.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rz_0x80BFB480/func_80BFC078.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rz_0x80BFB480/func_80BFC078.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rz_0x80BFB480/func_80BFC19C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rz_0x80BFB480/func_80BFC19C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rz_0x80BFB480/func_80BFC214.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rz_0x80BFB480/func_80BFC214.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rz_0x80BFB480/func_80BFC270.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rz_0x80BFB480/func_80BFC270.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rz_0x80BFB480/func_80BFC2F4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rz_0x80BFB480/func_80BFC2F4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rz_0x80BFB480/func_80BFC36C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rz_0x80BFB480/func_80BFC36C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rz_0x80BFB480/func_80BFC3F8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rz_0x80BFB480/func_80BFC3F8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rz_0x80BFB480/func_80BFC608.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rz_0x80BFB480/func_80BFC608.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rz_0x80BFB480/func_80BFC674.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rz_0x80BFB480/func_80BFC674.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rz_0x80BFB480/func_80BFC728.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rz_0x80BFB480/func_80BFC728.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rz_0x80BFB480/func_80BFC7E0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rz_0x80BFB480/func_80BFC7E0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rz_0x80BFB480/func_80BFC8AC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rz_0x80BFB480/func_80BFC8AC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rz_0x80BFB480/func_80BFC8F8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rz_0x80BFB480/func_80BFC8F8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rz_0x80BFB480/EnRz_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rz_0x80BFB480/EnRz_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rz_0x80BFB480/func_80BFCAD0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rz_0x80BFB480/func_80BFCAD0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Rz_0x80BFB480/EnRz_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Rz_0x80BFB480/EnRz_Draw.asm") diff --git a/src/overlays/actors/ovl_En_S_Goro/z_en_s_goro.c b/src/overlays/actors/ovl_En_S_Goro/z_en_s_goro.c index d6c3d2370b..d34e059541 100644 --- a/src/overlays/actors/ovl_En_S_Goro/z_en_s_goro.c +++ b/src/overlays/actors/ovl_En_S_Goro/z_en_s_goro.c @@ -23,76 +23,76 @@ const ActorInit En_S_Goro_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_S_Goro_0x80BBCA80/func_80BBCA80.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_S_Goro_0x80BBCA80/func_80BBCA80.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_S_Goro_0x80BBCA80/func_80BBD348.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_S_Goro_0x80BBCA80/func_80BBD348.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_S_Goro_0x80BBCA80/func_80BBD8F0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_S_Goro_0x80BBCA80/func_80BBD8F0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_S_Goro_0x80BBCA80/func_80BBD93C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_S_Goro_0x80BBCA80/func_80BBD93C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_S_Goro_0x80BBCA80/func_80BBD98C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_S_Goro_0x80BBCA80/func_80BBD98C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_S_Goro_0x80BBCA80/func_80BBDACC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_S_Goro_0x80BBCA80/func_80BBDACC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_S_Goro_0x80BBCA80/func_80BBDC34.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_S_Goro_0x80BBCA80/func_80BBDC34.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_S_Goro_0x80BBCA80/func_80BBDCFC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_S_Goro_0x80BBCA80/func_80BBDCFC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_S_Goro_0x80BBCA80/func_80BBDDF8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_S_Goro_0x80BBCA80/func_80BBDDF8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_S_Goro_0x80BBCA80/func_80BBDE78.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_S_Goro_0x80BBCA80/func_80BBDE78.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_S_Goro_0x80BBCA80/func_80BBDF28.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_S_Goro_0x80BBCA80/func_80BBDF28.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_S_Goro_0x80BBCA80/func_80BBDFA8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_S_Goro_0x80BBCA80/func_80BBDFA8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_S_Goro_0x80BBCA80/func_80BBE05C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_S_Goro_0x80BBCA80/func_80BBE05C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_S_Goro_0x80BBCA80/func_80BBE0E4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_S_Goro_0x80BBCA80/func_80BBE0E4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_S_Goro_0x80BBCA80/func_80BBE144.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_S_Goro_0x80BBCA80/func_80BBE144.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_S_Goro_0x80BBCA80/func_80BBE374.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_S_Goro_0x80BBCA80/func_80BBE374.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_S_Goro_0x80BBCA80/func_80BBE498.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_S_Goro_0x80BBCA80/func_80BBE498.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_S_Goro_0x80BBCA80/func_80BBE73C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_S_Goro_0x80BBCA80/func_80BBE73C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_S_Goro_0x80BBCA80/func_80BBE844.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_S_Goro_0x80BBCA80/func_80BBE844.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_S_Goro_0x80BBCA80/func_80BBE904.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_S_Goro_0x80BBCA80/func_80BBE904.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_S_Goro_0x80BBCA80/func_80BBE9F8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_S_Goro_0x80BBCA80/func_80BBE9F8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_S_Goro_0x80BBCA80/func_80BBEAD8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_S_Goro_0x80BBCA80/func_80BBEAD8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_S_Goro_0x80BBCA80/func_80BBEBF8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_S_Goro_0x80BBCA80/func_80BBEBF8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_S_Goro_0x80BBCA80/func_80BBECBC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_S_Goro_0x80BBCA80/func_80BBECBC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_S_Goro_0x80BBCA80/func_80BBEEB4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_S_Goro_0x80BBCA80/func_80BBEEB4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_S_Goro_0x80BBCA80/func_80BBEF34.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_S_Goro_0x80BBCA80/func_80BBEF34.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_S_Goro_0x80BBCA80/func_80BBEFA0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_S_Goro_0x80BBCA80/func_80BBEFA0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_S_Goro_0x80BBCA80/func_80BBF01C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_S_Goro_0x80BBCA80/func_80BBF01C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_S_Goro_0x80BBCA80/EnSGoro_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_S_Goro_0x80BBCA80/EnSGoro_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_S_Goro_0x80BBCA80/EnSGoro_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_S_Goro_0x80BBCA80/EnSGoro_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_S_Goro_0x80BBCA80/EnSGoro_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_S_Goro_0x80BBCA80/EnSGoro_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_S_Goro_0x80BBCA80/func_80BBF298.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_S_Goro_0x80BBCA80/func_80BBF298.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_S_Goro_0x80BBCA80/func_80BBF3D0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_S_Goro_0x80BBCA80/func_80BBF3D0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_S_Goro_0x80BBCA80/func_80BBF3EC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_S_Goro_0x80BBCA80/func_80BBF3EC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_S_Goro_0x80BBCA80/func_80BBF5F0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_S_Goro_0x80BBCA80/func_80BBF5F0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_S_Goro_0x80BBCA80/func_80BBF6BC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_S_Goro_0x80BBCA80/func_80BBF6BC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_S_Goro_0x80BBCA80/EnSGoro_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_S_Goro_0x80BBCA80/EnSGoro_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Sb/z_en_sb.c b/src/overlays/actors/ovl_En_Sb/z_en_sb.c index d4c024258c..51002cc552 100644 --- a/src/overlays/actors/ovl_En_Sb/z_en_sb.c +++ b/src/overlays/actors/ovl_En_Sb/z_en_sb.c @@ -23,42 +23,42 @@ const ActorInit En_Sb_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sb_0x808E3EF0/EnSb_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sb_0x808E3EF0/EnSb_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sb_0x808E3EF0/EnSb_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sb_0x808E3EF0/EnSb_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sb_0x808E3EF0/func_808E401C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sb_0x808E3EF0/func_808E401C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sb_0x808E3EF0/func_808E40CC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sb_0x808E3EF0/func_808E40CC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sb_0x808E3EF0/func_808E4144.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sb_0x808E3EF0/func_808E4144.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sb_0x808E3EF0/func_808E41C0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sb_0x808E3EF0/func_808E41C0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sb_0x808E3EF0/func_808E4234.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sb_0x808E3EF0/func_808E4234.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sb_0x808E3EF0/func_808E42DC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sb_0x808E3EF0/func_808E42DC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sb_0x808E3EF0/func_808E4354.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sb_0x808E3EF0/func_808E4354.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sb_0x808E3EF0/func_808E4458.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sb_0x808E3EF0/func_808E4458.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sb_0x808E3EF0/func_808E44D4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sb_0x808E3EF0/func_808E44D4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sb_0x808E3EF0/func_808E45A0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sb_0x808E3EF0/func_808E45A0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sb_0x808E3EF0/func_808E4654.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sb_0x808E3EF0/func_808E4654.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sb_0x808E3EF0/func_808E4740.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sb_0x808E3EF0/func_808E4740.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sb_0x808E3EF0/func_808E47E8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sb_0x808E3EF0/func_808E47E8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sb_0x808E3EF0/func_808E491C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sb_0x808E3EF0/func_808E491C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sb_0x808E3EF0/func_808E4984.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sb_0x808E3EF0/func_808E4984.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sb_0x808E3EF0/EnSb_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sb_0x808E3EF0/EnSb_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sb_0x808E3EF0/func_808E4C18.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sb_0x808E3EF0/func_808E4C18.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sb_0x808E3EF0/EnSb_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sb_0x808E3EF0/EnSb_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Sc_Ruppe/z_en_sc_ruppe.c b/src/overlays/actors/ovl_En_Sc_Ruppe/z_en_sc_ruppe.c index 7313bacc33..835a312265 100644 --- a/src/overlays/actors/ovl_En_Sc_Ruppe/z_en_sc_ruppe.c +++ b/src/overlays/actors/ovl_En_Sc_Ruppe/z_en_sc_ruppe.c @@ -23,18 +23,18 @@ const ActorInit En_Sc_Ruppe_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sc_Ruppe_0x80BD6910/func_80BD6910.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sc_Ruppe_0x80BD6910/func_80BD6910.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sc_Ruppe_0x80BD6910/func_80BD697C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sc_Ruppe_0x80BD6910/func_80BD697C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sc_Ruppe_0x80BD6910/func_80BD6A8C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sc_Ruppe_0x80BD6910/func_80BD6A8C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sc_Ruppe_0x80BD6910/func_80BD6B18.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sc_Ruppe_0x80BD6910/func_80BD6B18.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sc_Ruppe_0x80BD6910/EnScRuppe_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sc_Ruppe_0x80BD6910/EnScRuppe_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sc_Ruppe_0x80BD6910/EnScRuppe_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sc_Ruppe_0x80BD6910/EnScRuppe_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sc_Ruppe_0x80BD6910/EnScRuppe_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sc_Ruppe_0x80BD6910/EnScRuppe_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sc_Ruppe_0x80BD6910/EnScRuppe_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sc_Ruppe_0x80BD6910/EnScRuppe_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Scopecoin/z_en_scopecoin.c b/src/overlays/actors/ovl_En_Scopecoin/z_en_scopecoin.c index 844c8256df..253767542d 100644 --- a/src/overlays/actors/ovl_En_Scopecoin/z_en_scopecoin.c +++ b/src/overlays/actors/ovl_En_Scopecoin/z_en_scopecoin.c @@ -23,14 +23,14 @@ const ActorInit En_Scopecoin_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Scopecoin_0x80BFCFA0/func_80BFCFA0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Scopecoin_0x80BFCFA0/func_80BFCFA0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Scopecoin_0x80BFCFA0/func_80BFCFB8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Scopecoin_0x80BFCFA0/func_80BFCFB8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Scopecoin_0x80BFCFA0/EnScopecoin_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Scopecoin_0x80BFCFA0/EnScopecoin_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Scopecoin_0x80BFCFA0/EnScopecoin_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Scopecoin_0x80BFCFA0/EnScopecoin_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Scopecoin_0x80BFCFA0/EnScopecoin_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Scopecoin_0x80BFCFA0/EnScopecoin_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Scopecoin_0x80BFCFA0/EnScopecoin_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Scopecoin_0x80BFCFA0/EnScopecoin_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Scopecrow/z_en_scopecrow.c b/src/overlays/actors/ovl_En_Scopecrow/z_en_scopecrow.c index 97ac38c1db..ca21bf15e7 100644 --- a/src/overlays/actors/ovl_En_Scopecrow/z_en_scopecrow.c +++ b/src/overlays/actors/ovl_En_Scopecrow/z_en_scopecrow.c @@ -23,26 +23,26 @@ const ActorInit En_Scopecrow_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Scopecrow_0x80BCD000/func_80BCD000.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Scopecrow_0x80BCD000/func_80BCD000.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Scopecrow_0x80BCD000/func_80BCD09C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Scopecrow_0x80BCD000/func_80BCD09C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Scopecrow_0x80BCD000/func_80BCD1AC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Scopecrow_0x80BCD000/func_80BCD1AC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Scopecrow_0x80BCD000/func_80BCD2BC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Scopecrow_0x80BCD000/func_80BCD2BC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Scopecrow_0x80BCD000/func_80BCD334.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Scopecrow_0x80BCD000/func_80BCD334.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Scopecrow_0x80BCD000/func_80BCD4D0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Scopecrow_0x80BCD000/func_80BCD4D0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Scopecrow_0x80BCD000/func_80BCD590.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Scopecrow_0x80BCD000/func_80BCD590.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Scopecrow_0x80BCD000/func_80BCD640.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Scopecrow_0x80BCD000/func_80BCD640.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Scopecrow_0x80BCD000/EnScopecrow_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Scopecrow_0x80BCD000/EnScopecrow_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Scopecrow_0x80BCD000/EnScopecrow_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Scopecrow_0x80BCD000/EnScopecrow_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Scopecrow_0x80BCD000/EnScopecrow_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Scopecrow_0x80BCD000/EnScopecrow_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Scopecrow_0x80BCD000/EnScopecrow_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Scopecrow_0x80BCD000/EnScopecrow_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Scopenuts/z_en_scopenuts.c b/src/overlays/actors/ovl_En_Scopenuts/z_en_scopenuts.c index 81a671c79b..6f3403ca64 100644 --- a/src/overlays/actors/ovl_En_Scopenuts/z_en_scopenuts.c +++ b/src/overlays/actors/ovl_En_Scopenuts/z_en_scopenuts.c @@ -23,60 +23,60 @@ const ActorInit En_Scopenuts_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Scopenuts_0x80BCABF0/func_80BCABF0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Scopenuts_0x80BCABF0/func_80BCABF0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Scopenuts_0x80BCABF0/func_80BCAC40.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Scopenuts_0x80BCABF0/func_80BCAC40.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Scopenuts_0x80BCABF0/func_80BCAD64.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Scopenuts_0x80BCABF0/func_80BCAD64.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Scopenuts_0x80BCABF0/func_80BCAE78.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Scopenuts_0x80BCABF0/func_80BCAE78.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Scopenuts_0x80BCABF0/func_80BCAF0C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Scopenuts_0x80BCABF0/func_80BCAF0C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Scopenuts_0x80BCABF0/func_80BCAFA8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Scopenuts_0x80BCABF0/func_80BCAFA8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Scopenuts_0x80BCABF0/func_80BCB078.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Scopenuts_0x80BCABF0/func_80BCB078.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Scopenuts_0x80BCABF0/func_80BCB1C8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Scopenuts_0x80BCABF0/func_80BCB1C8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Scopenuts_0x80BCABF0/func_80BCB230.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Scopenuts_0x80BCABF0/func_80BCB230.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Scopenuts_0x80BCABF0/func_80BCB4DC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Scopenuts_0x80BCABF0/func_80BCB4DC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Scopenuts_0x80BCABF0/func_80BCB52C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Scopenuts_0x80BCABF0/func_80BCB52C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Scopenuts_0x80BCABF0/func_80BCB6D0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Scopenuts_0x80BCABF0/func_80BCB6D0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Scopenuts_0x80BCABF0/func_80BCB90C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Scopenuts_0x80BCABF0/func_80BCB90C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Scopenuts_0x80BCABF0/func_80BCB980.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Scopenuts_0x80BCABF0/func_80BCB980.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Scopenuts_0x80BCABF0/func_80BCBA00.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Scopenuts_0x80BCABF0/func_80BCBA00.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Scopenuts_0x80BCABF0/func_80BCBC60.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Scopenuts_0x80BCABF0/func_80BCBC60.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Scopenuts_0x80BCABF0/func_80BCBD28.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Scopenuts_0x80BCABF0/func_80BCBD28.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Scopenuts_0x80BCABF0/func_80BCBF0C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Scopenuts_0x80BCABF0/func_80BCBF0C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Scopenuts_0x80BCABF0/func_80BCBFFC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Scopenuts_0x80BCABF0/func_80BCBFFC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Scopenuts_0x80BCABF0/func_80BCC288.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Scopenuts_0x80BCABF0/func_80BCC288.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Scopenuts_0x80BCABF0/func_80BCC2AC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Scopenuts_0x80BCABF0/func_80BCC2AC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Scopenuts_0x80BCABF0/func_80BCC448.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Scopenuts_0x80BCABF0/func_80BCC448.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Scopenuts_0x80BCABF0/EnScopenuts_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Scopenuts_0x80BCABF0/EnScopenuts_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Scopenuts_0x80BCABF0/EnScopenuts_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Scopenuts_0x80BCABF0/EnScopenuts_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Scopenuts_0x80BCABF0/EnScopenuts_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Scopenuts_0x80BCABF0/EnScopenuts_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Scopenuts_0x80BCABF0/func_80BCC828.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Scopenuts_0x80BCABF0/func_80BCC828.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Scopenuts_0x80BCABF0/func_80BCC9CC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Scopenuts_0x80BCABF0/func_80BCC9CC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Scopenuts_0x80BCABF0/func_80BCC9E4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Scopenuts_0x80BCABF0/func_80BCC9E4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Scopenuts_0x80BCABF0/EnScopenuts_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Scopenuts_0x80BCABF0/EnScopenuts_Draw.asm") 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 956b05bc3f..f2a95d2450 100644 --- a/src/overlays/actors/ovl_En_Sda/z_en_sda.c +++ b/src/overlays/actors/ovl_En_Sda/z_en_sda.c @@ -23,16 +23,16 @@ const ActorInit En_Sda_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sda_0x809468D0/EnSda_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sda_0x809468D0/EnSda_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sda_0x809468D0/EnSda_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sda_0x809468D0/EnSda_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sda_0x809468D0/EnSda_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sda_0x809468D0/EnSda_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sda_0x809468D0/EnSda_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sda_0x809468D0/EnSda_Draw.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sda_0x809468D0/func_809469C0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sda_0x809468D0/func_809469C0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sda_0x809468D0/func_8094702C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sda_0x809468D0/func_8094702C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sda_0x809468D0/func_80947668.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sda_0x809468D0/func_80947668.asm") diff --git a/src/overlays/actors/ovl_En_Sekihi/z_en_sekihi.c b/src/overlays/actors/ovl_En_Sekihi/z_en_sekihi.c index e375318b17..b64f5f01de 100644 --- a/src/overlays/actors/ovl_En_Sekihi/z_en_sekihi.c +++ b/src/overlays/actors/ovl_En_Sekihi/z_en_sekihi.c @@ -22,18 +22,18 @@ const ActorInit En_Sekihi_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sekihi_0x80A44C80/EnSekihi_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sekihi_0x80A44C80/EnSekihi_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sekihi_0x80A44C80/EnSekihi_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sekihi_0x80A44C80/EnSekihi_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sekihi_0x80A44C80/func_80A44DE8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sekihi_0x80A44C80/func_80A44DE8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sekihi_0x80A44C80/func_80A44F40.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sekihi_0x80A44C80/func_80A44F40.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sekihi_0x80A44C80/func_80A450B0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sekihi_0x80A44C80/func_80A450B0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sekihi_0x80A44C80/func_80A45130.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sekihi_0x80A44C80/func_80A45130.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sekihi_0x80A44C80/EnSekihi_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sekihi_0x80A44C80/EnSekihi_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sekihi_0x80A44C80/func_80A45164.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sekihi_0x80A44C80/func_80A45164.asm") diff --git a/src/overlays/actors/ovl_En_Sellnuts/z_en_sellnuts.c b/src/overlays/actors/ovl_En_Sellnuts/z_en_sellnuts.c index bf9b7550e3..82661928e6 100644 --- a/src/overlays/actors/ovl_En_Sellnuts/z_en_sellnuts.c +++ b/src/overlays/actors/ovl_En_Sellnuts/z_en_sellnuts.c @@ -23,78 +23,78 @@ const ActorInit En_Sellnuts_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sellnuts_0x80ADADD0/func_80ADADD0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sellnuts_0x80ADADD0/func_80ADADD0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sellnuts_0x80ADADD0/func_80ADAE64.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sellnuts_0x80ADADD0/func_80ADAE64.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sellnuts_0x80ADADD0/func_80ADAFC0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sellnuts_0x80ADADD0/func_80ADAFC0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sellnuts_0x80ADADD0/func_80ADB040.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sellnuts_0x80ADADD0/func_80ADB040.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sellnuts_0x80ADADD0/func_80ADB08C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sellnuts_0x80ADADD0/func_80ADB08C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sellnuts_0x80ADADD0/func_80ADB0D8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sellnuts_0x80ADADD0/func_80ADB0D8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sellnuts_0x80ADADD0/func_80ADB254.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sellnuts_0x80ADADD0/func_80ADB254.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sellnuts_0x80ADADD0/func_80ADB4F4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sellnuts_0x80ADADD0/func_80ADB4F4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sellnuts_0x80ADADD0/func_80ADB544.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sellnuts_0x80ADADD0/func_80ADB544.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sellnuts_0x80ADADD0/func_80ADB924.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sellnuts_0x80ADADD0/func_80ADB924.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sellnuts_0x80ADADD0/func_80ADBAB8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sellnuts_0x80ADADD0/func_80ADBAB8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sellnuts_0x80ADADD0/func_80ADBBEC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sellnuts_0x80ADADD0/func_80ADBBEC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sellnuts_0x80ADADD0/func_80ADBC60.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sellnuts_0x80ADADD0/func_80ADBC60.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sellnuts_0x80ADADD0/func_80ADBCE4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sellnuts_0x80ADADD0/func_80ADBCE4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sellnuts_0x80ADADD0/func_80ADBD64.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sellnuts_0x80ADADD0/func_80ADBD64.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sellnuts_0x80ADADD0/func_80ADBE80.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sellnuts_0x80ADADD0/func_80ADBE80.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sellnuts_0x80ADADD0/func_80ADBFA0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sellnuts_0x80ADADD0/func_80ADBFA0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sellnuts_0x80ADADD0/func_80ADC034.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sellnuts_0x80ADADD0/func_80ADC034.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sellnuts_0x80ADADD0/func_80ADC118.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sellnuts_0x80ADADD0/func_80ADC118.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sellnuts_0x80ADADD0/func_80ADC2CC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sellnuts_0x80ADADD0/func_80ADC2CC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sellnuts_0x80ADADD0/func_80ADC37C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sellnuts_0x80ADADD0/func_80ADC37C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sellnuts_0x80ADADD0/func_80ADC580.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sellnuts_0x80ADADD0/func_80ADC580.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sellnuts_0x80ADADD0/func_80ADC5A4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sellnuts_0x80ADADD0/func_80ADC5A4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sellnuts_0x80ADADD0/func_80ADC6D0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sellnuts_0x80ADADD0/func_80ADC6D0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sellnuts_0x80ADADD0/func_80ADC7B4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sellnuts_0x80ADADD0/func_80ADC7B4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sellnuts_0x80ADADD0/func_80ADC8C4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sellnuts_0x80ADADD0/func_80ADC8C4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sellnuts_0x80ADADD0/func_80ADCA64.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sellnuts_0x80ADADD0/func_80ADCA64.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sellnuts_0x80ADADD0/func_80ADCC04.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sellnuts_0x80ADADD0/func_80ADCC04.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sellnuts_0x80ADADD0/func_80ADCD3C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sellnuts_0x80ADADD0/func_80ADCD3C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sellnuts_0x80ADADD0/func_80ADCE4C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sellnuts_0x80ADADD0/func_80ADCE4C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sellnuts_0x80ADADD0/func_80ADCFE8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sellnuts_0x80ADADD0/func_80ADCFE8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sellnuts_0x80ADADD0/EnSellnuts_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sellnuts_0x80ADADD0/EnSellnuts_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sellnuts_0x80ADADD0/EnSellnuts_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sellnuts_0x80ADADD0/EnSellnuts_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sellnuts_0x80ADADD0/EnSellnuts_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sellnuts_0x80ADADD0/EnSellnuts_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sellnuts_0x80ADADD0/func_80ADD4E0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sellnuts_0x80ADADD0/func_80ADD4E0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sellnuts_0x80ADADD0/func_80ADD7B4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sellnuts_0x80ADADD0/func_80ADD7B4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sellnuts_0x80ADADD0/func_80ADD7CC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sellnuts_0x80ADADD0/func_80ADD7CC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sellnuts_0x80ADADD0/EnSellnuts_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sellnuts_0x80ADADD0/EnSellnuts_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Shn/z_en_shn.c b/src/overlays/actors/ovl_En_Shn/z_en_shn.c index d325b96ed8..5671c61e0a 100644 --- a/src/overlays/actors/ovl_En_Shn/z_en_shn.c +++ b/src/overlays/actors/ovl_En_Shn/z_en_shn.c @@ -23,42 +23,42 @@ const ActorInit En_Shn_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Shn_0x80AE6130/func_80AE6130.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Shn_0x80AE6130/func_80AE6130.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Shn_0x80AE6130/func_80AE615C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Shn_0x80AE6130/func_80AE615C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Shn_0x80AE6130/func_80AE61C0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Shn_0x80AE6130/func_80AE61C0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Shn_0x80AE6130/func_80AE625C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Shn_0x80AE6130/func_80AE625C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Shn_0x80AE6130/func_80AE626C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Shn_0x80AE6130/func_80AE626C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Shn_0x80AE6130/func_80AE63A8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Shn_0x80AE6130/func_80AE63A8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Shn_0x80AE6130/func_80AE6488.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Shn_0x80AE6130/func_80AE6488.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Shn_0x80AE6130/func_80AE65F4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Shn_0x80AE6130/func_80AE65F4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Shn_0x80AE6130/func_80AE6704.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Shn_0x80AE6130/func_80AE6704.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Shn_0x80AE6130/func_80AE6880.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Shn_0x80AE6130/func_80AE6880.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Shn_0x80AE6130/func_80AE68F0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Shn_0x80AE6130/func_80AE68F0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Shn_0x80AE6130/func_80AE69E8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Shn_0x80AE6130/func_80AE69E8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Shn_0x80AE6130/func_80AE6A64.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Shn_0x80AE6130/func_80AE6A64.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Shn_0x80AE6130/EnShn_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Shn_0x80AE6130/EnShn_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Shn_0x80AE6130/EnShn_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Shn_0x80AE6130/EnShn_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Shn_0x80AE6130/EnShn_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Shn_0x80AE6130/EnShn_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Shn_0x80AE6130/func_80AE6CF0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Shn_0x80AE6130/func_80AE6CF0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Shn_0x80AE6130/func_80AE6D40.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Shn_0x80AE6130/func_80AE6D40.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Shn_0x80AE6130/func_80AE6D90.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Shn_0x80AE6130/func_80AE6D90.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Shn_0x80AE6130/EnShn_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Shn_0x80AE6130/EnShn_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Si/z_en_si.c b/src/overlays/actors/ovl_En_Si/z_en_si.c index 874db8936e..7cbd722abf 100644 --- a/src/overlays/actors/ovl_En_Si/z_en_si.c +++ b/src/overlays/actors/ovl_En_Si/z_en_si.c @@ -23,18 +23,18 @@ const ActorInit En_Si_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Si_0x8098CA20/func_8098CA20.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Si_0x8098CA20/func_8098CA20.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Si_0x8098CA20/func_8098CAD0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Si_0x8098CA20/func_8098CAD0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Si_0x8098CA20/func_8098CB70.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Si_0x8098CA20/func_8098CB70.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Si_0x8098CA20/func_8098CBDC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Si_0x8098CA20/func_8098CBDC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Si_0x8098CA20/EnSi_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Si_0x8098CA20/EnSi_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Si_0x8098CA20/EnSi_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Si_0x8098CA20/EnSi_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Si_0x8098CA20/EnSi_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Si_0x8098CA20/EnSi_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Si_0x8098CA20/EnSi_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Si_0x8098CA20/EnSi_Draw.asm") 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 149e814bb3..ba91b94845 100644 --- a/src/overlays/actors/ovl_En_Skb/z_en_skb.c +++ b/src/overlays/actors/ovl_En_Skb/z_en_skb.c @@ -23,110 +23,110 @@ const ActorInit En_Skb_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Skb_0x809947B0/func_809947B0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Skb_0x809947B0/func_809947B0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Skb_0x809947B0/func_8099495C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Skb_0x809947B0/func_8099495C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Skb_0x809947B0/func_809949C4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Skb_0x809947B0/func_809949C4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Skb_0x809947B0/func_80994A30.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Skb_0x809947B0/func_80994A30.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Skb_0x809947B0/func_80994A9C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Skb_0x809947B0/func_80994A9C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Skb_0x809947B0/EnSkb_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Skb_0x809947B0/EnSkb_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Skb_0x809947B0/EnSkb_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Skb_0x809947B0/EnSkb_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Skb_0x809947B0/func_80994DA8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Skb_0x809947B0/func_80994DA8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Skb_0x809947B0/func_80994E2C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Skb_0x809947B0/func_80994E2C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Skb_0x809947B0/func_80994E94.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Skb_0x809947B0/func_80994E94.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Skb_0x809947B0/func_80994F7C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Skb_0x809947B0/func_80994F7C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Skb_0x809947B0/func_8099504C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Skb_0x809947B0/func_8099504C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Skb_0x809947B0/func_80995068.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Skb_0x809947B0/func_80995068.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Skb_0x809947B0/func_80995190.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Skb_0x809947B0/func_80995190.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Skb_0x809947B0/func_80995244.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Skb_0x809947B0/func_80995244.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Skb_0x809947B0/func_809952D8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Skb_0x809947B0/func_809952D8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Skb_0x809947B0/func_8099533C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Skb_0x809947B0/func_8099533C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Skb_0x809947B0/func_809953E8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Skb_0x809947B0/func_809953E8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Skb_0x809947B0/func_8099544C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Skb_0x809947B0/func_8099544C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Skb_0x809947B0/func_809954F8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Skb_0x809947B0/func_809954F8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Skb_0x809947B0/func_8099556C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Skb_0x809947B0/func_8099556C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Skb_0x809947B0/func_8099571C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Skb_0x809947B0/func_8099571C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Skb_0x809947B0/func_80995818.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Skb_0x809947B0/func_80995818.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Skb_0x809947B0/func_809958F4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Skb_0x809947B0/func_809958F4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Skb_0x809947B0/func_8099599C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Skb_0x809947B0/func_8099599C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Skb_0x809947B0/func_80995A30.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Skb_0x809947B0/func_80995A30.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Skb_0x809947B0/func_80995A8C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Skb_0x809947B0/func_80995A8C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Skb_0x809947B0/func_80995C24.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Skb_0x809947B0/func_80995C24.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Skb_0x809947B0/func_80995C84.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Skb_0x809947B0/func_80995C84.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Skb_0x809947B0/func_80995D3C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Skb_0x809947B0/func_80995D3C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Skb_0x809947B0/func_80995DC4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Skb_0x809947B0/func_80995DC4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Skb_0x809947B0/func_80995E08.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Skb_0x809947B0/func_80995E08.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Skb_0x809947B0/func_80995E64.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Skb_0x809947B0/func_80995E64.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Skb_0x809947B0/func_80995F98.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Skb_0x809947B0/func_80995F98.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Skb_0x809947B0/func_809960AC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Skb_0x809947B0/func_809960AC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Skb_0x809947B0/func_809961E4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Skb_0x809947B0/func_809961E4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Skb_0x809947B0/func_80996284.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Skb_0x809947B0/func_80996284.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Skb_0x809947B0/func_809962D4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Skb_0x809947B0/func_809962D4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Skb_0x809947B0/func_8099630C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Skb_0x809947B0/func_8099630C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Skb_0x809947B0/func_809963C4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Skb_0x809947B0/func_809963C4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Skb_0x809947B0/func_809963D8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Skb_0x809947B0/func_809963D8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Skb_0x809947B0/func_80996474.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Skb_0x809947B0/func_80996474.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Skb_0x809947B0/func_809964A0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Skb_0x809947B0/func_809964A0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Skb_0x809947B0/func_809964DC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Skb_0x809947B0/func_809964DC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Skb_0x809947B0/func_80996544.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Skb_0x809947B0/func_80996544.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Skb_0x809947B0/func_80996594.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Skb_0x809947B0/func_80996594.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Skb_0x809947B0/func_8099672C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Skb_0x809947B0/func_8099672C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Skb_0x809947B0/func_80996AD0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Skb_0x809947B0/func_80996AD0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Skb_0x809947B0/func_80996BEC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Skb_0x809947B0/func_80996BEC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Skb_0x809947B0/func_80996D68.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Skb_0x809947B0/func_80996D68.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Skb_0x809947B0/EnSkb_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Skb_0x809947B0/EnSkb_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Skb_0x809947B0/func_80996F78.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Skb_0x809947B0/func_80996F78.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Skb_0x809947B0/func_809970D0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Skb_0x809947B0/func_809970D0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Skb_0x809947B0/EnSkb_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Skb_0x809947B0/EnSkb_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Slime/z_en_slime.c b/src/overlays/actors/ovl_En_Slime/z_en_slime.c index 69248e71cf..5252663bba 100644 --- a/src/overlays/actors/ovl_En_Slime/z_en_slime.c +++ b/src/overlays/actors/ovl_En_Slime/z_en_slime.c @@ -23,84 +23,84 @@ const ActorInit En_Slime_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Slime_0x80A2EDA0/EnSlime_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Slime_0x80A2EDA0/EnSlime_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Slime_0x80A2EDA0/EnSlime_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Slime_0x80A2EDA0/EnSlime_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Slime_0x80A2EDA0/func_80A2EFAC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Slime_0x80A2EDA0/func_80A2EFAC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Slime_0x80A2EDA0/func_80A2F028.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Slime_0x80A2EDA0/func_80A2F028.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Slime_0x80A2EDA0/func_80A2F0A8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Slime_0x80A2EDA0/func_80A2F0A8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Slime_0x80A2EDA0/func_80A2F110.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Slime_0x80A2EDA0/func_80A2F110.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Slime_0x80A2EDA0/func_80A2F140.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Slime_0x80A2EDA0/func_80A2F140.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Slime_0x80A2EDA0/func_80A2F180.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Slime_0x80A2EDA0/func_80A2F180.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Slime_0x80A2EDA0/func_80A2F1A4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Slime_0x80A2EDA0/func_80A2F1A4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Slime_0x80A2EDA0/func_80A2F354.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Slime_0x80A2EDA0/func_80A2F354.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Slime_0x80A2EDA0/func_80A2F418.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Slime_0x80A2EDA0/func_80A2F418.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Slime_0x80A2EDA0/func_80A2F684.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Slime_0x80A2EDA0/func_80A2F684.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Slime_0x80A2EDA0/func_80A2F6CC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Slime_0x80A2EDA0/func_80A2F6CC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Slime_0x80A2EDA0/func_80A2F8B4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Slime_0x80A2EDA0/func_80A2F8B4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Slime_0x80A2EDA0/func_80A2F8E0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Slime_0x80A2EDA0/func_80A2F8E0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Slime_0x80A2EDA0/func_80A2F9A0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Slime_0x80A2EDA0/func_80A2F9A0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Slime_0x80A2EDA0/func_80A2FA88.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Slime_0x80A2EDA0/func_80A2FA88.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Slime_0x80A2EDA0/func_80A2FB60.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Slime_0x80A2EDA0/func_80A2FB60.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Slime_0x80A2EDA0/func_80A2FBA0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Slime_0x80A2EDA0/func_80A2FBA0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Slime_0x80A2EDA0/func_80A2FD94.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Slime_0x80A2EDA0/func_80A2FD94.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Slime_0x80A2EDA0/func_80A2FE38.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Slime_0x80A2EDA0/func_80A2FE38.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Slime_0x80A2EDA0/func_80A30018.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Slime_0x80A2EDA0/func_80A30018.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Slime_0x80A2EDA0/func_80A30344.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Slime_0x80A2EDA0/func_80A30344.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Slime_0x80A2EDA0/func_80A30454.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Slime_0x80A2EDA0/func_80A30454.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Slime_0x80A2EDA0/func_80A304B8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Slime_0x80A2EDA0/func_80A304B8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Slime_0x80A2EDA0/func_80A3072C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Slime_0x80A2EDA0/func_80A3072C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Slime_0x80A2EDA0/func_80A30778.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Slime_0x80A2EDA0/func_80A30778.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Slime_0x80A2EDA0/func_80A30820.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Slime_0x80A2EDA0/func_80A30820.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Slime_0x80A2EDA0/func_80A30924.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Slime_0x80A2EDA0/func_80A30924.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Slime_0x80A2EDA0/func_80A30944.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Slime_0x80A2EDA0/func_80A30944.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Slime_0x80A2EDA0/func_80A309C8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Slime_0x80A2EDA0/func_80A309C8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Slime_0x80A2EDA0/func_80A30A20.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Slime_0x80A2EDA0/func_80A30A20.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Slime_0x80A2EDA0/func_80A30A90.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Slime_0x80A2EDA0/func_80A30A90.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Slime_0x80A2EDA0/func_80A30AE4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Slime_0x80A2EDA0/func_80A30AE4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Slime_0x80A2EDA0/func_80A30BE0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Slime_0x80A2EDA0/func_80A30BE0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Slime_0x80A2EDA0/func_80A30C2C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Slime_0x80A2EDA0/func_80A30C2C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Slime_0x80A2EDA0/func_80A30C68.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Slime_0x80A2EDA0/func_80A30C68.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Slime_0x80A2EDA0/func_80A30CEC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Slime_0x80A2EDA0/func_80A30CEC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Slime_0x80A2EDA0/func_80A30F98.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Slime_0x80A2EDA0/func_80A30F98.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Slime_0x80A2EDA0/EnSlime_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Slime_0x80A2EDA0/EnSlime_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Slime_0x80A2EDA0/EnSlime_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Slime_0x80A2EDA0/EnSlime_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Snowman/z_en_snowman.c b/src/overlays/actors/ovl_En_Snowman/z_en_snowman.c index 6a70e6cd41..8e1bfc725e 100644 --- a/src/overlays/actors/ovl_En_Snowman/z_en_snowman.c +++ b/src/overlays/actors/ovl_En_Snowman/z_en_snowman.c @@ -23,80 +23,80 @@ const ActorInit En_Snowman_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Snowman_0x80B16B00/EnSnowman_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Snowman_0x80B16B00/EnSnowman_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Snowman_0x80B16B00/EnSnowman_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Snowman_0x80B16B00/EnSnowman_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Snowman_0x80B16B00/func_80B16FC0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Snowman_0x80B16B00/func_80B16FC0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Snowman_0x80B16B00/func_80B17144.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Snowman_0x80B16B00/func_80B17144.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Snowman_0x80B16B00/func_80B173D0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Snowman_0x80B16B00/func_80B173D0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Snowman_0x80B16B00/func_80B1746C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Snowman_0x80B16B00/func_80B1746C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Snowman_0x80B16B00/func_80B177EC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Snowman_0x80B16B00/func_80B177EC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Snowman_0x80B16B00/func_80B178B8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Snowman_0x80B16B00/func_80B178B8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Snowman_0x80B16B00/func_80B179D0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Snowman_0x80B16B00/func_80B179D0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Snowman_0x80B16B00/func_80B17A58.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Snowman_0x80B16B00/func_80B17A58.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Snowman_0x80B16B00/func_80B17CE8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Snowman_0x80B16B00/func_80B17CE8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Snowman_0x80B16B00/func_80B17D78.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Snowman_0x80B16B00/func_80B17D78.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Snowman_0x80B16B00/func_80B17EB4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Snowman_0x80B16B00/func_80B17EB4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Snowman_0x80B16B00/func_80B17EFC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Snowman_0x80B16B00/func_80B17EFC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Snowman_0x80B16B00/func_80B17F4C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Snowman_0x80B16B00/func_80B17F4C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Snowman_0x80B16B00/func_80B17FE0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Snowman_0x80B16B00/func_80B17FE0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Snowman_0x80B16B00/func_80B180A4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Snowman_0x80B16B00/func_80B180A4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Snowman_0x80B16B00/func_80B18124.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Snowman_0x80B16B00/func_80B18124.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Snowman_0x80B16B00/func_80B18380.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Snowman_0x80B16B00/func_80B18380.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Snowman_0x80B16B00/func_80B183A4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Snowman_0x80B16B00/func_80B183A4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Snowman_0x80B16B00/func_80B183C4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Snowman_0x80B16B00/func_80B183C4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Snowman_0x80B16B00/func_80B1848C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Snowman_0x80B16B00/func_80B1848C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Snowman_0x80B16B00/func_80B18600.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Snowman_0x80B16B00/func_80B18600.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Snowman_0x80B16B00/func_80B1861C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Snowman_0x80B16B00/func_80B1861C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Snowman_0x80B16B00/func_80B18908.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Snowman_0x80B16B00/func_80B18908.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Snowman_0x80B16B00/func_80B189C4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Snowman_0x80B16B00/func_80B189C4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Snowman_0x80B16B00/func_80B189D4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Snowman_0x80B16B00/func_80B189D4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Snowman_0x80B16B00/func_80B18A04.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Snowman_0x80B16B00/func_80B18A04.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Snowman_0x80B16B00/func_80B18A28.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Snowman_0x80B16B00/func_80B18A28.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Snowman_0x80B16B00/func_80B18B30.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Snowman_0x80B16B00/func_80B18B30.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Snowman_0x80B16B00/func_80B18BB4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Snowman_0x80B16B00/func_80B18BB4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Snowman_0x80B16B00/func_80B18C7C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Snowman_0x80B16B00/func_80B18C7C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Snowman_0x80B16B00/func_80B18F50.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Snowman_0x80B16B00/func_80B18F50.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Snowman_0x80B16B00/EnSnowman_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Snowman_0x80B16B00/EnSnowman_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Snowman_0x80B16B00/func_80B19474.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Snowman_0x80B16B00/func_80B19474.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Snowman_0x80B16B00/func_80B19718.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Snowman_0x80B16B00/func_80B19718.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Snowman_0x80B16B00/EnSnowman_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Snowman_0x80B16B00/EnSnowman_Draw.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Snowman_0x80B16B00/func_80B19948.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Snowman_0x80B16B00/func_80B19948.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Snowman_0x80B16B00/func_80B19998.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Snowman_0x80B16B00/func_80B19998.asm") diff --git a/src/overlays/actors/ovl_En_Snowwd/z_en_snowwd.c b/src/overlays/actors/ovl_En_Snowwd/z_en_snowwd.c index 3b74ea7e56..51d3042cf6 100644 --- a/src/overlays/actors/ovl_En_Snowwd/z_en_snowwd.c +++ b/src/overlays/actors/ovl_En_Snowwd/z_en_snowwd.c @@ -23,12 +23,12 @@ const ActorInit En_Snowwd_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Snowwd_0x80AF7640/EnSnowwd_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Snowwd_0x80AF7640/EnSnowwd_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Snowwd_0x80AF7640/EnSnowwd_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Snowwd_0x80AF7640/EnSnowwd_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Snowwd_0x80AF7640/func_80AF76F0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Snowwd_0x80AF7640/func_80AF76F0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Snowwd_0x80AF7640/EnSnowwd_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Snowwd_0x80AF7640/EnSnowwd_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Snowwd_0x80AF7640/EnSnowwd_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Snowwd_0x80AF7640/EnSnowwd_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Sob1/z_en_sob1.c b/src/overlays/actors/ovl_En_Sob1/z_en_sob1.c index 95b6b95331..3ecaaa9dff 100644 --- a/src/overlays/actors/ovl_En_Sob1/z_en_sob1.c +++ b/src/overlays/actors/ovl_En_Sob1/z_en_sob1.c @@ -22,154 +22,154 @@ const ActorInit En_Sob1_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sob1_0x80A0C810/func_80A0C810.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sob1_0x80A0C810/func_80A0C810.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sob1_0x80A0C810/func_80A0C8AC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sob1_0x80A0C810/func_80A0C8AC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sob1_0x80A0C810/func_80A0C8B8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sob1_0x80A0C810/func_80A0C8B8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sob1_0x80A0C810/func_80A0C938.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sob1_0x80A0C810/func_80A0C938.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sob1_0x80A0C810/func_80A0CA38.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sob1_0x80A0C810/func_80A0CA38.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sob1_0x80A0C810/func_80A0CC88.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sob1_0x80A0C810/func_80A0CC88.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sob1_0x80A0C810/func_80A0CCEC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sob1_0x80A0C810/func_80A0CCEC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sob1_0x80A0C810/func_80A0CD48.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sob1_0x80A0C810/func_80A0CD48.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sob1_0x80A0C810/func_80A0CE10.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sob1_0x80A0C810/func_80A0CE10.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sob1_0x80A0C810/EnSob1_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sob1_0x80A0C810/EnSob1_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sob1_0x80A0C810/EnSob1_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sob1_0x80A0C810/EnSob1_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sob1_0x80A0C810/func_80A0D034.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sob1_0x80A0C810/func_80A0D034.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sob1_0x80A0C810/func_80A0D0B8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sob1_0x80A0C810/func_80A0D0B8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sob1_0x80A0C810/func_80A0D188.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sob1_0x80A0C810/func_80A0D188.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sob1_0x80A0C810/func_80A0D1F4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sob1_0x80A0C810/func_80A0D1F4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sob1_0x80A0C810/func_80A0D258.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sob1_0x80A0C810/func_80A0D258.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sob1_0x80A0C810/func_80A0D2B8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sob1_0x80A0C810/func_80A0D2B8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sob1_0x80A0C810/func_80A0D320.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sob1_0x80A0C810/func_80A0D320.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sob1_0x80A0C810/func_80A0D388.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sob1_0x80A0C810/func_80A0D388.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sob1_0x80A0C810/func_80A0D3C4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sob1_0x80A0C810/func_80A0D3C4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sob1_0x80A0C810/func_80A0D414.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sob1_0x80A0C810/func_80A0D414.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sob1_0x80A0C810/func_80A0D4A0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sob1_0x80A0C810/func_80A0D4A0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sob1_0x80A0C810/func_80A0D628.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sob1_0x80A0C810/func_80A0D628.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sob1_0x80A0C810/func_80A0D74C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sob1_0x80A0C810/func_80A0D74C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sob1_0x80A0C810/func_80A0D77C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sob1_0x80A0C810/func_80A0D77C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sob1_0x80A0C810/func_80A0D850.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sob1_0x80A0C810/func_80A0D850.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sob1_0x80A0C810/func_80A0D904.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sob1_0x80A0C810/func_80A0D904.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sob1_0x80A0C810/func_80A0DA5C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sob1_0x80A0C810/func_80A0DA5C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sob1_0x80A0C810/func_80A0DAAC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sob1_0x80A0C810/func_80A0DAAC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sob1_0x80A0C810/func_80A0DB78.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sob1_0x80A0C810/func_80A0DB78.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sob1_0x80A0C810/func_80A0DCC4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sob1_0x80A0C810/func_80A0DCC4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sob1_0x80A0C810/func_80A0DD40.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sob1_0x80A0C810/func_80A0DD40.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sob1_0x80A0C810/func_80A0DE64.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sob1_0x80A0C810/func_80A0DE64.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sob1_0x80A0C810/func_80A0DFD0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sob1_0x80A0C810/func_80A0DFD0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sob1_0x80A0C810/func_80A0E0C0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sob1_0x80A0C810/func_80A0E0C0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sob1_0x80A0C810/func_80A0E1B8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sob1_0x80A0C810/func_80A0E1B8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sob1_0x80A0C810/func_80A0E258.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sob1_0x80A0C810/func_80A0E258.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sob1_0x80A0C810/func_80A0E330.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sob1_0x80A0C810/func_80A0E330.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sob1_0x80A0C810/func_80A0E420.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sob1_0x80A0C810/func_80A0E420.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sob1_0x80A0C810/func_80A0E4DC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sob1_0x80A0C810/func_80A0E4DC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sob1_0x80A0C810/func_80A0E518.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sob1_0x80A0C810/func_80A0E518.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sob1_0x80A0C810/func_80A0E554.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sob1_0x80A0C810/func_80A0E554.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sob1_0x80A0C810/func_80A0E884.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sob1_0x80A0C810/func_80A0E884.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sob1_0x80A0C810/func_80A0E96C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sob1_0x80A0C810/func_80A0E96C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sob1_0x80A0C810/func_80A0E9E0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sob1_0x80A0C810/func_80A0E9E0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sob1_0x80A0C810/func_80A0EA84.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sob1_0x80A0C810/func_80A0EA84.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sob1_0x80A0C810/func_80A0EAF8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sob1_0x80A0C810/func_80A0EAF8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sob1_0x80A0C810/func_80A0EBC0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sob1_0x80A0C810/func_80A0EBC0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sob1_0x80A0C810/func_80A0EC98.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sob1_0x80A0C810/func_80A0EC98.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sob1_0x80A0C810/func_80A0ED7C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sob1_0x80A0C810/func_80A0ED7C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sob1_0x80A0C810/func_80A0EDA0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sob1_0x80A0C810/func_80A0EDA0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sob1_0x80A0C810/func_80A0EE3C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sob1_0x80A0C810/func_80A0EE3C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sob1_0x80A0C810/func_80A0EEC8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sob1_0x80A0C810/func_80A0EEC8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sob1_0x80A0C810/func_80A0EF48.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sob1_0x80A0C810/func_80A0EF48.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sob1_0x80A0C810/func_80A0F014.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sob1_0x80A0C810/func_80A0F014.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sob1_0x80A0C810/func_80A0F1C4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sob1_0x80A0C810/func_80A0F1C4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sob1_0x80A0C810/func_80A0F284.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sob1_0x80A0C810/func_80A0F284.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sob1_0x80A0C810/func_80A0F2C8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sob1_0x80A0C810/func_80A0F2C8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sob1_0x80A0C810/func_80A0F2FC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sob1_0x80A0C810/func_80A0F2FC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sob1_0x80A0C810/func_80A0F39C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sob1_0x80A0C810/func_80A0F39C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sob1_0x80A0C810/func_80A0F3D4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sob1_0x80A0C810/func_80A0F3D4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sob1_0x80A0C810/func_80A0F470.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sob1_0x80A0C810/func_80A0F470.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sob1_0x80A0C810/func_80A0F554.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sob1_0x80A0C810/func_80A0F554.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sob1_0x80A0C810/func_80A0F638.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sob1_0x80A0C810/func_80A0F638.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sob1_0x80A0C810/func_80A0F6B0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sob1_0x80A0C810/func_80A0F6B0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sob1_0x80A0C810/EnSob1_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sob1_0x80A0C810/EnSob1_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sob1_0x80A0C810/func_80A0FADC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sob1_0x80A0C810/func_80A0FADC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sob1_0x80A0C810/func_80A0FD4C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sob1_0x80A0C810/func_80A0FD4C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sob1_0x80A0C810/func_80A0FEE8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sob1_0x80A0C810/func_80A0FEE8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sob1_0x80A0C810/func_80A10290.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sob1_0x80A0C810/func_80A10290.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sob1_0x80A0C810/func_80A102C8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sob1_0x80A0C810/func_80A102C8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sob1_0x80A0C810/func_80A10308.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sob1_0x80A0C810/func_80A10308.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sob1_0x80A0C810/func_80A10344.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sob1_0x80A0C810/func_80A10344.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sob1_0x80A0C810/func_80A10368.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sob1_0x80A0C810/func_80A10368.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sob1_0x80A0C810/func_80A104E4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sob1_0x80A0C810/func_80A104E4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sob1_0x80A0C810/func_80A10608.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sob1_0x80A0C810/func_80A10608.asm") 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 f32d9743f0..a6074e4088 100644 --- a/src/overlays/actors/ovl_En_Ssh/z_en_ssh.c +++ b/src/overlays/actors/ovl_En_Ssh/z_en_ssh.c @@ -23,96 +23,96 @@ const ActorInit En_Ssh_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ssh_0x80973EF0/func_80973EF0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ssh_0x80973EF0/func_80973EF0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ssh_0x80973EF0/func_80973EFC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ssh_0x80973EF0/func_80973EFC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ssh_0x80973EF0/func_80973F84.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ssh_0x80973EF0/func_80973F84.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ssh_0x80973EF0/func_80974080.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ssh_0x80973EF0/func_80974080.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ssh_0x80973EF0/func_80974118.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ssh_0x80973EF0/func_80974118.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ssh_0x80973EF0/func_80974220.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ssh_0x80973EF0/func_80974220.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ssh_0x80973EF0/func_8097424C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ssh_0x80973EF0/func_8097424C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ssh_0x80973EF0/func_80974374.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ssh_0x80973EF0/func_80974374.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ssh_0x80973EF0/func_809744A8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ssh_0x80973EF0/func_809744A8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ssh_0x80973EF0/func_809744C8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ssh_0x80973EF0/func_809744C8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ssh_0x80973EF0/func_809744FC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ssh_0x80973EF0/func_809744FC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ssh_0x80973EF0/func_80974540.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ssh_0x80973EF0/func_80974540.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ssh_0x80973EF0/func_80974590.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ssh_0x80973EF0/func_80974590.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ssh_0x80973EF0/func_809745BC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ssh_0x80973EF0/func_809745BC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ssh_0x80973EF0/func_80974730.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ssh_0x80973EF0/func_80974730.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ssh_0x80973EF0/func_8097480C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ssh_0x80973EF0/func_8097480C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ssh_0x80973EF0/func_809748DC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ssh_0x80973EF0/func_809748DC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ssh_0x80973EF0/func_8097497C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ssh_0x80973EF0/func_8097497C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ssh_0x80973EF0/func_809749B8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ssh_0x80973EF0/func_809749B8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ssh_0x80973EF0/func_80974A24.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ssh_0x80973EF0/func_80974A24.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ssh_0x80973EF0/func_80974B0C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ssh_0x80973EF0/func_80974B0C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ssh_0x80973EF0/func_80974B44.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ssh_0x80973EF0/func_80974B44.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ssh_0x80973EF0/func_80974B84.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ssh_0x80973EF0/func_80974B84.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ssh_0x80973EF0/func_80974CC8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ssh_0x80973EF0/func_80974CC8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ssh_0x80973EF0/func_80974D3C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ssh_0x80973EF0/func_80974D3C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ssh_0x80973EF0/func_80974E44.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ssh_0x80973EF0/func_80974E44.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ssh_0x80973EF0/func_80974EA0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ssh_0x80973EF0/func_80974EA0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ssh_0x80973EF0/func_80974F78.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ssh_0x80973EF0/func_80974F78.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ssh_0x80973EF0/func_8097502C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ssh_0x80973EF0/func_8097502C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ssh_0x80973EF0/func_80975070.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ssh_0x80973EF0/func_80975070.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ssh_0x80973EF0/func_80975128.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ssh_0x80973EF0/func_80975128.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ssh_0x80973EF0/func_80975300.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ssh_0x80973EF0/func_80975300.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ssh_0x80973EF0/EnSsh_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ssh_0x80973EF0/EnSsh_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ssh_0x80973EF0/EnSsh_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ssh_0x80973EF0/EnSsh_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ssh_0x80973EF0/func_809755C0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ssh_0x80973EF0/func_809755C0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ssh_0x80973EF0/func_8097561C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ssh_0x80973EF0/func_8097561C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ssh_0x80973EF0/func_809756D0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ssh_0x80973EF0/func_809756D0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ssh_0x80973EF0/func_80975720.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ssh_0x80973EF0/func_80975720.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ssh_0x80973EF0/func_809758B0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ssh_0x80973EF0/func_809758B0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ssh_0x80973EF0/func_80975998.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ssh_0x80973EF0/func_80975998.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ssh_0x80973EF0/func_80975A98.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ssh_0x80973EF0/func_80975A98.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ssh_0x80973EF0/func_80975B6C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ssh_0x80973EF0/func_80975B6C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ssh_0x80973EF0/func_80975C14.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ssh_0x80973EF0/func_80975C14.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ssh_0x80973EF0/EnSsh_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ssh_0x80973EF0/EnSsh_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ssh_0x80973EF0/func_80975DBC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ssh_0x80973EF0/func_80975DBC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ssh_0x80973EF0/func_80975EB8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ssh_0x80973EF0/func_80975EB8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Ssh_0x80973EF0/EnSsh_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ssh_0x80973EF0/EnSsh_Draw.asm") 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 284ef7d6d3..e947e73cc2 100644 --- a/src/overlays/actors/ovl_En_St/z_en_st.c +++ b/src/overlays/actors/ovl_En_St/z_en_st.c @@ -22,62 +22,62 @@ const ActorInit En_St_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_St_0x808A5050/func_808A5050.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_St_0x808A5050/func_808A5050.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_St_0x808A5050/func_808A52A8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_St_0x808A5050/func_808A52A8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_St_0x808A5050/func_808A54B0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_St_0x808A5050/func_808A54B0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_St_0x808A5050/func_808A576C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_St_0x808A5050/func_808A576C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_St_0x808A5050/func_808A5988.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_St_0x808A5050/func_808A5988.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_St_0x808A5050/func_808A5AF8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_St_0x808A5050/func_808A5AF8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_St_0x808A5050/func_808A5BEC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_St_0x808A5050/func_808A5BEC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_St_0x808A5050/func_808A5CCC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_St_0x808A5050/func_808A5CCC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_St_0x808A5050/func_808A5D7C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_St_0x808A5050/func_808A5D7C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_St_0x808A5050/func_808A5DCC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_St_0x808A5050/func_808A5DCC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_St_0x808A5050/func_808A5F28.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_St_0x808A5050/func_808A5F28.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_St_0x808A5050/func_808A6064.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_St_0x808A5050/func_808A6064.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_St_0x808A5050/func_808A60E0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_St_0x808A5050/func_808A60E0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_St_0x808A5050/func_808A61F4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_St_0x808A5050/func_808A61F4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_St_0x808A5050/func_808A6220.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_St_0x808A5050/func_808A6220.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_St_0x808A5050/func_808A63E8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_St_0x808A5050/func_808A63E8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_St_0x808A5050/func_808A6468.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_St_0x808A5050/func_808A6468.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_St_0x808A5050/func_808A650C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_St_0x808A5050/func_808A650C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_St_0x808A5050/func_808A6580.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_St_0x808A5050/func_808A6580.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_St_0x808A5050/func_808A6A3C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_St_0x808A5050/func_808A6A3C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_St_0x808A5050/func_808A6A78.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_St_0x808A5050/func_808A6A78.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_St_0x808A5050/func_808A6C04.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_St_0x808A5050/func_808A6C04.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_St_0x808A5050/func_808A6D84.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_St_0x808A5050/func_808A6D84.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_St_0x808A5050/func_808A6E24.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_St_0x808A5050/func_808A6E24.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_St_0x808A5050/func_808A701C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_St_0x808A5050/func_808A701C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_St_0x808A5050/EnSt_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_St_0x808A5050/EnSt_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_St_0x808A5050/EnSt_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_St_0x808A5050/EnSt_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_St_0x808A5050/EnSt_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_St_0x808A5050/EnSt_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_St_0x808A5050/func_808A73E8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_St_0x808A5050/func_808A73E8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_St_0x808A5050/func_808A7478.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_St_0x808A5050/func_808A7478.asm") 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 9fea92db6b..3b7aa51069 100644 --- a/src/overlays/actors/ovl_En_Sth/z_en_sth.c +++ b/src/overlays/actors/ovl_En_Sth/z_en_sth.c @@ -22,54 +22,54 @@ const ActorInit En_Sth_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sth_0x80B66D30/EnSth_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sth_0x80B66D30/EnSth_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sth_0x80B66D30/EnSth_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sth_0x80B66D30/EnSth_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sth_0x80B66D30/func_80B6703C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sth_0x80B66D30/func_80B6703C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sth_0x80B66D30/func_80B670A4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sth_0x80B66D30/func_80B670A4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sth_0x80B66D30/func_80B67148.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sth_0x80B66D30/func_80B67148.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sth_0x80B66D30/func_80B671A0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sth_0x80B66D30/func_80B671A0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sth_0x80B66D30/func_80B67208.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sth_0x80B66D30/func_80B67208.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sth_0x80B66D30/func_80B672A4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sth_0x80B66D30/func_80B672A4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sth_0x80B66D30/func_80B67348.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sth_0x80B66D30/func_80B67348.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sth_0x80B66D30/func_80B67458.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sth_0x80B66D30/func_80B67458.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sth_0x80B66D30/func_80B67540.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sth_0x80B66D30/func_80B67540.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sth_0x80B66D30/func_80B677BC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sth_0x80B66D30/func_80B677BC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sth_0x80B66D30/func_80B67838.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sth_0x80B66D30/func_80B67838.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sth_0x80B66D30/func_80B678A8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sth_0x80B66D30/func_80B678A8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sth_0x80B66D30/func_80B67958.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sth_0x80B66D30/func_80B67958.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sth_0x80B66D30/func_80B67984.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sth_0x80B66D30/func_80B67984.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sth_0x80B66D30/func_80B67AB4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sth_0x80B66D30/func_80B67AB4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sth_0x80B66D30/func_80B67B50.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sth_0x80B66D30/func_80B67B50.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sth_0x80B66D30/func_80B67C1C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sth_0x80B66D30/func_80B67C1C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sth_0x80B66D30/func_80B67DA0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sth_0x80B66D30/func_80B67DA0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sth_0x80B66D30/func_80B67E20.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sth_0x80B66D30/func_80B67E20.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sth_0x80B66D30/EnSth_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sth_0x80B66D30/EnSth_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sth_0x80B66D30/func_80B680A8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sth_0x80B66D30/func_80B680A8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sth_0x80B66D30/func_80B681E8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sth_0x80B66D30/func_80B681E8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sth_0x80B66D30/func_80B68310.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sth_0x80B66D30/func_80B68310.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sth_0x80B66D30/func_80B6849C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sth_0x80B66D30/func_80B6849C.asm") diff --git a/src/overlays/actors/ovl_En_Sth2/z_en_sth2.c b/src/overlays/actors/ovl_En_Sth2/z_en_sth2.c index 7941035ade..9ae9149c4c 100644 --- a/src/overlays/actors/ovl_En_Sth2/z_en_sth2.c +++ b/src/overlays/actors/ovl_En_Sth2/z_en_sth2.c @@ -22,18 +22,18 @@ const ActorInit En_Sth2_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sth2_0x80BF74E0/EnSth2_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sth2_0x80BF74E0/EnSth2_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sth2_0x80BF74E0/EnSth2_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sth2_0x80BF74E0/EnSth2_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sth2_0x80BF74E0/func_80BF75A0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sth2_0x80BF74E0/func_80BF75A0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sth2_0x80BF74E0/EnSth2_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sth2_0x80BF74E0/EnSth2_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sth2_0x80BF74E0/func_80BF7688.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sth2_0x80BF74E0/func_80BF7688.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sth2_0x80BF74E0/func_80BF76AC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sth2_0x80BF74E0/func_80BF76AC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sth2_0x80BF74E0/func_80BF77AC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sth2_0x80BF74E0/func_80BF77AC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sth2_0x80BF74E0/func_80BF7814.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sth2_0x80BF74E0/func_80BF7814.asm") diff --git a/src/overlays/actors/ovl_En_Stone_heishi/z_en_stone_heishi.c b/src/overlays/actors/ovl_En_Stone_heishi/z_en_stone_heishi.c index d8b17e98a9..e7ba9b9d3c 100644 --- a/src/overlays/actors/ovl_En_Stone_heishi/z_en_stone_heishi.c +++ b/src/overlays/actors/ovl_En_Stone_heishi/z_en_stone_heishi.c @@ -23,40 +23,40 @@ const ActorInit En_Stone_heishi_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Stone_heishi_0x80BC9270/EnStoneheishi_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Stone_heishi_0x80BC9270/EnStoneheishi_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Stone_heishi_0x80BC9270/EnStoneheishi_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Stone_heishi_0x80BC9270/EnStoneheishi_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Stone_heishi_0x80BC9270/func_80BC935C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Stone_heishi_0x80BC9270/func_80BC935C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Stone_heishi_0x80BC9270/func_80BC941C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Stone_heishi_0x80BC9270/func_80BC941C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Stone_heishi_0x80BC9270/func_80BC94B0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Stone_heishi_0x80BC9270/func_80BC94B0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Stone_heishi_0x80BC9270/func_80BC9560.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Stone_heishi_0x80BC9270/func_80BC9560.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Stone_heishi_0x80BC9270/func_80BC9660.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Stone_heishi_0x80BC9270/func_80BC9660.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Stone_heishi_0x80BC9270/func_80BC9680.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Stone_heishi_0x80BC9270/func_80BC9680.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Stone_heishi_0x80BC9270/func_80BC98EC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Stone_heishi_0x80BC9270/func_80BC98EC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Stone_heishi_0x80BC9270/func_80BC9908.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Stone_heishi_0x80BC9270/func_80BC9908.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Stone_heishi_0x80BC9270/func_80BC9A10.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Stone_heishi_0x80BC9270/func_80BC9A10.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Stone_heishi_0x80BC9270/func_80BC9A2C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Stone_heishi_0x80BC9270/func_80BC9A2C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Stone_heishi_0x80BC9270/func_80BC9C88.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Stone_heishi_0x80BC9270/func_80BC9C88.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Stone_heishi_0x80BC9270/func_80BC9D28.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Stone_heishi_0x80BC9270/func_80BC9D28.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Stone_heishi_0x80BC9270/func_80BC9E50.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Stone_heishi_0x80BC9270/func_80BC9E50.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Stone_heishi_0x80BC9270/EnStoneheishi_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Stone_heishi_0x80BC9270/EnStoneheishi_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Stone_heishi_0x80BC9270/func_80BCA0AC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Stone_heishi_0x80BC9270/func_80BCA0AC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Stone_heishi_0x80BC9270/func_80BCA104.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Stone_heishi_0x80BC9270/func_80BCA104.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Stone_heishi_0x80BC9270/EnStoneheishi_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Stone_heishi_0x80BC9270/EnStoneheishi_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Stop_heishi/z_en_stop_heishi.c b/src/overlays/actors/ovl_En_Stop_heishi/z_en_stop_heishi.c index 8265210088..dd382e6f3e 100644 --- a/src/overlays/actors/ovl_En_Stop_heishi/z_en_stop_heishi.c +++ b/src/overlays/actors/ovl_En_Stop_heishi/z_en_stop_heishi.c @@ -23,32 +23,32 @@ const ActorInit En_Stop_heishi_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Stop_heishi_0x80AE73A0/EnStopheishi_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Stop_heishi_0x80AE73A0/EnStopheishi_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Stop_heishi_0x80AE73A0/EnStopheishi_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Stop_heishi_0x80AE73A0/EnStopheishi_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Stop_heishi_0x80AE73A0/func_80AE750C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Stop_heishi_0x80AE73A0/func_80AE750C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Stop_heishi_0x80AE73A0/func_80AE75C8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Stop_heishi_0x80AE73A0/func_80AE75C8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Stop_heishi_0x80AE73A0/func_80AE7718.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Stop_heishi_0x80AE73A0/func_80AE7718.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Stop_heishi_0x80AE73A0/func_80AE77D4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Stop_heishi_0x80AE73A0/func_80AE77D4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Stop_heishi_0x80AE73A0/func_80AE795C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Stop_heishi_0x80AE73A0/func_80AE795C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Stop_heishi_0x80AE73A0/func_80AE7E9C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Stop_heishi_0x80AE73A0/func_80AE7E9C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Stop_heishi_0x80AE73A0/func_80AE7F34.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Stop_heishi_0x80AE73A0/func_80AE7F34.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Stop_heishi_0x80AE73A0/func_80AE854C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Stop_heishi_0x80AE73A0/func_80AE854C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Stop_heishi_0x80AE73A0/func_80AE85C4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Stop_heishi_0x80AE73A0/func_80AE85C4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Stop_heishi_0x80AE73A0/EnStopheishi_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Stop_heishi_0x80AE73A0/EnStopheishi_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Stop_heishi_0x80AE73A0/func_80AE87A4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Stop_heishi_0x80AE73A0/func_80AE87A4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Stop_heishi_0x80AE73A0/func_80AE87EC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Stop_heishi_0x80AE73A0/func_80AE87EC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Stop_heishi_0x80AE73A0/EnStopheishi_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Stop_heishi_0x80AE73A0/EnStopheishi_Draw.asm") 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 7cd9f7f638..34e43153bd 100644 --- a/src/overlays/actors/ovl_En_Stream/z_en_stream.c +++ b/src/overlays/actors/ovl_En_Stream/z_en_stream.c @@ -23,18 +23,18 @@ const ActorInit En_Stream_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Stream_0x80965650/func_80965650.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Stream_0x80965650/func_80965650.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Stream_0x80965650/EnStream_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Stream_0x80965650/EnStream_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Stream_0x80965650/EnStream_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Stream_0x80965650/EnStream_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Stream_0x80965650/func_809656D4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Stream_0x80965650/func_809656D4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Stream_0x80965650/func_809657F4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Stream_0x80965650/func_809657F4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Stream_0x80965650/func_8096597C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Stream_0x80965650/func_8096597C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Stream_0x80965650/EnStream_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Stream_0x80965650/EnStream_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Stream_0x80965650/EnStream_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Stream_0x80965650/EnStream_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Suttari/z_en_suttari.c b/src/overlays/actors/ovl_En_Suttari/z_en_suttari.c index a7c287e6b3..55bf32142e 100644 --- a/src/overlays/actors/ovl_En_Suttari/z_en_suttari.c +++ b/src/overlays/actors/ovl_En_Suttari/z_en_suttari.c @@ -23,108 +23,108 @@ const ActorInit En_Suttari_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Suttari_0x80BAA6D0/func_80BAA6D0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Suttari_0x80BAA6D0/func_80BAA6D0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Suttari_0x80BAA6D0/func_80BAA848.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Suttari_0x80BAA6D0/func_80BAA848.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Suttari_0x80BAA6D0/func_80BAA88C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Suttari_0x80BAA6D0/func_80BAA88C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Suttari_0x80BAA6D0/func_80BAA8D0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Suttari_0x80BAA6D0/func_80BAA8D0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Suttari_0x80BAA6D0/func_80BAA904.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Suttari_0x80BAA6D0/func_80BAA904.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Suttari_0x80BAA6D0/func_80BAA9B4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Suttari_0x80BAA6D0/func_80BAA9B4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Suttari_0x80BAA6D0/func_80BAAA94.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Suttari_0x80BAA6D0/func_80BAAA94.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Suttari_0x80BAA6D0/func_80BAAB78.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Suttari_0x80BAA6D0/func_80BAAB78.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Suttari_0x80BAA6D0/func_80BAAF1C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Suttari_0x80BAA6D0/func_80BAAF1C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Suttari_0x80BAA6D0/func_80BAAFDC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Suttari_0x80BAA6D0/func_80BAAFDC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Suttari_0x80BAA6D0/func_80BAB1A0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Suttari_0x80BAA6D0/func_80BAB1A0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Suttari_0x80BAA6D0/func_80BAB374.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Suttari_0x80BAA6D0/func_80BAB374.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Suttari_0x80BAA6D0/func_80BAB434.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Suttari_0x80BAA6D0/func_80BAB434.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Suttari_0x80BAA6D0/func_80BAB490.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Suttari_0x80BAA6D0/func_80BAB490.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Suttari_0x80BAA6D0/func_80BAB4F0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Suttari_0x80BAA6D0/func_80BAB4F0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Suttari_0x80BAA6D0/func_80BAB698.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Suttari_0x80BAA6D0/func_80BAB698.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Suttari_0x80BAA6D0/func_80BAB758.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Suttari_0x80BAA6D0/func_80BAB758.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Suttari_0x80BAA6D0/func_80BAB8F4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Suttari_0x80BAA6D0/func_80BAB8F4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Suttari_0x80BAA6D0/func_80BABA90.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Suttari_0x80BAA6D0/func_80BABA90.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Suttari_0x80BAA6D0/func_80BABB90.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Suttari_0x80BAA6D0/func_80BABB90.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Suttari_0x80BAA6D0/func_80BABC48.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Suttari_0x80BAA6D0/func_80BABC48.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Suttari_0x80BAA6D0/func_80BABDD8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Suttari_0x80BAA6D0/func_80BABDD8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Suttari_0x80BAA6D0/func_80BABF64.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Suttari_0x80BAA6D0/func_80BABF64.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Suttari_0x80BAA6D0/func_80BABFD4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Suttari_0x80BAA6D0/func_80BABFD4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Suttari_0x80BAA6D0/func_80BAC220.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Suttari_0x80BAA6D0/func_80BAC220.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Suttari_0x80BAA6D0/func_80BAC2FC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Suttari_0x80BAA6D0/func_80BAC2FC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Suttari_0x80BAA6D0/func_80BAC6E8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Suttari_0x80BAA6D0/func_80BAC6E8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Suttari_0x80BAA6D0/func_80BACA14.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Suttari_0x80BAA6D0/func_80BACA14.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Suttari_0x80BAA6D0/func_80BACBB0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Suttari_0x80BAA6D0/func_80BACBB0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Suttari_0x80BAA6D0/func_80BACD2C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Suttari_0x80BAA6D0/func_80BACD2C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Suttari_0x80BAA6D0/func_80BACE4C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Suttari_0x80BAA6D0/func_80BACE4C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Suttari_0x80BAA6D0/func_80BACEE0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Suttari_0x80BAA6D0/func_80BACEE0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Suttari_0x80BAA6D0/func_80BAD004.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Suttari_0x80BAA6D0/func_80BAD004.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Suttari_0x80BAA6D0/func_80BAD130.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Suttari_0x80BAA6D0/func_80BAD130.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Suttari_0x80BAA6D0/func_80BAD230.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Suttari_0x80BAA6D0/func_80BAD230.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Suttari_0x80BAA6D0/func_80BAD2B4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Suttari_0x80BAA6D0/func_80BAD2B4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Suttari_0x80BAA6D0/func_80BAD380.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Suttari_0x80BAA6D0/func_80BAD380.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Suttari_0x80BAA6D0/func_80BAD5F8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Suttari_0x80BAA6D0/func_80BAD5F8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Suttari_0x80BAA6D0/func_80BAD7F8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Suttari_0x80BAA6D0/func_80BAD7F8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Suttari_0x80BAA6D0/func_80BADA08.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Suttari_0x80BAA6D0/func_80BADA08.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Suttari_0x80BAA6D0/func_80BADA9C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Suttari_0x80BAA6D0/func_80BADA9C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Suttari_0x80BAA6D0/func_80BADD0C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Suttari_0x80BAA6D0/func_80BADD0C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Suttari_0x80BAA6D0/func_80BADDB4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Suttari_0x80BAA6D0/func_80BADDB4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Suttari_0x80BAA6D0/func_80BADE14.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Suttari_0x80BAA6D0/func_80BADE14.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Suttari_0x80BAA6D0/func_80BADE8C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Suttari_0x80BAA6D0/func_80BADE8C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Suttari_0x80BAA6D0/func_80BADF3C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Suttari_0x80BAA6D0/func_80BADF3C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Suttari_0x80BAA6D0/EnSuttari_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Suttari_0x80BAA6D0/EnSuttari_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Suttari_0x80BAA6D0/EnSuttari_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Suttari_0x80BAA6D0/EnSuttari_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Suttari_0x80BAA6D0/EnSuttari_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Suttari_0x80BAA6D0/EnSuttari_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Suttari_0x80BAA6D0/func_80BAE250.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Suttari_0x80BAA6D0/func_80BAE250.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Suttari_0x80BAA6D0/func_80BAE3C4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Suttari_0x80BAA6D0/func_80BAE3C4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Suttari_0x80BAA6D0/func_80BAE524.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Suttari_0x80BAA6D0/func_80BAE524.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Suttari_0x80BAA6D0/EnSuttari_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Suttari_0x80BAA6D0/EnSuttari_Draw.asm") 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 615889b589..119f8adee9 100644 --- a/src/overlays/actors/ovl_En_Sw/z_en_sw.c +++ b/src/overlays/actors/ovl_En_Sw/z_en_sw.c @@ -23,78 +23,78 @@ const ActorInit En_Sw_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sw_0x808D8940/func_808D8940.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sw_0x808D8940/func_808D8940.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sw_0x808D8940/func_808D8B58.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sw_0x808D8940/func_808D8B58.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sw_0x808D8940/func_808D8D60.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sw_0x808D8940/func_808D8D60.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sw_0x808D8940/func_808D8ED0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sw_0x808D8940/func_808D8ED0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sw_0x808D8940/func_808D8FC4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sw_0x808D8940/func_808D8FC4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sw_0x808D8940/func_808D90C4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sw_0x808D8940/func_808D90C4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sw_0x808D8940/func_808D90F0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sw_0x808D8940/func_808D90F0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sw_0x808D8940/func_808D91C4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sw_0x808D8940/func_808D91C4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sw_0x808D8940/func_808D93BC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sw_0x808D8940/func_808D93BC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sw_0x808D8940/func_808D9440.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sw_0x808D8940/func_808D9440.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sw_0x808D8940/func_808D94D0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sw_0x808D8940/func_808D94D0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sw_0x808D8940/func_808D9894.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sw_0x808D8940/func_808D9894.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sw_0x808D8940/func_808D9968.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sw_0x808D8940/func_808D9968.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sw_0x808D8940/func_808D99C8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sw_0x808D8940/func_808D99C8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sw_0x808D8940/func_808D9A70.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sw_0x808D8940/func_808D9A70.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sw_0x808D8940/func_808D9C18.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sw_0x808D8940/func_808D9C18.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sw_0x808D8940/func_808D9DA0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sw_0x808D8940/func_808D9DA0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sw_0x808D8940/func_808D9E44.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sw_0x808D8940/func_808D9E44.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sw_0x808D8940/func_808D9F08.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sw_0x808D8940/func_808D9F08.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sw_0x808D8940/func_808D9F78.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sw_0x808D8940/func_808D9F78.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sw_0x808D8940/func_808DA024.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sw_0x808D8940/func_808DA024.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sw_0x808D8940/func_808DA08C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sw_0x808D8940/func_808DA08C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sw_0x808D8940/func_808DA350.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sw_0x808D8940/func_808DA350.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sw_0x808D8940/func_808DA3F4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sw_0x808D8940/func_808DA3F4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sw_0x808D8940/func_808DA578.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sw_0x808D8940/func_808DA578.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sw_0x808D8940/func_808DA6FC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sw_0x808D8940/func_808DA6FC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sw_0x808D8940/func_808DA89C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sw_0x808D8940/func_808DA89C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sw_0x808D8940/func_808DAA60.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sw_0x808D8940/func_808DAA60.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sw_0x808D8940/func_808DACF4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sw_0x808D8940/func_808DACF4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sw_0x808D8940/func_808DAEB4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sw_0x808D8940/func_808DAEB4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sw_0x808D8940/func_808DB100.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sw_0x808D8940/func_808DB100.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sw_0x808D8940/func_808DB25C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sw_0x808D8940/func_808DB25C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sw_0x808D8940/func_808DB2E0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sw_0x808D8940/func_808DB2E0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sw_0x808D8940/EnSw_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sw_0x808D8940/EnSw_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sw_0x808D8940/EnSw_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sw_0x808D8940/EnSw_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sw_0x808D8940/EnSw_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sw_0x808D8940/EnSw_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sw_0x808D8940/func_808DB7F4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sw_0x808D8940/func_808DB7F4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Sw_0x808D8940/EnSw_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Sw_0x808D8940/EnSw_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Syateki_Crow/z_en_syateki_crow.c b/src/overlays/actors/ovl_En_Syateki_Crow/z_en_syateki_crow.c index b0e57ffed5..87cab3703d 100644 --- a/src/overlays/actors/ovl_En_Syateki_Crow/z_en_syateki_crow.c +++ b/src/overlays/actors/ovl_En_Syateki_Crow/z_en_syateki_crow.c @@ -23,30 +23,30 @@ const ActorInit En_Syateki_Crow_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Crow_0x809CA3F0/EnSyatekiCrow_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Syateki_Crow_0x809CA3F0/EnSyatekiCrow_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Crow_0x809CA3F0/EnSyatekiCrow_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Syateki_Crow_0x809CA3F0/EnSyatekiCrow_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Crow_0x809CA3F0/func_809CA5D4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Syateki_Crow_0x809CA3F0/func_809CA5D4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Crow_0x809CA3F0/func_809CA67C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Syateki_Crow_0x809CA3F0/func_809CA67C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Crow_0x809CA3F0/func_809CA71C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Syateki_Crow_0x809CA3F0/func_809CA71C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Crow_0x809CA3F0/func_809CA840.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Syateki_Crow_0x809CA3F0/func_809CA840.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Crow_0x809CA3F0/func_809CA8E4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Syateki_Crow_0x809CA3F0/func_809CA8E4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Crow_0x809CA3F0/func_809CAAF8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Syateki_Crow_0x809CA3F0/func_809CAAF8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Crow_0x809CA3F0/func_809CABC0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Syateki_Crow_0x809CA3F0/func_809CABC0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Crow_0x809CA3F0/func_809CACD0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Syateki_Crow_0x809CA3F0/func_809CACD0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Crow_0x809CA3F0/EnSyatekiCrow_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Syateki_Crow_0x809CA3F0/EnSyatekiCrow_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Crow_0x809CA3F0/func_809CAE5C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Syateki_Crow_0x809CA3F0/func_809CAE5C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Crow_0x809CA3F0/func_809CAF2C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Syateki_Crow_0x809CA3F0/func_809CAF2C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Crow_0x809CA3F0/EnSyatekiCrow_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Syateki_Crow_0x809CA3F0/EnSyatekiCrow_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Syateki_Dekunuts/z_en_syateki_dekunuts.c b/src/overlays/actors/ovl_En_Syateki_Dekunuts/z_en_syateki_dekunuts.c index 1e97367be8..7a9d2d75d9 100644 --- a/src/overlays/actors/ovl_En_Syateki_Dekunuts/z_en_syateki_dekunuts.c +++ b/src/overlays/actors/ovl_En_Syateki_Dekunuts/z_en_syateki_dekunuts.c @@ -23,46 +23,46 @@ const ActorInit En_Syateki_Dekunuts_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Dekunuts_0x80A2BC00/EnSyatekiDekunuts_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Syateki_Dekunuts_0x80A2BC00/EnSyatekiDekunuts_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Dekunuts_0x80A2BC00/EnSyatekiDekunuts_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Syateki_Dekunuts_0x80A2BC00/EnSyatekiDekunuts_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Dekunuts_0x80A2BC00/func_80A2BE54.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Syateki_Dekunuts_0x80A2BC00/func_80A2BE54.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Dekunuts_0x80A2BC00/func_80A2BF18.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Syateki_Dekunuts_0x80A2BC00/func_80A2BF18.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Dekunuts_0x80A2BC00/func_80A2BFC4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Syateki_Dekunuts_0x80A2BC00/func_80A2BFC4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Dekunuts_0x80A2BC00/func_80A2C0F8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Syateki_Dekunuts_0x80A2BC00/func_80A2C0F8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Dekunuts_0x80A2BC00/func_80A2C150.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Syateki_Dekunuts_0x80A2BC00/func_80A2C150.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Dekunuts_0x80A2BC00/func_80A2C168.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Syateki_Dekunuts_0x80A2BC00/func_80A2C168.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Dekunuts_0x80A2BC00/func_80A2C1AC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Syateki_Dekunuts_0x80A2BC00/func_80A2C1AC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Dekunuts_0x80A2BC00/func_80A2C208.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Syateki_Dekunuts_0x80A2BC00/func_80A2C208.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Dekunuts_0x80A2BC00/func_80A2C27C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Syateki_Dekunuts_0x80A2BC00/func_80A2C27C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Dekunuts_0x80A2BC00/func_80A2C2E0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Syateki_Dekunuts_0x80A2BC00/func_80A2C2E0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Dekunuts_0x80A2BC00/func_80A2C33C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Syateki_Dekunuts_0x80A2BC00/func_80A2C33C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Dekunuts_0x80A2BC00/func_80A2C3AC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Syateki_Dekunuts_0x80A2BC00/func_80A2C3AC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Dekunuts_0x80A2BC00/func_80A2C3F0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Syateki_Dekunuts_0x80A2BC00/func_80A2C3F0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Dekunuts_0x80A2BC00/func_80A2C478.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Syateki_Dekunuts_0x80A2BC00/func_80A2C478.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Dekunuts_0x80A2BC00/func_80A2C48C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Syateki_Dekunuts_0x80A2BC00/func_80A2C48C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Dekunuts_0x80A2BC00/func_80A2C4D0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Syateki_Dekunuts_0x80A2BC00/func_80A2C4D0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Dekunuts_0x80A2BC00/func_80A2C5DC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Syateki_Dekunuts_0x80A2BC00/func_80A2C5DC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Dekunuts_0x80A2BC00/EnSyatekiDekunuts_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Syateki_Dekunuts_0x80A2BC00/EnSyatekiDekunuts_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Dekunuts_0x80A2BC00/func_80A2C8A0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Syateki_Dekunuts_0x80A2BC00/func_80A2C8A0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Dekunuts_0x80A2BC00/EnSyatekiDekunuts_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Syateki_Dekunuts_0x80A2BC00/EnSyatekiDekunuts_Draw.asm") 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 6f8095b8b6..fdfcb0559d 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 @@ -23,66 +23,66 @@ const ActorInit En_Syateki_Man_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Man_0x809C64C0/func_809C64C0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Syateki_Man_0x809C64C0/func_809C64C0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Man_0x809C64C0/EnSyatekiMan_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Syateki_Man_0x809C64C0/EnSyatekiMan_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Man_0x809C64C0/EnSyatekiMan_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Syateki_Man_0x809C64C0/EnSyatekiMan_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Man_0x809C64C0/func_809C6720.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Syateki_Man_0x809C64C0/func_809C6720.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Man_0x809C64C0/func_809C6810.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Syateki_Man_0x809C64C0/func_809C6810.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Man_0x809C64C0/func_809C6848.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Syateki_Man_0x809C64C0/func_809C6848.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Man_0x809C64C0/func_809C6A04.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Syateki_Man_0x809C64C0/func_809C6A04.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Man_0x809C64C0/func_809C6C2C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Syateki_Man_0x809C64C0/func_809C6C2C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Man_0x809C64C0/func_809C6E30.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Syateki_Man_0x809C64C0/func_809C6E30.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Man_0x809C64C0/func_809C6F98.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Syateki_Man_0x809C64C0/func_809C6F98.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Man_0x809C64C0/func_809C72D8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Syateki_Man_0x809C64C0/func_809C72D8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Man_0x809C64C0/func_809C7380.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Syateki_Man_0x809C64C0/func_809C7380.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Man_0x809C64C0/func_809C7620.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Syateki_Man_0x809C64C0/func_809C7620.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Man_0x809C64C0/func_809C7990.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Syateki_Man_0x809C64C0/func_809C7990.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Man_0x809C64C0/func_809C7A90.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Syateki_Man_0x809C64C0/func_809C7A90.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Man_0x809C64C0/func_809C7C14.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Syateki_Man_0x809C64C0/func_809C7C14.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Man_0x809C64C0/func_809C7D14.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Syateki_Man_0x809C64C0/func_809C7D14.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Man_0x809C64C0/func_809C7EB4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Syateki_Man_0x809C64C0/func_809C7EB4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Man_0x809C64C0/func_809C7FFC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Syateki_Man_0x809C64C0/func_809C7FFC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Man_0x809C64C0/func_809C80C0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Syateki_Man_0x809C64C0/func_809C80C0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Man_0x809C64C0/func_809C81D0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Syateki_Man_0x809C64C0/func_809C81D0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Man_0x809C64C0/func_809C8488.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Syateki_Man_0x809C64C0/func_809C8488.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Man_0x809C64C0/func_809C8610.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Syateki_Man_0x809C64C0/func_809C8610.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Man_0x809C64C0/func_809C8710.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Syateki_Man_0x809C64C0/func_809C8710.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Man_0x809C64C0/func_809C8808.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Syateki_Man_0x809C64C0/func_809C8808.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Man_0x809C64C0/func_809C898C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Syateki_Man_0x809C64C0/func_809C898C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Man_0x809C64C0/func_809C8BF0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Syateki_Man_0x809C64C0/func_809C8BF0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Man_0x809C64C0/func_809C8DE8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Syateki_Man_0x809C64C0/func_809C8DE8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Man_0x809C64C0/EnSyatekiMan_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Syateki_Man_0x809C64C0/EnSyatekiMan_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Man_0x809C64C0/func_809C8EE4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Syateki_Man_0x809C64C0/func_809C8EE4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Man_0x809C64C0/func_809C8FAC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Syateki_Man_0x809C64C0/func_809C8FAC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Man_0x809C64C0/EnSyatekiMan_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Syateki_Man_0x809C64C0/EnSyatekiMan_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Syateki_Okuta/z_en_syateki_okuta.c b/src/overlays/actors/ovl_En_Syateki_Okuta/z_en_syateki_okuta.c index 6b8dcc17c2..a853bde738 100644 --- a/src/overlays/actors/ovl_En_Syateki_Okuta/z_en_syateki_okuta.c +++ b/src/overlays/actors/ovl_En_Syateki_Okuta/z_en_syateki_okuta.c @@ -23,52 +23,52 @@ const ActorInit En_Syateki_Okuta_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Okuta_0x80A35FF0/EnSyatekiOkuta_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Syateki_Okuta_0x80A35FF0/EnSyatekiOkuta_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Okuta_0x80A35FF0/EnSyatekiOkuta_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Syateki_Okuta_0x80A35FF0/EnSyatekiOkuta_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Okuta_0x80A35FF0/func_80A36148.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Syateki_Okuta_0x80A35FF0/func_80A36148.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Okuta_0x80A35FF0/func_80A361B0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Syateki_Okuta_0x80A35FF0/func_80A361B0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Okuta_0x80A35FF0/func_80A361F4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Syateki_Okuta_0x80A35FF0/func_80A361F4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Okuta_0x80A35FF0/func_80A36260.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Syateki_Okuta_0x80A35FF0/func_80A36260.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Okuta_0x80A35FF0/func_80A362A8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Syateki_Okuta_0x80A35FF0/func_80A362A8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Okuta_0x80A35FF0/func_80A362F8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Syateki_Okuta_0x80A35FF0/func_80A362F8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Okuta_0x80A35FF0/func_80A36350.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Syateki_Okuta_0x80A35FF0/func_80A36350.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Okuta_0x80A35FF0/func_80A36360.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Syateki_Okuta_0x80A35FF0/func_80A36360.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Okuta_0x80A35FF0/func_80A363B4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Syateki_Okuta_0x80A35FF0/func_80A363B4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Okuta_0x80A35FF0/func_80A36444.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Syateki_Okuta_0x80A35FF0/func_80A36444.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Okuta_0x80A35FF0/func_80A36488.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Syateki_Okuta_0x80A35FF0/func_80A36488.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Okuta_0x80A35FF0/func_80A364C0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Syateki_Okuta_0x80A35FF0/func_80A364C0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Okuta_0x80A35FF0/func_80A36504.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Syateki_Okuta_0x80A35FF0/func_80A36504.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Okuta_0x80A35FF0/func_80A3657C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Syateki_Okuta_0x80A35FF0/func_80A3657C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Okuta_0x80A35FF0/func_80A365EC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Syateki_Okuta_0x80A35FF0/func_80A365EC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Okuta_0x80A35FF0/func_80A368E0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Syateki_Okuta_0x80A35FF0/func_80A368E0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Okuta_0x80A35FF0/func_80A36A90.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Syateki_Okuta_0x80A35FF0/func_80A36A90.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Okuta_0x80A35FF0/func_80A36AF8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Syateki_Okuta_0x80A35FF0/func_80A36AF8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Okuta_0x80A35FF0/EnSyatekiOkuta_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Syateki_Okuta_0x80A35FF0/EnSyatekiOkuta_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Okuta_0x80A35FF0/func_80A36CB0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Syateki_Okuta_0x80A35FF0/func_80A36CB0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Okuta_0x80A35FF0/func_80A370EC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Syateki_Okuta_0x80A35FF0/func_80A370EC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Okuta_0x80A35FF0/func_80A37294.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Syateki_Okuta_0x80A35FF0/func_80A37294.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Okuta_0x80A35FF0/EnSyatekiOkuta_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Syateki_Okuta_0x80A35FF0/EnSyatekiOkuta_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Syateki_Wf/z_en_syateki_wf.c b/src/overlays/actors/ovl_En_Syateki_Wf/z_en_syateki_wf.c index c223d3936c..e0eefe6331 100644 --- a/src/overlays/actors/ovl_En_Syateki_Wf/z_en_syateki_wf.c +++ b/src/overlays/actors/ovl_En_Syateki_Wf/z_en_syateki_wf.c @@ -23,44 +23,44 @@ const ActorInit En_Syateki_Wf_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Wf_0x80A1FE50/EnSyatekiWf_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Syateki_Wf_0x80A1FE50/EnSyatekiWf_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Wf_0x80A1FE50/EnSyatekiWf_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Syateki_Wf_0x80A1FE50/EnSyatekiWf_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Wf_0x80A1FE50/func_80A200E0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Syateki_Wf_0x80A1FE50/func_80A200E0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Wf_0x80A1FE50/func_80A201CC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Syateki_Wf_0x80A1FE50/func_80A201CC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Wf_0x80A1FE50/func_80A20284.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Syateki_Wf_0x80A1FE50/func_80A20284.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Wf_0x80A1FE50/func_80A2030C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Syateki_Wf_0x80A1FE50/func_80A2030C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Wf_0x80A1FE50/func_80A20320.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Syateki_Wf_0x80A1FE50/func_80A20320.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Wf_0x80A1FE50/func_80A20378.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Syateki_Wf_0x80A1FE50/func_80A20378.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Wf_0x80A1FE50/func_80A203DC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Syateki_Wf_0x80A1FE50/func_80A203DC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Wf_0x80A1FE50/func_80A20670.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Syateki_Wf_0x80A1FE50/func_80A20670.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Wf_0x80A1FE50/func_80A206DC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Syateki_Wf_0x80A1FE50/func_80A206DC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Wf_0x80A1FE50/func_80A20710.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Syateki_Wf_0x80A1FE50/func_80A20710.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Wf_0x80A1FE50/func_80A2075C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Syateki_Wf_0x80A1FE50/func_80A2075C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Wf_0x80A1FE50/func_80A2079C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Syateki_Wf_0x80A1FE50/func_80A2079C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Wf_0x80A1FE50/func_80A20800.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Syateki_Wf_0x80A1FE50/func_80A20800.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Wf_0x80A1FE50/func_80A20858.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Syateki_Wf_0x80A1FE50/func_80A20858.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Wf_0x80A1FE50/func_80A208F8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Syateki_Wf_0x80A1FE50/func_80A208F8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Wf_0x80A1FE50/EnSyatekiWf_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Syateki_Wf_0x80A1FE50/EnSyatekiWf_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Wf_0x80A1FE50/func_80A20CF4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Syateki_Wf_0x80A1FE50/func_80A20CF4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Wf_0x80A1FE50/func_80A20D10.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Syateki_Wf_0x80A1FE50/func_80A20D10.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Wf_0x80A1FE50/EnSyatekiWf_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Syateki_Wf_0x80A1FE50/EnSyatekiWf_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Tab/z_en_tab.c b/src/overlays/actors/ovl_En_Tab/z_en_tab.c index 79c260e4ee..02bf94e605 100644 --- a/src/overlays/actors/ovl_En_Tab/z_en_tab.c +++ b/src/overlays/actors/ovl_En_Tab/z_en_tab.c @@ -23,58 +23,58 @@ const ActorInit En_Tab_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tab_0x80BE04E0/func_80BE04E0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tab_0x80BE04E0/func_80BE04E0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tab_0x80BE04E0/func_80BE0590.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tab_0x80BE04E0/func_80BE0590.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tab_0x80BE04E0/func_80BE05BC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tab_0x80BE04E0/func_80BE05BC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tab_0x80BE04E0/func_80BE0620.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tab_0x80BE04E0/func_80BE0620.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tab_0x80BE04E0/func_80BE0664.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tab_0x80BE04E0/func_80BE0664.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tab_0x80BE04E0/func_80BE06DC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tab_0x80BE04E0/func_80BE06DC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tab_0x80BE04E0/func_80BE0778.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tab_0x80BE04E0/func_80BE0778.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tab_0x80BE04E0/func_80BE07A0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tab_0x80BE04E0/func_80BE07A0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tab_0x80BE04E0/func_80BE09A8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tab_0x80BE04E0/func_80BE09A8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tab_0x80BE04E0/func_80BE0A98.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tab_0x80BE04E0/func_80BE0A98.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tab_0x80BE04E0/func_80BE0C04.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tab_0x80BE04E0/func_80BE0C04.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tab_0x80BE04E0/func_80BE0D38.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tab_0x80BE04E0/func_80BE0D38.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tab_0x80BE04E0/func_80BE0D60.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tab_0x80BE04E0/func_80BE0D60.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tab_0x80BE04E0/func_80BE0E04.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tab_0x80BE04E0/func_80BE0E04.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tab_0x80BE04E0/func_80BE0F04.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tab_0x80BE04E0/func_80BE0F04.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tab_0x80BE04E0/func_80BE0FC4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tab_0x80BE04E0/func_80BE0FC4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tab_0x80BE04E0/func_80BE1060.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tab_0x80BE04E0/func_80BE1060.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tab_0x80BE04E0/func_80BE10BC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tab_0x80BE04E0/func_80BE10BC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tab_0x80BE04E0/func_80BE1224.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tab_0x80BE04E0/func_80BE1224.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tab_0x80BE04E0/func_80BE127C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tab_0x80BE04E0/func_80BE127C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tab_0x80BE04E0/func_80BE1348.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tab_0x80BE04E0/func_80BE1348.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tab_0x80BE04E0/EnTab_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tab_0x80BE04E0/EnTab_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tab_0x80BE04E0/EnTab_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tab_0x80BE04E0/EnTab_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tab_0x80BE04E0/EnTab_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tab_0x80BE04E0/EnTab_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tab_0x80BE04E0/func_80BE1648.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tab_0x80BE04E0/func_80BE1648.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tab_0x80BE04E0/func_80BE16B4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tab_0x80BE04E0/func_80BE16B4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tab_0x80BE04E0/func_80BE1704.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tab_0x80BE04E0/func_80BE1704.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tab_0x80BE04E0/EnTab_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tab_0x80BE04E0/EnTab_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Tag_Obj/z_en_tag_obj.c b/src/overlays/actors/ovl_En_Tag_Obj/z_en_tag_obj.c index a9896c6dda..d22486a852 100644 --- a/src/overlays/actors/ovl_En_Tag_Obj/z_en_tag_obj.c +++ b/src/overlays/actors/ovl_En_Tag_Obj/z_en_tag_obj.c @@ -22,8 +22,8 @@ const ActorInit En_Tag_Obj_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tag_Obj_0x80B12870/EnTagObj_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tag_Obj_0x80B12870/EnTagObj_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tag_Obj_0x80B12870/EnTagObj_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tag_Obj_0x80B12870/EnTagObj_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tag_Obj_0x80B12870/EnTagObj_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tag_Obj_0x80B12870/EnTagObj_Update.asm") diff --git a/src/overlays/actors/ovl_En_Takaraya/z_en_takaraya.c b/src/overlays/actors/ovl_En_Takaraya/z_en_takaraya.c index 3d8544a0df..7ad5231887 100644 --- a/src/overlays/actors/ovl_En_Takaraya/z_en_takaraya.c +++ b/src/overlays/actors/ovl_En_Takaraya/z_en_takaraya.c @@ -23,46 +23,46 @@ const ActorInit En_Takaraya_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Takaraya_0x80ADEB90/EnTakaraya_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Takaraya_0x80ADEB90/EnTakaraya_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Takaraya_0x80ADEB90/EnTakaraya_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Takaraya_0x80ADEB90/EnTakaraya_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Takaraya_0x80ADEB90/func_80ADED8C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Takaraya_0x80ADEB90/func_80ADED8C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Takaraya_0x80ADEB90/func_80ADEDF8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Takaraya_0x80ADEB90/func_80ADEDF8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Takaraya_0x80ADEB90/func_80ADEE4C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Takaraya_0x80ADEB90/func_80ADEE4C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Takaraya_0x80ADEB90/func_80ADEF74.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Takaraya_0x80ADEB90/func_80ADEF74.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Takaraya_0x80ADEB90/func_80ADF03C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Takaraya_0x80ADEB90/func_80ADF03C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Takaraya_0x80ADEB90/func_80ADF050.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Takaraya_0x80ADEB90/func_80ADF050.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Takaraya_0x80ADEB90/func_80ADF2D4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Takaraya_0x80ADEB90/func_80ADF2D4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Takaraya_0x80ADEB90/func_80ADF338.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Takaraya_0x80ADEB90/func_80ADF338.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Takaraya_0x80ADEB90/func_80ADF4E0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Takaraya_0x80ADEB90/func_80ADF4E0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Takaraya_0x80ADEB90/func_80ADF520.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Takaraya_0x80ADEB90/func_80ADF520.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Takaraya_0x80ADEB90/func_80ADF608.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Takaraya_0x80ADEB90/func_80ADF608.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Takaraya_0x80ADEB90/func_80ADF654.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Takaraya_0x80ADEB90/func_80ADF654.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Takaraya_0x80ADEB90/func_80ADF6DC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Takaraya_0x80ADEB90/func_80ADF6DC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Takaraya_0x80ADEB90/func_80ADF730.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Takaraya_0x80ADEB90/func_80ADF730.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Takaraya_0x80ADEB90/func_80ADF7B8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Takaraya_0x80ADEB90/func_80ADF7B8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Takaraya_0x80ADEB90/func_80ADF7CC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Takaraya_0x80ADEB90/func_80ADF7CC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Takaraya_0x80ADEB90/EnTakaraya_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Takaraya_0x80ADEB90/EnTakaraya_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Takaraya_0x80ADEB90/func_80ADF94C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Takaraya_0x80ADEB90/func_80ADF94C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Takaraya_0x80ADEB90/func_80ADF984.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Takaraya_0x80ADEB90/func_80ADF984.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Takaraya_0x80ADEB90/EnTakaraya_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Takaraya_0x80ADEB90/EnTakaraya_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Talk/z_en_talk.c b/src/overlays/actors/ovl_En_Talk/z_en_talk.c index f3bc567942..a2a012fb5f 100644 --- a/src/overlays/actors/ovl_En_Talk/z_en_talk.c +++ b/src/overlays/actors/ovl_En_Talk/z_en_talk.c @@ -22,12 +22,12 @@ const ActorInit En_Talk_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Talk_0x80BDDFE0/EnTalk_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Talk_0x80BDDFE0/EnTalk_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Talk_0x80BDDFE0/EnTalk_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Talk_0x80BDDFE0/EnTalk_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Talk_0x80BDDFE0/func_80BDE058.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Talk_0x80BDDFE0/func_80BDE058.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Talk_0x80BDDFE0/func_80BDE090.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Talk_0x80BDDFE0/func_80BDE090.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Talk_0x80BDDFE0/EnTalk_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Talk_0x80BDDFE0/EnTalk_Update.asm") diff --git a/src/overlays/actors/ovl_En_Talk_Gibud/z_en_talk_gibud.c b/src/overlays/actors/ovl_En_Talk_Gibud/z_en_talk_gibud.c index e18f96b48c..cde1d298ac 100644 --- a/src/overlays/actors/ovl_En_Talk_Gibud/z_en_talk_gibud.c +++ b/src/overlays/actors/ovl_En_Talk_Gibud/z_en_talk_gibud.c @@ -23,102 +23,102 @@ const ActorInit En_Talk_Gibud_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Talk_Gibud_0x80AFE8A0/EnTalkGibud_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Talk_Gibud_0x80AFE8A0/EnTalkGibud_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Talk_Gibud_0x80AFE8A0/EnTalkGibud_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Talk_Gibud_0x80AFE8A0/EnTalkGibud_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Talk_Gibud_0x80AFE8A0/func_80AFEB38.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Talk_Gibud_0x80AFE8A0/func_80AFEB38.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Talk_Gibud_0x80AFE8A0/func_80AFEB7C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Talk_Gibud_0x80AFE8A0/func_80AFEB7C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Talk_Gibud_0x80AFE8A0/func_80AFEC08.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Talk_Gibud_0x80AFE8A0/func_80AFEC08.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Talk_Gibud_0x80AFE8A0/func_80AFEC4C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Talk_Gibud_0x80AFE8A0/func_80AFEC4C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Talk_Gibud_0x80AFE8A0/func_80AFED08.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Talk_Gibud_0x80AFE8A0/func_80AFED08.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Talk_Gibud_0x80AFE8A0/func_80AFED7C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Talk_Gibud_0x80AFE8A0/func_80AFED7C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Talk_Gibud_0x80AFE8A0/func_80AFEFD4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Talk_Gibud_0x80AFE8A0/func_80AFEFD4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Talk_Gibud_0x80AFE8A0/func_80AFF030.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Talk_Gibud_0x80AFE8A0/func_80AFF030.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Talk_Gibud_0x80AFE8A0/func_80AFF22C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Talk_Gibud_0x80AFE8A0/func_80AFF22C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Talk_Gibud_0x80AFE8A0/func_80AFF288.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Talk_Gibud_0x80AFE8A0/func_80AFF288.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Talk_Gibud_0x80AFE8A0/func_80AFF330.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Talk_Gibud_0x80AFE8A0/func_80AFF330.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Talk_Gibud_0x80AFE8A0/func_80AFF378.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Talk_Gibud_0x80AFE8A0/func_80AFF378.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Talk_Gibud_0x80AFE8A0/func_80AFF45C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Talk_Gibud_0x80AFE8A0/func_80AFF45C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Talk_Gibud_0x80AFE8A0/func_80AFF4AC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Talk_Gibud_0x80AFE8A0/func_80AFF4AC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Talk_Gibud_0x80AFE8A0/func_80AFF618.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Talk_Gibud_0x80AFE8A0/func_80AFF618.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Talk_Gibud_0x80AFE8A0/func_80AFF6A0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Talk_Gibud_0x80AFE8A0/func_80AFF6A0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Talk_Gibud_0x80AFE8A0/func_80AFF700.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Talk_Gibud_0x80AFE8A0/func_80AFF700.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Talk_Gibud_0x80AFE8A0/func_80AFF76C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Talk_Gibud_0x80AFE8A0/func_80AFF76C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Talk_Gibud_0x80AFE8A0/func_80AFF880.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Talk_Gibud_0x80AFE8A0/func_80AFF880.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Talk_Gibud_0x80AFE8A0/func_80AFF8E4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Talk_Gibud_0x80AFE8A0/func_80AFF8E4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Talk_Gibud_0x80AFE8A0/func_80AFF9CC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Talk_Gibud_0x80AFE8A0/func_80AFF9CC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Talk_Gibud_0x80AFE8A0/func_80AFFA68.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Talk_Gibud_0x80AFE8A0/func_80AFFA68.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Talk_Gibud_0x80AFE8A0/func_80AFFAB0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Talk_Gibud_0x80AFE8A0/func_80AFFAB0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Talk_Gibud_0x80AFE8A0/func_80AFFC10.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Talk_Gibud_0x80AFE8A0/func_80AFFC10.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Talk_Gibud_0x80AFE8A0/func_80AFFC9C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Talk_Gibud_0x80AFE8A0/func_80AFFC9C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Talk_Gibud_0x80AFE8A0/func_80AFFD3C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Talk_Gibud_0x80AFE8A0/func_80AFFD3C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Talk_Gibud_0x80AFE8A0/func_80AFFE3C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Talk_Gibud_0x80AFE8A0/func_80AFFE3C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Talk_Gibud_0x80AFE8A0/func_80AFFE94.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Talk_Gibud_0x80AFE8A0/func_80AFFE94.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Talk_Gibud_0x80AFE8A0/func_80AFFFA4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Talk_Gibud_0x80AFE8A0/func_80AFFFA4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Talk_Gibud_0x80AFE8A0/func_80AFFFBC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Talk_Gibud_0x80AFE8A0/func_80AFFFBC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Talk_Gibud_0x80AFE8A0/func_80B000FC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Talk_Gibud_0x80AFE8A0/func_80B000FC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Talk_Gibud_0x80AFE8A0/func_80B00158.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Talk_Gibud_0x80AFE8A0/func_80B00158.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Talk_Gibud_0x80AFE8A0/func_80B00384.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Talk_Gibud_0x80AFE8A0/func_80B00384.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Talk_Gibud_0x80AFE8A0/func_80B0040C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Talk_Gibud_0x80AFE8A0/func_80B0040C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Talk_Gibud_0x80AFE8A0/func_80B00484.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Talk_Gibud_0x80AFE8A0/func_80B00484.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Talk_Gibud_0x80AFE8A0/func_80B004D0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Talk_Gibud_0x80AFE8A0/func_80B004D0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Talk_Gibud_0x80AFE8A0/func_80B005EC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Talk_Gibud_0x80AFE8A0/func_80B005EC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Talk_Gibud_0x80AFE8A0/func_80B00760.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Talk_Gibud_0x80AFE8A0/func_80B00760.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Talk_Gibud_0x80AFE8A0/func_80B008BC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Talk_Gibud_0x80AFE8A0/func_80B008BC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Talk_Gibud_0x80AFE8A0/func_80B008FC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Talk_Gibud_0x80AFE8A0/func_80B008FC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Talk_Gibud_0x80AFE8A0/func_80B0094C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Talk_Gibud_0x80AFE8A0/func_80B0094C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Talk_Gibud_0x80AFE8A0/func_80B00B8C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Talk_Gibud_0x80AFE8A0/func_80B00B8C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Talk_Gibud_0x80AFE8A0/func_80B00C94.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Talk_Gibud_0x80AFE8A0/func_80B00C94.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Talk_Gibud_0x80AFE8A0/func_80B00D9C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Talk_Gibud_0x80AFE8A0/func_80B00D9C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Talk_Gibud_0x80AFE8A0/EnTalkGibud_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Talk_Gibud_0x80AFE8A0/EnTalkGibud_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Talk_Gibud_0x80AFE8A0/func_80B00F08.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Talk_Gibud_0x80AFE8A0/func_80B00F08.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Talk_Gibud_0x80AFE8A0/func_80B00F64.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Talk_Gibud_0x80AFE8A0/func_80B00F64.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Talk_Gibud_0x80AFE8A0/EnTalkGibud_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Talk_Gibud_0x80AFE8A0/EnTalkGibud_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Tanron1/z_en_tanron1.c b/src/overlays/actors/ovl_En_Tanron1/z_en_tanron1.c index 6499c5423d..8ae2dffdad 100644 --- a/src/overlays/actors/ovl_En_Tanron1/z_en_tanron1.c +++ b/src/overlays/actors/ovl_En_Tanron1/z_en_tanron1.c @@ -23,16 +23,16 @@ const ActorInit En_Tanron1_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tanron1_0x80BB4E00/EnTanron1_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tanron1_0x80BB4E00/EnTanron1_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tanron1_0x80BB4E00/EnTanron1_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tanron1_0x80BB4E00/EnTanron1_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tanron1_0x80BB4E00/func_80BB4E50.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tanron1_0x80BB4E00/func_80BB4E50.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tanron1_0x80BB4E00/EnTanron1_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tanron1_0x80BB4E00/EnTanron1_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tanron1_0x80BB4E00/EnTanron1_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tanron1_0x80BB4E00/EnTanron1_Draw.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tanron1_0x80BB4E00/func_80BB5318.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tanron1_0x80BB4E00/func_80BB5318.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tanron1_0x80BB4E00/func_80BB5AAC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tanron1_0x80BB4E00/func_80BB5AAC.asm") diff --git a/src/overlays/actors/ovl_En_Tanron2/z_en_tanron2.c b/src/overlays/actors/ovl_En_Tanron2/z_en_tanron2.c index 1ee48d1dad..3e958995a5 100644 --- a/src/overlays/actors/ovl_En_Tanron2/z_en_tanron2.c +++ b/src/overlays/actors/ovl_En_Tanron2/z_en_tanron2.c @@ -23,32 +23,32 @@ const ActorInit En_Tanron2_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tanron2_0x80BB67D0/EnTanron2_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tanron2_0x80BB67D0/EnTanron2_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tanron2_0x80BB67D0/EnTanron2_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tanron2_0x80BB67D0/EnTanron2_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tanron2_0x80BB67D0/func_80BB69C0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tanron2_0x80BB67D0/func_80BB69C0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tanron2_0x80BB67D0/func_80BB69FC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tanron2_0x80BB67D0/func_80BB69FC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tanron2_0x80BB67D0/func_80BB6B80.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tanron2_0x80BB67D0/func_80BB6B80.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tanron2_0x80BB67D0/func_80BB6BD8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tanron2_0x80BB67D0/func_80BB6BD8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tanron2_0x80BB67D0/func_80BB6F64.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tanron2_0x80BB67D0/func_80BB6F64.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tanron2_0x80BB67D0/func_80BB6F78.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tanron2_0x80BB67D0/func_80BB6F78.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tanron2_0x80BB67D0/func_80BB71C8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tanron2_0x80BB67D0/func_80BB71C8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tanron2_0x80BB67D0/func_80BB7398.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tanron2_0x80BB67D0/func_80BB7398.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tanron2_0x80BB67D0/func_80BB7408.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tanron2_0x80BB67D0/func_80BB7408.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tanron2_0x80BB67D0/func_80BB7578.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tanron2_0x80BB67D0/func_80BB7578.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tanron2_0x80BB67D0/EnTanron2_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tanron2_0x80BB67D0/EnTanron2_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tanron2_0x80BB67D0/func_80BB7B90.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tanron2_0x80BB67D0/func_80BB7B90.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tanron2_0x80BB67D0/EnTanron2_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tanron2_0x80BB67D0/EnTanron2_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Tanron3/z_en_tanron3.c b/src/overlays/actors/ovl_En_Tanron3/z_en_tanron3.c index ab09dd7747..a5cc2767c0 100644 --- a/src/overlays/actors/ovl_En_Tanron3/z_en_tanron3.c +++ b/src/overlays/actors/ovl_En_Tanron3/z_en_tanron3.c @@ -23,26 +23,26 @@ const ActorInit En_Tanron3_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tanron3_0x80BB85A0/func_80BB85A0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tanron3_0x80BB85A0/func_80BB85A0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tanron3_0x80BB85A0/EnTanron3_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tanron3_0x80BB85A0/EnTanron3_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tanron3_0x80BB85A0/EnTanron3_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tanron3_0x80BB85A0/EnTanron3_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tanron3_0x80BB85A0/func_80BB87D4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tanron3_0x80BB85A0/func_80BB87D4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tanron3_0x80BB85A0/func_80BB897C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tanron3_0x80BB85A0/func_80BB897C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tanron3_0x80BB85A0/func_80BB8A48.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tanron3_0x80BB85A0/func_80BB8A48.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tanron3_0x80BB85A0/func_80BB91D4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tanron3_0x80BB85A0/func_80BB91D4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tanron3_0x80BB85A0/func_80BB9288.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tanron3_0x80BB85A0/func_80BB9288.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tanron3_0x80BB85A0/func_80BB9308.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tanron3_0x80BB85A0/func_80BB9308.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tanron3_0x80BB85A0/EnTanron3_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tanron3_0x80BB85A0/EnTanron3_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tanron3_0x80BB85A0/func_80BB95FC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tanron3_0x80BB85A0/func_80BB95FC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tanron3_0x80BB85A0/EnTanron3_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tanron3_0x80BB85A0/EnTanron3_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Tanron4/z_en_tanron4.c b/src/overlays/actors/ovl_En_Tanron4/z_en_tanron4.c index 374da8ba7c..49293fbef5 100644 --- a/src/overlays/actors/ovl_En_Tanron4/z_en_tanron4.c +++ b/src/overlays/actors/ovl_En_Tanron4/z_en_tanron4.c @@ -23,18 +23,18 @@ const ActorInit En_Tanron4_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tanron4_0x80BE3B80/EnTanron4_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tanron4_0x80BE3B80/EnTanron4_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tanron4_0x80BE3B80/EnTanron4_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tanron4_0x80BE3B80/EnTanron4_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tanron4_0x80BE3B80/func_80BE3DC0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tanron4_0x80BE3B80/func_80BE3DC0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tanron4_0x80BE3B80/func_80BE3DFC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tanron4_0x80BE3B80/func_80BE3DFC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tanron4_0x80BE3B80/func_80BE4268.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tanron4_0x80BE3B80/func_80BE4268.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tanron4_0x80BE3B80/func_80BE42A4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tanron4_0x80BE3B80/func_80BE42A4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tanron4_0x80BE3B80/EnTanron4_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tanron4_0x80BE3B80/EnTanron4_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tanron4_0x80BE3B80/EnTanron4_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tanron4_0x80BE3B80/EnTanron4_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Tanron5/z_en_tanron5.c b/src/overlays/actors/ovl_En_Tanron5/z_en_tanron5.c index 25a261c570..61a75a672c 100644 --- a/src/overlays/actors/ovl_En_Tanron5/z_en_tanron5.c +++ b/src/overlays/actors/ovl_En_Tanron5/z_en_tanron5.c @@ -23,18 +23,18 @@ const ActorInit En_Tanron5_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tanron5_0x80BE4930/func_80BE4930.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tanron5_0x80BE4930/func_80BE4930.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tanron5_0x80BE4930/func_80BE4A2C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tanron5_0x80BE4930/func_80BE4A2C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tanron5_0x80BE4930/EnTanron5_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tanron5_0x80BE4930/EnTanron5_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tanron5_0x80BE4930/EnTanron5_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tanron5_0x80BE4930/EnTanron5_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tanron5_0x80BE4930/EnTanron5_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tanron5_0x80BE4930/EnTanron5_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tanron5_0x80BE4930/func_80BE5818.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tanron5_0x80BE4930/func_80BE5818.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tanron5_0x80BE4930/EnTanron5_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tanron5_0x80BE4930/EnTanron5_Draw.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tanron5_0x80BE4930/func_80BE5C10.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tanron5_0x80BE4930/func_80BE5C10.asm") 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 64aca1197e..6145bb2616 100644 --- a/src/overlays/actors/ovl_En_Test/z_en_test.c +++ b/src/overlays/actors/ovl_En_Test/z_en_test.c @@ -23,20 +23,20 @@ const ActorInit En_Test_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Test_0x80862B70/func_80862B70.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Test_0x80862B70/func_80862B70.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Test_0x80862B70/func_80862CBC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Test_0x80862B70/func_80862CBC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Test_0x80862B70/func_80862EDC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Test_0x80862B70/func_80862EDC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Test_0x80862B70/func_80863048.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Test_0x80862B70/func_80863048.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Test_0x80862B70/EnTest_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Test_0x80862B70/EnTest_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Test_0x80862B70/EnTest_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Test_0x80862B70/EnTest_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Test_0x80862B70/EnTest_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Test_0x80862B70/EnTest_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Test_0x80862B70/func_808634B8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Test_0x80862B70/func_808634B8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Test_0x80862B70/EnTest_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Test_0x80862B70/EnTest_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Test2/z_en_test2.c b/src/overlays/actors/ovl_En_Test2/z_en_test2.c index 81ce23955a..b330f263c1 100644 --- a/src/overlays/actors/ovl_En_Test2/z_en_test2.c +++ b/src/overlays/actors/ovl_En_Test2/z_en_test2.c @@ -21,10 +21,10 @@ const ActorInit En_Test2_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Test2_0x80A3E390/EnTest2_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Test2_0x80A3E390/EnTest2_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Test2_0x80A3E390/EnTest2_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Test2_0x80A3E390/EnTest2_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Test2_0x80A3E390/func_80A3E4EC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Test2_0x80A3E390/func_80A3E4EC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Test2_0x80A3E390/func_80A3E524.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Test2_0x80A3E390/func_80A3E524.asm") diff --git a/src/overlays/actors/ovl_En_Test3/z_en_test3.c b/src/overlays/actors/ovl_En_Test3/z_en_test3.c index 983130f09e..9f5207c2aa 100644 --- a/src/overlays/actors/ovl_En_Test3/z_en_test3.c +++ b/src/overlays/actors/ovl_En_Test3/z_en_test3.c @@ -22,108 +22,108 @@ const ActorInit En_Test3_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Test3_0x80A3E7E0/func_80A3E7E0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Test3_0x80A3E7E0/func_80A3E7E0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Test3_0x80A3E7E0/func_80A3E80C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Test3_0x80A3E7E0/func_80A3E80C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Test3_0x80A3E7E0/func_80A3E870.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Test3_0x80A3E7E0/func_80A3E870.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Test3_0x80A3E7E0/func_80A3E884.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Test3_0x80A3E7E0/func_80A3E884.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Test3_0x80A3E7E0/func_80A3E898.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Test3_0x80A3E7E0/func_80A3E898.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Test3_0x80A3E7E0/func_80A3E960.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Test3_0x80A3E7E0/func_80A3E960.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Test3_0x80A3E7E0/func_80A3E97C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Test3_0x80A3E7E0/func_80A3E97C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Test3_0x80A3E7E0/func_80A3E9DC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Test3_0x80A3E7E0/func_80A3E9DC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Test3_0x80A3E7E0/func_80A3EA30.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Test3_0x80A3E7E0/func_80A3EA30.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Test3_0x80A3E7E0/func_80A3EAC4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Test3_0x80A3E7E0/func_80A3EAC4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Test3_0x80A3E7E0/func_80A3EAF8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Test3_0x80A3E7E0/func_80A3EAF8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Test3_0x80A3E7E0/func_80A3EB8C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Test3_0x80A3E7E0/func_80A3EB8C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Test3_0x80A3E7E0/func_80A3EBFC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Test3_0x80A3E7E0/func_80A3EBFC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Test3_0x80A3E7E0/func_80A3EC30.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Test3_0x80A3E7E0/func_80A3EC30.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Test3_0x80A3E7E0/func_80A3EC44.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Test3_0x80A3E7E0/func_80A3EC44.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Test3_0x80A3E7E0/func_80A3ECEC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Test3_0x80A3E7E0/func_80A3ECEC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Test3_0x80A3E7E0/func_80A3ED24.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Test3_0x80A3E7E0/func_80A3ED24.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Test3_0x80A3E7E0/EnTest3_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Test3_0x80A3E7E0/EnTest3_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Test3_0x80A3E7E0/EnTest3_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Test3_0x80A3E7E0/EnTest3_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Test3_0x80A3E7E0/func_80A3F080.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Test3_0x80A3E7E0/func_80A3F080.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Test3_0x80A3E7E0/func_80A3F09C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Test3_0x80A3E7E0/func_80A3F09C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Test3_0x80A3E7E0/func_80A3F0B0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Test3_0x80A3E7E0/func_80A3F0B0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Test3_0x80A3E7E0/func_80A3F114.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Test3_0x80A3E7E0/func_80A3F114.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Test3_0x80A3E7E0/func_80A3F15C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Test3_0x80A3E7E0/func_80A3F15C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Test3_0x80A3E7E0/func_80A3F2BC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Test3_0x80A3E7E0/func_80A3F2BC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Test3_0x80A3E7E0/func_80A3F384.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Test3_0x80A3E7E0/func_80A3F384.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Test3_0x80A3E7E0/func_80A3F4A4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Test3_0x80A3E7E0/func_80A3F4A4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Test3_0x80A3E7E0/func_80A3F534.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Test3_0x80A3E7E0/func_80A3F534.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Test3_0x80A3E7E0/func_80A3F5A4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Test3_0x80A3E7E0/func_80A3F5A4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Test3_0x80A3E7E0/func_80A3F62C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Test3_0x80A3E7E0/func_80A3F62C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Test3_0x80A3E7E0/func_80A3F73C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Test3_0x80A3E7E0/func_80A3F73C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Test3_0x80A3E7E0/func_80A3F8D4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Test3_0x80A3E7E0/func_80A3F8D4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Test3_0x80A3E7E0/func_80A3F9A4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Test3_0x80A3E7E0/func_80A3F9A4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Test3_0x80A3E7E0/func_80A3F9E4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Test3_0x80A3E7E0/func_80A3F9E4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Test3_0x80A3E7E0/func_80A3FA58.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Test3_0x80A3E7E0/func_80A3FA58.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Test3_0x80A3E7E0/func_80A3FBCC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Test3_0x80A3E7E0/func_80A3FBCC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Test3_0x80A3E7E0/func_80A3FBE8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Test3_0x80A3E7E0/func_80A3FBE8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Test3_0x80A3E7E0/func_80A3FDE4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Test3_0x80A3E7E0/func_80A3FDE4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Test3_0x80A3E7E0/func_80A3FE20.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Test3_0x80A3E7E0/func_80A3FE20.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Test3_0x80A3E7E0/func_80A3FF10.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Test3_0x80A3E7E0/func_80A3FF10.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Test3_0x80A3E7E0/func_80A3FFD0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Test3_0x80A3E7E0/func_80A3FFD0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Test3_0x80A3E7E0/func_80A40098.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Test3_0x80A3E7E0/func_80A40098.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Test3_0x80A3E7E0/func_80A40230.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Test3_0x80A3E7E0/func_80A40230.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Test3_0x80A3E7E0/func_80A40678.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Test3_0x80A3E7E0/func_80A40678.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Test3_0x80A3E7E0/func_80A40824.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Test3_0x80A3E7E0/func_80A40824.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Test3_0x80A3E7E0/func_80A4084C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Test3_0x80A3E7E0/func_80A4084C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Test3_0x80A3E7E0/func_80A40908.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Test3_0x80A3E7E0/func_80A40908.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Test3_0x80A3E7E0/func_80A409D4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Test3_0x80A3E7E0/func_80A409D4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Test3_0x80A3E7E0/func_80A40A6C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Test3_0x80A3E7E0/func_80A40A6C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Test3_0x80A3E7E0/EnTest3_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Test3_0x80A3E7E0/EnTest3_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Test3_0x80A3E7E0/func_80A40CF0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Test3_0x80A3E7E0/func_80A40CF0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Test3_0x80A3E7E0/func_80A40F34.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Test3_0x80A3E7E0/func_80A40F34.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Test3_0x80A3E7E0/func_80A4129C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Test3_0x80A3E7E0/func_80A4129C.asm") diff --git a/src/overlays/actors/ovl_En_Test4/z_en_test4.c b/src/overlays/actors/ovl_En_Test4/z_en_test4.c index 9f2e0d796e..d5b7bbde7a 100644 --- a/src/overlays/actors/ovl_En_Test4/z_en_test4.c +++ b/src/overlays/actors/ovl_En_Test4/z_en_test4.c @@ -22,26 +22,26 @@ const ActorInit En_Test4_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Test4_0x80A41D70/func_80A41D70.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Test4_0x80A41D70/func_80A41D70.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Test4_0x80A41D70/func_80A41FA4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Test4_0x80A41D70/func_80A41FA4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Test4_0x80A41D70/func_80A42198.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Test4_0x80A41D70/func_80A42198.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Test4_0x80A41D70/func_80A425E4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Test4_0x80A41D70/func_80A425E4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Test4_0x80A41D70/EnTest4_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Test4_0x80A41D70/EnTest4_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Test4_0x80A41D70/EnTest4_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Test4_0x80A41D70/EnTest4_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Test4_0x80A41D70/func_80A42AB8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Test4_0x80A41D70/func_80A42AB8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Test4_0x80A41D70/func_80A42F20.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Test4_0x80A41D70/func_80A42F20.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Test4_0x80A41D70/func_80A430C8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Test4_0x80A41D70/func_80A430C8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Test4_0x80A41D70/func_80A431C8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Test4_0x80A41D70/func_80A431C8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Test4_0x80A41D70/func_80A4323C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Test4_0x80A41D70/func_80A4323C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Test4_0x80A41D70/EnTest4_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Test4_0x80A41D70/EnTest4_Update.asm") diff --git a/src/overlays/actors/ovl_En_Test5/z_en_test5.c b/src/overlays/actors/ovl_En_Test5/z_en_test5.c index 013da85ef9..670e262779 100644 --- a/src/overlays/actors/ovl_En_Test5/z_en_test5.c +++ b/src/overlays/actors/ovl_En_Test5/z_en_test5.c @@ -22,12 +22,12 @@ const ActorInit En_Test5_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Test5_0x80A903B0/func_80A903B0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Test5_0x80A903B0/func_80A903B0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Test5_0x80A903B0/EnTest5_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Test5_0x80A903B0/EnTest5_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Test5_0x80A903B0/EnTest5_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Test5_0x80A903B0/EnTest5_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Test5_0x80A903B0/func_80A90478.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Test5_0x80A903B0/func_80A90478.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Test5_0x80A903B0/EnTest5_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Test5_0x80A903B0/EnTest5_Update.asm") diff --git a/src/overlays/actors/ovl_En_Test6/z_en_test6.c b/src/overlays/actors/ovl_En_Test6/z_en_test6.c index 6ac1424a23..8ba3b887be 100644 --- a/src/overlays/actors/ovl_En_Test6/z_en_test6.c +++ b/src/overlays/actors/ovl_En_Test6/z_en_test6.c @@ -23,48 +23,48 @@ const ActorInit En_Test6_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Test6_0x80A90730/func_80A90730.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Test6_0x80A90730/func_80A90730.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Test6_0x80A90730/func_80A90C08.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Test6_0x80A90730/func_80A90C08.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Test6_0x80A90730/func_80A90C34.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Test6_0x80A90730/func_80A90C34.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Test6_0x80A90730/func_80A90C54.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Test6_0x80A90730/func_80A90C54.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Test6_0x80A90730/func_80A90D20.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Test6_0x80A90730/func_80A90D20.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Test6_0x80A90730/func_80A90D34.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Test6_0x80A90730/func_80A90D34.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Test6_0x80A90730/func_80A90FC0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Test6_0x80A90730/func_80A90FC0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Test6_0x80A90730/func_80A91324.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Test6_0x80A90730/func_80A91324.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Test6_0x80A90730/EnTest6_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Test6_0x80A90730/EnTest6_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Test6_0x80A90730/EnTest6_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Test6_0x80A90730/EnTest6_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Test6_0x80A90730/func_80A9156C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Test6_0x80A90730/func_80A9156C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Test6_0x80A90730/func_80A91690.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Test6_0x80A90730/func_80A91690.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Test6_0x80A90730/func_80A916F0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Test6_0x80A90730/func_80A916F0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Test6_0x80A90730/func_80A91760.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Test6_0x80A90730/func_80A91760.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Test6_0x80A90730/func_80A920C8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Test6_0x80A90730/func_80A920C8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Test6_0x80A90730/func_80A92118.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Test6_0x80A90730/func_80A92118.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Test6_0x80A90730/func_80A92188.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Test6_0x80A90730/func_80A92188.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Test6_0x80A90730/EnTest6_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Test6_0x80A90730/EnTest6_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Test6_0x80A90730/func_80A92950.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Test6_0x80A90730/func_80A92950.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Test6_0x80A90730/func_80A93298.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Test6_0x80A90730/func_80A93298.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Test6_0x80A90730/func_80A9369C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Test6_0x80A90730/func_80A9369C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Test6_0x80A90730/func_80A939E8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Test6_0x80A90730/func_80A939E8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Test6_0x80A90730/EnTest6_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Test6_0x80A90730/EnTest6_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Test7/z_en_test7.c b/src/overlays/actors/ovl_En_Test7/z_en_test7.c index 6bd0a990ec..22b0593da0 100644 --- a/src/overlays/actors/ovl_En_Test7/z_en_test7.c +++ b/src/overlays/actors/ovl_En_Test7/z_en_test7.c @@ -23,78 +23,78 @@ const ActorInit En_Test7_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Test7_0x80AF0820/func_80AF0820.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Test7_0x80AF0820/func_80AF0820.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Test7_0x80AF0820/func_80AF082C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Test7_0x80AF0820/func_80AF082C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Test7_0x80AF0820/func_80AF0838.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Test7_0x80AF0820/func_80AF0838.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Test7_0x80AF0820/func_80AF0984.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Test7_0x80AF0820/func_80AF0984.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Test7_0x80AF0820/func_80AF0C30.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Test7_0x80AF0820/func_80AF0C30.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Test7_0x80AF0820/func_80AF0CDC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Test7_0x80AF0820/func_80AF0CDC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Test7_0x80AF0820/func_80AF10D8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Test7_0x80AF0820/func_80AF10D8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Test7_0x80AF0820/func_80AF118C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Test7_0x80AF0820/func_80AF118C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Test7_0x80AF0820/func_80AF14FC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Test7_0x80AF0820/func_80AF14FC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Test7_0x80AF0820/func_80AF1730.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Test7_0x80AF0820/func_80AF1730.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Test7_0x80AF0820/EnTest7_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Test7_0x80AF0820/EnTest7_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Test7_0x80AF0820/EnTest7_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Test7_0x80AF0820/EnTest7_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Test7_0x80AF0820/func_80AF19A8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Test7_0x80AF0820/func_80AF19A8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Test7_0x80AF0820/func_80AF1A2C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Test7_0x80AF0820/func_80AF1A2C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Test7_0x80AF0820/func_80AF1B68.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Test7_0x80AF0820/func_80AF1B68.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Test7_0x80AF0820/func_80AF1CA0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Test7_0x80AF0820/func_80AF1CA0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Test7_0x80AF0820/func_80AF1E44.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Test7_0x80AF0820/func_80AF1E44.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Test7_0x80AF0820/func_80AF1F48.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Test7_0x80AF0820/func_80AF1F48.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Test7_0x80AF0820/func_80AF2030.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Test7_0x80AF0820/func_80AF2030.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Test7_0x80AF0820/func_80AF21E8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Test7_0x80AF0820/func_80AF21E8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Test7_0x80AF0820/func_80AF2318.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Test7_0x80AF0820/func_80AF2318.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Test7_0x80AF0820/func_80AF2350.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Test7_0x80AF0820/func_80AF2350.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Test7_0x80AF0820/func_80AF24D8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Test7_0x80AF0820/func_80AF24D8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Test7_0x80AF0820/func_80AF2654.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Test7_0x80AF0820/func_80AF2654.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Test7_0x80AF0820/func_80AF2808.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Test7_0x80AF0820/func_80AF2808.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Test7_0x80AF0820/func_80AF2854.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Test7_0x80AF0820/func_80AF2854.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Test7_0x80AF0820/func_80AF2938.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Test7_0x80AF0820/func_80AF2938.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Test7_0x80AF0820/func_80AF29C0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Test7_0x80AF0820/func_80AF29C0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Test7_0x80AF0820/func_80AF2AE8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Test7_0x80AF0820/func_80AF2AE8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Test7_0x80AF0820/func_80AF2BAC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Test7_0x80AF0820/func_80AF2BAC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Test7_0x80AF0820/func_80AF2C48.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Test7_0x80AF0820/func_80AF2C48.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Test7_0x80AF0820/func_80AF2DB4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Test7_0x80AF0820/func_80AF2DB4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Test7_0x80AF0820/func_80AF2EC8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Test7_0x80AF0820/func_80AF2EC8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Test7_0x80AF0820/func_80AF2F98.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Test7_0x80AF0820/func_80AF2F98.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Test7_0x80AF0820/func_80AF30F4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Test7_0x80AF0820/func_80AF30F4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Test7_0x80AF0820/EnTest7_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Test7_0x80AF0820/EnTest7_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Test7_0x80AF0820/func_80AF31D0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Test7_0x80AF0820/func_80AF31D0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Test7_0x80AF0820/EnTest7_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Test7_0x80AF0820/EnTest7_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Tg/z_en_tg.c b/src/overlays/actors/ovl_En_Tg/z_en_tg.c index 7b04953837..0b4017f73d 100644 --- a/src/overlays/actors/ovl_En_Tg/z_en_tg.c +++ b/src/overlays/actors/ovl_En_Tg/z_en_tg.c @@ -23,28 +23,28 @@ const ActorInit En_Tg_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tg_0x8098F800/func_8098F800.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tg_0x8098F800/func_8098F800.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tg_0x8098F800/func_8098F8A8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tg_0x8098F800/func_8098F8A8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tg_0x8098F800/func_8098F928.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tg_0x8098F800/func_8098F928.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tg_0x8098F800/EnTg_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tg_0x8098F800/EnTg_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tg_0x8098F800/EnTg_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tg_0x8098F800/EnTg_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tg_0x8098F800/func_8098FA70.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tg_0x8098F800/func_8098FA70.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tg_0x8098F800/EnTg_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tg_0x8098F800/EnTg_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tg_0x8098F800/func_8098FBB4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tg_0x8098F800/func_8098FBB4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tg_0x8098F800/func_8098FBD0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tg_0x8098F800/func_8098FBD0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tg_0x8098F800/EnTg_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tg_0x8098F800/EnTg_Draw.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tg_0x8098F800/func_8098FD50.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tg_0x8098F800/func_8098FD50.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tg_0x8098F800/func_8098FEA8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tg_0x8098F800/func_8098FEA8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tg_0x8098F800/func_8099000C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tg_0x8098F800/func_8099000C.asm") diff --git a/src/overlays/actors/ovl_En_Thiefbird/z_en_thiefbird.c b/src/overlays/actors/ovl_En_Thiefbird/z_en_thiefbird.c index 8d716bee05..bc5e7d4b83 100644 --- a/src/overlays/actors/ovl_En_Thiefbird/z_en_thiefbird.c +++ b/src/overlays/actors/ovl_En_Thiefbird/z_en_thiefbird.c @@ -23,70 +23,70 @@ const ActorInit En_Thiefbird_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Thiefbird_0x80C10770/EnThiefbird_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Thiefbird_0x80C10770/EnThiefbird_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Thiefbird_0x80C10770/EnThiefbird_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Thiefbird_0x80C10770/EnThiefbird_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Thiefbird_0x80C10770/func_80C10984.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Thiefbird_0x80C10770/func_80C10984.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Thiefbird_0x80C10770/func_80C10B0C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Thiefbird_0x80C10770/func_80C10B0C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Thiefbird_0x80C10770/func_80C10DE8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Thiefbird_0x80C10770/func_80C10DE8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Thiefbird_0x80C10770/func_80C10E98.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Thiefbird_0x80C10770/func_80C10E98.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Thiefbird_0x80C10770/func_80C11338.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Thiefbird_0x80C10770/func_80C11338.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Thiefbird_0x80C10770/func_80C11454.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Thiefbird_0x80C10770/func_80C11454.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Thiefbird_0x80C10770/func_80C114C0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Thiefbird_0x80C10770/func_80C114C0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Thiefbird_0x80C10770/func_80C11538.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Thiefbird_0x80C10770/func_80C11538.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Thiefbird_0x80C10770/func_80C11590.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Thiefbird_0x80C10770/func_80C11590.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Thiefbird_0x80C10770/func_80C118E4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Thiefbird_0x80C10770/func_80C118E4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Thiefbird_0x80C10770/func_80C1193C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Thiefbird_0x80C10770/func_80C1193C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Thiefbird_0x80C10770/func_80C11C60.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Thiefbird_0x80C10770/func_80C11C60.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Thiefbird_0x80C10770/func_80C11D14.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Thiefbird_0x80C10770/func_80C11D14.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Thiefbird_0x80C10770/func_80C11DC0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Thiefbird_0x80C10770/func_80C11DC0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Thiefbird_0x80C10770/func_80C11DF0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Thiefbird_0x80C10770/func_80C11DF0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Thiefbird_0x80C10770/func_80C11F6C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Thiefbird_0x80C10770/func_80C11F6C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Thiefbird_0x80C10770/func_80C1215C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Thiefbird_0x80C10770/func_80C1215C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Thiefbird_0x80C10770/func_80C12308.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Thiefbird_0x80C10770/func_80C12308.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Thiefbird_0x80C10770/func_80C12378.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Thiefbird_0x80C10770/func_80C12378.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Thiefbird_0x80C10770/func_80C1242C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Thiefbird_0x80C10770/func_80C1242C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Thiefbird_0x80C10770/func_80C124B0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Thiefbird_0x80C10770/func_80C124B0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Thiefbird_0x80C10770/func_80C126A8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Thiefbird_0x80C10770/func_80C126A8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Thiefbird_0x80C10770/func_80C126D8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Thiefbird_0x80C10770/func_80C126D8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Thiefbird_0x80C10770/func_80C12744.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Thiefbird_0x80C10770/func_80C12744.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Thiefbird_0x80C10770/func_80C127F4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Thiefbird_0x80C10770/func_80C127F4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Thiefbird_0x80C10770/func_80C12B1C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Thiefbird_0x80C10770/func_80C12B1C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Thiefbird_0x80C10770/func_80C12D00.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Thiefbird_0x80C10770/func_80C12D00.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Thiefbird_0x80C10770/EnThiefbird_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Thiefbird_0x80C10770/EnThiefbird_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Thiefbird_0x80C10770/func_80C130EC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Thiefbird_0x80C10770/func_80C130EC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Thiefbird_0x80C10770/func_80C1315C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Thiefbird_0x80C10770/func_80C1315C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Thiefbird_0x80C10770/func_80C13354.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Thiefbird_0x80C10770/func_80C13354.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Thiefbird_0x80C10770/EnThiefbird_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Thiefbird_0x80C10770/EnThiefbird_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Time_Tag/z_en_time_tag.c b/src/overlays/actors/ovl_En_Time_Tag/z_en_time_tag.c index 7405935916..71f71e0d95 100644 --- a/src/overlays/actors/ovl_En_Time_Tag/z_en_time_tag.c +++ b/src/overlays/actors/ovl_En_Time_Tag/z_en_time_tag.c @@ -22,38 +22,38 @@ const ActorInit En_Time_Tag_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Time_Tag_0x80AC9EA0/EnTimeTag_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Time_Tag_0x80AC9EA0/EnTimeTag_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Time_Tag_0x80AC9EA0/EnTimeTag_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Time_Tag_0x80AC9EA0/EnTimeTag_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Time_Tag_0x80AC9EA0/func_80AC9FD4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Time_Tag_0x80AC9EA0/func_80AC9FD4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Time_Tag_0x80AC9EA0/func_80AC9FE4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Time_Tag_0x80AC9EA0/func_80AC9FE4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Time_Tag_0x80AC9EA0/func_80ACA0A8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Time_Tag_0x80AC9EA0/func_80ACA0A8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Time_Tag_0x80AC9EA0/func_80ACA12C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Time_Tag_0x80AC9EA0/func_80ACA12C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Time_Tag_0x80AC9EA0/func_80ACA184.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Time_Tag_0x80AC9EA0/func_80ACA184.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Time_Tag_0x80AC9EA0/func_80ACA208.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Time_Tag_0x80AC9EA0/func_80ACA208.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Time_Tag_0x80AC9EA0/func_80ACA268.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Time_Tag_0x80AC9EA0/func_80ACA268.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Time_Tag_0x80AC9EA0/func_80ACA348.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Time_Tag_0x80AC9EA0/func_80ACA348.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Time_Tag_0x80AC9EA0/func_80ACA3C0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Time_Tag_0x80AC9EA0/func_80ACA3C0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Time_Tag_0x80AC9EA0/func_80ACA418.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Time_Tag_0x80AC9EA0/func_80ACA418.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Time_Tag_0x80AC9EA0/func_80ACA5F8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Time_Tag_0x80AC9EA0/func_80ACA5F8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Time_Tag_0x80AC9EA0/func_80ACA714.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Time_Tag_0x80AC9EA0/func_80ACA714.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Time_Tag_0x80AC9EA0/func_80ACA724.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Time_Tag_0x80AC9EA0/func_80ACA724.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Time_Tag_0x80AC9EA0/func_80ACA7C4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Time_Tag_0x80AC9EA0/func_80ACA7C4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Time_Tag_0x80AC9EA0/func_80ACA840.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Time_Tag_0x80AC9EA0/func_80ACA840.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Time_Tag_0x80AC9EA0/EnTimeTag_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Time_Tag_0x80AC9EA0/EnTimeTag_Update.asm") 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 ff3676d7cc..339f6a4e65 100644 --- a/src/overlays/actors/ovl_En_Tite/z_en_tite.c +++ b/src/overlays/actors/ovl_En_Tite/z_en_tite.c @@ -23,104 +23,104 @@ const ActorInit En_Tite_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tite_0x808937F0/EnTite_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tite_0x808937F0/EnTite_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tite_0x808937F0/EnTite_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tite_0x808937F0/EnTite_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tite_0x808937F0/func_80893A18.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tite_0x808937F0/func_80893A18.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tite_0x808937F0/func_80893A34.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tite_0x808937F0/func_80893A34.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tite_0x808937F0/func_80893A9C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tite_0x808937F0/func_80893A9C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tite_0x808937F0/func_80893ADC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tite_0x808937F0/func_80893ADC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tite_0x808937F0/func_80893B10.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tite_0x808937F0/func_80893B10.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tite_0x808937F0/func_80893B70.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tite_0x808937F0/func_80893B70.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tite_0x808937F0/func_80893BCC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tite_0x808937F0/func_80893BCC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tite_0x808937F0/func_80893DD4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tite_0x808937F0/func_80893DD4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tite_0x808937F0/func_80893E54.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tite_0x808937F0/func_80893E54.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tite_0x808937F0/func_80893ED4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tite_0x808937F0/func_80893ED4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tite_0x808937F0/func_80893F30.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tite_0x808937F0/func_80893F30.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tite_0x808937F0/func_80893FD0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tite_0x808937F0/func_80893FD0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tite_0x808937F0/func_80894024.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tite_0x808937F0/func_80894024.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tite_0x808937F0/func_8089408C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tite_0x808937F0/func_8089408C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tite_0x808937F0/func_808942B4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tite_0x808937F0/func_808942B4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tite_0x808937F0/func_80894414.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tite_0x808937F0/func_80894414.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tite_0x808937F0/func_80894454.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tite_0x808937F0/func_80894454.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tite_0x808937F0/func_8089452C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tite_0x808937F0/func_8089452C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tite_0x808937F0/func_808945B4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tite_0x808937F0/func_808945B4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tite_0x808937F0/func_808945EC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tite_0x808937F0/func_808945EC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tite_0x808937F0/func_80894638.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tite_0x808937F0/func_80894638.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tite_0x808937F0/func_8089484C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tite_0x808937F0/func_8089484C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tite_0x808937F0/func_80894910.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tite_0x808937F0/func_80894910.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tite_0x808937F0/func_80894B2C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tite_0x808937F0/func_80894B2C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tite_0x808937F0/func_80894BC8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tite_0x808937F0/func_80894BC8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tite_0x808937F0/func_80894DD0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tite_0x808937F0/func_80894DD0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tite_0x808937F0/func_80894E0C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tite_0x808937F0/func_80894E0C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tite_0x808937F0/func_80895020.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tite_0x808937F0/func_80895020.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tite_0x808937F0/func_808951B8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tite_0x808937F0/func_808951B8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tite_0x808937F0/func_808952EC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tite_0x808937F0/func_808952EC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tite_0x808937F0/func_80895424.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tite_0x808937F0/func_80895424.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tite_0x808937F0/func_808955E4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tite_0x808937F0/func_808955E4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tite_0x808937F0/func_80895640.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tite_0x808937F0/func_80895640.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tite_0x808937F0/func_808956B8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tite_0x808937F0/func_808956B8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tite_0x808937F0/func_808956FC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tite_0x808937F0/func_808956FC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tite_0x808937F0/func_80895738.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tite_0x808937F0/func_80895738.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tite_0x808937F0/func_8089595C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tite_0x808937F0/func_8089595C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tite_0x808937F0/func_80895A10.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tite_0x808937F0/func_80895A10.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tite_0x808937F0/func_80895AC0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tite_0x808937F0/func_80895AC0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tite_0x808937F0/func_80895CB0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tite_0x808937F0/func_80895CB0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tite_0x808937F0/func_80895D08.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tite_0x808937F0/func_80895D08.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tite_0x808937F0/func_80895DE8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tite_0x808937F0/func_80895DE8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tite_0x808937F0/func_80895E28.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tite_0x808937F0/func_80895E28.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tite_0x808937F0/func_80895FF8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tite_0x808937F0/func_80895FF8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tite_0x808937F0/func_808963B4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tite_0x808937F0/func_808963B4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tite_0x808937F0/EnTite_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tite_0x808937F0/EnTite_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tite_0x808937F0/func_80896750.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tite_0x808937F0/func_80896750.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tite_0x808937F0/func_80896788.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tite_0x808937F0/func_80896788.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tite_0x808937F0/EnTite_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tite_0x808937F0/EnTite_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Tk/z_en_tk.c b/src/overlays/actors/ovl_En_Tk/z_en_tk.c index 4b0509413c..18ae071cc8 100644 --- a/src/overlays/actors/ovl_En_Tk/z_en_tk.c +++ b/src/overlays/actors/ovl_En_Tk/z_en_tk.c @@ -23,116 +23,116 @@ const ActorInit En_Tk_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tk_0x80AEC460/func_80AEC460.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tk_0x80AEC460/func_80AEC460.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tk_0x80AEC460/func_80AEC524.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tk_0x80AEC460/func_80AEC524.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tk_0x80AEC460/func_80AEC658.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tk_0x80AEC460/func_80AEC658.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tk_0x80AEC460/EnTk_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tk_0x80AEC460/EnTk_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tk_0x80AEC460/EnTk_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tk_0x80AEC460/EnTk_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tk_0x80AEC460/func_80AECA3C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tk_0x80AEC460/func_80AECA3C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tk_0x80AEC460/func_80AECA90.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tk_0x80AEC460/func_80AECA90.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tk_0x80AEC460/func_80AECB0C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tk_0x80AEC460/func_80AECB0C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tk_0x80AEC460/func_80AECB6C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tk_0x80AEC460/func_80AECB6C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tk_0x80AEC460/func_80AECE0C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tk_0x80AEC460/func_80AECE0C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tk_0x80AEC460/func_80AECE60.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tk_0x80AEC460/func_80AECE60.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tk_0x80AEC460/func_80AED354.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tk_0x80AEC460/func_80AED354.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tk_0x80AEC460/func_80AED38C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tk_0x80AEC460/func_80AED38C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tk_0x80AEC460/func_80AED4F8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tk_0x80AEC460/func_80AED4F8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tk_0x80AEC460/func_80AED544.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tk_0x80AEC460/func_80AED544.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tk_0x80AEC460/func_80AED610.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tk_0x80AEC460/func_80AED610.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tk_0x80AEC460/func_80AED898.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tk_0x80AEC460/func_80AED898.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tk_0x80AEC460/func_80AED940.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tk_0x80AEC460/func_80AED940.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tk_0x80AEC460/func_80AEDBEC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tk_0x80AEC460/func_80AEDBEC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tk_0x80AEC460/func_80AEDC4C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tk_0x80AEC460/func_80AEDC4C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tk_0x80AEC460/func_80AEDCBC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tk_0x80AEC460/func_80AEDCBC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tk_0x80AEC460/func_80AEDD4C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tk_0x80AEC460/func_80AEDD4C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tk_0x80AEC460/func_80AEDDA0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tk_0x80AEC460/func_80AEDDA0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tk_0x80AEC460/func_80AEDE10.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tk_0x80AEC460/func_80AEDE10.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tk_0x80AEC460/func_80AEDF5C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tk_0x80AEC460/func_80AEDF5C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tk_0x80AEC460/func_80AEE2A8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tk_0x80AEC460/func_80AEE2A8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tk_0x80AEC460/func_80AEE2C0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tk_0x80AEC460/func_80AEE2C0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tk_0x80AEC460/func_80AEE300.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tk_0x80AEC460/func_80AEE300.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tk_0x80AEC460/func_80AEE374.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tk_0x80AEC460/func_80AEE374.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tk_0x80AEC460/func_80AEE414.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tk_0x80AEC460/func_80AEE414.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tk_0x80AEC460/func_80AEE478.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tk_0x80AEC460/func_80AEE478.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tk_0x80AEC460/func_80AEE4D0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tk_0x80AEC460/func_80AEE4D0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tk_0x80AEC460/func_80AEE650.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tk_0x80AEC460/func_80AEE650.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tk_0x80AEC460/func_80AEE6B8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tk_0x80AEC460/func_80AEE6B8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tk_0x80AEC460/func_80AEE784.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tk_0x80AEC460/func_80AEE784.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tk_0x80AEC460/func_80AEE7E0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tk_0x80AEC460/func_80AEE7E0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tk_0x80AEC460/func_80AEE86C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tk_0x80AEC460/func_80AEE86C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tk_0x80AEC460/func_80AEE9B0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tk_0x80AEC460/func_80AEE9B0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tk_0x80AEC460/func_80AEEA4C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tk_0x80AEC460/func_80AEEA4C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tk_0x80AEC460/func_80AEEAD4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tk_0x80AEC460/func_80AEEAD4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tk_0x80AEC460/func_80AEEB88.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tk_0x80AEC460/func_80AEEB88.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tk_0x80AEC460/func_80AEED38.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tk_0x80AEC460/func_80AEED38.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tk_0x80AEC460/func_80AEF048.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tk_0x80AEC460/func_80AEF048.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tk_0x80AEC460/func_80AEF094.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tk_0x80AEC460/func_80AEF094.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tk_0x80AEC460/func_80AEF15C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tk_0x80AEC460/func_80AEF15C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tk_0x80AEC460/func_80AEF1B4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tk_0x80AEC460/func_80AEF1B4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tk_0x80AEC460/func_80AEF1C4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tk_0x80AEC460/func_80AEF1C4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tk_0x80AEC460/func_80AEF210.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tk_0x80AEC460/func_80AEF210.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tk_0x80AEC460/func_80AEF220.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tk_0x80AEC460/func_80AEF220.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tk_0x80AEC460/func_80AEF278.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tk_0x80AEC460/func_80AEF278.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tk_0x80AEC460/func_80AEF2C8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tk_0x80AEC460/func_80AEF2C8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tk_0x80AEC460/func_80AEF2D8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tk_0x80AEC460/func_80AEF2D8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tk_0x80AEC460/EnTk_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tk_0x80AEC460/EnTk_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tk_0x80AEC460/func_80AEF5F4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tk_0x80AEC460/func_80AEF5F4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tk_0x80AEC460/func_80AEF65C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tk_0x80AEC460/func_80AEF65C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tk_0x80AEC460/func_80AEF6A4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tk_0x80AEC460/func_80AEF6A4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tk_0x80AEC460/EnTk_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tk_0x80AEC460/EnTk_Draw.asm") 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 c19f99a10b..f4c22d5e1f 100644 --- a/src/overlays/actors/ovl_En_Torch2/z_en_torch2.c +++ b/src/overlays/actors/ovl_En_Torch2/z_en_torch2.c @@ -23,14 +23,14 @@ const ActorInit En_Torch2_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Torch2_0x808A31B0/EnTorch2_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Torch2_0x808A31B0/EnTorch2_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Torch2_0x808A31B0/EnTorch2_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Torch2_0x808A31B0/EnTorch2_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Torch2_0x808A31B0/EnTorch2_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Torch2_0x808A31B0/EnTorch2_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Torch2_0x808A31B0/func_808A3428.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Torch2_0x808A31B0/func_808A3428.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Torch2_0x808A31B0/func_808A3458.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Torch2_0x808A31B0/func_808A3458.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Torch2_0x808A31B0/EnTorch2_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Torch2_0x808A31B0/EnTorch2_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Toto/z_en_toto.c b/src/overlays/actors/ovl_En_Toto/z_en_toto.c index 322a7b71f6..c2afb50df6 100644 --- a/src/overlays/actors/ovl_En_Toto/z_en_toto.c +++ b/src/overlays/actors/ovl_En_Toto/z_en_toto.c @@ -23,84 +23,84 @@ const ActorInit En_Toto_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Toto_0x80BA36C0/func_80BA36C0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Toto_0x80BA36C0/func_80BA36C0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Toto_0x80BA36C0/EnToto_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Toto_0x80BA36C0/EnToto_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Toto_0x80BA36C0/EnToto_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Toto_0x80BA36C0/EnToto_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Toto_0x80BA36C0/func_80BA383C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Toto_0x80BA36C0/func_80BA383C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Toto_0x80BA36C0/func_80BA3930.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Toto_0x80BA36C0/func_80BA3930.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Toto_0x80BA36C0/func_80BA397C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Toto_0x80BA36C0/func_80BA397C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Toto_0x80BA36C0/func_80BA39C8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Toto_0x80BA36C0/func_80BA39C8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Toto_0x80BA36C0/func_80BA3BFC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Toto_0x80BA36C0/func_80BA3BFC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Toto_0x80BA36C0/func_80BA3C88.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Toto_0x80BA36C0/func_80BA3C88.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Toto_0x80BA36C0/func_80BA3CC4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Toto_0x80BA36C0/func_80BA3CC4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Toto_0x80BA36C0/func_80BA3D38.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Toto_0x80BA36C0/func_80BA3D38.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Toto_0x80BA36C0/func_80BA3DBC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Toto_0x80BA36C0/func_80BA3DBC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Toto_0x80BA36C0/func_80BA3EC0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Toto_0x80BA36C0/func_80BA3EC0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Toto_0x80BA36C0/func_80BA3ED4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Toto_0x80BA36C0/func_80BA3ED4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Toto_0x80BA36C0/func_80BA3EE8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Toto_0x80BA36C0/func_80BA3EE8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Toto_0x80BA36C0/func_80BA3F2C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Toto_0x80BA36C0/func_80BA3F2C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Toto_0x80BA36C0/func_80BA3FB0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Toto_0x80BA36C0/func_80BA3FB0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Toto_0x80BA36C0/func_80BA3FCC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Toto_0x80BA36C0/func_80BA3FCC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Toto_0x80BA36C0/func_80BA402C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Toto_0x80BA36C0/func_80BA402C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Toto_0x80BA36C0/func_80BA407C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Toto_0x80BA36C0/func_80BA407C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Toto_0x80BA36C0/func_80BA40D4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Toto_0x80BA36C0/func_80BA40D4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Toto_0x80BA36C0/func_80BA4128.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Toto_0x80BA36C0/func_80BA4128.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Toto_0x80BA36C0/func_80BA415C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Toto_0x80BA36C0/func_80BA415C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Toto_0x80BA36C0/func_80BA4204.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Toto_0x80BA36C0/func_80BA4204.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Toto_0x80BA36C0/func_80BA42BC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Toto_0x80BA36C0/func_80BA42BC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Toto_0x80BA36C0/func_80BA43F4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Toto_0x80BA36C0/func_80BA43F4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Toto_0x80BA36C0/func_80BA445C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Toto_0x80BA36C0/func_80BA445C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Toto_0x80BA36C0/func_80BA44A0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Toto_0x80BA36C0/func_80BA44A0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Toto_0x80BA36C0/func_80BA44D4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Toto_0x80BA36C0/func_80BA44D4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Toto_0x80BA36C0/func_80BA4530.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Toto_0x80BA36C0/func_80BA4530.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Toto_0x80BA36C0/func_80BA46D8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Toto_0x80BA36C0/func_80BA46D8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Toto_0x80BA36C0/func_80BA4740.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Toto_0x80BA36C0/func_80BA4740.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Toto_0x80BA36C0/func_80BA47E0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Toto_0x80BA36C0/func_80BA47E0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Toto_0x80BA36C0/func_80BA49A4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Toto_0x80BA36C0/func_80BA49A4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Toto_0x80BA36C0/func_80BA4A00.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Toto_0x80BA36C0/func_80BA4A00.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Toto_0x80BA36C0/func_80BA4B24.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Toto_0x80BA36C0/func_80BA4B24.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Toto_0x80BA36C0/func_80BA4C0C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Toto_0x80BA36C0/func_80BA4C0C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Toto_0x80BA36C0/func_80BA4C44.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Toto_0x80BA36C0/func_80BA4C44.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Toto_0x80BA36C0/func_80BA4CB4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Toto_0x80BA36C0/func_80BA4CB4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Toto_0x80BA36C0/EnToto_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Toto_0x80BA36C0/EnToto_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Toto_0x80BA36C0/EnToto_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Toto_0x80BA36C0/EnToto_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Trt/z_en_trt.c b/src/overlays/actors/ovl_En_Trt/z_en_trt.c index 74334d2420..993b783aef 100644 --- a/src/overlays/actors/ovl_En_Trt/z_en_trt.c +++ b/src/overlays/actors/ovl_En_Trt/z_en_trt.c @@ -23,166 +23,166 @@ const ActorInit En_Trt_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/func_80A8B770.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Trt_0x80A8B770/func_80A8B770.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/func_80A8B80C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Trt_0x80A8B770/func_80A8B80C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/func_80A8B88C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Trt_0x80A8B770/func_80A8B88C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/func_80A8B964.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Trt_0x80A8B770/func_80A8B964.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/func_80A8B9B8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Trt_0x80A8B770/func_80A8B9B8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/func_80A8BA3C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Trt_0x80A8B770/func_80A8BA3C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/func_80A8BAF8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Trt_0x80A8B770/func_80A8BAF8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/func_80A8BB3C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Trt_0x80A8B770/func_80A8BB3C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/func_80A8BB8C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Trt_0x80A8B770/func_80A8BB8C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/func_80A8BC8C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Trt_0x80A8B770/func_80A8BC8C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/func_80A8BCD4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Trt_0x80A8B770/func_80A8BCD4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/func_80A8BD28.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Trt_0x80A8B770/func_80A8BD28.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/func_80A8BD7C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Trt_0x80A8B770/func_80A8BD7C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/func_80A8BDD0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Trt_0x80A8B770/func_80A8BDD0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/func_80A8BEF4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Trt_0x80A8B770/func_80A8BEF4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/func_80A8BF24.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Trt_0x80A8B770/func_80A8BF24.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/func_80A8BFE0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Trt_0x80A8B770/func_80A8BFE0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/func_80A8C168.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Trt_0x80A8B770/func_80A8C168.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/func_80A8C1E8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Trt_0x80A8B770/func_80A8C1E8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/func_80A8C288.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Trt_0x80A8B770/func_80A8C288.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/func_80A8C488.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Trt_0x80A8B770/func_80A8C488.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/func_80A8C564.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Trt_0x80A8B770/func_80A8C564.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/func_80A8C64C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Trt_0x80A8B770/func_80A8C64C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/func_80A8C6CC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Trt_0x80A8B770/func_80A8C6CC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/func_80A8C74C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Trt_0x80A8B770/func_80A8C74C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/func_80A8C8A0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Trt_0x80A8B770/func_80A8C8A0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/func_80A8C98C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Trt_0x80A8B770/func_80A8C98C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/func_80A8CA2C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Trt_0x80A8B770/func_80A8CA2C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/func_80A8CB0C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Trt_0x80A8B770/func_80A8CB0C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/func_80A8CBFC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Trt_0x80A8B770/func_80A8CBFC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/func_80A8CCB4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Trt_0x80A8B770/func_80A8CCB4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/func_80A8CCF0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Trt_0x80A8B770/func_80A8CCF0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/func_80A8CD2C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Trt_0x80A8B770/func_80A8CD2C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/func_80A8CEE8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Trt_0x80A8B770/func_80A8CEE8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/func_80A8D094.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Trt_0x80A8B770/func_80A8D094.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/func_80A8D380.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Trt_0x80A8B770/func_80A8D380.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/func_80A8D5C8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Trt_0x80A8B770/func_80A8D5C8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/func_80A8D880.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Trt_0x80A8B770/func_80A8D880.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/func_80A8D9CC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Trt_0x80A8B770/func_80A8D9CC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/func_80A8DAAC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Trt_0x80A8B770/func_80A8DAAC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/func_80A8DBBC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Trt_0x80A8B770/func_80A8DBBC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/func_80A8DD10.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Trt_0x80A8B770/func_80A8DD10.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/func_80A8DD60.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Trt_0x80A8B770/func_80A8DD60.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/func_80A8DEBC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Trt_0x80A8B770/func_80A8DEBC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/func_80A8DF20.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Trt_0x80A8B770/func_80A8DF20.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/func_80A8DFBC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Trt_0x80A8B770/func_80A8DFBC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/func_80A8E02C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Trt_0x80A8B770/func_80A8E02C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/func_80A8E0D0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Trt_0x80A8B770/func_80A8E0D0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/func_80A8E26C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Trt_0x80A8B770/func_80A8E26C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/func_80A8E30C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Trt_0x80A8B770/func_80A8E30C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/func_80A8E330.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Trt_0x80A8B770/func_80A8E330.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/func_80A8E3CC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Trt_0x80A8B770/func_80A8E3CC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/func_80A8E458.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Trt_0x80A8B770/func_80A8E458.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/func_80A8E4D8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Trt_0x80A8B770/func_80A8E4D8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/func_80A8E5A4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Trt_0x80A8B770/func_80A8E5A4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/func_80A8E754.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Trt_0x80A8B770/func_80A8E754.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/func_80A8E774.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Trt_0x80A8B770/func_80A8E774.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/func_80A8E79C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Trt_0x80A8B770/func_80A8E79C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/func_80A8E830.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Trt_0x80A8B770/func_80A8E830.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/func_80A8E890.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Trt_0x80A8B770/func_80A8E890.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/func_80A8E91C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Trt_0x80A8B770/func_80A8E91C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/func_80A8E92C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Trt_0x80A8B770/func_80A8E92C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/func_80A8E94C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Trt_0x80A8B770/func_80A8E94C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/func_80A8E9A4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Trt_0x80A8B770/func_80A8E9A4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/func_80A8EB4C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Trt_0x80A8B770/func_80A8EB4C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/func_80A8EB9C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Trt_0x80A8B770/func_80A8EB9C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/func_80A8EBD8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Trt_0x80A8B770/func_80A8EBD8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/func_80A8ECA4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Trt_0x80A8B770/func_80A8ECA4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/func_80A8ED3C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Trt_0x80A8B770/func_80A8ED3C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/func_80A8EFA4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Trt_0x80A8B770/func_80A8EFA4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/func_80A8EFF8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Trt_0x80A8B770/func_80A8EFF8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/func_80A8F268.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Trt_0x80A8B770/func_80A8F268.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/func_80A8F404.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Trt_0x80A8B770/func_80A8F404.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/EnTrt_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Trt_0x80A8B770/EnTrt_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/EnTrt_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Trt_0x80A8B770/EnTrt_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/EnTrt_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Trt_0x80A8B770/EnTrt_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/func_80A8F8C4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Trt_0x80A8B770/func_80A8F8C4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/func_80A8FA00.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Trt_0x80A8B770/func_80A8FA00.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/func_80A8FB34.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Trt_0x80A8B770/func_80A8FB34.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/func_80A8FBB4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Trt_0x80A8B770/func_80A8FBB4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/func_80A8FC64.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Trt_0x80A8B770/func_80A8FC64.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/EnTrt_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Trt_0x80A8B770/EnTrt_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Trt2/z_en_trt2.c b/src/overlays/actors/ovl_En_Trt2/z_en_trt2.c index 0d388df234..f2fd2caa2e 100644 --- a/src/overlays/actors/ovl_En_Trt2/z_en_trt2.c +++ b/src/overlays/actors/ovl_En_Trt2/z_en_trt2.c @@ -22,96 +22,96 @@ const ActorInit En_Trt2_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Trt2_0x80AD3380/func_80AD3380.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Trt2_0x80AD3380/func_80AD3380.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Trt2_0x80AD3380/func_80AD341C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Trt2_0x80AD3380/func_80AD341C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Trt2_0x80AD3380/func_80AD349C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Trt2_0x80AD3380/func_80AD349C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Trt2_0x80AD3380/func_80AD3530.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Trt2_0x80AD3380/func_80AD3530.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Trt2_0x80AD3380/func_80AD3664.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Trt2_0x80AD3380/func_80AD3664.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Trt2_0x80AD3380/func_80AD36EC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Trt2_0x80AD3380/func_80AD36EC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Trt2_0x80AD3380/func_80AD381C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Trt2_0x80AD3380/func_80AD381C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Trt2_0x80AD3380/func_80AD38B8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Trt2_0x80AD3380/func_80AD38B8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Trt2_0x80AD3380/func_80AD3A24.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Trt2_0x80AD3380/func_80AD3A24.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Trt2_0x80AD3380/func_80AD3AE4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Trt2_0x80AD3380/func_80AD3AE4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Trt2_0x80AD3380/func_80AD3B6C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Trt2_0x80AD3380/func_80AD3B6C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Trt2_0x80AD3380/func_80AD3BE4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Trt2_0x80AD3380/func_80AD3BE4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Trt2_0x80AD3380/func_80AD3C94.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Trt2_0x80AD3380/func_80AD3C94.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Trt2_0x80AD3380/func_80AD3CEC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Trt2_0x80AD3380/func_80AD3CEC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Trt2_0x80AD3380/func_80AD3DA4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Trt2_0x80AD3380/func_80AD3DA4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Trt2_0x80AD3380/func_80AD3E34.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Trt2_0x80AD3380/func_80AD3E34.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Trt2_0x80AD3380/func_80AD3EF0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Trt2_0x80AD3380/func_80AD3EF0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Trt2_0x80AD3380/func_80AD3FF4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Trt2_0x80AD3380/func_80AD3FF4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Trt2_0x80AD3380/func_80AD40AC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Trt2_0x80AD3380/func_80AD40AC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Trt2_0x80AD3380/func_80AD4110.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Trt2_0x80AD3380/func_80AD4110.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Trt2_0x80AD3380/func_80AD417C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Trt2_0x80AD3380/func_80AD417C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Trt2_0x80AD3380/func_80AD4298.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Trt2_0x80AD3380/func_80AD4298.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Trt2_0x80AD3380/func_80AD431C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Trt2_0x80AD3380/func_80AD431C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Trt2_0x80AD3380/func_80AD434C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Trt2_0x80AD3380/func_80AD434C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Trt2_0x80AD3380/func_80AD4550.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Trt2_0x80AD3380/func_80AD4550.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Trt2_0x80AD3380/func_80AD4608.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Trt2_0x80AD3380/func_80AD4608.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Trt2_0x80AD3380/func_80AD469C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Trt2_0x80AD3380/func_80AD469C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Trt2_0x80AD3380/func_80AD46F8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Trt2_0x80AD3380/func_80AD46F8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Trt2_0x80AD3380/func_80AD475C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Trt2_0x80AD3380/func_80AD475C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Trt2_0x80AD3380/func_80AD48F8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Trt2_0x80AD3380/func_80AD48F8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Trt2_0x80AD3380/func_80AD49B8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Trt2_0x80AD3380/func_80AD49B8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Trt2_0x80AD3380/func_80AD4A78.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Trt2_0x80AD3380/func_80AD4A78.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Trt2_0x80AD3380/func_80AD4B08.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Trt2_0x80AD3380/func_80AD4B08.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Trt2_0x80AD3380/func_80AD4B4C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Trt2_0x80AD3380/func_80AD4B4C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Trt2_0x80AD3380/func_80AD4C4C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Trt2_0x80AD3380/func_80AD4C4C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Trt2_0x80AD3380/func_80AD4CCC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Trt2_0x80AD3380/func_80AD4CCC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Trt2_0x80AD3380/func_80AD4DB4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Trt2_0x80AD3380/func_80AD4DB4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Trt2_0x80AD3380/func_80AD4FE4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Trt2_0x80AD3380/func_80AD4FE4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Trt2_0x80AD3380/EnTrt2_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Trt2_0x80AD3380/EnTrt2_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Trt2_0x80AD3380/EnTrt2_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Trt2_0x80AD3380/EnTrt2_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Trt2_0x80AD3380/EnTrt2_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Trt2_0x80AD3380/EnTrt2_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Trt2_0x80AD3380/func_80AD5234.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Trt2_0x80AD3380/func_80AD5234.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Trt2_0x80AD3380/func_80AD5394.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Trt2_0x80AD3380/func_80AD5394.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Trt2_0x80AD3380/func_80AD54C8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Trt2_0x80AD3380/func_80AD54C8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Trt2_0x80AD3380/func_80AD5584.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Trt2_0x80AD3380/func_80AD5584.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Trt2_0x80AD3380/func_80AD566C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Trt2_0x80AD3380/func_80AD566C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Trt2_0x80AD3380/func_80AD56E8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Trt2_0x80AD3380/func_80AD56E8.asm") diff --git a/src/overlays/actors/ovl_En_Tru/z_en_tru.c b/src/overlays/actors/ovl_En_Tru/z_en_tru.c index 4576fc62ed..61510e9707 100644 --- a/src/overlays/actors/ovl_En_Tru/z_en_tru.c +++ b/src/overlays/actors/ovl_En_Tru/z_en_tru.c @@ -23,72 +23,72 @@ const ActorInit En_Tru_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tru_0x80A85620/func_80A85620.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tru_0x80A85620/func_80A85620.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tru_0x80A85620/func_80A85788.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tru_0x80A85620/func_80A85788.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tru_0x80A85620/func_80A85AA4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tru_0x80A85620/func_80A85AA4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tru_0x80A85620/func_80A85BCC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tru_0x80A85620/func_80A85BCC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tru_0x80A85620/func_80A85E2C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tru_0x80A85620/func_80A85E2C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tru_0x80A85620/func_80A85F84.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tru_0x80A85620/func_80A85F84.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tru_0x80A85620/func_80A86384.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tru_0x80A85620/func_80A86384.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tru_0x80A85620/func_80A86460.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tru_0x80A85620/func_80A86460.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tru_0x80A85620/func_80A86674.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tru_0x80A85620/func_80A86674.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tru_0x80A85620/func_80A86770.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tru_0x80A85620/func_80A86770.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tru_0x80A85620/func_80A868F8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tru_0x80A85620/func_80A868F8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tru_0x80A85620/func_80A86924.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tru_0x80A85620/func_80A86924.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tru_0x80A85620/func_80A8697C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tru_0x80A85620/func_80A8697C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tru_0x80A85620/func_80A869DC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tru_0x80A85620/func_80A869DC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tru_0x80A85620/func_80A86B0C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tru_0x80A85620/func_80A86B0C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tru_0x80A85620/func_80A86BAC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tru_0x80A85620/func_80A86BAC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tru_0x80A85620/func_80A86DB8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tru_0x80A85620/func_80A86DB8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tru_0x80A85620/func_80A871E0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tru_0x80A85620/func_80A871E0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tru_0x80A85620/func_80A872AC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tru_0x80A85620/func_80A872AC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tru_0x80A85620/func_80A873B8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tru_0x80A85620/func_80A873B8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tru_0x80A85620/func_80A87400.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tru_0x80A85620/func_80A87400.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tru_0x80A85620/func_80A875AC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tru_0x80A85620/func_80A875AC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tru_0x80A85620/func_80A8777C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tru_0x80A85620/func_80A8777C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tru_0x80A85620/func_80A87880.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tru_0x80A85620/func_80A87880.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tru_0x80A85620/func_80A87B48.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tru_0x80A85620/func_80A87B48.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tru_0x80A85620/func_80A87DC0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tru_0x80A85620/func_80A87DC0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tru_0x80A85620/func_80A87FD0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tru_0x80A85620/func_80A87FD0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tru_0x80A85620/func_80A881E0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tru_0x80A85620/func_80A881E0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tru_0x80A85620/EnTru_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tru_0x80A85620/EnTru_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tru_0x80A85620/EnTru_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tru_0x80A85620/EnTru_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tru_0x80A85620/EnTru_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tru_0x80A85620/EnTru_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tru_0x80A85620/func_80A885B8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tru_0x80A85620/func_80A885B8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tru_0x80A85620/func_80A88698.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tru_0x80A85620/func_80A88698.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tru_0x80A85620/func_80A886D4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tru_0x80A85620/func_80A886D4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tru_0x80A85620/EnTru_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tru_0x80A85620/EnTru_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Tru_Mt/z_en_tru_mt.c b/src/overlays/actors/ovl_En_Tru_Mt/z_en_tru_mt.c index d09b9b0bf4..5739da6d7a 100644 --- a/src/overlays/actors/ovl_En_Tru_Mt/z_en_tru_mt.c +++ b/src/overlays/actors/ovl_En_Tru_Mt/z_en_tru_mt.c @@ -23,50 +23,50 @@ const ActorInit En_Tru_Mt_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tru_Mt_0x80B76030/func_80B76030.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tru_Mt_0x80B76030/func_80B76030.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tru_Mt_0x80B76030/func_80B76110.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tru_Mt_0x80B76030/func_80B76110.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tru_Mt_0x80B76030/func_80B76188.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tru_Mt_0x80B76030/func_80B76188.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tru_Mt_0x80B76030/func_80B761FC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tru_Mt_0x80B76030/func_80B761FC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tru_Mt_0x80B76030/func_80B76368.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tru_Mt_0x80B76030/func_80B76368.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tru_Mt_0x80B76030/func_80B763C4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tru_Mt_0x80B76030/func_80B763C4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tru_Mt_0x80B76030/func_80B76440.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tru_Mt_0x80B76030/func_80B76440.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tru_Mt_0x80B76030/func_80B76540.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tru_Mt_0x80B76030/func_80B76540.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tru_Mt_0x80B76030/func_80B76600.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tru_Mt_0x80B76030/func_80B76600.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tru_Mt_0x80B76030/func_80B7679C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tru_Mt_0x80B76030/func_80B7679C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tru_Mt_0x80B76030/func_80B768F0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tru_Mt_0x80B76030/func_80B768F0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tru_Mt_0x80B76030/func_80B76924.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tru_Mt_0x80B76030/func_80B76924.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tru_Mt_0x80B76030/func_80B76980.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tru_Mt_0x80B76030/func_80B76980.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tru_Mt_0x80B76030/func_80B76A64.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tru_Mt_0x80B76030/func_80B76A64.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tru_Mt_0x80B76030/func_80B76BB8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tru_Mt_0x80B76030/func_80B76BB8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tru_Mt_0x80B76030/func_80B76C38.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tru_Mt_0x80B76030/func_80B76C38.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tru_Mt_0x80B76030/EnTruMt_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tru_Mt_0x80B76030/EnTruMt_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tru_Mt_0x80B76030/EnTruMt_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tru_Mt_0x80B76030/EnTruMt_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tru_Mt_0x80B76030/EnTruMt_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tru_Mt_0x80B76030/EnTruMt_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tru_Mt_0x80B76030/func_80B76ED4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tru_Mt_0x80B76030/func_80B76ED4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tru_Mt_0x80B76030/func_80B77008.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tru_Mt_0x80B76030/func_80B77008.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tru_Mt_0x80B76030/func_80B77078.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tru_Mt_0x80B76030/func_80B77078.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tru_Mt_0x80B76030/func_80B77354.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tru_Mt_0x80B76030/func_80B77354.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tru_Mt_0x80B76030/EnTruMt_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tru_Mt_0x80B76030/EnTruMt_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Tsn/z_en_tsn.c b/src/overlays/actors/ovl_En_Tsn/z_en_tsn.c index b42f3fe851..180cc5641c 100644 --- a/src/overlays/actors/ovl_En_Tsn/z_en_tsn.c +++ b/src/overlays/actors/ovl_En_Tsn/z_en_tsn.c @@ -23,44 +23,44 @@ const ActorInit En_Tsn_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tsn_0x80ADFCA0/func_80ADFCA0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tsn_0x80ADFCA0/func_80ADFCA0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tsn_0x80ADFCA0/func_80ADFCEC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tsn_0x80ADFCA0/func_80ADFCEC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tsn_0x80ADFCA0/EnTsn_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tsn_0x80ADFCA0/EnTsn_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tsn_0x80ADFCA0/EnTsn_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tsn_0x80ADFCA0/EnTsn_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tsn_0x80ADFCA0/func_80ADFF84.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tsn_0x80ADFCA0/func_80ADFF84.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tsn_0x80ADFCA0/func_80AE0010.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tsn_0x80ADFCA0/func_80AE0010.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tsn_0x80ADFCA0/func_80AE0304.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tsn_0x80ADFCA0/func_80AE0304.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tsn_0x80ADFCA0/func_80AE0418.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tsn_0x80ADFCA0/func_80AE0418.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tsn_0x80ADFCA0/func_80AE0460.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tsn_0x80ADFCA0/func_80AE0460.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tsn_0x80ADFCA0/func_80AE04C4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tsn_0x80ADFCA0/func_80AE04C4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tsn_0x80ADFCA0/func_80AE04FC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tsn_0x80ADFCA0/func_80AE04FC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tsn_0x80ADFCA0/func_80AE0698.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tsn_0x80ADFCA0/func_80AE0698.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tsn_0x80ADFCA0/func_80AE0704.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tsn_0x80ADFCA0/func_80AE0704.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tsn_0x80ADFCA0/func_80AE0C88.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tsn_0x80ADFCA0/func_80AE0C88.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tsn_0x80ADFCA0/func_80AE0D10.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tsn_0x80ADFCA0/func_80AE0D10.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tsn_0x80ADFCA0/func_80AE0D78.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tsn_0x80ADFCA0/func_80AE0D78.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tsn_0x80ADFCA0/EnTsn_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tsn_0x80ADFCA0/EnTsn_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tsn_0x80ADFCA0/func_80AE0F84.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tsn_0x80ADFCA0/func_80AE0F84.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tsn_0x80ADFCA0/func_80AE0FA8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tsn_0x80ADFCA0/func_80AE0FA8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tsn_0x80ADFCA0/func_80AE1024.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tsn_0x80ADFCA0/func_80AE1024.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tsn_0x80ADFCA0/EnTsn_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tsn_0x80ADFCA0/EnTsn_Draw.asm") 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 2f6af82038..f65d638bb0 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 @@ -23,24 +23,24 @@ const ActorInit En_Tubo_Trap_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tubo_Trap_0x809307E0/EnTuboTrap_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tubo_Trap_0x809307E0/EnTuboTrap_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tubo_Trap_0x809307E0/EnTuboTrap_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tubo_Trap_0x809307E0/EnTuboTrap_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tubo_Trap_0x809307E0/func_8093089C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tubo_Trap_0x809307E0/func_8093089C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tubo_Trap_0x809307E0/func_809308F4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tubo_Trap_0x809307E0/func_809308F4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tubo_Trap_0x809307E0/func_80930B60.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tubo_Trap_0x809307E0/func_80930B60.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tubo_Trap_0x809307E0/func_80930DDC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tubo_Trap_0x809307E0/func_80930DDC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tubo_Trap_0x809307E0/func_80931004.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tubo_Trap_0x809307E0/func_80931004.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tubo_Trap_0x809307E0/func_80931138.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tubo_Trap_0x809307E0/func_80931138.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tubo_Trap_0x809307E0/func_809311C4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tubo_Trap_0x809307E0/func_809311C4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tubo_Trap_0x809307E0/EnTuboTrap_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tubo_Trap_0x809307E0/EnTuboTrap_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Tubo_Trap_0x809307E0/EnTuboTrap_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Tubo_Trap_0x809307E0/EnTuboTrap_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Twig/z_en_twig.c b/src/overlays/actors/ovl_En_Twig/z_en_twig.c index efe7d91823..c656347ada 100644 --- a/src/overlays/actors/ovl_En_Twig/z_en_twig.c +++ b/src/overlays/actors/ovl_En_Twig/z_en_twig.c @@ -23,22 +23,22 @@ const ActorInit En_Twig_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Twig_0x80AC0830/EnTwig_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Twig_0x80AC0830/EnTwig_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Twig_0x80AC0830/EnTwig_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Twig_0x80AC0830/EnTwig_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Twig_0x80AC0830/func_80AC0A54.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Twig_0x80AC0830/func_80AC0A54.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Twig_0x80AC0830/func_80AC0A6C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Twig_0x80AC0830/func_80AC0A6C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Twig_0x80AC0830/func_80AC0A7C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Twig_0x80AC0830/func_80AC0A7C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Twig_0x80AC0830/func_80AC0AC8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Twig_0x80AC0830/func_80AC0AC8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Twig_0x80AC0830/func_80AC0CC4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Twig_0x80AC0830/func_80AC0CC4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Twig_0x80AC0830/func_80AC0D2C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Twig_0x80AC0830/func_80AC0D2C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Twig_0x80AC0830/EnTwig_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Twig_0x80AC0830/EnTwig_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Twig_0x80AC0830/EnTwig_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Twig_0x80AC0830/EnTwig_Draw.asm") 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 1b6e7f6261..aa3a9df26f 100644 --- a/src/overlays/actors/ovl_En_Viewer/z_en_viewer.c +++ b/src/overlays/actors/ovl_En_Viewer/z_en_viewer.c @@ -23,22 +23,22 @@ const ActorInit En_Viewer_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Viewer_0x8089EE20/func_8089EE20.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Viewer_0x8089EE20/func_8089EE20.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Viewer_0x8089EE20/EnViewer_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Viewer_0x8089EE20/EnViewer_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Viewer_0x8089EE20/EnViewer_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Viewer_0x8089EE20/EnViewer_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Viewer_0x8089EE20/func_8089F014.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Viewer_0x8089EE20/func_8089F014.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Viewer_0x8089EE20/func_8089F0A0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Viewer_0x8089EE20/func_8089F0A0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Viewer_0x8089EE20/func_8089F17C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Viewer_0x8089EE20/func_8089F17C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Viewer_0x8089EE20/func_8089F218.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Viewer_0x8089EE20/func_8089F218.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Viewer_0x8089EE20/func_8089F2C4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Viewer_0x8089EE20/func_8089F2C4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Viewer_0x8089EE20/EnViewer_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Viewer_0x8089EE20/EnViewer_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Viewer_0x8089EE20/EnViewer_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Viewer_0x8089EE20/EnViewer_Draw.asm") 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 39bd903833..7b59ace493 100644 --- a/src/overlays/actors/ovl_En_Vm/z_en_vm.c +++ b/src/overlays/actors/ovl_En_Vm/z_en_vm.c @@ -23,40 +23,40 @@ const ActorInit En_Vm_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Vm_0x808CC260/EnVm_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Vm_0x808CC260/EnVm_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Vm_0x808CC260/EnVm_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Vm_0x808CC260/EnVm_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Vm_0x808CC260/func_808CC420.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Vm_0x808CC260/func_808CC420.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Vm_0x808CC260/func_808CC490.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Vm_0x808CC260/func_808CC490.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Vm_0x808CC260/func_808CC5C4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Vm_0x808CC260/func_808CC5C4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Vm_0x808CC260/func_808CC610.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Vm_0x808CC260/func_808CC610.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Vm_0x808CC260/func_808CC788.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Vm_0x808CC260/func_808CC788.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Vm_0x808CC260/func_808CC820.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Vm_0x808CC260/func_808CC820.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Vm_0x808CC260/func_808CCA10.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Vm_0x808CC260/func_808CCA10.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Vm_0x808CC260/func_808CCAA4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Vm_0x808CC260/func_808CCAA4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Vm_0x808CC260/func_808CCB08.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Vm_0x808CC260/func_808CCB08.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Vm_0x808CC260/func_808CCB50.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Vm_0x808CC260/func_808CCB50.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Vm_0x808CC260/func_808CCBE4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Vm_0x808CC260/func_808CCBE4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Vm_0x808CC260/func_808CCCF0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Vm_0x808CC260/func_808CCCF0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Vm_0x808CC260/func_808CCDE4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Vm_0x808CC260/func_808CCDE4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Vm_0x808CC260/EnVm_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Vm_0x808CC260/EnVm_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Vm_0x808CC260/func_808CD020.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Vm_0x808CC260/func_808CD020.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Vm_0x808CC260/func_808CD08C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Vm_0x808CC260/func_808CD08C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Vm_0x808CC260/EnVm_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Vm_0x808CC260/EnVm_Draw.asm") 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 49d4809752..3403c6a736 100644 --- a/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c +++ b/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c @@ -23,76 +23,76 @@ const ActorInit En_Wallmas_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wallmas_0x80874810/EnWallmas_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wallmas_0x80874810/EnWallmas_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wallmas_0x80874810/EnWallmas_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wallmas_0x80874810/EnWallmas_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wallmas_0x80874810/func_80874A88.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wallmas_0x80874810/func_80874A88.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wallmas_0x80874810/func_80874B04.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wallmas_0x80874810/func_80874B04.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wallmas_0x80874810/func_80874B88.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wallmas_0x80874810/func_80874B88.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wallmas_0x80874810/func_80874BE4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wallmas_0x80874810/func_80874BE4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wallmas_0x80874810/func_80874D1C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wallmas_0x80874810/func_80874D1C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wallmas_0x80874810/func_80874DE8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wallmas_0x80874810/func_80874DE8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wallmas_0x80874810/func_80874F14.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wallmas_0x80874810/func_80874F14.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wallmas_0x80874810/func_80874FD8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wallmas_0x80874810/func_80874FD8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wallmas_0x80874810/func_80875014.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wallmas_0x80874810/func_80875014.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wallmas_0x80874810/func_80875054.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wallmas_0x80874810/func_80875054.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wallmas_0x80874810/func_808750B8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wallmas_0x80874810/func_808750B8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wallmas_0x80874810/func_80875108.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wallmas_0x80874810/func_80875108.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wallmas_0x80874810/func_808751C4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wallmas_0x80874810/func_808751C4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wallmas_0x80874810/func_8087520C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wallmas_0x80874810/func_8087520C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wallmas_0x80874810/func_80875248.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wallmas_0x80874810/func_80875248.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wallmas_0x80874810/func_808752CC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wallmas_0x80874810/func_808752CC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wallmas_0x80874810/func_808753F0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wallmas_0x80874810/func_808753F0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wallmas_0x80874810/func_80875484.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wallmas_0x80874810/func_80875484.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wallmas_0x80874810/func_80875518.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wallmas_0x80874810/func_80875518.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wallmas_0x80874810/func_8087556C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wallmas_0x80874810/func_8087556C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wallmas_0x80874810/func_808755A8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wallmas_0x80874810/func_808755A8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wallmas_0x80874810/func_80875638.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wallmas_0x80874810/func_80875638.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wallmas_0x80874810/func_808756AC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wallmas_0x80874810/func_808756AC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wallmas_0x80874810/func_8087571C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wallmas_0x80874810/func_8087571C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wallmas_0x80874810/func_808758C8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wallmas_0x80874810/func_808758C8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wallmas_0x80874810/func_80875910.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wallmas_0x80874810/func_80875910.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wallmas_0x80874810/func_8087596C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wallmas_0x80874810/func_8087596C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wallmas_0x80874810/func_808759B8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wallmas_0x80874810/func_808759B8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wallmas_0x80874810/func_80875A0C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wallmas_0x80874810/func_80875A0C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wallmas_0x80874810/func_80875A74.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wallmas_0x80874810/func_80875A74.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wallmas_0x80874810/EnWallmas_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wallmas_0x80874810/EnWallmas_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wallmas_0x80874810/func_80875F04.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wallmas_0x80874810/func_80875F04.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wallmas_0x80874810/func_808760A4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wallmas_0x80874810/func_808760A4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wallmas_0x80874810/func_80876118.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wallmas_0x80874810/func_80876118.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wallmas_0x80874810/EnWallmas_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wallmas_0x80874810/EnWallmas_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Warp_Uzu/z_en_warp_uzu.c b/src/overlays/actors/ovl_En_Warp_Uzu/z_en_warp_uzu.c index fa49dfda5e..8188b90bf1 100644 --- a/src/overlays/actors/ovl_En_Warp_Uzu/z_en_warp_uzu.c +++ b/src/overlays/actors/ovl_En_Warp_Uzu/z_en_warp_uzu.c @@ -23,18 +23,18 @@ const ActorInit En_Warp_Uzu_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Warp_Uzu_0x80A66180/EnWarpUzu_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Warp_Uzu_0x80A66180/EnWarpUzu_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Warp_Uzu_0x80A66180/EnWarpUzu_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Warp_Uzu_0x80A66180/EnWarpUzu_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Warp_Uzu_0x80A66180/func_80A66208.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Warp_Uzu_0x80A66180/func_80A66208.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Warp_Uzu_0x80A66180/func_80A66278.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Warp_Uzu_0x80A66180/func_80A66278.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Warp_Uzu_0x80A66180/func_80A66384.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Warp_Uzu_0x80A66180/func_80A66384.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Warp_Uzu_0x80A66180/func_80A663E8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Warp_Uzu_0x80A66180/func_80A663E8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Warp_Uzu_0x80A66180/EnWarpUzu_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Warp_Uzu_0x80A66180/EnWarpUzu_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Warp_Uzu_0x80A66180/EnWarpUzu_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Warp_Uzu_0x80A66180/EnWarpUzu_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Warp_tag/z_en_warp_tag.c b/src/overlays/actors/ovl_En_Warp_tag/z_en_warp_tag.c index 51d242d911..fd6e426599 100644 --- a/src/overlays/actors/ovl_En_Warp_tag/z_en_warp_tag.c +++ b/src/overlays/actors/ovl_En_Warp_tag/z_en_warp_tag.c @@ -22,22 +22,22 @@ const ActorInit En_Warp_tag_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Warp_tag_0x809C0760/EnWarptag_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Warp_tag_0x809C0760/EnWarptag_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Warp_tag_0x809C0760/EnWarptag_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Warp_tag_0x809C0760/EnWarptag_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Warp_tag_0x809C0760/func_809C085C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Warp_tag_0x809C0760/func_809C085C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Warp_tag_0x809C0760/func_809C08E0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Warp_tag_0x809C0760/func_809C08E0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Warp_tag_0x809C0760/func_809C09A0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Warp_tag_0x809C0760/func_809C09A0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Warp_tag_0x809C0760/func_809C0A20.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Warp_tag_0x809C0760/func_809C0A20.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Warp_tag_0x809C0760/func_809C0AB4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Warp_tag_0x809C0760/func_809C0AB4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Warp_tag_0x809C0760/func_809C0E30.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Warp_tag_0x809C0760/func_809C0E30.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Warp_tag_0x809C0760/EnWarptag_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Warp_tag_0x809C0760/EnWarptag_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Warp_tag_0x809C0760/func_809C0F3C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Warp_tag_0x809C0760/func_809C0F3C.asm") diff --git a/src/overlays/actors/ovl_En_Water_Effect/z_en_water_effect.c b/src/overlays/actors/ovl_En_Water_Effect/z_en_water_effect.c index b38936c530..1f79e2bcd4 100644 --- a/src/overlays/actors/ovl_En_Water_Effect/z_en_water_effect.c +++ b/src/overlays/actors/ovl_En_Water_Effect/z_en_water_effect.c @@ -23,24 +23,24 @@ const ActorInit En_Water_Effect_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Water_Effect_0x80A587A0/func_80A587A0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Water_Effect_0x80A587A0/func_80A587A0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Water_Effect_0x80A587A0/func_80A58908.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Water_Effect_0x80A587A0/func_80A58908.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Water_Effect_0x80A587A0/EnWaterEffect_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Water_Effect_0x80A587A0/EnWaterEffect_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Water_Effect_0x80A587A0/EnWaterEffect_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Water_Effect_0x80A587A0/EnWaterEffect_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Water_Effect_0x80A587A0/EnWaterEffect_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Water_Effect_0x80A587A0/EnWaterEffect_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Water_Effect_0x80A587A0/EnWaterEffect_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Water_Effect_0x80A587A0/EnWaterEffect_Draw.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Water_Effect_0x80A587A0/func_80A599E8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Water_Effect_0x80A587A0/func_80A599E8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Water_Effect_0x80A587A0/func_80A59C04.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Water_Effect_0x80A587A0/func_80A59C04.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Water_Effect_0x80A587A0/func_80A5A184.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Water_Effect_0x80A587A0/func_80A5A184.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Water_Effect_0x80A587A0/func_80A5A534.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Water_Effect_0x80A587A0/func_80A5A534.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Water_Effect_0x80A587A0/func_80A5A6B8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Water_Effect_0x80A587A0/func_80A5A6B8.asm") diff --git a/src/overlays/actors/ovl_En_Wdhand/z_en_wdhand.c b/src/overlays/actors/ovl_En_Wdhand/z_en_wdhand.c index 8ec23ed5d9..08103d7847 100644 --- a/src/overlays/actors/ovl_En_Wdhand/z_en_wdhand.c +++ b/src/overlays/actors/ovl_En_Wdhand/z_en_wdhand.c @@ -23,50 +23,50 @@ const ActorInit En_Wdhand_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wdhand_0x80AF43F0/EnWdhand_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wdhand_0x80AF43F0/EnWdhand_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wdhand_0x80AF43F0/EnWdhand_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wdhand_0x80AF43F0/EnWdhand_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wdhand_0x80AF43F0/func_80AF4608.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wdhand_0x80AF43F0/func_80AF4608.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wdhand_0x80AF43F0/func_80AF4670.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wdhand_0x80AF43F0/func_80AF4670.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wdhand_0x80AF43F0/func_80AF46F0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wdhand_0x80AF43F0/func_80AF46F0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wdhand_0x80AF43F0/func_80AF488C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wdhand_0x80AF43F0/func_80AF488C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wdhand_0x80AF43F0/func_80AF48D0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wdhand_0x80AF43F0/func_80AF48D0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wdhand_0x80AF43F0/func_80AF4964.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wdhand_0x80AF43F0/func_80AF4964.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wdhand_0x80AF43F0/func_80AF4A88.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wdhand_0x80AF43F0/func_80AF4A88.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wdhand_0x80AF43F0/func_80AF4C18.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wdhand_0x80AF43F0/func_80AF4C18.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wdhand_0x80AF43F0/func_80AF4C64.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wdhand_0x80AF43F0/func_80AF4C64.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wdhand_0x80AF43F0/func_80AF4ED0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wdhand_0x80AF43F0/func_80AF4ED0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wdhand_0x80AF43F0/func_80AF4F30.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wdhand_0x80AF43F0/func_80AF4F30.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wdhand_0x80AF43F0/func_80AF4F6C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wdhand_0x80AF43F0/func_80AF4F6C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wdhand_0x80AF43F0/func_80AF4FF8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wdhand_0x80AF43F0/func_80AF4FF8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wdhand_0x80AF43F0/func_80AF5130.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wdhand_0x80AF43F0/func_80AF5130.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wdhand_0x80AF43F0/func_80AF520C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wdhand_0x80AF43F0/func_80AF520C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wdhand_0x80AF43F0/func_80AF5650.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wdhand_0x80AF43F0/func_80AF5650.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wdhand_0x80AF43F0/func_80AF56A0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wdhand_0x80AF43F0/func_80AF56A0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wdhand_0x80AF43F0/func_80AF5820.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wdhand_0x80AF43F0/func_80AF5820.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wdhand_0x80AF43F0/func_80AF5E3C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wdhand_0x80AF43F0/func_80AF5E3C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wdhand_0x80AF43F0/EnWdhand_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wdhand_0x80AF43F0/EnWdhand_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wdhand_0x80AF43F0/func_80AF5FE4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wdhand_0x80AF43F0/func_80AF5FE4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wdhand_0x80AF43F0/EnWdhand_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wdhand_0x80AF43F0/EnWdhand_Draw.asm") 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 3533ecda82..f031ce670b 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 @@ -23,56 +23,56 @@ const ActorInit En_Weather_Tag_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Weather_Tag_0x80966410/func_80966410.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Weather_Tag_0x80966410/func_80966410.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Weather_Tag_0x80966410/EnWeatherTag_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Weather_Tag_0x80966410/EnWeatherTag_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Weather_Tag_0x80966410/EnWeatherTag_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Weather_Tag_0x80966410/EnWeatherTag_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Weather_Tag_0x80966410/func_80966608.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Weather_Tag_0x80966410/func_80966608.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Weather_Tag_0x80966410/func_80966758.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Weather_Tag_0x80966410/func_80966758.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Weather_Tag_0x80966410/func_8096689C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Weather_Tag_0x80966410/func_8096689C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Weather_Tag_0x80966410/func_80966A08.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Weather_Tag_0x80966410/func_80966A08.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Weather_Tag_0x80966410/func_80966A68.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Weather_Tag_0x80966410/func_80966A68.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Weather_Tag_0x80966410/func_80966AE4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Weather_Tag_0x80966410/func_80966AE4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Weather_Tag_0x80966410/func_80966B08.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Weather_Tag_0x80966410/func_80966B08.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Weather_Tag_0x80966410/func_80966BF4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Weather_Tag_0x80966410/func_80966BF4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Weather_Tag_0x80966410/func_80966D20.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Weather_Tag_0x80966410/func_80966D20.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Weather_Tag_0x80966410/func_80966E0C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Weather_Tag_0x80966410/func_80966E0C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Weather_Tag_0x80966410/func_80966E84.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Weather_Tag_0x80966410/func_80966E84.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Weather_Tag_0x80966410/func_80966EF0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Weather_Tag_0x80966410/func_80966EF0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Weather_Tag_0x80966410/func_80966F74.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Weather_Tag_0x80966410/func_80966F74.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Weather_Tag_0x80966410/func_80966FEC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Weather_Tag_0x80966410/func_80966FEC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Weather_Tag_0x80966410/func_80967060.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Weather_Tag_0x80966410/func_80967060.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Weather_Tag_0x80966410/func_80967148.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Weather_Tag_0x80966410/func_80967148.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Weather_Tag_0x80966410/func_809671A8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Weather_Tag_0x80966410/func_809671A8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Weather_Tag_0x80966410/func_809671B8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Weather_Tag_0x80966410/func_809671B8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Weather_Tag_0x80966410/func_80967250.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Weather_Tag_0x80966410/func_80967250.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Weather_Tag_0x80966410/func_809672DC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Weather_Tag_0x80966410/func_809672DC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Weather_Tag_0x80966410/func_809674C8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Weather_Tag_0x80966410/func_809674C8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Weather_Tag_0x80966410/func_80967608.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Weather_Tag_0x80966410/func_80967608.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Weather_Tag_0x80966410/EnWeatherTag_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Weather_Tag_0x80966410/EnWeatherTag_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Weather_Tag_0x80966410/EnWeatherTag_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Weather_Tag_0x80966410/EnWeatherTag_Draw.asm") 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 7a6c2617b6..0d12fe69cc 100644 --- a/src/overlays/actors/ovl_En_Wf/z_en_wf.c +++ b/src/overlays/actors/ovl_En_Wf/z_en_wf.c @@ -23,116 +23,116 @@ const ActorInit En_Wf_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wf_0x80990310/EnWf_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wf_0x80990310/EnWf_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wf_0x80990310/EnWf_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wf_0x80990310/EnWf_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wf_0x80990310/func_809907D4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wf_0x80990310/func_809907D4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wf_0x80990310/func_80990854.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wf_0x80990310/func_80990854.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wf_0x80990310/func_809908E0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wf_0x80990310/func_809908E0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wf_0x80990310/func_80990948.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wf_0x80990310/func_80990948.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wf_0x80990310/func_80990C6C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wf_0x80990310/func_80990C6C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wf_0x80990310/func_80990E4C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wf_0x80990310/func_80990E4C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wf_0x80990310/func_80990EAC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wf_0x80990310/func_80990EAC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wf_0x80990310/func_80990ED4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wf_0x80990310/func_80990ED4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wf_0x80990310/func_80990F0C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wf_0x80990310/func_80990F0C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wf_0x80990310/func_80990F50.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wf_0x80990310/func_80990F50.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wf_0x80990310/func_80990FC8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wf_0x80990310/func_80990FC8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wf_0x80990310/func_80991040.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wf_0x80990310/func_80991040.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wf_0x80990310/func_809910F0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wf_0x80990310/func_809910F0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wf_0x80990310/func_80991174.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wf_0x80990310/func_80991174.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wf_0x80990310/func_80991200.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wf_0x80990310/func_80991200.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wf_0x80990310/func_80991280.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wf_0x80990310/func_80991280.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wf_0x80990310/func_80991438.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wf_0x80990310/func_80991438.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wf_0x80990310/func_8099149C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wf_0x80990310/func_8099149C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wf_0x80990310/func_80991738.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wf_0x80990310/func_80991738.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wf_0x80990310/func_8099177C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wf_0x80990310/func_8099177C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wf_0x80990310/func_80991948.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wf_0x80990310/func_80991948.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wf_0x80990310/func_809919F4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wf_0x80990310/func_809919F4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wf_0x80990310/func_80991C04.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wf_0x80990310/func_80991C04.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wf_0x80990310/func_80991C80.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wf_0x80990310/func_80991C80.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wf_0x80990310/func_80991FD8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wf_0x80990310/func_80991FD8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wf_0x80990310/func_80992068.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wf_0x80990310/func_80992068.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wf_0x80990310/func_8099223C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wf_0x80990310/func_8099223C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wf_0x80990310/func_809922B4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wf_0x80990310/func_809922B4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wf_0x80990310/func_809923B0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wf_0x80990310/func_809923B0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wf_0x80990310/func_809923E4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wf_0x80990310/func_809923E4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wf_0x80990310/func_8099245C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wf_0x80990310/func_8099245C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wf_0x80990310/func_809924EC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wf_0x80990310/func_809924EC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wf_0x80990310/func_809926D0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wf_0x80990310/func_809926D0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wf_0x80990310/func_80992784.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wf_0x80990310/func_80992784.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wf_0x80990310/func_8099282C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wf_0x80990310/func_8099282C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wf_0x80990310/func_809928CC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wf_0x80990310/func_809928CC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wf_0x80990310/func_80992A74.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wf_0x80990310/func_80992A74.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wf_0x80990310/func_80992B8C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wf_0x80990310/func_80992B8C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wf_0x80990310/func_80992D6C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wf_0x80990310/func_80992D6C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wf_0x80990310/func_80992E0C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wf_0x80990310/func_80992E0C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wf_0x80990310/func_80992FD4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wf_0x80990310/func_80992FD4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wf_0x80990310/func_80993018.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wf_0x80990310/func_80993018.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wf_0x80990310/func_80993148.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wf_0x80990310/func_80993148.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wf_0x80990310/func_80993194.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wf_0x80990310/func_80993194.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wf_0x80990310/func_80993350.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wf_0x80990310/func_80993350.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wf_0x80990310/func_809933A0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wf_0x80990310/func_809933A0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wf_0x80990310/func_80993524.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wf_0x80990310/func_80993524.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wf_0x80990310/func_8099357C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wf_0x80990310/func_8099357C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wf_0x80990310/func_80993738.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wf_0x80990310/func_80993738.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wf_0x80990310/func_8099386C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wf_0x80990310/func_8099386C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wf_0x80990310/EnWf_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wf_0x80990310/EnWf_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wf_0x80990310/func_80993E50.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wf_0x80990310/func_80993E50.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wf_0x80990310/func_80993E94.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wf_0x80990310/func_80993E94.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wf_0x80990310/EnWf_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wf_0x80990310/EnWf_Draw.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wf_0x80990310/func_8099408C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wf_0x80990310/func_8099408C.asm") diff --git a/src/overlays/actors/ovl_En_Wiz/z_en_wiz.c b/src/overlays/actors/ovl_En_Wiz/z_en_wiz.c index f30da61dfd..a981f04009 100644 --- a/src/overlays/actors/ovl_En_Wiz/z_en_wiz.c +++ b/src/overlays/actors/ovl_En_Wiz/z_en_wiz.c @@ -23,58 +23,58 @@ const ActorInit En_Wiz_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wiz_0x80A45360/EnWiz_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wiz_0x80A45360/EnWiz_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wiz_0x80A45360/EnWiz_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wiz_0x80A45360/EnWiz_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wiz_0x80A45360/func_80A455C4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wiz_0x80A45360/func_80A455C4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wiz_0x80A45360/func_80A456A0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wiz_0x80A45360/func_80A456A0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wiz_0x80A45360/func_80A45CD8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wiz_0x80A45360/func_80A45CD8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wiz_0x80A45360/func_80A460A4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wiz_0x80A45360/func_80A460A4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wiz_0x80A45360/func_80A46280.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wiz_0x80A45360/func_80A46280.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wiz_0x80A45360/func_80A462F8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wiz_0x80A45360/func_80A462F8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wiz_0x80A45360/func_80A46414.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wiz_0x80A45360/func_80A46414.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wiz_0x80A45360/func_80A4668C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wiz_0x80A45360/func_80A4668C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wiz_0x80A45360/func_80A46764.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wiz_0x80A45360/func_80A46764.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wiz_0x80A45360/func_80A468CC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wiz_0x80A45360/func_80A468CC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wiz_0x80A45360/func_80A46990.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wiz_0x80A45360/func_80A46990.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wiz_0x80A45360/func_80A46C88.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wiz_0x80A45360/func_80A46C88.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wiz_0x80A45360/func_80A46CC4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wiz_0x80A45360/func_80A46CC4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wiz_0x80A45360/func_80A46DDC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wiz_0x80A45360/func_80A46DDC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wiz_0x80A45360/func_80A46E24.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wiz_0x80A45360/func_80A46E24.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wiz_0x80A45360/func_80A47000.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wiz_0x80A45360/func_80A47000.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wiz_0x80A45360/func_80A470D8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wiz_0x80A45360/func_80A470D8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wiz_0x80A45360/func_80A47298.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wiz_0x80A45360/func_80A47298.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wiz_0x80A45360/func_80A473B8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wiz_0x80A45360/func_80A473B8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wiz_0x80A45360/func_80A4767C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wiz_0x80A45360/func_80A4767C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wiz_0x80A45360/func_80A476C8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wiz_0x80A45360/func_80A476C8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wiz_0x80A45360/func_80A477E8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wiz_0x80A45360/func_80A477E8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wiz_0x80A45360/EnWiz_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wiz_0x80A45360/EnWiz_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wiz_0x80A45360/func_80A47FCC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wiz_0x80A45360/func_80A47FCC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wiz_0x80A45360/func_80A48138.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wiz_0x80A45360/func_80A48138.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wiz_0x80A45360/EnWiz_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wiz_0x80A45360/EnWiz_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Wiz_Brock/z_en_wiz_brock.c b/src/overlays/actors/ovl_En_Wiz_Brock/z_en_wiz_brock.c index 04aef072a9..7983f5a01b 100644 --- a/src/overlays/actors/ovl_En_Wiz_Brock/z_en_wiz_brock.c +++ b/src/overlays/actors/ovl_En_Wiz_Brock/z_en_wiz_brock.c @@ -23,14 +23,14 @@ const ActorInit En_Wiz_Brock_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wiz_Brock_0x80A48FE0/EnWizBrock_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wiz_Brock_0x80A48FE0/EnWizBrock_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wiz_Brock_0x80A48FE0/EnWizBrock_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wiz_Brock_0x80A48FE0/EnWizBrock_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wiz_Brock_0x80A48FE0/func_80A490E4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wiz_Brock_0x80A48FE0/func_80A490E4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wiz_Brock_0x80A48FE0/func_80A490FC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wiz_Brock_0x80A48FE0/func_80A490FC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wiz_Brock_0x80A48FE0/EnWizBrock_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wiz_Brock_0x80A48FE0/EnWizBrock_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wiz_Brock_0x80A48FE0/EnWizBrock_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wiz_Brock_0x80A48FE0/EnWizBrock_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Wiz_Fire/z_en_wiz_fire.c b/src/overlays/actors/ovl_En_Wiz_Fire/z_en_wiz_fire.c index 33f5e97ee9..b472571a66 100644 --- a/src/overlays/actors/ovl_En_Wiz_Fire/z_en_wiz_fire.c +++ b/src/overlays/actors/ovl_En_Wiz_Fire/z_en_wiz_fire.c @@ -23,34 +23,34 @@ const ActorInit En_Wiz_Fire_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wiz_Fire_0x80A496A0/EnWizFire_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wiz_Fire_0x80A496A0/EnWizFire_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wiz_Fire_0x80A496A0/EnWizFire_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wiz_Fire_0x80A496A0/EnWizFire_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wiz_Fire_0x80A496A0/func_80A4984C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wiz_Fire_0x80A496A0/func_80A4984C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wiz_Fire_0x80A496A0/func_80A49A44.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wiz_Fire_0x80A496A0/func_80A49A44.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wiz_Fire_0x80A496A0/func_80A49F38.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wiz_Fire_0x80A496A0/func_80A49F38.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wiz_Fire_0x80A496A0/func_80A49FD8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wiz_Fire_0x80A496A0/func_80A49FD8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wiz_Fire_0x80A496A0/func_80A4A11C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wiz_Fire_0x80A496A0/func_80A4A11C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wiz_Fire_0x80A496A0/func_80A4A608.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wiz_Fire_0x80A496A0/func_80A4A608.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wiz_Fire_0x80A496A0/EnWizFire_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wiz_Fire_0x80A496A0/EnWizFire_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wiz_Fire_0x80A496A0/func_80A4B0C8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wiz_Fire_0x80A496A0/func_80A4B0C8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wiz_Fire_0x80A496A0/func_80A4B33C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wiz_Fire_0x80A496A0/func_80A4B33C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wiz_Fire_0x80A496A0/EnWizFire_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wiz_Fire_0x80A496A0/EnWizFire_Draw.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wiz_Fire_0x80A496A0/func_80A4BAB4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wiz_Fire_0x80A496A0/func_80A4BAB4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wiz_Fire_0x80A496A0/func_80A4BC74.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wiz_Fire_0x80A496A0/func_80A4BC74.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wiz_Fire_0x80A496A0/func_80A4BDDC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wiz_Fire_0x80A496A0/func_80A4BDDC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wiz_Fire_0x80A496A0/func_80A4BF78.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wiz_Fire_0x80A496A0/func_80A4BF78.asm") 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 4bdd75a9c7..9c0339d09f 100644 --- a/src/overlays/actors/ovl_En_Wood02/z_en_wood02.c +++ b/src/overlays/actors/ovl_En_Wood02/z_en_wood02.c @@ -23,16 +23,16 @@ const ActorInit En_Wood02_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wood02_0x808C3C00/func_808C3C00.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wood02_0x808C3C00/func_808C3C00.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wood02_0x808C3C00/func_808C3D28.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wood02_0x808C3C00/func_808C3D28.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wood02_0x808C3C00/EnWood02_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wood02_0x808C3C00/EnWood02_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wood02_0x808C3C00/EnWood02_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wood02_0x808C3C00/EnWood02_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wood02_0x808C3C00/func_808C4458.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wood02_0x808C3C00/func_808C4458.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wood02_0x808C3C00/EnWood02_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wood02_0x808C3C00/EnWood02_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Wood02_0x808C3C00/EnWood02_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Wood02_0x808C3C00/EnWood02_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Yb/z_en_yb.c b/src/overlays/actors/ovl_En_Yb/z_en_yb.c index 6f29089352..3e6c14f74b 100644 --- a/src/overlays/actors/ovl_En_Yb/z_en_yb.c +++ b/src/overlays/actors/ovl_En_Yb/z_en_yb.c @@ -23,46 +23,46 @@ const ActorInit En_Yb_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Yb_0x80BFA100/EnYb_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Yb_0x80BFA100/EnYb_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Yb_0x80BFA100/EnYb_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Yb_0x80BFA100/EnYb_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Yb_0x80BFA100/func_80BFA2FC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Yb_0x80BFA100/func_80BFA2FC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Yb_0x80BFA100/func_80BFA350.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Yb_0x80BFA100/func_80BFA350.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Yb_0x80BFA100/func_80BFA444.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Yb_0x80BFA100/func_80BFA444.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Yb_0x80BFA100/func_80BFA5CC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Yb_0x80BFA100/func_80BFA5CC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Yb_0x80BFA100/func_80BFA634.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Yb_0x80BFA100/func_80BFA634.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Yb_0x80BFA100/func_80BFA67C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Yb_0x80BFA100/func_80BFA67C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Yb_0x80BFA100/func_80BFA6E0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Yb_0x80BFA100/func_80BFA6E0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Yb_0x80BFA100/func_80BFA710.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Yb_0x80BFA100/func_80BFA710.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Yb_0x80BFA100/func_80BFA730.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Yb_0x80BFA100/func_80BFA730.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Yb_0x80BFA100/func_80BFA868.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Yb_0x80BFA100/func_80BFA868.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Yb_0x80BFA100/func_80BFA91C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Yb_0x80BFA100/func_80BFA91C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Yb_0x80BFA100/func_80BFA9D4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Yb_0x80BFA100/func_80BFA9D4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Yb_0x80BFA100/func_80BFAB4C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Yb_0x80BFA100/func_80BFAB4C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Yb_0x80BFA100/func_80BFABF0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Yb_0x80BFA100/func_80BFABF0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Yb_0x80BFA100/func_80BFAC88.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Yb_0x80BFA100/func_80BFAC88.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Yb_0x80BFA100/func_80BFAE80.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Yb_0x80BFA100/func_80BFAE80.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Yb_0x80BFA100/EnYb_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Yb_0x80BFA100/EnYb_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Yb_0x80BFA100/func_80BFB074.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Yb_0x80BFA100/func_80BFB074.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Yb_0x80BFA100/func_80BFB0E0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Yb_0x80BFA100/func_80BFB0E0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Yb_0x80BFA100/EnYb_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Yb_0x80BFA100/EnYb_Draw.asm") 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 4740a6259c..d1695ccf83 100644 --- a/src/overlays/actors/ovl_En_Zl4/z_en_zl4.c +++ b/src/overlays/actors/ovl_En_Zl4/z_en_zl4.c @@ -23,24 +23,24 @@ const ActorInit En_Zl4_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zl4_0x809A1BB0/func_809A1BB0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zl4_0x809A1BB0/func_809A1BB0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zl4_0x809A1BB0/EnZl4_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zl4_0x809A1BB0/EnZl4_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zl4_0x809A1BB0/EnZl4_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zl4_0x809A1BB0/EnZl4_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zl4_0x809A1BB0/func_809A1D0C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zl4_0x809A1BB0/func_809A1D0C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zl4_0x809A1BB0/EnZl4_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zl4_0x809A1BB0/EnZl4_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zl4_0x809A1BB0/func_809A1D60.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zl4_0x809A1BB0/func_809A1D60.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zl4_0x809A1BB0/func_809A1DA4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zl4_0x809A1BB0/func_809A1DA4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zl4_0x809A1BB0/func_809A1DBC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zl4_0x809A1BB0/func_809A1DBC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zl4_0x809A1BB0/func_809A1DD0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zl4_0x809A1BB0/func_809A1DD0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zl4_0x809A1BB0/func_809A1E28.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zl4_0x809A1BB0/func_809A1E28.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zl4_0x809A1BB0/EnZl4_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zl4_0x809A1BB0/EnZl4_Draw.asm") 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 ffe2a4417a..bc6b8e49ac 100644 --- a/src/overlays/actors/ovl_En_Zo/z_en_zo.c +++ b/src/overlays/actors/ovl_En_Zo/z_en_zo.c @@ -23,32 +23,32 @@ const ActorInit En_Zo_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zo_0x8099E790/func_8099E790.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zo_0x8099E790/func_8099E790.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zo_0x8099E790/func_8099E858.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zo_0x8099E790/func_8099E858.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zo_0x8099E790/func_8099E96C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zo_0x8099E790/func_8099E96C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zo_0x8099E790/func_8099E9E0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zo_0x8099E790/func_8099E9E0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zo_0x8099E790/func_8099EA60.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zo_0x8099E790/func_8099EA60.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zo_0x8099E790/func_8099EBD8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zo_0x8099E790/func_8099EBD8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zo_0x8099E790/func_8099EC50.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zo_0x8099E790/func_8099EC50.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zo_0x8099E790/func_8099ED4C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zo_0x8099E790/func_8099ED4C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zo_0x8099E790/func_8099EE24.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zo_0x8099E790/func_8099EE24.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zo_0x8099E790/EnZo_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zo_0x8099E790/EnZo_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zo_0x8099E790/EnZo_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zo_0x8099E790/EnZo_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zo_0x8099E790/EnZo_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zo_0x8099E790/EnZo_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zo_0x8099E790/func_8099EFF4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zo_0x8099E790/func_8099EFF4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zo_0x8099E790/func_8099F15C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zo_0x8099E790/func_8099F15C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zo_0x8099E790/EnZo_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zo_0x8099E790/EnZo_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Zob/z_en_zob.c b/src/overlays/actors/ovl_En_Zob/z_en_zob.c index 509200ac88..9f713afe41 100644 --- a/src/overlays/actors/ovl_En_Zob/z_en_zob.c +++ b/src/overlays/actors/ovl_En_Zob/z_en_zob.c @@ -23,66 +23,66 @@ const ActorInit En_Zob_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zob_0x80B9F570/EnZob_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zob_0x80B9F570/EnZob_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zob_0x80B9F570/EnZob_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zob_0x80B9F570/EnZob_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zob_0x80B9F570/func_80B9F7E4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zob_0x80B9F570/func_80B9F7E4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zob_0x80B9F570/func_80B9F86C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zob_0x80B9F570/func_80B9F86C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zob_0x80B9F570/func_80B9FA3C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zob_0x80B9F570/func_80B9FA3C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zob_0x80B9F570/func_80B9FC0C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zob_0x80B9F570/func_80B9FC0C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zob_0x80B9F570/func_80B9FC70.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zob_0x80B9F570/func_80B9FC70.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zob_0x80B9F570/func_80B9FCA0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zob_0x80B9F570/func_80B9FCA0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zob_0x80B9F570/func_80B9FD24.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zob_0x80B9F570/func_80B9FD24.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zob_0x80B9F570/func_80B9FDDC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zob_0x80B9F570/func_80B9FDDC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zob_0x80B9F570/func_80B9FE1C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zob_0x80B9F570/func_80B9FE1C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zob_0x80B9F570/func_80B9FE5C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zob_0x80B9F570/func_80B9FE5C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zob_0x80B9F570/func_80B9FF20.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zob_0x80B9F570/func_80B9FF20.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zob_0x80B9F570/func_80B9FF80.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zob_0x80B9F570/func_80B9FF80.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zob_0x80B9F570/func_80BA005C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zob_0x80B9F570/func_80BA005C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zob_0x80B9F570/func_80BA00BC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zob_0x80B9F570/func_80BA00BC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zob_0x80B9F570/func_80BA0318.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zob_0x80B9F570/func_80BA0318.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zob_0x80B9F570/func_80BA0374.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zob_0x80B9F570/func_80BA0374.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zob_0x80B9F570/func_80BA0610.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zob_0x80B9F570/func_80BA0610.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zob_0x80B9F570/func_80BA06BC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zob_0x80B9F570/func_80BA06BC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zob_0x80B9F570/func_80BA0728.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zob_0x80B9F570/func_80BA0728.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zob_0x80B9F570/func_80BA08E8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zob_0x80B9F570/func_80BA08E8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zob_0x80B9F570/func_80BA09E0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zob_0x80B9F570/func_80BA09E0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zob_0x80B9F570/func_80BA0A04.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zob_0x80B9F570/func_80BA0A04.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zob_0x80B9F570/func_80BA0AD8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zob_0x80B9F570/func_80BA0AD8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zob_0x80B9F570/func_80BA0BB4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zob_0x80B9F570/func_80BA0BB4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zob_0x80B9F570/func_80BA0C14.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zob_0x80B9F570/func_80BA0C14.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zob_0x80B9F570/func_80BA0CF4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zob_0x80B9F570/func_80BA0CF4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zob_0x80B9F570/EnZob_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zob_0x80B9F570/EnZob_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zob_0x80B9F570/func_80BA0F64.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zob_0x80B9F570/func_80BA0F64.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zob_0x80B9F570/func_80BA0FAC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zob_0x80B9F570/func_80BA0FAC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zob_0x80B9F570/EnZob_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zob_0x80B9F570/EnZob_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Zod/z_en_zod.c b/src/overlays/actors/ovl_En_Zod/z_en_zod.c index 1738361e81..150ec48a9f 100644 --- a/src/overlays/actors/ovl_En_Zod/z_en_zod.c +++ b/src/overlays/actors/ovl_En_Zod/z_en_zod.c @@ -23,48 +23,48 @@ const ActorInit En_Zod_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zod_0x80BAEF70/EnZod_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zod_0x80BAEF70/EnZod_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zod_0x80BAEF70/EnZod_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zod_0x80BAEF70/EnZod_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zod_0x80BAEF70/func_80BAF1EC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zod_0x80BAEF70/func_80BAF1EC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zod_0x80BAEF70/func_80BAF2B4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zod_0x80BAEF70/func_80BAF2B4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zod_0x80BAEF70/func_80BAF338.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zod_0x80BAEF70/func_80BAF338.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zod_0x80BAEF70/func_80BAF3E0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zod_0x80BAEF70/func_80BAF3E0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zod_0x80BAEF70/func_80BAF4D8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zod_0x80BAEF70/func_80BAF4D8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zod_0x80BAEF70/func_80BAF7CC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zod_0x80BAEF70/func_80BAF7CC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zod_0x80BAEF70/func_80BAF99C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zod_0x80BAEF70/func_80BAF99C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zod_0x80BAEF70/func_80BAFA44.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zod_0x80BAEF70/func_80BAFA44.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zod_0x80BAEF70/func_80BAFADC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zod_0x80BAEF70/func_80BAFADC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zod_0x80BAEF70/func_80BAFB84.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zod_0x80BAEF70/func_80BAFB84.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zod_0x80BAEF70/func_80BAFC00.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zod_0x80BAEF70/func_80BAFC00.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zod_0x80BAEF70/func_80BAFC10.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zod_0x80BAEF70/func_80BAFC10.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zod_0x80BAEF70/func_80BAFD00.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zod_0x80BAEF70/func_80BAFD00.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zod_0x80BAEF70/func_80BAFDB4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zod_0x80BAEF70/func_80BAFDB4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zod_0x80BAEF70/func_80BAFE34.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zod_0x80BAEF70/func_80BAFE34.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zod_0x80BAEF70/func_80BAFF14.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zod_0x80BAEF70/func_80BAFF14.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zod_0x80BAEF70/EnZod_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zod_0x80BAEF70/EnZod_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zod_0x80BAEF70/func_80BB0128.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zod_0x80BAEF70/func_80BB0128.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zod_0x80BAEF70/func_80BB0170.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zod_0x80BAEF70/func_80BB0170.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zod_0x80BAEF70/func_80BB01B0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zod_0x80BAEF70/func_80BB01B0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zod_0x80BAEF70/EnZod_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zod_0x80BAEF70/EnZod_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Zog/z_en_zog.c b/src/overlays/actors/ovl_En_Zog/z_en_zog.c index 52e2f772d6..075e8b96d5 100644 --- a/src/overlays/actors/ovl_En_Zog/z_en_zog.c +++ b/src/overlays/actors/ovl_En_Zog/z_en_zog.c @@ -23,64 +23,64 @@ const ActorInit En_Zog_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zog_0x80B93310/func_80B93310.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zog_0x80B93310/func_80B93310.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zog_0x80B93310/func_80B93468.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zog_0x80B93310/func_80B93468.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zog_0x80B93310/EnZog_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zog_0x80B93310/EnZog_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zog_0x80B93310/EnZog_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zog_0x80B93310/EnZog_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zog_0x80B93310/func_80B939C0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zog_0x80B93310/func_80B939C0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zog_0x80B93310/func_80B93A48.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zog_0x80B93310/func_80B93A48.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zog_0x80B93310/func_80B93B44.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zog_0x80B93310/func_80B93B44.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zog_0x80B93310/func_80B93BA8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zog_0x80B93310/func_80B93BA8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zog_0x80B93310/func_80B93BE0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zog_0x80B93310/func_80B93BE0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zog_0x80B93310/func_80B93D2C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zog_0x80B93310/func_80B93D2C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zog_0x80B93310/func_80B93DE8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zog_0x80B93310/func_80B93DE8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zog_0x80B93310/func_80B93EA0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zog_0x80B93310/func_80B93EA0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zog_0x80B93310/func_80B943A0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zog_0x80B93310/func_80B943A0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zog_0x80B93310/func_80B943C0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zog_0x80B93310/func_80B943C0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zog_0x80B93310/func_80B943EC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zog_0x80B93310/func_80B943EC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zog_0x80B93310/func_80B94470.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zog_0x80B93310/func_80B94470.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zog_0x80B93310/func_80B9451C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zog_0x80B93310/func_80B9451C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zog_0x80B93310/func_80B9461C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zog_0x80B93310/func_80B9461C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zog_0x80B93310/func_80B946B4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zog_0x80B93310/func_80B946B4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zog_0x80B93310/func_80B946FC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zog_0x80B93310/func_80B946FC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zog_0x80B93310/func_80B948A8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zog_0x80B93310/func_80B948A8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zog_0x80B93310/func_80B94A00.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zog_0x80B93310/func_80B94A00.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zog_0x80B93310/func_80B94C5C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zog_0x80B93310/func_80B94C5C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zog_0x80B93310/func_80B94D0C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zog_0x80B93310/func_80B94D0C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zog_0x80B93310/func_80B94E34.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zog_0x80B93310/func_80B94E34.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zog_0x80B93310/func_80B95128.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zog_0x80B93310/func_80B95128.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zog_0x80B93310/func_80B95240.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zog_0x80B93310/func_80B95240.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zog_0x80B93310/EnZog_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zog_0x80B93310/EnZog_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zog_0x80B93310/func_80B954C4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zog_0x80B93310/func_80B954C4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zog_0x80B93310/func_80B95598.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zog_0x80B93310/func_80B95598.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zog_0x80B93310/EnZog_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zog_0x80B93310/EnZog_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Zoraegg/z_en_zoraegg.c b/src/overlays/actors/ovl_En_Zoraegg/z_en_zoraegg.c index 47da6ac3f2..fe1fb74f9c 100644 --- a/src/overlays/actors/ovl_En_Zoraegg/z_en_zoraegg.c +++ b/src/overlays/actors/ovl_En_Zoraegg/z_en_zoraegg.c @@ -23,78 +23,78 @@ const ActorInit En_Zoraegg_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zoraegg_0x80B31590/func_80B31590.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zoraegg_0x80B31590/func_80B31590.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zoraegg_0x80B31590/EnZoraegg_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zoraegg_0x80B31590/EnZoraegg_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zoraegg_0x80B31590/EnZoraegg_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zoraegg_0x80B31590/EnZoraegg_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zoraegg_0x80B31590/func_80B319A8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zoraegg_0x80B31590/func_80B319A8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zoraegg_0x80B31590/func_80B319D0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zoraegg_0x80B31590/func_80B319D0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zoraegg_0x80B31590/func_80B31A34.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zoraegg_0x80B31590/func_80B31A34.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zoraegg_0x80B31590/func_80B31C40.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zoraegg_0x80B31590/func_80B31C40.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zoraegg_0x80B31590/func_80B31CB4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zoraegg_0x80B31590/func_80B31CB4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zoraegg_0x80B31590/func_80B31D14.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zoraegg_0x80B31590/func_80B31D14.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zoraegg_0x80B31590/func_80B31D64.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zoraegg_0x80B31590/func_80B31D64.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zoraegg_0x80B31590/func_80B31E00.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zoraegg_0x80B31590/func_80B31E00.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zoraegg_0x80B31590/func_80B32084.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zoraegg_0x80B31590/func_80B32084.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zoraegg_0x80B31590/func_80B32094.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zoraegg_0x80B31590/func_80B32094.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zoraegg_0x80B31590/func_80B320E0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zoraegg_0x80B31590/func_80B320E0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zoraegg_0x80B31590/func_80B321D0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zoraegg_0x80B31590/func_80B321D0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zoraegg_0x80B31590/func_80B32228.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zoraegg_0x80B31590/func_80B32228.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zoraegg_0x80B31590/func_80B322BC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zoraegg_0x80B31590/func_80B322BC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zoraegg_0x80B31590/func_80B32390.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zoraegg_0x80B31590/func_80B32390.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zoraegg_0x80B31590/func_80B324B0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zoraegg_0x80B31590/func_80B324B0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zoraegg_0x80B31590/func_80B32644.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zoraegg_0x80B31590/func_80B32644.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zoraegg_0x80B31590/func_80B326F4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zoraegg_0x80B31590/func_80B326F4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zoraegg_0x80B31590/func_80B32820.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zoraegg_0x80B31590/func_80B32820.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zoraegg_0x80B31590/func_80B32928.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zoraegg_0x80B31590/func_80B32928.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zoraegg_0x80B31590/func_80B32A88.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zoraegg_0x80B31590/func_80B32A88.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zoraegg_0x80B31590/func_80B32B10.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zoraegg_0x80B31590/func_80B32B10.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zoraegg_0x80B31590/func_80B32B3C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zoraegg_0x80B31590/func_80B32B3C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zoraegg_0x80B31590/func_80B32B70.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zoraegg_0x80B31590/func_80B32B70.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zoraegg_0x80B31590/func_80B32BB8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zoraegg_0x80B31590/func_80B32BB8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zoraegg_0x80B31590/func_80B32C34.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zoraegg_0x80B31590/func_80B32C34.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zoraegg_0x80B31590/func_80B32D08.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zoraegg_0x80B31590/func_80B32D08.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zoraegg_0x80B31590/EnZoraegg_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zoraegg_0x80B31590/EnZoraegg_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zoraegg_0x80B31590/func_80B32F04.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zoraegg_0x80B31590/func_80B32F04.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zoraegg_0x80B31590/func_80B331C8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zoraegg_0x80B31590/func_80B331C8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zoraegg_0x80B31590/func_80B3336C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zoraegg_0x80B31590/func_80B3336C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zoraegg_0x80B31590/func_80B333DC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zoraegg_0x80B31590/func_80B333DC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zoraegg_0x80B31590/func_80B33480.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zoraegg_0x80B31590/func_80B33480.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zoraegg_0x80B31590/func_80B33818.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zoraegg_0x80B31590/func_80B33818.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zoraegg_0x80B31590/EnZoraegg_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zoraegg_0x80B31590/EnZoraegg_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Zos/z_en_zos.c b/src/overlays/actors/ovl_En_Zos/z_en_zos.c index 80877ccd83..03b8b24516 100644 --- a/src/overlays/actors/ovl_En_Zos/z_en_zos.c +++ b/src/overlays/actors/ovl_En_Zos/z_en_zos.c @@ -23,60 +23,60 @@ const ActorInit En_Zos_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zos_0x80BBACA0/EnZos_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zos_0x80BBACA0/EnZos_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zos_0x80BBACA0/EnZos_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zos_0x80BBACA0/EnZos_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zos_0x80BBACA0/func_80BBAE84.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zos_0x80BBACA0/func_80BBAE84.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zos_0x80BBACA0/func_80BBAF5C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zos_0x80BBACA0/func_80BBAF5C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zos_0x80BBACA0/func_80BBAFFC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zos_0x80BBACA0/func_80BBAFFC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zos_0x80BBACA0/func_80BBB0D4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zos_0x80BBACA0/func_80BBB0D4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zos_0x80BBACA0/func_80BBB15C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zos_0x80BBACA0/func_80BBB15C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zos_0x80BBACA0/func_80BBB2C4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zos_0x80BBACA0/func_80BBB2C4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zos_0x80BBACA0/func_80BBB354.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zos_0x80BBACA0/func_80BBB354.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zos_0x80BBACA0/func_80BBB414.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zos_0x80BBACA0/func_80BBB414.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zos_0x80BBACA0/func_80BBB4CC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zos_0x80BBACA0/func_80BBB4CC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zos_0x80BBACA0/func_80BBB574.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zos_0x80BBACA0/func_80BBB574.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zos_0x80BBACA0/func_80BBB718.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zos_0x80BBACA0/func_80BBB718.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zos_0x80BBACA0/func_80BBB8AC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zos_0x80BBACA0/func_80BBB8AC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zos_0x80BBACA0/func_80BBBB84.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zos_0x80BBACA0/func_80BBBB84.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zos_0x80BBACA0/func_80BBBCBC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zos_0x80BBACA0/func_80BBBCBC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zos_0x80BBACA0/func_80BBBD5C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zos_0x80BBACA0/func_80BBBD5C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zos_0x80BBACA0/func_80BBBDE0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zos_0x80BBACA0/func_80BBBDE0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zos_0x80BBACA0/func_80BBBFBC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zos_0x80BBACA0/func_80BBBFBC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zos_0x80BBACA0/func_80BBC070.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zos_0x80BBACA0/func_80BBC070.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zos_0x80BBACA0/func_80BBC14C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zos_0x80BBACA0/func_80BBC14C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zos_0x80BBACA0/func_80BBC22C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zos_0x80BBACA0/func_80BBC22C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zos_0x80BBACA0/func_80BBC24C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zos_0x80BBACA0/func_80BBC24C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zos_0x80BBACA0/func_80BBC298.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zos_0x80BBACA0/func_80BBC298.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zos_0x80BBACA0/func_80BBC37C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zos_0x80BBACA0/func_80BBC37C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zos_0x80BBACA0/EnZos_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zos_0x80BBACA0/EnZos_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zos_0x80BBACA0/func_80BBC4E4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zos_0x80BBACA0/func_80BBC4E4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zos_0x80BBACA0/func_80BBC500.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zos_0x80BBACA0/func_80BBC500.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zos_0x80BBACA0/EnZos_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zos_0x80BBACA0/EnZos_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Zot/z_en_zot.c b/src/overlays/actors/ovl_En_Zot/z_en_zot.c index 48468c93ab..679edc6664 100644 --- a/src/overlays/actors/ovl_En_Zot/z_en_zot.c +++ b/src/overlays/actors/ovl_En_Zot/z_en_zot.c @@ -23,110 +23,110 @@ const ActorInit En_Zot_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zot_0x80B965D0/func_80B965D0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zot_0x80B965D0/func_80B965D0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zot_0x80B965D0/EnZot_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zot_0x80B965D0/EnZot_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zot_0x80B965D0/EnZot_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zot_0x80B965D0/EnZot_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zot_0x80B965D0/func_80B96BEC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zot_0x80B965D0/func_80B96BEC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zot_0x80B965D0/func_80B96CE4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zot_0x80B965D0/func_80B96CE4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zot_0x80B965D0/func_80B96D4C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zot_0x80B965D0/func_80B96D4C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zot_0x80B965D0/func_80B96DF0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zot_0x80B965D0/func_80B96DF0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zot_0x80B965D0/func_80B96E5C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zot_0x80B965D0/func_80B96E5C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zot_0x80B965D0/func_80B96FB0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zot_0x80B965D0/func_80B96FB0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zot_0x80B965D0/func_80B97100.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zot_0x80B965D0/func_80B97100.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zot_0x80B965D0/func_80B97110.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zot_0x80B965D0/func_80B97110.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zot_0x80B965D0/func_80B97194.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zot_0x80B965D0/func_80B97194.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zot_0x80B965D0/func_80B97240.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zot_0x80B965D0/func_80B97240.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zot_0x80B965D0/func_80B972E8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zot_0x80B965D0/func_80B972E8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zot_0x80B965D0/func_80B973BC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zot_0x80B965D0/func_80B973BC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zot_0x80B965D0/func_80B975F8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zot_0x80B965D0/func_80B975F8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zot_0x80B965D0/func_80B9765C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zot_0x80B965D0/func_80B9765C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zot_0x80B965D0/func_80B97708.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zot_0x80B965D0/func_80B97708.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zot_0x80B965D0/func_80B9787C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zot_0x80B965D0/func_80B9787C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zot_0x80B965D0/func_80B979DC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zot_0x80B965D0/func_80B979DC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zot_0x80B965D0/func_80B97A44.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zot_0x80B965D0/func_80B97A44.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zot_0x80B965D0/func_80B97B5C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zot_0x80B965D0/func_80B97B5C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zot_0x80B965D0/func_80B97BF8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zot_0x80B965D0/func_80B97BF8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zot_0x80B965D0/func_80B97C40.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zot_0x80B965D0/func_80B97C40.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zot_0x80B965D0/func_80B97CC8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zot_0x80B965D0/func_80B97CC8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zot_0x80B965D0/func_80B97D6C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zot_0x80B965D0/func_80B97D6C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zot_0x80B965D0/func_80B97E0C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zot_0x80B965D0/func_80B97E0C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zot_0x80B965D0/func_80B97E4C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zot_0x80B965D0/func_80B97E4C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zot_0x80B965D0/func_80B97FD0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zot_0x80B965D0/func_80B97FD0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zot_0x80B965D0/func_80B980FC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zot_0x80B965D0/func_80B980FC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zot_0x80B965D0/func_80B98178.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zot_0x80B965D0/func_80B98178.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zot_0x80B965D0/func_80B98348.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zot_0x80B965D0/func_80B98348.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zot_0x80B965D0/func_80B9849C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zot_0x80B965D0/func_80B9849C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zot_0x80B965D0/func_80B9854C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zot_0x80B965D0/func_80B9854C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zot_0x80B965D0/func_80B985EC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zot_0x80B965D0/func_80B985EC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zot_0x80B965D0/func_80B98728.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zot_0x80B965D0/func_80B98728.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zot_0x80B965D0/func_80B98998.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zot_0x80B965D0/func_80B98998.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zot_0x80B965D0/func_80B98A4C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zot_0x80B965D0/func_80B98A4C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zot_0x80B965D0/func_80B98AD0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zot_0x80B965D0/func_80B98AD0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zot_0x80B965D0/func_80B98BF4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zot_0x80B965D0/func_80B98BF4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zot_0x80B965D0/func_80B98CA8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zot_0x80B965D0/func_80B98CA8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zot_0x80B965D0/func_80B98E10.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zot_0x80B965D0/func_80B98E10.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zot_0x80B965D0/func_80B98F30.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zot_0x80B965D0/func_80B98F30.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zot_0x80B965D0/func_80B98F94.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zot_0x80B965D0/func_80B98F94.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zot_0x80B965D0/func_80B990A4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zot_0x80B965D0/func_80B990A4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zot_0x80B965D0/func_80B99160.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zot_0x80B965D0/func_80B99160.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zot_0x80B965D0/func_80B991E4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zot_0x80B965D0/func_80B991E4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zot_0x80B965D0/func_80B992C0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zot_0x80B965D0/func_80B992C0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zot_0x80B965D0/func_80B99384.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zot_0x80B965D0/func_80B99384.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zot_0x80B965D0/EnZot_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zot_0x80B965D0/EnZot_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zot_0x80B965D0/func_80B99580.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zot_0x80B965D0/func_80B99580.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zot_0x80B965D0/func_80B995A4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zot_0x80B965D0/func_80B995A4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zot_0x80B965D0/func_80B99758.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zot_0x80B965D0/func_80B99758.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zot_0x80B965D0/EnZot_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zot_0x80B965D0/EnZot_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Zov/z_en_zov.c b/src/overlays/actors/ovl_En_Zov/z_en_zov.c index 74be335172..208bfe0d66 100644 --- a/src/overlays/actors/ovl_En_Zov/z_en_zov.c +++ b/src/overlays/actors/ovl_En_Zov/z_en_zov.c @@ -23,50 +23,50 @@ const ActorInit En_Zov_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zov_0x80BD11E0/EnZov_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zov_0x80BD11E0/EnZov_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zov_0x80BD11E0/EnZov_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zov_0x80BD11E0/EnZov_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zov_0x80BD11E0/func_80BD13DC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zov_0x80BD11E0/func_80BD13DC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zov_0x80BD11E0/func_80BD1440.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zov_0x80BD11E0/func_80BD1440.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zov_0x80BD11E0/func_80BD1470.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zov_0x80BD11E0/func_80BD1470.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zov_0x80BD11E0/func_80BD1570.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zov_0x80BD11E0/func_80BD1570.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zov_0x80BD11E0/func_80BD15A4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zov_0x80BD11E0/func_80BD15A4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zov_0x80BD11E0/func_80BD160C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zov_0x80BD11E0/func_80BD160C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zov_0x80BD11E0/func_80BD1764.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zov_0x80BD11E0/func_80BD1764.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zov_0x80BD11E0/func_80BD187C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zov_0x80BD11E0/func_80BD187C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zov_0x80BD11E0/func_80BD19FC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zov_0x80BD11E0/func_80BD19FC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zov_0x80BD11E0/func_80BD1AE0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zov_0x80BD11E0/func_80BD1AE0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zov_0x80BD11E0/func_80BD1BF0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zov_0x80BD11E0/func_80BD1BF0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zov_0x80BD11E0/func_80BD1C38.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zov_0x80BD11E0/func_80BD1C38.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zov_0x80BD11E0/func_80BD1C84.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zov_0x80BD11E0/func_80BD1C84.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zov_0x80BD11E0/func_80BD1D30.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zov_0x80BD11E0/func_80BD1D30.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zov_0x80BD11E0/func_80BD1D94.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zov_0x80BD11E0/func_80BD1D94.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zov_0x80BD11E0/func_80BD1DB8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zov_0x80BD11E0/func_80BD1DB8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zov_0x80BD11E0/func_80BD1F1C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zov_0x80BD11E0/func_80BD1F1C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zov_0x80BD11E0/func_80BD1FC8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zov_0x80BD11E0/func_80BD1FC8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zov_0x80BD11E0/EnZov_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zov_0x80BD11E0/EnZov_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zov_0x80BD11E0/func_80BD2380.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zov_0x80BD11E0/func_80BD2380.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zov_0x80BD11E0/func_80BD2404.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zov_0x80BD11E0/func_80BD2404.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zov_0x80BD11E0/EnZov_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zov_0x80BD11E0/EnZov_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Zow/z_en_zow.c b/src/overlays/actors/ovl_En_Zow/z_en_zow.c index d0cd17c64a..0fbb029437 100644 --- a/src/overlays/actors/ovl_En_Zow/z_en_zow.c +++ b/src/overlays/actors/ovl_En_Zow/z_en_zow.c @@ -23,56 +23,56 @@ const ActorInit En_Zow_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zow_0x80BDC270/func_80BDC270.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zow_0x80BDC270/func_80BDC270.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zow_0x80BDC270/func_80BDC2D8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zow_0x80BDC270/func_80BDC2D8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zow_0x80BDC270/func_80BDC3C0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zow_0x80BDC270/func_80BDC3C0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zow_0x80BDC270/func_80BDC50C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zow_0x80BDC270/func_80BDC50C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zow_0x80BDC270/func_80BDC5C8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zow_0x80BDC270/func_80BDC5C8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zow_0x80BDC270/func_80BDC6F8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zow_0x80BDC270/func_80BDC6F8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zow_0x80BDC270/func_80BDC830.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zow_0x80BDC270/func_80BDC830.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zow_0x80BDC270/func_80BDC9DC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zow_0x80BDC270/func_80BDC9DC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zow_0x80BDC270/func_80BDCB84.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zow_0x80BDC270/func_80BDCB84.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zow_0x80BDC270/func_80BDCD38.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zow_0x80BDC270/func_80BDCD38.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zow_0x80BDC270/func_80BDCDA8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zow_0x80BDC270/func_80BDCDA8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zow_0x80BDC270/EnZow_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zow_0x80BDC270/EnZow_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zow_0x80BDC270/EnZow_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zow_0x80BDC270/EnZow_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zow_0x80BDC270/func_80BDD04C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zow_0x80BDC270/func_80BDD04C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zow_0x80BDC270/func_80BDD154.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zow_0x80BDC270/func_80BDD154.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zow_0x80BDC270/func_80BDD1E0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zow_0x80BDC270/func_80BDD1E0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zow_0x80BDC270/func_80BDD350.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zow_0x80BDC270/func_80BDD350.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zow_0x80BDC270/func_80BDD490.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zow_0x80BDC270/func_80BDD490.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zow_0x80BDC270/func_80BDD570.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zow_0x80BDC270/func_80BDD570.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zow_0x80BDC270/func_80BDD634.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zow_0x80BDC270/func_80BDD634.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zow_0x80BDC270/func_80BDD6BC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zow_0x80BDC270/func_80BDD6BC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zow_0x80BDC270/func_80BDD79C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zow_0x80BDC270/func_80BDD79C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zow_0x80BDC270/EnZow_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zow_0x80BDC270/EnZow_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zow_0x80BDC270/func_80BDDA7C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zow_0x80BDC270/func_80BDDA7C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zow_0x80BDC270/func_80BDDAA0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zow_0x80BDC270/func_80BDDAA0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zow_0x80BDC270/func_80BDDAE0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zow_0x80BDC270/func_80BDDAE0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_En_Zow_0x80BDC270/EnZow_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Zow_0x80BDC270/EnZow_Draw.asm") 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 24d34c2ac2..2a6d115984 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 @@ -23,12 +23,12 @@ const ActorInit Item_B_Heart_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Item_B_Heart_0x808BCDF0/ItemBHeart_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Item_B_Heart_0x808BCDF0/ItemBHeart_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Item_B_Heart_0x808BCDF0/ItemBHeart_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Item_B_Heart_0x808BCDF0/ItemBHeart_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Item_B_Heart_0x808BCDF0/ItemBHeart_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Item_B_Heart_0x808BCDF0/ItemBHeart_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Item_B_Heart_0x808BCDF0/func_808BCF54.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Item_B_Heart_0x808BCDF0/func_808BCF54.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Item_B_Heart_0x808BCDF0/ItemBHeart_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Item_B_Heart_0x808BCDF0/ItemBHeart_Draw.asm") 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 a2b1c740b2..a0ab0e4a0a 100644 --- a/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.c +++ b/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.c @@ -22,20 +22,20 @@ const ActorInit Item_Etcetera_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Item_Etcetera_0x8091FEF0/func_8091FEF0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Item_Etcetera_0x8091FEF0/func_8091FEF0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Item_Etcetera_0x8091FEF0/ItemEtcetera_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Item_Etcetera_0x8091FEF0/ItemEtcetera_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Item_Etcetera_0x8091FEF0/ItemEtcetera_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Item_Etcetera_0x8091FEF0/ItemEtcetera_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Item_Etcetera_0x8091FEF0/func_80920044.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Item_Etcetera_0x8091FEF0/func_80920044.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Item_Etcetera_0x8091FEF0/func_8092009C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Item_Etcetera_0x8091FEF0/func_8092009C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Item_Etcetera_0x8091FEF0/func_809200F8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Item_Etcetera_0x8091FEF0/func_809200F8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Item_Etcetera_0x8091FEF0/ItemEtcetera_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Item_Etcetera_0x8091FEF0/ItemEtcetera_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Item_Etcetera_0x8091FEF0/func_80920164.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Item_Etcetera_0x8091FEF0/func_80920164.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Item_Etcetera_0x8091FEF0/func_809201BC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Item_Etcetera_0x8091FEF0/func_809201BC.asm") diff --git a/src/overlays/actors/ovl_Item_Inbox/z_item_inbox.c b/src/overlays/actors/ovl_Item_Inbox/z_item_inbox.c index 4d9202a97d..e0eac8a834 100644 --- a/src/overlays/actors/ovl_Item_Inbox/z_item_inbox.c +++ b/src/overlays/actors/ovl_Item_Inbox/z_item_inbox.c @@ -23,12 +23,12 @@ const ActorInit Item_Inbox_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Item_Inbox_0x809454F0/ItemInbox_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Item_Inbox_0x809454F0/ItemInbox_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Item_Inbox_0x809454F0/ItemInbox_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Item_Inbox_0x809454F0/ItemInbox_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Item_Inbox_0x809454F0/func_80945534.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Item_Inbox_0x809454F0/func_80945534.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Item_Inbox_0x809454F0/ItemInbox_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Item_Inbox_0x809454F0/ItemInbox_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Item_Inbox_0x809454F0/ItemInbox_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Item_Inbox_0x809454F0/ItemInbox_Draw.asm") 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 b981796f81..7a6a14abbb 100644 --- a/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.c +++ b/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.c @@ -23,24 +23,24 @@ const ActorInit Mir_Ray_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Mir_Ray_0x808E2600/func_808E2600.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Mir_Ray_0x808E2600/func_808E2600.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Mir_Ray_0x808E2600/func_808E26C8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Mir_Ray_0x808E2600/func_808E26C8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Mir_Ray_0x808E2600/MirRay_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Mir_Ray_0x808E2600/MirRay_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Mir_Ray_0x808E2600/MirRay_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Mir_Ray_0x808E2600/MirRay_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Mir_Ray_0x808E2600/MirRay_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Mir_Ray_0x808E2600/MirRay_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Mir_Ray_0x808E2600/func_808E2C68.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Mir_Ray_0x808E2600/func_808E2C68.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Mir_Ray_0x808E2600/func_808E2E1C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Mir_Ray_0x808E2600/func_808E2E1C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Mir_Ray_0x808E2600/func_808E2FF8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Mir_Ray_0x808E2600/func_808E2FF8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Mir_Ray_0x808E2600/func_808E30FC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Mir_Ray_0x808E2600/func_808E30FC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Mir_Ray_0x808E2600/MirRay_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Mir_Ray_0x808E2600/MirRay_Draw.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Mir_Ray_0x808E2600/func_808E3984.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Mir_Ray_0x808E2600/func_808E3984.asm") diff --git a/src/overlays/actors/ovl_Mir_Ray2/z_mir_ray2.c b/src/overlays/actors/ovl_Mir_Ray2/z_mir_ray2.c index 6f1815d7b7..946319d697 100644 --- a/src/overlays/actors/ovl_Mir_Ray2/z_mir_ray2.c +++ b/src/overlays/actors/ovl_Mir_Ray2/z_mir_ray2.c @@ -23,14 +23,14 @@ const ActorInit Mir_Ray2_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Mir_Ray2_0x80AF3F70/func_80AF3F70.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Mir_Ray2_0x80AF3F70/func_80AF3F70.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Mir_Ray2_0x80AF3F70/func_80AF3FE0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Mir_Ray2_0x80AF3F70/func_80AF3FE0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Mir_Ray2_0x80AF3F70/MirRay2_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Mir_Ray2_0x80AF3F70/MirRay2_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Mir_Ray2_0x80AF3F70/MirRay2_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Mir_Ray2_0x80AF3F70/MirRay2_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Mir_Ray2_0x80AF3F70/MirRay2_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Mir_Ray2_0x80AF3F70/MirRay2_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Mir_Ray2_0x80AF3F70/MirRay2_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Mir_Ray2_0x80AF3F70/MirRay2_Draw.asm") diff --git a/src/overlays/actors/ovl_Mir_Ray3/z_mir_ray3.c b/src/overlays/actors/ovl_Mir_Ray3/z_mir_ray3.c index c9eca46f0f..69916d3d36 100644 --- a/src/overlays/actors/ovl_Mir_Ray3/z_mir_ray3.c +++ b/src/overlays/actors/ovl_Mir_Ray3/z_mir_ray3.c @@ -23,18 +23,18 @@ const ActorInit Mir_Ray3_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Mir_Ray3_0x80B9E2C0/MirRay3_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Mir_Ray3_0x80B9E2C0/MirRay3_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Mir_Ray3_0x80B9E2C0/MirRay3_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Mir_Ray3_0x80B9E2C0/MirRay3_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Mir_Ray3_0x80B9E2C0/MirRay3_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Mir_Ray3_0x80B9E2C0/MirRay3_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Mir_Ray3_0x80B9E2C0/func_80B9E544.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Mir_Ray3_0x80B9E2C0/func_80B9E544.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Mir_Ray3_0x80B9E2C0/func_80B9E5F4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Mir_Ray3_0x80B9E2C0/func_80B9E5F4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Mir_Ray3_0x80B9E2C0/func_80B9E7D0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Mir_Ray3_0x80B9E2C0/func_80B9E7D0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Mir_Ray3_0x80B9E2C0/func_80B9E8D4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Mir_Ray3_0x80B9E2C0/func_80B9E8D4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Mir_Ray3_0x80B9E2C0/MirRay3_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Mir_Ray3_0x80B9E2C0/MirRay3_Draw.asm") diff --git a/src/overlays/actors/ovl_Obj_Aqua/z_obj_aqua.c b/src/overlays/actors/ovl_Obj_Aqua/z_obj_aqua.c index ee08adf00a..023bbc0c65 100644 --- a/src/overlays/actors/ovl_Obj_Aqua/z_obj_aqua.c +++ b/src/overlays/actors/ovl_Obj_Aqua/z_obj_aqua.c @@ -23,32 +23,32 @@ const ActorInit Obj_Aqua_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Aqua_0x80ACB6A0/func_80ACB6A0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Aqua_0x80ACB6A0/func_80ACB6A0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Aqua_0x80ACB6A0/func_80ACB7F4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Aqua_0x80ACB6A0/func_80ACB7F4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Aqua_0x80ACB6A0/func_80ACB940.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Aqua_0x80ACB6A0/func_80ACB940.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Aqua_0x80ACB6A0/func_80ACBA10.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Aqua_0x80ACB6A0/func_80ACBA10.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Aqua_0x80ACB6A0/func_80ACBA60.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Aqua_0x80ACB6A0/func_80ACBA60.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Aqua_0x80ACB6A0/ObjAqua_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Aqua_0x80ACB6A0/ObjAqua_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Aqua_0x80ACB6A0/ObjAqua_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Aqua_0x80ACB6A0/ObjAqua_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Aqua_0x80ACB6A0/func_80ACBC70.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Aqua_0x80ACB6A0/func_80ACBC70.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Aqua_0x80ACB6A0/func_80ACBC8C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Aqua_0x80ACB6A0/func_80ACBC8C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Aqua_0x80ACB6A0/func_80ACBD34.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Aqua_0x80ACB6A0/func_80ACBD34.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Aqua_0x80ACB6A0/func_80ACBD48.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Aqua_0x80ACB6A0/func_80ACBD48.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Aqua_0x80ACB6A0/func_80ACBDCC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Aqua_0x80ACB6A0/func_80ACBDCC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Aqua_0x80ACB6A0/func_80ACBDFC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Aqua_0x80ACB6A0/func_80ACBDFC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Aqua_0x80ACB6A0/ObjAqua_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Aqua_0x80ACB6A0/ObjAqua_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Aqua_0x80ACB6A0/ObjAqua_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Aqua_0x80ACB6A0/ObjAqua_Draw.asm") diff --git a/src/overlays/actors/ovl_Obj_Armos/z_obj_armos.c b/src/overlays/actors/ovl_Obj_Armos/z_obj_armos.c index db564e65a7..0b4ce0ea31 100644 --- a/src/overlays/actors/ovl_Obj_Armos/z_obj_armos.c +++ b/src/overlays/actors/ovl_Obj_Armos/z_obj_armos.c @@ -23,36 +23,36 @@ const ActorInit Obj_Armos_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Armos_0x809A4E00/func_809A4E00.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Armos_0x809A4E00/func_809A4E00.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Armos_0x809A4E00/func_809A4E68.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Armos_0x809A4E00/func_809A4E68.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Armos_0x809A4E00/func_809A4F00.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Armos_0x809A4E00/func_809A4F00.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Armos_0x809A4E00/func_809A500C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Armos_0x809A4E00/func_809A500C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Armos_0x809A4E00/func_809A518C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Armos_0x809A4E00/func_809A518C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Armos_0x809A4E00/ObjArmos_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Armos_0x809A4E00/ObjArmos_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Armos_0x809A4E00/ObjArmos_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Armos_0x809A4E00/ObjArmos_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Armos_0x809A4E00/func_809A54B4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Armos_0x809A4E00/func_809A54B4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Armos_0x809A4E00/func_809A54E0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Armos_0x809A4E00/func_809A54E0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Armos_0x809A4E00/func_809A5610.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Armos_0x809A4E00/func_809A5610.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Armos_0x809A4E00/func_809A562C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Armos_0x809A4E00/func_809A562C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Armos_0x809A4E00/func_809A57D8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Armos_0x809A4E00/func_809A57D8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Armos_0x809A4E00/func_809A57F4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Armos_0x809A4E00/func_809A57F4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Armos_0x809A4E00/ObjArmos_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Armos_0x809A4E00/ObjArmos_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Armos_0x809A4E00/func_809A5960.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Armos_0x809A4E00/func_809A5960.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Armos_0x809A4E00/func_809A5A3C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Armos_0x809A4E00/func_809A5A3C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Armos_0x809A4E00/ObjArmos_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Armos_0x809A4E00/ObjArmos_Draw.asm") 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 4669ce5459..bfa16d97e7 100644 --- a/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c +++ b/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c @@ -22,128 +22,128 @@ const ActorInit Obj_Bean_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bean_0x80936CF0/func_80936CF0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Bean_0x80936CF0/func_80936CF0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bean_0x80936CF0/func_80936D58.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Bean_0x80936CF0/func_80936D58.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bean_0x80936CF0/func_80936F04.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Bean_0x80936CF0/func_80936F04.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bean_0x80936CF0/func_80936F24.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Bean_0x80936CF0/func_80936F24.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bean_0x80936CF0/func_80937130.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Bean_0x80936CF0/func_80937130.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bean_0x80936CF0/func_80937160.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Bean_0x80936CF0/func_80937160.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bean_0x80936CF0/func_80937238.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Bean_0x80936CF0/func_80937238.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bean_0x80936CF0/func_80937268.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Bean_0x80936CF0/func_80937268.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bean_0x80936CF0/func_809372A8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Bean_0x80936CF0/func_809372A8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bean_0x80936CF0/func_809372D0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Bean_0x80936CF0/func_809372D0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bean_0x80936CF0/func_80937468.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Bean_0x80936CF0/func_80937468.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bean_0x80936CF0/func_809374F8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Bean_0x80936CF0/func_809374F8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bean_0x80936CF0/func_809375C8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Bean_0x80936CF0/func_809375C8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bean_0x80936CF0/func_809375F4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Bean_0x80936CF0/func_809375F4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bean_0x80936CF0/ObjBean_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Bean_0x80936CF0/ObjBean_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bean_0x80936CF0/ObjBean_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Bean_0x80936CF0/ObjBean_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bean_0x80936CF0/func_80937B54.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Bean_0x80936CF0/func_80937B54.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bean_0x80936CF0/func_80937C10.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Bean_0x80936CF0/func_80937C10.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bean_0x80936CF0/func_80937C24.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Bean_0x80936CF0/func_80937C24.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bean_0x80936CF0/func_80937C30.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Bean_0x80936CF0/func_80937C30.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bean_0x80936CF0/func_80937CA0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Bean_0x80936CF0/func_80937CA0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bean_0x80936CF0/func_80937CE4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Bean_0x80936CF0/func_80937CE4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bean_0x80936CF0/func_80937D54.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Bean_0x80936CF0/func_80937D54.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bean_0x80936CF0/func_80937DD8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Bean_0x80936CF0/func_80937DD8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bean_0x80936CF0/func_80937DEC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Bean_0x80936CF0/func_80937DEC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bean_0x80936CF0/func_80937FB0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Bean_0x80936CF0/func_80937FB0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bean_0x80936CF0/func_80937FC8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Bean_0x80936CF0/func_80937FC8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bean_0x80936CF0/func_809381B0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Bean_0x80936CF0/func_809381B0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bean_0x80936CF0/func_809381C4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Bean_0x80936CF0/func_809381C4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bean_0x80936CF0/func_80938284.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Bean_0x80936CF0/func_80938284.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bean_0x80936CF0/func_80938298.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Bean_0x80936CF0/func_80938298.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bean_0x80936CF0/func_8093833C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Bean_0x80936CF0/func_8093833C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bean_0x80936CF0/func_80938358.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Bean_0x80936CF0/func_80938358.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bean_0x80936CF0/func_809383B4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Bean_0x80936CF0/func_809383B4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bean_0x80936CF0/func_809383D0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Bean_0x80936CF0/func_809383D0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bean_0x80936CF0/func_80938408.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Bean_0x80936CF0/func_80938408.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bean_0x80936CF0/func_80938444.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Bean_0x80936CF0/func_80938444.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bean_0x80936CF0/func_809384E8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Bean_0x80936CF0/func_809384E8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bean_0x80936CF0/func_80938504.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Bean_0x80936CF0/func_80938504.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bean_0x80936CF0/func_80938588.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Bean_0x80936CF0/func_80938588.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bean_0x80936CF0/func_809385A8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Bean_0x80936CF0/func_809385A8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bean_0x80936CF0/func_80938670.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Bean_0x80936CF0/func_80938670.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bean_0x80936CF0/func_8093868C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Bean_0x80936CF0/func_8093868C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bean_0x80936CF0/func_80938704.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Bean_0x80936CF0/func_80938704.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bean_0x80936CF0/func_80938728.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Bean_0x80936CF0/func_80938728.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bean_0x80936CF0/func_8093876C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Bean_0x80936CF0/func_8093876C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bean_0x80936CF0/func_80938780.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Bean_0x80936CF0/func_80938780.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bean_0x80936CF0/func_80938804.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Bean_0x80936CF0/func_80938804.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bean_0x80936CF0/func_80938834.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Bean_0x80936CF0/func_80938834.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bean_0x80936CF0/func_80938874.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Bean_0x80936CF0/func_80938874.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bean_0x80936CF0/func_809388A8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Bean_0x80936CF0/func_809388A8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bean_0x80936CF0/func_8093892C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Bean_0x80936CF0/func_8093892C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bean_0x80936CF0/func_80938958.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Bean_0x80936CF0/func_80938958.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bean_0x80936CF0/func_80938998.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Bean_0x80936CF0/func_80938998.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bean_0x80936CF0/func_809389BC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Bean_0x80936CF0/func_809389BC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bean_0x80936CF0/func_80938A14.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Bean_0x80936CF0/func_80938A14.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bean_0x80936CF0/func_80938A5C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Bean_0x80936CF0/func_80938A5C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bean_0x80936CF0/func_80938AA4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Bean_0x80936CF0/func_80938AA4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bean_0x80936CF0/func_80938AD8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Bean_0x80936CF0/func_80938AD8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bean_0x80936CF0/func_80938C1C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Bean_0x80936CF0/func_80938C1C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bean_0x80936CF0/ObjBean_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Bean_0x80936CF0/ObjBean_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bean_0x80936CF0/func_80938E00.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Bean_0x80936CF0/func_80938E00.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bean_0x80936CF0/func_80938F50.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Bean_0x80936CF0/func_80938F50.asm") diff --git a/src/overlays/actors/ovl_Obj_Bell/z_obj_bell.c b/src/overlays/actors/ovl_Obj_Bell/z_obj_bell.c index b461ddfd4f..a22d8fd8c0 100644 --- a/src/overlays/actors/ovl_Obj_Bell/z_obj_bell.c +++ b/src/overlays/actors/ovl_Obj_Bell/z_obj_bell.c @@ -23,24 +23,24 @@ const ActorInit Obj_Bell_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bell_0x80A35510/func_80A35510.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Bell_0x80A35510/func_80A35510.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bell_0x80A35510/func_80A356D8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Bell_0x80A35510/func_80A356D8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bell_0x80A35510/func_80A357A8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Bell_0x80A35510/func_80A357A8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bell_0x80A35510/func_80A358FC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Bell_0x80A35510/func_80A358FC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bell_0x80A35510/func_80A359B4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Bell_0x80A35510/func_80A359B4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bell_0x80A35510/func_80A35B18.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Bell_0x80A35510/func_80A35B18.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bell_0x80A35510/func_80A35BD4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Bell_0x80A35510/func_80A35BD4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bell_0x80A35510/ObjBell_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Bell_0x80A35510/ObjBell_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bell_0x80A35510/ObjBell_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Bell_0x80A35510/ObjBell_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bell_0x80A35510/ObjBell_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Bell_0x80A35510/ObjBell_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bell_0x80A35510/ObjBell_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Bell_0x80A35510/ObjBell_Draw.asm") diff --git a/src/overlays/actors/ovl_Obj_Bigicicle/z_obj_bigicicle.c b/src/overlays/actors/ovl_Obj_Bigicicle/z_obj_bigicicle.c index 55c4648056..0e220dbed8 100644 --- a/src/overlays/actors/ovl_Obj_Bigicicle/z_obj_bigicicle.c +++ b/src/overlays/actors/ovl_Obj_Bigicicle/z_obj_bigicicle.c @@ -23,22 +23,22 @@ const ActorInit Obj_Bigicicle_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bigicicle_0x80AE8B70/ObjBigicicle_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Bigicicle_0x80AE8B70/ObjBigicicle_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bigicicle_0x80AE8B70/ObjBigicicle_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Bigicicle_0x80AE8B70/ObjBigicicle_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bigicicle_0x80AE8B70/func_80AE8DE4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Bigicicle_0x80AE8B70/func_80AE8DE4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bigicicle_0x80AE8B70/func_80AE8FD4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Bigicicle_0x80AE8B70/func_80AE8FD4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bigicicle_0x80AE8B70/func_80AE9090.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Bigicicle_0x80AE8B70/func_80AE9090.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bigicicle_0x80AE8B70/func_80AE9180.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Bigicicle_0x80AE8B70/func_80AE9180.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bigicicle_0x80AE8B70/func_80AE9258.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Bigicicle_0x80AE8B70/func_80AE9258.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bigicicle_0x80AE8B70/func_80AE939C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Bigicicle_0x80AE8B70/func_80AE939C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bigicicle_0x80AE8B70/ObjBigicicle_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Bigicicle_0x80AE8B70/ObjBigicicle_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bigicicle_0x80AE8B70/ObjBigicicle_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Bigicicle_0x80AE8B70/ObjBigicicle_Draw.asm") diff --git a/src/overlays/actors/ovl_Obj_Blockstop/z_obj_blockstop.c b/src/overlays/actors/ovl_Obj_Blockstop/z_obj_blockstop.c index 7e6e076c7d..ef6af07c01 100644 --- a/src/overlays/actors/ovl_Obj_Blockstop/z_obj_blockstop.c +++ b/src/overlays/actors/ovl_Obj_Blockstop/z_obj_blockstop.c @@ -21,10 +21,10 @@ const ActorInit Obj_Blockstop_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Blockstop_0x809466A0/ObjBlockstop_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Blockstop_0x809466A0/ObjBlockstop_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Blockstop_0x809466A0/func_809466F0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Blockstop_0x809466A0/func_809466F0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Blockstop_0x809466A0/func_809467E8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Blockstop_0x809466A0/func_809467E8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Blockstop_0x809466A0/ObjBlockstop_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Blockstop_0x809466A0/ObjBlockstop_Update.asm") diff --git a/src/overlays/actors/ovl_Obj_Boat/z_obj_boat.c b/src/overlays/actors/ovl_Obj_Boat/z_obj_boat.c index 46c3ba17b2..9a6a3096ee 100644 --- a/src/overlays/actors/ovl_Obj_Boat/z_obj_boat.c +++ b/src/overlays/actors/ovl_Obj_Boat/z_obj_boat.c @@ -23,16 +23,16 @@ const ActorInit Obj_Boat_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Boat_0x80B9AF50/func_80B9AF50.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Boat_0x80B9AF50/func_80B9AF50.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Boat_0x80B9AF50/ObjBoat_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Boat_0x80B9AF50/ObjBoat_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Boat_0x80B9AF50/ObjBoat_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Boat_0x80B9AF50/ObjBoat_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Boat_0x80B9AF50/func_80B9B124.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Boat_0x80B9AF50/func_80B9B124.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Boat_0x80B9AF50/ObjBoat_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Boat_0x80B9AF50/ObjBoat_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Boat_0x80B9AF50/func_80B9B428.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Boat_0x80B9AF50/func_80B9B428.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Boat_0x80B9AF50/ObjBoat_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Boat_0x80B9AF50/ObjBoat_Draw.asm") 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 4d998af36e..4813f50209 100644 --- a/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.c +++ b/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.c @@ -22,34 +22,34 @@ const ActorInit Obj_Bombiwa_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bombiwa_0x809393B0/func_809393B0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Bombiwa_0x809393B0/func_809393B0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bombiwa_0x809393B0/func_80939470.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Bombiwa_0x809393B0/func_80939470.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bombiwa_0x809393B0/func_8093951C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Bombiwa_0x809393B0/func_8093951C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bombiwa_0x809393B0/func_80939594.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Bombiwa_0x809393B0/func_80939594.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bombiwa_0x809393B0/ObjBombiwa_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Bombiwa_0x809393B0/ObjBombiwa_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bombiwa_0x809393B0/ObjBombiwa_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Bombiwa_0x809393B0/ObjBombiwa_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bombiwa_0x809393B0/func_80939794.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Bombiwa_0x809393B0/func_80939794.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bombiwa_0x809393B0/func_80939994.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Bombiwa_0x809393B0/func_80939994.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bombiwa_0x809393B0/func_80939C50.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Bombiwa_0x809393B0/func_80939C50.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bombiwa_0x809393B0/func_80939EE0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Bombiwa_0x809393B0/func_80939EE0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bombiwa_0x809393B0/func_80939EF4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Bombiwa_0x809393B0/func_80939EF4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bombiwa_0x809393B0/func_8093A080.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Bombiwa_0x809393B0/func_8093A080.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bombiwa_0x809393B0/func_8093A1F0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Bombiwa_0x809393B0/func_8093A1F0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bombiwa_0x809393B0/ObjBombiwa_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Bombiwa_0x809393B0/ObjBombiwa_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bombiwa_0x809393B0/func_8093A418.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Bombiwa_0x809393B0/func_8093A418.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bombiwa_0x809393B0/func_8093A608.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Bombiwa_0x809393B0/func_8093A608.asm") diff --git a/src/overlays/actors/ovl_Obj_Boyo/z_obj_boyo.c b/src/overlays/actors/ovl_Obj_Boyo/z_obj_boyo.c index 606c89f311..b64e5e5bce 100644 --- a/src/overlays/actors/ovl_Obj_Boyo/z_obj_boyo.c +++ b/src/overlays/actors/ovl_Obj_Boyo/z_obj_boyo.c @@ -23,18 +23,18 @@ const ActorInit Obj_Boyo_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Boyo_0x809A5D10/ObjBoyo_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Boyo_0x809A5D10/ObjBoyo_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Boyo_0x809A5D10/ObjBoyo_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Boyo_0x809A5D10/ObjBoyo_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Boyo_0x809A5D10/func_809A5DC0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Boyo_0x809A5D10/func_809A5DC0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Boyo_0x809A5D10/func_809A5DE0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Boyo_0x809A5D10/func_809A5DE0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Boyo_0x809A5D10/func_809A5E14.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Boyo_0x809A5D10/func_809A5E14.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Boyo_0x809A5D10/func_809A5E24.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Boyo_0x809A5D10/func_809A5E24.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Boyo_0x809A5D10/ObjBoyo_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Boyo_0x809A5D10/ObjBoyo_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Boyo_0x809A5D10/ObjBoyo_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Boyo_0x809A5D10/ObjBoyo_Draw.asm") diff --git a/src/overlays/actors/ovl_Obj_Chan/z_obj_chan.c b/src/overlays/actors/ovl_Obj_Chan/z_obj_chan.c index 36e7a9ddcb..bb84a7eeec 100644 --- a/src/overlays/actors/ovl_Obj_Chan/z_obj_chan.c +++ b/src/overlays/actors/ovl_Obj_Chan/z_obj_chan.c @@ -23,28 +23,28 @@ const ActorInit Obj_Chan_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Chan_0x80BB98E0/ObjChan_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Chan_0x80BB98E0/ObjChan_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Chan_0x80BB98E0/ObjChan_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Chan_0x80BB98E0/ObjChan_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Chan_0x80BB98E0/func_80BB9A1C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Chan_0x80BB98E0/func_80BB9A1C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Chan_0x80BB98E0/func_80BB9B40.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Chan_0x80BB98E0/func_80BB9B40.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Chan_0x80BB98E0/func_80BB9C08.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Chan_0x80BB98E0/func_80BB9C08.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Chan_0x80BB98E0/func_80BB9F24.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Chan_0x80BB98E0/func_80BB9F24.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Chan_0x80BB98E0/func_80BBA2FC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Chan_0x80BB98E0/func_80BBA2FC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Chan_0x80BB98E0/func_80BBA314.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Chan_0x80BB98E0/func_80BBA314.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Chan_0x80BB98E0/func_80BBA488.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Chan_0x80BB98E0/func_80BBA488.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Chan_0x80BB98E0/ObjChan_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Chan_0x80BB98E0/ObjChan_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Chan_0x80BB98E0/ObjChan_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Chan_0x80BB98E0/ObjChan_Draw.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Chan_0x80BB98E0/func_80BBA894.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Chan_0x80BB98E0/func_80BBA894.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Chan_0x80BB98E0/func_80BBA930.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Chan_0x80BB98E0/func_80BBA930.asm") diff --git a/src/overlays/actors/ovl_Obj_Chikuwa/z_obj_chikuwa.c b/src/overlays/actors/ovl_Obj_Chikuwa/z_obj_chikuwa.c index abfe9f7e58..a12836ce5d 100644 --- a/src/overlays/actors/ovl_Obj_Chikuwa/z_obj_chikuwa.c +++ b/src/overlays/actors/ovl_Obj_Chikuwa/z_obj_chikuwa.c @@ -23,16 +23,16 @@ const ActorInit Obj_Chikuwa_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Chikuwa_0x809B1550/func_809B1550.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Chikuwa_0x809B1550/func_809B1550.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Chikuwa_0x809B1550/ObjChikuwa_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Chikuwa_0x809B1550/ObjChikuwa_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Chikuwa_0x809B1550/ObjChikuwa_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Chikuwa_0x809B1550/ObjChikuwa_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Chikuwa_0x809B1550/func_809B17D0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Chikuwa_0x809B1550/func_809B17D0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Chikuwa_0x809B1550/func_809B1AA0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Chikuwa_0x809B1550/func_809B1AA0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Chikuwa_0x809B1550/ObjChikuwa_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Chikuwa_0x809B1550/ObjChikuwa_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Chikuwa_0x809B1550/ObjChikuwa_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Chikuwa_0x809B1550/ObjChikuwa_Draw.asm") 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 bed9708d30..5b0db44cc8 100644 --- a/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c +++ b/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c @@ -23,40 +23,40 @@ const ActorInit Obj_Comb_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Comb_0x8098CE40/func_8098CE40.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Comb_0x8098CE40/func_8098CE40.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Comb_0x8098CE40/func_8098CEAC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Comb_0x8098CE40/func_8098CEAC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Comb_0x8098CE40/func_8098D19C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Comb_0x8098CE40/func_8098D19C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Comb_0x8098CE40/func_8098D47C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Comb_0x8098CE40/func_8098D47C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Comb_0x8098CE40/func_8098D6E0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Comb_0x8098CE40/func_8098D6E0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Comb_0x8098CE40/func_8098D870.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Comb_0x8098CE40/func_8098D870.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Comb_0x8098CE40/func_8098D8C8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Comb_0x8098CE40/func_8098D8C8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Comb_0x8098CE40/func_8098D99C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Comb_0x8098CE40/func_8098D99C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Comb_0x8098CE40/func_8098DA74.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Comb_0x8098CE40/func_8098DA74.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Comb_0x8098CE40/ObjComb_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Comb_0x8098CE40/ObjComb_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Comb_0x8098CE40/ObjComb_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Comb_0x8098CE40/ObjComb_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Comb_0x8098CE40/func_8098DC44.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Comb_0x8098CE40/func_8098DC44.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Comb_0x8098CE40/func_8098DC60.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Comb_0x8098CE40/func_8098DC60.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Comb_0x8098CE40/func_8098DE58.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Comb_0x8098CE40/func_8098DE58.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Comb_0x8098CE40/func_8098DEA0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Comb_0x8098CE40/func_8098DEA0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Comb_0x8098CE40/func_8098E098.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Comb_0x8098CE40/func_8098E098.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Comb_0x8098CE40/func_8098E0B8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Comb_0x8098CE40/func_8098E0B8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Comb_0x8098CE40/ObjComb_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Comb_0x8098CE40/ObjComb_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Comb_0x8098CE40/ObjComb_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Comb_0x8098CE40/ObjComb_Draw.asm") diff --git a/src/overlays/actors/ovl_Obj_Danpeilift/z_obj_danpeilift.c b/src/overlays/actors/ovl_Obj_Danpeilift/z_obj_danpeilift.c index 8e925d1e0e..e1985037f2 100644 --- a/src/overlays/actors/ovl_Obj_Danpeilift/z_obj_danpeilift.c +++ b/src/overlays/actors/ovl_Obj_Danpeilift/z_obj_danpeilift.c @@ -23,20 +23,20 @@ const ActorInit Obj_Danpeilift_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Danpeilift_0x80C1ADC0/func_80C1ADC0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Danpeilift_0x80C1ADC0/func_80C1ADC0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Danpeilift_0x80C1ADC0/ObjDanpeilift_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Danpeilift_0x80C1ADC0/ObjDanpeilift_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Danpeilift_0x80C1ADC0/ObjDanpeilift_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Danpeilift_0x80C1ADC0/ObjDanpeilift_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Danpeilift_0x80C1ADC0/func_80C1AF84.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Danpeilift_0x80C1ADC0/func_80C1AF84.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Danpeilift_0x80C1ADC0/func_80C1AF94.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Danpeilift_0x80C1ADC0/func_80C1AF94.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Danpeilift_0x80C1ADC0/func_80C1B210.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Danpeilift_0x80C1ADC0/func_80C1B210.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Danpeilift_0x80C1ADC0/func_80C1B26C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Danpeilift_0x80C1ADC0/func_80C1B26C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Danpeilift_0x80C1ADC0/ObjDanpeilift_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Danpeilift_0x80C1ADC0/ObjDanpeilift_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Danpeilift_0x80C1ADC0/ObjDanpeilift_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Danpeilift_0x80C1ADC0/ObjDanpeilift_Draw.asm") diff --git a/src/overlays/actors/ovl_Obj_Demo/z_obj_demo.c b/src/overlays/actors/ovl_Obj_Demo/z_obj_demo.c index 90ac1d8a23..09a81b2757 100644 --- a/src/overlays/actors/ovl_Obj_Demo/z_obj_demo.c +++ b/src/overlays/actors/ovl_Obj_Demo/z_obj_demo.c @@ -21,12 +21,12 @@ const ActorInit Obj_Demo_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Demo_0x80983520/ObjDemo_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Demo_0x80983520/ObjDemo_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Demo_0x80983520/func_80983634.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Demo_0x80983520/func_80983634.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Demo_0x80983520/func_80983678.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Demo_0x80983520/func_80983678.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Demo_0x80983520/func_80983704.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Demo_0x80983520/func_80983704.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Demo_0x80983520/ObjDemo_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Demo_0x80983520/ObjDemo_Update.asm") diff --git a/src/overlays/actors/ovl_Obj_Dhouse/z_obj_dhouse.c b/src/overlays/actors/ovl_Obj_Dhouse/z_obj_dhouse.c index 67df81aec4..d7df56a342 100644 --- a/src/overlays/actors/ovl_Obj_Dhouse/z_obj_dhouse.c +++ b/src/overlays/actors/ovl_Obj_Dhouse/z_obj_dhouse.c @@ -23,42 +23,42 @@ const ActorInit Obj_Dhouse_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Dhouse_0x80B12980/ObjDhouse_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Dhouse_0x80B12980/ObjDhouse_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Dhouse_0x80B12980/ObjDhouse_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Dhouse_0x80B12980/ObjDhouse_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Dhouse_0x80B12980/func_80B12A50.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Dhouse_0x80B12980/func_80B12A50.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Dhouse_0x80B12980/func_80B12A88.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Dhouse_0x80B12980/func_80B12A88.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Dhouse_0x80B12980/func_80B12B38.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Dhouse_0x80B12980/func_80B12B38.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Dhouse_0x80B12980/func_80B12D78.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Dhouse_0x80B12980/func_80B12D78.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Dhouse_0x80B12980/func_80B12E7C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Dhouse_0x80B12980/func_80B12E7C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Dhouse_0x80B12980/func_80B13170.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Dhouse_0x80B12980/func_80B13170.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Dhouse_0x80B12980/func_80B13474.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Dhouse_0x80B12980/func_80B13474.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Dhouse_0x80B12980/func_80B13724.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Dhouse_0x80B12980/func_80B13724.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Dhouse_0x80B12980/func_80B13908.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Dhouse_0x80B12980/func_80B13908.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Dhouse_0x80B12980/func_80B1391C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Dhouse_0x80B12980/func_80B1391C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Dhouse_0x80B12980/func_80B1392C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Dhouse_0x80B12980/func_80B1392C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Dhouse_0x80B12980/func_80B13940.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Dhouse_0x80B12980/func_80B13940.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Dhouse_0x80B12980/func_80B139D8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Dhouse_0x80B12980/func_80B139D8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Dhouse_0x80B12980/func_80B139F4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Dhouse_0x80B12980/func_80B139F4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Dhouse_0x80B12980/ObjDhouse_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Dhouse_0x80B12980/ObjDhouse_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Dhouse_0x80B12980/ObjDhouse_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Dhouse_0x80B12980/ObjDhouse_Draw.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Dhouse_0x80B12980/func_80B13C08.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Dhouse_0x80B12980/func_80B13C08.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Dhouse_0x80B12980/func_80B13E40.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Dhouse_0x80B12980/func_80B13E40.asm") diff --git a/src/overlays/actors/ovl_Obj_Dora/z_obj_dora.c b/src/overlays/actors/ovl_Obj_Dora/z_obj_dora.c index 4ca36b5ee1..c1947ad156 100644 --- a/src/overlays/actors/ovl_Obj_Dora/z_obj_dora.c +++ b/src/overlays/actors/ovl_Obj_Dora/z_obj_dora.c @@ -23,22 +23,22 @@ const ActorInit Obj_Dora_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Dora_0x80B60AD0/ObjDora_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Dora_0x80B60AD0/ObjDora_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Dora_0x80B60AD0/ObjDora_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Dora_0x80B60AD0/ObjDora_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Dora_0x80B60AD0/func_80B60C9C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Dora_0x80B60AD0/func_80B60C9C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Dora_0x80B60AD0/func_80B60CB0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Dora_0x80B60AD0/func_80B60CB0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Dora_0x80B60AD0/func_80B60CC0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Dora_0x80B60AD0/func_80B60CC0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Dora_0x80B60AD0/func_80B60D34.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Dora_0x80B60AD0/func_80B60D34.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Dora_0x80B60AD0/func_80B60E54.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Dora_0x80B60AD0/func_80B60E54.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Dora_0x80B60AD0/func_80B60EE8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Dora_0x80B60AD0/func_80B60EE8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Dora_0x80B60AD0/ObjDora_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Dora_0x80B60AD0/ObjDora_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Dora_0x80B60AD0/ObjDora_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Dora_0x80B60AD0/ObjDora_Draw.asm") diff --git a/src/overlays/actors/ovl_Obj_Dowsing/z_obj_dowsing.c b/src/overlays/actors/ovl_Obj_Dowsing/z_obj_dowsing.c index 7c2a6bd342..c9483483c6 100644 --- a/src/overlays/actors/ovl_Obj_Dowsing/z_obj_dowsing.c +++ b/src/overlays/actors/ovl_Obj_Dowsing/z_obj_dowsing.c @@ -22,12 +22,12 @@ const ActorInit Obj_Dowsing_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Dowsing_0x80B23D50/func_80B23D50.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Dowsing_0x80B23D50/func_80B23D50.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Dowsing_0x80B23D50/func_80B23DD0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Dowsing_0x80B23D50/func_80B23DD0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Dowsing_0x80B23D50/ObjDowsing_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Dowsing_0x80B23D50/ObjDowsing_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Dowsing_0x80B23D50/ObjDowsing_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Dowsing_0x80B23D50/ObjDowsing_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Dowsing_0x80B23D50/ObjDowsing_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Dowsing_0x80B23D50/ObjDowsing_Update.asm") diff --git a/src/overlays/actors/ovl_Obj_Driftice/z_obj_driftice.c b/src/overlays/actors/ovl_Obj_Driftice/z_obj_driftice.c index 9d48303f72..807c237d09 100644 --- a/src/overlays/actors/ovl_Obj_Driftice/z_obj_driftice.c +++ b/src/overlays/actors/ovl_Obj_Driftice/z_obj_driftice.c @@ -23,40 +23,40 @@ const ActorInit Obj_Driftice_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Driftice_0x80A66570/func_80A66570.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Driftice_0x80A66570/func_80A66570.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Driftice_0x80A66570/func_80A665AC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Driftice_0x80A66570/func_80A665AC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Driftice_0x80A66570/func_80A665EC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Driftice_0x80A66570/func_80A665EC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Driftice_0x80A66570/func_80A667F0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Driftice_0x80A66570/func_80A667F0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Driftice_0x80A66570/func_80A66930.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Driftice_0x80A66570/func_80A66930.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Driftice_0x80A66570/func_80A66C4C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Driftice_0x80A66570/func_80A66C4C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Driftice_0x80A66570/func_80A66E30.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Driftice_0x80A66570/func_80A66E30.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Driftice_0x80A66570/ObjDriftice_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Driftice_0x80A66570/ObjDriftice_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Driftice_0x80A66570/ObjDriftice_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Driftice_0x80A66570/ObjDriftice_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Driftice_0x80A66570/func_80A671A8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Driftice_0x80A66570/func_80A671A8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Driftice_0x80A66570/func_80A671BC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Driftice_0x80A66570/func_80A671BC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Driftice_0x80A66570/func_80A671CC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Driftice_0x80A66570/func_80A671CC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Driftice_0x80A66570/func_80A671E0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Driftice_0x80A66570/func_80A671E0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Driftice_0x80A66570/func_80A6743C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Driftice_0x80A66570/func_80A6743C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Driftice_0x80A66570/func_80A67450.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Driftice_0x80A66570/func_80A67450.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Driftice_0x80A66570/func_80A674A8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Driftice_0x80A66570/func_80A674A8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Driftice_0x80A66570/func_80A674C4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Driftice_0x80A66570/func_80A674C4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Driftice_0x80A66570/ObjDriftice_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Driftice_0x80A66570/ObjDriftice_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Driftice_0x80A66570/ObjDriftice_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Driftice_0x80A66570/ObjDriftice_Draw.asm") diff --git a/src/overlays/actors/ovl_Obj_Ending/z_obj_ending.c b/src/overlays/actors/ovl_Obj_Ending/z_obj_ending.c index 5d3faea856..0202e0e287 100644 --- a/src/overlays/actors/ovl_Obj_Ending/z_obj_ending.c +++ b/src/overlays/actors/ovl_Obj_Ending/z_obj_ending.c @@ -22,8 +22,8 @@ const ActorInit Obj_Ending_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Ending_0x80C25BC0/ObjEnding_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Ending_0x80C25BC0/ObjEnding_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Ending_0x80C25BC0/ObjEnding_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Ending_0x80C25BC0/ObjEnding_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Ending_0x80C25BC0/ObjEnding_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Ending_0x80C25BC0/ObjEnding_Draw.asm") diff --git a/src/overlays/actors/ovl_Obj_Entotu/z_obj_entotu.c b/src/overlays/actors/ovl_Obj_Entotu/z_obj_entotu.c index 1b025fcaa4..48621de9b9 100644 --- a/src/overlays/actors/ovl_Obj_Entotu/z_obj_entotu.c +++ b/src/overlays/actors/ovl_Obj_Entotu/z_obj_entotu.c @@ -23,18 +23,18 @@ const ActorInit Obj_Entotu_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Entotu_0x80A34700/func_80A34700.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Entotu_0x80A34700/func_80A34700.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Entotu_0x80A34700/func_80A349C0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Entotu_0x80A34700/func_80A349C0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Entotu_0x80A34700/func_80A34A44.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Entotu_0x80A34700/func_80A34A44.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Entotu_0x80A34700/func_80A34B28.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Entotu_0x80A34700/func_80A34B28.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Entotu_0x80A34700/ObjEntotu_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Entotu_0x80A34700/ObjEntotu_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Entotu_0x80A34700/ObjEntotu_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Entotu_0x80A34700/ObjEntotu_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Entotu_0x80A34700/ObjEntotu_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Entotu_0x80A34700/ObjEntotu_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Entotu_0x80A34700/ObjEntotu_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Entotu_0x80A34700/ObjEntotu_Draw.asm") diff --git a/src/overlays/actors/ovl_Obj_Etcetera/z_obj_etcetera.c b/src/overlays/actors/ovl_Obj_Etcetera/z_obj_etcetera.c index 9c8cffdf17..dcb88a6576 100644 --- a/src/overlays/actors/ovl_Obj_Etcetera/z_obj_etcetera.c +++ b/src/overlays/actors/ovl_Obj_Etcetera/z_obj_etcetera.c @@ -22,24 +22,24 @@ const ActorInit Obj_Etcetera_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Etcetera_0x80A7BC70/ObjEtcetera_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Etcetera_0x80A7BC70/ObjEtcetera_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Etcetera_0x80A7BC70/ObjEtcetera_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Etcetera_0x80A7BC70/ObjEtcetera_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Etcetera_0x80A7BC70/func_80A7BDC8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Etcetera_0x80A7BC70/func_80A7BDC8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Etcetera_0x80A7BC70/func_80A7BE8C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Etcetera_0x80A7BC70/func_80A7BE8C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Etcetera_0x80A7BC70/func_80A7BF08.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Etcetera_0x80A7BC70/func_80A7BF08.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Etcetera_0x80A7BC70/func_80A7C168.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Etcetera_0x80A7BC70/func_80A7C168.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Etcetera_0x80A7BC70/func_80A7C1F0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Etcetera_0x80A7BC70/func_80A7C1F0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Etcetera_0x80A7BC70/func_80A7C308.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Etcetera_0x80A7BC70/func_80A7C308.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Etcetera_0x80A7BC70/ObjEtcetera_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Etcetera_0x80A7BC70/ObjEtcetera_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Etcetera_0x80A7BC70/func_80A7C690.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Etcetera_0x80A7BC70/func_80A7C690.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Etcetera_0x80A7BC70/func_80A7C718.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Etcetera_0x80A7BC70/func_80A7C718.asm") diff --git a/src/overlays/actors/ovl_Obj_Fireshield/z_obj_fireshield.c b/src/overlays/actors/ovl_Obj_Fireshield/z_obj_fireshield.c index fe2e4bba0c..f38c2e6b0b 100644 --- a/src/overlays/actors/ovl_Obj_Fireshield/z_obj_fireshield.c +++ b/src/overlays/actors/ovl_Obj_Fireshield/z_obj_fireshield.c @@ -23,30 +23,30 @@ const ActorInit Obj_Fireshield_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Fireshield_0x80A4CA90/func_80A4CA90.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Fireshield_0x80A4CA90/func_80A4CA90.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Fireshield_0x80A4CA90/func_80A4CABC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Fireshield_0x80A4CA90/func_80A4CABC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Fireshield_0x80A4CA90/func_80A4CB7C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Fireshield_0x80A4CA90/func_80A4CB7C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Fireshield_0x80A4CA90/func_80A4CC54.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Fireshield_0x80A4CA90/func_80A4CC54.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Fireshield_0x80A4CA90/func_80A4CCBC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Fireshield_0x80A4CA90/func_80A4CCBC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Fireshield_0x80A4CA90/func_80A4CD28.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Fireshield_0x80A4CA90/func_80A4CD28.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Fireshield_0x80A4CA90/func_80A4CD34.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Fireshield_0x80A4CA90/func_80A4CD34.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Fireshield_0x80A4CA90/func_80A4CE28.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Fireshield_0x80A4CA90/func_80A4CE28.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Fireshield_0x80A4CA90/func_80A4D174.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Fireshield_0x80A4CA90/func_80A4D174.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Fireshield_0x80A4CA90/func_80A4D1CC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Fireshield_0x80A4CA90/func_80A4D1CC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Fireshield_0x80A4CA90/ObjFireshield_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Fireshield_0x80A4CA90/ObjFireshield_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Fireshield_0x80A4CA90/ObjFireshield_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Fireshield_0x80A4CA90/ObjFireshield_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Fireshield_0x80A4CA90/ObjFireshield_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Fireshield_0x80A4CA90/ObjFireshield_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Fireshield_0x80A4CA90/ObjFireshield_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Fireshield_0x80A4CA90/ObjFireshield_Draw.asm") diff --git a/src/overlays/actors/ovl_Obj_Flowerpot/z_obj_flowerpot.c b/src/overlays/actors/ovl_Obj_Flowerpot/z_obj_flowerpot.c index 53e6474727..641a3810b8 100644 --- a/src/overlays/actors/ovl_Obj_Flowerpot/z_obj_flowerpot.c +++ b/src/overlays/actors/ovl_Obj_Flowerpot/z_obj_flowerpot.c @@ -23,48 +23,48 @@ const ActorInit Obj_Flowerpot_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Flowerpot_0x80A1B3D0/func_80A1B3D0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Flowerpot_0x80A1B3D0/func_80A1B3D0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Flowerpot_0x80A1B3D0/func_80A1B840.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Flowerpot_0x80A1B3D0/func_80A1B840.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Flowerpot_0x80A1B3D0/func_80A1B914.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Flowerpot_0x80A1B3D0/func_80A1B914.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Flowerpot_0x80A1B3D0/func_80A1B994.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Flowerpot_0x80A1B3D0/func_80A1B994.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Flowerpot_0x80A1B3D0/func_80A1B9CC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Flowerpot_0x80A1B3D0/func_80A1B9CC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Flowerpot_0x80A1B3D0/func_80A1BA04.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Flowerpot_0x80A1B3D0/func_80A1BA04.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Flowerpot_0x80A1B3D0/func_80A1BA44.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Flowerpot_0x80A1B3D0/func_80A1BA44.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Flowerpot_0x80A1B3D0/func_80A1BD80.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Flowerpot_0x80A1B3D0/func_80A1BD80.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Flowerpot_0x80A1B3D0/func_80A1C0FC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Flowerpot_0x80A1B3D0/func_80A1C0FC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Flowerpot_0x80A1B3D0/func_80A1C328.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Flowerpot_0x80A1B3D0/func_80A1C328.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Flowerpot_0x80A1B3D0/func_80A1C554.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Flowerpot_0x80A1B3D0/func_80A1C554.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Flowerpot_0x80A1B3D0/func_80A1C5E8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Flowerpot_0x80A1B3D0/func_80A1C5E8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Flowerpot_0x80A1B3D0/func_80A1C62C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Flowerpot_0x80A1B3D0/func_80A1C62C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Flowerpot_0x80A1B3D0/ObjFlowerpot_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Flowerpot_0x80A1B3D0/ObjFlowerpot_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Flowerpot_0x80A1B3D0/ObjFlowerpot_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Flowerpot_0x80A1B3D0/ObjFlowerpot_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Flowerpot_0x80A1B3D0/func_80A1C818.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Flowerpot_0x80A1B3D0/func_80A1C818.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Flowerpot_0x80A1B3D0/func_80A1C838.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Flowerpot_0x80A1B3D0/func_80A1C838.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Flowerpot_0x80A1B3D0/func_80A1CBF8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Flowerpot_0x80A1B3D0/func_80A1CBF8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Flowerpot_0x80A1B3D0/func_80A1CC0C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Flowerpot_0x80A1B3D0/func_80A1CC0C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Flowerpot_0x80A1B3D0/func_80A1CD10.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Flowerpot_0x80A1B3D0/func_80A1CD10.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Flowerpot_0x80A1B3D0/func_80A1CEF4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Flowerpot_0x80A1B3D0/func_80A1CEF4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Flowerpot_0x80A1B3D0/ObjFlowerpot_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Flowerpot_0x80A1B3D0/ObjFlowerpot_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Flowerpot_0x80A1B3D0/ObjFlowerpot_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Flowerpot_0x80A1B3D0/ObjFlowerpot_Draw.asm") diff --git a/src/overlays/actors/ovl_Obj_Funen/z_obj_funen.c b/src/overlays/actors/ovl_Obj_Funen/z_obj_funen.c index d53d7f31cf..78562a26f2 100644 --- a/src/overlays/actors/ovl_Obj_Funen/z_obj_funen.c +++ b/src/overlays/actors/ovl_Obj_Funen/z_obj_funen.c @@ -21,6 +21,6 @@ const ActorInit Obj_Funen_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Funen_0x80A19740/ObjFunen_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Funen_0x80A19740/ObjFunen_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Funen_0x80A19740/ObjFunen_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Funen_0x80A19740/ObjFunen_Draw.asm") diff --git a/src/overlays/actors/ovl_Obj_Ghaka/z_obj_ghaka.c b/src/overlays/actors/ovl_Obj_Ghaka/z_obj_ghaka.c index eb403cd0ef..87d9f6d12e 100644 --- a/src/overlays/actors/ovl_Obj_Ghaka/z_obj_ghaka.c +++ b/src/overlays/actors/ovl_Obj_Ghaka/z_obj_ghaka.c @@ -23,24 +23,24 @@ const ActorInit Obj_Ghaka_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Ghaka_0x80B3C260/func_80B3C260.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Ghaka_0x80B3C260/func_80B3C260.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Ghaka_0x80B3C260/func_80B3C29C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Ghaka_0x80B3C260/func_80B3C29C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Ghaka_0x80B3C260/func_80B3C2B0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Ghaka_0x80B3C260/func_80B3C2B0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Ghaka_0x80B3C260/func_80B3C2C4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Ghaka_0x80B3C260/func_80B3C2C4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Ghaka_0x80B3C260/func_80B3C39C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Ghaka_0x80B3C260/func_80B3C39C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Ghaka_0x80B3C260/func_80B3C4E0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Ghaka_0x80B3C260/func_80B3C4E0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Ghaka_0x80B3C260/func_80B3C624.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Ghaka_0x80B3C260/func_80B3C624.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Ghaka_0x80B3C260/ObjGhaka_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Ghaka_0x80B3C260/ObjGhaka_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Ghaka_0x80B3C260/ObjGhaka_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Ghaka_0x80B3C260/ObjGhaka_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Ghaka_0x80B3C260/ObjGhaka_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Ghaka_0x80B3C260/ObjGhaka_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Ghaka_0x80B3C260/ObjGhaka_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Ghaka_0x80B3C260/ObjGhaka_Draw.asm") diff --git a/src/overlays/actors/ovl_Obj_Grass/z_obj_grass.c b/src/overlays/actors/ovl_Obj_Grass/z_obj_grass.c index e48e9c90db..507e3f88d1 100644 --- a/src/overlays/actors/ovl_Obj_Grass/z_obj_grass.c +++ b/src/overlays/actors/ovl_Obj_Grass/z_obj_grass.c @@ -23,30 +23,30 @@ const ActorInit Obj_Grass_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Grass_0x809A9110/func_809A9110.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Grass_0x809A9110/func_809A9110.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Grass_0x809A9110/func_809A91FC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Grass_0x809A9110/func_809A91FC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Grass_0x809A9110/func_809A92D0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Grass_0x809A9110/func_809A92D0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Grass_0x809A9110/func_809A9314.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Grass_0x809A9110/func_809A9314.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Grass_0x809A9110/ObjGrass_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Grass_0x809A9110/ObjGrass_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Grass_0x809A9110/ObjGrass_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Grass_0x809A9110/ObjGrass_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Grass_0x809A9110/func_809A9790.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Grass_0x809A9110/func_809A9790.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Grass_0x809A9110/func_809A983C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Grass_0x809A9110/func_809A983C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Grass_0x809A9110/func_809A9DB8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Grass_0x809A9110/func_809A9DB8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Grass_0x809A9110/ObjGrass_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Grass_0x809A9110/ObjGrass_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Grass_0x809A9110/func_809AA278.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Grass_0x809A9110/func_809AA278.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Grass_0x809A9110/func_809AA54C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Grass_0x809A9110/func_809AA54C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Grass_0x809A9110/func_809AA798.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Grass_0x809A9110/func_809AA798.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Grass_0x809A9110/ObjGrass_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Grass_0x809A9110/ObjGrass_Draw.asm") diff --git a/src/overlays/actors/ovl_Obj_Grass_Carry/z_obj_grass_carry.c b/src/overlays/actors/ovl_Obj_Grass_Carry/z_obj_grass_carry.c index 3adb9c2b8d..e65ffb56a9 100644 --- a/src/overlays/actors/ovl_Obj_Grass_Carry/z_obj_grass_carry.c +++ b/src/overlays/actors/ovl_Obj_Grass_Carry/z_obj_grass_carry.c @@ -22,42 +22,42 @@ const ActorInit Obj_Grass_Carry_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Grass_Carry_0x809AAE60/func_809AAE60.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Grass_Carry_0x809AAE60/func_809AAE60.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Grass_Carry_0x809AAE60/func_809AAE94.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Grass_Carry_0x809AAE60/func_809AAE94.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Grass_Carry_0x809AAE60/func_809AAF18.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Grass_Carry_0x809AAE60/func_809AAF18.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Grass_Carry_0x809AAE60/func_809AAF58.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Grass_Carry_0x809AAE60/func_809AAF58.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Grass_Carry_0x809AAE60/func_809AAF9C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Grass_Carry_0x809AAE60/func_809AAF9C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Grass_Carry_0x809AAE60/func_809AAFE8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Grass_Carry_0x809AAE60/func_809AAFE8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Grass_Carry_0x809AAE60/ObjGrassCarry_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Grass_Carry_0x809AAE60/ObjGrassCarry_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Grass_Carry_0x809AAE60/ObjGrassCarry_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Grass_Carry_0x809AAE60/ObjGrassCarry_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Grass_Carry_0x809AAE60/func_809AB3C4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Grass_Carry_0x809AAE60/func_809AB3C4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Grass_Carry_0x809AAE60/func_809AB3D8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Grass_Carry_0x809AAE60/func_809AB3D8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Grass_Carry_0x809AAE60/func_809AB428.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Grass_Carry_0x809AAE60/func_809AB428.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Grass_Carry_0x809AAE60/func_809AB43C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Grass_Carry_0x809AAE60/func_809AB43C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Grass_Carry_0x809AAE60/func_809AB474.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Grass_Carry_0x809AAE60/func_809AB474.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Grass_Carry_0x809AAE60/func_809AB4A8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Grass_Carry_0x809AAE60/func_809AB4A8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Grass_Carry_0x809AAE60/func_809AB5FC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Grass_Carry_0x809AAE60/func_809AB5FC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Grass_Carry_0x809AAE60/func_809AB610.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Grass_Carry_0x809AAE60/func_809AB610.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Grass_Carry_0x809AAE60/func_809AB6FC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Grass_Carry_0x809AAE60/func_809AB6FC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Grass_Carry_0x809AAE60/func_809AB77C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Grass_Carry_0x809AAE60/func_809AB77C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Grass_Carry_0x809AAE60/ObjGrassCarry_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Grass_Carry_0x809AAE60/ObjGrassCarry_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Grass_Carry_0x809AAE60/func_809ABB7C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Grass_Carry_0x809AAE60/func_809ABB7C.asm") diff --git a/src/overlays/actors/ovl_Obj_Grass_Unit/z_obj_grass_unit.c b/src/overlays/actors/ovl_Obj_Grass_Unit/z_obj_grass_unit.c index b27f1f5983..35f25e6f8f 100644 --- a/src/overlays/actors/ovl_Obj_Grass_Unit/z_obj_grass_unit.c +++ b/src/overlays/actors/ovl_Obj_Grass_Unit/z_obj_grass_unit.c @@ -20,12 +20,12 @@ const ActorInit Obj_Grass_Unit_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Grass_Unit_0x809ABDE0/func_809ABDE0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Grass_Unit_0x809ABDE0/func_809ABDE0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Grass_Unit_0x809ABDE0/func_809ABE54.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Grass_Unit_0x809ABDE0/func_809ABE54.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Grass_Unit_0x809ABDE0/func_809ABEC4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Grass_Unit_0x809ABDE0/func_809ABEC4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Grass_Unit_0x809ABDE0/func_809ABF38.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Grass_Unit_0x809ABDE0/func_809ABF38.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Grass_Unit_0x809ABDE0/ObjGrassUnit_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Grass_Unit_0x809ABDE0/ObjGrassUnit_Init.asm") diff --git a/src/overlays/actors/ovl_Obj_Hakaisi/z_obj_hakaisi.c b/src/overlays/actors/ovl_Obj_Hakaisi/z_obj_hakaisi.c index 355ae69cdf..8849a39868 100644 --- a/src/overlays/actors/ovl_Obj_Hakaisi/z_obj_hakaisi.c +++ b/src/overlays/actors/ovl_Obj_Hakaisi/z_obj_hakaisi.c @@ -23,50 +23,50 @@ const ActorInit Obj_Hakaisi_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hakaisi_0x80B14180/ObjHakaisi_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Hakaisi_0x80B14180/ObjHakaisi_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hakaisi_0x80B14180/ObjHakaisi_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Hakaisi_0x80B14180/ObjHakaisi_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hakaisi_0x80B14180/func_80B1444C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Hakaisi_0x80B14180/func_80B1444C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hakaisi_0x80B14180/func_80B14460.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Hakaisi_0x80B14180/func_80B14460.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hakaisi_0x80B14180/func_80B14510.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Hakaisi_0x80B14180/func_80B14510.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hakaisi_0x80B14180/func_80B14524.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Hakaisi_0x80B14180/func_80B14524.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hakaisi_0x80B14180/func_80B14558.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Hakaisi_0x80B14180/func_80B14558.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hakaisi_0x80B14180/func_80B1456C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Hakaisi_0x80B14180/func_80B1456C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hakaisi_0x80B14180/func_80B145F4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Hakaisi_0x80B14180/func_80B145F4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hakaisi_0x80B14180/func_80B14648.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Hakaisi_0x80B14180/func_80B14648.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hakaisi_0x80B14180/func_80B149A8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Hakaisi_0x80B14180/func_80B149A8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hakaisi_0x80B14180/func_80B149C0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Hakaisi_0x80B14180/func_80B149C0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hakaisi_0x80B14180/func_80B14A24.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Hakaisi_0x80B14180/func_80B14A24.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hakaisi_0x80B14180/func_80B14B6C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Hakaisi_0x80B14180/func_80B14B6C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hakaisi_0x80B14180/func_80B14CF8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Hakaisi_0x80B14180/func_80B14CF8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hakaisi_0x80B14180/func_80B14F4C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Hakaisi_0x80B14180/func_80B14F4C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hakaisi_0x80B14180/ObjHakaisi_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Hakaisi_0x80B14180/ObjHakaisi_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hakaisi_0x80B14180/ObjHakaisi_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Hakaisi_0x80B14180/ObjHakaisi_Draw.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hakaisi_0x80B14180/func_80B151E0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Hakaisi_0x80B14180/func_80B151E0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hakaisi_0x80B14180/func_80B15254.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Hakaisi_0x80B14180/func_80B15254.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hakaisi_0x80B14180/func_80B15264.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Hakaisi_0x80B14180/func_80B15264.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hakaisi_0x80B14180/func_80B15330.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Hakaisi_0x80B14180/func_80B15330.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hakaisi_0x80B14180/func_80B1544C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Hakaisi_0x80B14180/func_80B1544C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hakaisi_0x80B14180/func_80B154A0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Hakaisi_0x80B14180/func_80B154A0.asm") 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 626568b258..b138e06892 100644 --- a/src/overlays/actors/ovl_Obj_Hamishi/z_obj_hamishi.c +++ b/src/overlays/actors/ovl_Obj_Hamishi/z_obj_hamishi.c @@ -23,20 +23,20 @@ const ActorInit Obj_Hamishi_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hamishi_0x809A0F20/func_809A0F20.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Hamishi_0x809A0F20/func_809A0F20.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hamishi_0x809A0F20/func_809A0F78.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Hamishi_0x809A0F20/func_809A0F78.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hamishi_0x809A0F20/func_809A10F4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Hamishi_0x809A0F20/func_809A10F4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hamishi_0x809A0F20/func_809A13A0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Hamishi_0x809A0F20/func_809A13A0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hamishi_0x809A0F20/func_809A1408.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Hamishi_0x809A0F20/func_809A1408.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hamishi_0x809A0F20/ObjHamishi_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Hamishi_0x809A0F20/ObjHamishi_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hamishi_0x809A0F20/ObjHamishi_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Hamishi_0x809A0F20/ObjHamishi_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hamishi_0x809A0F20/ObjHamishi_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Hamishi_0x809A0F20/ObjHamishi_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hamishi_0x809A0F20/ObjHamishi_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Hamishi_0x809A0F20/ObjHamishi_Draw.asm") diff --git a/src/overlays/actors/ovl_Obj_Hariko/z_obj_hariko.c b/src/overlays/actors/ovl_Obj_Hariko/z_obj_hariko.c index 8f68d03832..94fa4867bd 100644 --- a/src/overlays/actors/ovl_Obj_Hariko/z_obj_hariko.c +++ b/src/overlays/actors/ovl_Obj_Hariko/z_obj_hariko.c @@ -23,20 +23,20 @@ const ActorInit Obj_Hariko_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hariko_0x80B66A20/ObjHariko_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Hariko_0x80B66A20/ObjHariko_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hariko_0x80B66A20/ObjHariko_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Hariko_0x80B66A20/ObjHariko_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hariko_0x80B66A20/func_80B66A7C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Hariko_0x80B66A20/func_80B66A7C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hariko_0x80B66A20/func_80B66A90.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Hariko_0x80B66A20/func_80B66A90.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hariko_0x80B66A20/func_80B66AA0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Hariko_0x80B66A20/func_80B66AA0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hariko_0x80B66A20/func_80B66AC4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Hariko_0x80B66A20/func_80B66AC4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hariko_0x80B66A20/func_80B66B78.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Hariko_0x80B66A20/func_80B66B78.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hariko_0x80B66A20/ObjHariko_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Hariko_0x80B66A20/ObjHariko_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hariko_0x80B66A20/ObjHariko_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Hariko_0x80B66A20/ObjHariko_Draw.asm") diff --git a/src/overlays/actors/ovl_Obj_Hgdoor/z_obj_hgdoor.c b/src/overlays/actors/ovl_Obj_Hgdoor/z_obj_hgdoor.c index 22745673fc..fe5382c412 100644 --- a/src/overlays/actors/ovl_Obj_Hgdoor/z_obj_hgdoor.c +++ b/src/overlays/actors/ovl_Obj_Hgdoor/z_obj_hgdoor.c @@ -23,34 +23,34 @@ const ActorInit Obj_Hgdoor_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hgdoor_0x80BD4090/func_80BD4090.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Hgdoor_0x80BD4090/func_80BD4090.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hgdoor_0x80BD4090/func_80BD40D0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Hgdoor_0x80BD4090/func_80BD40D0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hgdoor_0x80BD4090/ObjHgdoor_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Hgdoor_0x80BD4090/ObjHgdoor_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hgdoor_0x80BD4090/ObjHgdoor_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Hgdoor_0x80BD4090/ObjHgdoor_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hgdoor_0x80BD4090/func_80BD41E8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Hgdoor_0x80BD4090/func_80BD41E8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hgdoor_0x80BD4090/func_80BD41FC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Hgdoor_0x80BD4090/func_80BD41FC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hgdoor_0x80BD4090/func_80BD42AC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Hgdoor_0x80BD4090/func_80BD42AC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hgdoor_0x80BD4090/func_80BD42C0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Hgdoor_0x80BD4090/func_80BD42C0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hgdoor_0x80BD4090/func_80BD433C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Hgdoor_0x80BD4090/func_80BD433C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hgdoor_0x80BD4090/func_80BD4358.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Hgdoor_0x80BD4090/func_80BD4358.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hgdoor_0x80BD4090/func_80BD4460.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Hgdoor_0x80BD4090/func_80BD4460.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hgdoor_0x80BD4090/func_80BD4478.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Hgdoor_0x80BD4090/func_80BD4478.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hgdoor_0x80BD4090/func_80BD44D0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Hgdoor_0x80BD4090/func_80BD44D0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hgdoor_0x80BD4090/func_80BD4500.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Hgdoor_0x80BD4090/func_80BD4500.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hgdoor_0x80BD4090/ObjHgdoor_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Hgdoor_0x80BD4090/ObjHgdoor_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hgdoor_0x80BD4090/ObjHgdoor_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Hgdoor_0x80BD4090/ObjHgdoor_Draw.asm") diff --git a/src/overlays/actors/ovl_Obj_HsStump/z_obj_hsstump.c b/src/overlays/actors/ovl_Obj_HsStump/z_obj_hsstump.c index 540abec9f5..cab8d267f7 100644 --- a/src/overlays/actors/ovl_Obj_HsStump/z_obj_hsstump.c +++ b/src/overlays/actors/ovl_Obj_HsStump/z_obj_hsstump.c @@ -23,18 +23,18 @@ const ActorInit Obj_HsStump_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_HsStump_0x80BDAA30/ObjHsStump_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_HsStump_0x80BDAA30/ObjHsStump_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_HsStump_0x80BDAA30/func_80BDAB00.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_HsStump_0x80BDAA30/func_80BDAB00.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_HsStump_0x80BDAA30/func_80BDAB18.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_HsStump_0x80BDAA30/func_80BDAB18.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_HsStump_0x80BDAA30/func_80BDAB6C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_HsStump_0x80BDAA30/func_80BDAB6C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_HsStump_0x80BDAA30/func_80BDABCC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_HsStump_0x80BDAA30/func_80BDABCC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_HsStump_0x80BDAA30/ObjHsStump_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_HsStump_0x80BDAA30/ObjHsStump_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_HsStump_0x80BDAA30/ObjHsStump_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_HsStump_0x80BDAA30/ObjHsStump_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_HsStump_0x80BDAA30/ObjHsStump_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_HsStump_0x80BDAA30/ObjHsStump_Draw.asm") 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 80f9a9ae4d..42d0d7f753 100644 --- a/src/overlays/actors/ovl_Obj_Hsblock/z_obj_hsblock.c +++ b/src/overlays/actors/ovl_Obj_Hsblock/z_obj_hsblock.c @@ -23,24 +23,24 @@ const ActorInit Obj_Hsblock_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hsblock_0x8093DEA0/func_8093DEA0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Hsblock_0x8093DEA0/func_8093DEA0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hsblock_0x8093DEA0/func_8093DEAC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Hsblock_0x8093DEA0/func_8093DEAC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hsblock_0x8093DEA0/ObjHsblock_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Hsblock_0x8093DEA0/ObjHsblock_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hsblock_0x8093DEA0/ObjHsblock_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Hsblock_0x8093DEA0/ObjHsblock_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hsblock_0x8093DEA0/func_8093E03C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Hsblock_0x8093DEA0/func_8093E03C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hsblock_0x8093DEA0/func_8093E05C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Hsblock_0x8093DEA0/func_8093E05C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hsblock_0x8093DEA0/func_8093E0A0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Hsblock_0x8093DEA0/func_8093E0A0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hsblock_0x8093DEA0/func_8093E0E8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Hsblock_0x8093DEA0/func_8093E0E8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hsblock_0x8093DEA0/func_8093E10C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Hsblock_0x8093DEA0/func_8093E10C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hsblock_0x8093DEA0/ObjHsblock_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Hsblock_0x8093DEA0/ObjHsblock_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hsblock_0x8093DEA0/ObjHsblock_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Hsblock_0x8093DEA0/ObjHsblock_Draw.asm") diff --git a/src/overlays/actors/ovl_Obj_Hugebombiwa/z_obj_hugebombiwa.c b/src/overlays/actors/ovl_Obj_Hugebombiwa/z_obj_hugebombiwa.c index 9a63bba1bd..dc1af5793e 100644 --- a/src/overlays/actors/ovl_Obj_Hugebombiwa/z_obj_hugebombiwa.c +++ b/src/overlays/actors/ovl_Obj_Hugebombiwa/z_obj_hugebombiwa.c @@ -23,40 +23,40 @@ const ActorInit Obj_Hugebombiwa_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hugebombiwa_0x80A53BE0/func_80A53BE0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Hugebombiwa_0x80A53BE0/func_80A53BE0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hugebombiwa_0x80A53BE0/func_80A53E60.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Hugebombiwa_0x80A53BE0/func_80A53E60.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hugebombiwa_0x80A53BE0/func_80A541F4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Hugebombiwa_0x80A53BE0/func_80A541F4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hugebombiwa_0x80A53BE0/func_80A54600.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Hugebombiwa_0x80A53BE0/func_80A54600.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hugebombiwa_0x80A53BE0/func_80A54980.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Hugebombiwa_0x80A53BE0/func_80A54980.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hugebombiwa_0x80A53BE0/func_80A54A0C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Hugebombiwa_0x80A53BE0/func_80A54A0C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hugebombiwa_0x80A53BE0/ObjHugebombiwa_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Hugebombiwa_0x80A53BE0/ObjHugebombiwa_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hugebombiwa_0x80A53BE0/ObjHugebombiwa_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Hugebombiwa_0x80A53BE0/ObjHugebombiwa_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hugebombiwa_0x80A53BE0/func_80A54BF0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Hugebombiwa_0x80A53BE0/func_80A54BF0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hugebombiwa_0x80A53BE0/func_80A54C04.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Hugebombiwa_0x80A53BE0/func_80A54C04.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hugebombiwa_0x80A53BE0/func_80A54CD8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Hugebombiwa_0x80A53BE0/func_80A54CD8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hugebombiwa_0x80A53BE0/func_80A54CEC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Hugebombiwa_0x80A53BE0/func_80A54CEC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hugebombiwa_0x80A53BE0/func_80A54E10.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Hugebombiwa_0x80A53BE0/func_80A54E10.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hugebombiwa_0x80A53BE0/func_80A55064.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Hugebombiwa_0x80A53BE0/func_80A55064.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hugebombiwa_0x80A53BE0/func_80A55310.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Hugebombiwa_0x80A53BE0/func_80A55310.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hugebombiwa_0x80A53BE0/func_80A55564.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Hugebombiwa_0x80A53BE0/func_80A55564.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hugebombiwa_0x80A53BE0/ObjHugebombiwa_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Hugebombiwa_0x80A53BE0/ObjHugebombiwa_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hugebombiwa_0x80A53BE0/ObjHugebombiwa_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Hugebombiwa_0x80A53BE0/ObjHugebombiwa_Draw.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hugebombiwa_0x80A53BE0/func_80A55B34.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Hugebombiwa_0x80A53BE0/func_80A55B34.asm") diff --git a/src/overlays/actors/ovl_Obj_Hunsui/z_obj_hunsui.c b/src/overlays/actors/ovl_Obj_Hunsui/z_obj_hunsui.c index ab2c69d0e9..44779f47ab 100644 --- a/src/overlays/actors/ovl_Obj_Hunsui/z_obj_hunsui.c +++ b/src/overlays/actors/ovl_Obj_Hunsui/z_obj_hunsui.c @@ -23,36 +23,36 @@ const ActorInit Obj_Hunsui_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hunsui_0x80B9C450/func_80B9C450.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Hunsui_0x80B9C450/func_80B9C450.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hunsui_0x80B9C450/func_80B9C5E8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Hunsui_0x80B9C450/func_80B9C5E8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hunsui_0x80B9C450/ObjHunsui_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Hunsui_0x80B9C450/ObjHunsui_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hunsui_0x80B9C450/ObjHunsui_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Hunsui_0x80B9C450/ObjHunsui_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hunsui_0x80B9C450/ObjHunsui_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Hunsui_0x80B9C450/ObjHunsui_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hunsui_0x80B9C450/func_80B9CE64.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Hunsui_0x80B9C450/func_80B9CE64.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hunsui_0x80B9C450/func_80B9D094.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Hunsui_0x80B9C450/func_80B9D094.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hunsui_0x80B9C450/func_80B9D0FC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Hunsui_0x80B9C450/func_80B9D0FC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hunsui_0x80B9C450/func_80B9D120.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Hunsui_0x80B9C450/func_80B9D120.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hunsui_0x80B9C450/func_80B9D288.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Hunsui_0x80B9C450/func_80B9D288.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hunsui_0x80B9C450/func_80B9D2BC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Hunsui_0x80B9C450/func_80B9D2BC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hunsui_0x80B9C450/func_80B9D334.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Hunsui_0x80B9C450/func_80B9D334.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hunsui_0x80B9C450/func_80B9D4D0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Hunsui_0x80B9C450/func_80B9D4D0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hunsui_0x80B9C450/func_80B9D508.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Hunsui_0x80B9C450/func_80B9D508.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hunsui_0x80B9C450/func_80B9D714.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Hunsui_0x80B9C450/func_80B9D714.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hunsui_0x80B9C450/ObjHunsui_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Hunsui_0x80B9C450/ObjHunsui_Draw.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hunsui_0x80B9C450/func_80B9DA60.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Hunsui_0x80B9C450/func_80B9DA60.asm") 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 d4fe75740e..6cf8b0aefb 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 @@ -23,18 +23,18 @@ const ActorInit Obj_Ice_Poly_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Ice_Poly_0x80931560/ObjIcePoly_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Ice_Poly_0x80931560/ObjIcePoly_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Ice_Poly_0x80931560/ObjIcePoly_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Ice_Poly_0x80931560/ObjIcePoly_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Ice_Poly_0x80931560/func_80931828.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Ice_Poly_0x80931560/func_80931828.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Ice_Poly_0x80931560/func_80931A38.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Ice_Poly_0x80931560/func_80931A38.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Ice_Poly_0x80931560/func_80931E58.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Ice_Poly_0x80931560/func_80931E58.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Ice_Poly_0x80931560/func_80931EEC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Ice_Poly_0x80931560/func_80931EEC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Ice_Poly_0x80931560/ObjIcePoly_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Ice_Poly_0x80931560/ObjIcePoly_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Ice_Poly_0x80931560/ObjIcePoly_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Ice_Poly_0x80931560/ObjIcePoly_Draw.asm") diff --git a/src/overlays/actors/ovl_Obj_Iceblock/z_obj_iceblock.c b/src/overlays/actors/ovl_Obj_Iceblock/z_obj_iceblock.c index e032759882..2485b5577f 100644 --- a/src/overlays/actors/ovl_Obj_Iceblock/z_obj_iceblock.c +++ b/src/overlays/actors/ovl_Obj_Iceblock/z_obj_iceblock.c @@ -23,132 +23,132 @@ const ActorInit Obj_Iceblock_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Iceblock_0x80A23090/func_80A23090.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Iceblock_0x80A23090/func_80A23090.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Iceblock_0x80A23090/func_80A2311C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Iceblock_0x80A23090/func_80A2311C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Iceblock_0x80A23090/func_80A2319C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Iceblock_0x80A23090/func_80A2319C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Iceblock_0x80A23090/func_80A232C4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Iceblock_0x80A23090/func_80A232C4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Iceblock_0x80A23090/func_80A23370.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Iceblock_0x80A23090/func_80A23370.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Iceblock_0x80A23090/func_80A2339C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Iceblock_0x80A23090/func_80A2339C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Iceblock_0x80A23090/func_80A23690.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Iceblock_0x80A23090/func_80A23690.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Iceblock_0x80A23090/func_80A236D4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Iceblock_0x80A23090/func_80A236D4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Iceblock_0x80A23090/func_80A237A4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Iceblock_0x80A23090/func_80A237A4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Iceblock_0x80A23090/func_80A23938.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Iceblock_0x80A23090/func_80A23938.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Iceblock_0x80A23090/func_80A23B88.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Iceblock_0x80A23090/func_80A23B88.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Iceblock_0x80A23090/func_80A23D08.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Iceblock_0x80A23090/func_80A23D08.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Iceblock_0x80A23090/func_80A23F90.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Iceblock_0x80A23090/func_80A23F90.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Iceblock_0x80A23090/func_80A24118.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Iceblock_0x80A23090/func_80A24118.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Iceblock_0x80A23090/func_80A24384.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Iceblock_0x80A23090/func_80A24384.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Iceblock_0x80A23090/func_80A243E0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Iceblock_0x80A23090/func_80A243E0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Iceblock_0x80A23090/func_80A24680.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Iceblock_0x80A23090/func_80A24680.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Iceblock_0x80A23090/func_80A246D8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Iceblock_0x80A23090/func_80A246D8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Iceblock_0x80A23090/func_80A2491C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Iceblock_0x80A23090/func_80A2491C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Iceblock_0x80A23090/func_80A24954.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Iceblock_0x80A23090/func_80A24954.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Iceblock_0x80A23090/func_80A24A48.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Iceblock_0x80A23090/func_80A24A48.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Iceblock_0x80A23090/func_80A24AA8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Iceblock_0x80A23090/func_80A24AA8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Iceblock_0x80A23090/func_80A24B74.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Iceblock_0x80A23090/func_80A24B74.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Iceblock_0x80A23090/func_80A24BDC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Iceblock_0x80A23090/func_80A24BDC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Iceblock_0x80A23090/func_80A24DC4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Iceblock_0x80A23090/func_80A24DC4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Iceblock_0x80A23090/func_80A24DD0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Iceblock_0x80A23090/func_80A24DD0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Iceblock_0x80A23090/func_80A2508C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Iceblock_0x80A23090/func_80A2508C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Iceblock_0x80A23090/func_80A25238.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Iceblock_0x80A23090/func_80A25238.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Iceblock_0x80A23090/func_80A252DC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Iceblock_0x80A23090/func_80A252DC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Iceblock_0x80A23090/func_80A25404.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Iceblock_0x80A23090/func_80A25404.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Iceblock_0x80A23090/func_80A2541C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Iceblock_0x80A23090/func_80A2541C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Iceblock_0x80A23090/func_80A25440.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Iceblock_0x80A23090/func_80A25440.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Iceblock_0x80A23090/ObjIceblock_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Iceblock_0x80A23090/ObjIceblock_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Iceblock_0x80A23090/ObjIceblock_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Iceblock_0x80A23090/ObjIceblock_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Iceblock_0x80A23090/func_80A257A0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Iceblock_0x80A23090/func_80A257A0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Iceblock_0x80A23090/func_80A257B4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Iceblock_0x80A23090/func_80A257B4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Iceblock_0x80A23090/func_80A25824.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Iceblock_0x80A23090/func_80A25824.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Iceblock_0x80A23090/func_80A2586C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Iceblock_0x80A23090/func_80A2586C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Iceblock_0x80A23090/func_80A25978.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Iceblock_0x80A23090/func_80A25978.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Iceblock_0x80A23090/func_80A25994.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Iceblock_0x80A23090/func_80A25994.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Iceblock_0x80A23090/func_80A25A8C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Iceblock_0x80A23090/func_80A25A8C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Iceblock_0x80A23090/func_80A25AA8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Iceblock_0x80A23090/func_80A25AA8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Iceblock_0x80A23090/func_80A25BA0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Iceblock_0x80A23090/func_80A25BA0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Iceblock_0x80A23090/func_80A25BBC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Iceblock_0x80A23090/func_80A25BBC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Iceblock_0x80A23090/func_80A25C5C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Iceblock_0x80A23090/func_80A25C5C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Iceblock_0x80A23090/func_80A25C70.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Iceblock_0x80A23090/func_80A25C70.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Iceblock_0x80A23090/func_80A25CF4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Iceblock_0x80A23090/func_80A25CF4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Iceblock_0x80A23090/func_80A25D28.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Iceblock_0x80A23090/func_80A25D28.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Iceblock_0x80A23090/func_80A25E3C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Iceblock_0x80A23090/func_80A25E3C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Iceblock_0x80A23090/func_80A25E50.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Iceblock_0x80A23090/func_80A25E50.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Iceblock_0x80A23090/func_80A25FA0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Iceblock_0x80A23090/func_80A25FA0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Iceblock_0x80A23090/func_80A25FD4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Iceblock_0x80A23090/func_80A25FD4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Iceblock_0x80A23090/func_80A260E8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Iceblock_0x80A23090/func_80A260E8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Iceblock_0x80A23090/func_80A26144.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Iceblock_0x80A23090/func_80A26144.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Iceblock_0x80A23090/func_80A262BC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Iceblock_0x80A23090/func_80A262BC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Iceblock_0x80A23090/func_80A262EC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Iceblock_0x80A23090/func_80A262EC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Iceblock_0x80A23090/func_80A26574.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Iceblock_0x80A23090/func_80A26574.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Iceblock_0x80A23090/func_80A265C0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Iceblock_0x80A23090/func_80A265C0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Iceblock_0x80A23090/func_80A266C4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Iceblock_0x80A23090/func_80A266C4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Iceblock_0x80A23090/func_80A266E0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Iceblock_0x80A23090/func_80A266E0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Iceblock_0x80A23090/ObjIceblock_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Iceblock_0x80A23090/ObjIceblock_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Iceblock_0x80A23090/func_80A26B64.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Iceblock_0x80A23090/func_80A26B64.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Iceblock_0x80A23090/func_80A26B74.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Iceblock_0x80A23090/func_80A26B74.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Iceblock_0x80A23090/func_80A26BF8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Iceblock_0x80A23090/func_80A26BF8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Iceblock_0x80A23090/ObjIceblock_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Iceblock_0x80A23090/ObjIceblock_Draw.asm") diff --git a/src/overlays/actors/ovl_Obj_Jg_Gakki/z_obj_jg_gakki.c b/src/overlays/actors/ovl_Obj_Jg_Gakki/z_obj_jg_gakki.c index 56bb137b07..80c480f644 100644 --- a/src/overlays/actors/ovl_Obj_Jg_Gakki/z_obj_jg_gakki.c +++ b/src/overlays/actors/ovl_Obj_Jg_Gakki/z_obj_jg_gakki.c @@ -23,10 +23,10 @@ const ActorInit Obj_Jg_Gakki_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Jg_Gakki_0x80B961E0/ObjJgGakki_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Jg_Gakki_0x80B961E0/ObjJgGakki_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Jg_Gakki_0x80B961E0/ObjJgGakki_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Jg_Gakki_0x80B961E0/ObjJgGakki_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Jg_Gakki_0x80B961E0/ObjJgGakki_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Jg_Gakki_0x80B961E0/ObjJgGakki_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Jg_Gakki_0x80B961E0/ObjJgGakki_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Jg_Gakki_0x80B961E0/ObjJgGakki_Draw.asm") diff --git a/src/overlays/actors/ovl_Obj_Jgame_Light/z_obj_jgame_light.c b/src/overlays/actors/ovl_Obj_Jgame_Light/z_obj_jgame_light.c index 7aaa715c8b..849748b270 100644 --- a/src/overlays/actors/ovl_Obj_Jgame_Light/z_obj_jgame_light.c +++ b/src/overlays/actors/ovl_Obj_Jgame_Light/z_obj_jgame_light.c @@ -23,16 +23,16 @@ const ActorInit Obj_Jgame_Light_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Jgame_Light_0x80C152F0/ObjJgameLight_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Jgame_Light_0x80C152F0/ObjJgameLight_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Jgame_Light_0x80C152F0/ObjJgameLight_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Jgame_Light_0x80C152F0/ObjJgameLight_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Jgame_Light_0x80C152F0/func_80C15474.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Jgame_Light_0x80C152F0/func_80C15474.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Jgame_Light_0x80C152F0/func_80C156C4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Jgame_Light_0x80C152F0/func_80C156C4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Jgame_Light_0x80C152F0/func_80C15718.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Jgame_Light_0x80C152F0/func_80C15718.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Jgame_Light_0x80C152F0/ObjJgameLight_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Jgame_Light_0x80C152F0/ObjJgameLight_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Jgame_Light_0x80C152F0/ObjJgameLight_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Jgame_Light_0x80C152F0/ObjJgameLight_Draw.asm") diff --git a/src/overlays/actors/ovl_Obj_Kendo_Kanban/z_obj_kendo_kanban.c b/src/overlays/actors/ovl_Obj_Kendo_Kanban/z_obj_kendo_kanban.c index 93544e487a..79ac423c25 100644 --- a/src/overlays/actors/ovl_Obj_Kendo_Kanban/z_obj_kendo_kanban.c +++ b/src/overlays/actors/ovl_Obj_Kendo_Kanban/z_obj_kendo_kanban.c @@ -23,28 +23,28 @@ const ActorInit Obj_Kendo_Kanban_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Kendo_Kanban_0x80B654C0/ObjKendoKanban_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Kendo_Kanban_0x80B654C0/ObjKendoKanban_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Kendo_Kanban_0x80B654C0/ObjKendoKanban_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Kendo_Kanban_0x80B654C0/ObjKendoKanban_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Kendo_Kanban_0x80B654C0/func_80B65880.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Kendo_Kanban_0x80B654C0/func_80B65880.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Kendo_Kanban_0x80B654C0/func_80B65894.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Kendo_Kanban_0x80B654C0/func_80B65894.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Kendo_Kanban_0x80B654C0/func_80B658A4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Kendo_Kanban_0x80B654C0/func_80B658A4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Kendo_Kanban_0x80B654C0/func_80B65CE0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Kendo_Kanban_0x80B654C0/func_80B65CE0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Kendo_Kanban_0x80B654C0/func_80B65D54.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Kendo_Kanban_0x80B654C0/func_80B65D54.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Kendo_Kanban_0x80B654C0/func_80B65D68.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Kendo_Kanban_0x80B654C0/func_80B65D68.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Kendo_Kanban_0x80B654C0/func_80B65DA8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Kendo_Kanban_0x80B654C0/func_80B65DA8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Kendo_Kanban_0x80B654C0/func_80B6618C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Kendo_Kanban_0x80B654C0/func_80B6618C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Kendo_Kanban_0x80B654C0/func_80B66304.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Kendo_Kanban_0x80B654C0/func_80B66304.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Kendo_Kanban_0x80B654C0/ObjKendoKanban_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Kendo_Kanban_0x80B654C0/ObjKendoKanban_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Kendo_Kanban_0x80B654C0/ObjKendoKanban_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Kendo_Kanban_0x80B654C0/ObjKendoKanban_Draw.asm") diff --git a/src/overlays/actors/ovl_Obj_Kepn_Koya/z_obj_kepn_koya.c b/src/overlays/actors/ovl_Obj_Kepn_Koya/z_obj_kepn_koya.c index cebb345b18..3e85ba2fe8 100644 --- a/src/overlays/actors/ovl_Obj_Kepn_Koya/z_obj_kepn_koya.c +++ b/src/overlays/actors/ovl_Obj_Kepn_Koya/z_obj_kepn_koya.c @@ -23,10 +23,10 @@ const ActorInit Obj_Kepn_Koya_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Kepn_Koya_0x80C07B20/ObjKepnKoya_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Kepn_Koya_0x80C07B20/ObjKepnKoya_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Kepn_Koya_0x80C07B20/ObjKepnKoya_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Kepn_Koya_0x80C07B20/ObjKepnKoya_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Kepn_Koya_0x80C07B20/ObjKepnKoya_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Kepn_Koya_0x80C07B20/ObjKepnKoya_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Kepn_Koya_0x80C07B20/ObjKepnKoya_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Kepn_Koya_0x80C07B20/ObjKepnKoya_Draw.asm") 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 d44a7b9904..5babc371eb 100644 --- a/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c +++ b/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c @@ -22,40 +22,40 @@ const ActorInit Obj_Kibako_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Kibako_0x809261B0/func_809261B0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Kibako_0x809261B0/func_809261B0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Kibako_0x809261B0/func_80926224.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Kibako_0x809261B0/func_80926224.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Kibako_0x809261B0/func_809262BC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Kibako_0x809261B0/func_809262BC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Kibako_0x809261B0/func_80926318.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Kibako_0x809261B0/func_80926318.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Kibako_0x809261B0/func_80926394.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Kibako_0x809261B0/func_80926394.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Kibako_0x809261B0/ObjKibako_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Kibako_0x809261B0/ObjKibako_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Kibako_0x809261B0/ObjKibako_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Kibako_0x809261B0/ObjKibako_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Kibako_0x809261B0/func_8092650C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Kibako_0x809261B0/func_8092650C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Kibako_0x809261B0/func_809267EC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Kibako_0x809261B0/func_809267EC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Kibako_0x809261B0/func_80926B40.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Kibako_0x809261B0/func_80926B40.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Kibako_0x809261B0/func_80926B54.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Kibako_0x809261B0/func_80926B54.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Kibako_0x809261B0/func_80926BE0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Kibako_0x809261B0/func_80926BE0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Kibako_0x809261B0/func_80926BF4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Kibako_0x809261B0/func_80926BF4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Kibako_0x809261B0/func_80926EF4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Kibako_0x809261B0/func_80926EF4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Kibako_0x809261B0/func_80926F08.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Kibako_0x809261B0/func_80926F08.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Kibako_0x809261B0/func_8092703C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Kibako_0x809261B0/func_8092703C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Kibako_0x809261B0/func_809270F8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Kibako_0x809261B0/func_809270F8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Kibako_0x809261B0/ObjKibako_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Kibako_0x809261B0/ObjKibako_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Kibako_0x809261B0/func_80927334.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Kibako_0x809261B0/func_80927334.asm") 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 481d99d466..c20eefb152 100644 --- a/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.c +++ b/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.c @@ -23,26 +23,26 @@ const ActorInit Obj_Kibako2_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Kibako2_0x8098E5C0/func_8098E5C0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Kibako2_0x8098E5C0/func_8098E5C0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Kibako2_0x8098E5C0/func_8098E62C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Kibako2_0x8098E5C0/func_8098E62C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Kibako2_0x8098E5C0/func_8098E8A8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Kibako2_0x8098E5C0/func_8098E8A8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Kibako2_0x8098E5C0/func_8098E900.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Kibako2_0x8098E5C0/func_8098E900.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Kibako2_0x8098E5C0/func_8098E9C4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Kibako2_0x8098E5C0/func_8098E9C4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Kibako2_0x8098E5C0/ObjKibako2_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Kibako2_0x8098E5C0/ObjKibako2_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Kibako2_0x8098E5C0/ObjKibako2_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Kibako2_0x8098E5C0/ObjKibako2_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Kibako2_0x8098E5C0/func_8098EB78.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Kibako2_0x8098E5C0/func_8098EB78.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Kibako2_0x8098E5C0/func_8098EC68.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Kibako2_0x8098E5C0/func_8098EC68.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Kibako2_0x8098E5C0/func_8098ED20.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Kibako2_0x8098E5C0/func_8098ED20.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Kibako2_0x8098E5C0/ObjKibako2_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Kibako2_0x8098E5C0/ObjKibako2_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Kibako2_0x8098E5C0/ObjKibako2_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Kibako2_0x8098E5C0/ObjKibako2_Draw.asm") diff --git a/src/overlays/actors/ovl_Obj_Kinoko/z_obj_kinoko.c b/src/overlays/actors/ovl_Obj_Kinoko/z_obj_kinoko.c index f9d70790b7..5bba1e6adf 100644 --- a/src/overlays/actors/ovl_Obj_Kinoko/z_obj_kinoko.c +++ b/src/overlays/actors/ovl_Obj_Kinoko/z_obj_kinoko.c @@ -23,10 +23,10 @@ const ActorInit Obj_Kinoko_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Kinoko_0x80BB4700/ObjKinoko_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Kinoko_0x80BB4700/ObjKinoko_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Kinoko_0x80BB4700/ObjKinoko_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Kinoko_0x80BB4700/ObjKinoko_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Kinoko_0x80BB4700/ObjKinoko_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Kinoko_0x80BB4700/ObjKinoko_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Kinoko_0x80BB4700/ObjKinoko_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Kinoko_0x80BB4700/ObjKinoko_Draw.asm") diff --git a/src/overlays/actors/ovl_Obj_Kzsaku/z_obj_kzsaku.c b/src/overlays/actors/ovl_Obj_Kzsaku/z_obj_kzsaku.c index f21f50d5be..fb08f3946d 100644 --- a/src/overlays/actors/ovl_Obj_Kzsaku/z_obj_kzsaku.c +++ b/src/overlays/actors/ovl_Obj_Kzsaku/z_obj_kzsaku.c @@ -23,22 +23,22 @@ const ActorInit Obj_Kzsaku_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Kzsaku_0x80C08A80/ObjKzsaku_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Kzsaku_0x80C08A80/ObjKzsaku_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Kzsaku_0x80C08A80/ObjKzsaku_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Kzsaku_0x80C08A80/ObjKzsaku_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Kzsaku_0x80C08A80/func_80C08B60.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Kzsaku_0x80C08A80/func_80C08B60.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Kzsaku_0x80C08A80/func_80C08B7C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Kzsaku_0x80C08A80/func_80C08B7C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Kzsaku_0x80C08A80/func_80C08BBC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Kzsaku_0x80C08A80/func_80C08BBC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Kzsaku_0x80C08A80/func_80C08BD0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Kzsaku_0x80C08A80/func_80C08BD0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Kzsaku_0x80C08A80/func_80C08C84.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Kzsaku_0x80C08A80/func_80C08C84.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Kzsaku_0x80C08A80/func_80C08CB0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Kzsaku_0x80C08A80/func_80C08CB0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Kzsaku_0x80C08A80/ObjKzsaku_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Kzsaku_0x80C08A80/ObjKzsaku_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Kzsaku_0x80C08A80/ObjKzsaku_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Kzsaku_0x80C08A80/ObjKzsaku_Draw.asm") 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 cab492705c..a588f9fb77 100644 --- a/src/overlays/actors/ovl_Obj_Lift/z_obj_lift.c +++ b/src/overlays/actors/ovl_Obj_Lift/z_obj_lift.c @@ -23,30 +23,30 @@ const ActorInit Obj_Lift_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Lift_0x8093D3C0/func_8093D3C0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Lift_0x8093D3C0/func_8093D3C0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Lift_0x8093D3C0/ObjLift_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Lift_0x8093D3C0/ObjLift_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Lift_0x8093D3C0/ObjLift_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Lift_0x8093D3C0/ObjLift_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Lift_0x8093D3C0/func_8093D760.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Lift_0x8093D3C0/func_8093D760.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Lift_0x8093D3C0/func_8093D7A0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Lift_0x8093D3C0/func_8093D7A0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Lift_0x8093D3C0/func_8093D88C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Lift_0x8093D3C0/func_8093D88C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Lift_0x8093D3C0/func_8093D8B4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Lift_0x8093D3C0/func_8093D8B4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Lift_0x8093D3C0/func_8093D9C0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Lift_0x8093D3C0/func_8093D9C0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Lift_0x8093D3C0/func_8093DA48.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Lift_0x8093D3C0/func_8093DA48.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Lift_0x8093D3C0/func_8093DB70.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Lift_0x8093D3C0/func_8093DB70.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Lift_0x8093D3C0/func_8093DB90.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Lift_0x8093D3C0/func_8093DB90.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Lift_0x8093D3C0/ObjLift_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Lift_0x8093D3C0/ObjLift_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Lift_0x8093D3C0/ObjLift_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Lift_0x8093D3C0/ObjLift_Draw.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Lift_0x8093D3C0/func_8093DC90.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Lift_0x8093D3C0/func_8093DC90.asm") diff --git a/src/overlays/actors/ovl_Obj_Lightblock/z_obj_lightblock.c b/src/overlays/actors/ovl_Obj_Lightblock/z_obj_lightblock.c index 1b7b866b6a..16391780e1 100644 --- a/src/overlays/actors/ovl_Obj_Lightblock/z_obj_lightblock.c +++ b/src/overlays/actors/ovl_Obj_Lightblock/z_obj_lightblock.c @@ -23,24 +23,24 @@ const ActorInit Obj_Lightblock_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Lightblock_0x80AF3910/func_80AF3910.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Lightblock_0x80AF3910/func_80AF3910.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Lightblock_0x80AF3910/ObjLightblock_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Lightblock_0x80AF3910/ObjLightblock_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Lightblock_0x80AF3910/ObjLightblock_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Lightblock_0x80AF3910/ObjLightblock_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Lightblock_0x80AF3910/func_80AF3AC8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Lightblock_0x80AF3910/func_80AF3AC8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Lightblock_0x80AF3910/func_80AF3ADC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Lightblock_0x80AF3910/func_80AF3ADC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Lightblock_0x80AF3910/func_80AF3B8C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Lightblock_0x80AF3910/func_80AF3B8C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Lightblock_0x80AF3910/func_80AF3BA0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Lightblock_0x80AF3910/func_80AF3BA0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Lightblock_0x80AF3910/func_80AF3C18.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Lightblock_0x80AF3910/func_80AF3C18.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Lightblock_0x80AF3910/func_80AF3C34.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Lightblock_0x80AF3910/func_80AF3C34.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Lightblock_0x80AF3910/ObjLightblock_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Lightblock_0x80AF3910/ObjLightblock_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Lightblock_0x80AF3910/ObjLightblock_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Lightblock_0x80AF3910/ObjLightblock_Draw.asm") 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 0641fe6ad5..4a3b24381d 100644 --- a/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.c +++ b/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.c @@ -23,44 +23,44 @@ const ActorInit Obj_Lightswitch_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Lightswitch_0x8095FBF0/func_8095FBF0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Lightswitch_0x8095FBF0/func_8095FBF0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Lightswitch_0x8095FBF0/func_8095FC94.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Lightswitch_0x8095FBF0/func_8095FC94.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Lightswitch_0x8095FBF0/func_8095FCEC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Lightswitch_0x8095FBF0/func_8095FCEC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Lightswitch_0x8095FBF0/ObjLightswitch_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Lightswitch_0x8095FBF0/ObjLightswitch_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Lightswitch_0x8095FBF0/ObjLightswitch_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Lightswitch_0x8095FBF0/ObjLightswitch_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Lightswitch_0x8095FBF0/func_8095FFF8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Lightswitch_0x8095FBF0/func_8095FFF8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Lightswitch_0x8095FBF0/func_80960014.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Lightswitch_0x8095FBF0/func_80960014.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Lightswitch_0x8095FBF0/func_80960088.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Lightswitch_0x8095FBF0/func_80960088.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Lightswitch_0x8095FBF0/func_809600BC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Lightswitch_0x8095FBF0/func_809600BC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Lightswitch_0x8095FBF0/func_8096012C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Lightswitch_0x8095FBF0/func_8096012C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Lightswitch_0x8095FBF0/func_80960148.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Lightswitch_0x8095FBF0/func_80960148.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Lightswitch_0x8095FBF0/func_80960224.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Lightswitch_0x8095FBF0/func_80960224.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Lightswitch_0x8095FBF0/func_80960260.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Lightswitch_0x8095FBF0/func_80960260.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Lightswitch_0x8095FBF0/func_8096034C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Lightswitch_0x8095FBF0/func_8096034C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Lightswitch_0x8095FBF0/func_80960370.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Lightswitch_0x8095FBF0/func_80960370.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Lightswitch_0x8095FBF0/func_80960424.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Lightswitch_0x8095FBF0/func_80960424.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Lightswitch_0x8095FBF0/func_80960440.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Lightswitch_0x8095FBF0/func_80960440.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Lightswitch_0x8095FBF0/ObjLightswitch_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Lightswitch_0x8095FBF0/ObjLightswitch_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Lightswitch_0x8095FBF0/func_809605F4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Lightswitch_0x8095FBF0/func_809605F4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Lightswitch_0x8095FBF0/func_80960880.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Lightswitch_0x8095FBF0/func_80960880.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Lightswitch_0x8095FBF0/ObjLightswitch_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Lightswitch_0x8095FBF0/ObjLightswitch_Draw.asm") diff --git a/src/overlays/actors/ovl_Obj_Lupygamelift/z_obj_lupygamelift.c b/src/overlays/actors/ovl_Obj_Lupygamelift/z_obj_lupygamelift.c index 15e33c438c..4ebb7cfac2 100644 --- a/src/overlays/actors/ovl_Obj_Lupygamelift/z_obj_lupygamelift.c +++ b/src/overlays/actors/ovl_Obj_Lupygamelift/z_obj_lupygamelift.c @@ -23,20 +23,20 @@ const ActorInit Obj_Lupygamelift_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Lupygamelift_0x80AF0170/ObjLupygamelift_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Lupygamelift_0x80AF0170/ObjLupygamelift_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Lupygamelift_0x80AF0170/ObjLupygamelift_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Lupygamelift_0x80AF0170/ObjLupygamelift_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Lupygamelift_0x80AF0170/func_80AF0394.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Lupygamelift_0x80AF0170/func_80AF0394.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Lupygamelift_0x80AF0170/func_80AF04BC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Lupygamelift_0x80AF0170/func_80AF04BC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Lupygamelift_0x80AF0170/func_80AF04D8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Lupygamelift_0x80AF0170/func_80AF04D8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Lupygamelift_0x80AF0170/func_80AF0514.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Lupygamelift_0x80AF0170/func_80AF0514.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Lupygamelift_0x80AF0170/func_80AF0530.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Lupygamelift_0x80AF0170/func_80AF0530.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Lupygamelift_0x80AF0170/ObjLupygamelift_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Lupygamelift_0x80AF0170/ObjLupygamelift_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Lupygamelift_0x80AF0170/ObjLupygamelift_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Lupygamelift_0x80AF0170/ObjLupygamelift_Draw.asm") 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 a57d1c2c45..290dc74179 100644 --- a/src/overlays/actors/ovl_Obj_Makekinsuta/z_obj_makekinsuta.c +++ b/src/overlays/actors/ovl_Obj_Makekinsuta/z_obj_makekinsuta.c @@ -22,14 +22,14 @@ const ActorInit Obj_Makekinsuta_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Makekinsuta_0x8099FA40/func_8099FA40.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Makekinsuta_0x8099FA40/func_8099FA40.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Makekinsuta_0x8099FA40/ObjMakekinsuta_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Makekinsuta_0x8099FA40/ObjMakekinsuta_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Makekinsuta_0x8099FA40/ObjMakekinsuta_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Makekinsuta_0x8099FA40/ObjMakekinsuta_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Makekinsuta_0x8099FA40/func_8099FB64.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Makekinsuta_0x8099FA40/func_8099FB64.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Makekinsuta_0x8099FA40/ObjMakekinsuta_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Makekinsuta_0x8099FA40/ObjMakekinsuta_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Makekinsuta_0x8099FA40/func_8099FD7C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Makekinsuta_0x8099FA40/func_8099FD7C.asm") 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 37bfa5d17e..059b979019 100644 --- a/src/overlays/actors/ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.c +++ b/src/overlays/actors/ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.c @@ -21,10 +21,10 @@ const ActorInit Obj_Makeoshihiki_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Makeoshihiki_0x80972350/func_80972350.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Makeoshihiki_0x80972350/func_80972350.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Makeoshihiki_0x80972350/func_809723C4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Makeoshihiki_0x80972350/func_809723C4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Makeoshihiki_0x80972350/ObjMakeoshihiki_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Makeoshihiki_0x80972350/ObjMakeoshihiki_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Makeoshihiki_0x80972350/ObjMakeoshihiki_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Makeoshihiki_0x80972350/ObjMakeoshihiki_Update.asm") diff --git a/src/overlays/actors/ovl_Obj_Milk_Bin/z_obj_milk_bin.c b/src/overlays/actors/ovl_Obj_Milk_Bin/z_obj_milk_bin.c index 9f2c61eac4..d724cb4a4a 100644 --- a/src/overlays/actors/ovl_Obj_Milk_Bin/z_obj_milk_bin.c +++ b/src/overlays/actors/ovl_Obj_Milk_Bin/z_obj_milk_bin.c @@ -23,10 +23,10 @@ const ActorInit Obj_Milk_Bin_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Milk_Bin_0x80C08E40/ObjMilkBin_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Milk_Bin_0x80C08E40/ObjMilkBin_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Milk_Bin_0x80C08E40/ObjMilkBin_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Milk_Bin_0x80C08E40/ObjMilkBin_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Milk_Bin_0x80C08E40/ObjMilkBin_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Milk_Bin_0x80C08E40/ObjMilkBin_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Milk_Bin_0x80C08E40/ObjMilkBin_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Milk_Bin_0x80C08E40/ObjMilkBin_Draw.asm") diff --git a/src/overlays/actors/ovl_Obj_Mine/z_obj_mine.c b/src/overlays/actors/ovl_Obj_Mine/z_obj_mine.c index f8ce94a0fb..e374d70ed3 100644 --- a/src/overlays/actors/ovl_Obj_Mine/z_obj_mine.c +++ b/src/overlays/actors/ovl_Obj_Mine/z_obj_mine.c @@ -23,96 +23,96 @@ const ActorInit Obj_Mine_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mine_0x80A811D0/func_80A811D0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Mine_0x80A811D0/func_80A811D0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mine_0x80A811D0/func_80A8120C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Mine_0x80A811D0/func_80A8120C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mine_0x80A811D0/func_80A81288.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Mine_0x80A811D0/func_80A81288.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mine_0x80A811D0/func_80A8131C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Mine_0x80A811D0/func_80A8131C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mine_0x80A811D0/func_80A81384.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Mine_0x80A811D0/func_80A81384.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mine_0x80A811D0/func_80A8140C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Mine_0x80A811D0/func_80A8140C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mine_0x80A811D0/func_80A8146C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Mine_0x80A811D0/func_80A8146C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mine_0x80A811D0/func_80A81544.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Mine_0x80A811D0/func_80A81544.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mine_0x80A811D0/func_80A81640.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Mine_0x80A811D0/func_80A81640.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mine_0x80A811D0/func_80A8164C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Mine_0x80A811D0/func_80A8164C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mine_0x80A811D0/func_80A81684.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Mine_0x80A811D0/func_80A81684.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mine_0x80A811D0/func_80A81714.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Mine_0x80A811D0/func_80A81714.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mine_0x80A811D0/func_80A81818.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Mine_0x80A811D0/func_80A81818.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mine_0x80A811D0/func_80A81868.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Mine_0x80A811D0/func_80A81868.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mine_0x80A811D0/func_80A819A4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Mine_0x80A811D0/func_80A819A4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mine_0x80A811D0/func_80A81A00.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Mine_0x80A811D0/func_80A81A00.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mine_0x80A811D0/func_80A81AA4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Mine_0x80A811D0/func_80A81AA4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mine_0x80A811D0/func_80A81B14.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Mine_0x80A811D0/func_80A81B14.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mine_0x80A811D0/func_80A81B7C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Mine_0x80A811D0/func_80A81B7C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mine_0x80A811D0/func_80A81D70.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Mine_0x80A811D0/func_80A81D70.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mine_0x80A811D0/func_80A81DEC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Mine_0x80A811D0/func_80A81DEC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mine_0x80A811D0/func_80A81E7C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Mine_0x80A811D0/func_80A81E7C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mine_0x80A811D0/func_80A81FFC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Mine_0x80A811D0/func_80A81FFC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mine_0x80A811D0/func_80A828A8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Mine_0x80A811D0/func_80A828A8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mine_0x80A811D0/func_80A82C28.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Mine_0x80A811D0/func_80A82C28.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mine_0x80A811D0/ObjMine_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Mine_0x80A811D0/ObjMine_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mine_0x80A811D0/ObjMine_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Mine_0x80A811D0/ObjMine_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mine_0x80A811D0/func_80A82F84.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Mine_0x80A811D0/func_80A82F84.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mine_0x80A811D0/func_80A82F98.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Mine_0x80A811D0/func_80A82F98.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mine_0x80A811D0/func_80A82FA8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Mine_0x80A811D0/func_80A82FA8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mine_0x80A811D0/func_80A82FC8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Mine_0x80A811D0/func_80A82FC8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mine_0x80A811D0/func_80A83214.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Mine_0x80A811D0/func_80A83214.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mine_0x80A811D0/func_80A83258.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Mine_0x80A811D0/func_80A83258.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mine_0x80A811D0/func_80A832BC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Mine_0x80A811D0/func_80A832BC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mine_0x80A811D0/func_80A832D0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Mine_0x80A811D0/func_80A832D0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mine_0x80A811D0/func_80A83A74.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Mine_0x80A811D0/func_80A83A74.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mine_0x80A811D0/func_80A83A88.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Mine_0x80A811D0/func_80A83A88.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mine_0x80A811D0/func_80A83B14.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Mine_0x80A811D0/func_80A83B14.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mine_0x80A811D0/func_80A83B28.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Mine_0x80A811D0/func_80A83B28.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mine_0x80A811D0/func_80A83CEC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Mine_0x80A811D0/func_80A83CEC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mine_0x80A811D0/func_80A83D00.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Mine_0x80A811D0/func_80A83D00.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mine_0x80A811D0/ObjMine_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Mine_0x80A811D0/ObjMine_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mine_0x80A811D0/func_80A83E7C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Mine_0x80A811D0/func_80A83E7C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mine_0x80A811D0/ObjMine_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Mine_0x80A811D0/ObjMine_Draw.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mine_0x80A811D0/func_80A83FBC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Mine_0x80A811D0/func_80A83FBC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mine_0x80A811D0/func_80A84088.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Mine_0x80A811D0/func_80A84088.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mine_0x80A811D0/func_80A84338.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Mine_0x80A811D0/func_80A84338.asm") diff --git a/src/overlays/actors/ovl_Obj_Moon_Stone/z_obj_moon_stone.c b/src/overlays/actors/ovl_Obj_Moon_Stone/z_obj_moon_stone.c index 5a75e8a9b3..ad8a95f731 100644 --- a/src/overlays/actors/ovl_Obj_Moon_Stone/z_obj_moon_stone.c +++ b/src/overlays/actors/ovl_Obj_Moon_Stone/z_obj_moon_stone.c @@ -23,26 +23,26 @@ const ActorInit Obj_Moon_Stone_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Moon_Stone_0x80C06510/ObjMoonStone_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Moon_Stone_0x80C06510/ObjMoonStone_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Moon_Stone_0x80C06510/ObjMoonStone_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Moon_Stone_0x80C06510/ObjMoonStone_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Moon_Stone_0x80C06510/func_80C0662C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Moon_Stone_0x80C06510/func_80C0662C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Moon_Stone_0x80C06510/func_80C06640.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Moon_Stone_0x80C06510/func_80C06640.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Moon_Stone_0x80C06510/func_80C066F8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Moon_Stone_0x80C06510/func_80C066F8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Moon_Stone_0x80C06510/func_80C0670C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Moon_Stone_0x80C06510/func_80C0670C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Moon_Stone_0x80C06510/func_80C0673C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Moon_Stone_0x80C06510/func_80C0673C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Moon_Stone_0x80C06510/func_80C06768.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Moon_Stone_0x80C06510/func_80C06768.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Moon_Stone_0x80C06510/func_80C0685C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Moon_Stone_0x80C06510/func_80C0685C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Moon_Stone_0x80C06510/func_80C06870.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Moon_Stone_0x80C06510/func_80C06870.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Moon_Stone_0x80C06510/ObjMoonStone_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Moon_Stone_0x80C06510/ObjMoonStone_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Moon_Stone_0x80C06510/ObjMoonStone_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Moon_Stone_0x80C06510/ObjMoonStone_Draw.asm") diff --git a/src/overlays/actors/ovl_Obj_Mu_Pict/z_obj_mu_pict.c b/src/overlays/actors/ovl_Obj_Mu_Pict/z_obj_mu_pict.c index 5d3da6805d..7445eed561 100644 --- a/src/overlays/actors/ovl_Obj_Mu_Pict/z_obj_mu_pict.c +++ b/src/overlays/actors/ovl_Obj_Mu_Pict/z_obj_mu_pict.c @@ -23,28 +23,28 @@ const ActorInit Obj_Mu_Pict_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mu_Pict_0x80C06AA0/ObjMuPict_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Mu_Pict_0x80C06AA0/ObjMuPict_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mu_Pict_0x80C06AA0/ObjMuPict_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Mu_Pict_0x80C06AA0/ObjMuPict_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mu_Pict_0x80C06AA0/func_80C06B5C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Mu_Pict_0x80C06AA0/func_80C06B5C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mu_Pict_0x80C06AA0/func_80C06B70.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Mu_Pict_0x80C06AA0/func_80C06B70.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mu_Pict_0x80C06AA0/func_80C06C54.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Mu_Pict_0x80C06AA0/func_80C06C54.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mu_Pict_0x80C06AA0/func_80C06C68.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Mu_Pict_0x80C06AA0/func_80C06C68.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mu_Pict_0x80C06AA0/func_80C06CC4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Mu_Pict_0x80C06AA0/func_80C06CC4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mu_Pict_0x80C06AA0/func_80C06CD8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Mu_Pict_0x80C06AA0/func_80C06CD8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mu_Pict_0x80C06AA0/func_80C06D90.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Mu_Pict_0x80C06AA0/func_80C06D90.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mu_Pict_0x80C06AA0/func_80C06DC8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Mu_Pict_0x80C06AA0/func_80C06DC8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mu_Pict_0x80C06AA0/func_80C06E88.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Mu_Pict_0x80C06AA0/func_80C06E88.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mu_Pict_0x80C06AA0/ObjMuPict_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Mu_Pict_0x80C06AA0/ObjMuPict_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mu_Pict_0x80C06AA0/ObjMuPict_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Mu_Pict_0x80C06AA0/ObjMuPict_Draw.asm") 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 a6f3474b3b..adc598e731 100644 --- a/src/overlays/actors/ovl_Obj_Mure/z_obj_mure.c +++ b/src/overlays/actors/ovl_Obj_Mure/z_obj_mure.c @@ -22,42 +22,42 @@ const ActorInit Obj_Mure_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mure_0x808D78D0/func_808D78D0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Mure_0x808D78D0/func_808D78D0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mure_0x808D78D0/func_808D7928.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Mure_0x808D78D0/func_808D7928.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mure_0x808D78D0/ObjMure_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Mure_0x808D78D0/ObjMure_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mure_0x808D78D0/ObjMure_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Mure_0x808D78D0/ObjMure_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mure_0x808D78D0/func_808D7A14.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Mure_0x808D78D0/func_808D7A14.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mure_0x808D78D0/func_808D7A40.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Mure_0x808D78D0/func_808D7A40.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mure_0x808D78D0/func_808D7A68.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Mure_0x808D78D0/func_808D7A68.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mure_0x808D78D0/func_808D7C64.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Mure_0x808D78D0/func_808D7C64.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mure_0x808D78D0/func_808D7DC4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Mure_0x808D78D0/func_808D7DC4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mure_0x808D78D0/func_808D7E14.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Mure_0x808D78D0/func_808D7E14.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mure_0x808D78D0/func_808D7F0C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Mure_0x808D78D0/func_808D7F0C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mure_0x808D78D0/func_808D7F2C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Mure_0x808D78D0/func_808D7F2C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mure_0x808D78D0/func_808D7FFC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Mure_0x808D78D0/func_808D7FFC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mure_0x808D78D0/func_808D8014.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Mure_0x808D78D0/func_808D8014.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mure_0x808D78D0/func_808D8074.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Mure_0x808D78D0/func_808D8074.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mure_0x808D78D0/func_808D814C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Mure_0x808D78D0/func_808D814C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mure_0x808D78D0/func_808D82CC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Mure_0x808D78D0/func_808D82CC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mure_0x808D78D0/func_808D84F4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Mure_0x808D78D0/func_808D84F4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mure_0x808D78D0/func_808D8678.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Mure_0x808D78D0/func_808D8678.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mure_0x808D78D0/ObjMure_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Mure_0x808D78D0/ObjMure_Update.asm") 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 4660c9445f..10e6e75417 100644 --- a/src/overlays/actors/ovl_Obj_Mure2/z_obj_mure2.c +++ b/src/overlays/actors/ovl_Obj_Mure2/z_obj_mure2.c @@ -21,32 +21,32 @@ const ActorInit Obj_Mure2_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mure2_0x80960CF0/func_80960CF0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Mure2_0x80960CF0/func_80960CF0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mure2_0x80960CF0/func_80960E0C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Mure2_0x80960CF0/func_80960E0C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mure2_0x80960CF0/func_80960F0C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Mure2_0x80960CF0/func_80960F0C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mure2_0x80960CF0/func_80961018.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Mure2_0x80960CF0/func_80961018.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mure2_0x80960CF0/func_8096104C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Mure2_0x80960CF0/func_8096104C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mure2_0x80960CF0/func_809611BC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Mure2_0x80960CF0/func_809611BC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mure2_0x80960CF0/func_809612BC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Mure2_0x80960CF0/func_809612BC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mure2_0x80960CF0/ObjMure2_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Mure2_0x80960CF0/ObjMure2_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mure2_0x80960CF0/func_809613B0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Mure2_0x80960CF0/func_809613B0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mure2_0x80960CF0/func_809613C4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Mure2_0x80960CF0/func_809613C4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mure2_0x80960CF0/func_809613E8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Mure2_0x80960CF0/func_809613E8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mure2_0x80960CF0/func_809613FC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Mure2_0x80960CF0/func_809613FC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mure2_0x80960CF0/func_8096147C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Mure2_0x80960CF0/func_8096147C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mure2_0x80960CF0/func_80961490.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Mure2_0x80960CF0/func_80961490.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mure2_0x80960CF0/ObjMure2_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Mure2_0x80960CF0/ObjMure2_Update.asm") 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 65ccdc7339..9662aede70 100644 --- a/src/overlays/actors/ovl_Obj_Mure3/z_obj_mure3.c +++ b/src/overlays/actors/ovl_Obj_Mure3/z_obj_mure3.c @@ -22,30 +22,30 @@ const ActorInit Obj_Mure3_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mure3_0x8098F040/func_8098F040.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Mure3_0x8098F040/func_8098F040.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mure3_0x8098F040/func_8098F110.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Mure3_0x8098F040/func_8098F110.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mure3_0x8098F040/func_8098F220.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Mure3_0x8098F040/func_8098F220.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mure3_0x8098F040/func_8098F364.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Mure3_0x8098F040/func_8098F364.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mure3_0x8098F040/func_8098F438.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Mure3_0x8098F040/func_8098F438.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mure3_0x8098F040/ObjMure3_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Mure3_0x8098F040/ObjMure3_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mure3_0x8098F040/ObjMure3_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Mure3_0x8098F040/ObjMure3_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mure3_0x8098F040/func_8098F598.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Mure3_0x8098F040/func_8098F598.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mure3_0x8098F040/func_8098F5AC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Mure3_0x8098F040/func_8098F5AC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mure3_0x8098F040/func_8098F5D0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Mure3_0x8098F040/func_8098F5D0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mure3_0x8098F040/func_8098F5E4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Mure3_0x8098F040/func_8098F5E4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mure3_0x8098F040/func_8098F66C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Mure3_0x8098F040/func_8098F66C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mure3_0x8098F040/func_8098F680.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Mure3_0x8098F040/func_8098F680.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mure3_0x8098F040/ObjMure3_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Mure3_0x8098F040/ObjMure3_Update.asm") diff --git a/src/overlays/actors/ovl_Obj_Nozoki/z_obj_nozoki.c b/src/overlays/actors/ovl_Obj_Nozoki/z_obj_nozoki.c index 246bad7c95..b96ecc899a 100644 --- a/src/overlays/actors/ovl_Obj_Nozoki/z_obj_nozoki.c +++ b/src/overlays/actors/ovl_Obj_Nozoki/z_obj_nozoki.c @@ -22,42 +22,42 @@ const ActorInit Obj_Nozoki_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Nozoki_0x80BA2420/func_80BA2420.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Nozoki_0x80BA2420/func_80BA2420.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Nozoki_0x80BA2420/ObjNozoki_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Nozoki_0x80BA2420/ObjNozoki_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Nozoki_0x80BA2420/ObjNozoki_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Nozoki_0x80BA2420/ObjNozoki_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Nozoki_0x80BA2420/func_80BA2514.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Nozoki_0x80BA2420/func_80BA2514.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Nozoki_0x80BA2420/func_80BA26A8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Nozoki_0x80BA2420/func_80BA26A8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Nozoki_0x80BA2420/func_80BA2708.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Nozoki_0x80BA2420/func_80BA2708.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Nozoki_0x80BA2420/func_80BA2790.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Nozoki_0x80BA2420/func_80BA2790.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Nozoki_0x80BA2420/func_80BA27C4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Nozoki_0x80BA2420/func_80BA27C4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Nozoki_0x80BA2420/func_80BA28DC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Nozoki_0x80BA2420/func_80BA28DC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Nozoki_0x80BA2420/func_80BA2AB4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Nozoki_0x80BA2420/func_80BA2AB4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Nozoki_0x80BA2420/func_80BA2B64.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Nozoki_0x80BA2420/func_80BA2B64.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Nozoki_0x80BA2420/func_80BA2BA4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Nozoki_0x80BA2420/func_80BA2BA4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Nozoki_0x80BA2420/func_80BA2C28.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Nozoki_0x80BA2420/func_80BA2C28.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Nozoki_0x80BA2420/func_80BA2C94.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Nozoki_0x80BA2420/func_80BA2C94.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Nozoki_0x80BA2420/func_80BA3044.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Nozoki_0x80BA2420/func_80BA3044.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Nozoki_0x80BA2420/func_80BA311C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Nozoki_0x80BA2420/func_80BA311C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Nozoki_0x80BA2420/func_80BA3230.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Nozoki_0x80BA2420/func_80BA3230.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Nozoki_0x80BA2420/func_80BA3344.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Nozoki_0x80BA2420/func_80BA3344.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Nozoki_0x80BA2420/ObjNozoki_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Nozoki_0x80BA2420/ObjNozoki_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Nozoki_0x80BA2420/func_80BA3434.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Nozoki_0x80BA2420/func_80BA3434.asm") diff --git a/src/overlays/actors/ovl_Obj_Ocarinalift/z_obj_ocarinalift.c b/src/overlays/actors/ovl_Obj_Ocarinalift/z_obj_ocarinalift.c index fdb32dec7f..5f7a721055 100644 --- a/src/overlays/actors/ovl_Obj_Ocarinalift/z_obj_ocarinalift.c +++ b/src/overlays/actors/ovl_Obj_Ocarinalift/z_obj_ocarinalift.c @@ -23,40 +23,40 @@ const ActorInit Obj_Ocarinalift_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Ocarinalift_0x80AC94C0/func_80AC94C0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Ocarinalift_0x80AC94C0/func_80AC94C0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Ocarinalift_0x80AC94C0/ObjOcarinalift_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Ocarinalift_0x80AC94C0/ObjOcarinalift_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Ocarinalift_0x80AC94C0/ObjOcarinalift_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Ocarinalift_0x80AC94C0/ObjOcarinalift_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Ocarinalift_0x80AC94C0/func_80AC9680.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Ocarinalift_0x80AC94C0/func_80AC9680.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Ocarinalift_0x80AC94C0/func_80AC96A4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Ocarinalift_0x80AC94C0/func_80AC96A4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Ocarinalift_0x80AC94C0/func_80AC96B4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Ocarinalift_0x80AC94C0/func_80AC96B4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Ocarinalift_0x80AC94C0/func_80AC96D0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Ocarinalift_0x80AC94C0/func_80AC96D0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Ocarinalift_0x80AC94C0/func_80AC99C0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Ocarinalift_0x80AC94C0/func_80AC99C0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Ocarinalift_0x80AC94C0/func_80AC99D4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Ocarinalift_0x80AC94C0/func_80AC99D4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Ocarinalift_0x80AC94C0/func_80AC9A68.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Ocarinalift_0x80AC94C0/func_80AC9A68.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Ocarinalift_0x80AC94C0/func_80AC9A7C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Ocarinalift_0x80AC94C0/func_80AC9A7C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Ocarinalift_0x80AC94C0/func_80AC9AB8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Ocarinalift_0x80AC94C0/func_80AC9AB8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Ocarinalift_0x80AC94C0/func_80AC9AE0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Ocarinalift_0x80AC94C0/func_80AC9AE0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Ocarinalift_0x80AC94C0/func_80AC9B48.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Ocarinalift_0x80AC94C0/func_80AC9B48.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Ocarinalift_0x80AC94C0/func_80AC9B5C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Ocarinalift_0x80AC94C0/func_80AC9B5C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Ocarinalift_0x80AC94C0/func_80AC9C20.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Ocarinalift_0x80AC94C0/func_80AC9C20.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Ocarinalift_0x80AC94C0/func_80AC9C48.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Ocarinalift_0x80AC94C0/func_80AC9C48.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Ocarinalift_0x80AC94C0/ObjOcarinalift_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Ocarinalift_0x80AC94C0/ObjOcarinalift_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Ocarinalift_0x80AC94C0/ObjOcarinalift_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Ocarinalift_0x80AC94C0/ObjOcarinalift_Draw.asm") 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 728b9761b5..ba790f77e8 100644 --- a/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.c +++ b/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.c @@ -23,58 +23,58 @@ const ActorInit Obj_Oshihiki_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Oshihiki_0x80917290/func_80917290.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Oshihiki_0x80917290/func_80917290.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Oshihiki_0x80917290/func_809172E4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Oshihiki_0x80917290/func_809172E4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Oshihiki_0x80917290/func_8091734C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Oshihiki_0x80917290/func_8091734C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Oshihiki_0x80917290/func_80917378.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Oshihiki_0x80917290/func_80917378.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Oshihiki_0x80917290/func_80917408.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Oshihiki_0x80917290/func_80917408.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Oshihiki_0x80917290/func_80917538.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Oshihiki_0x80917290/func_80917538.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Oshihiki_0x80917290/func_80917604.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Oshihiki_0x80917290/func_80917604.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Oshihiki_0x80917290/func_8091763C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Oshihiki_0x80917290/func_8091763C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Oshihiki_0x80917290/func_8091768C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Oshihiki_0x80917290/func_8091768C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Oshihiki_0x80917290/ObjOshihiki_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Oshihiki_0x80917290/ObjOshihiki_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Oshihiki_0x80917290/ObjOshihiki_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Oshihiki_0x80917290/ObjOshihiki_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Oshihiki_0x80917290/func_80917840.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Oshihiki_0x80917290/func_80917840.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Oshihiki_0x80917290/func_809179A0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Oshihiki_0x80917290/func_809179A0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Oshihiki_0x80917290/func_80917AEC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Oshihiki_0x80917290/func_80917AEC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Oshihiki_0x80917290/func_80917B44.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Oshihiki_0x80917290/func_80917B44.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Oshihiki_0x80917290/func_80917B9C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Oshihiki_0x80917290/func_80917B9C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Oshihiki_0x80917290/func_80917C14.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Oshihiki_0x80917290/func_80917C14.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Oshihiki_0x80917290/func_80917E8C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Oshihiki_0x80917290/func_80917E8C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Oshihiki_0x80917290/func_80917F88.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Oshihiki_0x80917290/func_80917F88.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Oshihiki_0x80917290/func_80917FC0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Oshihiki_0x80917290/func_80917FC0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Oshihiki_0x80917290/func_809180C8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Oshihiki_0x80917290/func_809180C8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Oshihiki_0x80917290/func_80918108.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Oshihiki_0x80917290/func_80918108.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Oshihiki_0x80917290/func_80918314.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Oshihiki_0x80917290/func_80918314.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Oshihiki_0x80917290/func_8091834C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Oshihiki_0x80917290/func_8091834C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Oshihiki_0x80917290/func_8091851C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Oshihiki_0x80917290/func_8091851C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Oshihiki_0x80917290/func_80918574.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Oshihiki_0x80917290/func_80918574.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Oshihiki_0x80917290/ObjOshihiki_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Oshihiki_0x80917290/ObjOshihiki_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Oshihiki_0x80917290/ObjOshihiki_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Oshihiki_0x80917290/ObjOshihiki_Draw.asm") diff --git a/src/overlays/actors/ovl_Obj_Purify/z_obj_purify.c b/src/overlays/actors/ovl_Obj_Purify/z_obj_purify.c index 50f9d8fa51..eb69069b5b 100644 --- a/src/overlays/actors/ovl_Obj_Purify/z_obj_purify.c +++ b/src/overlays/actors/ovl_Obj_Purify/z_obj_purify.c @@ -22,40 +22,40 @@ const ActorInit Obj_Purify_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Purify_0x80A84CD0/func_80A84CD0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Purify_0x80A84CD0/func_80A84CD0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Purify_0x80A84CD0/func_80A84CF8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Purify_0x80A84CD0/func_80A84CF8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Purify_0x80A84CD0/ObjPurify_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Purify_0x80A84CD0/ObjPurify_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Purify_0x80A84CD0/ObjPurify_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Purify_0x80A84CD0/ObjPurify_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Purify_0x80A84CD0/func_80A84EAC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Purify_0x80A84CD0/func_80A84EAC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Purify_0x80A84CD0/func_80A84EC0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Purify_0x80A84CD0/func_80A84EC0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Purify_0x80A84CD0/func_80A84FA0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Purify_0x80A84CD0/func_80A84FA0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Purify_0x80A84CD0/func_80A84FB4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Purify_0x80A84CD0/func_80A84FB4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Purify_0x80A84CD0/func_80A84FEC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Purify_0x80A84CD0/func_80A84FEC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Purify_0x80A84CD0/func_80A85010.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Purify_0x80A84CD0/func_80A85010.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Purify_0x80A84CD0/func_80A85048.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Purify_0x80A84CD0/func_80A85048.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Purify_0x80A84CD0/func_80A85074.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Purify_0x80A84CD0/func_80A85074.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Purify_0x80A84CD0/func_80A850B0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Purify_0x80A84CD0/func_80A850B0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Purify_0x80A84CD0/func_80A850E8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Purify_0x80A84CD0/func_80A850E8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Purify_0x80A84CD0/func_80A8515C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Purify_0x80A84CD0/func_80A8515C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Purify_0x80A84CD0/func_80A85194.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Purify_0x80A84CD0/func_80A85194.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Purify_0x80A84CD0/ObjPurify_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Purify_0x80A84CD0/ObjPurify_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Purify_0x80A84CD0/func_80A851C8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Purify_0x80A84CD0/func_80A851C8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Purify_0x80A84CD0/func_80A85304.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Purify_0x80A84CD0/func_80A85304.asm") diff --git a/src/overlays/actors/ovl_Obj_Pzlblock/z_obj_pzlblock.c b/src/overlays/actors/ovl_Obj_Pzlblock/z_obj_pzlblock.c index 91c6842cd9..9ec310fbcd 100644 --- a/src/overlays/actors/ovl_Obj_Pzlblock/z_obj_pzlblock.c +++ b/src/overlays/actors/ovl_Obj_Pzlblock/z_obj_pzlblock.c @@ -22,34 +22,34 @@ const ActorInit Obj_Pzlblock_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Pzlblock_0x809A33E0/func_809A33E0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Pzlblock_0x809A33E0/func_809A33E0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Pzlblock_0x809A33E0/func_809A3448.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Pzlblock_0x809A33E0/func_809A3448.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Pzlblock_0x809A33E0/func_809A34E0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Pzlblock_0x809A33E0/func_809A34E0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Pzlblock_0x809A33E0/func_809A35EC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Pzlblock_0x809A33E0/func_809A35EC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Pzlblock_0x809A33E0/func_809A376C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Pzlblock_0x809A33E0/func_809A376C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Pzlblock_0x809A33E0/ObjPzlblock_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Pzlblock_0x809A33E0/ObjPzlblock_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Pzlblock_0x809A33E0/ObjPzlblock_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Pzlblock_0x809A33E0/ObjPzlblock_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Pzlblock_0x809A33E0/func_809A3A48.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Pzlblock_0x809A33E0/func_809A3A48.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Pzlblock_0x809A33E0/func_809A3A74.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Pzlblock_0x809A33E0/func_809A3A74.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Pzlblock_0x809A33E0/func_809A3BA4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Pzlblock_0x809A33E0/func_809A3BA4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Pzlblock_0x809A33E0/func_809A3BC0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Pzlblock_0x809A33E0/func_809A3BC0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Pzlblock_0x809A33E0/func_809A3D1C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Pzlblock_0x809A33E0/func_809A3D1C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Pzlblock_0x809A33E0/func_809A3D38.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Pzlblock_0x809A33E0/func_809A3D38.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Pzlblock_0x809A33E0/ObjPzlblock_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Pzlblock_0x809A33E0/ObjPzlblock_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Pzlblock_0x809A33E0/func_809A3E58.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Pzlblock_0x809A33E0/func_809A3E58.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Pzlblock_0x809A33E0/func_809A3F0C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Pzlblock_0x809A33E0/func_809A3F0C.asm") diff --git a/src/overlays/actors/ovl_Obj_Raillift/z_obj_raillift.c b/src/overlays/actors/ovl_Obj_Raillift/z_obj_raillift.c index 87bd9cd6cf..3e88663b09 100644 --- a/src/overlays/actors/ovl_Obj_Raillift/z_obj_raillift.c +++ b/src/overlays/actors/ovl_Obj_Raillift/z_obj_raillift.c @@ -23,28 +23,28 @@ const ActorInit Obj_Raillift_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Raillift_0x80A19910/func_80A19910.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Raillift_0x80A19910/func_80A19910.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Raillift_0x80A19910/ObjRaillift_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Raillift_0x80A19910/ObjRaillift_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Raillift_0x80A19910/ObjRaillift_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Raillift_0x80A19910/ObjRaillift_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Raillift_0x80A19910/func_80A19B98.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Raillift_0x80A19910/func_80A19B98.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Raillift_0x80A19910/func_80A19BA8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Raillift_0x80A19910/func_80A19BA8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Raillift_0x80A19910/func_80A19E84.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Raillift_0x80A19910/func_80A19E84.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Raillift_0x80A19910/func_80A19EE0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Raillift_0x80A19910/func_80A19EE0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Raillift_0x80A19910/func_80A19F18.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Raillift_0x80A19910/func_80A19F18.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Raillift_0x80A19910/func_80A19F78.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Raillift_0x80A19910/func_80A19F78.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Raillift_0x80A19910/ObjRaillift_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Raillift_0x80A19910/ObjRaillift_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Raillift_0x80A19910/ObjRaillift_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Raillift_0x80A19910/ObjRaillift_Draw.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Raillift_0x80A19910/func_80A1A330.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Raillift_0x80A19910/func_80A1A330.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Raillift_0x80A19910/func_80A1A360.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Raillift_0x80A19910/func_80A1A360.asm") 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 ca2c6edc24..cbc044cfaa 100644 --- a/src/overlays/actors/ovl_Obj_Roomtimer/z_obj_roomtimer.c +++ b/src/overlays/actors/ovl_Obj_Roomtimer/z_obj_roomtimer.c @@ -22,14 +22,14 @@ const ActorInit Obj_Roomtimer_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Roomtimer_0x80973C50/ObjRoomtimer_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Roomtimer_0x80973C50/ObjRoomtimer_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Roomtimer_0x80973C50/ObjRoomtimer_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Roomtimer_0x80973C50/ObjRoomtimer_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Roomtimer_0x80973C50/func_80973CD8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Roomtimer_0x80973C50/func_80973CD8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Roomtimer_0x80973C50/func_80973D3C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Roomtimer_0x80973C50/func_80973D3C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Roomtimer_0x80973C50/func_80973DE0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Roomtimer_0x80973C50/func_80973DE0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Roomtimer_0x80973C50/ObjRoomtimer_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Roomtimer_0x80973C50/ObjRoomtimer_Update.asm") diff --git a/src/overlays/actors/ovl_Obj_Rotlift/z_obj_rotlift.c b/src/overlays/actors/ovl_Obj_Rotlift/z_obj_rotlift.c index b7071f6a6c..c46879b5bd 100644 --- a/src/overlays/actors/ovl_Obj_Rotlift/z_obj_rotlift.c +++ b/src/overlays/actors/ovl_Obj_Rotlift/z_obj_rotlift.c @@ -23,12 +23,12 @@ const ActorInit Obj_Rotlift_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Rotlift_0x80B95E20/func_80B95E20.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Rotlift_0x80B95E20/func_80B95E20.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Rotlift_0x80B95E20/ObjRotlift_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Rotlift_0x80B95E20/ObjRotlift_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Rotlift_0x80B95E20/ObjRotlift_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Rotlift_0x80B95E20/ObjRotlift_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Rotlift_0x80B95E20/ObjRotlift_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Rotlift_0x80B95E20/ObjRotlift_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Rotlift_0x80B95E20/ObjRotlift_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Rotlift_0x80B95E20/ObjRotlift_Draw.asm") diff --git a/src/overlays/actors/ovl_Obj_Shutter/z_obj_shutter.c b/src/overlays/actors/ovl_Obj_Shutter/z_obj_shutter.c index d351c0600b..2bbd26cd55 100644 --- a/src/overlays/actors/ovl_Obj_Shutter/z_obj_shutter.c +++ b/src/overlays/actors/ovl_Obj_Shutter/z_obj_shutter.c @@ -23,10 +23,10 @@ const ActorInit Obj_Shutter_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Shutter_0x80A37ED0/ObjShutter_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Shutter_0x80A37ED0/ObjShutter_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Shutter_0x80A37ED0/ObjShutter_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Shutter_0x80A37ED0/ObjShutter_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Shutter_0x80A37ED0/ObjShutter_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Shutter_0x80A37ED0/ObjShutter_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Shutter_0x80A37ED0/ObjShutter_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Shutter_0x80A37ED0/ObjShutter_Draw.asm") diff --git a/src/overlays/actors/ovl_Obj_Skateblock/z_obj_skateblock.c b/src/overlays/actors/ovl_Obj_Skateblock/z_obj_skateblock.c index af2e00673b..93515497e3 100644 --- a/src/overlays/actors/ovl_Obj_Skateblock/z_obj_skateblock.c +++ b/src/overlays/actors/ovl_Obj_Skateblock/z_obj_skateblock.c @@ -23,62 +23,62 @@ const ActorInit Obj_Skateblock_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Skateblock_0x80A21150/func_80A21150.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Skateblock_0x80A21150/func_80A21150.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Skateblock_0x80A21150/func_80A211F4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Skateblock_0x80A21150/func_80A211F4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Skateblock_0x80A21150/func_80A212F0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Skateblock_0x80A21150/func_80A212F0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Skateblock_0x80A21150/func_80A21370.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Skateblock_0x80A21150/func_80A21370.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Skateblock_0x80A21150/func_80A21548.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Skateblock_0x80A21150/func_80A21548.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Skateblock_0x80A21150/func_80A216D4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Skateblock_0x80A21150/func_80A216D4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Skateblock_0x80A21150/func_80A21934.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Skateblock_0x80A21150/func_80A21934.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Skateblock_0x80A21150/func_80A21990.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Skateblock_0x80A21150/func_80A21990.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Skateblock_0x80A21150/func_80A21C30.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Skateblock_0x80A21150/func_80A21C30.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Skateblock_0x80A21150/func_80A21C88.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Skateblock_0x80A21150/func_80A21C88.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Skateblock_0x80A21150/func_80A21CB4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Skateblock_0x80A21150/func_80A21CB4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Skateblock_0x80A21150/func_80A21CD8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Skateblock_0x80A21150/func_80A21CD8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Skateblock_0x80A21150/func_80A21D1C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Skateblock_0x80A21150/func_80A21D1C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Skateblock_0x80A21150/func_80A21E9C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Skateblock_0x80A21150/func_80A21E9C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Skateblock_0x80A21150/func_80A21F68.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Skateblock_0x80A21150/func_80A21F68.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Skateblock_0x80A21150/func_80A21F74.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Skateblock_0x80A21150/func_80A21F74.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Skateblock_0x80A21150/ObjSkateblock_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Skateblock_0x80A21150/ObjSkateblock_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Skateblock_0x80A21150/ObjSkateblock_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Skateblock_0x80A21150/ObjSkateblock_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Skateblock_0x80A21150/func_80A22308.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Skateblock_0x80A21150/func_80A22308.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Skateblock_0x80A21150/func_80A22334.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Skateblock_0x80A21150/func_80A22334.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Skateblock_0x80A21150/func_80A2244C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Skateblock_0x80A21150/func_80A2244C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Skateblock_0x80A21150/func_80A224A4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Skateblock_0x80A21150/func_80A224A4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Skateblock_0x80A21150/func_80A22628.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Skateblock_0x80A21150/func_80A22628.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Skateblock_0x80A21150/func_80A2264C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Skateblock_0x80A21150/func_80A2264C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Skateblock_0x80A21150/func_80A22728.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Skateblock_0x80A21150/func_80A22728.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Skateblock_0x80A21150/func_80A2273C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Skateblock_0x80A21150/func_80A2273C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Skateblock_0x80A21150/func_80A227A4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Skateblock_0x80A21150/func_80A227A4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Skateblock_0x80A21150/func_80A227C0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Skateblock_0x80A21150/func_80A227C0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Skateblock_0x80A21150/ObjSkateblock_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Skateblock_0x80A21150/ObjSkateblock_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Skateblock_0x80A21150/ObjSkateblock_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Skateblock_0x80A21150/ObjSkateblock_Draw.asm") diff --git a/src/overlays/actors/ovl_Obj_Smork/z_obj_smork.c b/src/overlays/actors/ovl_Obj_Smork/z_obj_smork.c index 7dbfe5af5c..a216b32869 100644 --- a/src/overlays/actors/ovl_Obj_Smork/z_obj_smork.c +++ b/src/overlays/actors/ovl_Obj_Smork/z_obj_smork.c @@ -23,16 +23,16 @@ const ActorInit Obj_Smork_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Smork_0x80A3D680/func_80A3D680.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Smork_0x80A3D680/func_80A3D680.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Smork_0x80A3D680/func_80A3D940.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Smork_0x80A3D680/func_80A3D940.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Smork_0x80A3D680/func_80A3D9C4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Smork_0x80A3D680/func_80A3D9C4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Smork_0x80A3D680/ObjSmork_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Smork_0x80A3D680/ObjSmork_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Smork_0x80A3D680/ObjSmork_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Smork_0x80A3D680/ObjSmork_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Smork_0x80A3D680/ObjSmork_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Smork_0x80A3D680/ObjSmork_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Smork_0x80A3D680/ObjSmork_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Smork_0x80A3D680/ObjSmork_Draw.asm") diff --git a/src/overlays/actors/ovl_Obj_Snowball/z_obj_snowball.c b/src/overlays/actors/ovl_Obj_Snowball/z_obj_snowball.c index ba9510ced9..b84ee12b86 100644 --- a/src/overlays/actors/ovl_Obj_Snowball/z_obj_snowball.c +++ b/src/overlays/actors/ovl_Obj_Snowball/z_obj_snowball.c @@ -23,52 +23,52 @@ const ActorInit Obj_Snowball_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Snowball_0x80B02CD0/func_80B02CD0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Snowball_0x80B02CD0/func_80B02CD0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Snowball_0x80B02CD0/func_80B02D58.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Snowball_0x80B02CD0/func_80B02D58.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Snowball_0x80B02CD0/func_80B02DB0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Snowball_0x80B02CD0/func_80B02DB0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Snowball_0x80B02CD0/func_80B02E54.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Snowball_0x80B02CD0/func_80B02E54.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Snowball_0x80B02CD0/func_80B02EE4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Snowball_0x80B02CD0/func_80B02EE4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Snowball_0x80B02CD0/func_80B030F8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Snowball_0x80B02CD0/func_80B030F8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Snowball_0x80B02CD0/func_80B03688.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Snowball_0x80B02CD0/func_80B03688.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Snowball_0x80B02CD0/func_80B03A80.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Snowball_0x80B02CD0/func_80B03A80.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Snowball_0x80B02CD0/func_80B03E2C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Snowball_0x80B02CD0/func_80B03E2C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Snowball_0x80B02CD0/func_80B03FF8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Snowball_0x80B02CD0/func_80B03FF8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Snowball_0x80B02CD0/ObjSnowball_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Snowball_0x80B02CD0/ObjSnowball_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Snowball_0x80B02CD0/ObjSnowball_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Snowball_0x80B02CD0/ObjSnowball_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Snowball_0x80B02CD0/func_80B04338.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Snowball_0x80B02CD0/func_80B04338.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Snowball_0x80B02CD0/func_80B04350.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Snowball_0x80B02CD0/func_80B04350.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Snowball_0x80B02CD0/func_80B04540.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Snowball_0x80B02CD0/func_80B04540.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Snowball_0x80B02CD0/func_80B0457C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Snowball_0x80B02CD0/func_80B0457C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Snowball_0x80B02CD0/func_80B04608.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Snowball_0x80B02CD0/func_80B04608.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Snowball_0x80B02CD0/func_80B04648.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Snowball_0x80B02CD0/func_80B04648.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Snowball_0x80B02CD0/func_80B046E4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Snowball_0x80B02CD0/func_80B046E4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Snowball_0x80B02CD0/func_80B047C0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Snowball_0x80B02CD0/func_80B047C0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Snowball_0x80B02CD0/func_80B04B48.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Snowball_0x80B02CD0/func_80B04B48.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Snowball_0x80B02CD0/func_80B04B60.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Snowball_0x80B02CD0/func_80B04B60.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Snowball_0x80B02CD0/ObjSnowball_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Snowball_0x80B02CD0/ObjSnowball_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Snowball_0x80B02CD0/ObjSnowball_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Snowball_0x80B02CD0/ObjSnowball_Draw.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Snowball_0x80B02CD0/func_80B04D34.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Snowball_0x80B02CD0/func_80B04D34.asm") diff --git a/src/overlays/actors/ovl_Obj_Snowball2/z_obj_snowball2.c b/src/overlays/actors/ovl_Obj_Snowball2/z_obj_snowball2.c index 489050ef4b..7357e14ee7 100644 --- a/src/overlays/actors/ovl_Obj_Snowball2/z_obj_snowball2.c +++ b/src/overlays/actors/ovl_Obj_Snowball2/z_obj_snowball2.c @@ -23,50 +23,50 @@ const ActorInit Obj_Snowball2_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Snowball2_0x80B38E20/func_80B38E20.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Snowball2_0x80B38E20/func_80B38E20.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Snowball2_0x80B38E20/func_80B38E88.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Snowball2_0x80B38E20/func_80B38E88.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Snowball2_0x80B38E20/func_80B38EFC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Snowball2_0x80B38E20/func_80B38EFC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Snowball2_0x80B38E20/func_80B39108.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Snowball2_0x80B38E20/func_80B39108.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Snowball2_0x80B38E20/func_80B39470.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Snowball2_0x80B38E20/func_80B39470.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Snowball2_0x80B38E20/func_80B395C4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Snowball2_0x80B38E20/func_80B395C4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Snowball2_0x80B38E20/func_80B395EC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Snowball2_0x80B38E20/func_80B395EC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Snowball2_0x80B38E20/func_80B39638.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Snowball2_0x80B38E20/func_80B39638.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Snowball2_0x80B38E20/func_80B39834.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Snowball2_0x80B38E20/func_80B39834.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Snowball2_0x80B38E20/func_80B39908.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Snowball2_0x80B38E20/func_80B39908.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Snowball2_0x80B38E20/func_80B39B28.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Snowball2_0x80B38E20/func_80B39B28.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Snowball2_0x80B38E20/func_80B39B5C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Snowball2_0x80B38E20/func_80B39B5C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Snowball2_0x80B38E20/ObjSnowball2_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Snowball2_0x80B38E20/ObjSnowball2_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Snowball2_0x80B38E20/ObjSnowball2_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Snowball2_0x80B38E20/ObjSnowball2_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Snowball2_0x80B38E20/func_80B39C78.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Snowball2_0x80B38E20/func_80B39C78.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Snowball2_0x80B38E20/func_80B39C9C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Snowball2_0x80B38E20/func_80B39C9C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Snowball2_0x80B38E20/func_80B39F60.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Snowball2_0x80B38E20/func_80B39F60.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Snowball2_0x80B38E20/func_80B39FA8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Snowball2_0x80B38E20/func_80B39FA8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Snowball2_0x80B38E20/func_80B3A0D8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Snowball2_0x80B38E20/func_80B3A0D8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Snowball2_0x80B38E20/func_80B3A13C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Snowball2_0x80B38E20/func_80B3A13C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Snowball2_0x80B38E20/func_80B3A498.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Snowball2_0x80B38E20/func_80B3A498.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Snowball2_0x80B38E20/func_80B3A500.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Snowball2_0x80B38E20/func_80B3A500.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Snowball2_0x80B38E20/ObjSnowball2_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Snowball2_0x80B38E20/ObjSnowball2_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Snowball2_0x80B38E20/ObjSnowball2_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Snowball2_0x80B38E20/ObjSnowball2_Draw.asm") diff --git a/src/overlays/actors/ovl_Obj_Sound/z_obj_sound.c b/src/overlays/actors/ovl_Obj_Sound/z_obj_sound.c index 5be4cc38dc..74d72cddf6 100644 --- a/src/overlays/actors/ovl_Obj_Sound/z_obj_sound.c +++ b/src/overlays/actors/ovl_Obj_Sound/z_obj_sound.c @@ -22,10 +22,10 @@ const ActorInit Obj_Sound_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Sound_0x8099A920/ObjSound_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Sound_0x8099A920/ObjSound_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Sound_0x8099A920/ObjSound_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Sound_0x8099A920/ObjSound_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Sound_0x8099A920/ObjSound_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Sound_0x8099A920/ObjSound_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Sound_0x8099A920/func_8099AA84.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Sound_0x8099A920/func_8099AA84.asm") diff --git a/src/overlays/actors/ovl_Obj_Spidertent/z_obj_spidertent.c b/src/overlays/actors/ovl_Obj_Spidertent/z_obj_spidertent.c index 80faac0318..214ae01cdb 100644 --- a/src/overlays/actors/ovl_Obj_Spidertent/z_obj_spidertent.c +++ b/src/overlays/actors/ovl_Obj_Spidertent/z_obj_spidertent.c @@ -23,34 +23,34 @@ const ActorInit Obj_Spidertent_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Spidertent_0x80B2FB10/func_80B2FB10.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Spidertent_0x80B2FB10/func_80B2FB10.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Spidertent_0x80B2FB10/func_80B2FB94.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Spidertent_0x80B2FB10/func_80B2FB94.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Spidertent_0x80B2FB10/func_80B2FC98.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Spidertent_0x80B2FB10/func_80B2FC98.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Spidertent_0x80B2FB10/func_80B300F4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Spidertent_0x80B2FB10/func_80B300F4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Spidertent_0x80B2FB10/func_80B30410.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Spidertent_0x80B2FB10/func_80B30410.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Spidertent_0x80B2FB10/func_80B30480.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Spidertent_0x80B2FB10/func_80B30480.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Spidertent_0x80B2FB10/ObjSpidertent_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Spidertent_0x80B2FB10/ObjSpidertent_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Spidertent_0x80B2FB10/ObjSpidertent_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Spidertent_0x80B2FB10/ObjSpidertent_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Spidertent_0x80B2FB10/func_80B307E0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Spidertent_0x80B2FB10/func_80B307E0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Spidertent_0x80B2FB10/func_80B30808.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Spidertent_0x80B2FB10/func_80B30808.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Spidertent_0x80B2FB10/func_80B30A2C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Spidertent_0x80B2FB10/func_80B30A2C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Spidertent_0x80B2FB10/func_80B30A4C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Spidertent_0x80B2FB10/func_80B30A4C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Spidertent_0x80B2FB10/func_80B30AD4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Spidertent_0x80B2FB10/func_80B30AD4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Spidertent_0x80B2FB10/func_80B30AF8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Spidertent_0x80B2FB10/func_80B30AF8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Spidertent_0x80B2FB10/ObjSpidertent_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Spidertent_0x80B2FB10/ObjSpidertent_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Spidertent_0x80B2FB10/ObjSpidertent_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Spidertent_0x80B2FB10/ObjSpidertent_Draw.asm") diff --git a/src/overlays/actors/ovl_Obj_Spinyroll/z_obj_spinyroll.c b/src/overlays/actors/ovl_Obj_Spinyroll/z_obj_spinyroll.c index ff9117a648..be73d24aa3 100644 --- a/src/overlays/actors/ovl_Obj_Spinyroll/z_obj_spinyroll.c +++ b/src/overlays/actors/ovl_Obj_Spinyroll/z_obj_spinyroll.c @@ -23,72 +23,72 @@ const ActorInit Obj_Spinyroll_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Spinyroll_0x80A1DA50/func_80A1DA50.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Spinyroll_0x80A1DA50/func_80A1DA50.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Spinyroll_0x80A1DA50/func_80A1DAAC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Spinyroll_0x80A1DA50/func_80A1DAAC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Spinyroll_0x80A1DA50/func_80A1DB2C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Spinyroll_0x80A1DA50/func_80A1DB2C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Spinyroll_0x80A1DA50/func_80A1DC5C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Spinyroll_0x80A1DA50/func_80A1DC5C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Spinyroll_0x80A1DA50/func_80A1DCCC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Spinyroll_0x80A1DA50/func_80A1DCCC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Spinyroll_0x80A1DA50/func_80A1DD18.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Spinyroll_0x80A1DA50/func_80A1DD18.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Spinyroll_0x80A1DA50/func_80A1DE10.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Spinyroll_0x80A1DA50/func_80A1DE10.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Spinyroll_0x80A1DA50/func_80A1DE58.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Spinyroll_0x80A1DA50/func_80A1DE58.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Spinyroll_0x80A1DA50/func_80A1DE84.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Spinyroll_0x80A1DA50/func_80A1DE84.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Spinyroll_0x80A1DA50/func_80A1DEB8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Spinyroll_0x80A1DA50/func_80A1DEB8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Spinyroll_0x80A1DA50/func_80A1DFA0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Spinyroll_0x80A1DA50/func_80A1DFA0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Spinyroll_0x80A1DA50/func_80A1E074.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Spinyroll_0x80A1DA50/func_80A1E074.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Spinyroll_0x80A1DA50/func_80A1E2D8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Spinyroll_0x80A1DA50/func_80A1E2D8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Spinyroll_0x80A1DA50/func_80A1E334.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Spinyroll_0x80A1DA50/func_80A1E334.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Spinyroll_0x80A1DA50/func_80A1E394.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Spinyroll_0x80A1DA50/func_80A1E394.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Spinyroll_0x80A1DA50/func_80A1E3D8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Spinyroll_0x80A1DA50/func_80A1E3D8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Spinyroll_0x80A1DA50/func_80A1E648.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Spinyroll_0x80A1DA50/func_80A1E648.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Spinyroll_0x80A1DA50/func_80A1E694.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Spinyroll_0x80A1DA50/func_80A1E694.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Spinyroll_0x80A1DA50/func_80A1E6D4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Spinyroll_0x80A1DA50/func_80A1E6D4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Spinyroll_0x80A1DA50/ObjSpinyroll_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Spinyroll_0x80A1DA50/ObjSpinyroll_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Spinyroll_0x80A1DA50/ObjSpinyroll_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Spinyroll_0x80A1DA50/ObjSpinyroll_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Spinyroll_0x80A1DA50/func_80A1E9C4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Spinyroll_0x80A1DA50/func_80A1E9C4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Spinyroll_0x80A1DA50/func_80A1E9E0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Spinyroll_0x80A1DA50/func_80A1E9E0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Spinyroll_0x80A1DA50/func_80A1EA10.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Spinyroll_0x80A1DA50/func_80A1EA10.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Spinyroll_0x80A1DA50/func_80A1EA4C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Spinyroll_0x80A1DA50/func_80A1EA4C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Spinyroll_0x80A1DA50/func_80A1EAAC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Spinyroll_0x80A1DA50/func_80A1EAAC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Spinyroll_0x80A1DA50/func_80A1EAE0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Spinyroll_0x80A1DA50/func_80A1EAE0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Spinyroll_0x80A1DA50/func_80A1EB40.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Spinyroll_0x80A1DA50/func_80A1EB40.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Spinyroll_0x80A1DA50/func_80A1EB54.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Spinyroll_0x80A1DA50/func_80A1EB54.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Spinyroll_0x80A1DA50/func_80A1EC24.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Spinyroll_0x80A1DA50/func_80A1EC24.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Spinyroll_0x80A1DA50/func_80A1EC38.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Spinyroll_0x80A1DA50/func_80A1EC38.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Spinyroll_0x80A1DA50/func_80A1ECC0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Spinyroll_0x80A1DA50/func_80A1ECC0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Spinyroll_0x80A1DA50/func_80A1ECD4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Spinyroll_0x80A1DA50/func_80A1ECD4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Spinyroll_0x80A1DA50/ObjSpinyroll_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Spinyroll_0x80A1DA50/ObjSpinyroll_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Spinyroll_0x80A1DA50/ObjSpinyroll_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Spinyroll_0x80A1DA50/ObjSpinyroll_Draw.asm") 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 b3aaf37fc9..a8a10ad807 100644 --- a/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.c +++ b/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.c @@ -23,116 +23,116 @@ const ActorInit Obj_Switch_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Switch_0x8093ABD0/func_8093ABD0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Switch_0x8093ABD0/func_8093ABD0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Switch_0x8093ABD0/func_8093AC6C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Switch_0x8093ABD0/func_8093AC6C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Switch_0x8093ABD0/func_8093ADA8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Switch_0x8093ABD0/func_8093ADA8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Switch_0x8093ABD0/func_8093AE1C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Switch_0x8093ABD0/func_8093AE1C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Switch_0x8093ABD0/func_8093AE74.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Switch_0x8093ABD0/func_8093AE74.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Switch_0x8093ABD0/func_8093AE88.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Switch_0x8093ABD0/func_8093AE88.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Switch_0x8093ABD0/func_8093AEC4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Switch_0x8093ABD0/func_8093AEC4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Switch_0x8093ABD0/func_8093AEF0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Switch_0x8093ABD0/func_8093AEF0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Switch_0x8093ABD0/func_8093AF1C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Switch_0x8093ABD0/func_8093AF1C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Switch_0x8093ABD0/func_8093AF54.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Switch_0x8093ABD0/func_8093AF54.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Switch_0x8093ABD0/ObjSwitch_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Switch_0x8093ABD0/ObjSwitch_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Switch_0x8093ABD0/ObjSwitch_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Switch_0x8093ABD0/ObjSwitch_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Switch_0x8093ABD0/func_8093B648.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Switch_0x8093ABD0/func_8093B648.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Switch_0x8093ABD0/func_8093B668.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Switch_0x8093ABD0/func_8093B668.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Switch_0x8093ABD0/func_8093B6F4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Switch_0x8093ABD0/func_8093B6F4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Switch_0x8093ABD0/func_8093B710.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Switch_0x8093ABD0/func_8093B710.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Switch_0x8093ABD0/func_8093B92C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Switch_0x8093ABD0/func_8093B92C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Switch_0x8093ABD0/func_8093B940.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Switch_0x8093ABD0/func_8093B940.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Switch_0x8093ABD0/func_8093B9C0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Switch_0x8093ABD0/func_8093B9C0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Switch_0x8093ABD0/func_8093B9E4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Switch_0x8093ABD0/func_8093B9E4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Switch_0x8093ABD0/func_8093BB5C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Switch_0x8093ABD0/func_8093BB5C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Switch_0x8093ABD0/func_8093BB70.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Switch_0x8093ABD0/func_8093BB70.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Switch_0x8093ABD0/func_8093BBD0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Switch_0x8093ABD0/func_8093BBD0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Switch_0x8093ABD0/func_8093BCC8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Switch_0x8093ABD0/func_8093BCC8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Switch_0x8093ABD0/func_8093BCDC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Switch_0x8093ABD0/func_8093BCDC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Switch_0x8093ABD0/func_8093BD34.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Switch_0x8093ABD0/func_8093BD34.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Switch_0x8093ABD0/func_8093BD4C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Switch_0x8093ABD0/func_8093BD4C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Switch_0x8093ABD0/func_8093BDAC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Switch_0x8093ABD0/func_8093BDAC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Switch_0x8093ABD0/func_8093BDC0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Switch_0x8093ABD0/func_8093BDC0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Switch_0x8093ABD0/func_8093BE10.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Switch_0x8093ABD0/func_8093BE10.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Switch_0x8093ABD0/func_8093BE2C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Switch_0x8093ABD0/func_8093BE2C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Switch_0x8093ABD0/func_8093BEF0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Switch_0x8093ABD0/func_8093BEF0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Switch_0x8093ABD0/func_8093BF04.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Switch_0x8093ABD0/func_8093BF04.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Switch_0x8093ABD0/func_8093BF50.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Switch_0x8093ABD0/func_8093BF50.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Switch_0x8093ABD0/func_8093BF70.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Switch_0x8093ABD0/func_8093BF70.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Switch_0x8093ABD0/func_8093C0A4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Switch_0x8093ABD0/func_8093C0A4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Switch_0x8093ABD0/func_8093C0B8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Switch_0x8093ABD0/func_8093C0B8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Switch_0x8093ABD0/func_8093C138.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Switch_0x8093ABD0/func_8093C138.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Switch_0x8093ABD0/func_8093C15C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Switch_0x8093ABD0/func_8093C15C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Switch_0x8093ABD0/func_8093C23C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Switch_0x8093ABD0/func_8093C23C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Switch_0x8093ABD0/func_8093C250.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Switch_0x8093ABD0/func_8093C250.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Switch_0x8093ABD0/func_8093C2B4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Switch_0x8093ABD0/func_8093C2B4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Switch_0x8093ABD0/func_8093C2D4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Switch_0x8093ABD0/func_8093C2D4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Switch_0x8093ABD0/func_8093C3C8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Switch_0x8093ABD0/func_8093C3C8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Switch_0x8093ABD0/func_8093C3DC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Switch_0x8093ABD0/func_8093C3DC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Switch_0x8093ABD0/func_8093C460.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Switch_0x8093ABD0/func_8093C460.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Switch_0x8093ABD0/func_8093C488.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Switch_0x8093ABD0/func_8093C488.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Switch_0x8093ABD0/func_8093C584.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Switch_0x8093ABD0/func_8093C584.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Switch_0x8093ABD0/func_8093C598.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Switch_0x8093ABD0/func_8093C598.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Switch_0x8093ABD0/ObjSwitch_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Switch_0x8093ABD0/ObjSwitch_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Switch_0x8093ABD0/func_8093C778.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Switch_0x8093ABD0/func_8093C778.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Switch_0x8093ABD0/func_8093C888.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Switch_0x8093ABD0/func_8093C888.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Switch_0x8093ABD0/func_8093C8B8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Switch_0x8093ABD0/func_8093C8B8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Switch_0x8093ABD0/func_8093C99C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Switch_0x8093ABD0/func_8093C99C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Switch_0x8093ABD0/func_8093CA80.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Switch_0x8093ABD0/func_8093CA80.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Switch_0x8093ABD0/func_8093CAC4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Switch_0x8093ABD0/func_8093CAC4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Switch_0x8093ABD0/ObjSwitch_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Switch_0x8093ABD0/ObjSwitch_Draw.asm") diff --git a/src/overlays/actors/ovl_Obj_Swprize/z_obj_swprize.c b/src/overlays/actors/ovl_Obj_Swprize/z_obj_swprize.c index b2a713f55e..2a6dc50f98 100644 --- a/src/overlays/actors/ovl_Obj_Swprize/z_obj_swprize.c +++ b/src/overlays/actors/ovl_Obj_Swprize/z_obj_swprize.c @@ -22,28 +22,28 @@ const ActorInit Obj_Swprize_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Swprize_0x80C25360/func_80C25360.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Swprize_0x80C25360/func_80C25360.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Swprize_0x80C25360/func_80C253D0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Swprize_0x80C25360/func_80C253D0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Swprize_0x80C25360/ObjSwprize_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Swprize_0x80C25360/ObjSwprize_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Swprize_0x80C25360/ObjSwprize_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Swprize_0x80C25360/ObjSwprize_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Swprize_0x80C25360/func_80C25640.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Swprize_0x80C25360/func_80C25640.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Swprize_0x80C25360/func_80C25654.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Swprize_0x80C25360/func_80C25654.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Swprize_0x80C25360/func_80C25698.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Swprize_0x80C25360/func_80C25698.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Swprize_0x80C25360/func_80C256AC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Swprize_0x80C25360/func_80C256AC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Swprize_0x80C25360/func_80C25710.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Swprize_0x80C25360/func_80C25710.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Swprize_0x80C25360/func_80C2572C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Swprize_0x80C25360/func_80C2572C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Swprize_0x80C25360/func_80C25780.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Swprize_0x80C25360/func_80C25780.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Swprize_0x80C25360/func_80C25794.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Swprize_0x80C25360/func_80C25794.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Swprize_0x80C25360/ObjSwprize_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Swprize_0x80C25360/ObjSwprize_Update.asm") 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 01a48522ad..ffa9dac5de 100644 --- a/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.c +++ b/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.c @@ -23,10 +23,10 @@ const ActorInit Obj_Syokudai_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Syokudai_0x808BC010/ObjSyokudai_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Syokudai_0x808BC010/ObjSyokudai_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Syokudai_0x808BC010/ObjSyokudai_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Syokudai_0x808BC010/ObjSyokudai_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Syokudai_0x808BC010/ObjSyokudai_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Syokudai_0x808BC010/ObjSyokudai_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Syokudai_0x808BC010/ObjSyokudai_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Syokudai_0x808BC010/ObjSyokudai_Draw.asm") diff --git a/src/overlays/actors/ovl_Obj_Takaraya_Wall/z_obj_takaraya_wall.c b/src/overlays/actors/ovl_Obj_Takaraya_Wall/z_obj_takaraya_wall.c index 85c8c68080..c5ed7ec24e 100644 --- a/src/overlays/actors/ovl_Obj_Takaraya_Wall/z_obj_takaraya_wall.c +++ b/src/overlays/actors/ovl_Obj_Takaraya_Wall/z_obj_takaraya_wall.c @@ -23,20 +23,20 @@ const ActorInit Obj_Takaraya_Wall_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Takaraya_Wall_0x80AD9240/func_80AD9240.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Takaraya_Wall_0x80AD9240/func_80AD9240.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Takaraya_Wall_0x80AD9240/func_80AD92FC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Takaraya_Wall_0x80AD9240/func_80AD92FC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Takaraya_Wall_0x80AD9240/func_80AD9358.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Takaraya_Wall_0x80AD9240/func_80AD9358.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Takaraya_Wall_0x80AD9240/func_80AD9488.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Takaraya_Wall_0x80AD9240/func_80AD9488.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Takaraya_Wall_0x80AD9240/ObjTakarayaWall_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Takaraya_Wall_0x80AD9240/ObjTakarayaWall_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Takaraya_Wall_0x80AD9240/ObjTakarayaWall_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Takaraya_Wall_0x80AD9240/ObjTakarayaWall_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Takaraya_Wall_0x80AD9240/func_80AD9B04.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Takaraya_Wall_0x80AD9240/func_80AD9B04.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Takaraya_Wall_0x80AD9240/ObjTakarayaWall_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Takaraya_Wall_0x80AD9240/ObjTakarayaWall_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Takaraya_Wall_0x80AD9240/ObjTakarayaWall_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Takaraya_Wall_0x80AD9240/ObjTakarayaWall_Draw.asm") diff --git a/src/overlays/actors/ovl_Obj_Taru/z_obj_taru.c b/src/overlays/actors/ovl_Obj_Taru/z_obj_taru.c index b2adffdf1c..c3e97805b3 100644 --- a/src/overlays/actors/ovl_Obj_Taru/z_obj_taru.c +++ b/src/overlays/actors/ovl_Obj_Taru/z_obj_taru.c @@ -23,30 +23,30 @@ const ActorInit Obj_Taru_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Taru_0x80B9B6E0/func_80B9B6E0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Taru_0x80B9B6E0/func_80B9B6E0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Taru_0x80B9B6E0/func_80B9B74C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Taru_0x80B9B6E0/func_80B9B74C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Taru_0x80B9B6E0/func_80B9B9C8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Taru_0x80B9B6E0/func_80B9B9C8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Taru_0x80B9B6E0/func_80B9BC64.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Taru_0x80B9B6E0/func_80B9BC64.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Taru_0x80B9B6E0/func_80B9BCBC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Taru_0x80B9B6E0/func_80B9BCBC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Taru_0x80B9B6E0/func_80B9BD84.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Taru_0x80B9B6E0/func_80B9BD84.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Taru_0x80B9B6E0/ObjTaru_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Taru_0x80B9B6E0/ObjTaru_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Taru_0x80B9B6E0/ObjTaru_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Taru_0x80B9B6E0/ObjTaru_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Taru_0x80B9B6E0/func_80B9BF7C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Taru_0x80B9B6E0/func_80B9BF7C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Taru_0x80B9B6E0/func_80B9C07C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Taru_0x80B9B6E0/func_80B9C07C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Taru_0x80B9B6E0/func_80B9C174.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Taru_0x80B9B6E0/func_80B9C174.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Taru_0x80B9B6E0/func_80B9C1A0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Taru_0x80B9B6E0/func_80B9C1A0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Taru_0x80B9B6E0/ObjTaru_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Taru_0x80B9B6E0/ObjTaru_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Taru_0x80B9B6E0/ObjTaru_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Taru_0x80B9B6E0/ObjTaru_Draw.asm") diff --git a/src/overlays/actors/ovl_Obj_Toge/z_obj_toge.c b/src/overlays/actors/ovl_Obj_Toge/z_obj_toge.c index 71db19cdb7..a04ef157dc 100644 --- a/src/overlays/actors/ovl_Obj_Toge/z_obj_toge.c +++ b/src/overlays/actors/ovl_Obj_Toge/z_obj_toge.c @@ -23,30 +23,30 @@ const ActorInit Obj_Toge_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Toge_0x809A41C0/func_809A41C0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Toge_0x809A41C0/func_809A41C0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Toge_0x809A41C0/func_809A42A0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Toge_0x809A41C0/func_809A42A0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Toge_0x809A41C0/func_809A43A8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Toge_0x809A41C0/func_809A43A8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Toge_0x809A41C0/func_809A43EC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Toge_0x809A41C0/func_809A43EC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Toge_0x809A41C0/ObjToge_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Toge_0x809A41C0/ObjToge_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Toge_0x809A41C0/ObjToge_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Toge_0x809A41C0/ObjToge_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Toge_0x809A41C0/func_809A4744.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Toge_0x809A41C0/func_809A4744.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Toge_0x809A41C0/func_809A477C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Toge_0x809A41C0/func_809A477C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Toge_0x809A41C0/func_809A4804.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Toge_0x809A41C0/func_809A4804.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Toge_0x809A41C0/func_809A481C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Toge_0x809A41C0/func_809A481C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Toge_0x809A41C0/func_809A488C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Toge_0x809A41C0/func_809A488C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Toge_0x809A41C0/func_809A48AC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Toge_0x809A41C0/func_809A48AC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Toge_0x809A41C0/ObjToge_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Toge_0x809A41C0/ObjToge_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Toge_0x809A41C0/ObjToge_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Toge_0x809A41C0/ObjToge_Draw.asm") diff --git a/src/overlays/actors/ovl_Obj_Tokei_Step/z_obj_tokei_step.c b/src/overlays/actors/ovl_Obj_Tokei_Step/z_obj_tokei_step.c index 907a80fb9f..cff48a81a1 100644 --- a/src/overlays/actors/ovl_Obj_Tokei_Step/z_obj_tokei_step.c +++ b/src/overlays/actors/ovl_Obj_Tokei_Step/z_obj_tokei_step.c @@ -23,42 +23,42 @@ const ActorInit Obj_Tokei_Step_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tokei_Step_0x80AD5BB0/func_80AD5BB0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Tokei_Step_0x80AD5BB0/func_80AD5BB0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tokei_Step_0x80AD5BB0/func_80AD5BE8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Tokei_Step_0x80AD5BB0/func_80AD5BE8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tokei_Step_0x80AD5BB0/func_80AD5C70.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Tokei_Step_0x80AD5BB0/func_80AD5C70.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tokei_Step_0x80AD5BB0/func_80AD5DFC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Tokei_Step_0x80AD5BB0/func_80AD5DFC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tokei_Step_0x80AD5BB0/func_80AD5EB8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Tokei_Step_0x80AD5BB0/func_80AD5EB8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tokei_Step_0x80AD5BB0/func_80AD5F70.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Tokei_Step_0x80AD5BB0/func_80AD5F70.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tokei_Step_0x80AD5BB0/func_80AD5FB0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Tokei_Step_0x80AD5BB0/func_80AD5FB0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tokei_Step_0x80AD5BB0/ObjTokeiStep_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Tokei_Step_0x80AD5BB0/ObjTokeiStep_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tokei_Step_0x80AD5BB0/ObjTokeiStep_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Tokei_Step_0x80AD5BB0/ObjTokeiStep_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tokei_Step_0x80AD5BB0/func_80AD6348.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Tokei_Step_0x80AD5BB0/func_80AD6348.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tokei_Step_0x80AD5BB0/func_80AD635C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Tokei_Step_0x80AD5BB0/func_80AD635C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tokei_Step_0x80AD5BB0/func_80AD63D4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Tokei_Step_0x80AD5BB0/func_80AD63D4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tokei_Step_0x80AD5BB0/func_80AD63E8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Tokei_Step_0x80AD5BB0/func_80AD63E8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tokei_Step_0x80AD5BB0/func_80AD63F8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Tokei_Step_0x80AD5BB0/func_80AD63F8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tokei_Step_0x80AD5BB0/func_80AD642C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Tokei_Step_0x80AD5BB0/func_80AD642C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tokei_Step_0x80AD5BB0/func_80AD6480.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Tokei_Step_0x80AD5BB0/func_80AD6480.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tokei_Step_0x80AD5BB0/func_80AD64A4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Tokei_Step_0x80AD5BB0/func_80AD64A4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tokei_Step_0x80AD5BB0/ObjTokeiStep_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Tokei_Step_0x80AD5BB0/ObjTokeiStep_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tokei_Step_0x80AD5BB0/ObjTokeiStep_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Tokei_Step_0x80AD5BB0/ObjTokeiStep_Draw.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tokei_Step_0x80AD5BB0/func_80AD6508.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Tokei_Step_0x80AD5BB0/func_80AD6508.asm") diff --git a/src/overlays/actors/ovl_Obj_Tokei_Tobira/z_obj_tokei_tobira.c b/src/overlays/actors/ovl_Obj_Tokei_Tobira/z_obj_tokei_tobira.c index 0dfc912a0f..8abd2d9094 100644 --- a/src/overlays/actors/ovl_Obj_Tokei_Tobira/z_obj_tokei_tobira.c +++ b/src/overlays/actors/ovl_Obj_Tokei_Tobira/z_obj_tokei_tobira.c @@ -23,12 +23,12 @@ const ActorInit Obj_Tokei_Tobira_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tokei_Tobira_0x80ABD1D0/ObjTokeiTobira_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Tokei_Tobira_0x80ABD1D0/ObjTokeiTobira_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tokei_Tobira_0x80ABD1D0/ObjTokeiTobira_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Tokei_Tobira_0x80ABD1D0/ObjTokeiTobira_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tokei_Tobira_0x80ABD1D0/func_80ABD3B0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Tokei_Tobira_0x80ABD1D0/func_80ABD3B0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tokei_Tobira_0x80ABD1D0/ObjTokeiTobira_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Tokei_Tobira_0x80ABD1D0/ObjTokeiTobira_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tokei_Tobira_0x80ABD1D0/ObjTokeiTobira_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Tokei_Tobira_0x80ABD1D0/ObjTokeiTobira_Draw.asm") diff --git a/src/overlays/actors/ovl_Obj_Tokei_Turret/z_obj_tokei_turret.c b/src/overlays/actors/ovl_Obj_Tokei_Turret/z_obj_tokei_turret.c index 8db2be1573..6ce3bd0438 100644 --- a/src/overlays/actors/ovl_Obj_Tokei_Turret/z_obj_tokei_turret.c +++ b/src/overlays/actors/ovl_Obj_Tokei_Turret/z_obj_tokei_turret.c @@ -23,10 +23,10 @@ const ActorInit Obj_Tokei_Turret_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tokei_Turret_0x80B91CC0/ObjTokeiTurret_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Tokei_Turret_0x80B91CC0/ObjTokeiTurret_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tokei_Turret_0x80B91CC0/ObjTokeiTurret_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Tokei_Turret_0x80B91CC0/ObjTokeiTurret_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tokei_Turret_0x80B91CC0/ObjTokeiTurret_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Tokei_Turret_0x80B91CC0/ObjTokeiTurret_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tokei_Turret_0x80B91CC0/ObjTokeiTurret_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Tokei_Turret_0x80B91CC0/ObjTokeiTurret_Draw.asm") diff --git a/src/overlays/actors/ovl_Obj_Tokeidai/z_obj_tokeidai.c b/src/overlays/actors/ovl_Obj_Tokeidai/z_obj_tokeidai.c index 54611e365d..087d1f326f 100644 --- a/src/overlays/actors/ovl_Obj_Tokeidai/z_obj_tokeidai.c +++ b/src/overlays/actors/ovl_Obj_Tokeidai/z_obj_tokeidai.c @@ -23,80 +23,80 @@ const ActorInit Obj_Tokeidai_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tokeidai_0x80AB2790/func_80AB2790.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Tokeidai_0x80AB2790/func_80AB2790.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tokeidai_0x80AB2790/func_80AB27B4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Tokeidai_0x80AB2790/func_80AB27B4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tokeidai_0x80AB2790/func_80AB2834.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Tokeidai_0x80AB2790/func_80AB2834.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tokeidai_0x80AB2790/func_80AB28C8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Tokeidai_0x80AB2790/func_80AB28C8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tokeidai_0x80AB2790/func_80AB29F8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Tokeidai_0x80AB2790/func_80AB29F8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tokeidai_0x80AB2790/func_80AB2BBC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Tokeidai_0x80AB2790/func_80AB2BBC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tokeidai_0x80AB2790/ObjTokeidai_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Tokeidai_0x80AB2790/ObjTokeidai_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tokeidai_0x80AB2790/ObjTokeidai_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Tokeidai_0x80AB2790/ObjTokeidai_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tokeidai_0x80AB2790/func_80AB3010.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Tokeidai_0x80AB2790/func_80AB3010.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tokeidai_0x80AB2790/func_80AB319C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Tokeidai_0x80AB2790/func_80AB319C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tokeidai_0x80AB2790/func_80AB3240.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Tokeidai_0x80AB2790/func_80AB3240.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tokeidai_0x80AB2790/func_80AB32F0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Tokeidai_0x80AB2790/func_80AB32F0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tokeidai_0x80AB2790/func_80AB3370.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Tokeidai_0x80AB2790/func_80AB3370.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tokeidai_0x80AB2790/func_80AB34CC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Tokeidai_0x80AB2790/func_80AB34CC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tokeidai_0x80AB2790/func_80AB3544.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Tokeidai_0x80AB2790/func_80AB3544.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tokeidai_0x80AB2790/func_80AB3598.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Tokeidai_0x80AB2790/func_80AB3598.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tokeidai_0x80AB2790/func_80AB363C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Tokeidai_0x80AB2790/func_80AB363C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tokeidai_0x80AB2790/func_80AB365C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Tokeidai_0x80AB2790/func_80AB365C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tokeidai_0x80AB2790/func_80AB36C4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Tokeidai_0x80AB2790/func_80AB36C4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tokeidai_0x80AB2790/func_80AB3808.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Tokeidai_0x80AB2790/func_80AB3808.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tokeidai_0x80AB2790/func_80AB3880.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Tokeidai_0x80AB2790/func_80AB3880.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tokeidai_0x80AB2790/func_80AB38B0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Tokeidai_0x80AB2790/func_80AB38B0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tokeidai_0x80AB2790/func_80AB39BC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Tokeidai_0x80AB2790/func_80AB39BC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tokeidai_0x80AB2790/func_80AB3A7C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Tokeidai_0x80AB2790/func_80AB3A7C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tokeidai_0x80AB2790/func_80AB3B34.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Tokeidai_0x80AB2790/func_80AB3B34.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tokeidai_0x80AB2790/func_80AB3BB0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Tokeidai_0x80AB2790/func_80AB3BB0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tokeidai_0x80AB2790/func_80AB3BD8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Tokeidai_0x80AB2790/func_80AB3BD8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tokeidai_0x80AB2790/func_80AB3BE8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Tokeidai_0x80AB2790/func_80AB3BE8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tokeidai_0x80AB2790/func_80AB3C50.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Tokeidai_0x80AB2790/func_80AB3C50.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tokeidai_0x80AB2790/func_80AB3CCC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Tokeidai_0x80AB2790/func_80AB3CCC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tokeidai_0x80AB2790/func_80AB3ED0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Tokeidai_0x80AB2790/func_80AB3ED0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tokeidai_0x80AB2790/func_80AB4040.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Tokeidai_0x80AB2790/func_80AB4040.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tokeidai_0x80AB2790/func_80AB4080.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Tokeidai_0x80AB2790/func_80AB4080.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tokeidai_0x80AB2790/func_80AB4160.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Tokeidai_0x80AB2790/func_80AB4160.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tokeidai_0x80AB2790/ObjTokeidai_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Tokeidai_0x80AB2790/ObjTokeidai_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tokeidai_0x80AB2790/ObjTokeidai_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Tokeidai_0x80AB2790/ObjTokeidai_Draw.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tokeidai_0x80AB2790/func_80AB4394.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Tokeidai_0x80AB2790/func_80AB4394.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tokeidai_0x80AB2790/func_80AB4664.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Tokeidai_0x80AB2790/func_80AB4664.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tokeidai_0x80AB2790/func_80AB4894.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Tokeidai_0x80AB2790/func_80AB4894.asm") diff --git a/src/overlays/actors/ovl_Obj_Toudai/z_obj_toudai.c b/src/overlays/actors/ovl_Obj_Toudai/z_obj_toudai.c index 15e0e94b64..daffbf8639 100644 --- a/src/overlays/actors/ovl_Obj_Toudai/z_obj_toudai.c +++ b/src/overlays/actors/ovl_Obj_Toudai/z_obj_toudai.c @@ -23,16 +23,16 @@ const ActorInit Obj_Toudai_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Toudai_0x80A33B00/func_80A33B00.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Toudai_0x80A33B00/func_80A33B00.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Toudai_0x80A33B00/func_80A33BB4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Toudai_0x80A33B00/func_80A33BB4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Toudai_0x80A33B00/func_80A342F4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Toudai_0x80A33B00/func_80A342F4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Toudai_0x80A33B00/ObjToudai_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Toudai_0x80A33B00/ObjToudai_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Toudai_0x80A33B00/ObjToudai_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Toudai_0x80A33B00/ObjToudai_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Toudai_0x80A33B00/ObjToudai_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Toudai_0x80A33B00/ObjToudai_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Toudai_0x80A33B00/ObjToudai_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Toudai_0x80A33B00/ObjToudai_Draw.asm") diff --git a/src/overlays/actors/ovl_Obj_Tree/z_obj_tree.c b/src/overlays/actors/ovl_Obj_Tree/z_obj_tree.c index 18dbfe841f..3f51a0419d 100644 --- a/src/overlays/actors/ovl_Obj_Tree/z_obj_tree.c +++ b/src/overlays/actors/ovl_Obj_Tree/z_obj_tree.c @@ -23,20 +23,20 @@ const ActorInit Obj_Tree_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tree_0x80B9A0B0/ObjTree_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Tree_0x80B9A0B0/ObjTree_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tree_0x80B9A0B0/ObjTree_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Tree_0x80B9A0B0/ObjTree_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tree_0x80B9A0B0/func_80B9A20C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Tree_0x80B9A0B0/func_80B9A20C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tree_0x80B9A0B0/func_80B9A220.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Tree_0x80B9A0B0/func_80B9A220.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tree_0x80B9A0B0/func_80B9A230.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Tree_0x80B9A0B0/func_80B9A230.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tree_0x80B9A0B0/func_80B9A27C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Tree_0x80B9A0B0/func_80B9A27C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tree_0x80B9A0B0/func_80B9A348.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Tree_0x80B9A0B0/func_80B9A348.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tree_0x80B9A0B0/ObjTree_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Tree_0x80B9A0B0/ObjTree_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tree_0x80B9A0B0/ObjTree_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Tree_0x80B9A0B0/ObjTree_Draw.asm") 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 5f26359d78..094ef03ae5 100644 --- a/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c +++ b/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c @@ -22,58 +22,58 @@ const ActorInit Obj_Tsubo_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tsubo_0x809275C0/func_809275C0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Tsubo_0x809275C0/func_809275C0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tsubo_0x809275C0/func_8092762C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Tsubo_0x809275C0/func_8092762C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tsubo_0x809275C0/func_80927690.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Tsubo_0x809275C0/func_80927690.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tsubo_0x809275C0/func_80927714.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Tsubo_0x809275C0/func_80927714.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tsubo_0x809275C0/func_8092776C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Tsubo_0x809275C0/func_8092776C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tsubo_0x809275C0/func_80927818.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Tsubo_0x809275C0/func_80927818.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tsubo_0x809275C0/func_80927864.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Tsubo_0x809275C0/func_80927864.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tsubo_0x809275C0/func_8092788C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Tsubo_0x809275C0/func_8092788C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tsubo_0x809275C0/ObjTsubo_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Tsubo_0x809275C0/ObjTsubo_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tsubo_0x809275C0/ObjTsubo_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Tsubo_0x809275C0/ObjTsubo_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tsubo_0x809275C0/func_80927A78.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Tsubo_0x809275C0/func_80927A78.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tsubo_0x809275C0/func_80927D2C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Tsubo_0x809275C0/func_80927D2C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tsubo_0x809275C0/func_80927FCC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Tsubo_0x809275C0/func_80927FCC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tsubo_0x809275C0/func_809282F0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Tsubo_0x809275C0/func_809282F0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tsubo_0x809275C0/func_8092860C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Tsubo_0x809275C0/func_8092860C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tsubo_0x809275C0/func_80928904.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Tsubo_0x809275C0/func_80928904.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tsubo_0x809275C0/func_80928914.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Tsubo_0x809275C0/func_80928914.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tsubo_0x809275C0/func_80928928.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Tsubo_0x809275C0/func_80928928.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tsubo_0x809275C0/func_809289B4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Tsubo_0x809275C0/func_809289B4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tsubo_0x809275C0/func_809289E4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Tsubo_0x809275C0/func_809289E4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tsubo_0x809275C0/func_80928D6C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Tsubo_0x809275C0/func_80928D6C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tsubo_0x809275C0/func_80928D80.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Tsubo_0x809275C0/func_80928D80.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tsubo_0x809275C0/func_80928E74.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Tsubo_0x809275C0/func_80928E74.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tsubo_0x809275C0/func_80928F18.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Tsubo_0x809275C0/func_80928F18.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tsubo_0x809275C0/func_809291DC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Tsubo_0x809275C0/func_809291DC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tsubo_0x809275C0/func_8092926C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Tsubo_0x809275C0/func_8092926C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tsubo_0x809275C0/ObjTsubo_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Tsubo_0x809275C0/ObjTsubo_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tsubo_0x809275C0/func_809294B0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Tsubo_0x809275C0/func_809294B0.asm") diff --git a/src/overlays/actors/ovl_Obj_Um/z_obj_um.c b/src/overlays/actors/ovl_Obj_Um/z_obj_um.c index 0ea3de99a9..1c2bc2817b 100644 --- a/src/overlays/actors/ovl_Obj_Um/z_obj_um.c +++ b/src/overlays/actors/ovl_Obj_Um/z_obj_um.c @@ -23,110 +23,110 @@ const ActorInit Obj_Um_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Um_0x80B77770/func_80B77770.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Um_0x80B77770/func_80B77770.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Um_0x80B77770/func_80B77FA4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Um_0x80B77770/func_80B77FA4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Um_0x80B77770/func_80B781DC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Um_0x80B77770/func_80B781DC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Um_0x80B77770/func_80B783E0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Um_0x80B77770/func_80B783E0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Um_0x80B77770/func_80B78764.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Um_0x80B77770/func_80B78764.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Um_0x80B77770/func_80B78A54.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Um_0x80B77770/func_80B78A54.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Um_0x80B77770/func_80B78C18.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Um_0x80B77770/func_80B78C18.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Um_0x80B77770/func_80B78D08.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Um_0x80B77770/func_80B78D08.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Um_0x80B77770/func_80B78DF0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Um_0x80B77770/func_80B78DF0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Um_0x80B77770/func_80B78E2C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Um_0x80B77770/func_80B78E2C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Um_0x80B77770/func_80B78E38.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Um_0x80B77770/func_80B78E38.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Um_0x80B77770/func_80B78E88.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Um_0x80B77770/func_80B78E88.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Um_0x80B77770/func_80B78EBC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Um_0x80B77770/func_80B78EBC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Um_0x80B77770/func_80B78EFC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Um_0x80B77770/func_80B78EFC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Um_0x80B77770/ObjUm_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Um_0x80B77770/ObjUm_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Um_0x80B77770/ObjUm_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Um_0x80B77770/ObjUm_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Um_0x80B77770/func_80B79524.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Um_0x80B77770/func_80B79524.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Um_0x80B77770/func_80B79560.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Um_0x80B77770/func_80B79560.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Um_0x80B77770/func_80B795A0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Um_0x80B77770/func_80B795A0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Um_0x80B77770/func_80B79734.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Um_0x80B77770/func_80B79734.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Um_0x80B77770/func_80B797EC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Um_0x80B77770/func_80B797EC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Um_0x80B77770/func_80B7984C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Um_0x80B77770/func_80B7984C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Um_0x80B77770/func_80B79A24.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Um_0x80B77770/func_80B79A24.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Um_0x80B77770/func_80B79A50.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Um_0x80B77770/func_80B79A50.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Um_0x80B77770/func_80B79BA0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Um_0x80B77770/func_80B79BA0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Um_0x80B77770/func_80B79F10.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Um_0x80B77770/func_80B79F10.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Um_0x80B77770/func_80B79FFC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Um_0x80B77770/func_80B79FFC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Um_0x80B77770/func_80B7A070.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Um_0x80B77770/func_80B7A070.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Um_0x80B77770/func_80B7A0E0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Um_0x80B77770/func_80B7A0E0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Um_0x80B77770/func_80B7A144.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Um_0x80B77770/func_80B7A144.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Um_0x80B77770/func_80B7A1B4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Um_0x80B77770/func_80B7A1B4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Um_0x80B77770/func_80B7A240.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Um_0x80B77770/func_80B7A240.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Um_0x80B77770/func_80B7A2AC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Um_0x80B77770/func_80B7A2AC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Um_0x80B77770/func_80B7A394.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Um_0x80B77770/func_80B7A394.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Um_0x80B77770/func_80B7A400.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Um_0x80B77770/func_80B7A400.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Um_0x80B77770/func_80B7A494.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Um_0x80B77770/func_80B7A494.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Um_0x80B77770/func_80B7A614.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Um_0x80B77770/func_80B7A614.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Um_0x80B77770/func_80B7A7AC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Um_0x80B77770/func_80B7A7AC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Um_0x80B77770/func_80B7A860.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Um_0x80B77770/func_80B7A860.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Um_0x80B77770/func_80B7AB78.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Um_0x80B77770/func_80B7AB78.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Um_0x80B77770/func_80B7ABE4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Um_0x80B77770/func_80B7ABE4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Um_0x80B77770/func_80B7AC94.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Um_0x80B77770/func_80B7AC94.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Um_0x80B77770/func_80B7AD34.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Um_0x80B77770/func_80B7AD34.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Um_0x80B77770/func_80B7AE58.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Um_0x80B77770/func_80B7AE58.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Um_0x80B77770/func_80B7AEFC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Um_0x80B77770/func_80B7AEFC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Um_0x80B77770/func_80B7AF30.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Um_0x80B77770/func_80B7AF30.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Um_0x80B77770/func_80B7B154.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Um_0x80B77770/func_80B7B154.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Um_0x80B77770/func_80B7B18C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Um_0x80B77770/func_80B7B18C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Um_0x80B77770/ObjUm_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Um_0x80B77770/ObjUm_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Um_0x80B77770/func_80B7B598.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Um_0x80B77770/func_80B7B598.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Um_0x80B77770/func_80B7B93C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Um_0x80B77770/func_80B7B93C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Um_0x80B77770/func_80B7BABC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Um_0x80B77770/func_80B7BABC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Um_0x80B77770/func_80B7BEA4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Um_0x80B77770/func_80B7BEA4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Um_0x80B77770/ObjUm_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Um_0x80B77770/ObjUm_Draw.asm") diff --git a/src/overlays/actors/ovl_Obj_Usiyane/z_obj_usiyane.c b/src/overlays/actors/ovl_Obj_Usiyane/z_obj_usiyane.c index d93e5dd0fd..6a2cab5ea2 100644 --- a/src/overlays/actors/ovl_Obj_Usiyane/z_obj_usiyane.c +++ b/src/overlays/actors/ovl_Obj_Usiyane/z_obj_usiyane.c @@ -23,26 +23,26 @@ const ActorInit Obj_Usiyane_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Usiyane_0x80C07C80/func_80C07C80.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Usiyane_0x80C07C80/func_80C07C80.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Usiyane_0x80C07C80/func_80C07CD0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Usiyane_0x80C07C80/func_80C07CD0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Usiyane_0x80C07C80/func_80C07DC4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Usiyane_0x80C07C80/func_80C07DC4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Usiyane_0x80C07C80/func_80C07DFC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Usiyane_0x80C07C80/func_80C07DFC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Usiyane_0x80C07C80/func_80C07F30.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Usiyane_0x80C07C80/func_80C07F30.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Usiyane_0x80C07C80/func_80C081C8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Usiyane_0x80C07C80/func_80C081C8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Usiyane_0x80C07C80/func_80C082CC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Usiyane_0x80C07C80/func_80C082CC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Usiyane_0x80C07C80/func_80C082E0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Usiyane_0x80C07C80/func_80C082E0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Usiyane_0x80C07C80/ObjUsiyane_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Usiyane_0x80C07C80/ObjUsiyane_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Usiyane_0x80C07C80/ObjUsiyane_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Usiyane_0x80C07C80/ObjUsiyane_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Usiyane_0x80C07C80/ObjUsiyane_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Usiyane_0x80C07C80/ObjUsiyane_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Usiyane_0x80C07C80/ObjUsiyane_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Usiyane_0x80C07C80/ObjUsiyane_Draw.asm") diff --git a/src/overlays/actors/ovl_Obj_Visiblock/z_obj_visiblock.c b/src/overlays/actors/ovl_Obj_Visiblock/z_obj_visiblock.c index 9092f498a2..c5d95da3d4 100644 --- a/src/overlays/actors/ovl_Obj_Visiblock/z_obj_visiblock.c +++ b/src/overlays/actors/ovl_Obj_Visiblock/z_obj_visiblock.c @@ -22,8 +22,8 @@ const ActorInit Obj_Visiblock_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Visiblock_0x80ADEA70/ObjVisiblock_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Visiblock_0x80ADEA70/ObjVisiblock_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Visiblock_0x80ADEA70/ObjVisiblock_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Visiblock_0x80ADEA70/ObjVisiblock_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Visiblock_0x80ADEA70/ObjVisiblock_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Visiblock_0x80ADEA70/ObjVisiblock_Draw.asm") diff --git a/src/overlays/actors/ovl_Obj_Vspinyroll/z_obj_vspinyroll.c b/src/overlays/actors/ovl_Obj_Vspinyroll/z_obj_vspinyroll.c index 69a8bad620..122b44d5c4 100644 --- a/src/overlays/actors/ovl_Obj_Vspinyroll/z_obj_vspinyroll.c +++ b/src/overlays/actors/ovl_Obj_Vspinyroll/z_obj_vspinyroll.c @@ -23,56 +23,56 @@ const ActorInit Obj_Vspinyroll_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Vspinyroll_0x80A3C4E0/func_80A3C4E0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Vspinyroll_0x80A3C4E0/func_80A3C4E0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Vspinyroll_0x80A3C4E0/func_80A3C560.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Vspinyroll_0x80A3C4E0/func_80A3C560.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Vspinyroll_0x80A3C4E0/func_80A3C658.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Vspinyroll_0x80A3C4E0/func_80A3C658.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Vspinyroll_0x80A3C4E0/func_80A3C6A0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Vspinyroll_0x80A3C4E0/func_80A3C6A0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Vspinyroll_0x80A3C4E0/func_80A3C6CC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Vspinyroll_0x80A3C4E0/func_80A3C6CC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Vspinyroll_0x80A3C4E0/func_80A3C700.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Vspinyroll_0x80A3C4E0/func_80A3C700.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Vspinyroll_0x80A3C4E0/func_80A3C7E8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Vspinyroll_0x80A3C4E0/func_80A3C7E8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Vspinyroll_0x80A3C4E0/func_80A3C8D8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Vspinyroll_0x80A3C4E0/func_80A3C8D8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Vspinyroll_0x80A3C4E0/func_80A3CB94.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Vspinyroll_0x80A3C4E0/func_80A3CB94.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Vspinyroll_0x80A3C4E0/func_80A3CBF0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Vspinyroll_0x80A3C4E0/func_80A3CBF0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Vspinyroll_0x80A3C4E0/func_80A3CC30.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Vspinyroll_0x80A3C4E0/func_80A3CC30.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Vspinyroll_0x80A3C4E0/func_80A3CC84.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Vspinyroll_0x80A3C4E0/func_80A3CC84.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Vspinyroll_0x80A3C4E0/ObjVspinyroll_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Vspinyroll_0x80A3C4E0/ObjVspinyroll_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Vspinyroll_0x80A3C4E0/ObjVspinyroll_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Vspinyroll_0x80A3C4E0/ObjVspinyroll_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Vspinyroll_0x80A3C4E0/func_80A3CEC4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Vspinyroll_0x80A3C4E0/func_80A3CEC4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Vspinyroll_0x80A3C4E0/func_80A3CEE0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Vspinyroll_0x80A3C4E0/func_80A3CEE0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Vspinyroll_0x80A3C4E0/func_80A3CF10.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Vspinyroll_0x80A3C4E0/func_80A3CF10.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Vspinyroll_0x80A3C4E0/func_80A3CF4C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Vspinyroll_0x80A3C4E0/func_80A3CF4C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Vspinyroll_0x80A3C4E0/func_80A3CFAC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Vspinyroll_0x80A3C4E0/func_80A3CFAC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Vspinyroll_0x80A3C4E0/func_80A3CFE0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Vspinyroll_0x80A3C4E0/func_80A3CFE0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Vspinyroll_0x80A3C4E0/func_80A3D024.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Vspinyroll_0x80A3C4E0/func_80A3D024.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Vspinyroll_0x80A3C4E0/func_80A3D038.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Vspinyroll_0x80A3C4E0/func_80A3D038.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Vspinyroll_0x80A3C4E0/func_80A3D0E8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Vspinyroll_0x80A3C4E0/func_80A3D0E8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Vspinyroll_0x80A3C4E0/func_80A3D0FC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Vspinyroll_0x80A3C4E0/func_80A3D0FC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Vspinyroll_0x80A3C4E0/ObjVspinyroll_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Vspinyroll_0x80A3C4E0/ObjVspinyroll_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Vspinyroll_0x80A3C4E0/ObjVspinyroll_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Vspinyroll_0x80A3C4E0/ObjVspinyroll_Draw.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Vspinyroll_0x80A3C4E0/func_80A3D2C0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Vspinyroll_0x80A3C4E0/func_80A3D2C0.asm") diff --git a/src/overlays/actors/ovl_Obj_Warpstone/z_obj_warpstone.c b/src/overlays/actors/ovl_Obj_Warpstone/z_obj_warpstone.c index 08115f07be..c1eec03409 100644 --- a/src/overlays/actors/ovl_Obj_Warpstone/z_obj_warpstone.c +++ b/src/overlays/actors/ovl_Obj_Warpstone/z_obj_warpstone.c @@ -23,20 +23,20 @@ const ActorInit Obj_Warpstone_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Warpstone_0x80B92B10/func_80B92B10.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Warpstone_0x80B92B10/func_80B92B10.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Warpstone_0x80B92B10/ObjWarpstone_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Warpstone_0x80B92B10/ObjWarpstone_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Warpstone_0x80B92B10/ObjWarpstone_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Warpstone_0x80B92B10/ObjWarpstone_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Warpstone_0x80B92B10/func_80B92C00.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Warpstone_0x80B92B10/func_80B92C00.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Warpstone_0x80B92B10/func_80B92C48.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Warpstone_0x80B92B10/func_80B92C48.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Warpstone_0x80B92B10/func_80B92CD0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Warpstone_0x80B92B10/func_80B92CD0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Warpstone_0x80B92B10/func_80B92DC4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Warpstone_0x80B92B10/func_80B92DC4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Warpstone_0x80B92B10/ObjWarpstone_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Warpstone_0x80B92B10/ObjWarpstone_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Warpstone_0x80B92B10/ObjWarpstone_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Warpstone_0x80B92B10/ObjWarpstone_Draw.asm") diff --git a/src/overlays/actors/ovl_Obj_Wind/z_obj_wind.c b/src/overlays/actors/ovl_Obj_Wind/z_obj_wind.c index ab5a655005..7a38242f6e 100644 --- a/src/overlays/actors/ovl_Obj_Wind/z_obj_wind.c +++ b/src/overlays/actors/ovl_Obj_Wind/z_obj_wind.c @@ -23,10 +23,10 @@ const ActorInit Obj_Wind_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Wind_0x80B23ED0/ObjWind_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Wind_0x80B23ED0/ObjWind_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Wind_0x80B23ED0/ObjWind_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Wind_0x80B23ED0/ObjWind_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Wind_0x80B23ED0/ObjWind_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Wind_0x80B23ED0/ObjWind_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Wind_0x80B23ED0/ObjWind_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Wind_0x80B23ED0/ObjWind_Draw.asm") diff --git a/src/overlays/actors/ovl_Obj_Wturn/z_obj_wturn.c b/src/overlays/actors/ovl_Obj_Wturn/z_obj_wturn.c index 8068c8a535..0faf035136 100644 --- a/src/overlays/actors/ovl_Obj_Wturn/z_obj_wturn.c +++ b/src/overlays/actors/ovl_Obj_Wturn/z_obj_wturn.c @@ -21,22 +21,22 @@ const ActorInit Obj_Wturn_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Wturn_0x808A7930/ObjWturn_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Wturn_0x808A7930/ObjWturn_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Wturn_0x808A7930/func_808A7954.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Wturn_0x808A7930/func_808A7954.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Wturn_0x808A7930/func_808A7968.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Wturn_0x808A7930/func_808A7968.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Wturn_0x808A7930/func_808A7A24.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Wturn_0x808A7930/func_808A7A24.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Wturn_0x808A7930/func_808A7A5C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Wturn_0x808A7930/func_808A7A5C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Wturn_0x808A7930/func_808A7AAC.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Wturn_0x808A7930/func_808A7AAC.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Wturn_0x808A7930/func_808A7BA0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Wturn_0x808A7930/func_808A7BA0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Wturn_0x808A7930/func_808A7C04.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Wturn_0x808A7930/func_808A7C04.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Wturn_0x808A7930/func_808A7C78.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Wturn_0x808A7930/func_808A7C78.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Wturn_0x808A7930/ObjWturn_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Wturn_0x808A7930/ObjWturn_Update.asm") diff --git a/src/overlays/actors/ovl_Obj_Y2lift/z_obj_y2lift.c b/src/overlays/actors/ovl_Obj_Y2lift/z_obj_y2lift.c index ca704d0570..fe51e93ae6 100644 --- a/src/overlays/actors/ovl_Obj_Y2lift/z_obj_y2lift.c +++ b/src/overlays/actors/ovl_Obj_Y2lift/z_obj_y2lift.c @@ -23,10 +23,10 @@ const ActorInit Obj_Y2lift_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Y2lift_0x80B9A650/ObjY2lift_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Y2lift_0x80B9A650/ObjY2lift_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Y2lift_0x80B9A650/ObjY2lift_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Y2lift_0x80B9A650/ObjY2lift_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Y2lift_0x80B9A650/ObjY2lift_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Y2lift_0x80B9A650/ObjY2lift_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Y2lift_0x80B9A650/ObjY2lift_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Y2lift_0x80B9A650/ObjY2lift_Draw.asm") diff --git a/src/overlays/actors/ovl_Obj_Y2shutter/z_obj_y2shutter.c b/src/overlays/actors/ovl_Obj_Y2shutter/z_obj_y2shutter.c index a6d4ea8e8d..b1f2737c38 100644 --- a/src/overlays/actors/ovl_Obj_Y2shutter/z_obj_y2shutter.c +++ b/src/overlays/actors/ovl_Obj_Y2shutter/z_obj_y2shutter.c @@ -23,12 +23,12 @@ const ActorInit Obj_Y2shutter_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Y2shutter_0x80B9A980/ObjY2shutter_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Y2shutter_0x80B9A980/ObjY2shutter_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Y2shutter_0x80B9A980/ObjY2shutter_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Y2shutter_0x80B9A980/ObjY2shutter_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Y2shutter_0x80B9A980/func_80B9AA20.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Y2shutter_0x80B9A980/func_80B9AA20.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Y2shutter_0x80B9A980/ObjY2shutter_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Y2shutter_0x80B9A980/ObjY2shutter_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Y2shutter_0x80B9A980/ObjY2shutter_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Y2shutter_0x80B9A980/ObjY2shutter_Draw.asm") diff --git a/src/overlays/actors/ovl_Obj_Yado/z_obj_yado.c b/src/overlays/actors/ovl_Obj_Yado/z_obj_yado.c index b23a11909e..a99361da0a 100644 --- a/src/overlays/actors/ovl_Obj_Yado/z_obj_yado.c +++ b/src/overlays/actors/ovl_Obj_Yado/z_obj_yado.c @@ -23,10 +23,10 @@ const ActorInit Obj_Yado_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Yado_0x80C161E0/ObjYado_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Yado_0x80C161E0/ObjYado_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Yado_0x80C161E0/ObjYado_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Yado_0x80C161E0/ObjYado_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Yado_0x80C161E0/ObjYado_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Yado_0x80C161E0/ObjYado_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Yado_0x80C161E0/ObjYado_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Yado_0x80C161E0/ObjYado_Draw.asm") diff --git a/src/overlays/actors/ovl_Obj_Yasi/z_obj_yasi.c b/src/overlays/actors/ovl_Obj_Yasi/z_obj_yasi.c index 19237e557e..727de0f05a 100644 --- a/src/overlays/actors/ovl_Obj_Yasi/z_obj_yasi.c +++ b/src/overlays/actors/ovl_Obj_Yasi/z_obj_yasi.c @@ -23,10 +23,10 @@ const ActorInit Obj_Yasi_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Yasi_0x80BB4AF0/ObjYasi_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Yasi_0x80BB4AF0/ObjYasi_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Yasi_0x80BB4AF0/ObjYasi_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Yasi_0x80BB4AF0/ObjYasi_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Yasi_0x80BB4AF0/ObjYasi_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Yasi_0x80BB4AF0/ObjYasi_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Obj_Yasi_0x80BB4AF0/ObjYasi_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Yasi_0x80BB4AF0/ObjYasi_Draw.asm") 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 bf45904291..75f59b521c 100644 --- a/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.c +++ b/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.c @@ -23,38 +23,38 @@ const ActorInit Object_Kankyo_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Object_Kankyo_0x808DBE80/func_808DBE80.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Object_Kankyo_0x808DBE80/func_808DBE80.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Object_Kankyo_0x808DBE80/func_808DBE8C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Object_Kankyo_0x808DBE80/func_808DBE8C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Object_Kankyo_0x808DBE80/func_808DBEB0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Object_Kankyo_0x808DBE80/func_808DBEB0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Object_Kankyo_0x808DBE80/func_808DBFB0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Object_Kankyo_0x808DBE80/func_808DBFB0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Object_Kankyo_0x808DBE80/func_808DC038.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Object_Kankyo_0x808DBE80/func_808DC038.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Object_Kankyo_0x808DBE80/ObjectKankyo_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Object_Kankyo_0x808DBE80/ObjectKankyo_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Object_Kankyo_0x808DBE80/ObjectKankyo_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Object_Kankyo_0x808DBE80/ObjectKankyo_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Object_Kankyo_0x808DBE80/func_808DC18C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Object_Kankyo_0x808DBE80/func_808DC18C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Object_Kankyo_0x808DBE80/func_808DC454.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Object_Kankyo_0x808DBE80/func_808DC454.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Object_Kankyo_0x808DBE80/func_808DCB7C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Object_Kankyo_0x808DBE80/func_808DCB7C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Object_Kankyo_0x808DBE80/func_808DCBF8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Object_Kankyo_0x808DBE80/func_808DCBF8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Object_Kankyo_0x808DBE80/func_808DCDB4.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Object_Kankyo_0x808DBE80/func_808DCDB4.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Object_Kankyo_0x808DBE80/ObjectKankyo_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Object_Kankyo_0x808DBE80/ObjectKankyo_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Object_Kankyo_0x808DBE80/ObjectKankyo_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Object_Kankyo_0x808DBE80/ObjectKankyo_Draw.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Object_Kankyo_0x808DBE80/func_808DD3C8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Object_Kankyo_0x808DBE80/func_808DD3C8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Object_Kankyo_0x808DBE80/func_808DD970.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Object_Kankyo_0x808DBE80/func_808DD970.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Object_Kankyo_0x808DBE80/func_808DDE74.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Object_Kankyo_0x808DBE80/func_808DDE74.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Object_Kankyo_0x808DBE80/func_808DDE9C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Object_Kankyo_0x808DBE80/func_808DDE9C.asm") 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 299bce5b02..97c3975746 100644 --- a/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.c +++ b/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.c @@ -23,18 +23,18 @@ const ActorInit Oceff_Spot_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Oceff_Spot_0x80972680/func_80972680.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Oceff_Spot_0x80972680/func_80972680.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Oceff_Spot_0x80972680/OceffSpot_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Oceff_Spot_0x80972680/OceffSpot_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Oceff_Spot_0x80972680/OceffSpot_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Oceff_Spot_0x80972680/OceffSpot_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Oceff_Spot_0x80972680/func_80972844.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Oceff_Spot_0x80972680/func_80972844.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Oceff_Spot_0x80972680/func_809728F8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Oceff_Spot_0x80972680/func_809728F8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Oceff_Spot_0x80972680/func_80972934.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Oceff_Spot_0x80972680/func_80972934.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Oceff_Spot_0x80972680/OceffSpot_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Oceff_Spot_0x80972680/OceffSpot_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Oceff_Spot_0x80972680/OceffSpot_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Oceff_Spot_0x80972680/OceffSpot_Draw.asm") 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 6ca51f09e2..b6cbbe27ae 100644 --- a/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.c +++ b/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.c @@ -23,20 +23,20 @@ const ActorInit Oceff_Storm_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Oceff_Storm_0x80981760/func_80981760.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Oceff_Storm_0x80981760/func_80981760.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Oceff_Storm_0x80981760/func_8098176C.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Oceff_Storm_0x80981760/func_8098176C.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Oceff_Storm_0x80981760/OceffStorm_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Oceff_Storm_0x80981760/OceffStorm_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Oceff_Storm_0x80981760/OceffStorm_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Oceff_Storm_0x80981760/OceffStorm_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Oceff_Storm_0x80981760/func_80981928.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Oceff_Storm_0x80981760/func_80981928.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Oceff_Storm_0x80981760/func_80981B48.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Oceff_Storm_0x80981760/func_80981B48.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Oceff_Storm_0x80981760/OceffStorm_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Oceff_Storm_0x80981760/OceffStorm_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Oceff_Storm_0x80981760/func_80981BB8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Oceff_Storm_0x80981760/func_80981BB8.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Oceff_Storm_0x80981760/OceffStorm_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Oceff_Storm_0x80981760/OceffStorm_Draw.asm") 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 45ae69ce19..2453cdd00d 100644 --- a/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.c +++ b/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.c @@ -23,10 +23,10 @@ const ActorInit Oceff_Wipe_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Oceff_Wipe_0x809764B0/OceffWipe_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Oceff_Wipe_0x809764B0/OceffWipe_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Oceff_Wipe_0x809764B0/OceffWipe_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Oceff_Wipe_0x809764B0/OceffWipe_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Oceff_Wipe_0x809764B0/OceffWipe_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Oceff_Wipe_0x809764B0/OceffWipe_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Oceff_Wipe_0x809764B0/OceffWipe_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Oceff_Wipe_0x809764B0/OceffWipe_Draw.asm") 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 5b1922e305..c0fc98b9cd 100644 --- a/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.c +++ b/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.c @@ -23,10 +23,10 @@ const ActorInit Oceff_Wipe2_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Oceff_Wipe2_0x80986270/OceffWipe2_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Oceff_Wipe2_0x80986270/OceffWipe2_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Oceff_Wipe2_0x80986270/OceffWipe2_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Oceff_Wipe2_0x80986270/OceffWipe2_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Oceff_Wipe2_0x80986270/OceffWipe2_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Oceff_Wipe2_0x80986270/OceffWipe2_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Oceff_Wipe2_0x80986270/OceffWipe2_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Oceff_Wipe2_0x80986270/OceffWipe2_Draw.asm") 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 b3e2a7c0d8..7169dfc7ae 100644 --- a/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.c +++ b/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.c @@ -23,10 +23,10 @@ const ActorInit Oceff_Wipe3_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Oceff_Wipe3_0x809879E0/OceffWipe3_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Oceff_Wipe3_0x809879E0/OceffWipe3_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Oceff_Wipe3_0x809879E0/OceffWipe3_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Oceff_Wipe3_0x809879E0/OceffWipe3_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Oceff_Wipe3_0x809879E0/OceffWipe3_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Oceff_Wipe3_0x809879E0/OceffWipe3_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Oceff_Wipe3_0x809879E0/OceffWipe3_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Oceff_Wipe3_0x809879E0/OceffWipe3_Draw.asm") 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 8674738aca..092b413ac1 100644 --- a/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.c +++ b/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.c @@ -23,10 +23,10 @@ const ActorInit Oceff_Wipe4_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Oceff_Wipe4_0x8099D780/OceffWipe4_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Oceff_Wipe4_0x8099D780/OceffWipe4_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Oceff_Wipe4_0x8099D780/OceffWipe4_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Oceff_Wipe4_0x8099D780/OceffWipe4_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Oceff_Wipe4_0x8099D780/OceffWipe4_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Oceff_Wipe4_0x8099D780/OceffWipe4_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Oceff_Wipe4_0x8099D780/OceffWipe4_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Oceff_Wipe4_0x8099D780/OceffWipe4_Draw.asm") diff --git a/src/overlays/actors/ovl_Oceff_Wipe5/z_oceff_wipe5.c b/src/overlays/actors/ovl_Oceff_Wipe5/z_oceff_wipe5.c index 9b17607909..60ec5f2c91 100644 --- a/src/overlays/actors/ovl_Oceff_Wipe5/z_oceff_wipe5.c +++ b/src/overlays/actors/ovl_Oceff_Wipe5/z_oceff_wipe5.c @@ -23,10 +23,10 @@ const ActorInit Oceff_Wipe5_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Oceff_Wipe5_0x80BC7AD0/OceffWipe5_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Oceff_Wipe5_0x80BC7AD0/OceffWipe5_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Oceff_Wipe5_0x80BC7AD0/OceffWipe5_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Oceff_Wipe5_0x80BC7AD0/OceffWipe5_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Oceff_Wipe5_0x80BC7AD0/OceffWipe5_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Oceff_Wipe5_0x80BC7AD0/OceffWipe5_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Oceff_Wipe5_0x80BC7AD0/OceffWipe5_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Oceff_Wipe5_0x80BC7AD0/OceffWipe5_Draw.asm") diff --git a/src/overlays/actors/ovl_Oceff_Wipe6/z_oceff_wipe6.c b/src/overlays/actors/ovl_Oceff_Wipe6/z_oceff_wipe6.c index 96f6d172cc..100fe309d5 100644 --- a/src/overlays/actors/ovl_Oceff_Wipe6/z_oceff_wipe6.c +++ b/src/overlays/actors/ovl_Oceff_Wipe6/z_oceff_wipe6.c @@ -23,10 +23,10 @@ const ActorInit Oceff_Wipe6_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Oceff_Wipe6_0x80BCA5A0/OceffWipe6_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Oceff_Wipe6_0x80BCA5A0/OceffWipe6_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Oceff_Wipe6_0x80BCA5A0/OceffWipe6_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Oceff_Wipe6_0x80BCA5A0/OceffWipe6_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Oceff_Wipe6_0x80BCA5A0/OceffWipe6_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Oceff_Wipe6_0x80BCA5A0/OceffWipe6_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Oceff_Wipe6_0x80BCA5A0/OceffWipe6_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Oceff_Wipe6_0x80BCA5A0/OceffWipe6_Draw.asm") diff --git a/src/overlays/actors/ovl_Oceff_Wipe7/z_oceff_wipe7.c b/src/overlays/actors/ovl_Oceff_Wipe7/z_oceff_wipe7.c index 91c3bb12ee..080bf4238a 100644 --- a/src/overlays/actors/ovl_Oceff_Wipe7/z_oceff_wipe7.c +++ b/src/overlays/actors/ovl_Oceff_Wipe7/z_oceff_wipe7.c @@ -23,10 +23,10 @@ const ActorInit Oceff_Wipe7_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Oceff_Wipe7_0x80BCDCB0/OceffWipe7_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Oceff_Wipe7_0x80BCDCB0/OceffWipe7_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Oceff_Wipe7_0x80BCDCB0/OceffWipe7_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Oceff_Wipe7_0x80BCDCB0/OceffWipe7_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Oceff_Wipe7_0x80BCDCB0/OceffWipe7_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Oceff_Wipe7_0x80BCDCB0/OceffWipe7_Update.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Oceff_Wipe7_0x80BCDCB0/OceffWipe7_Draw.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Oceff_Wipe7_0x80BCDCB0/OceffWipe7_Draw.asm") 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 693f8fed3b..fb745a54bc 100644 --- a/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.c +++ b/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.c @@ -22,16 +22,16 @@ const ActorInit Shot_Sun_InitVars = { }; */ -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Shot_Sun_0x80973640/ShotSun_Init.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Shot_Sun_0x80973640/ShotSun_Init.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Shot_Sun_0x80973640/ShotSun_Destroy.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Shot_Sun_0x80973640/ShotSun_Destroy.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Shot_Sun_0x80973640/func_80973740.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Shot_Sun_0x80973640/func_80973740.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Shot_Sun_0x80973640/func_80973804.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Shot_Sun_0x80973640/func_80973804.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Shot_Sun_0x80973640/func_809738D0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Shot_Sun_0x80973640/func_809738D0.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Shot_Sun_0x80973640/func_80973960.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Shot_Sun_0x80973640/func_80973960.asm") -#pragma GLOBAL_ASM("asm/non_matchings/ovl_Shot_Sun_0x80973640/ShotSun_Update.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Shot_Sun_0x80973640/ShotSun_Update.asm") diff --git a/tables/files.txt b/tables/files.txt index b936bb55f8..69a07e488c 100644 --- a/tables/files.txt +++ b/tables/files.txt @@ -1,623 +1,623 @@ -# Follows the format of (File Location, Name, Start Address, .data/.rodata Segments (Start, End Inclusive), .bss Segments) +# Follows the format of (Disassembled Location, File Location, Name, Start Address, .data/.rodata Segments (Start, End Inclusive), .bss Segments) # TODO split .data & .rodata? { - ('baserom/', 'boot', 0x80080060, ((0x800969C0, 0x800994FF),),((0x80099500,0x800A5ABF),)), - ('decomp/', 'code', 0x800A5AC0, ((0x80186028, 0x80186A6F),(0x801AAAB0, 0x801E3F9F),),((0x801E3FA0,0x807FFFFF),)), - ('decomp/', 'ovl_title', 0x80800000, ((0x80800860, 0x8080090F),),()), - ('decomp/', 'ovl_select', 0x80800910, ((0x80801C80, 0x80803DEF),),()), - ('decomp/', 'ovl_opening', 0x80803DF0, ((0x80803FC0, 0x8080400F),),()), - ('decomp/', 'ovl_file_choose', 0x80804010, ((0x80813DF0, 0x80814E7F),),((0x80814E80,0x80814EAF),)), - ('decomp/', 'ovl_daytelop', 0x80814EB0, ((0x808158E0, 0x8081609F),),()), - ('decomp/', 'ovl_kaleido_scope', 0x808160A0, ((0x8082AED0, 0x8082DA4F),),((0x8082DA50,0x8082DA8F),)), - ('decomp/', 'ovl_Player_Actor', 0x8082DA90, ((0x8085B9F0, 0x80862AEF),),((0x80862AF0,0x80862B6F),)), - ('decomp/', 'ovl_En_Test', 0x80862B70, ((0x808637B0, 0x8086386F),),()), - ('decomp/', 'ovl_En_GirlA', 0x80863870, ((0x80864A30, 0x8086536F),),()), - ('decomp/', 'ovl_En_Part', 0x80865370, ((0x808658E0, 0x8086598F),),()), - ('decomp/', 'ovl_En_Light', 0x80865990, ((0x808666B0, 0x808667FF),),()), - ('decomp/', 'ovl_En_Door', 0x80866800, ((0x808674B0, 0x80867BBF),),((0x80867BC0,0x80867BCF),)), - ('decomp/', 'ovl_En_Box', 0x80867BD0, ((0x80869B30, 0x80869D8F),),()), - ('decomp/', 'ovl_En_Pametfrog', 0x80869D90, ((0x8086D940, 0x8086DE1F),),()), - ('decomp/', 'ovl_En_Okuta', 0x8086DE20, ((0x80870870, 0x80870DAF),),()), - ('decomp/', 'ovl_En_Bom', 0x80870DB0, ((0x80872DA0, 0x8087464F),),((0x80874650,0x8087480F),)), - ('decomp/', 'ovl_En_Wallmas', 0x80874810, ((0x80876340, 0x8087666F),),()), - ('decomp/', 'ovl_En_Dodongo', 0x80876670, ((0x808790B0, 0x808796EF),),()), - ('decomp/', 'ovl_En_Firefly', 0x808796F0, ((0x8087B450, 0x8087B72F),),()), - ('decomp/', 'ovl_En_Horse', 0x8087B730, ((0x80888EC0, 0x8088A23F),),()), - ('decomp/', 'ovl_En_Arrow', 0x8088A240, ((0x8088C1C0, 0x8088C50F),),()), - ('decomp/', 'ovl_En_Elf', 0x8088C510, ((0x808909C0, 0x8089105F),),()), - ('decomp/', 'ovl_En_Niw', 0x80891060, ((0x80893460, 0x808937EF),),()), - ('decomp/', 'ovl_En_Tite', 0x808937F0, ((0x80896AB0, 0x80896F2F),),()), - ('decomp/', 'ovl_En_Peehat', 0x80896F30, ((0x80899410, 0x8089995F),),()), - ('decomp/', 'ovl_En_Holl', 0x80899960, ((0x8089A530, 0x8089A6DF),),()), - ('decomp/', 'ovl_En_Dinofos', 0x8089A6E0, ((0x8089E150, 0x8089E8DF),),()), - ('decomp/', 'ovl_En_Hata', 0x8089E8E0, ((0x8089ED10, 0x8089ED8F),),()), - ('decomp/', 'ovl_En_Zl1', 0x8089ED90, ((0x8089EDD0, 0x8089EE1F),),()), - ('decomp/', 'ovl_En_Viewer', 0x8089EE20, ((0x8089F3E0, 0x8089F4CF),),((0x8089F4D0,0x8089F4DF),)), - ('decomp/', 'ovl_En_Bubble', 0x8089F4E0, ((0x808A06E0, 0x808A08EF),),()), - ('decomp/', 'ovl_Door_Shutter', 0x808A08F0, ((0x808A2160, 0x808A24CF),),()), - ('decomp/', 'ovl_En_Boom', 0x808A24D0, ((0x808A2FF0, 0x808A31AF),),()), - ('decomp/', 'ovl_En_Torch2', 0x808A31B0, ((0x808A35B0, 0x808A366F),),()), - ('decomp/', 'ovl_En_Minifrog', 0x808A3670, ((0x808A4D20, 0x808A504F),),()), - ('decomp/', 'ovl_En_St', 0x808A5050, ((0x808A7590, 0x808A792F),),()), - ('decomp/', 'ovl_Obj_Wturn', 0x808A7930, ((0x808A7DA0, 0x808A7E2F),),()), - ('decomp/', 'ovl_En_River_Sound', 0x808A7E30, ((0x808A8040, 0x808A809F),),()), - ('decomp/', 'ovl_En_Ossan', 0x808A80A0, ((0x808AC010, 0x808AC91F),),()), - ('decomp/', 'ovl_En_Famos', 0x808AC920, ((0x808AE5E0, 0x808AE8BF),),()), - ('decomp/', 'ovl_En_Bombf', 0x808AE8C0, ((0x808AFB00, 0x808AFCCF),),()), - ('decomp/', 'ovl_En_Am', 0x808AFCD0, ((0x808B1050, 0x808B132F),),()), - ('decomp/', 'ovl_En_Dekubaba', 0x808B1330, ((0x808B4D40, 0x808B522F),),()), - ('decomp/', 'ovl_En_M_Fire1', 0x808B5230, ((0x808B5340, 0x808B53BF),),()), - ('decomp/', 'ovl_En_M_Thunder', 0x808B53C0, ((0x808B7100, 0x808B735F),),()), - ('decomp/', 'ovl_Bg_Breakwall', 0x808B7360, ((0x808B8120, 0x808B848F),),()), - ('decomp/', 'ovl_Door_Warp1', 0x808B8490, ((0x808BBB20, 0x808BBFFF),),((0x808BC000,0x808BC00F),)), - ('decomp/', 'ovl_Obj_Syokudai', 0x808BC010, ((0x808BCCA0, 0x808BCDDF),),((0x808BCDE0,0x808BCDEF),)), - ('decomp/', 'ovl_Item_B_Heart', 0x808BCDF0, ((0x808BD160, 0x808BD1DF),),()), - ('decomp/', 'ovl_En_Dekunuts', 0x808BD1E0, ((0x808BEF10, 0x808BF21F),),()), - ('decomp/', 'ovl_En_Bbfall', 0x808BF220, ((0x808C0D10, 0x808C102F),),()), - ('decomp/', 'ovl_Arms_Hook', 0x808C1030, ((0x808C1BA0, 0x808C1D3F),),()), - ('decomp/', 'ovl_En_Bb', 0x808C1D40, ((0x808C3780, 0x808C3A4F),),()), - ('decomp/', 'ovl_Bg_Keikoku_Spr', 0x808C3A50, ((0x808C3BA0, 0x808C3BFF),),()), - ('decomp/', 'ovl_En_Wood02', 0x808C3C00, ((0x808C4CE0, 0x808C4F6F),),((0x808C4F70,0x808C4F7F),)), - ('decomp/', 'ovl_En_Death', 0x808C4F80, ((0x808C98C0, 0x808CA0AF),),()), - ('decomp/', 'ovl_En_Minideath', 0x808CA0B0, ((0x808CBF30, 0x808CC24F),),((0x808CC250,0x808CC25F),)), - ('decomp/', 'ovl_En_Vm', 0x808CC260, ((0x808CD4A0, 0x808CD73F),),()), - ('decomp/', 'ovl_Demo_Effect', 0x808CD740, ((0x808CE290, 0x808CE44F),),()), - ('decomp/', 'ovl_Demo_Kankyo', 0x808CE450, ((0x808D03C0, 0x808D067F),),()), - ('decomp/', 'ovl_En_Floormas', 0x808D0680, ((0x808D3880, 0x808D3E1F),),()), - ('decomp/', 'ovl_En_Rd', 0x808D3E20, ((0x808D70C0, 0x808D754F),),()), - ('decomp/', 'ovl_Bg_F40_Flift', 0x808D7550, ((0x808D7810, 0x808D78CF),),()), - ('decomp/', 'ovl_Obj_Mure', 0x808D78D0, ((0x808D8760, 0x808D893F),),()), - ('decomp/', 'ovl_En_Sw', 0x808D8940, ((0x808DB9C0, 0x808DBE7F),),()), - ('decomp/', 'ovl_Object_Kankyo', 0x808DBE80, ((0x808DE320, 0x808DE5AF),),((0x808DE5B0,0x808DE5BF),)), - ('decomp/', 'ovl_En_Horse_Link_Child', 0x808DE5C0, ((0x808DFEA0, 0x808E019F),),()), - ('decomp/', 'ovl_Door_Ana', 0x808E01A0, ((0x808E0740, 0x808E082F),),()), - ('decomp/', 'ovl_En_Encount1', 0x808E0830, ((0x808E0DD0, 0x808E0E3F),),()), - ('decomp/', 'ovl_Demo_Tre_Lgt', 0x808E0E40, ((0x808E1490, 0x808E155F),),()), - ('decomp/', 'ovl_En_Encount2', 0x808E1560, ((0x808E1ED0, 0x808E1FDF),),()), - ('decomp/', 'ovl_En_Fire_Rock', 0x808E1FE0, ((0x808E2020, 0x808E206F),),()), - ('decomp/', 'ovl_Bg_Ctower_Rot', 0x808E2070, ((0x808E2540, 0x808E25FF),),()), - ('decomp/', 'ovl_Mir_Ray', 0x808E2600, ((0x808E3BD0, 0x808E3EEF),),()), - ('decomp/', 'ovl_En_Sb', 0x808E3EF0, ((0x808E4DF0, 0x808E4FBF),),()), - ('decomp/', 'ovl_En_Bigslime', 0x808E4FC0, ((0x808ED640, 0x808F11FF),),()), - ('decomp/', 'ovl_En_Karebaba', 0x808F1200, ((0x808F2D80, 0x808F30AF),),()), - ('decomp/', 'ovl_En_In', 0x808F30B0, ((0x808F6A40, 0x808F74AF),),()), - ('decomp/', 'ovl_En_Bom_Chu', 0x808F74B0, ((0x808F88C0, 0x808F8A9F),),()), - ('decomp/', 'ovl_En_Horse_Game_Check', 0x808F8AA0, ((0x808F9B00, 0x808F9DFF),),()), - ('decomp/', 'ovl_En_Rr', 0x808F9E00, ((0x808FC130, 0x808FC54F),),()), - ('decomp/', 'ovl_En_Fr', 0x808FC550, ((0x808FC670, 0x808FC6BF),),()), - ('decomp/', 'ovl_En_Fishing', 0x808FC6C0, ((0x8090CCB0, 0x809101AF),),((0x809101B0,0x8091728F),)), - ('decomp/', 'ovl_Obj_Oshihiki', 0x80917290, ((0x80918830, 0x80918B3F),),()), - ('decomp/', 'ovl_Eff_Dust', 0x80918B40, ((0x80919D90, 0x80919F2F),),()), - ('decomp/', 'ovl_Bg_Umajump', 0x80919F30, ((0x8091A7F0, 0x8091A89F),),()), - ('decomp/', 'ovl_En_Insect', 0x8091A8A0, ((0x8091BD60, 0x8091C09F),),()), - ('decomp/', 'ovl_En_Butte', 0x8091C0A0, ((0x8091D2D0, 0x8091D62F),),()), - ('decomp/', 'ovl_En_Fish', 0x8091D630, ((0x8091FA60, 0x8091FEEF),),()), - ('decomp/', 'ovl_Item_Etcetera', 0x8091FEF0, ((0x80920210, 0x8092033F),),()), - ('decomp/', 'ovl_Arrow_Fire', 0x80920340, ((0x80920DF0, 0x8092241F),),((0x80922420,0x8092242F),)), - ('decomp/', 'ovl_Arrow_Ice', 0x80922430, ((0x80922DB0, 0x809242EF),),((0x809242F0,0x809242FF),)), - ('decomp/', 'ovl_Arrow_Light', 0x80924300, ((0x80924C60, 0x8092619F),),((0x809261A0,0x809261AF),)), - ('decomp/', 'ovl_Obj_Kibako', 0x809261B0, ((0x80927380, 0x809275BF),),()), - ('decomp/', 'ovl_Obj_Tsubo', 0x809275C0, ((0x80929500, 0x8092990F),),()), - ('decomp/', 'ovl_En_Ik', 0x80929910, ((0x8092BFA0, 0x8092C52F),),()), - ('decomp/', 'ovl_Demo_Shd', 0x8092C530, ((0x8092C570, 0x8092C5BF),),()), - ('decomp/', 'ovl_En_Dns', 0x8092C5C0, ((0x8092DCB0, 0x8092DF8F),),()), - ('decomp/', 'ovl_Elf_Msg', 0x8092DF90, ((0x8092E450, 0x8092E50F),),()), - ('decomp/', 'ovl_En_Honotrap', 0x8092E510, ((0x809303F0, 0x809307DF),),()), - ('decomp/', 'ovl_En_Tubo_Trap', 0x809307E0, ((0x80931410, 0x8093155F),),()), - ('decomp/', 'ovl_Obj_Ice_Poly', 0x80931560, ((0x80932300, 0x8093248F),),()), - ('decomp/', 'ovl_En_Fz', 0x80932490, ((0x809346D0, 0x809349DF),),()), - ('decomp/', 'ovl_En_Kusa', 0x809349E0, ((0x809366A0, 0x80936ACF),),((0x80936AD0,0x80936CEF),)), - ('decomp/', 'ovl_Obj_Bean', 0x80936CF0, ((0x80938F80, 0x809393AF),),()), - ('decomp/', 'ovl_Obj_Bombiwa', 0x809393B0, ((0x8093A920, 0x8093ABCF),),()), - ('decomp/', 'ovl_Obj_Switch', 0x8093ABD0, ((0x8093CC60, 0x8093D3AF),),((0x8093D3B0,0x8093D3BF),)), - ('decomp/', 'ovl_Obj_Lift', 0x8093D3C0, ((0x8093DD30, 0x8093DE9F),),()), - ('decomp/', 'ovl_Obj_Hsblock', 0x8093DEA0, ((0x8093E310, 0x8093E41F),),()), - ('decomp/', 'ovl_En_Okarina_Tag', 0x8093E420, ((0x8093E810, 0x8093E89F),),()), - ('decomp/', 'ovl_En_Goroiwa', 0x8093E8A0, ((0x80942DA0, 0x809434AF),),()), - ('decomp/', 'ovl_En_Daiku', 0x809434B0, ((0x80944040, 0x809441DF),),()), - ('decomp/', 'ovl_En_Nwc', 0x809441E0, ((0x80945370, 0x809454EF),),()), - ('decomp/', 'ovl_Item_Inbox', 0x809454F0, ((0x80945600, 0x8094564F),),()), - ('decomp/', 'ovl_En_Ge1', 0x80945650, ((0x809464B0, 0x8094669F),),()), - ('decomp/', 'ovl_Obj_Blockstop', 0x809466A0, ((0x80946880, 0x809468CF),),()), - ('decomp/', 'ovl_En_Sda', 0x809468D0, ((0x80947A40, 0x80947E9F),),((0x80947EA0,0x80947F5F),)), - ('decomp/', 'ovl_En_Clear_Tag', 0x80947F60, ((0x8094AD40, 0x8094DEDF),),()), - ('decomp/', 'ovl_En_Gm', 0x8094DEE0, ((0x80951820, 0x8095261F),),()), - ('decomp/', 'ovl_En_Ms', 0x80952620, ((0x80952B80, 0x80952C4F),),()), - ('decomp/', 'ovl_En_Hs', 0x80952C50, ((0x809538F0, 0x80953A8F),),()), - ('decomp/', 'ovl_Bg_Ingate', 0x80953A90, ((0x809548A0, 0x8095495F),),()), - ('decomp/', 'ovl_En_Kanban', 0x80954960, ((0x809572E0, 0x809580BF),),()), - ('decomp/', 'ovl_En_Attack_Niw', 0x809580C0, ((0x80959100, 0x809592DF),),()), - ('decomp/', 'ovl_En_Mk', 0x809592E0, ((0x8095A240, 0x8095A50F),),()), - ('decomp/', 'ovl_En_Owl', 0x8095A510, ((0x8095D2D0, 0x8095D6DF),),()), - ('decomp/', 'ovl_En_Ishi', 0x8095D6E0, ((0x8095F690, 0x8095FB0F),),()), - ('decomp/', 'ovl_Obj_Hana', 0x8095FB10, ((0x8095FB90, 0x8095FBEF),),()), - ('decomp/', 'ovl_Obj_Lightswitch', 0x8095FBF0, ((0x80960B70, 0x80960CEF),),()), - ('decomp/', 'ovl_Obj_Mure2', 0x80960CF0, ((0x80961570, 0x809616DF),),()), - ('decomp/', 'ovl_En_Fu', 0x809616E0, ((0x80964AE0, 0x8096564F),),()), - ('decomp/', 'ovl_En_Stream', 0x80965650, ((0x80965B00, 0x80965BAF),),()), - ('decomp/', 'ovl_En_Mm', 0x80965BB0, ((0x80966320, 0x8096640F),),()), - ('decomp/', 'ovl_En_Weather_Tag', 0x80966410, ((0x809677A0, 0x809679CF),),()), - ('decomp/', 'ovl_En_Ani', 0x809679D0, ((0x80968650, 0x809687AF),),()), - ('decomp/', 'ovl_En_Js', 0x809687B0, ((0x8096AB80, 0x8096B09F),),()), - ('decomp/', 'ovl_En_Okarina_Effect', 0x8096B0A0, ((0x8096B290, 0x8096B30F),),()), - ('decomp/', 'ovl_En_Mag', 0x8096B310, ((0x8096E910, 0x8096EC3F),),()), - ('decomp/', 'ovl_Elf_Msg2', 0x8096EC40, ((0x8096F090, 0x8096F15F),),()), - ('decomp/', 'ovl_Bg_F40_Swlift', 0x8096F160, ((0x8096F510, 0x8096F5CF),),((0x8096F5D0,0x8096F5DF),)), - ('decomp/', 'ovl_En_Kakasi', 0x8096F5E0, ((0x80971D80, 0x8097234F),),()), - ('decomp/', 'ovl_Obj_Makeoshihiki', 0x80972350, ((0x80972630, 0x8097267F),),()), - ('decomp/', 'ovl_Oceff_Spot', 0x80972680, ((0x80972D80, 0x8097354F),),()), - ('decomp/', 'ovl_En_Torch', 0x80973550, ((0x809735E0, 0x8097363F),),()), - ('decomp/', 'ovl_Shot_Sun', 0x80973640, ((0x80973B80, 0x80973C4F),),()), - ('decomp/', 'ovl_Obj_Roomtimer', 0x80973C50, ((0x80973E90, 0x80973EEF),),()), - ('decomp/', 'ovl_En_Ssh', 0x80973EF0, ((0x80976010, 0x809764AF),),()), - ('decomp/', 'ovl_Oceff_Wipe', 0x809764B0, ((0x80976980, 0x809771FF),),((0x80977200,0x8097720F),)), - ('decomp/', 'ovl_Effect_Ss_Dust', 0x80977210, ((0x80977910, 0x809779FF),),()), - ('decomp/', 'ovl_Effect_Ss_Kirakira', 0x80977A00, ((0x80977FC0, 0x8097806F),),()), - ('decomp/', 'ovl_Effect_Ss_Bomb2', 0x80978070, ((0x809787F0, 0x809788CF),),()), - ('decomp/', 'ovl_Effect_Ss_Blast', 0x809788D0, ((0x80978BD0, 0x80978C2F),),()), - ('decomp/', 'ovl_Effect_Ss_G_Spk', 0x80978C30, ((0x80979130, 0x809791AF),),()), - ('decomp/', 'ovl_Effect_Ss_D_Fire', 0x809791B0, ((0x80979560, 0x809795BF),),()), - ('decomp/', 'ovl_Effect_Ss_Bubble', 0x809795C0, ((0x80979AB0, 0x80979B2F),),()), - ('decomp/', 'ovl_Effect_Ss_G_Ripple', 0x80979B30, ((0x80979FF0, 0x8097A04F),),()), - ('decomp/', 'ovl_Effect_Ss_G_Splash', 0x8097A050, ((0x8097A3E0, 0x8097A46F),),()), - ('decomp/', 'ovl_Effect_Ss_G_Fire', 0x8097A470, ((0x8097A610, 0x8097A67F),),()), - ('decomp/', 'ovl_Effect_Ss_Lightning', 0x8097A680, ((0x8097AC80, 0x8097AD5F),),()), - ('decomp/', 'ovl_Effect_Ss_Dt_Bubble', 0x8097AD60, ((0x8097B1E0, 0x8097B26F),),()), - ('decomp/', 'ovl_Effect_Ss_Hahen', 0x8097B270, ((0x8097B790, 0x8097B80F),),()), - ('decomp/', 'ovl_Effect_Ss_Stick', 0x8097B810, ((0x8097BA70, 0x8097BACF),),()), - ('decomp/', 'ovl_Effect_Ss_Sibuki', 0x8097BAD0, ((0x8097C080, 0x8097C12F),),()), - ('decomp/', 'ovl_Effect_Ss_Stone1', 0x8097C130, ((0x8097C3D0, 0x8097C48F),),()), - ('decomp/', 'ovl_Effect_Ss_Hitmark', 0x8097C490, ((0x8097C880, 0x8097C98F),),()), - ('decomp/', 'ovl_Effect_Ss_Fhg_Flash', 0x8097C990, ((0x8097CEC0, 0x8097D40F),),()), - ('decomp/', 'ovl_Effect_Ss_K_Fire', 0x8097D410, ((0x8097D7F0, 0x8097D84F),),()), - ('decomp/', 'ovl_Effect_Ss_Solder_Srch_Ball', 0x8097D850, ((0x8097DC40, 0x8097DC9F),),()), - ('decomp/', 'ovl_Effect_Ss_Kakera', 0x8097DCA0, ((0x8097EAD0, 0x8097ECCF),),()), - ('decomp/', 'ovl_Effect_Ss_Ice_Piece', 0x8097ECD0, ((0x8097F070, 0x8097F0CF),),()), - ('decomp/', 'ovl_Effect_Ss_En_Ice', 0x8097F0D0, ((0x8097F810, 0x8097F87F),),()), - ('decomp/', 'ovl_Effect_Ss_Fire_Tail', 0x8097F880, ((0x8097FED0, 0x8097FF5F),),()), - ('decomp/', 'ovl_Effect_Ss_En_Fire', 0x8097FF60, ((0x80980570, 0x809805CF),),()), - ('decomp/', 'ovl_Effect_Ss_Extra', 0x809805D0, ((0x809808E0, 0x8098093F),),()), - ('decomp/', 'ovl_Effect_Ss_Dead_Db', 0x80980940, ((0x80980CD0, 0x80980D4F),),()), - ('decomp/', 'ovl_Effect_Ss_Dead_Dd', 0x80980D50, ((0x80981270, 0x809812DF),),()), - ('decomp/', 'ovl_Effect_Ss_Dead_Ds', 0x809812E0, ((0x80981700, 0x8098175F),),()), - ('decomp/', 'ovl_Oceff_Storm', 0x80981760, ((0x80981F70, 0x8098351F),),()), - ('decomp/', 'ovl_Obj_Demo', 0x80983520, ((0x80983890, 0x809838EF),),()), - ('decomp/', 'ovl_En_Minislime', 0x809838F0, ((0x809857C0, 0x80985C3F),),()), - ('decomp/', 'ovl_En_Nutsball', 0x80985C40, ((0x809861D0, 0x8098626F),),()), - ('decomp/', 'ovl_Oceff_Wipe2', 0x80986270, ((0x80986670, 0x809879CF),),((0x809879D0,0x809879DF),)), - ('decomp/', 'ovl_Oceff_Wipe3', 0x809879E0, ((0x80987DF0, 0x8098912F),),((0x80989130,0x8098913F),)), - ('decomp/', 'ovl_En_Dg', 0x80989140, ((0x8098C280, 0x8098CA1F),),()), - ('decomp/', 'ovl_En_Si', 0x8098CA20, ((0x8098CD60, 0x8098CE3F),),()), - ('decomp/', 'ovl_Obj_Comb', 0x8098CE40, ((0x8098E420, 0x8098E5BF),),()), - ('decomp/', 'ovl_Obj_Kibako2', 0x8098E5C0, ((0x8098EE40, 0x8098EF5F),),()), - ('decomp/', 'ovl_En_Hs2', 0x8098EF60, ((0x8098EFF0, 0x8098F03F),),()), - ('decomp/', 'ovl_Obj_Mure3', 0x8098F040, ((0x8098F720, 0x8098F7FF),),()), - ('decomp/', 'ovl_En_Tg', 0x8098F800, ((0x809901A0, 0x8099030F),),()), - ('decomp/', 'ovl_En_Wf', 0x80990310, ((0x80994150, 0x809947AF),),()), - ('decomp/', 'ovl_En_Skb', 0x809947B0, ((0x80997330, 0x80997A8F),),()), - ('decomp/', 'ovl_En_Gs', 0x80997A90, ((0x8099A380, 0x8099A91F),),()), - ('decomp/', 'ovl_Obj_Sound', 0x8099A920, ((0x8099AAE0, 0x8099AB2F),),()), - ('decomp/', 'ovl_En_Crow', 0x8099AB30, ((0x8099C050, 0x8099C28F),),()), - ('decomp/', 'ovl_En_Cow', 0x8099C290, ((0x8099D5F0, 0x8099D77F),),()), - ('decomp/', 'ovl_Oceff_Wipe4', 0x8099D780, ((0x8099DB90, 0x8099E77F),),((0x8099E780,0x8099E78F),)), - ('decomp/', 'ovl_En_Zo', 0x8099E790, ((0x8099F490, 0x8099F72F),),()), - ('decomp/', 'ovl_Effect_Ss_Ice_Smoke', 0x8099F730, ((0x8099F9E0, 0x8099FA3F),),()), - ('decomp/', 'ovl_Obj_Makekinsuta', 0x8099FA40, ((0x8099FE10, 0x8099FEAF),),()), - ('decomp/', 'ovl_En_Ge3', 0x8099FEB0, ((0x809A0D80, 0x809A0F1F),),()), - ('decomp/', 'ovl_Obj_Hamishi', 0x809A0F20, ((0x809A1A80, 0x809A1BAF),),()), - ('decomp/', 'ovl_En_Zl4', 0x809A1BB0, ((0x809A1F60, 0x809A202F),),()), - ('decomp/', 'ovl_En_Mm2', 0x809A2030, ((0x809A2250, 0x809A2B5F),),()), - ('decomp/', 'ovl_Door_Spiral', 0x809A2B60, ((0x809A3230, 0x809A33DF),),()), - ('decomp/', 'ovl_Obj_Pzlblock', 0x809A33E0, ((0x809A4030, 0x809A41BF),),()), - ('decomp/', 'ovl_Obj_Toge', 0x809A41C0, ((0x809A4C90, 0x809A4DFF),),()), - ('decomp/', 'ovl_Obj_Armos', 0x809A4E00, ((0x809A5B90, 0x809A5D0F),),()), - ('decomp/', 'ovl_Obj_Boyo', 0x809A5D10, ((0x809A6150, 0x809A627F),),()), - ('decomp/', 'ovl_En_Grasshopper', 0x809A6280, ((0x809A8C80, 0x809A910F),),()), - ('decomp/', 'ovl_Obj_Grass', 0x809A9110, ((0x809AA9F0, 0x809AAD9F),),((0x809AADA0,0x809AAE5F),)), - ('decomp/', 'ovl_Obj_Grass_Carry', 0x809AAE60, ((0x809ABBB0, 0x809ABDDF),),()), - ('decomp/', 'ovl_Obj_Grass_Unit', 0x809ABDE0, ((0x809AC340, 0x809AC4AF),),()), - ('decomp/', 'ovl_Bg_Fire_Wall', 0x809AC4B0, ((0x809ACC40, 0x809ACD8F),),()), - ('decomp/', 'ovl_En_Bu', 0x809ACD90, ((0x809ACED0, 0x809ACF3F),),()), - ('decomp/', 'ovl_En_Encount3', 0x809ACF40, ((0x809AD7F0, 0x809AD8DF),),()), - ('decomp/', 'ovl_En_Jso', 0x809AD8E0, ((0x809B0F40, 0x809B154F),),()), - ('decomp/', 'ovl_Obj_Chikuwa', 0x809B1550, ((0x809B1FA0, 0x809B20EF),),()), - ('decomp/', 'ovl_En_Knight', 0x809B20F0, ((0x809BDAF0, 0x809BEFCF),),((0x809BEFD0,0x809C075F),)), - ('decomp/', 'ovl_En_Warp_tag', 0x809C0760, ((0x809C0FE0, 0x809C10AF),),()), - ('decomp/', 'ovl_En_Aob_01', 0x809C10B0, ((0x809C3770, 0x809C3D7F),),()), - ('decomp/', 'ovl_En_Boj_01', 0x809C3D80, ((0x809C3DC0, 0x809C3E0F),),()), - ('decomp/', 'ovl_En_Boj_02', 0x809C3E10, ((0x809C3E50, 0x809C3E9F),),()), - ('decomp/', 'ovl_En_Boj_03', 0x809C3EA0, ((0x809C3EE0, 0x809C3F2F),),()), - ('decomp/', 'ovl_En_Encount4', 0x809C3F30, ((0x809C46B0, 0x809C478F),),()), - ('decomp/', 'ovl_En_Bom_Bowl_Man', 0x809C4790, ((0x809C6100, 0x809C64BF),),()), - ('decomp/', 'ovl_En_Syateki_Man', 0x809C64C0, ((0x809C9160, 0x809C9A5F),),()), - ('decomp/', 'ovl_Bg_Icicle', 0x809C9A60, ((0x809CA2B0, 0x809CA3EF),),()), - ('decomp/', 'ovl_En_Syateki_Crow', 0x809CA3F0, ((0x809CB050, 0x809CB1FF),),()), - ('decomp/', 'ovl_En_Boj_04', 0x809CB200, ((0x809CB240, 0x809CB28F),),()), - ('decomp/', 'ovl_En_Cne_01', 0x809CB290, ((0x809CBEE0, 0x809CC05F),),()), - ('decomp/', 'ovl_En_Bba_01', 0x809CC060, ((0x809CCC60, 0x809CCDDF),),()), - ('decomp/', 'ovl_En_Bji_01', 0x809CCDE0, ((0x809CDC30, 0x809CDEBF),),()), - ('decomp/', 'ovl_Bg_Spdweb', 0x809CDEC0, ((0x809CF060, 0x809CF34F),),()), - ('decomp/', 'ovl_En_Mt_tag', 0x809CF350, ((0x809D0190, 0x809D052F),),()), - ('decomp/', 'ovl_Boss_01', 0x809D0530, ((0x809D7980, 0x809D8A0F),),((0x809D8A10,0x809DA1CF),)), - ('decomp/', 'ovl_Boss_02', 0x809DA1D0, ((0x809DF550, 0x809E041F),),((0x809E0420,0x809E275F),)), - ('decomp/', 'ovl_Boss_03', 0x809E2760, ((0x809E8EA0, 0x809E983F),),((0x809E9840,0x809EC03F),)), - ('decomp/', 'ovl_Boss_04', 0x809EC040, ((0x809EE150, 0x809EE4CF),),((0x809EE4D0,0x809EE4DF),)), - ('decomp/', 'ovl_Boss_05', 0x809EE4E0, ((0x809F1A20, 0x809F210F),),((0x809F2110,0x809F211F),)), - ('decomp/', 'ovl_Boss_06', 0x809F2120, ((0x809F4080, 0x809F436F),),((0x809F4370,0x809F497F),)), - ('decomp/', 'ovl_Boss_07', 0x809F4980, ((0x80A07950, 0x80A09A3F),),((0x80A09A40,0x80A0A89F),)), - ('decomp/', 'ovl_Bg_Dy_Yoseizo', 0x80A0A8A0, ((0x80A0C4A0, 0x80A0C77F),),()), - ('decomp/', 'ovl_En_Boj_05', 0x80A0C780, ((0x80A0C7C0, 0x80A0C80F),),()), - ('decomp/', 'ovl_En_Sob1', 0x80A0C810, ((0x80A10860, 0x80A10FCF),),()), - ('decomp/', 'ovl_En_Go', 0x80A10FD0, ((0x80A16100, 0x80A16D3F),),()), - ('decomp/', 'ovl_En_Raf', 0x80A16D40, ((0x80A18EC0, 0x80A1973F),),()), - ('decomp/', 'ovl_Obj_Funen', 0x80A19740, ((0x80A198B0, 0x80A1990F),),()), - ('decomp/', 'ovl_Obj_Raillift', 0x80A19910, ((0x80A1A390, 0x80A1A4FF),),()), - ('decomp/', 'ovl_Bg_Numa_Hana', 0x80A1A500, ((0x80A1B240, 0x80A1B3CF),),()), - ('decomp/', 'ovl_Obj_Flowerpot', 0x80A1B3D0, ((0x80A1D380, 0x80A1D82F),),((0x80A1D830,0x80A1DA4F),)), - ('decomp/', 'ovl_Obj_Spinyroll', 0x80A1DA50, ((0x80A1F020, 0x80A1F40F),),()), - ('decomp/', 'ovl_Dm_Hina', 0x80A1F410, ((0x80A1FDB0, 0x80A1FE4F),),()), - ('decomp/', 'ovl_En_Syateki_Wf', 0x80A1FE50, ((0x80A20E50, 0x80A2114F),),()), - ('decomp/', 'ovl_Obj_Skateblock', 0x80A21150, ((0x80A229F0, 0x80A22D3F),),()), - ('decomp/', 'ovl_Effect_En_Ice_Block', 0x80A22D40, ((0x80A23020, 0x80A2308F),),()), - ('decomp/', 'ovl_Obj_Iceblock', 0x80A23090, ((0x80A26E30, 0x80A2751F),),()), - ('decomp/', 'ovl_En_Bigpamet', 0x80A27520, ((0x80A296E0, 0x80A29A7F),),()), - ('decomp/', 'ovl_Bg_Dblue_Movebg', 0x80A29A80, ((0x80A2B870, 0x80A2BBEF),),((0x80A2BBF0,0x80A2BBFF),)), - ('decomp/', 'ovl_En_Syateki_Dekunuts', 0x80A2BC00, ((0x80A2CA90, 0x80A2CD0F),),()), - ('decomp/', 'ovl_Elf_Msg3', 0x80A2CD10, ((0x80A2D1C0, 0x80A2D27F),),()), - ('decomp/', 'ovl_En_Fg', 0x80A2D280, ((0x80A2E4E0, 0x80A2E79F),),()), - ('decomp/', 'ovl_Dm_Ravine', 0x80A2E7A0, ((0x80A2E910, 0x80A2E95F),),()), - ('decomp/', 'ovl_Dm_Sa', 0x80A2E960, ((0x80A2ECE0, 0x80A2ED9F),),()), - ('decomp/', 'ovl_En_Slime', 0x80A2EDA0, ((0x80A31AD0, 0x80A321FF),),((0x80A32200,0x80A3220F),)), - ('decomp/', 'ovl_En_Pr', 0x80A32210, ((0x80A338A0, 0x80A33AFF),),()), - ('decomp/', 'ovl_Obj_Toudai', 0x80A33B00, ((0x80A34570, 0x80A346FF),),()), - ('decomp/', 'ovl_Obj_Entotu', 0x80A34700, ((0x80A353F0, 0x80A3550F),),()), - ('decomp/', 'ovl_Obj_Bell', 0x80A35510, ((0x80A35E70, 0x80A35FEF),),()), - ('decomp/', 'ovl_En_Syateki_Okuta', 0x80A35FF0, ((0x80A37550, 0x80A37ECF),),()), - ('decomp/', 'ovl_Obj_Shutter', 0x80A37ED0, ((0x80A38110, 0x80A3818F),),()), - ('decomp/', 'ovl_Dm_Zl', 0x80A38190, ((0x80A387D0, 0x80A3899F),),()), - ('decomp/', 'ovl_En_Ru', 0x80A389A0, ((0x80A39430, 0x80A396AF),),()), - ('decomp/', 'ovl_En_Elfgrp', 0x80A396B0, ((0x80A3AAD0, 0x80A3AC5F),),()), - ('decomp/', 'ovl_Dm_Tsg', 0x80A3AC60, ((0x80A3B010, 0x80A3B07F),),()), - ('decomp/', 'ovl_En_Baguo', 0x80A3B080, ((0x80A3C2D0, 0x80A3C4DF),),()), - ('decomp/', 'ovl_Obj_Vspinyroll', 0x80A3C4E0, ((0x80A3D430, 0x80A3D67F),),()), - ('decomp/', 'ovl_Obj_Smork', 0x80A3D680, ((0x80A3E270, 0x80A3E38F),),()), - ('decomp/', 'ovl_En_Test2', 0x80A3E390, ((0x80A3E690, 0x80A3E7DF),),()), - ('decomp/', 'ovl_En_Test3', 0x80A3E7E0, ((0x80A41530, 0x80A41D1F),),((0x80A41D20,0x80A41D6F),)), - ('decomp/', 'ovl_En_Test4', 0x80A41D70, ((0x80A43320, 0x80A434CF),),((0x80A434D0,0x80A434DF),)), - ('decomp/', 'ovl_En_Bat', 0x80A434E0, ((0x80A449E0, 0x80A44C6F),),((0x80A44C70,0x80A44C7F),)), - ('decomp/', 'ovl_En_Sekihi', 0x80A44C80, ((0x80A45250, 0x80A4535F),),()), - ('decomp/', 'ovl_En_Wiz', 0x80A45360, ((0x80A48B30, 0x80A48FDF),),()), - ('decomp/', 'ovl_En_Wiz_Brock', 0x80A48FE0, ((0x80A495B0, 0x80A4969F),),()), - ('decomp/', 'ovl_En_Wiz_Fire', 0x80A496A0, ((0x80A4C1C0, 0x80A4C48F),),()), - ('decomp/', 'ovl_Eff_Change', 0x80A4C490, ((0x80A4C900, 0x80A4C9AF),),()), - ('decomp/', 'ovl_Dm_Statue', 0x80A4C9B0, ((0x80A4CA40, 0x80A4CA8F),),()), - ('decomp/', 'ovl_Obj_Fireshield', 0x80A4CA90, ((0x80A4D800, 0x80A4D9EF),),()), - ('decomp/', 'ovl_Bg_Ladder', 0x80A4D9F0, ((0x80A4DE20, 0x80A4DECF),),()), - ('decomp/', 'ovl_En_Mkk', 0x80A4DED0, ((0x80A4F700, 0x80A4FA3F),),()), - ('decomp/', 'ovl_Demo_Getitem', 0x80A4FA40, ((0x80A4FD40, 0x80A4FDCF),),()), - ('decomp/', 'ovl_En_Dnb', 0x80A4FDD0, ((0x80A50C90, 0x80A50D3F),),()), - ('decomp/', 'ovl_En_Dnh', 0x80A50D40, ((0x80A51250, 0x80A514EF),),()), - ('decomp/', 'ovl_En_Dnk', 0x80A514F0, ((0x80A521A0, 0x80A5252F),),()), - ('decomp/', 'ovl_En_Dnq', 0x80A52530, ((0x80A53400, 0x80A537CF),),()), - ('decomp/', 'ovl_Bg_Keikoku_Saku', 0x80A537D0, ((0x80A53B50, 0x80A53BDF),),()), - ('decomp/', 'ovl_Obj_Hugebombiwa', 0x80A53BE0, ((0x80A55CE0, 0x80A560BF),),()), - ('decomp/', 'ovl_En_Firefly2', 0x80A560C0, ((0x80A56100, 0x80A5614F),),()), - ('decomp/', 'ovl_En_Rat', 0x80A56150, ((0x80A583E0, 0x80A5879F),),()), - ('decomp/', 'ovl_En_Water_Effect', 0x80A587A0, ((0x80A5AF90, 0x80A5B15F),),()), - ('decomp/', 'ovl_En_Kusa2', 0x80A5B160, ((0x80A5EAA0, 0x80A5F1BF),),((0x80A5F1C0,0x80A60B1F),)), - ('decomp/', 'ovl_Bg_Spout_Fire', 0x80A60B20, ((0x80A61140, 0x80A612AF),),()), - ('decomp/', 'ovl_En_Dy_Extra', 0x80A612B0, ((0x80A61720, 0x80A6180F),),()), - ('decomp/', 'ovl_En_Bal', 0x80A61810, ((0x80A63CC0, 0x80A6449F),),()), - ('decomp/', 'ovl_En_Ginko_Man', 0x80A644A0, ((0x80A65D40, 0x80A6617F),),()), - ('decomp/', 'ovl_En_Warp_Uzu', 0x80A66180, ((0x80A664A0, 0x80A6656F),),()), - ('decomp/', 'ovl_Obj_Driftice', 0x80A66570, ((0x80A67600, 0x80A678AF),),()), - ('decomp/', 'ovl_En_Look_Nuts', 0x80A678B0, ((0x80A685E0, 0x80A6879F),),()), - ('decomp/', 'ovl_En_Mushi2', 0x80A687A0, ((0x80A6B930, 0x80A6BF8F),),()), - ('decomp/', 'ovl_En_Fall', 0x80A6BF90, ((0x80A6E490, 0x80A6E98F),),((0x80A6E990,0x80A6F09F),)), - ('decomp/', 'ovl_En_Mm3', 0x80A6F0A0, ((0x80A703D0, 0x80A706EF),),()), - ('decomp/', 'ovl_Bg_Crace_Movebg', 0x80A706F0, ((0x80A71080, 0x80A711AF),),((0x80A711B0,0x80A711CF),)), - ('decomp/', 'ovl_En_Dno', 0x80A711D0, ((0x80A739A0, 0x80A73F9F),),()), - ('decomp/', 'ovl_En_Pr2', 0x80A73FA0, ((0x80A75BC0, 0x80A75DBF),),()), - ('decomp/', 'ovl_En_Prz', 0x80A75DC0, ((0x80A771C0, 0x80A773BF),),()), - ('decomp/', 'ovl_En_Jso2', 0x80A773C0, ((0x80A7B4F0, 0x80A7BC6F),),()), - ('decomp/', 'ovl_Obj_Etcetera', 0x80A7BC70, ((0x80A7C770, 0x80A7C98F),),()), - ('decomp/', 'ovl_En_Egol', 0x80A7C990, ((0x80A80C40, 0x80A811CF),),()), - ('decomp/', 'ovl_Obj_Mine', 0x80A811D0, ((0x80A84550, 0x80A849CF),),((0x80A849D0,0x80A84CCF),)), - ('decomp/', 'ovl_Obj_Purify', 0x80A84CD0, ((0x80A85460, 0x80A8561F),),()), - ('decomp/', 'ovl_En_Tru', 0x80A85620, ((0x80A88910, 0x80A8B76F),),()), - ('decomp/', 'ovl_En_Trt', 0x80A8B770, ((0x80A8FE10, 0x80A903AF),),()), - ('decomp/', 'ovl_En_Test5', 0x80A903B0, ((0x80A906E0, 0x80A9072F),),()), - ('decomp/', 'ovl_En_Test6', 0x80A90730, ((0x80A93E60, 0x80A9490F),),((0x80A94910,0x80A94A2F),)), - ('decomp/', 'ovl_En_Az', 0x80A94A30, ((0x80A99010, 0x80A99E7F),),((0x80A99E80,0x80A99E9F),)), - ('decomp/', 'ovl_En_Estone', 0x80A99EA0, ((0x80A9AB50, 0x80A9ACCF),),()), - ('decomp/', 'ovl_Bg_Hakugin_Post', 0x80A9ACD0, ((0x80A9D860, 0x80A9DDBF),),((0x80A9DDC0,0x80A9F94F),)), - ('decomp/', 'ovl_Dm_Opstage', 0x80A9F950, ((0x80A9FD10, 0x80A9FDAF),),()), - ('decomp/', 'ovl_Dm_Stk', 0x80A9FDB0, ((0x80AA3580, 0x80AA557F),),()), - ('decomp/', 'ovl_Dm_Char00', 0x80AA5580, ((0x80AA6F90, 0x80AA81DF),),()), - ('decomp/', 'ovl_Dm_Char01', 0x80AA81E0, ((0x80AA9DC0, 0x80AAAE1F),),((0x80AAAE20,0x80AAAE2F),)), - ('decomp/', 'ovl_Dm_Char02', 0x80AAAE30, ((0x80AAB390, 0x80AAB49F),),()), - ('decomp/', 'ovl_Dm_Char03', 0x80AAB4A0, ((0x80AABB60, 0x80AABC3F),),()), - ('decomp/', 'ovl_Dm_Char04', 0x80AABC40, ((0x80AAC440, 0x80AAC59F),),()), - ('decomp/', 'ovl_Dm_Char05', 0x80AAC5A0, ((0x80AAE240, 0x80AAE67F),),()), - ('decomp/', 'ovl_Dm_Char06', 0x80AAE680, ((0x80AAE960, 0x80AAE9BF),),()), - ('decomp/', 'ovl_Dm_Char07', 0x80AAE9C0, ((0x80AAEFF0, 0x80AAF04F),),()), - ('decomp/', 'ovl_Dm_Char08', 0x80AAF050, ((0x80AB1370, 0x80AB1E0F),),()), - ('decomp/', 'ovl_Dm_Char09', 0x80AB1E10, ((0x80AB2690, 0x80AB278F),),()), - ('decomp/', 'ovl_Obj_Tokeidai', 0x80AB2790, ((0x80AB49C0, 0x80AB4D0F),),()), - ('decomp/', 'ovl_En_Mnk', 0x80AB4D10, ((0x80AB9CF0, 0x80ABA79F),),()), - ('decomp/', 'ovl_En_Egblock', 0x80ABA7A0, ((0x80ABB040, 0x80ABB0DF),),()), - ('decomp/', 'ovl_En_Guard_Nuts', 0x80ABB0E0, ((0x80ABBDD0, 0x80ABBFBF),),()), - ('decomp/', 'ovl_Bg_Hakugin_Bombwall', 0x80ABBFC0, ((0x80ABCF60, 0x80ABD1CF),),()), - ('decomp/', 'ovl_Obj_Tokei_Tobira', 0x80ABD1D0, ((0x80ABD730, 0x80ABD82F),),()), - ('decomp/', 'ovl_Bg_Hakugin_Elvpole', 0x80ABD830, ((0x80ABDC50, 0x80ABDC9F),),()), - ('decomp/', 'ovl_En_Ma4', 0x80ABDCA0, ((0x80AC0090, 0x80AC082F),),()), - ('decomp/', 'ovl_En_Twig', 0x80AC0830, ((0x80AC1090, 0x80AC122F),),((0x80AC1230,0x80AC126F),)), - ('decomp/', 'ovl_En_Po_Fusen', 0x80AC1270, ((0x80AC1D80, 0x80AC1ECF),),()), - ('decomp/', 'ovl_En_Door_Etc', 0x80AC1ED0, ((0x80AC2580, 0x80AC26EF),),()), - ('decomp/', 'ovl_En_Bigokuta', 0x80AC26F0, ((0x80AC4510, 0x80AC48EF),),()), - ('decomp/', 'ovl_Bg_Icefloe', 0x80AC48F0, ((0x80AC4F10, 0x80AC505F),),((0x80AC5060,0x80AC506F),)), - ('decomp/', '385_0x00cfc450', 0x80AC5070, ((0x80AC5630, 0x80AC57AF),),()), - ('decomp/', '386_0x00cfc970', 0x80AC57B0, ((0x80AC5C20, 0x80AC673F),),()), - ('decomp/', '387_0x00cfd400', 0x80AC6740, ((0x80AC6C60, 0x80AC842F),),()), - ('decomp/', '388_0x00cfdf10', 0x80AC8430, ((0x80AC8650, 0x80AC86EF),),()), - ('decomp/', '389_0x00cfe150', 0x80AC86F0, ((0x80AC8AB0, 0x80AC8B4F),),()), - ('decomp/', 'ovl_Effect_Ss_Sbn', 0x80AC8B50, ((0x80AC93B0, 0x80AC94BF),),()), - ('decomp/', 'ovl_Obj_Ocarinalift', 0x80AC94C0, ((0x80AC9D50, 0x80AC9E9F),),()), - ('decomp/', 'ovl_En_Time_Tag', 0x80AC9EA0, ((0x80ACA9D0, 0x80ACAB0F),),()), - ('decomp/', 'ovl_Bg_Open_Shutter', 0x80ACAB10, ((0x80ACB120, 0x80ACB1DF),),()), - ('decomp/', 'ovl_Bg_Open_Spot', 0x80ACB1E0, ((0x80ACB390, 0x80ACB3FF),),()), - ('decomp/', 'ovl_Bg_Fu_Kaiten', 0x80ACB400, ((0x80ACB630, 0x80ACB69F),),()), - ('decomp/', 'ovl_Obj_Aqua', 0x80ACB6A0, ((0x80ACC2A0, 0x80ACC46F),),()), - ('decomp/', 'ovl_En_Elforg', 0x80ACC470, ((0x80ACDA10, 0x80ACDCCF),),()), - ('decomp/', 'ovl_En_Elfbub', 0x80ACDCD0, ((0x80ACE250, 0x80ACE32F),),()), - ('decomp/', 'ovl_En_Fu_Mato', 0x80ACE330, ((0x80ACF5F0, 0x80ACF77F),),()), - ('decomp/', 'ovl_En_Fu_Kago', 0x80ACF780, ((0x80AD05D0, 0x80AD082F),),()), - ('decomp/', 'ovl_En_Osn', 0x80AD0830, ((0x80AD22A0, 0x80AD2B6F),),()), - ('decomp/', 'ovl_Bg_Ctower_Gear', 0x80AD2B70, ((0x80AD3250, 0x80AD337F),),()), - ('decomp/', 'ovl_En_Trt2', 0x80AD3380, ((0x80AD57E0, 0x80AD5BAF),),()), - ('decomp/', 'ovl_Obj_Tokei_Step', 0x80AD5BB0, ((0x80AD6600, 0x80AD675F),),()), - ('decomp/', 'ovl_Bg_Lotus', 0x80AD6760, ((0x80AD6CF0, 0x80AD6DCF),),()), - ('decomp/', 'ovl_En_Kame', 0x80AD6DD0, ((0x80AD8DC0, 0x80AD923F),),()), - ('decomp/', 'ovl_Obj_Takaraya_Wall', 0x80AD9240, ((0x80ADA280, 0x80ADA44F),),((0x80ADA450,0x80ADAAEF),)), - ('decomp/', 'ovl_Bg_Fu_Mizu', 0x80ADAAF0, ((0x80ADAD80, 0x80ADADCF),),()), - ('decomp/', 'ovl_En_Sellnuts', 0x80ADADD0, ((0x80ADD910, 0x80ADE22F),),()), - ('decomp/', 'ovl_Bg_Dkjail_Ivy', 0x80ADE230, ((0x80ADE930, 0x80ADEA6F),),()), - ('decomp/', 'ovl_Obj_Visiblock', 0x80ADEA70, ((0x80ADEB30, 0x80ADEB8F),),()), - ('decomp/', 'ovl_En_Takaraya', 0x80ADEB90, ((0x80ADFAE0, 0x80ADFC9F),),()), - ('decomp/', 'ovl_En_Tsn', 0x80ADFCA0, ((0x80AE1170, 0x80AE164F),),()), - ('decomp/', 'ovl_En_Ds2n', 0x80AE1650, ((0x80AE1AB0, 0x80AE1B6F),),()), - ('decomp/', 'ovl_En_Fsn', 0x80AE1B70, ((0x80AE5B00, 0x80AE612F),),()), - ('decomp/', 'ovl_En_Shn', 0x80AE6130, ((0x80AE6F00, 0x80AE739F),),()), - ('decomp/', 'ovl_En_Stop_heishi', 0x80AE73A0, ((0x80AE8890, 0x80AE8B6F),),()), - ('decomp/', 'ovl_Obj_Bigicicle', 0x80AE8B70, ((0x80AE9800, 0x80AE9A1F),),()), - ('decomp/', 'ovl_En_Lift_Nuts', 0x80AE9A20, ((0x80AEBD30, 0x80AEC45F),),()), - ('decomp/', 'ovl_En_Tk', 0x80AEC460, ((0x80AEF800, 0x80AF004F),),((0x80AF0050,0x80AF005F),)), - ('decomp/', 'ovl_Bg_Market_Step', 0x80AF0060, ((0x80AF00F0, 0x80AF016F),),()), - ('decomp/', 'ovl_Obj_Lupygamelift', 0x80AF0170, ((0x80AF0720, 0x80AF081F),),()), - ('decomp/', 'ovl_En_Test7', 0x80AF0820, ((0x80AF33F0, 0x80AF38AF),),((0x80AF38B0,0x80AF390F),)), - ('decomp/', 'ovl_Obj_Lightblock', 0x80AF3910, ((0x80AF3E80, 0x80AF3F6F),),()), - ('decomp/', 'ovl_Mir_Ray2', 0x80AF3F70, ((0x80AF4330, 0x80AF43EF),),()), - ('decomp/', 'ovl_En_Wdhand', 0x80AF43F0, ((0x80AF63C0, 0x80AF675F),),()), - ('decomp/', 'ovl_En_Gamelupy', 0x80AF6760, ((0x80AF6CD0, 0x80AF6DDF),),()), - ('decomp/', 'ovl_Bg_Danpei_Movebg', 0x80AF6DE0, ((0x80AF7510, 0x80AF763F),),()), - ('decomp/', 'ovl_En_Snowwd', 0x80AF7640, ((0x80AF7A70, 0x80AF7B3F),),()), - ('decomp/', 'ovl_En_Pm', 0x80AF7B40, ((0x80AFAD80, 0x80AFC95F),),()), - ('decomp/', 'ovl_En_Gakufu', 0x80AFC960, ((0x80AFD1B0, 0x80AFD37F),),()), - ('decomp/', 'ovl_Elf_Msg4', 0x80AFD380, ((0x80AFD8D0, 0x80AFD98F),),()), - ('decomp/', 'ovl_Elf_Msg5', 0x80AFD990, ((0x80AFDBB0, 0x80AFDC3F),),()), - ('decomp/', 'ovl_En_Col_Man', 0x80AFDC40, ((0x80AFE730, 0x80AFE89F),),()), - ('decomp/', 'ovl_En_Talk_Gibud', 0x80AFE8A0, ((0x80B011E0, 0x80B0198F),),()), - ('decomp/', 'ovl_En_Giant', 0x80B01990, ((0x80B02930, 0x80B02CCF),),()), - ('decomp/', 'ovl_Obj_Snowball', 0x80B02CD0, ((0x80B04F30, 0x80B0528F),),()), - ('decomp/', 'ovl_Boss_Hakugin', 0x80B05290, ((0x80B0E6E0, 0x80B0F5DF),),()), - ('decomp/', 'ovl_En_Gb2', 0x80B0F5E0, ((0x80B11990, 0x80B11E5F),),()), - ('decomp/', 'ovl_En_Onpuman', 0x80B11E60, ((0x80B12370, 0x80B1242F),),()), - ('decomp/', 'ovl_Bg_Tobira01', 0x80B12430, ((0x80B12800, 0x80B1286F),),()), - ('decomp/', 'ovl_En_Tag_Obj', 0x80B12870, ((0x80B12900, 0x80B1297F),),()), - ('decomp/', 'ovl_Obj_Dhouse', 0x80B12980, ((0x80B13E70, 0x80B1417F),),()), - ('decomp/', 'ovl_Obj_Hakaisi', 0x80B14180, ((0x80B15590, 0x80B1578F),),()), - ('decomp/', 'ovl_Bg_Hakugin_Switch', 0x80B15790, ((0x80B16840, 0x80B16AEF),),((0x80B16AF0,0x80B16AFF),)), - ('decomp/', 'ovl_En_Snowman', 0x80B16B00, ((0x80B199E0, 0x80B19F5F),),()), - ('decomp/', 'ovl_TG_Sw', 0x80B19F60, ((0x80B1A320, 0x80B1A3AF),),()), - ('decomp/', 'ovl_En_Po_Sisters', 0x80B1A3B0, ((0x80B1DA30, 0x80B1DEAF),),()), - ('decomp/', 'ovl_En_Pp', 0x80B1DEB0, ((0x80B21620, 0x80B21AFF),),()), - ('decomp/', 'ovl_En_Hakurock', 0x80B21B00, ((0x80B22A60, 0x80B22BFF),),()), - ('decomp/', 'ovl_En_Hanabi', 0x80B22C00, ((0x80B23A80, 0x80B23D4F),),()), - ('decomp/', 'ovl_Obj_Dowsing', 0x80B23D50, ((0x80B23E80, 0x80B23ECF),),()), - ('decomp/', 'ovl_Obj_Wind', 0x80B23ED0, ((0x80B24460, 0x80B2462F),),()), - ('decomp/', 'ovl_En_Racedog', 0x80B24630, ((0x80B25D20, 0x80B2629F),),()), - ('decomp/', 'ovl_En_Kendo_Js', 0x80B262A0, ((0x80B27C10, 0x80B2807F),),()), - ('decomp/', 'ovl_Bg_Botihasira', 0x80B28080, ((0x80B282D0, 0x80B2836F),),()), - ('decomp/', 'ovl_En_Fish2', 0x80B28370, ((0x80B2B2E0, 0x80B2B82F),),()), - ('decomp/', 'ovl_En_Pst', 0x80B2B830, ((0x80B2C200, 0x80B2C6EF),),()), - ('decomp/', 'ovl_En_Poh', 0x80B2C6F0, ((0x80B2F660, 0x80B2FB0F),),()), - ('decomp/', 'ovl_Obj_Spidertent', 0x80B2FB10, ((0x80B31040, 0x80B3158F),),()), - ('decomp/', 'ovl_En_Zoraegg', 0x80B31590, ((0x80B33910, 0x80B33D2F),),()), - ('decomp/', 'ovl_En_Kbt', 0x80B33D30, ((0x80B34B20, 0x80B34F6F),),()), - ('decomp/', 'ovl_En_Gg', 0x80B34F70, ((0x80B36BE0, 0x80B3707F),),()), - ('decomp/', 'ovl_En_Maruta', 0x80B37080, ((0x80B38680, 0x80B38E1F),),()), - ('decomp/', 'ovl_Obj_Snowball2', 0x80B38E20, ((0x80B3A8C0, 0x80B3AC4F),),()), - ('decomp/', 'ovl_En_Gg2', 0x80B3AC50, ((0x80B3BEE0, 0x80B3C25F),),()), - ('decomp/', 'ovl_Obj_Ghaka', 0x80B3C260, ((0x80B3C940, 0x80B3CA1F),),()), - ('decomp/', 'ovl_En_Dnp', 0x80B3CA20, ((0x80B3DC60, 0x80B3DFEF),),()), - ('decomp/', 'ovl_En_Dai', 0x80B3DFF0, ((0x80B3FBD0, 0x80B4007F),),()), - ('decomp/', 'ovl_Bg_Goron_Oyu', 0x80B40080, ((0x80B40760, 0x80B407FF),),()), - ('decomp/', 'ovl_En_Kgy', 0x80B40800, ((0x80B43250, 0x80B439AF),),()), - ('decomp/', 'ovl_En_Invadepoh', 0x80B439B0, ((0x80B4E890, 0x80B5029F),),((0x80B502A0,0x80B5040F),)), - ('decomp/', 'ovl_En_Gk', 0x80B50410, ((0x80B531F0, 0x80B5383F),),()), - ('decomp/', 'ovl_En_An', 0x80B53840, ((0x80B581D0, 0x80B5A71F),),()), - ('decomp/', 'ovl_En_Bee', 0x80B5A720, ((0x80B5B1F0, 0x80B5B2DF),),()), - ('decomp/', 'ovl_En_Ot', 0x80B5B2E0, ((0x80B5E380, 0x80B5E87F),),((0x80B5E880,0x80B5E88F),)), - ('decomp/', 'ovl_En_Dragon', 0x80B5E890, ((0x80B605D0, 0x80B60ACF),),()), - ('decomp/', 'ovl_Obj_Dora', 0x80B60AD0, ((0x80B612F0, 0x80B615DF),),()), - ('decomp/', 'ovl_En_Bigpo', 0x80B615E0, ((0x80B64FF0, 0x80B654BF),),()), - ('decomp/', 'ovl_Obj_Kendo_Kanban', 0x80B654C0, ((0x80B66640, 0x80B66A1F),),()), - ('decomp/', 'ovl_Obj_Hariko', 0x80B66A20, ((0x80B66CB0, 0x80B66D2F),),()), - ('decomp/', 'ovl_En_Sth', 0x80B66D30, ((0x80B685A0, 0x80B6D65F),),()), - ('decomp/', 'ovl_Bg_Sinkai_Kabe', 0x80B6D660, ((0x80B6DB50, 0x80B6DBDF),),()), - ('decomp/', 'ovl_Bg_Haka_Curtain', 0x80B6DBE0, ((0x80B6DF80, 0x80B6E01F),),()), - ('decomp/', 'ovl_Bg_Kin2_Bombwall', 0x80B6E020, ((0x80B6E6D0, 0x80B6E81F),),()), - ('decomp/', 'ovl_Bg_Kin2_Fence', 0x80B6E820, ((0x80B6EDC0, 0x80B6EF9F),),()), - ('decomp/', 'ovl_Bg_Kin2_Picture', 0x80B6EFA0, ((0x80B6F970, 0x80B6FB2F),),()), - ('decomp/', 'ovl_Bg_Kin2_Shelf', 0x80B6FB30, ((0x80B70730, 0x80B708BF),),()), - ('decomp/', 'ovl_En_Rail_Skb', 0x80B708C0, ((0x80B732B0, 0x80B73A8F),),()), - ('decomp/', 'ovl_En_Jg', 0x80B73A90, ((0x80B75800, 0x80B7602F),),()), - ('decomp/', 'ovl_En_Tru_Mt', 0x80B76030, ((0x80B774F0, 0x80B7776F),),()), - ('decomp/', 'ovl_Obj_Um', 0x80B77770, ((0x80B7C0F0, 0x80B7C88F),),()), - ('decomp/', 'ovl_En_Neo_Reeba', 0x80B7C890, ((0x80B7E4E0, 0x80B7E92F),),()), - ('decomp/', 'ovl_Bg_Mbar_Chair', 0x80B7E930, ((0x80B7EA00, 0x80B7EA5F),),()), - ('decomp/', 'ovl_Bg_Ikana_Block', 0x80B7EA60, ((0x80B7F620, 0x80B7F72F),),()), - ('decomp/', 'ovl_Bg_Ikana_Mirror', 0x80B7F730, ((0x80B7FF30, 0x80B802DF),),()), - ('decomp/', 'ovl_Bg_Ikana_Rotaryroom', 0x80B802E0, ((0x80B820C0, 0x80B823AF),),()), - ('decomp/', 'ovl_Bg_Dblue_Balance', 0x80B823B0, ((0x80B83A00, 0x80B83C6F),),((0x80B83C70,0x80B83C7F),)), - ('decomp/', 'ovl_Bg_Dblue_Waterfall', 0x80B83C80, ((0x80B85350, 0x80B8558F),),()), - ('decomp/', 'ovl_En_Kaizoku', 0x80B85590, ((0x80B8A8D0, 0x80B8B2CF),),()), - ('decomp/', 'ovl_En_Ge2', 0x80B8B2D0, ((0x80B8CE20, 0x80B8D02F),),()), - ('decomp/', 'ovl_En_Ma_Yts', 0x80B8D030, ((0x80B8E150, 0x80B8E51F),),()), - ('decomp/', 'ovl_En_Ma_Yto', 0x80B8E520, ((0x80B913F0, 0x80B91CBF),),()), - ('decomp/', 'ovl_Obj_Tokei_Turret', 0x80B91CC0, ((0x80B91EA0, 0x80B91F1F),),()), - ('decomp/', 'ovl_Bg_Dblue_Elevator', 0x80B91F20, ((0x80B92940, 0x80B92B0F),),()), - ('decomp/', 'ovl_Obj_Warpstone', 0x80B92B10, ((0x80B93200, 0x80B9330F),),()), - ('decomp/', 'ovl_En_Zog', 0x80B93310, ((0x80B95860, 0x80B95E0F),),((0x80B95E10,0x80B95E1F),)), - ('decomp/', 'ovl_Obj_Rotlift', 0x80B95E20, ((0x80B96140, 0x80B961DF),),()), - ('decomp/', 'ovl_Obj_Jg_Gakki', 0x80B961E0, ((0x80B963C0, 0x80B9640F),),()), - ('decomp/', 'ovl_Bg_Inibs_Movebg', 0x80B96410, ((0x80B96540, 0x80B965CF),),()), - ('decomp/', 'ovl_En_Zot', 0x80B965D0, ((0x80B998C0, 0x80B9A0AF),),()), - ('decomp/', 'ovl_Obj_Tree', 0x80B9A0B0, ((0x80B9A550, 0x80B9A64F),),()), - ('decomp/', 'ovl_Obj_Y2lift', 0x80B9A650, ((0x80B9A920, 0x80B9A97F),),()), - ('decomp/', 'ovl_Obj_Y2shutter', 0x80B9A980, ((0x80B9AE50, 0x80B9AF4F),),()), - ('decomp/', 'ovl_Obj_Boat', 0x80B9AF50, ((0x80B9B660, 0x80B9B6DF),),()), - ('decomp/', 'ovl_Obj_Taru', 0x80B9B6E0, ((0x80B9C320, 0x80B9C44F),),()), - ('decomp/', 'ovl_Obj_Hunsui', 0x80B9C450, ((0x80B9DC70, 0x80B9DECF),),((0x80B9DED0,0x80B9DEDF),)), - ('decomp/', 'ovl_En_Jc_Mato', 0x80B9DEE0, ((0x80B9E1F0, 0x80B9E2BF),),()), - ('decomp/', 'ovl_Mir_Ray3', 0x80B9E2C0, ((0x80B9F400, 0x80B9F56F),),()), - ('decomp/', 'ovl_En_Zob', 0x80B9F570, ((0x80BA10B0, 0x80BA159F),),()), - ('decomp/', 'ovl_Elf_Msg6', 0x80BA15A0, ((0x80BA22E0, 0x80BA241F),),()), - ('decomp/', 'ovl_Obj_Nozoki', 0x80BA2420, ((0x80BA3490, 0x80BA36AF),),((0x80BA36B0,0x80BA36BF),)), - ('decomp/', 'ovl_En_Toto', 0x80BA36C0, ((0x80BA4FD0, 0x80BA53FF),),()), - ('decomp/', 'ovl_En_Railgibud', 0x80BA5400, ((0x80BA80A0, 0x80BA881F),),()), - ('decomp/', 'ovl_En_Baba', 0x80BA8820, ((0x80BAA380, 0x80BAA6CF),),()), - ('decomp/', 'ovl_En_Suttari', 0x80BAA6D0, ((0x80BAE6B0, 0x80BAEF6F),),()), - ('decomp/', 'ovl_En_Zod', 0x80BAEF70, ((0x80BB0520, 0x80BB08DF),),()), - ('decomp/', 'ovl_En_Kujiya', 0x80BB08E0, ((0x80BB1500, 0x80BB16CF),),()), - ('decomp/', 'ovl_En_Geg', 0x80BB16D0, ((0x80BB3E50, 0x80BB46FF),),()), - ('decomp/', 'ovl_Obj_Kinoko', 0x80BB4700, ((0x80BB4A70, 0x80BB4AEF),),()), - ('decomp/', 'ovl_Obj_Yasi', 0x80BB4AF0, ((0x80BB4D70, 0x80BB4DFF),),()), - ('decomp/', 'ovl_En_Tanron1', 0x80BB4E00, ((0x80BB5E00, 0x80BB67CF),),()), - ('decomp/', 'ovl_En_Tanron2', 0x80BB67D0, ((0x80BB8150, 0x80BB844F),),((0x80BB8450,0x80BB859F),)), - ('decomp/', 'ovl_En_Tanron3', 0x80BB85A0, ((0x80BB9720, 0x80BB98DF),),()), - ('decomp/', 'ovl_Obj_Chan', 0x80BB98E0, ((0x80BBAB10, 0x80BBAC8F),),((0x80BBAC90,0x80BBAC9F),)), - ('decomp/', 'ovl_En_Zos', 0x80BBACA0, ((0x80BBC6D0, 0x80BBCA7F),),()), - ('decomp/', 'ovl_En_S_Goro', 0x80BBCA80, ((0x80BBF800, 0x80BBFDAF),),()), - ('decomp/', 'ovl_En_Nb', 0x80BBFDB0, ((0x80BC13F0, 0x80BC18FF),),()), - ('decomp/', 'ovl_En_Ja', 0x80BC1900, ((0x80BC35F0, 0x80BC397F),),()), - ('decomp/', 'ovl_Bg_F40_Block', 0x80BC3980, ((0x80BC4600, 0x80BC47AF),),()), - ('decomp/', 'ovl_Bg_F40_Switch', 0x80BC47B0, ((0x80BC4DD0, 0x80BC4F1F),),((0x80BC4F20,0x80BC4F2F),)), - ('decomp/', 'ovl_En_Po_Composer', 0x80BC4F30, ((0x80BC6760, 0x80BC6BEF),),()), - ('decomp/', 'ovl_En_Guruguru', 0x80BC6BF0, ((0x80BC7960, 0x80BC7ACF),),()), - ('decomp/', 'ovl_Oceff_Wipe5', 0x80BC7AD0, ((0x80BC7EF0, 0x80BC925F),),((0x80BC9260,0x80BC926F),)), - ('decomp/', 'ovl_En_Stone_heishi', 0x80BC9270, ((0x80BCA380, 0x80BCA59F),),()), - ('decomp/', 'ovl_Oceff_Wipe6', 0x80BCA5A0, ((0x80BCA8B0, 0x80BCABEF),),()), - ('decomp/', 'ovl_En_Scopenuts', 0x80BCABF0, ((0x80BCCB20, 0x80BCCFFF),),()), - ('decomp/', 'ovl_En_Scopecrow', 0x80BCD000, ((0x80BCDB50, 0x80BCDCAF),),()), - ('decomp/', 'ovl_Oceff_Wipe7', 0x80BCDCB0, ((0x80BCDFC0, 0x80BCEB0F),),((0x80BCEB10,0x80BCEB1F),)), - ('decomp/', 'ovl_Eff_Kamejima_Wave', 0x80BCEB20, ((0x80BCF070, 0x80BCF1BF),),((0x80BCF1C0,0x80BCF1CF),)), - ('decomp/', 'ovl_En_Hg', 0x80BCF1D0, ((0x80BCFF90, 0x80BD02AF),),()), - ('decomp/', 'ovl_En_Hgo', 0x80BD02B0, ((0x80BD0E80, 0x80BD11DF),),()), - ('decomp/', 'ovl_En_Zov', 0x80BD11E0, ((0x80BD26C0, 0x80BD2A2F),),()), - ('decomp/', 'ovl_En_Ah', 0x80BD2A30, ((0x80BD3DB0, 0x80BD408F),),()), - ('decomp/', 'ovl_Obj_Hgdoor', 0x80BD4090, ((0x80BD4670, 0x80BD471F),),()), - ('decomp/', 'ovl_Bg_Ikana_Bombwall', 0x80BD4720, ((0x80BD5250, 0x80BD53BF),),()), - ('decomp/', 'ovl_Bg_Ikana_Ray', 0x80BD53C0, ((0x80BD55D0, 0x80BD568F),),()), - ('decomp/', 'ovl_Bg_Ikana_Shutter', 0x80BD5690, ((0x80BD5CF0, 0x80BD5DFF),),()), - ('decomp/', 'ovl_Bg_Haka_Bombwall', 0x80BD5E00, ((0x80BD6480, 0x80BD657F),),()), - ('decomp/', 'ovl_Bg_Haka_Tomb', 0x80BD6580, ((0x80BD6880, 0x80BD690F),),()), - ('decomp/', 'ovl_En_Sc_Ruppe', 0x80BD6910, ((0x80BD6DF0, 0x80BD6F0F),),()), - ('decomp/', 'ovl_Bg_Iknv_Doukutu', 0x80BD6F10, ((0x80BD79C0, 0x80BD7AAF),),()), - ('decomp/', 'ovl_Bg_Iknv_Obj', 0x80BD7AB0, ((0x80BD81D0, 0x80BD82AF),),()), - ('decomp/', 'ovl_En_Pamera', 0x80BD82B0, ((0x80BDA460, 0x80BDAA2F),),()), - ('decomp/', 'ovl_Obj_HsStump', 0x80BDAA30, ((0x80BDAF60, 0x80BDB03F),),()), - ('decomp/', 'ovl_En_Hidden_Nuts', 0x80BDB040, ((0x80BDC0B0, 0x80BDC26F),),()), - ('decomp/', 'ovl_En_Zow', 0x80BDC270, ((0x80BDDCD0, 0x80BDDFDF),),()), - ('decomp/', 'ovl_En_Talk', 0x80BDDFE0, ((0x80BDE140, 0x80BDE19F),),()), - ('decomp/', 'ovl_En_Al', 0x80BDE1A0, ((0x80BDFC70, 0x80BE04DF),),()), - ('decomp/', 'ovl_En_Tab', 0x80BE04E0, ((0x80BE18D0, 0x80BE1C7F),),()), - ('decomp/', 'ovl_En_Nimotsu', 0x80BE1C80, ((0x80BE1F90, 0x80BE202F),),()), - ('decomp/', 'ovl_En_Hit_Tag', 0x80BE2030, ((0x80BE21D0, 0x80BE225F),),()), - ('decomp/', 'ovl_En_Ruppecrow', 0x80BE2260, ((0x80BE3990, 0x80BE3B7F),),()), - ('decomp/', 'ovl_En_Tanron4', 0x80BE3B80, ((0x80BE4880, 0x80BE492F),),()), - ('decomp/', 'ovl_En_Tanron5', 0x80BE4930, ((0x80BE5D80, 0x80BE603F),),()), - ('decomp/', 'ovl_En_Tanron6', 0x80BE6040, ((0x80BE6150, 0x80BE61CF),),()), - ('decomp/', 'ovl_En_Daiku2', 0x80BE61D0, ((0x80BE78D0, 0x80BE7AFF),),()), - ('decomp/', 'ovl_En_Muto', 0x80BE7B00, ((0x80BE83F0, 0x80BE84EF),),()), - ('decomp/', 'ovl_En_Baisen', 0x80BE84F0, ((0x80BE8DF0, 0x80BE8F1F),),()), - ('decomp/', 'ovl_En_Heishi', 0x80BE8F20, ((0x80BE9430, 0x80BE950F),),()), - ('decomp/', 'ovl_En_Demo_heishi', 0x80BE9510, ((0x80BE9A30, 0x80BE9B1F),),()), - ('decomp/', 'ovl_En_Dt', 0x80BE9B20, ((0x80BEB1B0, 0x80BEB51F),),()), - ('decomp/', 'ovl_En_Cha', 0x80BEB520, ((0x80BEB860, 0x80BEB93F),),()), - ('decomp/', 'ovl_Obj_Dinner', 0x80BEB940, ((0x80BEBA70, 0x80BEBABF),),()), - ('decomp/', 'ovl_Eff_Lastday', 0x80BEBAC0, ((0x80BEC190, 0x80BEC23F),),()), - ('decomp/', 'ovl_Bg_Ikana_Dharma', 0x80BEC240, ((0x80BECAB0, 0x80BECBCF),),((0x80BECBD0,0x80BECBDF),)), - ('decomp/', 'ovl_En_Akindonuts', 0x80BECBE0, ((0x80BF02D0, 0x80BF0D8F),),()), - ('decomp/', 'ovl_Eff_Stk', 0x80BF0D90, ((0x80BF10C0, 0x80BF114F),),()), - ('decomp/', 'ovl_En_Ig', 0x80BF1150, ((0x80BF3260, 0x80BF391F),),()), - ('decomp/', 'ovl_En_Rg', 0x80BF3920, ((0x80BF5740, 0x80BF5C0F),),((0x80BF5C10,0x80BF5C1F),)), - ('decomp/', 'ovl_En_Osk', 0x80BF5C20, ((0x80BF6F80, 0x80BF74DF),),()), - ('decomp/', 'ovl_En_Sth2', 0x80BF74E0, ((0x80BF7920, 0x80BFA0FF),),()), - ('decomp/', 'ovl_En_Yb', 0x80BFA100, ((0x80BFB290, 0x80BFB47F),),()), - ('decomp/', 'ovl_En_Rz', 0x80BFB480, ((0x80BFCCC0, 0x80BFCF9F),),()), - ('decomp/', 'ovl_En_Scopecoin', 0x80BFCFA0, ((0x80BFD260, 0x80BFD2DF),),()), - ('decomp/', 'ovl_En_Bjt', 0x80BFD2E0, ((0x80BFDEA0, 0x80BFE16F),),()), - ('decomp/', 'ovl_En_Bomjima', 0x80BFE170, ((0x80C009F0, 0x80C00E9F),),()), - ('decomp/', 'ovl_En_Bomjimb', 0x80C00EA0, ((0x80C03170, 0x80C0352F),),()), - ('decomp/', 'ovl_En_Bombers', 0x80C03530, ((0x80C04750, 0x80C0492F),),()), - ('decomp/', 'ovl_En_Bombers2', 0x80C04930, ((0x80C05880, 0x80C05A6F),),()), - ('decomp/', 'ovl_En_Bombal', 0x80C05A70, ((0x80C06440, 0x80C0650F),),()), - ('decomp/', 'ovl_Obj_Moon_Stone', 0x80C06510, ((0x80C06A10, 0x80C06A9F),),()), - ('decomp/', 'ovl_Obj_Mu_Pict', 0x80C06AA0, ((0x80C06FE0, 0x80C0710F),),()), - ('decomp/', 'ovl_Bg_Ikninside', 0x80C07110, ((0x80C07680, 0x80C0773F),),()), - ('decomp/', 'ovl_Eff_Zoraband', 0x80C07740, ((0x80C07AC0, 0x80C07B1F),),()), - ('decomp/', 'ovl_Obj_Kepn_Koya', 0x80C07B20, ((0x80C07C20, 0x80C07C7F),),()), - ('decomp/', 'ovl_Obj_Usiyane', 0x80C07C80, ((0x80C08640, 0x80C0875F),),()), - ('decomp/', 'ovl_En_Nnh', 0x80C08760, ((0x80C089E0, 0x80C08A7F),),()), - ('decomp/', 'ovl_Obj_Kzsaku', 0x80C08A80, ((0x80C08DD0, 0x80C08E3F),),()), - ('decomp/', 'ovl_Obj_Milk_Bin', 0x80C08E40, ((0x80C09030, 0x80C090CF),),()), - ('decomp/', 'ovl_En_Kitan', 0x80C090D0, ((0x80C09D30, 0x80C09ECF),),()), - ('decomp/', 'ovl_Bg_Astr_Bombwall', 0x80C09ED0, ((0x80C0A600, 0x80C0A73F),),()), - ('decomp/', 'ovl_Bg_Iknin_Susceil', 0x80C0A740, ((0x80C0B0C0, 0x80C0B28F),),()), - ('decomp/', 'ovl_En_Bsb', 0x80C0B290, ((0x80C0F8D0, 0x80C0FFCF),),()), - ('decomp/', 'ovl_En_Recepgirl', 0x80C0FFD0, ((0x80C10690, 0x80C1076F),),()), - ('decomp/', 'ovl_En_Thiefbird', 0x80C10770, ((0x80C135A0, 0x80C1391F),),((0x80C13920,0x80C1392F),)), - ('decomp/', 'ovl_En_Jgame_Tsn', 0x80C13930, ((0x80C15010, 0x80C152EF),),()), - ('decomp/', 'ovl_Obj_Jgame_Light', 0x80C152F0, ((0x80C15BA0, 0x80C161DF),),()), - ('decomp/', 'ovl_Obj_Yado', 0x80C161E0, ((0x80C16400, 0x80C1646F),),((0x80C16470,0x80C1647F),)), - ('decomp/', 'ovl_Demo_Syoten', 0x80C16480, ((0x80C177B0, 0x80C17A0F),),()), - ('decomp/', 'ovl_Demo_Moonend', 0x80C17A10, ((0x80C18070, 0x80C1811F),),()), - ('decomp/', 'ovl_Bg_Lbfshot', 0x80C18120, ((0x80C181E0, 0x80C1823F),),()), - ('decomp/', 'ovl_Bg_Last_Bwall', 0x80C18240, ((0x80C189A0, 0x80C18B8F),),()), - ('decomp/', 'ovl_En_And', 0x80C18B90, ((0x80C19160, 0x80C1929F),),()), - ('decomp/', 'ovl_En_Invadepoh_Demo', 0x80C192A0, ((0x80C1AA40, 0x80C1AD3F),),((0x80C1AD40,0x80C1ADBF),)), - ('decomp/', 'ovl_Obj_Danpeilift', 0x80C1ADC0, ((0x80C1B520, 0x80C1B63F),),()), - ('decomp/', 'ovl_En_Fall2', 0x80C1B640, ((0x80C1BBE0, 0x80C1BD8F),),()), - ('decomp/', 'ovl_Dm_Al', 0x80C1BD90, ((0x80C1C250, 0x80C1C40F),),()), - ('decomp/', 'ovl_Dm_An', 0x80C1C410, ((0x80C1D1A0, 0x80C1D40F),),()), - ('decomp/', 'ovl_Dm_Ah', 0x80C1D410, ((0x80C1DDC0, 0x80C1DECF),),()), - ('decomp/', 'ovl_Dm_Nb', 0x80C1DED0, ((0x80C1E1E0, 0x80C1E28F),),()), - ('decomp/', 'ovl_En_Drs', 0x80C1E290, ((0x80C1E5C0, 0x80C1E68F),),()), - ('decomp/', 'ovl_En_Ending_Hero', 0x80C1E690, ((0x80C1E950, 0x80C1E9DF),),()), - ('decomp/', 'ovl_Dm_Bal', 0x80C1E9E0, ((0x80C1F150, 0x80C1F3CF),),()), - ('decomp/', 'ovl_En_Paper', 0x80C1F3D0, ((0x80C1FC40, 0x80C1FCEF),),()), - ('decomp/', 'ovl_En_Hint_Skb', 0x80C1FCF0, ((0x80C21C60, 0x80C2234F),),()), - ('decomp/', 'ovl_Dm_Tag', 0x80C22350, ((0x80C22BD0, 0x80C22D3F),),()), - ('decomp/', 'ovl_En_Bh', 0x80C22D40, ((0x80C231C0, 0x80C2322F),),()), - ('decomp/', 'ovl_En_Ending_Hero2', 0x80C23230, ((0x80C23400, 0x80C2345F),),()), - ('decomp/', 'ovl_En_Ending_Hero3', 0x80C23460, ((0x80C23630, 0x80C2368F),),()), - ('decomp/', 'ovl_En_Ending_Hero4', 0x80C23690, ((0x80C23860, 0x80C238BF),),()), - ('decomp/', 'ovl_En_Ending_Hero5', 0x80C238C0, ((0x80C23BD0, 0x80C23C8F),),()), - ('decomp/', 'ovl_En_Ending_Hero6', 0x80C23C90, ((0x80C241E0, 0x80C2435F),),()), - ('decomp/', 'ovl_Dm_Gm', 0x80C24360, ((0x80C250F0, 0x80C2535F),),()), - ('decomp/', 'ovl_Obj_Swprize', 0x80C25360, ((0x80C257D0, 0x80C2589F),),()), - ('decomp/', 'ovl_En_Invisible_Ruppe', 0x80C258A0, ((0x80C25B30, 0x80C25BBF),),()), - ('decomp/', 'ovl_Obj_Ending', 0x80C25BC0, ((0x80C25CC0, 0x80C25D3F),),()), - ('decomp/', 'ovl_En_Rsn', 0x80C25D40, ((0x80C25FF0, 0x80C2609F),),()), + ('boot/', 'baserom/', 'boot', 0x80080060, ((0x800969C0, 0x800994FF),),((0x80099500,0x800A5ABF),)), + ('code/', 'decomp/', 'code', 0x800A5AC0, ((0x80186028, 0x80186A6F),(0x801AAAB0, 0x801E3F9F),),((0x801E3FA0,0x807FFFFF),)), + ('overlays/', 'decomp/', 'ovl_title', 0x80800000, ((0x80800860, 0x8080090F),),()), + ('overlays/', 'decomp/', 'ovl_select', 0x80800910, ((0x80801C80, 0x80803DEF),),()), + ('overlays/', 'decomp/', 'ovl_opening', 0x80803DF0, ((0x80803FC0, 0x8080400F),),()), + ('overlays/', 'decomp/', 'ovl_file_choose', 0x80804010, ((0x80813DF0, 0x80814E7F),),((0x80814E80,0x80814EAF),)), + ('overlays/', 'decomp/', 'ovl_daytelop', 0x80814EB0, ((0x808158E0, 0x8081609F),),()), + ('overlays/', 'decomp/', 'ovl_kaleido_scope', 0x808160A0, ((0x8082AED0, 0x8082DA4F),),((0x8082DA50,0x8082DA8F),)), + ('overlays/', 'decomp/', 'ovl_Player_Actor', 0x8082DA90, ((0x8085B9F0, 0x80862AEF),),((0x80862AF0,0x80862B6F),)), + ('overlays/', 'decomp/', 'ovl_En_Test', 0x80862B70, ((0x808637B0, 0x8086386F),),()), + ('overlays/', 'decomp/', 'ovl_En_GirlA', 0x80863870, ((0x80864A30, 0x8086536F),),()), + ('overlays/', 'decomp/', 'ovl_En_Part', 0x80865370, ((0x808658E0, 0x8086598F),),()), + ('overlays/', 'decomp/', 'ovl_En_Light', 0x80865990, ((0x808666B0, 0x808667FF),),()), + ('overlays/', 'decomp/', 'ovl_En_Door', 0x80866800, ((0x808674B0, 0x80867BBF),),((0x80867BC0,0x80867BCF),)), + ('overlays/', 'decomp/', 'ovl_En_Box', 0x80867BD0, ((0x80869B30, 0x80869D8F),),()), + ('overlays/', 'decomp/', 'ovl_En_Pametfrog', 0x80869D90, ((0x8086D940, 0x8086DE1F),),()), + ('overlays/', 'decomp/', 'ovl_En_Okuta', 0x8086DE20, ((0x80870870, 0x80870DAF),),()), + ('overlays/', 'decomp/', 'ovl_En_Bom', 0x80870DB0, ((0x80872DA0, 0x8087464F),),((0x80874650,0x8087480F),)), + ('overlays/', 'decomp/', 'ovl_En_Wallmas', 0x80874810, ((0x80876340, 0x8087666F),),()), + ('overlays/', 'decomp/', 'ovl_En_Dodongo', 0x80876670, ((0x808790B0, 0x808796EF),),()), + ('overlays/', 'decomp/', 'ovl_En_Firefly', 0x808796F0, ((0x8087B450, 0x8087B72F),),()), + ('overlays/', 'decomp/', 'ovl_En_Horse', 0x8087B730, ((0x80888EC0, 0x8088A23F),),()), + ('overlays/', 'decomp/', 'ovl_En_Arrow', 0x8088A240, ((0x8088C1C0, 0x8088C50F),),()), + ('overlays/', 'decomp/', 'ovl_En_Elf', 0x8088C510, ((0x808909C0, 0x8089105F),),()), + ('overlays/', 'decomp/', 'ovl_En_Niw', 0x80891060, ((0x80893460, 0x808937EF),),()), + ('overlays/', 'decomp/', 'ovl_En_Tite', 0x808937F0, ((0x80896AB0, 0x80896F2F),),()), + ('overlays/', 'decomp/', 'ovl_En_Peehat', 0x80896F30, ((0x80899410, 0x8089995F),),()), + ('overlays/', 'decomp/', 'ovl_En_Holl', 0x80899960, ((0x8089A530, 0x8089A6DF),),()), + ('overlays/', 'decomp/', 'ovl_En_Dinofos', 0x8089A6E0, ((0x8089E150, 0x8089E8DF),),()), + ('overlays/', 'decomp/', 'ovl_En_Hata', 0x8089E8E0, ((0x8089ED10, 0x8089ED8F),),()), + ('overlays/', 'decomp/', 'ovl_En_Zl1', 0x8089ED90, ((0x8089EDD0, 0x8089EE1F),),()), + ('overlays/', 'decomp/', 'ovl_En_Viewer', 0x8089EE20, ((0x8089F3E0, 0x8089F4CF),),((0x8089F4D0,0x8089F4DF),)), + ('overlays/', 'decomp/', 'ovl_En_Bubble', 0x8089F4E0, ((0x808A06E0, 0x808A08EF),),()), + ('overlays/', 'decomp/', 'ovl_Door_Shutter', 0x808A08F0, ((0x808A2160, 0x808A24CF),),()), + ('overlays/', 'decomp/', 'ovl_En_Boom', 0x808A24D0, ((0x808A2FF0, 0x808A31AF),),()), + ('overlays/', 'decomp/', 'ovl_En_Torch2', 0x808A31B0, ((0x808A35B0, 0x808A366F),),()), + ('overlays/', 'decomp/', 'ovl_En_Minifrog', 0x808A3670, ((0x808A4D20, 0x808A504F),),()), + ('overlays/', 'decomp/', 'ovl_En_St', 0x808A5050, ((0x808A7590, 0x808A792F),),()), + ('overlays/', 'decomp/', 'ovl_Obj_Wturn', 0x808A7930, ((0x808A7DA0, 0x808A7E2F),),()), + ('overlays/', 'decomp/', 'ovl_En_River_Sound', 0x808A7E30, ((0x808A8040, 0x808A809F),),()), + ('overlays/', 'decomp/', 'ovl_En_Ossan', 0x808A80A0, ((0x808AC010, 0x808AC91F),),()), + ('overlays/', 'decomp/', 'ovl_En_Famos', 0x808AC920, ((0x808AE5E0, 0x808AE8BF),),()), + ('overlays/', 'decomp/', 'ovl_En_Bombf', 0x808AE8C0, ((0x808AFB00, 0x808AFCCF),),()), + ('overlays/', 'decomp/', 'ovl_En_Am', 0x808AFCD0, ((0x808B1050, 0x808B132F),),()), + ('overlays/', 'decomp/', 'ovl_En_Dekubaba', 0x808B1330, ((0x808B4D40, 0x808B522F),),()), + ('overlays/', 'decomp/', 'ovl_En_M_Fire1', 0x808B5230, ((0x808B5340, 0x808B53BF),),()), + ('overlays/', 'decomp/', 'ovl_En_M_Thunder', 0x808B53C0, ((0x808B7100, 0x808B735F),),()), + ('overlays/', 'decomp/', 'ovl_Bg_Breakwall', 0x808B7360, ((0x808B8120, 0x808B848F),),()), + ('overlays/', 'decomp/', 'ovl_Door_Warp1', 0x808B8490, ((0x808BBB20, 0x808BBFFF),),((0x808BC000,0x808BC00F),)), + ('overlays/', 'decomp/', 'ovl_Obj_Syokudai', 0x808BC010, ((0x808BCCA0, 0x808BCDDF),),((0x808BCDE0,0x808BCDEF),)), + ('overlays/', 'decomp/', 'ovl_Item_B_Heart', 0x808BCDF0, ((0x808BD160, 0x808BD1DF),),()), + ('overlays/', 'decomp/', 'ovl_En_Dekunuts', 0x808BD1E0, ((0x808BEF10, 0x808BF21F),),()), + ('overlays/', 'decomp/', 'ovl_En_Bbfall', 0x808BF220, ((0x808C0D10, 0x808C102F),),()), + ('overlays/', 'decomp/', 'ovl_Arms_Hook', 0x808C1030, ((0x808C1BA0, 0x808C1D3F),),()), + ('overlays/', 'decomp/', 'ovl_En_Bb', 0x808C1D40, ((0x808C3780, 0x808C3A4F),),()), + ('overlays/', 'decomp/', 'ovl_Bg_Keikoku_Spr', 0x808C3A50, ((0x808C3BA0, 0x808C3BFF),),()), + ('overlays/', 'decomp/', 'ovl_En_Wood02', 0x808C3C00, ((0x808C4CE0, 0x808C4F6F),),((0x808C4F70,0x808C4F7F),)), + ('overlays/', 'decomp/', 'ovl_En_Death', 0x808C4F80, ((0x808C98C0, 0x808CA0AF),),()), + ('overlays/', 'decomp/', 'ovl_En_Minideath', 0x808CA0B0, ((0x808CBF30, 0x808CC24F),),((0x808CC250,0x808CC25F),)), + ('overlays/', 'decomp/', 'ovl_En_Vm', 0x808CC260, ((0x808CD4A0, 0x808CD73F),),()), + ('overlays/', 'decomp/', 'ovl_Demo_Effect', 0x808CD740, ((0x808CE290, 0x808CE44F),),()), + ('overlays/', 'decomp/', 'ovl_Demo_Kankyo', 0x808CE450, ((0x808D03C0, 0x808D067F),),()), + ('overlays/', 'decomp/', 'ovl_En_Floormas', 0x808D0680, ((0x808D3880, 0x808D3E1F),),()), + ('overlays/', 'decomp/', 'ovl_En_Rd', 0x808D3E20, ((0x808D70C0, 0x808D754F),),()), + ('overlays/', 'decomp/', 'ovl_Bg_F40_Flift', 0x808D7550, ((0x808D7810, 0x808D78CF),),()), + ('overlays/', 'decomp/', 'ovl_Obj_Mure', 0x808D78D0, ((0x808D8760, 0x808D893F),),()), + ('overlays/', 'decomp/', 'ovl_En_Sw', 0x808D8940, ((0x808DB9C0, 0x808DBE7F),),()), + ('overlays/', 'decomp/', 'ovl_Object_Kankyo', 0x808DBE80, ((0x808DE320, 0x808DE5AF),),((0x808DE5B0,0x808DE5BF),)), + ('overlays/', 'decomp/', 'ovl_En_Horse_Link_Child', 0x808DE5C0, ((0x808DFEA0, 0x808E019F),),()), + ('overlays/', 'decomp/', 'ovl_Door_Ana', 0x808E01A0, ((0x808E0740, 0x808E082F),),()), + ('overlays/', 'decomp/', 'ovl_En_Encount1', 0x808E0830, ((0x808E0DD0, 0x808E0E3F),),()), + ('overlays/', 'decomp/', 'ovl_Demo_Tre_Lgt', 0x808E0E40, ((0x808E1490, 0x808E155F),),()), + ('overlays/', 'decomp/', 'ovl_En_Encount2', 0x808E1560, ((0x808E1ED0, 0x808E1FDF),),()), + ('overlays/', 'decomp/', 'ovl_En_Fire_Rock', 0x808E1FE0, ((0x808E2020, 0x808E206F),),()), + ('overlays/', 'decomp/', 'ovl_Bg_Ctower_Rot', 0x808E2070, ((0x808E2540, 0x808E25FF),),()), + ('overlays/', 'decomp/', 'ovl_Mir_Ray', 0x808E2600, ((0x808E3BD0, 0x808E3EEF),),()), + ('overlays/', 'decomp/', 'ovl_En_Sb', 0x808E3EF0, ((0x808E4DF0, 0x808E4FBF),),()), + ('overlays/', 'decomp/', 'ovl_En_Bigslime', 0x808E4FC0, ((0x808ED640, 0x808F11FF),),()), + ('overlays/', 'decomp/', 'ovl_En_Karebaba', 0x808F1200, ((0x808F2D80, 0x808F30AF),),()), + ('overlays/', 'decomp/', 'ovl_En_In', 0x808F30B0, ((0x808F6A40, 0x808F74AF),),()), + ('overlays/', 'decomp/', 'ovl_En_Bom_Chu', 0x808F74B0, ((0x808F88C0, 0x808F8A9F),),()), + ('overlays/', 'decomp/', 'ovl_En_Horse_Game_Check', 0x808F8AA0, ((0x808F9B00, 0x808F9DFF),),()), + ('overlays/', 'decomp/', 'ovl_En_Rr', 0x808F9E00, ((0x808FC130, 0x808FC54F),),()), + ('overlays/', 'decomp/', 'ovl_En_Fr', 0x808FC550, ((0x808FC670, 0x808FC6BF),),()), + ('overlays/', 'decomp/', 'ovl_En_Fishing', 0x808FC6C0, ((0x8090CCB0, 0x809101AF),),((0x809101B0,0x8091728F),)), + ('overlays/', 'decomp/', 'ovl_Obj_Oshihiki', 0x80917290, ((0x80918830, 0x80918B3F),),()), + ('overlays/', 'decomp/', 'ovl_Eff_Dust', 0x80918B40, ((0x80919D90, 0x80919F2F),),()), + ('overlays/', 'decomp/', 'ovl_Bg_Umajump', 0x80919F30, ((0x8091A7F0, 0x8091A89F),),()), + ('overlays/', 'decomp/', 'ovl_En_Insect', 0x8091A8A0, ((0x8091BD60, 0x8091C09F),),()), + ('overlays/', 'decomp/', 'ovl_En_Butte', 0x8091C0A0, ((0x8091D2D0, 0x8091D62F),),()), + ('overlays/', 'decomp/', 'ovl_En_Fish', 0x8091D630, ((0x8091FA60, 0x8091FEEF),),()), + ('overlays/', 'decomp/', 'ovl_Item_Etcetera', 0x8091FEF0, ((0x80920210, 0x8092033F),),()), + ('overlays/', 'decomp/', 'ovl_Arrow_Fire', 0x80920340, ((0x80920DF0, 0x8092241F),),((0x80922420,0x8092242F),)), + ('overlays/', 'decomp/', 'ovl_Arrow_Ice', 0x80922430, ((0x80922DB0, 0x809242EF),),((0x809242F0,0x809242FF),)), + ('overlays/', 'decomp/', 'ovl_Arrow_Light', 0x80924300, ((0x80924C60, 0x8092619F),),((0x809261A0,0x809261AF),)), + ('overlays/', 'decomp/', 'ovl_Obj_Kibako', 0x809261B0, ((0x80927380, 0x809275BF),),()), + ('overlays/', 'decomp/', 'ovl_Obj_Tsubo', 0x809275C0, ((0x80929500, 0x8092990F),),()), + ('overlays/', 'decomp/', 'ovl_En_Ik', 0x80929910, ((0x8092BFA0, 0x8092C52F),),()), + ('overlays/', 'decomp/', 'ovl_Demo_Shd', 0x8092C530, ((0x8092C570, 0x8092C5BF),),()), + ('overlays/', 'decomp/', 'ovl_En_Dns', 0x8092C5C0, ((0x8092DCB0, 0x8092DF8F),),()), + ('overlays/', 'decomp/', 'ovl_Elf_Msg', 0x8092DF90, ((0x8092E450, 0x8092E50F),),()), + ('overlays/', 'decomp/', 'ovl_En_Honotrap', 0x8092E510, ((0x809303F0, 0x809307DF),),()), + ('overlays/', 'decomp/', 'ovl_En_Tubo_Trap', 0x809307E0, ((0x80931410, 0x8093155F),),()), + ('overlays/', 'decomp/', 'ovl_Obj_Ice_Poly', 0x80931560, ((0x80932300, 0x8093248F),),()), + ('overlays/', 'decomp/', 'ovl_En_Fz', 0x80932490, ((0x809346D0, 0x809349DF),),()), + ('overlays/', 'decomp/', 'ovl_En_Kusa', 0x809349E0, ((0x809366A0, 0x80936ACF),),((0x80936AD0,0x80936CEF),)), + ('overlays/', 'decomp/', 'ovl_Obj_Bean', 0x80936CF0, ((0x80938F80, 0x809393AF),),()), + ('overlays/', 'decomp/', 'ovl_Obj_Bombiwa', 0x809393B0, ((0x8093A920, 0x8093ABCF),),()), + ('overlays/', 'decomp/', 'ovl_Obj_Switch', 0x8093ABD0, ((0x8093CC60, 0x8093D3AF),),((0x8093D3B0,0x8093D3BF),)), + ('overlays/', 'decomp/', 'ovl_Obj_Lift', 0x8093D3C0, ((0x8093DD30, 0x8093DE9F),),()), + ('overlays/', 'decomp/', 'ovl_Obj_Hsblock', 0x8093DEA0, ((0x8093E310, 0x8093E41F),),()), + ('overlays/', 'decomp/', 'ovl_En_Okarina_Tag', 0x8093E420, ((0x8093E810, 0x8093E89F),),()), + ('overlays/', 'decomp/', 'ovl_En_Goroiwa', 0x8093E8A0, ((0x80942DA0, 0x809434AF),),()), + ('overlays/', 'decomp/', 'ovl_En_Daiku', 0x809434B0, ((0x80944040, 0x809441DF),),()), + ('overlays/', 'decomp/', 'ovl_En_Nwc', 0x809441E0, ((0x80945370, 0x809454EF),),()), + ('overlays/', 'decomp/', 'ovl_Item_Inbox', 0x809454F0, ((0x80945600, 0x8094564F),),()), + ('overlays/', 'decomp/', 'ovl_En_Ge1', 0x80945650, ((0x809464B0, 0x8094669F),),()), + ('overlays/', 'decomp/', 'ovl_Obj_Blockstop', 0x809466A0, ((0x80946880, 0x809468CF),),()), + ('overlays/', 'decomp/', 'ovl_En_Sda', 0x809468D0, ((0x80947A40, 0x80947E9F),),((0x80947EA0,0x80947F5F),)), + ('overlays/', 'decomp/', 'ovl_En_Clear_Tag', 0x80947F60, ((0x8094AD40, 0x8094DEDF),),()), + ('overlays/', 'decomp/', 'ovl_En_Gm', 0x8094DEE0, ((0x80951820, 0x8095261F),),()), + ('overlays/', 'decomp/', 'ovl_En_Ms', 0x80952620, ((0x80952B80, 0x80952C4F),),()), + ('overlays/', 'decomp/', 'ovl_En_Hs', 0x80952C50, ((0x809538F0, 0x80953A8F),),()), + ('overlays/', 'decomp/', 'ovl_Bg_Ingate', 0x80953A90, ((0x809548A0, 0x8095495F),),()), + ('overlays/', 'decomp/', 'ovl_En_Kanban', 0x80954960, ((0x809572E0, 0x809580BF),),()), + ('overlays/', 'decomp/', 'ovl_En_Attack_Niw', 0x809580C0, ((0x80959100, 0x809592DF),),()), + ('overlays/', 'decomp/', 'ovl_En_Mk', 0x809592E0, ((0x8095A240, 0x8095A50F),),()), + ('overlays/', 'decomp/', 'ovl_En_Owl', 0x8095A510, ((0x8095D2D0, 0x8095D6DF),),()), + ('overlays/', 'decomp/', 'ovl_En_Ishi', 0x8095D6E0, ((0x8095F690, 0x8095FB0F),),()), + ('overlays/', 'decomp/', 'ovl_Obj_Hana', 0x8095FB10, ((0x8095FB90, 0x8095FBEF),),()), + ('overlays/', 'decomp/', 'ovl_Obj_Lightswitch', 0x8095FBF0, ((0x80960B70, 0x80960CEF),),()), + ('overlays/', 'decomp/', 'ovl_Obj_Mure2', 0x80960CF0, ((0x80961570, 0x809616DF),),()), + ('overlays/', 'decomp/', 'ovl_En_Fu', 0x809616E0, ((0x80964AE0, 0x8096564F),),()), + ('overlays/', 'decomp/', 'ovl_En_Stream', 0x80965650, ((0x80965B00, 0x80965BAF),),()), + ('overlays/', 'decomp/', 'ovl_En_Mm', 0x80965BB0, ((0x80966320, 0x8096640F),),()), + ('overlays/', 'decomp/', 'ovl_En_Weather_Tag', 0x80966410, ((0x809677A0, 0x809679CF),),()), + ('overlays/', 'decomp/', 'ovl_En_Ani', 0x809679D0, ((0x80968650, 0x809687AF),),()), + ('overlays/', 'decomp/', 'ovl_En_Js', 0x809687B0, ((0x8096AB80, 0x8096B09F),),()), + ('overlays/', 'decomp/', 'ovl_En_Okarina_Effect', 0x8096B0A0, ((0x8096B290, 0x8096B30F),),()), + ('overlays/', 'decomp/', 'ovl_En_Mag', 0x8096B310, ((0x8096E910, 0x8096EC3F),),()), + ('overlays/', 'decomp/', 'ovl_Elf_Msg2', 0x8096EC40, ((0x8096F090, 0x8096F15F),),()), + ('overlays/', 'decomp/', 'ovl_Bg_F40_Swlift', 0x8096F160, ((0x8096F510, 0x8096F5CF),),((0x8096F5D0,0x8096F5DF),)), + ('overlays/', 'decomp/', 'ovl_En_Kakasi', 0x8096F5E0, ((0x80971D80, 0x8097234F),),()), + ('overlays/', 'decomp/', 'ovl_Obj_Makeoshihiki', 0x80972350, ((0x80972630, 0x8097267F),),()), + ('overlays/', 'decomp/', 'ovl_Oceff_Spot', 0x80972680, ((0x80972D80, 0x8097354F),),()), + ('overlays/', 'decomp/', 'ovl_En_Torch', 0x80973550, ((0x809735E0, 0x8097363F),),()), + ('overlays/', 'decomp/', 'ovl_Shot_Sun', 0x80973640, ((0x80973B80, 0x80973C4F),),()), + ('overlays/', 'decomp/', 'ovl_Obj_Roomtimer', 0x80973C50, ((0x80973E90, 0x80973EEF),),()), + ('overlays/', 'decomp/', 'ovl_En_Ssh', 0x80973EF0, ((0x80976010, 0x809764AF),),()), + ('overlays/', 'decomp/', 'ovl_Oceff_Wipe', 0x809764B0, ((0x80976980, 0x809771FF),),((0x80977200,0x8097720F),)), + ('overlays/', 'decomp/', 'ovl_Effect_Ss_Dust', 0x80977210, ((0x80977910, 0x809779FF),),()), + ('overlays/', 'decomp/', 'ovl_Effect_Ss_Kirakira', 0x80977A00, ((0x80977FC0, 0x8097806F),),()), + ('overlays/', 'decomp/', 'ovl_Effect_Ss_Bomb2', 0x80978070, ((0x809787F0, 0x809788CF),),()), + ('overlays/', 'decomp/', 'ovl_Effect_Ss_Blast', 0x809788D0, ((0x80978BD0, 0x80978C2F),),()), + ('overlays/', 'decomp/', 'ovl_Effect_Ss_G_Spk', 0x80978C30, ((0x80979130, 0x809791AF),),()), + ('overlays/', 'decomp/', 'ovl_Effect_Ss_D_Fire', 0x809791B0, ((0x80979560, 0x809795BF),),()), + ('overlays/', 'decomp/', 'ovl_Effect_Ss_Bubble', 0x809795C0, ((0x80979AB0, 0x80979B2F),),()), + ('overlays/', 'decomp/', 'ovl_Effect_Ss_G_Ripple', 0x80979B30, ((0x80979FF0, 0x8097A04F),),()), + ('overlays/', 'decomp/', 'ovl_Effect_Ss_G_Splash', 0x8097A050, ((0x8097A3E0, 0x8097A46F),),()), + ('overlays/', 'decomp/', 'ovl_Effect_Ss_G_Fire', 0x8097A470, ((0x8097A610, 0x8097A67F),),()), + ('overlays/', 'decomp/', 'ovl_Effect_Ss_Lightning', 0x8097A680, ((0x8097AC80, 0x8097AD5F),),()), + ('overlays/', 'decomp/', 'ovl_Effect_Ss_Dt_Bubble', 0x8097AD60, ((0x8097B1E0, 0x8097B26F),),()), + ('overlays/', 'decomp/', 'ovl_Effect_Ss_Hahen', 0x8097B270, ((0x8097B790, 0x8097B80F),),()), + ('overlays/', 'decomp/', 'ovl_Effect_Ss_Stick', 0x8097B810, ((0x8097BA70, 0x8097BACF),),()), + ('overlays/', 'decomp/', 'ovl_Effect_Ss_Sibuki', 0x8097BAD0, ((0x8097C080, 0x8097C12F),),()), + ('overlays/', 'decomp/', 'ovl_Effect_Ss_Stone1', 0x8097C130, ((0x8097C3D0, 0x8097C48F),),()), + ('overlays/', 'decomp/', 'ovl_Effect_Ss_Hitmark', 0x8097C490, ((0x8097C880, 0x8097C98F),),()), + ('overlays/', 'decomp/', 'ovl_Effect_Ss_Fhg_Flash', 0x8097C990, ((0x8097CEC0, 0x8097D40F),),()), + ('overlays/', 'decomp/', 'ovl_Effect_Ss_K_Fire', 0x8097D410, ((0x8097D7F0, 0x8097D84F),),()), + ('overlays/', 'decomp/', 'ovl_Effect_Ss_Solder_Srch_Ball', 0x8097D850, ((0x8097DC40, 0x8097DC9F),),()), + ('overlays/', 'decomp/', 'ovl_Effect_Ss_Kakera', 0x8097DCA0, ((0x8097EAD0, 0x8097ECCF),),()), + ('overlays/', 'decomp/', 'ovl_Effect_Ss_Ice_Piece', 0x8097ECD0, ((0x8097F070, 0x8097F0CF),),()), + ('overlays/', 'decomp/', 'ovl_Effect_Ss_En_Ice', 0x8097F0D0, ((0x8097F810, 0x8097F87F),),()), + ('overlays/', 'decomp/', 'ovl_Effect_Ss_Fire_Tail', 0x8097F880, ((0x8097FED0, 0x8097FF5F),),()), + ('overlays/', 'decomp/', 'ovl_Effect_Ss_En_Fire', 0x8097FF60, ((0x80980570, 0x809805CF),),()), + ('overlays/', 'decomp/', 'ovl_Effect_Ss_Extra', 0x809805D0, ((0x809808E0, 0x8098093F),),()), + ('overlays/', 'decomp/', 'ovl_Effect_Ss_Dead_Db', 0x80980940, ((0x80980CD0, 0x80980D4F),),()), + ('overlays/', 'decomp/', 'ovl_Effect_Ss_Dead_Dd', 0x80980D50, ((0x80981270, 0x809812DF),),()), + ('overlays/', 'decomp/', 'ovl_Effect_Ss_Dead_Ds', 0x809812E0, ((0x80981700, 0x8098175F),),()), + ('overlays/', 'decomp/', 'ovl_Oceff_Storm', 0x80981760, ((0x80981F70, 0x8098351F),),()), + ('overlays/', 'decomp/', 'ovl_Obj_Demo', 0x80983520, ((0x80983890, 0x809838EF),),()), + ('overlays/', 'decomp/', 'ovl_En_Minislime', 0x809838F0, ((0x809857C0, 0x80985C3F),),()), + ('overlays/', 'decomp/', 'ovl_En_Nutsball', 0x80985C40, ((0x809861D0, 0x8098626F),),()), + ('overlays/', 'decomp/', 'ovl_Oceff_Wipe2', 0x80986270, ((0x80986670, 0x809879CF),),((0x809879D0,0x809879DF),)), + ('overlays/', 'decomp/', 'ovl_Oceff_Wipe3', 0x809879E0, ((0x80987DF0, 0x8098912F),),((0x80989130,0x8098913F),)), + ('overlays/', 'decomp/', 'ovl_En_Dg', 0x80989140, ((0x8098C280, 0x8098CA1F),),()), + ('overlays/', 'decomp/', 'ovl_En_Si', 0x8098CA20, ((0x8098CD60, 0x8098CE3F),),()), + ('overlays/', 'decomp/', 'ovl_Obj_Comb', 0x8098CE40, ((0x8098E420, 0x8098E5BF),),()), + ('overlays/', 'decomp/', 'ovl_Obj_Kibako2', 0x8098E5C0, ((0x8098EE40, 0x8098EF5F),),()), + ('overlays/', 'decomp/', 'ovl_En_Hs2', 0x8098EF60, ((0x8098EFF0, 0x8098F03F),),()), + ('overlays/', 'decomp/', 'ovl_Obj_Mure3', 0x8098F040, ((0x8098F720, 0x8098F7FF),),()), + ('overlays/', 'decomp/', 'ovl_En_Tg', 0x8098F800, ((0x809901A0, 0x8099030F),),()), + ('overlays/', 'decomp/', 'ovl_En_Wf', 0x80990310, ((0x80994150, 0x809947AF),),()), + ('overlays/', 'decomp/', 'ovl_En_Skb', 0x809947B0, ((0x80997330, 0x80997A8F),),()), + ('overlays/', 'decomp/', 'ovl_En_Gs', 0x80997A90, ((0x8099A380, 0x8099A91F),),()), + ('overlays/', 'decomp/', 'ovl_Obj_Sound', 0x8099A920, ((0x8099AAE0, 0x8099AB2F),),()), + ('overlays/', 'decomp/', 'ovl_En_Crow', 0x8099AB30, ((0x8099C050, 0x8099C28F),),()), + ('overlays/', 'decomp/', 'ovl_En_Cow', 0x8099C290, ((0x8099D5F0, 0x8099D77F),),()), + ('overlays/', 'decomp/', 'ovl_Oceff_Wipe4', 0x8099D780, ((0x8099DB90, 0x8099E77F),),((0x8099E780,0x8099E78F),)), + ('overlays/', 'decomp/', 'ovl_En_Zo', 0x8099E790, ((0x8099F490, 0x8099F72F),),()), + ('overlays/', 'decomp/', 'ovl_Effect_Ss_Ice_Smoke', 0x8099F730, ((0x8099F9E0, 0x8099FA3F),),()), + ('overlays/', 'decomp/', 'ovl_Obj_Makekinsuta', 0x8099FA40, ((0x8099FE10, 0x8099FEAF),),()), + ('overlays/', 'decomp/', 'ovl_En_Ge3', 0x8099FEB0, ((0x809A0D80, 0x809A0F1F),),()), + ('overlays/', 'decomp/', 'ovl_Obj_Hamishi', 0x809A0F20, ((0x809A1A80, 0x809A1BAF),),()), + ('overlays/', 'decomp/', 'ovl_En_Zl4', 0x809A1BB0, ((0x809A1F60, 0x809A202F),),()), + ('overlays/', 'decomp/', 'ovl_En_Mm2', 0x809A2030, ((0x809A2250, 0x809A2B5F),),()), + ('overlays/', 'decomp/', 'ovl_Door_Spiral', 0x809A2B60, ((0x809A3230, 0x809A33DF),),()), + ('overlays/', 'decomp/', 'ovl_Obj_Pzlblock', 0x809A33E0, ((0x809A4030, 0x809A41BF),),()), + ('overlays/', 'decomp/', 'ovl_Obj_Toge', 0x809A41C0, ((0x809A4C90, 0x809A4DFF),),()), + ('overlays/', 'decomp/', 'ovl_Obj_Armos', 0x809A4E00, ((0x809A5B90, 0x809A5D0F),),()), + ('overlays/', 'decomp/', 'ovl_Obj_Boyo', 0x809A5D10, ((0x809A6150, 0x809A627F),),()), + ('overlays/', 'decomp/', 'ovl_En_Grasshopper', 0x809A6280, ((0x809A8C80, 0x809A910F),),()), + ('overlays/', 'decomp/', 'ovl_Obj_Grass', 0x809A9110, ((0x809AA9F0, 0x809AAD9F),),((0x809AADA0,0x809AAE5F),)), + ('overlays/', 'decomp/', 'ovl_Obj_Grass_Carry', 0x809AAE60, ((0x809ABBB0, 0x809ABDDF),),()), + ('overlays/', 'decomp/', 'ovl_Obj_Grass_Unit', 0x809ABDE0, ((0x809AC340, 0x809AC4AF),),()), + ('overlays/', 'decomp/', 'ovl_Bg_Fire_Wall', 0x809AC4B0, ((0x809ACC40, 0x809ACD8F),),()), + ('overlays/', 'decomp/', 'ovl_En_Bu', 0x809ACD90, ((0x809ACED0, 0x809ACF3F),),()), + ('overlays/', 'decomp/', 'ovl_En_Encount3', 0x809ACF40, ((0x809AD7F0, 0x809AD8DF),),()), + ('overlays/', 'decomp/', 'ovl_En_Jso', 0x809AD8E0, ((0x809B0F40, 0x809B154F),),()), + ('overlays/', 'decomp/', 'ovl_Obj_Chikuwa', 0x809B1550, ((0x809B1FA0, 0x809B20EF),),()), + ('overlays/', 'decomp/', 'ovl_En_Knight', 0x809B20F0, ((0x809BDAF0, 0x809BEFCF),),((0x809BEFD0,0x809C075F),)), + ('overlays/', 'decomp/', 'ovl_En_Warp_tag', 0x809C0760, ((0x809C0FE0, 0x809C10AF),),()), + ('overlays/', 'decomp/', 'ovl_En_Aob_01', 0x809C10B0, ((0x809C3770, 0x809C3D7F),),()), + ('overlays/', 'decomp/', 'ovl_En_Boj_01', 0x809C3D80, ((0x809C3DC0, 0x809C3E0F),),()), + ('overlays/', 'decomp/', 'ovl_En_Boj_02', 0x809C3E10, ((0x809C3E50, 0x809C3E9F),),()), + ('overlays/', 'decomp/', 'ovl_En_Boj_03', 0x809C3EA0, ((0x809C3EE0, 0x809C3F2F),),()), + ('overlays/', 'decomp/', 'ovl_En_Encount4', 0x809C3F30, ((0x809C46B0, 0x809C478F),),()), + ('overlays/', 'decomp/', 'ovl_En_Bom_Bowl_Man', 0x809C4790, ((0x809C6100, 0x809C64BF),),()), + ('overlays/', 'decomp/', 'ovl_En_Syateki_Man', 0x809C64C0, ((0x809C9160, 0x809C9A5F),),()), + ('overlays/', 'decomp/', 'ovl_Bg_Icicle', 0x809C9A60, ((0x809CA2B0, 0x809CA3EF),),()), + ('overlays/', 'decomp/', 'ovl_En_Syateki_Crow', 0x809CA3F0, ((0x809CB050, 0x809CB1FF),),()), + ('overlays/', 'decomp/', 'ovl_En_Boj_04', 0x809CB200, ((0x809CB240, 0x809CB28F),),()), + ('overlays/', 'decomp/', 'ovl_En_Cne_01', 0x809CB290, ((0x809CBEE0, 0x809CC05F),),()), + ('overlays/', 'decomp/', 'ovl_En_Bba_01', 0x809CC060, ((0x809CCC60, 0x809CCDDF),),()), + ('overlays/', 'decomp/', 'ovl_En_Bji_01', 0x809CCDE0, ((0x809CDC30, 0x809CDEBF),),()), + ('overlays/', 'decomp/', 'ovl_Bg_Spdweb', 0x809CDEC0, ((0x809CF060, 0x809CF34F),),()), + ('overlays/', 'decomp/', 'ovl_En_Mt_tag', 0x809CF350, ((0x809D0190, 0x809D052F),),()), + ('overlays/', 'decomp/', 'ovl_Boss_01', 0x809D0530, ((0x809D7980, 0x809D8A0F),),((0x809D8A10,0x809DA1CF),)), + ('overlays/', 'decomp/', 'ovl_Boss_02', 0x809DA1D0, ((0x809DF550, 0x809E041F),),((0x809E0420,0x809E275F),)), + ('overlays/', 'decomp/', 'ovl_Boss_03', 0x809E2760, ((0x809E8EA0, 0x809E983F),),((0x809E9840,0x809EC03F),)), + ('overlays/', 'decomp/', 'ovl_Boss_04', 0x809EC040, ((0x809EE150, 0x809EE4CF),),((0x809EE4D0,0x809EE4DF),)), + ('overlays/', 'decomp/', 'ovl_Boss_05', 0x809EE4E0, ((0x809F1A20, 0x809F210F),),((0x809F2110,0x809F211F),)), + ('overlays/', 'decomp/', 'ovl_Boss_06', 0x809F2120, ((0x809F4080, 0x809F436F),),((0x809F4370,0x809F497F),)), + ('overlays/', 'decomp/', 'ovl_Boss_07', 0x809F4980, ((0x80A07950, 0x80A09A3F),),((0x80A09A40,0x80A0A89F),)), + ('overlays/', 'decomp/', 'ovl_Bg_Dy_Yoseizo', 0x80A0A8A0, ((0x80A0C4A0, 0x80A0C77F),),()), + ('overlays/', 'decomp/', 'ovl_En_Boj_05', 0x80A0C780, ((0x80A0C7C0, 0x80A0C80F),),()), + ('overlays/', 'decomp/', 'ovl_En_Sob1', 0x80A0C810, ((0x80A10860, 0x80A10FCF),),()), + ('overlays/', 'decomp/', 'ovl_En_Go', 0x80A10FD0, ((0x80A16100, 0x80A16D3F),),()), + ('overlays/', 'decomp/', 'ovl_En_Raf', 0x80A16D40, ((0x80A18EC0, 0x80A1973F),),()), + ('overlays/', 'decomp/', 'ovl_Obj_Funen', 0x80A19740, ((0x80A198B0, 0x80A1990F),),()), + ('overlays/', 'decomp/', 'ovl_Obj_Raillift', 0x80A19910, ((0x80A1A390, 0x80A1A4FF),),()), + ('overlays/', 'decomp/', 'ovl_Bg_Numa_Hana', 0x80A1A500, ((0x80A1B240, 0x80A1B3CF),),()), + ('overlays/', 'decomp/', 'ovl_Obj_Flowerpot', 0x80A1B3D0, ((0x80A1D380, 0x80A1D82F),),((0x80A1D830,0x80A1DA4F),)), + ('overlays/', 'decomp/', 'ovl_Obj_Spinyroll', 0x80A1DA50, ((0x80A1F020, 0x80A1F40F),),()), + ('overlays/', 'decomp/', 'ovl_Dm_Hina', 0x80A1F410, ((0x80A1FDB0, 0x80A1FE4F),),()), + ('overlays/', 'decomp/', 'ovl_En_Syateki_Wf', 0x80A1FE50, ((0x80A20E50, 0x80A2114F),),()), + ('overlays/', 'decomp/', 'ovl_Obj_Skateblock', 0x80A21150, ((0x80A229F0, 0x80A22D3F),),()), + ('overlays/', 'decomp/', 'ovl_Effect_En_Ice_Block', 0x80A22D40, ((0x80A23020, 0x80A2308F),),()), + ('overlays/', 'decomp/', 'ovl_Obj_Iceblock', 0x80A23090, ((0x80A26E30, 0x80A2751F),),()), + ('overlays/', 'decomp/', 'ovl_En_Bigpamet', 0x80A27520, ((0x80A296E0, 0x80A29A7F),),()), + ('overlays/', 'decomp/', 'ovl_Bg_Dblue_Movebg', 0x80A29A80, ((0x80A2B870, 0x80A2BBEF),),((0x80A2BBF0,0x80A2BBFF),)), + ('overlays/', 'decomp/', 'ovl_En_Syateki_Dekunuts', 0x80A2BC00, ((0x80A2CA90, 0x80A2CD0F),),()), + ('overlays/', 'decomp/', 'ovl_Elf_Msg3', 0x80A2CD10, ((0x80A2D1C0, 0x80A2D27F),),()), + ('overlays/', 'decomp/', 'ovl_En_Fg', 0x80A2D280, ((0x80A2E4E0, 0x80A2E79F),),()), + ('overlays/', 'decomp/', 'ovl_Dm_Ravine', 0x80A2E7A0, ((0x80A2E910, 0x80A2E95F),),()), + ('overlays/', 'decomp/', 'ovl_Dm_Sa', 0x80A2E960, ((0x80A2ECE0, 0x80A2ED9F),),()), + ('overlays/', 'decomp/', 'ovl_En_Slime', 0x80A2EDA0, ((0x80A31AD0, 0x80A321FF),),((0x80A32200,0x80A3220F),)), + ('overlays/', 'decomp/', 'ovl_En_Pr', 0x80A32210, ((0x80A338A0, 0x80A33AFF),),()), + ('overlays/', 'decomp/', 'ovl_Obj_Toudai', 0x80A33B00, ((0x80A34570, 0x80A346FF),),()), + ('overlays/', 'decomp/', 'ovl_Obj_Entotu', 0x80A34700, ((0x80A353F0, 0x80A3550F),),()), + ('overlays/', 'decomp/', 'ovl_Obj_Bell', 0x80A35510, ((0x80A35E70, 0x80A35FEF),),()), + ('overlays/', 'decomp/', 'ovl_En_Syateki_Okuta', 0x80A35FF0, ((0x80A37550, 0x80A37ECF),),()), + ('overlays/', 'decomp/', 'ovl_Obj_Shutter', 0x80A37ED0, ((0x80A38110, 0x80A3818F),),()), + ('overlays/', 'decomp/', 'ovl_Dm_Zl', 0x80A38190, ((0x80A387D0, 0x80A3899F),),()), + ('overlays/', 'decomp/', 'ovl_En_Ru', 0x80A389A0, ((0x80A39430, 0x80A396AF),),()), + ('overlays/', 'decomp/', 'ovl_En_Elfgrp', 0x80A396B0, ((0x80A3AAD0, 0x80A3AC5F),),()), + ('overlays/', 'decomp/', 'ovl_Dm_Tsg', 0x80A3AC60, ((0x80A3B010, 0x80A3B07F),),()), + ('overlays/', 'decomp/', 'ovl_En_Baguo', 0x80A3B080, ((0x80A3C2D0, 0x80A3C4DF),),()), + ('overlays/', 'decomp/', 'ovl_Obj_Vspinyroll', 0x80A3C4E0, ((0x80A3D430, 0x80A3D67F),),()), + ('overlays/', 'decomp/', 'ovl_Obj_Smork', 0x80A3D680, ((0x80A3E270, 0x80A3E38F),),()), + ('overlays/', 'decomp/', 'ovl_En_Test2', 0x80A3E390, ((0x80A3E690, 0x80A3E7DF),),()), + ('overlays/', 'decomp/', 'ovl_En_Test3', 0x80A3E7E0, ((0x80A41530, 0x80A41D1F),),((0x80A41D20,0x80A41D6F),)), + ('overlays/', 'decomp/', 'ovl_En_Test4', 0x80A41D70, ((0x80A43320, 0x80A434CF),),((0x80A434D0,0x80A434DF),)), + ('overlays/', 'decomp/', 'ovl_En_Bat', 0x80A434E0, ((0x80A449E0, 0x80A44C6F),),((0x80A44C70,0x80A44C7F),)), + ('overlays/', 'decomp/', 'ovl_En_Sekihi', 0x80A44C80, ((0x80A45250, 0x80A4535F),),()), + ('overlays/', 'decomp/', 'ovl_En_Wiz', 0x80A45360, ((0x80A48B30, 0x80A48FDF),),()), + ('overlays/', 'decomp/', 'ovl_En_Wiz_Brock', 0x80A48FE0, ((0x80A495B0, 0x80A4969F),),()), + ('overlays/', 'decomp/', 'ovl_En_Wiz_Fire', 0x80A496A0, ((0x80A4C1C0, 0x80A4C48F),),()), + ('overlays/', 'decomp/', 'ovl_Eff_Change', 0x80A4C490, ((0x80A4C900, 0x80A4C9AF),),()), + ('overlays/', 'decomp/', 'ovl_Dm_Statue', 0x80A4C9B0, ((0x80A4CA40, 0x80A4CA8F),),()), + ('overlays/', 'decomp/', 'ovl_Obj_Fireshield', 0x80A4CA90, ((0x80A4D800, 0x80A4D9EF),),()), + ('overlays/', 'decomp/', 'ovl_Bg_Ladder', 0x80A4D9F0, ((0x80A4DE20, 0x80A4DECF),),()), + ('overlays/', 'decomp/', 'ovl_En_Mkk', 0x80A4DED0, ((0x80A4F700, 0x80A4FA3F),),()), + ('overlays/', 'decomp/', 'ovl_Demo_Getitem', 0x80A4FA40, ((0x80A4FD40, 0x80A4FDCF),),()), + ('overlays/', 'decomp/', 'ovl_En_Dnb', 0x80A4FDD0, ((0x80A50C90, 0x80A50D3F),),()), + ('overlays/', 'decomp/', 'ovl_En_Dnh', 0x80A50D40, ((0x80A51250, 0x80A514EF),),()), + ('overlays/', 'decomp/', 'ovl_En_Dnk', 0x80A514F0, ((0x80A521A0, 0x80A5252F),),()), + ('overlays/', 'decomp/', 'ovl_En_Dnq', 0x80A52530, ((0x80A53400, 0x80A537CF),),()), + ('overlays/', 'decomp/', 'ovl_Bg_Keikoku_Saku', 0x80A537D0, ((0x80A53B50, 0x80A53BDF),),()), + ('overlays/', 'decomp/', 'ovl_Obj_Hugebombiwa', 0x80A53BE0, ((0x80A55CE0, 0x80A560BF),),()), + ('overlays/', 'decomp/', 'ovl_En_Firefly2', 0x80A560C0, ((0x80A56100, 0x80A5614F),),()), + ('overlays/', 'decomp/', 'ovl_En_Rat', 0x80A56150, ((0x80A583E0, 0x80A5879F),),()), + ('overlays/', 'decomp/', 'ovl_En_Water_Effect', 0x80A587A0, ((0x80A5AF90, 0x80A5B15F),),()), + ('overlays/', 'decomp/', 'ovl_En_Kusa2', 0x80A5B160, ((0x80A5EAA0, 0x80A5F1BF),),((0x80A5F1C0,0x80A60B1F),)), + ('overlays/', 'decomp/', 'ovl_Bg_Spout_Fire', 0x80A60B20, ((0x80A61140, 0x80A612AF),),()), + ('overlays/', 'decomp/', 'ovl_En_Dy_Extra', 0x80A612B0, ((0x80A61720, 0x80A6180F),),()), + ('overlays/', 'decomp/', 'ovl_En_Bal', 0x80A61810, ((0x80A63CC0, 0x80A6449F),),()), + ('overlays/', 'decomp/', 'ovl_En_Ginko_Man', 0x80A644A0, ((0x80A65D40, 0x80A6617F),),()), + ('overlays/', 'decomp/', 'ovl_En_Warp_Uzu', 0x80A66180, ((0x80A664A0, 0x80A6656F),),()), + ('overlays/', 'decomp/', 'ovl_Obj_Driftice', 0x80A66570, ((0x80A67600, 0x80A678AF),),()), + ('overlays/', 'decomp/', 'ovl_En_Look_Nuts', 0x80A678B0, ((0x80A685E0, 0x80A6879F),),()), + ('overlays/', 'decomp/', 'ovl_En_Mushi2', 0x80A687A0, ((0x80A6B930, 0x80A6BF8F),),()), + ('overlays/', 'decomp/', 'ovl_En_Fall', 0x80A6BF90, ((0x80A6E490, 0x80A6E98F),),((0x80A6E990,0x80A6F09F),)), + ('overlays/', 'decomp/', 'ovl_En_Mm3', 0x80A6F0A0, ((0x80A703D0, 0x80A706EF),),()), + ('overlays/', 'decomp/', 'ovl_Bg_Crace_Movebg', 0x80A706F0, ((0x80A71080, 0x80A711AF),),((0x80A711B0,0x80A711CF),)), + ('overlays/', 'decomp/', 'ovl_En_Dno', 0x80A711D0, ((0x80A739A0, 0x80A73F9F),),()), + ('overlays/', 'decomp/', 'ovl_En_Pr2', 0x80A73FA0, ((0x80A75BC0, 0x80A75DBF),),()), + ('overlays/', 'decomp/', 'ovl_En_Prz', 0x80A75DC0, ((0x80A771C0, 0x80A773BF),),()), + ('overlays/', 'decomp/', 'ovl_En_Jso2', 0x80A773C0, ((0x80A7B4F0, 0x80A7BC6F),),()), + ('overlays/', 'decomp/', 'ovl_Obj_Etcetera', 0x80A7BC70, ((0x80A7C770, 0x80A7C98F),),()), + ('overlays/', 'decomp/', 'ovl_En_Egol', 0x80A7C990, ((0x80A80C40, 0x80A811CF),),()), + ('overlays/', 'decomp/', 'ovl_Obj_Mine', 0x80A811D0, ((0x80A84550, 0x80A849CF),),((0x80A849D0,0x80A84CCF),)), + ('overlays/', 'decomp/', 'ovl_Obj_Purify', 0x80A84CD0, ((0x80A85460, 0x80A8561F),),()), + ('overlays/', 'decomp/', 'ovl_En_Tru', 0x80A85620, ((0x80A88910, 0x80A8B76F),),()), + ('overlays/', 'decomp/', 'ovl_En_Trt', 0x80A8B770, ((0x80A8FE10, 0x80A903AF),),()), + ('overlays/', 'decomp/', 'ovl_En_Test5', 0x80A903B0, ((0x80A906E0, 0x80A9072F),),()), + ('overlays/', 'decomp/', 'ovl_En_Test6', 0x80A90730, ((0x80A93E60, 0x80A9490F),),((0x80A94910,0x80A94A2F),)), + ('overlays/', 'decomp/', 'ovl_En_Az', 0x80A94A30, ((0x80A99010, 0x80A99E7F),),((0x80A99E80,0x80A99E9F),)), + ('overlays/', 'decomp/', 'ovl_En_Estone', 0x80A99EA0, ((0x80A9AB50, 0x80A9ACCF),),()), + ('overlays/', 'decomp/', 'ovl_Bg_Hakugin_Post', 0x80A9ACD0, ((0x80A9D860, 0x80A9DDBF),),((0x80A9DDC0,0x80A9F94F),)), + ('overlays/', 'decomp/', 'ovl_Dm_Opstage', 0x80A9F950, ((0x80A9FD10, 0x80A9FDAF),),()), + ('overlays/', 'decomp/', 'ovl_Dm_Stk', 0x80A9FDB0, ((0x80AA3580, 0x80AA557F),),()), + ('overlays/', 'decomp/', 'ovl_Dm_Char00', 0x80AA5580, ((0x80AA6F90, 0x80AA81DF),),()), + ('overlays/', 'decomp/', 'ovl_Dm_Char01', 0x80AA81E0, ((0x80AA9DC0, 0x80AAAE1F),),((0x80AAAE20,0x80AAAE2F),)), + ('overlays/', 'decomp/', 'ovl_Dm_Char02', 0x80AAAE30, ((0x80AAB390, 0x80AAB49F),),()), + ('overlays/', 'decomp/', 'ovl_Dm_Char03', 0x80AAB4A0, ((0x80AABB60, 0x80AABC3F),),()), + ('overlays/', 'decomp/', 'ovl_Dm_Char04', 0x80AABC40, ((0x80AAC440, 0x80AAC59F),),()), + ('overlays/', 'decomp/', 'ovl_Dm_Char05', 0x80AAC5A0, ((0x80AAE240, 0x80AAE67F),),()), + ('overlays/', 'decomp/', 'ovl_Dm_Char06', 0x80AAE680, ((0x80AAE960, 0x80AAE9BF),),()), + ('overlays/', 'decomp/', 'ovl_Dm_Char07', 0x80AAE9C0, ((0x80AAEFF0, 0x80AAF04F),),()), + ('overlays/', 'decomp/', 'ovl_Dm_Char08', 0x80AAF050, ((0x80AB1370, 0x80AB1E0F),),()), + ('overlays/', 'decomp/', 'ovl_Dm_Char09', 0x80AB1E10, ((0x80AB2690, 0x80AB278F),),()), + ('overlays/', 'decomp/', 'ovl_Obj_Tokeidai', 0x80AB2790, ((0x80AB49C0, 0x80AB4D0F),),()), + ('overlays/', 'decomp/', 'ovl_En_Mnk', 0x80AB4D10, ((0x80AB9CF0, 0x80ABA79F),),()), + ('overlays/', 'decomp/', 'ovl_En_Egblock', 0x80ABA7A0, ((0x80ABB040, 0x80ABB0DF),),()), + ('overlays/', 'decomp/', 'ovl_En_Guard_Nuts', 0x80ABB0E0, ((0x80ABBDD0, 0x80ABBFBF),),()), + ('overlays/', 'decomp/', 'ovl_Bg_Hakugin_Bombwall', 0x80ABBFC0, ((0x80ABCF60, 0x80ABD1CF),),()), + ('overlays/', 'decomp/', 'ovl_Obj_Tokei_Tobira', 0x80ABD1D0, ((0x80ABD730, 0x80ABD82F),),()), + ('overlays/', 'decomp/', 'ovl_Bg_Hakugin_Elvpole', 0x80ABD830, ((0x80ABDC50, 0x80ABDC9F),),()), + ('overlays/', 'decomp/', 'ovl_En_Ma4', 0x80ABDCA0, ((0x80AC0090, 0x80AC082F),),()), + ('overlays/', 'decomp/', 'ovl_En_Twig', 0x80AC0830, ((0x80AC1090, 0x80AC122F),),((0x80AC1230,0x80AC126F),)), + ('overlays/', 'decomp/', 'ovl_En_Po_Fusen', 0x80AC1270, ((0x80AC1D80, 0x80AC1ECF),),()), + ('overlays/', 'decomp/', 'ovl_En_Door_Etc', 0x80AC1ED0, ((0x80AC2580, 0x80AC26EF),),()), + ('overlays/', 'decomp/', 'ovl_En_Bigokuta', 0x80AC26F0, ((0x80AC4510, 0x80AC48EF),),()), + ('overlays/', 'decomp/', 'ovl_Bg_Icefloe', 0x80AC48F0, ((0x80AC4F10, 0x80AC505F),),((0x80AC5060,0x80AC506F),)), + ('overlays/', 'decomp/', '385_0x00cfc450', 0x80AC5070, ((0x80AC5630, 0x80AC57AF),),()), + ('overlays/', 'decomp/', '386_0x00cfc970', 0x80AC57B0, ((0x80AC5C20, 0x80AC673F),),()), + ('overlays/', 'decomp/', '387_0x00cfd400', 0x80AC6740, ((0x80AC6C60, 0x80AC842F),),()), + ('overlays/', 'decomp/', '388_0x00cfdf10', 0x80AC8430, ((0x80AC8650, 0x80AC86EF),),()), + ('overlays/', 'decomp/', '389_0x00cfe150', 0x80AC86F0, ((0x80AC8AB0, 0x80AC8B4F),),()), + ('overlays/', 'decomp/', 'ovl_Effect_Ss_Sbn', 0x80AC8B50, ((0x80AC93B0, 0x80AC94BF),),()), + ('overlays/', 'decomp/', 'ovl_Obj_Ocarinalift', 0x80AC94C0, ((0x80AC9D50, 0x80AC9E9F),),()), + ('overlays/', 'decomp/', 'ovl_En_Time_Tag', 0x80AC9EA0, ((0x80ACA9D0, 0x80ACAB0F),),()), + ('overlays/', 'decomp/', 'ovl_Bg_Open_Shutter', 0x80ACAB10, ((0x80ACB120, 0x80ACB1DF),),()), + ('overlays/', 'decomp/', 'ovl_Bg_Open_Spot', 0x80ACB1E0, ((0x80ACB390, 0x80ACB3FF),),()), + ('overlays/', 'decomp/', 'ovl_Bg_Fu_Kaiten', 0x80ACB400, ((0x80ACB630, 0x80ACB69F),),()), + ('overlays/', 'decomp/', 'ovl_Obj_Aqua', 0x80ACB6A0, ((0x80ACC2A0, 0x80ACC46F),),()), + ('overlays/', 'decomp/', 'ovl_En_Elforg', 0x80ACC470, ((0x80ACDA10, 0x80ACDCCF),),()), + ('overlays/', 'decomp/', 'ovl_En_Elfbub', 0x80ACDCD0, ((0x80ACE250, 0x80ACE32F),),()), + ('overlays/', 'decomp/', 'ovl_En_Fu_Mato', 0x80ACE330, ((0x80ACF5F0, 0x80ACF77F),),()), + ('overlays/', 'decomp/', 'ovl_En_Fu_Kago', 0x80ACF780, ((0x80AD05D0, 0x80AD082F),),()), + ('overlays/', 'decomp/', 'ovl_En_Osn', 0x80AD0830, ((0x80AD22A0, 0x80AD2B6F),),()), + ('overlays/', 'decomp/', 'ovl_Bg_Ctower_Gear', 0x80AD2B70, ((0x80AD3250, 0x80AD337F),),()), + ('overlays/', 'decomp/', 'ovl_En_Trt2', 0x80AD3380, ((0x80AD57E0, 0x80AD5BAF),),()), + ('overlays/', 'decomp/', 'ovl_Obj_Tokei_Step', 0x80AD5BB0, ((0x80AD6600, 0x80AD675F),),()), + ('overlays/', 'decomp/', 'ovl_Bg_Lotus', 0x80AD6760, ((0x80AD6CF0, 0x80AD6DCF),),()), + ('overlays/', 'decomp/', 'ovl_En_Kame', 0x80AD6DD0, ((0x80AD8DC0, 0x80AD923F),),()), + ('overlays/', 'decomp/', 'ovl_Obj_Takaraya_Wall', 0x80AD9240, ((0x80ADA280, 0x80ADA44F),),((0x80ADA450,0x80ADAAEF),)), + ('overlays/', 'decomp/', 'ovl_Bg_Fu_Mizu', 0x80ADAAF0, ((0x80ADAD80, 0x80ADADCF),),()), + ('overlays/', 'decomp/', 'ovl_En_Sellnuts', 0x80ADADD0, ((0x80ADD910, 0x80ADE22F),),()), + ('overlays/', 'decomp/', 'ovl_Bg_Dkjail_Ivy', 0x80ADE230, ((0x80ADE930, 0x80ADEA6F),),()), + ('overlays/', 'decomp/', 'ovl_Obj_Visiblock', 0x80ADEA70, ((0x80ADEB30, 0x80ADEB8F),),()), + ('overlays/', 'decomp/', 'ovl_En_Takaraya', 0x80ADEB90, ((0x80ADFAE0, 0x80ADFC9F),),()), + ('overlays/', 'decomp/', 'ovl_En_Tsn', 0x80ADFCA0, ((0x80AE1170, 0x80AE164F),),()), + ('overlays/', 'decomp/', 'ovl_En_Ds2n', 0x80AE1650, ((0x80AE1AB0, 0x80AE1B6F),),()), + ('overlays/', 'decomp/', 'ovl_En_Fsn', 0x80AE1B70, ((0x80AE5B00, 0x80AE612F),),()), + ('overlays/', 'decomp/', 'ovl_En_Shn', 0x80AE6130, ((0x80AE6F00, 0x80AE739F),),()), + ('overlays/', 'decomp/', 'ovl_En_Stop_heishi', 0x80AE73A0, ((0x80AE8890, 0x80AE8B6F),),()), + ('overlays/', 'decomp/', 'ovl_Obj_Bigicicle', 0x80AE8B70, ((0x80AE9800, 0x80AE9A1F),),()), + ('overlays/', 'decomp/', 'ovl_En_Lift_Nuts', 0x80AE9A20, ((0x80AEBD30, 0x80AEC45F),),()), + ('overlays/', 'decomp/', 'ovl_En_Tk', 0x80AEC460, ((0x80AEF800, 0x80AF004F),),((0x80AF0050,0x80AF005F),)), + ('overlays/', 'decomp/', 'ovl_Bg_Market_Step', 0x80AF0060, ((0x80AF00F0, 0x80AF016F),),()), + ('overlays/', 'decomp/', 'ovl_Obj_Lupygamelift', 0x80AF0170, ((0x80AF0720, 0x80AF081F),),()), + ('overlays/', 'decomp/', 'ovl_En_Test7', 0x80AF0820, ((0x80AF33F0, 0x80AF38AF),),((0x80AF38B0,0x80AF390F),)), + ('overlays/', 'decomp/', 'ovl_Obj_Lightblock', 0x80AF3910, ((0x80AF3E80, 0x80AF3F6F),),()), + ('overlays/', 'decomp/', 'ovl_Mir_Ray2', 0x80AF3F70, ((0x80AF4330, 0x80AF43EF),),()), + ('overlays/', 'decomp/', 'ovl_En_Wdhand', 0x80AF43F0, ((0x80AF63C0, 0x80AF675F),),()), + ('overlays/', 'decomp/', 'ovl_En_Gamelupy', 0x80AF6760, ((0x80AF6CD0, 0x80AF6DDF),),()), + ('overlays/', 'decomp/', 'ovl_Bg_Danpei_Movebg', 0x80AF6DE0, ((0x80AF7510, 0x80AF763F),),()), + ('overlays/', 'decomp/', 'ovl_En_Snowwd', 0x80AF7640, ((0x80AF7A70, 0x80AF7B3F),),()), + ('overlays/', 'decomp/', 'ovl_En_Pm', 0x80AF7B40, ((0x80AFAD80, 0x80AFC95F),),()), + ('overlays/', 'decomp/', 'ovl_En_Gakufu', 0x80AFC960, ((0x80AFD1B0, 0x80AFD37F),),()), + ('overlays/', 'decomp/', 'ovl_Elf_Msg4', 0x80AFD380, ((0x80AFD8D0, 0x80AFD98F),),()), + ('overlays/', 'decomp/', 'ovl_Elf_Msg5', 0x80AFD990, ((0x80AFDBB0, 0x80AFDC3F),),()), + ('overlays/', 'decomp/', 'ovl_En_Col_Man', 0x80AFDC40, ((0x80AFE730, 0x80AFE89F),),()), + ('overlays/', 'decomp/', 'ovl_En_Talk_Gibud', 0x80AFE8A0, ((0x80B011E0, 0x80B0198F),),()), + ('overlays/', 'decomp/', 'ovl_En_Giant', 0x80B01990, ((0x80B02930, 0x80B02CCF),),()), + ('overlays/', 'decomp/', 'ovl_Obj_Snowball', 0x80B02CD0, ((0x80B04F30, 0x80B0528F),),()), + ('overlays/', 'decomp/', 'ovl_Boss_Hakugin', 0x80B05290, ((0x80B0E6E0, 0x80B0F5DF),),()), + ('overlays/', 'decomp/', 'ovl_En_Gb2', 0x80B0F5E0, ((0x80B11990, 0x80B11E5F),),()), + ('overlays/', 'decomp/', 'ovl_En_Onpuman', 0x80B11E60, ((0x80B12370, 0x80B1242F),),()), + ('overlays/', 'decomp/', 'ovl_Bg_Tobira01', 0x80B12430, ((0x80B12800, 0x80B1286F),),()), + ('overlays/', 'decomp/', 'ovl_En_Tag_Obj', 0x80B12870, ((0x80B12900, 0x80B1297F),),()), + ('overlays/', 'decomp/', 'ovl_Obj_Dhouse', 0x80B12980, ((0x80B13E70, 0x80B1417F),),()), + ('overlays/', 'decomp/', 'ovl_Obj_Hakaisi', 0x80B14180, ((0x80B15590, 0x80B1578F),),()), + ('overlays/', 'decomp/', 'ovl_Bg_Hakugin_Switch', 0x80B15790, ((0x80B16840, 0x80B16AEF),),((0x80B16AF0,0x80B16AFF),)), + ('overlays/', 'decomp/', 'ovl_En_Snowman', 0x80B16B00, ((0x80B199E0, 0x80B19F5F),),()), + ('overlays/', 'decomp/', 'ovl_TG_Sw', 0x80B19F60, ((0x80B1A320, 0x80B1A3AF),),()), + ('overlays/', 'decomp/', 'ovl_En_Po_Sisters', 0x80B1A3B0, ((0x80B1DA30, 0x80B1DEAF),),()), + ('overlays/', 'decomp/', 'ovl_En_Pp', 0x80B1DEB0, ((0x80B21620, 0x80B21AFF),),()), + ('overlays/', 'decomp/', 'ovl_En_Hakurock', 0x80B21B00, ((0x80B22A60, 0x80B22BFF),),()), + ('overlays/', 'decomp/', 'ovl_En_Hanabi', 0x80B22C00, ((0x80B23A80, 0x80B23D4F),),()), + ('overlays/', 'decomp/', 'ovl_Obj_Dowsing', 0x80B23D50, ((0x80B23E80, 0x80B23ECF),),()), + ('overlays/', 'decomp/', 'ovl_Obj_Wind', 0x80B23ED0, ((0x80B24460, 0x80B2462F),),()), + ('overlays/', 'decomp/', 'ovl_En_Racedog', 0x80B24630, ((0x80B25D20, 0x80B2629F),),()), + ('overlays/', 'decomp/', 'ovl_En_Kendo_Js', 0x80B262A0, ((0x80B27C10, 0x80B2807F),),()), + ('overlays/', 'decomp/', 'ovl_Bg_Botihasira', 0x80B28080, ((0x80B282D0, 0x80B2836F),),()), + ('overlays/', 'decomp/', 'ovl_En_Fish2', 0x80B28370, ((0x80B2B2E0, 0x80B2B82F),),()), + ('overlays/', 'decomp/', 'ovl_En_Pst', 0x80B2B830, ((0x80B2C200, 0x80B2C6EF),),()), + ('overlays/', 'decomp/', 'ovl_En_Poh', 0x80B2C6F0, ((0x80B2F660, 0x80B2FB0F),),()), + ('overlays/', 'decomp/', 'ovl_Obj_Spidertent', 0x80B2FB10, ((0x80B31040, 0x80B3158F),),()), + ('overlays/', 'decomp/', 'ovl_En_Zoraegg', 0x80B31590, ((0x80B33910, 0x80B33D2F),),()), + ('overlays/', 'decomp/', 'ovl_En_Kbt', 0x80B33D30, ((0x80B34B20, 0x80B34F6F),),()), + ('overlays/', 'decomp/', 'ovl_En_Gg', 0x80B34F70, ((0x80B36BE0, 0x80B3707F),),()), + ('overlays/', 'decomp/', 'ovl_En_Maruta', 0x80B37080, ((0x80B38680, 0x80B38E1F),),()), + ('overlays/', 'decomp/', 'ovl_Obj_Snowball2', 0x80B38E20, ((0x80B3A8C0, 0x80B3AC4F),),()), + ('overlays/', 'decomp/', 'ovl_En_Gg2', 0x80B3AC50, ((0x80B3BEE0, 0x80B3C25F),),()), + ('overlays/', 'decomp/', 'ovl_Obj_Ghaka', 0x80B3C260, ((0x80B3C940, 0x80B3CA1F),),()), + ('overlays/', 'decomp/', 'ovl_En_Dnp', 0x80B3CA20, ((0x80B3DC60, 0x80B3DFEF),),()), + ('overlays/', 'decomp/', 'ovl_En_Dai', 0x80B3DFF0, ((0x80B3FBD0, 0x80B4007F),),()), + ('overlays/', 'decomp/', 'ovl_Bg_Goron_Oyu', 0x80B40080, ((0x80B40760, 0x80B407FF),),()), + ('overlays/', 'decomp/', 'ovl_En_Kgy', 0x80B40800, ((0x80B43250, 0x80B439AF),),()), + ('overlays/', 'decomp/', 'ovl_En_Invadepoh', 0x80B439B0, ((0x80B4E890, 0x80B5029F),),((0x80B502A0,0x80B5040F),)), + ('overlays/', 'decomp/', 'ovl_En_Gk', 0x80B50410, ((0x80B531F0, 0x80B5383F),),()), + ('overlays/', 'decomp/', 'ovl_En_An', 0x80B53840, ((0x80B581D0, 0x80B5A71F),),()), + ('overlays/', 'decomp/', 'ovl_En_Bee', 0x80B5A720, ((0x80B5B1F0, 0x80B5B2DF),),()), + ('overlays/', 'decomp/', 'ovl_En_Ot', 0x80B5B2E0, ((0x80B5E380, 0x80B5E87F),),((0x80B5E880,0x80B5E88F),)), + ('overlays/', 'decomp/', 'ovl_En_Dragon', 0x80B5E890, ((0x80B605D0, 0x80B60ACF),),()), + ('overlays/', 'decomp/', 'ovl_Obj_Dora', 0x80B60AD0, ((0x80B612F0, 0x80B615DF),),()), + ('overlays/', 'decomp/', 'ovl_En_Bigpo', 0x80B615E0, ((0x80B64FF0, 0x80B654BF),),()), + ('overlays/', 'decomp/', 'ovl_Obj_Kendo_Kanban', 0x80B654C0, ((0x80B66640, 0x80B66A1F),),()), + ('overlays/', 'decomp/', 'ovl_Obj_Hariko', 0x80B66A20, ((0x80B66CB0, 0x80B66D2F),),()), + ('overlays/', 'decomp/', 'ovl_En_Sth', 0x80B66D30, ((0x80B685A0, 0x80B6D65F),),()), + ('overlays/', 'decomp/', 'ovl_Bg_Sinkai_Kabe', 0x80B6D660, ((0x80B6DB50, 0x80B6DBDF),),()), + ('overlays/', 'decomp/', 'ovl_Bg_Haka_Curtain', 0x80B6DBE0, ((0x80B6DF80, 0x80B6E01F),),()), + ('overlays/', 'decomp/', 'ovl_Bg_Kin2_Bombwall', 0x80B6E020, ((0x80B6E6D0, 0x80B6E81F),),()), + ('overlays/', 'decomp/', 'ovl_Bg_Kin2_Fence', 0x80B6E820, ((0x80B6EDC0, 0x80B6EF9F),),()), + ('overlays/', 'decomp/', 'ovl_Bg_Kin2_Picture', 0x80B6EFA0, ((0x80B6F970, 0x80B6FB2F),),()), + ('overlays/', 'decomp/', 'ovl_Bg_Kin2_Shelf', 0x80B6FB30, ((0x80B70730, 0x80B708BF),),()), + ('overlays/', 'decomp/', 'ovl_En_Rail_Skb', 0x80B708C0, ((0x80B732B0, 0x80B73A8F),),()), + ('overlays/', 'decomp/', 'ovl_En_Jg', 0x80B73A90, ((0x80B75800, 0x80B7602F),),()), + ('overlays/', 'decomp/', 'ovl_En_Tru_Mt', 0x80B76030, ((0x80B774F0, 0x80B7776F),),()), + ('overlays/', 'decomp/', 'ovl_Obj_Um', 0x80B77770, ((0x80B7C0F0, 0x80B7C88F),),()), + ('overlays/', 'decomp/', 'ovl_En_Neo_Reeba', 0x80B7C890, ((0x80B7E4E0, 0x80B7E92F),),()), + ('overlays/', 'decomp/', 'ovl_Bg_Mbar_Chair', 0x80B7E930, ((0x80B7EA00, 0x80B7EA5F),),()), + ('overlays/', 'decomp/', 'ovl_Bg_Ikana_Block', 0x80B7EA60, ((0x80B7F620, 0x80B7F72F),),()), + ('overlays/', 'decomp/', 'ovl_Bg_Ikana_Mirror', 0x80B7F730, ((0x80B7FF30, 0x80B802DF),),()), + ('overlays/', 'decomp/', 'ovl_Bg_Ikana_Rotaryroom', 0x80B802E0, ((0x80B820C0, 0x80B823AF),),()), + ('overlays/', 'decomp/', 'ovl_Bg_Dblue_Balance', 0x80B823B0, ((0x80B83A00, 0x80B83C6F),),((0x80B83C70,0x80B83C7F),)), + ('overlays/', 'decomp/', 'ovl_Bg_Dblue_Waterfall', 0x80B83C80, ((0x80B85350, 0x80B8558F),),()), + ('overlays/', 'decomp/', 'ovl_En_Kaizoku', 0x80B85590, ((0x80B8A8D0, 0x80B8B2CF),),()), + ('overlays/', 'decomp/', 'ovl_En_Ge2', 0x80B8B2D0, ((0x80B8CE20, 0x80B8D02F),),()), + ('overlays/', 'decomp/', 'ovl_En_Ma_Yts', 0x80B8D030, ((0x80B8E150, 0x80B8E51F),),()), + ('overlays/', 'decomp/', 'ovl_En_Ma_Yto', 0x80B8E520, ((0x80B913F0, 0x80B91CBF),),()), + ('overlays/', 'decomp/', 'ovl_Obj_Tokei_Turret', 0x80B91CC0, ((0x80B91EA0, 0x80B91F1F),),()), + ('overlays/', 'decomp/', 'ovl_Bg_Dblue_Elevator', 0x80B91F20, ((0x80B92940, 0x80B92B0F),),()), + ('overlays/', 'decomp/', 'ovl_Obj_Warpstone', 0x80B92B10, ((0x80B93200, 0x80B9330F),),()), + ('overlays/', 'decomp/', 'ovl_En_Zog', 0x80B93310, ((0x80B95860, 0x80B95E0F),),((0x80B95E10,0x80B95E1F),)), + ('overlays/', 'decomp/', 'ovl_Obj_Rotlift', 0x80B95E20, ((0x80B96140, 0x80B961DF),),()), + ('overlays/', 'decomp/', 'ovl_Obj_Jg_Gakki', 0x80B961E0, ((0x80B963C0, 0x80B9640F),),()), + ('overlays/', 'decomp/', 'ovl_Bg_Inibs_Movebg', 0x80B96410, ((0x80B96540, 0x80B965CF),),()), + ('overlays/', 'decomp/', 'ovl_En_Zot', 0x80B965D0, ((0x80B998C0, 0x80B9A0AF),),()), + ('overlays/', 'decomp/', 'ovl_Obj_Tree', 0x80B9A0B0, ((0x80B9A550, 0x80B9A64F),),()), + ('overlays/', 'decomp/', 'ovl_Obj_Y2lift', 0x80B9A650, ((0x80B9A920, 0x80B9A97F),),()), + ('overlays/', 'decomp/', 'ovl_Obj_Y2shutter', 0x80B9A980, ((0x80B9AE50, 0x80B9AF4F),),()), + ('overlays/', 'decomp/', 'ovl_Obj_Boat', 0x80B9AF50, ((0x80B9B660, 0x80B9B6DF),),()), + ('overlays/', 'decomp/', 'ovl_Obj_Taru', 0x80B9B6E0, ((0x80B9C320, 0x80B9C44F),),()), + ('overlays/', 'decomp/', 'ovl_Obj_Hunsui', 0x80B9C450, ((0x80B9DC70, 0x80B9DECF),),((0x80B9DED0,0x80B9DEDF),)), + ('overlays/', 'decomp/', 'ovl_En_Jc_Mato', 0x80B9DEE0, ((0x80B9E1F0, 0x80B9E2BF),),()), + ('overlays/', 'decomp/', 'ovl_Mir_Ray3', 0x80B9E2C0, ((0x80B9F400, 0x80B9F56F),),()), + ('overlays/', 'decomp/', 'ovl_En_Zob', 0x80B9F570, ((0x80BA10B0, 0x80BA159F),),()), + ('overlays/', 'decomp/', 'ovl_Elf_Msg6', 0x80BA15A0, ((0x80BA22E0, 0x80BA241F),),()), + ('overlays/', 'decomp/', 'ovl_Obj_Nozoki', 0x80BA2420, ((0x80BA3490, 0x80BA36AF),),((0x80BA36B0,0x80BA36BF),)), + ('overlays/', 'decomp/', 'ovl_En_Toto', 0x80BA36C0, ((0x80BA4FD0, 0x80BA53FF),),()), + ('overlays/', 'decomp/', 'ovl_En_Railgibud', 0x80BA5400, ((0x80BA80A0, 0x80BA881F),),()), + ('overlays/', 'decomp/', 'ovl_En_Baba', 0x80BA8820, ((0x80BAA380, 0x80BAA6CF),),()), + ('overlays/', 'decomp/', 'ovl_En_Suttari', 0x80BAA6D0, ((0x80BAE6B0, 0x80BAEF6F),),()), + ('overlays/', 'decomp/', 'ovl_En_Zod', 0x80BAEF70, ((0x80BB0520, 0x80BB08DF),),()), + ('overlays/', 'decomp/', 'ovl_En_Kujiya', 0x80BB08E0, ((0x80BB1500, 0x80BB16CF),),()), + ('overlays/', 'decomp/', 'ovl_En_Geg', 0x80BB16D0, ((0x80BB3E50, 0x80BB46FF),),()), + ('overlays/', 'decomp/', 'ovl_Obj_Kinoko', 0x80BB4700, ((0x80BB4A70, 0x80BB4AEF),),()), + ('overlays/', 'decomp/', 'ovl_Obj_Yasi', 0x80BB4AF0, ((0x80BB4D70, 0x80BB4DFF),),()), + ('overlays/', 'decomp/', 'ovl_En_Tanron1', 0x80BB4E00, ((0x80BB5E00, 0x80BB67CF),),()), + ('overlays/', 'decomp/', 'ovl_En_Tanron2', 0x80BB67D0, ((0x80BB8150, 0x80BB844F),),((0x80BB8450,0x80BB859F),)), + ('overlays/', 'decomp/', 'ovl_En_Tanron3', 0x80BB85A0, ((0x80BB9720, 0x80BB98DF),),()), + ('overlays/', 'decomp/', 'ovl_Obj_Chan', 0x80BB98E0, ((0x80BBAB10, 0x80BBAC8F),),((0x80BBAC90,0x80BBAC9F),)), + ('overlays/', 'decomp/', 'ovl_En_Zos', 0x80BBACA0, ((0x80BBC6D0, 0x80BBCA7F),),()), + ('overlays/', 'decomp/', 'ovl_En_S_Goro', 0x80BBCA80, ((0x80BBF800, 0x80BBFDAF),),()), + ('overlays/', 'decomp/', 'ovl_En_Nb', 0x80BBFDB0, ((0x80BC13F0, 0x80BC18FF),),()), + ('overlays/', 'decomp/', 'ovl_En_Ja', 0x80BC1900, ((0x80BC35F0, 0x80BC397F),),()), + ('overlays/', 'decomp/', 'ovl_Bg_F40_Block', 0x80BC3980, ((0x80BC4600, 0x80BC47AF),),()), + ('overlays/', 'decomp/', 'ovl_Bg_F40_Switch', 0x80BC47B0, ((0x80BC4DD0, 0x80BC4F1F),),((0x80BC4F20,0x80BC4F2F),)), + ('overlays/', 'decomp/', 'ovl_En_Po_Composer', 0x80BC4F30, ((0x80BC6760, 0x80BC6BEF),),()), + ('overlays/', 'decomp/', 'ovl_En_Guruguru', 0x80BC6BF0, ((0x80BC7960, 0x80BC7ACF),),()), + ('overlays/', 'decomp/', 'ovl_Oceff_Wipe5', 0x80BC7AD0, ((0x80BC7EF0, 0x80BC925F),),((0x80BC9260,0x80BC926F),)), + ('overlays/', 'decomp/', 'ovl_En_Stone_heishi', 0x80BC9270, ((0x80BCA380, 0x80BCA59F),),()), + ('overlays/', 'decomp/', 'ovl_Oceff_Wipe6', 0x80BCA5A0, ((0x80BCA8B0, 0x80BCABEF),),()), + ('overlays/', 'decomp/', 'ovl_En_Scopenuts', 0x80BCABF0, ((0x80BCCB20, 0x80BCCFFF),),()), + ('overlays/', 'decomp/', 'ovl_En_Scopecrow', 0x80BCD000, ((0x80BCDB50, 0x80BCDCAF),),()), + ('overlays/', 'decomp/', 'ovl_Oceff_Wipe7', 0x80BCDCB0, ((0x80BCDFC0, 0x80BCEB0F),),((0x80BCEB10,0x80BCEB1F),)), + ('overlays/', 'decomp/', 'ovl_Eff_Kamejima_Wave', 0x80BCEB20, ((0x80BCF070, 0x80BCF1BF),),((0x80BCF1C0,0x80BCF1CF),)), + ('overlays/', 'decomp/', 'ovl_En_Hg', 0x80BCF1D0, ((0x80BCFF90, 0x80BD02AF),),()), + ('overlays/', 'decomp/', 'ovl_En_Hgo', 0x80BD02B0, ((0x80BD0E80, 0x80BD11DF),),()), + ('overlays/', 'decomp/', 'ovl_En_Zov', 0x80BD11E0, ((0x80BD26C0, 0x80BD2A2F),),()), + ('overlays/', 'decomp/', 'ovl_En_Ah', 0x80BD2A30, ((0x80BD3DB0, 0x80BD408F),),()), + ('overlays/', 'decomp/', 'ovl_Obj_Hgdoor', 0x80BD4090, ((0x80BD4670, 0x80BD471F),),()), + ('overlays/', 'decomp/', 'ovl_Bg_Ikana_Bombwall', 0x80BD4720, ((0x80BD5250, 0x80BD53BF),),()), + ('overlays/', 'decomp/', 'ovl_Bg_Ikana_Ray', 0x80BD53C0, ((0x80BD55D0, 0x80BD568F),),()), + ('overlays/', 'decomp/', 'ovl_Bg_Ikana_Shutter', 0x80BD5690, ((0x80BD5CF0, 0x80BD5DFF),),()), + ('overlays/', 'decomp/', 'ovl_Bg_Haka_Bombwall', 0x80BD5E00, ((0x80BD6480, 0x80BD657F),),()), + ('overlays/', 'decomp/', 'ovl_Bg_Haka_Tomb', 0x80BD6580, ((0x80BD6880, 0x80BD690F),),()), + ('overlays/', 'decomp/', 'ovl_En_Sc_Ruppe', 0x80BD6910, ((0x80BD6DF0, 0x80BD6F0F),),()), + ('overlays/', 'decomp/', 'ovl_Bg_Iknv_Doukutu', 0x80BD6F10, ((0x80BD79C0, 0x80BD7AAF),),()), + ('overlays/', 'decomp/', 'ovl_Bg_Iknv_Obj', 0x80BD7AB0, ((0x80BD81D0, 0x80BD82AF),),()), + ('overlays/', 'decomp/', 'ovl_En_Pamera', 0x80BD82B0, ((0x80BDA460, 0x80BDAA2F),),()), + ('overlays/', 'decomp/', 'ovl_Obj_HsStump', 0x80BDAA30, ((0x80BDAF60, 0x80BDB03F),),()), + ('overlays/', 'decomp/', 'ovl_En_Hidden_Nuts', 0x80BDB040, ((0x80BDC0B0, 0x80BDC26F),),()), + ('overlays/', 'decomp/', 'ovl_En_Zow', 0x80BDC270, ((0x80BDDCD0, 0x80BDDFDF),),()), + ('overlays/', 'decomp/', 'ovl_En_Talk', 0x80BDDFE0, ((0x80BDE140, 0x80BDE19F),),()), + ('overlays/', 'decomp/', 'ovl_En_Al', 0x80BDE1A0, ((0x80BDFC70, 0x80BE04DF),),()), + ('overlays/', 'decomp/', 'ovl_En_Tab', 0x80BE04E0, ((0x80BE18D0, 0x80BE1C7F),),()), + ('overlays/', 'decomp/', 'ovl_En_Nimotsu', 0x80BE1C80, ((0x80BE1F90, 0x80BE202F),),()), + ('overlays/', 'decomp/', 'ovl_En_Hit_Tag', 0x80BE2030, ((0x80BE21D0, 0x80BE225F),),()), + ('overlays/', 'decomp/', 'ovl_En_Ruppecrow', 0x80BE2260, ((0x80BE3990, 0x80BE3B7F),),()), + ('overlays/', 'decomp/', 'ovl_En_Tanron4', 0x80BE3B80, ((0x80BE4880, 0x80BE492F),),()), + ('overlays/', 'decomp/', 'ovl_En_Tanron5', 0x80BE4930, ((0x80BE5D80, 0x80BE603F),),()), + ('overlays/', 'decomp/', 'ovl_En_Tanron6', 0x80BE6040, ((0x80BE6150, 0x80BE61CF),),()), + ('overlays/', 'decomp/', 'ovl_En_Daiku2', 0x80BE61D0, ((0x80BE78D0, 0x80BE7AFF),),()), + ('overlays/', 'decomp/', 'ovl_En_Muto', 0x80BE7B00, ((0x80BE83F0, 0x80BE84EF),),()), + ('overlays/', 'decomp/', 'ovl_En_Baisen', 0x80BE84F0, ((0x80BE8DF0, 0x80BE8F1F),),()), + ('overlays/', 'decomp/', 'ovl_En_Heishi', 0x80BE8F20, ((0x80BE9430, 0x80BE950F),),()), + ('overlays/', 'decomp/', 'ovl_En_Demo_heishi', 0x80BE9510, ((0x80BE9A30, 0x80BE9B1F),),()), + ('overlays/', 'decomp/', 'ovl_En_Dt', 0x80BE9B20, ((0x80BEB1B0, 0x80BEB51F),),()), + ('overlays/', 'decomp/', 'ovl_En_Cha', 0x80BEB520, ((0x80BEB860, 0x80BEB93F),),()), + ('overlays/', 'decomp/', 'ovl_Obj_Dinner', 0x80BEB940, ((0x80BEBA70, 0x80BEBABF),),()), + ('overlays/', 'decomp/', 'ovl_Eff_Lastday', 0x80BEBAC0, ((0x80BEC190, 0x80BEC23F),),()), + ('overlays/', 'decomp/', 'ovl_Bg_Ikana_Dharma', 0x80BEC240, ((0x80BECAB0, 0x80BECBCF),),((0x80BECBD0,0x80BECBDF),)), + ('overlays/', 'decomp/', 'ovl_En_Akindonuts', 0x80BECBE0, ((0x80BF02D0, 0x80BF0D8F),),()), + ('overlays/', 'decomp/', 'ovl_Eff_Stk', 0x80BF0D90, ((0x80BF10C0, 0x80BF114F),),()), + ('overlays/', 'decomp/', 'ovl_En_Ig', 0x80BF1150, ((0x80BF3260, 0x80BF391F),),()), + ('overlays/', 'decomp/', 'ovl_En_Rg', 0x80BF3920, ((0x80BF5740, 0x80BF5C0F),),((0x80BF5C10,0x80BF5C1F),)), + ('overlays/', 'decomp/', 'ovl_En_Osk', 0x80BF5C20, ((0x80BF6F80, 0x80BF74DF),),()), + ('overlays/', 'decomp/', 'ovl_En_Sth2', 0x80BF74E0, ((0x80BF7920, 0x80BFA0FF),),()), + ('overlays/', 'decomp/', 'ovl_En_Yb', 0x80BFA100, ((0x80BFB290, 0x80BFB47F),),()), + ('overlays/', 'decomp/', 'ovl_En_Rz', 0x80BFB480, ((0x80BFCCC0, 0x80BFCF9F),),()), + ('overlays/', 'decomp/', 'ovl_En_Scopecoin', 0x80BFCFA0, ((0x80BFD260, 0x80BFD2DF),),()), + ('overlays/', 'decomp/', 'ovl_En_Bjt', 0x80BFD2E0, ((0x80BFDEA0, 0x80BFE16F),),()), + ('overlays/', 'decomp/', 'ovl_En_Bomjima', 0x80BFE170, ((0x80C009F0, 0x80C00E9F),),()), + ('overlays/', 'decomp/', 'ovl_En_Bomjimb', 0x80C00EA0, ((0x80C03170, 0x80C0352F),),()), + ('overlays/', 'decomp/', 'ovl_En_Bombers', 0x80C03530, ((0x80C04750, 0x80C0492F),),()), + ('overlays/', 'decomp/', 'ovl_En_Bombers2', 0x80C04930, ((0x80C05880, 0x80C05A6F),),()), + ('overlays/', 'decomp/', 'ovl_En_Bombal', 0x80C05A70, ((0x80C06440, 0x80C0650F),),()), + ('overlays/', 'decomp/', 'ovl_Obj_Moon_Stone', 0x80C06510, ((0x80C06A10, 0x80C06A9F),),()), + ('overlays/', 'decomp/', 'ovl_Obj_Mu_Pict', 0x80C06AA0, ((0x80C06FE0, 0x80C0710F),),()), + ('overlays/', 'decomp/', 'ovl_Bg_Ikninside', 0x80C07110, ((0x80C07680, 0x80C0773F),),()), + ('overlays/', 'decomp/', 'ovl_Eff_Zoraband', 0x80C07740, ((0x80C07AC0, 0x80C07B1F),),()), + ('overlays/', 'decomp/', 'ovl_Obj_Kepn_Koya', 0x80C07B20, ((0x80C07C20, 0x80C07C7F),),()), + ('overlays/', 'decomp/', 'ovl_Obj_Usiyane', 0x80C07C80, ((0x80C08640, 0x80C0875F),),()), + ('overlays/', 'decomp/', 'ovl_En_Nnh', 0x80C08760, ((0x80C089E0, 0x80C08A7F),),()), + ('overlays/', 'decomp/', 'ovl_Obj_Kzsaku', 0x80C08A80, ((0x80C08DD0, 0x80C08E3F),),()), + ('overlays/', 'decomp/', 'ovl_Obj_Milk_Bin', 0x80C08E40, ((0x80C09030, 0x80C090CF),),()), + ('overlays/', 'decomp/', 'ovl_En_Kitan', 0x80C090D0, ((0x80C09D30, 0x80C09ECF),),()), + ('overlays/', 'decomp/', 'ovl_Bg_Astr_Bombwall', 0x80C09ED0, ((0x80C0A600, 0x80C0A73F),),()), + ('overlays/', 'decomp/', 'ovl_Bg_Iknin_Susceil', 0x80C0A740, ((0x80C0B0C0, 0x80C0B28F),),()), + ('overlays/', 'decomp/', 'ovl_En_Bsb', 0x80C0B290, ((0x80C0F8D0, 0x80C0FFCF),),()), + ('overlays/', 'decomp/', 'ovl_En_Recepgirl', 0x80C0FFD0, ((0x80C10690, 0x80C1076F),),()), + ('overlays/', 'decomp/', 'ovl_En_Thiefbird', 0x80C10770, ((0x80C135A0, 0x80C1391F),),((0x80C13920,0x80C1392F),)), + ('overlays/', 'decomp/', 'ovl_En_Jgame_Tsn', 0x80C13930, ((0x80C15010, 0x80C152EF),),()), + ('overlays/', 'decomp/', 'ovl_Obj_Jgame_Light', 0x80C152F0, ((0x80C15BA0, 0x80C161DF),),()), + ('overlays/', 'decomp/', 'ovl_Obj_Yado', 0x80C161E0, ((0x80C16400, 0x80C1646F),),((0x80C16470,0x80C1647F),)), + ('overlays/', 'decomp/', 'ovl_Demo_Syoten', 0x80C16480, ((0x80C177B0, 0x80C17A0F),),()), + ('overlays/', 'decomp/', 'ovl_Demo_Moonend', 0x80C17A10, ((0x80C18070, 0x80C1811F),),()), + ('overlays/', 'decomp/', 'ovl_Bg_Lbfshot', 0x80C18120, ((0x80C181E0, 0x80C1823F),),()), + ('overlays/', 'decomp/', 'ovl_Bg_Last_Bwall', 0x80C18240, ((0x80C189A0, 0x80C18B8F),),()), + ('overlays/', 'decomp/', 'ovl_En_And', 0x80C18B90, ((0x80C19160, 0x80C1929F),),()), + ('overlays/', 'decomp/', 'ovl_En_Invadepoh_Demo', 0x80C192A0, ((0x80C1AA40, 0x80C1AD3F),),((0x80C1AD40,0x80C1ADBF),)), + ('overlays/', 'decomp/', 'ovl_Obj_Danpeilift', 0x80C1ADC0, ((0x80C1B520, 0x80C1B63F),),()), + ('overlays/', 'decomp/', 'ovl_En_Fall2', 0x80C1B640, ((0x80C1BBE0, 0x80C1BD8F),),()), + ('overlays/', 'decomp/', 'ovl_Dm_Al', 0x80C1BD90, ((0x80C1C250, 0x80C1C40F),),()), + ('overlays/', 'decomp/', 'ovl_Dm_An', 0x80C1C410, ((0x80C1D1A0, 0x80C1D40F),),()), + ('overlays/', 'decomp/', 'ovl_Dm_Ah', 0x80C1D410, ((0x80C1DDC0, 0x80C1DECF),),()), + ('overlays/', 'decomp/', 'ovl_Dm_Nb', 0x80C1DED0, ((0x80C1E1E0, 0x80C1E28F),),()), + ('overlays/', 'decomp/', 'ovl_En_Drs', 0x80C1E290, ((0x80C1E5C0, 0x80C1E68F),),()), + ('overlays/', 'decomp/', 'ovl_En_Ending_Hero', 0x80C1E690, ((0x80C1E950, 0x80C1E9DF),),()), + ('overlays/', 'decomp/', 'ovl_Dm_Bal', 0x80C1E9E0, ((0x80C1F150, 0x80C1F3CF),),()), + ('overlays/', 'decomp/', 'ovl_En_Paper', 0x80C1F3D0, ((0x80C1FC40, 0x80C1FCEF),),()), + ('overlays/', 'decomp/', 'ovl_En_Hint_Skb', 0x80C1FCF0, ((0x80C21C60, 0x80C2234F),),()), + ('overlays/', 'decomp/', 'ovl_Dm_Tag', 0x80C22350, ((0x80C22BD0, 0x80C22D3F),),()), + ('overlays/', 'decomp/', 'ovl_En_Bh', 0x80C22D40, ((0x80C231C0, 0x80C2322F),),()), + ('overlays/', 'decomp/', 'ovl_En_Ending_Hero2', 0x80C23230, ((0x80C23400, 0x80C2345F),),()), + ('overlays/', 'decomp/', 'ovl_En_Ending_Hero3', 0x80C23460, ((0x80C23630, 0x80C2368F),),()), + ('overlays/', 'decomp/', 'ovl_En_Ending_Hero4', 0x80C23690, ((0x80C23860, 0x80C238BF),),()), + ('overlays/', 'decomp/', 'ovl_En_Ending_Hero5', 0x80C238C0, ((0x80C23BD0, 0x80C23C8F),),()), + ('overlays/', 'decomp/', 'ovl_En_Ending_Hero6', 0x80C23C90, ((0x80C241E0, 0x80C2435F),),()), + ('overlays/', 'decomp/', 'ovl_Dm_Gm', 0x80C24360, ((0x80C250F0, 0x80C2535F),),()), + ('overlays/', 'decomp/', 'ovl_Obj_Swprize', 0x80C25360, ((0x80C257D0, 0x80C2589F),),()), + ('overlays/', 'decomp/', 'ovl_En_Invisible_Ruppe', 0x80C258A0, ((0x80C25B30, 0x80C25BBF),),()), + ('overlays/', 'decomp/', 'ovl_Obj_Ending', 0x80C25BC0, ((0x80C25CC0, 0x80C25D3F),),()), + ('overlays/', 'decomp/', 'ovl_En_Rsn', 0x80C25D40, ((0x80C25FF0, 0x80C2609F),),()), } \ No newline at end of file diff --git a/tables/files_with_nonmatching.txt b/tables/files_with_nonmatching.txt index 916b5114f1..804cda7dbd 100644 --- a/tables/files_with_nonmatching.txt +++ b/tables/files_with_nonmatching.txt @@ -1,593 +1,593 @@ -boot_0x800968B0 -code_0x800AF710 -fault -fault_drawer -idle -loadfragment -loadfragment2 -stackcheck -viconfig -z_actor -z_bgcheck -z_DLF -z_effect_soft_sprite -z_lib -z_lights -z_room -z_scene_proc -z_std_dma -z_scene -z_view -z_rcp -z_prenmi -ovl_En_Test_0x80862B70 -ovl_En_GirlA_0x80863870 -ovl_En_Part_0x80865370 -ovl_En_Light_0x80865990 -ovl_En_Door_0x80866800 -ovl_En_Box_0x80867BD0 -ovl_En_Pametfrog_0x80869D90 -ovl_En_Okuta_0x8086DE20 -ovl_En_Bom_0x80870DB0 -ovl_En_Wallmas_0x80874810 -ovl_En_Dodongo_0x80876670 -ovl_En_Firefly_0x808796F0 -ovl_En_Horse_0x8087B730 -ovl_En_Arrow_0x8088A240 -ovl_En_Elf_0x8088C510 -ovl_En_Niw_0x80891060 -ovl_En_Tite_0x808937F0 -ovl_En_Peehat_0x80896F30 -ovl_En_Butte_0x8091C0A0 -ovl_En_Insect_0x8091A8A0 -ovl_En_Fish_0x8091D630 -ovl_En_Holl_0x80899960 -ovl_En_Dinofos_0x8089A6E0 -ovl_En_Hata_0x8089E8E0 -ovl_En_Zl1_0x8089ED90 -ovl_En_Viewer_0x8089EE20 -ovl_En_Bubble_0x8089F4E0 -ovl_Door_Shutter_0x808A08F0 -ovl_En_Boom_0x808A24D0 -ovl_En_Torch2_0x808A31B0 -ovl_En_Minifrog_0x808A3670 -ovl_En_St_0x808A5050 -ovl_Obj_Wturn_0x808A7930 -ovl_En_River_Sound_0x808A7E30 -ovl_En_Ossan_0x808A80A0 -ovl_En_Famos_0x808AC920 -ovl_En_Bombf_0x808AE8C0 -ovl_En_Am_0x808AFCD0 -ovl_En_Dekubaba_0x808B1330 -ovl_En_M_Fire1_0x808B5230 -ovl_En_M_Thunder_0x808B53C0 -ovl_Bg_Breakwall_0x808B7360 -ovl_Door_Warp1_0x808B8490 -ovl_Obj_Syokudai_0x808BC010 -ovl_Item_B_Heart_0x808BCDF0 -ovl_En_Dekunuts_0x808BD1E0 -ovl_En_Bbfall_0x808BF220 -ovl_Arms_Hook_0x808C1030 -ovl_En_Bb_0x808C1D40 -ovl_Bg_Keikoku_Spr_0x808C3A50 -ovl_En_Wood02_0x808C3C00 -ovl_En_Death_0x808C4F80 -ovl_En_Minideath_0x808CA0B0 -ovl_En_Vm_0x808CC260 -ovl_Demo_Effect_0x808CD740 -ovl_Demo_Kankyo_0x808CE450 -ovl_En_Floormas_0x808D0680 -ovl_En_Rd_0x808D3E20 -ovl_Bg_F40_Flift_0x808D7550 -ovl_Obj_Mure_0x808D78D0 -ovl_En_Sw_0x808D8940 -ovl_Object_Kankyo_0x808DBE80 -ovl_En_Horse_Link_Child_0x808DE5C0 -ovl_Door_Ana_0x808E01A0 -ovl_En_Encount1_0x808E0830 -ovl_Demo_Tre_Lgt_0x808E0E40 -ovl_En_Encount2_0x808E1560 -ovl_En_Fire_Rock_0x808E1FE0 -ovl_Bg_Ctower_Rot_0x808E2070 -ovl_Mir_Ray_0x808E2600 -ovl_En_Sb_0x808E3EF0 -ovl_En_Bigslime_0x808E4FC0 -ovl_En_Karebaba_0x808F1200 -ovl_En_In_0x808F30B0 -ovl_En_Ru_0x80A389A0 -ovl_En_Bom_Chu_0x808F74B0 -ovl_En_Horse_Game_Check_0x808F8AA0 -ovl_En_Rr_0x808F9E00 -ovl_En_Fr_0x808FC550 -ovl_Obj_Oshihiki_0x80917290 -ovl_Eff_Dust_0x80918B40 -ovl_Bg_Umajump_0x80919F30 -ovl_Arrow_Fire_0x80920340 -ovl_Arrow_Ice_0x80922430 -ovl_Arrow_Light_0x80924300 -ovl_Item_Etcetera_0x8091FEF0 -ovl_Obj_Kibako_0x809261B0 -ovl_Obj_Tsubo_0x809275C0 -ovl_En_Ik_0x80929910 -ovl_Demo_Shd_0x8092C530 -ovl_En_Dns_0x8092C5C0 -ovl_Elf_Msg_0x8092DF90 -ovl_En_Honotrap_0x8092E510 -ovl_En_Tubo_Trap_0x809307E0 -ovl_Obj_Ice_Poly_0x80931560 -ovl_En_Fz_0x80932490 -ovl_En_Kusa_0x809349E0 -ovl_Obj_Bean_0x80936CF0 -ovl_Obj_Bombiwa_0x809393B0 -ovl_Obj_Switch_0x8093ABD0 -ovl_Obj_Lift_0x8093D3C0 -ovl_Obj_Hsblock_0x8093DEA0 -ovl_En_Okarina_Tag_0x8093E420 -ovl_En_Goroiwa_0x8093E8A0 -ovl_En_Daiku_0x809434B0 -ovl_En_Nwc_0x809441E0 -ovl_Item_Inbox_0x809454F0 -ovl_En_Ge1_0x80945650 -ovl_Obj_Blockstop_0x809466A0 -ovl_En_Sda_0x809468D0 -ovl_En_Clear_Tag_0x80947F60 -ovl_En_Gm_0x8094DEE0 -ovl_En_Ms_0x80952620 -ovl_En_Hs_0x80952C50 -ovl_Bg_Ingate_0x80953A90 -ovl_En_Kanban_0x80954960 -ovl_En_Attack_Niw_0x809580C0 -ovl_En_Mk_0x809592E0 -ovl_En_Owl_0x8095A510 -ovl_En_Ishi_0x8095D6E0 -ovl_Obj_Hana_0x8095FB10 -ovl_Obj_Lightswitch_0x8095FBF0 -ovl_Obj_Mure2_0x80960CF0 -ovl_En_Fu_0x809616E0 -ovl_En_Stream_0x80965650 -ovl_En_Mm_0x80965BB0 -ovl_En_Weather_Tag_0x80966410 -ovl_En_Ani_0x809679D0 -ovl_En_Js_0x809687B0 -ovl_En_Okarina_Effect_0x8096B0A0 -ovl_En_Mag_0x8096B310 -ovl_Elf_Msg2_0x8096EC40 -ovl_Bg_F40_Swlift_0x8096F160 -ovl_En_Kakasi_0x8096F5E0 -ovl_Obj_Makeoshihiki_0x80972350 -ovl_Oceff_Spot_0x80972680 -ovl_En_Torch_0x80973550 -ovl_Shot_Sun_0x80973640 -ovl_Obj_Roomtimer_0x80973C50 -ovl_En_Ssh_0x80973EF0 -ovl_Oceff_Wipe_0x809764B0 -ovl_Oceff_Storm_0x80981760 -ovl_Obj_Demo_0x80983520 -ovl_En_Minislime_0x809838F0 -ovl_En_Nutsball_0x80985C40 -ovl_Oceff_Wipe2_0x80986270 -ovl_Oceff_Wipe3_0x809879E0 -ovl_En_Dg_0x80989140 -ovl_En_Si_0x8098CA20 -ovl_Obj_Comb_0x8098CE40 -ovl_Obj_Kibako2_0x8098E5C0 -ovl_En_Hs2_0x8098EF60 -ovl_Obj_Mure3_0x8098F040 -ovl_En_Tg_0x8098F800 -ovl_En_Wf_0x80990310 -ovl_En_Skb_0x809947B0 -ovl_En_Gs_0x80997A90 -ovl_Obj_Sound_0x8099A920 -ovl_En_Crow_0x8099AB30 -ovl_En_Cow_0x8099C290 -ovl_Oceff_Wipe4_0x8099D780 -ovl_En_Zo_0x8099E790 -ovl_Obj_Makekinsuta_0x8099FA40 -ovl_En_Ge3_0x8099FEB0 -ovl_Obj_Hamishi_0x809A0F20 -ovl_En_Zl4_0x809A1BB0 -ovl_En_Mm2_0x809A2030 -ovl_Door_Spiral_0x809A2B60 -ovl_Obj_Pzlblock_0x809A33E0 -ovl_Obj_Toge_0x809A41C0 -ovl_Obj_Armos_0x809A4E00 -ovl_Obj_Boyo_0x809A5D10 -ovl_En_Grasshopper_0x809A6280 -ovl_Obj_Grass_0x809A9110 -ovl_Obj_Grass_Carry_0x809AAE60 -ovl_Obj_Grass_Unit_0x809ABDE0 -ovl_Bg_Fire_Wall_0x809AC4B0 -ovl_En_Bu_0x809ACD90 -ovl_En_Encount3_0x809ACF40 -ovl_En_Jso_0x809AD8E0 -ovl_Obj_Chikuwa_0x809B1550 -ovl_En_Knight_0x809B20F0 -ovl_En_Warp_tag_0x809C0760 -ovl_En_Aob_01_0x809C10B0 -ovl_En_Boj_01_0x809C3D80 -ovl_En_Boj_02_0x809C3E10 -ovl_En_Boj_03_0x809C3EA0 -ovl_En_Encount4_0x809C3F30 -ovl_En_Bom_Bowl_Man_0x809C4790 -ovl_En_Syateki_Man_0x809C64C0 -ovl_Bg_Icicle_0x809C9A60 -ovl_En_Syateki_Crow_0x809CA3F0 -ovl_En_Boj_04_0x809CB200 -ovl_En_Cne_01_0x809CB290 -ovl_En_Bba_01_0x809CC060 -ovl_En_Bji_01_0x809CCDE0 -ovl_Bg_Spdweb_0x809CDEC0 -ovl_En_Mt_tag_0x809CF350 -ovl_Boss_01_0x809D0530 -ovl_Boss_02_0x809DA1D0 -ovl_Boss_03_0x809E2760 -ovl_Boss_04_0x809EC040 -ovl_Boss_05_0x809EE4E0 -ovl_Boss_06_0x809F2120 -ovl_Boss_07_0x809F4980 -ovl_Bg_Dy_Yoseizo_0x80A0A8A0 -ovl_En_Boj_05_0x80A0C780 -ovl_En_Sob1_0x80A0C810 -ovl_En_Go_0x80A10FD0 -ovl_En_Raf_0x80A16D40 -ovl_Obj_Funen_0x80A19740 -ovl_Obj_Raillift_0x80A19910 -ovl_Bg_Numa_Hana_0x80A1A500 -ovl_Obj_Flowerpot_0x80A1B3D0 -ovl_Obj_Spinyroll_0x80A1DA50 -ovl_Dm_Hina_0x80A1F410 -ovl_En_Syateki_Wf_0x80A1FE50 -ovl_Obj_Skateblock_0x80A21150 -ovl_Obj_Iceblock_0x80A23090 -ovl_En_Bigpamet_0x80A27520 -ovl_En_Syateki_Dekunuts_0x80A2BC00 -ovl_Elf_Msg3_0x80A2CD10 -ovl_En_Fg_0x80A2D280 -ovl_Dm_Ravine_0x80A2E7A0 -ovl_Dm_Sa_0x80A2E960 -ovl_En_Slime_0x80A2EDA0 -ovl_En_Pr_0x80A32210 -ovl_Obj_Toudai_0x80A33B00 -ovl_Obj_Entotu_0x80A34700 -ovl_Obj_Bell_0x80A35510 -ovl_En_Syateki_Okuta_0x80A35FF0 -ovl_Obj_Shutter_0x80A37ED0 -ovl_Dm_Zl_0x80A38190 -ovl_En_Elfgrp_0x80A396B0 -ovl_Dm_Tsg_0x80A3AC60 -ovl_En_Baguo_0x80A3B080 -ovl_Obj_Vspinyroll_0x80A3C4E0 -ovl_Obj_Smork_0x80A3D680 -ovl_En_Test2_0x80A3E390 -ovl_En_Test3_0x80A3E7E0 -ovl_En_Test4_0x80A41D70 -ovl_En_Bat_0x80A434E0 -ovl_En_Sekihi_0x80A44C80 -ovl_En_Wiz_0x80A45360 -ovl_En_Wiz_Brock_0x80A48FE0 -ovl_En_Wiz_Fire_0x80A496A0 -ovl_Eff_Change_0x80A4C490 -ovl_Dm_Statue_0x80A4C9B0 -ovl_Obj_Fireshield_0x80A4CA90 -ovl_Bg_Ladder_0x80A4D9F0 -ovl_En_Mkk_0x80A4DED0 -ovl_Demo_Getitem_0x80A4FA40 -ovl_En_Dnb_0x80A4FDD0 -ovl_En_Dnh_0x80A50D40 -ovl_En_Dnk_0x80A514F0 -ovl_En_Dnq_0x80A52530 -ovl_Bg_Keikoku_Saku_0x80A537D0 -ovl_Obj_Hugebombiwa_0x80A53BE0 -ovl_En_Firefly2_0x80A560C0 -ovl_En_Rat_0x80A56150 -ovl_En_Water_Effect_0x80A587A0 -ovl_En_Kusa2_0x80A5B160 -ovl_Bg_Spout_Fire_0x80A60B20 -ovl_Bg_Dblue_Movebg_0x80A29A80 -ovl_En_Dy_Extra_0x80A612B0 -ovl_En_Bal_0x80A61810 -ovl_En_Ginko_Man_0x80A644A0 -ovl_En_Warp_Uzu_0x80A66180 -ovl_Obj_Driftice_0x80A66570 -ovl_En_Look_Nuts_0x80A678B0 -ovl_En_Mushi2_0x80A687A0 -ovl_En_Fall_0x80A6BF90 -ovl_En_Mm3_0x80A6F0A0 -ovl_Bg_Crace_Movebg_0x80A706F0 -ovl_En_Dno_0x80A711D0 -ovl_En_Pr2_0x80A73FA0 -ovl_En_Prz_0x80A75DC0 -ovl_En_Jso2_0x80A773C0 -ovl_Obj_Etcetera_0x80A7BC70 -ovl_En_Egol_0x80A7C990 -ovl_Obj_Mine_0x80A811D0 -ovl_Obj_Purify_0x80A84CD0 -ovl_En_Tru_0x80A85620 -ovl_En_Trt_0x80A8B770 -ovl_En_Test5_0x80A903B0 -ovl_En_Test6_0x80A90730 -ovl_En_Az_0x80A94A30 -ovl_En_Estone_0x80A99EA0 -ovl_Bg_Hakugin_Post_0x80A9ACD0 -ovl_Dm_Opstage_0x80A9F950 -ovl_Dm_Stk_0x80A9FDB0 -ovl_Dm_Char00_0x80AA5580 -ovl_Dm_Char01_0x80AA81E0 -ovl_Dm_Char02_0x80AAAE30 -ovl_Dm_Char03_0x80AAB4A0 -ovl_Dm_Char04_0x80AABC40 -ovl_Dm_Char05_0x80AAC5A0 -ovl_Dm_Char06_0x80AAE680 -ovl_Dm_Char07_0x80AAE9C0 -ovl_Dm_Char08_0x80AAF050 -ovl_Dm_Char09_0x80AB1E10 -ovl_Obj_Tokeidai_0x80AB2790 -ovl_En_Mnk_0x80AB4D10 -ovl_En_Egblock_0x80ABA7A0 -ovl_En_Guard_Nuts_0x80ABB0E0 -ovl_Bg_Hakugin_Bombwall_0x80ABBFC0 -ovl_Obj_Tokei_Tobira_0x80ABD1D0 -ovl_Bg_Hakugin_Elvpole_0x80ABD830 -ovl_En_Ma4_0x80ABDCA0 -ovl_En_Twig_0x80AC0830 -ovl_En_Po_Fusen_0x80AC1270 -ovl_En_Door_Etc_0x80AC1ED0 -ovl_En_Bigokuta_0x80AC26F0 -ovl_Bg_Icefloe_0x80AC48F0 -ovl_Obj_Ocarinalift_0x80AC94C0 -ovl_En_Time_Tag_0x80AC9EA0 -ovl_Bg_Open_Shutter_0x80ACAB10 -ovl_Bg_Open_Spot_0x80ACB1E0 -ovl_Obj_Aqua_0x80ACB6A0 -ovl_En_Elforg_0x80ACC470 -ovl_En_Elfbub_0x80ACDCD0 -ovl_En_Fu_Mato_0x80ACE330 -ovl_En_Fu_Kago_0x80ACF780 -ovl_En_Osn_0x80AD0830 -ovl_Bg_Ctower_Gear_0x80AD2B70 -ovl_En_Trt2_0x80AD3380 -ovl_Obj_Tokei_Step_0x80AD5BB0 -ovl_Bg_Lotus_0x80AD6760 -ovl_En_Kame_0x80AD6DD0 -ovl_Obj_Takaraya_Wall_0x80AD9240 -ovl_Bg_Fu_Mizu_0x80ADAAF0 -ovl_En_Sellnuts_0x80ADADD0 -ovl_Bg_Dkjail_Ivy_0x80ADE230 -ovl_Obj_Visiblock_0x80ADEA70 -ovl_En_Takaraya_0x80ADEB90 -ovl_En_Tsn_0x80ADFCA0 -ovl_En_Ds2n_0x80AE1650 -ovl_En_Fsn_0x80AE1B70 -ovl_En_Shn_0x80AE6130 -ovl_En_Stop_heishi_0x80AE73A0 -ovl_Obj_Bigicicle_0x80AE8B70 -ovl_En_Lift_Nuts_0x80AE9A20 -ovl_En_Tk_0x80AEC460 -ovl_Bg_Market_Step_0x80AF0060 -ovl_Obj_Lupygamelift_0x80AF0170 -ovl_En_Test7_0x80AF0820 -ovl_Obj_Lightblock_0x80AF3910 -ovl_Mir_Ray2_0x80AF3F70 -ovl_En_Wdhand_0x80AF43F0 -ovl_En_Gamelupy_0x80AF6760 -ovl_Bg_Danpei_Movebg_0x80AF6DE0 -ovl_En_Snowwd_0x80AF7640 -ovl_En_Pm_0x80AF7B40 -ovl_En_Gakufu_0x80AFC960 -ovl_Elf_Msg4_0x80AFD380 -ovl_Elf_Msg5_0x80AFD990 -ovl_En_Col_Man_0x80AFDC40 -ovl_En_Talk_Gibud_0x80AFE8A0 -ovl_En_Giant_0x80B01990 -ovl_Obj_Snowball_0x80B02CD0 -ovl_Boss_Hakugin_0x80B05290 -ovl_En_Gb2_0x80B0F5E0 -ovl_En_Onpuman_0x80B11E60 -ovl_Bg_Tobira01_0x80B12430 -ovl_En_Tag_Obj_0x80B12870 -ovl_Obj_Dhouse_0x80B12980 -ovl_Obj_Hakaisi_0x80B14180 -ovl_Bg_Hakugin_Switch_0x80B15790 -ovl_En_Snowman_0x80B16B00 -ovl_En_Po_Sisters_0x80B1A3B0 -ovl_En_Pp_0x80B1DEB0 -ovl_En_Hakurock_0x80B21B00 -ovl_En_Hanabi_0x80B22C00 -ovl_Obj_Dowsing_0x80B23D50 -ovl_Obj_Wind_0x80B23ED0 -ovl_En_Racedog_0x80B24630 -ovl_En_Kendo_Js_0x80B262A0 -ovl_Bg_Botihasira_0x80B28080 -ovl_En_Fish2_0x80B28370 -ovl_En_Pst_0x80B2B830 -ovl_En_Poh_0x80B2C6F0 -ovl_Obj_Spidertent_0x80B2FB10 -ovl_En_Zoraegg_0x80B31590 -ovl_En_Kbt_0x80B33D30 -ovl_En_Gg_0x80B34F70 -ovl_En_Maruta_0x80B37080 -ovl_Obj_Snowball2_0x80B38E20 -ovl_En_Gg2_0x80B3AC50 -ovl_Obj_Ghaka_0x80B3C260 -ovl_En_Dnp_0x80B3CA20 -ovl_En_Dai_0x80B3DFF0 -ovl_Bg_Goron_Oyu_0x80B40080 -ovl_En_Kgy_0x80B40800 -ovl_En_Invadepoh_0x80B439B0 -ovl_En_Gk_0x80B50410 -ovl_En_An_0x80B53840 -ovl_En_Bee_0x80B5A720 -ovl_En_Ot_0x80B5B2E0 -ovl_En_Dragon_0x80B5E890 -ovl_Obj_Dora_0x80B60AD0 -ovl_En_Bigpo_0x80B615E0 -ovl_Obj_Kendo_Kanban_0x80B654C0 -ovl_Obj_Hariko_0x80B66A20 -ovl_En_Sth_0x80B66D30 -ovl_Bg_Sinkai_Kabe_0x80B6D660 -ovl_Bg_Haka_Curtain_0x80B6DBE0 -ovl_Bg_Kin2_Bombwall_0x80B6E020 -ovl_Bg_Kin2_Fence_0x80B6E820 -ovl_Bg_Kin2_Picture_0x80B6EFA0 -ovl_Bg_Kin2_Shelf_0x80B6FB30 -ovl_En_Rail_Skb_0x80B708C0 -ovl_En_Jg_0x80B73A90 -ovl_En_Tru_Mt_0x80B76030 -ovl_Obj_Um_0x80B77770 -ovl_En_Neo_Reeba_0x80B7C890 -ovl_Bg_Mbar_Chair_0x80B7E930 -ovl_Bg_Ikana_Block_0x80B7EA60 -ovl_Bg_Ikana_Mirror_0x80B7F730 -ovl_Bg_Ikana_Rotaryroom_0x80B802E0 -ovl_Bg_Dblue_Balance_0x80B823B0 -ovl_Bg_Dblue_Waterfall_0x80B83C80 -ovl_En_Kaizoku_0x80B85590 -ovl_En_Ge2_0x80B8B2D0 -ovl_En_Ma_Yts_0x80B8D030 -ovl_En_Ma_Yto_0x80B8E520 -ovl_Obj_Tokei_Turret_0x80B91CC0 -ovl_Bg_Dblue_Elevator_0x80B91F20 -ovl_Obj_Warpstone_0x80B92B10 -ovl_En_Zog_0x80B93310 -ovl_Obj_Rotlift_0x80B95E20 -ovl_Obj_Jg_Gakki_0x80B961E0 -ovl_Bg_Inibs_Movebg_0x80B96410 -ovl_En_Zot_0x80B965D0 -ovl_Obj_Tree_0x80B9A0B0 -ovl_Obj_Y2lift_0x80B9A650 -ovl_Obj_Y2shutter_0x80B9A980 -ovl_Obj_Boat_0x80B9AF50 -ovl_Obj_Taru_0x80B9B6E0 -ovl_Obj_Hunsui_0x80B9C450 -ovl_En_Jc_Mato_0x80B9DEE0 -ovl_Mir_Ray3_0x80B9E2C0 -ovl_En_Zob_0x80B9F570 -ovl_Elf_Msg6_0x80BA15A0 -ovl_Obj_Nozoki_0x80BA2420 -ovl_En_Toto_0x80BA36C0 -ovl_En_Railgibud_0x80BA5400 -ovl_En_Baba_0x80BA8820 -ovl_En_Suttari_0x80BAA6D0 -ovl_En_Zod_0x80BAEF70 -ovl_En_Kujiya_0x80BB08E0 -ovl_En_Geg_0x80BB16D0 -ovl_Obj_Kinoko_0x80BB4700 -ovl_Obj_Yasi_0x80BB4AF0 -ovl_En_Tanron1_0x80BB4E00 -ovl_En_Tanron2_0x80BB67D0 -ovl_En_Tanron3_0x80BB85A0 -ovl_Obj_Chan_0x80BB98E0 -ovl_En_Zos_0x80BBACA0 -ovl_En_S_Goro_0x80BBCA80 -ovl_En_Nb_0x80BBFDB0 -ovl_En_Ja_0x80BC1900 -ovl_Bg_F40_Block_0x80BC3980 -ovl_Bg_F40_Switch_0x80BC47B0 -ovl_En_Po_Composer_0x80BC4F30 -ovl_En_Guruguru_0x80BC6BF0 -ovl_Oceff_Wipe5_0x80BC7AD0 -ovl_En_Stone_heishi_0x80BC9270 -ovl_Oceff_Wipe6_0x80BCA5A0 -ovl_En_Scopenuts_0x80BCABF0 -ovl_En_Scopecrow_0x80BCD000 -ovl_Oceff_Wipe7_0x80BCDCB0 -ovl_Eff_Kamejima_Wave_0x80BCEB20 -ovl_En_Hg_0x80BCF1D0 -ovl_En_Hgo_0x80BD02B0 -ovl_En_Zov_0x80BD11E0 -ovl_En_Ah_0x80BD2A30 -ovl_Obj_Hgdoor_0x80BD4090 -ovl_Bg_Ikana_Bombwall_0x80BD4720 -ovl_Bg_Ikana_Shutter_0x80BD5690 -ovl_Bg_Haka_Bombwall_0x80BD5E00 -ovl_Bg_Haka_Tomb_0x80BD6580 -ovl_En_Sc_Ruppe_0x80BD6910 -ovl_Bg_Iknv_Doukutu_0x80BD6F10 -ovl_Bg_Iknv_Obj_0x80BD7AB0 -ovl_En_Pamera_0x80BD82B0 -ovl_Obj_HsStump_0x80BDAA30 -ovl_En_Hidden_Nuts_0x80BDB040 -ovl_En_Zow_0x80BDC270 -ovl_En_Talk_0x80BDDFE0 -ovl_En_Al_0x80BDE1A0 -ovl_En_Tab_0x80BE04E0 -ovl_En_Nimotsu_0x80BE1C80 -ovl_En_Hit_Tag_0x80BE2030 -ovl_En_Ruppecrow_0x80BE2260 -ovl_En_Tanron4_0x80BE3B80 -ovl_En_Tanron5_0x80BE4930 -ovl_En_Tanron6_0x80BE6040 -ovl_En_Daiku2_0x80BE61D0 -ovl_En_Muto_0x80BE7B00 -ovl_En_Baisen_0x80BE84F0 -ovl_En_Heishi_0x80BE8F20 -ovl_En_Demo_heishi_0x80BE9510 -ovl_En_Dt_0x80BE9B20 -ovl_En_Cha_0x80BEB520 -ovl_Obj_Dinner_0x80BEB940 -ovl_Eff_Lastday_0x80BEBAC0 -ovl_Bg_Ikana_Dharma_0x80BEC240 -ovl_En_Akindonuts_0x80BECBE0 -ovl_Eff_Stk_0x80BF0D90 -ovl_En_Ig_0x80BF1150 -ovl_En_Rg_0x80BF3920 -ovl_En_Osk_0x80BF5C20 -ovl_En_Sth2_0x80BF74E0 -ovl_En_Yb_0x80BFA100 -ovl_En_Rz_0x80BFB480 -ovl_En_Scopecoin_0x80BFCFA0 -ovl_En_Bjt_0x80BFD2E0 -ovl_En_Bomjima_0x80BFE170 -ovl_En_Bomjimb_0x80C00EA0 -ovl_En_Bombers_0x80C03530 -ovl_En_Bombers2_0x80C04930 -ovl_En_Bombal_0x80C05A70 -ovl_Obj_Moon_Stone_0x80C06510 -ovl_Obj_Mu_Pict_0x80C06AA0 -ovl_Bg_Ikninside_0x80C07110 -ovl_Eff_Zoraband_0x80C07740 -ovl_Obj_Kepn_Koya_0x80C07B20 -ovl_Obj_Usiyane_0x80C07C80 -ovl_En_Nnh_0x80C08760 -ovl_Obj_Kzsaku_0x80C08A80 -ovl_Obj_Milk_Bin_0x80C08E40 -ovl_En_Kitan_0x80C090D0 -ovl_Bg_Astr_Bombwall_0x80C09ED0 -ovl_Bg_Iknin_Susceil_0x80C0A740 -ovl_En_Bsb_0x80C0B290 -ovl_En_Recepgirl_0x80C0FFD0 -ovl_En_Thiefbird_0x80C10770 -ovl_En_Jgame_Tsn_0x80C13930 -ovl_Obj_Jgame_Light_0x80C152F0 -ovl_Obj_Yado_0x80C161E0 -ovl_Demo_Syoten_0x80C16480 -ovl_Demo_Moonend_0x80C17A10 -ovl_Bg_Lbfshot_0x80C18120 -ovl_Bg_Last_Bwall_0x80C18240 -ovl_En_And_0x80C18B90 -ovl_En_Invadepoh_Demo_0x80C192A0 -ovl_Obj_Danpeilift_0x80C1ADC0 -ovl_En_Fall2_0x80C1B640 -ovl_Dm_Al_0x80C1BD90 -ovl_Dm_An_0x80C1C410 -ovl_Dm_Ah_0x80C1D410 -ovl_Dm_Nb_0x80C1DED0 -ovl_En_Drs_0x80C1E290 -ovl_En_Ending_Hero_0x80C1E690 -ovl_Dm_Bal_0x80C1E9E0 -ovl_En_Paper_0x80C1F3D0 -ovl_En_Hint_Skb_0x80C1FCF0 -ovl_Dm_Tag_0x80C22350 -ovl_En_Bh_0x80C22D40 -ovl_En_Ending_Hero2_0x80C23230 -ovl_En_Ending_Hero3_0x80C23460 -ovl_En_Ending_Hero4_0x80C23690 -ovl_En_Ending_Hero5_0x80C238C0 -ovl_En_Ending_Hero6_0x80C23C90 -ovl_Dm_Gm_0x80C24360 -ovl_Obj_Swprize_0x80C25360 -ovl_En_Invisible_Ruppe_0x80C258A0 -ovl_Obj_Ending_0x80C25BC0 -ovl_En_Rsn_0x80C25D40 -z_skelanime -z_collision_check +boot/boot_0x800968B0 +code/code_0x800AF710 +boot/fault +boot/fault_drawer +boot/idle +boot/loadfragment +boot/loadfragment2 +boot/stackcheck +boot/viconfig +code/z_actor +code/z_bgcheck +code/z_DLF +code/z_effect_soft_sprite +code/z_lib +code/z_lights +code/z_room +code/z_scene_proc +boot/z_std_dma +code/z_scene +code/z_view +code/z_rcp +code/z_prenmi +overlays/ovl_En_Test_0x80862B70 +overlays/ovl_En_GirlA_0x80863870 +overlays/ovl_En_Part_0x80865370 +overlays/ovl_En_Light_0x80865990 +overlays/ovl_En_Door_0x80866800 +overlays/ovl_En_Box_0x80867BD0 +overlays/ovl_En_Pametfrog_0x80869D90 +overlays/ovl_En_Okuta_0x8086DE20 +overlays/ovl_En_Bom_0x80870DB0 +overlays/ovl_En_Wallmas_0x80874810 +overlays/ovl_En_Dodongo_0x80876670 +overlays/ovl_En_Firefly_0x808796F0 +overlays/ovl_En_Horse_0x8087B730 +overlays/ovl_En_Arrow_0x8088A240 +overlays/ovl_En_Elf_0x8088C510 +overlays/ovl_En_Niw_0x80891060 +overlays/ovl_En_Tite_0x808937F0 +overlays/ovl_En_Peehat_0x80896F30 +overlays/ovl_En_Butte_0x8091C0A0 +overlays/ovl_En_Insect_0x8091A8A0 +overlays/ovl_En_Fish_0x8091D630 +overlays/ovl_En_Holl_0x80899960 +overlays/ovl_En_Dinofos_0x8089A6E0 +overlays/ovl_En_Hata_0x8089E8E0 +overlays/ovl_En_Zl1_0x8089ED90 +overlays/ovl_En_Viewer_0x8089EE20 +overlays/ovl_En_Bubble_0x8089F4E0 +overlays/ovl_Door_Shutter_0x808A08F0 +overlays/ovl_En_Boom_0x808A24D0 +overlays/ovl_En_Torch2_0x808A31B0 +overlays/ovl_En_Minifrog_0x808A3670 +overlays/ovl_En_St_0x808A5050 +overlays/ovl_Obj_Wturn_0x808A7930 +overlays/ovl_En_River_Sound_0x808A7E30 +overlays/ovl_En_Ossan_0x808A80A0 +overlays/ovl_En_Famos_0x808AC920 +overlays/ovl_En_Bombf_0x808AE8C0 +overlays/ovl_En_Am_0x808AFCD0 +overlays/ovl_En_Dekubaba_0x808B1330 +overlays/ovl_En_M_Fire1_0x808B5230 +overlays/ovl_En_M_Thunder_0x808B53C0 +overlays/ovl_Bg_Breakwall_0x808B7360 +overlays/ovl_Door_Warp1_0x808B8490 +overlays/ovl_Obj_Syokudai_0x808BC010 +overlays/ovl_Item_B_Heart_0x808BCDF0 +overlays/ovl_En_Dekunuts_0x808BD1E0 +overlays/ovl_En_Bbfall_0x808BF220 +overlays/ovl_Arms_Hook_0x808C1030 +overlays/ovl_En_Bb_0x808C1D40 +overlays/ovl_Bg_Keikoku_Spr_0x808C3A50 +overlays/ovl_En_Wood02_0x808C3C00 +overlays/ovl_En_Death_0x808C4F80 +overlays/ovl_En_Minideath_0x808CA0B0 +overlays/ovl_En_Vm_0x808CC260 +overlays/ovl_Demo_Effect_0x808CD740 +overlays/ovl_Demo_Kankyo_0x808CE450 +overlays/ovl_En_Floormas_0x808D0680 +overlays/ovl_En_Rd_0x808D3E20 +overlays/ovl_Bg_F40_Flift_0x808D7550 +overlays/ovl_Obj_Mure_0x808D78D0 +overlays/ovl_En_Sw_0x808D8940 +overlays/ovl_Object_Kankyo_0x808DBE80 +overlays/ovl_En_Horse_Link_Child_0x808DE5C0 +overlays/ovl_Door_Ana_0x808E01A0 +overlays/ovl_En_Encount1_0x808E0830 +overlays/ovl_Demo_Tre_Lgt_0x808E0E40 +overlays/ovl_En_Encount2_0x808E1560 +overlays/ovl_En_Fire_Rock_0x808E1FE0 +overlays/ovl_Bg_Ctower_Rot_0x808E2070 +overlays/ovl_Mir_Ray_0x808E2600 +overlays/ovl_En_Sb_0x808E3EF0 +overlays/ovl_En_Bigslime_0x808E4FC0 +overlays/ovl_En_Karebaba_0x808F1200 +overlays/ovl_En_In_0x808F30B0 +overlays/ovl_En_Ru_0x80A389A0 +overlays/ovl_En_Bom_Chu_0x808F74B0 +overlays/ovl_En_Horse_Game_Check_0x808F8AA0 +overlays/ovl_En_Rr_0x808F9E00 +overlays/ovl_En_Fr_0x808FC550 +overlays/ovl_Obj_Oshihiki_0x80917290 +overlays/ovl_Eff_Dust_0x80918B40 +overlays/ovl_Bg_Umajump_0x80919F30 +overlays/ovl_Arrow_Fire_0x80920340 +overlays/ovl_Arrow_Ice_0x80922430 +overlays/ovl_Arrow_Light_0x80924300 +overlays/ovl_Item_Etcetera_0x8091FEF0 +overlays/ovl_Obj_Kibako_0x809261B0 +overlays/ovl_Obj_Tsubo_0x809275C0 +overlays/ovl_En_Ik_0x80929910 +overlays/ovl_Demo_Shd_0x8092C530 +overlays/ovl_En_Dns_0x8092C5C0 +overlays/ovl_Elf_Msg_0x8092DF90 +overlays/ovl_En_Honotrap_0x8092E510 +overlays/ovl_En_Tubo_Trap_0x809307E0 +overlays/ovl_Obj_Ice_Poly_0x80931560 +overlays/ovl_En_Fz_0x80932490 +overlays/ovl_En_Kusa_0x809349E0 +overlays/ovl_Obj_Bean_0x80936CF0 +overlays/ovl_Obj_Bombiwa_0x809393B0 +overlays/ovl_Obj_Switch_0x8093ABD0 +overlays/ovl_Obj_Lift_0x8093D3C0 +overlays/ovl_Obj_Hsblock_0x8093DEA0 +overlays/ovl_En_Okarina_Tag_0x8093E420 +overlays/ovl_En_Goroiwa_0x8093E8A0 +overlays/ovl_En_Daiku_0x809434B0 +overlays/ovl_En_Nwc_0x809441E0 +overlays/ovl_Item_Inbox_0x809454F0 +overlays/ovl_En_Ge1_0x80945650 +overlays/ovl_Obj_Blockstop_0x809466A0 +overlays/ovl_En_Sda_0x809468D0 +overlays/ovl_En_Clear_Tag_0x80947F60 +overlays/ovl_En_Gm_0x8094DEE0 +overlays/ovl_En_Ms_0x80952620 +overlays/ovl_En_Hs_0x80952C50 +overlays/ovl_Bg_Ingate_0x80953A90 +overlays/ovl_En_Kanban_0x80954960 +overlays/ovl_En_Attack_Niw_0x809580C0 +overlays/ovl_En_Mk_0x809592E0 +overlays/ovl_En_Owl_0x8095A510 +overlays/ovl_En_Ishi_0x8095D6E0 +overlays/ovl_Obj_Hana_0x8095FB10 +overlays/ovl_Obj_Lightswitch_0x8095FBF0 +overlays/ovl_Obj_Mure2_0x80960CF0 +overlays/ovl_En_Fu_0x809616E0 +overlays/ovl_En_Stream_0x80965650 +overlays/ovl_En_Mm_0x80965BB0 +overlays/ovl_En_Weather_Tag_0x80966410 +overlays/ovl_En_Ani_0x809679D0 +overlays/ovl_En_Js_0x809687B0 +overlays/ovl_En_Okarina_Effect_0x8096B0A0 +overlays/ovl_En_Mag_0x8096B310 +overlays/ovl_Elf_Msg2_0x8096EC40 +overlays/ovl_Bg_F40_Swlift_0x8096F160 +overlays/ovl_En_Kakasi_0x8096F5E0 +overlays/ovl_Obj_Makeoshihiki_0x80972350 +overlays/ovl_Oceff_Spot_0x80972680 +overlays/ovl_En_Torch_0x80973550 +overlays/ovl_Shot_Sun_0x80973640 +overlays/ovl_Obj_Roomtimer_0x80973C50 +overlays/ovl_En_Ssh_0x80973EF0 +overlays/ovl_Oceff_Wipe_0x809764B0 +overlays/ovl_Oceff_Storm_0x80981760 +overlays/ovl_Obj_Demo_0x80983520 +overlays/ovl_En_Minislime_0x809838F0 +overlays/ovl_En_Nutsball_0x80985C40 +overlays/ovl_Oceff_Wipe2_0x80986270 +overlays/ovl_Oceff_Wipe3_0x809879E0 +overlays/ovl_En_Dg_0x80989140 +overlays/ovl_En_Si_0x8098CA20 +overlays/ovl_Obj_Comb_0x8098CE40 +overlays/ovl_Obj_Kibako2_0x8098E5C0 +overlays/ovl_En_Hs2_0x8098EF60 +overlays/ovl_Obj_Mure3_0x8098F040 +overlays/ovl_En_Tg_0x8098F800 +overlays/ovl_En_Wf_0x80990310 +overlays/ovl_En_Skb_0x809947B0 +overlays/ovl_En_Gs_0x80997A90 +overlays/ovl_Obj_Sound_0x8099A920 +overlays/ovl_En_Crow_0x8099AB30 +overlays/ovl_En_Cow_0x8099C290 +overlays/ovl_Oceff_Wipe4_0x8099D780 +overlays/ovl_En_Zo_0x8099E790 +overlays/ovl_Obj_Makekinsuta_0x8099FA40 +overlays/ovl_En_Ge3_0x8099FEB0 +overlays/ovl_Obj_Hamishi_0x809A0F20 +overlays/ovl_En_Zl4_0x809A1BB0 +overlays/ovl_En_Mm2_0x809A2030 +overlays/ovl_Door_Spiral_0x809A2B60 +overlays/ovl_Obj_Pzlblock_0x809A33E0 +overlays/ovl_Obj_Toge_0x809A41C0 +overlays/ovl_Obj_Armos_0x809A4E00 +overlays/ovl_Obj_Boyo_0x809A5D10 +overlays/ovl_En_Grasshopper_0x809A6280 +overlays/ovl_Obj_Grass_0x809A9110 +overlays/ovl_Obj_Grass_Carry_0x809AAE60 +overlays/ovl_Obj_Grass_Unit_0x809ABDE0 +overlays/ovl_Bg_Fire_Wall_0x809AC4B0 +overlays/ovl_En_Bu_0x809ACD90 +overlays/ovl_En_Encount3_0x809ACF40 +overlays/ovl_En_Jso_0x809AD8E0 +overlays/ovl_Obj_Chikuwa_0x809B1550 +overlays/ovl_En_Knight_0x809B20F0 +overlays/ovl_En_Warp_tag_0x809C0760 +overlays/ovl_En_Aob_01_0x809C10B0 +overlays/ovl_En_Boj_01_0x809C3D80 +overlays/ovl_En_Boj_02_0x809C3E10 +overlays/ovl_En_Boj_03_0x809C3EA0 +overlays/ovl_En_Encount4_0x809C3F30 +overlays/ovl_En_Bom_Bowl_Man_0x809C4790 +overlays/ovl_En_Syateki_Man_0x809C64C0 +overlays/ovl_Bg_Icicle_0x809C9A60 +overlays/ovl_En_Syateki_Crow_0x809CA3F0 +overlays/ovl_En_Boj_04_0x809CB200 +overlays/ovl_En_Cne_01_0x809CB290 +overlays/ovl_En_Bba_01_0x809CC060 +overlays/ovl_En_Bji_01_0x809CCDE0 +overlays/ovl_Bg_Spdweb_0x809CDEC0 +overlays/ovl_En_Mt_tag_0x809CF350 +overlays/ovl_Boss_01_0x809D0530 +overlays/ovl_Boss_02_0x809DA1D0 +overlays/ovl_Boss_03_0x809E2760 +overlays/ovl_Boss_04_0x809EC040 +overlays/ovl_Boss_05_0x809EE4E0 +overlays/ovl_Boss_06_0x809F2120 +overlays/ovl_Boss_07_0x809F4980 +overlays/ovl_Bg_Dy_Yoseizo_0x80A0A8A0 +overlays/ovl_En_Boj_05_0x80A0C780 +overlays/ovl_En_Sob1_0x80A0C810 +overlays/ovl_En_Go_0x80A10FD0 +overlays/ovl_En_Raf_0x80A16D40 +overlays/ovl_Obj_Funen_0x80A19740 +overlays/ovl_Obj_Raillift_0x80A19910 +overlays/ovl_Bg_Numa_Hana_0x80A1A500 +overlays/ovl_Obj_Flowerpot_0x80A1B3D0 +overlays/ovl_Obj_Spinyroll_0x80A1DA50 +overlays/ovl_Dm_Hina_0x80A1F410 +overlays/ovl_En_Syateki_Wf_0x80A1FE50 +overlays/ovl_Obj_Skateblock_0x80A21150 +overlays/ovl_Obj_Iceblock_0x80A23090 +overlays/ovl_En_Bigpamet_0x80A27520 +overlays/ovl_En_Syateki_Dekunuts_0x80A2BC00 +overlays/ovl_Elf_Msg3_0x80A2CD10 +overlays/ovl_En_Fg_0x80A2D280 +overlays/ovl_Dm_Ravine_0x80A2E7A0 +overlays/ovl_Dm_Sa_0x80A2E960 +overlays/ovl_En_Slime_0x80A2EDA0 +overlays/ovl_En_Pr_0x80A32210 +overlays/ovl_Obj_Toudai_0x80A33B00 +overlays/ovl_Obj_Entotu_0x80A34700 +overlays/ovl_Obj_Bell_0x80A35510 +overlays/ovl_En_Syateki_Okuta_0x80A35FF0 +overlays/ovl_Obj_Shutter_0x80A37ED0 +overlays/ovl_Dm_Zl_0x80A38190 +overlays/ovl_En_Elfgrp_0x80A396B0 +overlays/ovl_Dm_Tsg_0x80A3AC60 +overlays/ovl_En_Baguo_0x80A3B080 +overlays/ovl_Obj_Vspinyroll_0x80A3C4E0 +overlays/ovl_Obj_Smork_0x80A3D680 +overlays/ovl_En_Test2_0x80A3E390 +overlays/ovl_En_Test3_0x80A3E7E0 +overlays/ovl_En_Test4_0x80A41D70 +overlays/ovl_En_Bat_0x80A434E0 +overlays/ovl_En_Sekihi_0x80A44C80 +overlays/ovl_En_Wiz_0x80A45360 +overlays/ovl_En_Wiz_Brock_0x80A48FE0 +overlays/ovl_En_Wiz_Fire_0x80A496A0 +overlays/ovl_Eff_Change_0x80A4C490 +overlays/ovl_Dm_Statue_0x80A4C9B0 +overlays/ovl_Obj_Fireshield_0x80A4CA90 +overlays/ovl_Bg_Ladder_0x80A4D9F0 +overlays/ovl_En_Mkk_0x80A4DED0 +overlays/ovl_Demo_Getitem_0x80A4FA40 +overlays/ovl_En_Dnb_0x80A4FDD0 +overlays/ovl_En_Dnh_0x80A50D40 +overlays/ovl_En_Dnk_0x80A514F0 +overlays/ovl_En_Dnq_0x80A52530 +overlays/ovl_Bg_Keikoku_Saku_0x80A537D0 +overlays/ovl_Obj_Hugebombiwa_0x80A53BE0 +overlays/ovl_En_Firefly2_0x80A560C0 +overlays/ovl_En_Rat_0x80A56150 +overlays/ovl_En_Water_Effect_0x80A587A0 +overlays/ovl_En_Kusa2_0x80A5B160 +overlays/ovl_Bg_Spout_Fire_0x80A60B20 +overlays/ovl_Bg_Dblue_Movebg_0x80A29A80 +overlays/ovl_En_Dy_Extra_0x80A612B0 +overlays/ovl_En_Bal_0x80A61810 +overlays/ovl_En_Ginko_Man_0x80A644A0 +overlays/ovl_En_Warp_Uzu_0x80A66180 +overlays/ovl_Obj_Driftice_0x80A66570 +overlays/ovl_En_Look_Nuts_0x80A678B0 +overlays/ovl_En_Mushi2_0x80A687A0 +overlays/ovl_En_Fall_0x80A6BF90 +overlays/ovl_En_Mm3_0x80A6F0A0 +overlays/ovl_Bg_Crace_Movebg_0x80A706F0 +overlays/ovl_En_Dno_0x80A711D0 +overlays/ovl_En_Pr2_0x80A73FA0 +overlays/ovl_En_Prz_0x80A75DC0 +overlays/ovl_En_Jso2_0x80A773C0 +overlays/ovl_Obj_Etcetera_0x80A7BC70 +overlays/ovl_En_Egol_0x80A7C990 +overlays/ovl_Obj_Mine_0x80A811D0 +overlays/ovl_Obj_Purify_0x80A84CD0 +overlays/ovl_En_Tru_0x80A85620 +overlays/ovl_En_Trt_0x80A8B770 +overlays/ovl_En_Test5_0x80A903B0 +overlays/ovl_En_Test6_0x80A90730 +overlays/ovl_En_Az_0x80A94A30 +overlays/ovl_En_Estone_0x80A99EA0 +overlays/ovl_Bg_Hakugin_Post_0x80A9ACD0 +overlays/ovl_Dm_Opstage_0x80A9F950 +overlays/ovl_Dm_Stk_0x80A9FDB0 +overlays/ovl_Dm_Char00_0x80AA5580 +overlays/ovl_Dm_Char01_0x80AA81E0 +overlays/ovl_Dm_Char02_0x80AAAE30 +overlays/ovl_Dm_Char03_0x80AAB4A0 +overlays/ovl_Dm_Char04_0x80AABC40 +overlays/ovl_Dm_Char05_0x80AAC5A0 +overlays/ovl_Dm_Char06_0x80AAE680 +overlays/ovl_Dm_Char07_0x80AAE9C0 +overlays/ovl_Dm_Char08_0x80AAF050 +overlays/ovl_Dm_Char09_0x80AB1E10 +overlays/ovl_Obj_Tokeidai_0x80AB2790 +overlays/ovl_En_Mnk_0x80AB4D10 +overlays/ovl_En_Egblock_0x80ABA7A0 +overlays/ovl_En_Guard_Nuts_0x80ABB0E0 +overlays/ovl_Bg_Hakugin_Bombwall_0x80ABBFC0 +overlays/ovl_Obj_Tokei_Tobira_0x80ABD1D0 +overlays/ovl_Bg_Hakugin_Elvpole_0x80ABD830 +overlays/ovl_En_Ma4_0x80ABDCA0 +overlays/ovl_En_Twig_0x80AC0830 +overlays/ovl_En_Po_Fusen_0x80AC1270 +overlays/ovl_En_Door_Etc_0x80AC1ED0 +overlays/ovl_En_Bigokuta_0x80AC26F0 +overlays/ovl_Bg_Icefloe_0x80AC48F0 +overlays/ovl_Obj_Ocarinalift_0x80AC94C0 +overlays/ovl_En_Time_Tag_0x80AC9EA0 +overlays/ovl_Bg_Open_Shutter_0x80ACAB10 +overlays/ovl_Bg_Open_Spot_0x80ACB1E0 +overlays/ovl_Obj_Aqua_0x80ACB6A0 +overlays/ovl_En_Elforg_0x80ACC470 +overlays/ovl_En_Elfbub_0x80ACDCD0 +overlays/ovl_En_Fu_Mato_0x80ACE330 +overlays/ovl_En_Fu_Kago_0x80ACF780 +overlays/ovl_En_Osn_0x80AD0830 +overlays/ovl_Bg_Ctower_Gear_0x80AD2B70 +overlays/ovl_En_Trt2_0x80AD3380 +overlays/ovl_Obj_Tokei_Step_0x80AD5BB0 +overlays/ovl_Bg_Lotus_0x80AD6760 +overlays/ovl_En_Kame_0x80AD6DD0 +overlays/ovl_Obj_Takaraya_Wall_0x80AD9240 +overlays/ovl_Bg_Fu_Mizu_0x80ADAAF0 +overlays/ovl_En_Sellnuts_0x80ADADD0 +overlays/ovl_Bg_Dkjail_Ivy_0x80ADE230 +overlays/ovl_Obj_Visiblock_0x80ADEA70 +overlays/ovl_En_Takaraya_0x80ADEB90 +overlays/ovl_En_Tsn_0x80ADFCA0 +overlays/ovl_En_Ds2n_0x80AE1650 +overlays/ovl_En_Fsn_0x80AE1B70 +overlays/ovl_En_Shn_0x80AE6130 +overlays/ovl_En_Stop_heishi_0x80AE73A0 +overlays/ovl_Obj_Bigicicle_0x80AE8B70 +overlays/ovl_En_Lift_Nuts_0x80AE9A20 +overlays/ovl_En_Tk_0x80AEC460 +overlays/ovl_Bg_Market_Step_0x80AF0060 +overlays/ovl_Obj_Lupygamelift_0x80AF0170 +overlays/ovl_En_Test7_0x80AF0820 +overlays/ovl_Obj_Lightblock_0x80AF3910 +overlays/ovl_Mir_Ray2_0x80AF3F70 +overlays/ovl_En_Wdhand_0x80AF43F0 +overlays/ovl_En_Gamelupy_0x80AF6760 +overlays/ovl_Bg_Danpei_Movebg_0x80AF6DE0 +overlays/ovl_En_Snowwd_0x80AF7640 +overlays/ovl_En_Pm_0x80AF7B40 +overlays/ovl_En_Gakufu_0x80AFC960 +overlays/ovl_Elf_Msg4_0x80AFD380 +overlays/ovl_Elf_Msg5_0x80AFD990 +overlays/ovl_En_Col_Man_0x80AFDC40 +overlays/ovl_En_Talk_Gibud_0x80AFE8A0 +overlays/ovl_En_Giant_0x80B01990 +overlays/ovl_Obj_Snowball_0x80B02CD0 +overlays/ovl_Boss_Hakugin_0x80B05290 +overlays/ovl_En_Gb2_0x80B0F5E0 +overlays/ovl_En_Onpuman_0x80B11E60 +overlays/ovl_Bg_Tobira01_0x80B12430 +overlays/ovl_En_Tag_Obj_0x80B12870 +overlays/ovl_Obj_Dhouse_0x80B12980 +overlays/ovl_Obj_Hakaisi_0x80B14180 +overlays/ovl_Bg_Hakugin_Switch_0x80B15790 +overlays/ovl_En_Snowman_0x80B16B00 +overlays/ovl_En_Po_Sisters_0x80B1A3B0 +overlays/ovl_En_Pp_0x80B1DEB0 +overlays/ovl_En_Hakurock_0x80B21B00 +overlays/ovl_En_Hanabi_0x80B22C00 +overlays/ovl_Obj_Dowsing_0x80B23D50 +overlays/ovl_Obj_Wind_0x80B23ED0 +overlays/ovl_En_Racedog_0x80B24630 +overlays/ovl_En_Kendo_Js_0x80B262A0 +overlays/ovl_Bg_Botihasira_0x80B28080 +overlays/ovl_En_Fish2_0x80B28370 +overlays/ovl_En_Pst_0x80B2B830 +overlays/ovl_En_Poh_0x80B2C6F0 +overlays/ovl_Obj_Spidertent_0x80B2FB10 +overlays/ovl_En_Zoraegg_0x80B31590 +overlays/ovl_En_Kbt_0x80B33D30 +overlays/ovl_En_Gg_0x80B34F70 +overlays/ovl_En_Maruta_0x80B37080 +overlays/ovl_Obj_Snowball2_0x80B38E20 +overlays/ovl_En_Gg2_0x80B3AC50 +overlays/ovl_Obj_Ghaka_0x80B3C260 +overlays/ovl_En_Dnp_0x80B3CA20 +overlays/ovl_En_Dai_0x80B3DFF0 +overlays/ovl_Bg_Goron_Oyu_0x80B40080 +overlays/ovl_En_Kgy_0x80B40800 +overlays/ovl_En_Invadepoh_0x80B439B0 +overlays/ovl_En_Gk_0x80B50410 +overlays/ovl_En_An_0x80B53840 +overlays/ovl_En_Bee_0x80B5A720 +overlays/ovl_En_Ot_0x80B5B2E0 +overlays/ovl_En_Dragon_0x80B5E890 +overlays/ovl_Obj_Dora_0x80B60AD0 +overlays/ovl_En_Bigpo_0x80B615E0 +overlays/ovl_Obj_Kendo_Kanban_0x80B654C0 +overlays/ovl_Obj_Hariko_0x80B66A20 +overlays/ovl_En_Sth_0x80B66D30 +overlays/ovl_Bg_Sinkai_Kabe_0x80B6D660 +overlays/ovl_Bg_Haka_Curtain_0x80B6DBE0 +overlays/ovl_Bg_Kin2_Bombwall_0x80B6E020 +overlays/ovl_Bg_Kin2_Fence_0x80B6E820 +overlays/ovl_Bg_Kin2_Picture_0x80B6EFA0 +overlays/ovl_Bg_Kin2_Shelf_0x80B6FB30 +overlays/ovl_En_Rail_Skb_0x80B708C0 +overlays/ovl_En_Jg_0x80B73A90 +overlays/ovl_En_Tru_Mt_0x80B76030 +overlays/ovl_Obj_Um_0x80B77770 +overlays/ovl_En_Neo_Reeba_0x80B7C890 +overlays/ovl_Bg_Mbar_Chair_0x80B7E930 +overlays/ovl_Bg_Ikana_Block_0x80B7EA60 +overlays/ovl_Bg_Ikana_Mirror_0x80B7F730 +overlays/ovl_Bg_Ikana_Rotaryroom_0x80B802E0 +overlays/ovl_Bg_Dblue_Balance_0x80B823B0 +overlays/ovl_Bg_Dblue_Waterfall_0x80B83C80 +overlays/ovl_En_Kaizoku_0x80B85590 +overlays/ovl_En_Ge2_0x80B8B2D0 +overlays/ovl_En_Ma_Yts_0x80B8D030 +overlays/ovl_En_Ma_Yto_0x80B8E520 +overlays/ovl_Obj_Tokei_Turret_0x80B91CC0 +overlays/ovl_Bg_Dblue_Elevator_0x80B91F20 +overlays/ovl_Obj_Warpstone_0x80B92B10 +overlays/ovl_En_Zog_0x80B93310 +overlays/ovl_Obj_Rotlift_0x80B95E20 +overlays/ovl_Obj_Jg_Gakki_0x80B961E0 +overlays/ovl_Bg_Inibs_Movebg_0x80B96410 +overlays/ovl_En_Zot_0x80B965D0 +overlays/ovl_Obj_Tree_0x80B9A0B0 +overlays/ovl_Obj_Y2lift_0x80B9A650 +overlays/ovl_Obj_Y2shutter_0x80B9A980 +overlays/ovl_Obj_Boat_0x80B9AF50 +overlays/ovl_Obj_Taru_0x80B9B6E0 +overlays/ovl_Obj_Hunsui_0x80B9C450 +overlays/ovl_En_Jc_Mato_0x80B9DEE0 +overlays/ovl_Mir_Ray3_0x80B9E2C0 +overlays/ovl_En_Zob_0x80B9F570 +overlays/ovl_Elf_Msg6_0x80BA15A0 +overlays/ovl_Obj_Nozoki_0x80BA2420 +overlays/ovl_En_Toto_0x80BA36C0 +overlays/ovl_En_Railgibud_0x80BA5400 +overlays/ovl_En_Baba_0x80BA8820 +overlays/ovl_En_Suttari_0x80BAA6D0 +overlays/ovl_En_Zod_0x80BAEF70 +overlays/ovl_En_Kujiya_0x80BB08E0 +overlays/ovl_En_Geg_0x80BB16D0 +overlays/ovl_Obj_Kinoko_0x80BB4700 +overlays/ovl_Obj_Yasi_0x80BB4AF0 +overlays/ovl_En_Tanron1_0x80BB4E00 +overlays/ovl_En_Tanron2_0x80BB67D0 +overlays/ovl_En_Tanron3_0x80BB85A0 +overlays/ovl_Obj_Chan_0x80BB98E0 +overlays/ovl_En_Zos_0x80BBACA0 +overlays/ovl_En_S_Goro_0x80BBCA80 +overlays/ovl_En_Nb_0x80BBFDB0 +overlays/ovl_En_Ja_0x80BC1900 +overlays/ovl_Bg_F40_Block_0x80BC3980 +overlays/ovl_Bg_F40_Switch_0x80BC47B0 +overlays/ovl_En_Po_Composer_0x80BC4F30 +overlays/ovl_En_Guruguru_0x80BC6BF0 +overlays/ovl_Oceff_Wipe5_0x80BC7AD0 +overlays/ovl_En_Stone_heishi_0x80BC9270 +overlays/ovl_Oceff_Wipe6_0x80BCA5A0 +overlays/ovl_En_Scopenuts_0x80BCABF0 +overlays/ovl_En_Scopecrow_0x80BCD000 +overlays/ovl_Oceff_Wipe7_0x80BCDCB0 +overlays/ovl_Eff_Kamejima_Wave_0x80BCEB20 +overlays/ovl_En_Hg_0x80BCF1D0 +overlays/ovl_En_Hgo_0x80BD02B0 +overlays/ovl_En_Zov_0x80BD11E0 +overlays/ovl_En_Ah_0x80BD2A30 +overlays/ovl_Obj_Hgdoor_0x80BD4090 +overlays/ovl_Bg_Ikana_Bombwall_0x80BD4720 +overlays/ovl_Bg_Ikana_Shutter_0x80BD5690 +overlays/ovl_Bg_Haka_Bombwall_0x80BD5E00 +overlays/ovl_Bg_Haka_Tomb_0x80BD6580 +overlays/ovl_En_Sc_Ruppe_0x80BD6910 +overlays/ovl_Bg_Iknv_Doukutu_0x80BD6F10 +overlays/ovl_Bg_Iknv_Obj_0x80BD7AB0 +overlays/ovl_En_Pamera_0x80BD82B0 +overlays/ovl_Obj_HsStump_0x80BDAA30 +overlays/ovl_En_Hidden_Nuts_0x80BDB040 +overlays/ovl_En_Zow_0x80BDC270 +overlays/ovl_En_Talk_0x80BDDFE0 +overlays/ovl_En_Al_0x80BDE1A0 +overlays/ovl_En_Tab_0x80BE04E0 +overlays/ovl_En_Nimotsu_0x80BE1C80 +overlays/ovl_En_Hit_Tag_0x80BE2030 +overlays/ovl_En_Ruppecrow_0x80BE2260 +overlays/ovl_En_Tanron4_0x80BE3B80 +overlays/ovl_En_Tanron5_0x80BE4930 +overlays/ovl_En_Tanron6_0x80BE6040 +overlays/ovl_En_Daiku2_0x80BE61D0 +overlays/ovl_En_Muto_0x80BE7B00 +overlays/ovl_En_Baisen_0x80BE84F0 +overlays/ovl_En_Heishi_0x80BE8F20 +overlays/ovl_En_Demo_heishi_0x80BE9510 +overlays/ovl_En_Dt_0x80BE9B20 +overlays/ovl_En_Cha_0x80BEB520 +overlays/ovl_Obj_Dinner_0x80BEB940 +overlays/ovl_Eff_Lastday_0x80BEBAC0 +overlays/ovl_Bg_Ikana_Dharma_0x80BEC240 +overlays/ovl_En_Akindonuts_0x80BECBE0 +overlays/ovl_Eff_Stk_0x80BF0D90 +overlays/ovl_En_Ig_0x80BF1150 +overlays/ovl_En_Rg_0x80BF3920 +overlays/ovl_En_Osk_0x80BF5C20 +overlays/ovl_En_Sth2_0x80BF74E0 +overlays/ovl_En_Yb_0x80BFA100 +overlays/ovl_En_Rz_0x80BFB480 +overlays/ovl_En_Scopecoin_0x80BFCFA0 +overlays/ovl_En_Bjt_0x80BFD2E0 +overlays/ovl_En_Bomjima_0x80BFE170 +overlays/ovl_En_Bomjimb_0x80C00EA0 +overlays/ovl_En_Bombers_0x80C03530 +overlays/ovl_En_Bombers2_0x80C04930 +overlays/ovl_En_Bombal_0x80C05A70 +overlays/ovl_Obj_Moon_Stone_0x80C06510 +overlays/ovl_Obj_Mu_Pict_0x80C06AA0 +overlays/ovl_Bg_Ikninside_0x80C07110 +overlays/ovl_Eff_Zoraband_0x80C07740 +overlays/ovl_Obj_Kepn_Koya_0x80C07B20 +overlays/ovl_Obj_Usiyane_0x80C07C80 +overlays/ovl_En_Nnh_0x80C08760 +overlays/ovl_Obj_Kzsaku_0x80C08A80 +overlays/ovl_Obj_Milk_Bin_0x80C08E40 +overlays/ovl_En_Kitan_0x80C090D0 +overlays/ovl_Bg_Astr_Bombwall_0x80C09ED0 +overlays/ovl_Bg_Iknin_Susceil_0x80C0A740 +overlays/ovl_En_Bsb_0x80C0B290 +overlays/ovl_En_Recepgirl_0x80C0FFD0 +overlays/ovl_En_Thiefbird_0x80C10770 +overlays/ovl_En_Jgame_Tsn_0x80C13930 +overlays/ovl_Obj_Jgame_Light_0x80C152F0 +overlays/ovl_Obj_Yado_0x80C161E0 +overlays/ovl_Demo_Syoten_0x80C16480 +overlays/ovl_Demo_Moonend_0x80C17A10 +overlays/ovl_Bg_Lbfshot_0x80C18120 +overlays/ovl_Bg_Last_Bwall_0x80C18240 +overlays/ovl_En_And_0x80C18B90 +overlays/ovl_En_Invadepoh_Demo_0x80C192A0 +overlays/ovl_Obj_Danpeilift_0x80C1ADC0 +overlays/ovl_En_Fall2_0x80C1B640 +overlays/ovl_Dm_Al_0x80C1BD90 +overlays/ovl_Dm_An_0x80C1C410 +overlays/ovl_Dm_Ah_0x80C1D410 +overlays/ovl_Dm_Nb_0x80C1DED0 +overlays/ovl_En_Drs_0x80C1E290 +overlays/ovl_En_Ending_Hero_0x80C1E690 +overlays/ovl_Dm_Bal_0x80C1E9E0 +overlays/ovl_En_Paper_0x80C1F3D0 +overlays/ovl_En_Hint_Skb_0x80C1FCF0 +overlays/ovl_Dm_Tag_0x80C22350 +overlays/ovl_En_Bh_0x80C22D40 +overlays/ovl_En_Ending_Hero2_0x80C23230 +overlays/ovl_En_Ending_Hero3_0x80C23460 +overlays/ovl_En_Ending_Hero4_0x80C23690 +overlays/ovl_En_Ending_Hero5_0x80C238C0 +overlays/ovl_En_Ending_Hero6_0x80C23C90 +overlays/ovl_Dm_Gm_0x80C24360 +overlays/ovl_Obj_Swprize_0x80C25360 +overlays/ovl_En_Invisible_Ruppe_0x80C258A0 +overlays/ovl_Obj_Ending_0x80C25BC0 +overlays/ovl_En_Rsn_0x80C25D40 +code/z_skelanime +code/z_collision_check diff --git a/tools/asm-differ b/tools/asm-differ index 7cd33c4e7f..9d79eb9f53 160000 --- a/tools/asm-differ +++ b/tools/asm-differ @@ -1 +1 @@ -Subproject commit 7cd33c4e7f5adadf5892261ad8a522efec51cac8 +Subproject commit 9d79eb9f539e5fa58fe63c62862661c5d9ce0d27 diff --git a/tools/disasm.py b/tools/disasm.py index 54dda463dd..5312762b00 100755 --- a/tools/disasm.py +++ b/tools/disasm.py @@ -164,8 +164,9 @@ def write_header(file, is_data): class Disassembler: class File: - def __init__(self, name, data, vaddr): + def __init__(self, name, disasmPath, data, vaddr): self.name = name + self.disasmPath = disasmPath self.data = data self.vaddr = vaddr self.size = len(data) @@ -196,13 +197,13 @@ class Disassembler: def load_defaults(self): for file in known_files: - self.add_file(file[0], file[1], file[2]) - self.add_object(file[2]) # assume every file starts with a object and function - self.add_function(file[2]) - for region in file[3]: - self.add_data_region(region[0], region[1], file[1]) + self.add_file(file[0], file[1], file[2], file[3]) + self.add_object(file[3]) # assume every file starts with a object and function + self.add_function(file[3]) for region in file[4]: - self.add_bss_region(region[0], region[1], file[1]) + self.add_data_region(region[0], region[1], file[2]) + for region in file[5]: + self.add_bss_region(region[0], region[1], file[2]) for addr in known_funcs: self.add_function(addr) @@ -220,8 +221,8 @@ class Disassembler: self.is_code_cache = {} self.is_bss_cache = {} - def add_file(self, path, name, vaddr): - self.files.append(self.File(name, read_file(path + '/' + name), vaddr)) + def add_file(self, disasmPath, readPath, name, vaddr): + self.files.append(self.File(name, disasmPath, read_file(readPath + '/' + name), vaddr)) self.files = sorted(self.files, key = lambda file: file.vaddr) self.reset_cache() @@ -432,10 +433,13 @@ class Disassembler: if self.auto_analysis: self.guess_functions_and_variables_from_data() self.has_done_first_pass = True + + def build_disassembled_path(self, basePath, addr, file): + return basePath + '/' + file.disasmPath + '%s.asm' % self.get_object_name(addr, file.vaddr) def second_pass(self, path): for file in self.files: - filename = path + '/%s.asm' % self.get_object_name(file.vaddr, file.vaddr) + filename = self.build_disassembled_path(path, file.vaddr, file) with open(filename, 'w') as f: write_header(f, self.is_in_data_or_undef(file.vaddr)) @@ -446,7 +450,7 @@ class Disassembler: if addr in self.objects and SPLIT_FILES: f.close() - filename = path + '/%s.asm' % self.get_object_name(addr, file.vaddr) + filename = self.build_disassembled_path(path, addr, file) f = open(filename, 'w') write_header(f, self.is_in_data_or_undef(addr)) @@ -965,6 +969,9 @@ if __name__ == "__main__": if args.disassemble != None: os.makedirs(args.disassemble, exist_ok=True) + os.makedirs(args.disassemble + "/boot", exist_ok=True) + os.makedirs(args.disassemble + "/code", exist_ok=True) + os.makedirs(args.disassemble + "/overlays", exist_ok=True) dis.disassemble(args.disassemble) if args.undefined != None: os.makedirs(args.undefined, exist_ok=True) diff --git a/tools/progress.py b/tools/progress.py index 00758ce33e..1761812a54 100755 --- a/tools/progress.py +++ b/tools/progress.py @@ -1,102 +1,229 @@ #!/usr/bin/env python3 -import os, struct, sys, ast, argparse +import os, struct, sys, ast, argparse, json, re, csv -def read_all_lines(file_name): - lines = list() - try: - with open(file_name) as f: - lines = f.readlines() - except IOError: - print('failed to read file ' + file_name) - sys.exit(1) +parser = argparse.ArgumentParser() - return lines +parser = argparse.ArgumentParser(description="Computes current progress throughout the whole project.") +parser.add_argument("format", nargs="?", default="text", choices=["text", "csv", "shield-json"]) +parser.add_argument("-m", "--matching", dest='matching', action='store_true', + help="Output matching progress instead of decompilation progress") +args = parser.parse_args() -if __name__ == "__main__": - parser = argparse.ArgumentParser() +NON_MATCHING_PATTERN = r"#ifdef\s+NON_MATCHING.*?#pragma\s+GLOBAL_ASM\s*\(\s*\"(.*?)\"\s*\).*?#endif" +NOT_ATTEMPTED_PATTERN = r"#pragma\s+GLOBAL_ASM\s*\(\s*\"(.*?)\"\s*\)" - parser.add_argument('--file', help='File to print progress off. If excluded, defaults to all files.') - args = parser.parse_args() +def GetFunctionsByPattern(pattern, files): + functions = [] - map_lines = read_all_lines('build/mm.map') + for file in files: + with open(file) as f: + functions += re.findall(pattern, f.read(), re.DOTALL) - current_section = '' - in_section_list = False - asm_amounts = dict() - src_amounts = dict() - src_files = dict() - for line in map_lines: - if in_section_list: - if line.startswith('OUTPUT(build/code.elf elf32-tradbigmips)'): - break + return functions - line_split = list(filter(None, line.split())) +def ReadAllLines(fileName): + line_list = list() + with open(fileName) as f: + line_list = f.readlines() - if (len(line_split) > 0 and not line.startswith(' ')): - current_section = line_split[0] - src_amounts[current_section] = 0 - asm_amounts[current_section] = 0 - src_files[current_section] = [] + return line_list - if (len(line_split) == 4 and line_split[0].startswith(".")): - section = line_split[0] - size = int(line_split[2], 16) - obj_file = line_split[3] +def GetFiles(path, ext): + files = [] + + for r, d, f in os.walk(path): + for file in f: + if file.endswith(ext): + files.append(os.path.join(r, file)) - if (section == ".text" and not current_section + '_data' in obj_file and not current_section + '_rodata' in obj_file): - if (obj_file.startswith("build/src")): - src_amounts[current_section] += size - formatted_name = obj_file[len('build/'):] # remove build/ prefix - formatted_name = formatted_name[:-1] + 'c' # replace .o preface with .c - src_files[current_section].append(formatted_name) - elif (obj_file.startswith("build/asm")): - asm_amounts[current_section] += size - else: - in_section_list = line.startswith('Linker script and memory map') + return files - for section in src_files: - for file in src_files[section]: - file_lines = read_all_lines(file) - for line in file_lines: - if line.startswith('#pragma GLOBAL_ASM'): - line_split = list(filter(None, line.split('\"'))) - asm_lines = read_all_lines(line_split[1]) - for asm_line in asm_lines: - if asm_line.startswith('/*'): - asm_amounts[section] += 4 - src_amounts[section] -= 4 +def GetRemovableSize(functions_to_count, path): + size = 0 - src = 0 - asm = 0 - if args.file == None: - for section in src_amounts: - src += src_amounts[section] - for section in asm_amounts: - asm += asm_amounts[section] - else: - if args.file not in src_amounts or args.file not in asm_amounts: - sys.exit('{} not found in map file'.format(args.file)) - src += src_amounts[args.file] - asm += asm_amounts[args.file] + asm_files = GetFiles(path, ".asm") - total = src + asm - src_percent = 100 * src / total - asm_percent = 100 * asm / total + for asm_file_path in asm_files: + file_size = 0 + if asm_file_path in functions_to_count: + asm_lines = ReadAllLines(asm_file_path) - print('{} total bytes of decompilable code\n'.format(total)) - print('{} bytes of code in src {}%'.format(src, src_percent)) - print('{} bytes of code in asm {}%\n'.format(asm, asm_percent)) + for asm_line in asm_lines: + if (asm_line.startswith("/*")): + file_size += 4 + + size += file_size + + return size + +map_file = ReadAllLines('build/mm.map') + +# Get list of Non-Matchings +all_files = GetFiles("src", ".c") +non_matching_functions = GetFunctionsByPattern(NON_MATCHING_PATTERN, all_files) if not args.matching else [] + +# Get list of functions not attempted. +not_attempted_functions = GetFunctionsByPattern(NOT_ATTEMPTED_PATTERN, all_files) +not_attempted_functions = list(set(not_attempted_functions).difference(non_matching_functions)) + +# Initialize all the code values +src = 0 +src_code = 0 +src_boot = 0 +src_ovl = 0 +src_libultra = 0 +asm = 0 +asm_code = 0 +asm_boot = 0 +asm_ovl = 0 +asm_libultra = 0 + +for line in map_file: + line_split = list(filter(None, line.split(" "))) + + if (len(line_split) == 4 and line_split[0].startswith(".")): + section = line_split[0] + file_size = int(line_split[2], 16) + obj_file = line_split[3] + + if (section == ".text"): + if (obj_file.startswith("build/src")): + if (obj_file.startswith("build/src/code")): + src_code += file_size + elif (obj_file.startswith("build/src/libultra")): + src_libultra += file_size + elif (obj_file.startswith("build/src/boot")): + src_boot += file_size + elif (obj_file.startswith("build/src/overlays")): + src_ovl += file_size + elif (obj_file.startswith("build/asm")): + if (obj_file.startswith("build/asm/code")): + asm_code += file_size + elif (obj_file.startswith("build/asm/libultra")): + asm_libultra += file_size + elif (obj_file.startswith("build/asm/boot")): + asm_boot += file_size + elif (obj_file.startswith("build/asm/overlays")): + asm_ovl += file_size + +# Add libultra to boot. +src_boot += src_libultra +asm_boot += asm_libultra + +# Calculate Non-Matching +non_matching_asm_ovl = GetRemovableSize(non_matching_functions, "./asm/non_matchings/overlays") +non_matching_asm_code = GetRemovableSize(non_matching_functions, "./asm/non_matchings/code") +non_matching_asm_boot = GetRemovableSize(non_matching_functions, "./asm/non_matchings/boot") + +# Calculate Not Attempted +not_attempted_asm_ovl = GetRemovableSize(not_attempted_functions, "./asm/non_matchings/overlays") +not_attempted_asm_code = GetRemovableSize(not_attempted_functions, "./asm/non_matchings/code") +not_attempted_asm_boot = GetRemovableSize(not_attempted_functions, "./asm/non_matchings/boot") + +# All the non matching asm is the sum of non-matching code +non_matching_asm = non_matching_asm_ovl + non_matching_asm_code + non_matching_asm_boot + +# All the not attempted asm is the sum of not attemped code +not_attempted_asm = not_attempted_asm_ovl + not_attempted_asm_code + not_attempted_asm_boot + +# Calculate total decompiled for each bucket by taking out the non-matching and not attempted in ovl/code/boot buckets. +code = src_code - (non_matching_asm_code + not_attempted_asm_code) +boot = src_boot - (non_matching_asm_boot + not_attempted_asm_boot) +ovl = src_ovl - (non_matching_asm_ovl + not_attempted_asm_ovl) + +# Total code bucket sizes +code_size = src_code + asm_code +boot_size = src_boot + asm_boot +ovl_size = src_ovl + asm_ovl +handwritten = 0 # Currently unsure of any handwritten asm in MM + +# Calculate asm and src totals +src = src_code + src_boot + src_ovl +asm = asm_code + asm_boot + asm_ovl + +# Take out the non-matchings and not attempted in grand totals +src -= non_matching_asm + not_attempted_asm +asm += non_matching_asm + not_attempted_asm + +# Calculate the total amount of decompilable code +total = src + asm + +# Convert vaules to percentages +src_percent = 100 * src / total +asm_percent = 100 * asm / total +code_percent = 100 * code / code_size +boot_percent = 100 * boot / boot_size +ovl_percent = 100 * ovl / ovl_size + +# convert bytes to masks and rupees +num_masks = 24 +max_rupees = 500 +bytes_per_mask = total / num_masks +bytes_per_rupee = bytes_per_mask / max_rupees + +# Debug print statements for the values +print("Total: ", total) +print("src: ", src) +print("asm: ", asm) +print("") +print("src_code: ", src_code) +print("src_boot: ", src_boot) +print("src_ovl: ", src_ovl) +print("") +print("asm_code: ", asm_code) +print("asm_boot: ", asm_boot) +print("asm_ovl: ", asm_ovl) +print("") +print("Nonmatching code: ", non_matching_asm_code) +print("Nonmatching boot: ", non_matching_asm_boot) +print("Nonmatching ovl: ", non_matching_asm_ovl) +print("") +print("Not attempted code: ", not_attempted_asm_code) +print("Not attempted boot: ", not_attempted_asm_boot) +print("Not attempted ovl: ", not_attempted_asm_ovl) +print("") +print("code_size: ", code_size) +print("boot_size: ", boot_size) +print("ovl_size: ", ovl_size) +print("") +print("code: ", code) +print("boot: ", boot) +print("ovl: ", ovl) +print("") + +if args.format == 'csv': + version = 1 + git_object = git.Repo().head.object + timestamp = str(git_object.committed_date) + git_hash = git_object.hexsha + csv_list = [str(version), timestamp, git_hash, str(code), str(code_size), str(boot), str(boot_size), + str(ovl), str(ovl_size), str(src), str(asm), str(len(non_matching_functions))] + + print(",".join(csv_list)) +elif args.format == 'shield-json': + # https://shields.io/endpoint + print(json.dumps({ + "schemaVersion": 1, + "label": "progress", + "message": f"{src_percent:.3g}%", + "color": 'yellow', + })) +elif args.format == 'text': + adjective = "decompiled" if not args.matching else "matched" + + print(str(total) + " total bytes of decompilable code\n") + print(str(src) + " bytes " + adjective + " in src " + str(src_percent) + "%\n") + print(str(boot) + "/" + str(boot_size) + " bytes " + adjective + " in boot " + str(boot_percent) + "%\n") + print(str(code) + "/" + str(code_size) + " bytes " + adjective + " in code " + str(code_percent) + "%\n") + print(str(ovl) + "/" + str(ovl_size) + " bytes " + adjective + " in overlays " + str(ovl_percent) + "%\n") print("------------------------------------\n") - num_masks = 24 - max_rupees = 500 - bytes_per_mask = total / num_masks - bytes_per_rupee = bytes_per_mask / max_rupees masks = int(src / bytes_per_mask) rupees = int((src % bytes_per_mask) / bytes_per_rupee) if (rupees > 0): - print('You have {}/{} masks and {}/{} rupee(s).\n'.format(masks, num_masks, rupees, max_rupees)); + print('You have {}/{} masks and {}/{} rupee(s).\n'.format(masks, num_masks, rupees, max_rupees)) else: - print('You have {}/{} masks.\n'.format(masks, num_masks)); - + print('You have {}/{} masks.\n'.format(masks, num_masks)) +else: + print("Unknown format argument: " + args.format) \ No newline at end of file