MGislv/ooot
1
0
Fork 0
mirror of https://github.com/blawar/ooot.git synced 2024-07-04 18:13:37 +00:00
Code Releases Wiki Activity
b4f0eba3d9
ooot/spec

10471 lines
252 KiB
Plaintext
Raw Normal View History

First proper commit.
2020-03-17 04:31:30 +00:00
/*
* ROM spec file
*/
beginseg
name "makerom"
Disassemble the rom header and entrypoint function (#87) The actual boot code (ipl3) is still only incbin'd. If someone else wants to disassemble it properly, go ahead. I might do it eventually, but for now it doesn't seem required for shiftability or anything interesting.
2020-04-22 17:44:46 +00:00
include "build/asm/rom_header.o"
include "build/asm/ipl3.o"
include "build/asm/entry.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "boot"
Disassemble the rom header and entrypoint function (#87) The actual boot code (ipl3) is still only incbin'd. If someone else wants to disassemble it properly, go ahead. I might do it eventually, but for now it doesn't seem required for shiftability or anything interesting.
2020-04-22 17:44:46 +00:00
address 0x80000460
First proper commit.
2020-03-17 04:31:30 +00:00
include "build/src/boot/boot_main.o"
Minor data/ cleanups (#1025) * Moved code_800D2E30's data to C * Moved some audio data from asm to C * Made separate data files for unknown pointer arrays * Fixed a few missing balign directives
2021-11-24 02:07:48 +00:00
include "build/data/unk_80009410.data.o"
First proper commit.
2020-03-17 04:31:30 +00:00
include "build/src/boot/idle.o"
include "build/src/boot/viconfig.o"
include "build/src/boot/z_std_dma.o"
include "build/src/boot/yaz0.o"
include "build/src/boot/z_locale.o"
include "build/src/boot/assert.o"
include "build/src/boot/is_debug.o"
libultra files and directories restructure (#1038) * Restructure files, begin header restructure * Format * us2dex * Fix parallel spelling Co-authored-by: JoshDuMan <40190173+JoshDuMan@users.noreply.github.com> * Use OS_K0_TO_PHYSICAL in place of VIRTUAL_TO_PHYSICAL in osAiSetNextBuffer * Uppercase hex, exception vector address defines * Interrupt flags 1 Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Interrupt flags 2 Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> Co-authored-by: JoshDuMan <40190173+JoshDuMan@users.noreply.github.com> Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
2021-12-01 00:08:57 +00:00
include "build/src/libultra/io/driverominit.o"
ucode_disas.c progress (#188) * ucode_disas.c progress * fix * minor fixes * minor comment changes
2020-06-05 17:18:39 +00:00
include "build/asm/mio0.o"
First proper commit.
2020-03-17 04:31:30 +00:00
include "build/src/boot/stackcheck.o"
include "build/src/boot/logutils.o"
libultra files and directories restructure (#1038) * Restructure files, begin header restructure * Format * us2dex * Fix parallel spelling Co-authored-by: JoshDuMan <40190173+JoshDuMan@users.noreply.github.com> * Use OS_K0_TO_PHYSICAL in place of VIRTUAL_TO_PHYSICAL in osAiSetNextBuffer * Uppercase hex, exception vector address defines * Interrupt flags 1 Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Interrupt flags 2 Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> Co-authored-by: JoshDuMan <40190173+JoshDuMan@users.noreply.github.com> Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
2021-12-01 00:08:57 +00:00
include "build/src/libultra/rmon/sprintf.o"
include "build/src/libultra/io/piacs.o"
include "build/src/libultra/os/sendmesg.o"
include "build/src/libultra/os/stopthread.o"
include "build/src/libultra/io/viextend.o"
include "build/src/libultra/io/vimodepallan1.o"
include "build/src/libultra/os/recvmesg.o"
include "build/src/libultra/os/initialize.o"
include "build/src/libultra/libc/ll.o"
First proper commit.
2020-03-17 04:31:30 +00:00
include "build/asm/exceptasm.o"
libultra files and directories restructure (#1038) * Restructure files, begin header restructure * Format * us2dex * Fix parallel spelling Co-authored-by: JoshDuMan <40190173+JoshDuMan@users.noreply.github.com> * Use OS_K0_TO_PHYSICAL in place of VIRTUAL_TO_PHYSICAL in osAiSetNextBuffer * Uppercase hex, exception vector address defines * Interrupt flags 1 Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Interrupt flags 2 Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> Co-authored-by: JoshDuMan <40190173+JoshDuMan@users.noreply.github.com> Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
2021-12-01 00:08:57 +00:00
include "build/src/libultra/os/dequeuethread.o"
include "build/src/libultra/os/destroythread.o"
First proper commit.
2020-03-17 04:31:30 +00:00
include "build/asm/bzero.o"
libultra files and directories restructure (#1038) * Restructure files, begin header restructure * Format * us2dex * Fix parallel spelling Co-authored-by: JoshDuMan <40190173+JoshDuMan@users.noreply.github.com> * Use OS_K0_TO_PHYSICAL in place of VIRTUAL_TO_PHYSICAL in osAiSetNextBuffer * Uppercase hex, exception vector address defines * Interrupt flags 1 Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Interrupt flags 2 Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> Co-authored-by: JoshDuMan <40190173+JoshDuMan@users.noreply.github.com> Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
2021-12-01 00:08:57 +00:00
include "build/src/libultra/os/createthread.o"
First proper commit.
2020-03-17 04:31:30 +00:00
include "build/asm/__osSetSR.o"
include "build/asm/__osGetSR.o"
include "build/asm/osWritebackDCache.o"
libultra files and directories restructure (#1038) * Restructure files, begin header restructure * Format * us2dex * Fix parallel spelling Co-authored-by: JoshDuMan <40190173+JoshDuMan@users.noreply.github.com> * Use OS_K0_TO_PHYSICAL in place of VIRTUAL_TO_PHYSICAL in osAiSetNextBuffer * Uppercase hex, exception vector address defines * Interrupt flags 1 Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Interrupt flags 2 Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> Co-authored-by: JoshDuMan <40190173+JoshDuMan@users.noreply.github.com> Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
2021-12-01 00:08:57 +00:00
include "build/src/libultra/io/vigetnextframebuf.o"
include "build/src/libultra/io/pimgr.o"
include "build/src/libultra/io/devmgr.o"
include "build/src/libultra/io/pirawdma.o"
include "build/src/libultra/os/virtualtophysical.o"
include "build/src/libultra/io/viblack.o"
include "build/src/libultra/io/sirawread.o"
include "build/src/libultra/os/getthreadid.o"
First proper commit.
2020-03-17 04:31:30 +00:00
include "build/asm/osSetIntMask.o"
libultra files and directories restructure (#1038) * Restructure files, begin header restructure * Format * us2dex * Fix parallel spelling Co-authored-by: JoshDuMan <40190173+JoshDuMan@users.noreply.github.com> * Use OS_K0_TO_PHYSICAL in place of VIRTUAL_TO_PHYSICAL in osAiSetNextBuffer * Uppercase hex, exception vector address defines * Interrupt flags 1 Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Interrupt flags 2 Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> Co-authored-by: JoshDuMan <40190173+JoshDuMan@users.noreply.github.com> Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
2021-12-01 00:08:57 +00:00
include "build/src/libultra/io/visetmode.o"
First proper commit.
2020-03-17 04:31:30 +00:00
include "build/asm/__osProbeTLB.o"
libultra files and directories restructure (#1038) * Restructure files, begin header restructure * Format * us2dex * Fix parallel spelling Co-authored-by: JoshDuMan <40190173+JoshDuMan@users.noreply.github.com> * Use OS_K0_TO_PHYSICAL in place of VIRTUAL_TO_PHYSICAL in osAiSetNextBuffer * Uppercase hex, exception vector address defines * Interrupt flags 1 Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Interrupt flags 2 Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> Co-authored-by: JoshDuMan <40190173+JoshDuMan@users.noreply.github.com> Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
2021-12-01 00:08:57 +00:00
include "build/src/libultra/os/getmemsize.o"
include "build/src/libultra/os/seteventmesg.o"
include "build/src/libultra/rmon/xprintf.o"
First proper commit.
2020-03-17 04:31:30 +00:00
include "build/asm/osUnmapTLBAll.o"
libultra files and directories restructure (#1038) * Restructure files, begin header restructure * Format * us2dex * Fix parallel spelling Co-authored-by: JoshDuMan <40190173+JoshDuMan@users.noreply.github.com> * Use OS_K0_TO_PHYSICAL in place of VIRTUAL_TO_PHYSICAL in osAiSetNextBuffer * Uppercase hex, exception vector address defines * Interrupt flags 1 Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Interrupt flags 2 Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> Co-authored-by: JoshDuMan <40190173+JoshDuMan@users.noreply.github.com> Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
2021-12-01 00:08:57 +00:00
include "build/src/libultra/io/epidma.o"
include "build/src/libultra/libc/string.o"
First proper commit.
2020-03-17 04:31:30 +00:00
include "build/asm/osInvalICache.o"
libultra files and directories restructure (#1038) * Restructure files, begin header restructure * Format * us2dex * Fix parallel spelling Co-authored-by: JoshDuMan <40190173+JoshDuMan@users.noreply.github.com> * Use OS_K0_TO_PHYSICAL in place of VIRTUAL_TO_PHYSICAL in osAiSetNextBuffer * Uppercase hex, exception vector address defines * Interrupt flags 1 Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Interrupt flags 2 Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> Co-authored-by: JoshDuMan <40190173+JoshDuMan@users.noreply.github.com> Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
2021-12-01 00:08:57 +00:00
include "build/src/libultra/os/createmesgqueue.o"
First proper commit.
2020-03-17 04:31:30 +00:00
include "build/asm/osInvalDCache.o"
libultra files and directories restructure (#1038) * Restructure files, begin header restructure * Format * us2dex * Fix parallel spelling Co-authored-by: JoshDuMan <40190173+JoshDuMan@users.noreply.github.com> * Use OS_K0_TO_PHYSICAL in place of VIRTUAL_TO_PHYSICAL in osAiSetNextBuffer * Uppercase hex, exception vector address defines * Interrupt flags 1 Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Interrupt flags 2 Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> Co-authored-by: JoshDuMan <40190173+JoshDuMan@users.noreply.github.com> Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
2021-12-01 00:08:57 +00:00
include "build/src/libultra/io/si.o"
include "build/src/libultra/os/jammesg.o"
include "build/src/libultra/os/setthreadpri.o"
include "build/src/libultra/os/getthreadpri.o"
include "build/src/libultra/io/epirawread.o"
include "build/src/libultra/io/viswapbuf.o"
include "build/src/libultra/io/epirawdma.o"
First proper commit.
2020-03-17 04:31:30 +00:00
include "build/asm/bcmp.o"
libultra files and directories restructure (#1038) * Restructure files, begin header restructure * Format * us2dex * Fix parallel spelling Co-authored-by: JoshDuMan <40190173+JoshDuMan@users.noreply.github.com> * Use OS_K0_TO_PHYSICAL in place of VIRTUAL_TO_PHYSICAL in osAiSetNextBuffer * Uppercase hex, exception vector address defines * Interrupt flags 1 Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Interrupt flags 2 Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> Co-authored-by: JoshDuMan <40190173+JoshDuMan@users.noreply.github.com> Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
2021-12-01 00:08:57 +00:00
include "build/src/libultra/os/gettime.o"
include "build/src/libultra/os/timerintr.o"
First proper commit.
2020-03-17 04:31:30 +00:00
include "build/asm/osGetCount.o"
libultra files and directories restructure (#1038) * Restructure files, begin header restructure * Format * us2dex * Fix parallel spelling Co-authored-by: JoshDuMan <40190173+JoshDuMan@users.noreply.github.com> * Use OS_K0_TO_PHYSICAL in place of VIRTUAL_TO_PHYSICAL in osAiSetNextBuffer * Uppercase hex, exception vector address defines * Interrupt flags 1 Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Interrupt flags 2 Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> Co-authored-by: JoshDuMan <40190173+JoshDuMan@users.noreply.github.com> Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
2021-12-01 00:08:57 +00:00
include "build/src/libultra/os/setglobalintmask.o"
First proper commit.
2020-03-17 04:31:30 +00:00
include "build/asm/__osSetCompare.o"
include "build/asm/bcopy.o"
libultra files and directories restructure (#1038) * Restructure files, begin header restructure * Format * us2dex * Fix parallel spelling Co-authored-by: JoshDuMan <40190173+JoshDuMan@users.noreply.github.com> * Use OS_K0_TO_PHYSICAL in place of VIRTUAL_TO_PHYSICAL in osAiSetNextBuffer * Uppercase hex, exception vector address defines * Interrupt flags 1 Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Interrupt flags 2 Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> Co-authored-by: JoshDuMan <40190173+JoshDuMan@users.noreply.github.com> Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
2021-12-01 00:08:57 +00:00
include "build/src/libultra/os/resetglobalintmask.o"
First proper commit.
2020-03-17 04:31:30 +00:00
include "build/asm/__osDisableInt.o"
include "build/asm/__osRestoreInt.o"
libultra files and directories restructure (#1038) * Restructure files, begin header restructure * Format * us2dex * Fix parallel spelling Co-authored-by: JoshDuMan <40190173+JoshDuMan@users.noreply.github.com> * Use OS_K0_TO_PHYSICAL in place of VIRTUAL_TO_PHYSICAL in osAiSetNextBuffer * Uppercase hex, exception vector address defines * Interrupt flags 1 Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Interrupt flags 2 Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> Co-authored-by: JoshDuMan <40190173+JoshDuMan@users.noreply.github.com> Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
2021-12-01 00:08:57 +00:00
include "build/src/libultra/io/vimodentsclan1.o"
include "build/src/libultra/io/vimodempallan1.o"
include "build/src/libultra/io/vi.o"
include "build/src/libultra/io/viswapcontext.o"
include "build/src/libultra/io/pigetcmdq.o"
include "build/src/libultra/io/epiread.o"
include "build/src/libultra/io/visetspecial.o"
include "build/src/libultra/io/cartrominit.o"
include "build/src/libultra/io/vimodefpallan1.o"
First proper commit.
2020-03-17 04:31:30 +00:00
include "build/asm/__osSetFpcCsr.o"
include "build/asm/__osGetFpcCsr.o"
libultra files and directories restructure (#1038) * Restructure files, begin header restructure * Format * us2dex * Fix parallel spelling Co-authored-by: JoshDuMan <40190173+JoshDuMan@users.noreply.github.com> * Use OS_K0_TO_PHYSICAL in place of VIRTUAL_TO_PHYSICAL in osAiSetNextBuffer * Uppercase hex, exception vector address defines * Interrupt flags 1 Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Interrupt flags 2 Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> Co-authored-by: JoshDuMan <40190173+JoshDuMan@users.noreply.github.com> Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
2021-12-01 00:08:57 +00:00
include "build/src/libultra/io/epiwrite.o"
First proper commit.
2020-03-17 04:31:30 +00:00
include "build/asm/osMapTLBRdb.o"
libultra files and directories restructure (#1038) * Restructure files, begin header restructure * Format * us2dex * Fix parallel spelling Co-authored-by: JoshDuMan <40190173+JoshDuMan@users.noreply.github.com> * Use OS_K0_TO_PHYSICAL in place of VIRTUAL_TO_PHYSICAL in osAiSetNextBuffer * Uppercase hex, exception vector address defines * Interrupt flags 1 Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Interrupt flags 2 Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> Co-authored-by: JoshDuMan <40190173+JoshDuMan@users.noreply.github.com> Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
2021-12-01 00:08:57 +00:00
include "build/src/libultra/os/yieldthread.o"
First proper commit.
2020-03-17 04:31:30 +00:00
include "build/asm/__osGetCause.o"
libultra files and directories restructure (#1038) * Restructure files, begin header restructure * Format * us2dex * Fix parallel spelling Co-authored-by: JoshDuMan <40190173+JoshDuMan@users.noreply.github.com> * Use OS_K0_TO_PHYSICAL in place of VIRTUAL_TO_PHYSICAL in osAiSetNextBuffer * Uppercase hex, exception vector address defines * Interrupt flags 1 Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Interrupt flags 2 Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> Co-authored-by: JoshDuMan <40190173+JoshDuMan@users.noreply.github.com> Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
2021-12-01 00:08:57 +00:00
include "build/src/libultra/io/epirawwrite.o"
include "build/src/libultra/rmon/xlitob.o"
include "build/src/libultra/libc/ldiv.o"
include "build/src/libultra/rmon/xldtob.o"
First proper commit.
2020-03-17 04:31:30 +00:00
include "build/src/boot/build.o"
libultra files and directories restructure (#1038) * Restructure files, begin header restructure * Format * us2dex * Fix parallel spelling Co-authored-by: JoshDuMan <40190173+JoshDuMan@users.noreply.github.com> * Use OS_K0_TO_PHYSICAL in place of VIRTUAL_TO_PHYSICAL in osAiSetNextBuffer * Uppercase hex, exception vector address defines * Interrupt flags 1 Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Interrupt flags 2 Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> Co-authored-by: JoshDuMan <40190173+JoshDuMan@users.noreply.github.com> Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
2021-12-01 00:08:57 +00:00
include "build/src/libultra/io/sirawwrite.o"
include "build/src/libultra/io/vimgr.o"
include "build/src/libultra/io/vigetcurrcontext.o"
include "build/src/libultra/os/startthread.o"
include "build/src/libultra/io/visetyscale.o"
include "build/src/libultra/io/visetxscale.o"
include "build/src/libultra/os/sethwintrroutine.o"
include "build/src/libultra/os/gethwintrroutine.o"
First proper commit.
2020-03-17 04:31:30 +00:00
include "build/asm/__osSetWatchLo.o"
include "build/data/rsp_boot.text.o"
endseg
beginseg
name "dmadata"
Rework handling of dmadata (#1036) * Generate dmadata * Remove tab indentations in mkdmadata.c and mkldscript.c * Fix * Review suggestions * Hopefully fix * Fix index Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
2021-11-30 23:29:09 +00:00
include "build/src/dmadata/dmadata.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "Audiobank"
Add sym_info.py and first_diff.py scripts for convenience (#192)
2020-06-07 14:37:48 +00:00
address 0x10 // fake RAM address to avoid map lookup inaccuracies
First proper commit.
2020-03-17 04:31:30 +00:00
include "build/baserom/Audiobank.o"
endseg
beginseg
name "Audioseq"
include "build/baserom/Audioseq.o"
endseg
beginseg
name "Audiotable"
include "build/baserom/Audiotable.o"
endseg
beginseg
name "link_animetion"
`link_animetion` xml, and ExternalFile config (#1011) * Automatic XML for link_animetion * Make sure tutorial images are not gitignored * OK * Correct ovl_Boss_Sst RangeEnd * ExternalFiles * Remove Segment="128" * Remove segments from place_title_cards * format, newlines, remove previous xml
2021-11-07 17:13:44 +00:00
include "build/assets/misc/link_animetion/link_animetion.o"
number 7
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "icon_item_static"
romalign 0x1000
include "build/assets/textures/icon_item_static/icon_item_static.o"
Decompile Gameplay_Keep and fix all existing decompiled objects (#595) * First batch of files * Add missing folders back * Fix missing folders again * Finish fixing existing texture files * Gameplay_Keep XML finished * Most actor gameplay_keep undefined syms removed * Only ~200 gkeep symbols remain * All gkeep symbols that ZAP supports are fixed * Cleanup, and make gkeep names more accurate * Starting to figure out what some unknown blobs are, merge zeldaret in * fix a few more things * refactor gkeep * Change how gitkeep is handled * gkeep xml cleanup * Gkeep finished, now just waiting up ZAP updates * 100 link animations finished * 150 link animations finished * 200 link animations finished * 250 link animations finished * 350 link animations finished * 400 link animations finished * 450 link animations finished * 500 link animations finished * 550 link animations finished * All Link animations finished cannot build yet because ZAP doesn't have LinkAnimationHeader yet * xml changes for new zap stuff * finish gameplay_keep * fixing existing objects * ready for pr besides zap padding issue * mostly ready for pr * format all c files * all conflicts fixed * make changes that roman requested * fix thing i didn't mean to change * some animation symbols renamed * fixed roman's stuff * lifemeter hardcoded pointers removed * fix issue with incorrect data in gameplay_keep * removed unused asm * fixed most of fig's comments * fix all of fig's comments * reformat files * Update assets/xml/textures/icon_item_static.xml Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update assets/xml/textures/icon_item_static.xml Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * fixed stuff * fixed most of roman's comments * remove leading zeroes * should build now * git subrepo pull --force tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "f84d8337b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "f84d8337b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * all of gkeep symbols fixed * compiler error fixed * format files * final changes Co-authored-by: Zelllll <elijah@DESKTOP-NMP1I89.localdomain> Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2021-01-25 00:36:40 +00:00
number 8
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "icon_item_24_static"
romalign 0x1000
include "build/assets/textures/icon_item_24_static/icon_item_24_static.o"
Decompile the pause menu aka. ovl_kaleido_scope (+ minor changes) (#803) * Decompile ovl_kaleido_scope + minor cleanups * Add a common header for ovl_kaleido_scope * Start cleaning up and documenting kaleido_scope (+ some interface docs) * Improve and fix some kaleido_scope non matchings * Match KaleidoSetup_Init * Extract icon_item_fra/ger_static files * Add more documentation and matches to kaleido_scope * Improve the z_kaleido_collect.c non matching * Rename z_kaleido_8081EFF0.c to z_kaleido_prompt.c * Update most kaleido variables to be static * Improve GS flag macros * Improve z_lmap_mark.c and extract z_lmap_mark_data.c with a script * Various minor fixes and improvements * Minor fixes and review changes * Review changes part 2 * Rename gSetTileCustom to gDPSetTileCustom * Review changes part 3
2021-05-02 23:15:16 +00:00
number 9
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "icon_item_field_static"
romalign 0x1000
include "build/assets/textures/icon_item_field_static/icon_item_field_static.o"
Decompile the pause menu aka. ovl_kaleido_scope (+ minor changes) (#803) * Decompile ovl_kaleido_scope + minor cleanups * Add a common header for ovl_kaleido_scope * Start cleaning up and documenting kaleido_scope (+ some interface docs) * Improve and fix some kaleido_scope non matchings * Match KaleidoSetup_Init * Extract icon_item_fra/ger_static files * Add more documentation and matches to kaleido_scope * Improve the z_kaleido_collect.c non matching * Rename z_kaleido_8081EFF0.c to z_kaleido_prompt.c * Update most kaleido variables to be static * Improve GS flag macros * Improve z_lmap_mark.c and extract z_lmap_mark_data.c with a script * Various minor fixes and improvements * Minor fixes and review changes * Review changes part 2 * Rename gSetTileCustom to gDPSetTileCustom * Review changes part 3
2021-05-02 23:15:16 +00:00
number 12
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "icon_item_dungeon_static"
romalign 0x1000
include "build/assets/textures/icon_item_dungeon_static/icon_item_dungeon_static.o"
Decompile the pause menu aka. ovl_kaleido_scope (+ minor changes) (#803) * Decompile ovl_kaleido_scope + minor cleanups * Add a common header for ovl_kaleido_scope * Start cleaning up and documenting kaleido_scope (+ some interface docs) * Improve and fix some kaleido_scope non matchings * Match KaleidoSetup_Init * Extract icon_item_fra/ger_static files * Add more documentation and matches to kaleido_scope * Improve the z_kaleido_collect.c non matching * Rename z_kaleido_8081EFF0.c to z_kaleido_prompt.c * Update most kaleido variables to be static * Improve GS flag macros * Improve z_lmap_mark.c and extract z_lmap_mark_data.c with a script * Various minor fixes and improvements * Minor fixes and review changes * Review changes part 2 * Rename gSetTileCustom to gDPSetTileCustom * Review changes part 3
2021-05-02 23:15:16 +00:00
number 12
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "icon_item_gameover_static"
romalign 0x1000
Decompile the pause menu aka. ovl_kaleido_scope (+ minor changes) (#803) * Decompile ovl_kaleido_scope + minor cleanups * Add a common header for ovl_kaleido_scope * Start cleaning up and documenting kaleido_scope (+ some interface docs) * Improve and fix some kaleido_scope non matchings * Match KaleidoSetup_Init * Extract icon_item_fra/ger_static files * Add more documentation and matches to kaleido_scope * Improve the z_kaleido_collect.c non matching * Rename z_kaleido_8081EFF0.c to z_kaleido_prompt.c * Update most kaleido variables to be static * Improve GS flag macros * Improve z_lmap_mark.c and extract z_lmap_mark_data.c with a script * Various minor fixes and improvements * Minor fixes and review changes * Review changes part 2 * Rename gSetTileCustom to gDPSetTileCustom * Review changes part 3
2021-05-02 23:15:16 +00:00
include "build/assets/textures/icon_item_gameover_static/icon_item_gameover_static.o"
number 12
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "icon_item_nes_static"
romalign 0x1000
Decompile the pause menu aka. ovl_kaleido_scope (+ minor changes) (#803) * Decompile ovl_kaleido_scope + minor cleanups * Add a common header for ovl_kaleido_scope * Start cleaning up and documenting kaleido_scope (+ some interface docs) * Improve and fix some kaleido_scope non matchings * Match KaleidoSetup_Init * Extract icon_item_fra/ger_static files * Add more documentation and matches to kaleido_scope * Improve the z_kaleido_collect.c non matching * Rename z_kaleido_8081EFF0.c to z_kaleido_prompt.c * Update most kaleido variables to be static * Improve GS flag macros * Improve z_lmap_mark.c and extract z_lmap_mark_data.c with a script * Various minor fixes and improvements * Minor fixes and review changes * Review changes part 2 * Rename gSetTileCustom to gDPSetTileCustom * Review changes part 3
2021-05-02 23:15:16 +00:00
include "build/assets/textures/icon_item_nes_static/icon_item_nes_static.o"
number 13
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "icon_item_ger_static"
romalign 0x1000
Decompile the pause menu aka. ovl_kaleido_scope (+ minor changes) (#803) * Decompile ovl_kaleido_scope + minor cleanups * Add a common header for ovl_kaleido_scope * Start cleaning up and documenting kaleido_scope (+ some interface docs) * Improve and fix some kaleido_scope non matchings * Match KaleidoSetup_Init * Extract icon_item_fra/ger_static files * Add more documentation and matches to kaleido_scope * Improve the z_kaleido_collect.c non matching * Rename z_kaleido_8081EFF0.c to z_kaleido_prompt.c * Update most kaleido variables to be static * Improve GS flag macros * Improve z_lmap_mark.c and extract z_lmap_mark_data.c with a script * Various minor fixes and improvements * Minor fixes and review changes * Review changes part 2 * Rename gSetTileCustom to gDPSetTileCustom * Review changes part 3
2021-05-02 23:15:16 +00:00
include "build/assets/textures/icon_item_ger_static/icon_item_ger_static.o"
number 13
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "icon_item_fra_static"
romalign 0x1000
Decompile the pause menu aka. ovl_kaleido_scope (+ minor changes) (#803) * Decompile ovl_kaleido_scope + minor cleanups * Add a common header for ovl_kaleido_scope * Start cleaning up and documenting kaleido_scope (+ some interface docs) * Improve and fix some kaleido_scope non matchings * Match KaleidoSetup_Init * Extract icon_item_fra/ger_static files * Add more documentation and matches to kaleido_scope * Improve the z_kaleido_collect.c non matching * Rename z_kaleido_8081EFF0.c to z_kaleido_prompt.c * Update most kaleido variables to be static * Improve GS flag macros * Improve z_lmap_mark.c and extract z_lmap_mark_data.c with a script * Various minor fixes and improvements * Minor fixes and review changes * Review changes part 2 * Rename gSetTileCustom to gDPSetTileCustom * Review changes part 3
2021-05-02 23:15:16 +00:00
include "build/assets/textures/icon_item_fra_static/icon_item_fra_static.o"
number 13
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "item_name_static"
romalign 0x1000
Some static texture files "decompiled" (#658) * . * remove tools/ZAP2 from origin master * Some texture files * fix tabs in new texture files * map_i_static * some updates * update names * update more names * nintendo_rogo_static * title_static ok * Added segment= to the texture files * do_action_static update * Made suggested changes * Made suggested changes * Fixed spec
2021-02-24 18:41:43 +00:00
include "build/assets/textures/item_name_static/item_name_static.o"
number 10
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "map_name_static"
romalign 0x1000
Some static texture files "decompiled" (#658) * . * remove tools/ZAP2 from origin master * Some texture files * fix tabs in new texture files * map_i_static * some updates * update names * update more names * nintendo_rogo_static * title_static ok * Added segment= to the texture files * do_action_static update * Made suggested changes * Made suggested changes * Fixed spec
2021-02-24 18:41:43 +00:00
include "build/assets/textures/map_name_static/map_name_static.o"
number 11
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "do_action_static"
romalign 0x1000
Some static texture files "decompiled" (#658) * . * remove tools/ZAP2 from origin master * Some texture files * fix tabs in new texture files * map_i_static * some updates * update names * update more names * nintendo_rogo_static * title_static ok * Added segment= to the texture files * do_action_static update * Made suggested changes * Made suggested changes * Fixed spec
2021-02-24 18:41:43 +00:00
include "build/assets/textures/do_action_static/do_action_static.o"
number 7
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "message_static"
romalign 0x1000
Some static texture files "decompiled" (#658) * . * remove tools/ZAP2 from origin master * Some texture files * fix tabs in new texture files * map_i_static * some updates * update names * update more names * nintendo_rogo_static * title_static ok * Added segment= to the texture files * do_action_static update * Made suggested changes * Made suggested changes * Fixed spec
2021-02-24 18:41:43 +00:00
include "build/assets/textures/message_static/message_static.o"
number 7
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "message_texture_static"
romalign 0x1000
Some static texture files "decompiled" (#658) * . * remove tools/ZAP2 from origin master * Some texture files * fix tabs in new texture files * map_i_static * some updates * update names * update more names * nintendo_rogo_static * title_static ok * Added segment= to the texture files * do_action_static update * Made suggested changes * Made suggested changes * Fixed spec
2021-02-24 18:41:43 +00:00
include "build/assets/textures/message_texture_static/message_texture_static.o"
number 9
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "nes_font_static"
romalign 0x1000
Some static texture files "decompiled" (#658) * . * remove tools/ZAP2 from origin master * Some texture files * fix tabs in new texture files * map_i_static * some updates * update names * update more names * nintendo_rogo_static * title_static ok * Added segment= to the texture files * do_action_static update * Made suggested changes * Made suggested changes * Fixed spec
2021-02-24 18:41:43 +00:00
include "build/assets/textures/nes_font_static/nes_font_static.o"
number 10
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "nes_message_data_static"
romalign 0x1000
z_message_PAL, message_data_static and surrounding doc (#996) * Initial progress on z_message_PAL, very messy * Fix merge * Some more progress * Fix merge * More z_message_PAL * Small progress * More small progress * message_data_static files OK * Prepare z_message_tables * Matched another function, small updates * Attempt to use asm-processor static-symbols branch * Refactor text id declarations * Begin large text codes parser function * Fix merge * Refactor done * Build OK, add color and highscore names * Remove encoded text headers and automatically encode during build * Fix kanfont * Various cleanups * DISP macros * Another match aside data * Further progress * Small improvements * Deduplicate magic values for text control codes, small improvements * Tiny progress * Minor cleanups * Clean up z_message_PAL comment * Progress on large functions * Further progress on large functions * Changes to mkldscript to link .data in the .rodata section * data OK * Few improvements * Use gDPLoadTextureBlock macros where appropriate * rm z_message_tables, progress on large functions * 2 more matches * Improvements * Small progress * More progress on big function * progress * match func_80107980 * match Message_Update * match func_8010BED8 * done * Progress on remaining large functions * Small progress on largest function * Another match, extract text and move to assets, improve text build system * Small nonmatchings improvements * docs wip * Largest function maybe equivalent * Fix merge * Document do_action values, largest function is almost instruction-matching * Rename NAVI do_action to NONE, as that appears to be how that value is used in practice * Fix merge * one match * Last function is instruction-matching * Fix * Improvements thanks to engineer124 * Stack matched thanks to petrie911, now just a/v/low t regalloc issues, some cleanup * More variables labeled, use text state enum everywhere * More labels and names * Fix * Actor_IsTalking -> Actor_TalkRequested * Match func_8010C39C and remove unused asm * More docs * Mostly ocarina related docs * All msgModes named * Fix assetclean * Cleanup * Extraction fixes and headers * Suggestions * Review suggestions * Change text extraction again, only extract if the headers do not already exist * Fix * Use ast for charmap, fix assetclean for real this time * Review suggestions * BGM ids and ran formatter * Review comments * rename include_readonly to include_data_with_rodata * Remove leading 0s in number directives * Review suggestions for message_data_static * textbox pos enum comments, rename several enum names from Message to TextBox Co-authored-by: Thar0 <maximilianc64@gmail.com> Co-authored-by: Zelllll <56516451+Zelllll@users.noreply.github.com> Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain> Co-authored-by: Roman971 <romanlasnier@hotmail.com>
2021-11-23 01:20:30 +00:00
include "build/assets/text/nes_message_data_static.o"
number 7
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ger_message_data_static"
romalign 0x1000
z_message_PAL, message_data_static and surrounding doc (#996) * Initial progress on z_message_PAL, very messy * Fix merge * Some more progress * Fix merge * More z_message_PAL * Small progress * More small progress * message_data_static files OK * Prepare z_message_tables * Matched another function, small updates * Attempt to use asm-processor static-symbols branch * Refactor text id declarations * Begin large text codes parser function * Fix merge * Refactor done * Build OK, add color and highscore names * Remove encoded text headers and automatically encode during build * Fix kanfont * Various cleanups * DISP macros * Another match aside data * Further progress * Small improvements * Deduplicate magic values for text control codes, small improvements * Tiny progress * Minor cleanups * Clean up z_message_PAL comment * Progress on large functions * Further progress on large functions * Changes to mkldscript to link .data in the .rodata section * data OK * Few improvements * Use gDPLoadTextureBlock macros where appropriate * rm z_message_tables, progress on large functions * 2 more matches * Improvements * Small progress * More progress on big function * progress * match func_80107980 * match Message_Update * match func_8010BED8 * done * Progress on remaining large functions * Small progress on largest function * Another match, extract text and move to assets, improve text build system * Small nonmatchings improvements * docs wip * Largest function maybe equivalent * Fix merge * Document do_action values, largest function is almost instruction-matching * Rename NAVI do_action to NONE, as that appears to be how that value is used in practice * Fix merge * one match * Last function is instruction-matching * Fix * Improvements thanks to engineer124 * Stack matched thanks to petrie911, now just a/v/low t regalloc issues, some cleanup * More variables labeled, use text state enum everywhere * More labels and names * Fix * Actor_IsTalking -> Actor_TalkRequested * Match func_8010C39C and remove unused asm * More docs * Mostly ocarina related docs * All msgModes named * Fix assetclean * Cleanup * Extraction fixes and headers * Suggestions * Review suggestions * Change text extraction again, only extract if the headers do not already exist * Fix * Use ast for charmap, fix assetclean for real this time * Review suggestions * BGM ids and ran formatter * Review comments * rename include_readonly to include_data_with_rodata * Remove leading 0s in number directives * Review suggestions for message_data_static * textbox pos enum comments, rename several enum names from Message to TextBox Co-authored-by: Thar0 <maximilianc64@gmail.com> Co-authored-by: Zelllll <56516451+Zelllll@users.noreply.github.com> Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain> Co-authored-by: Roman971 <romanlasnier@hotmail.com>
2021-11-23 01:20:30 +00:00
include "build/assets/text/ger_message_data_static.o"
number 7
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "fra_message_data_static"
romalign 0x1000
z_message_PAL, message_data_static and surrounding doc (#996) * Initial progress on z_message_PAL, very messy * Fix merge * Some more progress * Fix merge * More z_message_PAL * Small progress * More small progress * message_data_static files OK * Prepare z_message_tables * Matched another function, small updates * Attempt to use asm-processor static-symbols branch * Refactor text id declarations * Begin large text codes parser function * Fix merge * Refactor done * Build OK, add color and highscore names * Remove encoded text headers and automatically encode during build * Fix kanfont * Various cleanups * DISP macros * Another match aside data * Further progress * Small improvements * Deduplicate magic values for text control codes, small improvements * Tiny progress * Minor cleanups * Clean up z_message_PAL comment * Progress on large functions * Further progress on large functions * Changes to mkldscript to link .data in the .rodata section * data OK * Few improvements * Use gDPLoadTextureBlock macros where appropriate * rm z_message_tables, progress on large functions * 2 more matches * Improvements * Small progress * More progress on big function * progress * match func_80107980 * match Message_Update * match func_8010BED8 * done * Progress on remaining large functions * Small progress on largest function * Another match, extract text and move to assets, improve text build system * Small nonmatchings improvements * docs wip * Largest function maybe equivalent * Fix merge * Document do_action values, largest function is almost instruction-matching * Rename NAVI do_action to NONE, as that appears to be how that value is used in practice * Fix merge * one match * Last function is instruction-matching * Fix * Improvements thanks to engineer124 * Stack matched thanks to petrie911, now just a/v/low t regalloc issues, some cleanup * More variables labeled, use text state enum everywhere * More labels and names * Fix * Actor_IsTalking -> Actor_TalkRequested * Match func_8010C39C and remove unused asm * More docs * Mostly ocarina related docs * All msgModes named * Fix assetclean * Cleanup * Extraction fixes and headers * Suggestions * Review suggestions * Change text extraction again, only extract if the headers do not already exist * Fix * Use ast for charmap, fix assetclean for real this time * Review suggestions * BGM ids and ran formatter * Review comments * rename include_readonly to include_data_with_rodata * Remove leading 0s in number directives * Review suggestions for message_data_static * textbox pos enum comments, rename several enum names from Message to TextBox Co-authored-by: Thar0 <maximilianc64@gmail.com> Co-authored-by: Zelllll <56516451+Zelllll@users.noreply.github.com> Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain> Co-authored-by: Roman971 <romanlasnier@hotmail.com>
2021-11-23 01:20:30 +00:00
include "build/assets/text/fra_message_data_static.o"
number 7
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "staff_message_data_static"
romalign 0x1000
z_message_PAL, message_data_static and surrounding doc (#996) * Initial progress on z_message_PAL, very messy * Fix merge * Some more progress * Fix merge * More z_message_PAL * Small progress * More small progress * message_data_static files OK * Prepare z_message_tables * Matched another function, small updates * Attempt to use asm-processor static-symbols branch * Refactor text id declarations * Begin large text codes parser function * Fix merge * Refactor done * Build OK, add color and highscore names * Remove encoded text headers and automatically encode during build * Fix kanfont * Various cleanups * DISP macros * Another match aside data * Further progress * Small improvements * Deduplicate magic values for text control codes, small improvements * Tiny progress * Minor cleanups * Clean up z_message_PAL comment * Progress on large functions * Further progress on large functions * Changes to mkldscript to link .data in the .rodata section * data OK * Few improvements * Use gDPLoadTextureBlock macros where appropriate * rm z_message_tables, progress on large functions * 2 more matches * Improvements * Small progress * More progress on big function * progress * match func_80107980 * match Message_Update * match func_8010BED8 * done * Progress on remaining large functions * Small progress on largest function * Another match, extract text and move to assets, improve text build system * Small nonmatchings improvements * docs wip * Largest function maybe equivalent * Fix merge * Document do_action values, largest function is almost instruction-matching * Rename NAVI do_action to NONE, as that appears to be how that value is used in practice * Fix merge * one match * Last function is instruction-matching * Fix * Improvements thanks to engineer124 * Stack matched thanks to petrie911, now just a/v/low t regalloc issues, some cleanup * More variables labeled, use text state enum everywhere * More labels and names * Fix * Actor_IsTalking -> Actor_TalkRequested * Match func_8010C39C and remove unused asm * More docs * Mostly ocarina related docs * All msgModes named * Fix assetclean * Cleanup * Extraction fixes and headers * Suggestions * Review suggestions * Change text extraction again, only extract if the headers do not already exist * Fix * Use ast for charmap, fix assetclean for real this time * Review suggestions * BGM ids and ran formatter * Review comments * rename include_readonly to include_data_with_rodata * Remove leading 0s in number directives * Review suggestions for message_data_static * textbox pos enum comments, rename several enum names from Message to TextBox Co-authored-by: Thar0 <maximilianc64@gmail.com> Co-authored-by: Zelllll <56516451+Zelllll@users.noreply.github.com> Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain> Co-authored-by: Roman971 <romanlasnier@hotmail.com>
2021-11-23 01:20:30 +00:00
include "build/assets/text/staff_message_data_static.o"
number 7
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "map_grand_static"
romalign 0x1000
Some static texture files "decompiled" (#658) * . * remove tools/ZAP2 from origin master * Some texture files * fix tabs in new texture files * map_i_static * some updates * update names * update more names * nintendo_rogo_static * title_static ok * Added segment= to the texture files * do_action_static update * Made suggested changes * Made suggested changes * Fixed spec
2021-02-24 18:41:43 +00:00
include "build/assets/textures/map_grand_static/map_grand_static.o"
number 11
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "map_48x85_static"
romalign 0x1000
Decompiled A LOT of objects (#815) * . * remove tools/ZAP2 from origin master * object_spot04_objects * remove accidentally added xml * object_spot00_objects * object_bombf ok * object_dy_obj * object_masterzoora * object_mastergolon and object_masterkokirihead * object_aob * object_gt * object_gt * object_geff * object_mag kinda * object_gjyo_objects OK * object_ani OK * object_door_gerudo * object_md and object_trap * object_js OK * object_goroiwa * object_gs * object_nwc * object_niw * object_ane * object_os_anime OK * object_d_hsblock OK * object_fz OK * object_ru2 OK * fixed object_mag * object_cow OK * object_spot01_objects OK * object_spot15_obj * object_umajump OK * object_spot18_obj * object_spot12_obj * fix symbols in z_item_b_heart * object_bdan_objects & object_bowl * object_ddan_objects * object_owl OK * object_spot01_matoyab.xml OK * object_haka OK * object_heavy_object * object_ingate and objet_menkuri_objects * objet_spot00_break & object_relay_objects OK * object_spot01_matoya OK * object_spot06_objects OK * undefined_syms * object_spot08_obj OK * object_efc_doughnut & object_zg * object_ik OK * object_vm * object_ei OK * object_ds OK * updated spec * map_48x85_static OK * object_zl1 & object_peehat ok * some z_parameter naming and other undefined symbol stuff, object_yukabyun OK * object_bubble & object_fw ok * object_shopnuts * restore delete file * object_timeblock OK * object_d_lift OK * object_kibako2 OK * object_mamenoki OK * matches * remove unused asm * object_mag ok now * fixed object_ani * done for now, im tired * object_bdan_objects fixed up * fix bdan * object_bombf fixed * object_bowl fixed up * object_cow fixed * did more, im tired * fixed some stuff in object_ddan_objects * fix object_ddan_object * object_door_gerudo fixed * object_ds fix * object_dy progress * fixed great fairy * some more * more * object_haka fix * progress * ingo_gate fixed * object_js * forgot collision * object_relay_objects fixed * object_kibako2 * object_mag fixed * u64* to void* * more u64* to void* * object_mamenoki fix * object_mastergolon & object_masterkokirihead fix * mido is weird * fixed build * fix object_menkuri_objects * add missing textures in object_menkuri_objects * object_ms * fixed object_peehat * some cleanup stuff * object_zg fix * object_spot00_break fix * object_niw fix * object_nwc fixed * object_ru2 object_rr and some of object_owl fix * object_spot15_obj fix * business scrub * object_spot01_matoya fixed * object_spot18_obj fix * object_spot01_objects fix * object_spot04_objects fix * object_spot04_objects actually fixed * object_spot12_obj fix * object_timeblock fix * object_spot06_objects fixed * object_spot08_obj fix * spot01_matoyab fix * object_trap fix * object_umajump fix * object_vm fix * z_en_niw_lady fix * object_yukabyun fix * object_zl1 fixed * added offsets to object_os_anime * object_md fix * object_ane fix * object_aob fix * add palette comment * object_spot00_objects fix * spot00 fix * remove unused asm * updates * Add TlutOffset to objects added in https://github.com/zeldaret/oot/pull/815 * Updated object_bdan_objects, ran format.sh * Change rgb5a1 to rgba16 in my object xmls * Addressed Anghelo's comments * review Co-authored-by: Lucas Shaw <lucas.shaw1123@gmail.com> Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-08-05 15:53:58 +00:00
include "build/assets/textures/map_48x85_static/map_48x85_static.o"
number 11
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "map_i_static"
romalign 0x1000
Some static texture files "decompiled" (#658) * . * remove tools/ZAP2 from origin master * Some texture files * fix tabs in new texture files * map_i_static * some updates * update names * update more names * nintendo_rogo_static * title_static ok * Added segment= to the texture files * do_action_static update * Made suggested changes * Made suggested changes * Fixed spec
2021-02-24 18:41:43 +00:00
include "build/assets/textures/map_i_static/map_i_static.o"
number 11
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "code"
Add support for 'after' and 'number' in mkldscript and use 'after' to properly shift the code segment (#194) * Add support for 'after' and 'number' in mkldscript * Use 'after' in spec to ensure code ends up after dmadata in RAM
2020-06-07 14:31:11 +00:00
after "dmadata"
First proper commit.
2020-03-17 04:31:30 +00:00
include "build/src/code/z_en_a_keep.o"
include "build/src/code/z_en_item00.o"
include "build/src/code/z_eff_blure.o"
include "build/src/code/z_eff_shield_particle.o"
include "build/src/code/z_eff_spark.o"
include "build/src/code/z_eff_ss_dead.o"
Split z_path.c and Rename some small files and functions
2020-03-23 20:18:53 +00:00
include "build/src/code/z_effect.o"
First proper commit.
2020-03-17 04:31:30 +00:00
include "build/src/code/z_effect_soft_sprite.o"
include "build/src/code/z_effect_soft_sprite_old_init.o"
Decompile most effect files in "code" (#144) - `z_effect`: Matched and essentially all documented. - `z_eff_spark.c`: Decompiled (1 non matching left) and mostly documented. - `z_eff_shield_particle.c`: Matched and mostly documented. - `z_eff_blure.c`: Decompiled (5 non matchings left) and partially documented. - `z_effect_soft_sprite.c`: Matched and mostly documented. - `z_eff_ss_dead.c`: Matched but not documented. - `z_effect_soft_sprite_dlftbls.c`: "Matched" (only data, contains the effect ss overlay table). - `z_effect_soft_sprite_old_init.c`: Not decompiled, but functions are categorized by effect ss overlay. And they should be decompiled at the same time as their corresponding effect ss in the future. Other changes: - Added a lot of types/enums to `z64effect.h`and moved+renamed some structs from `z64.h` to this header - Added effect ss overlay segments to `segment_symbols.h` and effect ss init vars to `initvars.h` - Added a macro called `VTX_T` to generate a `Vtx_t` in the same style as `VTX` - Fixed `flg_set.c` .bss to be in the right file - Removed `tools/overlayhelpers/batchdisasm` since it's no longer relevant - Removed unused leftover asm from recent PRs
2020-05-18 18:24:00 +00:00
include "build/src/code/z_effect_soft_sprite_dlftbls.o"
First proper commit.
2020-03-17 04:31:30 +00:00
include "build/src/code/flg_set.o"
include "build/src/code/z_DLF.o"
include "build/src/code/z_actor.o"
include "build/src/code/z_actor_dlftbls.o"
include "build/src/code/z_bgcheck.o"
include "build/src/code/code_800430A0.o"
include "build/src/code/code_80043480.o"
include "build/src/code/z_camera.o"
include "build/src/code/z_collision_btltbls.o"
include "build/src/code/z_collision_check.o"
include "build/src/code/z_common_data.o"
include "build/src/code/z_debug.o"
include "build/src/code/z_debug_display.o"
include "build/src/code/z_demo.o"
include "build/src/code/code_80069420.o"
include "build/src/code/z_draw.o"
Decompile 2 small files (code_8006BA00.c and code_8006C3A0.c) (#101) * Decompile code_8006C3A0.c (handling "env" flags) * Decompile code_8006BA00.c (handling sound sources)
2020-05-01 02:00:39 +00:00
include "build/src/code/code_8006BA00.o"
First proper commit.
2020-03-17 04:31:30 +00:00
include "build/src/code/z_elf_message.o"
Split z_path.c and Rename some small files and functions
2020-03-23 20:18:53 +00:00
include "build/src/code/z_face_reaction.o"
First proper commit.
2020-03-17 04:31:30 +00:00
include "build/src/code/code_8006C3A0.o"
include "build/src/code/code_8006C510.o"
include "build/src/code/z_fcurve_data_skelanime.o"
Decompile graph.c - decompile `graph.c` (2 non-matchings left) - decompile `z_game_dlftbls.c` - add noop macros in `gbi.h`
2020-04-04 16:12:59 +00:00
include "build/src/code/z_game_dlftbls.o"
First proper commit.
2020-03-17 04:31:30 +00:00
include "build/src/code/z_horse.o"
include "build/src/code/z_jpeg.o"
Decompile pausemgr.c (#211) * Decompile pausemgr.c * rename pausemgr to z_kaleido_setup * replace 0x4b with SCENE_BOWLING * fix conflict
2020-06-17 19:23:42 +00:00
include "build/src/code/z_kaleido_setup.o"
First proper commit.
2020-03-17 04:31:30 +00:00
include "build/src/code/z_kanfont.o"
include "build/src/code/z_kankyo.o"
include "build/src/code/z_lib.o"
include "build/src/code/z_lifemeter.o"
include "build/src/code/z_lights.o"
include "build/src/code/z_malloc.o"
include "build/src/code/z_map_mark.o"
include "build/src/code/z_moji.o"
Changes in PR #15 - Renamed `prenmi_buff.c` to `z_prenmi_buff.c`
2020-03-20 17:13:47 +00:00
include "build/src/code/z_prenmi_buff.o"
Changes in PR #15 (2) - Documented z_msgevent.c
2020-03-20 16:15:39 +00:00
include "build/src/code/z_msgevent.o"
rename code_8007BF90.c to z_olib.c, rename functions in z_olib.c (#181) * rename code_8007BF90.c to z_olib.c, rename functions in z_olib.c * pr updates
2020-06-04 05:59:17 +00:00
include "build/src/code/z_olib.o"
First proper commit.
2020-03-17 04:31:30 +00:00
include "build/src/code/z_onepointdemo.o"
include "build/src/code/z_map_exp.o"
Convert z_map_data to C (#183) * Convert z_map_data to C * Style Co-authored-by: Random <28494085+Random06457@users.noreply.github.com> * Cleanup Co-authored-by: Random <28494085+Random06457@users.noreply.github.com> * Convert the whole file * Cleanup * Cleanup Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * floorNames → floorID * Style * Format & fix switch array padding * Remove trailing zeroes * Cleanup Co-authored-by: Random <28494085+Random06457@users.noreply.github.com> Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-06-03 20:52:10 +00:00
include "build/src/code/z_map_data.o"
First proper commit.
2020-03-17 04:31:30 +00:00
include "build/src/code/z_parameter.o"
Split z_path.c and Rename some small files and functions
2020-03-23 20:18:53 +00:00
include "build/src/code/z_path.o"
document code_8008E6A0 (frame advance) (#737) * OK * fixes * format * remove gotos, thanks petrie
2021-03-28 23:35:16 +00:00
include "build/src/code/z_frame_advance.o"
First proper commit.
2020-03-17 04:31:30 +00:00
include "build/src/code/z_player_lib.o"
include "build/src/code/z_prenmi.o"
Decompile z_quake.c and code_800D31A0.c - `code_800D31A0.c` : OK - `z_quake.c` : OK
2020-03-29 01:24:39 +00:00
include "build/src/code/z_quake.o"
First proper commit.
2020-03-17 04:31:30 +00:00
include "build/src/code/z_rcp.o"
include "build/src/code/z_room.o"
include "build/src/code/z_sample.o"
include "build/src/code/code_80097A00.o"
include "build/src/code/z_scene.o"
include "build/src/code/z_scene_table.o"
include "build/src/code/z_skelanime.o"
include "build/src/code/z_skin.o"
include "build/src/code/z_skin_awb.o"
include "build/src/code/z_skin_matrix.o"
include "build/src/code/z_sram.o"
Decompile z_sram.c (#431) * Decompile z_sram.c * rename Sram_CalcChecksum to Sram_WriteSaveSlot * progress * done i think * add original name comments * temp substructs * minor fixes * review * review 2 * fix Co-authored-by: fig <fig02srl@gmail.com>
2020-10-11 17:45:08 +00:00
include "build/src/code/z_ss_sram.o"
First proper commit.
2020-03-17 04:31:30 +00:00
include "build/src/code/code_800A9F30.o"
Decompile most of z_view
2020-04-04 17:17:56 +00:00
include "build/data/z_text.data.o"
Minor data/ cleanups (#1025) * Moved code_800D2E30's data to C * Moved some audio data from asm to C * Made separate data files for unknown pointer arrays * Fixed a few missing balign directives
2021-11-24 02:07:48 +00:00
include "build/data/unk_8012ABC0.data.o"
First proper commit.
2020-03-17 04:31:30 +00:00
include "build/src/code/z_view.o"
include "build/src/code/z_vimode.o"
Decompiled code_800ACE70.c `code_800ACE70` : OK
2020-03-21 18:09:05 +00:00
include "build/src/code/code_800ACE70.o"
First proper commit.
2020-03-17 04:31:30 +00:00
include "build/src/code/z_vismono.o"
Decompile remaining z_vis... files (#131) * Decompile z_vismono.c / code_800AD920.c - z_vismono.c: OK - code_800AD920.c: OK * Minor fixes in PR #131
2020-05-15 09:02:39 +00:00
include "build/src/code/code_800AD920.o"
First proper commit.
2020-03-17 04:31:30 +00:00
include "build/src/code/z_vr_box.o"
include "build/src/code/z_vr_box_draw.o"
include "build/src/code/z_player_call.o"
include "build/src/code/z_fbdemo.o"
Decompiles most FBDemo and transition functions (#92) * Decompile fbdemo (transition) files * run format.sh * reformat vtx array, fill in a couple unk * match TransitionTriforce_IsDone * add VTX macro, add DW_ wrapping around triangle macros * use new VTX macro, name graphic assets * Naming updates * pr updates * naming updates * remove symbols for COLOR_BUFFER, D_08000000, and D_09000000
2020-04-30 18:41:09 +00:00
include "build/src/code/z_fbdemo_triforce.o"
include "build/src/code/z_fbdemo_wipe1.o"
include "build/src/code/z_fbdemo_circle.o"
include "build/src/code/z_fbdemo_fade.o"
Decompile shrink_window.c (#232)
2020-07-09 01:54:39 +00:00
include "build/src/code/shrink_window.o"
First proper commit.
2020-03-17 04:31:30 +00:00
include "build/src/code/db_camera.o"
Decompile z_camera data, and some camera WIP (#173) * cleanup * name camera action functions * decompile a few small functions, name a few Camera struct members * decompile camera data, decompile a few camera functions * Split ASM for code_800BB0A0 * removing code_800BB0A0.s * PR Requests, Camera WIP * remove #define NON_MATCHING from db_camera
2020-06-01 21:54:47 +00:00
include "build/src/code/code_800BB0A0.o"
Decompile mempak.c (#191)
2020-06-07 23:38:33 +00:00
include "build/src/code/mempak.o"
First proper commit.
2020-03-17 04:31:30 +00:00
include "build/src/code/z_kaleido_manager.o"
include "build/src/code/z_kaleido_scope_call.o"
include "build/src/code/z_play.o"
Split remaining unsplit asm files and migrate more rodata (#277) * Split files * Format rodata * Some more code rodata migrated * Some more actor rodata migrated * Migrate rodata for ovl_Boss_Ganon * Migrate rodata for code_800EC960 * Remove unused rodata * x1b occurences all lowercase b
2020-07-20 01:08:50 +00:00
include "build/src/code/PreRender.o"
First proper commit.
2020-03-17 04:31:30 +00:00
include "build/src/code/TwoHeadArena.o"
Decompile jpegdecoder.c, padsetup.c and code_800C3C20.c (#217) * Decompile jpegdecoder.c, padsetup.c and code_800C3C20.c * change func_800C3C20's prototype and rename some fields in jpeg related structs * Fix comment in Jpeg_GetU16 and change func_800C3C20 * use a switch in padsetup.c
2020-06-21 22:43:14 +00:00
include "build/src/code/code_800C3C20.o"
First proper commit.
2020-03-17 04:31:30 +00:00
include "build/src/code/audioMgr.o"
include "build/src/code/title_setup.o"
Decomp game.c (#129) * decomp most of game.c * improve GameState_DrawInputDisplay matching * fix merge conflicts * pr suggestions * remove builtin math functions
2020-05-14 23:11:33 +00:00
include "build/src/code/game.o"
First proper commit.
2020-03-17 04:31:30 +00:00
include "build/src/code/gamealloc.o"
Decompile graph.c - decompile `graph.c` (2 non-matchings left) - decompile `z_game_dlftbls.c` - add noop macros in `gbi.h`
2020-04-04 16:12:59 +00:00
include "build/src/code/graph.o"
First proper commit.
2020-03-17 04:31:30 +00:00
include "build/src/code/listalloc.o"
include "build/src/code/main.o"
include "build/src/code/padmgr.o"
include "build/src/code/sched.o"
include "build/src/code/speed_meter.o"
include "build/src/code/sys_cfb.o"
Math Files (#76) * math3d wip * math3d wip * wip * wip * wip * wip * final update before pr * run format.sh * fix merge conflicts * tharo suggestions update * fig formatting suggestion * math3d pr updates * use sFactorialTbl in sys_math
2020-04-19 03:28:24 +00:00
include "build/src/code/sys_math.o"
include "build/src/code/sys_math3d.o"
include "build/src/code/sys_math_atan.o"
First proper commit.
2020-03-17 04:31:30 +00:00
include "build/src/code/sys_matrix.o"
include "build/src/code/sys_ucode.o"
Decompile code_800D2E30 and use struct in code_800A9F30 (#80) * Match func_800AA000 * Match z_camera/func_800437F0 * Decompile code_800D2E30, use struct in 800A9F30 * Format * Remove 'U' from literals * Remove bss, cleanup z_camera * Review changes, rename temp * Move externs to variables.h
2020-04-19 02:56:53 +00:00
include "build/src/code/code_800D2E30.o"
Decompile z_quake.c and code_800D31A0.c - `code_800D31A0.c` : OK - `z_quake.c` : OK
2020-03-29 01:24:39 +00:00
include "build/src/code/code_800D31A0.o"
First proper commit.
2020-03-17 04:31:30 +00:00
include "build/src/code/irqmgr.o"
include "build/src/code/debug_malloc.o"
include "build/src/code/fault.o"
Decompile z_jpeg.c (#70) * Decompile z_jpeg.c - Decompile z_jpeg.c - Move .bss variables from fault.c and fault_drawer.c into .s files to avoid bss reordering * Rename JPEGWork to JpegWork and minor fix in Jpeg_GetU16
2020-04-13 23:03:10 +00:00
include "build/data/fault.bss.o"
First proper commit.
2020-03-17 04:31:30 +00:00
include "build/src/code/fault_drawer.o"
include "build/asm/code_800D71F0.o"
ucode_disas.c progress (#188) * ucode_disas.c progress * fix * minor fixes * minor comment changes
2020-06-05 17:18:39 +00:00
include "build/src/code/ucode_disas.o"
Add pad_text to mkldscript and update progress.py (#1024) * Add pad_text to mkldscript and update progress.py Implements `pad_text` from MM and uses it instead of asm nops for the padding in ucode_disas. Also updates `progress.py` to account for the change (RIP 1000000 code size), and to have a green badge for 100%. * Remove 1.00mb comment in progress.py Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com> Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
2021-11-23 18:31:44 +00:00
pad_text // audio library aligned to 32 bytes?
Import Audio Synthesis Data (#1010) * Import audio synth data, OK * Cleanup data * Merge data into 1 file * naming * format * Fix data * Separate audio_data into it's own file * CleanUp, more PR suggestions * Fix audio_effects.data.s * Format audio_data * rm asm, always gets me
2021-11-12 15:52:17 +00:00
include "build/src/code/audio_data.o"
Audio WIP (#836) * being code_800EC960 * wip * wip * more audio progress * migrate data in code_800E11F0 * wip * make ok * remove asm * wip * move some variables outside of gAudioContext to the AudioContext structure due to the size used in func_800E3094 * more progress * wip * wip * split code_800E11F0 * migrate rodata in code_800E11F0 * match functions that couldn't because of data issues * move code_800E4FE0 asm files * wip * more wip * fix global functions, and forward declarations * wip * wip * wip * ocarina wip * match a couple functions * some progress * separate some bss * match func_800EDA3C * some matching * more matches * migrate audio rodata * some matches * more matchess * start on synthesis * work on synthesis * fix function declaration * Merge branch 'master' into audio * match a few more functions * wip * wip * more matching, rename Audio_SetBGM to Audio_QueueSeqCmd * name several audio functions, and audiocontext members * more naming, rename code_800E11F0 to audio_load, code_800DAAC0 to audio_synthesis * audio wip * match a few more functions. * wip * add missing NON_MATCHING directive * wip * some matching, data reogranization * match cursed function * wip * wip * formatting * remove prefix from struct memebers * missed function rename * review Co-authored-by: fig02 <fig02srl@gmail.com>
2021-07-27 23:44:58 +00:00
include "build/src/code/audio_synthesis.o"
audio_playback, audio_effects OK (#313) * audio_playback.c * format.sh * rename functions * Audio_SequenceChannelProcessSound * Audio_SequencePlayerProcessSound * Audio_GetPortamentoFreqScale * Audio_GetVibratoPitchChange * Audio_GetVibratoFreqScale * Audio_NoteVibratoInit, Audio_NoteVibratoUpdate * Audio_NotePortamentoInit * Audio_AdsrInit * Audio_AdsrUpdate * Common bitfield formatting * format.sh * review Co-authored-by: zelda2774 <zelda2774@invalid>
2020-08-15 18:06:26 +00:00
include "build/src/code/audio_heap.o"
Audio WIP (#836) * being code_800EC960 * wip * wip * more audio progress * migrate data in code_800E11F0 * wip * make ok * remove asm * wip * move some variables outside of gAudioContext to the AudioContext structure due to the size used in func_800E3094 * more progress * wip * wip * split code_800E11F0 * migrate rodata in code_800E11F0 * match functions that couldn't because of data issues * move code_800E4FE0 asm files * wip * more wip * fix global functions, and forward declarations * wip * wip * wip * ocarina wip * match a couple functions * some progress * separate some bss * match func_800EDA3C * some matching * more matches * migrate audio rodata * some matches * more matchess * start on synthesis * work on synthesis * fix function declaration * Merge branch 'master' into audio * match a few more functions * wip * wip * more matching, rename Audio_SetBGM to Audio_QueueSeqCmd * name several audio functions, and audiocontext members * more naming, rename code_800E11F0 to audio_load, code_800DAAC0 to audio_synthesis * audio wip * match a few more functions. * wip * add missing NON_MATCHING directive * wip * some matching, data reogranization * match cursed function * wip * wip * formatting * remove prefix from struct memebers * missed function rename * review Co-authored-by: fig02 <fig02srl@gmail.com>
2021-07-27 23:44:58 +00:00
include "build/src/code/audio_load.o"
include "build/src/code/code_800E4FE0.o"
libultra files and directories restructure (#1038) * Restructure files, begin header restructure * Format * us2dex * Fix parallel spelling Co-authored-by: JoshDuMan <40190173+JoshDuMan@users.noreply.github.com> * Use OS_K0_TO_PHYSICAL in place of VIRTUAL_TO_PHYSICAL in osAiSetNextBuffer * Uppercase hex, exception vector address defines * Interrupt flags 1 Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Interrupt flags 2 Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> Co-authored-by: JoshDuMan <40190173+JoshDuMan@users.noreply.github.com> Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
2021-12-01 00:08:57 +00:00
include "build/src/code/code_800E6840.o"
include "build/src/libultra/io/aisetnextbuf.o"
Decompile playback.c (#82) * Decompile playback.c * Remove rename_sym.sh * Fixed for loop in pop_node_... * Address krim's other issues * Remove rename_sym again * Address Roman's comments. * Fix build and remove rename_sym another time.
2020-04-21 08:19:33 +00:00
include "build/src/code/audio_playback.o"
audio_playback, audio_effects OK (#313) * audio_playback.c * format.sh * rename functions * Audio_SequenceChannelProcessSound * Audio_SequencePlayerProcessSound * Audio_GetPortamentoFreqScale * Audio_GetVibratoPitchChange * Audio_GetVibratoFreqScale * Audio_NoteVibratoInit, Audio_NoteVibratoUpdate * Audio_NotePortamentoInit * Audio_AdsrInit * Audio_AdsrUpdate * Common bitfield formatting * format.sh * review Co-authored-by: zelda2774 <zelda2774@invalid>
2020-08-15 18:06:26 +00:00
include "build/src/code/audio_effects.o"
include "build/src/code/audio_seqplayer.o"
Split remaining unsplit asm files and migrate more rodata (#277) * Split files * Format rodata * Some more code rodata migrated * Some more actor rodata migrated * Migrate rodata for ovl_Boss_Ganon * Migrate rodata for code_800EC960 * Remove unused rodata * x1b occurences all lowercase b
2020-07-20 01:08:50 +00:00
include "build/src/code/code_800EC960.o"
code_800EC960 OK + data migrated (#937) * Match AudioDebug_ProcessInput_SEFlagSwap * Data migration * Migrate in-function statics for func_800EE824 * More data migration * Migrate in-function static for func_800F510C * Last bit of migration * formatting * naming fix * Prune variables.h Co-authored-by: zelda2774 <zelda2774@invalid>
2021-09-01 22:33:37 +00:00
include "build/src/code/audio_sound_params.o"
Split remaining unsplit asm files and migrate more rodata (#277) * Split files * Format rodata * Some more code rodata migrated * Some more actor rodata migrated * Migrate rodata for ovl_Boss_Ganon * Migrate rodata for code_800EC960 * Remove unused rodata * x1b occurences all lowercase b
2020-07-20 01:08:50 +00:00
include "build/src/code/code_800F7260.o"
Audio WIP (#836) * being code_800EC960 * wip * wip * more audio progress * migrate data in code_800E11F0 * wip * make ok * remove asm * wip * move some variables outside of gAudioContext to the AudioContext structure due to the size used in func_800E3094 * more progress * wip * wip * split code_800E11F0 * migrate rodata in code_800E11F0 * match functions that couldn't because of data issues * move code_800E4FE0 asm files * wip * more wip * fix global functions, and forward declarations * wip * wip * wip * ocarina wip * match a couple functions * some progress * separate some bss * match func_800EDA3C * some matching * more matches * migrate audio rodata * some matches * more matchess * start on synthesis * work on synthesis * fix function declaration * Merge branch 'master' into audio * match a few more functions * wip * wip * more matching, rename Audio_SetBGM to Audio_QueueSeqCmd * name several audio functions, and audiocontext members * more naming, rename code_800E11F0 to audio_load, code_800DAAC0 to audio_synthesis * audio wip * match a few more functions. * wip * add missing NON_MATCHING directive * wip * some matching, data reogranization * match cursed function * wip * wip * formatting * remove prefix from struct memebers * missed function rename * review Co-authored-by: fig02 <fig02srl@gmail.com>
2021-07-27 23:44:58 +00:00
include "build/data/code_800F7260.bss.o"
Split remaining unsplit asm files and migrate more rodata (#277) * Split files * Format rodata * Some more code rodata migrated * Some more actor rodata migrated * Migrate rodata for ovl_Boss_Ganon * Migrate rodata for code_800EC960 * Remove unused rodata * x1b occurences all lowercase b
2020-07-20 01:08:50 +00:00
include "build/src/code/code_800F9280.o"
First proper commit.
2020-03-17 04:31:30 +00:00
include "build/data/code_800F9280.data.o"
Document parts of audio (#1000) * Minor labelling * progress * play percentage -> delay * duration -> gatetime * more * more * more * seqIdx -> playerIdx * more * more * more * more * format * fix comment * filters * more * media * confusion * Sync load is actually slow load * AudioHeap prefix * more * more * reformat * more * more * AudioLoad * more * more * seq banks * more consistent * more * name last function in audio_load * More audio_synthesis * clean up audio tables * minor * slow/fast load ramAddr * format * remove unused * Remove union * remove padding * audio bank -> sound font * seqLayer -> layer * stuff * seqChannel -> channel * ChannelLayer -> Layer * remove define, add bug comment * format * more * cache enum * more * AudioSeq function prefix * naming * bankIdx -> bankId * more * format * review * more * fixes * avoid hardcoded sfxid's * SE -> Sfx Co-authored-by: zelda2774 <zelda2774@invalid>
2021-11-07 16:58:50 +00:00
include "build/src/code/audio_init_params.o"
First proper commit.
2020-03-17 04:31:30 +00:00
include "build/src/code/logseverity.o"
include "build/src/code/gfxprint.o"
include "build/src/code/code_800FBCE0.o"
include "build/src/code/loadfragment2.o"
Decompile a bunch of small files (#160) * Decompile a bunch of small files * Rename dacrate to dacRate * Run format.sh * Minor fixes in PR #160
2020-05-25 21:18:14 +00:00
include "build/src/code/mtxuty-cvt.o"
First proper commit.
2020-03-17 04:31:30 +00:00
include "build/src/code/relocation.o"
include "build/src/code/code_800FC620.o"
Decompile a bunch of small files (#160) * Decompile a bunch of small files * Rename dacrate to dacRate * Run format.sh * Minor fixes in PR #160
2020-05-25 21:18:14 +00:00
include "build/src/code/padutils.o"
Decompile jpegdecoder.c, padsetup.c and code_800C3C20.c (#217) * Decompile jpegdecoder.c, padsetup.c and code_800C3C20.c * change func_800C3C20's prototype and rename some fields in jpeg related structs * Fix comment in Jpeg_GetU16 and change func_800C3C20 * use a switch in padsetup.c
2020-06-21 22:43:14 +00:00
include "build/src/code/padsetup.o"
code_800FCE80 OK
2020-03-21 02:09:42 +00:00
include "build/src/code/code_800FCE80.o"
include "build/asm/fp.o"
First proper commit.
2020-03-17 04:31:30 +00:00
include "build/src/code/system_malloc.o"
Decompile code_800FD970 (#141) * Decompile code_800FD970 * Comment cleanups, ensure formatter won't cause a matching issue later
2020-05-15 17:58:14 +00:00
include "build/src/code/code_800FD970.o"
First proper commit.
2020-03-17 04:31:30 +00:00
include "build/src/code/__osMalloc.o"
Decompile sleep.c and printutils.c - Decompile sleep.c (OK) - Decompile printutils.c (OK) - Fix 1 non-matching in z_room.c - Get rid of some magic numbers
2020-04-08 16:36:15 +00:00
include "build/src/code/printutils.o"
include "build/src/code/sleep.o"
Decompile jpegutils.c (#75) * Decompile jpegutils.c jpegutils.c : OK * Fix a typo * Fixes in PR #75 - Fix a type in JpegWork - Remove clang-format off/on in z_quake.c - Move the jpegutils rule at the end of makefile
2020-04-16 18:08:23 +00:00
include "build/src/code/jpegutils.o"
Decompile jpegdecoder.c, padsetup.c and code_800C3C20.c (#217) * Decompile jpegdecoder.c, padsetup.c and code_800C3C20.c * change func_800C3C20's prototype and rename some fields in jpeg related structs * Fix comment in Jpeg_GetU16 and change func_800C3C20 * use a switch in padsetup.c
2020-06-21 22:43:14 +00:00
include "build/src/code/jpegdecoder.o"
libultra files and directories restructure (#1038) * Restructure files, begin header restructure * Format * us2dex * Fix parallel spelling Co-authored-by: JoshDuMan <40190173+JoshDuMan@users.noreply.github.com> * Use OS_K0_TO_PHYSICAL in place of VIRTUAL_TO_PHYSICAL in osAiSetNextBuffer * Uppercase hex, exception vector address defines * Interrupt flags 1 Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Interrupt flags 2 Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> Co-authored-by: JoshDuMan <40190173+JoshDuMan@users.noreply.github.com> Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
2021-12-01 00:08:57 +00:00
include "build/src/libultra/io/pfsfreeblocks.o"
Decompile a bunch of small files (#160) * Decompile a bunch of small files * Rename dacrate to dacRate * Run format.sh * Minor fixes in PR #160
2020-05-25 21:18:14 +00:00
include "build/asm/guScale.o"
libultra files and directories restructure (#1038) * Restructure files, begin header restructure * Format * us2dex * Fix parallel spelling Co-authored-by: JoshDuMan <40190173+JoshDuMan@users.noreply.github.com> * Use OS_K0_TO_PHYSICAL in place of VIRTUAL_TO_PHYSICAL in osAiSetNextBuffer * Uppercase hex, exception vector address defines * Interrupt flags 1 Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Interrupt flags 2 Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> Co-authored-by: JoshDuMan <40190173+JoshDuMan@users.noreply.github.com> Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
2021-12-01 00:08:57 +00:00
include "build/src/libultra/gu/sinf.o"
include "build/src/libultra/gu/sins.o"
include "build/src/libultra/io/sptask.o"
include "build/src/libultra/io/motor.o"
include "build/src/libultra/io/siacs.o"
include "build/src/libultra/io/controller.o"
include "build/src/libultra/io/contreaddata.o"
include "build/src/libultra/gu/perspective.o"
include "build/src/libultra/io/sprawdma.o"
include "build/src/libultra/io/sirawdma.o"
include "build/src/libultra/io/sptaskyield.o"
include "build/src/libultra/io/pfsreadwritefile.o"
include "build/src/libultra/io/pfsgetstatus.o"
Finished code_801031F0.c, guPosition.c, guLookAtHilite.c (#84) * started microcode decomp * Modified spec to fix error * osContGetQuery OK * Decompiled guLookAtHilite.c * guPosition.c OK * Fixed formatting * osViSetEvent.c OK * Deleted unnecessary files * Made suggested changes, merged playblack.c * Removed line breaks from comments * Removed argument listing
2020-04-22 17:20:49 +00:00
include "build/asm/guMtxIdentF.o"
libultra files and directories restructure (#1038) * Restructure files, begin header restructure * Format * us2dex * Fix parallel spelling Co-authored-by: JoshDuMan <40190173+JoshDuMan@users.noreply.github.com> * Use OS_K0_TO_PHYSICAL in place of VIRTUAL_TO_PHYSICAL in osAiSetNextBuffer * Uppercase hex, exception vector address defines * Interrupt flags 1 Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Interrupt flags 2 Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> Co-authored-by: JoshDuMan <40190173+JoshDuMan@users.noreply.github.com> Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
2021-12-01 00:08:57 +00:00
include "build/src/libultra/gu/lookat.o"
include "build/src/libultra/io/pfsallocatefile.o"
include "build/src/libultra/os/stoptimer.o"
include "build/src/libultra/io/contpfs.o"
Decompile the last of libultra_code_O2 (#464) * Decompile osPfsFileState, move guMtxL2F to asm/ * Remove asm * Add some prototypes to functions.h
2020-10-28 19:59:18 +00:00
include "build/asm/guMtxL2F.o"
libultra files and directories restructure (#1038) * Restructure files, begin header restructure * Format * us2dex * Fix parallel spelling Co-authored-by: JoshDuMan <40190173+JoshDuMan@users.noreply.github.com> * Use OS_K0_TO_PHYSICAL in place of VIRTUAL_TO_PHYSICAL in osAiSetNextBuffer * Uppercase hex, exception vector address defines * Interrupt flags 1 Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Interrupt flags 2 Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> Co-authored-by: JoshDuMan <40190173+JoshDuMan@users.noreply.github.com> Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
2021-12-01 00:08:57 +00:00
include "build/src/libultra/io/pfsfindfile.o"
include "build/src/libultra/gu/sqrtf.o"
include "build/src/libultra/os/afterprenmi.o"
include "build/src/libultra/io/contquery.o"
include "build/src/libultra/gu/lookathil.o"
include "build/src/libultra/io/sp.o"
Decompile a bunch of small files (#160) * Decompile a bunch of small files * Rename dacrate to dacRate * Run format.sh * Minor fixes in PR #160
2020-05-25 21:18:14 +00:00
include "build/asm/guMtxIdent.o"
libultra files and directories restructure (#1038) * Restructure files, begin header restructure * Format * us2dex * Fix parallel spelling Co-authored-by: JoshDuMan <40190173+JoshDuMan@users.noreply.github.com> * Use OS_K0_TO_PHYSICAL in place of VIRTUAL_TO_PHYSICAL in osAiSetNextBuffer * Uppercase hex, exception vector address defines * Interrupt flags 1 Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Interrupt flags 2 Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> Co-authored-by: JoshDuMan <40190173+JoshDuMan@users.noreply.github.com> Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
2021-12-01 00:08:57 +00:00
include "build/src/libultra/gu/position.o"
include "build/src/libultra/io/sptaskyielded.o"
include "build/src/libultra/gu/rotate.o"
include "build/src/libultra/io/aisetfreq.o"
include "build/src/libultra/os/getactivequeue.o"
Decompile a bunch of small files (#160) * Decompile a bunch of small files * Rename dacrate to dacRate * Run format.sh * Minor fixes in PR #160
2020-05-25 21:18:14 +00:00
include "build/asm/guNormalize.o"
libultra files and directories restructure (#1038) * Restructure files, begin header restructure * Format * us2dex * Fix parallel spelling Co-authored-by: JoshDuMan <40190173+JoshDuMan@users.noreply.github.com> * Use OS_K0_TO_PHYSICAL in place of VIRTUAL_TO_PHYSICAL in osAiSetNextBuffer * Uppercase hex, exception vector address defines * Interrupt flags 1 Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Interrupt flags 2 Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> Co-authored-by: JoshDuMan <40190173+JoshDuMan@users.noreply.github.com> Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
2021-12-01 00:08:57 +00:00
include "build/src/libultra/io/dpgetstat.o"
include "build/src/libultra/io/dpsetstat.o"
include "build/src/libultra/io/pfsdeletefile.o"
include "build/src/libultra/gu/ortho.o"
include "build/src/libultra/gu/cosf.o"
include "build/asm/libm_vals.o"
include "build/src/libultra/gu/coss.o"
include "build/src/libultra/io/visetevent.o"
include "build/src/libultra/io/pfsisplug.o"
include "build/src/libultra/gu/us2dex.o"
include "build/src/libultra/io/pfsselectbank.o"
include "build/src/libultra/io/contsetch.o"
include "build/src/libultra/io/pfsfilestate.o"
include "build/src/libultra/io/pfsinitpak.o"
include "build/src/libultra/io/pfschecker.o"
include "build/src/libultra/io/aigetlen.o"
Decompile a bunch of small files (#160) * Decompile a bunch of small files * Rename dacrate to dacRate * Run format.sh * Minor fixes in PR #160
2020-05-25 21:18:14 +00:00
include "build/asm/guTranslate.o"
libultra files and directories restructure (#1038) * Restructure files, begin header restructure * Format * us2dex * Fix parallel spelling Co-authored-by: JoshDuMan <40190173+JoshDuMan@users.noreply.github.com> * Use OS_K0_TO_PHYSICAL in place of VIRTUAL_TO_PHYSICAL in osAiSetNextBuffer * Uppercase hex, exception vector address defines * Interrupt flags 1 Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Interrupt flags 2 Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> Co-authored-by: JoshDuMan <40190173+JoshDuMan@users.noreply.github.com> Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
2021-12-01 00:08:57 +00:00
include "build/src/libultra/io/contramwrite.o"
include "build/src/libultra/io/contramread.o"
include "build/src/libultra/io/crc.o"
include "build/src/libultra/os/settimer.o"
include "build/src/libultra/io/spgetstat.o"
include "build/src/libultra/io/spsetstat.o"
First proper commit.
2020-03-17 04:31:30 +00:00
include "build/asm/osWritebackDCacheAll.o"
libultra files and directories restructure (#1038) * Restructure files, begin header restructure * Format * us2dex * Fix parallel spelling Co-authored-by: JoshDuMan <40190173+JoshDuMan@users.noreply.github.com> * Use OS_K0_TO_PHYSICAL in place of VIRTUAL_TO_PHYSICAL in osAiSetNextBuffer * Uppercase hex, exception vector address defines * Interrupt flags 1 Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Interrupt flags 2 Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> Co-authored-by: JoshDuMan <40190173+JoshDuMan@users.noreply.github.com> Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
2021-12-01 00:08:57 +00:00
include "build/src/libultra/os/getcurrfaultedthread.o"
Decompile a bunch of small files (#160) * Decompile a bunch of small files * Rename dacrate to dacRate * Run format.sh * Minor fixes in PR #160
2020-05-25 21:18:14 +00:00
include "build/asm/guMtxF2L.o"
libultra files and directories restructure (#1038) * Restructure files, begin header restructure * Format * us2dex * Fix parallel spelling Co-authored-by: JoshDuMan <40190173+JoshDuMan@users.noreply.github.com> * Use OS_K0_TO_PHYSICAL in place of VIRTUAL_TO_PHYSICAL in osAiSetNextBuffer * Uppercase hex, exception vector address defines * Interrupt flags 1 Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Interrupt flags 2 Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> Co-authored-by: JoshDuMan <40190173+JoshDuMan@users.noreply.github.com> Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
2021-12-01 00:08:57 +00:00
include "build/src/libultra/libc/llcvt.o"
include "build/src/libultra/io/vigetcurrframebuf.o"
include "build/src/libultra/io/spsetpc.o"
include "build/src/libultra/libc/sqrt.o"
include "build/src/libultra/libc/absf.o"
Decompile code_801067F0, 80106860, 801068B0 (#89) * Decompile code_801067F0, 80106860, 801068B0 * clang format * Remove unnecessary casts
2020-04-23 08:59:25 +00:00
include "build/src/code/code_801067F0.o"
include "build/src/code/code_80106860.o"
include "build/src/code/code_801068B0.o"
z_message_PAL, message_data_static and surrounding doc (#996) * Initial progress on z_message_PAL, very messy * Fix merge * Some more progress * Fix merge * More z_message_PAL * Small progress * More small progress * message_data_static files OK * Prepare z_message_tables * Matched another function, small updates * Attempt to use asm-processor static-symbols branch * Refactor text id declarations * Begin large text codes parser function * Fix merge * Refactor done * Build OK, add color and highscore names * Remove encoded text headers and automatically encode during build * Fix kanfont * Various cleanups * DISP macros * Another match aside data * Further progress * Small improvements * Deduplicate magic values for text control codes, small improvements * Tiny progress * Minor cleanups * Clean up z_message_PAL comment * Progress on large functions * Further progress on large functions * Changes to mkldscript to link .data in the .rodata section * data OK * Few improvements * Use gDPLoadTextureBlock macros where appropriate * rm z_message_tables, progress on large functions * 2 more matches * Improvements * Small progress * More progress on big function * progress * match func_80107980 * match Message_Update * match func_8010BED8 * done * Progress on remaining large functions * Small progress on largest function * Another match, extract text and move to assets, improve text build system * Small nonmatchings improvements * docs wip * Largest function maybe equivalent * Fix merge * Document do_action values, largest function is almost instruction-matching * Rename NAVI do_action to NONE, as that appears to be how that value is used in practice * Fix merge * one match * Last function is instruction-matching * Fix * Improvements thanks to engineer124 * Stack matched thanks to petrie911, now just a/v/low t regalloc issues, some cleanup * More variables labeled, use text state enum everywhere * More labels and names * Fix * Actor_IsTalking -> Actor_TalkRequested * Match func_8010C39C and remove unused asm * More docs * Mostly ocarina related docs * All msgModes named * Fix assetclean * Cleanup * Extraction fixes and headers * Suggestions * Review suggestions * Change text extraction again, only extract if the headers do not already exist * Fix * Use ast for charmap, fix assetclean for real this time * Review suggestions * BGM ids and ran formatter * Review comments * rename include_readonly to include_data_with_rodata * Remove leading 0s in number directives * Review suggestions for message_data_static * textbox pos enum comments, rename several enum names from Message to TextBox Co-authored-by: Thar0 <maximilianc64@gmail.com> Co-authored-by: Zelllll <56516451+Zelllll@users.noreply.github.com> Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain> Co-authored-by: Roman971 <romanlasnier@hotmail.com>
2021-11-23 01:20:30 +00:00
include_data_with_rodata "build/src/code/z_message_PAL.o"
code_80110450 (game over) OK* (#739) * OK (sort of) * remove hack * clean up comments
2021-03-28 23:50:46 +00:00
include "build/src/code/z_game_over.o"
First proper commit.
2020-03-17 04:31:30 +00:00
include "build/src/code/z_construct.o"
include "build/data/rsp.text.o"
include "build/data/rsp.rodata.o"
endseg
beginseg
name "buffers"
Add 64-byte alignment requirement to the buffers segment (#247)
2020-07-11 15:23:54 +00:00
align 0x40
First proper commit.
2020-03-17 04:31:30 +00:00
include "build/src/buffers/zbuffer.o"
include "build/src/buffers/gfxbuffers.o"
include "build/src/buffers/heaps.o"
endseg
beginseg
name "ovl_title"
Disassemble the rom header and entrypoint function (#87) The actual boot code (ipl3) is still only incbin'd. If someone else wants to disassemble it properly, go ahead. I might do it eventually, but for now it doesn't seem required for shiftability or anything interesting.
2020-04-22 17:44:46 +00:00
address 0x80800000
First proper commit.
2020-03-17 04:31:30 +00:00
include "build/src/overlays/gamestates/ovl_title/z_title.o"
Split ovl_file_choose and ovl_kaleido_scope (#167) * Split ovl_file_choose and ovl_kaleido_scope * Split ovl_kaleido_scope's rodata/data/bss * fix * fix spec * spec fix * hopefully last spec fix * hopefully last spec fix 2 * fix * Add comments on file boundaries * fix
2020-06-07 17:52:43 +00:00
include "build/src/overlays/gamestates/ovl_title/ovl_title_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_select"
include "build/src/overlays/gamestates/ovl_select/z_select.o"
z_select decompiled, 1 non matching left (#202) * First pass z_select * lots of progress. 2 non matchings and data stuff needed * match Select_LoadGame * z_select almost ok, 1 func left * remove comments * remove comments and add description * remove unused flg_set asm * set_next_gamestate macro * pr suggestions 1 * pr suggestions 2 * map -> scene * pr suggestions 3 Co-authored-by: Kelebek1 <eeeedddccc@hotmail.co.uk>
2020-06-14 02:59:58 +00:00
include "build/src/overlays/gamestates/ovl_select/ovl_select_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_opening"
include "build/src/overlays/gamestates/ovl_opening/z_opening.o"
Split ovl_file_choose and ovl_kaleido_scope (#167) * Split ovl_file_choose and ovl_kaleido_scope * Split ovl_kaleido_scope's rodata/data/bss * fix * fix spec * spec fix * hopefully last spec fix * hopefully last spec fix 2 * fix * Add comments on file boundaries * fix
2020-06-07 17:52:43 +00:00
include "build/src/overlays/gamestates/ovl_opening/ovl_opening_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_file_choose"
File Select (z_file_choose) OK (#1012) * matching split * migrate progress * split done and rodata migrated * all data migrated to c * start init * progress * progress * progress * progress * progress * progress * copy done * progress * erase and settings done * progress * progress * progress * start keyboard * progress * progress * progress * progress * Minor progress * fix z_magic_dark issue * func_80806F34 decomp'd * verified equivalence * one fix * format * merge petries work * reorganizing * lots of reorganizing and wraning fixing * rename file * remove language enum * unwanted changes * some symbol replacement, organization, and some names * all symbols replaced, some organization * some more cleanup * continue docs * Match the remaining functions in file_choose * merge master * select mode documented, all functions in file_choose.c named * nameset functions named, some other cleaning * some more general cleanup * stub comments for cm, name a few things * fix data and sizeof * copy/erase functions and modes named * rename assets, format * change some struct members * fixes * review1 * fix maching error * extract VTX data * re add werror to ZAPD * review 2 * fix * remove file boundary padding * remove zeroes * review3 * change skybox stuff * changes to vs etc Co-authored-by: KrimtonZ <krimtonz@gmail.com> Co-authored-by: Thar0 <17233964+Thar0@users.noreply.github.com> Co-authored-by: mzxrules <mzxrules@gmail.com> Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain> Co-authored-by: Roman971 <romanlasnier@hotmail.com> Co-authored-by: Louis <louist103@gmail.com>
2021-11-15 21:33:44 +00:00
include "build/src/overlays/gamestates/ovl_file_choose/z_file_nameset_data.o"
include "build/src/overlays/gamestates/ovl_file_choose/z_file_copy_erase.o"
Split ovl_file_choose and ovl_kaleido_scope (#167) * Split ovl_file_choose and ovl_kaleido_scope * Split ovl_kaleido_scope's rodata/data/bss * fix * fix spec * spec fix * hopefully last spec fix * hopefully last spec fix 2 * fix * Add comments on file boundaries * fix
2020-06-07 17:52:43 +00:00
include "build/src/overlays/gamestates/ovl_file_choose/z_file_nameset_PAL.o"
First proper commit.
2020-03-17 04:31:30 +00:00
include "build/src/overlays/gamestates/ovl_file_choose/z_file_choose.o"
File Select (z_file_choose) OK (#1012) * matching split * migrate progress * split done and rodata migrated * all data migrated to c * start init * progress * progress * progress * progress * progress * progress * copy done * progress * erase and settings done * progress * progress * progress * start keyboard * progress * progress * progress * progress * Minor progress * fix z_magic_dark issue * func_80806F34 decomp'd * verified equivalence * one fix * format * merge petries work * reorganizing * lots of reorganizing and wraning fixing * rename file * remove language enum * unwanted changes * some symbol replacement, organization, and some names * all symbols replaced, some organization * some more cleanup * continue docs * Match the remaining functions in file_choose * merge master * select mode documented, all functions in file_choose.c named * nameset functions named, some other cleaning * some more general cleanup * stub comments for cm, name a few things * fix data and sizeof * copy/erase functions and modes named * rename assets, format * change some struct members * fixes * review1 * fix maching error * extract VTX data * re add werror to ZAPD * review 2 * fix * remove file boundary padding * remove zeroes * review3 * change skybox stuff * changes to vs etc Co-authored-by: KrimtonZ <krimtonz@gmail.com> Co-authored-by: Thar0 <17233964+Thar0@users.noreply.github.com> Co-authored-by: mzxrules <mzxrules@gmail.com> Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain> Co-authored-by: Roman971 <romanlasnier@hotmail.com> Co-authored-by: Louis <louist103@gmail.com>
2021-11-15 21:33:44 +00:00
include "build/src/overlays/gamestates/ovl_file_choose/ovl_file_choose_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_kaleido_scope"
Move kaleido scope and map mark data to a misc folder (#1033)
2021-11-28 13:25:30 +00:00
include "build/src/overlays/misc/ovl_kaleido_scope/z_kaleido_collect.o"
include "build/src/overlays/misc/ovl_kaleido_scope/z_kaleido_debug.o"
include "build/src/overlays/misc/ovl_kaleido_scope/z_kaleido_equipment.o"
include "build/src/overlays/misc/ovl_kaleido_scope/z_kaleido_item.o"
include "build/src/overlays/misc/ovl_kaleido_scope/z_kaleido_map_PAL.o"
include "build/src/overlays/misc/ovl_kaleido_scope/z_kaleido_prompt.o"
include "build/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL.o"
include "build/src/overlays/misc/ovl_kaleido_scope/z_lmap_mark.o"
include "build/src/overlays/misc/ovl_kaleido_scope/z_lmap_mark_data.o"
include "build/src/overlays/misc/ovl_kaleido_scope/ovl_kaleido_scope_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_player_actor"
include "build/src/overlays/actors/ovl_player_actor/z_player.o"
Decompile Player (#387) * Setup player decomp * Decompile z_player.c and z_player_lib.c * Decompile remaining z_player.c functions * Various player improvements * Player progress (some non matchings and .data migrated) * Player progress (reposition data and fix some non matchings) * Cleanup, improve and document parts of z_player_lib.c/z_player.c * Fix player renames in z_en_st.c * Fix missing open/close disps in z_player.c * Minor player fixes * Address player comments
2020-09-19 01:45:39 +00:00
include "build/src/overlays/actors/ovl_player_actor/ovl_player_actor_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_map_mark_data"
Move kaleido scope and map mark data to a misc folder (#1033)
2021-11-28 13:25:30 +00:00
include "build/src/overlays/misc/ovl_map_mark_data/z_map_mark_data.o"
include "build/src/overlays/misc/ovl_map_mark_data/ovl_map_mark_data_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Test"
include "build/src/overlays/actors/ovl_En_Test/z_en_test.o"
Stalfos (en_test) OK and object_sk2 documented (#868) * fix colliderinit typo * migrate data * init has 1 problem * progress * progress * builds now * progress * progress * lots of funcs matched * many functions, fix warnings * 1 left * done * docs progress * remove graphovl * missed some * change some funcs * some more * another * format * more docs * cleanups1 * limbs, DLs, textures * limbs named (thanks elliptic) * more docs * Name animations, import symbols * Named sections of xml * more docs * rename limbs and use flag macros * name * review1 and use limb enum * review2 * agro -> aggro * review3 * review4 * review5 Co-authored-by: Elliptic Ellipsis <elliptic.ellipsis@gmail.com>
2021-08-01 19:44:16 +00:00
include "build/src/overlays/actors/ovl_En_Test/ovl_En_Test_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Arms_Hook"
include "build/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.o"
Arms_Hook OK (#210) * Arms_Hook OK * cleanup * decr * remove redundant include * missed some things * rename things Co-authored-by: dark-samus <mathmcclintic@gmail.com>
2020-06-17 19:44:22 +00:00
include "build/src/overlays/actors/ovl_Arms_Hook/ovl_Arms_Hook_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Arrow_Fire"
include "build/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.o"
Split ovl_file_choose and ovl_kaleido_scope (#167) * Split ovl_file_choose and ovl_kaleido_scope * Split ovl_kaleido_scope's rodata/data/bss * fix * fix spec * spec fix * hopefully last spec fix * hopefully last spec fix 2 * fix * Add comments on file boundaries * fix
2020-06-07 17:52:43 +00:00
include "build/src/overlays/actors/ovl_Arrow_Fire/ovl_Arrow_Fire_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Arrow_Ice"
include "build/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.o"
Split ovl_file_choose and ovl_kaleido_scope (#167) * Split ovl_file_choose and ovl_kaleido_scope * Split ovl_kaleido_scope's rodata/data/bss * fix * fix spec * spec fix * hopefully last spec fix * hopefully last spec fix 2 * fix * Add comments on file boundaries * fix
2020-06-07 17:52:43 +00:00
include "build/src/overlays/actors/ovl_Arrow_Ice/ovl_Arrow_Ice_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Arrow_Light"
include "build/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.o"
Split ovl_file_choose and ovl_kaleido_scope (#167) * Split ovl_file_choose and ovl_kaleido_scope * Split ovl_kaleido_scope's rodata/data/bss * fix * fix spec * spec fix * hopefully last spec fix * hopefully last spec fix 2 * fix * Add comments on file boundaries * fix
2020-06-07 17:52:43 +00:00
include "build/src/overlays/actors/ovl_Arrow_Light/ovl_Arrow_Light_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Bg_Bdan_Objects"
include "build/src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.o"
Split ovl_file_choose and ovl_kaleido_scope (#167) * Split ovl_file_choose and ovl_kaleido_scope * Split ovl_kaleido_scope's rodata/data/bss * fix * fix spec * spec fix * hopefully last spec fix * hopefully last spec fix 2 * fix * Add comments on file boundaries * fix
2020-06-07 17:52:43 +00:00
include "build/src/overlays/actors/ovl_Bg_Bdan_Objects/ovl_Bg_Bdan_Objects_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Bg_Bdan_Switch"
include "build/src/overlays/actors/ovl_Bg_Bdan_Switch/z_bg_bdan_switch.o"
Split ovl_file_choose and ovl_kaleido_scope (#167) * Split ovl_file_choose and ovl_kaleido_scope * Split ovl_kaleido_scope's rodata/data/bss * fix * fix spec * spec fix * hopefully last spec fix * hopefully last spec fix 2 * fix * Add comments on file boundaries * fix
2020-06-07 17:52:43 +00:00
include "build/src/overlays/actors/ovl_Bg_Bdan_Switch/ovl_Bg_Bdan_Switch_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Bg_Bom_Guard"
include "build/src/overlays/actors/ovl_Bg_Bom_Guard/z_bg_bom_guard.o"
Split ovl_file_choose and ovl_kaleido_scope (#167) * Split ovl_file_choose and ovl_kaleido_scope * Split ovl_kaleido_scope's rodata/data/bss * fix * fix spec * spec fix * hopefully last spec fix * hopefully last spec fix 2 * fix * Add comments on file boundaries * fix
2020-06-07 17:52:43 +00:00
include "build/src/overlays/actors/ovl_Bg_Bom_Guard/ovl_Bg_Bom_Guard_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Bg_Bombwall"
include "build/src/overlays/actors/ovl_Bg_Bombwall/z_bg_bombwall.o"
z_bg_bombwall OK (#506) * Update spec remove z_bg_bombwall.o from spec * Update z_bg_bombwall.h updated actor struct * Update z_bg_bombwall.c * Delete BgBombwall_Destroy.s no longer needed * Delete BgBombwall_Draw.s no longer needed * Delete BgBombwall_Init.s no longer needed * Delete BgBombwall_Update.s no longer needed * Delete func_8086E7D0.s no longer needed * Delete func_8086E850.s no longer needed * Delete func_8086EAC0.s no longer needed * Delete func_8086EB5C.s no longer needed * Delete func_8086ED50.s no longer needed * Delete func_8086ED70.s no longer needed * Delete func_8086EDFC.s no longer needed * Delete func_8086EE40.s no longer needed * Delete func_8086EE94.s no longer needed * Update spec update path to reloc * Delete z_bg_bombwall.data.s no longer needed * Delete z_bg_bombwall.reloc.s no longer needed * Update spec fix path to reloc of bombwall * Update z_bg_bombwall.c Co-authored-by: fig <fig02srl@gmail.com>
2020-12-30 16:36:17 +00:00
include "build/src/overlays/actors/ovl_Bg_Bombwall/ovl_Bg_Bombwall_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Bg_Bowl_Wall"
include "build/src/overlays/actors/ovl_Bg_Bowl_Wall/z_bg_bowl_wall.o"
Bombchu bowling OK (#496) * All functions decompiled, most named * asm deleted, spec and undefined_syms included * missed a static * Some cleanup on comments and osSyncPrintfs * asm Co-authored-by: fig02 <fig02srl@gmail.com>
2020-12-06 18:48:51 +00:00
include "build/src/overlays/actors/ovl_Bg_Bowl_Wall/ovl_Bg_Bowl_Wall_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Bg_Breakwall"
include "build/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.o"
Bg_Breakwall OK and documented (#684) * cleanup breakwall * fix mistake in header * make some data static * reloc stuffs * ready for pr * Remove asm * Update src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.c Co-authored-by: petrie911 <69443847+petrie911@users.noreply.github.com> * fix petrie's stuff * fixed all feedback * Update src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.h Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> Co-authored-by: petrie911 <69443847+petrie911@users.noreply.github.com> Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2021-02-13 01:51:59 +00:00
include "build/src/overlays/actors/ovl_Bg_Breakwall/ovl_Bg_Breakwall_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Bg_Ddan_Jd"
include "build/src/overlays/actors/ovl_Bg_Ddan_Jd/z_bg_ddan_jd.o"
Match and fully document bg_ddan_jd (#386) * match and fully document bg_ddan_jd * fix comment * implemented suggested changes, minor fixes * more changes * implement requested changes, tweak wording on ySpeed comments * more minor tweaks
2020-09-28 05:18:47 +00:00
include "build/src/overlays/actors/ovl_Bg_Ddan_Jd/ovl_Bg_Ddan_Jd_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Bg_Ddan_Kd"
include "build/src/overlays/actors/ovl_Bg_Ddan_Kd/z_bg_ddan_kd.o"
Split ovl_file_choose and ovl_kaleido_scope (#167) * Split ovl_file_choose and ovl_kaleido_scope * Split ovl_kaleido_scope's rodata/data/bss * fix * fix spec * spec fix * hopefully last spec fix * hopefully last spec fix 2 * fix * Add comments on file boundaries * fix
2020-06-07 17:52:43 +00:00
include "build/src/overlays/actors/ovl_Bg_Ddan_Kd/ovl_Bg_Ddan_Kd_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Bg_Dodoago"
include "build/src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.o"
Decompiles z_bg_dodoago.c (#334) * Starts decompiling z_bg_dodoago.c * Removes data * * BgDodoago_SetupAction * * BgDodoago_Destroy * * func_80872288 * * BgDodoago_Draw * * func_80871A08 * * BgDodoago_Init * WIP * * func_80871CF4 * * func_80871CF4 * WIP * * BgDodoago_Update * Finishes z_bg_dodoago * Addresses PR comments * Addresses PR comments #2 * Removes Setup forward declared function * Addresses PR comments #3 Co-authored-by: i82orbom <i82orbom i82orbom@github>
2020-08-24 03:17:47 +00:00
include "build/src/overlays/actors/ovl_Bg_Dodoago/ovl_Bg_Dodoago_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Bg_Dy_Yoseizo"
include "build/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.o"
BgDyYoseizo OK and documented (#634) * OK, data imported * naming * spec, more naming * more naming, in EnDyExtra too * more naming * deleat asm * change one function name * addressed review comments * Actor changes * Address review comments * Apply suggestions from code review Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2021-02-03 00:29:40 +00:00
include "build/src/overlays/actors/ovl_Bg_Dy_Yoseizo/ovl_Bg_Dy_Yoseizo_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Bg_Ganon_Otyuka"
include "build/src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.o"
ovl_Bg_Ganon_Otyuka (#488) * merge upstream * Merge upstream * BgGanonOtyuka_Init * Migrate data * Use texture symbol in dlist * Split gfx into another file * Cool data stuff * Cleanup more data * Name some more stuff * Add newline * BgGanonOtyuka_Destroy * Rename shockwave to flash * Work on BgGanonOtyuka_Draw * Work more on draw * More progress * More BgGanonOtyuka_Draw * Stuff * Terrible match BgGanonOtyuka_Draw * BgGanonOtyuka_Update * func_808760DC * Cleanup BgGanonOtyuka_Draw * Cleanup * More cleanup * Work on func_80875A0C * Rename to color * func_80875C88 * func_80875A0C * Stuff * Stuff * Name top and bottom dlists * Name some verts * Add back in accidentally removed D_808772E0 * Name side dlist * Name dlists * Name flash verts * Only add unk_198 to BossGanon * Name drop timer * Name isFalling * Name stuff * Name stuff relating to sides * Use Side enum * Use cardinal directions for sides * More naming / cleanup * Rename to SIDE_ALL * Replace enum with defines * Flash state * Reorder add * Rename to flashHeight * Revert "Rename to flashHeight" This reverts commit fa1ca87630aa4991e700bf9a8830ad786ba9aeb8. * Correct sides * Rename to unwalledSides * Put f32 on 0x8000 * Cleanup * Update src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.h Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Cleanup Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-11-29 10:05:30 +00:00
include "build/src/overlays/actors/ovl_Bg_Ganon_Otyuka/ovl_Bg_Ganon_Otyuka_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Bg_Gate_Shutter"
include "build/src/overlays/actors/ovl_Bg_Gate_Shutter/z_bg_gate_shutter.o"
Split ovl_file_choose and ovl_kaleido_scope (#167) * Split ovl_file_choose and ovl_kaleido_scope * Split ovl_kaleido_scope's rodata/data/bss * fix * fix spec * spec fix * hopefully last spec fix * hopefully last spec fix 2 * fix * Add comments on file boundaries * fix
2020-06-07 17:52:43 +00:00
include "build/src/overlays/actors/ovl_Bg_Gate_Shutter/ovl_Bg_Gate_Shutter_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Bg_Gjyo_Bridge"
include "build/src/overlays/actors/ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge.o"
Split ovl_file_choose and ovl_kaleido_scope (#167) * Split ovl_file_choose and ovl_kaleido_scope * Split ovl_kaleido_scope's rodata/data/bss * fix * fix spec * spec fix * hopefully last spec fix * hopefully last spec fix 2 * fix * Add comments on file boundaries * fix
2020-06-07 17:52:43 +00:00
include "build/src/overlays/actors/ovl_Bg_Gjyo_Bridge/ovl_Bg_Gjyo_Bridge_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Bg_Gnd_Darkmeiro"
include "build/src/overlays/actors/ovl_Bg_Gnd_Darkmeiro/z_bg_gnd_darkmeiro.o"
Darkmeiro decompilation (#320) * Darkmeiro decompilation Bg_Gnd_Darkmeiro decompiled, matched, and documented. * forgot to remove ASM * Now with better formatting * removed some stray thisx * Update src/overlays/actors/ovl_Bg_Gnd_Darkmeiro/z_bg_gnd_darkmeiro.c Co-authored-by: Random <28494085+Random06457@users.noreply.github.com> * Update src/overlays/actors/ovl_Bg_Gnd_Darkmeiro/z_bg_gnd_darkmeiro.c Co-authored-by: Random <28494085+Random06457@users.noreply.github.com> * Update src/overlays/actors/ovl_Bg_Gnd_Darkmeiro/z_bg_gnd_darkmeiro.c Co-authored-by: Random <28494085+Random06457@users.noreply.github.com> * one more cleanup * cleanup as per discussion * fancy new names * sfx * ZAP * more cleanup * more cleanup * and a little more * renaming some stuff * a little more tidying up * bug comment Co-authored-by: Random <28494085+Random06457@users.noreply.github.com>
2020-09-14 20:53:57 +00:00
include "build/src/overlays/actors/ovl_Bg_Gnd_Darkmeiro/ovl_Bg_Gnd_Darkmeiro_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Bg_Gnd_Firemeiro"
include "build/src/overlays/actors/ovl_Bg_Gnd_Firemeiro/z_bg_gnd_firemeiro.o"
BgGndFiremeiro OK and documented (#850) * OK, data imported * Name everything * Delete asm
2021-06-14 17:50:16 +00:00
include "build/src/overlays/actors/ovl_Bg_Gnd_Firemeiro/ovl_Bg_Gnd_Firemeiro_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Bg_Gnd_Iceblock"
include "build/src/overlays/actors/ovl_Bg_Gnd_Iceblock/z_bg_gnd_iceblock.o"
Bg_Gnd_Iceblock and Bg_Ice_Objects (sliding ice blocks) (#534) * Darkmeiro decompilation Bg_Gnd_Darkmeiro decompiled, matched, and documented. * give this a shot * fix conflict * one more try * could be useful * whoops * ZAP2 stuff * ZAP why * ZAP again * a good start * done * Log * formatting * thisx Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
2020-12-29 18:11:11 +00:00
include "build/src/overlays/actors/ovl_Bg_Gnd_Iceblock/ovl_Bg_Gnd_Iceblock_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Bg_Gnd_Nisekabe"
include "build/src/overlays/actors/ovl_Bg_Gnd_Nisekabe/z_bg_gnd_nisekabe.o"
Split ovl_file_choose and ovl_kaleido_scope (#167) * Split ovl_file_choose and ovl_kaleido_scope * Split ovl_kaleido_scope's rodata/data/bss * fix * fix spec * spec fix * hopefully last spec fix * hopefully last spec fix 2 * fix * Add comments on file boundaries * fix
2020-06-07 17:52:43 +00:00
include "build/src/overlays/actors/ovl_Bg_Gnd_Nisekabe/ovl_Bg_Gnd_Nisekabe_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Bg_Gnd_Soulmeiro"
include "build/src/overlays/actors/ovl_Bg_Gnd_Soulmeiro/z_bg_gnd_soulmeiro.o"
z_bg_gnd_soulmeiro.c OK (#439) * Starts z_bg_gnd_soulmeiro.c * Init * Some more progress * BgGndSoulmeiro_Draw * Some more progress * Matched * Removes unused asm * PR suggestions * Update comment Co-authored-by: i82orbom <i82orbom i82orbom@github>
2020-10-11 00:05:59 +00:00
include "build/src/overlays/actors/ovl_Bg_Gnd_Soulmeiro/ovl_Bg_Gnd_Soulmeiro_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Bg_Haka"
include "build/src/overlays/actors/ovl_Bg_Haka/z_bg_haka.o"
Decompiled ovl_Bg_Haka (#346) * Progress * match func_8087B7E8 * combine into else if * match func_8087B938 * reorder condition to be more readable * SFX macros * clang fmt * func_8087BAAC and func_8087BAE4 * match BgHaka_Draw * attempt to remove dependency on asm data * match file and remove asm * reorder comparison * clang format * use bitwise not * merge upstream * fix ZAP2 * Update src/overlays/actors/ovl_Bg_Haka/z_bg_haka.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update src/overlays/actors/ovl_Bg_Haka/z_bg_haka.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update src/overlays/actors/ovl_Bg_Haka/z_bg_haka.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * implement fig's suggestions Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-08-27 15:48:38 +00:00
include "build/src/overlays/actors/ovl_Bg_Haka/ovl_Bg_Haka_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Bg_Haka_Gate"
include "build/src/overlays/actors/ovl_Bg_Haka_Gate/z_bg_haka_gate.o"
Bg_Haka_Gate (#557) * Darkmeiro decompilation Bg_Gnd_Darkmeiro decompiled, matched, and documented. * give this a shot * fix conflict * one more try * could be useful * whoops * ZAP2 stuff * ZAP why * ZAP again * match * sfx fix * should be good to go * comments and such * Matrix macros escape me * format * fix bubble * remove comments Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain> Co-authored-by: fig <fig02srl@gmail.com>
2020-12-30 00:39:30 +00:00
include "build/src/overlays/actors/ovl_Bg_Haka_Gate/ovl_Bg_Haka_Gate_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Bg_Haka_Huta"
include "build/src/overlays/actors/ovl_Bg_Haka_Huta/z_bg_haka_huta.o"
Bg haka huta OK (#682) * starting haka_huta with new changes * matched last func, deleting asm * added changes from review
2021-02-12 22:29:05 +00:00
include "build/src/overlays/actors/ovl_Bg_Haka_Huta/ovl_Bg_Haka_Huta_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Bg_Haka_Megane"
include "build/src/overlays/actors/ovl_Bg_Haka_Megane/z_bg_haka_megane.o"
Split ovl_file_choose and ovl_kaleido_scope (#167) * Split ovl_file_choose and ovl_kaleido_scope * Split ovl_kaleido_scope's rodata/data/bss * fix * fix spec * spec fix * hopefully last spec fix * hopefully last spec fix 2 * fix * Add comments on file boundaries * fix
2020-06-07 17:52:43 +00:00
include "build/src/overlays/actors/ovl_Bg_Haka_Megane/ovl_Bg_Haka_Megane_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Bg_Haka_MeganeBG"
include "build/src/overlays/actors/ovl_Bg_Haka_MeganeBG/z_bg_haka_meganebg.o"
Decompiled ovl_Bg_Haka_MeganeBG (#448)
2020-10-13 00:44:22 +00:00
include "build/src/overlays/actors/ovl_Bg_Haka_MeganeBG/ovl_Bg_Haka_MeganeBG_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Bg_Haka_Sgami"
include "build/src/overlays/actors/ovl_Bg_Haka_Sgami/z_bg_haka_sgami.o"
Bg_Haka_Sgami OK (#532) * spinning scythe trap, 4/6 matching * fixed typo * Almost matched sgami init * Matched sgami Init * starting to clean up func_8087E858 * func_8087E858 half-way done * Scythe matched * update scythe * Removed asm files * Delete z_bg_haka_sgami.reloc.s * Update src/overlays/actors/ovl_Bg_Haka_Sgami/z_bg_haka_sgami.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update src/overlays/actors/ovl_Bg_Haka_Sgami/z_bg_haka_sgami.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update src/overlays/actors/ovl_Bg_Haka_Sgami/z_bg_haka_sgami.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update z_bg_haka_sgami.c Co-authored-by: Zelllll <elijah@DESKTOP-NMP1I89.localdomain> Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-12-19 09:59:35 +00:00
include "build/src/overlays/actors/ovl_Bg_Haka_Sgami/ovl_Bg_Haka_Sgami_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Bg_Haka_Ship"
include "build/src/overlays/actors/ovl_Bg_Haka_Ship/z_bg_haka_ship.o"
ovl_bg_haka_ship OK (#712) * 2 non matchings left * decompiled ovl_Bg_Haka_Ship * review suggestions * parent/child (Actor*) * removed unneeded cast * removed DECR * review 2 suggestions, removed some redundant parentheses
2021-03-11 00:02:22 +00:00
include "build/src/overlays/actors/ovl_Bg_Haka_Ship/ovl_Bg_Haka_Ship_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Bg_Haka_Trap"
include "build/src/overlays/actors/ovl_Bg_Haka_Trap/z_bg_haka_trap.o"
Decompile z_bg_haka_trap.c (#201) * Decompile z_bg_haka_trap.c * Update spec delete old .reloc.s file Co-authored-by: Random <28494085+Random06457@users.noreply.github.com> * Deleted reloc.s and made style changes to function pointers and local vars * Renamed timer field, added more useful temp names * Implemented Roman's suggestions, including moving enum to header file, moving some static variables inside functions, removing unnecessary casts, removing unnecessary temps, and fixing a few style issues * Commented dual purpose of unk_16A and formatted file again Co-authored-by: Random <28494085+Random06457@users.noreply.github.com>
2020-06-11 21:39:47 +00:00
include "build/src/overlays/actors/ovl_Bg_Haka_Trap/ovl_Bg_Haka_Trap_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Bg_Haka_Tubo"
include "build/src/overlays/actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.o"
Decompile ovl_Bg_Haka_Tubo (#280) * Bg_Haka_Tubo OK * Ran formatter * Review suggestions * Fix commented field offsets in header Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Fix other field offset Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Named data and made static Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-07-20 23:57:02 +00:00
include "build/src/overlays/actors/ovl_Bg_Haka_Tubo/ovl_Bg_Haka_Tubo_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Bg_Haka_Water"
include "build/src/overlays/actors/ovl_Bg_Haka_Water/z_bg_haka_water.o"
BgHakaWater OK (#302) * BgHakaWater OK * minor style fixups * made requested changes * use true/false for isLowered
2020-09-09 02:48:35 +00:00
include "build/src/overlays/actors/ovl_Bg_Haka_Water/ovl_Bg_Haka_Water_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Bg_Haka_Zou"
include "build/src/overlays/actors/ovl_Bg_Haka_Zou/z_bg_haka_zou.o"
Bg_Haka_Zou OK (#598) * started init, not matched yet * all except init matched * haka_zou OK * haka_zou done * fix jenkins problem * various improvements * removed unused asm * fixed things * fixed new dyna names * more dyna fixes * ok now????? * this better build OK * applied roman's suggestions * function renames Co-authored-by: Zelllll <elijah@DESKTOP-NMP1I89.localdomain> Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-01-21 15:21:05 +00:00
include "build/src/overlays/actors/ovl_Bg_Haka_Zou/ovl_Bg_Haka_Zou_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Bg_Heavy_Block"
include "build/src/overlays/actors/ovl_Bg_Heavy_Block/z_bg_heavy_block.o"
Bg_Heavy_Block and Eff_Ss_Dust (#258) * heavy_rock progress * heavy block progress, 2 functions left * progress * progress * heavy_block OK * comments * heavy block done * eff ss dust ok * naming * done i think * comment * clean up dust usages * remove docs * remove reloc * move enum and rename flag * effect enum
2020-07-19 13:54:24 +00:00
include "build/src/overlays/actors/ovl_Bg_Heavy_Block/ovl_Bg_Heavy_Block_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Bg_Hidan_Curtain"
include "build/src/overlays/actors/ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.o"
Bg_Hidan_Curtain (#411) * Darkmeiro decompilation Bg_Gnd_Darkmeiro decompiled, matched, and documented. * give this a shot * fix conflict * one more try * flame circles * merge and description * Update src/overlays/actors/ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.c Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * formatting and other cleanup * names Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
2020-10-04 12:48:48 +00:00
include "build/src/overlays/actors/ovl_Bg_Hidan_Curtain/ovl_Bg_Hidan_Curtain_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Bg_Hidan_Dalm"
include "build/src/overlays/actors/ovl_Bg_Hidan_Dalm/z_bg_hidan_dalm.o"
ovl_Bg_Hidan_Dalm OK (#367) * ovl_Bg_Hidan_Dalm OK, except _Init * names and style changes * OK, names, style
2020-09-07 12:29:58 +00:00
include "build/src/overlays/actors/ovl_Bg_Hidan_Dalm/ovl_Bg_Hidan_Dalm_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Bg_Hidan_Firewall"
include "build/src/overlays/actors/ovl_Bg_Hidan_Firewall/z_bg_hidan_firewall.o"
Split ovl_file_choose and ovl_kaleido_scope (#167) * Split ovl_file_choose and ovl_kaleido_scope * Split ovl_kaleido_scope's rodata/data/bss * fix * fix spec * spec fix * hopefully last spec fix * hopefully last spec fix 2 * fix * Add comments on file boundaries * fix
2020-06-07 17:52:43 +00:00
include "build/src/overlays/actors/ovl_Bg_Hidan_Firewall/ovl_Bg_Hidan_Firewall_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Bg_Hidan_Fslift"
include "build/src/overlays/actors/ovl_Bg_Hidan_Fslift/z_bg_hidan_fslift.o"
Split ovl_file_choose and ovl_kaleido_scope (#167) * Split ovl_file_choose and ovl_kaleido_scope * Split ovl_kaleido_scope's rodata/data/bss * fix * fix spec * spec fix * hopefully last spec fix * hopefully last spec fix 2 * fix * Add comments on file boundaries * fix
2020-06-07 17:52:43 +00:00
include "build/src/overlays/actors/ovl_Bg_Hidan_Fslift/ovl_Bg_Hidan_Fslift_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Bg_Hidan_Fwbig"
include "build/src/overlays/actors/ovl_Bg_Hidan_Fwbig/z_bg_hidan_fwbig.o"
Bg_Hidan_Fwbig (#450) * Darkmeiro decompilation Bg_Gnd_Darkmeiro decompiled, matched, and documented. * give this a shot * fix conflict * one more try * could be useful * whoops * long firewall is long * Fwbig documented, some cleanup on Zl1 * format * merge and cleanup * last things
2020-10-27 05:29:01 +00:00
include "build/src/overlays/actors/ovl_Bg_Hidan_Fwbig/ovl_Bg_Hidan_Fwbig_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Bg_Hidan_Hamstep"
include "build/src/overlays/actors/ovl_Bg_Hidan_Hamstep/z_bg_hidan_hamstep.o"
Bg_Hidan_Hamstep OK (#544) * BgHidanHamstep 7/15 * 9/15 matched * hamstep 14/15 * cleanup * fix not OK * fix ctrl+f mistake * All functions OK * cleanup * Update z_bg_hidan_hamstep.c * Update z_bg_hidan_hamstep.h * fix math Co-authored-by: Zelllll <elijah@DESKTOP-NMP1I89.localdomain>
2020-12-30 03:48:57 +00:00
include "build/src/overlays/actors/ovl_Bg_Hidan_Hamstep/ovl_Bg_Hidan_Hamstep_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Bg_Hidan_Hrock"
include "build/src/overlays/actors/ovl_Bg_Hidan_Hrock/z_bg_hidan_hrock.o"
Decompiled ovl_Bg_Hidan_Hrock (#690) * Fixing mkldscript.c for mac * 1 to go * merge update * almost * small update * updating API with master * NON_MATCHING * names of vars * almost matching Signed-off-by: angie <angheloalf95@gmail.com> * BgHidanHrock_Init matching Signed-off-by: Anghelo <angheloalf95@gmail.com> * renames * format * PR suggestions Co-authored-by: angie <angheloalf95@gmail.com>
2021-02-15 19:33:41 +00:00
include "build/src/overlays/actors/ovl_Bg_Hidan_Hrock/ovl_Bg_Hidan_Hrock_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Bg_Hidan_Kousi"
include "build/src/overlays/actors/ovl_Bg_Hidan_Kousi/z_bg_hidan_kousi.o"
Split ovl_file_choose and ovl_kaleido_scope (#167) * Split ovl_file_choose and ovl_kaleido_scope * Split ovl_kaleido_scope's rodata/data/bss * fix * fix spec * spec fix * hopefully last spec fix * hopefully last spec fix 2 * fix * Add comments on file boundaries * fix
2020-06-07 17:52:43 +00:00
include "build/src/overlays/actors/ovl_Bg_Hidan_Kousi/ovl_Bg_Hidan_Kousi_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Bg_Hidan_Kowarerukabe"
include "build/src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.o"
Bg_Hidan_Kowarerukabe OK (#562) * 10/12 functions decompiled and matched * 12/12 matched * file done * kowarerukabe OK * Update src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.c Co-authored-by: AdamKiddle <54328813+AdamKiddle@users.noreply.github.com> * Update src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.c Co-authored-by: AdamKiddle <54328813+AdamKiddle@users.noreply.github.com> * Update src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.c Co-authored-by: AdamKiddle <54328813+AdamKiddle@users.noreply.github.com> * Update src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.c Co-authored-by: AdamKiddle <54328813+AdamKiddle@users.noreply.github.com> * Update src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.c Co-authored-by: AdamKiddle <54328813+AdamKiddle@users.noreply.github.com> * Update src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.c Co-authored-by: AdamKiddle <54328813+AdamKiddle@users.noreply.github.com> * Update src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.c Co-authored-by: AdamKiddle <54328813+AdamKiddle@users.noreply.github.com> * Update src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.c Co-authored-by: AdamKiddle <54328813+AdamKiddle@users.noreply.github.com> * Update src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.c Co-authored-by: AdamKiddle <54328813+AdamKiddle@users.noreply.github.com> * Update src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.c Co-authored-by: AdamKiddle <54328813+AdamKiddle@users.noreply.github.com> * Update src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.c Co-authored-by: AdamKiddle <54328813+AdamKiddle@users.noreply.github.com> * Update src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.c Co-authored-by: AdamKiddle <54328813+AdamKiddle@users.noreply.github.com> * Update src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.c Co-authored-by: AdamKiddle <54328813+AdamKiddle@users.noreply.github.com> * Update src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.c Co-authored-by: AdamKiddle <54328813+AdamKiddle@users.noreply.github.com> * Update src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.c Co-authored-by: AdamKiddle <54328813+AdamKiddle@users.noreply.github.com> * hopefully fixed build issue * OK now * Fix new math function names Co-authored-by: Zelllll <elijah@DESKTOP-NMP1I89.localdomain> Co-authored-by: AdamKiddle <54328813+AdamKiddle@users.noreply.github.com>
2020-12-30 01:13:38 +00:00
include "build/src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/ovl_Bg_Hidan_Kowarerukabe_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Bg_Hidan_Rock"
include "build/src/overlays/actors/ovl_Bg_Hidan_Rock/z_bg_hidan_rock.o"
ovl_Bg_Hidan_Rock OK (#657) * void BgHidanRock_Init(Actor *thisx, GlobalContext *globalCtx) Signed-off-by: angie <angheloalf95@gmail.com> * small functions Signed-off-by: angie <angheloalf95@gmail.com> * BgHidanRock_Destroy Signed-off-by: angie <angheloalf95@gmail.com> * BgHidanRock_Update Signed-off-by: angie <angheloalf95@gmail.com> * BgHidanRock_Draw Signed-off-by: angie <angheloalf95@gmail.com> * func_8088B69C Signed-off-by: angie <angheloalf95@gmail.com> * func_8088B79C Signed-off-by: angie <angheloalf95@gmail.com> * func_8088B990 Signed-off-by: angie <angheloalf95@gmail.com> * func_8088B268 and move data Signed-off-by: angie <angheloalf95@gmail.com> * func_8088BC40 Signed-off-by: angie <angheloalf95@gmail.com> * erase reloc Signed-off-by: angie <angheloalf95@gmail.com> * a bit of cleanup Signed-off-by: angie <angheloalf95@gmail.com> * ups Signed-off-by: angie <angheloalf95@gmail.com> * another bit of cleanup Signed-off-by: angie <angheloalf95@gmail.com> * Changes requested by @petrie911 Signed-off-by: Anghelo <angheloalf95@gmail.com> * More changes requested by @petrie911 Signed-off-by: angie <angheloalf95@gmail.com> * fix some types Signed-off-by: angie <angheloalf95@gmail.com>
2021-02-12 22:33:03 +00:00
include "build/src/overlays/actors/ovl_Bg_Hidan_Rock/ovl_Bg_Hidan_Rock_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Bg_Hidan_Rsekizou"
include "build/src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.o"
z_en_bg_hidan_rsekizou (#282) * RSekizou 4/5 * func_8088C70C on its way. * ROM got shifted? * RSekizou is OK * Cleanup * Removed unused ASM. Jenkins! * Update src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.h Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Tidy Roman-ization. ;) * UNK_TYPE array instead of illegal UNK_PTR array. * Update src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-07-22 21:12:47 +00:00
include "build/src/overlays/actors/ovl_Bg_Hidan_Rsekizou/ovl_Bg_Hidan_Rsekizou_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Bg_Hidan_Sekizou"
include "build/src/overlays/actors/ovl_Bg_Hidan_Sekizou/z_bg_hidan_sekizou.o"
Decomp BgHidanSekizou (#970) * mostly matching * OK! * relocs * I fix * fix some floats * fixes * array counts Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
2021-09-24 22:26:19 +00:00
include "build/src/overlays/actors/ovl_Bg_Hidan_Sekizou/ovl_Bg_Hidan_Sekizou_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Bg_Hidan_Sima"
include "build/src/overlays/actors/ovl_Bg_Hidan_Sima/z_bg_hidan_sima.o"
z_bg_hidan_sima OK (#680) * z_bg_hidan_sima OK * cleanup code * implement suggestions
2021-02-13 23:31:25 +00:00
include "build/src/overlays/actors/ovl_Bg_Hidan_Sima/ovl_Bg_Hidan_Sima_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Bg_Hidan_Syoku"
include "build/src/overlays/actors/ovl_Bg_Hidan_Syoku/z_bg_hidan_syoku.o"
Split ovl_file_choose and ovl_kaleido_scope (#167) * Split ovl_file_choose and ovl_kaleido_scope * Split ovl_kaleido_scope's rodata/data/bss * fix * fix spec * spec fix * hopefully last spec fix * hopefully last spec fix 2 * fix * Add comments on file boundaries * fix
2020-06-07 17:52:43 +00:00
include "build/src/overlays/actors/ovl_Bg_Hidan_Syoku/ovl_Bg_Hidan_Syoku_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Bg_Ice_Objects"
include "build/src/overlays/actors/ovl_Bg_Ice_Objects/z_bg_ice_objects.o"
Bg_Gnd_Iceblock and Bg_Ice_Objects (sliding ice blocks) (#534) * Darkmeiro decompilation Bg_Gnd_Darkmeiro decompiled, matched, and documented. * give this a shot * fix conflict * one more try * could be useful * whoops * ZAP2 stuff * ZAP why * ZAP again * a good start * done * Log * formatting * thisx Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
2020-12-29 18:11:11 +00:00
include "build/src/overlays/actors/ovl_Bg_Ice_Objects/ovl_Bg_Ice_Objects_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Bg_Ice_Shelter"
include "build/src/overlays/actors/ovl_Bg_Ice_Shelter/z_bg_ice_shelter.o"
bg_ice_shelter OK (#736) * ok * OK * asm
2021-03-28 22:53:28 +00:00
include "build/src/overlays/actors/ovl_Bg_Ice_Shelter/ovl_Bg_Ice_Shelter_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Bg_Ice_Shutter"
include "build/src/overlays/actors/ovl_Bg_Ice_Shutter/z_bg_ice_shutter.o"
ovl_Bg_Ice_Shutter (#377) * Starting work on Bg_Ice_Shutter, want to commit before attempting to use the permuter. * Forgot to use the new UNK_TPYE in DynaPolyInfo_Alloc * Resolving last asm issues by re-ordering and updating .c file. * Attempting to match by reordering things, removing no longer used .s files from spec file. * Adding in proper include path for _reloc file * Removing unneeded parens and casts * Removing extra space. * Updated with review fixes * Another round of review comments. * Adding description to comment to clarify what these are. * Adding in newline before draw function
2020-09-19 19:12:42 +00:00
include "build/src/overlays/actors/ovl_Bg_Ice_Shutter/ovl_Bg_Ice_Shutter_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Bg_Ice_Turara"
include "build/src/overlays/actors/ovl_Bg_Ice_Turara/z_bg_ice_turara.o"
ovl_bg_ice_turara OK (#467) * ovl_Bg_Ice_Turara.c OK * =Updated z_bg_ice_turara.c to address comments * Params and all functions named * remove unnecessary linebreak * Update src/overlays/actors/ovl_Bg_Ice_Turara/z_bg_ice_turara.h Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Changed enum names Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-11-23 23:32:57 +00:00
include "build/src/overlays/actors/ovl_Bg_Ice_Turara/ovl_Bg_Ice_Turara_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Bg_Ingate"
include "build/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.o"
Decompiles z_bg_ingate (#301) * Decompiles z_bg_ingate * BgIngate_SetupAction * BgIngate_Init * BgIngate_Destroy * BgIngate_Update * func_80892990 * func_80892890 * BgIngate_Draw Removes unused asm's Formats z_bg_ingate.c * Addresses PR comments * Fixes usage of cutscene id instead of regular scene * Addresses PR comments
2020-08-04 18:30:46 +00:00
include "build/src/overlays/actors/ovl_Bg_Ingate/ovl_Bg_Ingate_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Bg_Jya_1flift"
include "build/src/overlays/actors/ovl_Bg_Jya_1flift/z_bg_jya_1flift.o"
Bg jya1flift (#269) * Update ZAP2 * BgJya1flift progress * BgJya1flift Progress * Rename unknown variables * BgJya1flift Progress * Finish Decomp for BgJya1flift FInished decomp and added missing functions to functions.h * Fix struct padding * PR fixes * PR fixes * Pr Fixes
2020-07-22 07:48:31 +00:00
include "build/src/overlays/actors/ovl_Bg_Jya_1flift/ovl_Bg_Jya_1flift_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Bg_Jya_Amishutter"
include "build/src/overlays/actors/ovl_Bg_Jya_Amishutter/z_bg_jya_amishutter.o"
Split ovl_file_choose and ovl_kaleido_scope (#167) * Split ovl_file_choose and ovl_kaleido_scope * Split ovl_kaleido_scope's rodata/data/bss * fix * fix spec * spec fix * hopefully last spec fix * hopefully last spec fix 2 * fix * Add comments on file boundaries * fix
2020-06-07 17:52:43 +00:00
include "build/src/overlays/actors/ovl_Bg_Jya_Amishutter/ovl_Bg_Jya_Amishutter_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Bg_Jya_Bigmirror"
include "build/src/overlays/actors/ovl_Bg_Jya_Bigmirror/z_bg_jya_bigmirror.o"
Bigmirror OK and documented (#530) * OK * documented (with one odd float value) * delete asm and alter spec * uniformise spawn data to sIsSpawned, fix compile warnings in Bg_Jya_Lift and Bg_Mori_Elevator * translate last printf * re-delete modified asm * addressed review comments * remove outdated comment * addressed comments, made defines * untrack scenes dir * remove scenes dir
2020-12-29 08:50:56 +00:00
include "build/src/overlays/actors/ovl_Bg_Jya_Bigmirror/ovl_Bg_Jya_Bigmirror_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Bg_Jya_Block"
include "build/src/overlays/actors/ovl_Bg_Jya_Block/z_bg_jya_block.o"
Decompiled ovl_Bg_Jya_Block (#286) * Decompiled ovl_Bg_Jya_Block * PR comments
2020-07-23 03:44:18 +00:00
include "build/src/overlays/actors/ovl_Bg_Jya_Block/ovl_Bg_Jya_Block_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Bg_Jya_Bombchuiwa"
include "build/src/overlays/actors/ovl_Bg_Jya_Bombchuiwa/z_bg_jya_bombchuiwa.o"
BgJyaBombchuiwa OK (#452) * Fixed upstream * Almost done * Done * PR fixes * PR fix Co-authored-by: Louis <5883445+louist103@users.noreply.github.com>
2020-10-26 16:55:37 +00:00
include "build/src/overlays/actors/ovl_Bg_Jya_Bombchuiwa/ovl_Bg_Jya_Bombchuiwa_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Bg_Jya_Bombiwa"
include "build/src/overlays/actors/ovl_Bg_Jya_Bombiwa/z_bg_jya_bombiwa.o"
Decomp BgJyaBombiwa (#294) * Decomp BgJyaBombiwa * Delete z_bg_jya_bombiwa.data.s * Delete z_bg_jya_bombiwa.reloc.s * PR fixes * Delete cur_list.txt * Delete old_data_list.txt * Delete data_list.txt * Delete old_list.txt * PR fixes * PR fixes
2020-08-04 18:01:40 +00:00
include "build/src/overlays/actors/ovl_Bg_Jya_Bombiwa/ovl_Bg_Jya_Bombiwa_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Bg_Jya_Cobra"
include "build/src/overlays/actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.o"
Decompile Bg Jya Cobra (#588) * Start work on Jya Cobra * Match two functions * Work on func_80896ABC * func_80896CB4 and most of func_80896D78 * Fix func_80895BEC, clean up func_80896ABC * Work on func_80896EE4 * Match func_80896EE4 * Nearly match func_80895A70, finish BgJyaCobra_Draw * Match func_808969F8, start on func_80895C74 * Work on func_80895C74 and func_80895EF0, data move Also ran permuter * Some cleanup * Almost match func_80895C74, tiny bit of work on func_80895EF0 * Remove variables in func_80895EF0 * Make init match nicer * Work on func_80896518 * Progress in func_80896518 * Figured something out in func_80896518 Going to experiment with stack stuff * func_80896518 has tiny stack and regalloc issues * Work on func_80895EF0 * Some work on func_80895EF0 * Update diff script * Work on func_90995EF0 Use 2d array indexing in func_80895EF0 Small regalloc improvement in func_80896518 Change not equal to to less than where possible * match func_80896ABC and func_80896D78 * Improve func_80895EF0 a bit * Do some cleanup * Change commented out functions to ifdefs * Another bit of cleanup * Run formatter * Remove now unused include * Another another bit of cleanup * Revert update to diff script * PR suggestions * PR comments * PR comments, a bit of documentation * Run formatter * Apply suggestions from code review Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * More PR comments * actor fixes Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-01-21 14:55:11 +00:00
include "build/src/overlays/actors/ovl_Bg_Jya_Cobra/ovl_Bg_Jya_Cobra_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Bg_Jya_Goroiwa"
include "build/src/overlays/actors/ovl_Bg_Jya_Goroiwa/z_bg_jya_goroiwa.o"
Decompiles z_bg_jya_goroiwa (#307) * Decompiles z_bg_jya_goroiwa * BgJyaGoroiwa_Init * func_808979C0 * BgJyaGoroiwa_Destroy * func_80897970 * func_80897A2C * BgJyaGoroiwa_Draw * func_80897DF0 * func_80897DDC * BgJyaGoroiwa_Update * func_80897B48 * Adds description header to z_bg_jya_goroiwa.c * Addresses PR comments * Addresses PR comments #2 * Addresses PR comments (padding) * PR comments, change paddings to s32 Co-authored-by: i82orbom <i82orbom@github> Co-authored-by: i82orbom <i82orbom i82orbom@github>
2020-08-21 01:53:00 +00:00
include "build/src/overlays/actors/ovl_Bg_Jya_Goroiwa/ovl_Bg_Jya_Goroiwa_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Bg_Jya_Haheniron"
include "build/src/overlays/actors/ovl_Bg_Jya_Haheniron/z_bg_jya_haheniron.o"
z_bg_jya_haheniron OK (#524) * getting things started * all matched, rock solid * deleted assembly, formatted, and cleaned spec * yikes, forgot to hit -d on deleting the asm * Fixed suggestions and some documentation * fixing a few compiler warnings * added suggestions * removing assembly to fix merge issues * Documented function names
2020-12-20 18:03:31 +00:00
include "build/src/overlays/actors/ovl_Bg_Jya_Haheniron/ovl_Bg_Jya_Haheniron_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Bg_Jya_Ironobj"
include "build/src/overlays/actors/ovl_Bg_Jya_Ironobj/z_bg_jya_ironobj.o"
z_bg_jya_ironobj and object_jya_iron OK (#676) * z_bg_jya_ironobj OK * decompile object_jya_iron, clean up code * implement requested changes
2021-02-14 00:10:40 +00:00
include "build/src/overlays/actors/ovl_Bg_Jya_Ironobj/ovl_Bg_Jya_Ironobj_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Bg_Jya_Kanaami"
include "build/src/overlays/actors/ovl_Bg_Jya_Kanaami/z_bg_jya_kanaami.o"
Split ovl_file_choose and ovl_kaleido_scope (#167) * Split ovl_file_choose and ovl_kaleido_scope * Split ovl_kaleido_scope's rodata/data/bss * fix * fix spec * spec fix * hopefully last spec fix * hopefully last spec fix 2 * fix * Add comments on file boundaries * fix
2020-06-07 17:52:43 +00:00
include "build/src/overlays/actors/ovl_Bg_Jya_Kanaami/ovl_Bg_Jya_Kanaami_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Bg_Jya_Lift"
include "build/src/overlays/actors/ovl_Bg_Jya_Lift/z_bg_jya_lift.o"
Decomp BgJyaLift (#216) * Re upload * Decomp BgJyaLift * Fixed issues Fixed issues from review * Edits after review * Review Fixes Made some fixes and also changed an unknown variable name * Fixes to file Fixed some styling things and renamed the last function * Added fixes Added roman's fixes * Delete filemap.pyc * Fixes Removed ctx.c and replaced tabs with spaces spec.
2020-06-24 22:34:31 +00:00
include "build/src/overlays/actors/ovl_Bg_Jya_Lift/ovl_Bg_Jya_Lift_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Bg_Jya_Megami"
include "build/src/overlays/actors/ovl_Bg_Jya_Megami/z_bg_jya_megami.o"
Ovl_Bg_Jya_Megami OK (#284) * merge from upstream * one non-matching in bg_jya_megami * deleted asm files * renamed unk_1D0 * some suggested changes * megami OK, zero non-matchings * deleted old reloc.s * using a define rather than ARRAY_COUNT * suggested changes * some requested changes * Setup -> Init
2020-08-27 22:00:36 +00:00
include "build/src/overlays/actors/ovl_Bg_Jya_Megami/ovl_Bg_Jya_Megami_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Bg_Jya_Zurerukabe"
include "build/src/overlays/actors/ovl_Bg_Jya_Zurerukabe/z_bg_jya_zurerukabe.o"
Decompiled ovl_Bg_Jya_Zurerukabe (#424) * Decompiled ovl_Bg_Jya_Zurerukabe * PR suggestions, cleanup * PR suggestion
2020-09-30 20:09:52 +00:00
include "build/src/overlays/actors/ovl_Bg_Jya_Zurerukabe/ovl_Bg_Jya_Zurerukabe_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Bg_Menkuri_Eye"
include "build/src/overlays/actors/ovl_Bg_Menkuri_Eye/z_bg_menkuri_eye.o"
z_bg_menkuri_eye OK (#374) * z_bg_menkuri_eye OK * Fixed up a few things in Update * Made all requested fixes.
2020-09-14 20:27:23 +00:00
include "build/src/overlays/actors/ovl_Bg_Menkuri_Eye/ovl_Bg_Menkuri_Eye_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Bg_Menkuri_Kaiten"
include "build/src/overlays/actors/ovl_Bg_Menkuri_Kaiten/z_bg_menkuri_kaiten.o"
Split ovl_file_choose and ovl_kaleido_scope (#167) * Split ovl_file_choose and ovl_kaleido_scope * Split ovl_kaleido_scope's rodata/data/bss * fix * fix spec * spec fix * hopefully last spec fix * hopefully last spec fix 2 * fix * Add comments on file boundaries * fix
2020-06-07 17:52:43 +00:00
include "build/src/overlays/actors/ovl_Bg_Menkuri_Kaiten/ovl_Bg_Menkuri_Kaiten_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Bg_Menkuri_Nisekabe"
include "build/src/overlays/actors/ovl_Bg_Menkuri_Nisekabe/z_bg_menkuri_nisekabe.o"
Split ovl_file_choose and ovl_kaleido_scope (#167) * Split ovl_file_choose and ovl_kaleido_scope * Split ovl_kaleido_scope's rodata/data/bss * fix * fix spec * spec fix * hopefully last spec fix * hopefully last spec fix 2 * fix * Add comments on file boundaries * fix
2020-06-07 17:52:43 +00:00
include "build/src/overlays/actors/ovl_Bg_Menkuri_Nisekabe/ovl_Bg_Menkuri_Nisekabe_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Bg_Mizu_Bwall"
include "build/src/overlays/actors/ovl_Bg_Mizu_Bwall/z_bg_mizu_bwall.o"
Bg_Mizu_Bwall (#543) * Darkmeiro decompilation Bg_Gnd_Darkmeiro decompiled, matched, and documented. * give this a shot * fix conflict * one more try * could be useful * whoops * ZAP2 stuff * ZAP why * ZAP again * bwall * cleanup Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
2020-12-29 18:35:01 +00:00
include "build/src/overlays/actors/ovl_Bg_Mizu_Bwall/ovl_Bg_Mizu_Bwall_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Bg_Mizu_Movebg"
include "build/src/overlays/actors/ovl_Bg_Mizu_Movebg/z_bg_mizu_movebg.o"
z_bg_mizu_movebg and object_mizu_objects (#747) * OK a few functions * BgMizuMovebg_Draw OK, make tweaks to bg_mizu_bwall * migrate data * create mizu_objects, defines for water temple water level * clean up some code * implement most suggestions * review * review2 * formatting Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-04-25 23:36:43 +00:00
include "build/src/overlays/actors/ovl_Bg_Mizu_Movebg/ovl_Bg_Mizu_Movebg_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Bg_Mizu_Shutter"
include "build/src/overlays/actors/ovl_Bg_Mizu_Shutter/z_bg_mizu_shutter.o"
Bg_Mizu_Shutter (#487) * Darkmeiro decompilation Bg_Gnd_Darkmeiro decompiled, matched, and documented. * give this a shot * fix conflict * one more try * could be useful * whoops * ZAP2 stuff * ZAP why * ZAP again * gate * done * done * now with names
2020-11-23 12:53:17 +00:00
include "build/src/overlays/actors/ovl_Bg_Mizu_Shutter/ovl_Bg_Mizu_Shutter_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Bg_Mizu_Uzu"
include "build/src/overlays/actors/ovl_Bg_Mizu_Uzu/z_bg_mizu_uzu.o"
Split ovl_file_choose and ovl_kaleido_scope (#167) * Split ovl_file_choose and ovl_kaleido_scope * Split ovl_kaleido_scope's rodata/data/bss * fix * fix spec * spec fix * hopefully last spec fix * hopefully last spec fix 2 * fix * Add comments on file boundaries * fix
2020-06-07 17:52:43 +00:00
include "build/src/overlays/actors/ovl_Bg_Mizu_Uzu/ovl_Bg_Mizu_Uzu_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Bg_Mizu_Water"
include "build/src/overlays/actors/ovl_Bg_Mizu_Water/z_bg_mizu_water.o"
BgMizuWater OK (#359) * BgMizuWater OK * Renaming * Fix formatting * Cleanup, use new gfx functions * Fix stack issue * PR fixes * Apply suggestions from code review Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * PR fixes * More PR fixes * Fix formatting Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-09-27 01:06:30 +00:00
include "build/src/overlays/actors/ovl_Bg_Mizu_Water/ovl_Bg_Mizu_Water_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Bg_Mjin"
include "build/src/overlays/actors/ovl_Bg_Mjin/z_bg_mjin.o"
Split ovl_file_choose and ovl_kaleido_scope (#167) * Split ovl_file_choose and ovl_kaleido_scope * Split ovl_kaleido_scope's rodata/data/bss * fix * fix spec * spec fix * hopefully last spec fix * hopefully last spec fix 2 * fix * Add comments on file boundaries * fix
2020-06-07 17:52:43 +00:00
include "build/src/overlays/actors/ovl_Bg_Mjin/ovl_Bg_Mjin_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Bg_Mori_Bigst"
include "build/src/overlays/actors/ovl_Bg_Mori_Bigst/z_bg_mori_bigst.o"
mori_bigst (#392) * Darkmeiro decompilation Bg_Gnd_Darkmeiro decompiled, matched, and documented. * give this a shot * fix conflict * one more try * mori_bigst matched and documented * forgot the .s files again * Update src/overlays/actors/ovl_Bg_Mori_Bigst/z_bg_mori_bigst.c Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * one .s got away * more cleanup * one more thing * wait for mori tex * cleanup * Update z_bg_mori_bigst.c Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
2020-09-27 01:28:27 +00:00
include "build/src/overlays/actors/ovl_Bg_Mori_Bigst/ovl_Bg_Mori_Bigst_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Bg_Mori_Elevator"
include "build/src/overlays/actors/ovl_Bg_Mori_Elevator/z_bg_mori_elevator.o"
Bg mori elevator one non matching (#293) * BgMoriElevator Progress * Decomp Progress * Progress * Progress * Progress * Progress * Progress * Finish Decomp for MoriElevator * Test * Update spec * Update z_bg_mori_elevator.c * PR fixes * PR fixes * PR fixes * PR fixes * Fixed a non matching * Delete func_808A1800.s * PR fixes * PR fixes * PR fixes * PR fixes * Run Clang-Format * Change PlaceInGround to WaitAfterInit * PR fixes * Change a variable
2020-08-21 01:53:43 +00:00
include "build/src/overlays/actors/ovl_Bg_Mori_Elevator/ovl_Bg_Mori_Elevator_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Bg_Mori_Hashigo"
include "build/src/overlays/actors/ovl_Bg_Mori_Hashigo/z_bg_mori_hashigo.o"
Bg_Mori_Hashigo (#400) * Darkmeiro decompilation Bg_Gnd_Darkmeiro decompiled, matched, and documented. * give this a shot * fix conflict * one more try * All but one * OK * merge and cleanup * wait for mori tex
2020-09-28 05:03:26 +00:00
include "build/src/overlays/actors/ovl_Bg_Mori_Hashigo/ovl_Bg_Mori_Hashigo_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Bg_Mori_Hashira4"
include "build/src/overlays/actors/ovl_Bg_Mori_Hashira4/z_bg_mori_hashira4.o"
Hashira (#384) * Darkmeiro decompilation Bg_Gnd_Darkmeiro decompiled, matched, and documented. * give this a shot * fix conflict * one more try * Hashira4 done * forgot some names * minor cleanup * .gitignore reverted * merge and rename * merge and cleanup * needs a description * dlists * wait for mori tex
2020-09-27 01:10:20 +00:00
include "build/src/overlays/actors/ovl_Bg_Mori_Hashira4/ovl_Bg_Mori_Hashira4_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Bg_Mori_Hineri"
include "build/src/overlays/actors/ovl_Bg_Mori_Hineri/z_bg_mori_hineri.o"
ovl_Bg_Mori_Hineri OK (#279) * bg_mori_hineri OK * added description and removed reloc * made suggested changes from fig * made suggested changes * Named a few functions in ovl_Bg_Mori_Hineri
2020-07-23 10:51:02 +00:00
include "build/src/overlays/actors/ovl_Bg_Mori_Hineri/ovl_Bg_Mori_Hineri_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Bg_Mori_Idomizu"
include "build/src/overlays/actors/ovl_Bg_Mori_Idomizu/z_bg_mori_idomizu.o"
Bg_Mori_Idomizu (#401) * Darkmeiro decompilation Bg_Gnd_Darkmeiro decompiled, matched, and documented. * give this a shot * fix conflict * one more try * matching * merge and cleanup * wait for mori tex * name
2020-09-28 11:11:58 +00:00
include "build/src/overlays/actors/ovl_Bg_Mori_Idomizu/ovl_Bg_Mori_Idomizu_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Bg_Mori_Kaitenkabe"
include "build/src/overlays/actors/ovl_Bg_Mori_Kaitenkabe/z_bg_mori_kaitenkabe.o"
Bg_Mori_Kaitenkabe (#410) * Darkmeiro decompilation Bg_Gnd_Darkmeiro decompiled, matched, and documented. * give this a shot * fix conflict * one more try * spinny wall * cleanup * wait for mori tex * merge and better (?) names
2020-10-04 02:18:41 +00:00
include "build/src/overlays/actors/ovl_Bg_Mori_Kaitenkabe/ovl_Bg_Mori_Kaitenkabe_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Bg_Mori_Rakkatenjo"
include "build/src/overlays/actors/ovl_Bg_Mori_Rakkatenjo/z_bg_mori_rakkatenjo.o"
Rakkatenjo (#419) * Darkmeiro decompilation Bg_Gnd_Darkmeiro decompiled, matched, and documented. * give this a shot * fix conflict * one more try * bonk * static var cleanup * one more rename
2020-10-04 12:58:33 +00:00
include "build/src/overlays/actors/ovl_Bg_Mori_Rakkatenjo/ovl_Bg_Mori_Rakkatenjo_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Bg_Po_Event"
include "build/src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.o"
Po event (#368) * Darkmeiro decompilation Bg_Gnd_Darkmeiro decompiled, matched, and documented. * give this a shot * fix conflict * one more try * and now for poe sister stuff * more matches * awful control flow still needed * complex control is comples * matched and documented * also remove .s * ZAP * .s files never die * more cleaning * a little more cleanup * data cleanup * merge and fix * removing globalCtx2 * dlists * forgot this * now with ColHeader * a little more * one last name change
2020-10-04 12:45:23 +00:00
include "build/src/overlays/actors/ovl_Bg_Po_Event/ovl_Bg_Po_Event_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Bg_Po_Syokudai"
include "build/src/overlays/actors/ovl_Bg_Po_Syokudai/z_bg_po_syokudai.o"
BgPoSyokudai (#382) * BgPoSyokudai: decomp Init() * BgPoSyokudai: decomp Destroy() * BgPoSyokudai: decomp Update() * BgPoSyokudai: decomp Draw() * BgPoSyokudai: remove data.s and reloc.s * BgPoSyokudai: clarify switch flags 1D to 1F * BgPoSyokudai: format following codestyle and remove macros
2020-09-21 07:30:58 +00:00
include "build/src/overlays/actors/ovl_Bg_Po_Syokudai/ovl_Bg_Po_Syokudai_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Bg_Pushbox"
include "build/src/overlays/actors/ovl_Bg_Pushbox/z_bg_pushbox.o"
Split ovl_file_choose and ovl_kaleido_scope (#167) * Split ovl_file_choose and ovl_kaleido_scope * Split ovl_kaleido_scope's rodata/data/bss * fix * fix spec * spec fix * hopefully last spec fix * hopefully last spec fix 2 * fix * Add comments on file boundaries * fix
2020-06-07 17:52:43 +00:00
include "build/src/overlays/actors/ovl_Bg_Pushbox/ovl_Bg_Pushbox_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Bg_Relay_Objects"
include "build/src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.o"
Bg_Relay_Objects OK (#536) * bg_relay_objects OK * Update src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update z_bg_relay_objects.c Co-authored-by: Zelllll <elijah@DESKTOP-NMP1I89.localdomain> Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-12-19 04:46:52 +00:00
include "build/src/overlays/actors/ovl_Bg_Relay_Objects/ovl_Bg_Relay_Objects_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Bg_Spot00_Break"
include "build/src/overlays/actors/ovl_Bg_Spot00_Break/z_bg_spot00_break.o"
Split ovl_file_choose and ovl_kaleido_scope (#167) * Split ovl_file_choose and ovl_kaleido_scope * Split ovl_kaleido_scope's rodata/data/bss * fix * fix spec * spec fix * hopefully last spec fix * hopefully last spec fix 2 * fix * Add comments on file boundaries * fix
2020-06-07 17:52:43 +00:00
include "build/src/overlays/actors/ovl_Bg_Spot00_Break/ovl_Bg_Spot00_Break_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Bg_Spot00_Hanebasi"
include "build/src/overlays/actors/ovl_Bg_Spot00_Hanebasi/z_bg_spot00_hanebasi.o"
Bg_Spot00_Hanebasi (Drawbridge) OK (#614) * drawbridge progress * matched cursed draw functions * drawbridge OK * fix error that made it not OK * documentation improvements * format fix * update with new actor struct * Update src/overlays/actors/ovl_Bg_Spot00_Hanebasi/z_bg_spot00_hanebasi.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update src/overlays/actors/ovl_Bg_Spot00_Hanebasi/z_bg_spot00_hanebasi.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update src/overlays/actors/ovl_Bg_Spot00_Hanebasi/z_bg_spot00_hanebasi.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> Co-authored-by: Zelllll <elijah@DESKTOP-NMP1I89.localdomain> Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2021-01-31 20:09:04 +00:00
include "build/src/overlays/actors/ovl_Bg_Spot00_Hanebasi/ovl_Bg_Spot00_Hanebasi_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Bg_Spot01_Fusya"
include "build/src/overlays/actors/ovl_Bg_Spot01_Fusya/z_bg_spot01_fusya.o"
Split ovl_file_choose and ovl_kaleido_scope (#167) * Split ovl_file_choose and ovl_kaleido_scope * Split ovl_kaleido_scope's rodata/data/bss * fix * fix spec * spec fix * hopefully last spec fix * hopefully last spec fix 2 * fix * Add comments on file boundaries * fix
2020-06-07 17:52:43 +00:00
include "build/src/overlays/actors/ovl_Bg_Spot01_Fusya/ovl_Bg_Spot01_Fusya_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Bg_Spot01_Idohashira"
include "build/src/overlays/actors/ovl_Bg_Spot01_Idohashira/z_bg_spot01_idohashira.o"
Match and improve some non matchings (#254)
2020-07-15 15:23:57 +00:00
include "build/src/overlays/actors/ovl_Bg_Spot01_Idohashira/ovl_Bg_Spot01_Idohashira_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Bg_Spot01_Idomizu"
include "build/src/overlays/actors/ovl_Bg_Spot01_Idomizu/z_bg_spot01_idomizu.o"
Ovl_Bg_Spot01_Idomizu OK (#303) * Init OK (with weird goto) * func_808ABB84 matching * BgSpot01Idomizu_Destroy matching * Run ./format.sh * BgSpot01Idomizu_Update matching * Remove Init's goto * BgSpot01Idomizu_Draw matching * Delete BgSpot01Idomizu asm files * Variable naming and cleanup * Update spec * Delete unused ASM * Address review feedback * Fix fake match in Draw caused by not doing dispRefs[4]
2020-08-14 04:17:25 +00:00
include "build/src/overlays/actors/ovl_Bg_Spot01_Idomizu/ovl_Bg_Spot01_Idomizu_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Bg_Spot01_Idosoko"
include "build/src/overlays/actors/ovl_Bg_Spot01_Idosoko/z_bg_spot01_idosoko.o"
Split ovl_file_choose and ovl_kaleido_scope (#167) * Split ovl_file_choose and ovl_kaleido_scope * Split ovl_kaleido_scope's rodata/data/bss * fix * fix spec * spec fix * hopefully last spec fix * hopefully last spec fix 2 * fix * Add comments on file boundaries * fix
2020-06-07 17:52:43 +00:00
include "build/src/overlays/actors/ovl_Bg_Spot01_Idosoko/ovl_Bg_Spot01_Idosoko_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Bg_Spot01_Objects2"
include "build/src/overlays/actors/ovl_Bg_Spot01_Objects2/z_bg_spot01_objects2.o"
Decompiles z_bg_spot01_objects2.c (#357) * Starts z_bg_spot01_objects2 * z_bg_spot01_objects2.c almost finished * Finishes z_bg_spot01_objects2.c * Removes unused asm * PR comments and rebased to master * Addresses PR comments #2 Co-authored-by: i82orbom <i82orbom i82orbom@github> Co-authored-by: i82orbom <i82orbom@github.com>
2020-09-04 22:28:45 +00:00
include "build/src/overlays/actors/ovl_Bg_Spot01_Objects2/ovl_Bg_Spot01_Objects2_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Bg_Spot02_Objects"
include "build/src/overlays/actors/ovl_Bg_Spot02_Objects/z_bg_spot02_objects.o"
Graveyard objects: bg_spot02_objects (#751) * BgSpot02Objects 4 non-matching * Bg_Spot02 3 non-matching but all down to regalloc * finish file * spec * asm * rename var * rename func * review Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-04-03 22:32:23 +00:00
include "build/src/overlays/actors/ovl_Bg_Spot02_Objects/ovl_Bg_Spot02_Objects_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Bg_Spot03_Taki"
include "build/src/overlays/actors/ovl_Bg_Spot03_Taki/z_bg_spot03_taki.o"
BgSpot03Taki (#414) * Migrate data, fix header, add undefined symbol, decompile Init function * Decompiled Destroy function * Decompiled func_808ADEF0 and adjusted struct some * Decompiled Update function * Fixed sInitChain stuff * Preliminary Draw function decompilation * Replaced code with OPEN_DISPS and CLOSE_DISPS and some hex with decimal * Working on Draw function still * More permuter test stuff * Got Draw matching except for one little TwoTex issue * Added NON_MATCHING * Removed false alarm * Got most of the functions decompiled; 1 non-matching, 1 not started * Ran format.sh on file * These two symbols should be arrays * Got func_808ADAE0 mostly decompiled * Got func_808ADAE0 fully decompiled! * Removed necessary files (except _Draw) * Successfully decompiled Draw function * Decompiled Draw function + Added proper includes to spec * Removed Draw function assembly * Moved func_800F46E0 prototype to functions.h * Renamed unk_174 to bufferIndex * Replaced state constants with enum * Renamed func_808ADAE0 to BgSpot03Taki_ApplyOpeningAlpha * Renamed func_808ADAE0 to BgSpot03Taki_ApplyOpeningAlpha * Made changes as per pull request comments Co-authored-by: fig02 <fig02srl@gmail.com>
2020-10-04 14:14:28 +00:00
include "build/src/overlays/actors/ovl_Bg_Spot03_Taki/ovl_Bg_Spot03_Taki_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Bg_Spot05_Soko"
include "build/src/overlays/actors/ovl_Bg_Spot05_Soko/z_bg_spot05_soko.o"
Split ovl_file_choose and ovl_kaleido_scope (#167) * Split ovl_file_choose and ovl_kaleido_scope * Split ovl_kaleido_scope's rodata/data/bss * fix * fix spec * spec fix * hopefully last spec fix * hopefully last spec fix 2 * fix * Add comments on file boundaries * fix
2020-06-07 17:52:43 +00:00
include "build/src/overlays/actors/ovl_Bg_Spot05_Soko/ovl_Bg_Spot05_Soko_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Bg_Spot06_Objects"
include "build/src/overlays/actors/ovl_Bg_Spot06_Objects/z_bg_spot06_objects.o"
Bg_Spot06_Objects OK and documented (#605) * stuck on init * init matches * more functions matched * just a few functions left * three functions left * all finished * fix compiler error * various improvements * add actor description * remove unused asm * fix remaining dyna things * Update src/overlays/actors/ovl_Bg_Spot06_Objects/z_bg_spot06_objects.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update src/overlays/actors/ovl_Bg_Spot06_Objects/z_bg_spot06_objects.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * fixed all of roman's comments * format c files Co-authored-by: Zelllll <elijah@DESKTOP-NMP1I89.localdomain> Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2021-01-23 00:55:38 +00:00
include "build/src/overlays/actors/ovl_Bg_Spot06_Objects/ovl_Bg_Spot06_Objects_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Bg_Spot07_Taki"
include "build/src/overlays/actors/ovl_Bg_Spot07_Taki/z_bg_spot07_taki.o"
z_ovl_bg_spot07_taki OK (#766) * z_bg_spot07_taki OK * clean up code * implement pr suggestions * thisx fix
2021-04-12 01:33:29 +00:00
include "build/src/overlays/actors/ovl_Bg_Spot07_Taki/ovl_Bg_Spot07_Taki_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Bg_Spot08_Bakudankabe"
include "build/src/overlays/actors/ovl_Bg_Spot08_Bakudankabe/z_bg_spot08_bakudankabe.o"
Decompiles z_bg_spot08_bakudankabe.c (#348) * func_808B02D0 * BgSpot08Bakudankabe_Init * BgSpot08Bakudankabe_Destroy * BgSpot08Bakudankabe_Update * Finishes z_bg_spot08_bakudankabe * Update src/overlays/actors/ovl_Bg_Spot08_Bakudankabe/z_bg_spot08_bakudankabe.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update src/overlays/actors/ovl_Bg_Spot08_Bakudankabe/z_bg_spot08_bakudankabe.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> Co-authored-by: i82orbom <i82orbom i82orbom@github> Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-08-27 19:25:22 +00:00
include "build/src/overlays/actors/ovl_Bg_Spot08_Bakudankabe/ovl_Bg_Spot08_Bakudankabe_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Bg_Spot08_Iceblock"
include "build/src/overlays/actors/ovl_Bg_Spot08_Iceblock/z_bg_spot08_iceblock.o"
BgSpot08Iceblock OK, some documentation (#641) * OK, spec * all functions and variables named, some docs on the complicated function * delete asm * updated to reflect Actor changes * simplify one thing into a ternary * Address review comments
2021-02-02 22:28:29 +00:00
include "build/src/overlays/actors/ovl_Bg_Spot08_Iceblock/ovl_Bg_Spot08_Iceblock_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Bg_Spot09_Obj"
include "build/src/overlays/actors/ovl_Bg_Spot09_Obj/z_bg_spot09_obj.o"
Split ovl_file_choose and ovl_kaleido_scope (#167) * Split ovl_file_choose and ovl_kaleido_scope * Split ovl_kaleido_scope's rodata/data/bss * fix * fix spec * spec fix * hopefully last spec fix * hopefully last spec fix 2 * fix * Add comments on file boundaries * fix
2020-06-07 17:52:43 +00:00
include "build/src/overlays/actors/ovl_Bg_Spot09_Obj/ovl_Bg_Spot09_Obj_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Bg_Spot11_Bakudankabe"
include "build/src/overlays/actors/ovl_Bg_Spot11_Bakudankabe/z_bg_spot11_bakudankabe.o"
Decompiles z_bg_spot11_bakudankabe.c (#355) * Starts z_bg_spot11_bakudankabe * BgSpot11Bakudankabe_Init * BgSpot11Bakudankabe_Destroy * BgSpot11Bakudankabe_Update * BgSpot11Bakudankabe_Draw * func_808B2180 * func_808B2218 WIP * Finishes z_bg_spot11_bakudankabe.c * Removes forward declared function * Addresses PR comments Co-authored-by: i82orbom <i82orbom i82orbom@github>
2020-08-29 01:14:20 +00:00
include "build/src/overlays/actors/ovl_Bg_Spot11_Bakudankabe/ovl_Bg_Spot11_Bakudankabe_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Bg_Spot11_Oasis"
include "build/src/overlays/actors/ovl_Bg_Spot11_Oasis/z_bg_spot11_oasis.o"
ovl_bg_spot11_oasis OK (#454) * Decompiled ovl_bg_spot11_oasis * Forgot to rename the init chain * Renamed draw function, corrected include statments, corrected the waterbox pointer assignment, removed early return, removed unnecessary cast * Forgot to add a newline
2020-10-27 00:23:34 +00:00
include "build/src/overlays/actors/ovl_Bg_Spot11_Oasis/ovl_Bg_Spot11_Oasis_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Bg_Spot12_Gate"
include "build/src/overlays/actors/ovl_Bg_Spot12_Gate/z_bg_spot12_gate.o"
Split ovl_file_choose and ovl_kaleido_scope (#167) * Split ovl_file_choose and ovl_kaleido_scope * Split ovl_kaleido_scope's rodata/data/bss * fix * fix spec * spec fix * hopefully last spec fix * hopefully last spec fix 2 * fix * Add comments on file boundaries * fix
2020-06-07 17:52:43 +00:00
include "build/src/overlays/actors/ovl_Bg_Spot12_Gate/ovl_Bg_Spot12_Gate_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Bg_Spot12_Saku"
include "build/src/overlays/actors/ovl_Bg_Spot12_Saku/z_bg_spot12_saku.o"
Split ovl_file_choose and ovl_kaleido_scope (#167) * Split ovl_file_choose and ovl_kaleido_scope * Split ovl_kaleido_scope's rodata/data/bss * fix * fix spec * spec fix * hopefully last spec fix * hopefully last spec fix 2 * fix * Add comments on file boundaries * fix
2020-06-07 17:52:43 +00:00
include "build/src/overlays/actors/ovl_Bg_Spot12_Saku/ovl_Bg_Spot12_Saku_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Bg_Spot15_Rrbox"
include "build/src/overlays/actors/ovl_Bg_Spot15_Rrbox/z_bg_spot15_rrbox.o"
z_bg_spot15_rrbox OK (#375) * Initial work on spot15_rrbox * Few functions done with OK * Added destroy function * Fixed up struct, made actionFunc and completed more functions * Another function * Another function * Another function * Another function * Another function * Another function * Another function * Another function * Another function * Another function * Another function * Another function * File entirely working * Replaced padding with better variables * Replaced more padding * Ran format script and some other minor layout changes * Removed assembly files * Made update function consistent with other base functions * Renamed variable * Removed data file * Updated reloc location in spec * Removed old reloc file * Made init chain static * Minor fixes * Fixed various minor issues * More minor cleanup * Even more minor cleanup * Minor cleanup * More minor cleanup * Minor fix * Fixed up more variable names * Apply suggestions from code review Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * More cleanup Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
2020-09-27 00:06:26 +00:00
include "build/src/overlays/actors/ovl_Bg_Spot15_Rrbox/ovl_Bg_Spot15_Rrbox_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Bg_Spot15_Saku"
include "build/src/overlays/actors/ovl_Bg_Spot15_Saku/z_bg_spot15_saku.o"
Fix a couple of actors to use auto generated reloc (#547) * FIX RELOC * Update spec * Delete z_bg_spot15_saku.reloc.s * Add endseg back Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com> Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com>
2020-12-19 16:16:34 +00:00
include "build/src/overlays/actors/ovl_Bg_Spot15_Saku/ovl_Bg_Spot15_Saku_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Bg_Spot16_Bombstone"
include "build/src/overlays/actors/ovl_Bg_Spot16_Bombstone/z_bg_spot16_bombstone.o"
Bg_Spot16_Bombstone (#405) * First working function * Syncing up * Not OK - something wrong with data elements * Not OK - syncing files * OK now. Fixed data issue * Not OK - data issue * Not OK - syncing files * OK - added another function and commented out init for now * OK - another function * Not OK - working on function * OK - Added working functions back * OK - another function * Not OK - syncing files * Not OK - updating undefined syms * OK - Draw function * Not OK - slightly closer on 5950 * OK - another function * OK - another function * OK - another function * OK - another function * OK - finally fixed init * Lots of cleanup and renaming * Removed data files * Minor cleanup * Removed commented out line * Minor cleanup * More minor cleanup * More minor cleanup * More cleanup * Removed unneeded dereferences * Minor cleanup * Minor cleanup * More cleanup * Update src/overlays/actors/ovl_Bg_Spot16_Bombstone/z_bg_spot16_bombstone.c Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * More cleanup * More cleanup * Removed structs * Minor cleanup * Apply suggestions from code review Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Changed EnBombf to Actor Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-09-27 01:26:21 +00:00
include "build/src/overlays/actors/ovl_Bg_Spot16_Bombstone/ovl_Bg_Spot16_Bombstone_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Bg_Spot16_Doughnut"
include "build/src/overlays/actors/ovl_Bg_Spot16_Doughnut/z_bg_spot16_doughnut.o"
Split ovl_file_choose and ovl_kaleido_scope (#167) * Split ovl_file_choose and ovl_kaleido_scope * Split ovl_kaleido_scope's rodata/data/bss * fix * fix spec * spec fix * hopefully last spec fix * hopefully last spec fix 2 * fix * Add comments on file boundaries * fix
2020-06-07 17:52:43 +00:00
include "build/src/overlays/actors/ovl_Bg_Spot16_Doughnut/ovl_Bg_Spot16_Doughnut_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Bg_Spot17_Bakudankabe"
include "build/src/overlays/actors/ovl_Bg_Spot17_Bakudankabe/z_bg_spot17_bakudankabe.o"
Decompiles z_bg_spot17_bakudankabe.c (#347) * Decompiles z_bg_spot17_bakudankabe.c * More progress, BgSpot17Bakudankabe_Draw * * func_808B6BC0 start * Some progress *func_808B6BC0 * func_808B6BC0 almost there * Cleanup and finished z_bg_spot17_bakudankabe.c * Addresses PR comments * Adds description to z_bg_spot17_bakudankabe * Renames some variables Co-authored-by: i82orbom <i82orbom i82orbom@github>
2020-08-27 19:41:18 +00:00
include "build/src/overlays/actors/ovl_Bg_Spot17_Bakudankabe/ovl_Bg_Spot17_Bakudankabe_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Bg_Spot17_Funen"
include "build/src/overlays/actors/ovl_Bg_Spot17_Funen/z_bg_spot17_funen.o"
Split ovl_file_choose and ovl_kaleido_scope (#167) * Split ovl_file_choose and ovl_kaleido_scope * Split ovl_kaleido_scope's rodata/data/bss * fix * fix spec * spec fix * hopefully last spec fix * hopefully last spec fix 2 * fix * Add comments on file boundaries * fix
2020-06-07 17:52:43 +00:00
include "build/src/overlays/actors/ovl_Bg_Spot17_Funen/ovl_Bg_Spot17_Funen_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Bg_Spot18_Basket"
include "build/src/overlays/actors/ovl_Bg_Spot18_Basket/z_bg_spot18_basket.o"
z_bg_spot18_basket (#417) * OK - data transferred and two functions done * Not OK * Not OK * OK - several more functions * OK - another function * OK - 2 more functions * OK - another function * OK - one function lefet * Cleaned up file and removed ASM files * Removed unneeded forward declaration * Some cleanup * More cleanup * Minor cleanup * Minor cleanup * Minor cleanup * Addressed a few issues * Changed include statement format * Changed numbers to hex * Changed another number to hex
2020-11-22 11:05:35 +00:00
include "build/src/overlays/actors/ovl_Bg_Spot18_Basket/ovl_Bg_Spot18_Basket_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Bg_Spot18_Futa"
include "build/src/overlays/actors/ovl_Bg_Spot18_Futa/z_bg_spot18_futa.o"
Split ovl_file_choose and ovl_kaleido_scope (#167) * Split ovl_file_choose and ovl_kaleido_scope * Split ovl_kaleido_scope's rodata/data/bss * fix * fix spec * spec fix * hopefully last spec fix * hopefully last spec fix 2 * fix * Add comments on file boundaries * fix
2020-06-07 17:52:43 +00:00
include "build/src/overlays/actors/ovl_Bg_Spot18_Futa/ovl_Bg_Spot18_Futa_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Bg_Spot18_Obj"
include "build/src/overlays/actors/ovl_Bg_Spot18_Obj/z_bg_spot18_obj.o"
Decompiled ovl_Bg_Spot18_Obj (#204) * Decompiled ovl_Bg_Spot18_Obj * quick fix * Added description to c file * Update z_bg_spot18_obj.c * PR suggestions * PR suggestion
2020-06-17 12:02:28 +00:00
include "build/src/overlays/actors/ovl_Bg_Spot18_Obj/ovl_Bg_Spot18_Obj_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Bg_Spot18_Shutter"
include "build/src/overlays/actors/ovl_Bg_Spot18_Shutter/z_bg_spot18_shutter.o"
Decompiled ovl_Bg_Spot18_Shutter (#395) * Decompiled ovl_Bg_Spot18_Shutter * formatting * PR fix
2020-09-20 16:14:32 +00:00
include "build/src/overlays/actors/ovl_Bg_Spot18_Shutter/ovl_Bg_Spot18_Shutter_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Bg_Sst_Floor"
include "build/src/overlays/actors/ovl_Bg_Sst_Floor/z_bg_sst_floor.o"
Bongo Bongo (ovl_Boss_Sst) (#458) * First pass * Darkmeiro decompilation Bg_Gnd_Darkmeiro decompiled, matched, and documented. * give this a shot * fix conflict * one more try * more matching fun * fun with bongo * clean this up later * found the matching versions * diff.py has escaped? * now with more docs * Now with floor and more docs * one more thing * incremental progress * It's Bongo time * one little thing * merge ZAP * update * camera * gfx now in their own file * now with more object decomp * name animations * now shiftable * missed some. also DECR * opd merge * start xml * now with xml asset extraction * format * cleanup * removed union Co-authored-by: Kelebek1 <eeeedddccc@hotmail.co.uk> Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
2021-04-05 23:08:45 +00:00
include "build/src/overlays/actors/ovl_Bg_Sst_Floor/ovl_Bg_Sst_Floor_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Bg_Toki_Hikari"
include "build/src/overlays/actors/ovl_Bg_Toki_Hikari/z_bg_toki_hikari.o"
Bg_toki_hikari all functions matching (#781) * starting toki_hikari * func_808BA018 matched and some work on other func * init and draw matched, one to go * matched final function, removed ASM, updated spec * adding suggested changes
2021-04-17 16:21:43 +00:00
include "build/src/overlays/actors/ovl_Bg_Toki_Hikari/ovl_Bg_Toki_Hikari_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Bg_Toki_Swd"
Disassemble more cutscenes (#241) * Add cutscene disassembler script * Add more debug info * Use addresses instead of already disassembled data, emit array declaration * Disassemble more cutscene data, fix csdis bug where BGM commands would output too many args * Fix similar bug for LIGHTING command, fix line ending from previous commit * Remove CS_PAD * Update ZAP2 * Disassemble ovl_Demo_Sa cutscene data
2020-07-12 15:38:38 +00:00
include "build/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd_cutscene_data_1.o"
include "build/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd_cutscene_data_2.o"
include "build/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd_cutscene_data_3.o"
First proper commit.
2020-03-17 04:31:30 +00:00
include "build/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.o"
Split ovl_file_choose and ovl_kaleido_scope (#167) * Split ovl_file_choose and ovl_kaleido_scope * Split ovl_kaleido_scope's rodata/data/bss * fix * fix spec * spec fix * hopefully last spec fix * hopefully last spec fix 2 * fix * Add comments on file boundaries * fix
2020-06-07 17:52:43 +00:00
include "build/src/overlays/actors/ovl_Bg_Toki_Swd/ovl_Bg_Toki_Swd_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Bg_Treemouth"
Move to the spec the cutscenes of Bg_Treemough and En_Zl1 (#915) * link cutscenes of Bg_Treemough and En_Zl1 * move unused data Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-08-22 16:18:49 +00:00
include "build/src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth_cutscene_data.o"
First proper commit.
2020-03-17 04:31:30 +00:00
include "build/src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth.o"
Split ovl_file_choose and ovl_kaleido_scope (#167) * Split ovl_file_choose and ovl_kaleido_scope * Split ovl_kaleido_scope's rodata/data/bss * fix * fix spec * spec fix * hopefully last spec fix * hopefully last spec fix 2 * fix * Add comments on file boundaries * fix
2020-06-07 17:52:43 +00:00
include "build/src/overlays/actors/ovl_Bg_Treemouth/ovl_Bg_Treemouth_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Bg_Umajump"
include "build/src/overlays/actors/ovl_Bg_Umajump/z_bg_umajump.o"
Split ovl_file_choose and ovl_kaleido_scope (#167) * Split ovl_file_choose and ovl_kaleido_scope * Split ovl_kaleido_scope's rodata/data/bss * fix * fix spec * spec fix * hopefully last spec fix * hopefully last spec fix 2 * fix * Add comments on file boundaries * fix
2020-06-07 17:52:43 +00:00
include "build/src/overlays/actors/ovl_Bg_Umajump/ovl_Bg_Umajump_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Bg_Vb_Sima"
include "build/src/overlays/actors/ovl_Bg_Vb_Sima/z_bg_vb_sima.o"
Volvagia (ovl_Boss_Fd) and related actors (#352) * Darkmeiro decompilation Bg_Gnd_Darkmeiro decompiled, matched, and documented. * Lots of functions matched. Some big ones are close. * Five left unmatched, one close. * Merged data and decompiled the giant function into something readable. Its branch structure has yet to be matched. * Three unmatched, one essentially matched, the rest matched. * More fixes. * Documented more of the structure and cleaned up a bit. * BossFd2, BgVbSima, and EnVbBall matched and documented * Also removed unneeded .s files * And need to name EnVbBall's functions * give this a shot * fix conflict * one more try * removing darkmeiro changes * and again * now OK from make clean * minor cleanup * One more matching function for BossFd * which means it doesn't need its .s * splitting * splitting * splitting * forgot some .s * fancy new names * fancy new names * trying again * sneaky .s files * sound effects and some hex to decimal conversions * Sound effects and static variable cleanup * format.sh and clean up static variables * sfx and formatting * ZAP and cleanup * small cleanup * cleanup and ZAP * ZAP * looking at the giant function again * looking at the giant function again * Only the big function left. * Those .s files aren't mine, officer * float literals might be fixed. regalloc still a nightmare * almost done with the big function * should make now * not much of a change * all functions match. rodata somehow doesn't. * forgot some things * lots of cleanup * and a little more * small error * large cleanup. Also BossFd has function names and inlined variable declarations * still more cleanup * the quest for 0.1f continues * forgot to put NON_MATCHING back in * Data structures fully documented. Still more cleanup. * DECR now works with BossFd2 * should match now * cleanup * small cleanup * cleanup and names * tiny thing * particles and headers and stuff * now with more enums * merge * test * end test * update * cleanup * object 2 * object 1 * doc object_fd2 * git subrepo pull --force tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "6f874af4a" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "6f874af4a" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * formatting * .s * merge actor * vertex arrays * a little more * formatting * merge opd * fixed damage check * cleanup * fixes * effect struct * review Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain> Co-authored-by: fig02 <fig02srl@gmail.com>
2021-04-17 17:12:46 +00:00
include "build/src/overlays/actors/ovl_Bg_Vb_Sima/ovl_Bg_Vb_Sima_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Bg_Ydan_Hasi"
include "build/src/overlays/actors/ovl_Bg_Ydan_Hasi/z_bg_ydan_hasi.o"
Decomp BgYdanHasi (#263) * Decomp BgYdanHasi * PR fixes. * More PR fixes * FIx issue with missing Extern
2020-07-19 03:06:26 +00:00
include "build/src/overlays/actors/ovl_Bg_Ydan_Hasi/ovl_Bg_Ydan_Hasi_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Bg_Ydan_Maruta"
include "build/src/overlays/actors/ovl_Bg_Ydan_Maruta/z_bg_ydan_maruta.o"
Decomp BgYdanMaruta (#338) * Fix * fix * Fixed upstream * PR fixes * PR fixes * Fix ZAP2. Hopefully
2020-08-23 10:44:22 +00:00
include "build/src/overlays/actors/ovl_Bg_Ydan_Maruta/ovl_Bg_Ydan_Maruta_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Bg_Ydan_Sp"
include "build/src/overlays/actors/ovl_Bg_Ydan_Sp/z_bg_ydan_sp.o"
bg_ydan_sp OK (#628) * BgYdanSp OK * clean up for PR * fix thisx, run format.sh * delete unused asm * implement roman's changes * unnecessary comments
2021-02-01 19:56:33 +00:00
include "build/src/overlays/actors/ovl_Bg_Ydan_Sp/ovl_Bg_Ydan_Sp_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Bg_Zg"
include "build/src/overlays/actors/ovl_Bg_Zg/z_bg_zg.o"
Split ovl_file_choose and ovl_kaleido_scope (#167) * Split ovl_file_choose and ovl_kaleido_scope * Split ovl_kaleido_scope's rodata/data/bss * fix * fix spec * spec fix * hopefully last spec fix * hopefully last spec fix 2 * fix * Add comments on file boundaries * fix
2020-06-07 17:52:43 +00:00
include "build/src/overlays/actors/ovl_Bg_Zg/ovl_Bg_Zg_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Boss_Dodongo"
include "build/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.o"
Decompile King Dodongo and his fire effect (#744) * Fixed upstream * move .data * match init * mathc func_808C1D00 * match func_808C32F4, func_808C2B38, func_808C3224, func_808C2AB0 * match func_808C30F4, func_808C2A40, func_808C3704, func_808C3704 * func_808C18B0 * match another chain of functions * Match func_808C29B0, Draw, and most of OverrideLimbDraw * start update * Really close * Almost match update, match Override Limb Draw * start the big switch * Make a little progress on the big switch function * Test * chip away at the big one some more * test * progress * More progress * Add * Finished another chain of functions * Decomp effect functions * Get the whole file in C * Move data to its own C file * Start the effect file en_bdfire.c * Messed up expected * Finish EnBdfire.c * A little clean up * done as far as I can get it * Delete scenes directory * Delete graphs directory * Delete graphovl.py * match and such * Delete BossDodongo_Update.s * PR fixes * restore old IDO * Color Filter * PR fixes (Roman) * Fixed added assets * remove asm * PR fixes (Roman) * quick format change * remove unwanted files Co-authored-by: Louis <5883445+louist103@users.noreply.github.com> Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain> Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-04-11 16:38:22 +00:00
include "build/src/overlays/actors/ovl_Boss_Dodongo/ovl_Boss_Dodongo_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Boss_Fd"
include "build/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.o"
Volvagia (ovl_Boss_Fd) and related actors (#352) * Darkmeiro decompilation Bg_Gnd_Darkmeiro decompiled, matched, and documented. * Lots of functions matched. Some big ones are close. * Five left unmatched, one close. * Merged data and decompiled the giant function into something readable. Its branch structure has yet to be matched. * Three unmatched, one essentially matched, the rest matched. * More fixes. * Documented more of the structure and cleaned up a bit. * BossFd2, BgVbSima, and EnVbBall matched and documented * Also removed unneeded .s files * And need to name EnVbBall's functions * give this a shot * fix conflict * one more try * removing darkmeiro changes * and again * now OK from make clean * minor cleanup * One more matching function for BossFd * which means it doesn't need its .s * splitting * splitting * splitting * forgot some .s * fancy new names * fancy new names * trying again * sneaky .s files * sound effects and some hex to decimal conversions * Sound effects and static variable cleanup * format.sh and clean up static variables * sfx and formatting * ZAP and cleanup * small cleanup * cleanup and ZAP * ZAP * looking at the giant function again * looking at the giant function again * Only the big function left. * Those .s files aren't mine, officer * float literals might be fixed. regalloc still a nightmare * almost done with the big function * should make now * not much of a change * all functions match. rodata somehow doesn't. * forgot some things * lots of cleanup * and a little more * small error * large cleanup. Also BossFd has function names and inlined variable declarations * still more cleanup * the quest for 0.1f continues * forgot to put NON_MATCHING back in * Data structures fully documented. Still more cleanup. * DECR now works with BossFd2 * should match now * cleanup * small cleanup * cleanup and names * tiny thing * particles and headers and stuff * now with more enums * merge * test * end test * update * cleanup * object 2 * object 1 * doc object_fd2 * git subrepo pull --force tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "6f874af4a" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "6f874af4a" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * formatting * .s * merge actor * vertex arrays * a little more * formatting * merge opd * fixed damage check * cleanup * fixes * effect struct * review Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain> Co-authored-by: fig02 <fig02srl@gmail.com>
2021-04-17 17:12:46 +00:00
include "build/src/overlays/actors/ovl_Boss_Fd/ovl_Boss_Fd_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Boss_Fd2"
include "build/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2.o"
Volvagia (ovl_Boss_Fd) and related actors (#352) * Darkmeiro decompilation Bg_Gnd_Darkmeiro decompiled, matched, and documented. * Lots of functions matched. Some big ones are close. * Five left unmatched, one close. * Merged data and decompiled the giant function into something readable. Its branch structure has yet to be matched. * Three unmatched, one essentially matched, the rest matched. * More fixes. * Documented more of the structure and cleaned up a bit. * BossFd2, BgVbSima, and EnVbBall matched and documented * Also removed unneeded .s files * And need to name EnVbBall's functions * give this a shot * fix conflict * one more try * removing darkmeiro changes * and again * now OK from make clean * minor cleanup * One more matching function for BossFd * which means it doesn't need its .s * splitting * splitting * splitting * forgot some .s * fancy new names * fancy new names * trying again * sneaky .s files * sound effects and some hex to decimal conversions * Sound effects and static variable cleanup * format.sh and clean up static variables * sfx and formatting * ZAP and cleanup * small cleanup * cleanup and ZAP * ZAP * looking at the giant function again * looking at the giant function again * Only the big function left. * Those .s files aren't mine, officer * float literals might be fixed. regalloc still a nightmare * almost done with the big function * should make now * not much of a change * all functions match. rodata somehow doesn't. * forgot some things * lots of cleanup * and a little more * small error * large cleanup. Also BossFd has function names and inlined variable declarations * still more cleanup * the quest for 0.1f continues * forgot to put NON_MATCHING back in * Data structures fully documented. Still more cleanup. * DECR now works with BossFd2 * should match now * cleanup * small cleanup * cleanup and names * tiny thing * particles and headers and stuff * now with more enums * merge * test * end test * update * cleanup * object 2 * object 1 * doc object_fd2 * git subrepo pull --force tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "6f874af4a" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "6f874af4a" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * formatting * .s * merge actor * vertex arrays * a little more * formatting * merge opd * fixed damage check * cleanup * fixes * effect struct * review Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain> Co-authored-by: fig02 <fig02srl@gmail.com>
2021-04-17 17:12:46 +00:00
include "build/src/overlays/actors/ovl_Boss_Fd2/ovl_Boss_Fd2_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Boss_Ganon"
include "build/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.o"
boss_ganon (Ganondorf) OK (#1037) * data migrated and OK * some functions ported * everything ported and updated * merge message * plenty of functions matched * remove unwanted file * 5 more, progress on update * update matched * fix proto * fix * func_808E06FC * asm * 2 left * 1 more * last function inital decomp * Dbg MQ OK * docs progress * revert limb stuff * some more docs * docs progress * more docs * done with docs for now i think * revert unwanted change * some symbols * anime2 * format * small changes * some more changes * merge master and fix matrices * reviews 1 and 2 * remove continue * review 3 and 4 * un-name bodyPartsPos for now
2021-12-02 22:31:39 +00:00
include "build/src/overlays/actors/ovl_Boss_Ganon/ovl_Boss_Ganon_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Boss_Ganon2"
include "build/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.o"
ovl_Boss_Ganon2 (2 nonmatching) (#874) * Match a few * Remove cast * BossGanon2_Destroy * Some struct layout * Missed one * Work on BossGanon2_Update * Oops missed another * Work on update more * Get it to compile * Work a bit on update * func_808FD27C * Cleanup a bit * Fix incompatible pointer type * Work more on update * Multiply * Fix janky cast regalloc * Remove some casts * Move switch case to right spot * Tiny regalloc * Fix stack * Try to fix jump table * Migrate bss * Make data match * Fix minor formatting * Another minor formatting * Replace hex with symbols * Do display lists * Vertices * jnt items init * Split gfx into separate file * func_808FCF40 * func_808FCF5C * func_808FD080 * func_808FD4D4 * func_808FF898 * func_808FFA24 * func_808FFAC8 * func_808FFBBC * func_808FFC84 * use unk_313 as a bool * func_808FFCFC * func_808FFDB0 * Add commented static * func_808FFEBC * func_808FFFE0 * func_809000A0 * Remove useless cast in func_809000A0 * Remove useless temp * Fix wrong branch * BossGanon2_Update * Fix implicit function declarations * Type D_8090EB2C to zelda pointer * Reorder include because why not * Deduplicate undefined syms * Add more to struct * Work on func_808FD5F4 * Major work on func_808FD5F4 * Get func_808FD5F4 to compile * Make unk_398 unsigned * Work on func_808FD5F4 * Progress * func_808FD210 * BossGanon2_Draw * Make it compile * Fix compiler warnings * Fix branches func_808FD5F4 * re-nonmatching func_808FD5F4 * stuff * fix math functions * clang format * more progress * Replace bit stuff with type * Merge master * Add possibly janky things and fix while loop * Why does this help * Chained assignment * Remove dubious thing * Reorder thing * Add possibly fake notices * Use true and false * Make func_808FD5F4 equivalent * Massage stack a little * func_80906AB0 * Correct texture params * Whitespace is good * Use decimal line numbers * func_809069F8 * Work on func_809060E8 * Make funny loop less funny * Float stuff * Remove useless cast * Merge upstream * Fix compiler error in nonmatchings * func_809060E8 * Change tex alloc to be full integer * Add unk_234 * Correct size of unk_2F4 * Make textures u64[] * Type textures to u64[] * func_80905DA8 * func_80905674 * Replace some pi * BossGanon2_PostLimbDraw2 * func_8090523C * func_80904FC8 * func_80904D88 * BossGanon2_PostLimbDraw * BossGanon2_OverrideLimbDraw * func_8090464C * func_80903F38 * Match func_80900890 * Move func_80906538 prototype * Work on func_80902348 * Match func_80902348 * Add fake warning to array thing * Work on func_8090120C * Remove useless var from func_8090120C * Work more on func_8090120C * Move case probably into place func_8090120C * Work on func_8090120C until 4914 * Add break to switch * Pass player to startPlayerCutscene * Work more on func_8090120C * Work on func_80902524 * Move function prototype * Match func_80902524 * Clean up sfx ids in func_808FD5F4 * Correct SFX_FLAG in func_8090120C * Match func_8090120C * Match func_80904340 * Change tex to u8[] * Cleanup func_808FD5F4 a bit * Clean up another inequality func_808FD5F4 * Match func_80904108 * Cleanup for PR * Cleanup for PR part 2 * Cleanup data a bit and start on func_80906538 * Basically match func_80906538 * Match func_80906538 * Rename tex to shadowTexture * Work on func_809034E4 a bit * replace 255 with 0xFF for texture * Correct NON_MATCHING guard * Make func_809034E4 equivalent and not ugly! * Reuse i in func_809034E4 * Minor cleanup in func_809034E4 * Remove unused asm * Static all the data * Switch to using assets xml for overlay graphics :) * Remove now unused undefined syms * Rename pad to D_809071FC * Some cleanup * Cleanup and name more stuff * Name BossGanon2_DrawShadowTexture * Rename to sZelda * Correct array in func_809034E4.s * Start using proper symbols for assets * Add morre undefined syms comments * Cleanup a bit * Cleanup a bit more * Use THIS in limb functions * Update comments * Use define for actor id * Remove unnecessary padding in struct * Rename rand_float to randFloat * Update src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Various minor suggestions * Replace shadowTexture with void* wherever possible * Update src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Do multiply * Name some variables from debug prints * Update src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Use ARRAY_COUNT(sParticles) everywhere * Put data and bss in _data.c * Remove unecessary @bug s * Minor suggestions * Why are there so many timers Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
2021-08-06 18:30:31 +00:00
include "build/src/overlays/actors/ovl_Boss_Ganon2/ovl_Boss_Ganon2_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Boss_Ganondrof"
include "build/src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.o"
Phantom Ganon (ovl_Boss_Ganondrof) and related actors (#442) * Darkmeiro decompilation Bg_Gnd_Darkmeiro decompiled, matched, and documented. * give this a shot * fix conflict * one more try * It's Phantom Ganon time * Fhg_Fire matched * small touch up * more documentation * starting naming fire * renaming * cleanup * hooray for new names * merge * first pass * camera status * bgcheck * object 1 * object 2 * .s * .s * fig's comments * implementing zel's suggestions and a few other things * the work begins * work continues * docs, shifts, cleanup * cleanup * texture names * addressing the rest of the notes Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
2021-03-29 19:35:46 +00:00
include "build/src/overlays/actors/ovl_Boss_Ganondrof/ovl_Boss_Ganondrof_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Boss_Goma"
include "build/src/overlays/actors/ovl_Boss_Goma/z_boss_goma.o"
Gohma (ovl_Boss_Goma) (#397) * ovl_Boss_Goma OK, except func_80917D98 * ovl_Boss_Goma OK and documented * Minor cleanup: shorten enums, use named constants... * Floats with .0f, less useless static usage, details on oversight about spawning child gohmas, cleanup... * More documentation, hopefully less weird about documenting setups and actions * fix fhg_fire * remove warnings * formatting things * newlines * review Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-04-03 20:58:33 +00:00
include "build/src/overlays/actors/ovl_Boss_Goma/ovl_Boss_Goma_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Boss_Mo"
include "build/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.o"
Morpha (ovl_Boss_Mo) (#438) * Darkmeiro decompilation Bg_Gnd_Darkmeiro decompiled, matched, and documented. * give this a shot * fix conflict * one more try * it begins * more functions * another match * starting documentation * the big function works. also two more matches * small fix * data cleanup * removed .s * match with player * inching closer to matching * two more matches. almost there * OH MY GOD IT MATCHES * cleanup: part 1 of infinity * named a bunch of stuff * Naming particle fields * terminal commas * terminal commas * small enum fix * added description of droplet widths * merge * updating * Gfx * vt * xml * bgcheck * more on objects * unused stuff * git subrepo pull --force tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "44f5d7cb9" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "44f5d7cb9" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * git subrepo pull --force tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "6f874af4a" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "6f874af4a" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * object names * fixes * git subrepo pull --force tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "6f874af4a" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "6f874af4a" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * git subrepo pull --force tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "0305ec2c2" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "0305ec2c2" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * ZAPD works * .s * merge * starting work * more stuff * builds OK * first pass * PR fixes (Louis) * Bg_toki_hikari all functions matching (#781) * starting toki_hikari * func_808BA018 matched and some work on other func * init and draw matched, one to go * matched final function, removed ASM, updated spec * adding suggested changes * Volvagia (ovl_Boss_Fd) and related actors (#352) * Darkmeiro decompilation Bg_Gnd_Darkmeiro decompiled, matched, and documented. * Lots of functions matched. Some big ones are close. * Five left unmatched, one close. * Merged data and decompiled the giant function into something readable. Its branch structure has yet to be matched. * Three unmatched, one essentially matched, the rest matched. * More fixes. * Documented more of the structure and cleaned up a bit. * BossFd2, BgVbSima, and EnVbBall matched and documented * Also removed unneeded .s files * And need to name EnVbBall's functions * give this a shot * fix conflict * one more try * removing darkmeiro changes * and again * now OK from make clean * minor cleanup * One more matching function for BossFd * which means it doesn't need its .s * splitting * splitting * splitting * forgot some .s * fancy new names * fancy new names * trying again * sneaky .s files * sound effects and some hex to decimal conversions * Sound effects and static variable cleanup * format.sh and clean up static variables * sfx and formatting * ZAP and cleanup * small cleanup * cleanup and ZAP * ZAP * looking at the giant function again * looking at the giant function again * Only the big function left. * Those .s files aren't mine, officer * float literals might be fixed. regalloc still a nightmare * almost done with the big function * should make now * not much of a change * all functions match. rodata somehow doesn't. * forgot some things * lots of cleanup * and a little more * small error * large cleanup. Also BossFd has function names and inlined variable declarations * still more cleanup * the quest for 0.1f continues * forgot to put NON_MATCHING back in * Data structures fully documented. Still more cleanup. * DECR now works with BossFd2 * should match now * cleanup * small cleanup * cleanup and names * tiny thing * particles and headers and stuff * now with more enums * merge * test * end test * update * cleanup * object 2 * object 1 * doc object_fd2 * git subrepo pull --force tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "6f874af4a" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "6f874af4a" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * formatting * .s * merge actor * vertex arrays * a little more * formatting * merge opd * fixed damage check * cleanup * fixes * effect struct * review Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain> Co-authored-by: fig02 <fig02srl@gmail.com> * fix mistake in z_bg_hidan_hamstep (#771) if you're just going to close this pr just wait a week and review it then. * ovl_En_River_Sound 1 non-matching (#786) * ovl_En_River_Sound * Implement review suggestions, run through clang-format * Responding to PR comments * Use CHECK_QUEST_ITEM, run through clang-tidy. * EnTp, 1 nonmatching, and object_tp (#782) * Data imported, 8 easy functions matched * Init only remaining nonmatching, data in * some renaming & fiddling with Init, still nonmatching * fix colours * Init still not matching * Decompile object_tp * renames * Rename func_80B20DE0 * Horrible new idea * Known equivalent, docs next * Another attempt * Finished naming in object_tp * Named functions, more enums * DrawBridge -> Drawbridge * skulltulla -> Skulltula * Name almost all struct variables * Named most of the temps * delete asm * spec * Missed data file, whoops * Review * More review changes * cleanup en_dha (#787) * Set __FILE__ in asm_processor (#793) * Set __FILE__ in asm_processor * bss fix * Update to upstream version Co-authored-by: zelda2774 <zelda2774@invalid> * ovl_Efc_Erupc OK (#773) * a few good dead Gfx_TwoTexScrolls * EfcErupc OK, mostly documented * review * remove fake match Co-authored-by: Fig02 <fig02srl@gmail.com> * z_bg_mizu_movebg and object_mizu_objects (#747) * OK a few functions * BgMizuMovebg_Draw OK, make tweaks to bg_mizu_bwall * migrate data * create mizu_objects, defines for water temple water level * clean up some code * implement most suggestions * review * review2 * formatting Co-authored-by: Fig02 <fig02srl@gmail.com> * Document BodyBreak (en_part, body part spawner) (#797) * done * status defines * whoops * comment wording * size calc change * elseif * Improve the format in z_map_mark_data.c and cleanup mapmark.py (#798) * Cleanup mapmark.py script * Rename map mark defines * Remove unused entries from map_mark_data * `assert` macro OK (#755) * create assert macro and replace a bunch of __assert Signed-off-by: angie <angheloalf95@gmail.com> * Another bunch of assert Signed-off-by: angie <angheloalf95@gmail.com> * more assert Signed-off-by: angie <angheloalf95@gmail.com> * assert(false) Signed-off-by: angie <angheloalf95@gmail.com> * last assert used in matching code Signed-off-by: angie <angheloalf95@gmail.com> * the non-matchings Signed-off-by: angie <angheloalf95@gmail.com> * typo Signed-off-by: angie <angheloalf95@gmail.com> * format Signed-off-by: angie <angheloalf95@gmail.com> * change macro to uppercase Signed-off-by: angie <angheloalf95@gmail.com> * Apply suggestions from code review Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Change ASSERT(false) to ASSERT(0) Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * General object cleanup (#799) * Object cleanup * Fix running man * fix mm symbols * Updated to use latest version of ZAPD (#777) * Updated config file * Added missing files * Temporarily removed asm_processor changes. * git subrepo pull --force tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "96ffc1e62" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "96ffc1e62" git-subrepo: version: "0.4.3" origin: "???" commit: "???" * git subrepo pull --force tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "179af7d11" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "179af7d11" git-subrepo: version: "0.4.3" origin: "???" commit: "???" * Cleanup and fixes. * git subrepo pull --force tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "50ad2fe78" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "50ad2fe78" git-subrepo: version: "0.4.3" origin: "???" commit: "???" * Makefile fix * git subrepo pull --force tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "b9120803e" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "b9120803e" git-subrepo: version: "0.4.3" origin: "???" commit: "???" Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com> * Decompile `object_zo` :dolphin: (#794) * Initial xml * most of in-code references * Add limbs and evrything else * Functions used by EnRiverSound * Fix forearm and use void* for textures * Run formatter * Change Hints in scene's XMLs (#800) * Remove blobhint * Add segments and offsets, and remove most hints * Change PathHint to Path * Add missing final new lines in scenes xmls * finished object_skb (#790) * finished object_skb * neglected the limbs and dlists, so I added them * adding the textures * fixing some names * ....forgot to change the c file.... * hopefully fixed formatting issue * EnFish, OK and documented (#795) * Matching * Some naming * spec * Name another function * Name animations, clarify use of GI_MAX and GI_NONE * Documented bottle range functions * Simplify squared distance function in EnIceHono, actor descriptions * Functions for dropped fish * More naming * Change 65535.5f to (0xFFFF + 0.5f) * Change 65535.5f to (0xFFFF + 0.5f) * name phases * Named other types, Docile functions * Naming complete * delete asm * format, remove outdated comment * Fix a few DrawFlexOpa arguments * Review changes * Change back to original playSound * Function comments per review * Update asm-processor and add make dependencies for global asm and early includes (#801) * Update asm-processor to latest master * Add make dependencies for global asm and early includes * Update asm-processor to latest master * Decompile the pause menu aka. ovl_kaleido_scope (+ minor changes) (#803) * Decompile ovl_kaleido_scope + minor cleanups * Add a common header for ovl_kaleido_scope * Start cleaning up and documenting kaleido_scope (+ some interface docs) * Improve and fix some kaleido_scope non matchings * Match KaleidoSetup_Init * Extract icon_item_fra/ger_static files * Add more documentation and matches to kaleido_scope * Improve the z_kaleido_collect.c non matching * Rename z_kaleido_8081EFF0.c to z_kaleido_prompt.c * Update most kaleido variables to be static * Improve GS flag macros * Improve z_lmap_mark.c and extract z_lmap_mark_data.c with a script * Various minor fixes and improvements * Minor fixes and review changes * Review changes part 2 * Rename gSetTileCustom to gDPSetTileCustom * Review changes part 3 * Delete `-j` from `make setup` and document use of `-jN` and `-j` in readme (#804) * Add nproc to make setup * Add cross-platform nproc equivalents * Scrap that, just ditch -j in makefile altogether * Clarified thread advice * ViMode progress (#802) * ViMode OK * Fix variable name in regconvert tool * ViMode: fix formatting * Add nonmatching impl for ViMode_Configure, respond to PR - Fixed struct field naming (unkXX -> unk_XX) - ViMode_Configure args are not flags for top/left etc; seem to be for video mode - Used @Random06457's implementation of `ViMode_LogPrint` * Use plain LOG_ADDRESS in ViMode_LogPrint * Incorporate PR feedback from Roman971 * Add scene macros (#792) * add scene macros * SCENECMD -> SCENE_CMD * light renaming * SCENE_CMD_ROOM_BEHAVIOR * update params names * Remove extra spaces * More review changes by fig * remove MM cmd ids * more review changes * last minute edit * I keep confusing both lights commands * Review changes * Yet another cutscene change * Unused02 is unused * Add UNK_09 macro and other minor fixes (#813) (cherry picked from commit d3a6d4d2e1794f3b12f22d7808d65f24ef4c220a) * Match BossFd_Fly (ovl_Boss_Fd OK) (#807) * Simplify PNGs rules in the makefile (#814) * simplify rules * update `-eh` * Add every unreserved object in an automated way (#805) * it's crashing * fix stuff * fix xmls * problematic objects * fix tabs * Fix suffixes * add missing new lines * Add comments to the problematic objects * Find and replace fixes * Add Fig's objects * I forgot to add a Name in a cutscene, so I'm adding it here * Update object decomp tutorial a little bit * Update problematic objects * Update docs/tutorial/object_decomp.md Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Change comments * comment out a few blobs * dammit tluts * Change a bunch of objects * update the last bunch * update comments on oA11 and oB2 * Ninja-edit to fix compatibility with ZAPD's PR 142 Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Add clean assets (#785) * makefile change * also delete * Add cleantools * rename cleanassets and assetclean * add rules to PHONY in makefile * Remove toolsclean * object_hata OK (#806) * everything except limbs * spec * object_hata OK * Replace symbols, unused data, enums, some cleanup * Fix compiler warnings in EnRiverSound * Address Roman's review * Correct limbs name * Changed unk_192 to timer, as well as add missing trailing comma for formating (#817) * Remove some unused duplicated C files (#818) * Removes qemu from the README.md (#819) * Removes qemu from the README.md * Increments the step references in other parts of the README.md * Update README.md Co-authored-by: Anghelo Carvajal <anghelo.carvajal.14@sansano.usm.cl> * Update README.md Co-authored-by: Anghelo Carvajal <anghelo.carvajal.14@sansano.usm.cl> * Update README.md Co-authored-by: Anghelo Carvajal <anghelo.carvajal.14@sansano.usm.cl> * Update README.md Co-authored-by: Anghelo Carvajal <anghelo.carvajal.14@sansano.usm.cl> Co-authored-by: Anghelo Carvajal <anghelo.carvajal.14@sansano.usm.cl> * Match EnSkb_PostLimbDraw (obl_en_skb OK) (#821) * Small bgcheck documentation pass (#816) * implement some documentation * remove unnecessary comments related to decomp * eliminate comment function prototypes * Add `actorfixer.py` ~~and `graphovl.py`~~; and a few improvements to `extract_assets.py` (#783) * Only process touched files and abort the extraction if one file wasn't extracted properly Signed-off-by: angie <angheloalf95@gmail.com> * add actorfixer and graphovl Signed-off-by: angie <angheloalf95@gmail.com> * Re set execution permisions to diff.py Signed-off-by: angie <angheloalf95@gmail.com> * Add graphs/ to gitignore Signed-off-by: angie <angheloalf95@gmail.com> * Add looners flag to graphovl Signed-off-by: angie <angheloalf95@gmail.com> * Parse macros Signed-off-by: angie <angheloalf95@gmail.com> * cleanup Signed-off-by: angie <angheloalf95@gmail.com> * Add enum parser to graphovl Signed-off-by: angie <angheloalf95@gmail.com> * Remove redundant code Signed-off-by: angie <angheloalf95@gmail.com> * cleanup Signed-off-by: angie <angheloalf95@gmail.com> * Custom colors to graphovl! * Select multiples styles for graphovl * Add solarized light style * Add renames of #796 * Add unaccounted warning flag * remove graphovl * git subrepo clone https://github.com/AngheloAlf/graphovl.git tools/graphovl subrepo: subdir: "tools/graphovl" merged: "577e71592" upstream: origin: "https://github.com/AngheloAlf/graphovl.git" branch: "master" commit: "577e71592" git-subrepo: version: "0.4.3" origin: "???" commit: "???" * remove graphovl * Add `graphovl/` to gitignore * Label a bug in Door_Shutter (#810) * comment * Update src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Update src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Update src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c Co-authored-by: pixel-stuck <mathmcclintic@gmail.com> * change message * typo * repeated myself * extra space lmao * change wording again * Update src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c * indent Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> Co-authored-by: pixel-stuck <mathmcclintic@gmail.com> * en_weather_tag Quick documentation pass (#808) * Quick documentation pass * Fill out the En_Weather_Tag enum * move the enum into the header * implement roman's suggestion * object_sa OK (#789) * object_sa OK * PR fixes (AngheloAlf) * PR fixes (Roman) * Improve z_jpeg documentation (#825) * Improve z_jpeg documentation * JpegWork::data is probably better than address * Rename Jpeg_SendTask to Jpeg_ScheduleDecoderTask * Rename njpegUCode to gJpegUCode * Rename GetU16 to GetUnalignedU16 and improve docs * Decompile a bunch of objects (#603) * Mostly done but shifted * still messed up * Almost OK * OBJECT_JYA_OBJ OK, OBJECT_GR OK * Done * Merge master and format * Cleanup * Cleanup 2 * Start object MB dont merge yet * Object_MB OK * Object_ydan_objects OK * General 'ydan' actor cleanup * Forgot some small things * Object_EC OK * add .gitkeep and run format * Object_sd OK but no textures cause of a zap issue * PR fixes * Fix object_sd * fix ydan * delete .gitkeep files * OBJECT_BOX as far as it can go with current ZAP * Fix undefined_syms * Start child link object * Push progress, dont merge yet * Object_mori_objects OK * Fixed? * Fix conflicts again * Seems like i missed some textures * Extract data for BgBombwall * More field * ZAP YEP 2.0 * Object_Box OK * Object_SD ok. Ready to merge * remove ASM and merge master * remove ASM * remove files wrongfully added to docs/ * Almost done * Change comment in z_player_lib.c * forgot some DLists in player_lib.c * Fix conflict, run format * Same as before but this time with Tex and TLUT * Last few things * fix object_GR and add limbs to object_sd * Nane -> Name * gChildDekuShieldMtx is now a matrix and not a blob * PR fixes (Fig) * add a space for comment in z_player_lib.c * re push and new lines * PR fixes (AngheloAlf) * PR fixes (Roman) * Fix Heishi2 * PR fixes (Fig) * Replace spacing in a file * PR fixes (Roman) * Track XML extraction time (#826) * extracted-assets.json * delete `.extracted-assets.json` in distclean * Move `rm .extracted-assets.json` to `assetclean` * Outname -> OutName for OBJECT_LINK_CHILD (#827) * Outname -> OutName * ANother child fix * TLUT -> tlut * Change nanoseconds to seconds in extract_assets.py (#829) * Match 2 more functions in z_eff_blure.c (#831) * Match ViMode_Configure (z_vimode.c OK) (#830) * warnings fixed (#835) * ZAPD update: libpng, zroom improvements and others (#811) * git subrepo pull --force tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "769f5702a" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "769f5702a" git-subrepo: version: "0.4.3" origin: "???" commit: "???" * Add `libpng` to readme * Remove `-ifp` since it doesn't exists anymore in ZAPD * Remove extra print I added * Add UNK_09 macro and other minor fixes * Simplify PNG rules * simplify gitignore * Update README.md Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update dockerfile * basic instructions for cygwin and mac * git subrepo pull --force tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "86160be69" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "86160be69" git-subrepo: version: "0.4.3" origin: "???" commit: "???" * Change nanoseconds to seconds in extract_assets.py Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * "Decompile" more objects. (#784) * Object_hakach_objects OK and fix a warning in z_play.c * Object Warp1 OK * Object_spot16_obj OK * object_cs Skeleton and limbs OK * Limbs are broken * Limbs OK * Object_CS OK * Object_jya_door OK * fix errors and add new lines * PR fixes (AngheloAlf) * PR fixes (EllipticEllipsis) * PR fixes (Fig) * Rename Spot16 and Jya * GraveYard -> Graveyard * PR fixes * -s * PR fixes * Object_RU1, Object_MA1, and warp pad objects Decompiled (#828) * Ruto limbs * RutoLimb enum * the enum doesn't go in en_door * Limb DLists * Name almost all textures and clean up EnRu1.c * remove padding * Name all but 1 animation and remove undefined syms * Object MA limbs OK * (MA1)Most textures * Small renames in EnMa1.c * Object MA1 OK * add base object for Mjin * Mjin OK * Update object_ma1.xml * PR fixes (Fig) * PR fixes * Missed one * Update assets/xml/objects/object_ru1.xml Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * En_River_Sound OK (#833) * match en_river_sound * remove asm * some docs * more docs * saria song * review stuff * z_sram OK (#834) * match z_sram * format and remove unused asm, also make some data static * review comments * another change * Match Jpeg_Decode (z_jpeg.c OK) (#839) * Match EnDaiku_UpdateText (En_Daiku OK) (#841) * Match 1 of the 2 remaining functions in Bg_Mizu_Movebg (#840) * Improve Audio_SequencePlayerProcessSequence (#844) Co-authored-by: zelda2774 <zelda2774@invalid> * Fix and rename nes_font_static (#753) * renames * change digits and control pad names * Add codepoints, rename blank char 0x7F * BgGndFiremeiro OK and documented (#850) * OK, data imported * Name everything * Delete asm * Add struct `LegacyLimb` and rename `AnimationHeader2` for `object_human` (#849) * Add LegacyLimb and rename AnimationHeader2 * Simplify SkelAnime_GetFrameDataLegacy * Minor fixes * Move LegacyLimb with the rest of the limbs * EnVali OK and documented, object_vali and object_bl completely analysed and documented (#845) * OK * Some naming * Name more, correct typo in Biri, extract skel * just Draws need names, fix typos in bili and warp1 * Decompile object_vali and add symbols * Few more names * Bari naming done * object_bl completed, symbols added * Label object_bl * Formatter * delete asm * review changes * review changes * review * Interface improvements (#822) * Add symbols, does NOT build OK * parameter OK with syms * Use `static` more and inline arrays * wip docs * Start on Interface_Draw, NOT OK yet * rename variables since interface dev is weird * nonmatching for now * kaleido * Update src/code/z_parameter.c Co-authored-by: louist103 <35883445+louist103@users.noreply.github.com> * Make most texture rectangles use shifts * fix symbols for all interface things * done with interface_draw for now * Update z_parameter.c * format files * fix wrong function calls * fix bss * improvements in matching * remove button enum for now * (void)0 to fix warning * make conditional look nicer * fix * fix wrong combiner * Update src/overlays/actors/ovl_kaleido_scope/z_lmap_mark.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * format * remove "HUD" naming * review suggestions Co-authored-by: louist103 <35883445+louist103@users.noreply.github.com> Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Migrate .bss for fault drawer and .data for item00 (#823) * Item00 and fault drawer * Test * Test2 * test3 * test4 * remove .data file for item00 * revert hex * WHY * PLEASE * PR fixes (Roman) and run clang-format version 10 * Fault_drawer was swapped ...again) * Decompile and label EnEiyer (#852) * En_Eiyer OK * Label EnEiyer * Style fixes * Rename colCyl -> collider * Use CLAMP_MIN * Format * Review changes * Match Camera_PrintSettings (z_camera OK) (#853) * Match Camera_PrintSettings * rm asm * Match Math3D_LineSegMakePerpLineSeg (#854) * Match Math3D_LineSegMakePerpLineSeg Also renamed to Math3D_LineVsLineClosestTwoPoints * Fix UB * Some actor.c docs (in preparation for en_test) (#820) * renames * format * format functions.h * clean * arg name * remove asm * Decompile obj_bean (magic bean and soft soil). 2 NON_MATCHINGs (#846) * did a bunch * Do a bunch more * all functions in C * Macros for draw and collision part of state flags * Done for now * remove ASM * PR fixes (Elliptic) * all angles are hex and take away bad names * PR fixes (Roman) * PR fixes * PR fixes (Fig) * restore map mark * Fix the other messed with files * Decompile some more objects (#848) * Object_FU limbs and skel OK * limbs OK * Object_FU textures OK * Object_FU face textures OK * Symbols in en_fu.c * en_fu.c limb enum * Remove Object_fu from undefined_syms, move textures to draw, and small cleanup * Object_bird OK * Object_Bird OK, added cutscene for shot sun, and song of storms * Rainbow Bridge CS * Great fairy CS * Cutscene -> Cs * remove '&' from Cutscenes * Cleanup object_bird * Update z_en_fu.c * Update z_en_fu.h * Update z_en_fu.c * Update z_en_fu.h * Update z_en_fu.h * DC intro CS * Zeldas lullaby CS * Nabooru Knuckle CS * Owl Lake Hylia CS * Sun song CS * Undefined sym in Boss Dodongo * Missed a few more * DC tex name * Windmill man limbs * z_En_Ossan and dependencies (#824) * fix colliderinit typo * fix initchain * reloc * progress * progress * Pick off a few easy functions, reduce number of warnings * more tough OKs * Getting closer to all OK, fix en_girla header * some hard OKs, 7 to go * two funcs remaining * func_80AC7094 OK! * Fix warnings, begin documentation * get most of object_ossan documented, document some of en_ossan * improve en_girla function names * more EnOssan documentation * more documentation * en_tana basically complete, en_girla vars all named, en_ossan documentation improvements * delete TIME ITSELF * object_oF1d_map OK * more names, fixed a poition typo * Nearly all en_ossan functions named, all variables named * format.sh * forgot to delete data * implement pr changes * EnOssan OK! implement most of Roman's suggestions * ugh * implement figs suggestions * implement roman's suggestion * Can't tell my left from my other left Co-authored-by: fig02 <fig02srl@gmail.com> * Some progress on z_vr_box.c (#838) * z_vr_box.c progress * Rename dpList to dlistBuf and SKYBOX_CLEAR_SKY to SKYBOX_NORMAL_SKY * Fix * renamed dlistBuf to dListBuf and split large string further * Change PreRenderContext to just be PreRender (#862) * Decompile Fishing and document object_fish (#856) * Start decompiling Fishing * Decompile more functions in Fishing * Decompile a few more functions in Fishing * Decompile func_80B6E9E0 and func_80B7825C (non matching) * Minor Fishing cleanups * Migrate fishing bss to C and match 3 functions * Decompile and match Fishing_Update * Migrate fishing data to C and minor cleanups * Fix the object_fish xml and use its symbols in Fishing * Partially document Fishing and object_fish * Add more documentation/cleanups to Fishing and object_fish * Use object_fish symbols in Demo_Ec and fix naming * Minor fixes to Fishing docs * Apply review suggestions for Fishing * Apply 2 more review suggestions for Fishing * Apply some review suggestions for Fishing * Extract all "place name" title cards (#858) * Forest and shadow temple * fire temple * Water temple * Spirit temple * Deku tree * jabu jabu * DC * Inside Ganons castle * GTG * Castle courtyard * great fairy's fountain * chamber of sages * shooting gallery * Temple of time * market * back alley * kokir shop * goron shop * zora shop * House of skulltula * bazarr * potion shop * gravekeepers hut * lakeside lab * hyrule field * kak * graveyard * zoras river * kokiri forest * lake hylia * zoras domain * zoras fountain * gerudo valley * lost woods * the rest of them * cleanup * final cleanup * PR fixes (Zel) * (Re) fix case * segment 0 * Fix map name static conflict * Comment about ZAPD * number 0 * Update place_title_cards.xml * Update spec * Fix all xmls to explicitly use offsets (#859) * Forest and shadow temple * fire temple * Water temple * Spirit temple * Deku tree * jabu jabu * DC * Inside Ganons castle * GTG * Castle courtyard * great fairy's fountain * chamber of sages * shooting gallery * Temple of time * market * back alley * kokir shop * goron shop * zora shop * House of skulltula * bazarr * potion shop * gravekeepers hut * lakeside lab * hyrule field * kak * graveyard * zoras river * kokiri forest * lake hylia * zoras domain * zoras fountain * gerudo valley * lost woods * the rest of them * cleanup * final cleanup * PR fixes (Zel) * Fra -> FRA and cleanup map_name_static * map_name_static * DONE * SHould be it * Done done done done * vector * remove another pr * ? * EnDekubaba OK and documented, object_dekubaba documented (#864) * 13 functions left, data imported * 2 left * 1 left * OK * Begin naming * sfx rename * spec * Begin naming, add LINK_IS_CHILD to EnDu * Fix spelling of its/it's * Document most of object_dekubaba, import symbols * Document draw functions, begin on actionfuncs * New actor function names, some float constants * Name almost everything * Delete asm * Name size, format * Review changes * Review changes * Brackets, format * Fix Sheik typo (#867) * db_camera (#842) * Decompile shrink_window.c * progress * progress * makefile * progress * match 8 functions * 1 more match * match 2 functions * decompile func_800B9638 * fix flow * migrate .bss * doc * name some stuff * fixes * comment fix * remove scene .c files * old z_camera .s files * revert z_camera change * revert unwanted z_camera change * fixes * remove unused files, run clang-format and fix non-matching * fix clang-format causing non-matching * remove newline + old comment in func_800B3BD4 * make db_camera global variables static * add s prefix to startic variables * change magic constants * rename "unk_50" * Match func_800B3BD4 and Match DbCamera_UpdateDemoControl (-bss) * Lots of progress on update * Mainly cleanup * run format.sh + remove unused asm * replace chevrons with add quotes * remove useless cast + use correct empty argument function declaration Co-authored-by: engineer124 <engineer124engineer124@gmail.com> * Match Interface_Draw (z_parameter OK) (#876) * Interface_Draw down to permuter score = 175 * Fix typo * Matched Interface_Draw! * clean-up * Another touch-up * a little more cleanup * No more direct gGameInfo->data access * Audio WIP (#836) * being code_800EC960 * wip * wip * more audio progress * migrate data in code_800E11F0 * wip * make ok * remove asm * wip * move some variables outside of gAudioContext to the AudioContext structure due to the size used in func_800E3094 * more progress * wip * wip * split code_800E11F0 * migrate rodata in code_800E11F0 * match functions that couldn't because of data issues * move code_800E4FE0 asm files * wip * more wip * fix global functions, and forward declarations * wip * wip * wip * ocarina wip * match a couple functions * some progress * separate some bss * match func_800EDA3C * some matching * more matches * migrate audio rodata * some matches * more matchess * start on synthesis * work on synthesis * fix function declaration * Merge branch 'master' into audio * match a few more functions * wip * wip * more matching, rename Audio_SetBGM to Audio_QueueSeqCmd * name several audio functions, and audiocontext members * more naming, rename code_800E11F0 to audio_load, code_800DAAC0 to audio_synthesis * audio wip * match a few more functions. * wip * add missing NON_MATCHING directive * wip * some matching, data reogranization * match cursed function * wip * wip * formatting * remove prefix from struct memebers * missed function rename * review Co-authored-by: fig02 <fig02srl@gmail.com> * ZAPD update: Gotta go fast! (#877) * copy over the xml * Rename anims * A bunch of renames * minor extract_assets fixes * git subrepo pull --force tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "820678b4e" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "820678b4e" git-subrepo: version: "0.4.3" origin: "???" commit: "???" * Change rgb5a1 to rgba16 * eye and eyebrows * some dlists * git subrepo pull --force tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "6be9af65d" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "6be9af65d" git-subrepo: version: "0.4.3" origin: "???" commit: "???" * Dancing Couple (ovl_En_Tg) (#866) * Match EnTg_Destroy * Match EnTg_Init * Matching EnTg_Update * Match func_80B18360 Moving both 'return phi;'s into a single return at the end of the function causes the assembly to not match. * Probably equivalent, non-matching func_80B183F8 * Matching EnTg_Draw * Matching update function * Matching func_80B18778 * All functions decompiled * Move data to C code * All functions matched excepted weird switch/case * Last matching function * Remove unused ASM * Name obvious symbols * Clang format * Name text-related functions and variables * Describe actor as Dancing Couple See https://github.com/zeldaret/oot/pull/866#discussion_r664726581 * Use named constants * Name drawing constants * Use THIS macro for void* * Name the function that sets environment color * Add comments to parts of code that aren't clear * Rename timesSpokenTo to nextDialogue, treat isTalking as boolean * z_en_ko OK (#869) * .data OK * Progress * push some old stuff * Finish a chain * Progress * Progress * Run mathfixer.py * Progress * match one more * Up to date * Match func_80A97610 * func_80A96FD0 * most of the way through the mega switch * small formatting thing. still stuck on the switch * start a big switch function * a little closer * done with matching for now starting objects * func_80A97738 OK! * func_80A995CC OK! * func_80A99864 OK! * en_ko OK! * Code clean-up pass * more EnKo cleanups, object_fa and object_kw1 textures documented * complete object_km1, more EnKo documentation * More documentation * delete asm * Clean-up rebase issues * bleh * Implement Dragorn's suggestions * fix spec, implement fig's suggestions * whoops (ill leave it for the docs tho lol) * whoops again * i made an ouchie * smile * last one for real Co-authored-by: Louis <35883445+louist103@users.noreply.github.com> Co-authored-by: fig02 <fig02srl@gmail.com> * z_en_bigokuta OK (#878) * start * Did some more * Progress * More * IDK * Chip away a little * im done * func_809BEBBC OK! * get rid of graphovl * revert random changes * Big Okuta OK! * more clean-ups * implement dragorn's suggestions * implement fig and louist's suggestions Co-authored-by: Louis <35883445+louist103@users.noreply.github.com> * z_obj_mure OK (#875) * almost matching init, matching data * more matchings, some non-matching progress * finishing up SpawnActor, fixing .data types * first decompile pass done, few non matchings * cleanup/update matchings and remove asm * format code * pick up some OKs * 1 non_matching left, some documentation * z_obj_mure OK... but at what cost? * implement suggested changes, some more documentation * Implement Fig's suggestions * review Co-authored-by: Sam Lyon <sam.c.lyon@gmail.com> Co-authored-by: fig02 <fig02srl@gmail.com> * convert remaining RGB5a1 to RGBA16 (#879) * Stalfos (en_test) OK and object_sk2 documented (#868) * fix colliderinit typo * migrate data * init has 1 problem * progress * progress * builds now * progress * progress * lots of funcs matched * many functions, fix warnings * 1 left * done * docs progress * remove graphovl * missed some * change some funcs * some more * another * format * more docs * cleanups1 * limbs, DLs, textures * limbs named (thanks elliptic) * more docs * Name animations, import symbols * Named sections of xml * more docs * rename limbs and use flag macros * name * review1 and use limb enum * review2 * agro -> aggro * review3 * review4 * review5 Co-authored-by: Elliptic Ellipsis <elliptic.ellipsis@gmail.com> * Use a temp symbol for RomStart/RomEnd symbols, makes the map show the right value for actual RomStart/RomEnd symbols (#880) * builds OK * first pass * PR fixes (Louis) * fixes * a little more * format * dragorn's stuff * more cleanup, merge, and format * now with work buffers * forgot sfx * update and draw Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain> Co-authored-by: Louis <35883445+louist103@users.noreply.github.com> Co-authored-by: Parker Burnett <burnettparker@gmail.com> Co-authored-by: fig02 <fig02srl@gmail.com> Co-authored-by: Zelllll <56516451+Zelllll@users.noreply.github.com> Co-authored-by: glankk <glankk@users.noreply.github.com> Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> Co-authored-by: zelda2774 <69368340+zelda2774@users.noreply.github.com> Co-authored-by: zelda2774 <zelda2774@invalid> Co-authored-by: mzxrules <mzxrules@gmail.com> Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com> Co-authored-by: Nicholas Estelami <NEstelami@users.noreply.github.com> Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com> Co-authored-by: Zach Banks <zjbanks@gmail.com> Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> Co-authored-by: Kenix3 <kenixwhisperwind@gmail.com> Co-authored-by: Anghelo Carvajal <anghelo.carvajal.14@sansano.usm.cl> Co-authored-by: pixel-stuck <mathmcclintic@gmail.com> Co-authored-by: Vijfhoek <me@vijf.life> Co-authored-by: Synray <31429825+Synray@users.noreply.github.com> Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com> Co-authored-by: Random <28494085+Random06457@users.noreply.github.com> Co-authored-by: engineer124 <engineer124engineer124@gmail.com> Co-authored-by: krimtonz <33664508+krimtonz@users.noreply.github.com> Co-authored-by: Aly Cerruti <aprime2003@gmail.com> Co-authored-by: Sam Lyon <sam.c.lyon@gmail.com> Co-authored-by: Elliptic Ellipsis <elliptic.ellipsis@gmail.com> Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
2021-08-08 19:26:56 +00:00
include "build/src/overlays/actors/ovl_Boss_Mo/ovl_Boss_Mo_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Boss_Sst"
include "build/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.o"
Bongo Bongo (ovl_Boss_Sst) (#458) * First pass * Darkmeiro decompilation Bg_Gnd_Darkmeiro decompiled, matched, and documented. * give this a shot * fix conflict * one more try * more matching fun * fun with bongo * clean this up later * found the matching versions * diff.py has escaped? * now with more docs * Now with floor and more docs * one more thing * incremental progress * It's Bongo time * one little thing * merge ZAP * update * camera * gfx now in their own file * now with more object decomp * name animations * now shiftable * missed some. also DECR * opd merge * start xml * now with xml asset extraction * format * cleanup * removed union Co-authored-by: Kelebek1 <eeeedddccc@hotmail.co.uk> Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
2021-04-05 23:08:45 +00:00
include "build/src/overlays/actors/ovl_Boss_Sst/ovl_Boss_Sst_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Boss_Tw"
include "build/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.o"
Decompile Twinrova (#837) * start bosstw * wip * wip * wip * wip * wip * wip * wip * wip * wip * some wip * wip * wip * match some functions * match func_80948668 * match func_809477e0 * wip * format * migrate bss * reorganizing, fix warnings * BossTw_Init OK * match BossTw_ShootBeam * and then there were 2 * wip, start docs * more docs * wip * wip * format * PLEASE WORK GIT * spaces * review done * add dragorns matching suggestion * reloc * roman review * petrie review * dragorn review * dargorn2 Co-authored-by: Louis <35883445+louist103@users.noreply.github.com> Co-authored-by: fig02 <fig02srl@gmail.com>
2021-08-04 18:13:00 +00:00
include "build/src/overlays/actors/ovl_Boss_Tw/ovl_Boss_Tw_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Boss_Va"
include "build/src/overlays/actors/ovl_Boss_Va/z_boss_va.o"
Barinade (Boss_Va) (#529) * Darkmeiro decompilation Bg_Gnd_Darkmeiro decompiled, matched, and documented. * give this a shot * fix conflict * one more try * could be useful * whoops * ZAP2 stuff * ZAP why * ZAP again * When life gives you Bari, make Barinade * Now with more names * merge * enums everywhere * just one left * OK * more docs * a little more * I don't even remember what I changed * small cleanup * maybe it's time * weird * not sure what's up with sys_matrix * camera functions * it's no object * unused * back to being unused * git subrepo pull --force tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "6f874af4a" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "6f874af4a" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * hope this works * git subrepo pull --force tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "6f874af4a" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "6f874af4a" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * object fix * stuff * test merge * merge colchk * merge colchk * one more thing * naming things * naming things * implement most suggestions, and format * fixes * format * more fixes * more fixes and format * body -> get_body Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain> Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-08-08 17:57:07 +00:00
include "build/src/overlays/actors/ovl_Boss_Va/ovl_Boss_Va_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Demo_6K"
include "build/src/overlays/actors/ovl_Demo_6K/z_demo_6k.o"
ovl_Demo_6K (#726) * ovl_Demo_6K * PR review * Update src/overlays/actors/ovl_Demo_6K/z_demo_6k.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> Co-authored-by: fig02 <fig02srl@gmail.com> Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2021-03-28 22:40:38 +00:00
include "build/src/overlays/actors/ovl_Demo_6K/ovl_Demo_6K_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Demo_Du"
include "build/src/overlays/actors/ovl_Demo_Du/z_demo_du.o"
ovl_Demo_Du OK (#683) * DemoDu_Init and externed data Signed-off-by: Anghelo <angheloalf95@gmail.com> * functions called by init Signed-off-by: Anghelo <angheloalf95@gmail.com> * DemoDu_Destroy Signed-off-by: Anghelo <angheloalf95@gmail.com> * DemoDu_Update Signed-off-by: angie <angheloalf95@gmail.com> * DemoDu_Draw Signed-off-by: angie <angheloalf95@gmail.com> * func_80969FD0 Signed-off-by: angie <angheloalf95@gmail.com> * func_8096B840 Signed-off-by: angie <angheloalf95@gmail.com> * two non matching functions Signed-off-by: angie <angheloalf95@gmail.com> * import data Signed-off-by: angie <angheloalf95@gmail.com> * func_8096BF60 Signed-off-by: angie <angheloalf95@gmail.com> * func_8096BF54 Signed-off-by: angie <angheloalf95@gmail.com> * about half of the updates functions Signed-off-by: angie <angheloalf95@gmail.com> * almost the other half of update functions Signed-off-by: angie <angheloalf95@gmail.com> * the rest of the updates functions Signed-off-by: angie <angheloalf95@gmail.com> * DemoDu_UpdateEyes Signed-off-by: angie <angheloalf95@gmail.com> * bunch of functions Signed-off-by: angie <angheloalf95@gmail.com> * func_8096A970 Signed-off-by: angie <angheloalf95@gmail.com> * Another chunk of functions Signed-off-by: angie <angheloalf95@gmail.com> * More functions and a bit of renaming Signed-off-by: Anghelo <angheloalf95@gmail.com> * More functions Signed-off-by: Anghelo <angheloalf95@gmail.com> * a bit of renaming and five more functions Signed-off-by: angie <angheloalf95@gmail.com> * nonmatching function still not matching Signed-off-by: angie <angheloalf95@gmail.com> * func_8096B57C and a bit of renaming Signed-off-by: Anghelo <angheloalf95@gmail.com> * func_8096A528 Signed-off-by: Anghelo <angheloalf95@gmail.com> * move static variables around Signed-off-by: Anghelo <angheloalf95@gmail.com> * another bit of renaming Signed-off-by: angie <angheloalf95@gmail.com> * REG Signed-off-by: angie <angheloalf95@gmail.com> * Document the functions that give the medallion to player Signed-off-by: angie <angheloalf95@gmail.com> * More function renaming Signed-off-by: Anghelo <angheloalf95@gmail.com> * more function renaming Signed-off-by: angie <angheloalf95@gmail.com> * firemedallion and credits Signed-off-by: angie <angheloalf95@gmail.com> * rename some variables in a nonmatching function Signed-off-by: angie <angheloalf95@gmail.com> * i hate this function, and it is so dumb. it took me days to figure it out, the error was so stupid Signed-off-by: Anghelo <angheloalf95@gmail.com> * rename mouthtextures and some variables Signed-off-by: Anghelo <angheloalf95@gmail.com> * Rename almost all the missing functions Signed-off-by: angie <angheloalf95@gmail.com> * whoops, i forgot to run format.sh Signed-off-by: angie <angheloalf95@gmail.com> * Renaming the references to the cutscene at the chamber of the sages after killing ganon Thanks to @tharo Signed-off-by: angie <angheloalf95@gmail.com> * Many of the changes requested by @petrie911 Signed-off-by: angie <angheloalf95@gmail.com> * Inline the assignments at DemoDu_CsGoronsRuby_SpawnDustWhenHittingLink Signed-off-by: angie <angheloalf95@gmail.com> * change wrong type Signed-off-by: angie <angheloalf95@gmail.com> * changes requested by @fig02 Signed-off-by: angie <angheloalf95@gmail.com> * run format Signed-off-by: angie <angheloalf95@gmail.com> * remove s prefix in dustPosOffsets Signed-off-by: angie <angheloalf95@gmail.com>
2021-02-28 15:19:54 +00:00
include "build/src/overlays/actors/ovl_Demo_Du/ovl_Demo_Du_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Demo_Ec"
include "build/src/overlays/actors/ovl_Demo_Ec/z_demo_ec.o"
Decompile DemoEc 1 non matching (#479) * Fixed upstream * Migrate data and Decomp Init * Decomp a few more functions * Small change before starting * Back to this file * Match action func chains, func_8096DE94, func_8096DF9C, func_8096E0A4 * Match all except 1 function in first back of actionFuncs * matched a bunch in bank D_8097053C * Match the first few draw functions * match a few more draws and start one * All matched but one. All equivalent * Name setup funcs * finish naming functions * Fix Gfx stuff * Remove 'expectedc' * General clean up * fix * progress * cleanup * remove reloc * review 2 * fix awful function pointer thing Co-authored-by: fig <fig02srl@gmail.com>
2020-12-06 02:02:55 +00:00
include "build/src/overlays/actors/ovl_Demo_Ec/ovl_Demo_Ec_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Demo_Effect"
include "build/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.o"
ovl_demo_effect 100% OK (#466) * Fully decompiles demo_effect actor. * Formats z_demo_effect.c * GET_ACTOR_TYPE is renamed to GET_EFFECT_TYPE * Implements OPEN_DISPS macros for all draw functions. * Fixes ugly float values * Removes unnecessary union structs in the DemoEffect actor struct * Renames DemoEffect SkelAnimeCurve member to skelCurve * Names initObjectBankIndex DemoEffect struct member * Renames jewel display list holders * Renames initialization function pointers to initUpdateFunc and initDrawFunc * Renames primitive and environment color DemoEffect struct members. * Fixes a couple missed floats. * Renames most draw and update functions. * Finishes naming all update functions. * Adds additional SFX defines. * Renames the rest of the functions * Renames all external object display lists and vertex references * Renames DemoEffect global data variables * Renames DemoEffect Medal function to GetItem because it's used by LightArrows too * Fixes DemoEffect Timewarp_Timeblock documentation. * DemoEffect_TimewarpTimeblock updates shrink functions to use decimal * Converts DemoEffect hex to decimal where appopriate * Names the rest of DemoEffect struct members. * Names DemoEffect triforceSpot crystalLightOpacity * Adds DemoEffect enums for light effect color and god lgt types. * Renames DemoEffect_UpdateBlueOrb to DemoEffect_UpdateBlueOrbGrow * Fixes compiler warning in DemoEffect_JewelSparkle * Renames DemoEffect_MedalSparkle argument * Reformatting DemoEffect struct offset comments. * Formats z_demo_effect * Updates DemoEffect oGfxCtx to use the new macros. * Adds comments detailing what each function in the DemoEffect system does. * Removes z_demo_effect.data.s * Renames DemoEffect global variables and sets them to static * Removes pointer from DemoEffect function references * Removes unncecessary default: break; statements in DemoEffect * Converts rotation values to hex in DemoEffect * DemoEffect effectFlags now uses ~1 rather than 65534 * DemoEffect_DrawGodLgt now uses a cleaner conditional statement * eventChkInf in DemoEffect now uses 1 << 9 and 1 << 11 * DemoEffect now uses VT macros. * Converts DemoEffect colors to hex. * Changes M_PI / 32768.0f to M_PI / 0x8000 * Updates demo_effect enums to be all caps * ovl_demo_effect reloc info is now included via build process rather than included from original asm * Adds param packing macro * DemoEffect struct unions are now typedef'd outside of the main struct * Reformats DemoEffect sJewelSparkleColors * Removes an if(globalCtx){} in DemoEffect_Init * Removes ActorFunc cast in DemoEffect_Wait * Removes unncessary comment in DemoEffect_MedalSparkle * Timer check in DemoEffect_UpdateLightRingShrinking now uses <= 255 rather than < 256 * Removes unnecessary comment in DemoEffect_SetJewelColor * Removes unncessary comment in DemoEffect_MoveJewelActivateDoorOfTime * Converts an angle to hex in DemoEffect_MoveJewelActivateDoorOfTime * Converts a while to for loop in DemoEffect_JewelSparkle * Moves stack variables in DemoEffect_UpdateDust to a new line for each one * Removes globalCtx2 assignment to the beginning of the function in DemoEffect_DrawJewel * Removes unnecessary comment in DemoEffect_DrawCrystalLight * No longer wrapping rotation reset in if(1){} in DemoEffect_DrawGodLgt * Converts DemoEffect if statements to use != 0 and == 0 when non-boolean ints are checked. * DemoEffect initDrawFunc now uses type ActorFunc rather than DemoEffectFunc * review 2 Co-authored-by: fig <fig02srl@gmail.com>
2020-12-07 17:48:29 +00:00
include "build/src/overlays/actors/ovl_Demo_Effect/ovl_Demo_Effect_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Demo_Ext"
include "build/src/overlays/actors/ovl_Demo_Ext/z_demo_ext.o"
DemoExt OK and documented (#586) * OK * all functions and variables named * delete asm * data inlined * Merge remote-tracking branch 'upstream/master' into demo_ext * addressed review comments * formatter * addressed review comments
2021-01-14 19:28:36 +00:00
include "build/src/overlays/actors/ovl_Demo_Ext/ovl_Demo_Ext_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Demo_Geff"
include "build/src/overlays/actors/ovl_Demo_Geff/z_demo_geff.o"
Split ovl_file_choose and ovl_kaleido_scope (#167) * Split ovl_file_choose and ovl_kaleido_scope * Split ovl_kaleido_scope's rodata/data/bss * fix * fix spec * spec fix * hopefully last spec fix * hopefully last spec fix 2 * fix * Add comments on file boundaries * fix
2020-06-07 17:52:43 +00:00
include "build/src/overlays/actors/ovl_Demo_Geff/ovl_Demo_Geff_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Demo_Gj"
include "build/src/overlays/actors/ovl_Demo_Gj/z_demo_gj.o"
ovl_Demo_Gj Ok (#670) * a bunch of functions Signed-off-by: angie <angheloalf95@gmail.com> * another bunch of functions Signed-off-by: angie <angheloalf95@gmail.com> * add dummies to func_8097911C to match it Signed-off-by: angie <angheloalf95@gmail.com> * fix some functions declarations Signed-off-by: angie <angheloalf95@gmail.com> * Add functions of the array used by the update function Signed-off-by: angie <angheloalf95@gmail.com> * add functions used by draw Signed-off-by: angie <angheloalf95@gmail.com> * draw and update functions Signed-off-by: angie <angheloalf95@gmail.com> * DemoGj_Init Signed-off-by: angie <angheloalf95@gmail.com> * fix some functions declarations Signed-off-by: Anghelo <angheloalf95@gmail.com> * 9 small functions Signed-off-by: Anghelo <angheloalf95@gmail.com> * Some unmatched functions and 12 small matched functions Signed-off-by: Anghelo <angheloalf95@gmail.com> * another 7 small functions Signed-off-by: Anghelo <angheloalf95@gmail.com> * add data Signed-off-by: Anghelo <angheloalf95@gmail.com> * small types fixes Signed-off-by: Anghelo <angheloalf95@gmail.com> * six more functions Signed-off-by: angie <angheloalf95@gmail.com> * func_80978C20 Signed-off-by: angie <angheloalf95@gmail.com> * func_8097BA48 Signed-off-by: Anghelo <angheloalf95@gmail.com> * five repeated functions Signed-off-by: Anghelo <angheloalf95@gmail.com> * Array of cylinders and two other functions Signed-off-by: Anghelo <angheloalf95@gmail.com> * seven equals and problematic functions Signed-off-by: Anghelo <angheloalf95@gmail.com> * func_80978F60 and func_80979860 Signed-off-by: angie <angheloalf95@gmail.com> * func_8097923C doesn't want to match :c Signed-off-by: Anghelo <angheloalf95@gmail.com> * three not matching functions Signed-off-by: Anghelo <angheloalf95@gmail.com> * func_80978AFC Signed-off-by: Anghelo <angheloalf95@gmail.com> * three more Signed-off-by: Anghelo <angheloalf95@gmail.com> * DemoGj_FindGanon Signed-off-by: angie <angheloalf95@gmail.com> * func_809797E4 Signed-off-by: angie <angheloalf95@gmail.com> * func_80978B90 Signed-off-by: angie <angheloalf95@gmail.com> * last non matching function Signed-off-by: angie <angheloalf95@gmail.com> * erase reloc Signed-off-by: angie <angheloalf95@gmail.com> * a bit of renaming Signed-off-by: angie <angheloalf95@gmail.com> * another chunk of renaming Signed-off-by: angie <angheloalf95@gmail.com> * fix reg macros and a few comments Signed-off-by: Anghelo <angheloalf95@gmail.com> * vt, arrayfuncs renaming and another bit of renaming Signed-off-by: Anghelo <angheloalf95@gmail.com> * More renaming Signed-off-by: Anghelo <angheloalf95@gmail.com> * i'm hating this actor Signed-off-by: angie <angheloalf95@gmail.com> * format Signed-off-by: angie <angheloalf95@gmail.com> * Changes asked by @shawlucas Signed-off-by: Anghelo <angheloalf95@gmail.com> * swap globalCtx and globalCtx2 Signed-off-by: Anghelo <angheloalf95@gmail.com> * Move static variables nearer to where they are used and general cleanup Signed-off-by: Anghelo <angheloalf95@gmail.com> * A bunch of changes Signed-off-by: angie <angheloalf95@gmail.com> * run format.sh Signed-off-by: angie <angheloalf95@gmail.com> * Forgot to change updateMode Signed-off-by: Angie <angheloalf95@gmail.com> * Rename the references to object_gj Signed-off-by: Angie <angheloalf95@gmail.com> * Rename some functions Signed-off-by: Angie <angheloalf95@gmail.com> * document the actor params, a few members and rename some draw functions Signed-off-by: Angie <angheloalf95@gmail.com> * Rename DemoGj_DrawRubbleDisplayList into DemoGj_DrawRotated Signed-off-by: angie <angheloalf95@gmail.com> * The first type is the the rubble that is around the fight's arena Signed-off-by: angie <angheloalf95@gmail.com> * rename the enums Signed-off-by: angie <angheloalf95@gmail.com> * Document the value read from the Ganon instance and rename a few functions from that Signed-off-by: Angie <angheloalf95@gmail.com> * rename init and draw functions Signed-off-by: Angie <angheloalf95@gmail.com> * rename smoke spawner functions Signed-off-by: angie <angheloalf95@gmail.com> * run format.sh Signed-off-by: angie <angheloalf95@gmail.com> * fix merge issues Signed-off-by: Angie <angheloalf95@gmail.com>
2021-02-28 14:53:46 +00:00
include "build/src/overlays/actors/ovl_Demo_Gj/ovl_Demo_Gj_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Demo_Go"
include "build/src/overlays/actors/ovl_Demo_Go/z_demo_go.o"
Split ovl_file_choose and ovl_kaleido_scope (#167) * Split ovl_file_choose and ovl_kaleido_scope * Split ovl_kaleido_scope's rodata/data/bss * fix * fix spec * spec fix * hopefully last spec fix * hopefully last spec fix 2 * fix * Add comments on file boundaries * fix
2020-06-07 17:52:43 +00:00
include "build/src/overlays/actors/ovl_Demo_Go/ovl_Demo_Go_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Demo_Gt"
include "build/src/overlays/actors/ovl_Demo_Gt/z_demo_gt.o"
z_demo_gt.c, 2/112 non matching (#480) * Z_demo_gt.c * More progress * More progress * Some more progress * Mooore progress * Removes unused asm * Additional progress * More progress * 36 remaining * More progress?? * 19 remaining * some progress? * First draw function decompiled * func_80981694 * func_8097F508 * func_8097FF9C * WIP * func_80981E84 * func_80982244 * func_80981AA0 cannot believe it matched * func_8097D7D8 * Rand functions matched * Changes after rebase of GFX macros * func_8097F280 * func_8097FDDC * func_8097E824 some more progress, 2 left * Removes unused ASM * Cleanup / Function renaming * More cleanup / Renaming * review * review * format Co-authored-by: i82orbom <i82orbom i82orbom@github> Co-authored-by: fig <fig02srl@gmail.com>
2020-12-05 21:19:48 +00:00
include "build/src/overlays/actors/ovl_Demo_Gt/ovl_Demo_Gt_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Demo_Ik"
include "build/src/overlays/actors/ovl_Demo_Ik/z_demo_ik.o"
Demo_Ik (#620) * match * docs might be a while * cues * .s * review Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain> Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-01-31 20:33:48 +00:00
include "build/src/overlays/actors/ovl_Demo_Ik/ovl_Demo_Ik_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Demo_Im"
include "build/src/overlays/actors/ovl_Demo_Im/z_demo_im.o"
Decompiled ovl_Demo_Im (#296) * First steps * more * more * clean * Decompiled ovl_Demo_Im * fixes * comment update * consistency * PR comments
2020-08-15 18:07:28 +00:00
include "build/src/overlays/actors/ovl_Demo_Im/ovl_Demo_Im_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Demo_Kankyo"
ovl_Demo_Kankyo OK (#608) * Decompiled, not yet matched * Another match * Fix merge * OK * Move cutscene data to separate source files, name some functions and variables * Small cleanup * Some docs * Small improvements * Struct_Unk_150 -> DemoKankyo_Unk_150 * Review Suggestions Co-authored-by: mzxrules <mzxrules@gmail.com> Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Further review changes * rm reloc asm Co-authored-by: Thar0 <maximilianc64@gmail.com> Co-authored-by: mzxrules <mzxrules@gmail.com> Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2021-01-31 23:38:23 +00:00
include "build/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data1.o"
include "build/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data2.o"
include "build/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data3.o"
include "build/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data4.o"
include "build/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data5.o"
include "build/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data6.o"
include "build/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data7.o"
include "build/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data8.o"
First proper commit.
2020-03-17 04:31:30 +00:00
include "build/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.o"
ovl_Demo_Kankyo OK (#608) * Decompiled, not yet matched * Another match * Fix merge * OK * Move cutscene data to separate source files, name some functions and variables * Small cleanup * Some docs * Small improvements * Struct_Unk_150 -> DemoKankyo_Unk_150 * Review Suggestions Co-authored-by: mzxrules <mzxrules@gmail.com> Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Further review changes * rm reloc asm Co-authored-by: Thar0 <maximilianc64@gmail.com> Co-authored-by: mzxrules <mzxrules@gmail.com> Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2021-01-31 23:38:23 +00:00
include "build/src/overlays/actors/ovl_Demo_Kankyo/ovl_Demo_Kankyo_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Demo_Kekkai"
include "build/src/overlays/actors/ovl_Demo_Kekkai/z_demo_kekkai.o"
Demo_Kekkai, its object, and its cutscenes (#627) * first pass * scene * object * name * git subrepo pull --force tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "44f5d7cb9" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "44f5d7cb9" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * now with cutscenes * one last name * git subrepo pull --force tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "0305ec2c2" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "0305ec2c2" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * ZAPD works * git subrepo pull --force tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "2e1174063" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "2e1174063" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * now with vtx arrays * revert zap changes * review Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain> Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-02-01 19:52:23 +00:00
include "build/src/overlays/actors/ovl_Demo_Kekkai/ovl_Demo_Kekkai_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Demo_Sa"
include "build/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.o"
Decompiled ovl_Demo_Sa (#231) * Decompiled ovl_Demo_Sa * PR suggestions * ff -> alpha * PR suggestions * Reverting cutscene data
2020-07-08 23:40:09 +00:00
include "build/src/overlays/actors/ovl_Demo_Sa/ovl_Demo_Sa_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Demo_Shd"
include "build/src/overlays/actors/ovl_Demo_Shd/z_demo_shd.o"
Decompiled ovl_Demo_Shd (#388) * Decompiled ovl_Demo_Shd * Revert var change * gfxdata * vars in block * if (1) * PR comments
2020-09-27 01:12:19 +00:00
include "build/src/overlays/actors/ovl_Demo_Shd/ovl_Demo_Shd_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Demo_Tre_Lgt"
include "build/src/overlays/actors/ovl_Demo_Tre_Lgt/z_demo_tre_lgt.o"
z_demo_tre_lgt OK (#521) * z_demo_tre_lgt ok * ok * made suggested changes * fixed
2020-12-26 00:24:16 +00:00
include "build/src/overlays/actors/ovl_Demo_Tre_Lgt/ovl_Demo_Tre_Lgt_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Door_Ana"
include "build/src/overlays/actors/ovl_Door_Ana/z_door_ana.o"
Split ovl_file_choose and ovl_kaleido_scope (#167) * Split ovl_file_choose and ovl_kaleido_scope * Split ovl_kaleido_scope's rodata/data/bss * fix * fix spec * spec fix * hopefully last spec fix * hopefully last spec fix 2 * fix * Add comments on file boundaries * fix
2020-06-07 17:52:43 +00:00
include "build/src/overlays/actors/ovl_Door_Ana/ovl_Door_Ana_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Door_Gerudo"
include "build/src/overlays/actors/ovl_Door_Gerudo/z_door_gerudo.o"
Decompiled ovl_Door_Gerudo (#274) * Decompiled ovl_Door_Gerudo * Update include/z64actor.h Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update src/overlays/actors/ovl_Door_Gerudo/z_door_gerudo.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update src/overlays/actors/ovl_Door_Gerudo/z_door_gerudo.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update include/z64actor.h Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-07-19 20:36:18 +00:00
include "build/src/overlays/actors/ovl_Door_Gerudo/ovl_Door_Gerudo_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Door_Killer"
include "build/src/overlays/actors/ovl_Door_Killer/z_door_killer.o"
DoorKiller OK (#631) * Init done * slight tweak * Destroy done * func_80995020 * func_809951C4 done * started func_80995A84 * func_80995A84, func_80995284, func_809952B8 done * started the mess that is func_80995368 * most functions done except for 3 trouble cases * func_80995368 done * func_809958E4 done * fully matching. Documentation and cleanup to come * fixed fake matches * documentation progress * More documentation * getting close on tidying up everything * Finalised documentation and made some comments and name changes in player and other door files * formatting and final touches to comments * pr stuff * merge master * merge * format * remove unused asm after merge * review * \n Co-authored-by: fig02 <fig02srl@gmail.com>
2021-03-14 15:21:15 +00:00
include "build/src/overlays/actors/ovl_Door_Killer/ovl_Door_Killer_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Door_Shutter"
include "build/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.o"
ovl_Door_Shutter OK (#413) * Initial progress * Some more progress * Fix merge * OK * Small improvements * Further improvements * Some documentation, ran formatter * Small fix * Several review suggestions Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Further review changes * Space out declarations, better boolean comparisons Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Some ands to modulos * Swap condition Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Fix merge, PR suggestions * review Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> Co-authored-by: fig <fig02srl@gmail.com>
2020-12-03 21:55:01 +00:00
include "build/src/overlays/actors/ovl_Door_Shutter/ovl_Door_Shutter_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Door_Toki"
include "build/src/overlays/actors/ovl_Door_Toki/z_door_toki.o"
Split ovl_file_choose and ovl_kaleido_scope (#167) * Split ovl_file_choose and ovl_kaleido_scope * Split ovl_kaleido_scope's rodata/data/bss * fix * fix spec * spec fix * hopefully last spec fix * hopefully last spec fix 2 * fix * Add comments on file boundaries * fix
2020-06-07 17:52:43 +00:00
include "build/src/overlays/actors/ovl_Door_Toki/ovl_Door_Toki_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Door_Warp1"
include "build/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.o"
Decompile ovl_Door_Warp1 (#949) * Initial progress on Door_Warp1 * Fix merge * More work on Door_Warp1 * Decompile most of Door_Warp1 * 2 more functions OK * All decompiled, 3 nonmatching * Tiny improvements, fix several warnings * Remove commented GLOBAL_ASM lines * Fix * Fix merge * Two more matches * Some docs * More docs * Use generated reloc under NON_MATCHING * Fix accesses in ru1 * Add break and add limbs and dlists for the skeleton to the object xml * Comment values for enums Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com> * boolean returns for flag checking functions Co-authored-by: louist103 <35883445+louist103@users.noreply.github.com> * Named more loop variables i and named DoorWarp1_FloatPlayer * Last function matched thanks to Roman * Some further suggestions * Fix Co-authored-by: Thar0 <maximilianc64@gmail.com> Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com> Co-authored-by: louist103 <35883445+louist103@users.noreply.github.com>
2021-09-12 15:10:10 +00:00
include "build/src/overlays/actors/ovl_Door_Warp1/ovl_Door_Warp1_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Efc_Erupc"
include "build/src/overlays/actors/ovl_Efc_Erupc/z_efc_erupc.o"
ovl_Efc_Erupc OK (#773) * a few good dead Gfx_TwoTexScrolls * EfcErupc OK, mostly documented * review * remove fake match Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-04-25 23:12:42 +00:00
include "build/src/overlays/actors/ovl_Efc_Erupc/ovl_Efc_Erupc_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Eff_Dust"
include "build/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.o"
ovl_Eff_Dust OK (#655) * void func_8099D8D0(void *arg0, s32 arg1) Signed-off-by: angie <angheloalf95@gmail.com> * void func_8099D8D8(void *arg0, s32 arg1) Signed-off-by: angie <angheloalf95@gmail.com> * void EffDust_Destroy(Actor *thisx, GlobalContext *globalCtx) Signed-off-by: angie <angheloalf95@gmail.com> * Fix some pointers in the struct Signed-off-by: angie <angheloalf95@gmail.com> * Fix functions declarations Signed-off-by: angie <angheloalf95@gmail.com> * void EffDust_Init(Actor *thisx, GlobalContext *globalCtx) Signed-off-by: angie <angheloalf95@gmail.com> * EffDust_Update, EffDust_Draw, renaming and cleanup Signed-off-by: angie <angheloalf95@gmail.com> * void func_8099D8E0(EffDust *this) Signed-off-by: angie <angheloalf95@gmail.com> * void func_8099DB28(EffDust *this, GlobalContext *globalCtx) Signed-off-by: angie <angheloalf95@gmail.com> * void EffDust_UpdateFunc_8099DD74(EffDust *this, GlobalContext *globalCtx) Signed-off-by: angie <angheloalf95@gmail.com> * Members renaming Signed-off-by: Anghelo <angheloalf95@gmail.com> * NON_MATCHING void func_8099E4F4(EffDust *this, GlobalContext *globalCtx) Signed-off-by: Anghelo <angheloalf95@gmail.com> * void func_8099DFC0(EffDust *this, GlobalContext *globalCtx) Signed-off-by: Anghelo <angheloalf95@gmail.com> * NON_MATCHING void func_8099E784(EffDust *this, GlobalContext *globalCtx) Signed-off-by: angie <angheloalf95@gmail.com> * NON_MATCHING func_8099E784 - score 100 Signed-off-by: Anghelo <angheloalf95@gmail.com> * func_8099E784 still not matching Signed-off-by: Anghelo <angheloalf95@gmail.com> * almost there (func_8099E784) Signed-off-by: Anghelo <angheloalf95@gmail.com> * func_8099E784 matching. needs cleanup Signed-off-by: Anghelo <angheloalf95@gmail.com> * void func_8099E784(EffDust *this, GlobalContext *globalCtx) Signed-off-by: Anghelo <angheloalf95@gmail.com> * Rename most members of the struct Signed-off-by: Anghelo <angheloalf95@gmail.com> * void func_8099E4F4(EffDust *this, GlobalContext *globalCtx) matching Signed-off-by: Anghelo <angheloalf95@gmail.com> * Rename a few variables and functions Signed-off-by: Anghelo <angheloalf95@gmail.com> * Add an enum for the possibles values for actor.param Signed-off-by: angie <angheloalf95@gmail.com> * format files Signed-off-by: angie <angheloalf95@gmail.com> * fix merge problems Signed-off-by: angie <angheloalf95@gmail.com> * delete reloc Signed-off-by: angie <angheloalf95@gmail.com> * remove defined symbols from undefined_syms Signed-off-by: angie <angheloalf95@gmail.com> * a bunch of functions Signed-off-by: angie <angheloalf95@gmail.com> * another bunch of functions Signed-off-by: angie <angheloalf95@gmail.com> * add dummies to func_8097911C to match it Signed-off-by: angie <angheloalf95@gmail.com> * fix some functions declarations Signed-off-by: angie <angheloalf95@gmail.com> * Add functions of the array used by the update function Signed-off-by: angie <angheloalf95@gmail.com> * add functions used by draw Signed-off-by: angie <angheloalf95@gmail.com> * draw and update functions Signed-off-by: angie <angheloalf95@gmail.com> * DemoGj_Init Signed-off-by: angie <angheloalf95@gmail.com> * fix some functions declarations Signed-off-by: Anghelo <angheloalf95@gmail.com> * 9 small functions Signed-off-by: Anghelo <angheloalf95@gmail.com> * Some unmatched functions and 12 small matched functions Signed-off-by: Anghelo <angheloalf95@gmail.com> * another 7 small functions Signed-off-by: Anghelo <angheloalf95@gmail.com> * add data Signed-off-by: Anghelo <angheloalf95@gmail.com> * small types fixes Signed-off-by: Anghelo <angheloalf95@gmail.com> * six more functions Signed-off-by: angie <angheloalf95@gmail.com> * func_80978C20 Signed-off-by: angie <angheloalf95@gmail.com> * func_8097BA48 Signed-off-by: Anghelo <angheloalf95@gmail.com> * five repeated functions Signed-off-by: Anghelo <angheloalf95@gmail.com> * Array of cylinders and two other functions Signed-off-by: Anghelo <angheloalf95@gmail.com> * seven equals and problematic functions Signed-off-by: Anghelo <angheloalf95@gmail.com> * func_80978F60 and func_80979860 Signed-off-by: angie <angheloalf95@gmail.com> * func_8097923C doesn't want to match :c Signed-off-by: Anghelo <angheloalf95@gmail.com> * three not matching functions Signed-off-by: Anghelo <angheloalf95@gmail.com> * func_80978AFC Signed-off-by: Anghelo <angheloalf95@gmail.com> * three more Signed-off-by: Anghelo <angheloalf95@gmail.com> * DemoGj_FindGanon Signed-off-by: angie <angheloalf95@gmail.com> * func_809797E4 Signed-off-by: angie <angheloalf95@gmail.com> * func_80978B90 Signed-off-by: angie <angheloalf95@gmail.com> * last non matching function Signed-off-by: angie <angheloalf95@gmail.com> * erase reloc Signed-off-by: angie <angheloalf95@gmail.com> * a bit of renaming Signed-off-by: angie <angheloalf95@gmail.com> * another chunk of renaming Signed-off-by: angie <angheloalf95@gmail.com> * fix reg macros and a few comments Signed-off-by: Anghelo <angheloalf95@gmail.com> * vt, arrayfuncs renaming and another bit of renaming Signed-off-by: Anghelo <angheloalf95@gmail.com> * More renaming Signed-off-by: Anghelo <angheloalf95@gmail.com> * i'm hating this actor Signed-off-by: angie <angheloalf95@gmail.com> * format Signed-off-by: angie <angheloalf95@gmail.com> * Changes asked by @shawlucas Signed-off-by: Anghelo <angheloalf95@gmail.com> * changes asked by @louist103 Signed-off-by: angie <angheloalf95@gmail.com> * Revert "Merge branch 'ovl_Demo_Gj' of github.com:AngheloAlf/oot into ovl_Eff_Dust" This reverts commit 12e0e5d2a672e145d540a5315c5e73564402ded0, reversing changes made to b251f1d234a9aab4d80884fe1b75975590afa253. * fix merge problems Signed-off-by: Anghelo <angheloalf95@gmail.com> * Rename the param's enum and move it to header Signed-off-by: angie <angheloalf95@gmail.com> * add file description Signed-off-by: angie <angheloalf95@gmail.com> * Some changes requested by @Roman971 Signed-off-by: angie <angheloalf95@gmail.com> * more changes Signed-off-by: angie <angheloalf95@gmail.com> * Change the particles amount from hex to decimal Signed-off-by: angie <angheloalf95@gmail.com> * `format.sh` should also format headers :s Signed-off-by: angie <angheloalf95@gmail.com>
2021-02-13 00:04:22 +00:00
include "build/src/overlays/actors/ovl_Eff_Dust/ovl_Eff_Dust_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Effect_Ss_Blast"
Rename effects ss C files to z_eff_ss_* instead of z_effect_ss_* (#109) Just rectifying effect files to their correct original names, which was planned for a while.
2020-05-02 04:05:44 +00:00
include "build/src/overlays/effects/ovl_Effect_Ss_Blast/z_eff_ss_blast.o"
Bomb Related Effect Overlays (#283) * fix colliderinit typo * dead sound done * deadsound documentation * blast done * progress * spk init * progress * spark done * ss bomb ok * bomb done * cleanup * progress * progress * almost done with bomb2 * clean up gossip stone * more * cleanup and format * remove unused asm file * nonmatching reloc * done i think * mistakes * fix headers * idk how that got in here * match bomb2 * asm file * pr review
2020-07-28 19:49:00 +00:00
include "build/src/overlays/effects/ovl_Effect_Ss_Blast/ovl_Effect_Ss_Blast_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Effect_Ss_Bomb"
Rename effects ss C files to z_eff_ss_* instead of z_effect_ss_* (#109) Just rectifying effect files to their correct original names, which was planned for a while.
2020-05-02 04:05:44 +00:00
include "build/src/overlays/effects/ovl_Effect_Ss_Bomb/z_eff_ss_bomb.o"
Bomb Related Effect Overlays (#283) * fix colliderinit typo * dead sound done * deadsound documentation * blast done * progress * spk init * progress * spark done * ss bomb ok * bomb done * cleanup * progress * progress * almost done with bomb2 * clean up gossip stone * more * cleanup and format * remove unused asm file * nonmatching reloc * done i think * mistakes * fix headers * idk how that got in here * match bomb2 * asm file * pr review
2020-07-28 19:49:00 +00:00
include "build/src/overlays/effects/ovl_Effect_Ss_Bomb/ovl_Effect_Ss_Bomb_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Effect_Ss_Bomb2"
Rename effects ss C files to z_eff_ss_* instead of z_effect_ss_* (#109) Just rectifying effect files to their correct original names, which was planned for a while.
2020-05-02 04:05:44 +00:00
include "build/src/overlays/effects/ovl_Effect_Ss_Bomb2/z_eff_ss_bomb2.o"
Bomb Related Effect Overlays (#283) * fix colliderinit typo * dead sound done * deadsound documentation * blast done * progress * spk init * progress * spark done * ss bomb ok * bomb done * cleanup * progress * progress * almost done with bomb2 * clean up gossip stone * more * cleanup and format * remove unused asm file * nonmatching reloc * done i think * mistakes * fix headers * idk how that got in here * match bomb2 * asm file * pr review
2020-07-28 19:49:00 +00:00
include "build/src/overlays/effects/ovl_Effect_Ss_Bomb2/ovl_Effect_Ss_Bomb2_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Effect_Ss_Bubble"
Rename effects ss C files to z_eff_ss_* instead of z_effect_ss_* (#109) Just rectifying effect files to their correct original names, which was planned for a while.
2020-05-02 04:05:44 +00:00
include "build/src/overlays/effects/ovl_Effect_Ss_Bubble/z_eff_ss_bubble.o"
All Effect Overlays and z_effect_soft_sprite_old_init.c OK (#396) * fix colliderinit typo * dead sound done * deadsound documentation * blast done * progress * spk init * progress * spark done * ss bomb ok * bomb done * cleanup * progress * progress * almost done with bomb2 * clean up gossip stone * more * cleanup and format * remove unused asm file * nonmatching reloc * done i think * mistakes * fix headers * idk how that got in here * EffectSsStick OK * progress * fix conflicting name * progress * splash OK * uname fields * progress * lightning OK * remove unwanted files * kirakira ok * kirakira done * magma OK * remove files * ss_g_fire OK * name funcs * progress * progress * magma2 and kakera OK * eff_ss_dead_dd OK * fcircle OK * stone1 OK * sibuki2 OK * dt_bubble OK * deaddb OK * sibuki OK * dead_ds OK * ice_smoke OK * hitmark OK * hahen OK * k_fire OK * en_fire OK * starting colors * color changes 1 * color switch done * init file data migrated * data cleanup * ice_piece OK * en_ice OK * progress * progress * docs progress * fix blast color names * documentation pass 1 * progress * cleanup pass 2 * touchups * added to functions.h * small changes * fix functions.h * renaming progress * name progress * color enum * more cleanups * enice changes * final cleanups * remove unwanted file * lightning -> shock * pr suggestions * fix comment * remove unwanted comments
2020-09-30 00:18:46 +00:00
include "build/src/overlays/effects/ovl_Effect_Ss_Bubble/ovl_Effect_Ss_Bubble_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Effect_Ss_D_Fire"
Rename effects ss C files to z_eff_ss_* instead of z_effect_ss_* (#109) Just rectifying effect files to their correct original names, which was planned for a while.
2020-05-02 04:05:44 +00:00
include "build/src/overlays/effects/ovl_Effect_Ss_D_Fire/z_eff_ss_d_fire.o"
All Effect Overlays and z_effect_soft_sprite_old_init.c OK (#396) * fix colliderinit typo * dead sound done * deadsound documentation * blast done * progress * spk init * progress * spark done * ss bomb ok * bomb done * cleanup * progress * progress * almost done with bomb2 * clean up gossip stone * more * cleanup and format * remove unused asm file * nonmatching reloc * done i think * mistakes * fix headers * idk how that got in here * EffectSsStick OK * progress * fix conflicting name * progress * splash OK * uname fields * progress * lightning OK * remove unwanted files * kirakira ok * kirakira done * magma OK * remove files * ss_g_fire OK * name funcs * progress * progress * magma2 and kakera OK * eff_ss_dead_dd OK * fcircle OK * stone1 OK * sibuki2 OK * dt_bubble OK * deaddb OK * sibuki OK * dead_ds OK * ice_smoke OK * hitmark OK * hahen OK * k_fire OK * en_fire OK * starting colors * color changes 1 * color switch done * init file data migrated * data cleanup * ice_piece OK * en_ice OK * progress * progress * docs progress * fix blast color names * documentation pass 1 * progress * cleanup pass 2 * touchups * added to functions.h * small changes * fix functions.h * renaming progress * name progress * color enum * more cleanups * enice changes * final cleanups * remove unwanted file * lightning -> shock * pr suggestions * fix comment * remove unwanted comments
2020-09-30 00:18:46 +00:00
include "build/src/overlays/effects/ovl_Effect_Ss_D_Fire/ovl_Effect_Ss_D_Fire_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Effect_Ss_Dead_Db"
Rename effects ss C files to z_eff_ss_* instead of z_effect_ss_* (#109) Just rectifying effect files to their correct original names, which was planned for a while.
2020-05-02 04:05:44 +00:00
include "build/src/overlays/effects/ovl_Effect_Ss_Dead_Db/z_eff_ss_dead_db.o"
All Effect Overlays and z_effect_soft_sprite_old_init.c OK (#396) * fix colliderinit typo * dead sound done * deadsound documentation * blast done * progress * spk init * progress * spark done * ss bomb ok * bomb done * cleanup * progress * progress * almost done with bomb2 * clean up gossip stone * more * cleanup and format * remove unused asm file * nonmatching reloc * done i think * mistakes * fix headers * idk how that got in here * EffectSsStick OK * progress * fix conflicting name * progress * splash OK * uname fields * progress * lightning OK * remove unwanted files * kirakira ok * kirakira done * magma OK * remove files * ss_g_fire OK * name funcs * progress * progress * magma2 and kakera OK * eff_ss_dead_dd OK * fcircle OK * stone1 OK * sibuki2 OK * dt_bubble OK * deaddb OK * sibuki OK * dead_ds OK * ice_smoke OK * hitmark OK * hahen OK * k_fire OK * en_fire OK * starting colors * color changes 1 * color switch done * init file data migrated * data cleanup * ice_piece OK * en_ice OK * progress * progress * docs progress * fix blast color names * documentation pass 1 * progress * cleanup pass 2 * touchups * added to functions.h * small changes * fix functions.h * renaming progress * name progress * color enum * more cleanups * enice changes * final cleanups * remove unwanted file * lightning -> shock * pr suggestions * fix comment * remove unwanted comments
2020-09-30 00:18:46 +00:00
include "build/src/overlays/effects/ovl_Effect_Ss_Dead_Db/ovl_Effect_Ss_Dead_Db_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Effect_Ss_Dead_Dd"
Rename effects ss C files to z_eff_ss_* instead of z_effect_ss_* (#109) Just rectifying effect files to their correct original names, which was planned for a while.
2020-05-02 04:05:44 +00:00
include "build/src/overlays/effects/ovl_Effect_Ss_Dead_Dd/z_eff_ss_dead_dd.o"
All Effect Overlays and z_effect_soft_sprite_old_init.c OK (#396) * fix colliderinit typo * dead sound done * deadsound documentation * blast done * progress * spk init * progress * spark done * ss bomb ok * bomb done * cleanup * progress * progress * almost done with bomb2 * clean up gossip stone * more * cleanup and format * remove unused asm file * nonmatching reloc * done i think * mistakes * fix headers * idk how that got in here * EffectSsStick OK * progress * fix conflicting name * progress * splash OK * uname fields * progress * lightning OK * remove unwanted files * kirakira ok * kirakira done * magma OK * remove files * ss_g_fire OK * name funcs * progress * progress * magma2 and kakera OK * eff_ss_dead_dd OK * fcircle OK * stone1 OK * sibuki2 OK * dt_bubble OK * deaddb OK * sibuki OK * dead_ds OK * ice_smoke OK * hitmark OK * hahen OK * k_fire OK * en_fire OK * starting colors * color changes 1 * color switch done * init file data migrated * data cleanup * ice_piece OK * en_ice OK * progress * progress * docs progress * fix blast color names * documentation pass 1 * progress * cleanup pass 2 * touchups * added to functions.h * small changes * fix functions.h * renaming progress * name progress * color enum * more cleanups * enice changes * final cleanups * remove unwanted file * lightning -> shock * pr suggestions * fix comment * remove unwanted comments
2020-09-30 00:18:46 +00:00
include "build/src/overlays/effects/ovl_Effect_Ss_Dead_Dd/ovl_Effect_Ss_Dead_Dd_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Effect_Ss_Dead_Ds"
Rename effects ss C files to z_eff_ss_* instead of z_effect_ss_* (#109) Just rectifying effect files to their correct original names, which was planned for a while.
2020-05-02 04:05:44 +00:00
include "build/src/overlays/effects/ovl_Effect_Ss_Dead_Ds/z_eff_ss_dead_ds.o"
All Effect Overlays and z_effect_soft_sprite_old_init.c OK (#396) * fix colliderinit typo * dead sound done * deadsound documentation * blast done * progress * spk init * progress * spark done * ss bomb ok * bomb done * cleanup * progress * progress * almost done with bomb2 * clean up gossip stone * more * cleanup and format * remove unused asm file * nonmatching reloc * done i think * mistakes * fix headers * idk how that got in here * EffectSsStick OK * progress * fix conflicting name * progress * splash OK * uname fields * progress * lightning OK * remove unwanted files * kirakira ok * kirakira done * magma OK * remove files * ss_g_fire OK * name funcs * progress * progress * magma2 and kakera OK * eff_ss_dead_dd OK * fcircle OK * stone1 OK * sibuki2 OK * dt_bubble OK * deaddb OK * sibuki OK * dead_ds OK * ice_smoke OK * hitmark OK * hahen OK * k_fire OK * en_fire OK * starting colors * color changes 1 * color switch done * init file data migrated * data cleanup * ice_piece OK * en_ice OK * progress * progress * docs progress * fix blast color names * documentation pass 1 * progress * cleanup pass 2 * touchups * added to functions.h * small changes * fix functions.h * renaming progress * name progress * color enum * more cleanups * enice changes * final cleanups * remove unwanted file * lightning -> shock * pr suggestions * fix comment * remove unwanted comments
2020-09-30 00:18:46 +00:00
include "build/src/overlays/effects/ovl_Effect_Ss_Dead_Ds/ovl_Effect_Ss_Dead_Ds_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Effect_Ss_Dead_Sound"
Rename effects ss C files to z_eff_ss_* instead of z_effect_ss_* (#109) Just rectifying effect files to their correct original names, which was planned for a while.
2020-05-02 04:05:44 +00:00
include "build/src/overlays/effects/ovl_Effect_Ss_Dead_Sound/z_eff_ss_dead_sound.o"
Bomb Related Effect Overlays (#283) * fix colliderinit typo * dead sound done * deadsound documentation * blast done * progress * spk init * progress * spark done * ss bomb ok * bomb done * cleanup * progress * progress * almost done with bomb2 * clean up gossip stone * more * cleanup and format * remove unused asm file * nonmatching reloc * done i think * mistakes * fix headers * idk how that got in here * match bomb2 * asm file * pr review
2020-07-28 19:49:00 +00:00
include "build/src/overlays/effects/ovl_Effect_Ss_Dead_Sound/ovl_Effect_Ss_Dead_Sound_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Effect_Ss_Dt_Bubble"
Rename effects ss C files to z_eff_ss_* instead of z_effect_ss_* (#109) Just rectifying effect files to their correct original names, which was planned for a while.
2020-05-02 04:05:44 +00:00
include "build/src/overlays/effects/ovl_Effect_Ss_Dt_Bubble/z_eff_ss_dt_bubble.o"
All Effect Overlays and z_effect_soft_sprite_old_init.c OK (#396) * fix colliderinit typo * dead sound done * deadsound documentation * blast done * progress * spk init * progress * spark done * ss bomb ok * bomb done * cleanup * progress * progress * almost done with bomb2 * clean up gossip stone * more * cleanup and format * remove unused asm file * nonmatching reloc * done i think * mistakes * fix headers * idk how that got in here * EffectSsStick OK * progress * fix conflicting name * progress * splash OK * uname fields * progress * lightning OK * remove unwanted files * kirakira ok * kirakira done * magma OK * remove files * ss_g_fire OK * name funcs * progress * progress * magma2 and kakera OK * eff_ss_dead_dd OK * fcircle OK * stone1 OK * sibuki2 OK * dt_bubble OK * deaddb OK * sibuki OK * dead_ds OK * ice_smoke OK * hitmark OK * hahen OK * k_fire OK * en_fire OK * starting colors * color changes 1 * color switch done * init file data migrated * data cleanup * ice_piece OK * en_ice OK * progress * progress * docs progress * fix blast color names * documentation pass 1 * progress * cleanup pass 2 * touchups * added to functions.h * small changes * fix functions.h * renaming progress * name progress * color enum * more cleanups * enice changes * final cleanups * remove unwanted file * lightning -> shock * pr suggestions * fix comment * remove unwanted comments
2020-09-30 00:18:46 +00:00
include "build/src/overlays/effects/ovl_Effect_Ss_Dt_Bubble/ovl_Effect_Ss_Dt_Bubble_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Effect_Ss_Dust"
Rename effects ss C files to z_eff_ss_* instead of z_effect_ss_* (#109) Just rectifying effect files to their correct original names, which was planned for a while.
2020-05-02 04:05:44 +00:00
include "build/src/overlays/effects/ovl_Effect_Ss_Dust/z_eff_ss_dust.o"
Bg_Heavy_Block and Eff_Ss_Dust (#258) * heavy_rock progress * heavy block progress, 2 functions left * progress * progress * heavy_block OK * comments * heavy block done * eff ss dust ok * naming * done i think * comment * clean up dust usages * remove docs * remove reloc * move enum and rename flag * effect enum
2020-07-19 13:54:24 +00:00
include "build/src/overlays/effects/ovl_Effect_Ss_Dust/ovl_Effect_Ss_Dust_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Effect_Ss_En_Fire"
Rename effects ss C files to z_eff_ss_* instead of z_effect_ss_* (#109) Just rectifying effect files to their correct original names, which was planned for a while.
2020-05-02 04:05:44 +00:00
include "build/src/overlays/effects/ovl_Effect_Ss_En_Fire/z_eff_ss_en_fire.o"
All Effect Overlays and z_effect_soft_sprite_old_init.c OK (#396) * fix colliderinit typo * dead sound done * deadsound documentation * blast done * progress * spk init * progress * spark done * ss bomb ok * bomb done * cleanup * progress * progress * almost done with bomb2 * clean up gossip stone * more * cleanup and format * remove unused asm file * nonmatching reloc * done i think * mistakes * fix headers * idk how that got in here * EffectSsStick OK * progress * fix conflicting name * progress * splash OK * uname fields * progress * lightning OK * remove unwanted files * kirakira ok * kirakira done * magma OK * remove files * ss_g_fire OK * name funcs * progress * progress * magma2 and kakera OK * eff_ss_dead_dd OK * fcircle OK * stone1 OK * sibuki2 OK * dt_bubble OK * deaddb OK * sibuki OK * dead_ds OK * ice_smoke OK * hitmark OK * hahen OK * k_fire OK * en_fire OK * starting colors * color changes 1 * color switch done * init file data migrated * data cleanup * ice_piece OK * en_ice OK * progress * progress * docs progress * fix blast color names * documentation pass 1 * progress * cleanup pass 2 * touchups * added to functions.h * small changes * fix functions.h * renaming progress * name progress * color enum * more cleanups * enice changes * final cleanups * remove unwanted file * lightning -> shock * pr suggestions * fix comment * remove unwanted comments
2020-09-30 00:18:46 +00:00
include "build/src/overlays/effects/ovl_Effect_Ss_En_Fire/ovl_Effect_Ss_En_Fire_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Effect_Ss_En_Ice"
Rename effects ss C files to z_eff_ss_* instead of z_effect_ss_* (#109) Just rectifying effect files to their correct original names, which was planned for a while.
2020-05-02 04:05:44 +00:00
include "build/src/overlays/effects/ovl_Effect_Ss_En_Ice/z_eff_ss_en_ice.o"
All Effect Overlays and z_effect_soft_sprite_old_init.c OK (#396) * fix colliderinit typo * dead sound done * deadsound documentation * blast done * progress * spk init * progress * spark done * ss bomb ok * bomb done * cleanup * progress * progress * almost done with bomb2 * clean up gossip stone * more * cleanup and format * remove unused asm file * nonmatching reloc * done i think * mistakes * fix headers * idk how that got in here * EffectSsStick OK * progress * fix conflicting name * progress * splash OK * uname fields * progress * lightning OK * remove unwanted files * kirakira ok * kirakira done * magma OK * remove files * ss_g_fire OK * name funcs * progress * progress * magma2 and kakera OK * eff_ss_dead_dd OK * fcircle OK * stone1 OK * sibuki2 OK * dt_bubble OK * deaddb OK * sibuki OK * dead_ds OK * ice_smoke OK * hitmark OK * hahen OK * k_fire OK * en_fire OK * starting colors * color changes 1 * color switch done * init file data migrated * data cleanup * ice_piece OK * en_ice OK * progress * progress * docs progress * fix blast color names * documentation pass 1 * progress * cleanup pass 2 * touchups * added to functions.h * small changes * fix functions.h * renaming progress * name progress * color enum * more cleanups * enice changes * final cleanups * remove unwanted file * lightning -> shock * pr suggestions * fix comment * remove unwanted comments
2020-09-30 00:18:46 +00:00
include "build/src/overlays/effects/ovl_Effect_Ss_En_Ice/ovl_Effect_Ss_En_Ice_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Effect_Ss_Extra"
Rename effects ss C files to z_eff_ss_* instead of z_effect_ss_* (#109) Just rectifying effect files to their correct original names, which was planned for a while.
2020-05-02 04:05:44 +00:00
include "build/src/overlays/effects/ovl_Effect_Ss_Extra/z_eff_ss_extra.o"
ovl_Effect_Ss_Extra (#339) * ovl_Effect_Ss_Extra * EffectSsExtra_Spawn * Typo * PR review * PR review
2020-09-04 21:22:12 +00:00
include "build/src/overlays/effects/ovl_Effect_Ss_Extra/ovl_Effect_Ss_Extra_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Effect_Ss_Fcircle"
Rename effects ss C files to z_eff_ss_* instead of z_effect_ss_* (#109) Just rectifying effect files to their correct original names, which was planned for a while.
2020-05-02 04:05:44 +00:00
include "build/src/overlays/effects/ovl_Effect_Ss_Fcircle/z_eff_ss_fcircle.o"
All Effect Overlays and z_effect_soft_sprite_old_init.c OK (#396) * fix colliderinit typo * dead sound done * deadsound documentation * blast done * progress * spk init * progress * spark done * ss bomb ok * bomb done * cleanup * progress * progress * almost done with bomb2 * clean up gossip stone * more * cleanup and format * remove unused asm file * nonmatching reloc * done i think * mistakes * fix headers * idk how that got in here * EffectSsStick OK * progress * fix conflicting name * progress * splash OK * uname fields * progress * lightning OK * remove unwanted files * kirakira ok * kirakira done * magma OK * remove files * ss_g_fire OK * name funcs * progress * progress * magma2 and kakera OK * eff_ss_dead_dd OK * fcircle OK * stone1 OK * sibuki2 OK * dt_bubble OK * deaddb OK * sibuki OK * dead_ds OK * ice_smoke OK * hitmark OK * hahen OK * k_fire OK * en_fire OK * starting colors * color changes 1 * color switch done * init file data migrated * data cleanup * ice_piece OK * en_ice OK * progress * progress * docs progress * fix blast color names * documentation pass 1 * progress * cleanup pass 2 * touchups * added to functions.h * small changes * fix functions.h * renaming progress * name progress * color enum * more cleanups * enice changes * final cleanups * remove unwanted file * lightning -> shock * pr suggestions * fix comment * remove unwanted comments
2020-09-30 00:18:46 +00:00
include "build/src/overlays/effects/ovl_Effect_Ss_Fcircle/ovl_Effect_Ss_Fcircle_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Effect_Ss_Fhg_Flash"
Rename effects ss C files to z_eff_ss_* instead of z_effect_ss_* (#109) Just rectifying effect files to their correct original names, which was planned for a while.
2020-05-02 04:05:44 +00:00
include "build/src/overlays/effects/ovl_Effect_Ss_Fhg_Flash/z_eff_ss_fhg_flash.o"
All Effect Overlays and z_effect_soft_sprite_old_init.c OK (#396) * fix colliderinit typo * dead sound done * deadsound documentation * blast done * progress * spk init * progress * spark done * ss bomb ok * bomb done * cleanup * progress * progress * almost done with bomb2 * clean up gossip stone * more * cleanup and format * remove unused asm file * nonmatching reloc * done i think * mistakes * fix headers * idk how that got in here * EffectSsStick OK * progress * fix conflicting name * progress * splash OK * uname fields * progress * lightning OK * remove unwanted files * kirakira ok * kirakira done * magma OK * remove files * ss_g_fire OK * name funcs * progress * progress * magma2 and kakera OK * eff_ss_dead_dd OK * fcircle OK * stone1 OK * sibuki2 OK * dt_bubble OK * deaddb OK * sibuki OK * dead_ds OK * ice_smoke OK * hitmark OK * hahen OK * k_fire OK * en_fire OK * starting colors * color changes 1 * color switch done * init file data migrated * data cleanup * ice_piece OK * en_ice OK * progress * progress * docs progress * fix blast color names * documentation pass 1 * progress * cleanup pass 2 * touchups * added to functions.h * small changes * fix functions.h * renaming progress * name progress * color enum * more cleanups * enice changes * final cleanups * remove unwanted file * lightning -> shock * pr suggestions * fix comment * remove unwanted comments
2020-09-30 00:18:46 +00:00
include "build/src/overlays/effects/ovl_Effect_Ss_Fhg_Flash/ovl_Effect_Ss_Fhg_Flash_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Effect_Ss_Fire_Tail"
Rename effects ss C files to z_eff_ss_* instead of z_effect_ss_* (#109) Just rectifying effect files to their correct original names, which was planned for a while.
2020-05-02 04:05:44 +00:00
include "build/src/overlays/effects/ovl_Effect_Ss_Fire_Tail/z_eff_ss_fire_tail.o"
All Effect Overlays and z_effect_soft_sprite_old_init.c OK (#396) * fix colliderinit typo * dead sound done * deadsound documentation * blast done * progress * spk init * progress * spark done * ss bomb ok * bomb done * cleanup * progress * progress * almost done with bomb2 * clean up gossip stone * more * cleanup and format * remove unused asm file * nonmatching reloc * done i think * mistakes * fix headers * idk how that got in here * EffectSsStick OK * progress * fix conflicting name * progress * splash OK * uname fields * progress * lightning OK * remove unwanted files * kirakira ok * kirakira done * magma OK * remove files * ss_g_fire OK * name funcs * progress * progress * magma2 and kakera OK * eff_ss_dead_dd OK * fcircle OK * stone1 OK * sibuki2 OK * dt_bubble OK * deaddb OK * sibuki OK * dead_ds OK * ice_smoke OK * hitmark OK * hahen OK * k_fire OK * en_fire OK * starting colors * color changes 1 * color switch done * init file data migrated * data cleanup * ice_piece OK * en_ice OK * progress * progress * docs progress * fix blast color names * documentation pass 1 * progress * cleanup pass 2 * touchups * added to functions.h * small changes * fix functions.h * renaming progress * name progress * color enum * more cleanups * enice changes * final cleanups * remove unwanted file * lightning -> shock * pr suggestions * fix comment * remove unwanted comments
2020-09-30 00:18:46 +00:00
include "build/src/overlays/effects/ovl_Effect_Ss_Fire_Tail/ovl_Effect_Ss_Fire_Tail_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Effect_Ss_G_Fire"
Rename effects ss C files to z_eff_ss_* instead of z_effect_ss_* (#109) Just rectifying effect files to their correct original names, which was planned for a while.
2020-05-02 04:05:44 +00:00
include "build/src/overlays/effects/ovl_Effect_Ss_G_Fire/z_eff_ss_g_fire.o"
All Effect Overlays and z_effect_soft_sprite_old_init.c OK (#396) * fix colliderinit typo * dead sound done * deadsound documentation * blast done * progress * spk init * progress * spark done * ss bomb ok * bomb done * cleanup * progress * progress * almost done with bomb2 * clean up gossip stone * more * cleanup and format * remove unused asm file * nonmatching reloc * done i think * mistakes * fix headers * idk how that got in here * EffectSsStick OK * progress * fix conflicting name * progress * splash OK * uname fields * progress * lightning OK * remove unwanted files * kirakira ok * kirakira done * magma OK * remove files * ss_g_fire OK * name funcs * progress * progress * magma2 and kakera OK * eff_ss_dead_dd OK * fcircle OK * stone1 OK * sibuki2 OK * dt_bubble OK * deaddb OK * sibuki OK * dead_ds OK * ice_smoke OK * hitmark OK * hahen OK * k_fire OK * en_fire OK * starting colors * color changes 1 * color switch done * init file data migrated * data cleanup * ice_piece OK * en_ice OK * progress * progress * docs progress * fix blast color names * documentation pass 1 * progress * cleanup pass 2 * touchups * added to functions.h * small changes * fix functions.h * renaming progress * name progress * color enum * more cleanups * enice changes * final cleanups * remove unwanted file * lightning -> shock * pr suggestions * fix comment * remove unwanted comments
2020-09-30 00:18:46 +00:00
include "build/src/overlays/effects/ovl_Effect_Ss_G_Fire/ovl_Effect_Ss_G_Fire_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Effect_Ss_G_Magma"
Rename effects ss C files to z_eff_ss_* instead of z_effect_ss_* (#109) Just rectifying effect files to their correct original names, which was planned for a while.
2020-05-02 04:05:44 +00:00
include "build/src/overlays/effects/ovl_Effect_Ss_G_Magma/z_eff_ss_g_magma.o"
All Effect Overlays and z_effect_soft_sprite_old_init.c OK (#396) * fix colliderinit typo * dead sound done * deadsound documentation * blast done * progress * spk init * progress * spark done * ss bomb ok * bomb done * cleanup * progress * progress * almost done with bomb2 * clean up gossip stone * more * cleanup and format * remove unused asm file * nonmatching reloc * done i think * mistakes * fix headers * idk how that got in here * EffectSsStick OK * progress * fix conflicting name * progress * splash OK * uname fields * progress * lightning OK * remove unwanted files * kirakira ok * kirakira done * magma OK * remove files * ss_g_fire OK * name funcs * progress * progress * magma2 and kakera OK * eff_ss_dead_dd OK * fcircle OK * stone1 OK * sibuki2 OK * dt_bubble OK * deaddb OK * sibuki OK * dead_ds OK * ice_smoke OK * hitmark OK * hahen OK * k_fire OK * en_fire OK * starting colors * color changes 1 * color switch done * init file data migrated * data cleanup * ice_piece OK * en_ice OK * progress * progress * docs progress * fix blast color names * documentation pass 1 * progress * cleanup pass 2 * touchups * added to functions.h * small changes * fix functions.h * renaming progress * name progress * color enum * more cleanups * enice changes * final cleanups * remove unwanted file * lightning -> shock * pr suggestions * fix comment * remove unwanted comments
2020-09-30 00:18:46 +00:00
include "build/src/overlays/effects/ovl_Effect_Ss_G_Magma/ovl_Effect_Ss_G_Magma_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Effect_Ss_G_Magma2"
Rename effects ss C files to z_eff_ss_* instead of z_effect_ss_* (#109) Just rectifying effect files to their correct original names, which was planned for a while.
2020-05-02 04:05:44 +00:00
include "build/src/overlays/effects/ovl_Effect_Ss_G_Magma2/z_eff_ss_g_magma2.o"
All Effect Overlays and z_effect_soft_sprite_old_init.c OK (#396) * fix colliderinit typo * dead sound done * deadsound documentation * blast done * progress * spk init * progress * spark done * ss bomb ok * bomb done * cleanup * progress * progress * almost done with bomb2 * clean up gossip stone * more * cleanup and format * remove unused asm file * nonmatching reloc * done i think * mistakes * fix headers * idk how that got in here * EffectSsStick OK * progress * fix conflicting name * progress * splash OK * uname fields * progress * lightning OK * remove unwanted files * kirakira ok * kirakira done * magma OK * remove files * ss_g_fire OK * name funcs * progress * progress * magma2 and kakera OK * eff_ss_dead_dd OK * fcircle OK * stone1 OK * sibuki2 OK * dt_bubble OK * deaddb OK * sibuki OK * dead_ds OK * ice_smoke OK * hitmark OK * hahen OK * k_fire OK * en_fire OK * starting colors * color changes 1 * color switch done * init file data migrated * data cleanup * ice_piece OK * en_ice OK * progress * progress * docs progress * fix blast color names * documentation pass 1 * progress * cleanup pass 2 * touchups * added to functions.h * small changes * fix functions.h * renaming progress * name progress * color enum * more cleanups * enice changes * final cleanups * remove unwanted file * lightning -> shock * pr suggestions * fix comment * remove unwanted comments
2020-09-30 00:18:46 +00:00
include "build/src/overlays/effects/ovl_Effect_Ss_G_Magma2/ovl_Effect_Ss_G_Magma2_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Effect_Ss_G_Ripple"
Rename effects ss C files to z_eff_ss_* instead of z_effect_ss_* (#109) Just rectifying effect files to their correct original names, which was planned for a while.
2020-05-02 04:05:44 +00:00
include "build/src/overlays/effects/ovl_Effect_Ss_G_Ripple/z_eff_ss_g_ripple.o"
All Effect Overlays and z_effect_soft_sprite_old_init.c OK (#396) * fix colliderinit typo * dead sound done * deadsound documentation * blast done * progress * spk init * progress * spark done * ss bomb ok * bomb done * cleanup * progress * progress * almost done with bomb2 * clean up gossip stone * more * cleanup and format * remove unused asm file * nonmatching reloc * done i think * mistakes * fix headers * idk how that got in here * EffectSsStick OK * progress * fix conflicting name * progress * splash OK * uname fields * progress * lightning OK * remove unwanted files * kirakira ok * kirakira done * magma OK * remove files * ss_g_fire OK * name funcs * progress * progress * magma2 and kakera OK * eff_ss_dead_dd OK * fcircle OK * stone1 OK * sibuki2 OK * dt_bubble OK * deaddb OK * sibuki OK * dead_ds OK * ice_smoke OK * hitmark OK * hahen OK * k_fire OK * en_fire OK * starting colors * color changes 1 * color switch done * init file data migrated * data cleanup * ice_piece OK * en_ice OK * progress * progress * docs progress * fix blast color names * documentation pass 1 * progress * cleanup pass 2 * touchups * added to functions.h * small changes * fix functions.h * renaming progress * name progress * color enum * more cleanups * enice changes * final cleanups * remove unwanted file * lightning -> shock * pr suggestions * fix comment * remove unwanted comments
2020-09-30 00:18:46 +00:00
include "build/src/overlays/effects/ovl_Effect_Ss_G_Ripple/ovl_Effect_Ss_G_Ripple_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Effect_Ss_G_Spk"
Rename effects ss C files to z_eff_ss_* instead of z_effect_ss_* (#109) Just rectifying effect files to their correct original names, which was planned for a while.
2020-05-02 04:05:44 +00:00
include "build/src/overlays/effects/ovl_Effect_Ss_G_Spk/z_eff_ss_g_spk.o"
Bomb Related Effect Overlays (#283) * fix colliderinit typo * dead sound done * deadsound documentation * blast done * progress * spk init * progress * spark done * ss bomb ok * bomb done * cleanup * progress * progress * almost done with bomb2 * clean up gossip stone * more * cleanup and format * remove unused asm file * nonmatching reloc * done i think * mistakes * fix headers * idk how that got in here * match bomb2 * asm file * pr review
2020-07-28 19:49:00 +00:00
include "build/src/overlays/effects/ovl_Effect_Ss_G_Spk/ovl_Effect_Ss_G_Spk_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Effect_Ss_G_Splash"
Rename effects ss C files to z_eff_ss_* instead of z_effect_ss_* (#109) Just rectifying effect files to their correct original names, which was planned for a while.
2020-05-02 04:05:44 +00:00
include "build/src/overlays/effects/ovl_Effect_Ss_G_Splash/z_eff_ss_g_splash.o"
All Effect Overlays and z_effect_soft_sprite_old_init.c OK (#396) * fix colliderinit typo * dead sound done * deadsound documentation * blast done * progress * spk init * progress * spark done * ss bomb ok * bomb done * cleanup * progress * progress * almost done with bomb2 * clean up gossip stone * more * cleanup and format * remove unused asm file * nonmatching reloc * done i think * mistakes * fix headers * idk how that got in here * EffectSsStick OK * progress * fix conflicting name * progress * splash OK * uname fields * progress * lightning OK * remove unwanted files * kirakira ok * kirakira done * magma OK * remove files * ss_g_fire OK * name funcs * progress * progress * magma2 and kakera OK * eff_ss_dead_dd OK * fcircle OK * stone1 OK * sibuki2 OK * dt_bubble OK * deaddb OK * sibuki OK * dead_ds OK * ice_smoke OK * hitmark OK * hahen OK * k_fire OK * en_fire OK * starting colors * color changes 1 * color switch done * init file data migrated * data cleanup * ice_piece OK * en_ice OK * progress * progress * docs progress * fix blast color names * documentation pass 1 * progress * cleanup pass 2 * touchups * added to functions.h * small changes * fix functions.h * renaming progress * name progress * color enum * more cleanups * enice changes * final cleanups * remove unwanted file * lightning -> shock * pr suggestions * fix comment * remove unwanted comments
2020-09-30 00:18:46 +00:00
include "build/src/overlays/effects/ovl_Effect_Ss_G_Splash/ovl_Effect_Ss_G_Splash_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Effect_Ss_Hahen"
Rename effects ss C files to z_eff_ss_* instead of z_effect_ss_* (#109) Just rectifying effect files to their correct original names, which was planned for a while.
2020-05-02 04:05:44 +00:00
include "build/src/overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.o"
All Effect Overlays and z_effect_soft_sprite_old_init.c OK (#396) * fix colliderinit typo * dead sound done * deadsound documentation * blast done * progress * spk init * progress * spark done * ss bomb ok * bomb done * cleanup * progress * progress * almost done with bomb2 * clean up gossip stone * more * cleanup and format * remove unused asm file * nonmatching reloc * done i think * mistakes * fix headers * idk how that got in here * EffectSsStick OK * progress * fix conflicting name * progress * splash OK * uname fields * progress * lightning OK * remove unwanted files * kirakira ok * kirakira done * magma OK * remove files * ss_g_fire OK * name funcs * progress * progress * magma2 and kakera OK * eff_ss_dead_dd OK * fcircle OK * stone1 OK * sibuki2 OK * dt_bubble OK * deaddb OK * sibuki OK * dead_ds OK * ice_smoke OK * hitmark OK * hahen OK * k_fire OK * en_fire OK * starting colors * color changes 1 * color switch done * init file data migrated * data cleanup * ice_piece OK * en_ice OK * progress * progress * docs progress * fix blast color names * documentation pass 1 * progress * cleanup pass 2 * touchups * added to functions.h * small changes * fix functions.h * renaming progress * name progress * color enum * more cleanups * enice changes * final cleanups * remove unwanted file * lightning -> shock * pr suggestions * fix comment * remove unwanted comments
2020-09-30 00:18:46 +00:00
include "build/src/overlays/effects/ovl_Effect_Ss_Hahen/ovl_Effect_Ss_Hahen_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Effect_Ss_HitMark"
Rename effects ss C files to z_eff_ss_* instead of z_effect_ss_* (#109) Just rectifying effect files to their correct original names, which was planned for a while.
2020-05-02 04:05:44 +00:00
include "build/src/overlays/effects/ovl_Effect_Ss_HitMark/z_eff_ss_hitmark.o"
All Effect Overlays and z_effect_soft_sprite_old_init.c OK (#396) * fix colliderinit typo * dead sound done * deadsound documentation * blast done * progress * spk init * progress * spark done * ss bomb ok * bomb done * cleanup * progress * progress * almost done with bomb2 * clean up gossip stone * more * cleanup and format * remove unused asm file * nonmatching reloc * done i think * mistakes * fix headers * idk how that got in here * EffectSsStick OK * progress * fix conflicting name * progress * splash OK * uname fields * progress * lightning OK * remove unwanted files * kirakira ok * kirakira done * magma OK * remove files * ss_g_fire OK * name funcs * progress * progress * magma2 and kakera OK * eff_ss_dead_dd OK * fcircle OK * stone1 OK * sibuki2 OK * dt_bubble OK * deaddb OK * sibuki OK * dead_ds OK * ice_smoke OK * hitmark OK * hahen OK * k_fire OK * en_fire OK * starting colors * color changes 1 * color switch done * init file data migrated * data cleanup * ice_piece OK * en_ice OK * progress * progress * docs progress * fix blast color names * documentation pass 1 * progress * cleanup pass 2 * touchups * added to functions.h * small changes * fix functions.h * renaming progress * name progress * color enum * more cleanups * enice changes * final cleanups * remove unwanted file * lightning -> shock * pr suggestions * fix comment * remove unwanted comments
2020-09-30 00:18:46 +00:00
include "build/src/overlays/effects/ovl_Effect_Ss_HitMark/ovl_Effect_Ss_HitMark_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Effect_Ss_Ice_Piece"
Rename effects ss C files to z_eff_ss_* instead of z_effect_ss_* (#109) Just rectifying effect files to their correct original names, which was planned for a while.
2020-05-02 04:05:44 +00:00
include "build/src/overlays/effects/ovl_Effect_Ss_Ice_Piece/z_eff_ss_ice_piece.o"
All Effect Overlays and z_effect_soft_sprite_old_init.c OK (#396) * fix colliderinit typo * dead sound done * deadsound documentation * blast done * progress * spk init * progress * spark done * ss bomb ok * bomb done * cleanup * progress * progress * almost done with bomb2 * clean up gossip stone * more * cleanup and format * remove unused asm file * nonmatching reloc * done i think * mistakes * fix headers * idk how that got in here * EffectSsStick OK * progress * fix conflicting name * progress * splash OK * uname fields * progress * lightning OK * remove unwanted files * kirakira ok * kirakira done * magma OK * remove files * ss_g_fire OK * name funcs * progress * progress * magma2 and kakera OK * eff_ss_dead_dd OK * fcircle OK * stone1 OK * sibuki2 OK * dt_bubble OK * deaddb OK * sibuki OK * dead_ds OK * ice_smoke OK * hitmark OK * hahen OK * k_fire OK * en_fire OK * starting colors * color changes 1 * color switch done * init file data migrated * data cleanup * ice_piece OK * en_ice OK * progress * progress * docs progress * fix blast color names * documentation pass 1 * progress * cleanup pass 2 * touchups * added to functions.h * small changes * fix functions.h * renaming progress * name progress * color enum * more cleanups * enice changes * final cleanups * remove unwanted file * lightning -> shock * pr suggestions * fix comment * remove unwanted comments
2020-09-30 00:18:46 +00:00
include "build/src/overlays/effects/ovl_Effect_Ss_Ice_Piece/ovl_Effect_Ss_Ice_Piece_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Effect_Ss_Ice_Smoke"
Rename effects ss C files to z_eff_ss_* instead of z_effect_ss_* (#109) Just rectifying effect files to their correct original names, which was planned for a while.
2020-05-02 04:05:44 +00:00
include "build/src/overlays/effects/ovl_Effect_Ss_Ice_Smoke/z_eff_ss_ice_smoke.o"
All Effect Overlays and z_effect_soft_sprite_old_init.c OK (#396) * fix colliderinit typo * dead sound done * deadsound documentation * blast done * progress * spk init * progress * spark done * ss bomb ok * bomb done * cleanup * progress * progress * almost done with bomb2 * clean up gossip stone * more * cleanup and format * remove unused asm file * nonmatching reloc * done i think * mistakes * fix headers * idk how that got in here * EffectSsStick OK * progress * fix conflicting name * progress * splash OK * uname fields * progress * lightning OK * remove unwanted files * kirakira ok * kirakira done * magma OK * remove files * ss_g_fire OK * name funcs * progress * progress * magma2 and kakera OK * eff_ss_dead_dd OK * fcircle OK * stone1 OK * sibuki2 OK * dt_bubble OK * deaddb OK * sibuki OK * dead_ds OK * ice_smoke OK * hitmark OK * hahen OK * k_fire OK * en_fire OK * starting colors * color changes 1 * color switch done * init file data migrated * data cleanup * ice_piece OK * en_ice OK * progress * progress * docs progress * fix blast color names * documentation pass 1 * progress * cleanup pass 2 * touchups * added to functions.h * small changes * fix functions.h * renaming progress * name progress * color enum * more cleanups * enice changes * final cleanups * remove unwanted file * lightning -> shock * pr suggestions * fix comment * remove unwanted comments
2020-09-30 00:18:46 +00:00
include "build/src/overlays/effects/ovl_Effect_Ss_Ice_Smoke/ovl_Effect_Ss_Ice_Smoke_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Effect_Ss_K_Fire"
Rename effects ss C files to z_eff_ss_* instead of z_effect_ss_* (#109) Just rectifying effect files to their correct original names, which was planned for a while.
2020-05-02 04:05:44 +00:00
include "build/src/overlays/effects/ovl_Effect_Ss_K_Fire/z_eff_ss_k_fire.o"
All Effect Overlays and z_effect_soft_sprite_old_init.c OK (#396) * fix colliderinit typo * dead sound done * deadsound documentation * blast done * progress * spk init * progress * spark done * ss bomb ok * bomb done * cleanup * progress * progress * almost done with bomb2 * clean up gossip stone * more * cleanup and format * remove unused asm file * nonmatching reloc * done i think * mistakes * fix headers * idk how that got in here * EffectSsStick OK * progress * fix conflicting name * progress * splash OK * uname fields * progress * lightning OK * remove unwanted files * kirakira ok * kirakira done * magma OK * remove files * ss_g_fire OK * name funcs * progress * progress * magma2 and kakera OK * eff_ss_dead_dd OK * fcircle OK * stone1 OK * sibuki2 OK * dt_bubble OK * deaddb OK * sibuki OK * dead_ds OK * ice_smoke OK * hitmark OK * hahen OK * k_fire OK * en_fire OK * starting colors * color changes 1 * color switch done * init file data migrated * data cleanup * ice_piece OK * en_ice OK * progress * progress * docs progress * fix blast color names * documentation pass 1 * progress * cleanup pass 2 * touchups * added to functions.h * small changes * fix functions.h * renaming progress * name progress * color enum * more cleanups * enice changes * final cleanups * remove unwanted file * lightning -> shock * pr suggestions * fix comment * remove unwanted comments
2020-09-30 00:18:46 +00:00
include "build/src/overlays/effects/ovl_Effect_Ss_K_Fire/ovl_Effect_Ss_K_Fire_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Effect_Ss_Kakera"
Rename effects ss C files to z_eff_ss_* instead of z_effect_ss_* (#109) Just rectifying effect files to their correct original names, which was planned for a while.
2020-05-02 04:05:44 +00:00
include "build/src/overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.o"
All Effect Overlays and z_effect_soft_sprite_old_init.c OK (#396) * fix colliderinit typo * dead sound done * deadsound documentation * blast done * progress * spk init * progress * spark done * ss bomb ok * bomb done * cleanup * progress * progress * almost done with bomb2 * clean up gossip stone * more * cleanup and format * remove unused asm file * nonmatching reloc * done i think * mistakes * fix headers * idk how that got in here * EffectSsStick OK * progress * fix conflicting name * progress * splash OK * uname fields * progress * lightning OK * remove unwanted files * kirakira ok * kirakira done * magma OK * remove files * ss_g_fire OK * name funcs * progress * progress * magma2 and kakera OK * eff_ss_dead_dd OK * fcircle OK * stone1 OK * sibuki2 OK * dt_bubble OK * deaddb OK * sibuki OK * dead_ds OK * ice_smoke OK * hitmark OK * hahen OK * k_fire OK * en_fire OK * starting colors * color changes 1 * color switch done * init file data migrated * data cleanup * ice_piece OK * en_ice OK * progress * progress * docs progress * fix blast color names * documentation pass 1 * progress * cleanup pass 2 * touchups * added to functions.h * small changes * fix functions.h * renaming progress * name progress * color enum * more cleanups * enice changes * final cleanups * remove unwanted file * lightning -> shock * pr suggestions * fix comment * remove unwanted comments
2020-09-30 00:18:46 +00:00
include "build/src/overlays/effects/ovl_Effect_Ss_Kakera/ovl_Effect_Ss_Kakera_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Effect_Ss_KiraKira"
Rename effects ss C files to z_eff_ss_* instead of z_effect_ss_* (#109) Just rectifying effect files to their correct original names, which was planned for a while.
2020-05-02 04:05:44 +00:00
include "build/src/overlays/effects/ovl_Effect_Ss_KiraKira/z_eff_ss_kirakira.o"
All Effect Overlays and z_effect_soft_sprite_old_init.c OK (#396) * fix colliderinit typo * dead sound done * deadsound documentation * blast done * progress * spk init * progress * spark done * ss bomb ok * bomb done * cleanup * progress * progress * almost done with bomb2 * clean up gossip stone * more * cleanup and format * remove unused asm file * nonmatching reloc * done i think * mistakes * fix headers * idk how that got in here * EffectSsStick OK * progress * fix conflicting name * progress * splash OK * uname fields * progress * lightning OK * remove unwanted files * kirakira ok * kirakira done * magma OK * remove files * ss_g_fire OK * name funcs * progress * progress * magma2 and kakera OK * eff_ss_dead_dd OK * fcircle OK * stone1 OK * sibuki2 OK * dt_bubble OK * deaddb OK * sibuki OK * dead_ds OK * ice_smoke OK * hitmark OK * hahen OK * k_fire OK * en_fire OK * starting colors * color changes 1 * color switch done * init file data migrated * data cleanup * ice_piece OK * en_ice OK * progress * progress * docs progress * fix blast color names * documentation pass 1 * progress * cleanup pass 2 * touchups * added to functions.h * small changes * fix functions.h * renaming progress * name progress * color enum * more cleanups * enice changes * final cleanups * remove unwanted file * lightning -> shock * pr suggestions * fix comment * remove unwanted comments
2020-09-30 00:18:46 +00:00
include "build/src/overlays/effects/ovl_Effect_Ss_KiraKira/ovl_Effect_Ss_KiraKira_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Effect_Ss_Lightning"
Rename effects ss C files to z_eff_ss_* instead of z_effect_ss_* (#109) Just rectifying effect files to their correct original names, which was planned for a while.
2020-05-02 04:05:44 +00:00
include "build/src/overlays/effects/ovl_Effect_Ss_Lightning/z_eff_ss_lightning.o"
All Effect Overlays and z_effect_soft_sprite_old_init.c OK (#396) * fix colliderinit typo * dead sound done * deadsound documentation * blast done * progress * spk init * progress * spark done * ss bomb ok * bomb done * cleanup * progress * progress * almost done with bomb2 * clean up gossip stone * more * cleanup and format * remove unused asm file * nonmatching reloc * done i think * mistakes * fix headers * idk how that got in here * EffectSsStick OK * progress * fix conflicting name * progress * splash OK * uname fields * progress * lightning OK * remove unwanted files * kirakira ok * kirakira done * magma OK * remove files * ss_g_fire OK * name funcs * progress * progress * magma2 and kakera OK * eff_ss_dead_dd OK * fcircle OK * stone1 OK * sibuki2 OK * dt_bubble OK * deaddb OK * sibuki OK * dead_ds OK * ice_smoke OK * hitmark OK * hahen OK * k_fire OK * en_fire OK * starting colors * color changes 1 * color switch done * init file data migrated * data cleanup * ice_piece OK * en_ice OK * progress * progress * docs progress * fix blast color names * documentation pass 1 * progress * cleanup pass 2 * touchups * added to functions.h * small changes * fix functions.h * renaming progress * name progress * color enum * more cleanups * enice changes * final cleanups * remove unwanted file * lightning -> shock * pr suggestions * fix comment * remove unwanted comments
2020-09-30 00:18:46 +00:00
include "build/src/overlays/effects/ovl_Effect_Ss_Lightning/ovl_Effect_Ss_Lightning_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Effect_Ss_Sibuki"
Rename effects ss C files to z_eff_ss_* instead of z_effect_ss_* (#109) Just rectifying effect files to their correct original names, which was planned for a while.
2020-05-02 04:05:44 +00:00
include "build/src/overlays/effects/ovl_Effect_Ss_Sibuki/z_eff_ss_sibuki.o"
All Effect Overlays and z_effect_soft_sprite_old_init.c OK (#396) * fix colliderinit typo * dead sound done * deadsound documentation * blast done * progress * spk init * progress * spark done * ss bomb ok * bomb done * cleanup * progress * progress * almost done with bomb2 * clean up gossip stone * more * cleanup and format * remove unused asm file * nonmatching reloc * done i think * mistakes * fix headers * idk how that got in here * EffectSsStick OK * progress * fix conflicting name * progress * splash OK * uname fields * progress * lightning OK * remove unwanted files * kirakira ok * kirakira done * magma OK * remove files * ss_g_fire OK * name funcs * progress * progress * magma2 and kakera OK * eff_ss_dead_dd OK * fcircle OK * stone1 OK * sibuki2 OK * dt_bubble OK * deaddb OK * sibuki OK * dead_ds OK * ice_smoke OK * hitmark OK * hahen OK * k_fire OK * en_fire OK * starting colors * color changes 1 * color switch done * init file data migrated * data cleanup * ice_piece OK * en_ice OK * progress * progress * docs progress * fix blast color names * documentation pass 1 * progress * cleanup pass 2 * touchups * added to functions.h * small changes * fix functions.h * renaming progress * name progress * color enum * more cleanups * enice changes * final cleanups * remove unwanted file * lightning -> shock * pr suggestions * fix comment * remove unwanted comments
2020-09-30 00:18:46 +00:00
include "build/src/overlays/effects/ovl_Effect_Ss_Sibuki/ovl_Effect_Ss_Sibuki_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Effect_Ss_Sibuki2"
Rename effects ss C files to z_eff_ss_* instead of z_effect_ss_* (#109) Just rectifying effect files to their correct original names, which was planned for a while.
2020-05-02 04:05:44 +00:00
include "build/src/overlays/effects/ovl_Effect_Ss_Sibuki2/z_eff_ss_sibuki2.o"
All Effect Overlays and z_effect_soft_sprite_old_init.c OK (#396) * fix colliderinit typo * dead sound done * deadsound documentation * blast done * progress * spk init * progress * spark done * ss bomb ok * bomb done * cleanup * progress * progress * almost done with bomb2 * clean up gossip stone * more * cleanup and format * remove unused asm file * nonmatching reloc * done i think * mistakes * fix headers * idk how that got in here * EffectSsStick OK * progress * fix conflicting name * progress * splash OK * uname fields * progress * lightning OK * remove unwanted files * kirakira ok * kirakira done * magma OK * remove files * ss_g_fire OK * name funcs * progress * progress * magma2 and kakera OK * eff_ss_dead_dd OK * fcircle OK * stone1 OK * sibuki2 OK * dt_bubble OK * deaddb OK * sibuki OK * dead_ds OK * ice_smoke OK * hitmark OK * hahen OK * k_fire OK * en_fire OK * starting colors * color changes 1 * color switch done * init file data migrated * data cleanup * ice_piece OK * en_ice OK * progress * progress * docs progress * fix blast color names * documentation pass 1 * progress * cleanup pass 2 * touchups * added to functions.h * small changes * fix functions.h * renaming progress * name progress * color enum * more cleanups * enice changes * final cleanups * remove unwanted file * lightning -> shock * pr suggestions * fix comment * remove unwanted comments
2020-09-30 00:18:46 +00:00
include "build/src/overlays/effects/ovl_Effect_Ss_Sibuki2/ovl_Effect_Ss_Sibuki2_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Effect_Ss_Solder_Srch_Ball"
include "build/src/overlays/effects/ovl_Effect_Ss_Solder_Srch_Ball/z_eff_ss_solder_srch_ball.o"
En_Heishi1 and Eff_Ss_Solder_Srch_Ball OK (#234) * progress * init ok and merge master * enheishi1 and srchball OK * cleanup * cleanup * cleanup * more cleanup * done * more comments * add file headers * some review comments * move vectors * more review comments * angle in decimal * add prototype * semicolon would be good * fix * make unset actor ids 0 * reword comment * no &
2020-07-09 19:12:03 +00:00
include "build/src/overlays/effects/ovl_Effect_Ss_Solder_Srch_Ball/ovl_Effect_Ss_Solder_Srch_Ball_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Effect_Ss_Stick"
Rename effects ss C files to z_eff_ss_* instead of z_effect_ss_* (#109) Just rectifying effect files to their correct original names, which was planned for a while.
2020-05-02 04:05:44 +00:00
include "build/src/overlays/effects/ovl_Effect_Ss_Stick/z_eff_ss_stick.o"
All Effect Overlays and z_effect_soft_sprite_old_init.c OK (#396) * fix colliderinit typo * dead sound done * deadsound documentation * blast done * progress * spk init * progress * spark done * ss bomb ok * bomb done * cleanup * progress * progress * almost done with bomb2 * clean up gossip stone * more * cleanup and format * remove unused asm file * nonmatching reloc * done i think * mistakes * fix headers * idk how that got in here * EffectSsStick OK * progress * fix conflicting name * progress * splash OK * uname fields * progress * lightning OK * remove unwanted files * kirakira ok * kirakira done * magma OK * remove files * ss_g_fire OK * name funcs * progress * progress * magma2 and kakera OK * eff_ss_dead_dd OK * fcircle OK * stone1 OK * sibuki2 OK * dt_bubble OK * deaddb OK * sibuki OK * dead_ds OK * ice_smoke OK * hitmark OK * hahen OK * k_fire OK * en_fire OK * starting colors * color changes 1 * color switch done * init file data migrated * data cleanup * ice_piece OK * en_ice OK * progress * progress * docs progress * fix blast color names * documentation pass 1 * progress * cleanup pass 2 * touchups * added to functions.h * small changes * fix functions.h * renaming progress * name progress * color enum * more cleanups * enice changes * final cleanups * remove unwanted file * lightning -> shock * pr suggestions * fix comment * remove unwanted comments
2020-09-30 00:18:46 +00:00
include "build/src/overlays/effects/ovl_Effect_Ss_Stick/ovl_Effect_Ss_Stick_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Effect_Ss_Stone1"
Rename effects ss C files to z_eff_ss_* instead of z_effect_ss_* (#109) Just rectifying effect files to their correct original names, which was planned for a while.
2020-05-02 04:05:44 +00:00
include "build/src/overlays/effects/ovl_Effect_Ss_Stone1/z_eff_ss_stone1.o"
All Effect Overlays and z_effect_soft_sprite_old_init.c OK (#396) * fix colliderinit typo * dead sound done * deadsound documentation * blast done * progress * spk init * progress * spark done * ss bomb ok * bomb done * cleanup * progress * progress * almost done with bomb2 * clean up gossip stone * more * cleanup and format * remove unused asm file * nonmatching reloc * done i think * mistakes * fix headers * idk how that got in here * EffectSsStick OK * progress * fix conflicting name * progress * splash OK * uname fields * progress * lightning OK * remove unwanted files * kirakira ok * kirakira done * magma OK * remove files * ss_g_fire OK * name funcs * progress * progress * magma2 and kakera OK * eff_ss_dead_dd OK * fcircle OK * stone1 OK * sibuki2 OK * dt_bubble OK * deaddb OK * sibuki OK * dead_ds OK * ice_smoke OK * hitmark OK * hahen OK * k_fire OK * en_fire OK * starting colors * color changes 1 * color switch done * init file data migrated * data cleanup * ice_piece OK * en_ice OK * progress * progress * docs progress * fix blast color names * documentation pass 1 * progress * cleanup pass 2 * touchups * added to functions.h * small changes * fix functions.h * renaming progress * name progress * color enum * more cleanups * enice changes * final cleanups * remove unwanted file * lightning -> shock * pr suggestions * fix comment * remove unwanted comments
2020-09-30 00:18:46 +00:00
include "build/src/overlays/effects/ovl_Effect_Ss_Stone1/ovl_Effect_Ss_Stone1_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Elf_Msg"
include "build/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.o"
Elf_Msg, Elf_Msg2 OK (#317) * matched func_809AD700, ElfMsg2_Init * func_809AD968 done * func_809AD978 and func_809AD9F4 done * func_809ADA28 done * ElfMsg2_Update Done, ElfMsg2_Draw Started * whole file decomped * Matching and all symbols defined * Formatting changes, not currently building * run format.sh * fixed typos in comments * Changes to reflect comments * C file matching, polish needed * making parenthesis usage consistent * Documenting draw function, Vtx and Gfx arrays * Added japanese translation comments * line spacing fix * renaming stuff * Early return in Draw * naming updates * Cleaning up names, comments and formatting after the merge * comment cleanup * more cleanup * More cleanup * Adding commas at end of arrays so they look nicer :) * more cleanup * removing unnecessary parentheses * comment and code changes * Name changes * Renamings * Removing documentation at top
2020-08-18 18:31:34 +00:00
include "build/src/overlays/actors/ovl_Elf_Msg/ovl_Elf_Msg_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Elf_Msg2"
include "build/src/overlays/actors/ovl_Elf_Msg2/z_elf_msg2.o"
Elf_Msg, Elf_Msg2 OK (#317) * matched func_809AD700, ElfMsg2_Init * func_809AD968 done * func_809AD978 and func_809AD9F4 done * func_809ADA28 done * ElfMsg2_Update Done, ElfMsg2_Draw Started * whole file decomped * Matching and all symbols defined * Formatting changes, not currently building * run format.sh * fixed typos in comments * Changes to reflect comments * C file matching, polish needed * making parenthesis usage consistent * Documenting draw function, Vtx and Gfx arrays * Added japanese translation comments * line spacing fix * renaming stuff * Early return in Draw * naming updates * Cleaning up names, comments and formatting after the merge * comment cleanup * more cleanup * More cleanup * Adding commas at end of arrays so they look nicer :) * more cleanup * removing unnecessary parentheses * comment and code changes * Name changes * Renamings * Removing documentation at top
2020-08-18 18:31:34 +00:00
include "build/src/overlays/actors/ovl_Elf_Msg2/ovl_Elf_Msg2_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Am"
include "build/src/overlays/actors/ovl_En_Am/z_en_am.o"
Armos and object_am OK (#652) * started * all but 2 * OK * docs progress * lots of docs * add gitkeep back * all funcs named * small fix * git subrepo pull --force tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "0305ec2c2" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "0305ec2c2" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * object_am * change * ready i think * last thing * asm * progress
2021-02-15 18:41:55 +00:00
include "build/src/overlays/actors/ovl_En_Am/ovl_En_Am_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Ani"
include "build/src/overlays/actors/ovl_En_Ani/z_en_ani.o"
Split ovl_file_choose and ovl_kaleido_scope (#167) * Split ovl_file_choose and ovl_kaleido_scope * Split ovl_kaleido_scope's rodata/data/bss * fix * fix spec * spec fix * hopefully last spec fix * hopefully last spec fix 2 * fix * Add comments on file boundaries * fix
2020-06-07 17:52:43 +00:00
include "build/src/overlays/actors/ovl_En_Ani/ovl_En_Ani_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Anubice"
include "build/src/overlays/actors/ovl_En_Anubice/z_en_anubice.o"
En_anubice OK (#688) * init, func_809B1120, and func_809B11C0 OK Also migrate data to c * Match Destroy, func_809B142C, func_809B1524, func_809B15CC Start on func_809B16AC, but float register diffs :( * Everything OK but func_809B16AC and what a devil it is... * Work on func_809B16AC What an ugly function * Do some documentation * More documentation * Run formatter * Rename a few things * Address PR comments * Missed a couple angle macro opportunities * Update src/overlays/actors/ovl_En_Anubice/z_en_anubice.c Co-authored-by: mzxrules <mzxrules@gmail.com> * Anubice OK * Deleted the wrong part of the spec * A curtain was missed * Forgot a comment I changed the declaration but not the reference :I * More PR comments Co-authored-by: mzxrules <mzxrules@gmail.com>
2021-02-15 21:27:22 +00:00
include "build/src/overlays/actors/ovl_En_Anubice/ovl_En_Anubice_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Anubice_Fire"
include "build/src/overlays/actors/ovl_En_Anubice_Fire/z_en_anubice_fire.o"
ovl_En_Anubice_Fire OK (#687) * init, destroy and other func Signed-off-by: angie <angheloalf95@gmail.com> * func_809B2B48 Signed-off-by: angie <angheloalf95@gmail.com> * EnAnubiceFire_Update Signed-off-by: angie <angheloalf95@gmail.com> * EnAnubiceFire_Draw NON_MATCHING Signed-off-by: angie <angheloalf95@gmail.com> * import data Signed-off-by: angie <angheloalf95@gmail.com> * inline some static variables Signed-off-by: angie <angheloalf95@gmail.com> * EnAnubiceFire_Draw Signed-off-by: angie <angheloalf95@gmail.com> * func_809B27D8 Signed-off-by: angie <angheloalf95@gmail.com> * final cleanup Signed-off-by: angie <angheloalf95@gmail.com> * ups Signed-off-by: angie <angheloalf95@gmail.com> * changes requested by @petrie911 Signed-off-by: angie <angheloalf95@gmail.com> * changes requested by @Roman971 Signed-off-by: angie <angheloalf95@gmail.com> * I somehow forgot to delete that file Signed-off-by: angie <angheloalf95@gmail.com> * i don't know what to put in this message Signed-off-by: angie <angheloalf95@gmail.com>
2021-02-14 20:37:22 +00:00
include "build/src/overlays/actors/ovl_En_Anubice_Fire/ovl_En_Anubice_Fire_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Anubice_Tag"
include "build/src/overlays/actors/ovl_En_Anubice_Tag/z_en_anubice_tag.o"
Split ovl_file_choose and ovl_kaleido_scope (#167) * Split ovl_file_choose and ovl_kaleido_scope * Split ovl_kaleido_scope's rodata/data/bss * fix * fix spec * spec fix * hopefully last spec fix * hopefully last spec fix 2 * fix * Add comments on file boundaries * fix
2020-06-07 17:52:43 +00:00
include "build/src/overlays/actors/ovl_En_Anubice_Tag/ovl_En_Anubice_Tag_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Arow_Trap"
include "build/src/overlays/actors/ovl_En_Arow_Trap/z_en_arow_trap.o"
Split ovl_file_choose and ovl_kaleido_scope (#167) * Split ovl_file_choose and ovl_kaleido_scope * Split ovl_kaleido_scope's rodata/data/bss * fix * fix spec * spec fix * hopefully last spec fix * hopefully last spec fix 2 * fix * Add comments on file boundaries * fix
2020-06-07 17:52:43 +00:00
include "build/src/overlays/actors/ovl_En_Arow_Trap/ovl_En_Arow_Trap_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Arrow"
include "build/src/overlays/actors/ovl_En_Arrow/z_en_arrow.o"
En_Arrow OK (#648) * fix colliderinit typo * fix initchain * start init * match init * progress * progress * more funcs * match func_809B3DD8 * progress * last func almost done * enum * name some more types * progress * all but one * fix warning * remove undefined syms * match arrows * review * spec * remove asm
2021-02-03 01:30:21 +00:00
include "build/src/overlays/actors/ovl_En_Arrow/ovl_En_Arrow_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Attack_Niw"
include "build/src/overlays/actors/ovl_En_Attack_Niw/z_en_attack_niw.o"
Attack_Niw (#272) * Attack! * Decimal indexes * a * PR * PR * PR * Why break it
2020-08-20 02:17:42 +00:00
include "build/src/overlays/actors/ovl_En_Attack_Niw/ovl_En_Attack_Niw_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Ba"
include "build/src/overlays/actors/ovl_En_Ba/z_en_ba.o"
En_Ba OK (#700) * init done * Everything done except for draw * matching * Tidied for pr * merge master into en_ba * run format.sh * fixing merge mistakes * how many different ways can I screw up a merge challenge * some pr comments
2021-02-15 22:59:59 +00:00
include "build/src/overlays/actors/ovl_En_Ba/ovl_En_Ba_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Bb"
include "build/src/overlays/actors/ovl_En_Bb/z_en_bb.o"
En_Bb (Bubble (flying skull)) (#551) * Darkmeiro decompilation Bg_Gnd_Darkmeiro decompiled, matched, and documented. * give this a shot * fix conflict * one more try * could be useful * whoops * ZAP2 stuff * ZAP why * ZAP again * bubbles! * match * stuff * more names * let's go * SFX error * fixes * also formatting * Update src/overlays/actors/ovl_En_Bb/z_en_bb.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Bb/z_en_bb.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Bb/z_en_bb.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Bb/z_en_bb.h Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Bb/z_en_bb.h Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Bb/z_en_bb.h Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Bb/z_en_bb.h Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain> Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-12-29 21:06:20 +00:00
include "build/src/overlays/actors/ovl_En_Bb/ovl_En_Bb_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Bdfire"
include "build/src/overlays/actors/ovl_En_Bdfire/z_en_bdfire.o"
Decompile King Dodongo and his fire effect (#744) * Fixed upstream * move .data * match init * mathc func_808C1D00 * match func_808C32F4, func_808C2B38, func_808C3224, func_808C2AB0 * match func_808C30F4, func_808C2A40, func_808C3704, func_808C3704 * func_808C18B0 * match another chain of functions * Match func_808C29B0, Draw, and most of OverrideLimbDraw * start update * Really close * Almost match update, match Override Limb Draw * start the big switch * Make a little progress on the big switch function * Test * chip away at the big one some more * test * progress * More progress * Add * Finished another chain of functions * Decomp effect functions * Get the whole file in C * Move data to its own C file * Start the effect file en_bdfire.c * Messed up expected * Finish EnBdfire.c * A little clean up * done as far as I can get it * Delete scenes directory * Delete graphs directory * Delete graphovl.py * match and such * Delete BossDodongo_Update.s * PR fixes * restore old IDO * Color Filter * PR fixes (Roman) * Fixed added assets * remove asm * PR fixes (Roman) * quick format change * remove unwanted files Co-authored-by: Louis <5883445+louist103@users.noreply.github.com> Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain> Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-04-11 16:38:22 +00:00
include "build/src/overlays/actors/ovl_En_Bdfire/ovl_En_Bdfire_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Bigokuta"
include "build/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.o"
z_en_bigokuta OK (#878) * start * Did some more * Progress * More * IDK * Chip away a little * im done * func_809BEBBC OK! * get rid of graphovl * revert random changes * Big Okuta OK! * more clean-ups * implement dragorn's suggestions * implement fig and louist's suggestions Co-authored-by: Louis <35883445+louist103@users.noreply.github.com>
2021-07-29 22:15:18 +00:00
include "build/src/overlays/actors/ovl_En_Bigokuta/ovl_En_Bigokuta_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Bili"
include "build/src/overlays/actors/ovl_En_Bili/z_en_bili.o"
EnBili OK and documented (#654) * OK, data imported * reloc * some naming, some floats * named almost everything * description * delete asm * missing static * Address review comments * Apply suggestions from code review Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Bili/z_en_bili.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2021-02-08 01:43:02 +00:00
include "build/src/overlays/actors/ovl_En_Bili/ovl_En_Bili_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Bird"
include "build/src/overlays/actors/ovl_En_Bird/z_en_bird.o"
Fix a couple of actors to use auto generated reloc (#547) * FIX RELOC * Update spec * Delete z_bg_spot15_saku.reloc.s * Add endseg back Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com> Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com>
2020-12-19 16:16:34 +00:00
include "build/src/overlays/actors/ovl_En_Bird/ovl_En_Bird_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Blkobj"
include "build/src/overlays/actors/ovl_En_Blkobj/z_en_blkobj.o"
Decompiled ovl_En_Blkobj (#242) * Decompiled ovl_En_Blkobj * PR suggestions * gfx commands
2020-07-14 05:15:43 +00:00
include "build/src/overlays/actors/ovl_En_Blkobj/ovl_En_Blkobj_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Bom"
include "build/src/overlays/actors/ovl_En_Bom/z_en_bom.o"
En_Bom and En_Bombf (#264) * data migrated * progress * progress * enbom ok * cleanup * progress * still have stack issues * bombf done * done i think * review comments 1 * add type enums * move enums and use -1 * remove unwanted file
2020-07-19 18:04:30 +00:00
include "build/src/overlays/actors/ovl_En_Bom/ovl_En_Bom_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Bom_Bowl_Man"
include "build/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.o"
Bombchu bowling OK (#496) * All functions decompiled, most named * asm deleted, spec and undefined_syms included * missed a static * Some cleanup on comments and osSyncPrintfs * asm Co-authored-by: fig02 <fig02srl@gmail.com>
2020-12-06 18:48:51 +00:00
include "build/src/overlays/actors/ovl_En_Bom_Bowl_Man/ovl_En_Bom_Bowl_Man_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Bom_Bowl_Pit"
include "build/src/overlays/actors/ovl_En_Bom_Bowl_Pit/z_en_bom_bowl_pit.o"
Bombchu bowling OK (#496) * All functions decompiled, most named * asm deleted, spec and undefined_syms included * missed a static * Some cleanup on comments and osSyncPrintfs * asm Co-authored-by: fig02 <fig02srl@gmail.com>
2020-12-06 18:48:51 +00:00
include "build/src/overlays/actors/ovl_En_Bom_Bowl_Pit/ovl_En_Bom_Bowl_Pit_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Bom_Chu"
include "build/src/overlays/actors/ovl_En_Bom_Chu/z_en_bom_chu.o"
Bombchu OK (#647) * all but 1 * done * asm * rename collider data * final changes and format * matched, ty petrie * asm * review
2021-02-03 01:12:03 +00:00
include "build/src/overlays/actors/ovl_En_Bom_Chu/ovl_En_Bom_Chu_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Bombf"
include "build/src/overlays/actors/ovl_En_Bombf/z_en_bombf.o"
En_Bom and En_Bombf (#264) * data migrated * progress * progress * enbom ok * cleanup * progress * still have stack issues * bombf done * done i think * review comments 1 * add type enums * move enums and use -1 * remove unwanted file
2020-07-19 18:04:30 +00:00
include "build/src/overlays/actors/ovl_En_Bombf/ovl_En_Bombf_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Boom"
include "build/src/overlays/actors/ovl_En_Boom/z_en_boom.o"
Split ovl_file_choose and ovl_kaleido_scope (#167) * Split ovl_file_choose and ovl_kaleido_scope * Split ovl_kaleido_scope's rodata/data/bss * fix * fix spec * spec fix * hopefully last spec fix * hopefully last spec fix 2 * fix * Add comments on file boundaries * fix
2020-06-07 17:52:43 +00:00
include "build/src/overlays/actors/ovl_En_Boom/ovl_En_Boom_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Box"
include "build/src/overlays/actors/ovl_En_Box/z_en_box.o"
ovl_En_Box OK, documented (#356) * ovl_En_Box OK, documented * Update spec * Removed useless union * renames, remove comments, move internal enums from header * stylistic changes * Remove unneeded prototypes and use documentation format for doc comments * Misread git's merge solution * EnBox_SetupAction and Actor_SpawnAsChild * Cleanup * Merge effects, defines for movement flags, swap dList and dListHead, cleanup...
2020-10-03 22:42:10 +00:00
include "build/src/overlays/actors/ovl_En_Box/ovl_En_Box_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Brob"
include "build/src/overlays/actors/ovl_En_Brob/z_en_brob.o"
ovl_En_Brob OK (#708) * ovl_En_Brob OK * Review changes
2021-02-28 15:43:25 +00:00
include "build/src/overlays/actors/ovl_En_Brob/ovl_En_Brob_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Bubble"
include "build/src/overlays/actors/ovl_En_Bubble/z_en_bubble.o"
Shabom OK (#571) * 2 nonmatchings left * shabom OK * suggested changes * more suggested changes
2021-01-02 00:56:57 +00:00
include "build/src/overlays/actors/ovl_En_Bubble/ovl_En_Bubble_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Butte"
include "build/src/overlays/actors/ovl_En_Butte/z_en_butte.o"
ovl_En_Butte (#440) * ovl_En_Butte * Delete asm and inline static data * Style * PR review
2020-10-11 13:21:12 +00:00
include "build/src/overlays/actors/ovl_En_Butte/ovl_En_Butte_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Bw"
include "build/src/overlays/actors/ovl_En_Bw/z_en_bw.o"
En_Bw (Torch Slug) (#537) * Darkmeiro decompilation Bg_Gnd_Darkmeiro decompiled, matched, and documented. * give this a shot * fix conflict * one more try * could be useful * whoops * ZAP2 stuff * ZAP why * ZAP again * slug-o-cola * sfx macros * Matched * this will have to do * well maybe a little more * good enough
2020-12-29 18:32:32 +00:00
include "build/src/overlays/actors/ovl_En_Bw/ovl_En_Bw_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Bx"
include "build/src/overlays/actors/ovl_En_Bx/z_en_bx.o"
EnBx (#266) * EnBx * Memes * PR * PR
2020-07-20 06:49:42 +00:00
include "build/src/overlays/actors/ovl_En_Bx/ovl_En_Bx_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Changer"
include "build/src/overlays/actors/ovl_En_Changer/z_en_changer.o"
En_Changer OK (#501) * decomped most functions, 2 left * all functions decomped except for Init * just regalloc left in Init(?) * Init finally matched, translation, some naming * most other variables named * Delete asm * Whoops, actually deleted asm this time * review * review 2 Co-authored-by: fig02 <fig02srl@gmail.com>
2020-12-06 07:38:16 +00:00
include "build/src/overlays/actors/ovl_En_Changer/ovl_En_Changer_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Clear_Tag"
include "build/src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.o"
En_Clear_Tag OK and documented (#689) * Decompile and document En_Clear_Tag * Adds a define for setting the total count of ClearTag particles. * Fixes swap in particle effect struct member names. Additionally, implements the DECR macro where available. Additionally, implements the CLAMP_MIN macro. Additionally, adds more comments inside of functions explaining how the Arwing works. * Reformats z_en_clear_tag.c after recent fixes. * Removes not OK DECR and CLAMP_MIN macros. I don't know why they built locally OK for me. May have had a stale build. * Added static to data declarations. Additionally added white spacing between data definitions. * Various syling fixes in EnClearTag Fixes inconsistent usage of particle/effect. They're Effect is the better name, so I went with that. Fixed a naming issue in CalculateFloorTangent. Adds s prefix to all the static variables. Renames clearTagParticlesBuffer to sClearTagEffects Consistent capitalization in comments. Adds more descriptive comments to function level comments that didn't say a lot already. Renamed gameplay.particleEffects to gameplay.specialEffects. Renames cameraNumber to cameraId. Fixed capitalization in display list variable names. * Always capitalize the A in arwing. * Fixes issue with overzealous replacement of arwing -> Arwing * Renames arwing display lists to include the g prefix. * Renames effect seed -> random * Removes unnecessary decrement timer comments. * Updates Arwing comments to detail why it's important that the roll is updated to zero. * Updates stack variable names in EnClearTag_Update to be more consistent with each other. * Updates Arwing crashing documentation. * Further update documentation on arwing crashing. * Even further updates to Arwing crashing docs. * Fixes issue of missing newline in En_Clear_Tag.xml * targetDirection reset now has a chained assignment * Rotation angle to hex * Fixes rotation hex and identifies float. * Updates arwing fire check. * Arwing cutscene timer is multiplied by 128 rather than shifting 7 * Updates scaledCrashingTimer assignment to be more consistent. * Updates max scale to multiply by 2 * Gives name to the work buffer indices. Additionally, makes enum names more consistent. * Removes unnecessary globalCtx2 in EnClearTag_CreateFlashEffect * Runs format.sh after recent changes. * Updated path of ClearTag assets. * Clear tag now uses Arwing in the display list name for all effects. * Updates work buffer to expand and contract as new enums are added. * Uses c99 defines in my c89 * Updates the unknown 8 bytes in en_clear_tag * review Co-authored-by: fig02 <fig02srl@gmail.com>
2021-03-29 17:14:08 +00:00
include "build/src/overlays/actors/ovl_En_Clear_Tag/ovl_En_Clear_Tag_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Cow"
include "build/src/overlays/actors/ovl_En_Cow/z_en_cow.o"
Split ovl_file_choose and ovl_kaleido_scope (#167) * Split ovl_file_choose and ovl_kaleido_scope * Split ovl_kaleido_scope's rodata/data/bss * fix * fix spec * spec fix * hopefully last spec fix * hopefully last spec fix 2 * fix * Add comments on file boundaries * fix
2020-06-07 17:52:43 +00:00
include "build/src/overlays/actors/ovl_En_Cow/ovl_En_Cow_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Crow"
include "build/src/overlays/actors/ovl_En_Crow/z_en_crow.o"
Decompile En_Crow (Guay Enemy) (#444) * Decompile En_Crow (Guay Enemy) * Remove thisx * Update src/overlays/actors/ovl_En_Crow/z_en_crow.c Co-authored-by: petrie911 <69443847+petrie911@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Crow/z_en_crow.c Co-authored-by: petrie911 <69443847+petrie911@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Crow/z_en_crow.c Co-authored-by: petrie911 <69443847+petrie911@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Crow/z_en_crow.c Co-authored-by: petrie911 <69443847+petrie911@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Crow/z_en_crow.c Co-authored-by: petrie911 <69443847+petrie911@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Crow/z_en_crow.c Co-authored-by: petrie911 <69443847+petrie911@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Crow/z_en_crow.c Co-authored-by: petrie911 <69443847+petrie911@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Crow/z_en_crow.c Co-authored-by: petrie911 <69443847+petrie911@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Crow/z_en_crow.c Co-authored-by: petrie911 <69443847+petrie911@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Crow/z_en_crow.c Co-authored-by: petrie911 <69443847+petrie911@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Crow/z_en_crow.c Co-authored-by: petrie911 <69443847+petrie911@users.noreply.github.com> * Made suggested changes * Update src/overlays/actors/ovl_En_Crow/z_en_crow.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Crow/z_en_crow.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Crow/z_en_crow.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Crow/z_en_crow.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Crow/z_en_crow.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Crow/z_en_crow.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Crow/z_en_crow.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Updated En_Crow * Fixed chained assignment * Updated En_Crow * Update src/overlays/actors/ovl_En_Crow/z_en_crow.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Crow/z_en_crow.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Added parens * fix formatting Co-authored-by: petrie911 <69443847+petrie911@users.noreply.github.com> Co-authored-by: Zelllll <elijah@DESKTOP-NMP1I89.localdomain> Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-11-16 01:09:59 +00:00
include "build/src/overlays/actors/ovl_En_Crow/ovl_En_Crow_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Cs"
include "build/src/overlays/actors/ovl_En_Cs/z_en_cs.o"
En_Cs OK and mostly documented (#639) * all except one matching * documented and ready for pr * remove unused asm * change mass thing
2021-01-31 23:32:19 +00:00
include "build/src/overlays/actors/ovl_En_Cs/ovl_En_Cs_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Daiku"
include "build/src/overlays/actors/ovl_En_Daiku/z_en_daiku.o"
ovl_En_Daiku OK and documented (#422) * ovl_En_Daiku OK, except func_809E3068 * ovl_En_Daiku documented * `ACTORTYPE_ENEMY` Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Nonmatching reloc, better #include path, defines for state flags, enum values, `hair` -> `hairDLists` * asm and format * review Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> Co-authored-by: fig <fig02srl@gmail.com>
2020-12-03 21:58:05 +00:00
include "build/src/overlays/actors/ovl_En_Daiku/ovl_En_Daiku_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Daiku_Kakariko"
include "build/src/overlays/actors/ovl_En_Daiku_Kakariko/z_en_daiku_kakariko.o"
En_Daiku_Kakariko OK (Kakariko Village Carpenters) (#635) * mostly done, one function left * daiku_kakariko OK * should be ready for pr * removed unused asm * should build OK now * builds OK now * all of fig's suggestions resolved
2021-01-31 23:14:47 +00:00
include "build/src/overlays/actors/ovl_En_Daiku_Kakariko/ovl_En_Daiku_Kakariko_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Dekubaba"
include "build/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.o"
EnDekubaba OK and documented, object_dekubaba documented (#864) * 13 functions left, data imported * 2 left * 1 left * OK * Begin naming * sfx rename * spec * Begin naming, add LINK_IS_CHILD to EnDu * Fix spelling of its/it's * Document most of object_dekubaba, import symbols * Document draw functions, begin on actionfuncs * New actor function names, some float constants * Name almost everything * Delete asm * Name size, format * Review changes * Review changes * Brackets, format
2021-07-07 17:26:09 +00:00
include "build/src/overlays/actors/ovl_En_Dekubaba/ovl_En_Dekubaba_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Dekunuts"
include "build/src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.o"
dekunuts OK (#664) * dekunuts OK * named unk_19A * improved the match, got rid of volatile * one unaccounted blob * finished object_dekunuts * capitalization consistency * suggested changes * suggested changes again
2021-02-12 22:22:48 +00:00
include "build/src/overlays/actors/ovl_En_Dekunuts/ovl_En_Dekunuts_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Dh"
include "build/src/overlays/actors/ovl_En_Dh/z_en_dh.o"
En_Dh (#474) * Darkmeiro decompilation Bg_Gnd_Darkmeiro decompiled, matched, and documented. * give this a shot * fix conflict * one more try * could be useful * whoops * ZAP2 stuff * ZAP why * ZAP again * Is this where I make a Mr Hands joke? * Manos: the Hands of Fate * cleanup * and format
2020-12-02 19:58:57 +00:00
include "build/src/overlays/actors/ovl_En_Dh/ovl_En_Dh_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Dha"
include "build/src/overlays/actors/ovl_En_Dha/z_en_dha.o"
Split ovl_file_choose and ovl_kaleido_scope (#167) * Split ovl_file_choose and ovl_kaleido_scope * Split ovl_kaleido_scope's rodata/data/bss * fix * fix spec * spec fix * hopefully last spec fix * hopefully last spec fix 2 * fix * Add comments on file boundaries * fix
2020-06-07 17:52:43 +00:00
include "build/src/overlays/actors/ovl_En_Dha/ovl_En_Dha_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Diving_Game"
include "build/src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.o"
EnDivingGame OK (#745) * update * EnDivingGame_Draw OK * dont feel like working on this function today * fixed build errors * fixing some merge conflicts Signed-off-by: Angie <angheloalf95@gmail.com> * more conflict fixing Signed-off-by: Angie <angheloalf95@gmail.com> * all merge conflicts fixed Signed-off-by: Angie <angheloalf95@gmail.com> * EnDivingGame_Update OK Signed-off-by: Angie <angheloalf95@gmail.com> * remove DECR Signed-off-by: Angie <angheloalf95@gmail.com> * format and unused_asm Signed-off-by: Angie <angheloalf95@gmail.com> * change reloc in spec Signed-off-by: Angie <angheloalf95@gmail.com> * damn reloc Signed-off-by: Angie <angheloalf95@gmail.com> * Apply suggestions from code review Co-authored-by: louist103 <35883445+louist103@users.noreply.github.com> * use OPEN_DISPS macro Signed-off-by: Angie <angheloalf95@gmail.com> * batch of suggestions Signed-off-by: Angie <angheloalf95@gmail.com> * more suggestions Signed-off-by: Angie <angheloalf95@gmail.com> * more changes, but this isn't ready yet Signed-off-by: Angie <angheloalf95@gmail.com> * rename two timers Signed-off-by: angie <angheloalf95@gmail.com> * Update src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.c Co-authored-by: louist103 <35883445+louist103@users.noreply.github.com> * grabbedRuppiesCounter Signed-off-by: angie <angheloalf95@gmail.com> * a lot of vec Signed-off-by: angie <angheloalf95@gmail.com> * Apply suggestions from code review Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> Co-authored-by: petrie911 <69443847+petrie911@users.noreply.github.com> * fix some typos Signed-off-by: angie <angheloalf95@gmail.com> * allRupeesThrowed Signed-off-by: angie <angheloalf95@gmail.com> * rupeesLeftToThrow Signed-off-by: Angie <angheloalf95@gmail.com> * boolean changes and minor comments Signed-off-by: Angie <angheloalf95@gmail.com> * and more renaming Signed-off-by: Angie <angheloalf95@gmail.com> * renaiming and chained assign Signed-off-by: Angie <angheloalf95@gmail.com> * rename 3 functions Signed-off-by: Angie <angheloalf95@gmail.com> * final rename and add two enums Signed-off-by: angie <angheloalf95@gmail.com> * format Signed-off-by: angie <angheloalf95@gmail.com> * enum naming Signed-off-by: angie <angheloalf95@gmail.com> Co-authored-by: Lucas Shaw <lgs84@cornell.edu> Co-authored-by: louist103 <35883445+louist103@users.noreply.github.com> Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> Co-authored-by: petrie911 <69443847+petrie911@users.noreply.github.com>
2021-04-03 16:15:16 +00:00
include "build/src/overlays/actors/ovl_En_Diving_Game/ovl_En_Diving_Game_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Dns"
include "build/src/overlays/actors/ovl_En_Dns/z_en_dns.o"
En_Dns OK (#477) * En_Dns OK All functions matching, several named. I left unnamed the really short ones that just do purchase checks, and the string of action functions near the end where the purposes are somewhat opaque. * Addressed all comments (with the exception of one that didn't match) * missed the header * Apply suggestions from code review Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * else if review comment addressed Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-12-02 00:07:38 +00:00
include "build/src/overlays/actors/ovl_En_Dns/ovl_En_Dns_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Dnt_Demo"
include "build/src/overlays/actors/ovl_En_Dnt_Demo/z_en_dnt_demo.o"
Forest Stage and related actors and objects (#618) * starting out * match demo * full match * cleanup * more names * more names * headers * dist from link * docs * objects * format * organization of xmls * merge actor * Update src/overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * format Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain> Co-authored-by: Fig02 <fig02srl@gmail.com> Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2021-02-12 22:25:02 +00:00
include "build/src/overlays/actors/ovl_En_Dnt_Demo/ovl_En_Dnt_Demo_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Dnt_Jiji"
include "build/src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.o"
Forest Stage and related actors and objects (#618) * starting out * match demo * full match * cleanup * more names * more names * headers * dist from link * docs * objects * format * organization of xmls * merge actor * Update src/overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * format Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain> Co-authored-by: Fig02 <fig02srl@gmail.com> Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2021-02-12 22:25:02 +00:00
include "build/src/overlays/actors/ovl_En_Dnt_Jiji/ovl_En_Dnt_Jiji_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Dnt_Nomal"
include "build/src/overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.o"
Forest Stage and related actors and objects (#618) * starting out * match demo * full match * cleanup * more names * more names * headers * dist from link * docs * objects * format * organization of xmls * merge actor * Update src/overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * format Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain> Co-authored-by: Fig02 <fig02srl@gmail.com> Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2021-02-12 22:25:02 +00:00
include "build/src/overlays/actors/ovl_En_Dnt_Nomal/ovl_En_Dnt_Nomal_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Dodojr"
include "build/src/overlays/actors/ovl_En_Dodojr/z_en_dodojr.o"
En_Dodojr (Baby Dodongo) OK (#609) * some functions finished * some more progress * a bit more progress * more functions done, one wip * 2 functions remain * one function remains * actor mostly done, still one function left * some progress, still not equivalent * dodojr OK * dodojr ready * correct actor struct * Update src/overlays/actors/ovl_En_Dodojr/z_en_dodojr.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Dodojr/z_en_dodojr.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Dodojr/z_en_dodojr.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * builds OK now Co-authored-by: Zelllll <elijah@DESKTOP-NMP1I89.localdomain> Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2021-01-31 19:59:50 +00:00
include "build/src/overlays/actors/ovl_En_Dodojr/ovl_En_Dodojr_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Dodongo"
include "build/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.o"
En_Dodongo (#498) * Darkmeiro decompilation Bg_Gnd_Darkmeiro decompiled, matched, and documented. * give this a shot * fix conflict * one more try * could be useful * whoops * ZAP2 stuff * ZAP why * ZAP again * I can't wait to bomb some do dodongos * a whole heap of bombchus * matched * more names * Dodongo dislikes smoke * i am error * merge * fixes * Update src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.h Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-12-06 18:06:17 +00:00
include "build/src/overlays/actors/ovl_En_Dodongo/ovl_En_Dodongo_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Dog"
include "build/src/overlays/actors/ovl_En_Dog/z_en_dog.o"
Split ovl_file_choose and ovl_kaleido_scope (#167) * Split ovl_file_choose and ovl_kaleido_scope * Split ovl_kaleido_scope's rodata/data/bss * fix * fix spec * spec fix * hopefully last spec fix * hopefully last spec fix 2 * fix * Add comments on file boundaries * fix
2020-06-07 17:52:43 +00:00
include "build/src/overlays/actors/ovl_En_Dog/ovl_En_Dog_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Door"
include "build/src/overlays/actors/ovl_En_Door/z_en_door.o"
ovl_En_Door (#402) * Decompiled, two non-matchings remaining * Fix merge * Cleanups * Some documentation, remove unused asm * Remove unused data.s, review suggestions * Ran formatter, further review suggestions * Make some data static * Match EnDoor_Init * Remove asm for EnDoor_Init * Changes from review Co-authored-by: petrie911 <69443847+petrie911@users.noreply.github.com> * More variables static, remove unnecessary s8 cast * PR Suggestions * review Co-authored-by: petrie911 <69443847+petrie911@users.noreply.github.com> Co-authored-by: fig <fig02srl@gmail.com>
2020-12-03 21:51:22 +00:00
include "build/src/overlays/actors/ovl_En_Door/ovl_En_Door_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Ds"
include "build/src/overlays/actors/ovl_En_Ds/z_en_ds.o"
Split ovl_file_choose and ovl_kaleido_scope (#167) * Split ovl_file_choose and ovl_kaleido_scope * Split ovl_kaleido_scope's rodata/data/bss * fix * fix spec * spec fix * hopefully last spec fix * hopefully last spec fix 2 * fix * Add comments on file boundaries * fix
2020-06-07 17:52:43 +00:00
include "build/src/overlays/actors/ovl_En_Ds/ovl_En_Ds_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Du"
include "build/src/overlays/actors/ovl_En_Du/z_en_du.o"
ovl_En_Du (#630) * Decompiled * asm Co-authored-by: Thar0 <maximilianc64@gmail.com> Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-01-31 19:01:16 +00:00
include "build/src/overlays/actors/ovl_En_Du/ovl_En_Du_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Dy_Extra"
include "build/src/overlays/actors/ovl_En_Dy_Extra/z_en_dy_extra.o"
En_Dy_Extra OK and matching (#351) * Almost done with en_dy_extra * All matching other than draw function, which just has some stack issues + possibly a localGfxCtx issue. * OK, one non-matching. * z_en_dy_extra OK and matching * Deleted asm and updated spec * Changed colors to decimal and got rid of padding in the u8 array * Ran format script again to clean up after last commit * All requested fixes * Made further requested changes
2020-08-28 06:30:09 +00:00
include "build/src/overlays/actors/ovl_En_Dy_Extra/ovl_En_Dy_Extra_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Eg"
include "build/src/overlays/actors/ovl_En_Eg/z_en_eg.o"
Split ovl_file_choose and ovl_kaleido_scope (#167) * Split ovl_file_choose and ovl_kaleido_scope * Split ovl_kaleido_scope's rodata/data/bss * fix * fix spec * spec fix * hopefully last spec fix * hopefully last spec fix 2 * fix * Add comments on file boundaries * fix
2020-06-07 17:52:43 +00:00
include "build/src/overlays/actors/ovl_En_Eg/ovl_En_Eg_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Eiyer"
include "build/src/overlays/actors/ovl_En_Eiyer/z_en_eiyer.o"
Decompile and label EnEiyer (#852) * En_Eiyer OK * Label EnEiyer * Style fixes * Rename colCyl -> collider * Use CLAMP_MIN * Format * Review changes
2021-06-17 17:51:49 +00:00
include "build/src/overlays/actors/ovl_En_Eiyer/ovl_En_Eiyer_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Elf"
include "build/src/overlays/actors/ovl_En_Elf/z_en_elf.o"
En_Elf Decompiled (#432) * init matched * everything but navi OK * progress * 4 left * remove asm * progress * progress * asm and spec * remove comment * suggestion * review1 * use type enum * name func * overridelimbdraw * review 2 * forgot one * merge master * format
2020-10-28 17:02:35 +00:00
include "build/src/overlays/actors/ovl_En_Elf/ovl_En_Elf_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Encount1"
include "build/src/overlays/actors/ovl_En_Encount1/z_en_encount1.o"
EnEncount1 (#457) * Darkmeiro decompilation Bg_Gnd_Darkmeiro decompiled, matched, and documented. * give this a shot * fix conflict * one more try * could be useful * whoops * Leevers and Tektites and Wolfos, ohmy! * changes and cleanup * the need for speed
2020-11-19 19:27:32 +00:00
include "build/src/overlays/actors/ovl_En_Encount1/ovl_En_Encount1_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Encount2"
include "build/src/overlays/actors/ovl_En_Encount2/z_en_encount2.o"
EnEncount2 and EnFireRock OK (#659) * first two funcs done * fixing struct var name due to external use * func_80A07CA4 done * started EnEncount2_Update * EnEncount2_Update done * Encount2 done! * EnFireRock_Init done (but will only match once initvars are uncommented * progress * 4 funcs left * Fully matching * minor formatting * renames * change structs back to normal * formatting * removing unused comments * even more formatting stuff * removed unused asm * pr stuff * pr stuff * added newline at end of file * some merge suggestions * more pr stuff * review Co-authored-by: fig02 <fig02srl@gmail.com>
2021-03-14 14:39:41 +00:00
include "build/src/overlays/actors/ovl_En_Encount2/ovl_En_Encount2_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Ex_Item"
include "build/src/overlays/actors/ovl_En_Ex_Item/z_en_ex_item.o"
En_Ex_Item (#567) * first go * match * vt * docs * one last thing * formatted * bowling, why not * header * Update src/overlays/actors/ovl_En_Ex_Item/z_en_ex_item.h Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Ex_Item/z_en_ex_item.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * press FFFF Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain> Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2021-01-01 00:56:02 +00:00
include "build/src/overlays/actors/ovl_En_Ex_Item/ovl_En_Ex_Item_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Ex_Ruppy"
include "build/src/overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.o"
Match/Improve more non matching functions (#366) * Match/Improve more non matchings * Remove SET_NEXT_GAMESTATE from preserved macros
2020-08-30 16:51:46 +00:00
include "build/src/overlays/actors/ovl_En_Ex_Ruppy/ovl_En_Ex_Ruppy_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Fd"
include "build/src/overlays/actors/ovl_En_Fd/z_en_fd.o"
z_en_fd, z_en_fd_fire, and z_en_fw (#415) * EnFd OK * decompile En_Fd_Fire, document some of En_Fd * fw wip * match a few more of ovl_en_fw, properly organize data * Ovl_En_Fw OK * Documentation, formatting. * change Color_RGBA8_n to Color_RGBA8 * PR updates * fix errors with merge * review * dunno why jenkins failed * review Co-authored-by: fig <fig02srl@gmail.com>
2020-12-04 19:35:28 +00:00
include "build/src/overlays/actors/ovl_En_Fd/ovl_En_Fd_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Fd_Fire"
include "build/src/overlays/actors/ovl_En_Fd_Fire/z_en_fd_fire.o"
z_en_fd, z_en_fd_fire, and z_en_fw (#415) * EnFd OK * decompile En_Fd_Fire, document some of En_Fd * fw wip * match a few more of ovl_en_fw, properly organize data * Ovl_En_Fw OK * Documentation, formatting. * change Color_RGBA8_n to Color_RGBA8 * PR updates * fix errors with merge * review * dunno why jenkins failed * review Co-authored-by: fig <fig02srl@gmail.com>
2020-12-04 19:35:28 +00:00
include "build/src/overlays/actors/ovl_En_Fd_Fire/ovl_En_Fd_Fire_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Fhg_Fire"
include "build/src/overlays/actors/ovl_En_Fhg_Fire/z_en_fhg_fire.o"
Phantom Ganon (ovl_Boss_Ganondrof) and related actors (#442) * Darkmeiro decompilation Bg_Gnd_Darkmeiro decompiled, matched, and documented. * give this a shot * fix conflict * one more try * It's Phantom Ganon time * Fhg_Fire matched * small touch up * more documentation * starting naming fire * renaming * cleanup * hooray for new names * merge * first pass * camera status * bgcheck * object 1 * object 2 * .s * .s * fig's comments * implementing zel's suggestions and a few other things * the work begins * work continues * docs, shifts, cleanup * cleanup * texture names * addressing the rest of the notes Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
2021-03-29 19:35:46 +00:00
include "build/src/overlays/actors/ovl_En_Fhg_Fire/ovl_En_Fhg_Fire_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Fire_Rock"
include "build/src/overlays/actors/ovl_En_Fire_Rock/z_en_fire_rock.o"
EnEncount2 and EnFireRock OK (#659) * first two funcs done * fixing struct var name due to external use * func_80A07CA4 done * started EnEncount2_Update * EnEncount2_Update done * Encount2 done! * EnFireRock_Init done (but will only match once initvars are uncommented * progress * 4 funcs left * Fully matching * minor formatting * renames * change structs back to normal * formatting * removing unused comments * even more formatting stuff * removed unused asm * pr stuff * pr stuff * added newline at end of file * some merge suggestions * more pr stuff * review Co-authored-by: fig02 <fig02srl@gmail.com>
2021-03-14 14:39:41 +00:00
include "build/src/overlays/actors/ovl_En_Fire_Rock/ovl_En_Fire_Rock_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Firefly"
include "build/src/overlays/actors/ovl_En_Firefly/z_en_firefly.o"
En Firefly OK (#503) * Init, Destroy OK, data partially done * All functions matched * Data imported * Finished naming functions and variables * name change, inlined PostLimbDraw data * Delete asm * progress * skelanime updated and review * asm * review 2 Co-authored-by: fig <fig02srl@gmail.com>
2020-12-06 07:07:59 +00:00
include "build/src/overlays/actors/ovl_En_Firefly/ovl_En_Firefly_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Fish"
include "build/src/overlays/actors/ovl_En_Fish/z_en_fish.o"
EnFish, OK and documented (#795) * Matching * Some naming * spec * Name another function * Name animations, clarify use of GI_MAX and GI_NONE * Documented bottle range functions * Simplify squared distance function in EnIceHono, actor descriptions * Functions for dropped fish * More naming * Change 65535.5f to (0xFFFF + 0.5f) * Change 65535.5f to (0xFFFF + 0.5f) * name phases * Named other types, Docile functions * Naming complete * delete asm * format, remove outdated comment * Fix a few DrawFlexOpa arguments * Review changes * Change back to original playSound * Function comments per review
2021-05-02 16:41:05 +00:00
include "build/src/overlays/actors/ovl_En_Fish/ovl_En_Fish_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Floormas"
include "build/src/overlays/actors/ovl_En_Floormas/z_en_floormas.o"
Split ovl_file_choose and ovl_kaleido_scope (#167) * Split ovl_file_choose and ovl_kaleido_scope * Split ovl_kaleido_scope's rodata/data/bss * fix * fix spec * spec fix * hopefully last spec fix * hopefully last spec fix 2 * fix * Add comments on file boundaries * fix
2020-06-07 17:52:43 +00:00
include "build/src/overlays/actors/ovl_En_Floormas/ovl_En_Floormas_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Fr"
include "build/src/overlays/actors/ovl_En_Fr/z_en_fr.o"
En_Fr Frogs 47 of 48 func decomped (#576) * En_Fr 47 of 48 func decomped * EnFr more cleanup * uncommented out EnFr_Update * more cleanup * added format document * Update src/overlays/actors/ovl_En_Fr/z_en_fr.c Null Pointers Co-authored-by: petrie911 <69443847+petrie911@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Fr/z_en_fr.c Co-authored-by: petrie911 <69443847+petrie911@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Fr/z_en_fr.c Co-authored-by: petrie911 <69443847+petrie911@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Fr/z_en_fr.c Co-authored-by: petrie911 <69443847+petrie911@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Fr/z_en_fr.c Co-authored-by: petrie911 <69443847+petrie911@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Fr/z_en_fr.c Co-authored-by: petrie911 <69443847+petrie911@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Fr/z_en_fr.c Co-authored-by: petrie911 <69443847+petrie911@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Fr/z_en_fr.c Co-authored-by: petrie911 <69443847+petrie911@users.noreply.github.com> * feedback from pr * more cleanup * more pr feedback * more cleaning and updates * remove data.s * review 2 * review * missed one Co-authored-by: petrie911 <69443847+petrie911@users.noreply.github.com> Co-authored-by: fig <fig02srl@gmail.com>
2021-02-02 20:17:51 +00:00
include "build/src/overlays/actors/ovl_En_Fr/ovl_En_Fr_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Fu"
include "build/src/overlays/actors/ovl_En_Fu/z_en_fu.o"
Split ovl_file_choose and ovl_kaleido_scope (#167) * Split ovl_file_choose and ovl_kaleido_scope * Split ovl_kaleido_scope's rodata/data/bss * fix * fix spec * spec fix * hopefully last spec fix * hopefully last spec fix 2 * fix * Add comments on file boundaries * fix
2020-06-07 17:52:43 +00:00
include "build/src/overlays/actors/ovl_En_Fu/ovl_En_Fu_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Fw"
include "build/src/overlays/actors/ovl_En_Fw/z_en_fw.o"
z_en_fd, z_en_fd_fire, and z_en_fw (#415) * EnFd OK * decompile En_Fd_Fire, document some of En_Fd * fw wip * match a few more of ovl_en_fw, properly organize data * Ovl_En_Fw OK * Documentation, formatting. * change Color_RGBA8_n to Color_RGBA8 * PR updates * fix errors with merge * review * dunno why jenkins failed * review Co-authored-by: fig <fig02srl@gmail.com>
2020-12-04 19:35:28 +00:00
include "build/src/overlays/actors/ovl_En_Fw/ovl_En_Fw_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Fz"
include "build/src/overlays/actors/ovl_En_Fz/z_en_fz.o"
En_Fz Freezard (#519) * En_Fr 47 of 48 func decomped * En_Fz Frezzard 26/36 func decompiled * En_Fz Freezard fully decomped * revert EnFr to independently submit EnFz * EnFz fully decompiled * more cleanup * pr feedback * pr feedback * petries review * asm * review Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-01-31 17:47:34 +00:00
include "build/src/overlays/actors/ovl_En_Fz/ovl_En_Fz_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_G_Switch"
include "build/src/overlays/actors/ovl_En_G_Switch/z_en_g_switch.o"
G_Switch, Syateki_Itm, and Syateki_Man (Shooting gallery and related actors) (#523) * Darkmeiro decompilation Bg_Gnd_Darkmeiro decompiled, matched, and documented. * give this a shot * fix conflict * one more try * could be useful * whoops * ZAP2 stuff * ZAP why * ZAP again * rupees and, for some reason, pots * and now an even larger man * now for the gallery * more progress * naming continues * even more docs * another match * match, fix, a new enum * Update src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c * fixes except globalctx * well one more * and now globalCtx
2020-12-11 22:38:23 +00:00
include "build/src/overlays/actors/ovl_En_G_Switch/ovl_En_G_Switch_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Ganon_Mant"
include "build/src/overlays/actors/ovl_En_Ganon_Mant/z_en_ganon_mant.o"
Decompile ovl_En_Ganon_Mant (#912) * Initial progress * Improve the last NON_EQUIVALENT to NON_MATCHING * 2 functions down to stack, migrate data * 2 more matches, some other improvements * Use Vtx over Vtx_tn * Begin documenting * Some names * More docs * Finish docs * Remove VTX_TN * Review suggestions * Single line comments Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * en_ganon_mant fully matched thanks to Roman Co-authored-by: Thar0 <maximilianc64@gmail.com> Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2021-08-30 00:29:11 +00:00
include "build/src/overlays/actors/ovl_En_Ganon_Mant/ovl_En_Ganon_Mant_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Ganon_Organ"
include "build/src/overlays/actors/ovl_En_Ganon_Organ/z_en_ganon_organ.o"
Fix ganon organ reloc data and extract its assets (#965) * fix ganon organ reloc data and extract its assets * Named all textures * RangeEnd * static * Remove D_ comments from XML * Rename pad to sForceAlignment Co-authored-by: Elliptic Ellipsis <elliptic.ellipsis@gmail.com>
2021-09-18 15:40:40 +00:00
include "build/src/overlays/actors/ovl_En_Ganon_Organ/ovl_En_Ganon_Organ_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Gb"
include "build/src/overlays/actors/ovl_En_Gb/z_en_gb.o"
Ovl_En_Gb OK (#691) * Progress * Matched * Cleanup, some names Co-authored-by: Thar0 <maximilianc64@gmail.com>
2021-02-12 22:37:13 +00:00
include "build/src/overlays/actors/ovl_En_Gb/ovl_En_Gb_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Ge1"
include "build/src/overlays/actors/ovl_En_Ge1/z_en_ge1.o"
Gerudo1 OK and mostly documented (#607) * all functions matched, data imported * some function names * more naming * corrections, naming * some state flags named * naming completed (some may be inaccurate) * spec * delete asm * Review changes * review * review Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-02-01 20:20:16 +00:00
include "build/src/overlays/actors/ovl_En_Ge1/ovl_En_Ge1_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Ge2"
include "build/src/overlays/actors/ovl_En_Ge2/z_en_ge2.o"
Gerudo2 OK and mostly documented (#610) * OK, inlined small data, began naming * spec * more naming * finished naming * remove ASM * hex to dec * review Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-02-01 20:12:24 +00:00
include "build/src/overlays/actors/ovl_En_Ge2/ovl_En_Ge2_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Ge3"
include "build/src/overlays/actors/ovl_En_Ge3/z_en_ge3.o"
Gerudo3 OK and documented (#593) * Ge3: OK and data migrated * Functions and most variables named * finished enums for limbs, inlined data * spec updated, asm deleted * fix dists * changes * changes Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-01-31 23:39:41 +00:00
include "build/src/overlays/actors/ovl_En_Ge3/ovl_En_Ge3_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_GeldB"
include "build/src/overlays/actors/ovl_En_GeldB/z_en_geldb.o"
Automatic object xml creation (#596) * new tool * fixes Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
2021-01-04 17:06:51 +00:00
include "build/src/overlays/actors/ovl_En_GeldB/ovl_En_GeldB_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_GirlA"
include "build/src/overlays/actors/ovl_En_GirlA/z_en_girla.o"
EnGirlA (#233) * EnGirlA all matching but 2 * Fix warnings, remove files * PR 1 * Fix * aaa * Put this asm file back * Revert "Put this asm file back" This reverts commit 7e8e1080d7a89e54a6e42dc2d1d6ada53e348043. * PR * Fix * GirlA matched * Unused asm
2020-07-21 04:06:50 +00:00
include "build/src/overlays/actors/ovl_En_GirlA/ovl_En_GirlA_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Gm"
include "build/src/overlays/actors/ovl_En_Gm/z_en_gm.o"
ovl_En_Gm OK (#407) * im tired so done for tonight * decompiled * z_en_gm remove reloc * added description * weird formatting fixed * MTXMODE_APPLY * Made suggested changes * update * review 2 Co-authored-by: fig <fig02srl@gmail.com>
2020-12-02 20:00:24 +00:00
include "build/src/overlays/actors/ovl_En_Gm/ovl_En_Gm_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Go"
include "build/src/overlays/actors/ovl_En_Go/z_en_go.o"
Gorons: En_Go & En_Go2 OK (#556) * moved en_go rodata * EnGo 20/45 functions decompiled * EnGo 25/45 functions decompiled * EnGo 28/45 functions decompiled * EnGo 32/45 functions decompiled * minor attempts * init Goron 2 6/98 decompiled (baby functions) * Goron2 14/98 func decompiled * Goron2 30/98 func decompiled * EnGo 34/45 functions decompiled * EnGo 38/45 functions decompiled * Goron2 44/98 functions decompiled * Goron2 58/98 functions decompiled * Merged EnGo and EnGo2: 38/45, 58/98 functions decompiled * EnGo EnGo2: 38/45, 65/98 functions decompiled * EnGo EnGo2: 38/45, 70/98 functions decompiled * EnGo EnGo2: 39/45, 72/98 functions decompiled * EnGo EnGo2: 39/45, 80/98 functions decompiled * EnGo EnGo2: 39/45, 88/98 functions decompiled * EnGo EnGo2: 39/45, 92/98 functions decompiled * typo in GoronType * EnGo EnGo2: 40/45, 93/98 functions decompiled * EnGo EnGo2: 45/45, 93/98 functions decompiled * EnGo EnGo2 fully decomped * begin cleanup * the cleanup continues * continue cleaning * Documentation and renaming attempt * more cleanup * more cleanup * Apply suggestions from code review Committing suggestions Co-authored-by: AdamKiddle <54328813+AdamKiddle@users.noreply.github.com> Co-authored-by: mzxrules <mzxrules@gmail.com> * more pr suggestions * more pr and gns feedback * fixed comment * cleanup * update math & skelAnime names * goron1 * goron2 * relocs * review Co-authored-by: AdamKiddle <54328813+AdamKiddle@users.noreply.github.com> Co-authored-by: mzxrules <mzxrules@gmail.com> Co-authored-by: fig <fig02srl@gmail.com>
2021-01-31 18:02:28 +00:00
include "build/src/overlays/actors/ovl_En_Go/ovl_En_Go_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Go2"
include "build/src/overlays/actors/ovl_En_Go2/z_en_go2.o"
Gorons: En_Go & En_Go2 OK (#556) * moved en_go rodata * EnGo 20/45 functions decompiled * EnGo 25/45 functions decompiled * EnGo 28/45 functions decompiled * EnGo 32/45 functions decompiled * minor attempts * init Goron 2 6/98 decompiled (baby functions) * Goron2 14/98 func decompiled * Goron2 30/98 func decompiled * EnGo 34/45 functions decompiled * EnGo 38/45 functions decompiled * Goron2 44/98 functions decompiled * Goron2 58/98 functions decompiled * Merged EnGo and EnGo2: 38/45, 58/98 functions decompiled * EnGo EnGo2: 38/45, 65/98 functions decompiled * EnGo EnGo2: 38/45, 70/98 functions decompiled * EnGo EnGo2: 39/45, 72/98 functions decompiled * EnGo EnGo2: 39/45, 80/98 functions decompiled * EnGo EnGo2: 39/45, 88/98 functions decompiled * EnGo EnGo2: 39/45, 92/98 functions decompiled * typo in GoronType * EnGo EnGo2: 40/45, 93/98 functions decompiled * EnGo EnGo2: 45/45, 93/98 functions decompiled * EnGo EnGo2 fully decomped * begin cleanup * the cleanup continues * continue cleaning * Documentation and renaming attempt * more cleanup * more cleanup * Apply suggestions from code review Committing suggestions Co-authored-by: AdamKiddle <54328813+AdamKiddle@users.noreply.github.com> Co-authored-by: mzxrules <mzxrules@gmail.com> * more pr suggestions * more pr and gns feedback * fixed comment * cleanup * update math & skelAnime names * goron1 * goron2 * relocs * review Co-authored-by: AdamKiddle <54328813+AdamKiddle@users.noreply.github.com> Co-authored-by: mzxrules <mzxrules@gmail.com> Co-authored-by: fig <fig02srl@gmail.com>
2021-01-31 18:02:28 +00:00
include "build/src/overlays/actors/ovl_En_Go2/ovl_En_Go2_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Goma"
include "build/src/overlays/actors/ovl_En_Goma/z_en_goma.o"
EnGoma OK (#770) * En_Goma OK * Label Goma * Remove asm * Labeling * Review changes * Forgot a comment * sizeof * Review comments and fix warnings * review Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-04-12 17:45:58 +00:00
include "build/src/overlays/actors/ovl_En_Goma/ovl_En_Goma_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Goroiwa"
include "build/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.o"
ovl_En_Goroiwa OK (#376) * merge upstream * Merge upstream * Add block comment to c * EnGoroiwa_Init * Remove casts in EnGoroiwa_Init * Matched named functions * Add one prototype * func_80A4BD04 * func_80A4BCA0 * func_80A4BD70 and fix incompatible pointer * func_80A4BD8C and func_80A4BE54 * Remove forward declaration * Order variable by address * Cleanup warnings * func_80A4C188 * Remove func_80A4C188 forward declaration * Progress * Rename unk_1CE to waypoint * func_80A4C264 * func_80A4D5E0 * func_80A4C27C * Separate necessary forward declarations from temporary * func_80A4BE10 * func_80A4C080 * func_80A4C134 and func_80A4C164 * func_80A4D074 * Work on some (nonmatching) * func_80A4D944 * func_80A4D9DC * Progress * func_80A4DB90 and func_80A4DC00 * func_80A4D8CC * func_80A4CA50 * func_80A4C6C8 * work on func_80A4CED8 * Work on func_80A4CED8 * func_80A4CED8 * Use temp to avoid unused error * Clarify comment * Work on func_80A4C3A4 * func_80A4C3A4 * Clarify comment better * func_80A4C594 * Angles * Improve regalloc * func_80A4BF28 * Cleanup point access * Work on func_80A4C814 * func_80A4C814 * Use *= * Work on func_80A4CB78 * Work on func_80A4D0FC * Work on func_80A4CB78 * More on func_80A4CB78 * Implement dubious permuter suggestion * Make janky hack less janky * Update issue comment * Move ptr func_80A4CB78 * func_80A4CB78 * Cleanup func_80A4CB78 * Various cleanup * Add undefined sym * Work on func_80A4D0FC * Work more on func_80A4D0FC * Work on func_80A4D624 * func_80A4D0FC * Work on func_80A4D624 * Fix stack * Wrap in NON_MATCHING ifdef to remember which function is not done * Collapse goto * Use -- for unk_1C4 * Collapse else if * Add translation for 'Player ぶっ飛ばし' * func_80A4D624 * Migrate data section * Clang format * Actually add unused note * Name timers accordingly * Remove & from sInitChain * Give timer descriptive names * Rename idleTimer to waitTimer * Rename to sWaitDurations * Name effect data * Add s prefix (oops) * Move some data into functions * Rename params for func_80029E8C * Unify whitespace for bool returns * Name colliderHeightOffset * Name duplicate of colliderHeightOffset and clang format everything * Reorder vector assignments * Rename params to pathIdx * Rename temp to yawDiff * Add 'f's because floating point * Name a lot of stuff * Name posDiff * Nuke the bool * Remove unnecessary return Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Remove useless forward declarations and use list[0] * Clang format again * Use switch statement * Use hex for normalizing angle * Use hex because angle * Small fixes * Small fixes * Move function arrays out of function * Correct colliderItems * Don't separate static vars from others * Clang format Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
2020-09-28 10:03:39 +00:00
include "build/src/overlays/actors/ovl_En_Goroiwa/ovl_En_Goroiwa_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Gs"
include "build/src/overlays/actors/ovl_En_Gs/z_en_gs.o"
Gossip Stone, 1 nonmatching (#251) * Gossip Stone, 1 nonmatching * Appease the Fig * spec * Fix last function ordering * Ethan Review 1 * a * Hidden PR notes QQ * a * Fixed now?? * a
2020-07-19 00:35:12 +00:00
include "build/src/overlays/actors/ovl_En_Gs/ovl_En_Gs_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Guest"
include "build/src/overlays/actors/ovl_En_Guest/z_en_guest.o"
Split ovl_file_choose and ovl_kaleido_scope (#167) * Split ovl_file_choose and ovl_kaleido_scope * Split ovl_kaleido_scope's rodata/data/bss * fix * fix spec * spec fix * hopefully last spec fix * hopefully last spec fix 2 * fix * Add comments on file boundaries * fix
2020-06-07 17:52:43 +00:00
include "build/src/overlays/actors/ovl_En_Guest/ovl_En_Guest_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Hata"
include "build/src/overlays/actors/ovl_En_Hata/z_en_hata.o"
Split ovl_file_choose and ovl_kaleido_scope (#167) * Split ovl_file_choose and ovl_kaleido_scope * Split ovl_kaleido_scope's rodata/data/bss * fix * fix spec * spec fix * hopefully last spec fix * hopefully last spec fix 2 * fix * Add comments on file boundaries * fix
2020-06-07 17:52:43 +00:00
include "build/src/overlays/actors/ovl_En_Hata/ovl_En_Hata_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Heishi1"
include "build/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.o"
En_Heishi1 and Eff_Ss_Solder_Srch_Ball OK (#234) * progress * init ok and merge master * enheishi1 and srchball OK * cleanup * cleanup * cleanup * more cleanup * done * more comments * add file headers * some review comments * move vectors * more review comments * angle in decimal * add prototype * semicolon would be good * fix * make unset actor ids 0 * reword comment * no &
2020-07-09 19:12:03 +00:00
include "build/src/overlays/actors/ovl_En_Heishi1/ovl_En_Heishi1_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Heishi2"
include "build/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.o"
Split ovl_file_choose and ovl_kaleido_scope (#167) * Split ovl_file_choose and ovl_kaleido_scope * Split ovl_kaleido_scope's rodata/data/bss * fix * fix spec * spec fix * hopefully last spec fix * hopefully last spec fix 2 * fix * Add comments on file boundaries * fix
2020-06-07 17:52:43 +00:00
include "build/src/overlays/actors/ovl_En_Heishi2/ovl_En_Heishi2_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Heishi3"
include "build/src/overlays/actors/ovl_En_Heishi3/z_en_heishi3.o"
Split ovl_file_choose and ovl_kaleido_scope (#167) * Split ovl_file_choose and ovl_kaleido_scope * Split ovl_kaleido_scope's rodata/data/bss * fix * fix spec * spec fix * hopefully last spec fix * hopefully last spec fix 2 * fix * Add comments on file boundaries * fix
2020-06-07 17:52:43 +00:00
include "build/src/overlays/actors/ovl_En_Heishi3/ovl_En_Heishi3_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Heishi4"
include "build/src/overlays/actors/ovl_En_Heishi4/z_en_heishi4.o"
Decomp Heishi4 All OK (#364) * Fixed upstream * Migrate data, fix header, and begin Init function * Lots of progress * Almost done * One non matching left * Decomp EnHeishi4 All OK * PR fixes * PR fixes
2020-09-05 14:18:02 +00:00
include "build/src/overlays/actors/ovl_En_Heishi4/ovl_En_Heishi4_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Hintnuts"
include "build/src/overlays/actors/ovl_En_Hintnuts/z_en_hintnuts.o"
Split ovl_file_choose and ovl_kaleido_scope (#167) * Split ovl_file_choose and ovl_kaleido_scope * Split ovl_kaleido_scope's rodata/data/bss * fix * fix spec * spec fix * hopefully last spec fix * hopefully last spec fix 2 * fix * Add comments on file boundaries * fix
2020-06-07 17:52:43 +00:00
include "build/src/overlays/actors/ovl_En_Hintnuts/ovl_En_Hintnuts_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Holl"
include "build/src/overlays/actors/ovl_En_Holl/z_en_holl.o"
Decompiled En_Holl (#253) * Decompile most of En_Holl * Two nonmatchings left * Rename some variables, use EnHollActionFunc * Minor cleanups * Only regalloc issues left * General cleanups * 1 nonmatching left * Delete data.s file * Added some more documentation * Improved nonmatching but OK still elusive, some cleanups * Review changes * Ran formatter * More review changes * Flip conditions that were previously missed * DISP macros
2020-09-30 19:11:04 +00:00
include "build/src/overlays/actors/ovl_En_Holl/ovl_En_Holl_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Honotrap"
include "build/src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.o"
En_Honotrap (#580) * a good start * match * docs * slight error * to Link * fixes * format * come on formatter * Update src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.h Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain> Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2021-01-14 20:19:28 +00:00
include "build/src/overlays/actors/ovl_En_Honotrap/ovl_En_Honotrap_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Horse"
include "build/src/overlays/actors/ovl_En_Horse/z_en_horse.o"
En_Horse OK (#554) * En_Horse OK * Remove reloc * WIP * Use EnIn * Documentation * Documentation * Remove debug prints * Warnings * Cleanup * Unused asm * Review comment * Review comments and reformat * More review comments * Rename flags * Review changes Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-04-12 01:23:40 +00:00
include "build/src/overlays/actors/ovl_En_Horse/ovl_En_Horse_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Horse_Game_Check"
include "build/src/overlays/actors/ovl_En_Horse_Game_Check/z_en_horse_game_check.o"
En_Horse_Game_Check (#619) * stuff * name functions * whoops * horse head * matched and documented * merge actor * relocs Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
2021-01-30 18:17:43 +00:00
include "build/src/overlays/actors/ovl_En_Horse_Game_Check/ovl_En_Horse_Game_Check_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Horse_Ganon"
include "build/src/overlays/actors/ovl_En_Horse_Ganon/z_en_horse_ganon.o"
Split ovl_file_choose and ovl_kaleido_scope (#167) * Split ovl_file_choose and ovl_kaleido_scope * Split ovl_kaleido_scope's rodata/data/bss * fix * fix spec * spec fix * hopefully last spec fix * hopefully last spec fix 2 * fix * Add comments on file boundaries * fix
2020-06-07 17:52:43 +00:00
include "build/src/overlays/actors/ovl_En_Horse_Ganon/ovl_En_Horse_Ganon_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Horse_Link_Child"
include "build/src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.o"
ovl_En_Horse_Link_Child (#469) * ovl_En_Horse_Link_Child * PR review
2020-11-19 13:12:15 +00:00
include "build/src/overlays/actors/ovl_En_Horse_Link_Child/ovl_En_Horse_Link_Child_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Horse_Normal"
include "build/src/overlays/actors/ovl_En_Horse_Normal/z_en_horse_normal.o"
ovl_En_Horse_Normal (#403) * merge upstream * Merge upstream * Match EnHorseNormal_Init * Work on EnHorseNormal_Draw (probably finish depending functions first) * func_80A6CC88 * Work on EnHorseNormal_Draw * Clang format * Properly use OPEN_DISPS * Stop using thisx lol * Use the funny angle number * Use &D_04049AD0 because it's not a display list? * Stop using fun macros to fix stack * EnHorseNormal_Draw * EnHorseNormal_Destroy * EnHorseNormal_Update * Use disp macros EnHorseNormal_Draw * Correctly type D_04049AD0 * func_80A6C570 * Name some draw stuff * Fix names * Make if condition more readable * func_80A6B30C and fix incorrect pointer types * Function prototypes * func_80A6B250 * Add header comment * Move skin function to functions.h * Change to stable * Cleanup a little * Match some more * Work on func_80A6BE6C (won't compile yet) * Work on func_80A6BE6C again * Progress * func_80A6CAFC * Match all but one :) * Work on func_80A6BE6C * Work more on func_80A6BE6C * Multiply floating point by integer lol * Reorder assignment to almost match * func_80A6BE6C * Fix warning and remove unnecessary forward declarations * Data section * Cleanup data a bit * More cleanup and clang format * Clang format is a little confused * More cleanup * Formatting * Revert formatting on z_bg_spot01_objects2.c * Name unk_14C * Add clone comment * Name clonePos * Name and cleanup * Name some animation related stuff * Remove unnecessary assignment * Name cloneRotY * Use ARRAY_COUNT for sAnimations * Add more to unknown struct layout * Use u8 for last struct member * Use s32 for length * Add padding disclaimer * Update src/overlays/actors/ovl_En_Horse_Normal/z_en_horse_normal.c Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Horse_Normal/z_en_horse_normal.c Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Horse_Normal/z_en_horse_normal.c Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Horse_Normal/z_en_horse_normal.c Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Horse_Normal/z_en_horse_normal.c Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Various suggestions * Replace 10430.378f * Remove padding because alignment * Move function array out of function * Remove struct name being present twice unecessarily * Oops forgot the s * Don't separate static vars from others * Some cleanup * Use ARRAY_COUNT(sJntSphItemsInit) * Minor cleanup * Rename enum members * Oops forgot to rename enum Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
2020-10-12 22:45:16 +00:00
include "build/src/overlays/actors/ovl_En_Horse_Normal/ovl_En_Horse_Normal_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Horse_Zelda"
include "build/src/overlays/actors/ovl_En_Horse_Zelda/z_en_horse_zelda.o"
ovl_en_horse_zelda OK (#471) * Decompiled en_horse_zelda * Deleted some asm files I missed * Replaced approximation with a fraction * Turns out the f32 cast is unnecessary * Converted coordinates to decimal, replaced actor struct padding with char arrays * Properly converted to decimal * Renamed actionIndex to action, replaced += 1 with ++
2020-11-24 08:38:08 +00:00
include "build/src/overlays/actors/ovl_En_Horse_Zelda/ovl_En_Horse_Zelda_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Hs"
include "build/src/overlays/actors/ovl_En_Hs/z_en_hs.o"
ovl_En_Hs (#508) * ovl_En_Hs * PR review
2020-12-03 18:57:25 +00:00
include "build/src/overlays/actors/ovl_En_Hs/ovl_En_Hs_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Hs2"
include "build/src/overlays/actors/ovl_En_Hs2/z_en_hs2.o"
ovl_en_hs2 OK (#423) * Decompiled ovl_en_hs2 * Replaced skelAnime pointer with pad, changed some values to hex, replaced early return with else statment, removed unnecessary padding in the header, removed unneeded & on a function pointer * Replaced a tab with whitespace, removed address operator in front of ActorShadow_DrawFunc_Circle, moved vec3f inside the PostLimbDraw function * Changed 0xFFFE to ~1
2020-10-01 11:49:47 +00:00
include "build/src/overlays/actors/ovl_En_Hs2/ovl_En_Hs2_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Hy"
include "build/src/overlays/actors/ovl_En_Hy/z_en_hy.o"
ovl_En_Hy (#602) * ovl_En_Hy * Remove extra EOL * Rebase + PR review
2021-01-20 18:28:04 +00:00
include "build/src/overlays/actors/ovl_En_Hy/ovl_En_Hy_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Ice_Hono"
include "build/src/overlays/actors/ovl_En_Ice_Hono/z_en_ice_hono.o"
Match EnIceHono (#335) * Match EnIceHono * Cleanup for PR * Delete unused asm * Fix formatting * Requested style changes * PR fixes * More PR fixes * PR fixes
2020-10-04 16:13:37 +00:00
include "build/src/overlays/actors/ovl_En_Ice_Hono/ovl_En_Ice_Hono_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Ik"
include "build/src/overlays/actors/ovl_En_Ik/z_en_ik.o"
ovl_En_Ik (#461) * merge upstream * Merge upstream * Progress * Progress * Fixes * Migrate bss for now ig * func_80A772EC * Use rom reloc * Cleanup * Correct prototype * Rename to _PlayBGM * Eh revert to _StartMusic * Match func_80A74398 more * Fixes * Work on func_80A74398 * Work on func_80A74398 * Match func_80A74398 * Use thisx * Name, static, and move some stuff * Match some graphics functions * Rename asm for named functions * Forgot one * More graphics stuff * Progress * More progress * Fix jump table * Figure out types for a lot of data * Fix data * Type remaining data * Work on func_80A7492C * Ugly match for func_80A7492C * Fix func_80A7492C * Match some interesting stuff * Move and remove forward declarations * Sort declarations * Progress * Use quotes for vt import * Slightly better diff * Better diff again * Fix stack on func_80A74BA4 * match func_80A74BA4 * func_80A74674 * Progress * Progress * Progress * Progress * Eh early return probably makes more sense here * Progress * Progress * Progress * Autocomplete sucks * Name stuff in func_80A76E2C * Work a bit on func_80A75C38 * Ugly match func_80A75FA0 * Name it prevInvincibilityTimer * EnIk_PostLimbDraw3 * Use hex for line numbers in EnIk_PostLimbDraw3 * EnIk_PostLimbDraw2 * EnIk_PostLimbDraw1 * Use hex for line numbers in EnIk_PostLimbDraw1 * Use ACTORTYPE_ENEMY * Progress * Possible fake match of func_80A75C38 * Update spec and remove asm * Cleanup forward declarations * Move data to fun places * Move data into func_80A76E2C * Move data into func_80A75A38 * Make D_80A7847C an array * Remove struct padding * Revert "Remove struct padding" This reverts commit 87b0bd73da689beb65242e95fc81290c522a06f8. * Name colliders * Use else * Name shieldColliderItems * Use new graphics macros * Cleanup
2020-11-23 13:53:21 +00:00
include "build/src/overlays/actors/ovl_En_Ik/ovl_En_Ik_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_In"
include "build/src/overlays/actors/ovl_En_In/z_en_in.o"
ovl_En_In OK (#545) * Initial progress * Further progress * One nonmatching left * Fix merge * OK * Cleanup * Remove unused asm * Use generated reloc * nightFlag changes and requiredObject -> objectIdx * Some suggestions Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Revert nightflag changes, early return after Actor_Kill, objectIdx -> ingoObjBankIndex * Fix accidental nightFlag change in z_sram Co-authored-by: Thar0 <maximilianc64@gmail.com> Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2021-01-04 19:52:36 +00:00
include "build/src/overlays/actors/ovl_En_In/ovl_En_In_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Insect"
include "build/src/overlays/actors/ovl_En_Insect/z_en_insect.o"
Fix reloc data used for some actors and Match Bg_Spot01_Idohashira (#327)
2020-08-17 21:47:48 +00:00
include "build/src/overlays/actors/ovl_En_Insect/ovl_En_Insect_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Ishi"
include "build/src/overlays/actors/ovl_En_Ishi/z_en_ishi.o"
ovl_En_Ishi (#425) * merge upstream * Merge upstream * Use Petrie's data section * Move assignment to declaration * EnIshi_Init without messing with formatting * EnIshi_Draw * Update asm * Remove war of the zeros * Type function pointers * Match a few * Remove extra * in comment * Progress * func_80A7E5A8 and add translation * Cleanup func_80A7E5A8 and work on func_80A7E824 * Work on func_80A7E824 * Cursed asf match for func_80A7E824 * Re-use variable in cursed function to avoid warning * func_80A7F0A8 * func_80A7F514 * Use C data * Various fixes * Move data around * Clang format and stuff * Stuff * Pretty suspicious just saying * Add janky hack warnings * Use enum for type * Cleanup enum a bit * Use small and large instead of rock and boulder * Name EnIshi_SetupCollider * Remove static var space * Update translation * Name some stuff * Name sRockScales * Use object id defines for func_80029E8C * Properly type var to s16 * Make match slightly less fake * Yay no more fake match for func_80A7E824! * Use thisx all throughout func_80A7E824 for consistency * Rename to EnIshi_InitCollider * Remove asm * Only use thisx where required in func_80A7E824 * Cleanup and naming * More naming * Naming * Finish naming * Rename sCylinderInit to sCylinderInits * Actually finish naming * Minor cleanup * Header comment * Format effect function usage properly * More formatting * Various changes * Minor cleanup * review Co-authored-by: fig02 <fig02srl@gmail.com>
2020-10-04 16:00:15 +00:00
include "build/src/overlays/actors/ovl_En_Ishi/ovl_En_Ishi_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_It"
include "build/src/overlays/actors/ovl_En_It/z_en_it.o"
Split ovl_file_choose and ovl_kaleido_scope (#167) * Split ovl_file_choose and ovl_kaleido_scope * Split ovl_kaleido_scope's rodata/data/bss * fix * fix spec * spec fix * hopefully last spec fix * hopefully last spec fix 2 * fix * Add comments on file boundaries * fix
2020-06-07 17:52:43 +00:00
include "build/src/overlays/actors/ovl_En_It/ovl_En_It_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Jj"
include "build/src/overlays/actors/ovl_En_Jj/z_en_jj.o"
EnJj and object_jj OK (#741) * Shift to new branch * object_jj decomped * docs * Documented blinking, various other things * more naming * Most stuff in the object named * implement eye enums * delete asm * Changes from Fig's review * Apply suggestions from code review Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2021-03-29 00:02:09 +00:00
include "build/src/overlays/actors/ovl_En_Jj/ovl_En_Jj_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Js"
include "build/src/overlays/actors/ovl_En_Js/z_en_js.o"
z_en_js OK (#336) * Initial commit for en_js * More work on decomping en_js * More en_js work * z_en_js OK * Made requested changes/improvements * Renamed arg in func_80A88F64 * Fixed undefined_symbols.txt * Fixed undefined_symbols.txt * Fixed undefined_symbols.txt
2020-08-22 06:24:07 +00:00
include "build/src/overlays/actors/ovl_En_Js/ovl_En_Js_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Jsjutan"
include "build/src/overlays/actors/ovl_En_Jsjutan/z_en_jsjutan.o"
ovl_En_Jsjutan with 1 non_matching (#713) * Init Signed-off-by: angie <angheloalf95@gmail.com> * destroy and non_matching update Signed-off-by: angie <angheloalf95@gmail.com> * declare externs to data Signed-off-by: angie <angheloalf95@gmail.com> * nonmatching draw Signed-off-by: angie <angheloalf95@gmail.com> * everything is a disaster Signed-off-by: angie <angheloalf95@gmail.com> * import bss Signed-off-by: angie <angheloalf95@gmail.com> * first step to extract data Signed-off-by: angie <angheloalf95@gmail.com> * import data Signed-off-by: angie <angheloalf95@gmail.com> * func_80A89860 Signed-off-by: angie <angheloalf95@gmail.com> * draw Signed-off-by: angie <angheloalf95@gmail.com> * func_80A89A6C is crap Signed-off-by: angie <angheloalf95@gmail.com> * EnJsjutan_Update Signed-off-by: angie <angheloalf95@gmail.com> * change some hexs into decs Signed-off-by: angie <angheloalf95@gmail.com> * convert hexs of D_80A8AA98 into decimals and run format.sh Signed-off-by: angie <angheloalf95@gmail.com> * move data to its own file Signed-off-by: angie <angheloalf95@gmail.com> * this function is nightmare Signed-off-by: angie <angheloalf95@gmail.com> * i'm really trying Signed-off-by: angie <angheloalf95@gmail.com> * i think i am finally doing it Signed-off-by: angie <angheloalf95@gmail.com> * move the temps to where they are used Signed-off-by: angie <angheloalf95@gmail.com> * rename distance Signed-off-by: Angie <angheloalf95@gmail.com> * rename a few variables Signed-off-by: Angie <angheloalf95@gmail.com> * unclamp stuff :s Signed-off-by: Angie <angheloalf95@gmail.com> * i tried to see if i'm going better that older way Signed-off-by: Angie <angheloalf95@gmail.com> * moving stuff around Signed-off-by: Angie <angheloalf95@gmail.com> * this is the third try Signed-off-by: angie <angheloalf95@gmail.com> * changing bit by bit Signed-off-by: angie <angheloalf95@gmail.com> * step by step Signed-off-by: angie <angheloalf95@gmail.com> * more stuff Signed-off-by: angie <angheloalf95@gmail.com> * slow Signed-off-by: angie <angheloalf95@gmail.com> * a few small changes Signed-off-by: angie <angheloalf95@gmail.com> * go back to second try Signed-off-by: Angie <angheloalf95@gmail.com> * changing a s8 to u8 made a bigger difference than expected Signed-off-by: Angie <angheloalf95@gmail.com> * i am slowly doing it Signed-off-by: Angie <angheloalf95@gmail.com> * some problems are so dumb Signed-off-by: Angie <angheloalf95@gmail.com> * it is improving slowly again Signed-off-by: Angie <angheloalf95@gmail.com> * erase the old tries Signed-off-by: Angie <angheloalf95@gmail.com> * remove four variables Signed-off-by: Angie <angheloalf95@gmail.com> * fix the missing instructions at the end Signed-off-by: angie <angheloalf95@gmail.com> * theres only regalloc problems left Signed-off-by: angie <angheloalf95@gmail.com> * fix stack Signed-off-by: angie <angheloalf95@gmail.com> * add ifdef non_matching Signed-off-by: Angie <angheloalf95@gmail.com> * i'm getting desesperate Signed-off-by: Angie <angheloalf95@gmail.com> * Remove unnecessary casts Signed-off-by: Angie <angheloalf95@gmail.com> * random stuff that improves codegen Signed-off-by: angie <angheloalf95@gmail.com> * dumb is dumb Signed-off-by: angie <angheloalf95@gmail.com> * erase stuff Signed-off-by: angie <angheloalf95@gmail.com> * add some comments Signed-off-by: Angie <angheloalf95@gmail.com> * use bomb_explosion param and add some comments Signed-off-by: angie <angheloalf95@gmail.com> * add a few comments in about stuff Signed-off-by: Angie <angheloalf95@gmail.com> * extract carpet's texture instead of hardcode it Signed-off-by: Angie <angheloalf95@gmail.com> * set segment 128 in the xml Signed-off-by: Angie <angheloalf95@gmail.com> * Add baseaddress, which fixes dlist in xml Signed-off-by: Angie <angheloalf95@gmail.com> * fix the second dlist Signed-off-by: Angie <angheloalf95@gmail.com> * compiler complain that the symbol doesn't exists Signed-off-by: angie <angheloalf95@gmail.com> * last cleanup Signed-off-by: angie <angheloalf95@gmail.com> * format and delete unused asm Signed-off-by: angie <angheloalf95@gmail.com> * Cleanup and add a few comments Signed-off-by: Angie <angheloalf95@gmail.com> * add non matching to spec Signed-off-by: angie <angheloalf95@gmail.com> * update xml and add a note to future people Signed-off-by: angie <angheloalf95@gmail.com> * Finally remove z_en_jsjutan_data.c Signed-off-by: angie <angheloalf95@gmail.com> * Rename extracted variables Signed-off-by: angie <angheloalf95@gmail.com> * Update src/overlays/actors/ovl_En_Jsjutan/z_en_jsjutan.h Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Jsjutan/z_en_jsjutan.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2021-03-28 02:47:25 +00:00
include "build/src/overlays/actors/ovl_En_Jsjutan/ovl_En_Jsjutan_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Kakasi"
include "build/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.o"
z_en_kakasi.c OK (#428) * Starts decompiling z_en_kakasi * Destroy * EnKakasi_Init * func_80A8F660 * func_80A8F75C * func_80A8F28C * func_80A8F320 equivalent, non matching due to regalloc * EnKakasi_Draw * func_80A8FBB8 * func_80A8FAA4 * func_80A8F9C8 * z_en_kakasi.c OK (1 equivalent, 1 non-matching) * Fixed one non matching * z_en_kakasi.c OK * Removes unused asm * Some fixes * Additional fixes * PR fixes * Rename angle reference to yaw * Change low rotation values to decimal Co-authored-by: i82orbom <i82orbom i82orbom@github>
2020-10-04 16:17:54 +00:00
include "build/src/overlays/actors/ovl_En_Kakasi/ovl_En_Kakasi_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Kakasi2"
include "build/src/overlays/actors/ovl_En_Kakasi2/z_en_kakasi2.o"
z_en_kakasi2.c (#427) * Decompiles z_en_kakasi2 - EnKakasi2_Init * Destroy * func_80A90264 * Finishes z_en_kakasi2 * Remove unused data/reloc * Some hex fixes * Some fixes * Addresses PR comments * Rename temp to be more generic * More var renaming, timer modulo * Change low rotation values to decimal Co-authored-by: i82orbom <i82orbom i82orbom@github>
2020-10-04 16:15:01 +00:00
include "build/src/overlays/actors/ovl_En_Kakasi2/ovl_En_Kakasi2_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Kakasi3"
include "build/src/overlays/actors/ovl_En_Kakasi3/z_en_kakasi3.o"
z_en_kakasi3.c OK (#430) * Decompiles z_en_kakasi3.c * EnKakasi3_Init * Some more progress * 2 remaining * func_80A918E4 * z_en_kakasi3.c OK * PR suggestions * Additional PR fixes * Removes not needed var in z_en_kakasi3.h struct * Another PR rev round Co-authored-by: i82orbom <i82orbom i82orbom@github>
2020-10-04 14:39:21 +00:00
include "build/src/overlays/actors/ovl_En_Kakasi3/ovl_En_Kakasi3_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Kanban"
include "build/src/overlays/actors/ovl_En_Kanban/z_en_kanban.o"
En_Kanban (#533) * Darkmeiro decompilation Bg_Gnd_Darkmeiro decompiled, matched, and documented. * give this a shot * fix conflict * one more try * could be useful * whoops * ZAP2 stuff * ZAP why * ZAP again * matching * more stuff * names * names and formatting * vt * header * adjusted gfx Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
2020-12-29 23:28:50 +00:00
include "build/src/overlays/actors/ovl_En_Kanban/ovl_En_Kanban_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Karebaba"
include "build/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.o"
Decompiled and documentedKarebaba (withered Deku Baba enemy), all functions OK (#391) * Renamed functions based on decomp * Update function name changes * Karebaba decomp and documentation with one non-matching function * Cleaned up some messiness * Forgot a file * Addressing code review * Updated based on code review * Unnecessary define * This function is going down * Removed remaining asm, renamed symbols as recommended, and added comments to give context around the display lists * Forgot a file * Fix renamed function * Addressed issues raised in code review * Minor cleanup * Addressed issues identified in code review * Addressed the issues betterer * Updated to use poly disp macros * review 2 Co-authored-by: fig <fig02srl@gmail.com>
2020-12-03 21:05:32 +00:00
include "build/src/overlays/actors/ovl_En_Karebaba/ovl_En_Karebaba_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Ko"
include "build/src/overlays/actors/ovl_En_Ko/z_en_ko.o"
z_en_ko OK (#869) * .data OK * Progress * push some old stuff * Finish a chain * Progress * Progress * Run mathfixer.py * Progress * match one more * Up to date * Match func_80A97610 * func_80A96FD0 * most of the way through the mega switch * small formatting thing. still stuck on the switch * start a big switch function * a little closer * done with matching for now starting objects * func_80A97738 OK! * func_80A995CC OK! * func_80A99864 OK! * en_ko OK! * Code clean-up pass * more EnKo cleanups, object_fa and object_kw1 textures documented * complete object_km1, more EnKo documentation * More documentation * delete asm * Clean-up rebase issues * bleh * Implement Dragorn's suggestions * fix spec, implement fig's suggestions * whoops (ill leave it for the docs tho lol) * whoops again * i made an ouchie * smile * last one for real Co-authored-by: Louis <35883445+louist103@users.noreply.github.com> Co-authored-by: fig02 <fig02srl@gmail.com>
2021-07-28 21:59:52 +00:00
include "build/src/overlays/actors/ovl_En_Ko/ovl_En_Ko_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Kusa"
include "build/src/overlays/actors/ovl_En_Kusa/z_en_kusa.o"
en_kusa (#494) * starting the decomp for en_kusa -> the bushes * in the bushes of love * maybe the init_function is done? * The functions that call functions never end * more progress. almost matches init * fig helped a bunch...ty fig * moving things along * yikes * more things matching * moar matches! fixed casting issues on some data * progress * progress * One function left to go * yeah, idk....its close though * closer * Ok * En_Kusa: Ok * removing the asm files * fixed suggestions * small fixes I forgot * messed things up, had to go back, back to being OK * named a couple more functions and fixed some logic * fixing some names I guessed wrong on * fixed suggested changes Co-authored-by: fig <fig02srl@gmail.com>
2020-12-05 20:28:39 +00:00
include "build/src/overlays/actors/ovl_En_Kusa/ovl_En_Kusa_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Kz"
include "build/src/overlays/actors/ovl_En_Kz/z_en_kz.o"
Split ovl_file_choose and ovl_kaleido_scope (#167) * Split ovl_file_choose and ovl_kaleido_scope * Split ovl_kaleido_scope's rodata/data/bss * fix * fix spec * spec fix * hopefully last spec fix * hopefully last spec fix 2 * fix * Add comments on file boundaries * fix
2020-06-07 17:52:43 +00:00
include "build/src/overlays/actors/ovl_En_Kz/ovl_En_Kz_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Light"
include "build/src/overlays/actors/ovl_En_Light/z_en_light.o"
En_Light OK (#332) * fix colliderinit typo * en_light OK * format * remove asm * cleanup * pr review * no U * few changes
2020-08-20 02:57:31 +00:00
include "build/src/overlays/actors/ovl_En_Light/ovl_En_Light_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Lightbox"
include "build/src/overlays/actors/ovl_En_Lightbox/z_en_lightbox.o"
Split ovl_file_choose and ovl_kaleido_scope (#167) * Split ovl_file_choose and ovl_kaleido_scope * Split ovl_kaleido_scope's rodata/data/bss * fix * fix spec * spec fix * hopefully last spec fix * hopefully last spec fix 2 * fix * Add comments on file boundaries * fix
2020-06-07 17:52:43 +00:00
include "build/src/overlays/actors/ovl_En_Lightbox/ovl_En_Lightbox_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_M_Fire1"
include "build/src/overlays/actors/ovl_En_M_Fire1/z_en_m_fire1.o"
Split ovl_file_choose and ovl_kaleido_scope (#167) * Split ovl_file_choose and ovl_kaleido_scope * Split ovl_kaleido_scope's rodata/data/bss * fix * fix spec * spec fix * hopefully last spec fix * hopefully last spec fix 2 * fix * Add comments on file boundaries * fix
2020-06-07 17:52:43 +00:00
include "build/src/overlays/actors/ovl_En_M_Fire1/ovl_En_M_Fire1_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_M_Thunder"
include "build/src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.o"
EnMThunder, 1 nonmatching (#604) * Data migrated, all but Draw matched * Draw likely equivalent but serious regalloc issues, and that last Gfx_TwoTexScroll is being very stubborn * Merge remote-tracking branch 'upstream/master' into Thunder * some improvements, set up to PR as nonmatching * spec * corrected header * added function to functions.h * delete asm * Added new collider init Co-authored-by: fig02 <fig02srl@gmail.com>
2021-01-21 05:47:38 +00:00
include "build/src/overlays/actors/ovl_En_M_Thunder/ovl_En_M_Thunder_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Ma1"
include "build/src/overlays/actors/ovl_En_Ma1/z_en_ma1.o"
Split ovl_file_choose and ovl_kaleido_scope (#167) * Split ovl_file_choose and ovl_kaleido_scope * Split ovl_kaleido_scope's rodata/data/bss * fix * fix spec * spec fix * hopefully last spec fix * hopefully last spec fix 2 * fix * Add comments on file boundaries * fix
2020-06-07 17:52:43 +00:00
include "build/src/overlays/actors/ovl_En_Ma1/ovl_En_Ma1_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Ma2"
include "build/src/overlays/actors/ovl_En_Ma2/z_en_ma2.o"
Split ovl_file_choose and ovl_kaleido_scope (#167) * Split ovl_file_choose and ovl_kaleido_scope * Split ovl_kaleido_scope's rodata/data/bss * fix * fix spec * spec fix * hopefully last spec fix * hopefully last spec fix 2 * fix * Add comments on file boundaries * fix
2020-06-07 17:52:43 +00:00
include "build/src/overlays/actors/ovl_En_Ma2/ovl_En_Ma2_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Ma3"
include "build/src/overlays/actors/ovl_En_Ma3/z_en_ma3.o"
Split ovl_file_choose and ovl_kaleido_scope (#167) * Split ovl_file_choose and ovl_kaleido_scope * Split ovl_kaleido_scope's rodata/data/bss * fix * fix spec * spec fix * hopefully last spec fix * hopefully last spec fix 2 * fix * Add comments on file boundaries * fix
2020-06-07 17:52:43 +00:00
include "build/src/overlays/actors/ovl_En_Ma3/ovl_En_Ma3_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Mag"
include "build/src/overlays/actors/ovl_En_Mag/z_en_mag.o"
Decompile En_Mag (#406) * Decompile En_Mag * Document En_Mag * Address some review comments
2020-09-27 14:14:25 +00:00
include "build/src/overlays/actors/ovl_En_Mag/ovl_En_Mag_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Mb"
include "build/src/overlays/actors/ovl_En_Mb/z_en_mb.o"
Decomp EnMb (#445) * Fixed upstream * Initial commit * Matched init but broke something else * All fixed. Matched Init OK * Progress * Lots of progress * Progress * progress * Progress * progress * fix struct size * commit * progress * progress * add comment * merge master * fix undefined syms * progress * progress * progress * Progress * progress * Finish * Remove asm * Clean up * Delete some ASM * Fix spec * Update z_en_mb.h * Match a few more and move func_80AA7938 to non equivilent * asm * no more non equiv * matched * asm * review Co-authored-by: Louis <5883445+louist103@users.noreply.github.com> Co-authored-by: fig <fig02srl@gmail.com>
2020-12-04 00:25:36 +00:00
include "build/src/overlays/actors/ovl_En_Mb/ovl_En_Mb_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Md"
include "build/src/overlays/actors/ovl_En_Md/z_en_md.o"
Decompiled z_en_md.c (#246) * Decompile z_bg_haka_trap.c * Update spec delete old .reloc.s file Co-authored-by: Random <28494085+Random06457@users.noreply.github.com> * Deleted reloc.s and made style changes to function pointers and local vars * Renamed timer field, added more useful temp names * Implemented Roman's suggestions, including moving enum to header file, moving some static variables inside functions, removing unnecessary casts, removing unnecessary temps, and fixing a few style issues * Commented dual purpose of unk_16A and formatted file again * Decompiled z_en_md.c decompiled EnMd_Init Decompiled EnMd_Draw Decompiled EnMd_Destroy and EnMd_Update Decompiled func_80AAC104 Decompiled func_80AAA92C Decompiled func_80AAA93C Decompiled func_80AAA274 Decompiled func_80AAA308 Decompiled func_80AAA39C Decompiled func_80AAA474 Decompiled func_80AAA508 Decompiled func_80AAA5A4 Decompiled func_80AAA638 Decompiled func_80AAA6D4 Decompiled func_80AAA768 Decompiled func_80AAA7FC Decompiled func_80AAA890 Decompiled func_80AAA93C Decompiled func_80AAA250 Decompiled func_80AAB874 Decompile func_80AAAA24 Decompiled func_80AABD0C Decompiled func_80AAB8F8 Decompiled func_80AAAE94 Decompiled func_80AAACF8 Decompiled func_80AAADE0 Decompiled func_80AAAE14 Decompiled func_80AAB03C Decompiled func_80AAB0E0 Decompiled func_80AAB370 Decompiled func_80AAB4DC Decompiled func_80AAB5A4 Decompiled func_80AABC10 Decompiled func_80AAAC78 Decompiled func_80AABEF0 Decompiled func_80AAB158 Decompiled func_80AAAF04 Decompiled func_80AAB948 Migrated data into C file Commented out data file (migrated data) Removed data file from spec about to try changing alpha type cleaned up functions except for last two fixed player and player2 issue Decompiled z_en_md.c * updated actor field names to match upstream changes * deleted old asm nonmatchings (whoops) * Update src/overlays/actors/ovl_En_Md/z_en_md.h Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Md/z_en_md.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Md/z_en_md.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Md/z_en_md.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Md/z_en_md.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Md/z_en_md.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * removed unnecessary forward declarations * got rid of unnecessary temps in path functions, added names based on strong copy paste similarity with en_kz, minor formatting changes * Update src/overlays/actors/ovl_En_Md/z_en_md.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Md/z_en_md.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * pass EnMd* to appropriate functions instead of Actor* * Update src/overlays/actors/ovl_En_Md/z_en_md.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Md/z_en_md.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * finish renaming limb draw funcs * inlined vector data and moved static data * Update src/overlays/actors/ovl_En_Md/z_en_md.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * ran formatter and completed name change in PostLimbDraw * removed address-of array for sAnimations Co-authored-by: Random <28494085+Random06457@users.noreply.github.com> Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-07-14 19:59:45 +00:00
include "build/src/overlays/actors/ovl_En_Md/ovl_En_Md_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Mk"
include "build/src/overlays/actors/ovl_En_Mk/z_en_mk.o"
En_Mk OK (lakeside lab dude) (#616) * en_mk OK * ready for pr * ok now * anim mode enums * fixed dodojr Co-authored-by: Zelllll <elijah@DESKTOP-NMP1I89.localdomain>
2021-01-31 20:26:34 +00:00
include "build/src/overlays/actors/ovl_En_Mk/ovl_En_Mk_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Mm"
include "build/src/overlays/actors/ovl_En_Mm/z_en_mm.o"
en_mm and object_mm OK (#735) * almost done * progress * OK * update mm2 * delete asm * whitespace * Update assets/xml/objects/object_mm.xml Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Mm/z_en_mm.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * name data Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2021-03-28 23:18:41 +00:00
include "build/src/overlays/actors/ovl_En_Mm/ovl_En_Mm_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Mm2"
include "build/src/overlays/actors/ovl_En_Mm2/z_en_mm2.o"
ovl_en_mm2 OK (#636) * decompiled ovl_en_mm2 * resolved conflicts * add back huta * review suggestions * review 2 suggestions Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-02-02 21:41:03 +00:00
include "build/src/overlays/actors/ovl_En_Mm2/ovl_En_Mm2_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Ms"
include "build/src/overlays/actors/ovl_En_Ms/z_en_ms.o"
Split ovl_file_choose and ovl_kaleido_scope (#167) * Split ovl_file_choose and ovl_kaleido_scope * Split ovl_kaleido_scope's rodata/data/bss * fix * fix spec * spec fix * hopefully last spec fix * hopefully last spec fix 2 * fix * Add comments on file boundaries * fix
2020-06-07 17:52:43 +00:00
include "build/src/overlays/actors/ovl_En_Ms/ovl_En_Ms_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Mu"
include "build/src/overlays/actors/ovl_En_Mu/z_en_mu.o"
EnMu OK (#722) * Commit Before Draw Decomp * Closer EnMu_Draw * Matched draw function * EnMu Matching with OK * Removed ASM * EnMu OK * Implemented pull request changes as of 2020/03/16 * Reverted header * Split increment and switched 0s to NULLs
2021-03-27 20:14:38 +00:00
include "build/src/overlays/actors/ovl_En_Mu/ovl_En_Mu_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Nb"
include "build/src/overlays/actors/ovl_En_Nb/z_en_nb.o"
ovl_En_Nb Decompiled (#298) * started nabooru * more work on nabooru * did more * file name * almost done with z_en_nb * did some more * most of en_nb decomp * data migrated en_nb * did more * almost finished * started some documentation on ovl_en_nb * did more documentation on en_nb * did some more * one non matching in en_nb * ran format.sh * update * updated undefined_syms * updated descriptions * use DISP macros, delete japanese files. NABOORU IS 100% MATCHING POGGERS * made suggested changes and removed reloc file * Made some suggetsed changes * Made some updates * review 3 Co-authored-by: fig <fig02srl@gmail.com>
2020-12-02 19:57:54 +00:00
include "build/src/overlays/actors/ovl_En_Nb/ovl_En_Nb_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Niw"
include "build/src/overlays/actors/ovl_En_Niw/z_en_niw.o"
En_Niw (Cucco) OK (#429) * Cucco progress * Cucco decompiled, one non-matching * Update z_en_niw.c * Update z_en_niw.h * Update z_en_niw.c * Delete EnNiw_Destroy.s * Delete EnNiw_Draw.s * Delete EnNiw_Init.s * Delete EnNiw_Update.s * Delete func_80AB5BF8.s * Delete func_80AB5FA0.s * Delete func_80AB6100.s * Delete func_80AB627C.s * Delete func_80AB6324.s * Delete func_80AB63A8.s * Delete func_80AB840C.s * Delete func_80AB70F8.s * Delete func_80AB6D08.s * Delete func_80AB6BF8.s * Delete func_80AB6A38.s * Delete func_80AB7F60.s * Delete func_80AB6F04.s * Delete func_80AB6570.s * Delete func_80AB7204.s * Delete func_80AB714C.s * Delete func_80AB7328.s * Delete func_80AB7290.s * Delete func_80AB7420.s * Delete func_80AB747C.s * Delete func_80AB8168.s * Delete func_80AB8258.s * Delete func_80AB6EB4.s * Delete func_80AB70A0.s * Delete func_80AB6450.s * Delete z_en_niw.data.s * Delete z_en_niw.reloc.s * Update undefined_syms.txt * Update src/overlays/actors/ovl_En_Niw/z_en_niw.c Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Niw/z_en_niw.c Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Add boolean suggestion * Update src/overlays/actors/ovl_En_Niw/z_en_niw.c Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Niw/z_en_niw.c Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Niw/z_en_niw.c Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Niw/z_en_niw.c Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Niw/z_en_niw.c Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Niw/z_en_niw.c Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Made suggested changes * Update src/overlays/actors/ovl_En_Niw/z_en_niw.c Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Niw/z_en_niw.c Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Niw/z_en_niw.c Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Niw/z_en_niw.c Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Niw/z_en_niw.c Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Niw/z_en_niw.c Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Niw/z_en_niw.c Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Most suggested changes made * More changes made, fixed compiler error * Update src/overlays/actors/ovl_En_Niw/z_en_niw.c Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Niw/z_en_niw.c Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Niw/z_en_niw.c Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Cleaned up En_Niw * Cleaned up En_Niw * Cleaned up En_Niw * Merged Cucco conflicts * Update src/overlays/actors/ovl_En_Niw/z_en_niw.c Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Niw/z_en_niw.c Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Niw/z_en_niw.c Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Made requested changes (Cucco) * Added actor description * Update src/overlays/actors/ovl_En_Niw/z_en_niw.h Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Niw/z_en_niw.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Niw/z_en_niw.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Niw/z_en_niw.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Niw/z_en_niw.h Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Niw/z_en_niw.h Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Niw/z_en_niw.h Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Made requested En_Niw changes * Removed DECR from En_Niw * Reduced number of if (1)'s * Update EnNiw * Some Cucco documentation Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> Co-authored-by: Zelllll <elijah@DESKTOP-NMP1I89.localdomain>
2020-10-28 17:20:10 +00:00
include "build/src/overlays/actors/ovl_En_Niw/ovl_En_Niw_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Niw_Girl"
include "build/src/overlays/actors/ovl_En_Niw_Girl/z_en_niw_girl.o"
Decomp EnNiwGirl (#306) * Fix Repo * Update z_en_niw.h * PR fixes * Update z_en_niw_girl.c Add all masks to switch at 142 * Added currentMask enum * Small fixes * Cleaned up a lot of little things * PR fixes
2020-08-15 23:37:26 +00:00
include "build/src/overlays/actors/ovl_En_Niw_Girl/ovl_En_Niw_Girl_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Niw_Lady"
include "build/src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.o"
Decomp En_Niw_Lady, All OK (#462) * Fixed upstream * Migrate .data * Start functions * Decomp func_80AB9F24 * Add files via upload Decomp: func_80ABB228(Draw),EnNiwLady_OverrideLimbDraw,func_80ABB0A0 * Matched a few more * matched more * progress * All matched up. Whole file OK * Format, use reloc, deletet ASM * Fixed a fake match and removed padding from struct * Small cleanup * Small cleanup * Cleanup and some name changes * Small cleanup * Add POLY_OPA_DISP macro * Fix issue in Draw * Fix ZAP. hopefully * PR fixes * PR fixes * PR fixes Co-authored-by: Louis <5883445+louist103@users.noreply.github.com>
2020-12-01 18:59:02 +00:00
include "build/src/overlays/actors/ovl_En_Niw_Lady/ovl_En_Niw_Lady_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Nutsball"
include "build/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.o"
Split ovl_file_choose and ovl_kaleido_scope (#167) * Split ovl_file_choose and ovl_kaleido_scope * Split ovl_kaleido_scope's rodata/data/bss * fix * fix spec * spec fix * hopefully last spec fix * hopefully last spec fix 2 * fix * Add comments on file boundaries * fix
2020-06-07 17:52:43 +00:00
include "build/src/overlays/actors/ovl_En_Nutsball/ovl_En_Nutsball_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Nwc"
include "build/src/overlays/actors/ovl_En_Nwc/z_en_nwc.o"
En_Nwc (#475) * Darkmeiro decompilation Bg_Gnd_Darkmeiro decompiled, matched, and documented. * give this a shot * fix conflict * one more try * could be useful * whoops * ZAP2 stuff * ZAP why * ZAP again * chicks, man * slight change * formatted everything * Update src/overlays/actors/ovl_En_Nwc/z_en_nwc.h Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-12-02 02:29:51 +00:00
include "build/src/overlays/actors/ovl_En_Nwc/ovl_En_Nwc_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Ny"
include "build/src/overlays/actors/ovl_En_Ny/z_en_ny.o"
EnNy OK (#624) * get data in * Match Init and one other * match some more * match a bunch more * merge master * OK * Some naming done * OBJECT_NY almost done. waiting on ZAP changes * Remove ASM * Cleanup * Commit before merge * fix damage table * Change comment
2021-01-31 20:32:55 +00:00
include "build/src/overlays/actors/ovl_En_Ny/ovl_En_Ny_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_OE2"
include "build/src/overlays/actors/ovl_En_OE2/z_en_oe2.o"
Split ovl_file_choose and ovl_kaleido_scope (#167) * Split ovl_file_choose and ovl_kaleido_scope * Split ovl_kaleido_scope's rodata/data/bss * fix * fix spec * spec fix * hopefully last spec fix * hopefully last spec fix 2 * fix * Add comments on file boundaries * fix
2020-06-07 17:52:43 +00:00
include "build/src/overlays/actors/ovl_En_OE2/ovl_En_OE2_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Okarina_Effect"
include "build/src/overlays/actors/ovl_En_Okarina_Effect/z_en_okarina_effect.o"
Split ovl_file_choose and ovl_kaleido_scope (#167) * Split ovl_file_choose and ovl_kaleido_scope * Split ovl_kaleido_scope's rodata/data/bss * fix * fix spec * spec fix * hopefully last spec fix * hopefully last spec fix 2 * fix * Add comments on file boundaries * fix
2020-06-07 17:52:43 +00:00
include "build/src/overlays/actors/ovl_En_Okarina_Effect/ovl_En_Okarina_Effect_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Okarina_Tag"
ovl_En_Okarina_Tag OK (#273) * started okarinatag * did more * z_en_okarina_tag OK * finished okarinatag * Made suggested changes
2020-07-19 21:41:59 +00:00
include "build/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag_cutscene_data.o"
First proper commit.
2020-03-17 04:31:30 +00:00
include "build/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.o"
ovl_En_Okarina_Tag OK (#273) * started okarinatag * did more * z_en_okarina_tag OK * finished okarinatag * Made suggested changes
2020-07-19 21:41:59 +00:00
include "build/src/overlays/actors/ovl_En_Okarina_Tag/ovl_En_Okarina_Tag_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Okuta"
include "build/src/overlays/actors/ovl_En_Okuta/z_en_okuta.o"
ovl_En_Okuta (#470) * merge upstream * Merge upstream * Migrate data * Progress * Progress * Progress * Cleanup data * Match EnOkuta_Update * EnOkuta_Draw * func_80AC25D8 * Work on func_80AC2350 * Name EnOkuta_OverrideLimbDraw * More progress * More progress * Progress * Progress * func_80AC2350 * func_80AC1938 * Use LINK_IS_ADULT * func_80AC1B80 * Name some stuff * Update spec and remove asm * Name EnOkuta_SpawnSplash * Name more stuff * Name EnOkuta_Appear * Name ColliderInits * Reorder comparison to make more sense * Name some Octorock related functions * Name some projectile stuff * Reorder comparison * Convert remaining uses of unk_194 to decimal * Name some more stuff * Rename some wait functions to have 'to' * Consolidate timers * Name some more stuff * Change EnOkuta_SetupWaitToAppear to take this * Name jumpHeight * Name this->scale * Name shots * Name _SetupWaitToShoot and _SetupShoot * Name more stuff (might change) * Name EnOkuta_ColliderCheck for now * Replace some floating point constants * Change name to make a bit more sense * Rename mouth to snout * Just rename parameter to scale * Fun magic number I guess * Remove several returns * Cleanup * Update src/overlays/actors/ovl_En_Okuta/z_en_okuta.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Okuta/z_en_okuta.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Clang format Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-11-24 00:50:13 +00:00
include "build/src/overlays/actors/ovl_En_Okuta/ovl_En_Okuta_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Ossan"
include "build/src/overlays/actors/ovl_En_Ossan/z_en_ossan.o"
z_En_Ossan and dependencies (#824) * fix colliderinit typo * fix initchain * reloc * progress * progress * Pick off a few easy functions, reduce number of warnings * more tough OKs * Getting closer to all OK, fix en_girla header * some hard OKs, 7 to go * two funcs remaining * func_80AC7094 OK! * Fix warnings, begin documentation * get most of object_ossan documented, document some of en_ossan * improve en_girla function names * more EnOssan documentation * more documentation * en_tana basically complete, en_girla vars all named, en_ossan documentation improvements * delete TIME ITSELF * object_oF1d_map OK * more names, fixed a poition typo * Nearly all en_ossan functions named, all variables named * format.sh * forgot to delete data * implement pr changes * EnOssan OK! implement most of Roman's suggestions * ugh * implement figs suggestions * implement roman's suggestion * Can't tell my left from my other left Co-authored-by: fig02 <fig02srl@gmail.com>
2021-07-04 15:23:18 +00:00
include "build/src/overlays/actors/ovl_En_Ossan/ovl_En_Ossan_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Owl"
include "build/src/overlays/actors/ovl_En_Owl/z_en_owl.o"
ovl_En_Owl (#573) * begin En_Owl * EnOwl wip * fix conflicts * owl wip * wip * cleanup * more cleanup * remove unused asm * run formatter * match EnOwl_Init * formatting * pr updates * forgot the enum values in WaitZoraRiver * merge fixes * Fix merge issues * review changes + more * name Co-authored-by: fig <fig02srl@gmail.com>
2021-01-14 20:17:03 +00:00
include "build/src/overlays/actors/ovl_En_Owl/ovl_En_Owl_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Part"
include "build/src/overlays/actors/ovl_En_Part/z_en_part.o"
ovl_En_Part (#383) * ovl_En_Part * PR review * PR review * Rebase * PR review * Oversight * Rebase * PR review
2020-10-01 22:51:05 +00:00
include "build/src/overlays/actors/ovl_En_Part/ovl_En_Part_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Peehat"
include "build/src/overlays/actors/ovl_En_Peehat/z_en_peehat.o"
z_en_peehat (#660) * decomp most of En_Peehat * z_en_peehat code decomp'd and OK * complete data migration * first pass at documentation * minor code clean-up * documentation pass * fix spec (hopefully), implement some of petrie's suggestions * implement requested changes * fix compiler warnings * implement fig's changes * implement roman's changes
2021-02-21 14:25:53 +00:00
include "build/src/overlays/actors/ovl_En_Peehat/ovl_En_Peehat_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Po_Desert"
include "build/src/overlays/actors/ovl_En_Po_Desert/z_en_po_desert.o"
Poe Actor Decomps (#463) * Poe actors progress * Some more progress, En_Poh almost matching * Further progress * Fix merge * Decompile data * Actor struct cleanups * More functions OK * Progress * Last function decompiled, some nonmatchings left * Few more OK, skelanime_init definition changes * Progress * Style improvements, OPEN/CLOSE_DISPS, few more OK * Few more style improvements, function prototype additions/changes, another function OK * Remove unused asm, begin documentation * Use generated reloc * Cleanup, format * Remove a few no longer needed comments * PR suggestions * DISP macros * Missed some FrameUpdateMatrix != 0 replacements * EnPoField_InteractWithSoul -> EnPoField_SoulInteract, eyeImageIdx -> eyeTextureIdx * Fix merge, reformat * Review Suggestions Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Further review suggestions * Ran formatter * Less DECR usage Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-12-05 00:34:27 +00:00
include "build/src/overlays/actors/ovl_En_Po_Desert/ovl_En_Po_Desert_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Po_Field"
include "build/src/overlays/actors/ovl_En_Po_Field/z_en_po_field.o"
Poe Actor Decomps (#463) * Poe actors progress * Some more progress, En_Poh almost matching * Further progress * Fix merge * Decompile data * Actor struct cleanups * More functions OK * Progress * Last function decompiled, some nonmatchings left * Few more OK, skelanime_init definition changes * Progress * Style improvements, OPEN/CLOSE_DISPS, few more OK * Few more style improvements, function prototype additions/changes, another function OK * Remove unused asm, begin documentation * Use generated reloc * Cleanup, format * Remove a few no longer needed comments * PR suggestions * DISP macros * Missed some FrameUpdateMatrix != 0 replacements * EnPoField_InteractWithSoul -> EnPoField_SoulInteract, eyeImageIdx -> eyeTextureIdx * Fix merge, reformat * Review Suggestions Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Further review suggestions * Ran formatter * Less DECR usage Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-12-05 00:34:27 +00:00
include "build/src/overlays/actors/ovl_En_Po_Field/ovl_En_Po_Field_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Po_Relay"
include "build/src/overlays/actors/ovl_En_Po_Relay/z_en_po_relay.o"
Poe Actor Decomps (#463) * Poe actors progress * Some more progress, En_Poh almost matching * Further progress * Fix merge * Decompile data * Actor struct cleanups * More functions OK * Progress * Last function decompiled, some nonmatchings left * Few more OK, skelanime_init definition changes * Progress * Style improvements, OPEN/CLOSE_DISPS, few more OK * Few more style improvements, function prototype additions/changes, another function OK * Remove unused asm, begin documentation * Use generated reloc * Cleanup, format * Remove a few no longer needed comments * PR suggestions * DISP macros * Missed some FrameUpdateMatrix != 0 replacements * EnPoField_InteractWithSoul -> EnPoField_SoulInteract, eyeImageIdx -> eyeTextureIdx * Fix merge, reformat * Review Suggestions Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Further review suggestions * Ran formatter * Less DECR usage Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-12-05 00:34:27 +00:00
include "build/src/overlays/actors/ovl_En_Po_Relay/ovl_En_Po_Relay_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Po_Sisters"
include "build/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.o"
Poe Actor Decomps (#463) * Poe actors progress * Some more progress, En_Poh almost matching * Further progress * Fix merge * Decompile data * Actor struct cleanups * More functions OK * Progress * Last function decompiled, some nonmatchings left * Few more OK, skelanime_init definition changes * Progress * Style improvements, OPEN/CLOSE_DISPS, few more OK * Few more style improvements, function prototype additions/changes, another function OK * Remove unused asm, begin documentation * Use generated reloc * Cleanup, format * Remove a few no longer needed comments * PR suggestions * DISP macros * Missed some FrameUpdateMatrix != 0 replacements * EnPoField_InteractWithSoul -> EnPoField_SoulInteract, eyeImageIdx -> eyeTextureIdx * Fix merge, reformat * Review Suggestions Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Further review suggestions * Ran formatter * Less DECR usage Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-12-05 00:34:27 +00:00
include "build/src/overlays/actors/ovl_En_Po_Sisters/ovl_En_Po_Sisters_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Poh"
include "build/src/overlays/actors/ovl_En_Poh/z_en_poh.o"
Poe Actor Decomps (#463) * Poe actors progress * Some more progress, En_Poh almost matching * Further progress * Fix merge * Decompile data * Actor struct cleanups * More functions OK * Progress * Last function decompiled, some nonmatchings left * Few more OK, skelanime_init definition changes * Progress * Style improvements, OPEN/CLOSE_DISPS, few more OK * Few more style improvements, function prototype additions/changes, another function OK * Remove unused asm, begin documentation * Use generated reloc * Cleanup, format * Remove a few no longer needed comments * PR suggestions * DISP macros * Missed some FrameUpdateMatrix != 0 replacements * EnPoField_InteractWithSoul -> EnPoField_SoulInteract, eyeImageIdx -> eyeTextureIdx * Fix merge, reformat * Review Suggestions Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Further review suggestions * Ran formatter * Less DECR usage Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-12-05 00:34:27 +00:00
include "build/src/overlays/actors/ovl_En_Poh/ovl_En_Poh_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Pu_box"
include "build/src/overlays/actors/ovl_En_Pu_box/z_en_pu_box.o"
Split ovl_file_choose and ovl_kaleido_scope (#167) * Split ovl_file_choose and ovl_kaleido_scope * Split ovl_kaleido_scope's rodata/data/bss * fix * fix spec * spec fix * hopefully last spec fix * hopefully last spec fix 2 * fix * Add comments on file boundaries * fix
2020-06-07 17:52:43 +00:00
include "build/src/overlays/actors/ovl_En_Pu_box/ovl_En_Pu_box_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Rd"
include "build/src/overlays/actors/ovl_En_Rd/z_en_rd.o"
Decompiled ovl_En_Rd (1 nonmatching) (#390) * Initial progress * Broken but almost * Final attempt at the last function * Fixing struct def * PR updates * PR stuff * baby commit * PR comments * Error handling
2020-09-27 01:16:28 +00:00
include "build/src/overlays/actors/ovl_En_Rd/ovl_En_Rd_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Reeba"
include "build/src/overlays/actors/ovl_En_Reeba/z_en_reeba.o"
en_reeba OK (#434) * leever progress * leever progress * leever progress * 2 non matchings * test * merge master, match two functions * progress * OK * revert permissions change * remove unwanted file * review * use decr * merge * merge and review * early return * vt
2020-10-04 13:17:44 +00:00
include "build/src/overlays/actors/ovl_En_Reeba/ovl_En_Reeba_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_River_Sound"
include "build/src/overlays/actors/ovl_En_River_Sound/z_en_river_sound.o"
ovl_En_River_Sound 1 non-matching (#786) * ovl_En_River_Sound * Implement review suggestions, run through clang-format * Responding to PR comments * Use CHECK_QUEST_ITEM, run through clang-tidy.
2021-04-21 17:51:44 +00:00
include "build/src/overlays/actors/ovl_En_River_Sound/ovl_En_River_Sound_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Rl"
include "build/src/overlays/actors/ovl_En_Rl/z_en_rl.o"
En_Rl OK (#378) * Approx. half of en_rl matched * More En_Rl work * 5 functions left * One function left * En_Rl OK and all matching * Formatted and cleaned up style things. * Deleted asm and fixed spec * Forgot to delete the stuff in the data folder again * Made all requested changes. * Forgot one requested change * Implemented dragorn's documentation suggestions * Implemented dragorn's documentation suggestions * Made further requested changes Co-authored-by: fig02 <fig02srl@gmail.com>
2020-10-04 14:09:20 +00:00
include "build/src/overlays/actors/ovl_En_Rl/ovl_En_Rl_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Rr"
include "build/src/overlays/actors/ovl_En_Rr/z_en_rr.o"
En_Rr (#472) * Darkmeiro decompilation Bg_Gnd_Darkmeiro decompiled, matched, and documented. * give this a shot * fix conflict * one more try * could be useful * whoops * Many likes alike * matched * merge ZAP * now with names * merge and small cleanup * removed commends * got formatter to behave * move static array * fixed variable names * fixes * pedantic comments
2020-12-02 19:59:45 +00:00
include "build/src/overlays/actors/ovl_En_Rr/ovl_En_Rr_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Ru1"
include "build/src/overlays/actors/ovl_En_Ru1/z_en_ru1.o"
Split ovl_file_choose and ovl_kaleido_scope (#167) * Split ovl_file_choose and ovl_kaleido_scope * Split ovl_kaleido_scope's rodata/data/bss * fix * fix spec * spec fix * hopefully last spec fix * hopefully last spec fix 2 * fix * Add comments on file boundaries * fix
2020-06-07 17:52:43 +00:00
include "build/src/overlays/actors/ovl_En_Ru1/ovl_En_Ru1_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Ru2"
include "build/src/overlays/actors/ovl_En_Ru2/z_en_ru2.o"
Split ovl_file_choose and ovl_kaleido_scope (#167) * Split ovl_file_choose and ovl_kaleido_scope * Split ovl_kaleido_scope's rodata/data/bss * fix * fix spec * spec fix * hopefully last spec fix * hopefully last spec fix 2 * fix * Add comments on file boundaries * fix
2020-06-07 17:52:43 +00:00
include "build/src/overlays/actors/ovl_En_Ru2/ovl_En_Ru2_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Sa"
include "build/src/overlays/actors/ovl_En_Sa/z_en_sa.o"
ovl_En_Sa (#625) * Decompiled * Add missing sfx id name Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> Co-authored-by: Thar0 <maximilianc64@gmail.com> Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-01-31 19:35:58 +00:00
include "build/src/overlays/actors/ovl_En_Sa/ovl_En_Sa_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Sb"
include "build/src/overlays/actors/ovl_En_Sb/z_en_sb.o"
Split ovl_file_choose and ovl_kaleido_scope (#167) * Split ovl_file_choose and ovl_kaleido_scope * Split ovl_kaleido_scope's rodata/data/bss * fix * fix spec * spec fix * hopefully last spec fix * hopefully last spec fix 2 * fix * Add comments on file boundaries * fix
2020-06-07 17:52:43 +00:00
include "build/src/overlays/actors/ovl_En_Sb/ovl_En_Sb_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Scene_Change"
include "build/src/overlays/actors/ovl_En_Scene_Change/z_en_scene_change.o"
Split ovl_file_choose and ovl_kaleido_scope (#167) * Split ovl_file_choose and ovl_kaleido_scope * Split ovl_kaleido_scope's rodata/data/bss * fix * fix spec * spec fix * hopefully last spec fix * hopefully last spec fix 2 * fix * Add comments on file boundaries * fix
2020-06-07 17:52:43 +00:00
include "build/src/overlays/actors/ovl_En_Scene_Change/ovl_En_Scene_Change_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Sda"
include "build/src/overlays/actors/ovl_En_Sda/z_en_sda.o"
En_Sda (#581) * match * bug note * textureblock Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
2021-01-14 20:14:55 +00:00
include "build/src/overlays/actors/ovl_En_Sda/ovl_En_Sda_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Shopnuts"
include "build/src/overlays/actors/ovl_En_Shopnuts/z_en_shopnuts.o"
Shopnuts (#577) * matched functions, still need data * shopnuts OK * cleaned up some things in hintnuts by comparing to shopnuts * merge with new animation stuff * fixing merge 2 * suggested changes * missed a DECR * suggestions
2021-01-15 21:00:01 +00:00
include "build/src/overlays/actors/ovl_En_Shopnuts/ovl_En_Shopnuts_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Si"
include "build/src/overlays/actors/ovl_En_Si/z_en_si.o"
Decompiled ovl_En_Si (#239) * Decompiled ovl_En_Si * Description * Update src/overlays/actors/ovl_En_Si/z_en_si.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Si/z_en_si.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Si/z_en_si.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-07-07 10:39:06 +00:00
include "build/src/overlays/actors/ovl_En_Si/ovl_En_Si_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Siofuki"
include "build/src/overlays/actors/ovl_En_Siofuki/z_en_siofuki.o"
ovl_En_Siofuki (#456) * ovl_En_Siofuki * PR review * Rebase * PR review
2020-11-21 21:03:20 +00:00
include "build/src/overlays/actors/ovl_En_Siofuki/ovl_En_Siofuki_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Skb"
include "build/src/overlays/actors/ovl_En_Skb/z_en_skb.o"
z_en skb, 1 non-matching, with some documentation (#669) * breathing new life into these skeletons * StalZone Progress StalZone * another match * matched override * some progress * one down, one to go * naming and prepping for pr * removing asm and prepping for PR * fixing damage table and asm issues * hopefully this fixes it (thank you louis) * fixing some suggested changes * inlining data into EnSkb_SpawnDebris * Fixing suggestions and adding a note * fixing the asm and function name * fix * whoops Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-02-15 22:52:22 +00:00
include "build/src/overlays/actors/ovl_En_Skb/ovl_En_Skb_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Skj"
include "build/src/overlays/actors/ovl_En_Skj/z_en_skj.o"
Decompile and mostly document EnSkj, EnSkjNeedle, and OBJECT_SKJ. One NON_MATCHING (#750) * match a few * delete ASM * Almost done * One reg swap left * GlobalCtx2 YEP * Start object SKJ * Start some documentation * Big doc pass * Name the first batch of functions * Done * fix some issues real quick * lets try this again * remove left over doc tools and add 3 textures * Finish object_skj docs * PR fixes * PR fixes * Delete BuildInfo.ha * PR fixes (Roman) * PR fixes (Roman)
2021-04-10 15:39:25 +00:00
include "build/src/overlays/actors/ovl_En_Skj/ovl_En_Skj_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Skjneedle"
include "build/src/overlays/actors/ovl_En_Skjneedle/z_en_skjneedle.o"
Split ovl_file_choose and ovl_kaleido_scope (#167) * Split ovl_file_choose and ovl_kaleido_scope * Split ovl_kaleido_scope's rodata/data/bss * fix * fix spec * spec fix * hopefully last spec fix * hopefully last spec fix 2 * fix * Add comments on file boundaries * fix
2020-06-07 17:52:43 +00:00
include "build/src/overlays/actors/ovl_En_Skjneedle/ovl_En_Skjneedle_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Ssh"
include "build/src/overlays/actors/ovl_En_Ssh/z_en_ssh.o"
En_Ssh (House of Skulltula spiders) (#485) * Darkmeiro decompilation Bg_Gnd_Darkmeiro decompiled, matched, and documented. * give this a shot * fix conflict * one more try * could be useful * whoops * ZAP2 stuff * ZAP why * ZAP again * eek spiders * now with names * fixes and formatting * expanded enum * void* limb draw
2020-12-02 19:58:21 +00:00
include "build/src/overlays/actors/ovl_En_Ssh/ovl_En_Ssh_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_St"
include "build/src/overlays/actors/ovl_En_St/z_en_st.o"
Decompiles ovl_En_St (#349) * decompile and match En_St * document ovl_En_St * Implement OPEN_DISPS, and remove useless comments * styling updates, inline some declarations * PR suggestions as well as changing the BlureInit colors to u8 arrays over RGBA types * remove pointer from EnSt_SetupAction
2020-09-14 16:17:34 +00:00
include "build/src/overlays/actors/ovl_En_St/ovl_En_St_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Sth"
include "build/src/overlays/actors/ovl_En_Sth/z_en_sth.o"
En_Sth OK (#672) * all functions matching * en_sth OK * text formatting and added a description at the top * some suggested changes * merge master and remove text comments Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-02-12 23:34:37 +00:00
include "build/src/overlays/actors/ovl_En_Sth/ovl_En_Sth_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Stream"
include "build/src/overlays/actors/ovl_En_Stream/z_en_stream.o"
En_Stream (vortex) 7/8 matching, 1 equivalent (#512) * EnStream_Init OK * func_80B0B7A0 OK * EnStream_Destroy OK * EnStream_Update OK * Make func_80B0B7A0 take this instead of thisx like other SetupActions * func_80B0BAC8 OK * func_80B0B934 OK * func_80B0B81C not OK, but very close and I give up * EnStream_Draw OK * Delete unused ASM and do a little cleanup * Provide better names for functions * Make the file buildable when NONMATCHING is used * Flip comparisons in EnStream_SuckPlayer as per review * NONMATCHING -> NON_MATCHING * Remove & for function pointers * Type D_06000950 and remove the & in Draw * Remove unnecessary "struct" * Remove unnecessary forward declaration * Make func_80B0B81C take Vec3f*, not PosRot* * Use the generated reloc when NON_MATCHING * Move func_80B0B81C forward declare to the else block
2020-12-12 06:14:26 +00:00
include "build/src/overlays/actors/ovl_En_Stream/ovl_En_Stream_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Sw"
include "build/src/overlays/actors/ovl_En_Sw/z_en_sw.o"
Decompile en_sw (#679) * decompile ovl_en_sw * remove unused asm * some cleanup, run format * review * review Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-02-13 01:52:39 +00:00
include "build/src/overlays/actors/ovl_En_Sw/ovl_En_Sw_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Syateki_Itm"
include "build/src/overlays/actors/ovl_En_Syateki_Itm/z_en_syateki_itm.o"
G_Switch, Syateki_Itm, and Syateki_Man (Shooting gallery and related actors) (#523) * Darkmeiro decompilation Bg_Gnd_Darkmeiro decompiled, matched, and documented. * give this a shot * fix conflict * one more try * could be useful * whoops * ZAP2 stuff * ZAP why * ZAP again * rupees and, for some reason, pots * and now an even larger man * now for the gallery * more progress * naming continues * even more docs * another match * match, fix, a new enum * Update src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c * fixes except globalctx * well one more * and now globalCtx
2020-12-11 22:38:23 +00:00
include "build/src/overlays/actors/ovl_En_Syateki_Itm/ovl_En_Syateki_Itm_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Syateki_Man"
include "build/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.o"
G_Switch, Syateki_Itm, and Syateki_Man (Shooting gallery and related actors) (#523) * Darkmeiro decompilation Bg_Gnd_Darkmeiro decompiled, matched, and documented. * give this a shot * fix conflict * one more try * could be useful * whoops * ZAP2 stuff * ZAP why * ZAP again * rupees and, for some reason, pots * and now an even larger man * now for the gallery * more progress * naming continues * even more docs * another match * match, fix, a new enum * Update src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c * fixes except globalctx * well one more * and now globalCtx
2020-12-11 22:38:23 +00:00
include "build/src/overlays/actors/ovl_En_Syateki_Man/ovl_En_Syateki_Man_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Syateki_Niw"
include "build/src/overlays/actors/ovl_En_Syateki_Niw/z_en_syateki_niw.o"
En_Syateki_Niw (#270) * All matching, apart from the ones that aren't. * Fix conflcit and 1 func * Bugz * Conflict 2 * Header * Remove asm * PR * PR * undefined syms * PR
2020-08-20 22:34:18 +00:00
include "build/src/overlays/actors/ovl_En_Syateki_Niw/ovl_En_Syateki_Niw_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Ta"
include "build/src/overlays/actors/ovl_En_Ta/z_en_ta.o"
Decompiled ovl_En_Ta (#518) * First steps * more * done * format * PR comments * PR comments
2020-12-08 21:39:41 +00:00
include "build/src/overlays/actors/ovl_En_Ta/ovl_En_Ta_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Takara_Man"
include "build/src/overlays/actors/ovl_En_Takara_Man/z_en_takara_man.o"
z_en_takara_man OK (#380) * started * Decompiled z_en_takara_man, added CHOICE_NO and CHOICE_YES defines * use generated reloc * Removed choice index define due to inconsistencies * Made suggested changes
2020-09-27 01:09:17 +00:00
include "build/src/overlays/actors/ovl_En_Takara_Man/ovl_En_Takara_Man_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Tana"
include "build/src/overlays/actors/ovl_En_Tana/z_en_tana.o"
Split ovl_file_choose and ovl_kaleido_scope (#167) * Split ovl_file_choose and ovl_kaleido_scope * Split ovl_kaleido_scope's rodata/data/bss * fix * fix spec * spec fix * hopefully last spec fix * hopefully last spec fix 2 * fix * Add comments on file boundaries * fix
2020-06-07 17:52:43 +00:00
include "build/src/overlays/actors/ovl_En_Tana/ovl_En_Tana_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Tg"
include "build/src/overlays/actors/ovl_En_Tg/z_en_tg.o"
Dancing Couple (ovl_En_Tg) (#866) * Match EnTg_Destroy * Match EnTg_Init * Matching EnTg_Update * Match func_80B18360 Moving both 'return phi;'s into a single return at the end of the function causes the assembly to not match. * Probably equivalent, non-matching func_80B183F8 * Matching EnTg_Draw * Matching update function * Matching func_80B18778 * All functions decompiled * Move data to C code * All functions matched excepted weird switch/case * Last matching function * Remove unused ASM * Name obvious symbols * Clang format * Name text-related functions and variables * Describe actor as Dancing Couple See https://github.com/zeldaret/oot/pull/866#discussion_r664726581 * Use named constants * Name drawing constants * Use THIS macro for void* * Name the function that sets environment color * Add comments to parts of code that aren't clear * Rename timesSpokenTo to nextDialogue, treat isTalking as boolean
2021-07-28 16:51:12 +00:00
include "build/src/overlays/actors/ovl_En_Tg/ovl_En_Tg_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Tite"
include "build/src/overlays/actors/ovl_En_Tite/z_en_tite.o"
En_Tite OK (#555) * EnTite_Update matching * Fixes to update * made good progress, func_80B1A2A0 is in a good place to be matching soon * Merge stuff * func_80B19E94 done, func_80B18CC4 done * EnTite_Destroy and EnTite_Init done * Commenting out sDamageTable and EnTite_Init until all the data matches * Some more small functions done * more progress * func_80B19918 done * func_80B18E7C done * func_80B19524 done * more progress * EnTite_Draw equiv but nonmatching, file otherwise done * Found some unstaged changed on old laptop * Draw matching: File fully matching! * Documentation * finished documentation * deleted data files * update spec * fixed waterY -> yDistToWater rename after merge * ran format.sh * fixing accidental renames in camera * Fixed some obvious number/comment formatting issues * Removed unecessary prototypes * merge * running format.sh * suggestions * more pr comment changes * format to push * one more change * more renames (see pr comments) * merge * renames * format.sh * fix renames * function comment formatting * merge + format * endless merge fixes * merge fixes until die * yet again a merge fix * pr suggestions
2020-12-31 20:00:30 +00:00
include "build/src/overlays/actors/ovl_En_Tite/ovl_En_Tite_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Tk"
include "build/src/overlays/actors/ovl_En_Tk/z_en_tk.o"
Split ovl_file_choose and ovl_kaleido_scope (#167) * Split ovl_file_choose and ovl_kaleido_scope * Split ovl_kaleido_scope's rodata/data/bss * fix * fix spec * spec fix * hopefully last spec fix * hopefully last spec fix 2 * fix * Add comments on file boundaries * fix
2020-06-07 17:52:43 +00:00
include "build/src/overlays/actors/ovl_En_Tk/ovl_En_Tk_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Torch"
include "build/src/overlays/actors/ovl_En_Torch/z_en_torch.o"
Split ovl_file_choose and ovl_kaleido_scope (#167) * Split ovl_file_choose and ovl_kaleido_scope * Split ovl_kaleido_scope's rodata/data/bss * fix * fix spec * spec fix * hopefully last spec fix * hopefully last spec fix 2 * fix * Add comments on file boundaries * fix
2020-06-07 17:52:43 +00:00
include "build/src/overlays/actors/ovl_En_Torch/ovl_En_Torch_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Torch2"
include "build/src/overlays/actors/ovl_En_Torch2/z_en_torch2.o"
En_Torch2 (#486) * Darkmeiro decompilation Bg_Gnd_Darkmeiro decompiled, matched, and documented. * give this a shot * fix conflict * one more try * Oh boy more giant functions * now functional, but not equivalent * Now only non-matching * cleaned up illusion room * much closer. static variables still suck though * much closer. static variables still suck though * some docs and cleanup. matching is horrible. * static varaibles are a troublesome lot * ifdef * merge ZAP * merge again * small cleanup * small fixes * swordstate * resolve conflict * comments and such Co-authored-by: fig <fig02srl@gmail.com> Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
2020-12-29 01:56:24 +00:00
include "build/src/overlays/actors/ovl_En_Torch2/ovl_En_Torch2_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Toryo"
include "build/src/overlays/actors/ovl_En_Toryo/z_en_toryo.o"
En_Toryo OK (#569) * En_Toryo OK * en_Toryo fixes Co-authored-by: fig <fig02srl@gmail.com>
2021-01-07 19:10:15 +00:00
include "build/src/overlays/actors/ovl_En_Toryo/ovl_En_Toryo_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Tp"
include "build/src/overlays/actors/ovl_En_Tp/z_en_tp.o"
EnTp, 1 nonmatching, and object_tp (#782) * Data imported, 8 easy functions matched * Init only remaining nonmatching, data in * some renaming & fiddling with Init, still nonmatching * fix colours * Init still not matching * Decompile object_tp * renames * Rename func_80B20DE0 * Horrible new idea * Known equivalent, docs next * Another attempt * Finished naming in object_tp * Named functions, more enums * DrawBridge -> Drawbridge * skulltulla -> Skulltula * Name almost all struct variables * Named most of the temps * delete asm * spec * Missed data file, whoops * Review * More review changes
2021-04-21 18:26:24 +00:00
include "build/src/overlays/actors/ovl_En_Tp/ovl_En_Tp_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Tr"
include "build/src/overlays/actors/ovl_En_Tr/z_en_tr.o"
EnTr, 1 nonmatching, mostly documented (#621) * 2 functions left, data imported * one function left * setup for NON_MATCHING * struct variables named * most of the functions named, type enums * delete ASM * Actor fixes
2021-01-31 05:07:58 +00:00
include "build/src/overlays/actors/ovl_En_Tr/ovl_En_Tr_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Trap"
include "build/src/overlays/actors/ovl_En_Trap/z_en_trap.o"
EnTrap OK (#615) * Manual migration of work to new branch due to screwing up git * removing unused asm * formatting * Fixing a comment * Adding a missing sound define
2021-01-30 18:29:37 +00:00
include "build/src/overlays/actors/ovl_En_Trap/ovl_En_Trap_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Tubo_Trap"
include "build/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.o"
Split ovl_file_choose and ovl_kaleido_scope (#167) * Split ovl_file_choose and ovl_kaleido_scope * Split ovl_kaleido_scope's rodata/data/bss * fix * fix spec * spec fix * hopefully last spec fix * hopefully last spec fix 2 * fix * Add comments on file boundaries * fix
2020-06-07 17:52:43 +00:00
include "build/src/overlays/actors/ovl_En_Tubo_Trap/ovl_En_Tubo_Trap_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Vali"
include "build/src/overlays/actors/ovl_En_Vali/z_en_vali.o"
EnVali OK and documented, object_vali and object_bl completely analysed and documented (#845) * OK * Some naming * Name more, correct typo in Biri, extract skel * just Draws need names, fix typos in bili and warp1 * Decompile object_vali and add symbols * Few more names * Bari naming done * object_bl completed, symbols added * Label object_bl * Formatter * delete asm * review changes * review changes * review
2021-06-14 22:11:14 +00:00
include "build/src/overlays/actors/ovl_En_Vali/ovl_En_Vali_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Vase"
include "build/src/overlays/actors/ovl_En_Vase/z_en_vase.o"
Split ovl_file_choose and ovl_kaleido_scope (#167) * Split ovl_file_choose and ovl_kaleido_scope * Split ovl_kaleido_scope's rodata/data/bss * fix * fix spec * spec fix * hopefully last spec fix * hopefully last spec fix 2 * fix * Add comments on file boundaries * fix
2020-06-07 17:52:43 +00:00
include "build/src/overlays/actors/ovl_En_Vase/ovl_En_Vase_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Vb_Ball"
include "build/src/overlays/actors/ovl_En_Vb_Ball/z_en_vb_ball.o"
Volvagia (ovl_Boss_Fd) and related actors (#352) * Darkmeiro decompilation Bg_Gnd_Darkmeiro decompiled, matched, and documented. * Lots of functions matched. Some big ones are close. * Five left unmatched, one close. * Merged data and decompiled the giant function into something readable. Its branch structure has yet to be matched. * Three unmatched, one essentially matched, the rest matched. * More fixes. * Documented more of the structure and cleaned up a bit. * BossFd2, BgVbSima, and EnVbBall matched and documented * Also removed unneeded .s files * And need to name EnVbBall's functions * give this a shot * fix conflict * one more try * removing darkmeiro changes * and again * now OK from make clean * minor cleanup * One more matching function for BossFd * which means it doesn't need its .s * splitting * splitting * splitting * forgot some .s * fancy new names * fancy new names * trying again * sneaky .s files * sound effects and some hex to decimal conversions * Sound effects and static variable cleanup * format.sh and clean up static variables * sfx and formatting * ZAP and cleanup * small cleanup * cleanup and ZAP * ZAP * looking at the giant function again * looking at the giant function again * Only the big function left. * Those .s files aren't mine, officer * float literals might be fixed. regalloc still a nightmare * almost done with the big function * should make now * not much of a change * all functions match. rodata somehow doesn't. * forgot some things * lots of cleanup * and a little more * small error * large cleanup. Also BossFd has function names and inlined variable declarations * still more cleanup * the quest for 0.1f continues * forgot to put NON_MATCHING back in * Data structures fully documented. Still more cleanup. * DECR now works with BossFd2 * should match now * cleanup * small cleanup * cleanup and names * tiny thing * particles and headers and stuff * now with more enums * merge * test * end test * update * cleanup * object 2 * object 1 * doc object_fd2 * git subrepo pull --force tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "6f874af4a" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "6f874af4a" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * formatting * .s * merge actor * vertex arrays * a little more * formatting * merge opd * fixed damage check * cleanup * fixes * effect struct * review Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain> Co-authored-by: fig02 <fig02srl@gmail.com>
2021-04-17 17:12:46 +00:00
include "build/src/overlays/actors/ovl_En_Vb_Ball/ovl_En_Vb_Ball_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Viewer"
include "build/src/overlays/actors/ovl_En_Viewer/z_en_viewer.o"
En_Viewer (one non-matching) (#570) * init commit * en_viewer 20/24 functions decompiled * en_viewer 22/24 functions decompiled * EnViewer 1 func non-matching, down to stack * cleanup, 1 non-matching * ran formatter * remove extra space in undefined_syms.txt * remove data.s * update math & skelAnime names * pr feedback * review * semicolon Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-01-16 17:33:37 +00:00
include "build/src/overlays/actors/ovl_En_Viewer/ovl_En_Viewer_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Vm"
include "build/src/overlays/actors/ovl_En_Vm/z_en_vm.o"
Decompile En_Vm (Beamos) (#416) * Decompile En_Vm * various Beamos fixes * Beamos fixes * Cleanup Beamos * Update src/overlays/actors/ovl_En_Vm/z_en_vm.c Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Vm/z_en_vm.c Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Vm/z_en_vm.c Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Vm/z_en_vm.c Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Updated En_Vm * Update Beamos * Update src/overlays/actors/ovl_En_Vm/z_en_vm.h Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update En_Vm Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> Co-authored-by: Zelllll <elijah@DESKTOP-NMP1I89.localdomain> Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-11-25 19:20:02 +00:00
include "build/src/overlays/actors/ovl_En_Vm/ovl_En_Vm_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Wall_Tubo"
include "build/src/overlays/actors/ovl_En_Wall_Tubo/z_en_wall_tubo.o"
Bombchu bowling OK (#496) * All functions decompiled, most named * asm deleted, spec and undefined_syms included * missed a static * Some cleanup on comments and osSyncPrintfs * asm Co-authored-by: fig02 <fig02srl@gmail.com>
2020-12-06 18:48:51 +00:00
include "build/src/overlays/actors/ovl_En_Wall_Tubo/ovl_En_Wall_Tubo_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Wallmas"
include "build/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.o"
Split ovl_file_choose and ovl_kaleido_scope (#167) * Split ovl_file_choose and ovl_kaleido_scope * Split ovl_kaleido_scope's rodata/data/bss * fix * fix spec * spec fix * hopefully last spec fix * hopefully last spec fix 2 * fix * Add comments on file boundaries * fix
2020-06-07 17:52:43 +00:00
include "build/src/overlays/actors/ovl_En_Wallmas/ovl_En_Wallmas_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Weather_Tag"
include "build/src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.o"
z_en_weather_tag decomp (#329) * Initial commit of weather_tag actor decomp * Formatted source files and updated spec. * Fixed references to the environment context variable that I changed. * Deleted the last of the asm (forgot the stuff in the data folder) * Made all requested changes to z_en_weather_tag * Forgot to change basereg * Removed unnecessary field in weather tag struct * Update src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * That field in the header was totally necessary, not sure what I was thinking, sorry for all the commits * Renamed what I thought was struct padding to more accurately represent the fact that that field is an unused variable. * Update src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.h Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-08-21 01:28:41 +00:00
include "build/src/overlays/actors/ovl_En_Weather_Tag/ovl_En_Weather_Tag_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Weiyer"
include "build/src/overlays/actors/ovl_En_Weiyer/z_en_weiyer.o"
ovl_En_Weiyer (#650) * ovl_En_Weiyer * PR review * PR review
2021-02-07 23:31:24 +00:00
include "build/src/overlays/actors/ovl_En_Weiyer/ovl_En_Weiyer_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Wf"
include "build/src/overlays/actors/ovl_En_Wf/z_en_wf.o"
EnWf OK and documented (#967) * a ton of progress, 14 functions remain * cleanup * a few more functions done, 11 remain * finally all updated * another function matched * another action finished * damage table * death action done * started very large action func * more progress on long action funcs * large action func matched * 5 functions remain * another large action finished * start another action, doesn't match yet * a few new functions, neither match * done working on this for now * Correct one nonmatching, fix compiler warnings * Two functions left * one left * remove remaining gotos * OK * Delete outdated comment * namefixer * Flag macros * audio, dmgeff, some colour * Import symbols from object, reloc, name a few things * Rest of object done * Named a few more things, add action enum * Name body parts and another couple of actions * Last few names * Delete asm * Format * undefined_syms, mods where possible * Correct parent to EnEncount1 * Review * Last newline * louis and Dragorn's reviews * Format * More review * Put back to isInvisible and or, as in EnGeldB * Remove if (0)s in func_8009728C and change pointer arithmetic cast * More review * Unname headRot, make "fallthrough" case clearer, other review * Format * Even more review * Rephrase Co-authored-by: Zelllll <56516451+Zelllll@users.noreply.github.com>
2021-09-24 22:35:42 +00:00
include "build/src/overlays/actors/ovl_En_Wf/ovl_En_Wf_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Wonder_Item"
include "build/src/overlays/actors/ovl_En_Wonder_Item/z_en_wonder_item.o"
En_Wonder_Item (#451) * Darkmeiro decompilation Bg_Gnd_Darkmeiro decompiled, matched, and documented. * give this a shot * fix conflict * one more try * could be useful * whoops * wonder item and incidental cleanup on wondertalk2 * merge update * now with function names * static variables * the macros will rise again * better (?) translation * fix names
2020-11-21 19:18:14 +00:00
include "build/src/overlays/actors/ovl_En_Wonder_Item/ovl_En_Wonder_Item_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Wonder_Talk"
include "build/src/overlays/actors/ovl_En_Wonder_Talk/z_en_wonder_talk.o"
Decompiles z_en_wonder_talk.c (#309) * Decompiles z_en_wonder_talk.c * EnWonderTalk_Init * EnWonderTalk_Update * func_80B395F0 * func_80B391CC * func_80B3943C Removes unused asm's * Addresses PR comments * Uses VT macros in z_en_wonder_talk * Adds translations to stdout messages in comments * Addresses additional PR comments * Addresses PR comments #3 Co-authored-by: i82orbom <i82orbom@github> Co-authored-by: i82orbom <i82orbom i82orbom@github>
2020-08-18 22:27:03 +00:00
include "build/src/overlays/actors/ovl_En_Wonder_Talk/ovl_En_Wonder_Talk_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Wonder_Talk2"
include "build/src/overlays/actors/ovl_En_Wonder_Talk2/z_en_wonder_talk2.o"
Decompiles z_en_wonder_talk2.c (#312) * Decompiles z_en_wonder_talk2.c * EnWonderTalk2_Init * func_80B3A10C * func_80B3A770 * EnWonderTalk2_Update * func_80B3A15C * func_80B3A4F8 * func_80B3A3D4 * Removes unused asm * Addresses PR comments * Addresses PR comments #2 Co-authored-by: i82orbom <i82orbom i82orbom@github>
2020-08-19 01:31:54 +00:00
include "build/src/overlays/actors/ovl_En_Wonder_Talk2/ovl_En_Wonder_Talk2_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Wood02"
include "build/src/overlays/actors/ovl_En_Wood02/z_en_wood02.o"
EnWood02 OK (#578) * OK, some documentation * delete asm * dists updated * addressed review comments * one more comment * remove one comment * addressed review comments
2021-01-14 17:58:17 +00:00
include "build/src/overlays/actors/ovl_En_Wood02/ovl_En_Wood02_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Xc"
include "build/src/overlays/actors/ovl_En_Xc/z_en_xc.o"
ovl_En_Xc and object_xc OK (#746) * Started * did some more * did a few more * update * Fixed corrupted git repo * did some more * Did a few more functions * taking a break * fix undefined * matched the stupid hard function * a few more * did some more, done for tonight * commit in case i mess up * 3 non matching * . * remove tools/ZAP2 from origin master * idk * i cant figure this out * object_xc OK * compiles now * the evil function is now ok * z_en_xc OK * some documentation * more documentation i guess * more documentation * more z_en_xc docs * z_en_xc updates * Final pass, its been nearly a year * Remove unnecessary comment * forgot to remove unused asm * Merge * Made suggested changes and fixed warnings in z_en_xc * Remove symbols from undefined_syms.txt * Add some missing animmode to en_Xc * review * review * fix tot cutscene * comment Co-authored-by: Lucas Shaw <lucas.shaw1123@gmail.com> Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-04-14 22:49:56 +00:00
include "build/src/overlays/actors/ovl_En_Xc/ovl_En_Xc_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Yabusame_Mark"
include "build/src/overlays/actors/ovl_En_Yabusame_Mark/z_en_yabusame_mark.o"
ovl_en_yabusame_mark, 1 nonmatching (#707) * 1 nonmatching (func_80B42F74) * #ifdef NON_MATCHING * deleted unused asm * review suggestions * sCollisionVertices
2021-02-22 00:10:24 +00:00
include "build/src/overlays/actors/ovl_En_Yabusame_Mark/ovl_En_Yabusame_Mark_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Yukabyun"
include "build/src/overlays/actors/ovl_En_Yukabyun/z_en_yukabyun.o"
z_en_yukabyun decompiled (#318) * Decomped Yukabyun (flying floor tiles) * z_en_yukabyun * Ran the formatting script, plus fixed negative number stuff in the Update function * Changed unk_152 to unsigned to get rid of cast * Made all the suggested changes. * Update undefined_syms.txt Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-08-18 17:52:44 +00:00
include "build/src/overlays/actors/ovl_En_Yukabyun/ovl_En_Yukabyun_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Zf"
include "build/src/overlays/actors/ovl_En_Zf/z_en_zf.o"
EnZf OK and partially documented (#988) * Match Destroy * Matched Init * 3 more matched * 15 functions matched, data imported * 16 matched * 17 matched * 18 matched * formatting * 19 matched * Fix unk_404 * Draw matched, 20 in total * 21 matched * 22 matched * 23 matched * 24 matched * 25 matched * 26 matched * 27 matched * 28 matched * 29 matched * 30 matched * 31 matched * 33 matched * 34 matched * 35 matched * 36 matched * 17 left * 16 left * 15 left * 14 left * 13 left * 12 left * 11 left * 10 left * spec * bss * 9 left * 8 left * 7 left * 6 left * 5 left * 4 left * 1 up to regalloc, 3 left * 2 left (+ 1 regalloc) * More naming * 1 + regalloc left * Some naming * matches but for 2 words of stack in func_80B45748 * Delete some padding in header * Merge remote-tracking branch 'upstream/master' into Zf * func_8003426C rename * more failed matching attempts * Update to new function names * OK at last * Actually OK this time, removed pragmas, spec * Begin documentation * Few more names * Some more naming, added description to z_en_geldb.c * Confirm platform categories * (Badly) named floor check functions * Make fighter actors playSpeed animation frame checks consistent (up to names) * Action enum, lot of work on the skeleton stuff in the object * Lot of function and animation naming * More naming, last of the hardcoded symbols * Some name cleanup * Remove asm * Format * Bit more cleanup * Dragorn review I * undefined syms * Correct limb names * Non-control flow review suggestions * Easy review stuff * Some more review
2021-11-06 03:47:04 +00:00
include "build/src/overlays/actors/ovl_En_Zf/ovl_En_Zf_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Zl1"
Move to the spec the cutscenes of Bg_Treemough and En_Zl1 (#915) * link cutscenes of Bg_Treemough and En_Zl1 * move unused data Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-08-22 16:18:49 +00:00
include "build/src/overlays/actors/ovl_En_Zl1/z_en_zl1_cutscene_data.o"
First proper commit.
2020-03-17 04:31:30 +00:00
include "build/src/overlays/actors/ovl_En_Zl1/z_en_zl1.o"
Split ovl_file_choose and ovl_kaleido_scope (#167) * Split ovl_file_choose and ovl_kaleido_scope * Split ovl_kaleido_scope's rodata/data/bss * fix * fix spec * spec fix * hopefully last spec fix * hopefully last spec fix 2 * fix * Add comments on file boundaries * fix
2020-06-07 17:52:43 +00:00
include "build/src/overlays/actors/ovl_En_Zl1/ovl_En_Zl1_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Zl2"
include "build/src/overlays/actors/ovl_En_Zl2/z_en_zl2.o"
Decompiled ovl_En_Zl2 (2 nonmatchings) (#223) * Almost dun * 3 more, progress... * 2 more * Fixing field rename * improvement * 1 more * progress * more * work * Preparing for PR * Comments * tidbits * more tidbits * fixes * PR comments * Nonmatching reloc * PR suggestions * PR suggestions
2020-07-04 12:34:51 +00:00
include "build/src/overlays/actors/ovl_En_Zl2/ovl_En_Zl2_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Zl3"
include "build/src/overlays/actors/ovl_En_Zl3/z_en_zl3.o"
Decompiled ovl_En_Zl3 (2 non-matchings) (#491) * Progress * deleting more function files * more * more * More * more * more * more * more * 2 more * more * more * more * more * more * more * more * more * more * master update * 4 more * Merged * 3 more * One more done! * ug * Ido Recomp test * try 2 * Recomp by default * Fix Jenkinsfile * Fix 2 * Fixing struct * CFE errors * CFE fix -O2 * Cleanup * More progress, almost done... * Almost.. * Update and some progress * formatting * Cleanup * Major cleanup * done for now * PR comments * PR comments * merge master and format * a few things Co-authored-by: fig <fig02srl@gmail.com>
2020-12-02 01:48:54 +00:00
include "build/src/overlays/actors/ovl_En_Zl3/ovl_En_Zl3_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Zl4"
include "build/src/overlays/actors/ovl_En_Zl4/z_en_zl4.o"
En_Zl4 (#590) * significant progress * cutscene data * match * docs * dist from link * compiler warnings * cutscene and such * object decomp * stuff * cleanup * name some things * stuff * cutscenes fixed * git subrepo pull --force tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "44f5d7cb9" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "44f5d7cb9" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * git subrepo pull --force tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "0305ec2c2" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "0305ec2c2" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * reorder * unused content * documented cutscene dlists * enviewer update * Update src/overlays/actors/ovl_En_Zl4/z_en_zl4.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Zl4/z_en_zl4.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * formatter Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain> Co-authored-by: Fig02 <fig02srl@gmail.com> Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2021-02-12 22:16:40 +00:00
include "build/src/overlays/actors/ovl_En_Zl4/ovl_En_Zl4_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_Zo"
include "build/src/overlays/actors/ovl_En_Zo/z_en_zo.o"
ovl_En_Zo OK (#522) * Decompile ovl_En_Zo * Label ovl_En_Zo * clang-format * Cleanup * Review changes Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Use generated reloc Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Review Changes * Remove reloc data * Review changes Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-12-20 07:38:08 +00:00
include "build/src/overlays/actors/ovl_En_Zo/ovl_En_Zo_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_En_fHG"
include "build/src/overlays/actors/ovl_En_fHG/z_en_fhg.o"
Phantom Ganon (ovl_Boss_Ganondrof) and related actors (#442) * Darkmeiro decompilation Bg_Gnd_Darkmeiro decompiled, matched, and documented. * give this a shot * fix conflict * one more try * It's Phantom Ganon time * Fhg_Fire matched * small touch up * more documentation * starting naming fire * renaming * cleanup * hooray for new names * merge * first pass * camera status * bgcheck * object 1 * object 2 * .s * .s * fig's comments * implementing zel's suggestions and a few other things * the work begins * work continues * docs, shifts, cleanup * cleanup * texture names * addressing the rest of the notes Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
2021-03-29 19:35:46 +00:00
include "build/src/overlays/actors/ovl_En_fHG/ovl_En_fHG_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_End_Title"
include "build/src/overlays/actors/ovl_End_Title/z_end_title.o"
Split ovl_file_choose and ovl_kaleido_scope (#167) * Split ovl_file_choose and ovl_kaleido_scope * Split ovl_kaleido_scope's rodata/data/bss * fix * fix spec * spec fix * hopefully last spec fix * hopefully last spec fix 2 * fix * Add comments on file boundaries * fix
2020-06-07 17:52:43 +00:00
include "build/src/overlays/actors/ovl_End_Title/ovl_End_Title_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Fishing"
include "build/src/overlays/actors/ovl_Fishing/z_fishing.o"
Decompile Fishing and document object_fish (#856) * Start decompiling Fishing * Decompile more functions in Fishing * Decompile a few more functions in Fishing * Decompile func_80B6E9E0 and func_80B7825C (non matching) * Minor Fishing cleanups * Migrate fishing bss to C and match 3 functions * Decompile and match Fishing_Update * Migrate fishing data to C and minor cleanups * Fix the object_fish xml and use its symbols in Fishing * Partially document Fishing and object_fish * Add more documentation/cleanups to Fishing and object_fish * Use object_fish symbols in Demo_Ec and fix naming * Minor fixes to Fishing docs * Apply review suggestions for Fishing * Apply 2 more review suggestions for Fishing * Apply some review suggestions for Fishing
2021-07-04 17:42:17 +00:00
include "build/src/overlays/actors/ovl_Fishing/ovl_Fishing_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Item_B_Heart"
include "build/src/overlays/actors/ovl_Item_B_Heart/z_item_b_heart.o"
Decompiled ovl_Item_B_Heart <3 (#271) * Decompiled ovl_Item_B_Heart <3 * Update src/overlays/actors/ovl_Item_B_Heart/z_item_b_heart.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-07-19 16:54:30 +00:00
include "build/src/overlays/actors/ovl_Item_B_Heart/ovl_Item_B_Heart_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Item_Etcetera"
include "build/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.o"
ovl_Item_Etcetera OK (#281) * started item_etcetera * ovl_Item_Etcetera OK * z_item_etcetera cleanup * fixed * removed padding * z_item_etcetera updates * made suggested changes * change member in enum
2020-07-29 04:17:26 +00:00
include "build/src/overlays/actors/ovl_Item_Etcetera/ovl_Item_Etcetera_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Item_Inbox"
include "build/src/overlays/actors/ovl_Item_Inbox/z_item_inbox.o"
Split ovl_file_choose and ovl_kaleido_scope (#167) * Split ovl_file_choose and ovl_kaleido_scope * Split ovl_kaleido_scope's rodata/data/bss * fix * fix spec * spec fix * hopefully last spec fix * hopefully last spec fix 2 * fix * Add comments on file boundaries * fix
2020-06-07 17:52:43 +00:00
include "build/src/overlays/actors/ovl_Item_Inbox/ovl_Item_Inbox_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Item_Ocarina"
include "build/src/overlays/actors/ovl_Item_Ocarina/z_item_ocarina.o"
ovl_Item_Ocarina OK (#299) * first commit * fixes * remove unwanted file Co-authored-by: fig02 <fig02srl@gmail.com>
2020-08-28 18:35:35 +00:00
include "build/src/overlays/actors/ovl_Item_Ocarina/ovl_Item_Ocarina_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Item_Shield"
include "build/src/overlays/actors/ovl_Item_Shield/z_item_shield.o"
ovl_Item_Shield OK (#717) * ovl_Item_Shield OK * ovl_Item_Shield fix spec * review changes * review comments 2
2021-03-11 20:47:00 +00:00
include "build/src/overlays/actors/ovl_Item_Shield/ovl_Item_Shield_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Magic_Dark"
include "build/src/overlays/actors/ovl_Magic_Dark/z_magic_dark.o"
ovl_Magic_Dark (#495) * merge upstream * Merge upstream * Small formatting * Data section * MagicDark_Draw * Gross match of func_80B874E4 * Add func_8005A9CC to functions.h * Work on func_80B87A18 * func_80B8772C * Remove comment * Work on func_80B87A18 * Correct fp constant * Add regalloc comment ;( * Move negatives to numbers * Stupid casts >:( * Use this->actor when possible * It's so close * Use cast + 0xFF * func_80B87A18 * Delete asm and replace globalCtx2 * Update spec * static everything * Name scale * Use decimal for alpha * Name some stuff * Delete reloc * Name orbOffset * Name some functions * Make unused data colors (because it probably is) * Change >= to > * Use clamps * Name MagicDark_DimLighting * Name gfx * Rename prototype params * Cleanup * Funny cast Co-authored-by: Ethan Roseman <ethteck@gmail.com>
2020-12-02 02:36:39 +00:00
include "build/src/overlays/actors/ovl_Magic_Dark/ovl_Magic_Dark_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Magic_Fire"
include "build/src/overlays/actors/ovl_Magic_Fire/z_magic_fire.o"
Magic Fire OK (#662) * all done, graphics commands written in draw however very messy and non matching * figuring out data * OK * formatting before merge * pr stuff * more pr stuff * pr changes
2021-02-14 17:55:11 +00:00
include "build/src/overlays/actors/ovl_Magic_Fire/ovl_Magic_Fire_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Magic_Wind"
include "build/src/overlays/actors/ovl_Magic_Wind/z_magic_wind.o"
Split ovl_file_choose and ovl_kaleido_scope (#167) * Split ovl_file_choose and ovl_kaleido_scope * Split ovl_kaleido_scope's rodata/data/bss * fix * fix spec * spec fix * hopefully last spec fix * hopefully last spec fix 2 * fix * Add comments on file boundaries * fix
2020-06-07 17:52:43 +00:00
include "build/src/overlays/actors/ovl_Magic_Wind/ovl_Magic_Wind_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Mir_Ray"
include "build/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.o"
MirRay OK and documented (#528) * init, destroy, update, couple of others decomped * 2 functions remain * data migrated * 1 function left * OK thanks mostly to Petrie and the permuter, and no thanks to my find/replace skills * documented and deleted asm * updated spec * delete data * address review comments * Apply review suggestions
2020-12-21 17:28:57 +00:00
include "build/src/overlays/actors/ovl_Mir_Ray/ovl_Mir_Ray_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Obj_Bean"
include "build/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.o"
Decompile obj_bean (magic bean and soft soil). 2 NON_MATCHINGs (#846) * did a bunch * Do a bunch more * all functions in C * Macros for draw and collision part of state flags * Done for now * remove ASM * PR fixes (Elliptic) * all angles are hex and take away bad names * PR fixes (Roman) * PR fixes * PR fixes (Fig) * restore map mark * Fix the other messed with files
2021-06-23 17:28:57 +00:00
include "build/src/overlays/actors/ovl_Obj_Bean/ovl_Obj_Bean_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Obj_Blockstop"
include "build/src/overlays/actors/ovl_Obj_Blockstop/z_obj_blockstop.o"
Split ovl_file_choose and ovl_kaleido_scope (#167) * Split ovl_file_choose and ovl_kaleido_scope * Split ovl_kaleido_scope's rodata/data/bss * fix * fix spec * spec fix * hopefully last spec fix * hopefully last spec fix 2 * fix * Add comments on file boundaries * fix
2020-06-07 17:52:43 +00:00
include "build/src/overlays/actors/ovl_Obj_Blockstop/ovl_Obj_Blockstop_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Obj_Bombiwa"
include "build/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.o"
Split ovl_file_choose and ovl_kaleido_scope (#167) * Split ovl_file_choose and ovl_kaleido_scope * Split ovl_kaleido_scope's rodata/data/bss * fix * fix spec * spec fix * hopefully last spec fix * hopefully last spec fix 2 * fix * Add comments on file boundaries * fix
2020-06-07 17:52:43 +00:00
include "build/src/overlays/actors/ovl_Obj_Bombiwa/ovl_Obj_Bombiwa_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Obj_Comb"
include "build/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.o"
Split ovl_file_choose and ovl_kaleido_scope (#167) * Split ovl_file_choose and ovl_kaleido_scope * Split ovl_kaleido_scope's rodata/data/bss * fix * fix spec * spec fix * hopefully last spec fix * hopefully last spec fix 2 * fix * Add comments on file boundaries * fix
2020-06-07 17:52:43 +00:00
include "build/src/overlays/actors/ovl_Obj_Comb/ovl_Obj_Comb_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Obj_Dekujr"
include "build/src/overlays/actors/ovl_Obj_Dekujr/z_obj_dekujr.o"
ovl_Obj_Dekujr OK (#276) * started dekujr * ovl_Obj_Dekujr OK * cleanup * Made suggested changes
2020-07-20 22:06:04 +00:00
include "build/src/overlays/actors/ovl_Obj_Dekujr/ovl_Obj_Dekujr_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Obj_Elevator"
include "build/src/overlays/actors/ovl_Obj_Elevator/z_obj_elevator.o"
Split ovl_file_choose and ovl_kaleido_scope (#167) * Split ovl_file_choose and ovl_kaleido_scope * Split ovl_kaleido_scope's rodata/data/bss * fix * fix spec * spec fix * hopefully last spec fix * hopefully last spec fix 2 * fix * Add comments on file boundaries * fix
2020-06-07 17:52:43 +00:00
include "build/src/overlays/actors/ovl_Obj_Elevator/ovl_Obj_Elevator_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Obj_Hamishi"
include "build/src/overlays/actors/ovl_Obj_Hamishi/z_obj_hamishi.o"
Obj_Hamishi OK (#539) * obj_hamishi OK * Update src/overlays/actors/ovl_Obj_Hamishi/z_obj_hamishi.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * made suggested changes Co-authored-by: Zelllll <elijah@DESKTOP-NMP1I89.localdomain> Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-12-20 18:39:06 +00:00
include "build/src/overlays/actors/ovl_Obj_Hamishi/ovl_Obj_Hamishi_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Obj_Hana"
include "build/src/overlays/actors/ovl_Obj_Hana/z_obj_hana.o"
Ovl_Obj_Hana OK (#394) * initial commit * Deleted unused asm files. * Formatting, simplified scale floats in HanaParams structs * Removed a comment, replaced thisx with this->actor * Renamed hanaParams data symbol, added missing static keywords, formatting * Formatting suggestions
2020-09-20 13:37:54 +00:00
include "build/src/overlays/actors/ovl_Obj_Hana/ovl_Obj_Hana_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Obj_Hsblock"
include "build/src/overlays/actors/ovl_Obj_Hsblock/z_obj_hsblock.o"
Decompiled ovl_Obj_Hsblock (#345) * Decompiled ovl_Obj_Hsblock * reloc * Renaming * PR suggestion * PR comments * Grouping action funcs
2020-08-27 21:12:02 +00:00
include "build/src/overlays/actors/ovl_Obj_Hsblock/ovl_Obj_Hsblock_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Obj_Ice_Poly"
include "build/src/overlays/actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.o"
Obj_Ice_Poly (#473) * Darkmeiro decompilation Bg_Gnd_Darkmeiro decompiled, matched, and documented. * give this a shot * fix conflict * one more try * could be useful * whoops * ZAP2 stuff * ZAP why * ZAP again * Ice ice baby * slight cleanup * format * Update src/overlays/actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update src/overlays/actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-11-24 03:23:53 +00:00
include "build/src/overlays/actors/ovl_Obj_Ice_Poly/ovl_Obj_Ice_Poly_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Obj_Kibako"
include "build/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.o"
Kibako Reloc (#436) * fix colliderinit typo * fix initchain * reloc
2020-10-04 15:20:00 +00:00
include "build/src/overlays/actors/ovl_Obj_Kibako/ovl_Obj_Kibako_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Obj_Kibako2"
include "build/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.o"
z_obj_kibako2 (large wooden crate) OK (#582) * Migrate data to C * Partially decompile Init * func_80B959D0 OK * ObjKibako2_Destroy OK * ObjKibako2_Update OK * ObjKibako2_Draw OK * func_80B95CA4 OK * ObjKibako2_Init OK * func_80B95DFC * func_80B95ED4 OK * func_80B95A28 OK * Name functions * Delete unused asm and update spec * Fixup math post rebase * Name statics * Clean up variable names * Run formatter * xzDistFromLink -> xzDistToLink * Respond to feedback in ObjKibako2_Break * Type sp2C as a CollisionHeader* and initalize it when declaring it * Respond to remaining review feedback * Respond to review feedback from Roman
2021-01-14 18:22:48 +00:00
include "build/src/overlays/actors/ovl_Obj_Kibako2/ovl_Obj_Kibako2_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Obj_Lift"
include "build/src/overlays/actors/ovl_Obj_Lift/z_obj_lift.o"
ObJ_Lift OK (#883) * ObJ_Lift decompiled and matching. * Update src/overlays/actors/ovl_Obj_Lift/z_obj_lift.c Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Implemented suggestions * Decorrected mask in z_obj_lift per suggestion * Update src/overlays/actors/ovl_Obj_Lift/z_obj_lift.c * review * unused asm * review Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> Co-authored-by: fig02 <fig02srl@gmail.com>
2021-08-11 14:35:17 +00:00
include "build/src/overlays/actors/ovl_Obj_Lift/ovl_Obj_Lift_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Obj_Lightswitch"
include "build/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.o"
ovl_Obj_Lightswitch OK and documented (#373) * ovl_Obj_Lightswitch OK * ovl_Obj_Lightswitch documented * Removed unneeded prototypes * Minor cleanup * Cleanup, names * Use color array for more sane SetEnvColor * enum styling Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * more enum styling * globalCtx2 meme * XxxInit -> SetupXxx Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-09-27 14:35:52 +00:00
include "build/src/overlays/actors/ovl_Obj_Lightswitch/ovl_Obj_Lightswitch_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Obj_Makekinsuta"
include "build/src/overlays/actors/ovl_Obj_Makekinsuta/z_obj_makekinsuta.o"
Split ovl_file_choose and ovl_kaleido_scope (#167) * Split ovl_file_choose and ovl_kaleido_scope * Split ovl_kaleido_scope's rodata/data/bss * fix * fix spec * spec fix * hopefully last spec fix * hopefully last spec fix 2 * fix * Add comments on file boundaries * fix
2020-06-07 17:52:43 +00:00
include "build/src/overlays/actors/ovl_Obj_Makekinsuta/ovl_Obj_Makekinsuta_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Obj_Makeoshihiki"
include "build/src/overlays/actors/ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.o"
Decompiled ovl_Obj_Makeoshihiki (#285) * Decompiled ovl_Obj_Makeoshihiki * typo * PR comments * oops * Update src/overlays/actors/ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update src/overlays/actors/ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update src/overlays/actors/ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update src/overlays/actors/ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update src/overlays/actors/ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update src/overlays/actors/ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update src/overlays/actors/ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Fixing dumb thing * oops Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-07-24 21:37:44 +00:00
include "build/src/overlays/actors/ovl_Obj_Makeoshihiki/ovl_Obj_Makeoshihiki_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Obj_Mure"
include "build/src/overlays/actors/ovl_Obj_Mure/z_obj_mure.o"
z_obj_mure OK (#875) * almost matching init, matching data * more matchings, some non-matching progress * finishing up SpawnActor, fixing .data types * first decompile pass done, few non matchings * cleanup/update matchings and remove asm * format code * pick up some OKs * 1 non_matching left, some documentation * z_obj_mure OK... but at what cost? * implement suggested changes, some more documentation * Implement Fig's suggestions * review Co-authored-by: Sam Lyon <sam.c.lyon@gmail.com> Co-authored-by: fig02 <fig02srl@gmail.com>
2021-07-30 17:17:42 +00:00
include "build/src/overlays/actors/ovl_Obj_Mure/ovl_Obj_Mure_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Obj_Mure2"
include "build/src/overlays/actors/ovl_Obj_Mure2/z_obj_mure2.o"
Obj_Mure2 (one non-matching) (#550) * objmure2 about halfway * all decompiled, one non-matching * some documentation * mure2 done, one nonmatching * Update spec * Update z_obj_mure2.c * Update z_obj_mure2.c * Add files via upload * fix formatting * Fix fake match * Changed data formatting * More formatting changes * fixed name of var Co-authored-by: Zelllll <elijah@DESKTOP-NMP1I89.localdomain>
2020-12-30 01:14:04 +00:00
include "build/src/overlays/actors/ovl_Obj_Mure2/ovl_Obj_Mure2_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Obj_Mure3"
include "build/src/overlays/actors/ovl_Obj_Mure3/z_obj_mure3.o"
Obj_Mure3 OK (#720) * matched * format * review Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain> Co-authored-by: fig02 <fig02srl@gmail.com>
2021-03-27 19:50:26 +00:00
include "build/src/overlays/actors/ovl_Obj_Mure3/ovl_Obj_Mure3_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Obj_Oshihiki"
include "build/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.o"
Oshihiki (#441) * Darkmeiro decompilation Bg_Gnd_Darkmeiro decompiled, matched, and documented. * give this a shot * fix conflict * one more try * could be useful * whoops * matching * format * document and format * .s files * cleanup and macros in block-related actors * fixed a few more things, also an error I cso an error I caught in another file.
2020-10-26 13:33:58 +00:00
include "build/src/overlays/actors/ovl_Obj_Oshihiki/ovl_Obj_Oshihiki_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Obj_Roomtimer"
include "build/src/overlays/actors/ovl_Obj_Roomtimer/z_obj_roomtimer.o"
Split ovl_file_choose and ovl_kaleido_scope (#167) * Split ovl_file_choose and ovl_kaleido_scope * Split ovl_kaleido_scope's rodata/data/bss * fix * fix spec * spec fix * hopefully last spec fix * hopefully last spec fix 2 * fix * Add comments on file boundaries * fix
2020-06-07 17:52:43 +00:00
include "build/src/overlays/actors/ovl_Obj_Roomtimer/ovl_Obj_Roomtimer_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Obj_Switch"
include "build/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.o"
ovl_Obj_Switch OK and documented (#372) * ovl_Obj_Switch OK * Documentation & Cleanup * Remove unneeded prototypes, use documentation comments format, add struct offsets * Got rid of symbols not referenced by code, at the costly price of warnings * review 2 * remove asm * review 2 Co-authored-by: fig <fig02srl@gmail.com>
2020-12-03 19:59:28 +00:00
include "build/src/overlays/actors/ovl_Obj_Switch/ovl_Obj_Switch_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Obj_Syokudai"
include "build/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.o"
Obj_Syokudai (#412) * Darkmeiro decompilation Bg_Gnd_Darkmeiro decompiled, matched, and documented. * give this a shot * fix conflict * one more try * torches * Update src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.c Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.c Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * cleanup * Update src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.c Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * small cleanup Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
2020-10-04 12:54:09 +00:00
include "build/src/overlays/actors/ovl_Obj_Syokudai/ovl_Obj_Syokudai_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Obj_Timeblock"
include "build/src/overlays/actors/ovl_Obj_Timeblock/z_obj_timeblock.o"
ObjTimeblock OK (#421) * ObjTimeblock: move data in source file * ObjTimeblock: decomp Init() * ObjTimeblock: decomp Destroy() * ObjTimeblock: decomp func_80BA0058()/spawnDemoEffect() * ObjTimeblock: decomp func_80B9FFA0() * ObjTimeblock: decomp func_80BA040C()/mainActionFunc() * ObjTimeblock: decomp func_80BA032C() * ObjTimeblock: decomp func_80BA0480() * ObjTimeblock: decomp func_80BA0514() * ObjTimeblock: decomp func_80BA0524() * ObjTimeblock: decomp func_80BA00CC()/toggleSceneSwitch() * ObjTimeblock: decomp func_80BA04F8() * ObjTimeblock: decomp func_80BA0508()/doNothing() * ObjTimeblock: decomp func_80BA0758() * ObjTimeblock: decomp func_80BA0768() * ObjTimeblock: decomp func_80BA06AC() * ObjTimeblock: decomp func_80BA083C() * ObjTimeblock: decomp func_80BA084C() * ObjTimeblock: decomp ObjTimeblock_Update() * ObjTimeblock: decomp ObjTimeblock_Draw() * ObjTimeblock: document the most obvious * ObjTimeblock: use compiled reloc data * ObjTimeblock: apply suggestions from mzxrules * review Co-authored-by: fig <fig02srl@gmail.com>
2020-12-03 21:52:26 +00:00
include "build/src/overlays/actors/ovl_Obj_Timeblock/ovl_Obj_Timeblock_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Obj_Tsubo"
include "build/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.o"
obj_tsubo OK (#702) * Getting started * matched tsubo_init * matched func_80BA0DF4 and func_80BA100C * matched func_80BA1294, with progress func_80BA15BC * matched final func, deleted asm, some documenting * Fixing some control flow, and names * Fixing suggested changes (some still remain) * adding the dangeon_keep gfx
2021-02-21 01:32:35 +00:00
include "build/src/overlays/actors/ovl_Obj_Tsubo/ovl_Obj_Tsubo_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Obj_Warp2block"
include "build/src/overlays/actors/ovl_Obj_Warp2block/z_obj_warp2block.o"
ObjWarp2block OK (#685) * ObjWarp2block OK * Address petrie's comments * Rename unused temp to reflect that it's padding * Address fig comments * Use a single byte in offset and size comments * Address roman's comments
2021-02-13 22:51:08 +00:00
include "build/src/overlays/actors/ovl_Obj_Warp2block/ovl_Obj_Warp2block_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Object_Kankyo"
include "build/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.o"
Decompile Object Kankyo (#960) * Decompile Object Kankyo * Remove asm, format * Start documenting object kankyo * Document object kankyo * Remove reloc * Review changes and formatted again :( * WIP * Review changes
2021-09-26 13:35:01 +00:00
include "build/src/overlays/actors/ovl_Object_Kankyo/ovl_Object_Kankyo_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Oceff_Spot"
include "build/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.o"
Split ovl_file_choose and ovl_kaleido_scope (#167) * Split ovl_file_choose and ovl_kaleido_scope * Split ovl_kaleido_scope's rodata/data/bss * fix * fix spec * spec fix * hopefully last spec fix * hopefully last spec fix 2 * fix * Add comments on file boundaries * fix
2020-06-07 17:52:43 +00:00
include "build/src/overlays/actors/ovl_Oceff_Spot/ovl_Oceff_Spot_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Oceff_Storm"
include "build/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.o"
Split ovl_file_choose and ovl_kaleido_scope (#167) * Split ovl_file_choose and ovl_kaleido_scope * Split ovl_kaleido_scope's rodata/data/bss * fix * fix spec * spec fix * hopefully last spec fix * hopefully last spec fix 2 * fix * Add comments on file boundaries * fix
2020-06-07 17:52:43 +00:00
include "build/src/overlays/actors/ovl_Oceff_Storm/ovl_Oceff_Storm_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Oceff_Wipe"
include "build/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.o"
Split ovl_file_choose and ovl_kaleido_scope (#167) * Split ovl_file_choose and ovl_kaleido_scope * Split ovl_kaleido_scope's rodata/data/bss * fix * fix spec * spec fix * hopefully last spec fix * hopefully last spec fix 2 * fix * Add comments on file boundaries * fix
2020-06-07 17:52:43 +00:00
include "build/src/overlays/actors/ovl_Oceff_Wipe/ovl_Oceff_Wipe_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Oceff_Wipe2"
include "build/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.o"
Split ovl_file_choose and ovl_kaleido_scope (#167) * Split ovl_file_choose and ovl_kaleido_scope * Split ovl_kaleido_scope's rodata/data/bss * fix * fix spec * spec fix * hopefully last spec fix * hopefully last spec fix 2 * fix * Add comments on file boundaries * fix
2020-06-07 17:52:43 +00:00
include "build/src/overlays/actors/ovl_Oceff_Wipe2/ovl_Oceff_Wipe2_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Oceff_Wipe3"
include "build/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.o"
Split ovl_file_choose and ovl_kaleido_scope (#167) * Split ovl_file_choose and ovl_kaleido_scope * Split ovl_kaleido_scope's rodata/data/bss * fix * fix spec * spec fix * hopefully last spec fix * hopefully last spec fix 2 * fix * Add comments on file boundaries * fix
2020-06-07 17:52:43 +00:00
include "build/src/overlays/actors/ovl_Oceff_Wipe3/ovl_Oceff_Wipe3_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Oceff_Wipe4"
include "build/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.o"
Split ovl_file_choose and ovl_kaleido_scope (#167) * Split ovl_file_choose and ovl_kaleido_scope * Split ovl_kaleido_scope's rodata/data/bss * fix * fix spec * spec fix * hopefully last spec fix * hopefully last spec fix 2 * fix * Add comments on file boundaries * fix
2020-06-07 17:52:43 +00:00
include "build/src/overlays/actors/ovl_Oceff_Wipe4/ovl_Oceff_Wipe4_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ovl_Shot_Sun"
include "build/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.o"
Decompiled ovl_Shot_Sun (#236) * match ShotSun_Init * match ShotSun_Destroy * match func_80BADDCC * break up unk_19C to add spawnTimer * ShotSun_Update * func_80BADE74 * work on func_80BAE05C * make func_80BAE05C closer * use proper macros for osSyncPrintf * format if statement better and add temp player pointer func_80BAE05C * Reorder spawnPos to match stack args later * match func_80BAE05C * almost match func_80BADF0C * Remove temporary and add parenthesis * change part of comment and move last unk_1A4 assignment to be similar to decompiler * Change do while(false) to if (1) * func_80BADF0C * change comment * update spec * fix vt macro * cleanup and name * remove asm * remove data * remove extern Co-authored-by: Random <28494085+Random06457@users.noreply.github.com> * remove & for function pointers * rename and retype D_02007020 * format * remove tiny whitespace * reorder if statement * finish renaming * replace cast with bitwise operation * move globally used functions to functions.h * reorder description * move headers for EnItem00 and EnAObj to z64actor.h * retype Item_DropCollectible and Item_DropCollectible2 to return EnItem00* * rename ShotSun_StartFairyCountdown to ShotSun_TriggerFairy * rename ShotSun_FairyCountdown to ShotSun_SpawnFairy * add unk_E3EC field to MessageContext * rename to ShotSun_UpdateHyliaSun for now * remove != 0 on flag check * remove unsigned suffix and use enum constant for Item_DropCollectible call * add unk_95C field to Player * add ub comment * retype unk_1A4 and remove explicit struct padding * Update src/overlays/actors/ovl_Shot_Sun/z_shot_sun.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> Co-authored-by: Random <28494085+Random06457@users.noreply.github.com> Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-07-12 23:03:38 +00:00
include "build/src/overlays/actors/ovl_Shot_Sun/ovl_Shot_Sun_reloc.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "gameplay_keep"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/objects/gameplay_keep/gameplay_keep.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 4
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "gameplay_field_keep"
romalign 0x1000
Decompile a bunch of objects (#603) * Mostly done but shifted * still messed up * Almost OK * OBJECT_JYA_OBJ OK, OBJECT_GR OK * Done * Merge master and format * Cleanup * Cleanup 2 * Start object MB dont merge yet * Object_MB OK * Object_ydan_objects OK * General 'ydan' actor cleanup * Forgot some small things * Object_EC OK * add .gitkeep and run format * Object_sd OK but no textures cause of a zap issue * PR fixes * Fix object_sd * fix ydan * delete .gitkeep files * OBJECT_BOX as far as it can go with current ZAP * Fix undefined_syms * Start child link object * Push progress, dont merge yet * Object_mori_objects OK * Fixed? * Fix conflicts again * Seems like i missed some textures * Extract data for BgBombwall * More field * ZAP YEP 2.0 * Object_Box OK * Object_SD ok. Ready to merge * remove ASM and merge master * remove ASM * remove files wrongfully added to docs/ * Almost done * Change comment in z_player_lib.c * forgot some DLists in player_lib.c * Fix conflict, run format * Same as before but this time with Tex and TLUT * Last few things * fix object_GR and add limbs to object_sd * Nane -> Name * gChildDekuShieldMtx is now a matrix and not a blob * PR fixes (Fig) * add a space for comment in z_player_lib.c * re push and new lines * PR fixes (AngheloAlf) * PR fixes (Roman) * Fix Heishi2 * PR fixes (Fig) * Replace spacing in a file * PR fixes (Roman)
2021-05-26 22:59:21 +00:00
include "build/assets/objects/gameplay_field_keep/gameplay_field_keep.o"
number 5
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "gameplay_dangeon_keep"
romalign 0x1000
gameplay_dangeon_keep (#665) * xml done * add references in * missed a few * newline * review
2021-02-12 23:33:55 +00:00
include "build/assets/objects/gameplay_dangeon_keep/gameplay_dangeon_keep.o"
number 5
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "gameplay_object_exchange_static"
romalign 0x1000
include "build/baserom/gameplay_object_exchange_static.o"
endseg
beginseg
name "object_link_boy"
romalign 0x1000
Objects4 (#1057) * remove fake match * merge master * animations * dog limbs * textures * KZ limbs and DL * a few KZ textures and make a file for link_boy * the rest of KZ * Far Limb DLs * near DLs and limbs * small fix to child * boots and some sword and more child clean ups * a bunch of DLs * fix boy * fix link child for real this time * adult should be good now * progress * all undefined symbols done * progress * done (for now) * restore makefile * child -> adult * child -> adult * dog fixes * KZ fixes * more player fixes * remove unneeded enum in dog * rename hookshot stuff * Update z_player_lib.c * revert model group stuff * move comment * fix mirror shield upper * remove useless 2 * OOT -> Oot * gauntlet plate 2 fix * fix Co-authored-by: Louis <louist103@pop-os.localdomain>
2021-12-27 13:08:26 +00:00
include "build/assets/objects/object_link_boy/object_link_boy.o"
Automatic objects 2 (#889) * adding missing objects * update rgba16 format * comment blobs * Fix blobs * add another missing one * add newlines to XMLs * remove objects from other PRs * add TlutOffset Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
2021-08-06 19:18:29 +00:00
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_link_child"
romalign 0x1000
Decompile a bunch of objects (#603) * Mostly done but shifted * still messed up * Almost OK * OBJECT_JYA_OBJ OK, OBJECT_GR OK * Done * Merge master and format * Cleanup * Cleanup 2 * Start object MB dont merge yet * Object_MB OK * Object_ydan_objects OK * General 'ydan' actor cleanup * Forgot some small things * Object_EC OK * add .gitkeep and run format * Object_sd OK but no textures cause of a zap issue * PR fixes * Fix object_sd * fix ydan * delete .gitkeep files * OBJECT_BOX as far as it can go with current ZAP * Fix undefined_syms * Start child link object * Push progress, dont merge yet * Object_mori_objects OK * Fixed? * Fix conflicts again * Seems like i missed some textures * Extract data for BgBombwall * More field * ZAP YEP 2.0 * Object_Box OK * Object_SD ok. Ready to merge * remove ASM and merge master * remove ASM * remove files wrongfully added to docs/ * Almost done * Change comment in z_player_lib.c * forgot some DLists in player_lib.c * Fix conflict, run format * Same as before but this time with Tex and TLUT * Last few things * fix object_GR and add limbs to object_sd * Nane -> Name * gChildDekuShieldMtx is now a matrix and not a blob * PR fixes (Fig) * add a space for comment in z_player_lib.c * re push and new lines * PR fixes (AngheloAlf) * PR fixes (Roman) * Fix Heishi2 * PR fixes (Fig) * Replace spacing in a file * PR fixes (Roman)
2021-05-26 22:59:21 +00:00
include "build/assets/objects/object_link_child/object_link_child.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_box"
romalign 0x1000
Decompile a bunch of objects (#603) * Mostly done but shifted * still messed up * Almost OK * OBJECT_JYA_OBJ OK, OBJECT_GR OK * Done * Merge master and format * Cleanup * Cleanup 2 * Start object MB dont merge yet * Object_MB OK * Object_ydan_objects OK * General 'ydan' actor cleanup * Forgot some small things * Object_EC OK * add .gitkeep and run format * Object_sd OK but no textures cause of a zap issue * PR fixes * Fix object_sd * fix ydan * delete .gitkeep files * OBJECT_BOX as far as it can go with current ZAP * Fix undefined_syms * Start child link object * Push progress, dont merge yet * Object_mori_objects OK * Fixed? * Fix conflicts again * Seems like i missed some textures * Extract data for BgBombwall * More field * ZAP YEP 2.0 * Object_Box OK * Object_SD ok. Ready to merge * remove ASM and merge master * remove ASM * remove files wrongfully added to docs/ * Almost done * Change comment in z_player_lib.c * forgot some DLists in player_lib.c * Fix conflict, run format * Same as before but this time with Tex and TLUT * Last few things * fix object_GR and add limbs to object_sd * Nane -> Name * gChildDekuShieldMtx is now a matrix and not a blob * PR fixes (Fig) * add a space for comment in z_player_lib.c * re push and new lines * PR fixes (AngheloAlf) * PR fixes (Roman) * Fix Heishi2 * PR fixes (Fig) * Replace spacing in a file * PR fixes (Roman)
2021-05-26 22:59:21 +00:00
include "build/assets/objects/object_box/object_box.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_human"
romalign 0x1000
ZAPD update: Gotta go fast! (#877) * copy over the xml * Rename anims * A bunch of renames * minor extract_assets fixes * git subrepo pull --force tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "820678b4e" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "820678b4e" git-subrepo: version: "0.4.3" origin: "???" commit: "???" * Change rgb5a1 to rgba16 * eye and eyebrows * some dlists * git subrepo pull --force tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "6be9af65d" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "6be9af65d" git-subrepo: version: "0.4.3" origin: "???" commit: "???"
2021-07-28 02:16:03 +00:00
include "build/assets/objects/object_human/object_human.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_okuta"
romalign 0x1000
Various objects (#677) * object_okuta * object_crow * object_wallmaster * named wallmaster textures * object_dodongo * object_firefly * object_fire
2021-03-17 21:06:56 +00:00
include "build/assets/objects/object_okuta/object_okuta.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_poh"
romalign 0x1000
Poe Objects (#743) * poe objects * Last unaccounted resolved, name suffix fixes * remove _tex * missed 2 * format Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-04-04 21:48:12 +00:00
include "build/assets/objects/object_poh/object_poh.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_wallmaster"
romalign 0x1000
Various objects (#677) * object_okuta * object_crow * object_wallmaster * named wallmaster textures * object_dodongo * object_firefly * object_fire
2021-03-17 21:06:56 +00:00
include "build/assets/objects/object_wallmaster/object_wallmaster.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_dy_obj"
romalign 0x1000
Decompiled A LOT of objects (#815) * . * remove tools/ZAP2 from origin master * object_spot04_objects * remove accidentally added xml * object_spot00_objects * object_bombf ok * object_dy_obj * object_masterzoora * object_mastergolon and object_masterkokirihead * object_aob * object_gt * object_gt * object_geff * object_mag kinda * object_gjyo_objects OK * object_ani OK * object_door_gerudo * object_md and object_trap * object_js OK * object_goroiwa * object_gs * object_nwc * object_niw * object_ane * object_os_anime OK * object_d_hsblock OK * object_fz OK * object_ru2 OK * fixed object_mag * object_cow OK * object_spot01_objects OK * object_spot15_obj * object_umajump OK * object_spot18_obj * object_spot12_obj * fix symbols in z_item_b_heart * object_bdan_objects & object_bowl * object_ddan_objects * object_owl OK * object_spot01_matoyab.xml OK * object_haka OK * object_heavy_object * object_ingate and objet_menkuri_objects * objet_spot00_break & object_relay_objects OK * object_spot01_matoya OK * object_spot06_objects OK * undefined_syms * object_spot08_obj OK * object_efc_doughnut & object_zg * object_ik OK * object_vm * object_ei OK * object_ds OK * updated spec * map_48x85_static OK * object_zl1 & object_peehat ok * some z_parameter naming and other undefined symbol stuff, object_yukabyun OK * object_bubble & object_fw ok * object_shopnuts * restore delete file * object_timeblock OK * object_d_lift OK * object_kibako2 OK * object_mamenoki OK * matches * remove unused asm * object_mag ok now * fixed object_ani * done for now, im tired * object_bdan_objects fixed up * fix bdan * object_bombf fixed * object_bowl fixed up * object_cow fixed * did more, im tired * fixed some stuff in object_ddan_objects * fix object_ddan_object * object_door_gerudo fixed * object_ds fix * object_dy progress * fixed great fairy * some more * more * object_haka fix * progress * ingo_gate fixed * object_js * forgot collision * object_relay_objects fixed * object_kibako2 * object_mag fixed * u64* to void* * more u64* to void* * object_mamenoki fix * object_mastergolon & object_masterkokirihead fix * mido is weird * fixed build * fix object_menkuri_objects * add missing textures in object_menkuri_objects * object_ms * fixed object_peehat * some cleanup stuff * object_zg fix * object_spot00_break fix * object_niw fix * object_nwc fixed * object_ru2 object_rr and some of object_owl fix * object_spot15_obj fix * business scrub * object_spot01_matoya fixed * object_spot18_obj fix * object_spot01_objects fix * object_spot04_objects fix * object_spot04_objects actually fixed * object_spot12_obj fix * object_timeblock fix * object_spot06_objects fixed * object_spot08_obj fix * spot01_matoyab fix * object_trap fix * object_umajump fix * object_vm fix * z_en_niw_lady fix * object_yukabyun fix * object_zl1 fixed * added offsets to object_os_anime * object_md fix * object_ane fix * object_aob fix * add palette comment * object_spot00_objects fix * spot00 fix * remove unused asm * updates * Add TlutOffset to objects added in https://github.com/zeldaret/oot/pull/815 * Updated object_bdan_objects, ran format.sh * Change rgb5a1 to rgba16 in my object xmls * Addressed Anghelo's comments * review Co-authored-by: Lucas Shaw <lucas.shaw1123@gmail.com> Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-08-05 15:53:58 +00:00
include "build/assets/objects/object_dy_obj/object_dy_obj.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_firefly"
romalign 0x1000
Various objects (#677) * object_okuta * object_crow * object_wallmaster * named wallmaster textures * object_dodongo * object_firefly * object_fire
2021-03-17 21:06:56 +00:00
include "build/assets/objects/object_firefly/object_firefly.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_dodongo"
romalign 0x1000
Various objects (#677) * object_okuta * object_crow * object_wallmaster * named wallmaster textures * object_dodongo * object_firefly * object_fire
2021-03-17 21:06:56 +00:00
include "build/assets/objects/object_dodongo/object_dodongo.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_fire"
romalign 0x1000
Various objects (#677) * object_okuta * object_crow * object_wallmaster * named wallmaster textures * object_dodongo * object_firefly * object_fire
2021-03-17 21:06:56 +00:00
include "build/assets/objects/object_fire/object_fire.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_niw"
romalign 0x1000
Decompiled A LOT of objects (#815) * . * remove tools/ZAP2 from origin master * object_spot04_objects * remove accidentally added xml * object_spot00_objects * object_bombf ok * object_dy_obj * object_masterzoora * object_mastergolon and object_masterkokirihead * object_aob * object_gt * object_gt * object_geff * object_mag kinda * object_gjyo_objects OK * object_ani OK * object_door_gerudo * object_md and object_trap * object_js OK * object_goroiwa * object_gs * object_nwc * object_niw * object_ane * object_os_anime OK * object_d_hsblock OK * object_fz OK * object_ru2 OK * fixed object_mag * object_cow OK * object_spot01_objects OK * object_spot15_obj * object_umajump OK * object_spot18_obj * object_spot12_obj * fix symbols in z_item_b_heart * object_bdan_objects & object_bowl * object_ddan_objects * object_owl OK * object_spot01_matoyab.xml OK * object_haka OK * object_heavy_object * object_ingate and objet_menkuri_objects * objet_spot00_break & object_relay_objects OK * object_spot01_matoya OK * object_spot06_objects OK * undefined_syms * object_spot08_obj OK * object_efc_doughnut & object_zg * object_ik OK * object_vm * object_ei OK * object_ds OK * updated spec * map_48x85_static OK * object_zl1 & object_peehat ok * some z_parameter naming and other undefined symbol stuff, object_yukabyun OK * object_bubble & object_fw ok * object_shopnuts * restore delete file * object_timeblock OK * object_d_lift OK * object_kibako2 OK * object_mamenoki OK * matches * remove unused asm * object_mag ok now * fixed object_ani * done for now, im tired * object_bdan_objects fixed up * fix bdan * object_bombf fixed * object_bowl fixed up * object_cow fixed * did more, im tired * fixed some stuff in object_ddan_objects * fix object_ddan_object * object_door_gerudo fixed * object_ds fix * object_dy progress * fixed great fairy * some more * more * object_haka fix * progress * ingo_gate fixed * object_js * forgot collision * object_relay_objects fixed * object_kibako2 * object_mag fixed * u64* to void* * more u64* to void* * object_mamenoki fix * object_mastergolon & object_masterkokirihead fix * mido is weird * fixed build * fix object_menkuri_objects * add missing textures in object_menkuri_objects * object_ms * fixed object_peehat * some cleanup stuff * object_zg fix * object_spot00_break fix * object_niw fix * object_nwc fixed * object_ru2 object_rr and some of object_owl fix * object_spot15_obj fix * business scrub * object_spot01_matoya fixed * object_spot18_obj fix * object_spot01_objects fix * object_spot04_objects fix * object_spot04_objects actually fixed * object_spot12_obj fix * object_timeblock fix * object_spot06_objects fixed * object_spot08_obj fix * spot01_matoyab fix * object_trap fix * object_umajump fix * object_vm fix * z_en_niw_lady fix * object_yukabyun fix * object_zl1 fixed * added offsets to object_os_anime * object_md fix * object_ane fix * object_aob fix * add palette comment * object_spot00_objects fix * spot00 fix * remove unused asm * updates * Add TlutOffset to objects added in https://github.com/zeldaret/oot/pull/815 * Updated object_bdan_objects, ran format.sh * Change rgb5a1 to rgba16 in my object xmls * Addressed Anghelo's comments * review Co-authored-by: Lucas Shaw <lucas.shaw1123@gmail.com> Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-08-05 15:53:58 +00:00
include "build/assets/objects/object_niw/object_niw.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_tite"
romalign 0x1000
Add every unreserved object in an automated way (#805) * it's crashing * fix stuff * fix xmls * problematic objects * fix tabs * Fix suffixes * add missing new lines * Add comments to the problematic objects * Find and replace fixes * Add Fig's objects * I forgot to add a Name in a cutscene, so I'm adding it here * Update object decomp tutorial a little bit * Update problematic objects * Update docs/tutorial/object_decomp.md Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Change comments * comment out a few blobs * dammit tluts * Change a bunch of objects * update the last bunch * update comments on oA11 and oB2 * Ninja-edit to fix compatibility with ZAPD's PR 142 Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-05-16 16:36:40 +00:00
include "build/assets/objects/object_tite/object_tite.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_reeba"
romalign 0x1000
Add every unreserved object in an automated way (#805) * it's crashing * fix stuff * fix xmls * problematic objects * fix tabs * Fix suffixes * add missing new lines * Add comments to the problematic objects * Find and replace fixes * Add Fig's objects * I forgot to add a Name in a cutscene, so I'm adding it here * Update object decomp tutorial a little bit * Update problematic objects * Update docs/tutorial/object_decomp.md Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Change comments * comment out a few blobs * dammit tluts * Change a bunch of objects * update the last bunch * update comments on oA11 and oB2 * Ninja-edit to fix compatibility with ZAPD's PR 142 Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-05-16 16:36:40 +00:00
include "build/assets/objects/object_reeba/object_reeba.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_peehat"
romalign 0x1000
Decompiled A LOT of objects (#815) * . * remove tools/ZAP2 from origin master * object_spot04_objects * remove accidentally added xml * object_spot00_objects * object_bombf ok * object_dy_obj * object_masterzoora * object_mastergolon and object_masterkokirihead * object_aob * object_gt * object_gt * object_geff * object_mag kinda * object_gjyo_objects OK * object_ani OK * object_door_gerudo * object_md and object_trap * object_js OK * object_goroiwa * object_gs * object_nwc * object_niw * object_ane * object_os_anime OK * object_d_hsblock OK * object_fz OK * object_ru2 OK * fixed object_mag * object_cow OK * object_spot01_objects OK * object_spot15_obj * object_umajump OK * object_spot18_obj * object_spot12_obj * fix symbols in z_item_b_heart * object_bdan_objects & object_bowl * object_ddan_objects * object_owl OK * object_spot01_matoyab.xml OK * object_haka OK * object_heavy_object * object_ingate and objet_menkuri_objects * objet_spot00_break & object_relay_objects OK * object_spot01_matoya OK * object_spot06_objects OK * undefined_syms * object_spot08_obj OK * object_efc_doughnut & object_zg * object_ik OK * object_vm * object_ei OK * object_ds OK * updated spec * map_48x85_static OK * object_zl1 & object_peehat ok * some z_parameter naming and other undefined symbol stuff, object_yukabyun OK * object_bubble & object_fw ok * object_shopnuts * restore delete file * object_timeblock OK * object_d_lift OK * object_kibako2 OK * object_mamenoki OK * matches * remove unused asm * object_mag ok now * fixed object_ani * done for now, im tired * object_bdan_objects fixed up * fix bdan * object_bombf fixed * object_bowl fixed up * object_cow fixed * did more, im tired * fixed some stuff in object_ddan_objects * fix object_ddan_object * object_door_gerudo fixed * object_ds fix * object_dy progress * fixed great fairy * some more * more * object_haka fix * progress * ingo_gate fixed * object_js * forgot collision * object_relay_objects fixed * object_kibako2 * object_mag fixed * u64* to void* * more u64* to void* * object_mamenoki fix * object_mastergolon & object_masterkokirihead fix * mido is weird * fixed build * fix object_menkuri_objects * add missing textures in object_menkuri_objects * object_ms * fixed object_peehat * some cleanup stuff * object_zg fix * object_spot00_break fix * object_niw fix * object_nwc fixed * object_ru2 object_rr and some of object_owl fix * object_spot15_obj fix * business scrub * object_spot01_matoya fixed * object_spot18_obj fix * object_spot01_objects fix * object_spot04_objects fix * object_spot04_objects actually fixed * object_spot12_obj fix * object_timeblock fix * object_spot06_objects fixed * object_spot08_obj fix * spot01_matoyab fix * object_trap fix * object_umajump fix * object_vm fix * z_en_niw_lady fix * object_yukabyun fix * object_zl1 fixed * added offsets to object_os_anime * object_md fix * object_ane fix * object_aob fix * add palette comment * object_spot00_objects fix * spot00 fix * remove unused asm * updates * Add TlutOffset to objects added in https://github.com/zeldaret/oot/pull/815 * Updated object_bdan_objects, ran format.sh * Change rgb5a1 to rgba16 in my object xmls * Addressed Anghelo's comments * review Co-authored-by: Lucas Shaw <lucas.shaw1123@gmail.com> Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-08-05 15:53:58 +00:00
include "build/assets/objects/object_peehat/object_peehat.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_kingdodongo"
romalign 0x1000
Add every unreserved object in an automated way (#805) * it's crashing * fix stuff * fix xmls * problematic objects * fix tabs * Fix suffixes * add missing new lines * Add comments to the problematic objects * Find and replace fixes * Add Fig's objects * I forgot to add a Name in a cutscene, so I'm adding it here * Update object decomp tutorial a little bit * Update problematic objects * Update docs/tutorial/object_decomp.md Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Change comments * comment out a few blobs * dammit tluts * Change a bunch of objects * update the last bunch * update comments on oA11 and oB2 * Ninja-edit to fix compatibility with ZAPD's PR 142 Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-05-16 16:36:40 +00:00
include "build/assets/objects/object_kingdodongo/object_kingdodongo.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_horse"
romalign 0x1000
object_horse and object_hni (#772) * object_horse_zelda Signed-off-by: angie <angheloalf95@gmail.com> * object_horse_normal Signed-off-by: angie <angheloalf95@gmail.com> * object_horse_link_child Signed-off-by: angie <angheloalf95@gmail.com> * object_horse_ganon Signed-off-by: angie <angheloalf95@gmail.com> * object_horse Signed-off-by: angie <angheloalf95@gmail.com> * object_hni Signed-off-by: Angie <angheloalf95@gmail.com> * ZAPD is falling to do vtx Signed-off-by: Angie <angheloalf95@gmail.com> * Testing Signed-off-by: Angie <angheloalf95@gmail.com> * Rename horse_link_child variables Signed-off-by: angie <angheloalf95@gmail.com> * horse_zelda with names Signed-off-by: angie <angheloalf95@gmail.com> * I'm suspecting that this game doesn't use z_en_horse_ganon Signed-off-by: angie <angheloalf95@gmail.com> * Child epona eye textures Signed-off-by: Angie <angheloalf95@gmail.com> * Extract eyes textures from Epona Signed-off-by: Angie <angheloalf95@gmail.com> * Small rename Signed-off-by: Angie <angheloalf95@gmail.com> * change references in EnHorseNormal Signed-off-by: angie <angheloalf95@gmail.com> * Rename a few HorseNormal animations Signed-off-by: angie <angheloalf95@gmail.com> * Add normal horse eye texture Signed-off-by: angie <angheloalf95@gmail.com> * Add some textures Signed-off-by: angie <angheloalf95@gmail.com> * change pointers in EnViewer Signed-off-by: angie <angheloalf95@gmail.com> * Rename some animations of HorseGanon Signed-off-by: angie <angheloalf95@gmail.com> * Add a few dlists in object_horse Signed-off-by: Angie <angheloalf95@gmail.com> * Add whinnies Signed-off-by: Angie <angheloalf95@gmail.com> * Rename last animations remaining in horse_normal and horse_ganon Signed-off-by: angie <angheloalf95@gmail.com> * remove the other horses from this branch Signed-off-by: angie <angheloalf95@gmail.com> * Rename Epona animations Signed-off-by: angie <angheloalf95@gmail.com> * rename animations of ingo's horse Signed-off-by: angie <angheloalf95@gmail.com> * add textures in hni Signed-off-by: angie <angheloalf95@gmail.com> * Give proper animation names Signed-off-by: angie <angheloalf95@gmail.com> * Update symbols Signed-off-by: angie <angheloalf95@gmail.com> * cutscenes Signed-off-by: angie <angheloalf95@gmail.com> * ./format.sh Signed-off-by: angie <angheloalf95@gmail.com> * Apply suggestions from code review Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Add most of epona's textures and some limbs Signed-off-by: angie <angheloalf95@gmail.com> * add a bunch of textures and limbs of hni Signed-off-by: Angie <angheloalf95@gmail.com> * typo Signed-off-by: Angie <angheloalf95@gmail.com> * trailling comma memes Signed-off-by: Angie <angheloalf95@gmail.com> * all textures from hni Signed-off-by: angie <angheloalf95@gmail.com> * The remaining epona's textures Signed-off-by: Angie <angheloalf95@gmail.com> * Use proper names for bridge cutscene Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-04-14 21:12:00 +00:00
include "build/assets/objects/object_horse/object_horse.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_zf"
romalign 0x1000
Add every unreserved object in an automated way (#805) * it's crashing * fix stuff * fix xmls * problematic objects * fix tabs * Fix suffixes * add missing new lines * Add comments to the problematic objects * Find and replace fixes * Add Fig's objects * I forgot to add a Name in a cutscene, so I'm adding it here * Update object decomp tutorial a little bit * Update problematic objects * Update docs/tutorial/object_decomp.md Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Change comments * comment out a few blobs * dammit tluts * Change a bunch of objects * update the last bunch * update comments on oA11 and oB2 * Ninja-edit to fix compatibility with ZAPD's PR 142 Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-05-16 16:36:40 +00:00
include "build/assets/objects/object_zf/object_zf.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_goma"
romalign 0x1000
object_goma (#754) * testing * all named * oh god spelling * fixes Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
2021-04-04 21:54:56 +00:00
include "build/assets/objects/object_goma/object_goma.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_zl1"
romalign 0x1000
Decompiled A LOT of objects (#815) * . * remove tools/ZAP2 from origin master * object_spot04_objects * remove accidentally added xml * object_spot00_objects * object_bombf ok * object_dy_obj * object_masterzoora * object_mastergolon and object_masterkokirihead * object_aob * object_gt * object_gt * object_geff * object_mag kinda * object_gjyo_objects OK * object_ani OK * object_door_gerudo * object_md and object_trap * object_js OK * object_goroiwa * object_gs * object_nwc * object_niw * object_ane * object_os_anime OK * object_d_hsblock OK * object_fz OK * object_ru2 OK * fixed object_mag * object_cow OK * object_spot01_objects OK * object_spot15_obj * object_umajump OK * object_spot18_obj * object_spot12_obj * fix symbols in z_item_b_heart * object_bdan_objects & object_bowl * object_ddan_objects * object_owl OK * object_spot01_matoyab.xml OK * object_haka OK * object_heavy_object * object_ingate and objet_menkuri_objects * objet_spot00_break & object_relay_objects OK * object_spot01_matoya OK * object_spot06_objects OK * undefined_syms * object_spot08_obj OK * object_efc_doughnut & object_zg * object_ik OK * object_vm * object_ei OK * object_ds OK * updated spec * map_48x85_static OK * object_zl1 & object_peehat ok * some z_parameter naming and other undefined symbol stuff, object_yukabyun OK * object_bubble & object_fw ok * object_shopnuts * restore delete file * object_timeblock OK * object_d_lift OK * object_kibako2 OK * object_mamenoki OK * matches * remove unused asm * object_mag ok now * fixed object_ani * done for now, im tired * object_bdan_objects fixed up * fix bdan * object_bombf fixed * object_bowl fixed up * object_cow fixed * did more, im tired * fixed some stuff in object_ddan_objects * fix object_ddan_object * object_door_gerudo fixed * object_ds fix * object_dy progress * fixed great fairy * some more * more * object_haka fix * progress * ingo_gate fixed * object_js * forgot collision * object_relay_objects fixed * object_kibako2 * object_mag fixed * u64* to void* * more u64* to void* * object_mamenoki fix * object_mastergolon & object_masterkokirihead fix * mido is weird * fixed build * fix object_menkuri_objects * add missing textures in object_menkuri_objects * object_ms * fixed object_peehat * some cleanup stuff * object_zg fix * object_spot00_break fix * object_niw fix * object_nwc fixed * object_ru2 object_rr and some of object_owl fix * object_spot15_obj fix * business scrub * object_spot01_matoya fixed * object_spot18_obj fix * object_spot01_objects fix * object_spot04_objects fix * object_spot04_objects actually fixed * object_spot12_obj fix * object_timeblock fix * object_spot06_objects fixed * object_spot08_obj fix * spot01_matoyab fix * object_trap fix * object_umajump fix * object_vm fix * z_en_niw_lady fix * object_yukabyun fix * object_zl1 fixed * added offsets to object_os_anime * object_md fix * object_ane fix * object_aob fix * add palette comment * object_spot00_objects fix * spot00 fix * remove unused asm * updates * Add TlutOffset to objects added in https://github.com/zeldaret/oot/pull/815 * Updated object_bdan_objects, ran format.sh * Change rgb5a1 to rgba16 in my object xmls * Addressed Anghelo's comments * review Co-authored-by: Lucas Shaw <lucas.shaw1123@gmail.com> Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-08-05 15:53:58 +00:00
include "build/assets/objects/object_zl1/object_zl1.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_gol"
romalign 0x1000
Add every unreserved object in an automated way (#805) * it's crashing * fix stuff * fix xmls * problematic objects * fix tabs * Fix suffixes * add missing new lines * Add comments to the problematic objects * Find and replace fixes * Add Fig's objects * I forgot to add a Name in a cutscene, so I'm adding it here * Update object decomp tutorial a little bit * Update problematic objects * Update docs/tutorial/object_decomp.md Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Change comments * comment out a few blobs * dammit tluts * Change a bunch of objects * update the last bunch * update comments on oA11 and oB2 * Ninja-edit to fix compatibility with ZAPD's PR 142 Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-05-16 16:36:40 +00:00
include "build/assets/objects/object_gol/object_gol.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_bubble"
romalign 0x1000
Decompiled A LOT of objects (#815) * . * remove tools/ZAP2 from origin master * object_spot04_objects * remove accidentally added xml * object_spot00_objects * object_bombf ok * object_dy_obj * object_masterzoora * object_mastergolon and object_masterkokirihead * object_aob * object_gt * object_gt * object_geff * object_mag kinda * object_gjyo_objects OK * object_ani OK * object_door_gerudo * object_md and object_trap * object_js OK * object_goroiwa * object_gs * object_nwc * object_niw * object_ane * object_os_anime OK * object_d_hsblock OK * object_fz OK * object_ru2 OK * fixed object_mag * object_cow OK * object_spot01_objects OK * object_spot15_obj * object_umajump OK * object_spot18_obj * object_spot12_obj * fix symbols in z_item_b_heart * object_bdan_objects & object_bowl * object_ddan_objects * object_owl OK * object_spot01_matoyab.xml OK * object_haka OK * object_heavy_object * object_ingate and objet_menkuri_objects * objet_spot00_break & object_relay_objects OK * object_spot01_matoya OK * object_spot06_objects OK * undefined_syms * object_spot08_obj OK * object_efc_doughnut & object_zg * object_ik OK * object_vm * object_ei OK * object_ds OK * updated spec * map_48x85_static OK * object_zl1 & object_peehat ok * some z_parameter naming and other undefined symbol stuff, object_yukabyun OK * object_bubble & object_fw ok * object_shopnuts * restore delete file * object_timeblock OK * object_d_lift OK * object_kibako2 OK * object_mamenoki OK * matches * remove unused asm * object_mag ok now * fixed object_ani * done for now, im tired * object_bdan_objects fixed up * fix bdan * object_bombf fixed * object_bowl fixed up * object_cow fixed * did more, im tired * fixed some stuff in object_ddan_objects * fix object_ddan_object * object_door_gerudo fixed * object_ds fix * object_dy progress * fixed great fairy * some more * more * object_haka fix * progress * ingo_gate fixed * object_js * forgot collision * object_relay_objects fixed * object_kibako2 * object_mag fixed * u64* to void* * more u64* to void* * object_mamenoki fix * object_mastergolon & object_masterkokirihead fix * mido is weird * fixed build * fix object_menkuri_objects * add missing textures in object_menkuri_objects * object_ms * fixed object_peehat * some cleanup stuff * object_zg fix * object_spot00_break fix * object_niw fix * object_nwc fixed * object_ru2 object_rr and some of object_owl fix * object_spot15_obj fix * business scrub * object_spot01_matoya fixed * object_spot18_obj fix * object_spot01_objects fix * object_spot04_objects fix * object_spot04_objects actually fixed * object_spot12_obj fix * object_timeblock fix * object_spot06_objects fixed * object_spot08_obj fix * spot01_matoyab fix * object_trap fix * object_umajump fix * object_vm fix * z_en_niw_lady fix * object_yukabyun fix * object_zl1 fixed * added offsets to object_os_anime * object_md fix * object_ane fix * object_aob fix * add palette comment * object_spot00_objects fix * spot00 fix * remove unused asm * updates * Add TlutOffset to objects added in https://github.com/zeldaret/oot/pull/815 * Updated object_bdan_objects, ran format.sh * Change rgb5a1 to rgba16 in my object xmls * Addressed Anghelo's comments * review Co-authored-by: Lucas Shaw <lucas.shaw1123@gmail.com> Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-08-05 15:53:58 +00:00
include "build/assets/objects/object_bubble/object_bubble.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_dodojr"
romalign 0x1000
Add every unreserved object in an automated way (#805) * it's crashing * fix stuff * fix xmls * problematic objects * fix tabs * Fix suffixes * add missing new lines * Add comments to the problematic objects * Find and replace fixes * Add Fig's objects * I forgot to add a Name in a cutscene, so I'm adding it here * Update object decomp tutorial a little bit * Update problematic objects * Update docs/tutorial/object_decomp.md Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Change comments * comment out a few blobs * dammit tluts * Change a bunch of objects * update the last bunch * update comments on oA11 and oB2 * Ninja-edit to fix compatibility with ZAPD's PR 142 Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-05-16 16:36:40 +00:00
include "build/assets/objects/object_dodojr/object_dodojr.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_torch2"
romalign 0x1000
object_torch2, object_blkobj, and object_geldb (#592) * objects are fun * more objects * again * fixes to geldb * one more thing * forgot s * type fix * some formatting * change Gerudo name * git subrepo pull --force tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "0305ec2c2" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "0305ec2c2" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * organize xmls * outname Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain> Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-01-30 19:16:18 +00:00
include "build/assets/objects/object_torch2/object_torch2.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_bl"
romalign 0x1000
Add every unreserved object in an automated way (#805) * it's crashing * fix stuff * fix xmls * problematic objects * fix tabs * Fix suffixes * add missing new lines * Add comments to the problematic objects * Find and replace fixes * Add Fig's objects * I forgot to add a Name in a cutscene, so I'm adding it here * Update object decomp tutorial a little bit * Update problematic objects * Update docs/tutorial/object_decomp.md Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Change comments * comment out a few blobs * dammit tluts * Change a bunch of objects * update the last bunch * update comments on oA11 and oB2 * Ninja-edit to fix compatibility with ZAPD's PR 142 Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-05-16 16:36:40 +00:00
include "build/assets/objects/object_bl/object_bl.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_tp"
romalign 0x1000
EnTp, 1 nonmatching, and object_tp (#782) * Data imported, 8 easy functions matched * Init only remaining nonmatching, data in * some renaming & fiddling with Init, still nonmatching * fix colours * Init still not matching * Decompile object_tp * renames * Rename func_80B20DE0 * Horrible new idea * Known equivalent, docs next * Another attempt * Finished naming in object_tp * Named functions, more enums * DrawBridge -> Drawbridge * skulltulla -> Skulltula * Name almost all struct variables * Named most of the temps * delete asm * spec * Missed data file, whoops * Review * More review changes
2021-04-21 18:26:24 +00:00
include "build/assets/objects/object_tp/object_tp.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_oA1"
romalign 0x1000
Add every unreserved object in an automated way (#805) * it's crashing * fix stuff * fix xmls * problematic objects * fix tabs * Fix suffixes * add missing new lines * Add comments to the problematic objects * Find and replace fixes * Add Fig's objects * I forgot to add a Name in a cutscene, so I'm adding it here * Update object decomp tutorial a little bit * Update problematic objects * Update docs/tutorial/object_decomp.md Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Change comments * comment out a few blobs * dammit tluts * Change a bunch of objects * update the last bunch * update comments on oA11 and oB2 * Ninja-edit to fix compatibility with ZAPD's PR 142 Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-05-16 16:36:40 +00:00
include "build/assets/objects/object_oA1/object_oA1.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_st"
romalign 0x1000
Add every unreserved object in an automated way (#805) * it's crashing * fix stuff * fix xmls * problematic objects * fix tabs * Fix suffixes * add missing new lines * Add comments to the problematic objects * Find and replace fixes * Add Fig's objects * I forgot to add a Name in a cutscene, so I'm adding it here * Update object decomp tutorial a little bit * Update problematic objects * Update docs/tutorial/object_decomp.md Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Change comments * comment out a few blobs * dammit tluts * Change a bunch of objects * update the last bunch * update comments on oA11 and oB2 * Ninja-edit to fix compatibility with ZAPD's PR 142 Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-05-16 16:36:40 +00:00
include "build/assets/objects/object_st/object_st.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_bw"
romalign 0x1000
Add every unreserved object in an automated way (#805) * it's crashing * fix stuff * fix xmls * problematic objects * fix tabs * Fix suffixes * add missing new lines * Add comments to the problematic objects * Find and replace fixes * Add Fig's objects * I forgot to add a Name in a cutscene, so I'm adding it here * Update object decomp tutorial a little bit * Update problematic objects * Update docs/tutorial/object_decomp.md Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Change comments * comment out a few blobs * dammit tluts * Change a bunch of objects * update the last bunch * update comments on oA11 and oB2 * Ninja-edit to fix compatibility with ZAPD's PR 142 Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-05-16 16:36:40 +00:00
include "build/assets/objects/object_bw/object_bw.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_ei"
romalign 0x1000
Decompiled A LOT of objects (#815) * . * remove tools/ZAP2 from origin master * object_spot04_objects * remove accidentally added xml * object_spot00_objects * object_bombf ok * object_dy_obj * object_masterzoora * object_mastergolon and object_masterkokirihead * object_aob * object_gt * object_gt * object_geff * object_mag kinda * object_gjyo_objects OK * object_ani OK * object_door_gerudo * object_md and object_trap * object_js OK * object_goroiwa * object_gs * object_nwc * object_niw * object_ane * object_os_anime OK * object_d_hsblock OK * object_fz OK * object_ru2 OK * fixed object_mag * object_cow OK * object_spot01_objects OK * object_spot15_obj * object_umajump OK * object_spot18_obj * object_spot12_obj * fix symbols in z_item_b_heart * object_bdan_objects & object_bowl * object_ddan_objects * object_owl OK * object_spot01_matoyab.xml OK * object_haka OK * object_heavy_object * object_ingate and objet_menkuri_objects * objet_spot00_break & object_relay_objects OK * object_spot01_matoya OK * object_spot06_objects OK * undefined_syms * object_spot08_obj OK * object_efc_doughnut & object_zg * object_ik OK * object_vm * object_ei OK * object_ds OK * updated spec * map_48x85_static OK * object_zl1 & object_peehat ok * some z_parameter naming and other undefined symbol stuff, object_yukabyun OK * object_bubble & object_fw ok * object_shopnuts * restore delete file * object_timeblock OK * object_d_lift OK * object_kibako2 OK * object_mamenoki OK * matches * remove unused asm * object_mag ok now * fixed object_ani * done for now, im tired * object_bdan_objects fixed up * fix bdan * object_bombf fixed * object_bowl fixed up * object_cow fixed * did more, im tired * fixed some stuff in object_ddan_objects * fix object_ddan_object * object_door_gerudo fixed * object_ds fix * object_dy progress * fixed great fairy * some more * more * object_haka fix * progress * ingo_gate fixed * object_js * forgot collision * object_relay_objects fixed * object_kibako2 * object_mag fixed * u64* to void* * more u64* to void* * object_mamenoki fix * object_mastergolon & object_masterkokirihead fix * mido is weird * fixed build * fix object_menkuri_objects * add missing textures in object_menkuri_objects * object_ms * fixed object_peehat * some cleanup stuff * object_zg fix * object_spot00_break fix * object_niw fix * object_nwc fixed * object_ru2 object_rr and some of object_owl fix * object_spot15_obj fix * business scrub * object_spot01_matoya fixed * object_spot18_obj fix * object_spot01_objects fix * object_spot04_objects fix * object_spot04_objects actually fixed * object_spot12_obj fix * object_timeblock fix * object_spot06_objects fixed * object_spot08_obj fix * spot01_matoyab fix * object_trap fix * object_umajump fix * object_vm fix * z_en_niw_lady fix * object_yukabyun fix * object_zl1 fixed * added offsets to object_os_anime * object_md fix * object_ane fix * object_aob fix * add palette comment * object_spot00_objects fix * spot00 fix * remove unused asm * updates * Add TlutOffset to objects added in https://github.com/zeldaret/oot/pull/815 * Updated object_bdan_objects, ran format.sh * Change rgb5a1 to rgba16 in my object xmls * Addressed Anghelo's comments * review Co-authored-by: Lucas Shaw <lucas.shaw1123@gmail.com> Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-08-05 15:53:58 +00:00
include "build/assets/objects/object_ei/object_ei.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_horse_normal"
romalign 0x1000
object_horse_ganon, object_horse_link_child, object_horse_normal and object_horse_zelda OK (#724) * object_horse_zelda Signed-off-by: angie <angheloalf95@gmail.com> * object_horse_normal Signed-off-by: angie <angheloalf95@gmail.com> * object_horse_link_child Signed-off-by: angie <angheloalf95@gmail.com> * object_horse_ganon Signed-off-by: angie <angheloalf95@gmail.com> * object_horse Signed-off-by: angie <angheloalf95@gmail.com> * object_hni Signed-off-by: Angie <angheloalf95@gmail.com> * ZAPD is falling to do vtx Signed-off-by: Angie <angheloalf95@gmail.com> * Testing Signed-off-by: Angie <angheloalf95@gmail.com> * Rename horse_link_child variables Signed-off-by: angie <angheloalf95@gmail.com> * horse_zelda with names Signed-off-by: angie <angheloalf95@gmail.com> * I'm suspecting that this game doesn't use z_en_horse_ganon Signed-off-by: angie <angheloalf95@gmail.com> * Child epona eye textures Signed-off-by: Angie <angheloalf95@gmail.com> * Extract eyes textures from Epona Signed-off-by: Angie <angheloalf95@gmail.com> * Small rename Signed-off-by: Angie <angheloalf95@gmail.com> * change references in EnHorseNormal Signed-off-by: angie <angheloalf95@gmail.com> * Rename a few HorseNormal animations Signed-off-by: angie <angheloalf95@gmail.com> * Add normal horse eye texture Signed-off-by: angie <angheloalf95@gmail.com> * Add some textures Signed-off-by: angie <angheloalf95@gmail.com> * change pointers in EnViewer Signed-off-by: angie <angheloalf95@gmail.com> * Rename some animations of HorseGanon Signed-off-by: angie <angheloalf95@gmail.com> * Add a few dlists in object_horse Signed-off-by: Angie <angheloalf95@gmail.com> * Add whinnies Signed-off-by: Angie <angheloalf95@gmail.com> * Rename last animations remaining in horse_normal and horse_ganon Signed-off-by: angie <angheloalf95@gmail.com> * Remove epona and ingo's horse Signed-off-by: angie <angheloalf95@gmail.com> * ./format.sh Signed-off-by: angie <angheloalf95@gmail.com> * Give a proper name to horses animations Signed-off-by: angie <angheloalf95@gmail.com> * add trailling comma Signed-off-by: Angie <angheloalf95@gmail.com> * remove union of skeletons Signed-off-by: angie <angheloalf95@gmail.com> * change skeletonheader* to void* Signed-off-by: angie <angheloalf95@gmail.com> * remove cast Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * remove cast 2 Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * format.sh Signed-off-by: angie <angheloalf95@gmail.com> Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2021-03-28 03:44:11 +00:00
include "build/assets/objects/object_horse_normal/object_horse_normal.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_oB1"
romalign 0x1000
Add every unreserved object in an automated way (#805) * it's crashing * fix stuff * fix xmls * problematic objects * fix tabs * Fix suffixes * add missing new lines * Add comments to the problematic objects * Find and replace fixes * Add Fig's objects * I forgot to add a Name in a cutscene, so I'm adding it here * Update object decomp tutorial a little bit * Update problematic objects * Update docs/tutorial/object_decomp.md Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Change comments * comment out a few blobs * dammit tluts * Change a bunch of objects * update the last bunch * update comments on oA11 and oB2 * Ninja-edit to fix compatibility with ZAPD's PR 142 Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-05-16 16:36:40 +00:00
include "build/assets/objects/object_oB1/object_oB1.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_o_anime"
romalign 0x1000
Add every unreserved object in an automated way (#805) * it's crashing * fix stuff * fix xmls * problematic objects * fix tabs * Fix suffixes * add missing new lines * Add comments to the problematic objects * Find and replace fixes * Add Fig's objects * I forgot to add a Name in a cutscene, so I'm adding it here * Update object decomp tutorial a little bit * Update problematic objects * Update docs/tutorial/object_decomp.md Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Change comments * comment out a few blobs * dammit tluts * Change a bunch of objects * update the last bunch * update comments on oA11 and oB2 * Ninja-edit to fix compatibility with ZAPD's PR 142 Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-05-16 16:36:40 +00:00
include "build/assets/objects/object_o_anime/object_o_anime.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_spot04_objects"
romalign 0x1000
Decompiled A LOT of objects (#815) * . * remove tools/ZAP2 from origin master * object_spot04_objects * remove accidentally added xml * object_spot00_objects * object_bombf ok * object_dy_obj * object_masterzoora * object_mastergolon and object_masterkokirihead * object_aob * object_gt * object_gt * object_geff * object_mag kinda * object_gjyo_objects OK * object_ani OK * object_door_gerudo * object_md and object_trap * object_js OK * object_goroiwa * object_gs * object_nwc * object_niw * object_ane * object_os_anime OK * object_d_hsblock OK * object_fz OK * object_ru2 OK * fixed object_mag * object_cow OK * object_spot01_objects OK * object_spot15_obj * object_umajump OK * object_spot18_obj * object_spot12_obj * fix symbols in z_item_b_heart * object_bdan_objects & object_bowl * object_ddan_objects * object_owl OK * object_spot01_matoyab.xml OK * object_haka OK * object_heavy_object * object_ingate and objet_menkuri_objects * objet_spot00_break & object_relay_objects OK * object_spot01_matoya OK * object_spot06_objects OK * undefined_syms * object_spot08_obj OK * object_efc_doughnut & object_zg * object_ik OK * object_vm * object_ei OK * object_ds OK * updated spec * map_48x85_static OK * object_zl1 & object_peehat ok * some z_parameter naming and other undefined symbol stuff, object_yukabyun OK * object_bubble & object_fw ok * object_shopnuts * restore delete file * object_timeblock OK * object_d_lift OK * object_kibako2 OK * object_mamenoki OK * matches * remove unused asm * object_mag ok now * fixed object_ani * done for now, im tired * object_bdan_objects fixed up * fix bdan * object_bombf fixed * object_bowl fixed up * object_cow fixed * did more, im tired * fixed some stuff in object_ddan_objects * fix object_ddan_object * object_door_gerudo fixed * object_ds fix * object_dy progress * fixed great fairy * some more * more * object_haka fix * progress * ingo_gate fixed * object_js * forgot collision * object_relay_objects fixed * object_kibako2 * object_mag fixed * u64* to void* * more u64* to void* * object_mamenoki fix * object_mastergolon & object_masterkokirihead fix * mido is weird * fixed build * fix object_menkuri_objects * add missing textures in object_menkuri_objects * object_ms * fixed object_peehat * some cleanup stuff * object_zg fix * object_spot00_break fix * object_niw fix * object_nwc fixed * object_ru2 object_rr and some of object_owl fix * object_spot15_obj fix * business scrub * object_spot01_matoya fixed * object_spot18_obj fix * object_spot01_objects fix * object_spot04_objects fix * object_spot04_objects actually fixed * object_spot12_obj fix * object_timeblock fix * object_spot06_objects fixed * object_spot08_obj fix * spot01_matoyab fix * object_trap fix * object_umajump fix * object_vm fix * z_en_niw_lady fix * object_yukabyun fix * object_zl1 fixed * added offsets to object_os_anime * object_md fix * object_ane fix * object_aob fix * add palette comment * object_spot00_objects fix * spot00 fix * remove unused asm * updates * Add TlutOffset to objects added in https://github.com/zeldaret/oot/pull/815 * Updated object_bdan_objects, ran format.sh * Change rgb5a1 to rgba16 in my object xmls * Addressed Anghelo's comments * review Co-authored-by: Lucas Shaw <lucas.shaw1123@gmail.com> Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-08-05 15:53:58 +00:00
include "build/assets/objects/object_spot04_objects/object_spot04_objects.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_ddan_objects"
romalign 0x1000
Decompiled A LOT of objects (#815) * . * remove tools/ZAP2 from origin master * object_spot04_objects * remove accidentally added xml * object_spot00_objects * object_bombf ok * object_dy_obj * object_masterzoora * object_mastergolon and object_masterkokirihead * object_aob * object_gt * object_gt * object_geff * object_mag kinda * object_gjyo_objects OK * object_ani OK * object_door_gerudo * object_md and object_trap * object_js OK * object_goroiwa * object_gs * object_nwc * object_niw * object_ane * object_os_anime OK * object_d_hsblock OK * object_fz OK * object_ru2 OK * fixed object_mag * object_cow OK * object_spot01_objects OK * object_spot15_obj * object_umajump OK * object_spot18_obj * object_spot12_obj * fix symbols in z_item_b_heart * object_bdan_objects & object_bowl * object_ddan_objects * object_owl OK * object_spot01_matoyab.xml OK * object_haka OK * object_heavy_object * object_ingate and objet_menkuri_objects * objet_spot00_break & object_relay_objects OK * object_spot01_matoya OK * object_spot06_objects OK * undefined_syms * object_spot08_obj OK * object_efc_doughnut & object_zg * object_ik OK * object_vm * object_ei OK * object_ds OK * updated spec * map_48x85_static OK * object_zl1 & object_peehat ok * some z_parameter naming and other undefined symbol stuff, object_yukabyun OK * object_bubble & object_fw ok * object_shopnuts * restore delete file * object_timeblock OK * object_d_lift OK * object_kibako2 OK * object_mamenoki OK * matches * remove unused asm * object_mag ok now * fixed object_ani * done for now, im tired * object_bdan_objects fixed up * fix bdan * object_bombf fixed * object_bowl fixed up * object_cow fixed * did more, im tired * fixed some stuff in object_ddan_objects * fix object_ddan_object * object_door_gerudo fixed * object_ds fix * object_dy progress * fixed great fairy * some more * more * object_haka fix * progress * ingo_gate fixed * object_js * forgot collision * object_relay_objects fixed * object_kibako2 * object_mag fixed * u64* to void* * more u64* to void* * object_mamenoki fix * object_mastergolon & object_masterkokirihead fix * mido is weird * fixed build * fix object_menkuri_objects * add missing textures in object_menkuri_objects * object_ms * fixed object_peehat * some cleanup stuff * object_zg fix * object_spot00_break fix * object_niw fix * object_nwc fixed * object_ru2 object_rr and some of object_owl fix * object_spot15_obj fix * business scrub * object_spot01_matoya fixed * object_spot18_obj fix * object_spot01_objects fix * object_spot04_objects fix * object_spot04_objects actually fixed * object_spot12_obj fix * object_timeblock fix * object_spot06_objects fixed * object_spot08_obj fix * spot01_matoyab fix * object_trap fix * object_umajump fix * object_vm fix * z_en_niw_lady fix * object_yukabyun fix * object_zl1 fixed * added offsets to object_os_anime * object_md fix * object_ane fix * object_aob fix * add palette comment * object_spot00_objects fix * spot00 fix * remove unused asm * updates * Add TlutOffset to objects added in https://github.com/zeldaret/oot/pull/815 * Updated object_bdan_objects, ran format.sh * Change rgb5a1 to rgba16 in my object xmls * Addressed Anghelo's comments * review Co-authored-by: Lucas Shaw <lucas.shaw1123@gmail.com> Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-08-05 15:53:58 +00:00
include "build/assets/objects/object_ddan_objects/object_ddan_objects.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_hidan_objects"
romalign 0x1000
object_hidan_objects OK (#695) * xml Signed-off-by: angie <angheloalf95@gmail.com> * add to spec and remove repetaed entries Signed-off-by: Angie <angheloalf95@gmail.com> * add some dlists Signed-off-by: Angie <angheloalf95@gmail.com> * add a few offsets Signed-off-by: Angie <angheloalf95@gmail.com> * fireballs textures Signed-off-by: Angie <angheloalf95@gmail.com> * add some unused dlists Signed-off-by: Angie <angheloalf95@gmail.com> * change the references in decompiled objects Signed-off-by: angie <angheloalf95@gmail.com> * change the references from non matching actors Signed-off-by: angie <angheloalf95@gmail.com> * add blob Signed-off-by: angie <angheloalf95@gmail.com> * changes requested by @Zelllll Signed-off-by: angie <angheloalf95@gmail.com> * why is this object so big? Signed-off-by: angie <angheloalf95@gmail.com> * rename a lot of stuff Signed-off-by: Angie <angheloalf95@gmail.com> * this object never ends Signed-off-by: angie <angheloalf95@gmail.com> * Some floats Signed-off-by: angie <angheloalf95@gmail.com> * stones blocks Signed-off-by: angie <angheloalf95@gmail.com> * rename fireball and stuff Signed-off-by: Angie <angheloalf95@gmail.com> * Stationary flame thrower Signed-off-by: Angie <angheloalf95@gmail.com> * SpinningFlamethrower Signed-off-by: Angie <angheloalf95@gmail.com> * Rename the lasts textures Signed-off-by: Angie <angheloalf95@gmail.com> * some random renamings Signed-off-by: Angie <angheloalf95@gmail.com> * run format Signed-off-by: Angie <angheloalf95@gmail.com> * Remove .gitkeep Signed-off-by: angie <angheloalf95@gmail.com>
2021-03-18 07:23:59 +00:00
include "build/assets/objects/object_hidan_objects/object_hidan_objects.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_horse_ganon"
romalign 0x1000
object_horse_ganon, object_horse_link_child, object_horse_normal and object_horse_zelda OK (#724) * object_horse_zelda Signed-off-by: angie <angheloalf95@gmail.com> * object_horse_normal Signed-off-by: angie <angheloalf95@gmail.com> * object_horse_link_child Signed-off-by: angie <angheloalf95@gmail.com> * object_horse_ganon Signed-off-by: angie <angheloalf95@gmail.com> * object_horse Signed-off-by: angie <angheloalf95@gmail.com> * object_hni Signed-off-by: Angie <angheloalf95@gmail.com> * ZAPD is falling to do vtx Signed-off-by: Angie <angheloalf95@gmail.com> * Testing Signed-off-by: Angie <angheloalf95@gmail.com> * Rename horse_link_child variables Signed-off-by: angie <angheloalf95@gmail.com> * horse_zelda with names Signed-off-by: angie <angheloalf95@gmail.com> * I'm suspecting that this game doesn't use z_en_horse_ganon Signed-off-by: angie <angheloalf95@gmail.com> * Child epona eye textures Signed-off-by: Angie <angheloalf95@gmail.com> * Extract eyes textures from Epona Signed-off-by: Angie <angheloalf95@gmail.com> * Small rename Signed-off-by: Angie <angheloalf95@gmail.com> * change references in EnHorseNormal Signed-off-by: angie <angheloalf95@gmail.com> * Rename a few HorseNormal animations Signed-off-by: angie <angheloalf95@gmail.com> * Add normal horse eye texture Signed-off-by: angie <angheloalf95@gmail.com> * Add some textures Signed-off-by: angie <angheloalf95@gmail.com> * change pointers in EnViewer Signed-off-by: angie <angheloalf95@gmail.com> * Rename some animations of HorseGanon Signed-off-by: angie <angheloalf95@gmail.com> * Add a few dlists in object_horse Signed-off-by: Angie <angheloalf95@gmail.com> * Add whinnies Signed-off-by: Angie <angheloalf95@gmail.com> * Rename last animations remaining in horse_normal and horse_ganon Signed-off-by: angie <angheloalf95@gmail.com> * Remove epona and ingo's horse Signed-off-by: angie <angheloalf95@gmail.com> * ./format.sh Signed-off-by: angie <angheloalf95@gmail.com> * Give a proper name to horses animations Signed-off-by: angie <angheloalf95@gmail.com> * add trailling comma Signed-off-by: Angie <angheloalf95@gmail.com> * remove union of skeletons Signed-off-by: angie <angheloalf95@gmail.com> * change skeletonheader* to void* Signed-off-by: angie <angheloalf95@gmail.com> * remove cast Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * remove cast 2 Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * format.sh Signed-off-by: angie <angheloalf95@gmail.com> Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2021-03-28 03:44:11 +00:00
include "build/assets/objects/object_horse_ganon/object_horse_ganon.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_oA2"
romalign 0x1000
Add every unreserved object in an automated way (#805) * it's crashing * fix stuff * fix xmls * problematic objects * fix tabs * Fix suffixes * add missing new lines * Add comments to the problematic objects * Find and replace fixes * Add Fig's objects * I forgot to add a Name in a cutscene, so I'm adding it here * Update object decomp tutorial a little bit * Update problematic objects * Update docs/tutorial/object_decomp.md Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Change comments * comment out a few blobs * dammit tluts * Change a bunch of objects * update the last bunch * update comments on oA11 and oB2 * Ninja-edit to fix compatibility with ZAPD's PR 142 Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-05-16 16:36:40 +00:00
include "build/assets/objects/object_oA2/object_oA2.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_spot00_objects"
romalign 0x1000
Decompiled A LOT of objects (#815) * . * remove tools/ZAP2 from origin master * object_spot04_objects * remove accidentally added xml * object_spot00_objects * object_bombf ok * object_dy_obj * object_masterzoora * object_mastergolon and object_masterkokirihead * object_aob * object_gt * object_gt * object_geff * object_mag kinda * object_gjyo_objects OK * object_ani OK * object_door_gerudo * object_md and object_trap * object_js OK * object_goroiwa * object_gs * object_nwc * object_niw * object_ane * object_os_anime OK * object_d_hsblock OK * object_fz OK * object_ru2 OK * fixed object_mag * object_cow OK * object_spot01_objects OK * object_spot15_obj * object_umajump OK * object_spot18_obj * object_spot12_obj * fix symbols in z_item_b_heart * object_bdan_objects & object_bowl * object_ddan_objects * object_owl OK * object_spot01_matoyab.xml OK * object_haka OK * object_heavy_object * object_ingate and objet_menkuri_objects * objet_spot00_break & object_relay_objects OK * object_spot01_matoya OK * object_spot06_objects OK * undefined_syms * object_spot08_obj OK * object_efc_doughnut & object_zg * object_ik OK * object_vm * object_ei OK * object_ds OK * updated spec * map_48x85_static OK * object_zl1 & object_peehat ok * some z_parameter naming and other undefined symbol stuff, object_yukabyun OK * object_bubble & object_fw ok * object_shopnuts * restore delete file * object_timeblock OK * object_d_lift OK * object_kibako2 OK * object_mamenoki OK * matches * remove unused asm * object_mag ok now * fixed object_ani * done for now, im tired * object_bdan_objects fixed up * fix bdan * object_bombf fixed * object_bowl fixed up * object_cow fixed * did more, im tired * fixed some stuff in object_ddan_objects * fix object_ddan_object * object_door_gerudo fixed * object_ds fix * object_dy progress * fixed great fairy * some more * more * object_haka fix * progress * ingo_gate fixed * object_js * forgot collision * object_relay_objects fixed * object_kibako2 * object_mag fixed * u64* to void* * more u64* to void* * object_mamenoki fix * object_mastergolon & object_masterkokirihead fix * mido is weird * fixed build * fix object_menkuri_objects * add missing textures in object_menkuri_objects * object_ms * fixed object_peehat * some cleanup stuff * object_zg fix * object_spot00_break fix * object_niw fix * object_nwc fixed * object_ru2 object_rr and some of object_owl fix * object_spot15_obj fix * business scrub * object_spot01_matoya fixed * object_spot18_obj fix * object_spot01_objects fix * object_spot04_objects fix * object_spot04_objects actually fixed * object_spot12_obj fix * object_timeblock fix * object_spot06_objects fixed * object_spot08_obj fix * spot01_matoyab fix * object_trap fix * object_umajump fix * object_vm fix * z_en_niw_lady fix * object_yukabyun fix * object_zl1 fixed * added offsets to object_os_anime * object_md fix * object_ane fix * object_aob fix * add palette comment * object_spot00_objects fix * spot00 fix * remove unused asm * updates * Add TlutOffset to objects added in https://github.com/zeldaret/oot/pull/815 * Updated object_bdan_objects, ran format.sh * Change rgb5a1 to rgba16 in my object xmls * Addressed Anghelo's comments * review Co-authored-by: Lucas Shaw <lucas.shaw1123@gmail.com> Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-08-05 15:53:58 +00:00
include "build/assets/objects/object_spot00_objects/object_spot00_objects.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_mb"
romalign 0x1000
Decompile a bunch of objects (#603) * Mostly done but shifted * still messed up * Almost OK * OBJECT_JYA_OBJ OK, OBJECT_GR OK * Done * Merge master and format * Cleanup * Cleanup 2 * Start object MB dont merge yet * Object_MB OK * Object_ydan_objects OK * General 'ydan' actor cleanup * Forgot some small things * Object_EC OK * add .gitkeep and run format * Object_sd OK but no textures cause of a zap issue * PR fixes * Fix object_sd * fix ydan * delete .gitkeep files * OBJECT_BOX as far as it can go with current ZAP * Fix undefined_syms * Start child link object * Push progress, dont merge yet * Object_mori_objects OK * Fixed? * Fix conflicts again * Seems like i missed some textures * Extract data for BgBombwall * More field * ZAP YEP 2.0 * Object_Box OK * Object_SD ok. Ready to merge * remove ASM and merge master * remove ASM * remove files wrongfully added to docs/ * Almost done * Change comment in z_player_lib.c * forgot some DLists in player_lib.c * Fix conflict, run format * Same as before but this time with Tex and TLUT * Last few things * fix object_GR and add limbs to object_sd * Nane -> Name * gChildDekuShieldMtx is now a matrix and not a blob * PR fixes (Fig) * add a space for comment in z_player_lib.c * re push and new lines * PR fixes (AngheloAlf) * PR fixes (Roman) * Fix Heishi2 * PR fixes (Fig) * Replace spacing in a file * PR fixes (Roman)
2021-05-26 22:59:21 +00:00
include "build/assets/objects/object_mb/object_mb.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_bombf"
romalign 0x1000
Decompiled A LOT of objects (#815) * . * remove tools/ZAP2 from origin master * object_spot04_objects * remove accidentally added xml * object_spot00_objects * object_bombf ok * object_dy_obj * object_masterzoora * object_mastergolon and object_masterkokirihead * object_aob * object_gt * object_gt * object_geff * object_mag kinda * object_gjyo_objects OK * object_ani OK * object_door_gerudo * object_md and object_trap * object_js OK * object_goroiwa * object_gs * object_nwc * object_niw * object_ane * object_os_anime OK * object_d_hsblock OK * object_fz OK * object_ru2 OK * fixed object_mag * object_cow OK * object_spot01_objects OK * object_spot15_obj * object_umajump OK * object_spot18_obj * object_spot12_obj * fix symbols in z_item_b_heart * object_bdan_objects & object_bowl * object_ddan_objects * object_owl OK * object_spot01_matoyab.xml OK * object_haka OK * object_heavy_object * object_ingate and objet_menkuri_objects * objet_spot00_break & object_relay_objects OK * object_spot01_matoya OK * object_spot06_objects OK * undefined_syms * object_spot08_obj OK * object_efc_doughnut & object_zg * object_ik OK * object_vm * object_ei OK * object_ds OK * updated spec * map_48x85_static OK * object_zl1 & object_peehat ok * some z_parameter naming and other undefined symbol stuff, object_yukabyun OK * object_bubble & object_fw ok * object_shopnuts * restore delete file * object_timeblock OK * object_d_lift OK * object_kibako2 OK * object_mamenoki OK * matches * remove unused asm * object_mag ok now * fixed object_ani * done for now, im tired * object_bdan_objects fixed up * fix bdan * object_bombf fixed * object_bowl fixed up * object_cow fixed * did more, im tired * fixed some stuff in object_ddan_objects * fix object_ddan_object * object_door_gerudo fixed * object_ds fix * object_dy progress * fixed great fairy * some more * more * object_haka fix * progress * ingo_gate fixed * object_js * forgot collision * object_relay_objects fixed * object_kibako2 * object_mag fixed * u64* to void* * more u64* to void* * object_mamenoki fix * object_mastergolon & object_masterkokirihead fix * mido is weird * fixed build * fix object_menkuri_objects * add missing textures in object_menkuri_objects * object_ms * fixed object_peehat * some cleanup stuff * object_zg fix * object_spot00_break fix * object_niw fix * object_nwc fixed * object_ru2 object_rr and some of object_owl fix * object_spot15_obj fix * business scrub * object_spot01_matoya fixed * object_spot18_obj fix * object_spot01_objects fix * object_spot04_objects fix * object_spot04_objects actually fixed * object_spot12_obj fix * object_timeblock fix * object_spot06_objects fixed * object_spot08_obj fix * spot01_matoyab fix * object_trap fix * object_umajump fix * object_vm fix * z_en_niw_lady fix * object_yukabyun fix * object_zl1 fixed * added offsets to object_os_anime * object_md fix * object_ane fix * object_aob fix * add palette comment * object_spot00_objects fix * spot00 fix * remove unused asm * updates * Add TlutOffset to objects added in https://github.com/zeldaret/oot/pull/815 * Updated object_bdan_objects, ran format.sh * Change rgb5a1 to rgba16 in my object xmls * Addressed Anghelo's comments * review Co-authored-by: Lucas Shaw <lucas.shaw1123@gmail.com> Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-08-05 15:53:58 +00:00
include "build/assets/objects/object_bombf/object_bombf.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_sk2"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/objects/object_sk2/object_sk2.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_oE1"
romalign 0x1000
Add every unreserved object in an automated way (#805) * it's crashing * fix stuff * fix xmls * problematic objects * fix tabs * Fix suffixes * add missing new lines * Add comments to the problematic objects * Find and replace fixes * Add Fig's objects * I forgot to add a Name in a cutscene, so I'm adding it here * Update object decomp tutorial a little bit * Update problematic objects * Update docs/tutorial/object_decomp.md Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Change comments * comment out a few blobs * dammit tluts * Change a bunch of objects * update the last bunch * update comments on oA11 and oB2 * Ninja-edit to fix compatibility with ZAPD's PR 142 Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-05-16 16:36:40 +00:00
include "build/assets/objects/object_oE1/object_oE1.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_oE_anime"
romalign 0x1000
Add every unreserved object in an automated way (#805) * it's crashing * fix stuff * fix xmls * problematic objects * fix tabs * Fix suffixes * add missing new lines * Add comments to the problematic objects * Find and replace fixes * Add Fig's objects * I forgot to add a Name in a cutscene, so I'm adding it here * Update object decomp tutorial a little bit * Update problematic objects * Update docs/tutorial/object_decomp.md Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Change comments * comment out a few blobs * dammit tluts * Change a bunch of objects * update the last bunch * update comments on oA11 and oB2 * Ninja-edit to fix compatibility with ZAPD's PR 142 Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-05-16 16:36:40 +00:00
include "build/assets/objects/object_oE_anime/object_oE_anime.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_oE2"
romalign 0x1000
Add every unreserved object in an automated way (#805) * it's crashing * fix stuff * fix xmls * problematic objects * fix tabs * Fix suffixes * add missing new lines * Add comments to the problematic objects * Find and replace fixes * Add Fig's objects * I forgot to add a Name in a cutscene, so I'm adding it here * Update object decomp tutorial a little bit * Update problematic objects * Update docs/tutorial/object_decomp.md Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Change comments * comment out a few blobs * dammit tluts * Change a bunch of objects * update the last bunch * update comments on oA11 and oB2 * Ninja-edit to fix compatibility with ZAPD's PR 142 Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-05-16 16:36:40 +00:00
include "build/assets/objects/object_oE2/object_oE2.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_ydan_objects"
romalign 0x1000
Decompile object_syokudai and object_ydan_objects (#699) * add deku and torch objects * why git?
2021-02-17 19:42:59 +00:00
include "build/assets/objects/object_ydan_objects/object_ydan_objects.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_gnd"
romalign 0x1000
Phantom Ganon (ovl_Boss_Ganondrof) and related actors (#442) * Darkmeiro decompilation Bg_Gnd_Darkmeiro decompiled, matched, and documented. * give this a shot * fix conflict * one more try * It's Phantom Ganon time * Fhg_Fire matched * small touch up * more documentation * starting naming fire * renaming * cleanup * hooray for new names * merge * first pass * camera status * bgcheck * object 1 * object 2 * .s * .s * fig's comments * implementing zel's suggestions and a few other things * the work begins * work continues * docs, shifts, cleanup * cleanup * texture names * addressing the rest of the notes Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
2021-03-29 19:35:46 +00:00
include "build/assets/objects/object_gnd/object_gnd.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_am"
romalign 0x1000
Armos and object_am OK (#652) * started * all but 2 * OK * docs progress * lots of docs * add gitkeep back * all funcs named * small fix * git subrepo pull --force tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "0305ec2c2" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "0305ec2c2" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * object_am * change * ready i think * last thing * asm * progress
2021-02-15 18:41:55 +00:00
include "build/assets/objects/object_am/object_am.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_dekubaba"
romalign 0x1000
Add every unreserved object in an automated way (#805) * it's crashing * fix stuff * fix xmls * problematic objects * fix tabs * Fix suffixes * add missing new lines * Add comments to the problematic objects * Find and replace fixes * Add Fig's objects * I forgot to add a Name in a cutscene, so I'm adding it here * Update object decomp tutorial a little bit * Update problematic objects * Update docs/tutorial/object_decomp.md Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Change comments * comment out a few blobs * dammit tluts * Change a bunch of objects * update the last bunch * update comments on oA11 and oB2 * Ninja-edit to fix compatibility with ZAPD's PR 142 Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-05-16 16:36:40 +00:00
include "build/assets/objects/object_dekubaba/object_dekubaba.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_oA3"
romalign 0x1000
Add every unreserved object in an automated way (#805) * it's crashing * fix stuff * fix xmls * problematic objects * fix tabs * Fix suffixes * add missing new lines * Add comments to the problematic objects * Find and replace fixes * Add Fig's objects * I forgot to add a Name in a cutscene, so I'm adding it here * Update object decomp tutorial a little bit * Update problematic objects * Update docs/tutorial/object_decomp.md Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Change comments * comment out a few blobs * dammit tluts * Change a bunch of objects * update the last bunch * update comments on oA11 and oB2 * Ninja-edit to fix compatibility with ZAPD's PR 142 Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-05-16 16:36:40 +00:00
include "build/assets/objects/object_oA3/object_oA3.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_oA4"
romalign 0x1000
Add every unreserved object in an automated way (#805) * it's crashing * fix stuff * fix xmls * problematic objects * fix tabs * Fix suffixes * add missing new lines * Add comments to the problematic objects * Find and replace fixes * Add Fig's objects * I forgot to add a Name in a cutscene, so I'm adding it here * Update object decomp tutorial a little bit * Update problematic objects * Update docs/tutorial/object_decomp.md Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Change comments * comment out a few blobs * dammit tluts * Change a bunch of objects * update the last bunch * update comments on oA11 and oB2 * Ninja-edit to fix compatibility with ZAPD's PR 142 Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-05-16 16:36:40 +00:00
include "build/assets/objects/object_oA4/object_oA4.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_oA5"
romalign 0x1000
Add every unreserved object in an automated way (#805) * it's crashing * fix stuff * fix xmls * problematic objects * fix tabs * Fix suffixes * add missing new lines * Add comments to the problematic objects * Find and replace fixes * Add Fig's objects * I forgot to add a Name in a cutscene, so I'm adding it here * Update object decomp tutorial a little bit * Update problematic objects * Update docs/tutorial/object_decomp.md Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Change comments * comment out a few blobs * dammit tluts * Change a bunch of objects * update the last bunch * update comments on oA11 and oB2 * Ninja-edit to fix compatibility with ZAPD's PR 142 Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-05-16 16:36:40 +00:00
include "build/assets/objects/object_oA5/object_oA5.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_oA6"
romalign 0x1000
Add every unreserved object in an automated way (#805) * it's crashing * fix stuff * fix xmls * problematic objects * fix tabs * Fix suffixes * add missing new lines * Add comments to the problematic objects * Find and replace fixes * Add Fig's objects * I forgot to add a Name in a cutscene, so I'm adding it here * Update object decomp tutorial a little bit * Update problematic objects * Update docs/tutorial/object_decomp.md Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Change comments * comment out a few blobs * dammit tluts * Change a bunch of objects * update the last bunch * update comments on oA11 and oB2 * Ninja-edit to fix compatibility with ZAPD's PR 142 Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-05-16 16:36:40 +00:00
include "build/assets/objects/object_oA6/object_oA6.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_oA7"
romalign 0x1000
Add every unreserved object in an automated way (#805) * it's crashing * fix stuff * fix xmls * problematic objects * fix tabs * Fix suffixes * add missing new lines * Add comments to the problematic objects * Find and replace fixes * Add Fig's objects * I forgot to add a Name in a cutscene, so I'm adding it here * Update object decomp tutorial a little bit * Update problematic objects * Update docs/tutorial/object_decomp.md Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Change comments * comment out a few blobs * dammit tluts * Change a bunch of objects * update the last bunch * update comments on oA11 and oB2 * Ninja-edit to fix compatibility with ZAPD's PR 142 Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-05-16 16:36:40 +00:00
include "build/assets/objects/object_oA7/object_oA7.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_jj"
romalign 0x1000
EnJj and object_jj OK (#741) * Shift to new branch * object_jj decomped * docs * Documented blinking, various other things * more naming * Most stuff in the object named * implement eye enums * delete asm * Changes from Fig's review * Apply suggestions from code review Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2021-03-29 00:02:09 +00:00
include "build/assets/objects/object_jj/object_jj.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_oA8"
romalign 0x1000
Add every unreserved object in an automated way (#805) * it's crashing * fix stuff * fix xmls * problematic objects * fix tabs * Fix suffixes * add missing new lines * Add comments to the problematic objects * Find and replace fixes * Add Fig's objects * I forgot to add a Name in a cutscene, so I'm adding it here * Update object decomp tutorial a little bit * Update problematic objects * Update docs/tutorial/object_decomp.md Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Change comments * comment out a few blobs * dammit tluts * Change a bunch of objects * update the last bunch * update comments on oA11 and oB2 * Ninja-edit to fix compatibility with ZAPD's PR 142 Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-05-16 16:36:40 +00:00
include "build/assets/objects/object_oA8/object_oA8.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_oA9"
romalign 0x1000
Add every unreserved object in an automated way (#805) * it's crashing * fix stuff * fix xmls * problematic objects * fix tabs * Fix suffixes * add missing new lines * Add comments to the problematic objects * Find and replace fixes * Add Fig's objects * I forgot to add a Name in a cutscene, so I'm adding it here * Update object decomp tutorial a little bit * Update problematic objects * Update docs/tutorial/object_decomp.md Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Change comments * comment out a few blobs * dammit tluts * Change a bunch of objects * update the last bunch * update comments on oA11 and oB2 * Ninja-edit to fix compatibility with ZAPD's PR 142 Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-05-16 16:36:40 +00:00
include "build/assets/objects/object_oA9/object_oA9.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_oB2"
romalign 0x1000
Add every unreserved object in an automated way (#805) * it's crashing * fix stuff * fix xmls * problematic objects * fix tabs * Fix suffixes * add missing new lines * Add comments to the problematic objects * Find and replace fixes * Add Fig's objects * I forgot to add a Name in a cutscene, so I'm adding it here * Update object decomp tutorial a little bit * Update problematic objects * Update docs/tutorial/object_decomp.md Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Change comments * comment out a few blobs * dammit tluts * Change a bunch of objects * update the last bunch * update comments on oA11 and oB2 * Ninja-edit to fix compatibility with ZAPD's PR 142 Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-05-16 16:36:40 +00:00
include "build/assets/objects/object_oB2/object_oB2.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_oB3"
romalign 0x1000
Add every unreserved object in an automated way (#805) * it's crashing * fix stuff * fix xmls * problematic objects * fix tabs * Fix suffixes * add missing new lines * Add comments to the problematic objects * Find and replace fixes * Add Fig's objects * I forgot to add a Name in a cutscene, so I'm adding it here * Update object decomp tutorial a little bit * Update problematic objects * Update docs/tutorial/object_decomp.md Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Change comments * comment out a few blobs * dammit tluts * Change a bunch of objects * update the last bunch * update comments on oA11 and oB2 * Ninja-edit to fix compatibility with ZAPD's PR 142 Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-05-16 16:36:40 +00:00
include "build/assets/objects/object_oB3/object_oB3.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_oB4"
romalign 0x1000
Add every unreserved object in an automated way (#805) * it's crashing * fix stuff * fix xmls * problematic objects * fix tabs * Fix suffixes * add missing new lines * Add comments to the problematic objects * Find and replace fixes * Add Fig's objects * I forgot to add a Name in a cutscene, so I'm adding it here * Update object decomp tutorial a little bit * Update problematic objects * Update docs/tutorial/object_decomp.md Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Change comments * comment out a few blobs * dammit tluts * Change a bunch of objects * update the last bunch * update comments on oA11 and oB2 * Ninja-edit to fix compatibility with ZAPD's PR 142 Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-05-16 16:36:40 +00:00
include "build/assets/objects/object_oB4/object_oB4.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_horse_zelda"
romalign 0x1000
object_horse_ganon, object_horse_link_child, object_horse_normal and object_horse_zelda OK (#724) * object_horse_zelda Signed-off-by: angie <angheloalf95@gmail.com> * object_horse_normal Signed-off-by: angie <angheloalf95@gmail.com> * object_horse_link_child Signed-off-by: angie <angheloalf95@gmail.com> * object_horse_ganon Signed-off-by: angie <angheloalf95@gmail.com> * object_horse Signed-off-by: angie <angheloalf95@gmail.com> * object_hni Signed-off-by: Angie <angheloalf95@gmail.com> * ZAPD is falling to do vtx Signed-off-by: Angie <angheloalf95@gmail.com> * Testing Signed-off-by: Angie <angheloalf95@gmail.com> * Rename horse_link_child variables Signed-off-by: angie <angheloalf95@gmail.com> * horse_zelda with names Signed-off-by: angie <angheloalf95@gmail.com> * I'm suspecting that this game doesn't use z_en_horse_ganon Signed-off-by: angie <angheloalf95@gmail.com> * Child epona eye textures Signed-off-by: Angie <angheloalf95@gmail.com> * Extract eyes textures from Epona Signed-off-by: Angie <angheloalf95@gmail.com> * Small rename Signed-off-by: Angie <angheloalf95@gmail.com> * change references in EnHorseNormal Signed-off-by: angie <angheloalf95@gmail.com> * Rename a few HorseNormal animations Signed-off-by: angie <angheloalf95@gmail.com> * Add normal horse eye texture Signed-off-by: angie <angheloalf95@gmail.com> * Add some textures Signed-off-by: angie <angheloalf95@gmail.com> * change pointers in EnViewer Signed-off-by: angie <angheloalf95@gmail.com> * Rename some animations of HorseGanon Signed-off-by: angie <angheloalf95@gmail.com> * Add a few dlists in object_horse Signed-off-by: Angie <angheloalf95@gmail.com> * Add whinnies Signed-off-by: Angie <angheloalf95@gmail.com> * Rename last animations remaining in horse_normal and horse_ganon Signed-off-by: angie <angheloalf95@gmail.com> * Remove epona and ingo's horse Signed-off-by: angie <angheloalf95@gmail.com> * ./format.sh Signed-off-by: angie <angheloalf95@gmail.com> * Give a proper name to horses animations Signed-off-by: angie <angheloalf95@gmail.com> * add trailling comma Signed-off-by: Angie <angheloalf95@gmail.com> * remove union of skeletons Signed-off-by: angie <angheloalf95@gmail.com> * change skeletonheader* to void* Signed-off-by: angie <angheloalf95@gmail.com> * remove cast Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * remove cast 2 Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * format.sh Signed-off-by: angie <angheloalf95@gmail.com> Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2021-03-28 03:44:11 +00:00
include "build/assets/objects/object_horse_zelda/object_horse_zelda.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_opening_demo1"
romalign 0x1000
Add every unreserved object in an automated way (#805) * it's crashing * fix stuff * fix xmls * problematic objects * fix tabs * Fix suffixes * add missing new lines * Add comments to the problematic objects * Find and replace fixes * Add Fig's objects * I forgot to add a Name in a cutscene, so I'm adding it here * Update object decomp tutorial a little bit * Update problematic objects * Update docs/tutorial/object_decomp.md Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Change comments * comment out a few blobs * dammit tluts * Change a bunch of objects * update the last bunch * update comments on oA11 and oB2 * Ninja-edit to fix compatibility with ZAPD's PR 142 Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-05-16 16:36:40 +00:00
include "build/assets/objects/object_opening_demo1/object_opening_demo1.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_warp1"
romalign 0x1000
"Decompile" more objects. (#784) * Object_hakach_objects OK and fix a warning in z_play.c * Object Warp1 OK * Object_spot16_obj OK * object_cs Skeleton and limbs OK * Limbs are broken * Limbs OK * Object_CS OK * Object_jya_door OK * fix errors and add new lines * PR fixes (AngheloAlf) * PR fixes (EllipticEllipsis) * PR fixes (Fig) * Rename Spot16 and Jya * GraveYard -> Graveyard * PR fixes * -s * PR fixes
2021-05-30 16:30:38 +00:00
include "build/assets/objects/object_warp1/object_warp1.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_b_heart"
romalign 0x1000
Add every unreserved object in an automated way (#805) * it's crashing * fix stuff * fix xmls * problematic objects * fix tabs * Fix suffixes * add missing new lines * Add comments to the problematic objects * Find and replace fixes * Add Fig's objects * I forgot to add a Name in a cutscene, so I'm adding it here * Update object decomp tutorial a little bit * Update problematic objects * Update docs/tutorial/object_decomp.md Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Change comments * comment out a few blobs * dammit tluts * Change a bunch of objects * update the last bunch * update comments on oA11 and oB2 * Ninja-edit to fix compatibility with ZAPD's PR 142 Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-05-16 16:36:40 +00:00
include "build/assets/objects/object_b_heart/object_b_heart.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_dekunuts"
romalign 0x1000
dekunuts OK (#664) * dekunuts OK * named unk_19A * improved the match, got rid of volatile * one unaccounted blob * finished object_dekunuts * capitalization consistency * suggested changes * suggested changes again
2021-02-12 22:22:48 +00:00
include "build/assets/objects/object_dekunuts/object_dekunuts.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_oE3"
romalign 0x1000
Add every unreserved object in an automated way (#805) * it's crashing * fix stuff * fix xmls * problematic objects * fix tabs * Fix suffixes * add missing new lines * Add comments to the problematic objects * Find and replace fixes * Add Fig's objects * I forgot to add a Name in a cutscene, so I'm adding it here * Update object decomp tutorial a little bit * Update problematic objects * Update docs/tutorial/object_decomp.md Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Change comments * comment out a few blobs * dammit tluts * Change a bunch of objects * update the last bunch * update comments on oA11 and oB2 * Ninja-edit to fix compatibility with ZAPD's PR 142 Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-05-16 16:36:40 +00:00
include "build/assets/objects/object_oE3/object_oE3.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_oE4"
romalign 0x1000
Add every unreserved object in an automated way (#805) * it's crashing * fix stuff * fix xmls * problematic objects * fix tabs * Fix suffixes * add missing new lines * Add comments to the problematic objects * Find and replace fixes * Add Fig's objects * I forgot to add a Name in a cutscene, so I'm adding it here * Update object decomp tutorial a little bit * Update problematic objects * Update docs/tutorial/object_decomp.md Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Change comments * comment out a few blobs * dammit tluts * Change a bunch of objects * update the last bunch * update comments on oA11 and oB2 * Ninja-edit to fix compatibility with ZAPD's PR 142 Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-05-16 16:36:40 +00:00
include "build/assets/objects/object_oE4/object_oE4.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_menkuri_objects"
romalign 0x1000
Decompiled A LOT of objects (#815) * . * remove tools/ZAP2 from origin master * object_spot04_objects * remove accidentally added xml * object_spot00_objects * object_bombf ok * object_dy_obj * object_masterzoora * object_mastergolon and object_masterkokirihead * object_aob * object_gt * object_gt * object_geff * object_mag kinda * object_gjyo_objects OK * object_ani OK * object_door_gerudo * object_md and object_trap * object_js OK * object_goroiwa * object_gs * object_nwc * object_niw * object_ane * object_os_anime OK * object_d_hsblock OK * object_fz OK * object_ru2 OK * fixed object_mag * object_cow OK * object_spot01_objects OK * object_spot15_obj * object_umajump OK * object_spot18_obj * object_spot12_obj * fix symbols in z_item_b_heart * object_bdan_objects & object_bowl * object_ddan_objects * object_owl OK * object_spot01_matoyab.xml OK * object_haka OK * object_heavy_object * object_ingate and objet_menkuri_objects * objet_spot00_break & object_relay_objects OK * object_spot01_matoya OK * object_spot06_objects OK * undefined_syms * object_spot08_obj OK * object_efc_doughnut & object_zg * object_ik OK * object_vm * object_ei OK * object_ds OK * updated spec * map_48x85_static OK * object_zl1 & object_peehat ok * some z_parameter naming and other undefined symbol stuff, object_yukabyun OK * object_bubble & object_fw ok * object_shopnuts * restore delete file * object_timeblock OK * object_d_lift OK * object_kibako2 OK * object_mamenoki OK * matches * remove unused asm * object_mag ok now * fixed object_ani * done for now, im tired * object_bdan_objects fixed up * fix bdan * object_bombf fixed * object_bowl fixed up * object_cow fixed * did more, im tired * fixed some stuff in object_ddan_objects * fix object_ddan_object * object_door_gerudo fixed * object_ds fix * object_dy progress * fixed great fairy * some more * more * object_haka fix * progress * ingo_gate fixed * object_js * forgot collision * object_relay_objects fixed * object_kibako2 * object_mag fixed * u64* to void* * more u64* to void* * object_mamenoki fix * object_mastergolon & object_masterkokirihead fix * mido is weird * fixed build * fix object_menkuri_objects * add missing textures in object_menkuri_objects * object_ms * fixed object_peehat * some cleanup stuff * object_zg fix * object_spot00_break fix * object_niw fix * object_nwc fixed * object_ru2 object_rr and some of object_owl fix * object_spot15_obj fix * business scrub * object_spot01_matoya fixed * object_spot18_obj fix * object_spot01_objects fix * object_spot04_objects fix * object_spot04_objects actually fixed * object_spot12_obj fix * object_timeblock fix * object_spot06_objects fixed * object_spot08_obj fix * spot01_matoyab fix * object_trap fix * object_umajump fix * object_vm fix * z_en_niw_lady fix * object_yukabyun fix * object_zl1 fixed * added offsets to object_os_anime * object_md fix * object_ane fix * object_aob fix * add palette comment * object_spot00_objects fix * spot00 fix * remove unused asm * updates * Add TlutOffset to objects added in https://github.com/zeldaret/oot/pull/815 * Updated object_bdan_objects, ran format.sh * Change rgb5a1 to rgba16 in my object xmls * Addressed Anghelo's comments * review Co-authored-by: Lucas Shaw <lucas.shaw1123@gmail.com> Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-08-05 15:53:58 +00:00
include "build/assets/objects/object_menkuri_objects/object_menkuri_objects.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_oE5"
romalign 0x1000
Add every unreserved object in an automated way (#805) * it's crashing * fix stuff * fix xmls * problematic objects * fix tabs * Fix suffixes * add missing new lines * Add comments to the problematic objects * Find and replace fixes * Add Fig's objects * I forgot to add a Name in a cutscene, so I'm adding it here * Update object decomp tutorial a little bit * Update problematic objects * Update docs/tutorial/object_decomp.md Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Change comments * comment out a few blobs * dammit tluts * Change a bunch of objects * update the last bunch * update comments on oA11 and oB2 * Ninja-edit to fix compatibility with ZAPD's PR 142 Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-05-16 16:36:40 +00:00
include "build/assets/objects/object_oE5/object_oE5.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_oE6"
romalign 0x1000
Add every unreserved object in an automated way (#805) * it's crashing * fix stuff * fix xmls * problematic objects * fix tabs * Fix suffixes * add missing new lines * Add comments to the problematic objects * Find and replace fixes * Add Fig's objects * I forgot to add a Name in a cutscene, so I'm adding it here * Update object decomp tutorial a little bit * Update problematic objects * Update docs/tutorial/object_decomp.md Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Change comments * comment out a few blobs * dammit tluts * Change a bunch of objects * update the last bunch * update comments on oA11 and oB2 * Ninja-edit to fix compatibility with ZAPD's PR 142 Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-05-16 16:36:40 +00:00
include "build/assets/objects/object_oE6/object_oE6.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_oE7"
romalign 0x1000
Add every unreserved object in an automated way (#805) * it's crashing * fix stuff * fix xmls * problematic objects * fix tabs * Fix suffixes * add missing new lines * Add comments to the problematic objects * Find and replace fixes * Add Fig's objects * I forgot to add a Name in a cutscene, so I'm adding it here * Update object decomp tutorial a little bit * Update problematic objects * Update docs/tutorial/object_decomp.md Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Change comments * comment out a few blobs * dammit tluts * Change a bunch of objects * update the last bunch * update comments on oA11 and oB2 * Ninja-edit to fix compatibility with ZAPD's PR 142 Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-05-16 16:36:40 +00:00
include "build/assets/objects/object_oE7/object_oE7.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_oE8"
romalign 0x1000
Add every unreserved object in an automated way (#805) * it's crashing * fix stuff * fix xmls * problematic objects * fix tabs * Fix suffixes * add missing new lines * Add comments to the problematic objects * Find and replace fixes * Add Fig's objects * I forgot to add a Name in a cutscene, so I'm adding it here * Update object decomp tutorial a little bit * Update problematic objects * Update docs/tutorial/object_decomp.md Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Change comments * comment out a few blobs * dammit tluts * Change a bunch of objects * update the last bunch * update comments on oA11 and oB2 * Ninja-edit to fix compatibility with ZAPD's PR 142 Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-05-16 16:36:40 +00:00
include "build/assets/objects/object_oE8/object_oE8.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_oE9"
romalign 0x1000
Add every unreserved object in an automated way (#805) * it's crashing * fix stuff * fix xmls * problematic objects * fix tabs * Fix suffixes * add missing new lines * Add comments to the problematic objects * Find and replace fixes * Add Fig's objects * I forgot to add a Name in a cutscene, so I'm adding it here * Update object decomp tutorial a little bit * Update problematic objects * Update docs/tutorial/object_decomp.md Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Change comments * comment out a few blobs * dammit tluts * Change a bunch of objects * update the last bunch * update comments on oA11 and oB2 * Ninja-edit to fix compatibility with ZAPD's PR 142 Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-05-16 16:36:40 +00:00
include "build/assets/objects/object_oE9/object_oE9.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_oE10"
romalign 0x1000
Add every unreserved object in an automated way (#805) * it's crashing * fix stuff * fix xmls * problematic objects * fix tabs * Fix suffixes * add missing new lines * Add comments to the problematic objects * Find and replace fixes * Add Fig's objects * I forgot to add a Name in a cutscene, so I'm adding it here * Update object decomp tutorial a little bit * Update problematic objects * Update docs/tutorial/object_decomp.md Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Change comments * comment out a few blobs * dammit tluts * Change a bunch of objects * update the last bunch * update comments on oA11 and oB2 * Ninja-edit to fix compatibility with ZAPD's PR 142 Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-05-16 16:36:40 +00:00
include "build/assets/objects/object_oE10/object_oE10.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_oE11"
romalign 0x1000
Add every unreserved object in an automated way (#805) * it's crashing * fix stuff * fix xmls * problematic objects * fix tabs * Fix suffixes * add missing new lines * Add comments to the problematic objects * Find and replace fixes * Add Fig's objects * I forgot to add a Name in a cutscene, so I'm adding it here * Update object decomp tutorial a little bit * Update problematic objects * Update docs/tutorial/object_decomp.md Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Change comments * comment out a few blobs * dammit tluts * Change a bunch of objects * update the last bunch * update comments on oA11 and oB2 * Ninja-edit to fix compatibility with ZAPD's PR 142 Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-05-16 16:36:40 +00:00
include "build/assets/objects/object_oE11/object_oE11.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_oE12"
romalign 0x1000
Add every unreserved object in an automated way (#805) * it's crashing * fix stuff * fix xmls * problematic objects * fix tabs * Fix suffixes * add missing new lines * Add comments to the problematic objects * Find and replace fixes * Add Fig's objects * I forgot to add a Name in a cutscene, so I'm adding it here * Update object decomp tutorial a little bit * Update problematic objects * Update docs/tutorial/object_decomp.md Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Change comments * comment out a few blobs * dammit tluts * Change a bunch of objects * update the last bunch * update comments on oA11 and oB2 * Ninja-edit to fix compatibility with ZAPD's PR 142 Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-05-16 16:36:40 +00:00
include "build/assets/objects/object_oE12/object_oE12.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_vali"
romalign 0x1000
Add every unreserved object in an automated way (#805) * it's crashing * fix stuff * fix xmls * problematic objects * fix tabs * Fix suffixes * add missing new lines * Add comments to the problematic objects * Find and replace fixes * Add Fig's objects * I forgot to add a Name in a cutscene, so I'm adding it here * Update object decomp tutorial a little bit * Update problematic objects * Update docs/tutorial/object_decomp.md Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Change comments * comment out a few blobs * dammit tluts * Change a bunch of objects * update the last bunch * update comments on oA11 and oB2 * Ninja-edit to fix compatibility with ZAPD's PR 142 Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-05-16 16:36:40 +00:00
include "build/assets/objects/object_vali/object_vali.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_oA10"
romalign 0x1000
Add every unreserved object in an automated way (#805) * it's crashing * fix stuff * fix xmls * problematic objects * fix tabs * Fix suffixes * add missing new lines * Add comments to the problematic objects * Find and replace fixes * Add Fig's objects * I forgot to add a Name in a cutscene, so I'm adding it here * Update object decomp tutorial a little bit * Update problematic objects * Update docs/tutorial/object_decomp.md Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Change comments * comment out a few blobs * dammit tluts * Change a bunch of objects * update the last bunch * update comments on oA11 and oB2 * Ninja-edit to fix compatibility with ZAPD's PR 142 Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-05-16 16:36:40 +00:00
include "build/assets/objects/object_oA10/object_oA10.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_oA11"
romalign 0x1000
Add every unreserved object in an automated way (#805) * it's crashing * fix stuff * fix xmls * problematic objects * fix tabs * Fix suffixes * add missing new lines * Add comments to the problematic objects * Find and replace fixes * Add Fig's objects * I forgot to add a Name in a cutscene, so I'm adding it here * Update object decomp tutorial a little bit * Update problematic objects * Update docs/tutorial/object_decomp.md Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Change comments * comment out a few blobs * dammit tluts * Change a bunch of objects * update the last bunch * update comments on oA11 and oB2 * Ninja-edit to fix compatibility with ZAPD's PR 142 Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-05-16 16:36:40 +00:00
include "build/assets/objects/object_oA11/object_oA11.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_mizu_objects"
romalign 0x1000
z_bg_mizu_movebg and object_mizu_objects (#747) * OK a few functions * BgMizuMovebg_Draw OK, make tweaks to bg_mizu_bwall * migrate data * create mizu_objects, defines for water temple water level * clean up some code * implement most suggestions * review * review2 * formatting Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-04-25 23:36:43 +00:00
include "build/assets/objects/object_mizu_objects/object_mizu_objects.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_fhg"
romalign 0x1000
Phantom Ganon (ovl_Boss_Ganondrof) and related actors (#442) * Darkmeiro decompilation Bg_Gnd_Darkmeiro decompiled, matched, and documented. * give this a shot * fix conflict * one more try * It's Phantom Ganon time * Fhg_Fire matched * small touch up * more documentation * starting naming fire * renaming * cleanup * hooray for new names * merge * first pass * camera status * bgcheck * object 1 * object 2 * .s * .s * fig's comments * implementing zel's suggestions and a few other things * the work begins * work continues * docs, shifts, cleanup * cleanup * texture names * addressing the rest of the notes Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
2021-03-29 19:35:46 +00:00
include "build/assets/objects/object_fhg/object_fhg.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_ossan"
romalign 0x1000
z_En_Ossan and dependencies (#824) * fix colliderinit typo * fix initchain * reloc * progress * progress * Pick off a few easy functions, reduce number of warnings * more tough OKs * Getting closer to all OK, fix en_girla header * some hard OKs, 7 to go * two funcs remaining * func_80AC7094 OK! * Fix warnings, begin documentation * get most of object_ossan documented, document some of en_ossan * improve en_girla function names * more EnOssan documentation * more documentation * en_tana basically complete, en_girla vars all named, en_ossan documentation improvements * delete TIME ITSELF * object_oF1d_map OK * more names, fixed a poition typo * Nearly all en_ossan functions named, all variables named * format.sh * forgot to delete data * implement pr changes * EnOssan OK! implement most of Roman's suggestions * ugh * implement figs suggestions * implement roman's suggestion * Can't tell my left from my other left Co-authored-by: fig02 <fig02srl@gmail.com>
2021-07-04 15:23:18 +00:00
include "build/assets/objects/object_ossan/object_ossan.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_mori_hineri1"
romalign 0x1000
Add every unreserved object in an automated way (#805) * it's crashing * fix stuff * fix xmls * problematic objects * fix tabs * Fix suffixes * add missing new lines * Add comments to the problematic objects * Find and replace fixes * Add Fig's objects * I forgot to add a Name in a cutscene, so I'm adding it here * Update object decomp tutorial a little bit * Update problematic objects * Update docs/tutorial/object_decomp.md Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Change comments * comment out a few blobs * dammit tluts * Change a bunch of objects * update the last bunch * update comments on oA11 and oB2 * Ninja-edit to fix compatibility with ZAPD's PR 142 Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-05-16 16:36:40 +00:00
include "build/assets/objects/object_mori_hineri1/object_mori_hineri1.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_Bb"
romalign 0x1000
Add every unreserved object in an automated way (#805) * it's crashing * fix stuff * fix xmls * problematic objects * fix tabs * Fix suffixes * add missing new lines * Add comments to the problematic objects * Find and replace fixes * Add Fig's objects * I forgot to add a Name in a cutscene, so I'm adding it here * Update object decomp tutorial a little bit * Update problematic objects * Update docs/tutorial/object_decomp.md Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Change comments * comment out a few blobs * dammit tluts * Change a bunch of objects * update the last bunch * update comments on oA11 and oB2 * Ninja-edit to fix compatibility with ZAPD's PR 142 Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-05-16 16:36:40 +00:00
include "build/assets/objects/object_Bb/object_Bb.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_toki_objects"
romalign 0x1000
Automatic objects 2 (#889) * adding missing objects * update rgba16 format * comment blobs * Fix blobs * add another missing one * add newlines to XMLs * remove objects from other PRs * add TlutOffset Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
2021-08-06 19:18:29 +00:00
include "build/assets/objects/object_toki_objects/object_toki_objects.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_yukabyun"
romalign 0x1000
Decompiled A LOT of objects (#815) * . * remove tools/ZAP2 from origin master * object_spot04_objects * remove accidentally added xml * object_spot00_objects * object_bombf ok * object_dy_obj * object_masterzoora * object_mastergolon and object_masterkokirihead * object_aob * object_gt * object_gt * object_geff * object_mag kinda * object_gjyo_objects OK * object_ani OK * object_door_gerudo * object_md and object_trap * object_js OK * object_goroiwa * object_gs * object_nwc * object_niw * object_ane * object_os_anime OK * object_d_hsblock OK * object_fz OK * object_ru2 OK * fixed object_mag * object_cow OK * object_spot01_objects OK * object_spot15_obj * object_umajump OK * object_spot18_obj * object_spot12_obj * fix symbols in z_item_b_heart * object_bdan_objects & object_bowl * object_ddan_objects * object_owl OK * object_spot01_matoyab.xml OK * object_haka OK * object_heavy_object * object_ingate and objet_menkuri_objects * objet_spot00_break & object_relay_objects OK * object_spot01_matoya OK * object_spot06_objects OK * undefined_syms * object_spot08_obj OK * object_efc_doughnut & object_zg * object_ik OK * object_vm * object_ei OK * object_ds OK * updated spec * map_48x85_static OK * object_zl1 & object_peehat ok * some z_parameter naming and other undefined symbol stuff, object_yukabyun OK * object_bubble & object_fw ok * object_shopnuts * restore delete file * object_timeblock OK * object_d_lift OK * object_kibako2 OK * object_mamenoki OK * matches * remove unused asm * object_mag ok now * fixed object_ani * done for now, im tired * object_bdan_objects fixed up * fix bdan * object_bombf fixed * object_bowl fixed up * object_cow fixed * did more, im tired * fixed some stuff in object_ddan_objects * fix object_ddan_object * object_door_gerudo fixed * object_ds fix * object_dy progress * fixed great fairy * some more * more * object_haka fix * progress * ingo_gate fixed * object_js * forgot collision * object_relay_objects fixed * object_kibako2 * object_mag fixed * u64* to void* * more u64* to void* * object_mamenoki fix * object_mastergolon & object_masterkokirihead fix * mido is weird * fixed build * fix object_menkuri_objects * add missing textures in object_menkuri_objects * object_ms * fixed object_peehat * some cleanup stuff * object_zg fix * object_spot00_break fix * object_niw fix * object_nwc fixed * object_ru2 object_rr and some of object_owl fix * object_spot15_obj fix * business scrub * object_spot01_matoya fixed * object_spot18_obj fix * object_spot01_objects fix * object_spot04_objects fix * object_spot04_objects actually fixed * object_spot12_obj fix * object_timeblock fix * object_spot06_objects fixed * object_spot08_obj fix * spot01_matoyab fix * object_trap fix * object_umajump fix * object_vm fix * z_en_niw_lady fix * object_yukabyun fix * object_zl1 fixed * added offsets to object_os_anime * object_md fix * object_ane fix * object_aob fix * add palette comment * object_spot00_objects fix * spot00 fix * remove unused asm * updates * Add TlutOffset to objects added in https://github.com/zeldaret/oot/pull/815 * Updated object_bdan_objects, ran format.sh * Change rgb5a1 to rgba16 in my object xmls * Addressed Anghelo's comments * review Co-authored-by: Lucas Shaw <lucas.shaw1123@gmail.com> Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-08-05 15:53:58 +00:00
include "build/assets/objects/object_yukabyun/object_yukabyun.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_zl2"
romalign 0x1000
object_zl2, object_zl2_anime1 & object_zl2_anime2 OK (#694) * xml Signed-off-by: Angie <angheloalf95@gmail.com> * add xmls of anime1 and anime2 Signed-off-by: Angie <angheloalf95@gmail.com> * add unaccounted data from animes Signed-off-by: Angie <angheloalf95@gmail.com> * add all unaccounted data and a bit of renaming Signed-off-by: Angie <angheloalf95@gmail.com> * add to spec and change the pointer to the decompiled names Signed-off-by: Angie <angheloalf95@gmail.com> * add palettes Signed-off-by: angie <angheloalf95@gmail.com> * delete gitkeep Signed-off-by: angie <angheloalf95@gmail.com> * run format Signed-off-by: angie <angheloalf95@gmail.com> * change palette to Tlut Signed-off-by: angie <angheloalf95@gmail.com> * change `Tlut` to `TLUT` Signed-off-by: angie <angheloalf95@gmail.com>
2021-03-28 02:24:28 +00:00
include "build/assets/objects/object_zl2/object_zl2.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_mjin"
romalign 0x1000
Add every unreserved object in an automated way (#805) * it's crashing * fix stuff * fix xmls * problematic objects * fix tabs * Fix suffixes * add missing new lines * Add comments to the problematic objects * Find and replace fixes * Add Fig's objects * I forgot to add a Name in a cutscene, so I'm adding it here * Update object decomp tutorial a little bit * Update problematic objects * Update docs/tutorial/object_decomp.md Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Change comments * comment out a few blobs * dammit tluts * Change a bunch of objects * update the last bunch * update comments on oA11 and oB2 * Ninja-edit to fix compatibility with ZAPD's PR 142 Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-05-16 16:36:40 +00:00
include "build/assets/objects/object_mjin/object_mjin.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_mjin_flash"
romalign 0x1000
Add every unreserved object in an automated way (#805) * it's crashing * fix stuff * fix xmls * problematic objects * fix tabs * Fix suffixes * add missing new lines * Add comments to the problematic objects * Find and replace fixes * Add Fig's objects * I forgot to add a Name in a cutscene, so I'm adding it here * Update object decomp tutorial a little bit * Update problematic objects * Update docs/tutorial/object_decomp.md Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Change comments * comment out a few blobs * dammit tluts * Change a bunch of objects * update the last bunch * update comments on oA11 and oB2 * Ninja-edit to fix compatibility with ZAPD's PR 142 Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-05-16 16:36:40 +00:00
include "build/assets/objects/object_mjin_flash/object_mjin_flash.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_mjin_dark"
romalign 0x1000
Add every unreserved object in an automated way (#805) * it's crashing * fix stuff * fix xmls * problematic objects * fix tabs * Fix suffixes * add missing new lines * Add comments to the problematic objects * Find and replace fixes * Add Fig's objects * I forgot to add a Name in a cutscene, so I'm adding it here * Update object decomp tutorial a little bit * Update problematic objects * Update docs/tutorial/object_decomp.md Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Change comments * comment out a few blobs * dammit tluts * Change a bunch of objects * update the last bunch * update comments on oA11 and oB2 * Ninja-edit to fix compatibility with ZAPD's PR 142 Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-05-16 16:36:40 +00:00
include "build/assets/objects/object_mjin_dark/object_mjin_dark.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_mjin_flame"
romalign 0x1000
Add every unreserved object in an automated way (#805) * it's crashing * fix stuff * fix xmls * problematic objects * fix tabs * Fix suffixes * add missing new lines * Add comments to the problematic objects * Find and replace fixes * Add Fig's objects * I forgot to add a Name in a cutscene, so I'm adding it here * Update object decomp tutorial a little bit * Update problematic objects * Update docs/tutorial/object_decomp.md Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Change comments * comment out a few blobs * dammit tluts * Change a bunch of objects * update the last bunch * update comments on oA11 and oB2 * Ninja-edit to fix compatibility with ZAPD's PR 142 Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-05-16 16:36:40 +00:00
include "build/assets/objects/object_mjin_flame/object_mjin_flame.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_mjin_ice"
romalign 0x1000
Add every unreserved object in an automated way (#805) * it's crashing * fix stuff * fix xmls * problematic objects * fix tabs * Fix suffixes * add missing new lines * Add comments to the problematic objects * Find and replace fixes * Add Fig's objects * I forgot to add a Name in a cutscene, so I'm adding it here * Update object decomp tutorial a little bit * Update problematic objects * Update docs/tutorial/object_decomp.md Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Change comments * comment out a few blobs * dammit tluts * Change a bunch of objects * update the last bunch * update comments on oA11 and oB2 * Ninja-edit to fix compatibility with ZAPD's PR 142 Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-05-16 16:36:40 +00:00
include "build/assets/objects/object_mjin_ice/object_mjin_ice.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_mjin_soul"
romalign 0x1000
Add every unreserved object in an automated way (#805) * it's crashing * fix stuff * fix xmls * problematic objects * fix tabs * Fix suffixes * add missing new lines * Add comments to the problematic objects * Find and replace fixes * Add Fig's objects * I forgot to add a Name in a cutscene, so I'm adding it here * Update object decomp tutorial a little bit * Update problematic objects * Update docs/tutorial/object_decomp.md Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Change comments * comment out a few blobs * dammit tluts * Change a bunch of objects * update the last bunch * update comments on oA11 and oB2 * Ninja-edit to fix compatibility with ZAPD's PR 142 Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-05-16 16:36:40 +00:00
include "build/assets/objects/object_mjin_soul/object_mjin_soul.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_mjin_wind"
romalign 0x1000
Add every unreserved object in an automated way (#805) * it's crashing * fix stuff * fix xmls * problematic objects * fix tabs * Fix suffixes * add missing new lines * Add comments to the problematic objects * Find and replace fixes * Add Fig's objects * I forgot to add a Name in a cutscene, so I'm adding it here * Update object decomp tutorial a little bit * Update problematic objects * Update docs/tutorial/object_decomp.md Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Change comments * comment out a few blobs * dammit tluts * Change a bunch of objects * update the last bunch * update comments on oA11 and oB2 * Ninja-edit to fix compatibility with ZAPD's PR 142 Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-05-16 16:36:40 +00:00
include "build/assets/objects/object_mjin_wind/object_mjin_wind.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_mjin_oka"
romalign 0x1000
Add every unreserved object in an automated way (#805) * it's crashing * fix stuff * fix xmls * problematic objects * fix tabs * Fix suffixes * add missing new lines * Add comments to the problematic objects * Find and replace fixes * Add Fig's objects * I forgot to add a Name in a cutscene, so I'm adding it here * Update object decomp tutorial a little bit * Update problematic objects * Update docs/tutorial/object_decomp.md Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Change comments * comment out a few blobs * dammit tluts * Change a bunch of objects * update the last bunch * update comments on oA11 and oB2 * Ninja-edit to fix compatibility with ZAPD's PR 142 Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-05-16 16:36:40 +00:00
include "build/assets/objects/object_mjin_oka/object_mjin_oka.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_haka_objects"
romalign 0x1000
Add every unreserved object in an automated way (#805) * it's crashing * fix stuff * fix xmls * problematic objects * fix tabs * Fix suffixes * add missing new lines * Add comments to the problematic objects * Find and replace fixes * Add Fig's objects * I forgot to add a Name in a cutscene, so I'm adding it here * Update object decomp tutorial a little bit * Update problematic objects * Update docs/tutorial/object_decomp.md Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Change comments * comment out a few blobs * dammit tluts * Change a bunch of objects * update the last bunch * update comments on oA11 and oB2 * Ninja-edit to fix compatibility with ZAPD's PR 142 Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-05-16 16:36:40 +00:00
include "build/assets/objects/object_haka_objects/object_haka_objects.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_spot06_objects"
romalign 0x1000
Decompiled A LOT of objects (#815) * . * remove tools/ZAP2 from origin master * object_spot04_objects * remove accidentally added xml * object_spot00_objects * object_bombf ok * object_dy_obj * object_masterzoora * object_mastergolon and object_masterkokirihead * object_aob * object_gt * object_gt * object_geff * object_mag kinda * object_gjyo_objects OK * object_ani OK * object_door_gerudo * object_md and object_trap * object_js OK * object_goroiwa * object_gs * object_nwc * object_niw * object_ane * object_os_anime OK * object_d_hsblock OK * object_fz OK * object_ru2 OK * fixed object_mag * object_cow OK * object_spot01_objects OK * object_spot15_obj * object_umajump OK * object_spot18_obj * object_spot12_obj * fix symbols in z_item_b_heart * object_bdan_objects & object_bowl * object_ddan_objects * object_owl OK * object_spot01_matoyab.xml OK * object_haka OK * object_heavy_object * object_ingate and objet_menkuri_objects * objet_spot00_break & object_relay_objects OK * object_spot01_matoya OK * object_spot06_objects OK * undefined_syms * object_spot08_obj OK * object_efc_doughnut & object_zg * object_ik OK * object_vm * object_ei OK * object_ds OK * updated spec * map_48x85_static OK * object_zl1 & object_peehat ok * some z_parameter naming and other undefined symbol stuff, object_yukabyun OK * object_bubble & object_fw ok * object_shopnuts * restore delete file * object_timeblock OK * object_d_lift OK * object_kibako2 OK * object_mamenoki OK * matches * remove unused asm * object_mag ok now * fixed object_ani * done for now, im tired * object_bdan_objects fixed up * fix bdan * object_bombf fixed * object_bowl fixed up * object_cow fixed * did more, im tired * fixed some stuff in object_ddan_objects * fix object_ddan_object * object_door_gerudo fixed * object_ds fix * object_dy progress * fixed great fairy * some more * more * object_haka fix * progress * ingo_gate fixed * object_js * forgot collision * object_relay_objects fixed * object_kibako2 * object_mag fixed * u64* to void* * more u64* to void* * object_mamenoki fix * object_mastergolon & object_masterkokirihead fix * mido is weird * fixed build * fix object_menkuri_objects * add missing textures in object_menkuri_objects * object_ms * fixed object_peehat * some cleanup stuff * object_zg fix * object_spot00_break fix * object_niw fix * object_nwc fixed * object_ru2 object_rr and some of object_owl fix * object_spot15_obj fix * business scrub * object_spot01_matoya fixed * object_spot18_obj fix * object_spot01_objects fix * object_spot04_objects fix * object_spot04_objects actually fixed * object_spot12_obj fix * object_timeblock fix * object_spot06_objects fixed * object_spot08_obj fix * spot01_matoyab fix * object_trap fix * object_umajump fix * object_vm fix * z_en_niw_lady fix * object_yukabyun fix * object_zl1 fixed * added offsets to object_os_anime * object_md fix * object_ane fix * object_aob fix * add palette comment * object_spot00_objects fix * spot00 fix * remove unused asm * updates * Add TlutOffset to objects added in https://github.com/zeldaret/oot/pull/815 * Updated object_bdan_objects, ran format.sh * Change rgb5a1 to rgba16 in my object xmls * Addressed Anghelo's comments * review Co-authored-by: Lucas Shaw <lucas.shaw1123@gmail.com> Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-08-05 15:53:58 +00:00
include "build/assets/objects/object_spot06_objects/object_spot06_objects.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_ice_objects"
romalign 0x1000
Add every unreserved object in an automated way (#805) * it's crashing * fix stuff * fix xmls * problematic objects * fix tabs * Fix suffixes * add missing new lines * Add comments to the problematic objects * Find and replace fixes * Add Fig's objects * I forgot to add a Name in a cutscene, so I'm adding it here * Update object decomp tutorial a little bit * Update problematic objects * Update docs/tutorial/object_decomp.md Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Change comments * comment out a few blobs * dammit tluts * Change a bunch of objects * update the last bunch * update comments on oA11 and oB2 * Ninja-edit to fix compatibility with ZAPD's PR 142 Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-05-16 16:36:40 +00:00
include "build/assets/objects/object_ice_objects/object_ice_objects.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_relay_objects"
romalign 0x1000
Decompiled A LOT of objects (#815) * . * remove tools/ZAP2 from origin master * object_spot04_objects * remove accidentally added xml * object_spot00_objects * object_bombf ok * object_dy_obj * object_masterzoora * object_mastergolon and object_masterkokirihead * object_aob * object_gt * object_gt * object_geff * object_mag kinda * object_gjyo_objects OK * object_ani OK * object_door_gerudo * object_md and object_trap * object_js OK * object_goroiwa * object_gs * object_nwc * object_niw * object_ane * object_os_anime OK * object_d_hsblock OK * object_fz OK * object_ru2 OK * fixed object_mag * object_cow OK * object_spot01_objects OK * object_spot15_obj * object_umajump OK * object_spot18_obj * object_spot12_obj * fix symbols in z_item_b_heart * object_bdan_objects & object_bowl * object_ddan_objects * object_owl OK * object_spot01_matoyab.xml OK * object_haka OK * object_heavy_object * object_ingate and objet_menkuri_objects * objet_spot00_break & object_relay_objects OK * object_spot01_matoya OK * object_spot06_objects OK * undefined_syms * object_spot08_obj OK * object_efc_doughnut & object_zg * object_ik OK * object_vm * object_ei OK * object_ds OK * updated spec * map_48x85_static OK * object_zl1 & object_peehat ok * some z_parameter naming and other undefined symbol stuff, object_yukabyun OK * object_bubble & object_fw ok * object_shopnuts * restore delete file * object_timeblock OK * object_d_lift OK * object_kibako2 OK * object_mamenoki OK * matches * remove unused asm * object_mag ok now * fixed object_ani * done for now, im tired * object_bdan_objects fixed up * fix bdan * object_bombf fixed * object_bowl fixed up * object_cow fixed * did more, im tired * fixed some stuff in object_ddan_objects * fix object_ddan_object * object_door_gerudo fixed * object_ds fix * object_dy progress * fixed great fairy * some more * more * object_haka fix * progress * ingo_gate fixed * object_js * forgot collision * object_relay_objects fixed * object_kibako2 * object_mag fixed * u64* to void* * more u64* to void* * object_mamenoki fix * object_mastergolon & object_masterkokirihead fix * mido is weird * fixed build * fix object_menkuri_objects * add missing textures in object_menkuri_objects * object_ms * fixed object_peehat * some cleanup stuff * object_zg fix * object_spot00_break fix * object_niw fix * object_nwc fixed * object_ru2 object_rr and some of object_owl fix * object_spot15_obj fix * business scrub * object_spot01_matoya fixed * object_spot18_obj fix * object_spot01_objects fix * object_spot04_objects fix * object_spot04_objects actually fixed * object_spot12_obj fix * object_timeblock fix * object_spot06_objects fixed * object_spot08_obj fix * spot01_matoyab fix * object_trap fix * object_umajump fix * object_vm fix * z_en_niw_lady fix * object_yukabyun fix * object_zl1 fixed * added offsets to object_os_anime * object_md fix * object_ane fix * object_aob fix * add palette comment * object_spot00_objects fix * spot00 fix * remove unused asm * updates * Add TlutOffset to objects added in https://github.com/zeldaret/oot/pull/815 * Updated object_bdan_objects, ran format.sh * Change rgb5a1 to rgba16 in my object xmls * Addressed Anghelo's comments * review Co-authored-by: Lucas Shaw <lucas.shaw1123@gmail.com> Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-08-05 15:53:58 +00:00
include "build/assets/objects/object_relay_objects/object_relay_objects.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_mori_hineri1a"
romalign 0x1000
Add every unreserved object in an automated way (#805) * it's crashing * fix stuff * fix xmls * problematic objects * fix tabs * Fix suffixes * add missing new lines * Add comments to the problematic objects * Find and replace fixes * Add Fig's objects * I forgot to add a Name in a cutscene, so I'm adding it here * Update object decomp tutorial a little bit * Update problematic objects * Update docs/tutorial/object_decomp.md Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Change comments * comment out a few blobs * dammit tluts * Change a bunch of objects * update the last bunch * update comments on oA11 and oB2 * Ninja-edit to fix compatibility with ZAPD's PR 142 Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-05-16 16:36:40 +00:00
include "build/assets/objects/object_mori_hineri1a/object_mori_hineri1a.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_mori_hineri2"
romalign 0x1000
Add every unreserved object in an automated way (#805) * it's crashing * fix stuff * fix xmls * problematic objects * fix tabs * Fix suffixes * add missing new lines * Add comments to the problematic objects * Find and replace fixes * Add Fig's objects * I forgot to add a Name in a cutscene, so I'm adding it here * Update object decomp tutorial a little bit * Update problematic objects * Update docs/tutorial/object_decomp.md Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Change comments * comment out a few blobs * dammit tluts * Change a bunch of objects * update the last bunch * update comments on oA11 and oB2 * Ninja-edit to fix compatibility with ZAPD's PR 142 Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-05-16 16:36:40 +00:00
include "build/assets/objects/object_mori_hineri2/object_mori_hineri2.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_mori_hineri2a"
romalign 0x1000
Add every unreserved object in an automated way (#805) * it's crashing * fix stuff * fix xmls * problematic objects * fix tabs * Fix suffixes * add missing new lines * Add comments to the problematic objects * Find and replace fixes * Add Fig's objects * I forgot to add a Name in a cutscene, so I'm adding it here * Update object decomp tutorial a little bit * Update problematic objects * Update docs/tutorial/object_decomp.md Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Change comments * comment out a few blobs * dammit tluts * Change a bunch of objects * update the last bunch * update comments on oA11 and oB2 * Ninja-edit to fix compatibility with ZAPD's PR 142 Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-05-16 16:36:40 +00:00
include "build/assets/objects/object_mori_hineri2a/object_mori_hineri2a.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_mori_objects"
romalign 0x1000
Decompile a bunch of objects (#603) * Mostly done but shifted * still messed up * Almost OK * OBJECT_JYA_OBJ OK, OBJECT_GR OK * Done * Merge master and format * Cleanup * Cleanup 2 * Start object MB dont merge yet * Object_MB OK * Object_ydan_objects OK * General 'ydan' actor cleanup * Forgot some small things * Object_EC OK * add .gitkeep and run format * Object_sd OK but no textures cause of a zap issue * PR fixes * Fix object_sd * fix ydan * delete .gitkeep files * OBJECT_BOX as far as it can go with current ZAP * Fix undefined_syms * Start child link object * Push progress, dont merge yet * Object_mori_objects OK * Fixed? * Fix conflicts again * Seems like i missed some textures * Extract data for BgBombwall * More field * ZAP YEP 2.0 * Object_Box OK * Object_SD ok. Ready to merge * remove ASM and merge master * remove ASM * remove files wrongfully added to docs/ * Almost done * Change comment in z_player_lib.c * forgot some DLists in player_lib.c * Fix conflict, run format * Same as before but this time with Tex and TLUT * Last few things * fix object_GR and add limbs to object_sd * Nane -> Name * gChildDekuShieldMtx is now a matrix and not a blob * PR fixes (Fig) * add a space for comment in z_player_lib.c * re push and new lines * PR fixes (AngheloAlf) * PR fixes (Roman) * Fix Heishi2 * PR fixes (Fig) * Replace spacing in a file * PR fixes (Roman)
2021-05-26 22:59:21 +00:00
include "build/assets/objects/object_mori_objects/object_mori_objects.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_mori_tex"
romalign 0x1000
Add every unreserved object in an automated way (#805) * it's crashing * fix stuff * fix xmls * problematic objects * fix tabs * Fix suffixes * add missing new lines * Add comments to the problematic objects * Find and replace fixes * Add Fig's objects * I forgot to add a Name in a cutscene, so I'm adding it here * Update object decomp tutorial a little bit * Update problematic objects * Update docs/tutorial/object_decomp.md Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Change comments * comment out a few blobs * dammit tluts * Change a bunch of objects * update the last bunch * update comments on oA11 and oB2 * Ninja-edit to fix compatibility with ZAPD's PR 142 Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-05-16 16:36:40 +00:00
include "build/assets/objects/object_mori_tex/object_mori_tex.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_spot08_obj"
romalign 0x1000
Decompiled A LOT of objects (#815) * . * remove tools/ZAP2 from origin master * object_spot04_objects * remove accidentally added xml * object_spot00_objects * object_bombf ok * object_dy_obj * object_masterzoora * object_mastergolon and object_masterkokirihead * object_aob * object_gt * object_gt * object_geff * object_mag kinda * object_gjyo_objects OK * object_ani OK * object_door_gerudo * object_md and object_trap * object_js OK * object_goroiwa * object_gs * object_nwc * object_niw * object_ane * object_os_anime OK * object_d_hsblock OK * object_fz OK * object_ru2 OK * fixed object_mag * object_cow OK * object_spot01_objects OK * object_spot15_obj * object_umajump OK * object_spot18_obj * object_spot12_obj * fix symbols in z_item_b_heart * object_bdan_objects & object_bowl * object_ddan_objects * object_owl OK * object_spot01_matoyab.xml OK * object_haka OK * object_heavy_object * object_ingate and objet_menkuri_objects * objet_spot00_break & object_relay_objects OK * object_spot01_matoya OK * object_spot06_objects OK * undefined_syms * object_spot08_obj OK * object_efc_doughnut & object_zg * object_ik OK * object_vm * object_ei OK * object_ds OK * updated spec * map_48x85_static OK * object_zl1 & object_peehat ok * some z_parameter naming and other undefined symbol stuff, object_yukabyun OK * object_bubble & object_fw ok * object_shopnuts * restore delete file * object_timeblock OK * object_d_lift OK * object_kibako2 OK * object_mamenoki OK * matches * remove unused asm * object_mag ok now * fixed object_ani * done for now, im tired * object_bdan_objects fixed up * fix bdan * object_bombf fixed * object_bowl fixed up * object_cow fixed * did more, im tired * fixed some stuff in object_ddan_objects * fix object_ddan_object * object_door_gerudo fixed * object_ds fix * object_dy progress * fixed great fairy * some more * more * object_haka fix * progress * ingo_gate fixed * object_js * forgot collision * object_relay_objects fixed * object_kibako2 * object_mag fixed * u64* to void* * more u64* to void* * object_mamenoki fix * object_mastergolon & object_masterkokirihead fix * mido is weird * fixed build * fix object_menkuri_objects * add missing textures in object_menkuri_objects * object_ms * fixed object_peehat * some cleanup stuff * object_zg fix * object_spot00_break fix * object_niw fix * object_nwc fixed * object_ru2 object_rr and some of object_owl fix * object_spot15_obj fix * business scrub * object_spot01_matoya fixed * object_spot18_obj fix * object_spot01_objects fix * object_spot04_objects fix * object_spot04_objects actually fixed * object_spot12_obj fix * object_timeblock fix * object_spot06_objects fixed * object_spot08_obj fix * spot01_matoyab fix * object_trap fix * object_umajump fix * object_vm fix * z_en_niw_lady fix * object_yukabyun fix * object_zl1 fixed * added offsets to object_os_anime * object_md fix * object_ane fix * object_aob fix * add palette comment * object_spot00_objects fix * spot00 fix * remove unused asm * updates * Add TlutOffset to objects added in https://github.com/zeldaret/oot/pull/815 * Updated object_bdan_objects, ran format.sh * Change rgb5a1 to rgba16 in my object xmls * Addressed Anghelo's comments * review Co-authored-by: Lucas Shaw <lucas.shaw1123@gmail.com> Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-08-05 15:53:58 +00:00
include "build/assets/objects/object_spot08_obj/object_spot08_obj.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_warp2"
romalign 0x1000
Add every unreserved object in an automated way (#805) * it's crashing * fix stuff * fix xmls * problematic objects * fix tabs * Fix suffixes * add missing new lines * Add comments to the problematic objects * Find and replace fixes * Add Fig's objects * I forgot to add a Name in a cutscene, so I'm adding it here * Update object decomp tutorial a little bit * Update problematic objects * Update docs/tutorial/object_decomp.md Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Change comments * comment out a few blobs * dammit tluts * Change a bunch of objects * update the last bunch * update comments on oA11 and oB2 * Ninja-edit to fix compatibility with ZAPD's PR 142 Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-05-16 16:36:40 +00:00
include "build/assets/objects/object_warp2/object_warp2.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_hata"
romalign 0x1000
object_hata OK (#806) * everything except limbs * spec * object_hata OK * Replace symbols, unused data, enums, some cleanup * Fix compiler warnings in EnRiverSound * Address Roman's review * Correct limbs name
2021-05-17 18:57:59 +00:00
include "build/assets/objects/object_hata/object_hata.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_bird"
romalign 0x1000
Add every unreserved object in an automated way (#805) * it's crashing * fix stuff * fix xmls * problematic objects * fix tabs * Fix suffixes * add missing new lines * Add comments to the problematic objects * Find and replace fixes * Add Fig's objects * I forgot to add a Name in a cutscene, so I'm adding it here * Update object decomp tutorial a little bit * Update problematic objects * Update docs/tutorial/object_decomp.md Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Change comments * comment out a few blobs * dammit tluts * Change a bunch of objects * update the last bunch * update comments on oA11 and oB2 * Ninja-edit to fix compatibility with ZAPD's PR 142 Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-05-16 16:36:40 +00:00
include "build/assets/objects/object_bird/object_bird.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_wood02"
romalign 0x1000
Add every unreserved object in an automated way (#805) * it's crashing * fix stuff * fix xmls * problematic objects * fix tabs * Fix suffixes * add missing new lines * Add comments to the problematic objects * Find and replace fixes * Add Fig's objects * I forgot to add a Name in a cutscene, so I'm adding it here * Update object decomp tutorial a little bit * Update problematic objects * Update docs/tutorial/object_decomp.md Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Change comments * comment out a few blobs * dammit tluts * Change a bunch of objects * update the last bunch * update comments on oA11 and oB2 * Ninja-edit to fix compatibility with ZAPD's PR 142 Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-05-16 16:36:40 +00:00
include "build/assets/objects/object_wood02/object_wood02.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_lightbox"
romalign 0x1000
Add every unreserved object in an automated way (#805) * it's crashing * fix stuff * fix xmls * problematic objects * fix tabs * Fix suffixes * add missing new lines * Add comments to the problematic objects * Find and replace fixes * Add Fig's objects * I forgot to add a Name in a cutscene, so I'm adding it here * Update object decomp tutorial a little bit * Update problematic objects * Update docs/tutorial/object_decomp.md Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Change comments * comment out a few blobs * dammit tluts * Change a bunch of objects * update the last bunch * update comments on oA11 and oB2 * Ninja-edit to fix compatibility with ZAPD's PR 142 Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-05-16 16:36:40 +00:00
include "build/assets/objects/object_lightbox/object_lightbox.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_pu_box"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/objects/object_pu_box/object_pu_box.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_trap"
romalign 0x1000
Decompiled A LOT of objects (#815) * . * remove tools/ZAP2 from origin master * object_spot04_objects * remove accidentally added xml * object_spot00_objects * object_bombf ok * object_dy_obj * object_masterzoora * object_mastergolon and object_masterkokirihead * object_aob * object_gt * object_gt * object_geff * object_mag kinda * object_gjyo_objects OK * object_ani OK * object_door_gerudo * object_md and object_trap * object_js OK * object_goroiwa * object_gs * object_nwc * object_niw * object_ane * object_os_anime OK * object_d_hsblock OK * object_fz OK * object_ru2 OK * fixed object_mag * object_cow OK * object_spot01_objects OK * object_spot15_obj * object_umajump OK * object_spot18_obj * object_spot12_obj * fix symbols in z_item_b_heart * object_bdan_objects & object_bowl * object_ddan_objects * object_owl OK * object_spot01_matoyab.xml OK * object_haka OK * object_heavy_object * object_ingate and objet_menkuri_objects * objet_spot00_break & object_relay_objects OK * object_spot01_matoya OK * object_spot06_objects OK * undefined_syms * object_spot08_obj OK * object_efc_doughnut & object_zg * object_ik OK * object_vm * object_ei OK * object_ds OK * updated spec * map_48x85_static OK * object_zl1 & object_peehat ok * some z_parameter naming and other undefined symbol stuff, object_yukabyun OK * object_bubble & object_fw ok * object_shopnuts * restore delete file * object_timeblock OK * object_d_lift OK * object_kibako2 OK * object_mamenoki OK * matches * remove unused asm * object_mag ok now * fixed object_ani * done for now, im tired * object_bdan_objects fixed up * fix bdan * object_bombf fixed * object_bowl fixed up * object_cow fixed * did more, im tired * fixed some stuff in object_ddan_objects * fix object_ddan_object * object_door_gerudo fixed * object_ds fix * object_dy progress * fixed great fairy * some more * more * object_haka fix * progress * ingo_gate fixed * object_js * forgot collision * object_relay_objects fixed * object_kibako2 * object_mag fixed * u64* to void* * more u64* to void* * object_mamenoki fix * object_mastergolon & object_masterkokirihead fix * mido is weird * fixed build * fix object_menkuri_objects * add missing textures in object_menkuri_objects * object_ms * fixed object_peehat * some cleanup stuff * object_zg fix * object_spot00_break fix * object_niw fix * object_nwc fixed * object_ru2 object_rr and some of object_owl fix * object_spot15_obj fix * business scrub * object_spot01_matoya fixed * object_spot18_obj fix * object_spot01_objects fix * object_spot04_objects fix * object_spot04_objects actually fixed * object_spot12_obj fix * object_timeblock fix * object_spot06_objects fixed * object_spot08_obj fix * spot01_matoyab fix * object_trap fix * object_umajump fix * object_vm fix * z_en_niw_lady fix * object_yukabyun fix * object_zl1 fixed * added offsets to object_os_anime * object_md fix * object_ane fix * object_aob fix * add palette comment * object_spot00_objects fix * spot00 fix * remove unused asm * updates * Add TlutOffset to objects added in https://github.com/zeldaret/oot/pull/815 * Updated object_bdan_objects, ran format.sh * Change rgb5a1 to rgba16 in my object xmls * Addressed Anghelo's comments * review Co-authored-by: Lucas Shaw <lucas.shaw1123@gmail.com> Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-08-05 15:53:58 +00:00
include "build/assets/objects/object_trap/object_trap.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_vase"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/objects/object_vase/object_vase.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_im"
romalign 0x1000
Add every unreserved object in an automated way (#805) * it's crashing * fix stuff * fix xmls * problematic objects * fix tabs * Fix suffixes * add missing new lines * Add comments to the problematic objects * Find and replace fixes * Add Fig's objects * I forgot to add a Name in a cutscene, so I'm adding it here * Update object decomp tutorial a little bit * Update problematic objects * Update docs/tutorial/object_decomp.md Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Change comments * comment out a few blobs * dammit tluts * Change a bunch of objects * update the last bunch * update comments on oA11 and oB2 * Ninja-edit to fix compatibility with ZAPD's PR 142 Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-05-16 16:36:40 +00:00
include "build/assets/objects/object_im/object_im.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_ta"
romalign 0x1000
Add every unreserved object in an automated way (#805) * it's crashing * fix stuff * fix xmls * problematic objects * fix tabs * Fix suffixes * add missing new lines * Add comments to the problematic objects * Find and replace fixes * Add Fig's objects * I forgot to add a Name in a cutscene, so I'm adding it here * Update object decomp tutorial a little bit * Update problematic objects * Update docs/tutorial/object_decomp.md Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Change comments * comment out a few blobs * dammit tluts * Change a bunch of objects * update the last bunch * update comments on oA11 and oB2 * Ninja-edit to fix compatibility with ZAPD's PR 142 Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-05-16 16:36:40 +00:00
include "build/assets/objects/object_ta/object_ta.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_tk"
romalign 0x1000
Poe Objects (#743) * poe objects * Last unaccounted resolved, name suffix fixes * remove _tex * missed 2 * format Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-04-04 21:48:12 +00:00
include "build/assets/objects/object_tk/object_tk.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_xc"
romalign 0x1000
ovl_En_Xc and object_xc OK (#746) * Started * did some more * did a few more * update * Fixed corrupted git repo * did some more * Did a few more functions * taking a break * fix undefined * matched the stupid hard function * a few more * did some more, done for tonight * commit in case i mess up * 3 non matching * . * remove tools/ZAP2 from origin master * idk * i cant figure this out * object_xc OK * compiles now * the evil function is now ok * z_en_xc OK * some documentation * more documentation i guess * more documentation * more z_en_xc docs * z_en_xc updates * Final pass, its been nearly a year * Remove unnecessary comment * forgot to remove unused asm * Merge * Made suggested changes and fixed warnings in z_en_xc * Remove symbols from undefined_syms.txt * Add some missing animmode to en_Xc * review * review * fix tot cutscene * comment Co-authored-by: Lucas Shaw <lucas.shaw1123@gmail.com> Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-04-14 22:49:56 +00:00
include "build/assets/objects/object_xc/object_xc.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_vm"
romalign 0x1000
Decompiled A LOT of objects (#815) * . * remove tools/ZAP2 from origin master * object_spot04_objects * remove accidentally added xml * object_spot00_objects * object_bombf ok * object_dy_obj * object_masterzoora * object_mastergolon and object_masterkokirihead * object_aob * object_gt * object_gt * object_geff * object_mag kinda * object_gjyo_objects OK * object_ani OK * object_door_gerudo * object_md and object_trap * object_js OK * object_goroiwa * object_gs * object_nwc * object_niw * object_ane * object_os_anime OK * object_d_hsblock OK * object_fz OK * object_ru2 OK * fixed object_mag * object_cow OK * object_spot01_objects OK * object_spot15_obj * object_umajump OK * object_spot18_obj * object_spot12_obj * fix symbols in z_item_b_heart * object_bdan_objects & object_bowl * object_ddan_objects * object_owl OK * object_spot01_matoyab.xml OK * object_haka OK * object_heavy_object * object_ingate and objet_menkuri_objects * objet_spot00_break & object_relay_objects OK * object_spot01_matoya OK * object_spot06_objects OK * undefined_syms * object_spot08_obj OK * object_efc_doughnut & object_zg * object_ik OK * object_vm * object_ei OK * object_ds OK * updated spec * map_48x85_static OK * object_zl1 & object_peehat ok * some z_parameter naming and other undefined symbol stuff, object_yukabyun OK * object_bubble & object_fw ok * object_shopnuts * restore delete file * object_timeblock OK * object_d_lift OK * object_kibako2 OK * object_mamenoki OK * matches * remove unused asm * object_mag ok now * fixed object_ani * done for now, im tired * object_bdan_objects fixed up * fix bdan * object_bombf fixed * object_bowl fixed up * object_cow fixed * did more, im tired * fixed some stuff in object_ddan_objects * fix object_ddan_object * object_door_gerudo fixed * object_ds fix * object_dy progress * fixed great fairy * some more * more * object_haka fix * progress * ingo_gate fixed * object_js * forgot collision * object_relay_objects fixed * object_kibako2 * object_mag fixed * u64* to void* * more u64* to void* * object_mamenoki fix * object_mastergolon & object_masterkokirihead fix * mido is weird * fixed build * fix object_menkuri_objects * add missing textures in object_menkuri_objects * object_ms * fixed object_peehat * some cleanup stuff * object_zg fix * object_spot00_break fix * object_niw fix * object_nwc fixed * object_ru2 object_rr and some of object_owl fix * object_spot15_obj fix * business scrub * object_spot01_matoya fixed * object_spot18_obj fix * object_spot01_objects fix * object_spot04_objects fix * object_spot04_objects actually fixed * object_spot12_obj fix * object_timeblock fix * object_spot06_objects fixed * object_spot08_obj fix * spot01_matoyab fix * object_trap fix * object_umajump fix * object_vm fix * z_en_niw_lady fix * object_yukabyun fix * object_zl1 fixed * added offsets to object_os_anime * object_md fix * object_ane fix * object_aob fix * add palette comment * object_spot00_objects fix * spot00 fix * remove unused asm * updates * Add TlutOffset to objects added in https://github.com/zeldaret/oot/pull/815 * Updated object_bdan_objects, ran format.sh * Change rgb5a1 to rgba16 in my object xmls * Addressed Anghelo's comments * review Co-authored-by: Lucas Shaw <lucas.shaw1123@gmail.com> Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-08-05 15:53:58 +00:00
include "build/assets/objects/object_vm/object_vm.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_bv"
romalign 0x1000
Barinade (Boss_Va) (#529) * Darkmeiro decompilation Bg_Gnd_Darkmeiro decompiled, matched, and documented. * give this a shot * fix conflict * one more try * could be useful * whoops * ZAP2 stuff * ZAP why * ZAP again * When life gives you Bari, make Barinade * Now with more names * merge * enums everywhere * just one left * OK * more docs * a little more * I don't even remember what I changed * small cleanup * maybe it's time * weird * not sure what's up with sys_matrix * camera functions * it's no object * unused * back to being unused * git subrepo pull --force tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "6f874af4a" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "6f874af4a" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * hope this works * git subrepo pull --force tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "6f874af4a" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "6f874af4a" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * object fix * stuff * test merge * merge colchk * merge colchk * one more thing * naming things * naming things * implement most suggestions, and format * fixes * format * more fixes * more fixes and format * body -> get_body Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain> Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-08-08 17:57:07 +00:00
include "build/assets/objects/object_bv/object_bv.o"
Automatic objects 2 (#889) * adding missing objects * update rgba16 format * comment blobs * Fix blobs * add another missing one * add newlines to XMLs * remove objects from other PRs * add TlutOffset Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
2021-08-06 19:18:29 +00:00
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_hakach_objects"
romalign 0x1000
"Decompile" more objects. (#784) * Object_hakach_objects OK and fix a warning in z_play.c * Object Warp1 OK * Object_spot16_obj OK * object_cs Skeleton and limbs OK * Limbs are broken * Limbs OK * Object_CS OK * Object_jya_door OK * fix errors and add new lines * PR fixes (AngheloAlf) * PR fixes (EllipticEllipsis) * PR fixes (Fig) * Rename Spot16 and Jya * GraveYard -> Graveyard * PR fixes * -s * PR fixes
2021-05-30 16:30:38 +00:00
include "build/assets/objects/object_hakach_objects/object_hakach_objects.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_efc_crystal_light"
romalign 0x1000
Objects used in DemoEffect OK (#731) * object_triforce_spot * object_gi_jewel * object_efc_crystal_light * object_efc_fire_ball * object_efc_lgt_shower * object_god_lgt * object_light_ring * object_efc_tw * undefined_syms * fix gameplay_keep
2021-03-24 00:40:36 +00:00
include "build/assets/objects/object_efc_crystal_light/object_efc_crystal_light.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_efc_fire_ball"
romalign 0x1000
Objects used in DemoEffect OK (#731) * object_triforce_spot * object_gi_jewel * object_efc_crystal_light * object_efc_fire_ball * object_efc_lgt_shower * object_god_lgt * object_light_ring * object_efc_tw * undefined_syms * fix gameplay_keep
2021-03-24 00:40:36 +00:00
include "build/assets/objects/object_efc_fire_ball/object_efc_fire_ball.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_efc_flash"
romalign 0x1000
Add every unreserved object in an automated way (#805) * it's crashing * fix stuff * fix xmls * problematic objects * fix tabs * Fix suffixes * add missing new lines * Add comments to the problematic objects * Find and replace fixes * Add Fig's objects * I forgot to add a Name in a cutscene, so I'm adding it here * Update object decomp tutorial a little bit * Update problematic objects * Update docs/tutorial/object_decomp.md Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Change comments * comment out a few blobs * dammit tluts * Change a bunch of objects * update the last bunch * update comments on oA11 and oB2 * Ninja-edit to fix compatibility with ZAPD's PR 142 Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-05-16 16:36:40 +00:00
include "build/assets/objects/object_efc_flash/object_efc_flash.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_efc_lgt_shower"
romalign 0x1000
Objects used in DemoEffect OK (#731) * object_triforce_spot * object_gi_jewel * object_efc_crystal_light * object_efc_fire_ball * object_efc_lgt_shower * object_god_lgt * object_light_ring * object_efc_tw * undefined_syms * fix gameplay_keep
2021-03-24 00:40:36 +00:00
include "build/assets/objects/object_efc_lgt_shower/object_efc_lgt_shower.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_efc_star_field"
romalign 0x1000
Add every unreserved object in an automated way (#805) * it's crashing * fix stuff * fix xmls * problematic objects * fix tabs * Fix suffixes * add missing new lines * Add comments to the problematic objects * Find and replace fixes * Add Fig's objects * I forgot to add a Name in a cutscene, so I'm adding it here * Update object decomp tutorial a little bit * Update problematic objects * Update docs/tutorial/object_decomp.md Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Change comments * comment out a few blobs * dammit tluts * Change a bunch of objects * update the last bunch * update comments on oA11 and oB2 * Ninja-edit to fix compatibility with ZAPD's PR 142 Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-05-16 16:36:40 +00:00
include "build/assets/objects/object_efc_star_field/object_efc_star_field.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_god_lgt"
romalign 0x1000
Objects used in DemoEffect OK (#731) * object_triforce_spot * object_gi_jewel * object_efc_crystal_light * object_efc_fire_ball * object_efc_lgt_shower * object_god_lgt * object_light_ring * object_efc_tw * undefined_syms * fix gameplay_keep
2021-03-24 00:40:36 +00:00
include "build/assets/objects/object_god_lgt/object_god_lgt.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_light_ring"
romalign 0x1000
Objects used in DemoEffect OK (#731) * object_triforce_spot * object_gi_jewel * object_efc_crystal_light * object_efc_fire_ball * object_efc_lgt_shower * object_god_lgt * object_light_ring * object_efc_tw * undefined_syms * fix gameplay_keep
2021-03-24 00:40:36 +00:00
include "build/assets/objects/object_light_ring/object_light_ring.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_triforce_spot"
romalign 0x1000
Objects used in DemoEffect OK (#731) * object_triforce_spot * object_gi_jewel * object_efc_crystal_light * object_efc_fire_ball * object_efc_lgt_shower * object_god_lgt * object_light_ring * object_efc_tw * undefined_syms * fix gameplay_keep
2021-03-24 00:40:36 +00:00
include "build/assets/objects/object_triforce_spot/object_triforce_spot.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_medal"
romalign 0x1000
Add every unreserved object in an automated way (#805) * it's crashing * fix stuff * fix xmls * problematic objects * fix tabs * Fix suffixes * add missing new lines * Add comments to the problematic objects * Find and replace fixes * Add Fig's objects * I forgot to add a Name in a cutscene, so I'm adding it here * Update object decomp tutorial a little bit * Update problematic objects * Update docs/tutorial/object_decomp.md Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Change comments * comment out a few blobs * dammit tluts * Change a bunch of objects * update the last bunch * update comments on oA11 and oB2 * Ninja-edit to fix compatibility with ZAPD's PR 142 Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-05-16 16:36:40 +00:00
include "build/assets/objects/object_medal/object_medal.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_bdan_objects"
romalign 0x1000
Decompiled A LOT of objects (#815) * . * remove tools/ZAP2 from origin master * object_spot04_objects * remove accidentally added xml * object_spot00_objects * object_bombf ok * object_dy_obj * object_masterzoora * object_mastergolon and object_masterkokirihead * object_aob * object_gt * object_gt * object_geff * object_mag kinda * object_gjyo_objects OK * object_ani OK * object_door_gerudo * object_md and object_trap * object_js OK * object_goroiwa * object_gs * object_nwc * object_niw * object_ane * object_os_anime OK * object_d_hsblock OK * object_fz OK * object_ru2 OK * fixed object_mag * object_cow OK * object_spot01_objects OK * object_spot15_obj * object_umajump OK * object_spot18_obj * object_spot12_obj * fix symbols in z_item_b_heart * object_bdan_objects & object_bowl * object_ddan_objects * object_owl OK * object_spot01_matoyab.xml OK * object_haka OK * object_heavy_object * object_ingate and objet_menkuri_objects * objet_spot00_break & object_relay_objects OK * object_spot01_matoya OK * object_spot06_objects OK * undefined_syms * object_spot08_obj OK * object_efc_doughnut & object_zg * object_ik OK * object_vm * object_ei OK * object_ds OK * updated spec * map_48x85_static OK * object_zl1 & object_peehat ok * some z_parameter naming and other undefined symbol stuff, object_yukabyun OK * object_bubble & object_fw ok * object_shopnuts * restore delete file * object_timeblock OK * object_d_lift OK * object_kibako2 OK * object_mamenoki OK * matches * remove unused asm * object_mag ok now * fixed object_ani * done for now, im tired * object_bdan_objects fixed up * fix bdan * object_bombf fixed * object_bowl fixed up * object_cow fixed * did more, im tired * fixed some stuff in object_ddan_objects * fix object_ddan_object * object_door_gerudo fixed * object_ds fix * object_dy progress * fixed great fairy * some more * more * object_haka fix * progress * ingo_gate fixed * object_js * forgot collision * object_relay_objects fixed * object_kibako2 * object_mag fixed * u64* to void* * more u64* to void* * object_mamenoki fix * object_mastergolon & object_masterkokirihead fix * mido is weird * fixed build * fix object_menkuri_objects * add missing textures in object_menkuri_objects * object_ms * fixed object_peehat * some cleanup stuff * object_zg fix * object_spot00_break fix * object_niw fix * object_nwc fixed * object_ru2 object_rr and some of object_owl fix * object_spot15_obj fix * business scrub * object_spot01_matoya fixed * object_spot18_obj fix * object_spot01_objects fix * object_spot04_objects fix * object_spot04_objects actually fixed * object_spot12_obj fix * object_timeblock fix * object_spot06_objects fixed * object_spot08_obj fix * spot01_matoyab fix * object_trap fix * object_umajump fix * object_vm fix * z_en_niw_lady fix * object_yukabyun fix * object_zl1 fixed * added offsets to object_os_anime * object_md fix * object_ane fix * object_aob fix * add palette comment * object_spot00_objects fix * spot00 fix * remove unused asm * updates * Add TlutOffset to objects added in https://github.com/zeldaret/oot/pull/815 * Updated object_bdan_objects, ran format.sh * Change rgb5a1 to rgba16 in my object xmls * Addressed Anghelo's comments * review Co-authored-by: Lucas Shaw <lucas.shaw1123@gmail.com> Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-08-05 15:53:58 +00:00
include "build/assets/objects/object_bdan_objects/object_bdan_objects.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_sd"
romalign 0x1000
Decompile a bunch of objects (#603) * Mostly done but shifted * still messed up * Almost OK * OBJECT_JYA_OBJ OK, OBJECT_GR OK * Done * Merge master and format * Cleanup * Cleanup 2 * Start object MB dont merge yet * Object_MB OK * Object_ydan_objects OK * General 'ydan' actor cleanup * Forgot some small things * Object_EC OK * add .gitkeep and run format * Object_sd OK but no textures cause of a zap issue * PR fixes * Fix object_sd * fix ydan * delete .gitkeep files * OBJECT_BOX as far as it can go with current ZAP * Fix undefined_syms * Start child link object * Push progress, dont merge yet * Object_mori_objects OK * Fixed? * Fix conflicts again * Seems like i missed some textures * Extract data for BgBombwall * More field * ZAP YEP 2.0 * Object_Box OK * Object_SD ok. Ready to merge * remove ASM and merge master * remove ASM * remove files wrongfully added to docs/ * Almost done * Change comment in z_player_lib.c * forgot some DLists in player_lib.c * Fix conflict, run format * Same as before but this time with Tex and TLUT * Last few things * fix object_GR and add limbs to object_sd * Nane -> Name * gChildDekuShieldMtx is now a matrix and not a blob * PR fixes (Fig) * add a space for comment in z_player_lib.c * re push and new lines * PR fixes (AngheloAlf) * PR fixes (Roman) * Fix Heishi2 * PR fixes (Fig) * Replace spacing in a file * PR fixes (Roman)
2021-05-26 22:59:21 +00:00
include "build/assets/objects/object_sd/object_sd.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_rd"
romalign 0x1000
Add every unreserved object in an automated way (#805) * it's crashing * fix stuff * fix xmls * problematic objects * fix tabs * Fix suffixes * add missing new lines * Add comments to the problematic objects * Find and replace fixes * Add Fig's objects * I forgot to add a Name in a cutscene, so I'm adding it here * Update object decomp tutorial a little bit * Update problematic objects * Update docs/tutorial/object_decomp.md Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Change comments * comment out a few blobs * dammit tluts * Change a bunch of objects * update the last bunch * update comments on oA11 and oB2 * Ninja-edit to fix compatibility with ZAPD's PR 142 Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-05-16 16:36:40 +00:00
include "build/assets/objects/object_rd/object_rd.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_po_sisters"
romalign 0x1000
Poe Objects (#743) * poe objects * Last unaccounted resolved, name suffix fixes * remove _tex * missed 2 * format Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-04-04 21:48:12 +00:00
include "build/assets/objects/object_po_sisters/object_po_sisters.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_heavy_object"
romalign 0x1000
Decompiled A LOT of objects (#815) * . * remove tools/ZAP2 from origin master * object_spot04_objects * remove accidentally added xml * object_spot00_objects * object_bombf ok * object_dy_obj * object_masterzoora * object_mastergolon and object_masterkokirihead * object_aob * object_gt * object_gt * object_geff * object_mag kinda * object_gjyo_objects OK * object_ani OK * object_door_gerudo * object_md and object_trap * object_js OK * object_goroiwa * object_gs * object_nwc * object_niw * object_ane * object_os_anime OK * object_d_hsblock OK * object_fz OK * object_ru2 OK * fixed object_mag * object_cow OK * object_spot01_objects OK * object_spot15_obj * object_umajump OK * object_spot18_obj * object_spot12_obj * fix symbols in z_item_b_heart * object_bdan_objects & object_bowl * object_ddan_objects * object_owl OK * object_spot01_matoyab.xml OK * object_haka OK * object_heavy_object * object_ingate and objet_menkuri_objects * objet_spot00_break & object_relay_objects OK * object_spot01_matoya OK * object_spot06_objects OK * undefined_syms * object_spot08_obj OK * object_efc_doughnut & object_zg * object_ik OK * object_vm * object_ei OK * object_ds OK * updated spec * map_48x85_static OK * object_zl1 & object_peehat ok * some z_parameter naming and other undefined symbol stuff, object_yukabyun OK * object_bubble & object_fw ok * object_shopnuts * restore delete file * object_timeblock OK * object_d_lift OK * object_kibako2 OK * object_mamenoki OK * matches * remove unused asm * object_mag ok now * fixed object_ani * done for now, im tired * object_bdan_objects fixed up * fix bdan * object_bombf fixed * object_bowl fixed up * object_cow fixed * did more, im tired * fixed some stuff in object_ddan_objects * fix object_ddan_object * object_door_gerudo fixed * object_ds fix * object_dy progress * fixed great fairy * some more * more * object_haka fix * progress * ingo_gate fixed * object_js * forgot collision * object_relay_objects fixed * object_kibako2 * object_mag fixed * u64* to void* * more u64* to void* * object_mamenoki fix * object_mastergolon & object_masterkokirihead fix * mido is weird * fixed build * fix object_menkuri_objects * add missing textures in object_menkuri_objects * object_ms * fixed object_peehat * some cleanup stuff * object_zg fix * object_spot00_break fix * object_niw fix * object_nwc fixed * object_ru2 object_rr and some of object_owl fix * object_spot15_obj fix * business scrub * object_spot01_matoya fixed * object_spot18_obj fix * object_spot01_objects fix * object_spot04_objects fix * object_spot04_objects actually fixed * object_spot12_obj fix * object_timeblock fix * object_spot06_objects fixed * object_spot08_obj fix * spot01_matoyab fix * object_trap fix * object_umajump fix * object_vm fix * z_en_niw_lady fix * object_yukabyun fix * object_zl1 fixed * added offsets to object_os_anime * object_md fix * object_ane fix * object_aob fix * add palette comment * object_spot00_objects fix * spot00 fix * remove unused asm * updates * Add TlutOffset to objects added in https://github.com/zeldaret/oot/pull/815 * Updated object_bdan_objects, ran format.sh * Change rgb5a1 to rgba16 in my object xmls * Addressed Anghelo's comments * review Co-authored-by: Lucas Shaw <lucas.shaw1123@gmail.com> Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-08-05 15:53:58 +00:00
include "build/assets/objects/object_heavy_object/object_heavy_object.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_gndd"
romalign 0x1000
Add every unreserved object in an automated way (#805) * it's crashing * fix stuff * fix xmls * problematic objects * fix tabs * Fix suffixes * add missing new lines * Add comments to the problematic objects * Find and replace fixes * Add Fig's objects * I forgot to add a Name in a cutscene, so I'm adding it here * Update object decomp tutorial a little bit * Update problematic objects * Update docs/tutorial/object_decomp.md Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Change comments * comment out a few blobs * dammit tluts * Change a bunch of objects * update the last bunch * update comments on oA11 and oB2 * Ninja-edit to fix compatibility with ZAPD's PR 142 Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-05-16 16:36:40 +00:00
include "build/assets/objects/object_gndd/object_gndd.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_fd"
romalign 0x1000
Volvagia (ovl_Boss_Fd) and related actors (#352) * Darkmeiro decompilation Bg_Gnd_Darkmeiro decompiled, matched, and documented. * Lots of functions matched. Some big ones are close. * Five left unmatched, one close. * Merged data and decompiled the giant function into something readable. Its branch structure has yet to be matched. * Three unmatched, one essentially matched, the rest matched. * More fixes. * Documented more of the structure and cleaned up a bit. * BossFd2, BgVbSima, and EnVbBall matched and documented * Also removed unneeded .s files * And need to name EnVbBall's functions * give this a shot * fix conflict * one more try * removing darkmeiro changes * and again * now OK from make clean * minor cleanup * One more matching function for BossFd * which means it doesn't need its .s * splitting * splitting * splitting * forgot some .s * fancy new names * fancy new names * trying again * sneaky .s files * sound effects and some hex to decimal conversions * Sound effects and static variable cleanup * format.sh and clean up static variables * sfx and formatting * ZAP and cleanup * small cleanup * cleanup and ZAP * ZAP * looking at the giant function again * looking at the giant function again * Only the big function left. * Those .s files aren't mine, officer * float literals might be fixed. regalloc still a nightmare * almost done with the big function * should make now * not much of a change * all functions match. rodata somehow doesn't. * forgot some things * lots of cleanup * and a little more * small error * large cleanup. Also BossFd has function names and inlined variable declarations * still more cleanup * the quest for 0.1f continues * forgot to put NON_MATCHING back in * Data structures fully documented. Still more cleanup. * DECR now works with BossFd2 * should match now * cleanup * small cleanup * cleanup and names * tiny thing * particles and headers and stuff * now with more enums * merge * test * end test * update * cleanup * object 2 * object 1 * doc object_fd2 * git subrepo pull --force tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "6f874af4a" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "6f874af4a" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * formatting * .s * merge actor * vertex arrays * a little more * formatting * merge opd * fixed damage check * cleanup * fixes * effect struct * review Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain> Co-authored-by: fig02 <fig02srl@gmail.com>
2021-04-17 17:12:46 +00:00
include "build/assets/objects/object_fd/object_fd.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_du"
romalign 0x1000
object_du OK (#693) * .gitkeep and xml Signed-off-by: angie <angheloalf95@gmail.com> * comment out most of the xml Signed-off-by: angie <angheloalf95@gmail.com> * add all animations Signed-off-by: angie <angheloalf95@gmail.com> * textures Signed-off-by: angie <angheloalf95@gmail.com> * more textures Signed-off-by: angie <angheloalf95@gmail.com> * another texture Signed-off-by: angie <angheloalf95@gmail.com> * eye and mouth textures Signed-off-by: Anghelo <angheloalf95@gmail.com> * add to spec and comment out a problematic skeleton Signed-off-by: Anghelo <angheloalf95@gmail.com> * replace almost all d_ references Signed-off-by: Anghelo <angheloalf95@gmail.com> * add missing include Signed-off-by: Anghelo <angheloalf95@gmail.com> * fix problems with overlapping data Signed-off-by: angie <angheloalf95@gmail.com> * replace references to Darunia's skeleton Signed-off-by: Angie <angheloalf95@gmail.com> * rename cutscenes in en_du Signed-off-by: Angie <angheloalf95@gmail.com> * last renaming Signed-off-by: Angie <angheloalf95@gmail.com> * ups, forgot to delete some pointers from undefined_syms.txt Signed-off-by: Angie <angheloalf95@gmail.com> * Rename the animations Signed-off-by: angie <angheloalf95@gmail.com> * run format Signed-off-by: angie <angheloalf95@gmail.com> * gDaruniaSageFormationAnim Signed-off-by: angie <angheloalf95@gmail.com> * update actor symbols from object Signed-off-by: angie <angheloalf95@gmail.com> * rename eyes Signed-off-by: angie <angheloalf95@gmail.com> * rename a mouth texture Signed-off-by: angie <angheloalf95@gmail.com> * run format.sh Signed-off-by: angie <angheloalf95@gmail.com> * typo Signed-off-by: angie <angheloalf95@gmail.com> * delete gitkeep Signed-off-by: angie <angheloalf95@gmail.com> * link of the pr Signed-off-by: Angie <angheloalf95@gmail.com> * update the cs name to the correct one Signed-off-by: angie <angheloalf95@gmail.com> * tlut Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * add object name to outname in palettes Signed-off-by: angie <angheloalf95@gmail.com> Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2021-03-28 03:02:45 +00:00
include "build/assets/objects/object_du/object_du.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_fw"
romalign 0x1000
Decompiled A LOT of objects (#815) * . * remove tools/ZAP2 from origin master * object_spot04_objects * remove accidentally added xml * object_spot00_objects * object_bombf ok * object_dy_obj * object_masterzoora * object_mastergolon and object_masterkokirihead * object_aob * object_gt * object_gt * object_geff * object_mag kinda * object_gjyo_objects OK * object_ani OK * object_door_gerudo * object_md and object_trap * object_js OK * object_goroiwa * object_gs * object_nwc * object_niw * object_ane * object_os_anime OK * object_d_hsblock OK * object_fz OK * object_ru2 OK * fixed object_mag * object_cow OK * object_spot01_objects OK * object_spot15_obj * object_umajump OK * object_spot18_obj * object_spot12_obj * fix symbols in z_item_b_heart * object_bdan_objects & object_bowl * object_ddan_objects * object_owl OK * object_spot01_matoyab.xml OK * object_haka OK * object_heavy_object * object_ingate and objet_menkuri_objects * objet_spot00_break & object_relay_objects OK * object_spot01_matoya OK * object_spot06_objects OK * undefined_syms * object_spot08_obj OK * object_efc_doughnut & object_zg * object_ik OK * object_vm * object_ei OK * object_ds OK * updated spec * map_48x85_static OK * object_zl1 & object_peehat ok * some z_parameter naming and other undefined symbol stuff, object_yukabyun OK * object_bubble & object_fw ok * object_shopnuts * restore delete file * object_timeblock OK * object_d_lift OK * object_kibako2 OK * object_mamenoki OK * matches * remove unused asm * object_mag ok now * fixed object_ani * done for now, im tired * object_bdan_objects fixed up * fix bdan * object_bombf fixed * object_bowl fixed up * object_cow fixed * did more, im tired * fixed some stuff in object_ddan_objects * fix object_ddan_object * object_door_gerudo fixed * object_ds fix * object_dy progress * fixed great fairy * some more * more * object_haka fix * progress * ingo_gate fixed * object_js * forgot collision * object_relay_objects fixed * object_kibako2 * object_mag fixed * u64* to void* * more u64* to void* * object_mamenoki fix * object_mastergolon & object_masterkokirihead fix * mido is weird * fixed build * fix object_menkuri_objects * add missing textures in object_menkuri_objects * object_ms * fixed object_peehat * some cleanup stuff * object_zg fix * object_spot00_break fix * object_niw fix * object_nwc fixed * object_ru2 object_rr and some of object_owl fix * object_spot15_obj fix * business scrub * object_spot01_matoya fixed * object_spot18_obj fix * object_spot01_objects fix * object_spot04_objects fix * object_spot04_objects actually fixed * object_spot12_obj fix * object_timeblock fix * object_spot06_objects fixed * object_spot08_obj fix * spot01_matoyab fix * object_trap fix * object_umajump fix * object_vm fix * z_en_niw_lady fix * object_yukabyun fix * object_zl1 fixed * added offsets to object_os_anime * object_md fix * object_ane fix * object_aob fix * add palette comment * object_spot00_objects fix * spot00 fix * remove unused asm * updates * Add TlutOffset to objects added in https://github.com/zeldaret/oot/pull/815 * Updated object_bdan_objects, ran format.sh * Change rgb5a1 to rgba16 in my object xmls * Addressed Anghelo's comments * review Co-authored-by: Lucas Shaw <lucas.shaw1123@gmail.com> Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-08-05 15:53:58 +00:00
include "build/assets/objects/object_fw/object_fw.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_horse_link_child"
romalign 0x1000
object_horse_ganon, object_horse_link_child, object_horse_normal and object_horse_zelda OK (#724) * object_horse_zelda Signed-off-by: angie <angheloalf95@gmail.com> * object_horse_normal Signed-off-by: angie <angheloalf95@gmail.com> * object_horse_link_child Signed-off-by: angie <angheloalf95@gmail.com> * object_horse_ganon Signed-off-by: angie <angheloalf95@gmail.com> * object_horse Signed-off-by: angie <angheloalf95@gmail.com> * object_hni Signed-off-by: Angie <angheloalf95@gmail.com> * ZAPD is falling to do vtx Signed-off-by: Angie <angheloalf95@gmail.com> * Testing Signed-off-by: Angie <angheloalf95@gmail.com> * Rename horse_link_child variables Signed-off-by: angie <angheloalf95@gmail.com> * horse_zelda with names Signed-off-by: angie <angheloalf95@gmail.com> * I'm suspecting that this game doesn't use z_en_horse_ganon Signed-off-by: angie <angheloalf95@gmail.com> * Child epona eye textures Signed-off-by: Angie <angheloalf95@gmail.com> * Extract eyes textures from Epona Signed-off-by: Angie <angheloalf95@gmail.com> * Small rename Signed-off-by: Angie <angheloalf95@gmail.com> * change references in EnHorseNormal Signed-off-by: angie <angheloalf95@gmail.com> * Rename a few HorseNormal animations Signed-off-by: angie <angheloalf95@gmail.com> * Add normal horse eye texture Signed-off-by: angie <angheloalf95@gmail.com> * Add some textures Signed-off-by: angie <angheloalf95@gmail.com> * change pointers in EnViewer Signed-off-by: angie <angheloalf95@gmail.com> * Rename some animations of HorseGanon Signed-off-by: angie <angheloalf95@gmail.com> * Add a few dlists in object_horse Signed-off-by: Angie <angheloalf95@gmail.com> * Add whinnies Signed-off-by: Angie <angheloalf95@gmail.com> * Rename last animations remaining in horse_normal and horse_ganon Signed-off-by: angie <angheloalf95@gmail.com> * Remove epona and ingo's horse Signed-off-by: angie <angheloalf95@gmail.com> * ./format.sh Signed-off-by: angie <angheloalf95@gmail.com> * Give a proper name to horses animations Signed-off-by: angie <angheloalf95@gmail.com> * add trailling comma Signed-off-by: Angie <angheloalf95@gmail.com> * remove union of skeletons Signed-off-by: angie <angheloalf95@gmail.com> * change skeletonheader* to void* Signed-off-by: angie <angheloalf95@gmail.com> * remove cast Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * remove cast 2 Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * format.sh Signed-off-by: angie <angheloalf95@gmail.com> Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2021-03-28 03:44:11 +00:00
include "build/assets/objects/object_horse_link_child/object_horse_link_child.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_spot02_objects"
romalign 0x1000
Add every unreserved object in an automated way (#805) * it's crashing * fix stuff * fix xmls * problematic objects * fix tabs * Fix suffixes * add missing new lines * Add comments to the problematic objects * Find and replace fixes * Add Fig's objects * I forgot to add a Name in a cutscene, so I'm adding it here * Update object decomp tutorial a little bit * Update problematic objects * Update docs/tutorial/object_decomp.md Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Change comments * comment out a few blobs * dammit tluts * Change a bunch of objects * update the last bunch * update comments on oA11 and oB2 * Ninja-edit to fix compatibility with ZAPD's PR 142 Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-05-16 16:36:40 +00:00
include "build/assets/objects/object_spot02_objects/object_spot02_objects.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_haka"
romalign 0x1000
Decompiled A LOT of objects (#815) * . * remove tools/ZAP2 from origin master * object_spot04_objects * remove accidentally added xml * object_spot00_objects * object_bombf ok * object_dy_obj * object_masterzoora * object_mastergolon and object_masterkokirihead * object_aob * object_gt * object_gt * object_geff * object_mag kinda * object_gjyo_objects OK * object_ani OK * object_door_gerudo * object_md and object_trap * object_js OK * object_goroiwa * object_gs * object_nwc * object_niw * object_ane * object_os_anime OK * object_d_hsblock OK * object_fz OK * object_ru2 OK * fixed object_mag * object_cow OK * object_spot01_objects OK * object_spot15_obj * object_umajump OK * object_spot18_obj * object_spot12_obj * fix symbols in z_item_b_heart * object_bdan_objects & object_bowl * object_ddan_objects * object_owl OK * object_spot01_matoyab.xml OK * object_haka OK * object_heavy_object * object_ingate and objet_menkuri_objects * objet_spot00_break & object_relay_objects OK * object_spot01_matoya OK * object_spot06_objects OK * undefined_syms * object_spot08_obj OK * object_efc_doughnut & object_zg * object_ik OK * object_vm * object_ei OK * object_ds OK * updated spec * map_48x85_static OK * object_zl1 & object_peehat ok * some z_parameter naming and other undefined symbol stuff, object_yukabyun OK * object_bubble & object_fw ok * object_shopnuts * restore delete file * object_timeblock OK * object_d_lift OK * object_kibako2 OK * object_mamenoki OK * matches * remove unused asm * object_mag ok now * fixed object_ani * done for now, im tired * object_bdan_objects fixed up * fix bdan * object_bombf fixed * object_bowl fixed up * object_cow fixed * did more, im tired * fixed some stuff in object_ddan_objects * fix object_ddan_object * object_door_gerudo fixed * object_ds fix * object_dy progress * fixed great fairy * some more * more * object_haka fix * progress * ingo_gate fixed * object_js * forgot collision * object_relay_objects fixed * object_kibako2 * object_mag fixed * u64* to void* * more u64* to void* * object_mamenoki fix * object_mastergolon & object_masterkokirihead fix * mido is weird * fixed build * fix object_menkuri_objects * add missing textures in object_menkuri_objects * object_ms * fixed object_peehat * some cleanup stuff * object_zg fix * object_spot00_break fix * object_niw fix * object_nwc fixed * object_ru2 object_rr and some of object_owl fix * object_spot15_obj fix * business scrub * object_spot01_matoya fixed * object_spot18_obj fix * object_spot01_objects fix * object_spot04_objects fix * object_spot04_objects actually fixed * object_spot12_obj fix * object_timeblock fix * object_spot06_objects fixed * object_spot08_obj fix * spot01_matoyab fix * object_trap fix * object_umajump fix * object_vm fix * z_en_niw_lady fix * object_yukabyun fix * object_zl1 fixed * added offsets to object_os_anime * object_md fix * object_ane fix * object_aob fix * add palette comment * object_spot00_objects fix * spot00 fix * remove unused asm * updates * Add TlutOffset to objects added in https://github.com/zeldaret/oot/pull/815 * Updated object_bdan_objects, ran format.sh * Change rgb5a1 to rgba16 in my object xmls * Addressed Anghelo's comments * review Co-authored-by: Lucas Shaw <lucas.shaw1123@gmail.com> Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-08-05 15:53:58 +00:00
include "build/assets/objects/object_haka/object_haka.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_ru1"
romalign 0x1000
Add every unreserved object in an automated way (#805) * it's crashing * fix stuff * fix xmls * problematic objects * fix tabs * Fix suffixes * add missing new lines * Add comments to the problematic objects * Find and replace fixes * Add Fig's objects * I forgot to add a Name in a cutscene, so I'm adding it here * Update object decomp tutorial a little bit * Update problematic objects * Update docs/tutorial/object_decomp.md Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Change comments * comment out a few blobs * dammit tluts * Change a bunch of objects * update the last bunch * update comments on oA11 and oB2 * Ninja-edit to fix compatibility with ZAPD's PR 142 Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-05-16 16:36:40 +00:00
include "build/assets/objects/object_ru1/object_ru1.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_syokudai"
romalign 0x1000
Decompile object_syokudai and object_ydan_objects (#699) * add deku and torch objects * why git?
2021-02-17 19:42:59 +00:00
include "build/assets/objects/object_syokudai/object_syokudai.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_fd2"
romalign 0x1000
Volvagia (ovl_Boss_Fd) and related actors (#352) * Darkmeiro decompilation Bg_Gnd_Darkmeiro decompiled, matched, and documented. * Lots of functions matched. Some big ones are close. * Five left unmatched, one close. * Merged data and decompiled the giant function into something readable. Its branch structure has yet to be matched. * Three unmatched, one essentially matched, the rest matched. * More fixes. * Documented more of the structure and cleaned up a bit. * BossFd2, BgVbSima, and EnVbBall matched and documented * Also removed unneeded .s files * And need to name EnVbBall's functions * give this a shot * fix conflict * one more try * removing darkmeiro changes * and again * now OK from make clean * minor cleanup * One more matching function for BossFd * which means it doesn't need its .s * splitting * splitting * splitting * forgot some .s * fancy new names * fancy new names * trying again * sneaky .s files * sound effects and some hex to decimal conversions * Sound effects and static variable cleanup * format.sh and clean up static variables * sfx and formatting * ZAP and cleanup * small cleanup * cleanup and ZAP * ZAP * looking at the giant function again * looking at the giant function again * Only the big function left. * Those .s files aren't mine, officer * float literals might be fixed. regalloc still a nightmare * almost done with the big function * should make now * not much of a change * all functions match. rodata somehow doesn't. * forgot some things * lots of cleanup * and a little more * small error * large cleanup. Also BossFd has function names and inlined variable declarations * still more cleanup * the quest for 0.1f continues * forgot to put NON_MATCHING back in * Data structures fully documented. Still more cleanup. * DECR now works with BossFd2 * should match now * cleanup * small cleanup * cleanup and names * tiny thing * particles and headers and stuff * now with more enums * merge * test * end test * update * cleanup * object 2 * object 1 * doc object_fd2 * git subrepo pull --force tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "6f874af4a" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "6f874af4a" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * formatting * .s * merge actor * vertex arrays * a little more * formatting * merge opd * fixed damage check * cleanup * fixes * effect struct * review Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain> Co-authored-by: fig02 <fig02srl@gmail.com>
2021-04-17 17:12:46 +00:00
include "build/assets/objects/object_fd2/object_fd2.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_dh"
romalign 0x1000
Add every unreserved object in an automated way (#805) * it's crashing * fix stuff * fix xmls * problematic objects * fix tabs * Fix suffixes * add missing new lines * Add comments to the problematic objects * Find and replace fixes * Add Fig's objects * I forgot to add a Name in a cutscene, so I'm adding it here * Update object decomp tutorial a little bit * Update problematic objects * Update docs/tutorial/object_decomp.md Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Change comments * comment out a few blobs * dammit tluts * Change a bunch of objects * update the last bunch * update comments on oA11 and oB2 * Ninja-edit to fix compatibility with ZAPD's PR 142 Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-05-16 16:36:40 +00:00
include "build/assets/objects/object_dh/object_dh.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_rl"
romalign 0x1000
Add every unreserved object in an automated way (#805) * it's crashing * fix stuff * fix xmls * problematic objects * fix tabs * Fix suffixes * add missing new lines * Add comments to the problematic objects * Find and replace fixes * Add Fig's objects * I forgot to add a Name in a cutscene, so I'm adding it here * Update object decomp tutorial a little bit * Update problematic objects * Update docs/tutorial/object_decomp.md Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Change comments * comment out a few blobs * dammit tluts * Change a bunch of objects * update the last bunch * update comments on oA11 and oB2 * Ninja-edit to fix compatibility with ZAPD's PR 142 Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-05-16 16:36:40 +00:00
include "build/assets/objects/object_rl/object_rl.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_efc_tw"
romalign 0x1000
Objects used in DemoEffect OK (#731) * object_triforce_spot * object_gi_jewel * object_efc_crystal_light * object_efc_fire_ball * object_efc_lgt_shower * object_god_lgt * object_light_ring * object_efc_tw * undefined_syms * fix gameplay_keep
2021-03-24 00:40:36 +00:00
include "build/assets/objects/object_efc_tw/object_efc_tw.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_demo_tre_lgt"
romalign 0x1000
Add every unreserved object in an automated way (#805) * it's crashing * fix stuff * fix xmls * problematic objects * fix tabs * Fix suffixes * add missing new lines * Add comments to the problematic objects * Find and replace fixes * Add Fig's objects * I forgot to add a Name in a cutscene, so I'm adding it here * Update object decomp tutorial a little bit * Update problematic objects * Update docs/tutorial/object_decomp.md Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Change comments * comment out a few blobs * dammit tluts * Change a bunch of objects * update the last bunch * update comments on oA11 and oB2 * Ninja-edit to fix compatibility with ZAPD's PR 142 Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-05-16 16:36:40 +00:00
include "build/assets/objects/object_demo_tre_lgt/object_demo_tre_lgt.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_gi_key"
romalign 0x1000
All* Get Item objects decompiled (#668) * All get item objects OK * Name z_draw functions * fix skulltula tokens draw ids * Review suggestions, merge extract_single_asset into extract_assets as an optional argument Co-authored-by: Thar0 <maximilianc64@gmail.com>
2021-02-12 21:57:06 +00:00
include "build/assets/objects/object_gi_key/object_gi_key.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_mir_ray"
romalign 0x1000
object_bg and object_mir_ray OK (#714) * object_bg and object_mir_ray * remove externs in mir_ray * newline at end of xml * fix a couple of warnings in Obj_Tsubo
2021-03-18 07:46:42 +00:00
include "build/assets/objects/object_mir_ray/object_mir_ray.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_brob"
romalign 0x1000
Add every unreserved object in an automated way (#805) * it's crashing * fix stuff * fix xmls * problematic objects * fix tabs * Fix suffixes * add missing new lines * Add comments to the problematic objects * Find and replace fixes * Add Fig's objects * I forgot to add a Name in a cutscene, so I'm adding it here * Update object decomp tutorial a little bit * Update problematic objects * Update docs/tutorial/object_decomp.md Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Change comments * comment out a few blobs * dammit tluts * Change a bunch of objects * update the last bunch * update comments on oA11 and oB2 * Ninja-edit to fix compatibility with ZAPD's PR 142 Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-05-16 16:36:40 +00:00
include "build/assets/objects/object_brob/object_brob.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_gi_jewel"
romalign 0x1000
All* Get Item objects decompiled (#668) * All get item objects OK * Name z_draw functions * fix skulltula tokens draw ids * Review suggestions, merge extract_single_asset into extract_assets as an optional argument Co-authored-by: Thar0 <maximilianc64@gmail.com>
2021-02-12 21:57:06 +00:00
include "build/assets/objects/object_gi_jewel/object_gi_jewel.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_spot09_obj"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/objects/object_spot09_obj/object_spot09_obj.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_spot18_obj"
romalign 0x1000
Decompiled A LOT of objects (#815) * . * remove tools/ZAP2 from origin master * object_spot04_objects * remove accidentally added xml * object_spot00_objects * object_bombf ok * object_dy_obj * object_masterzoora * object_mastergolon and object_masterkokirihead * object_aob * object_gt * object_gt * object_geff * object_mag kinda * object_gjyo_objects OK * object_ani OK * object_door_gerudo * object_md and object_trap * object_js OK * object_goroiwa * object_gs * object_nwc * object_niw * object_ane * object_os_anime OK * object_d_hsblock OK * object_fz OK * object_ru2 OK * fixed object_mag * object_cow OK * object_spot01_objects OK * object_spot15_obj * object_umajump OK * object_spot18_obj * object_spot12_obj * fix symbols in z_item_b_heart * object_bdan_objects & object_bowl * object_ddan_objects * object_owl OK * object_spot01_matoyab.xml OK * object_haka OK * object_heavy_object * object_ingate and objet_menkuri_objects * objet_spot00_break & object_relay_objects OK * object_spot01_matoya OK * object_spot06_objects OK * undefined_syms * object_spot08_obj OK * object_efc_doughnut & object_zg * object_ik OK * object_vm * object_ei OK * object_ds OK * updated spec * map_48x85_static OK * object_zl1 & object_peehat ok * some z_parameter naming and other undefined symbol stuff, object_yukabyun OK * object_bubble & object_fw ok * object_shopnuts * restore delete file * object_timeblock OK * object_d_lift OK * object_kibako2 OK * object_mamenoki OK * matches * remove unused asm * object_mag ok now * fixed object_ani * done for now, im tired * object_bdan_objects fixed up * fix bdan * object_bombf fixed * object_bowl fixed up * object_cow fixed * did more, im tired * fixed some stuff in object_ddan_objects * fix object_ddan_object * object_door_gerudo fixed * object_ds fix * object_dy progress * fixed great fairy * some more * more * object_haka fix * progress * ingo_gate fixed * object_js * forgot collision * object_relay_objects fixed * object_kibako2 * object_mag fixed * u64* to void* * more u64* to void* * object_mamenoki fix * object_mastergolon & object_masterkokirihead fix * mido is weird * fixed build * fix object_menkuri_objects * add missing textures in object_menkuri_objects * object_ms * fixed object_peehat * some cleanup stuff * object_zg fix * object_spot00_break fix * object_niw fix * object_nwc fixed * object_ru2 object_rr and some of object_owl fix * object_spot15_obj fix * business scrub * object_spot01_matoya fixed * object_spot18_obj fix * object_spot01_objects fix * object_spot04_objects fix * object_spot04_objects actually fixed * object_spot12_obj fix * object_timeblock fix * object_spot06_objects fixed * object_spot08_obj fix * spot01_matoyab fix * object_trap fix * object_umajump fix * object_vm fix * z_en_niw_lady fix * object_yukabyun fix * object_zl1 fixed * added offsets to object_os_anime * object_md fix * object_ane fix * object_aob fix * add palette comment * object_spot00_objects fix * spot00 fix * remove unused asm * updates * Add TlutOffset to objects added in https://github.com/zeldaret/oot/pull/815 * Updated object_bdan_objects, ran format.sh * Change rgb5a1 to rgba16 in my object xmls * Addressed Anghelo's comments * review Co-authored-by: Lucas Shaw <lucas.shaw1123@gmail.com> Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-08-05 15:53:58 +00:00
include "build/assets/objects/object_spot18_obj/object_spot18_obj.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_bdoor"
romalign 0x1000
Add every unreserved object in an automated way (#805) * it's crashing * fix stuff * fix xmls * problematic objects * fix tabs * Fix suffixes * add missing new lines * Add comments to the problematic objects * Find and replace fixes * Add Fig's objects * I forgot to add a Name in a cutscene, so I'm adding it here * Update object decomp tutorial a little bit * Update problematic objects * Update docs/tutorial/object_decomp.md Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Change comments * comment out a few blobs * dammit tluts * Change a bunch of objects * update the last bunch * update comments on oA11 and oB2 * Ninja-edit to fix compatibility with ZAPD's PR 142 Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-05-16 16:36:40 +00:00
include "build/assets/objects/object_bdoor/object_bdoor.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_spot17_obj"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/objects/object_spot17_obj/object_spot17_obj.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_shop_dungen"
romalign 0x1000
Add every unreserved object in an automated way (#805) * it's crashing * fix stuff * fix xmls * problematic objects * fix tabs * Fix suffixes * add missing new lines * Add comments to the problematic objects * Find and replace fixes * Add Fig's objects * I forgot to add a Name in a cutscene, so I'm adding it here * Update object decomp tutorial a little bit * Update problematic objects * Update docs/tutorial/object_decomp.md Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Change comments * comment out a few blobs * dammit tluts * Change a bunch of objects * update the last bunch * update comments on oA11 and oB2 * Ninja-edit to fix compatibility with ZAPD's PR 142 Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-05-16 16:36:40 +00:00
include "build/assets/objects/object_shop_dungen/object_shop_dungen.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_nb"
romalign 0x1000
Gerudo objects (#757) * object_ge1 * more stuff named * object_gla OK, symbols added to C * eff fire fix in gameplay_keep * object_nb OK, fixed gameplay_keep * replaced symbols in EnNb, limb enums * Change EnGeldB limb enums to hex * Use enum in header too * Add descriptions to EnGe2 and EnNb, rearrange xml * Reorder xml * review changes
2021-04-10 16:25:03 +00:00
include "build/assets/objects/object_nb/object_nb.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_mo"
romalign 0x1000
Morpha (ovl_Boss_Mo) (#438) * Darkmeiro decompilation Bg_Gnd_Darkmeiro decompiled, matched, and documented. * give this a shot * fix conflict * one more try * it begins * more functions * another match * starting documentation * the big function works. also two more matches * small fix * data cleanup * removed .s * match with player * inching closer to matching * two more matches. almost there * OH MY GOD IT MATCHES * cleanup: part 1 of infinity * named a bunch of stuff * Naming particle fields * terminal commas * terminal commas * small enum fix * added description of droplet widths * merge * updating * Gfx * vt * xml * bgcheck * more on objects * unused stuff * git subrepo pull --force tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "44f5d7cb9" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "44f5d7cb9" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * git subrepo pull --force tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "6f874af4a" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "6f874af4a" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * object names * fixes * git subrepo pull --force tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "6f874af4a" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "6f874af4a" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * git subrepo pull --force tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "0305ec2c2" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "0305ec2c2" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * ZAPD works * .s * merge * starting work * more stuff * builds OK * first pass * PR fixes (Louis) * Bg_toki_hikari all functions matching (#781) * starting toki_hikari * func_808BA018 matched and some work on other func * init and draw matched, one to go * matched final function, removed ASM, updated spec * adding suggested changes * Volvagia (ovl_Boss_Fd) and related actors (#352) * Darkmeiro decompilation Bg_Gnd_Darkmeiro decompiled, matched, and documented. * Lots of functions matched. Some big ones are close. * Five left unmatched, one close. * Merged data and decompiled the giant function into something readable. Its branch structure has yet to be matched. * Three unmatched, one essentially matched, the rest matched. * More fixes. * Documented more of the structure and cleaned up a bit. * BossFd2, BgVbSima, and EnVbBall matched and documented * Also removed unneeded .s files * And need to name EnVbBall's functions * give this a shot * fix conflict * one more try * removing darkmeiro changes * and again * now OK from make clean * minor cleanup * One more matching function for BossFd * which means it doesn't need its .s * splitting * splitting * splitting * forgot some .s * fancy new names * fancy new names * trying again * sneaky .s files * sound effects and some hex to decimal conversions * Sound effects and static variable cleanup * format.sh and clean up static variables * sfx and formatting * ZAP and cleanup * small cleanup * cleanup and ZAP * ZAP * looking at the giant function again * looking at the giant function again * Only the big function left. * Those .s files aren't mine, officer * float literals might be fixed. regalloc still a nightmare * almost done with the big function * should make now * not much of a change * all functions match. rodata somehow doesn't. * forgot some things * lots of cleanup * and a little more * small error * large cleanup. Also BossFd has function names and inlined variable declarations * still more cleanup * the quest for 0.1f continues * forgot to put NON_MATCHING back in * Data structures fully documented. Still more cleanup. * DECR now works with BossFd2 * should match now * cleanup * small cleanup * cleanup and names * tiny thing * particles and headers and stuff * now with more enums * merge * test * end test * update * cleanup * object 2 * object 1 * doc object_fd2 * git subrepo pull --force tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "6f874af4a" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "6f874af4a" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * formatting * .s * merge actor * vertex arrays * a little more * formatting * merge opd * fixed damage check * cleanup * fixes * effect struct * review Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain> Co-authored-by: fig02 <fig02srl@gmail.com> * fix mistake in z_bg_hidan_hamstep (#771) if you're just going to close this pr just wait a week and review it then. * ovl_En_River_Sound 1 non-matching (#786) * ovl_En_River_Sound * Implement review suggestions, run through clang-format * Responding to PR comments * Use CHECK_QUEST_ITEM, run through clang-tidy. * EnTp, 1 nonmatching, and object_tp (#782) * Data imported, 8 easy functions matched * Init only remaining nonmatching, data in * some renaming & fiddling with Init, still nonmatching * fix colours * Init still not matching * Decompile object_tp * renames * Rename func_80B20DE0 * Horrible new idea * Known equivalent, docs next * Another attempt * Finished naming in object_tp * Named functions, more enums * DrawBridge -> Drawbridge * skulltulla -> Skulltula * Name almost all struct variables * Named most of the temps * delete asm * spec * Missed data file, whoops * Review * More review changes * cleanup en_dha (#787) * Set __FILE__ in asm_processor (#793) * Set __FILE__ in asm_processor * bss fix * Update to upstream version Co-authored-by: zelda2774 <zelda2774@invalid> * ovl_Efc_Erupc OK (#773) * a few good dead Gfx_TwoTexScrolls * EfcErupc OK, mostly documented * review * remove fake match Co-authored-by: Fig02 <fig02srl@gmail.com> * z_bg_mizu_movebg and object_mizu_objects (#747) * OK a few functions * BgMizuMovebg_Draw OK, make tweaks to bg_mizu_bwall * migrate data * create mizu_objects, defines for water temple water level * clean up some code * implement most suggestions * review * review2 * formatting Co-authored-by: Fig02 <fig02srl@gmail.com> * Document BodyBreak (en_part, body part spawner) (#797) * done * status defines * whoops * comment wording * size calc change * elseif * Improve the format in z_map_mark_data.c and cleanup mapmark.py (#798) * Cleanup mapmark.py script * Rename map mark defines * Remove unused entries from map_mark_data * `assert` macro OK (#755) * create assert macro and replace a bunch of __assert Signed-off-by: angie <angheloalf95@gmail.com> * Another bunch of assert Signed-off-by: angie <angheloalf95@gmail.com> * more assert Signed-off-by: angie <angheloalf95@gmail.com> * assert(false) Signed-off-by: angie <angheloalf95@gmail.com> * last assert used in matching code Signed-off-by: angie <angheloalf95@gmail.com> * the non-matchings Signed-off-by: angie <angheloalf95@gmail.com> * typo Signed-off-by: angie <angheloalf95@gmail.com> * format Signed-off-by: angie <angheloalf95@gmail.com> * change macro to uppercase Signed-off-by: angie <angheloalf95@gmail.com> * Apply suggestions from code review Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Change ASSERT(false) to ASSERT(0) Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * General object cleanup (#799) * Object cleanup * Fix running man * fix mm symbols * Updated to use latest version of ZAPD (#777) * Updated config file * Added missing files * Temporarily removed asm_processor changes. * git subrepo pull --force tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "96ffc1e62" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "96ffc1e62" git-subrepo: version: "0.4.3" origin: "???" commit: "???" * git subrepo pull --force tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "179af7d11" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "179af7d11" git-subrepo: version: "0.4.3" origin: "???" commit: "???" * Cleanup and fixes. * git subrepo pull --force tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "50ad2fe78" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "50ad2fe78" git-subrepo: version: "0.4.3" origin: "???" commit: "???" * Makefile fix * git subrepo pull --force tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "b9120803e" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "b9120803e" git-subrepo: version: "0.4.3" origin: "???" commit: "???" Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com> * Decompile `object_zo` :dolphin: (#794) * Initial xml * most of in-code references * Add limbs and evrything else * Functions used by EnRiverSound * Fix forearm and use void* for textures * Run formatter * Change Hints in scene's XMLs (#800) * Remove blobhint * Add segments and offsets, and remove most hints * Change PathHint to Path * Add missing final new lines in scenes xmls * finished object_skb (#790) * finished object_skb * neglected the limbs and dlists, so I added them * adding the textures * fixing some names * ....forgot to change the c file.... * hopefully fixed formatting issue * EnFish, OK and documented (#795) * Matching * Some naming * spec * Name another function * Name animations, clarify use of GI_MAX and GI_NONE * Documented bottle range functions * Simplify squared distance function in EnIceHono, actor descriptions * Functions for dropped fish * More naming * Change 65535.5f to (0xFFFF + 0.5f) * Change 65535.5f to (0xFFFF + 0.5f) * name phases * Named other types, Docile functions * Naming complete * delete asm * format, remove outdated comment * Fix a few DrawFlexOpa arguments * Review changes * Change back to original playSound * Function comments per review * Update asm-processor and add make dependencies for global asm and early includes (#801) * Update asm-processor to latest master * Add make dependencies for global asm and early includes * Update asm-processor to latest master * Decompile the pause menu aka. ovl_kaleido_scope (+ minor changes) (#803) * Decompile ovl_kaleido_scope + minor cleanups * Add a common header for ovl_kaleido_scope * Start cleaning up and documenting kaleido_scope (+ some interface docs) * Improve and fix some kaleido_scope non matchings * Match KaleidoSetup_Init * Extract icon_item_fra/ger_static files * Add more documentation and matches to kaleido_scope * Improve the z_kaleido_collect.c non matching * Rename z_kaleido_8081EFF0.c to z_kaleido_prompt.c * Update most kaleido variables to be static * Improve GS flag macros * Improve z_lmap_mark.c and extract z_lmap_mark_data.c with a script * Various minor fixes and improvements * Minor fixes and review changes * Review changes part 2 * Rename gSetTileCustom to gDPSetTileCustom * Review changes part 3 * Delete `-j` from `make setup` and document use of `-jN` and `-j` in readme (#804) * Add nproc to make setup * Add cross-platform nproc equivalents * Scrap that, just ditch -j in makefile altogether * Clarified thread advice * ViMode progress (#802) * ViMode OK * Fix variable name in regconvert tool * ViMode: fix formatting * Add nonmatching impl for ViMode_Configure, respond to PR - Fixed struct field naming (unkXX -> unk_XX) - ViMode_Configure args are not flags for top/left etc; seem to be for video mode - Used @Random06457's implementation of `ViMode_LogPrint` * Use plain LOG_ADDRESS in ViMode_LogPrint * Incorporate PR feedback from Roman971 * Add scene macros (#792) * add scene macros * SCENECMD -> SCENE_CMD * light renaming * SCENE_CMD_ROOM_BEHAVIOR * update params names * Remove extra spaces * More review changes by fig * remove MM cmd ids * more review changes * last minute edit * I keep confusing both lights commands * Review changes * Yet another cutscene change * Unused02 is unused * Add UNK_09 macro and other minor fixes (#813) (cherry picked from commit d3a6d4d2e1794f3b12f22d7808d65f24ef4c220a) * Match BossFd_Fly (ovl_Boss_Fd OK) (#807) * Simplify PNGs rules in the makefile (#814) * simplify rules * update `-eh` * Add every unreserved object in an automated way (#805) * it's crashing * fix stuff * fix xmls * problematic objects * fix tabs * Fix suffixes * add missing new lines * Add comments to the problematic objects * Find and replace fixes * Add Fig's objects * I forgot to add a Name in a cutscene, so I'm adding it here * Update object decomp tutorial a little bit * Update problematic objects * Update docs/tutorial/object_decomp.md Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Change comments * comment out a few blobs * dammit tluts * Change a bunch of objects * update the last bunch * update comments on oA11 and oB2 * Ninja-edit to fix compatibility with ZAPD's PR 142 Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Add clean assets (#785) * makefile change * also delete * Add cleantools * rename cleanassets and assetclean * add rules to PHONY in makefile * Remove toolsclean * object_hata OK (#806) * everything except limbs * spec * object_hata OK * Replace symbols, unused data, enums, some cleanup * Fix compiler warnings in EnRiverSound * Address Roman's review * Correct limbs name * Changed unk_192 to timer, as well as add missing trailing comma for formating (#817) * Remove some unused duplicated C files (#818) * Removes qemu from the README.md (#819) * Removes qemu from the README.md * Increments the step references in other parts of the README.md * Update README.md Co-authored-by: Anghelo Carvajal <anghelo.carvajal.14@sansano.usm.cl> * Update README.md Co-authored-by: Anghelo Carvajal <anghelo.carvajal.14@sansano.usm.cl> * Update README.md Co-authored-by: Anghelo Carvajal <anghelo.carvajal.14@sansano.usm.cl> * Update README.md Co-authored-by: Anghelo Carvajal <anghelo.carvajal.14@sansano.usm.cl> Co-authored-by: Anghelo Carvajal <anghelo.carvajal.14@sansano.usm.cl> * Match EnSkb_PostLimbDraw (obl_en_skb OK) (#821) * Small bgcheck documentation pass (#816) * implement some documentation * remove unnecessary comments related to decomp * eliminate comment function prototypes * Add `actorfixer.py` ~~and `graphovl.py`~~; and a few improvements to `extract_assets.py` (#783) * Only process touched files and abort the extraction if one file wasn't extracted properly Signed-off-by: angie <angheloalf95@gmail.com> * add actorfixer and graphovl Signed-off-by: angie <angheloalf95@gmail.com> * Re set execution permisions to diff.py Signed-off-by: angie <angheloalf95@gmail.com> * Add graphs/ to gitignore Signed-off-by: angie <angheloalf95@gmail.com> * Add looners flag to graphovl Signed-off-by: angie <angheloalf95@gmail.com> * Parse macros Signed-off-by: angie <angheloalf95@gmail.com> * cleanup Signed-off-by: angie <angheloalf95@gmail.com> * Add enum parser to graphovl Signed-off-by: angie <angheloalf95@gmail.com> * Remove redundant code Signed-off-by: angie <angheloalf95@gmail.com> * cleanup Signed-off-by: angie <angheloalf95@gmail.com> * Custom colors to graphovl! * Select multiples styles for graphovl * Add solarized light style * Add renames of #796 * Add unaccounted warning flag * remove graphovl * git subrepo clone https://github.com/AngheloAlf/graphovl.git tools/graphovl subrepo: subdir: "tools/graphovl" merged: "577e71592" upstream: origin: "https://github.com/AngheloAlf/graphovl.git" branch: "master" commit: "577e71592" git-subrepo: version: "0.4.3" origin: "???" commit: "???" * remove graphovl * Add `graphovl/` to gitignore * Label a bug in Door_Shutter (#810) * comment * Update src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Update src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Update src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c Co-authored-by: pixel-stuck <mathmcclintic@gmail.com> * change message * typo * repeated myself * extra space lmao * change wording again * Update src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c * indent Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> Co-authored-by: pixel-stuck <mathmcclintic@gmail.com> * en_weather_tag Quick documentation pass (#808) * Quick documentation pass * Fill out the En_Weather_Tag enum * move the enum into the header * implement roman's suggestion * object_sa OK (#789) * object_sa OK * PR fixes (AngheloAlf) * PR fixes (Roman) * Improve z_jpeg documentation (#825) * Improve z_jpeg documentation * JpegWork::data is probably better than address * Rename Jpeg_SendTask to Jpeg_ScheduleDecoderTask * Rename njpegUCode to gJpegUCode * Rename GetU16 to GetUnalignedU16 and improve docs * Decompile a bunch of objects (#603) * Mostly done but shifted * still messed up * Almost OK * OBJECT_JYA_OBJ OK, OBJECT_GR OK * Done * Merge master and format * Cleanup * Cleanup 2 * Start object MB dont merge yet * Object_MB OK * Object_ydan_objects OK * General 'ydan' actor cleanup * Forgot some small things * Object_EC OK * add .gitkeep and run format * Object_sd OK but no textures cause of a zap issue * PR fixes * Fix object_sd * fix ydan * delete .gitkeep files * OBJECT_BOX as far as it can go with current ZAP * Fix undefined_syms * Start child link object * Push progress, dont merge yet * Object_mori_objects OK * Fixed? * Fix conflicts again * Seems like i missed some textures * Extract data for BgBombwall * More field * ZAP YEP 2.0 * Object_Box OK * Object_SD ok. Ready to merge * remove ASM and merge master * remove ASM * remove files wrongfully added to docs/ * Almost done * Change comment in z_player_lib.c * forgot some DLists in player_lib.c * Fix conflict, run format * Same as before but this time with Tex and TLUT * Last few things * fix object_GR and add limbs to object_sd * Nane -> Name * gChildDekuShieldMtx is now a matrix and not a blob * PR fixes (Fig) * add a space for comment in z_player_lib.c * re push and new lines * PR fixes (AngheloAlf) * PR fixes (Roman) * Fix Heishi2 * PR fixes (Fig) * Replace spacing in a file * PR fixes (Roman) * Track XML extraction time (#826) * extracted-assets.json * delete `.extracted-assets.json` in distclean * Move `rm .extracted-assets.json` to `assetclean` * Outname -> OutName for OBJECT_LINK_CHILD (#827) * Outname -> OutName * ANother child fix * TLUT -> tlut * Change nanoseconds to seconds in extract_assets.py (#829) * Match 2 more functions in z_eff_blure.c (#831) * Match ViMode_Configure (z_vimode.c OK) (#830) * warnings fixed (#835) * ZAPD update: libpng, zroom improvements and others (#811) * git subrepo pull --force tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "769f5702a" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "769f5702a" git-subrepo: version: "0.4.3" origin: "???" commit: "???" * Add `libpng` to readme * Remove `-ifp` since it doesn't exists anymore in ZAPD * Remove extra print I added * Add UNK_09 macro and other minor fixes * Simplify PNG rules * simplify gitignore * Update README.md Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update dockerfile * basic instructions for cygwin and mac * git subrepo pull --force tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "86160be69" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "86160be69" git-subrepo: version: "0.4.3" origin: "???" commit: "???" * Change nanoseconds to seconds in extract_assets.py Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * "Decompile" more objects. (#784) * Object_hakach_objects OK and fix a warning in z_play.c * Object Warp1 OK * Object_spot16_obj OK * object_cs Skeleton and limbs OK * Limbs are broken * Limbs OK * Object_CS OK * Object_jya_door OK * fix errors and add new lines * PR fixes (AngheloAlf) * PR fixes (EllipticEllipsis) * PR fixes (Fig) * Rename Spot16 and Jya * GraveYard -> Graveyard * PR fixes * -s * PR fixes * Object_RU1, Object_MA1, and warp pad objects Decompiled (#828) * Ruto limbs * RutoLimb enum * the enum doesn't go in en_door * Limb DLists * Name almost all textures and clean up EnRu1.c * remove padding * Name all but 1 animation and remove undefined syms * Object MA limbs OK * (MA1)Most textures * Small renames in EnMa1.c * Object MA1 OK * add base object for Mjin * Mjin OK * Update object_ma1.xml * PR fixes (Fig) * PR fixes * Missed one * Update assets/xml/objects/object_ru1.xml Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * En_River_Sound OK (#833) * match en_river_sound * remove asm * some docs * more docs * saria song * review stuff * z_sram OK (#834) * match z_sram * format and remove unused asm, also make some data static * review comments * another change * Match Jpeg_Decode (z_jpeg.c OK) (#839) * Match EnDaiku_UpdateText (En_Daiku OK) (#841) * Match 1 of the 2 remaining functions in Bg_Mizu_Movebg (#840) * Improve Audio_SequencePlayerProcessSequence (#844) Co-authored-by: zelda2774 <zelda2774@invalid> * Fix and rename nes_font_static (#753) * renames * change digits and control pad names * Add codepoints, rename blank char 0x7F * BgGndFiremeiro OK and documented (#850) * OK, data imported * Name everything * Delete asm * Add struct `LegacyLimb` and rename `AnimationHeader2` for `object_human` (#849) * Add LegacyLimb and rename AnimationHeader2 * Simplify SkelAnime_GetFrameDataLegacy * Minor fixes * Move LegacyLimb with the rest of the limbs * EnVali OK and documented, object_vali and object_bl completely analysed and documented (#845) * OK * Some naming * Name more, correct typo in Biri, extract skel * just Draws need names, fix typos in bili and warp1 * Decompile object_vali and add symbols * Few more names * Bari naming done * object_bl completed, symbols added * Label object_bl * Formatter * delete asm * review changes * review changes * review * Interface improvements (#822) * Add symbols, does NOT build OK * parameter OK with syms * Use `static` more and inline arrays * wip docs * Start on Interface_Draw, NOT OK yet * rename variables since interface dev is weird * nonmatching for now * kaleido * Update src/code/z_parameter.c Co-authored-by: louist103 <35883445+louist103@users.noreply.github.com> * Make most texture rectangles use shifts * fix symbols for all interface things * done with interface_draw for now * Update z_parameter.c * format files * fix wrong function calls * fix bss * improvements in matching * remove button enum for now * (void)0 to fix warning * make conditional look nicer * fix * fix wrong combiner * Update src/overlays/actors/ovl_kaleido_scope/z_lmap_mark.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * format * remove "HUD" naming * review suggestions Co-authored-by: louist103 <35883445+louist103@users.noreply.github.com> Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Migrate .bss for fault drawer and .data for item00 (#823) * Item00 and fault drawer * Test * Test2 * test3 * test4 * remove .data file for item00 * revert hex * WHY * PLEASE * PR fixes (Roman) and run clang-format version 10 * Fault_drawer was swapped ...again) * Decompile and label EnEiyer (#852) * En_Eiyer OK * Label EnEiyer * Style fixes * Rename colCyl -> collider * Use CLAMP_MIN * Format * Review changes * Match Camera_PrintSettings (z_camera OK) (#853) * Match Camera_PrintSettings * rm asm * Match Math3D_LineSegMakePerpLineSeg (#854) * Match Math3D_LineSegMakePerpLineSeg Also renamed to Math3D_LineVsLineClosestTwoPoints * Fix UB * Some actor.c docs (in preparation for en_test) (#820) * renames * format * format functions.h * clean * arg name * remove asm * Decompile obj_bean (magic bean and soft soil). 2 NON_MATCHINGs (#846) * did a bunch * Do a bunch more * all functions in C * Macros for draw and collision part of state flags * Done for now * remove ASM * PR fixes (Elliptic) * all angles are hex and take away bad names * PR fixes (Roman) * PR fixes * PR fixes (Fig) * restore map mark * Fix the other messed with files * Decompile some more objects (#848) * Object_FU limbs and skel OK * limbs OK * Object_FU textures OK * Object_FU face textures OK * Symbols in en_fu.c * en_fu.c limb enum * Remove Object_fu from undefined_syms, move textures to draw, and small cleanup * Object_bird OK * Object_Bird OK, added cutscene for shot sun, and song of storms * Rainbow Bridge CS * Great fairy CS * Cutscene -> Cs * remove '&' from Cutscenes * Cleanup object_bird * Update z_en_fu.c * Update z_en_fu.h * Update z_en_fu.c * Update z_en_fu.h * Update z_en_fu.h * DC intro CS * Zeldas lullaby CS * Nabooru Knuckle CS * Owl Lake Hylia CS * Sun song CS * Undefined sym in Boss Dodongo * Missed a few more * DC tex name * Windmill man limbs * z_En_Ossan and dependencies (#824) * fix colliderinit typo * fix initchain * reloc * progress * progress * Pick off a few easy functions, reduce number of warnings * more tough OKs * Getting closer to all OK, fix en_girla header * some hard OKs, 7 to go * two funcs remaining * func_80AC7094 OK! * Fix warnings, begin documentation * get most of object_ossan documented, document some of en_ossan * improve en_girla function names * more EnOssan documentation * more documentation * en_tana basically complete, en_girla vars all named, en_ossan documentation improvements * delete TIME ITSELF * object_oF1d_map OK * more names, fixed a poition typo * Nearly all en_ossan functions named, all variables named * format.sh * forgot to delete data * implement pr changes * EnOssan OK! implement most of Roman's suggestions * ugh * implement figs suggestions * implement roman's suggestion * Can't tell my left from my other left Co-authored-by: fig02 <fig02srl@gmail.com> * Some progress on z_vr_box.c (#838) * z_vr_box.c progress * Rename dpList to dlistBuf and SKYBOX_CLEAR_SKY to SKYBOX_NORMAL_SKY * Fix * renamed dlistBuf to dListBuf and split large string further * Change PreRenderContext to just be PreRender (#862) * Decompile Fishing and document object_fish (#856) * Start decompiling Fishing * Decompile more functions in Fishing * Decompile a few more functions in Fishing * Decompile func_80B6E9E0 and func_80B7825C (non matching) * Minor Fishing cleanups * Migrate fishing bss to C and match 3 functions * Decompile and match Fishing_Update * Migrate fishing data to C and minor cleanups * Fix the object_fish xml and use its symbols in Fishing * Partially document Fishing and object_fish * Add more documentation/cleanups to Fishing and object_fish * Use object_fish symbols in Demo_Ec and fix naming * Minor fixes to Fishing docs * Apply review suggestions for Fishing * Apply 2 more review suggestions for Fishing * Apply some review suggestions for Fishing * Extract all "place name" title cards (#858) * Forest and shadow temple * fire temple * Water temple * Spirit temple * Deku tree * jabu jabu * DC * Inside Ganons castle * GTG * Castle courtyard * great fairy's fountain * chamber of sages * shooting gallery * Temple of time * market * back alley * kokir shop * goron shop * zora shop * House of skulltula * bazarr * potion shop * gravekeepers hut * lakeside lab * hyrule field * kak * graveyard * zoras river * kokiri forest * lake hylia * zoras domain * zoras fountain * gerudo valley * lost woods * the rest of them * cleanup * final cleanup * PR fixes (Zel) * (Re) fix case * segment 0 * Fix map name static conflict * Comment about ZAPD * number 0 * Update place_title_cards.xml * Update spec * Fix all xmls to explicitly use offsets (#859) * Forest and shadow temple * fire temple * Water temple * Spirit temple * Deku tree * jabu jabu * DC * Inside Ganons castle * GTG * Castle courtyard * great fairy's fountain * chamber of sages * shooting gallery * Temple of time * market * back alley * kokir shop * goron shop * zora shop * House of skulltula * bazarr * potion shop * gravekeepers hut * lakeside lab * hyrule field * kak * graveyard * zoras river * kokiri forest * lake hylia * zoras domain * zoras fountain * gerudo valley * lost woods * the rest of them * cleanup * final cleanup * PR fixes (Zel) * Fra -> FRA and cleanup map_name_static * map_name_static * DONE * SHould be it * Done done done done * vector * remove another pr * ? * EnDekubaba OK and documented, object_dekubaba documented (#864) * 13 functions left, data imported * 2 left * 1 left * OK * Begin naming * sfx rename * spec * Begin naming, add LINK_IS_CHILD to EnDu * Fix spelling of its/it's * Document most of object_dekubaba, import symbols * Document draw functions, begin on actionfuncs * New actor function names, some float constants * Name almost everything * Delete asm * Name size, format * Review changes * Review changes * Brackets, format * Fix Sheik typo (#867) * db_camera (#842) * Decompile shrink_window.c * progress * progress * makefile * progress * match 8 functions * 1 more match * match 2 functions * decompile func_800B9638 * fix flow * migrate .bss * doc * name some stuff * fixes * comment fix * remove scene .c files * old z_camera .s files * revert z_camera change * revert unwanted z_camera change * fixes * remove unused files, run clang-format and fix non-matching * fix clang-format causing non-matching * remove newline + old comment in func_800B3BD4 * make db_camera global variables static * add s prefix to startic variables * change magic constants * rename "unk_50" * Match func_800B3BD4 and Match DbCamera_UpdateDemoControl (-bss) * Lots of progress on update * Mainly cleanup * run format.sh + remove unused asm * replace chevrons with add quotes * remove useless cast + use correct empty argument function declaration Co-authored-by: engineer124 <engineer124engineer124@gmail.com> * Match Interface_Draw (z_parameter OK) (#876) * Interface_Draw down to permuter score = 175 * Fix typo * Matched Interface_Draw! * clean-up * Another touch-up * a little more cleanup * No more direct gGameInfo->data access * Audio WIP (#836) * being code_800EC960 * wip * wip * more audio progress * migrate data in code_800E11F0 * wip * make ok * remove asm * wip * move some variables outside of gAudioContext to the AudioContext structure due to the size used in func_800E3094 * more progress * wip * wip * split code_800E11F0 * migrate rodata in code_800E11F0 * match functions that couldn't because of data issues * move code_800E4FE0 asm files * wip * more wip * fix global functions, and forward declarations * wip * wip * wip * ocarina wip * match a couple functions * some progress * separate some bss * match func_800EDA3C * some matching * more matches * migrate audio rodata * some matches * more matchess * start on synthesis * work on synthesis * fix function declaration * Merge branch 'master' into audio * match a few more functions * wip * wip * more matching, rename Audio_SetBGM to Audio_QueueSeqCmd * name several audio functions, and audiocontext members * more naming, rename code_800E11F0 to audio_load, code_800DAAC0 to audio_synthesis * audio wip * match a few more functions. * wip * add missing NON_MATCHING directive * wip * some matching, data reogranization * match cursed function * wip * wip * formatting * remove prefix from struct memebers * missed function rename * review Co-authored-by: fig02 <fig02srl@gmail.com> * ZAPD update: Gotta go fast! (#877) * copy over the xml * Rename anims * A bunch of renames * minor extract_assets fixes * git subrepo pull --force tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "820678b4e" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "820678b4e" git-subrepo: version: "0.4.3" origin: "???" commit: "???" * Change rgb5a1 to rgba16 * eye and eyebrows * some dlists * git subrepo pull --force tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "6be9af65d" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "6be9af65d" git-subrepo: version: "0.4.3" origin: "???" commit: "???" * Dancing Couple (ovl_En_Tg) (#866) * Match EnTg_Destroy * Match EnTg_Init * Matching EnTg_Update * Match func_80B18360 Moving both 'return phi;'s into a single return at the end of the function causes the assembly to not match. * Probably equivalent, non-matching func_80B183F8 * Matching EnTg_Draw * Matching update function * Matching func_80B18778 * All functions decompiled * Move data to C code * All functions matched excepted weird switch/case * Last matching function * Remove unused ASM * Name obvious symbols * Clang format * Name text-related functions and variables * Describe actor as Dancing Couple See https://github.com/zeldaret/oot/pull/866#discussion_r664726581 * Use named constants * Name drawing constants * Use THIS macro for void* * Name the function that sets environment color * Add comments to parts of code that aren't clear * Rename timesSpokenTo to nextDialogue, treat isTalking as boolean * z_en_ko OK (#869) * .data OK * Progress * push some old stuff * Finish a chain * Progress * Progress * Run mathfixer.py * Progress * match one more * Up to date * Match func_80A97610 * func_80A96FD0 * most of the way through the mega switch * small formatting thing. still stuck on the switch * start a big switch function * a little closer * done with matching for now starting objects * func_80A97738 OK! * func_80A995CC OK! * func_80A99864 OK! * en_ko OK! * Code clean-up pass * more EnKo cleanups, object_fa and object_kw1 textures documented * complete object_km1, more EnKo documentation * More documentation * delete asm * Clean-up rebase issues * bleh * Implement Dragorn's suggestions * fix spec, implement fig's suggestions * whoops (ill leave it for the docs tho lol) * whoops again * i made an ouchie * smile * last one for real Co-authored-by: Louis <35883445+louist103@users.noreply.github.com> Co-authored-by: fig02 <fig02srl@gmail.com> * z_en_bigokuta OK (#878) * start * Did some more * Progress * More * IDK * Chip away a little * im done * func_809BEBBC OK! * get rid of graphovl * revert random changes * Big Okuta OK! * more clean-ups * implement dragorn's suggestions * implement fig and louist's suggestions Co-authored-by: Louis <35883445+louist103@users.noreply.github.com> * z_obj_mure OK (#875) * almost matching init, matching data * more matchings, some non-matching progress * finishing up SpawnActor, fixing .data types * first decompile pass done, few non matchings * cleanup/update matchings and remove asm * format code * pick up some OKs * 1 non_matching left, some documentation * z_obj_mure OK... but at what cost? * implement suggested changes, some more documentation * Implement Fig's suggestions * review Co-authored-by: Sam Lyon <sam.c.lyon@gmail.com> Co-authored-by: fig02 <fig02srl@gmail.com> * convert remaining RGB5a1 to RGBA16 (#879) * Stalfos (en_test) OK and object_sk2 documented (#868) * fix colliderinit typo * migrate data * init has 1 problem * progress * progress * builds now * progress * progress * lots of funcs matched * many functions, fix warnings * 1 left * done * docs progress * remove graphovl * missed some * change some funcs * some more * another * format * more docs * cleanups1 * limbs, DLs, textures * limbs named (thanks elliptic) * more docs * Name animations, import symbols * Named sections of xml * more docs * rename limbs and use flag macros * name * review1 and use limb enum * review2 * agro -> aggro * review3 * review4 * review5 Co-authored-by: Elliptic Ellipsis <elliptic.ellipsis@gmail.com> * Use a temp symbol for RomStart/RomEnd symbols, makes the map show the right value for actual RomStart/RomEnd symbols (#880) * builds OK * first pass * PR fixes (Louis) * fixes * a little more * format * dragorn's stuff * more cleanup, merge, and format * now with work buffers * forgot sfx * update and draw Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain> Co-authored-by: Louis <35883445+louist103@users.noreply.github.com> Co-authored-by: Parker Burnett <burnettparker@gmail.com> Co-authored-by: fig02 <fig02srl@gmail.com> Co-authored-by: Zelllll <56516451+Zelllll@users.noreply.github.com> Co-authored-by: glankk <glankk@users.noreply.github.com> Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> Co-authored-by: zelda2774 <69368340+zelda2774@users.noreply.github.com> Co-authored-by: zelda2774 <zelda2774@invalid> Co-authored-by: mzxrules <mzxrules@gmail.com> Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com> Co-authored-by: Nicholas Estelami <NEstelami@users.noreply.github.com> Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com> Co-authored-by: Zach Banks <zjbanks@gmail.com> Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> Co-authored-by: Kenix3 <kenixwhisperwind@gmail.com> Co-authored-by: Anghelo Carvajal <anghelo.carvajal.14@sansano.usm.cl> Co-authored-by: pixel-stuck <mathmcclintic@gmail.com> Co-authored-by: Vijfhoek <me@vijf.life> Co-authored-by: Synray <31429825+Synray@users.noreply.github.com> Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com> Co-authored-by: Random <28494085+Random06457@users.noreply.github.com> Co-authored-by: engineer124 <engineer124engineer124@gmail.com> Co-authored-by: krimtonz <33664508+krimtonz@users.noreply.github.com> Co-authored-by: Aly Cerruti <aprime2003@gmail.com> Co-authored-by: Sam Lyon <sam.c.lyon@gmail.com> Co-authored-by: Elliptic Ellipsis <elliptic.ellipsis@gmail.com> Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
2021-08-08 19:26:56 +00:00
include "build/assets/objects/object_mo/object_mo.o"
Automatic objects 2 (#889) * adding missing objects * update rgba16 format * comment blobs * Fix blobs * add another missing one * add newlines to XMLs * remove objects from other PRs * add TlutOffset Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
2021-08-06 19:18:29 +00:00
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_sb"
romalign 0x1000
Add every unreserved object in an automated way (#805) * it's crashing * fix stuff * fix xmls * problematic objects * fix tabs * Fix suffixes * add missing new lines * Add comments to the problematic objects * Find and replace fixes * Add Fig's objects * I forgot to add a Name in a cutscene, so I'm adding it here * Update object decomp tutorial a little bit * Update problematic objects * Update docs/tutorial/object_decomp.md Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Change comments * comment out a few blobs * dammit tluts * Change a bunch of objects * update the last bunch * update comments on oA11 and oB2 * Ninja-edit to fix compatibility with ZAPD's PR 142 Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-05-16 16:36:40 +00:00
include "build/assets/objects/object_sb/object_sb.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_gi_melody"
romalign 0x1000
All* Get Item objects decompiled (#668) * All get item objects OK * Name z_draw functions * fix skulltula tokens draw ids * Review suggestions, merge extract_single_asset into extract_assets as an optional argument Co-authored-by: Thar0 <maximilianc64@gmail.com>
2021-02-12 21:57:06 +00:00
include "build/assets/objects/object_gi_melody/object_gi_melody.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_gi_heart"
romalign 0x1000
All* Get Item objects decompiled (#668) * All get item objects OK * Name z_draw functions * fix skulltula tokens draw ids * Review suggestions, merge extract_single_asset into extract_assets as an optional argument Co-authored-by: Thar0 <maximilianc64@gmail.com>
2021-02-12 21:57:06 +00:00
include "build/assets/objects/object_gi_heart/object_gi_heart.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_gi_compass"
romalign 0x1000
All* Get Item objects decompiled (#668) * All get item objects OK * Name z_draw functions * fix skulltula tokens draw ids * Review suggestions, merge extract_single_asset into extract_assets as an optional argument Co-authored-by: Thar0 <maximilianc64@gmail.com>
2021-02-12 21:57:06 +00:00
include "build/assets/objects/object_gi_compass/object_gi_compass.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_gi_bosskey"
romalign 0x1000
All* Get Item objects decompiled (#668) * All get item objects OK * Name z_draw functions * fix skulltula tokens draw ids * Review suggestions, merge extract_single_asset into extract_assets as an optional argument Co-authored-by: Thar0 <maximilianc64@gmail.com>
2021-02-12 21:57:06 +00:00
include "build/assets/objects/object_gi_bosskey/object_gi_bosskey.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_gi_medal"
romalign 0x1000
All* Get Item objects decompiled (#668) * All get item objects OK * Name z_draw functions * fix skulltula tokens draw ids * Review suggestions, merge extract_single_asset into extract_assets as an optional argument Co-authored-by: Thar0 <maximilianc64@gmail.com>
2021-02-12 21:57:06 +00:00
include "build/assets/objects/object_gi_medal/object_gi_medal.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_gi_nuts"
romalign 0x1000
All* Get Item objects decompiled (#668) * All get item objects OK * Name z_draw functions * fix skulltula tokens draw ids * Review suggestions, merge extract_single_asset into extract_assets as an optional argument Co-authored-by: Thar0 <maximilianc64@gmail.com>
2021-02-12 21:57:06 +00:00
include "build/assets/objects/object_gi_nuts/object_gi_nuts.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_sa"
romalign 0x1000
object_sa OK (#789) * object_sa OK * PR fixes (AngheloAlf) * PR fixes (Roman)
2021-05-23 20:02:54 +00:00
include "build/assets/objects/object_sa/object_sa.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_gi_hearts"
romalign 0x1000
All* Get Item objects decompiled (#668) * All get item objects OK * Name z_draw functions * fix skulltula tokens draw ids * Review suggestions, merge extract_single_asset into extract_assets as an optional argument Co-authored-by: Thar0 <maximilianc64@gmail.com>
2021-02-12 21:57:06 +00:00
include "build/assets/objects/object_gi_hearts/object_gi_hearts.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_gi_arrowcase"
romalign 0x1000
All* Get Item objects decompiled (#668) * All get item objects OK * Name z_draw functions * fix skulltula tokens draw ids * Review suggestions, merge extract_single_asset into extract_assets as an optional argument Co-authored-by: Thar0 <maximilianc64@gmail.com>
2021-02-12 21:57:06 +00:00
include "build/assets/objects/object_gi_arrowcase/object_gi_arrowcase.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_gi_bombpouch"
romalign 0x1000
All* Get Item objects decompiled (#668) * All get item objects OK * Name z_draw functions * fix skulltula tokens draw ids * Review suggestions, merge extract_single_asset into extract_assets as an optional argument Co-authored-by: Thar0 <maximilianc64@gmail.com>
2021-02-12 21:57:06 +00:00
include "build/assets/objects/object_gi_bombpouch/object_gi_bombpouch.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_in"
romalign 0x1000
Add every unreserved object in an automated way (#805) * it's crashing * fix stuff * fix xmls * problematic objects * fix tabs * Fix suffixes * add missing new lines * Add comments to the problematic objects * Find and replace fixes * Add Fig's objects * I forgot to add a Name in a cutscene, so I'm adding it here * Update object decomp tutorial a little bit * Update problematic objects * Update docs/tutorial/object_decomp.md Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Change comments * comment out a few blobs * dammit tluts * Change a bunch of objects * update the last bunch * update comments on oA11 and oB2 * Ninja-edit to fix compatibility with ZAPD's PR 142 Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-05-16 16:36:40 +00:00
include "build/assets/objects/object_in/object_in.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_tr"
romalign 0x1000
Add every unreserved object in an automated way (#805) * it's crashing * fix stuff * fix xmls * problematic objects * fix tabs * Fix suffixes * add missing new lines * Add comments to the problematic objects * Find and replace fixes * Add Fig's objects * I forgot to add a Name in a cutscene, so I'm adding it here * Update object decomp tutorial a little bit * Update problematic objects * Update docs/tutorial/object_decomp.md Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Change comments * comment out a few blobs * dammit tluts * Change a bunch of objects * update the last bunch * update comments on oA11 and oB2 * Ninja-edit to fix compatibility with ZAPD's PR 142 Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-05-16 16:36:40 +00:00
include "build/assets/objects/object_tr/object_tr.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_spot16_obj"
romalign 0x1000
"Decompile" more objects. (#784) * Object_hakach_objects OK and fix a warning in z_play.c * Object Warp1 OK * Object_spot16_obj OK * object_cs Skeleton and limbs OK * Limbs are broken * Limbs OK * Object_CS OK * Object_jya_door OK * fix errors and add new lines * PR fixes (AngheloAlf) * PR fixes (EllipticEllipsis) * PR fixes (Fig) * Rename Spot16 and Jya * GraveYard -> Graveyard * PR fixes * -s * PR fixes
2021-05-30 16:30:38 +00:00
include "build/assets/objects/object_spot16_obj/object_spot16_obj.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_oE1s"
romalign 0x1000
Add every unreserved object in an automated way (#805) * it's crashing * fix stuff * fix xmls * problematic objects * fix tabs * Fix suffixes * add missing new lines * Add comments to the problematic objects * Find and replace fixes * Add Fig's objects * I forgot to add a Name in a cutscene, so I'm adding it here * Update object decomp tutorial a little bit * Update problematic objects * Update docs/tutorial/object_decomp.md Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Change comments * comment out a few blobs * dammit tluts * Change a bunch of objects * update the last bunch * update comments on oA11 and oB2 * Ninja-edit to fix compatibility with ZAPD's PR 142 Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-05-16 16:36:40 +00:00
include "build/assets/objects/object_oE1s/object_oE1s.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_oE4s"
romalign 0x1000
Add every unreserved object in an automated way (#805) * it's crashing * fix stuff * fix xmls * problematic objects * fix tabs * Fix suffixes * add missing new lines * Add comments to the problematic objects * Find and replace fixes * Add Fig's objects * I forgot to add a Name in a cutscene, so I'm adding it here * Update object decomp tutorial a little bit * Update problematic objects * Update docs/tutorial/object_decomp.md Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Change comments * comment out a few blobs * dammit tluts * Change a bunch of objects * update the last bunch * update comments on oA11 and oB2 * Ninja-edit to fix compatibility with ZAPD's PR 142 Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-05-16 16:36:40 +00:00
include "build/assets/objects/object_oE4s/object_oE4s.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_os_anime"
romalign 0x1000
Decompiled A LOT of objects (#815) * . * remove tools/ZAP2 from origin master * object_spot04_objects * remove accidentally added xml * object_spot00_objects * object_bombf ok * object_dy_obj * object_masterzoora * object_mastergolon and object_masterkokirihead * object_aob * object_gt * object_gt * object_geff * object_mag kinda * object_gjyo_objects OK * object_ani OK * object_door_gerudo * object_md and object_trap * object_js OK * object_goroiwa * object_gs * object_nwc * object_niw * object_ane * object_os_anime OK * object_d_hsblock OK * object_fz OK * object_ru2 OK * fixed object_mag * object_cow OK * object_spot01_objects OK * object_spot15_obj * object_umajump OK * object_spot18_obj * object_spot12_obj * fix symbols in z_item_b_heart * object_bdan_objects & object_bowl * object_ddan_objects * object_owl OK * object_spot01_matoyab.xml OK * object_haka OK * object_heavy_object * object_ingate and objet_menkuri_objects * objet_spot00_break & object_relay_objects OK * object_spot01_matoya OK * object_spot06_objects OK * undefined_syms * object_spot08_obj OK * object_efc_doughnut & object_zg * object_ik OK * object_vm * object_ei OK * object_ds OK * updated spec * map_48x85_static OK * object_zl1 & object_peehat ok * some z_parameter naming and other undefined symbol stuff, object_yukabyun OK * object_bubble & object_fw ok * object_shopnuts * restore delete file * object_timeblock OK * object_d_lift OK * object_kibako2 OK * object_mamenoki OK * matches * remove unused asm * object_mag ok now * fixed object_ani * done for now, im tired * object_bdan_objects fixed up * fix bdan * object_bombf fixed * object_bowl fixed up * object_cow fixed * did more, im tired * fixed some stuff in object_ddan_objects * fix object_ddan_object * object_door_gerudo fixed * object_ds fix * object_dy progress * fixed great fairy * some more * more * object_haka fix * progress * ingo_gate fixed * object_js * forgot collision * object_relay_objects fixed * object_kibako2 * object_mag fixed * u64* to void* * more u64* to void* * object_mamenoki fix * object_mastergolon & object_masterkokirihead fix * mido is weird * fixed build * fix object_menkuri_objects * add missing textures in object_menkuri_objects * object_ms * fixed object_peehat * some cleanup stuff * object_zg fix * object_spot00_break fix * object_niw fix * object_nwc fixed * object_ru2 object_rr and some of object_owl fix * object_spot15_obj fix * business scrub * object_spot01_matoya fixed * object_spot18_obj fix * object_spot01_objects fix * object_spot04_objects fix * object_spot04_objects actually fixed * object_spot12_obj fix * object_timeblock fix * object_spot06_objects fixed * object_spot08_obj fix * spot01_matoyab fix * object_trap fix * object_umajump fix * object_vm fix * z_en_niw_lady fix * object_yukabyun fix * object_zl1 fixed * added offsets to object_os_anime * object_md fix * object_ane fix * object_aob fix * add palette comment * object_spot00_objects fix * spot00 fix * remove unused asm * updates * Add TlutOffset to objects added in https://github.com/zeldaret/oot/pull/815 * Updated object_bdan_objects, ran format.sh * Change rgb5a1 to rgba16 in my object xmls * Addressed Anghelo's comments * review Co-authored-by: Lucas Shaw <lucas.shaw1123@gmail.com> Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-08-05 15:53:58 +00:00
include "build/assets/objects/object_os_anime/object_os_anime.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_gi_bottle"
romalign 0x1000
All* Get Item objects decompiled (#668) * All get item objects OK * Name z_draw functions * fix skulltula tokens draw ids * Review suggestions, merge extract_single_asset into extract_assets as an optional argument Co-authored-by: Thar0 <maximilianc64@gmail.com>
2021-02-12 21:57:06 +00:00
include "build/assets/objects/object_gi_bottle/object_gi_bottle.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_gi_stick"
romalign 0x1000
All* Get Item objects decompiled (#668) * All get item objects OK * Name z_draw functions * fix skulltula tokens draw ids * Review suggestions, merge extract_single_asset into extract_assets as an optional argument Co-authored-by: Thar0 <maximilianc64@gmail.com>
2021-02-12 21:57:06 +00:00
include "build/assets/objects/object_gi_stick/object_gi_stick.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_gi_map"
romalign 0x1000
All* Get Item objects decompiled (#668) * All get item objects OK * Name z_draw functions * fix skulltula tokens draw ids * Review suggestions, merge extract_single_asset into extract_assets as an optional argument Co-authored-by: Thar0 <maximilianc64@gmail.com>
2021-02-12 21:57:06 +00:00
include "build/assets/objects/object_gi_map/object_gi_map.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_oF1d_map"
romalign 0x1000
z_En_Ossan and dependencies (#824) * fix colliderinit typo * fix initchain * reloc * progress * progress * Pick off a few easy functions, reduce number of warnings * more tough OKs * Getting closer to all OK, fix en_girla header * some hard OKs, 7 to go * two funcs remaining * func_80AC7094 OK! * Fix warnings, begin documentation * get most of object_ossan documented, document some of en_ossan * improve en_girla function names * more EnOssan documentation * more documentation * en_tana basically complete, en_girla vars all named, en_ossan documentation improvements * delete TIME ITSELF * object_oF1d_map OK * more names, fixed a poition typo * Nearly all en_ossan functions named, all variables named * format.sh * forgot to delete data * implement pr changes * EnOssan OK! implement most of Roman's suggestions * ugh * implement figs suggestions * implement roman's suggestion * Can't tell my left from my other left Co-authored-by: fig02 <fig02srl@gmail.com>
2021-07-04 15:23:18 +00:00
include "build/assets/objects/object_oF1d_map/object_oF1d_map.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_ru2"
romalign 0x1000
Decompiled A LOT of objects (#815) * . * remove tools/ZAP2 from origin master * object_spot04_objects * remove accidentally added xml * object_spot00_objects * object_bombf ok * object_dy_obj * object_masterzoora * object_mastergolon and object_masterkokirihead * object_aob * object_gt * object_gt * object_geff * object_mag kinda * object_gjyo_objects OK * object_ani OK * object_door_gerudo * object_md and object_trap * object_js OK * object_goroiwa * object_gs * object_nwc * object_niw * object_ane * object_os_anime OK * object_d_hsblock OK * object_fz OK * object_ru2 OK * fixed object_mag * object_cow OK * object_spot01_objects OK * object_spot15_obj * object_umajump OK * object_spot18_obj * object_spot12_obj * fix symbols in z_item_b_heart * object_bdan_objects & object_bowl * object_ddan_objects * object_owl OK * object_spot01_matoyab.xml OK * object_haka OK * object_heavy_object * object_ingate and objet_menkuri_objects * objet_spot00_break & object_relay_objects OK * object_spot01_matoya OK * object_spot06_objects OK * undefined_syms * object_spot08_obj OK * object_efc_doughnut & object_zg * object_ik OK * object_vm * object_ei OK * object_ds OK * updated spec * map_48x85_static OK * object_zl1 & object_peehat ok * some z_parameter naming and other undefined symbol stuff, object_yukabyun OK * object_bubble & object_fw ok * object_shopnuts * restore delete file * object_timeblock OK * object_d_lift OK * object_kibako2 OK * object_mamenoki OK * matches * remove unused asm * object_mag ok now * fixed object_ani * done for now, im tired * object_bdan_objects fixed up * fix bdan * object_bombf fixed * object_bowl fixed up * object_cow fixed * did more, im tired * fixed some stuff in object_ddan_objects * fix object_ddan_object * object_door_gerudo fixed * object_ds fix * object_dy progress * fixed great fairy * some more * more * object_haka fix * progress * ingo_gate fixed * object_js * forgot collision * object_relay_objects fixed * object_kibako2 * object_mag fixed * u64* to void* * more u64* to void* * object_mamenoki fix * object_mastergolon & object_masterkokirihead fix * mido is weird * fixed build * fix object_menkuri_objects * add missing textures in object_menkuri_objects * object_ms * fixed object_peehat * some cleanup stuff * object_zg fix * object_spot00_break fix * object_niw fix * object_nwc fixed * object_ru2 object_rr and some of object_owl fix * object_spot15_obj fix * business scrub * object_spot01_matoya fixed * object_spot18_obj fix * object_spot01_objects fix * object_spot04_objects fix * object_spot04_objects actually fixed * object_spot12_obj fix * object_timeblock fix * object_spot06_objects fixed * object_spot08_obj fix * spot01_matoyab fix * object_trap fix * object_umajump fix * object_vm fix * z_en_niw_lady fix * object_yukabyun fix * object_zl1 fixed * added offsets to object_os_anime * object_md fix * object_ane fix * object_aob fix * add palette comment * object_spot00_objects fix * spot00 fix * remove unused asm * updates * Add TlutOffset to objects added in https://github.com/zeldaret/oot/pull/815 * Updated object_bdan_objects, ran format.sh * Change rgb5a1 to rgba16 in my object xmls * Addressed Anghelo's comments * review Co-authored-by: Lucas Shaw <lucas.shaw1123@gmail.com> Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-08-05 15:53:58 +00:00
include "build/assets/objects/object_ru2/object_ru2.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_gi_shield_1"
romalign 0x1000
All* Get Item objects decompiled (#668) * All get item objects OK * Name z_draw functions * fix skulltula tokens draw ids * Review suggestions, merge extract_single_asset into extract_assets as an optional argument Co-authored-by: Thar0 <maximilianc64@gmail.com>
2021-02-12 21:57:06 +00:00
include "build/assets/objects/object_gi_shield_1/object_gi_shield_1.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_dekujr"
romalign 0x1000
Add every unreserved object in an automated way (#805) * it's crashing * fix stuff * fix xmls * problematic objects * fix tabs * Fix suffixes * add missing new lines * Add comments to the problematic objects * Find and replace fixes * Add Fig's objects * I forgot to add a Name in a cutscene, so I'm adding it here * Update object decomp tutorial a little bit * Update problematic objects * Update docs/tutorial/object_decomp.md Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Change comments * comment out a few blobs * dammit tluts * Change a bunch of objects * update the last bunch * update comments on oA11 and oB2 * Ninja-edit to fix compatibility with ZAPD's PR 142 Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-05-16 16:36:40 +00:00
include "build/assets/objects/object_dekujr/object_dekujr.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_gi_magicpot"
romalign 0x1000
All* Get Item objects decompiled (#668) * All get item objects OK * Name z_draw functions * fix skulltula tokens draw ids * Review suggestions, merge extract_single_asset into extract_assets as an optional argument Co-authored-by: Thar0 <maximilianc64@gmail.com>
2021-02-12 21:57:06 +00:00
include "build/assets/objects/object_gi_magicpot/object_gi_magicpot.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_gi_bomb_1"
romalign 0x1000
All* Get Item objects decompiled (#668) * All get item objects OK * Name z_draw functions * fix skulltula tokens draw ids * Review suggestions, merge extract_single_asset into extract_assets as an optional argument Co-authored-by: Thar0 <maximilianc64@gmail.com>
2021-02-12 21:57:06 +00:00
include "build/assets/objects/object_gi_bomb_1/object_gi_bomb_1.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_oF1s"
romalign 0x1000
Add every unreserved object in an automated way (#805) * it's crashing * fix stuff * fix xmls * problematic objects * fix tabs * Fix suffixes * add missing new lines * Add comments to the problematic objects * Find and replace fixes * Add Fig's objects * I forgot to add a Name in a cutscene, so I'm adding it here * Update object decomp tutorial a little bit * Update problematic objects * Update docs/tutorial/object_decomp.md Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Change comments * comment out a few blobs * dammit tluts * Change a bunch of objects * update the last bunch * update comments on oA11 and oB2 * Ninja-edit to fix compatibility with ZAPD's PR 142 Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-05-16 16:36:40 +00:00
include "build/assets/objects/object_oF1s/object_oF1s.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_ma2"
romalign 0x1000
Add every unreserved object in an automated way (#805) * it's crashing * fix stuff * fix xmls * problematic objects * fix tabs * Fix suffixes * add missing new lines * Add comments to the problematic objects * Find and replace fixes * Add Fig's objects * I forgot to add a Name in a cutscene, so I'm adding it here * Update object decomp tutorial a little bit * Update problematic objects * Update docs/tutorial/object_decomp.md Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Change comments * comment out a few blobs * dammit tluts * Change a bunch of objects * update the last bunch * update comments on oA11 and oB2 * Ninja-edit to fix compatibility with ZAPD's PR 142 Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-05-16 16:36:40 +00:00
include "build/assets/objects/object_ma2/object_ma2.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_gi_purse"
romalign 0x1000
All* Get Item objects decompiled (#668) * All get item objects OK * Name z_draw functions * fix skulltula tokens draw ids * Review suggestions, merge extract_single_asset into extract_assets as an optional argument Co-authored-by: Thar0 <maximilianc64@gmail.com>
2021-02-12 21:57:06 +00:00
include "build/assets/objects/object_gi_purse/object_gi_purse.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_hni"
romalign 0x1000
object_horse and object_hni (#772) * object_horse_zelda Signed-off-by: angie <angheloalf95@gmail.com> * object_horse_normal Signed-off-by: angie <angheloalf95@gmail.com> * object_horse_link_child Signed-off-by: angie <angheloalf95@gmail.com> * object_horse_ganon Signed-off-by: angie <angheloalf95@gmail.com> * object_horse Signed-off-by: angie <angheloalf95@gmail.com> * object_hni Signed-off-by: Angie <angheloalf95@gmail.com> * ZAPD is falling to do vtx Signed-off-by: Angie <angheloalf95@gmail.com> * Testing Signed-off-by: Angie <angheloalf95@gmail.com> * Rename horse_link_child variables Signed-off-by: angie <angheloalf95@gmail.com> * horse_zelda with names Signed-off-by: angie <angheloalf95@gmail.com> * I'm suspecting that this game doesn't use z_en_horse_ganon Signed-off-by: angie <angheloalf95@gmail.com> * Child epona eye textures Signed-off-by: Angie <angheloalf95@gmail.com> * Extract eyes textures from Epona Signed-off-by: Angie <angheloalf95@gmail.com> * Small rename Signed-off-by: Angie <angheloalf95@gmail.com> * change references in EnHorseNormal Signed-off-by: angie <angheloalf95@gmail.com> * Rename a few HorseNormal animations Signed-off-by: angie <angheloalf95@gmail.com> * Add normal horse eye texture Signed-off-by: angie <angheloalf95@gmail.com> * Add some textures Signed-off-by: angie <angheloalf95@gmail.com> * change pointers in EnViewer Signed-off-by: angie <angheloalf95@gmail.com> * Rename some animations of HorseGanon Signed-off-by: angie <angheloalf95@gmail.com> * Add a few dlists in object_horse Signed-off-by: Angie <angheloalf95@gmail.com> * Add whinnies Signed-off-by: Angie <angheloalf95@gmail.com> * Rename last animations remaining in horse_normal and horse_ganon Signed-off-by: angie <angheloalf95@gmail.com> * remove the other horses from this branch Signed-off-by: angie <angheloalf95@gmail.com> * Rename Epona animations Signed-off-by: angie <angheloalf95@gmail.com> * rename animations of ingo's horse Signed-off-by: angie <angheloalf95@gmail.com> * add textures in hni Signed-off-by: angie <angheloalf95@gmail.com> * Give proper animation names Signed-off-by: angie <angheloalf95@gmail.com> * Update symbols Signed-off-by: angie <angheloalf95@gmail.com> * cutscenes Signed-off-by: angie <angheloalf95@gmail.com> * ./format.sh Signed-off-by: angie <angheloalf95@gmail.com> * Apply suggestions from code review Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Add most of epona's textures and some limbs Signed-off-by: angie <angheloalf95@gmail.com> * add a bunch of textures and limbs of hni Signed-off-by: Angie <angheloalf95@gmail.com> * typo Signed-off-by: Angie <angheloalf95@gmail.com> * trailling comma memes Signed-off-by: Angie <angheloalf95@gmail.com> * all textures from hni Signed-off-by: angie <angheloalf95@gmail.com> * The remaining epona's textures Signed-off-by: Angie <angheloalf95@gmail.com> * Use proper names for bridge cutscene Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-04-14 21:12:00 +00:00
include "build/assets/objects/object_hni/object_hni.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_tw"
romalign 0x1000
Automatic objects 2 (#889) * adding missing objects * update rgba16 format * comment blobs * Fix blobs * add another missing one * add newlines to XMLs * remove objects from other PRs * add TlutOffset Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
2021-08-06 19:18:29 +00:00
include "build/assets/objects/object_tw/object_tw.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_rr"
romalign 0x1000
Decompiled A LOT of objects (#815) * . * remove tools/ZAP2 from origin master * object_spot04_objects * remove accidentally added xml * object_spot00_objects * object_bombf ok * object_dy_obj * object_masterzoora * object_mastergolon and object_masterkokirihead * object_aob * object_gt * object_gt * object_geff * object_mag kinda * object_gjyo_objects OK * object_ani OK * object_door_gerudo * object_md and object_trap * object_js OK * object_goroiwa * object_gs * object_nwc * object_niw * object_ane * object_os_anime OK * object_d_hsblock OK * object_fz OK * object_ru2 OK * fixed object_mag * object_cow OK * object_spot01_objects OK * object_spot15_obj * object_umajump OK * object_spot18_obj * object_spot12_obj * fix symbols in z_item_b_heart * object_bdan_objects & object_bowl * object_ddan_objects * object_owl OK * object_spot01_matoyab.xml OK * object_haka OK * object_heavy_object * object_ingate and objet_menkuri_objects * objet_spot00_break & object_relay_objects OK * object_spot01_matoya OK * object_spot06_objects OK * undefined_syms * object_spot08_obj OK * object_efc_doughnut & object_zg * object_ik OK * object_vm * object_ei OK * object_ds OK * updated spec * map_48x85_static OK * object_zl1 & object_peehat ok * some z_parameter naming and other undefined symbol stuff, object_yukabyun OK * object_bubble & object_fw ok * object_shopnuts * restore delete file * object_timeblock OK * object_d_lift OK * object_kibako2 OK * object_mamenoki OK * matches * remove unused asm * object_mag ok now * fixed object_ani * done for now, im tired * object_bdan_objects fixed up * fix bdan * object_bombf fixed * object_bowl fixed up * object_cow fixed * did more, im tired * fixed some stuff in object_ddan_objects * fix object_ddan_object * object_door_gerudo fixed * object_ds fix * object_dy progress * fixed great fairy * some more * more * object_haka fix * progress * ingo_gate fixed * object_js * forgot collision * object_relay_objects fixed * object_kibako2 * object_mag fixed * u64* to void* * more u64* to void* * object_mamenoki fix * object_mastergolon & object_masterkokirihead fix * mido is weird * fixed build * fix object_menkuri_objects * add missing textures in object_menkuri_objects * object_ms * fixed object_peehat * some cleanup stuff * object_zg fix * object_spot00_break fix * object_niw fix * object_nwc fixed * object_ru2 object_rr and some of object_owl fix * object_spot15_obj fix * business scrub * object_spot01_matoya fixed * object_spot18_obj fix * object_spot01_objects fix * object_spot04_objects fix * object_spot04_objects actually fixed * object_spot12_obj fix * object_timeblock fix * object_spot06_objects fixed * object_spot08_obj fix * spot01_matoyab fix * object_trap fix * object_umajump fix * object_vm fix * z_en_niw_lady fix * object_yukabyun fix * object_zl1 fixed * added offsets to object_os_anime * object_md fix * object_ane fix * object_aob fix * add palette comment * object_spot00_objects fix * spot00 fix * remove unused asm * updates * Add TlutOffset to objects added in https://github.com/zeldaret/oot/pull/815 * Updated object_bdan_objects, ran format.sh * Change rgb5a1 to rgba16 in my object xmls * Addressed Anghelo's comments * review Co-authored-by: Lucas Shaw <lucas.shaw1123@gmail.com> Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-08-05 15:53:58 +00:00
include "build/assets/objects/object_rr/object_rr.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_bxa"
romalign 0x1000
Add every unreserved object in an automated way (#805) * it's crashing * fix stuff * fix xmls * problematic objects * fix tabs * Fix suffixes * add missing new lines * Add comments to the problematic objects * Find and replace fixes * Add Fig's objects * I forgot to add a Name in a cutscene, so I'm adding it here * Update object decomp tutorial a little bit * Update problematic objects * Update docs/tutorial/object_decomp.md Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Change comments * comment out a few blobs * dammit tluts * Change a bunch of objects * update the last bunch * update comments on oA11 and oB2 * Ninja-edit to fix compatibility with ZAPD's PR 142 Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-05-16 16:36:40 +00:00
include "build/assets/objects/object_bxa/object_bxa.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_anubice"
romalign 0x1000
object_anubice OK (#696) * xml Signed-off-by: Anghelo <angheloalf95@gmail.com> * add all the object to xml Signed-off-by: Angie <angheloalf95@gmail.com> * add object to srccode Signed-off-by: Angie <angheloalf95@gmail.com> * A bit of naming Signed-off-by: angie <angheloalf95@gmail.com> * final rename Signed-off-by: angie <angheloalf95@gmail.com> * add unused particle Signed-off-by: angie <angheloalf95@gmail.com> * rename unused particle dls Signed-off-by: angie <angheloalf95@gmail.com> * delete gitkeep Signed-off-by: angie <angheloalf95@gmail.com> * run format.sh Signed-off-by: angie <angheloalf95@gmail.com>
2021-03-17 20:22:06 +00:00
include "build/assets/objects/object_anubice/object_anubice.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_gi_gerudo"
romalign 0x1000
All* Get Item objects decompiled (#668) * All get item objects OK * Name z_draw functions * fix skulltula tokens draw ids * Review suggestions, merge extract_single_asset into extract_assets as an optional argument Co-authored-by: Thar0 <maximilianc64@gmail.com>
2021-02-12 21:57:06 +00:00
include "build/assets/objects/object_gi_gerudo/object_gi_gerudo.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_gi_arrow"
romalign 0x1000
All* Get Item objects decompiled (#668) * All get item objects OK * Name z_draw functions * fix skulltula tokens draw ids * Review suggestions, merge extract_single_asset into extract_assets as an optional argument Co-authored-by: Thar0 <maximilianc64@gmail.com>
2021-02-12 21:57:06 +00:00
include "build/assets/objects/object_gi_arrow/object_gi_arrow.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_gi_bomb_2"
romalign 0x1000
All* Get Item objects decompiled (#668) * All get item objects OK * Name z_draw functions * fix skulltula tokens draw ids * Review suggestions, merge extract_single_asset into extract_assets as an optional argument Co-authored-by: Thar0 <maximilianc64@gmail.com>
2021-02-12 21:57:06 +00:00
include "build/assets/objects/object_gi_bomb_2/object_gi_bomb_2.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_gi_egg"
romalign 0x1000
All* Get Item objects decompiled (#668) * All get item objects OK * Name z_draw functions * fix skulltula tokens draw ids * Review suggestions, merge extract_single_asset into extract_assets as an optional argument Co-authored-by: Thar0 <maximilianc64@gmail.com>
2021-02-12 21:57:06 +00:00
include "build/assets/objects/object_gi_egg/object_gi_egg.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_gi_scale"
romalign 0x1000
All* Get Item objects decompiled (#668) * All get item objects OK * Name z_draw functions * fix skulltula tokens draw ids * Review suggestions, merge extract_single_asset into extract_assets as an optional argument Co-authored-by: Thar0 <maximilianc64@gmail.com>
2021-02-12 21:57:06 +00:00
include "build/assets/objects/object_gi_scale/object_gi_scale.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_gi_shield_2"
romalign 0x1000
All* Get Item objects decompiled (#668) * All get item objects OK * Name z_draw functions * fix skulltula tokens draw ids * Review suggestions, merge extract_single_asset into extract_assets as an optional argument Co-authored-by: Thar0 <maximilianc64@gmail.com>
2021-02-12 21:57:06 +00:00
include "build/assets/objects/object_gi_shield_2/object_gi_shield_2.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_gi_hookshot"
romalign 0x1000
All* Get Item objects decompiled (#668) * All get item objects OK * Name z_draw functions * fix skulltula tokens draw ids * Review suggestions, merge extract_single_asset into extract_assets as an optional argument Co-authored-by: Thar0 <maximilianc64@gmail.com>
2021-02-12 21:57:06 +00:00
include "build/assets/objects/object_gi_hookshot/object_gi_hookshot.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_gi_ocarina"
romalign 0x1000
All* Get Item objects decompiled (#668) * All get item objects OK * Name z_draw functions * fix skulltula tokens draw ids * Review suggestions, merge extract_single_asset into extract_assets as an optional argument Co-authored-by: Thar0 <maximilianc64@gmail.com>
2021-02-12 21:57:06 +00:00
include "build/assets/objects/object_gi_ocarina/object_gi_ocarina.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_gi_milk"
romalign 0x1000
All* Get Item objects decompiled (#668) * All get item objects OK * Name z_draw functions * fix skulltula tokens draw ids * Review suggestions, merge extract_single_asset into extract_assets as an optional argument Co-authored-by: Thar0 <maximilianc64@gmail.com>
2021-02-12 21:57:06 +00:00
include "build/assets/objects/object_gi_milk/object_gi_milk.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_ma1"
romalign 0x1000
Add every unreserved object in an automated way (#805) * it's crashing * fix stuff * fix xmls * problematic objects * fix tabs * Fix suffixes * add missing new lines * Add comments to the problematic objects * Find and replace fixes * Add Fig's objects * I forgot to add a Name in a cutscene, so I'm adding it here * Update object decomp tutorial a little bit * Update problematic objects * Update docs/tutorial/object_decomp.md Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Change comments * comment out a few blobs * dammit tluts * Change a bunch of objects * update the last bunch * update comments on oA11 and oB2 * Ninja-edit to fix compatibility with ZAPD's PR 142 Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-05-16 16:36:40 +00:00
include "build/assets/objects/object_ma1/object_ma1.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_ganon"
romalign 0x1000
Add every unreserved object in an automated way (#805) * it's crashing * fix stuff * fix xmls * problematic objects * fix tabs * Fix suffixes * add missing new lines * Add comments to the problematic objects * Find and replace fixes * Add Fig's objects * I forgot to add a Name in a cutscene, so I'm adding it here * Update object decomp tutorial a little bit * Update problematic objects * Update docs/tutorial/object_decomp.md Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Change comments * comment out a few blobs * dammit tluts * Change a bunch of objects * update the last bunch * update comments on oA11 and oB2 * Ninja-edit to fix compatibility with ZAPD's PR 142 Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-05-16 16:36:40 +00:00
include "build/assets/objects/object_ganon/object_ganon.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_sst"
romalign 0x1000
Bongo Bongo (ovl_Boss_Sst) (#458) * First pass * Darkmeiro decompilation Bg_Gnd_Darkmeiro decompiled, matched, and documented. * give this a shot * fix conflict * one more try * more matching fun * fun with bongo * clean this up later * found the matching versions * diff.py has escaped? * now with more docs * Now with floor and more docs * one more thing * incremental progress * It's Bongo time * one little thing * merge ZAP * update * camera * gfx now in their own file * now with more object decomp * name animations * now shiftable * missed some. also DECR * opd merge * start xml * now with xml asset extraction * format * cleanup * removed union Co-authored-by: Kelebek1 <eeeedddccc@hotmail.co.uk> Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
2021-04-05 23:08:45 +00:00
include "build/assets/objects/object_sst/object_sst.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_ny"
romalign 0x1000
EnNy OK (#624) * get data in * Match Init and one other * match some more * match a bunch more * merge master * OK * Some naming done * OBJECT_NY almost done. waiting on ZAP changes * Remove ASM * Cleanup * Commit before merge * fix damage table * Change comment
2021-01-31 20:32:55 +00:00
include "build/assets/objects/object_ny/object_ny.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_fr"
romalign 0x1000
Add every unreserved object in an automated way (#805) * it's crashing * fix stuff * fix xmls * problematic objects * fix tabs * Fix suffixes * add missing new lines * Add comments to the problematic objects * Find and replace fixes * Add Fig's objects * I forgot to add a Name in a cutscene, so I'm adding it here * Update object decomp tutorial a little bit * Update problematic objects * Update docs/tutorial/object_decomp.md Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Change comments * comment out a few blobs * dammit tluts * Change a bunch of objects * update the last bunch * update comments on oA11 and oB2 * Ninja-edit to fix compatibility with ZAPD's PR 142 Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-05-16 16:36:40 +00:00
include "build/assets/objects/object_fr/object_fr.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_gi_pachinko"
romalign 0x1000
All* Get Item objects decompiled (#668) * All get item objects OK * Name z_draw functions * fix skulltula tokens draw ids * Review suggestions, merge extract_single_asset into extract_assets as an optional argument Co-authored-by: Thar0 <maximilianc64@gmail.com>
2021-02-12 21:57:06 +00:00
include "build/assets/objects/object_gi_pachinko/object_gi_pachinko.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_gi_boomerang"
romalign 0x1000
All* Get Item objects decompiled (#668) * All get item objects OK * Name z_draw functions * fix skulltula tokens draw ids * Review suggestions, merge extract_single_asset into extract_assets as an optional argument Co-authored-by: Thar0 <maximilianc64@gmail.com>
2021-02-12 21:57:06 +00:00
include "build/assets/objects/object_gi_boomerang/object_gi_boomerang.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_gi_bow"
romalign 0x1000
All* Get Item objects decompiled (#668) * All get item objects OK * Name z_draw functions * fix skulltula tokens draw ids * Review suggestions, merge extract_single_asset into extract_assets as an optional argument Co-authored-by: Thar0 <maximilianc64@gmail.com>
2021-02-12 21:57:06 +00:00
include "build/assets/objects/object_gi_bow/object_gi_bow.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_gi_glasses"
romalign 0x1000
All* Get Item objects decompiled (#668) * All get item objects OK * Name z_draw functions * fix skulltula tokens draw ids * Review suggestions, merge extract_single_asset into extract_assets as an optional argument Co-authored-by: Thar0 <maximilianc64@gmail.com>
2021-02-12 21:57:06 +00:00
include "build/assets/objects/object_gi_glasses/object_gi_glasses.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_gi_liquid"
romalign 0x1000
All* Get Item objects decompiled (#668) * All get item objects OK * Name z_draw functions * fix skulltula tokens draw ids * Review suggestions, merge extract_single_asset into extract_assets as an optional argument Co-authored-by: Thar0 <maximilianc64@gmail.com>
2021-02-12 21:57:06 +00:00
include "build/assets/objects/object_gi_liquid/object_gi_liquid.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_ani"
romalign 0x1000
Decompiled A LOT of objects (#815) * . * remove tools/ZAP2 from origin master * object_spot04_objects * remove accidentally added xml * object_spot00_objects * object_bombf ok * object_dy_obj * object_masterzoora * object_mastergolon and object_masterkokirihead * object_aob * object_gt * object_gt * object_geff * object_mag kinda * object_gjyo_objects OK * object_ani OK * object_door_gerudo * object_md and object_trap * object_js OK * object_goroiwa * object_gs * object_nwc * object_niw * object_ane * object_os_anime OK * object_d_hsblock OK * object_fz OK * object_ru2 OK * fixed object_mag * object_cow OK * object_spot01_objects OK * object_spot15_obj * object_umajump OK * object_spot18_obj * object_spot12_obj * fix symbols in z_item_b_heart * object_bdan_objects & object_bowl * object_ddan_objects * object_owl OK * object_spot01_matoyab.xml OK * object_haka OK * object_heavy_object * object_ingate and objet_menkuri_objects * objet_spot00_break & object_relay_objects OK * object_spot01_matoya OK * object_spot06_objects OK * undefined_syms * object_spot08_obj OK * object_efc_doughnut & object_zg * object_ik OK * object_vm * object_ei OK * object_ds OK * updated spec * map_48x85_static OK * object_zl1 & object_peehat ok * some z_parameter naming and other undefined symbol stuff, object_yukabyun OK * object_bubble & object_fw ok * object_shopnuts * restore delete file * object_timeblock OK * object_d_lift OK * object_kibako2 OK * object_mamenoki OK * matches * remove unused asm * object_mag ok now * fixed object_ani * done for now, im tired * object_bdan_objects fixed up * fix bdan * object_bombf fixed * object_bowl fixed up * object_cow fixed * did more, im tired * fixed some stuff in object_ddan_objects * fix object_ddan_object * object_door_gerudo fixed * object_ds fix * object_dy progress * fixed great fairy * some more * more * object_haka fix * progress * ingo_gate fixed * object_js * forgot collision * object_relay_objects fixed * object_kibako2 * object_mag fixed * u64* to void* * more u64* to void* * object_mamenoki fix * object_mastergolon & object_masterkokirihead fix * mido is weird * fixed build * fix object_menkuri_objects * add missing textures in object_menkuri_objects * object_ms * fixed object_peehat * some cleanup stuff * object_zg fix * object_spot00_break fix * object_niw fix * object_nwc fixed * object_ru2 object_rr and some of object_owl fix * object_spot15_obj fix * business scrub * object_spot01_matoya fixed * object_spot18_obj fix * object_spot01_objects fix * object_spot04_objects fix * object_spot04_objects actually fixed * object_spot12_obj fix * object_timeblock fix * object_spot06_objects fixed * object_spot08_obj fix * spot01_matoyab fix * object_trap fix * object_umajump fix * object_vm fix * z_en_niw_lady fix * object_yukabyun fix * object_zl1 fixed * added offsets to object_os_anime * object_md fix * object_ane fix * object_aob fix * add palette comment * object_spot00_objects fix * spot00 fix * remove unused asm * updates * Add TlutOffset to objects added in https://github.com/zeldaret/oot/pull/815 * Updated object_bdan_objects, ran format.sh * Change rgb5a1 to rgba16 in my object xmls * Addressed Anghelo's comments * review Co-authored-by: Lucas Shaw <lucas.shaw1123@gmail.com> Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-08-05 15:53:58 +00:00
include "build/assets/objects/object_ani/object_ani.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_demo_6k"
romalign 0x1000
Add every unreserved object in an automated way (#805) * it's crashing * fix stuff * fix xmls * problematic objects * fix tabs * Fix suffixes * add missing new lines * Add comments to the problematic objects * Find and replace fixes * Add Fig's objects * I forgot to add a Name in a cutscene, so I'm adding it here * Update object decomp tutorial a little bit * Update problematic objects * Update docs/tutorial/object_decomp.md Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Change comments * comment out a few blobs * dammit tluts * Change a bunch of objects * update the last bunch * update comments on oA11 and oB2 * Ninja-edit to fix compatibility with ZAPD's PR 142 Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-05-16 16:36:40 +00:00
include "build/assets/objects/object_demo_6k/object_demo_6k.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_gi_shield_3"
romalign 0x1000
All* Get Item objects decompiled (#668) * All get item objects OK * Name z_draw functions * fix skulltula tokens draw ids * Review suggestions, merge extract_single_asset into extract_assets as an optional argument Co-authored-by: Thar0 <maximilianc64@gmail.com>
2021-02-12 21:57:06 +00:00
include "build/assets/objects/object_gi_shield_3/object_gi_shield_3.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_gi_letter"
romalign 0x1000
All* Get Item objects decompiled (#668) * All get item objects OK * Name z_draw functions * fix skulltula tokens draw ids * Review suggestions, merge extract_single_asset into extract_assets as an optional argument Co-authored-by: Thar0 <maximilianc64@gmail.com>
2021-02-12 21:57:06 +00:00
include "build/assets/objects/object_gi_letter/object_gi_letter.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_spot15_obj"
romalign 0x1000
Decompiled A LOT of objects (#815) * . * remove tools/ZAP2 from origin master * object_spot04_objects * remove accidentally added xml * object_spot00_objects * object_bombf ok * object_dy_obj * object_masterzoora * object_mastergolon and object_masterkokirihead * object_aob * object_gt * object_gt * object_geff * object_mag kinda * object_gjyo_objects OK * object_ani OK * object_door_gerudo * object_md and object_trap * object_js OK * object_goroiwa * object_gs * object_nwc * object_niw * object_ane * object_os_anime OK * object_d_hsblock OK * object_fz OK * object_ru2 OK * fixed object_mag * object_cow OK * object_spot01_objects OK * object_spot15_obj * object_umajump OK * object_spot18_obj * object_spot12_obj * fix symbols in z_item_b_heart * object_bdan_objects & object_bowl * object_ddan_objects * object_owl OK * object_spot01_matoyab.xml OK * object_haka OK * object_heavy_object * object_ingate and objet_menkuri_objects * objet_spot00_break & object_relay_objects OK * object_spot01_matoya OK * object_spot06_objects OK * undefined_syms * object_spot08_obj OK * object_efc_doughnut & object_zg * object_ik OK * object_vm * object_ei OK * object_ds OK * updated spec * map_48x85_static OK * object_zl1 & object_peehat ok * some z_parameter naming and other undefined symbol stuff, object_yukabyun OK * object_bubble & object_fw ok * object_shopnuts * restore delete file * object_timeblock OK * object_d_lift OK * object_kibako2 OK * object_mamenoki OK * matches * remove unused asm * object_mag ok now * fixed object_ani * done for now, im tired * object_bdan_objects fixed up * fix bdan * object_bombf fixed * object_bowl fixed up * object_cow fixed * did more, im tired * fixed some stuff in object_ddan_objects * fix object_ddan_object * object_door_gerudo fixed * object_ds fix * object_dy progress * fixed great fairy * some more * more * object_haka fix * progress * ingo_gate fixed * object_js * forgot collision * object_relay_objects fixed * object_kibako2 * object_mag fixed * u64* to void* * more u64* to void* * object_mamenoki fix * object_mastergolon & object_masterkokirihead fix * mido is weird * fixed build * fix object_menkuri_objects * add missing textures in object_menkuri_objects * object_ms * fixed object_peehat * some cleanup stuff * object_zg fix * object_spot00_break fix * object_niw fix * object_nwc fixed * object_ru2 object_rr and some of object_owl fix * object_spot15_obj fix * business scrub * object_spot01_matoya fixed * object_spot18_obj fix * object_spot01_objects fix * object_spot04_objects fix * object_spot04_objects actually fixed * object_spot12_obj fix * object_timeblock fix * object_spot06_objects fixed * object_spot08_obj fix * spot01_matoyab fix * object_trap fix * object_umajump fix * object_vm fix * z_en_niw_lady fix * object_yukabyun fix * object_zl1 fixed * added offsets to object_os_anime * object_md fix * object_ane fix * object_aob fix * add palette comment * object_spot00_objects fix * spot00 fix * remove unused asm * updates * Add TlutOffset to objects added in https://github.com/zeldaret/oot/pull/815 * Updated object_bdan_objects, ran format.sh * Change rgb5a1 to rgba16 in my object xmls * Addressed Anghelo's comments * review Co-authored-by: Lucas Shaw <lucas.shaw1123@gmail.com> Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-08-05 15:53:58 +00:00
include "build/assets/objects/object_spot15_obj/object_spot15_obj.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_jya_obj"
romalign 0x1000
Decompile a bunch of objects (#603) * Mostly done but shifted * still messed up * Almost OK * OBJECT_JYA_OBJ OK, OBJECT_GR OK * Done * Merge master and format * Cleanup * Cleanup 2 * Start object MB dont merge yet * Object_MB OK * Object_ydan_objects OK * General 'ydan' actor cleanup * Forgot some small things * Object_EC OK * add .gitkeep and run format * Object_sd OK but no textures cause of a zap issue * PR fixes * Fix object_sd * fix ydan * delete .gitkeep files * OBJECT_BOX as far as it can go with current ZAP * Fix undefined_syms * Start child link object * Push progress, dont merge yet * Object_mori_objects OK * Fixed? * Fix conflicts again * Seems like i missed some textures * Extract data for BgBombwall * More field * ZAP YEP 2.0 * Object_Box OK * Object_SD ok. Ready to merge * remove ASM and merge master * remove ASM * remove files wrongfully added to docs/ * Almost done * Change comment in z_player_lib.c * forgot some DLists in player_lib.c * Fix conflict, run format * Same as before but this time with Tex and TLUT * Last few things * fix object_GR and add limbs to object_sd * Nane -> Name * gChildDekuShieldMtx is now a matrix and not a blob * PR fixes (Fig) * add a space for comment in z_player_lib.c * re push and new lines * PR fixes (AngheloAlf) * PR fixes (Roman) * Fix Heishi2 * PR fixes (Fig) * Replace spacing in a file * PR fixes (Roman)
2021-05-26 22:59:21 +00:00
include "build/assets/objects/object_jya_obj/object_jya_obj.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_gi_clothes"
romalign 0x1000
All* Get Item objects decompiled (#668) * All get item objects OK * Name z_draw functions * fix skulltula tokens draw ids * Review suggestions, merge extract_single_asset into extract_assets as an optional argument Co-authored-by: Thar0 <maximilianc64@gmail.com>
2021-02-12 21:57:06 +00:00
include "build/assets/objects/object_gi_clothes/object_gi_clothes.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_gi_bean"
romalign 0x1000
All* Get Item objects decompiled (#668) * All get item objects OK * Name z_draw functions * fix skulltula tokens draw ids * Review suggestions, merge extract_single_asset into extract_assets as an optional argument Co-authored-by: Thar0 <maximilianc64@gmail.com>
2021-02-12 21:57:06 +00:00
include "build/assets/objects/object_gi_bean/object_gi_bean.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_gi_fish"
romalign 0x1000
All* Get Item objects decompiled (#668) * All get item objects OK * Name z_draw functions * fix skulltula tokens draw ids * Review suggestions, merge extract_single_asset into extract_assets as an optional argument Co-authored-by: Thar0 <maximilianc64@gmail.com>
2021-02-12 21:57:06 +00:00
include "build/assets/objects/object_gi_fish/object_gi_fish.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_gi_saw"
romalign 0x1000
All* Get Item objects decompiled (#668) * All get item objects OK * Name z_draw functions * fix skulltula tokens draw ids * Review suggestions, merge extract_single_asset into extract_assets as an optional argument Co-authored-by: Thar0 <maximilianc64@gmail.com>
2021-02-12 21:57:06 +00:00
include "build/assets/objects/object_gi_saw/object_gi_saw.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_gi_hammer"
romalign 0x1000
All* Get Item objects decompiled (#668) * All get item objects OK * Name z_draw functions * fix skulltula tokens draw ids * Review suggestions, merge extract_single_asset into extract_assets as an optional argument Co-authored-by: Thar0 <maximilianc64@gmail.com>
2021-02-12 21:57:06 +00:00
include "build/assets/objects/object_gi_hammer/object_gi_hammer.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_gi_grass"
romalign 0x1000
All* Get Item objects decompiled (#668) * All get item objects OK * Name z_draw functions * fix skulltula tokens draw ids * Review suggestions, merge extract_single_asset into extract_assets as an optional argument Co-authored-by: Thar0 <maximilianc64@gmail.com>
2021-02-12 21:57:06 +00:00
include "build/assets/objects/object_gi_grass/object_gi_grass.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_gi_longsword"
romalign 0x1000
All* Get Item objects decompiled (#668) * All get item objects OK * Name z_draw functions * fix skulltula tokens draw ids * Review suggestions, merge extract_single_asset into extract_assets as an optional argument Co-authored-by: Thar0 <maximilianc64@gmail.com>
2021-02-12 21:57:06 +00:00
include "build/assets/objects/object_gi_longsword/object_gi_longsword.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_spot01_objects"
romalign 0x1000
Decompiled A LOT of objects (#815) * . * remove tools/ZAP2 from origin master * object_spot04_objects * remove accidentally added xml * object_spot00_objects * object_bombf ok * object_dy_obj * object_masterzoora * object_mastergolon and object_masterkokirihead * object_aob * object_gt * object_gt * object_geff * object_mag kinda * object_gjyo_objects OK * object_ani OK * object_door_gerudo * object_md and object_trap * object_js OK * object_goroiwa * object_gs * object_nwc * object_niw * object_ane * object_os_anime OK * object_d_hsblock OK * object_fz OK * object_ru2 OK * fixed object_mag * object_cow OK * object_spot01_objects OK * object_spot15_obj * object_umajump OK * object_spot18_obj * object_spot12_obj * fix symbols in z_item_b_heart * object_bdan_objects & object_bowl * object_ddan_objects * object_owl OK * object_spot01_matoyab.xml OK * object_haka OK * object_heavy_object * object_ingate and objet_menkuri_objects * objet_spot00_break & object_relay_objects OK * object_spot01_matoya OK * object_spot06_objects OK * undefined_syms * object_spot08_obj OK * object_efc_doughnut & object_zg * object_ik OK * object_vm * object_ei OK * object_ds OK * updated spec * map_48x85_static OK * object_zl1 & object_peehat ok * some z_parameter naming and other undefined symbol stuff, object_yukabyun OK * object_bubble & object_fw ok * object_shopnuts * restore delete file * object_timeblock OK * object_d_lift OK * object_kibako2 OK * object_mamenoki OK * matches * remove unused asm * object_mag ok now * fixed object_ani * done for now, im tired * object_bdan_objects fixed up * fix bdan * object_bombf fixed * object_bowl fixed up * object_cow fixed * did more, im tired * fixed some stuff in object_ddan_objects * fix object_ddan_object * object_door_gerudo fixed * object_ds fix * object_dy progress * fixed great fairy * some more * more * object_haka fix * progress * ingo_gate fixed * object_js * forgot collision * object_relay_objects fixed * object_kibako2 * object_mag fixed * u64* to void* * more u64* to void* * object_mamenoki fix * object_mastergolon & object_masterkokirihead fix * mido is weird * fixed build * fix object_menkuri_objects * add missing textures in object_menkuri_objects * object_ms * fixed object_peehat * some cleanup stuff * object_zg fix * object_spot00_break fix * object_niw fix * object_nwc fixed * object_ru2 object_rr and some of object_owl fix * object_spot15_obj fix * business scrub * object_spot01_matoya fixed * object_spot18_obj fix * object_spot01_objects fix * object_spot04_objects fix * object_spot04_objects actually fixed * object_spot12_obj fix * object_timeblock fix * object_spot06_objects fixed * object_spot08_obj fix * spot01_matoyab fix * object_trap fix * object_umajump fix * object_vm fix * z_en_niw_lady fix * object_yukabyun fix * object_zl1 fixed * added offsets to object_os_anime * object_md fix * object_ane fix * object_aob fix * add palette comment * object_spot00_objects fix * spot00 fix * remove unused asm * updates * Add TlutOffset to objects added in https://github.com/zeldaret/oot/pull/815 * Updated object_bdan_objects, ran format.sh * Change rgb5a1 to rgba16 in my object xmls * Addressed Anghelo's comments * review Co-authored-by: Lucas Shaw <lucas.shaw1123@gmail.com> Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-08-05 15:53:58 +00:00
include "build/assets/objects/object_spot01_objects/object_spot01_objects.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_md"
romalign 0x1000
Decompiled A LOT of objects (#815) * . * remove tools/ZAP2 from origin master * object_spot04_objects * remove accidentally added xml * object_spot00_objects * object_bombf ok * object_dy_obj * object_masterzoora * object_mastergolon and object_masterkokirihead * object_aob * object_gt * object_gt * object_geff * object_mag kinda * object_gjyo_objects OK * object_ani OK * object_door_gerudo * object_md and object_trap * object_js OK * object_goroiwa * object_gs * object_nwc * object_niw * object_ane * object_os_anime OK * object_d_hsblock OK * object_fz OK * object_ru2 OK * fixed object_mag * object_cow OK * object_spot01_objects OK * object_spot15_obj * object_umajump OK * object_spot18_obj * object_spot12_obj * fix symbols in z_item_b_heart * object_bdan_objects & object_bowl * object_ddan_objects * object_owl OK * object_spot01_matoyab.xml OK * object_haka OK * object_heavy_object * object_ingate and objet_menkuri_objects * objet_spot00_break & object_relay_objects OK * object_spot01_matoya OK * object_spot06_objects OK * undefined_syms * object_spot08_obj OK * object_efc_doughnut & object_zg * object_ik OK * object_vm * object_ei OK * object_ds OK * updated spec * map_48x85_static OK * object_zl1 & object_peehat ok * some z_parameter naming and other undefined symbol stuff, object_yukabyun OK * object_bubble & object_fw ok * object_shopnuts * restore delete file * object_timeblock OK * object_d_lift OK * object_kibako2 OK * object_mamenoki OK * matches * remove unused asm * object_mag ok now * fixed object_ani * done for now, im tired * object_bdan_objects fixed up * fix bdan * object_bombf fixed * object_bowl fixed up * object_cow fixed * did more, im tired * fixed some stuff in object_ddan_objects * fix object_ddan_object * object_door_gerudo fixed * object_ds fix * object_dy progress * fixed great fairy * some more * more * object_haka fix * progress * ingo_gate fixed * object_js * forgot collision * object_relay_objects fixed * object_kibako2 * object_mag fixed * u64* to void* * more u64* to void* * object_mamenoki fix * object_mastergolon & object_masterkokirihead fix * mido is weird * fixed build * fix object_menkuri_objects * add missing textures in object_menkuri_objects * object_ms * fixed object_peehat * some cleanup stuff * object_zg fix * object_spot00_break fix * object_niw fix * object_nwc fixed * object_ru2 object_rr and some of object_owl fix * object_spot15_obj fix * business scrub * object_spot01_matoya fixed * object_spot18_obj fix * object_spot01_objects fix * object_spot04_objects fix * object_spot04_objects actually fixed * object_spot12_obj fix * object_timeblock fix * object_spot06_objects fixed * object_spot08_obj fix * spot01_matoyab fix * object_trap fix * object_umajump fix * object_vm fix * z_en_niw_lady fix * object_yukabyun fix * object_zl1 fixed * added offsets to object_os_anime * object_md fix * object_ane fix * object_aob fix * add palette comment * object_spot00_objects fix * spot00 fix * remove unused asm * updates * Add TlutOffset to objects added in https://github.com/zeldaret/oot/pull/815 * Updated object_bdan_objects, ran format.sh * Change rgb5a1 to rgba16 in my object xmls * Addressed Anghelo's comments * review Co-authored-by: Lucas Shaw <lucas.shaw1123@gmail.com> Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-08-05 15:53:58 +00:00
include "build/assets/objects/object_md/object_md.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_km1"
romalign 0x1000
include "build/baserom/object_km1.o"
z_en_ko OK (#869) * .data OK * Progress * push some old stuff * Finish a chain * Progress * Progress * Run mathfixer.py * Progress * match one more * Up to date * Match func_80A97610 * func_80A96FD0 * most of the way through the mega switch * small formatting thing. still stuck on the switch * start a big switch function * a little closer * done with matching for now starting objects * func_80A97738 OK! * func_80A995CC OK! * func_80A99864 OK! * en_ko OK! * Code clean-up pass * more EnKo cleanups, object_fa and object_kw1 textures documented * complete object_km1, more EnKo documentation * More documentation * delete asm * Clean-up rebase issues * bleh * Implement Dragorn's suggestions * fix spec, implement fig's suggestions * whoops (ill leave it for the docs tho lol) * whoops again * i made an ouchie * smile * last one for real Co-authored-by: Louis <35883445+louist103@users.noreply.github.com> Co-authored-by: fig02 <fig02srl@gmail.com>
2021-07-28 21:59:52 +00:00
//include "build/assets/objects/object_km1/object_km1.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_kw1"
romalign 0x1000
z_en_ko OK (#869) * .data OK * Progress * push some old stuff * Finish a chain * Progress * Progress * Run mathfixer.py * Progress * match one more * Up to date * Match func_80A97610 * func_80A96FD0 * most of the way through the mega switch * small formatting thing. still stuck on the switch * start a big switch function * a little closer * done with matching for now starting objects * func_80A97738 OK! * func_80A995CC OK! * func_80A99864 OK! * en_ko OK! * Code clean-up pass * more EnKo cleanups, object_fa and object_kw1 textures documented * complete object_km1, more EnKo documentation * More documentation * delete asm * Clean-up rebase issues * bleh * Implement Dragorn's suggestions * fix spec, implement fig's suggestions * whoops (ill leave it for the docs tho lol) * whoops again * i made an ouchie * smile * last one for real Co-authored-by: Louis <35883445+louist103@users.noreply.github.com> Co-authored-by: fig02 <fig02srl@gmail.com>
2021-07-28 21:59:52 +00:00
include "build/baserom/object_kw1.o"
//include "build/assets/objects/object_kw1/object_kw1.o"
Add every unreserved object in an automated way (#805) * it's crashing * fix stuff * fix xmls * problematic objects * fix tabs * Fix suffixes * add missing new lines * Add comments to the problematic objects * Find and replace fixes * Add Fig's objects * I forgot to add a Name in a cutscene, so I'm adding it here * Update object decomp tutorial a little bit * Update problematic objects * Update docs/tutorial/object_decomp.md Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Change comments * comment out a few blobs * dammit tluts * Change a bunch of objects * update the last bunch * update comments on oA11 and oB2 * Ninja-edit to fix compatibility with ZAPD's PR 142 Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-05-16 16:36:40 +00:00
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_zo"
romalign 0x1000
Decompile `object_zo` :dolphin: (#794) * Initial xml * most of in-code references * Add limbs and evrything else * Functions used by EnRiverSound * Fix forearm and use void* for textures * Run formatter
2021-04-30 23:55:52 +00:00
include "build/assets/objects/object_zo/object_zo.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_kz"
romalign 0x1000
Automatic objects 2 (#889) * adding missing objects * update rgba16 format * comment blobs * Fix blobs * add another missing one * add newlines to XMLs * remove objects from other PRs * add TlutOffset Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
2021-08-06 19:18:29 +00:00
include "build/assets/objects/object_kz/object_kz.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_umajump"
romalign 0x1000
Decompiled A LOT of objects (#815) * . * remove tools/ZAP2 from origin master * object_spot04_objects * remove accidentally added xml * object_spot00_objects * object_bombf ok * object_dy_obj * object_masterzoora * object_mastergolon and object_masterkokirihead * object_aob * object_gt * object_gt * object_geff * object_mag kinda * object_gjyo_objects OK * object_ani OK * object_door_gerudo * object_md and object_trap * object_js OK * object_goroiwa * object_gs * object_nwc * object_niw * object_ane * object_os_anime OK * object_d_hsblock OK * object_fz OK * object_ru2 OK * fixed object_mag * object_cow OK * object_spot01_objects OK * object_spot15_obj * object_umajump OK * object_spot18_obj * object_spot12_obj * fix symbols in z_item_b_heart * object_bdan_objects & object_bowl * object_ddan_objects * object_owl OK * object_spot01_matoyab.xml OK * object_haka OK * object_heavy_object * object_ingate and objet_menkuri_objects * objet_spot00_break & object_relay_objects OK * object_spot01_matoya OK * object_spot06_objects OK * undefined_syms * object_spot08_obj OK * object_efc_doughnut & object_zg * object_ik OK * object_vm * object_ei OK * object_ds OK * updated spec * map_48x85_static OK * object_zl1 & object_peehat ok * some z_parameter naming and other undefined symbol stuff, object_yukabyun OK * object_bubble & object_fw ok * object_shopnuts * restore delete file * object_timeblock OK * object_d_lift OK * object_kibako2 OK * object_mamenoki OK * matches * remove unused asm * object_mag ok now * fixed object_ani * done for now, im tired * object_bdan_objects fixed up * fix bdan * object_bombf fixed * object_bowl fixed up * object_cow fixed * did more, im tired * fixed some stuff in object_ddan_objects * fix object_ddan_object * object_door_gerudo fixed * object_ds fix * object_dy progress * fixed great fairy * some more * more * object_haka fix * progress * ingo_gate fixed * object_js * forgot collision * object_relay_objects fixed * object_kibako2 * object_mag fixed * u64* to void* * more u64* to void* * object_mamenoki fix * object_mastergolon & object_masterkokirihead fix * mido is weird * fixed build * fix object_menkuri_objects * add missing textures in object_menkuri_objects * object_ms * fixed object_peehat * some cleanup stuff * object_zg fix * object_spot00_break fix * object_niw fix * object_nwc fixed * object_ru2 object_rr and some of object_owl fix * object_spot15_obj fix * business scrub * object_spot01_matoya fixed * object_spot18_obj fix * object_spot01_objects fix * object_spot04_objects fix * object_spot04_objects actually fixed * object_spot12_obj fix * object_timeblock fix * object_spot06_objects fixed * object_spot08_obj fix * spot01_matoyab fix * object_trap fix * object_umajump fix * object_vm fix * z_en_niw_lady fix * object_yukabyun fix * object_zl1 fixed * added offsets to object_os_anime * object_md fix * object_ane fix * object_aob fix * add palette comment * object_spot00_objects fix * spot00 fix * remove unused asm * updates * Add TlutOffset to objects added in https://github.com/zeldaret/oot/pull/815 * Updated object_bdan_objects, ran format.sh * Change rgb5a1 to rgba16 in my object xmls * Addressed Anghelo's comments * review Co-authored-by: Lucas Shaw <lucas.shaw1123@gmail.com> Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-08-05 15:53:58 +00:00
include "build/assets/objects/object_umajump/object_umajump.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_masterkokiri"
romalign 0x1000
Add every unreserved object in an automated way (#805) * it's crashing * fix stuff * fix xmls * problematic objects * fix tabs * Fix suffixes * add missing new lines * Add comments to the problematic objects * Find and replace fixes * Add Fig's objects * I forgot to add a Name in a cutscene, so I'm adding it here * Update object decomp tutorial a little bit * Update problematic objects * Update docs/tutorial/object_decomp.md Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Change comments * comment out a few blobs * dammit tluts * Change a bunch of objects * update the last bunch * update comments on oA11 and oB2 * Ninja-edit to fix compatibility with ZAPD's PR 142 Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-05-16 16:36:40 +00:00
include "build/assets/objects/object_masterkokiri/object_masterkokiri.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_masterkokirihead"
romalign 0x1000
Decompiled A LOT of objects (#815) * . * remove tools/ZAP2 from origin master * object_spot04_objects * remove accidentally added xml * object_spot00_objects * object_bombf ok * object_dy_obj * object_masterzoora * object_mastergolon and object_masterkokirihead * object_aob * object_gt * object_gt * object_geff * object_mag kinda * object_gjyo_objects OK * object_ani OK * object_door_gerudo * object_md and object_trap * object_js OK * object_goroiwa * object_gs * object_nwc * object_niw * object_ane * object_os_anime OK * object_d_hsblock OK * object_fz OK * object_ru2 OK * fixed object_mag * object_cow OK * object_spot01_objects OK * object_spot15_obj * object_umajump OK * object_spot18_obj * object_spot12_obj * fix symbols in z_item_b_heart * object_bdan_objects & object_bowl * object_ddan_objects * object_owl OK * object_spot01_matoyab.xml OK * object_haka OK * object_heavy_object * object_ingate and objet_menkuri_objects * objet_spot00_break & object_relay_objects OK * object_spot01_matoya OK * object_spot06_objects OK * undefined_syms * object_spot08_obj OK * object_efc_doughnut & object_zg * object_ik OK * object_vm * object_ei OK * object_ds OK * updated spec * map_48x85_static OK * object_zl1 & object_peehat ok * some z_parameter naming and other undefined symbol stuff, object_yukabyun OK * object_bubble & object_fw ok * object_shopnuts * restore delete file * object_timeblock OK * object_d_lift OK * object_kibako2 OK * object_mamenoki OK * matches * remove unused asm * object_mag ok now * fixed object_ani * done for now, im tired * object_bdan_objects fixed up * fix bdan * object_bombf fixed * object_bowl fixed up * object_cow fixed * did more, im tired * fixed some stuff in object_ddan_objects * fix object_ddan_object * object_door_gerudo fixed * object_ds fix * object_dy progress * fixed great fairy * some more * more * object_haka fix * progress * ingo_gate fixed * object_js * forgot collision * object_relay_objects fixed * object_kibako2 * object_mag fixed * u64* to void* * more u64* to void* * object_mamenoki fix * object_mastergolon & object_masterkokirihead fix * mido is weird * fixed build * fix object_menkuri_objects * add missing textures in object_menkuri_objects * object_ms * fixed object_peehat * some cleanup stuff * object_zg fix * object_spot00_break fix * object_niw fix * object_nwc fixed * object_ru2 object_rr and some of object_owl fix * object_spot15_obj fix * business scrub * object_spot01_matoya fixed * object_spot18_obj fix * object_spot01_objects fix * object_spot04_objects fix * object_spot04_objects actually fixed * object_spot12_obj fix * object_timeblock fix * object_spot06_objects fixed * object_spot08_obj fix * spot01_matoyab fix * object_trap fix * object_umajump fix * object_vm fix * z_en_niw_lady fix * object_yukabyun fix * object_zl1 fixed * added offsets to object_os_anime * object_md fix * object_ane fix * object_aob fix * add palette comment * object_spot00_objects fix * spot00 fix * remove unused asm * updates * Add TlutOffset to objects added in https://github.com/zeldaret/oot/pull/815 * Updated object_bdan_objects, ran format.sh * Change rgb5a1 to rgba16 in my object xmls * Addressed Anghelo's comments * review Co-authored-by: Lucas Shaw <lucas.shaw1123@gmail.com> Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-08-05 15:53:58 +00:00
include "build/assets/objects/object_masterkokirihead/object_masterkokirihead.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_mastergolon"
romalign 0x1000
Decompiled A LOT of objects (#815) * . * remove tools/ZAP2 from origin master * object_spot04_objects * remove accidentally added xml * object_spot00_objects * object_bombf ok * object_dy_obj * object_masterzoora * object_mastergolon and object_masterkokirihead * object_aob * object_gt * object_gt * object_geff * object_mag kinda * object_gjyo_objects OK * object_ani OK * object_door_gerudo * object_md and object_trap * object_js OK * object_goroiwa * object_gs * object_nwc * object_niw * object_ane * object_os_anime OK * object_d_hsblock OK * object_fz OK * object_ru2 OK * fixed object_mag * object_cow OK * object_spot01_objects OK * object_spot15_obj * object_umajump OK * object_spot18_obj * object_spot12_obj * fix symbols in z_item_b_heart * object_bdan_objects & object_bowl * object_ddan_objects * object_owl OK * object_spot01_matoyab.xml OK * object_haka OK * object_heavy_object * object_ingate and objet_menkuri_objects * objet_spot00_break & object_relay_objects OK * object_spot01_matoya OK * object_spot06_objects OK * undefined_syms * object_spot08_obj OK * object_efc_doughnut & object_zg * object_ik OK * object_vm * object_ei OK * object_ds OK * updated spec * map_48x85_static OK * object_zl1 & object_peehat ok * some z_parameter naming and other undefined symbol stuff, object_yukabyun OK * object_bubble & object_fw ok * object_shopnuts * restore delete file * object_timeblock OK * object_d_lift OK * object_kibako2 OK * object_mamenoki OK * matches * remove unused asm * object_mag ok now * fixed object_ani * done for now, im tired * object_bdan_objects fixed up * fix bdan * object_bombf fixed * object_bowl fixed up * object_cow fixed * did more, im tired * fixed some stuff in object_ddan_objects * fix object_ddan_object * object_door_gerudo fixed * object_ds fix * object_dy progress * fixed great fairy * some more * more * object_haka fix * progress * ingo_gate fixed * object_js * forgot collision * object_relay_objects fixed * object_kibako2 * object_mag fixed * u64* to void* * more u64* to void* * object_mamenoki fix * object_mastergolon & object_masterkokirihead fix * mido is weird * fixed build * fix object_menkuri_objects * add missing textures in object_menkuri_objects * object_ms * fixed object_peehat * some cleanup stuff * object_zg fix * object_spot00_break fix * object_niw fix * object_nwc fixed * object_ru2 object_rr and some of object_owl fix * object_spot15_obj fix * business scrub * object_spot01_matoya fixed * object_spot18_obj fix * object_spot01_objects fix * object_spot04_objects fix * object_spot04_objects actually fixed * object_spot12_obj fix * object_timeblock fix * object_spot06_objects fixed * object_spot08_obj fix * spot01_matoyab fix * object_trap fix * object_umajump fix * object_vm fix * z_en_niw_lady fix * object_yukabyun fix * object_zl1 fixed * added offsets to object_os_anime * object_md fix * object_ane fix * object_aob fix * add palette comment * object_spot00_objects fix * spot00 fix * remove unused asm * updates * Add TlutOffset to objects added in https://github.com/zeldaret/oot/pull/815 * Updated object_bdan_objects, ran format.sh * Change rgb5a1 to rgba16 in my object xmls * Addressed Anghelo's comments * review Co-authored-by: Lucas Shaw <lucas.shaw1123@gmail.com> Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-08-05 15:53:58 +00:00
include "build/assets/objects/object_mastergolon/object_mastergolon.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_masterzoora"
romalign 0x1000
Decompiled A LOT of objects (#815) * . * remove tools/ZAP2 from origin master * object_spot04_objects * remove accidentally added xml * object_spot00_objects * object_bombf ok * object_dy_obj * object_masterzoora * object_mastergolon and object_masterkokirihead * object_aob * object_gt * object_gt * object_geff * object_mag kinda * object_gjyo_objects OK * object_ani OK * object_door_gerudo * object_md and object_trap * object_js OK * object_goroiwa * object_gs * object_nwc * object_niw * object_ane * object_os_anime OK * object_d_hsblock OK * object_fz OK * object_ru2 OK * fixed object_mag * object_cow OK * object_spot01_objects OK * object_spot15_obj * object_umajump OK * object_spot18_obj * object_spot12_obj * fix symbols in z_item_b_heart * object_bdan_objects & object_bowl * object_ddan_objects * object_owl OK * object_spot01_matoyab.xml OK * object_haka OK * object_heavy_object * object_ingate and objet_menkuri_objects * objet_spot00_break & object_relay_objects OK * object_spot01_matoya OK * object_spot06_objects OK * undefined_syms * object_spot08_obj OK * object_efc_doughnut & object_zg * object_ik OK * object_vm * object_ei OK * object_ds OK * updated spec * map_48x85_static OK * object_zl1 & object_peehat ok * some z_parameter naming and other undefined symbol stuff, object_yukabyun OK * object_bubble & object_fw ok * object_shopnuts * restore delete file * object_timeblock OK * object_d_lift OK * object_kibako2 OK * object_mamenoki OK * matches * remove unused asm * object_mag ok now * fixed object_ani * done for now, im tired * object_bdan_objects fixed up * fix bdan * object_bombf fixed * object_bowl fixed up * object_cow fixed * did more, im tired * fixed some stuff in object_ddan_objects * fix object_ddan_object * object_door_gerudo fixed * object_ds fix * object_dy progress * fixed great fairy * some more * more * object_haka fix * progress * ingo_gate fixed * object_js * forgot collision * object_relay_objects fixed * object_kibako2 * object_mag fixed * u64* to void* * more u64* to void* * object_mamenoki fix * object_mastergolon & object_masterkokirihead fix * mido is weird * fixed build * fix object_menkuri_objects * add missing textures in object_menkuri_objects * object_ms * fixed object_peehat * some cleanup stuff * object_zg fix * object_spot00_break fix * object_niw fix * object_nwc fixed * object_ru2 object_rr and some of object_owl fix * object_spot15_obj fix * business scrub * object_spot01_matoya fixed * object_spot18_obj fix * object_spot01_objects fix * object_spot04_objects fix * object_spot04_objects actually fixed * object_spot12_obj fix * object_timeblock fix * object_spot06_objects fixed * object_spot08_obj fix * spot01_matoyab fix * object_trap fix * object_umajump fix * object_vm fix * z_en_niw_lady fix * object_yukabyun fix * object_zl1 fixed * added offsets to object_os_anime * object_md fix * object_ane fix * object_aob fix * add palette comment * object_spot00_objects fix * spot00 fix * remove unused asm * updates * Add TlutOffset to objects added in https://github.com/zeldaret/oot/pull/815 * Updated object_bdan_objects, ran format.sh * Change rgb5a1 to rgba16 in my object xmls * Addressed Anghelo's comments * review Co-authored-by: Lucas Shaw <lucas.shaw1123@gmail.com> Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-08-05 15:53:58 +00:00
include "build/assets/objects/object_masterzoora/object_masterzoora.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_aob"
romalign 0x1000
Decompiled A LOT of objects (#815) * . * remove tools/ZAP2 from origin master * object_spot04_objects * remove accidentally added xml * object_spot00_objects * object_bombf ok * object_dy_obj * object_masterzoora * object_mastergolon and object_masterkokirihead * object_aob * object_gt * object_gt * object_geff * object_mag kinda * object_gjyo_objects OK * object_ani OK * object_door_gerudo * object_md and object_trap * object_js OK * object_goroiwa * object_gs * object_nwc * object_niw * object_ane * object_os_anime OK * object_d_hsblock OK * object_fz OK * object_ru2 OK * fixed object_mag * object_cow OK * object_spot01_objects OK * object_spot15_obj * object_umajump OK * object_spot18_obj * object_spot12_obj * fix symbols in z_item_b_heart * object_bdan_objects & object_bowl * object_ddan_objects * object_owl OK * object_spot01_matoyab.xml OK * object_haka OK * object_heavy_object * object_ingate and objet_menkuri_objects * objet_spot00_break & object_relay_objects OK * object_spot01_matoya OK * object_spot06_objects OK * undefined_syms * object_spot08_obj OK * object_efc_doughnut & object_zg * object_ik OK * object_vm * object_ei OK * object_ds OK * updated spec * map_48x85_static OK * object_zl1 & object_peehat ok * some z_parameter naming and other undefined symbol stuff, object_yukabyun OK * object_bubble & object_fw ok * object_shopnuts * restore delete file * object_timeblock OK * object_d_lift OK * object_kibako2 OK * object_mamenoki OK * matches * remove unused asm * object_mag ok now * fixed object_ani * done for now, im tired * object_bdan_objects fixed up * fix bdan * object_bombf fixed * object_bowl fixed up * object_cow fixed * did more, im tired * fixed some stuff in object_ddan_objects * fix object_ddan_object * object_door_gerudo fixed * object_ds fix * object_dy progress * fixed great fairy * some more * more * object_haka fix * progress * ingo_gate fixed * object_js * forgot collision * object_relay_objects fixed * object_kibako2 * object_mag fixed * u64* to void* * more u64* to void* * object_mamenoki fix * object_mastergolon & object_masterkokirihead fix * mido is weird * fixed build * fix object_menkuri_objects * add missing textures in object_menkuri_objects * object_ms * fixed object_peehat * some cleanup stuff * object_zg fix * object_spot00_break fix * object_niw fix * object_nwc fixed * object_ru2 object_rr and some of object_owl fix * object_spot15_obj fix * business scrub * object_spot01_matoya fixed * object_spot18_obj fix * object_spot01_objects fix * object_spot04_objects fix * object_spot04_objects actually fixed * object_spot12_obj fix * object_timeblock fix * object_spot06_objects fixed * object_spot08_obj fix * spot01_matoyab fix * object_trap fix * object_umajump fix * object_vm fix * z_en_niw_lady fix * object_yukabyun fix * object_zl1 fixed * added offsets to object_os_anime * object_md fix * object_ane fix * object_aob fix * add palette comment * object_spot00_objects fix * spot00 fix * remove unused asm * updates * Add TlutOffset to objects added in https://github.com/zeldaret/oot/pull/815 * Updated object_bdan_objects, ran format.sh * Change rgb5a1 to rgba16 in my object xmls * Addressed Anghelo's comments * review Co-authored-by: Lucas Shaw <lucas.shaw1123@gmail.com> Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-08-05 15:53:58 +00:00
include "build/assets/objects/object_aob/object_aob.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_ik"
romalign 0x1000
Automatic objects 2 (#889) * adding missing objects * update rgba16 format * comment blobs * Fix blobs * add another missing one * add newlines to XMLs * remove objects from other PRs * add TlutOffset Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
2021-08-06 19:18:29 +00:00
include "build/assets/objects/object_ik/object_ik.o"
Decompiled A LOT of objects (#815) * . * remove tools/ZAP2 from origin master * object_spot04_objects * remove accidentally added xml * object_spot00_objects * object_bombf ok * object_dy_obj * object_masterzoora * object_mastergolon and object_masterkokirihead * object_aob * object_gt * object_gt * object_geff * object_mag kinda * object_gjyo_objects OK * object_ani OK * object_door_gerudo * object_md and object_trap * object_js OK * object_goroiwa * object_gs * object_nwc * object_niw * object_ane * object_os_anime OK * object_d_hsblock OK * object_fz OK * object_ru2 OK * fixed object_mag * object_cow OK * object_spot01_objects OK * object_spot15_obj * object_umajump OK * object_spot18_obj * object_spot12_obj * fix symbols in z_item_b_heart * object_bdan_objects & object_bowl * object_ddan_objects * object_owl OK * object_spot01_matoyab.xml OK * object_haka OK * object_heavy_object * object_ingate and objet_menkuri_objects * objet_spot00_break & object_relay_objects OK * object_spot01_matoya OK * object_spot06_objects OK * undefined_syms * object_spot08_obj OK * object_efc_doughnut & object_zg * object_ik OK * object_vm * object_ei OK * object_ds OK * updated spec * map_48x85_static OK * object_zl1 & object_peehat ok * some z_parameter naming and other undefined symbol stuff, object_yukabyun OK * object_bubble & object_fw ok * object_shopnuts * restore delete file * object_timeblock OK * object_d_lift OK * object_kibako2 OK * object_mamenoki OK * matches * remove unused asm * object_mag ok now * fixed object_ani * done for now, im tired * object_bdan_objects fixed up * fix bdan * object_bombf fixed * object_bowl fixed up * object_cow fixed * did more, im tired * fixed some stuff in object_ddan_objects * fix object_ddan_object * object_door_gerudo fixed * object_ds fix * object_dy progress * fixed great fairy * some more * more * object_haka fix * progress * ingo_gate fixed * object_js * forgot collision * object_relay_objects fixed * object_kibako2 * object_mag fixed * u64* to void* * more u64* to void* * object_mamenoki fix * object_mastergolon & object_masterkokirihead fix * mido is weird * fixed build * fix object_menkuri_objects * add missing textures in object_menkuri_objects * object_ms * fixed object_peehat * some cleanup stuff * object_zg fix * object_spot00_break fix * object_niw fix * object_nwc fixed * object_ru2 object_rr and some of object_owl fix * object_spot15_obj fix * business scrub * object_spot01_matoya fixed * object_spot18_obj fix * object_spot01_objects fix * object_spot04_objects fix * object_spot04_objects actually fixed * object_spot12_obj fix * object_timeblock fix * object_spot06_objects fixed * object_spot08_obj fix * spot01_matoyab fix * object_trap fix * object_umajump fix * object_vm fix * z_en_niw_lady fix * object_yukabyun fix * object_zl1 fixed * added offsets to object_os_anime * object_md fix * object_ane fix * object_aob fix * add palette comment * object_spot00_objects fix * spot00 fix * remove unused asm * updates * Add TlutOffset to objects added in https://github.com/zeldaret/oot/pull/815 * Updated object_bdan_objects, ran format.sh * Change rgb5a1 to rgba16 in my object xmls * Addressed Anghelo's comments * review Co-authored-by: Lucas Shaw <lucas.shaw1123@gmail.com> Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-08-05 15:53:58 +00:00
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_ahg"
romalign 0x1000
Add every unreserved object in an automated way (#805) * it's crashing * fix stuff * fix xmls * problematic objects * fix tabs * Fix suffixes * add missing new lines * Add comments to the problematic objects * Find and replace fixes * Add Fig's objects * I forgot to add a Name in a cutscene, so I'm adding it here * Update object decomp tutorial a little bit * Update problematic objects * Update docs/tutorial/object_decomp.md Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Change comments * comment out a few blobs * dammit tluts * Change a bunch of objects * update the last bunch * update comments on oA11 and oB2 * Ninja-edit to fix compatibility with ZAPD's PR 142 Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-05-16 16:36:40 +00:00
include "build/assets/objects/object_ahg/object_ahg.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_cne"
romalign 0x1000
Add every unreserved object in an automated way (#805) * it's crashing * fix stuff * fix xmls * problematic objects * fix tabs * Fix suffixes * add missing new lines * Add comments to the problematic objects * Find and replace fixes * Add Fig's objects * I forgot to add a Name in a cutscene, so I'm adding it here * Update object decomp tutorial a little bit * Update problematic objects * Update docs/tutorial/object_decomp.md Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Change comments * comment out a few blobs * dammit tluts * Change a bunch of objects * update the last bunch * update comments on oA11 and oB2 * Ninja-edit to fix compatibility with ZAPD's PR 142 Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-05-16 16:36:40 +00:00
include "build/assets/objects/object_cne/object_cne.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_gi_niwatori"
romalign 0x1000
All* Get Item objects decompiled (#668) * All get item objects OK * Name z_draw functions * fix skulltula tokens draw ids * Review suggestions, merge extract_single_asset into extract_assets as an optional argument Co-authored-by: Thar0 <maximilianc64@gmail.com>
2021-02-12 21:57:06 +00:00
include "build/assets/objects/object_gi_niwatori/object_gi_niwatori.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_skj"
romalign 0x1000
Decompile and mostly document EnSkj, EnSkjNeedle, and OBJECT_SKJ. One NON_MATCHING (#750) * match a few * delete ASM * Almost done * One reg swap left * GlobalCtx2 YEP * Start object SKJ * Start some documentation * Big doc pass * Name the first batch of functions * Done * fix some issues real quick * lets try this again * remove left over doc tools and add 3 textures * Finish object_skj docs * PR fixes * PR fixes * Delete BuildInfo.ha * PR fixes (Roman) * PR fixes (Roman)
2021-04-10 15:39:25 +00:00
include "build/assets/objects/object_skj/object_skj.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_gi_bottle_letter"
romalign 0x1000
All* Get Item objects decompiled (#668) * All get item objects OK * Name z_draw functions * fix skulltula tokens draw ids * Review suggestions, merge extract_single_asset into extract_assets as an optional argument Co-authored-by: Thar0 <maximilianc64@gmail.com>
2021-02-12 21:57:06 +00:00
include "build/assets/objects/object_gi_bottle_letter/object_gi_bottle_letter.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_bji"
romalign 0x1000
Add every unreserved object in an automated way (#805) * it's crashing * fix stuff * fix xmls * problematic objects * fix tabs * Fix suffixes * add missing new lines * Add comments to the problematic objects * Find and replace fixes * Add Fig's objects * I forgot to add a Name in a cutscene, so I'm adding it here * Update object decomp tutorial a little bit * Update problematic objects * Update docs/tutorial/object_decomp.md Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Change comments * comment out a few blobs * dammit tluts * Change a bunch of objects * update the last bunch * update comments on oA11 and oB2 * Ninja-edit to fix compatibility with ZAPD's PR 142 Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-05-16 16:36:40 +00:00
include "build/assets/objects/object_bji/object_bji.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_bba"
romalign 0x1000
Add every unreserved object in an automated way (#805) * it's crashing * fix stuff * fix xmls * problematic objects * fix tabs * Fix suffixes * add missing new lines * Add comments to the problematic objects * Find and replace fixes * Add Fig's objects * I forgot to add a Name in a cutscene, so I'm adding it here * Update object decomp tutorial a little bit * Update problematic objects * Update docs/tutorial/object_decomp.md Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Change comments * comment out a few blobs * dammit tluts * Change a bunch of objects * update the last bunch * update comments on oA11 and oB2 * Ninja-edit to fix compatibility with ZAPD's PR 142 Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-05-16 16:36:40 +00:00
include "build/assets/objects/object_bba/object_bba.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_gi_ocarina_0"
romalign 0x1000
All* Get Item objects decompiled (#668) * All get item objects OK * Name z_draw functions * fix skulltula tokens draw ids * Review suggestions, merge extract_single_asset into extract_assets as an optional argument Co-authored-by: Thar0 <maximilianc64@gmail.com>
2021-02-12 21:57:06 +00:00
include "build/assets/objects/object_gi_ocarina_0/object_gi_ocarina_0.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_ds"
romalign 0x1000
Decompiled A LOT of objects (#815) * . * remove tools/ZAP2 from origin master * object_spot04_objects * remove accidentally added xml * object_spot00_objects * object_bombf ok * object_dy_obj * object_masterzoora * object_mastergolon and object_masterkokirihead * object_aob * object_gt * object_gt * object_geff * object_mag kinda * object_gjyo_objects OK * object_ani OK * object_door_gerudo * object_md and object_trap * object_js OK * object_goroiwa * object_gs * object_nwc * object_niw * object_ane * object_os_anime OK * object_d_hsblock OK * object_fz OK * object_ru2 OK * fixed object_mag * object_cow OK * object_spot01_objects OK * object_spot15_obj * object_umajump OK * object_spot18_obj * object_spot12_obj * fix symbols in z_item_b_heart * object_bdan_objects & object_bowl * object_ddan_objects * object_owl OK * object_spot01_matoyab.xml OK * object_haka OK * object_heavy_object * object_ingate and objet_menkuri_objects * objet_spot00_break & object_relay_objects OK * object_spot01_matoya OK * object_spot06_objects OK * undefined_syms * object_spot08_obj OK * object_efc_doughnut & object_zg * object_ik OK * object_vm * object_ei OK * object_ds OK * updated spec * map_48x85_static OK * object_zl1 & object_peehat ok * some z_parameter naming and other undefined symbol stuff, object_yukabyun OK * object_bubble & object_fw ok * object_shopnuts * restore delete file * object_timeblock OK * object_d_lift OK * object_kibako2 OK * object_mamenoki OK * matches * remove unused asm * object_mag ok now * fixed object_ani * done for now, im tired * object_bdan_objects fixed up * fix bdan * object_bombf fixed * object_bowl fixed up * object_cow fixed * did more, im tired * fixed some stuff in object_ddan_objects * fix object_ddan_object * object_door_gerudo fixed * object_ds fix * object_dy progress * fixed great fairy * some more * more * object_haka fix * progress * ingo_gate fixed * object_js * forgot collision * object_relay_objects fixed * object_kibako2 * object_mag fixed * u64* to void* * more u64* to void* * object_mamenoki fix * object_mastergolon & object_masterkokirihead fix * mido is weird * fixed build * fix object_menkuri_objects * add missing textures in object_menkuri_objects * object_ms * fixed object_peehat * some cleanup stuff * object_zg fix * object_spot00_break fix * object_niw fix * object_nwc fixed * object_ru2 object_rr and some of object_owl fix * object_spot15_obj fix * business scrub * object_spot01_matoya fixed * object_spot18_obj fix * object_spot01_objects fix * object_spot04_objects fix * object_spot04_objects actually fixed * object_spot12_obj fix * object_timeblock fix * object_spot06_objects fixed * object_spot08_obj fix * spot01_matoyab fix * object_trap fix * object_umajump fix * object_vm fix * z_en_niw_lady fix * object_yukabyun fix * object_zl1 fixed * added offsets to object_os_anime * object_md fix * object_ane fix * object_aob fix * add palette comment * object_spot00_objects fix * spot00 fix * remove unused asm * updates * Add TlutOffset to objects added in https://github.com/zeldaret/oot/pull/815 * Updated object_bdan_objects, ran format.sh * Change rgb5a1 to rgba16 in my object xmls * Addressed Anghelo's comments * review Co-authored-by: Lucas Shaw <lucas.shaw1123@gmail.com> Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-08-05 15:53:58 +00:00
include "build/assets/objects/object_ds/object_ds.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_ane"
romalign 0x1000
Decompiled A LOT of objects (#815) * . * remove tools/ZAP2 from origin master * object_spot04_objects * remove accidentally added xml * object_spot00_objects * object_bombf ok * object_dy_obj * object_masterzoora * object_mastergolon and object_masterkokirihead * object_aob * object_gt * object_gt * object_geff * object_mag kinda * object_gjyo_objects OK * object_ani OK * object_door_gerudo * object_md and object_trap * object_js OK * object_goroiwa * object_gs * object_nwc * object_niw * object_ane * object_os_anime OK * object_d_hsblock OK * object_fz OK * object_ru2 OK * fixed object_mag * object_cow OK * object_spot01_objects OK * object_spot15_obj * object_umajump OK * object_spot18_obj * object_spot12_obj * fix symbols in z_item_b_heart * object_bdan_objects & object_bowl * object_ddan_objects * object_owl OK * object_spot01_matoyab.xml OK * object_haka OK * object_heavy_object * object_ingate and objet_menkuri_objects * objet_spot00_break & object_relay_objects OK * object_spot01_matoya OK * object_spot06_objects OK * undefined_syms * object_spot08_obj OK * object_efc_doughnut & object_zg * object_ik OK * object_vm * object_ei OK * object_ds OK * updated spec * map_48x85_static OK * object_zl1 & object_peehat ok * some z_parameter naming and other undefined symbol stuff, object_yukabyun OK * object_bubble & object_fw ok * object_shopnuts * restore delete file * object_timeblock OK * object_d_lift OK * object_kibako2 OK * object_mamenoki OK * matches * remove unused asm * object_mag ok now * fixed object_ani * done for now, im tired * object_bdan_objects fixed up * fix bdan * object_bombf fixed * object_bowl fixed up * object_cow fixed * did more, im tired * fixed some stuff in object_ddan_objects * fix object_ddan_object * object_door_gerudo fixed * object_ds fix * object_dy progress * fixed great fairy * some more * more * object_haka fix * progress * ingo_gate fixed * object_js * forgot collision * object_relay_objects fixed * object_kibako2 * object_mag fixed * u64* to void* * more u64* to void* * object_mamenoki fix * object_mastergolon & object_masterkokirihead fix * mido is weird * fixed build * fix object_menkuri_objects * add missing textures in object_menkuri_objects * object_ms * fixed object_peehat * some cleanup stuff * object_zg fix * object_spot00_break fix * object_niw fix * object_nwc fixed * object_ru2 object_rr and some of object_owl fix * object_spot15_obj fix * business scrub * object_spot01_matoya fixed * object_spot18_obj fix * object_spot01_objects fix * object_spot04_objects fix * object_spot04_objects actually fixed * object_spot12_obj fix * object_timeblock fix * object_spot06_objects fixed * object_spot08_obj fix * spot01_matoyab fix * object_trap fix * object_umajump fix * object_vm fix * z_en_niw_lady fix * object_yukabyun fix * object_zl1 fixed * added offsets to object_os_anime * object_md fix * object_ane fix * object_aob fix * add palette comment * object_spot00_objects fix * spot00 fix * remove unused asm * updates * Add TlutOffset to objects added in https://github.com/zeldaret/oot/pull/815 * Updated object_bdan_objects, ran format.sh * Change rgb5a1 to rgba16 in my object xmls * Addressed Anghelo's comments * review Co-authored-by: Lucas Shaw <lucas.shaw1123@gmail.com> Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-08-05 15:53:58 +00:00
include "build/assets/objects/object_ane/object_ane.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_boj"
romalign 0x1000
Add every unreserved object in an automated way (#805) * it's crashing * fix stuff * fix xmls * problematic objects * fix tabs * Fix suffixes * add missing new lines * Add comments to the problematic objects * Find and replace fixes * Add Fig's objects * I forgot to add a Name in a cutscene, so I'm adding it here * Update object decomp tutorial a little bit * Update problematic objects * Update docs/tutorial/object_decomp.md Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Change comments * comment out a few blobs * dammit tluts * Change a bunch of objects * update the last bunch * update comments on oA11 and oB2 * Ninja-edit to fix compatibility with ZAPD's PR 142 Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-05-16 16:36:40 +00:00
include "build/assets/objects/object_boj/object_boj.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_spot03_object"
romalign 0x1000
Add every unreserved object in an automated way (#805) * it's crashing * fix stuff * fix xmls * problematic objects * fix tabs * Fix suffixes * add missing new lines * Add comments to the problematic objects * Find and replace fixes * Add Fig's objects * I forgot to add a Name in a cutscene, so I'm adding it here * Update object decomp tutorial a little bit * Update problematic objects * Update docs/tutorial/object_decomp.md Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Change comments * comment out a few blobs * dammit tluts * Change a bunch of objects * update the last bunch * update comments on oA11 and oB2 * Ninja-edit to fix compatibility with ZAPD's PR 142 Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-05-16 16:36:40 +00:00
include "build/assets/objects/object_spot03_object/object_spot03_object.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_spot07_object"
romalign 0x1000
Add every unreserved object in an automated way (#805) * it's crashing * fix stuff * fix xmls * problematic objects * fix tabs * Fix suffixes * add missing new lines * Add comments to the problematic objects * Find and replace fixes * Add Fig's objects * I forgot to add a Name in a cutscene, so I'm adding it here * Update object decomp tutorial a little bit * Update problematic objects * Update docs/tutorial/object_decomp.md Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Change comments * comment out a few blobs * dammit tluts * Change a bunch of objects * update the last bunch * update comments on oA11 and oB2 * Ninja-edit to fix compatibility with ZAPD's PR 142 Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-05-16 16:36:40 +00:00
include "build/assets/objects/object_spot07_object/object_spot07_object.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_fz"
romalign 0x1000
Decompiled A LOT of objects (#815) * . * remove tools/ZAP2 from origin master * object_spot04_objects * remove accidentally added xml * object_spot00_objects * object_bombf ok * object_dy_obj * object_masterzoora * object_mastergolon and object_masterkokirihead * object_aob * object_gt * object_gt * object_geff * object_mag kinda * object_gjyo_objects OK * object_ani OK * object_door_gerudo * object_md and object_trap * object_js OK * object_goroiwa * object_gs * object_nwc * object_niw * object_ane * object_os_anime OK * object_d_hsblock OK * object_fz OK * object_ru2 OK * fixed object_mag * object_cow OK * object_spot01_objects OK * object_spot15_obj * object_umajump OK * object_spot18_obj * object_spot12_obj * fix symbols in z_item_b_heart * object_bdan_objects & object_bowl * object_ddan_objects * object_owl OK * object_spot01_matoyab.xml OK * object_haka OK * object_heavy_object * object_ingate and objet_menkuri_objects * objet_spot00_break & object_relay_objects OK * object_spot01_matoya OK * object_spot06_objects OK * undefined_syms * object_spot08_obj OK * object_efc_doughnut & object_zg * object_ik OK * object_vm * object_ei OK * object_ds OK * updated spec * map_48x85_static OK * object_zl1 & object_peehat ok * some z_parameter naming and other undefined symbol stuff, object_yukabyun OK * object_bubble & object_fw ok * object_shopnuts * restore delete file * object_timeblock OK * object_d_lift OK * object_kibako2 OK * object_mamenoki OK * matches * remove unused asm * object_mag ok now * fixed object_ani * done for now, im tired * object_bdan_objects fixed up * fix bdan * object_bombf fixed * object_bowl fixed up * object_cow fixed * did more, im tired * fixed some stuff in object_ddan_objects * fix object_ddan_object * object_door_gerudo fixed * object_ds fix * object_dy progress * fixed great fairy * some more * more * object_haka fix * progress * ingo_gate fixed * object_js * forgot collision * object_relay_objects fixed * object_kibako2 * object_mag fixed * u64* to void* * more u64* to void* * object_mamenoki fix * object_mastergolon & object_masterkokirihead fix * mido is weird * fixed build * fix object_menkuri_objects * add missing textures in object_menkuri_objects * object_ms * fixed object_peehat * some cleanup stuff * object_zg fix * object_spot00_break fix * object_niw fix * object_nwc fixed * object_ru2 object_rr and some of object_owl fix * object_spot15_obj fix * business scrub * object_spot01_matoya fixed * object_spot18_obj fix * object_spot01_objects fix * object_spot04_objects fix * object_spot04_objects actually fixed * object_spot12_obj fix * object_timeblock fix * object_spot06_objects fixed * object_spot08_obj fix * spot01_matoyab fix * object_trap fix * object_umajump fix * object_vm fix * z_en_niw_lady fix * object_yukabyun fix * object_zl1 fixed * added offsets to object_os_anime * object_md fix * object_ane fix * object_aob fix * add palette comment * object_spot00_objects fix * spot00 fix * remove unused asm * updates * Add TlutOffset to objects added in https://github.com/zeldaret/oot/pull/815 * Updated object_bdan_objects, ran format.sh * Change rgb5a1 to rgba16 in my object xmls * Addressed Anghelo's comments * review Co-authored-by: Lucas Shaw <lucas.shaw1123@gmail.com> Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-08-05 15:53:58 +00:00
include "build/assets/objects/object_fz/object_fz.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_bob"
romalign 0x1000
Add every unreserved object in an automated way (#805) * it's crashing * fix stuff * fix xmls * problematic objects * fix tabs * Fix suffixes * add missing new lines * Add comments to the problematic objects * Find and replace fixes * Add Fig's objects * I forgot to add a Name in a cutscene, so I'm adding it here * Update object decomp tutorial a little bit * Update problematic objects * Update docs/tutorial/object_decomp.md Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Change comments * comment out a few blobs * dammit tluts * Change a bunch of objects * update the last bunch * update comments on oA11 and oB2 * Ninja-edit to fix compatibility with ZAPD's PR 142 Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-05-16 16:36:40 +00:00
include "build/assets/objects/object_bob/object_bob.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_ge1"
romalign 0x1000
Gerudo objects (#757) * object_ge1 * more stuff named * object_gla OK, symbols added to C * eff fire fix in gameplay_keep * object_nb OK, fixed gameplay_keep * replaced symbols in EnNb, limb enums * Change EnGeldB limb enums to hex * Use enum in header too * Add descriptions to EnGe2 and EnNb, rearrange xml * Reorder xml * review changes
2021-04-10 16:25:03 +00:00
include "build/assets/objects/object_ge1/object_ge1.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_yabusame_point"
romalign 0x1000
Add every unreserved object in an automated way (#805) * it's crashing * fix stuff * fix xmls * problematic objects * fix tabs * Fix suffixes * add missing new lines * Add comments to the problematic objects * Find and replace fixes * Add Fig's objects * I forgot to add a Name in a cutscene, so I'm adding it here * Update object decomp tutorial a little bit * Update problematic objects * Update docs/tutorial/object_decomp.md Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Change comments * comment out a few blobs * dammit tluts * Change a bunch of objects * update the last bunch * update comments on oA11 and oB2 * Ninja-edit to fix compatibility with ZAPD's PR 142 Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-05-16 16:36:40 +00:00
include "build/assets/objects/object_yabusame_point/object_yabusame_point.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_gi_boots_2"
romalign 0x1000
All* Get Item objects decompiled (#668) * All get item objects OK * Name z_draw functions * fix skulltula tokens draw ids * Review suggestions, merge extract_single_asset into extract_assets as an optional argument Co-authored-by: Thar0 <maximilianc64@gmail.com>
2021-02-12 21:57:06 +00:00
include "build/assets/objects/object_gi_boots_2/object_gi_boots_2.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_gi_seed"
romalign 0x1000
All* Get Item objects decompiled (#668) * All get item objects OK * Name z_draw functions * fix skulltula tokens draw ids * Review suggestions, merge extract_single_asset into extract_assets as an optional argument Co-authored-by: Thar0 <maximilianc64@gmail.com>
2021-02-12 21:57:06 +00:00
include "build/assets/objects/object_gi_seed/object_gi_seed.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_gnd_magic"
romalign 0x1000
Add every unreserved object in an automated way (#805) * it's crashing * fix stuff * fix xmls * problematic objects * fix tabs * Fix suffixes * add missing new lines * Add comments to the problematic objects * Find and replace fixes * Add Fig's objects * I forgot to add a Name in a cutscene, so I'm adding it here * Update object decomp tutorial a little bit * Update problematic objects * Update docs/tutorial/object_decomp.md Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Change comments * comment out a few blobs * dammit tluts * Change a bunch of objects * update the last bunch * update comments on oA11 and oB2 * Ninja-edit to fix compatibility with ZAPD's PR 142 Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-05-16 16:36:40 +00:00
include "build/assets/objects/object_gnd_magic/object_gnd_magic.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_d_elevator"
romalign 0x1000
Add every unreserved object in an automated way (#805) * it's crashing * fix stuff * fix xmls * problematic objects * fix tabs * Fix suffixes * add missing new lines * Add comments to the problematic objects * Find and replace fixes * Add Fig's objects * I forgot to add a Name in a cutscene, so I'm adding it here * Update object decomp tutorial a little bit * Update problematic objects * Update docs/tutorial/object_decomp.md Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Change comments * comment out a few blobs * dammit tluts * Change a bunch of objects * update the last bunch * update comments on oA11 and oB2 * Ninja-edit to fix compatibility with ZAPD's PR 142 Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-05-16 16:36:40 +00:00
include "build/assets/objects/object_d_elevator/object_d_elevator.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_d_hsblock"
romalign 0x1000
Decompiled A LOT of objects (#815) * . * remove tools/ZAP2 from origin master * object_spot04_objects * remove accidentally added xml * object_spot00_objects * object_bombf ok * object_dy_obj * object_masterzoora * object_mastergolon and object_masterkokirihead * object_aob * object_gt * object_gt * object_geff * object_mag kinda * object_gjyo_objects OK * object_ani OK * object_door_gerudo * object_md and object_trap * object_js OK * object_goroiwa * object_gs * object_nwc * object_niw * object_ane * object_os_anime OK * object_d_hsblock OK * object_fz OK * object_ru2 OK * fixed object_mag * object_cow OK * object_spot01_objects OK * object_spot15_obj * object_umajump OK * object_spot18_obj * object_spot12_obj * fix symbols in z_item_b_heart * object_bdan_objects & object_bowl * object_ddan_objects * object_owl OK * object_spot01_matoyab.xml OK * object_haka OK * object_heavy_object * object_ingate and objet_menkuri_objects * objet_spot00_break & object_relay_objects OK * object_spot01_matoya OK * object_spot06_objects OK * undefined_syms * object_spot08_obj OK * object_efc_doughnut & object_zg * object_ik OK * object_vm * object_ei OK * object_ds OK * updated spec * map_48x85_static OK * object_zl1 & object_peehat ok * some z_parameter naming and other undefined symbol stuff, object_yukabyun OK * object_bubble & object_fw ok * object_shopnuts * restore delete file * object_timeblock OK * object_d_lift OK * object_kibako2 OK * object_mamenoki OK * matches * remove unused asm * object_mag ok now * fixed object_ani * done for now, im tired * object_bdan_objects fixed up * fix bdan * object_bombf fixed * object_bowl fixed up * object_cow fixed * did more, im tired * fixed some stuff in object_ddan_objects * fix object_ddan_object * object_door_gerudo fixed * object_ds fix * object_dy progress * fixed great fairy * some more * more * object_haka fix * progress * ingo_gate fixed * object_js * forgot collision * object_relay_objects fixed * object_kibako2 * object_mag fixed * u64* to void* * more u64* to void* * object_mamenoki fix * object_mastergolon & object_masterkokirihead fix * mido is weird * fixed build * fix object_menkuri_objects * add missing textures in object_menkuri_objects * object_ms * fixed object_peehat * some cleanup stuff * object_zg fix * object_spot00_break fix * object_niw fix * object_nwc fixed * object_ru2 object_rr and some of object_owl fix * object_spot15_obj fix * business scrub * object_spot01_matoya fixed * object_spot18_obj fix * object_spot01_objects fix * object_spot04_objects fix * object_spot04_objects actually fixed * object_spot12_obj fix * object_timeblock fix * object_spot06_objects fixed * object_spot08_obj fix * spot01_matoyab fix * object_trap fix * object_umajump fix * object_vm fix * z_en_niw_lady fix * object_yukabyun fix * object_zl1 fixed * added offsets to object_os_anime * object_md fix * object_ane fix * object_aob fix * add palette comment * object_spot00_objects fix * spot00 fix * remove unused asm * updates * Add TlutOffset to objects added in https://github.com/zeldaret/oot/pull/815 * Updated object_bdan_objects, ran format.sh * Change rgb5a1 to rgba16 in my object xmls * Addressed Anghelo's comments * review Co-authored-by: Lucas Shaw <lucas.shaw1123@gmail.com> Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-08-05 15:53:58 +00:00
include "build/assets/objects/object_d_hsblock/object_d_hsblock.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_d_lift"
romalign 0x1000
Decompiled A LOT of objects (#815) * . * remove tools/ZAP2 from origin master * object_spot04_objects * remove accidentally added xml * object_spot00_objects * object_bombf ok * object_dy_obj * object_masterzoora * object_mastergolon and object_masterkokirihead * object_aob * object_gt * object_gt * object_geff * object_mag kinda * object_gjyo_objects OK * object_ani OK * object_door_gerudo * object_md and object_trap * object_js OK * object_goroiwa * object_gs * object_nwc * object_niw * object_ane * object_os_anime OK * object_d_hsblock OK * object_fz OK * object_ru2 OK * fixed object_mag * object_cow OK * object_spot01_objects OK * object_spot15_obj * object_umajump OK * object_spot18_obj * object_spot12_obj * fix symbols in z_item_b_heart * object_bdan_objects & object_bowl * object_ddan_objects * object_owl OK * object_spot01_matoyab.xml OK * object_haka OK * object_heavy_object * object_ingate and objet_menkuri_objects * objet_spot00_break & object_relay_objects OK * object_spot01_matoya OK * object_spot06_objects OK * undefined_syms * object_spot08_obj OK * object_efc_doughnut & object_zg * object_ik OK * object_vm * object_ei OK * object_ds OK * updated spec * map_48x85_static OK * object_zl1 & object_peehat ok * some z_parameter naming and other undefined symbol stuff, object_yukabyun OK * object_bubble & object_fw ok * object_shopnuts * restore delete file * object_timeblock OK * object_d_lift OK * object_kibako2 OK * object_mamenoki OK * matches * remove unused asm * object_mag ok now * fixed object_ani * done for now, im tired * object_bdan_objects fixed up * fix bdan * object_bombf fixed * object_bowl fixed up * object_cow fixed * did more, im tired * fixed some stuff in object_ddan_objects * fix object_ddan_object * object_door_gerudo fixed * object_ds fix * object_dy progress * fixed great fairy * some more * more * object_haka fix * progress * ingo_gate fixed * object_js * forgot collision * object_relay_objects fixed * object_kibako2 * object_mag fixed * u64* to void* * more u64* to void* * object_mamenoki fix * object_mastergolon & object_masterkokirihead fix * mido is weird * fixed build * fix object_menkuri_objects * add missing textures in object_menkuri_objects * object_ms * fixed object_peehat * some cleanup stuff * object_zg fix * object_spot00_break fix * object_niw fix * object_nwc fixed * object_ru2 object_rr and some of object_owl fix * object_spot15_obj fix * business scrub * object_spot01_matoya fixed * object_spot18_obj fix * object_spot01_objects fix * object_spot04_objects fix * object_spot04_objects actually fixed * object_spot12_obj fix * object_timeblock fix * object_spot06_objects fixed * object_spot08_obj fix * spot01_matoyab fix * object_trap fix * object_umajump fix * object_vm fix * z_en_niw_lady fix * object_yukabyun fix * object_zl1 fixed * added offsets to object_os_anime * object_md fix * object_ane fix * object_aob fix * add palette comment * object_spot00_objects fix * spot00 fix * remove unused asm * updates * Add TlutOffset to objects added in https://github.com/zeldaret/oot/pull/815 * Updated object_bdan_objects, ran format.sh * Change rgb5a1 to rgba16 in my object xmls * Addressed Anghelo's comments * review Co-authored-by: Lucas Shaw <lucas.shaw1123@gmail.com> Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-08-05 15:53:58 +00:00
include "build/assets/objects/object_d_lift/object_d_lift.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_mamenoki"
romalign 0x1000
Decompiled A LOT of objects (#815) * . * remove tools/ZAP2 from origin master * object_spot04_objects * remove accidentally added xml * object_spot00_objects * object_bombf ok * object_dy_obj * object_masterzoora * object_mastergolon and object_masterkokirihead * object_aob * object_gt * object_gt * object_geff * object_mag kinda * object_gjyo_objects OK * object_ani OK * object_door_gerudo * object_md and object_trap * object_js OK * object_goroiwa * object_gs * object_nwc * object_niw * object_ane * object_os_anime OK * object_d_hsblock OK * object_fz OK * object_ru2 OK * fixed object_mag * object_cow OK * object_spot01_objects OK * object_spot15_obj * object_umajump OK * object_spot18_obj * object_spot12_obj * fix symbols in z_item_b_heart * object_bdan_objects & object_bowl * object_ddan_objects * object_owl OK * object_spot01_matoyab.xml OK * object_haka OK * object_heavy_object * object_ingate and objet_menkuri_objects * objet_spot00_break & object_relay_objects OK * object_spot01_matoya OK * object_spot06_objects OK * undefined_syms * object_spot08_obj OK * object_efc_doughnut & object_zg * object_ik OK * object_vm * object_ei OK * object_ds OK * updated spec * map_48x85_static OK * object_zl1 & object_peehat ok * some z_parameter naming and other undefined symbol stuff, object_yukabyun OK * object_bubble & object_fw ok * object_shopnuts * restore delete file * object_timeblock OK * object_d_lift OK * object_kibako2 OK * object_mamenoki OK * matches * remove unused asm * object_mag ok now * fixed object_ani * done for now, im tired * object_bdan_objects fixed up * fix bdan * object_bombf fixed * object_bowl fixed up * object_cow fixed * did more, im tired * fixed some stuff in object_ddan_objects * fix object_ddan_object * object_door_gerudo fixed * object_ds fix * object_dy progress * fixed great fairy * some more * more * object_haka fix * progress * ingo_gate fixed * object_js * forgot collision * object_relay_objects fixed * object_kibako2 * object_mag fixed * u64* to void* * more u64* to void* * object_mamenoki fix * object_mastergolon & object_masterkokirihead fix * mido is weird * fixed build * fix object_menkuri_objects * add missing textures in object_menkuri_objects * object_ms * fixed object_peehat * some cleanup stuff * object_zg fix * object_spot00_break fix * object_niw fix * object_nwc fixed * object_ru2 object_rr and some of object_owl fix * object_spot15_obj fix * business scrub * object_spot01_matoya fixed * object_spot18_obj fix * object_spot01_objects fix * object_spot04_objects fix * object_spot04_objects actually fixed * object_spot12_obj fix * object_timeblock fix * object_spot06_objects fixed * object_spot08_obj fix * spot01_matoyab fix * object_trap fix * object_umajump fix * object_vm fix * z_en_niw_lady fix * object_yukabyun fix * object_zl1 fixed * added offsets to object_os_anime * object_md fix * object_ane fix * object_aob fix * add palette comment * object_spot00_objects fix * spot00 fix * remove unused asm * updates * Add TlutOffset to objects added in https://github.com/zeldaret/oot/pull/815 * Updated object_bdan_objects, ran format.sh * Change rgb5a1 to rgba16 in my object xmls * Addressed Anghelo's comments * review Co-authored-by: Lucas Shaw <lucas.shaw1123@gmail.com> Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-08-05 15:53:58 +00:00
include "build/assets/objects/object_mamenoki/object_mamenoki.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_goroiwa"
romalign 0x1000
Decompiled A LOT of objects (#815) * . * remove tools/ZAP2 from origin master * object_spot04_objects * remove accidentally added xml * object_spot00_objects * object_bombf ok * object_dy_obj * object_masterzoora * object_mastergolon and object_masterkokirihead * object_aob * object_gt * object_gt * object_geff * object_mag kinda * object_gjyo_objects OK * object_ani OK * object_door_gerudo * object_md and object_trap * object_js OK * object_goroiwa * object_gs * object_nwc * object_niw * object_ane * object_os_anime OK * object_d_hsblock OK * object_fz OK * object_ru2 OK * fixed object_mag * object_cow OK * object_spot01_objects OK * object_spot15_obj * object_umajump OK * object_spot18_obj * object_spot12_obj * fix symbols in z_item_b_heart * object_bdan_objects & object_bowl * object_ddan_objects * object_owl OK * object_spot01_matoyab.xml OK * object_haka OK * object_heavy_object * object_ingate and objet_menkuri_objects * objet_spot00_break & object_relay_objects OK * object_spot01_matoya OK * object_spot06_objects OK * undefined_syms * object_spot08_obj OK * object_efc_doughnut & object_zg * object_ik OK * object_vm * object_ei OK * object_ds OK * updated spec * map_48x85_static OK * object_zl1 & object_peehat ok * some z_parameter naming and other undefined symbol stuff, object_yukabyun OK * object_bubble & object_fw ok * object_shopnuts * restore delete file * object_timeblock OK * object_d_lift OK * object_kibako2 OK * object_mamenoki OK * matches * remove unused asm * object_mag ok now * fixed object_ani * done for now, im tired * object_bdan_objects fixed up * fix bdan * object_bombf fixed * object_bowl fixed up * object_cow fixed * did more, im tired * fixed some stuff in object_ddan_objects * fix object_ddan_object * object_door_gerudo fixed * object_ds fix * object_dy progress * fixed great fairy * some more * more * object_haka fix * progress * ingo_gate fixed * object_js * forgot collision * object_relay_objects fixed * object_kibako2 * object_mag fixed * u64* to void* * more u64* to void* * object_mamenoki fix * object_mastergolon & object_masterkokirihead fix * mido is weird * fixed build * fix object_menkuri_objects * add missing textures in object_menkuri_objects * object_ms * fixed object_peehat * some cleanup stuff * object_zg fix * object_spot00_break fix * object_niw fix * object_nwc fixed * object_ru2 object_rr and some of object_owl fix * object_spot15_obj fix * business scrub * object_spot01_matoya fixed * object_spot18_obj fix * object_spot01_objects fix * object_spot04_objects fix * object_spot04_objects actually fixed * object_spot12_obj fix * object_timeblock fix * object_spot06_objects fixed * object_spot08_obj fix * spot01_matoyab fix * object_trap fix * object_umajump fix * object_vm fix * z_en_niw_lady fix * object_yukabyun fix * object_zl1 fixed * added offsets to object_os_anime * object_md fix * object_ane fix * object_aob fix * add palette comment * object_spot00_objects fix * spot00 fix * remove unused asm * updates * Add TlutOffset to objects added in https://github.com/zeldaret/oot/pull/815 * Updated object_bdan_objects, ran format.sh * Change rgb5a1 to rgba16 in my object xmls * Addressed Anghelo's comments * review Co-authored-by: Lucas Shaw <lucas.shaw1123@gmail.com> Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-08-05 15:53:58 +00:00
include "build/assets/objects/object_goroiwa/object_goroiwa.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_toryo"
romalign 0x1000
Add every unreserved object in an automated way (#805) * it's crashing * fix stuff * fix xmls * problematic objects * fix tabs * Fix suffixes * add missing new lines * Add comments to the problematic objects * Find and replace fixes * Add Fig's objects * I forgot to add a Name in a cutscene, so I'm adding it here * Update object decomp tutorial a little bit * Update problematic objects * Update docs/tutorial/object_decomp.md Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Change comments * comment out a few blobs * dammit tluts * Change a bunch of objects * update the last bunch * update comments on oA11 and oB2 * Ninja-edit to fix compatibility with ZAPD's PR 142 Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-05-16 16:36:40 +00:00
include "build/assets/objects/object_toryo/object_toryo.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_daiku"
romalign 0x1000
Add every unreserved object in an automated way (#805) * it's crashing * fix stuff * fix xmls * problematic objects * fix tabs * Fix suffixes * add missing new lines * Add comments to the problematic objects * Find and replace fixes * Add Fig's objects * I forgot to add a Name in a cutscene, so I'm adding it here * Update object decomp tutorial a little bit * Update problematic objects * Update docs/tutorial/object_decomp.md Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Change comments * comment out a few blobs * dammit tluts * Change a bunch of objects * update the last bunch * update comments on oA11 and oB2 * Ninja-edit to fix compatibility with ZAPD's PR 142 Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-05-16 16:36:40 +00:00
include "build/assets/objects/object_daiku/object_daiku.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_nwc"
romalign 0x1000
Decompiled A LOT of objects (#815) * . * remove tools/ZAP2 from origin master * object_spot04_objects * remove accidentally added xml * object_spot00_objects * object_bombf ok * object_dy_obj * object_masterzoora * object_mastergolon and object_masterkokirihead * object_aob * object_gt * object_gt * object_geff * object_mag kinda * object_gjyo_objects OK * object_ani OK * object_door_gerudo * object_md and object_trap * object_js OK * object_goroiwa * object_gs * object_nwc * object_niw * object_ane * object_os_anime OK * object_d_hsblock OK * object_fz OK * object_ru2 OK * fixed object_mag * object_cow OK * object_spot01_objects OK * object_spot15_obj * object_umajump OK * object_spot18_obj * object_spot12_obj * fix symbols in z_item_b_heart * object_bdan_objects & object_bowl * object_ddan_objects * object_owl OK * object_spot01_matoyab.xml OK * object_haka OK * object_heavy_object * object_ingate and objet_menkuri_objects * objet_spot00_break & object_relay_objects OK * object_spot01_matoya OK * object_spot06_objects OK * undefined_syms * object_spot08_obj OK * object_efc_doughnut & object_zg * object_ik OK * object_vm * object_ei OK * object_ds OK * updated spec * map_48x85_static OK * object_zl1 & object_peehat ok * some z_parameter naming and other undefined symbol stuff, object_yukabyun OK * object_bubble & object_fw ok * object_shopnuts * restore delete file * object_timeblock OK * object_d_lift OK * object_kibako2 OK * object_mamenoki OK * matches * remove unused asm * object_mag ok now * fixed object_ani * done for now, im tired * object_bdan_objects fixed up * fix bdan * object_bombf fixed * object_bowl fixed up * object_cow fixed * did more, im tired * fixed some stuff in object_ddan_objects * fix object_ddan_object * object_door_gerudo fixed * object_ds fix * object_dy progress * fixed great fairy * some more * more * object_haka fix * progress * ingo_gate fixed * object_js * forgot collision * object_relay_objects fixed * object_kibako2 * object_mag fixed * u64* to void* * more u64* to void* * object_mamenoki fix * object_mastergolon & object_masterkokirihead fix * mido is weird * fixed build * fix object_menkuri_objects * add missing textures in object_menkuri_objects * object_ms * fixed object_peehat * some cleanup stuff * object_zg fix * object_spot00_break fix * object_niw fix * object_nwc fixed * object_ru2 object_rr and some of object_owl fix * object_spot15_obj fix * business scrub * object_spot01_matoya fixed * object_spot18_obj fix * object_spot01_objects fix * object_spot04_objects fix * object_spot04_objects actually fixed * object_spot12_obj fix * object_timeblock fix * object_spot06_objects fixed * object_spot08_obj fix * spot01_matoyab fix * object_trap fix * object_umajump fix * object_vm fix * z_en_niw_lady fix * object_yukabyun fix * object_zl1 fixed * added offsets to object_os_anime * object_md fix * object_ane fix * object_aob fix * add palette comment * object_spot00_objects fix * spot00 fix * remove unused asm * updates * Add TlutOffset to objects added in https://github.com/zeldaret/oot/pull/815 * Updated object_bdan_objects, ran format.sh * Change rgb5a1 to rgba16 in my object xmls * Addressed Anghelo's comments * review Co-authored-by: Lucas Shaw <lucas.shaw1123@gmail.com> Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-08-05 15:53:58 +00:00
include "build/assets/objects/object_nwc/object_nwc.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_blkobj"
romalign 0x1000
object_torch2, object_blkobj, and object_geldb (#592) * objects are fun * more objects * again * fixes to geldb * one more thing * forgot s * type fix * some formatting * change Gerudo name * git subrepo pull --force tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "0305ec2c2" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "0305ec2c2" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * organize xmls * outname Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain> Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-01-30 19:16:18 +00:00
include "build/assets/objects/object_blkobj/object_blkobj.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_gm"
romalign 0x1000
Add every unreserved object in an automated way (#805) * it's crashing * fix stuff * fix xmls * problematic objects * fix tabs * Fix suffixes * add missing new lines * Add comments to the problematic objects * Find and replace fixes * Add Fig's objects * I forgot to add a Name in a cutscene, so I'm adding it here * Update object decomp tutorial a little bit * Update problematic objects * Update docs/tutorial/object_decomp.md Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Change comments * comment out a few blobs * dammit tluts * Change a bunch of objects * update the last bunch * update comments on oA11 and oB2 * Ninja-edit to fix compatibility with ZAPD's PR 142 Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-05-16 16:36:40 +00:00
include "build/assets/objects/object_gm/object_gm.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_ms"
romalign 0x1000
Decompiled A LOT of objects (#815) * . * remove tools/ZAP2 from origin master * object_spot04_objects * remove accidentally added xml * object_spot00_objects * object_bombf ok * object_dy_obj * object_masterzoora * object_mastergolon and object_masterkokirihead * object_aob * object_gt * object_gt * object_geff * object_mag kinda * object_gjyo_objects OK * object_ani OK * object_door_gerudo * object_md and object_trap * object_js OK * object_goroiwa * object_gs * object_nwc * object_niw * object_ane * object_os_anime OK * object_d_hsblock OK * object_fz OK * object_ru2 OK * fixed object_mag * object_cow OK * object_spot01_objects OK * object_spot15_obj * object_umajump OK * object_spot18_obj * object_spot12_obj * fix symbols in z_item_b_heart * object_bdan_objects & object_bowl * object_ddan_objects * object_owl OK * object_spot01_matoyab.xml OK * object_haka OK * object_heavy_object * object_ingate and objet_menkuri_objects * objet_spot00_break & object_relay_objects OK * object_spot01_matoya OK * object_spot06_objects OK * undefined_syms * object_spot08_obj OK * object_efc_doughnut & object_zg * object_ik OK * object_vm * object_ei OK * object_ds OK * updated spec * map_48x85_static OK * object_zl1 & object_peehat ok * some z_parameter naming and other undefined symbol stuff, object_yukabyun OK * object_bubble & object_fw ok * object_shopnuts * restore delete file * object_timeblock OK * object_d_lift OK * object_kibako2 OK * object_mamenoki OK * matches * remove unused asm * object_mag ok now * fixed object_ani * done for now, im tired * object_bdan_objects fixed up * fix bdan * object_bombf fixed * object_bowl fixed up * object_cow fixed * did more, im tired * fixed some stuff in object_ddan_objects * fix object_ddan_object * object_door_gerudo fixed * object_ds fix * object_dy progress * fixed great fairy * some more * more * object_haka fix * progress * ingo_gate fixed * object_js * forgot collision * object_relay_objects fixed * object_kibako2 * object_mag fixed * u64* to void* * more u64* to void* * object_mamenoki fix * object_mastergolon & object_masterkokirihead fix * mido is weird * fixed build * fix object_menkuri_objects * add missing textures in object_menkuri_objects * object_ms * fixed object_peehat * some cleanup stuff * object_zg fix * object_spot00_break fix * object_niw fix * object_nwc fixed * object_ru2 object_rr and some of object_owl fix * object_spot15_obj fix * business scrub * object_spot01_matoya fixed * object_spot18_obj fix * object_spot01_objects fix * object_spot04_objects fix * object_spot04_objects actually fixed * object_spot12_obj fix * object_timeblock fix * object_spot06_objects fixed * object_spot08_obj fix * spot01_matoyab fix * object_trap fix * object_umajump fix * object_vm fix * z_en_niw_lady fix * object_yukabyun fix * object_zl1 fixed * added offsets to object_os_anime * object_md fix * object_ane fix * object_aob fix * add palette comment * object_spot00_objects fix * spot00 fix * remove unused asm * updates * Add TlutOffset to objects added in https://github.com/zeldaret/oot/pull/815 * Updated object_bdan_objects, ran format.sh * Change rgb5a1 to rgba16 in my object xmls * Addressed Anghelo's comments * review Co-authored-by: Lucas Shaw <lucas.shaw1123@gmail.com> Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-08-05 15:53:58 +00:00
include "build/assets/objects/object_ms/object_ms.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_hs"
romalign 0x1000
Add every unreserved object in an automated way (#805) * it's crashing * fix stuff * fix xmls * problematic objects * fix tabs * Fix suffixes * add missing new lines * Add comments to the problematic objects * Find and replace fixes * Add Fig's objects * I forgot to add a Name in a cutscene, so I'm adding it here * Update object decomp tutorial a little bit * Update problematic objects * Update docs/tutorial/object_decomp.md Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Change comments * comment out a few blobs * dammit tluts * Change a bunch of objects * update the last bunch * update comments on oA11 and oB2 * Ninja-edit to fix compatibility with ZAPD's PR 142 Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-05-16 16:36:40 +00:00
include "build/assets/objects/object_hs/object_hs.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_ingate"
romalign 0x1000
Decompiled A LOT of objects (#815) * . * remove tools/ZAP2 from origin master * object_spot04_objects * remove accidentally added xml * object_spot00_objects * object_bombf ok * object_dy_obj * object_masterzoora * object_mastergolon and object_masterkokirihead * object_aob * object_gt * object_gt * object_geff * object_mag kinda * object_gjyo_objects OK * object_ani OK * object_door_gerudo * object_md and object_trap * object_js OK * object_goroiwa * object_gs * object_nwc * object_niw * object_ane * object_os_anime OK * object_d_hsblock OK * object_fz OK * object_ru2 OK * fixed object_mag * object_cow OK * object_spot01_objects OK * object_spot15_obj * object_umajump OK * object_spot18_obj * object_spot12_obj * fix symbols in z_item_b_heart * object_bdan_objects & object_bowl * object_ddan_objects * object_owl OK * object_spot01_matoyab.xml OK * object_haka OK * object_heavy_object * object_ingate and objet_menkuri_objects * objet_spot00_break & object_relay_objects OK * object_spot01_matoya OK * object_spot06_objects OK * undefined_syms * object_spot08_obj OK * object_efc_doughnut & object_zg * object_ik OK * object_vm * object_ei OK * object_ds OK * updated spec * map_48x85_static OK * object_zl1 & object_peehat ok * some z_parameter naming and other undefined symbol stuff, object_yukabyun OK * object_bubble & object_fw ok * object_shopnuts * restore delete file * object_timeblock OK * object_d_lift OK * object_kibako2 OK * object_mamenoki OK * matches * remove unused asm * object_mag ok now * fixed object_ani * done for now, im tired * object_bdan_objects fixed up * fix bdan * object_bombf fixed * object_bowl fixed up * object_cow fixed * did more, im tired * fixed some stuff in object_ddan_objects * fix object_ddan_object * object_door_gerudo fixed * object_ds fix * object_dy progress * fixed great fairy * some more * more * object_haka fix * progress * ingo_gate fixed * object_js * forgot collision * object_relay_objects fixed * object_kibako2 * object_mag fixed * u64* to void* * more u64* to void* * object_mamenoki fix * object_mastergolon & object_masterkokirihead fix * mido is weird * fixed build * fix object_menkuri_objects * add missing textures in object_menkuri_objects * object_ms * fixed object_peehat * some cleanup stuff * object_zg fix * object_spot00_break fix * object_niw fix * object_nwc fixed * object_ru2 object_rr and some of object_owl fix * object_spot15_obj fix * business scrub * object_spot01_matoya fixed * object_spot18_obj fix * object_spot01_objects fix * object_spot04_objects fix * object_spot04_objects actually fixed * object_spot12_obj fix * object_timeblock fix * object_spot06_objects fixed * object_spot08_obj fix * spot01_matoyab fix * object_trap fix * object_umajump fix * object_vm fix * z_en_niw_lady fix * object_yukabyun fix * object_zl1 fixed * added offsets to object_os_anime * object_md fix * object_ane fix * object_aob fix * add palette comment * object_spot00_objects fix * spot00 fix * remove unused asm * updates * Add TlutOffset to objects added in https://github.com/zeldaret/oot/pull/815 * Updated object_bdan_objects, ran format.sh * Change rgb5a1 to rgba16 in my object xmls * Addressed Anghelo's comments * review Co-authored-by: Lucas Shaw <lucas.shaw1123@gmail.com> Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-08-05 15:53:58 +00:00
include "build/assets/objects/object_ingate/object_ingate.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_lightswitch"
romalign 0x1000
Add every unreserved object in an automated way (#805) * it's crashing * fix stuff * fix xmls * problematic objects * fix tabs * Fix suffixes * add missing new lines * Add comments to the problematic objects * Find and replace fixes * Add Fig's objects * I forgot to add a Name in a cutscene, so I'm adding it here * Update object decomp tutorial a little bit * Update problematic objects * Update docs/tutorial/object_decomp.md Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Change comments * comment out a few blobs * dammit tluts * Change a bunch of objects * update the last bunch * update comments on oA11 and oB2 * Ninja-edit to fix compatibility with ZAPD's PR 142 Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-05-16 16:36:40 +00:00
include "build/assets/objects/object_lightswitch/object_lightswitch.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_kusa"
romalign 0x1000
Add every unreserved object in an automated way (#805) * it's crashing * fix stuff * fix xmls * problematic objects * fix tabs * Fix suffixes * add missing new lines * Add comments to the problematic objects * Find and replace fixes * Add Fig's objects * I forgot to add a Name in a cutscene, so I'm adding it here * Update object decomp tutorial a little bit * Update problematic objects * Update docs/tutorial/object_decomp.md Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Change comments * comment out a few blobs * dammit tluts * Change a bunch of objects * update the last bunch * update comments on oA11 and oB2 * Ninja-edit to fix compatibility with ZAPD's PR 142 Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-05-16 16:36:40 +00:00
include "build/assets/objects/object_kusa/object_kusa.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_tsubo"
romalign 0x1000
Add every unreserved object in an automated way (#805) * it's crashing * fix stuff * fix xmls * problematic objects * fix tabs * Fix suffixes * add missing new lines * Add comments to the problematic objects * Find and replace fixes * Add Fig's objects * I forgot to add a Name in a cutscene, so I'm adding it here * Update object decomp tutorial a little bit * Update problematic objects * Update docs/tutorial/object_decomp.md Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Change comments * comment out a few blobs * dammit tluts * Change a bunch of objects * update the last bunch * update comments on oA11 and oB2 * Ninja-edit to fix compatibility with ZAPD's PR 142 Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-05-16 16:36:40 +00:00
include "build/assets/objects/object_tsubo/object_tsubo.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_gi_gloves"
romalign 0x1000
All* Get Item objects decompiled (#668) * All get item objects OK * Name z_draw functions * fix skulltula tokens draw ids * Review suggestions, merge extract_single_asset into extract_assets as an optional argument Co-authored-by: Thar0 <maximilianc64@gmail.com>
2021-02-12 21:57:06 +00:00
include "build/assets/objects/object_gi_gloves/object_gi_gloves.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_gi_coin"
romalign 0x1000
All* Get Item objects decompiled (#668) * All get item objects OK * Name z_draw functions * fix skulltula tokens draw ids * Review suggestions, merge extract_single_asset into extract_assets as an optional argument Co-authored-by: Thar0 <maximilianc64@gmail.com>
2021-02-12 21:57:06 +00:00
include "build/assets/objects/object_gi_coin/object_gi_coin.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_kanban"
romalign 0x1000
Add every unreserved object in an automated way (#805) * it's crashing * fix stuff * fix xmls * problematic objects * fix tabs * Fix suffixes * add missing new lines * Add comments to the problematic objects * Find and replace fixes * Add Fig's objects * I forgot to add a Name in a cutscene, so I'm adding it here * Update object decomp tutorial a little bit * Update problematic objects * Update docs/tutorial/object_decomp.md Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Change comments * comment out a few blobs * dammit tluts * Change a bunch of objects * update the last bunch * update comments on oA11 and oB2 * Ninja-edit to fix compatibility with ZAPD's PR 142 Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-05-16 16:36:40 +00:00
include "build/assets/objects/object_kanban/object_kanban.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_gjyo_objects"
romalign 0x1000
Decompiled A LOT of objects (#815) * . * remove tools/ZAP2 from origin master * object_spot04_objects * remove accidentally added xml * object_spot00_objects * object_bombf ok * object_dy_obj * object_masterzoora * object_mastergolon and object_masterkokirihead * object_aob * object_gt * object_gt * object_geff * object_mag kinda * object_gjyo_objects OK * object_ani OK * object_door_gerudo * object_md and object_trap * object_js OK * object_goroiwa * object_gs * object_nwc * object_niw * object_ane * object_os_anime OK * object_d_hsblock OK * object_fz OK * object_ru2 OK * fixed object_mag * object_cow OK * object_spot01_objects OK * object_spot15_obj * object_umajump OK * object_spot18_obj * object_spot12_obj * fix symbols in z_item_b_heart * object_bdan_objects & object_bowl * object_ddan_objects * object_owl OK * object_spot01_matoyab.xml OK * object_haka OK * object_heavy_object * object_ingate and objet_menkuri_objects * objet_spot00_break & object_relay_objects OK * object_spot01_matoya OK * object_spot06_objects OK * undefined_syms * object_spot08_obj OK * object_efc_doughnut & object_zg * object_ik OK * object_vm * object_ei OK * object_ds OK * updated spec * map_48x85_static OK * object_zl1 & object_peehat ok * some z_parameter naming and other undefined symbol stuff, object_yukabyun OK * object_bubble & object_fw ok * object_shopnuts * restore delete file * object_timeblock OK * object_d_lift OK * object_kibako2 OK * object_mamenoki OK * matches * remove unused asm * object_mag ok now * fixed object_ani * done for now, im tired * object_bdan_objects fixed up * fix bdan * object_bombf fixed * object_bowl fixed up * object_cow fixed * did more, im tired * fixed some stuff in object_ddan_objects * fix object_ddan_object * object_door_gerudo fixed * object_ds fix * object_dy progress * fixed great fairy * some more * more * object_haka fix * progress * ingo_gate fixed * object_js * forgot collision * object_relay_objects fixed * object_kibako2 * object_mag fixed * u64* to void* * more u64* to void* * object_mamenoki fix * object_mastergolon & object_masterkokirihead fix * mido is weird * fixed build * fix object_menkuri_objects * add missing textures in object_menkuri_objects * object_ms * fixed object_peehat * some cleanup stuff * object_zg fix * object_spot00_break fix * object_niw fix * object_nwc fixed * object_ru2 object_rr and some of object_owl fix * object_spot15_obj fix * business scrub * object_spot01_matoya fixed * object_spot18_obj fix * object_spot01_objects fix * object_spot04_objects fix * object_spot04_objects actually fixed * object_spot12_obj fix * object_timeblock fix * object_spot06_objects fixed * object_spot08_obj fix * spot01_matoyab fix * object_trap fix * object_umajump fix * object_vm fix * z_en_niw_lady fix * object_yukabyun fix * object_zl1 fixed * added offsets to object_os_anime * object_md fix * object_ane fix * object_aob fix * add palette comment * object_spot00_objects fix * spot00 fix * remove unused asm * updates * Add TlutOffset to objects added in https://github.com/zeldaret/oot/pull/815 * Updated object_bdan_objects, ran format.sh * Change rgb5a1 to rgba16 in my object xmls * Addressed Anghelo's comments * review Co-authored-by: Lucas Shaw <lucas.shaw1123@gmail.com> Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-08-05 15:53:58 +00:00
include "build/assets/objects/object_gjyo_objects/object_gjyo_objects.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_owl"
romalign 0x1000
Decompiled A LOT of objects (#815) * . * remove tools/ZAP2 from origin master * object_spot04_objects * remove accidentally added xml * object_spot00_objects * object_bombf ok * object_dy_obj * object_masterzoora * object_mastergolon and object_masterkokirihead * object_aob * object_gt * object_gt * object_geff * object_mag kinda * object_gjyo_objects OK * object_ani OK * object_door_gerudo * object_md and object_trap * object_js OK * object_goroiwa * object_gs * object_nwc * object_niw * object_ane * object_os_anime OK * object_d_hsblock OK * object_fz OK * object_ru2 OK * fixed object_mag * object_cow OK * object_spot01_objects OK * object_spot15_obj * object_umajump OK * object_spot18_obj * object_spot12_obj * fix symbols in z_item_b_heart * object_bdan_objects & object_bowl * object_ddan_objects * object_owl OK * object_spot01_matoyab.xml OK * object_haka OK * object_heavy_object * object_ingate and objet_menkuri_objects * objet_spot00_break & object_relay_objects OK * object_spot01_matoya OK * object_spot06_objects OK * undefined_syms * object_spot08_obj OK * object_efc_doughnut & object_zg * object_ik OK * object_vm * object_ei OK * object_ds OK * updated spec * map_48x85_static OK * object_zl1 & object_peehat ok * some z_parameter naming and other undefined symbol stuff, object_yukabyun OK * object_bubble & object_fw ok * object_shopnuts * restore delete file * object_timeblock OK * object_d_lift OK * object_kibako2 OK * object_mamenoki OK * matches * remove unused asm * object_mag ok now * fixed object_ani * done for now, im tired * object_bdan_objects fixed up * fix bdan * object_bombf fixed * object_bowl fixed up * object_cow fixed * did more, im tired * fixed some stuff in object_ddan_objects * fix object_ddan_object * object_door_gerudo fixed * object_ds fix * object_dy progress * fixed great fairy * some more * more * object_haka fix * progress * ingo_gate fixed * object_js * forgot collision * object_relay_objects fixed * object_kibako2 * object_mag fixed * u64* to void* * more u64* to void* * object_mamenoki fix * object_mastergolon & object_masterkokirihead fix * mido is weird * fixed build * fix object_menkuri_objects * add missing textures in object_menkuri_objects * object_ms * fixed object_peehat * some cleanup stuff * object_zg fix * object_spot00_break fix * object_niw fix * object_nwc fixed * object_ru2 object_rr and some of object_owl fix * object_spot15_obj fix * business scrub * object_spot01_matoya fixed * object_spot18_obj fix * object_spot01_objects fix * object_spot04_objects fix * object_spot04_objects actually fixed * object_spot12_obj fix * object_timeblock fix * object_spot06_objects fixed * object_spot08_obj fix * spot01_matoyab fix * object_trap fix * object_umajump fix * object_vm fix * z_en_niw_lady fix * object_yukabyun fix * object_zl1 fixed * added offsets to object_os_anime * object_md fix * object_ane fix * object_aob fix * add palette comment * object_spot00_objects fix * spot00 fix * remove unused asm * updates * Add TlutOffset to objects added in https://github.com/zeldaret/oot/pull/815 * Updated object_bdan_objects, ran format.sh * Change rgb5a1 to rgba16 in my object xmls * Addressed Anghelo's comments * review Co-authored-by: Lucas Shaw <lucas.shaw1123@gmail.com> Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-08-05 15:53:58 +00:00
include "build/assets/objects/object_owl/object_owl.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_mk"
romalign 0x1000
Add every unreserved object in an automated way (#805) * it's crashing * fix stuff * fix xmls * problematic objects * fix tabs * Fix suffixes * add missing new lines * Add comments to the problematic objects * Find and replace fixes * Add Fig's objects * I forgot to add a Name in a cutscene, so I'm adding it here * Update object decomp tutorial a little bit * Update problematic objects * Update docs/tutorial/object_decomp.md Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Change comments * comment out a few blobs * dammit tluts * Change a bunch of objects * update the last bunch * update comments on oA11 and oB2 * Ninja-edit to fix compatibility with ZAPD's PR 142 Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-05-16 16:36:40 +00:00
include "build/assets/objects/object_mk/object_mk.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_fu"
romalign 0x1000
Add every unreserved object in an automated way (#805) * it's crashing * fix stuff * fix xmls * problematic objects * fix tabs * Fix suffixes * add missing new lines * Add comments to the problematic objects * Find and replace fixes * Add Fig's objects * I forgot to add a Name in a cutscene, so I'm adding it here * Update object decomp tutorial a little bit * Update problematic objects * Update docs/tutorial/object_decomp.md Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Change comments * comment out a few blobs * dammit tluts * Change a bunch of objects * update the last bunch * update comments on oA11 and oB2 * Ninja-edit to fix compatibility with ZAPD's PR 142 Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-05-16 16:36:40 +00:00
include "build/assets/objects/object_fu/object_fu.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_gi_ki_tan_mask"
romalign 0x1000
All* Get Item objects decompiled (#668) * All get item objects OK * Name z_draw functions * fix skulltula tokens draw ids * Review suggestions, merge extract_single_asset into extract_assets as an optional argument Co-authored-by: Thar0 <maximilianc64@gmail.com>
2021-02-12 21:57:06 +00:00
include "build/assets/objects/object_gi_ki_tan_mask/object_gi_ki_tan_mask.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_gi_redead_mask"
romalign 0x1000
All* Get Item objects decompiled (#668) * All get item objects OK * Name z_draw functions * fix skulltula tokens draw ids * Review suggestions, merge extract_single_asset into extract_assets as an optional argument Co-authored-by: Thar0 <maximilianc64@gmail.com>
2021-02-12 21:57:06 +00:00
include "build/assets/objects/object_gi_redead_mask/object_gi_redead_mask.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_gi_skj_mask"
romalign 0x1000
All* Get Item objects decompiled (#668) * All get item objects OK * Name z_draw functions * fix skulltula tokens draw ids * Review suggestions, merge extract_single_asset into extract_assets as an optional argument Co-authored-by: Thar0 <maximilianc64@gmail.com>
2021-02-12 21:57:06 +00:00
include "build/assets/objects/object_gi_skj_mask/object_gi_skj_mask.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_gi_rabit_mask"
romalign 0x1000
All* Get Item objects decompiled (#668) * All get item objects OK * Name z_draw functions * fix skulltula tokens draw ids * Review suggestions, merge extract_single_asset into extract_assets as an optional argument Co-authored-by: Thar0 <maximilianc64@gmail.com>
2021-02-12 21:57:06 +00:00
include "build/assets/objects/object_gi_rabit_mask/object_gi_rabit_mask.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_gi_truth_mask"
romalign 0x1000
All* Get Item objects decompiled (#668) * All get item objects OK * Name z_draw functions * fix skulltula tokens draw ids * Review suggestions, merge extract_single_asset into extract_assets as an optional argument Co-authored-by: Thar0 <maximilianc64@gmail.com>
2021-02-12 21:57:06 +00:00
include "build/assets/objects/object_gi_truth_mask/object_gi_truth_mask.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_ganon_objects"
romalign 0x1000
Add every unreserved object in an automated way (#805) * it's crashing * fix stuff * fix xmls * problematic objects * fix tabs * Fix suffixes * add missing new lines * Add comments to the problematic objects * Find and replace fixes * Add Fig's objects * I forgot to add a Name in a cutscene, so I'm adding it here * Update object decomp tutorial a little bit * Update problematic objects * Update docs/tutorial/object_decomp.md Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Change comments * comment out a few blobs * dammit tluts * Change a bunch of objects * update the last bunch * update comments on oA11 and oB2 * Ninja-edit to fix compatibility with ZAPD's PR 142 Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-05-16 16:36:40 +00:00
include "build/assets/objects/object_ganon_objects/object_ganon_objects.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_siofuki"
romalign 0x1000
Add every unreserved object in an automated way (#805) * it's crashing * fix stuff * fix xmls * problematic objects * fix tabs * Fix suffixes * add missing new lines * Add comments to the problematic objects * Find and replace fixes * Add Fig's objects * I forgot to add a Name in a cutscene, so I'm adding it here * Update object decomp tutorial a little bit * Update problematic objects * Update docs/tutorial/object_decomp.md Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Change comments * comment out a few blobs * dammit tluts * Change a bunch of objects * update the last bunch * update comments on oA11 and oB2 * Ninja-edit to fix compatibility with ZAPD's PR 142 Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-05-16 16:36:40 +00:00
include "build/assets/objects/object_siofuki/object_siofuki.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_stream"
romalign 0x1000
Add every unreserved object in an automated way (#805) * it's crashing * fix stuff * fix xmls * problematic objects * fix tabs * Fix suffixes * add missing new lines * Add comments to the problematic objects * Find and replace fixes * Add Fig's objects * I forgot to add a Name in a cutscene, so I'm adding it here * Update object decomp tutorial a little bit * Update problematic objects * Update docs/tutorial/object_decomp.md Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Change comments * comment out a few blobs * dammit tluts * Change a bunch of objects * update the last bunch * update comments on oA11 and oB2 * Ninja-edit to fix compatibility with ZAPD's PR 142 Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-05-16 16:36:40 +00:00
include "build/assets/objects/object_stream/object_stream.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_mm"
romalign 0x1000
en_mm and object_mm OK (#735) * almost done * progress * OK * update mm2 * delete asm * whitespace * Update assets/xml/objects/object_mm.xml Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Mm/z_en_mm.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * name data Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2021-03-28 23:18:41 +00:00
include "build/assets/objects/object_mm/object_mm.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_fa"
romalign 0x1000
Add every unreserved object in an automated way (#805) * it's crashing * fix stuff * fix xmls * problematic objects * fix tabs * Fix suffixes * add missing new lines * Add comments to the problematic objects * Find and replace fixes * Add Fig's objects * I forgot to add a Name in a cutscene, so I'm adding it here * Update object decomp tutorial a little bit * Update problematic objects * Update docs/tutorial/object_decomp.md Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Change comments * comment out a few blobs * dammit tluts * Change a bunch of objects * update the last bunch * update comments on oA11 and oB2 * Ninja-edit to fix compatibility with ZAPD's PR 142 Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-05-16 16:36:40 +00:00
include "build/assets/objects/object_fa/object_fa.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_os"
romalign 0x1000
Add every unreserved object in an automated way (#805) * it's crashing * fix stuff * fix xmls * problematic objects * fix tabs * Fix suffixes * add missing new lines * Add comments to the problematic objects * Find and replace fixes * Add Fig's objects * I forgot to add a Name in a cutscene, so I'm adding it here * Update object decomp tutorial a little bit * Update problematic objects * Update docs/tutorial/object_decomp.md Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Change comments * comment out a few blobs * dammit tluts * Change a bunch of objects * update the last bunch * update comments on oA11 and oB2 * Ninja-edit to fix compatibility with ZAPD's PR 142 Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-05-16 16:36:40 +00:00
include "build/assets/objects/object_os/object_os.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_gi_eye_lotion"
romalign 0x1000
All* Get Item objects decompiled (#668) * All get item objects OK * Name z_draw functions * fix skulltula tokens draw ids * Review suggestions, merge extract_single_asset into extract_assets as an optional argument Co-authored-by: Thar0 <maximilianc64@gmail.com>
2021-02-12 21:57:06 +00:00
include "build/assets/objects/object_gi_eye_lotion/object_gi_eye_lotion.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_gi_powder"
romalign 0x1000
All* Get Item objects decompiled (#668) * All get item objects OK * Name z_draw functions * fix skulltula tokens draw ids * Review suggestions, merge extract_single_asset into extract_assets as an optional argument Co-authored-by: Thar0 <maximilianc64@gmail.com>
2021-02-12 21:57:06 +00:00
include "build/assets/objects/object_gi_powder/object_gi_powder.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_gi_mushroom"
romalign 0x1000
All* Get Item objects decompiled (#668) * All get item objects OK * Name z_draw functions * fix skulltula tokens draw ids * Review suggestions, merge extract_single_asset into extract_assets as an optional argument Co-authored-by: Thar0 <maximilianc64@gmail.com>
2021-02-12 21:57:06 +00:00
include "build/assets/objects/object_gi_mushroom/object_gi_mushroom.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_gi_ticketstone"
romalign 0x1000
All* Get Item objects decompiled (#668) * All get item objects OK * Name z_draw functions * fix skulltula tokens draw ids * Review suggestions, merge extract_single_asset into extract_assets as an optional argument Co-authored-by: Thar0 <maximilianc64@gmail.com>
2021-02-12 21:57:06 +00:00
include "build/assets/objects/object_gi_ticketstone/object_gi_ticketstone.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_gi_brokensword"
romalign 0x1000
All* Get Item objects decompiled (#668) * All get item objects OK * Name z_draw functions * fix skulltula tokens draw ids * Review suggestions, merge extract_single_asset into extract_assets as an optional argument Co-authored-by: Thar0 <maximilianc64@gmail.com>
2021-02-12 21:57:06 +00:00
include "build/assets/objects/object_gi_brokensword/object_gi_brokensword.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_js"
romalign 0x1000
Decompiled A LOT of objects (#815) * . * remove tools/ZAP2 from origin master * object_spot04_objects * remove accidentally added xml * object_spot00_objects * object_bombf ok * object_dy_obj * object_masterzoora * object_mastergolon and object_masterkokirihead * object_aob * object_gt * object_gt * object_geff * object_mag kinda * object_gjyo_objects OK * object_ani OK * object_door_gerudo * object_md and object_trap * object_js OK * object_goroiwa * object_gs * object_nwc * object_niw * object_ane * object_os_anime OK * object_d_hsblock OK * object_fz OK * object_ru2 OK * fixed object_mag * object_cow OK * object_spot01_objects OK * object_spot15_obj * object_umajump OK * object_spot18_obj * object_spot12_obj * fix symbols in z_item_b_heart * object_bdan_objects & object_bowl * object_ddan_objects * object_owl OK * object_spot01_matoyab.xml OK * object_haka OK * object_heavy_object * object_ingate and objet_menkuri_objects * objet_spot00_break & object_relay_objects OK * object_spot01_matoya OK * object_spot06_objects OK * undefined_syms * object_spot08_obj OK * object_efc_doughnut & object_zg * object_ik OK * object_vm * object_ei OK * object_ds OK * updated spec * map_48x85_static OK * object_zl1 & object_peehat ok * some z_parameter naming and other undefined symbol stuff, object_yukabyun OK * object_bubble & object_fw ok * object_shopnuts * restore delete file * object_timeblock OK * object_d_lift OK * object_kibako2 OK * object_mamenoki OK * matches * remove unused asm * object_mag ok now * fixed object_ani * done for now, im tired * object_bdan_objects fixed up * fix bdan * object_bombf fixed * object_bowl fixed up * object_cow fixed * did more, im tired * fixed some stuff in object_ddan_objects * fix object_ddan_object * object_door_gerudo fixed * object_ds fix * object_dy progress * fixed great fairy * some more * more * object_haka fix * progress * ingo_gate fixed * object_js * forgot collision * object_relay_objects fixed * object_kibako2 * object_mag fixed * u64* to void* * more u64* to void* * object_mamenoki fix * object_mastergolon & object_masterkokirihead fix * mido is weird * fixed build * fix object_menkuri_objects * add missing textures in object_menkuri_objects * object_ms * fixed object_peehat * some cleanup stuff * object_zg fix * object_spot00_break fix * object_niw fix * object_nwc fixed * object_ru2 object_rr and some of object_owl fix * object_spot15_obj fix * business scrub * object_spot01_matoya fixed * object_spot18_obj fix * object_spot01_objects fix * object_spot04_objects fix * object_spot04_objects actually fixed * object_spot12_obj fix * object_timeblock fix * object_spot06_objects fixed * object_spot08_obj fix * spot01_matoyab fix * object_trap fix * object_umajump fix * object_vm fix * z_en_niw_lady fix * object_yukabyun fix * object_zl1 fixed * added offsets to object_os_anime * object_md fix * object_ane fix * object_aob fix * add palette comment * object_spot00_objects fix * spot00 fix * remove unused asm * updates * Add TlutOffset to objects added in https://github.com/zeldaret/oot/pull/815 * Updated object_bdan_objects, ran format.sh * Change rgb5a1 to rgba16 in my object xmls * Addressed Anghelo's comments * review Co-authored-by: Lucas Shaw <lucas.shaw1123@gmail.com> Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-08-05 15:53:58 +00:00
include "build/assets/objects/object_js/object_js.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_cs"
romalign 0x1000
"Decompile" more objects. (#784) * Object_hakach_objects OK and fix a warning in z_play.c * Object Warp1 OK * Object_spot16_obj OK * object_cs Skeleton and limbs OK * Limbs are broken * Limbs OK * Object_CS OK * Object_jya_door OK * fix errors and add new lines * PR fixes (AngheloAlf) * PR fixes (EllipticEllipsis) * PR fixes (Fig) * Rename Spot16 and Jya * GraveYard -> Graveyard * PR fixes * -s * PR fixes
2021-05-30 16:30:38 +00:00
include "build/assets/objects/object_cs/object_cs.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_gi_prescription"
romalign 0x1000
All* Get Item objects decompiled (#668) * All get item objects OK * Name z_draw functions * fix skulltula tokens draw ids * Review suggestions, merge extract_single_asset into extract_assets as an optional argument Co-authored-by: Thar0 <maximilianc64@gmail.com>
2021-02-12 21:57:06 +00:00
include "build/assets/objects/object_gi_prescription/object_gi_prescription.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_gi_bracelet"
romalign 0x1000
All* Get Item objects decompiled (#668) * All get item objects OK * Name z_draw functions * fix skulltula tokens draw ids * Review suggestions, merge extract_single_asset into extract_assets as an optional argument Co-authored-by: Thar0 <maximilianc64@gmail.com>
2021-02-12 21:57:06 +00:00
include "build/assets/objects/object_gi_bracelet/object_gi_bracelet.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_gi_soldout"
romalign 0x1000
All* Get Item objects decompiled (#668) * All get item objects OK * Name z_draw functions * fix skulltula tokens draw ids * Review suggestions, merge extract_single_asset into extract_assets as an optional argument Co-authored-by: Thar0 <maximilianc64@gmail.com>
2021-02-12 21:57:06 +00:00
include "build/assets/objects/object_gi_soldout/object_gi_soldout.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_gi_frog"
romalign 0x1000
All* Get Item objects decompiled (#668) * All get item objects OK * Name z_draw functions * fix skulltula tokens draw ids * Review suggestions, merge extract_single_asset into extract_assets as an optional argument Co-authored-by: Thar0 <maximilianc64@gmail.com>
2021-02-12 21:57:06 +00:00
include "build/assets/objects/object_gi_frog/object_gi_frog.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_mag"
romalign 0x1000
Decompiled A LOT of objects (#815) * . * remove tools/ZAP2 from origin master * object_spot04_objects * remove accidentally added xml * object_spot00_objects * object_bombf ok * object_dy_obj * object_masterzoora * object_mastergolon and object_masterkokirihead * object_aob * object_gt * object_gt * object_geff * object_mag kinda * object_gjyo_objects OK * object_ani OK * object_door_gerudo * object_md and object_trap * object_js OK * object_goroiwa * object_gs * object_nwc * object_niw * object_ane * object_os_anime OK * object_d_hsblock OK * object_fz OK * object_ru2 OK * fixed object_mag * object_cow OK * object_spot01_objects OK * object_spot15_obj * object_umajump OK * object_spot18_obj * object_spot12_obj * fix symbols in z_item_b_heart * object_bdan_objects & object_bowl * object_ddan_objects * object_owl OK * object_spot01_matoyab.xml OK * object_haka OK * object_heavy_object * object_ingate and objet_menkuri_objects * objet_spot00_break & object_relay_objects OK * object_spot01_matoya OK * object_spot06_objects OK * undefined_syms * object_spot08_obj OK * object_efc_doughnut & object_zg * object_ik OK * object_vm * object_ei OK * object_ds OK * updated spec * map_48x85_static OK * object_zl1 & object_peehat ok * some z_parameter naming and other undefined symbol stuff, object_yukabyun OK * object_bubble & object_fw ok * object_shopnuts * restore delete file * object_timeblock OK * object_d_lift OK * object_kibako2 OK * object_mamenoki OK * matches * remove unused asm * object_mag ok now * fixed object_ani * done for now, im tired * object_bdan_objects fixed up * fix bdan * object_bombf fixed * object_bowl fixed up * object_cow fixed * did more, im tired * fixed some stuff in object_ddan_objects * fix object_ddan_object * object_door_gerudo fixed * object_ds fix * object_dy progress * fixed great fairy * some more * more * object_haka fix * progress * ingo_gate fixed * object_js * forgot collision * object_relay_objects fixed * object_kibako2 * object_mag fixed * u64* to void* * more u64* to void* * object_mamenoki fix * object_mastergolon & object_masterkokirihead fix * mido is weird * fixed build * fix object_menkuri_objects * add missing textures in object_menkuri_objects * object_ms * fixed object_peehat * some cleanup stuff * object_zg fix * object_spot00_break fix * object_niw fix * object_nwc fixed * object_ru2 object_rr and some of object_owl fix * object_spot15_obj fix * business scrub * object_spot01_matoya fixed * object_spot18_obj fix * object_spot01_objects fix * object_spot04_objects fix * object_spot04_objects actually fixed * object_spot12_obj fix * object_timeblock fix * object_spot06_objects fixed * object_spot08_obj fix * spot01_matoyab fix * object_trap fix * object_umajump fix * object_vm fix * z_en_niw_lady fix * object_yukabyun fix * object_zl1 fixed * added offsets to object_os_anime * object_md fix * object_ane fix * object_aob fix * add palette comment * object_spot00_objects fix * spot00 fix * remove unused asm * updates * Add TlutOffset to objects added in https://github.com/zeldaret/oot/pull/815 * Updated object_bdan_objects, ran format.sh * Change rgb5a1 to rgba16 in my object xmls * Addressed Anghelo's comments * review Co-authored-by: Lucas Shaw <lucas.shaw1123@gmail.com> Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-08-05 15:53:58 +00:00
include "build/assets/objects/object_mag/object_mag.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_door_gerudo"
romalign 0x1000
Decompiled A LOT of objects (#815) * . * remove tools/ZAP2 from origin master * object_spot04_objects * remove accidentally added xml * object_spot00_objects * object_bombf ok * object_dy_obj * object_masterzoora * object_mastergolon and object_masterkokirihead * object_aob * object_gt * object_gt * object_geff * object_mag kinda * object_gjyo_objects OK * object_ani OK * object_door_gerudo * object_md and object_trap * object_js OK * object_goroiwa * object_gs * object_nwc * object_niw * object_ane * object_os_anime OK * object_d_hsblock OK * object_fz OK * object_ru2 OK * fixed object_mag * object_cow OK * object_spot01_objects OK * object_spot15_obj * object_umajump OK * object_spot18_obj * object_spot12_obj * fix symbols in z_item_b_heart * object_bdan_objects & object_bowl * object_ddan_objects * object_owl OK * object_spot01_matoyab.xml OK * object_haka OK * object_heavy_object * object_ingate and objet_menkuri_objects * objet_spot00_break & object_relay_objects OK * object_spot01_matoya OK * object_spot06_objects OK * undefined_syms * object_spot08_obj OK * object_efc_doughnut & object_zg * object_ik OK * object_vm * object_ei OK * object_ds OK * updated spec * map_48x85_static OK * object_zl1 & object_peehat ok * some z_parameter naming and other undefined symbol stuff, object_yukabyun OK * object_bubble & object_fw ok * object_shopnuts * restore delete file * object_timeblock OK * object_d_lift OK * object_kibako2 OK * object_mamenoki OK * matches * remove unused asm * object_mag ok now * fixed object_ani * done for now, im tired * object_bdan_objects fixed up * fix bdan * object_bombf fixed * object_bowl fixed up * object_cow fixed * did more, im tired * fixed some stuff in object_ddan_objects * fix object_ddan_object * object_door_gerudo fixed * object_ds fix * object_dy progress * fixed great fairy * some more * more * object_haka fix * progress * ingo_gate fixed * object_js * forgot collision * object_relay_objects fixed * object_kibako2 * object_mag fixed * u64* to void* * more u64* to void* * object_mamenoki fix * object_mastergolon & object_masterkokirihead fix * mido is weird * fixed build * fix object_menkuri_objects * add missing textures in object_menkuri_objects * object_ms * fixed object_peehat * some cleanup stuff * object_zg fix * object_spot00_break fix * object_niw fix * object_nwc fixed * object_ru2 object_rr and some of object_owl fix * object_spot15_obj fix * business scrub * object_spot01_matoya fixed * object_spot18_obj fix * object_spot01_objects fix * object_spot04_objects fix * object_spot04_objects actually fixed * object_spot12_obj fix * object_timeblock fix * object_spot06_objects fixed * object_spot08_obj fix * spot01_matoyab fix * object_trap fix * object_umajump fix * object_vm fix * z_en_niw_lady fix * object_yukabyun fix * object_zl1 fixed * added offsets to object_os_anime * object_md fix * object_ane fix * object_aob fix * add palette comment * object_spot00_objects fix * spot00 fix * remove unused asm * updates * Add TlutOffset to objects added in https://github.com/zeldaret/oot/pull/815 * Updated object_bdan_objects, ran format.sh * Change rgb5a1 to rgba16 in my object xmls * Addressed Anghelo's comments * review Co-authored-by: Lucas Shaw <lucas.shaw1123@gmail.com> Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-08-05 15:53:58 +00:00
include "build/assets/objects/object_door_gerudo/object_door_gerudo.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_gt"
romalign 0x1000
Decompiled A LOT of objects (#815) * . * remove tools/ZAP2 from origin master * object_spot04_objects * remove accidentally added xml * object_spot00_objects * object_bombf ok * object_dy_obj * object_masterzoora * object_mastergolon and object_masterkokirihead * object_aob * object_gt * object_gt * object_geff * object_mag kinda * object_gjyo_objects OK * object_ani OK * object_door_gerudo * object_md and object_trap * object_js OK * object_goroiwa * object_gs * object_nwc * object_niw * object_ane * object_os_anime OK * object_d_hsblock OK * object_fz OK * object_ru2 OK * fixed object_mag * object_cow OK * object_spot01_objects OK * object_spot15_obj * object_umajump OK * object_spot18_obj * object_spot12_obj * fix symbols in z_item_b_heart * object_bdan_objects & object_bowl * object_ddan_objects * object_owl OK * object_spot01_matoyab.xml OK * object_haka OK * object_heavy_object * object_ingate and objet_menkuri_objects * objet_spot00_break & object_relay_objects OK * object_spot01_matoya OK * object_spot06_objects OK * undefined_syms * object_spot08_obj OK * object_efc_doughnut & object_zg * object_ik OK * object_vm * object_ei OK * object_ds OK * updated spec * map_48x85_static OK * object_zl1 & object_peehat ok * some z_parameter naming and other undefined symbol stuff, object_yukabyun OK * object_bubble & object_fw ok * object_shopnuts * restore delete file * object_timeblock OK * object_d_lift OK * object_kibako2 OK * object_mamenoki OK * matches * remove unused asm * object_mag ok now * fixed object_ani * done for now, im tired * object_bdan_objects fixed up * fix bdan * object_bombf fixed * object_bowl fixed up * object_cow fixed * did more, im tired * fixed some stuff in object_ddan_objects * fix object_ddan_object * object_door_gerudo fixed * object_ds fix * object_dy progress * fixed great fairy * some more * more * object_haka fix * progress * ingo_gate fixed * object_js * forgot collision * object_relay_objects fixed * object_kibako2 * object_mag fixed * u64* to void* * more u64* to void* * object_mamenoki fix * object_mastergolon & object_masterkokirihead fix * mido is weird * fixed build * fix object_menkuri_objects * add missing textures in object_menkuri_objects * object_ms * fixed object_peehat * some cleanup stuff * object_zg fix * object_spot00_break fix * object_niw fix * object_nwc fixed * object_ru2 object_rr and some of object_owl fix * object_spot15_obj fix * business scrub * object_spot01_matoya fixed * object_spot18_obj fix * object_spot01_objects fix * object_spot04_objects fix * object_spot04_objects actually fixed * object_spot12_obj fix * object_timeblock fix * object_spot06_objects fixed * object_spot08_obj fix * spot01_matoyab fix * object_trap fix * object_umajump fix * object_vm fix * z_en_niw_lady fix * object_yukabyun fix * object_zl1 fixed * added offsets to object_os_anime * object_md fix * object_ane fix * object_aob fix * add palette comment * object_spot00_objects fix * spot00 fix * remove unused asm * updates * Add TlutOffset to objects added in https://github.com/zeldaret/oot/pull/815 * Updated object_bdan_objects, ran format.sh * Change rgb5a1 to rgba16 in my object xmls * Addressed Anghelo's comments * review Co-authored-by: Lucas Shaw <lucas.shaw1123@gmail.com> Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-08-05 15:53:58 +00:00
include "build/assets/objects/object_gt/object_gt.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_efc_erupc"
romalign 0x1000
Add every unreserved object in an automated way (#805) * it's crashing * fix stuff * fix xmls * problematic objects * fix tabs * Fix suffixes * add missing new lines * Add comments to the problematic objects * Find and replace fixes * Add Fig's objects * I forgot to add a Name in a cutscene, so I'm adding it here * Update object decomp tutorial a little bit * Update problematic objects * Update docs/tutorial/object_decomp.md Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Change comments * comment out a few blobs * dammit tluts * Change a bunch of objects * update the last bunch * update comments on oA11 and oB2 * Ninja-edit to fix compatibility with ZAPD's PR 142 Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-05-16 16:36:40 +00:00
include "build/assets/objects/object_efc_erupc/object_efc_erupc.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_zl2_anime1"
romalign 0x1000
object_zl2, object_zl2_anime1 & object_zl2_anime2 OK (#694) * xml Signed-off-by: Angie <angheloalf95@gmail.com> * add xmls of anime1 and anime2 Signed-off-by: Angie <angheloalf95@gmail.com> * add unaccounted data from animes Signed-off-by: Angie <angheloalf95@gmail.com> * add all unaccounted data and a bit of renaming Signed-off-by: Angie <angheloalf95@gmail.com> * add to spec and change the pointer to the decompiled names Signed-off-by: Angie <angheloalf95@gmail.com> * add palettes Signed-off-by: angie <angheloalf95@gmail.com> * delete gitkeep Signed-off-by: angie <angheloalf95@gmail.com> * run format Signed-off-by: angie <angheloalf95@gmail.com> * change palette to Tlut Signed-off-by: angie <angheloalf95@gmail.com> * change `Tlut` to `TLUT` Signed-off-by: angie <angheloalf95@gmail.com>
2021-03-28 02:24:28 +00:00
include "build/assets/objects/object_zl2_anime1/object_zl2_anime1.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_zl2_anime2"
romalign 0x1000
object_zl2, object_zl2_anime1 & object_zl2_anime2 OK (#694) * xml Signed-off-by: Angie <angheloalf95@gmail.com> * add xmls of anime1 and anime2 Signed-off-by: Angie <angheloalf95@gmail.com> * add unaccounted data from animes Signed-off-by: Angie <angheloalf95@gmail.com> * add all unaccounted data and a bit of renaming Signed-off-by: Angie <angheloalf95@gmail.com> * add to spec and change the pointer to the decompiled names Signed-off-by: Angie <angheloalf95@gmail.com> * add palettes Signed-off-by: angie <angheloalf95@gmail.com> * delete gitkeep Signed-off-by: angie <angheloalf95@gmail.com> * run format Signed-off-by: angie <angheloalf95@gmail.com> * change palette to Tlut Signed-off-by: angie <angheloalf95@gmail.com> * change `Tlut` to `TLUT` Signed-off-by: angie <angheloalf95@gmail.com>
2021-03-28 02:24:28 +00:00
include "build/assets/objects/object_zl2_anime2/object_zl2_anime2.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_gi_golonmask"
romalign 0x1000
All* Get Item objects decompiled (#668) * All get item objects OK * Name z_draw functions * fix skulltula tokens draw ids * Review suggestions, merge extract_single_asset into extract_assets as an optional argument Co-authored-by: Thar0 <maximilianc64@gmail.com>
2021-02-12 21:57:06 +00:00
include "build/assets/objects/object_gi_golonmask/object_gi_golonmask.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_gi_zoramask"
romalign 0x1000
All* Get Item objects decompiled (#668) * All get item objects OK * Name z_draw functions * fix skulltula tokens draw ids * Review suggestions, merge extract_single_asset into extract_assets as an optional argument Co-authored-by: Thar0 <maximilianc64@gmail.com>
2021-02-12 21:57:06 +00:00
include "build/assets/objects/object_gi_zoramask/object_gi_zoramask.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_gi_gerudomask"
romalign 0x1000
All* Get Item objects decompiled (#668) * All get item objects OK * Name z_draw functions * fix skulltula tokens draw ids * Review suggestions, merge extract_single_asset into extract_assets as an optional argument Co-authored-by: Thar0 <maximilianc64@gmail.com>
2021-02-12 21:57:06 +00:00
include "build/assets/objects/object_gi_gerudomask/object_gi_gerudomask.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_ganon2"
romalign 0x1000
Add every unreserved object in an automated way (#805) * it's crashing * fix stuff * fix xmls * problematic objects * fix tabs * Fix suffixes * add missing new lines * Add comments to the problematic objects * Find and replace fixes * Add Fig's objects * I forgot to add a Name in a cutscene, so I'm adding it here * Update object decomp tutorial a little bit * Update problematic objects * Update docs/tutorial/object_decomp.md Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Change comments * comment out a few blobs * dammit tluts * Change a bunch of objects * update the last bunch * update comments on oA11 and oB2 * Ninja-edit to fix compatibility with ZAPD's PR 142 Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-05-16 16:36:40 +00:00
include "build/assets/objects/object_ganon2/object_ganon2.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_ka"
romalign 0x1000
Add every unreserved object in an automated way (#805) * it's crashing * fix stuff * fix xmls * problematic objects * fix tabs * Fix suffixes * add missing new lines * Add comments to the problematic objects * Find and replace fixes * Add Fig's objects * I forgot to add a Name in a cutscene, so I'm adding it here * Update object decomp tutorial a little bit * Update problematic objects * Update docs/tutorial/object_decomp.md Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Change comments * comment out a few blobs * dammit tluts * Change a bunch of objects * update the last bunch * update comments on oA11 and oB2 * Ninja-edit to fix compatibility with ZAPD's PR 142 Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-05-16 16:36:40 +00:00
include "build/assets/objects/object_ka/object_ka.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_ts"
romalign 0x1000
Add every unreserved object in an automated way (#805) * it's crashing * fix stuff * fix xmls * problematic objects * fix tabs * Fix suffixes * add missing new lines * Add comments to the problematic objects * Find and replace fixes * Add Fig's objects * I forgot to add a Name in a cutscene, so I'm adding it here * Update object decomp tutorial a little bit * Update problematic objects * Update docs/tutorial/object_decomp.md Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Change comments * comment out a few blobs * dammit tluts * Change a bunch of objects * update the last bunch * update comments on oA11 and oB2 * Ninja-edit to fix compatibility with ZAPD's PR 142 Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-05-16 16:36:40 +00:00
include "build/assets/objects/object_ts/object_ts.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_zg"
romalign 0x1000
Decompiled A LOT of objects (#815) * . * remove tools/ZAP2 from origin master * object_spot04_objects * remove accidentally added xml * object_spot00_objects * object_bombf ok * object_dy_obj * object_masterzoora * object_mastergolon and object_masterkokirihead * object_aob * object_gt * object_gt * object_geff * object_mag kinda * object_gjyo_objects OK * object_ani OK * object_door_gerudo * object_md and object_trap * object_js OK * object_goroiwa * object_gs * object_nwc * object_niw * object_ane * object_os_anime OK * object_d_hsblock OK * object_fz OK * object_ru2 OK * fixed object_mag * object_cow OK * object_spot01_objects OK * object_spot15_obj * object_umajump OK * object_spot18_obj * object_spot12_obj * fix symbols in z_item_b_heart * object_bdan_objects & object_bowl * object_ddan_objects * object_owl OK * object_spot01_matoyab.xml OK * object_haka OK * object_heavy_object * object_ingate and objet_menkuri_objects * objet_spot00_break & object_relay_objects OK * object_spot01_matoya OK * object_spot06_objects OK * undefined_syms * object_spot08_obj OK * object_efc_doughnut & object_zg * object_ik OK * object_vm * object_ei OK * object_ds OK * updated spec * map_48x85_static OK * object_zl1 & object_peehat ok * some z_parameter naming and other undefined symbol stuff, object_yukabyun OK * object_bubble & object_fw ok * object_shopnuts * restore delete file * object_timeblock OK * object_d_lift OK * object_kibako2 OK * object_mamenoki OK * matches * remove unused asm * object_mag ok now * fixed object_ani * done for now, im tired * object_bdan_objects fixed up * fix bdan * object_bombf fixed * object_bowl fixed up * object_cow fixed * did more, im tired * fixed some stuff in object_ddan_objects * fix object_ddan_object * object_door_gerudo fixed * object_ds fix * object_dy progress * fixed great fairy * some more * more * object_haka fix * progress * ingo_gate fixed * object_js * forgot collision * object_relay_objects fixed * object_kibako2 * object_mag fixed * u64* to void* * more u64* to void* * object_mamenoki fix * object_mastergolon & object_masterkokirihead fix * mido is weird * fixed build * fix object_menkuri_objects * add missing textures in object_menkuri_objects * object_ms * fixed object_peehat * some cleanup stuff * object_zg fix * object_spot00_break fix * object_niw fix * object_nwc fixed * object_ru2 object_rr and some of object_owl fix * object_spot15_obj fix * business scrub * object_spot01_matoya fixed * object_spot18_obj fix * object_spot01_objects fix * object_spot04_objects fix * object_spot04_objects actually fixed * object_spot12_obj fix * object_timeblock fix * object_spot06_objects fixed * object_spot08_obj fix * spot01_matoyab fix * object_trap fix * object_umajump fix * object_vm fix * z_en_niw_lady fix * object_yukabyun fix * object_zl1 fixed * added offsets to object_os_anime * object_md fix * object_ane fix * object_aob fix * add palette comment * object_spot00_objects fix * spot00 fix * remove unused asm * updates * Add TlutOffset to objects added in https://github.com/zeldaret/oot/pull/815 * Updated object_bdan_objects, ran format.sh * Change rgb5a1 to rgba16 in my object xmls * Addressed Anghelo's comments * review Co-authored-by: Lucas Shaw <lucas.shaw1123@gmail.com> Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-08-05 15:53:58 +00:00
include "build/assets/objects/object_zg/object_zg.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_gi_hoverboots"
romalign 0x1000
All* Get Item objects decompiled (#668) * All get item objects OK * Name z_draw functions * fix skulltula tokens draw ids * Review suggestions, merge extract_single_asset into extract_assets as an optional argument Co-authored-by: Thar0 <maximilianc64@gmail.com>
2021-02-12 21:57:06 +00:00
include "build/assets/objects/object_gi_hoverboots/object_gi_hoverboots.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_gi_m_arrow"
romalign 0x1000
All* Get Item objects decompiled (#668) * All get item objects OK * Name z_draw functions * fix skulltula tokens draw ids * Review suggestions, merge extract_single_asset into extract_assets as an optional argument Co-authored-by: Thar0 <maximilianc64@gmail.com>
2021-02-12 21:57:06 +00:00
include "build/assets/objects/object_gi_m_arrow/object_gi_m_arrow.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_ds2"
romalign 0x1000
Add every unreserved object in an automated way (#805) * it's crashing * fix stuff * fix xmls * problematic objects * fix tabs * Fix suffixes * add missing new lines * Add comments to the problematic objects * Find and replace fixes * Add Fig's objects * I forgot to add a Name in a cutscene, so I'm adding it here * Update object decomp tutorial a little bit * Update problematic objects * Update docs/tutorial/object_decomp.md Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Change comments * comment out a few blobs * dammit tluts * Change a bunch of objects * update the last bunch * update comments on oA11 and oB2 * Ninja-edit to fix compatibility with ZAPD's PR 142 Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-05-16 16:36:40 +00:00
include "build/assets/objects/object_ds2/object_ds2.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_ec"
romalign 0x1000
Decompile a bunch of objects (#603) * Mostly done but shifted * still messed up * Almost OK * OBJECT_JYA_OBJ OK, OBJECT_GR OK * Done * Merge master and format * Cleanup * Cleanup 2 * Start object MB dont merge yet * Object_MB OK * Object_ydan_objects OK * General 'ydan' actor cleanup * Forgot some small things * Object_EC OK * add .gitkeep and run format * Object_sd OK but no textures cause of a zap issue * PR fixes * Fix object_sd * fix ydan * delete .gitkeep files * OBJECT_BOX as far as it can go with current ZAP * Fix undefined_syms * Start child link object * Push progress, dont merge yet * Object_mori_objects OK * Fixed? * Fix conflicts again * Seems like i missed some textures * Extract data for BgBombwall * More field * ZAP YEP 2.0 * Object_Box OK * Object_SD ok. Ready to merge * remove ASM and merge master * remove ASM * remove files wrongfully added to docs/ * Almost done * Change comment in z_player_lib.c * forgot some DLists in player_lib.c * Fix conflict, run format * Same as before but this time with Tex and TLUT * Last few things * fix object_GR and add limbs to object_sd * Nane -> Name * gChildDekuShieldMtx is now a matrix and not a blob * PR fixes (Fig) * add a space for comment in z_player_lib.c * re push and new lines * PR fixes (AngheloAlf) * PR fixes (Roman) * Fix Heishi2 * PR fixes (Fig) * Replace spacing in a file * PR fixes (Roman)
2021-05-26 22:59:21 +00:00
include "build/assets/objects/object_ec/object_ec.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_fish"
romalign 0x1000
Add every unreserved object in an automated way (#805) * it's crashing * fix stuff * fix xmls * problematic objects * fix tabs * Fix suffixes * add missing new lines * Add comments to the problematic objects * Find and replace fixes * Add Fig's objects * I forgot to add a Name in a cutscene, so I'm adding it here * Update object decomp tutorial a little bit * Update problematic objects * Update docs/tutorial/object_decomp.md Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Change comments * comment out a few blobs * dammit tluts * Change a bunch of objects * update the last bunch * update comments on oA11 and oB2 * Ninja-edit to fix compatibility with ZAPD's PR 142 Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-05-16 16:36:40 +00:00
include "build/assets/objects/object_fish/object_fish.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_gi_sutaru"
romalign 0x1000
All* Get Item objects decompiled (#668) * All get item objects OK * Name z_draw functions * fix skulltula tokens draw ids * Review suggestions, merge extract_single_asset into extract_assets as an optional argument Co-authored-by: Thar0 <maximilianc64@gmail.com>
2021-02-12 21:57:06 +00:00
include "build/assets/objects/object_gi_sutaru/object_gi_sutaru.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_gi_goddess"
romalign 0x1000
All* Get Item objects decompiled (#668) * All get item objects OK * Name z_draw functions * fix skulltula tokens draw ids * Review suggestions, merge extract_single_asset into extract_assets as an optional argument Co-authored-by: Thar0 <maximilianc64@gmail.com>
2021-02-12 21:57:06 +00:00
include "build/assets/objects/object_gi_goddess/object_gi_goddess.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_ssh"
romalign 0x1000
Add every unreserved object in an automated way (#805) * it's crashing * fix stuff * fix xmls * problematic objects * fix tabs * Fix suffixes * add missing new lines * Add comments to the problematic objects * Find and replace fixes * Add Fig's objects * I forgot to add a Name in a cutscene, so I'm adding it here * Update object decomp tutorial a little bit * Update problematic objects * Update docs/tutorial/object_decomp.md Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Change comments * comment out a few blobs * dammit tluts * Change a bunch of objects * update the last bunch * update comments on oA11 and oB2 * Ninja-edit to fix compatibility with ZAPD's PR 142 Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-05-16 16:36:40 +00:00
include "build/assets/objects/object_ssh/object_ssh.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_bigokuta"
romalign 0x1000
Add every unreserved object in an automated way (#805) * it's crashing * fix stuff * fix xmls * problematic objects * fix tabs * Fix suffixes * add missing new lines * Add comments to the problematic objects * Find and replace fixes * Add Fig's objects * I forgot to add a Name in a cutscene, so I'm adding it here * Update object decomp tutorial a little bit * Update problematic objects * Update docs/tutorial/object_decomp.md Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Change comments * comment out a few blobs * dammit tluts * Change a bunch of objects * update the last bunch * update comments on oA11 and oB2 * Ninja-edit to fix compatibility with ZAPD's PR 142 Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-05-16 16:36:40 +00:00
include "build/assets/objects/object_bigokuta/object_bigokuta.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_bg"
romalign 0x1000
object_bg and object_mir_ray OK (#714) * object_bg and object_mir_ray * remove externs in mir_ray * newline at end of xml * fix a couple of warnings in Obj_Tsubo
2021-03-18 07:46:42 +00:00
include "build/assets/objects/object_bg/object_bg.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_spot05_objects"
romalign 0x1000
Add every unreserved object in an automated way (#805) * it's crashing * fix stuff * fix xmls * problematic objects * fix tabs * Fix suffixes * add missing new lines * Add comments to the problematic objects * Find and replace fixes * Add Fig's objects * I forgot to add a Name in a cutscene, so I'm adding it here * Update object decomp tutorial a little bit * Update problematic objects * Update docs/tutorial/object_decomp.md Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Change comments * comment out a few blobs * dammit tluts * Change a bunch of objects * update the last bunch * update comments on oA11 and oB2 * Ninja-edit to fix compatibility with ZAPD's PR 142 Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-05-16 16:36:40 +00:00
include "build/assets/objects/object_spot05_objects/object_spot05_objects.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_spot12_obj"
romalign 0x1000
Decompiled A LOT of objects (#815) * . * remove tools/ZAP2 from origin master * object_spot04_objects * remove accidentally added xml * object_spot00_objects * object_bombf ok * object_dy_obj * object_masterzoora * object_mastergolon and object_masterkokirihead * object_aob * object_gt * object_gt * object_geff * object_mag kinda * object_gjyo_objects OK * object_ani OK * object_door_gerudo * object_md and object_trap * object_js OK * object_goroiwa * object_gs * object_nwc * object_niw * object_ane * object_os_anime OK * object_d_hsblock OK * object_fz OK * object_ru2 OK * fixed object_mag * object_cow OK * object_spot01_objects OK * object_spot15_obj * object_umajump OK * object_spot18_obj * object_spot12_obj * fix symbols in z_item_b_heart * object_bdan_objects & object_bowl * object_ddan_objects * object_owl OK * object_spot01_matoyab.xml OK * object_haka OK * object_heavy_object * object_ingate and objet_menkuri_objects * objet_spot00_break & object_relay_objects OK * object_spot01_matoya OK * object_spot06_objects OK * undefined_syms * object_spot08_obj OK * object_efc_doughnut & object_zg * object_ik OK * object_vm * object_ei OK * object_ds OK * updated spec * map_48x85_static OK * object_zl1 & object_peehat ok * some z_parameter naming and other undefined symbol stuff, object_yukabyun OK * object_bubble & object_fw ok * object_shopnuts * restore delete file * object_timeblock OK * object_d_lift OK * object_kibako2 OK * object_mamenoki OK * matches * remove unused asm * object_mag ok now * fixed object_ani * done for now, im tired * object_bdan_objects fixed up * fix bdan * object_bombf fixed * object_bowl fixed up * object_cow fixed * did more, im tired * fixed some stuff in object_ddan_objects * fix object_ddan_object * object_door_gerudo fixed * object_ds fix * object_dy progress * fixed great fairy * some more * more * object_haka fix * progress * ingo_gate fixed * object_js * forgot collision * object_relay_objects fixed * object_kibako2 * object_mag fixed * u64* to void* * more u64* to void* * object_mamenoki fix * object_mastergolon & object_masterkokirihead fix * mido is weird * fixed build * fix object_menkuri_objects * add missing textures in object_menkuri_objects * object_ms * fixed object_peehat * some cleanup stuff * object_zg fix * object_spot00_break fix * object_niw fix * object_nwc fixed * object_ru2 object_rr and some of object_owl fix * object_spot15_obj fix * business scrub * object_spot01_matoya fixed * object_spot18_obj fix * object_spot01_objects fix * object_spot04_objects fix * object_spot04_objects actually fixed * object_spot12_obj fix * object_timeblock fix * object_spot06_objects fixed * object_spot08_obj fix * spot01_matoyab fix * object_trap fix * object_umajump fix * object_vm fix * z_en_niw_lady fix * object_yukabyun fix * object_zl1 fixed * added offsets to object_os_anime * object_md fix * object_ane fix * object_aob fix * add palette comment * object_spot00_objects fix * spot00 fix * remove unused asm * updates * Add TlutOffset to objects added in https://github.com/zeldaret/oot/pull/815 * Updated object_bdan_objects, ran format.sh * Change rgb5a1 to rgba16 in my object xmls * Addressed Anghelo's comments * review Co-authored-by: Lucas Shaw <lucas.shaw1123@gmail.com> Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-08-05 15:53:58 +00:00
include "build/assets/objects/object_spot12_obj/object_spot12_obj.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_bombiwa"
romalign 0x1000
Add every unreserved object in an automated way (#805) * it's crashing * fix stuff * fix xmls * problematic objects * fix tabs * Fix suffixes * add missing new lines * Add comments to the problematic objects * Find and replace fixes * Add Fig's objects * I forgot to add a Name in a cutscene, so I'm adding it here * Update object decomp tutorial a little bit * Update problematic objects * Update docs/tutorial/object_decomp.md Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Change comments * comment out a few blobs * dammit tluts * Change a bunch of objects * update the last bunch * update comments on oA11 and oB2 * Ninja-edit to fix compatibility with ZAPD's PR 142 Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-05-16 16:36:40 +00:00
include "build/assets/objects/object_bombiwa/object_bombiwa.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_hintnuts"
romalign 0x1000
Forest Stage and related actors and objects (#618) * starting out * match demo * full match * cleanup * more names * more names * headers * dist from link * docs * objects * format * organization of xmls * merge actor * Update src/overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * format Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain> Co-authored-by: Fig02 <fig02srl@gmail.com> Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2021-02-12 22:25:02 +00:00
include "build/assets/objects/object_hintnuts/object_hintnuts.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_rs"
romalign 0x1000
Add every unreserved object in an automated way (#805) * it's crashing * fix stuff * fix xmls * problematic objects * fix tabs * Fix suffixes * add missing new lines * Add comments to the problematic objects * Find and replace fixes * Add Fig's objects * I forgot to add a Name in a cutscene, so I'm adding it here * Update object decomp tutorial a little bit * Update problematic objects * Update docs/tutorial/object_decomp.md Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Change comments * comment out a few blobs * dammit tluts * Change a bunch of objects * update the last bunch * update comments on oA11 and oB2 * Ninja-edit to fix compatibility with ZAPD's PR 142 Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-05-16 16:36:40 +00:00
include "build/assets/objects/object_rs/object_rs.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_spot00_break"
romalign 0x1000
Decompiled A LOT of objects (#815) * . * remove tools/ZAP2 from origin master * object_spot04_objects * remove accidentally added xml * object_spot00_objects * object_bombf ok * object_dy_obj * object_masterzoora * object_mastergolon and object_masterkokirihead * object_aob * object_gt * object_gt * object_geff * object_mag kinda * object_gjyo_objects OK * object_ani OK * object_door_gerudo * object_md and object_trap * object_js OK * object_goroiwa * object_gs * object_nwc * object_niw * object_ane * object_os_anime OK * object_d_hsblock OK * object_fz OK * object_ru2 OK * fixed object_mag * object_cow OK * object_spot01_objects OK * object_spot15_obj * object_umajump OK * object_spot18_obj * object_spot12_obj * fix symbols in z_item_b_heart * object_bdan_objects & object_bowl * object_ddan_objects * object_owl OK * object_spot01_matoyab.xml OK * object_haka OK * object_heavy_object * object_ingate and objet_menkuri_objects * objet_spot00_break & object_relay_objects OK * object_spot01_matoya OK * object_spot06_objects OK * undefined_syms * object_spot08_obj OK * object_efc_doughnut & object_zg * object_ik OK * object_vm * object_ei OK * object_ds OK * updated spec * map_48x85_static OK * object_zl1 & object_peehat ok * some z_parameter naming and other undefined symbol stuff, object_yukabyun OK * object_bubble & object_fw ok * object_shopnuts * restore delete file * object_timeblock OK * object_d_lift OK * object_kibako2 OK * object_mamenoki OK * matches * remove unused asm * object_mag ok now * fixed object_ani * done for now, im tired * object_bdan_objects fixed up * fix bdan * object_bombf fixed * object_bowl fixed up * object_cow fixed * did more, im tired * fixed some stuff in object_ddan_objects * fix object_ddan_object * object_door_gerudo fixed * object_ds fix * object_dy progress * fixed great fairy * some more * more * object_haka fix * progress * ingo_gate fixed * object_js * forgot collision * object_relay_objects fixed * object_kibako2 * object_mag fixed * u64* to void* * more u64* to void* * object_mamenoki fix * object_mastergolon & object_masterkokirihead fix * mido is weird * fixed build * fix object_menkuri_objects * add missing textures in object_menkuri_objects * object_ms * fixed object_peehat * some cleanup stuff * object_zg fix * object_spot00_break fix * object_niw fix * object_nwc fixed * object_ru2 object_rr and some of object_owl fix * object_spot15_obj fix * business scrub * object_spot01_matoya fixed * object_spot18_obj fix * object_spot01_objects fix * object_spot04_objects fix * object_spot04_objects actually fixed * object_spot12_obj fix * object_timeblock fix * object_spot06_objects fixed * object_spot08_obj fix * spot01_matoyab fix * object_trap fix * object_umajump fix * object_vm fix * z_en_niw_lady fix * object_yukabyun fix * object_zl1 fixed * added offsets to object_os_anime * object_md fix * object_ane fix * object_aob fix * add palette comment * object_spot00_objects fix * spot00 fix * remove unused asm * updates * Add TlutOffset to objects added in https://github.com/zeldaret/oot/pull/815 * Updated object_bdan_objects, ran format.sh * Change rgb5a1 to rgba16 in my object xmls * Addressed Anghelo's comments * review Co-authored-by: Lucas Shaw <lucas.shaw1123@gmail.com> Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-08-05 15:53:58 +00:00
include "build/assets/objects/object_spot00_break/object_spot00_break.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_gla"
romalign 0x1000
Gerudo objects (#757) * object_ge1 * more stuff named * object_gla OK, symbols added to C * eff fire fix in gameplay_keep * object_nb OK, fixed gameplay_keep * replaced symbols in EnNb, limb enums * Change EnGeldB limb enums to hex * Use enum in header too * Add descriptions to EnGe2 and EnNb, rearrange xml * Reorder xml * review changes
2021-04-10 16:25:03 +00:00
include "build/assets/objects/object_gla/object_gla.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_shopnuts"
romalign 0x1000
Decompiled A LOT of objects (#815) * . * remove tools/ZAP2 from origin master * object_spot04_objects * remove accidentally added xml * object_spot00_objects * object_bombf ok * object_dy_obj * object_masterzoora * object_mastergolon and object_masterkokirihead * object_aob * object_gt * object_gt * object_geff * object_mag kinda * object_gjyo_objects OK * object_ani OK * object_door_gerudo * object_md and object_trap * object_js OK * object_goroiwa * object_gs * object_nwc * object_niw * object_ane * object_os_anime OK * object_d_hsblock OK * object_fz OK * object_ru2 OK * fixed object_mag * object_cow OK * object_spot01_objects OK * object_spot15_obj * object_umajump OK * object_spot18_obj * object_spot12_obj * fix symbols in z_item_b_heart * object_bdan_objects & object_bowl * object_ddan_objects * object_owl OK * object_spot01_matoyab.xml OK * object_haka OK * object_heavy_object * object_ingate and objet_menkuri_objects * objet_spot00_break & object_relay_objects OK * object_spot01_matoya OK * object_spot06_objects OK * undefined_syms * object_spot08_obj OK * object_efc_doughnut & object_zg * object_ik OK * object_vm * object_ei OK * object_ds OK * updated spec * map_48x85_static OK * object_zl1 & object_peehat ok * some z_parameter naming and other undefined symbol stuff, object_yukabyun OK * object_bubble & object_fw ok * object_shopnuts * restore delete file * object_timeblock OK * object_d_lift OK * object_kibako2 OK * object_mamenoki OK * matches * remove unused asm * object_mag ok now * fixed object_ani * done for now, im tired * object_bdan_objects fixed up * fix bdan * object_bombf fixed * object_bowl fixed up * object_cow fixed * did more, im tired * fixed some stuff in object_ddan_objects * fix object_ddan_object * object_door_gerudo fixed * object_ds fix * object_dy progress * fixed great fairy * some more * more * object_haka fix * progress * ingo_gate fixed * object_js * forgot collision * object_relay_objects fixed * object_kibako2 * object_mag fixed * u64* to void* * more u64* to void* * object_mamenoki fix * object_mastergolon & object_masterkokirihead fix * mido is weird * fixed build * fix object_menkuri_objects * add missing textures in object_menkuri_objects * object_ms * fixed object_peehat * some cleanup stuff * object_zg fix * object_spot00_break fix * object_niw fix * object_nwc fixed * object_ru2 object_rr and some of object_owl fix * object_spot15_obj fix * business scrub * object_spot01_matoya fixed * object_spot18_obj fix * object_spot01_objects fix * object_spot04_objects fix * object_spot04_objects actually fixed * object_spot12_obj fix * object_timeblock fix * object_spot06_objects fixed * object_spot08_obj fix * spot01_matoyab fix * object_trap fix * object_umajump fix * object_vm fix * z_en_niw_lady fix * object_yukabyun fix * object_zl1 fixed * added offsets to object_os_anime * object_md fix * object_ane fix * object_aob fix * add palette comment * object_spot00_objects fix * spot00 fix * remove unused asm * updates * Add TlutOffset to objects added in https://github.com/zeldaret/oot/pull/815 * Updated object_bdan_objects, ran format.sh * Change rgb5a1 to rgba16 in my object xmls * Addressed Anghelo's comments * review Co-authored-by: Lucas Shaw <lucas.shaw1123@gmail.com> Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-08-05 15:53:58 +00:00
include "build/assets/objects/object_shopnuts/object_shopnuts.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_geldb"
romalign 0x1000
object_torch2, object_blkobj, and object_geldb (#592) * objects are fun * more objects * again * fixes to geldb * one more thing * forgot s * type fix * some formatting * change Gerudo name * git subrepo pull --force tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "0305ec2c2" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "0305ec2c2" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * organize xmls * outname Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain> Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-01-30 19:16:18 +00:00
include "build/assets/objects/object_geldb/object_geldb.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_gr"
romalign 0x1000
Decompile a bunch of objects (#603) * Mostly done but shifted * still messed up * Almost OK * OBJECT_JYA_OBJ OK, OBJECT_GR OK * Done * Merge master and format * Cleanup * Cleanup 2 * Start object MB dont merge yet * Object_MB OK * Object_ydan_objects OK * General 'ydan' actor cleanup * Forgot some small things * Object_EC OK * add .gitkeep and run format * Object_sd OK but no textures cause of a zap issue * PR fixes * Fix object_sd * fix ydan * delete .gitkeep files * OBJECT_BOX as far as it can go with current ZAP * Fix undefined_syms * Start child link object * Push progress, dont merge yet * Object_mori_objects OK * Fixed? * Fix conflicts again * Seems like i missed some textures * Extract data for BgBombwall * More field * ZAP YEP 2.0 * Object_Box OK * Object_SD ok. Ready to merge * remove ASM and merge master * remove ASM * remove files wrongfully added to docs/ * Almost done * Change comment in z_player_lib.c * forgot some DLists in player_lib.c * Fix conflict, run format * Same as before but this time with Tex and TLUT * Last few things * fix object_GR and add limbs to object_sd * Nane -> Name * gChildDekuShieldMtx is now a matrix and not a blob * PR fixes (Fig) * add a space for comment in z_player_lib.c * re push and new lines * PR fixes (AngheloAlf) * PR fixes (Roman) * Fix Heishi2 * PR fixes (Fig) * Replace spacing in a file * PR fixes (Roman)
2021-05-26 22:59:21 +00:00
include "build/assets/objects/object_gr/object_gr.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_dog"
romalign 0x1000
Automatic objects 2 (#889) * adding missing objects * update rgba16 format * comment blobs * Fix blobs * add another missing one * add newlines to XMLs * remove objects from other PRs * add TlutOffset Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
2021-08-06 19:18:29 +00:00
include "build/assets/objects/object_dog/object_dog.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_jya_iron"
romalign 0x1000
z_bg_jya_ironobj and object_jya_iron OK (#676) * z_bg_jya_ironobj OK * decompile object_jya_iron, clean up code * implement requested changes
2021-02-14 00:10:40 +00:00
include "build/assets/objects/object_jya_iron/object_jya_iron.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_jya_door"
romalign 0x1000
"Decompile" more objects. (#784) * Object_hakach_objects OK and fix a warning in z_play.c * Object Warp1 OK * Object_spot16_obj OK * object_cs Skeleton and limbs OK * Limbs are broken * Limbs OK * Object_CS OK * Object_jya_door OK * fix errors and add new lines * PR fixes (AngheloAlf) * PR fixes (EllipticEllipsis) * PR fixes (Fig) * Rename Spot16 and Jya * GraveYard -> Graveyard * PR fixes * -s * PR fixes
2021-05-30 16:30:38 +00:00
include "build/assets/objects/object_jya_door/object_jya_door.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_spot01_objects2"
romalign 0x1000
Automatic objects 2 (#889) * adding missing objects * update rgba16 format * comment blobs * Fix blobs * add another missing one * add newlines to XMLs * remove objects from other PRs * add TlutOffset Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
2021-08-06 19:18:29 +00:00
include "build/assets/objects/object_spot01_objects2/object_spot01_objects2.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_spot11_obj"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/objects/object_spot11_obj/object_spot11_obj.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_kibako2"
romalign 0x1000
Decompiled A LOT of objects (#815) * . * remove tools/ZAP2 from origin master * object_spot04_objects * remove accidentally added xml * object_spot00_objects * object_bombf ok * object_dy_obj * object_masterzoora * object_mastergolon and object_masterkokirihead * object_aob * object_gt * object_gt * object_geff * object_mag kinda * object_gjyo_objects OK * object_ani OK * object_door_gerudo * object_md and object_trap * object_js OK * object_goroiwa * object_gs * object_nwc * object_niw * object_ane * object_os_anime OK * object_d_hsblock OK * object_fz OK * object_ru2 OK * fixed object_mag * object_cow OK * object_spot01_objects OK * object_spot15_obj * object_umajump OK * object_spot18_obj * object_spot12_obj * fix symbols in z_item_b_heart * object_bdan_objects & object_bowl * object_ddan_objects * object_owl OK * object_spot01_matoyab.xml OK * object_haka OK * object_heavy_object * object_ingate and objet_menkuri_objects * objet_spot00_break & object_relay_objects OK * object_spot01_matoya OK * object_spot06_objects OK * undefined_syms * object_spot08_obj OK * object_efc_doughnut & object_zg * object_ik OK * object_vm * object_ei OK * object_ds OK * updated spec * map_48x85_static OK * object_zl1 & object_peehat ok * some z_parameter naming and other undefined symbol stuff, object_yukabyun OK * object_bubble & object_fw ok * object_shopnuts * restore delete file * object_timeblock OK * object_d_lift OK * object_kibako2 OK * object_mamenoki OK * matches * remove unused asm * object_mag ok now * fixed object_ani * done for now, im tired * object_bdan_objects fixed up * fix bdan * object_bombf fixed * object_bowl fixed up * object_cow fixed * did more, im tired * fixed some stuff in object_ddan_objects * fix object_ddan_object * object_door_gerudo fixed * object_ds fix * object_dy progress * fixed great fairy * some more * more * object_haka fix * progress * ingo_gate fixed * object_js * forgot collision * object_relay_objects fixed * object_kibako2 * object_mag fixed * u64* to void* * more u64* to void* * object_mamenoki fix * object_mastergolon & object_masterkokirihead fix * mido is weird * fixed build * fix object_menkuri_objects * add missing textures in object_menkuri_objects * object_ms * fixed object_peehat * some cleanup stuff * object_zg fix * object_spot00_break fix * object_niw fix * object_nwc fixed * object_ru2 object_rr and some of object_owl fix * object_spot15_obj fix * business scrub * object_spot01_matoya fixed * object_spot18_obj fix * object_spot01_objects fix * object_spot04_objects fix * object_spot04_objects actually fixed * object_spot12_obj fix * object_timeblock fix * object_spot06_objects fixed * object_spot08_obj fix * spot01_matoyab fix * object_trap fix * object_umajump fix * object_vm fix * z_en_niw_lady fix * object_yukabyun fix * object_zl1 fixed * added offsets to object_os_anime * object_md fix * object_ane fix * object_aob fix * add palette comment * object_spot00_objects fix * spot00 fix * remove unused asm * updates * Add TlutOffset to objects added in https://github.com/zeldaret/oot/pull/815 * Updated object_bdan_objects, ran format.sh * Change rgb5a1 to rgba16 in my object xmls * Addressed Anghelo's comments * review Co-authored-by: Lucas Shaw <lucas.shaw1123@gmail.com> Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-08-05 15:53:58 +00:00
include "build/assets/objects/object_kibako2/object_kibako2.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_dns"
romalign 0x1000
Forest Stage and related actors and objects (#618) * starting out * match demo * full match * cleanup * more names * more names * headers * dist from link * docs * objects * format * organization of xmls * merge actor * Update src/overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * format Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain> Co-authored-by: Fig02 <fig02srl@gmail.com> Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2021-02-12 22:25:02 +00:00
include "build/assets/objects/object_dns/object_dns.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_dnk"
romalign 0x1000
Forest Stage and related actors and objects (#618) * starting out * match demo * full match * cleanup * more names * more names * headers * dist from link * docs * objects * format * organization of xmls * merge actor * Update src/overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * format Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain> Co-authored-by: Fig02 <fig02srl@gmail.com> Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2021-02-12 22:25:02 +00:00
include "build/assets/objects/object_dnk/object_dnk.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_gi_fire"
romalign 0x1000
All* Get Item objects decompiled (#668) * All get item objects OK * Name z_draw functions * fix skulltula tokens draw ids * Review suggestions, merge extract_single_asset into extract_assets as an optional argument Co-authored-by: Thar0 <maximilianc64@gmail.com>
2021-02-12 21:57:06 +00:00
include "build/assets/objects/object_gi_fire/object_gi_fire.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_gi_insect"
romalign 0x1000
All* Get Item objects decompiled (#668) * All get item objects OK * Name z_draw functions * fix skulltula tokens draw ids * Review suggestions, merge extract_single_asset into extract_assets as an optional argument Co-authored-by: Thar0 <maximilianc64@gmail.com>
2021-02-12 21:57:06 +00:00
include "build/assets/objects/object_gi_insect/object_gi_insect.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_gi_butterfly"
romalign 0x1000
All* Get Item objects decompiled (#668) * All get item objects OK * Name z_draw functions * fix skulltula tokens draw ids * Review suggestions, merge extract_single_asset into extract_assets as an optional argument Co-authored-by: Thar0 <maximilianc64@gmail.com>
2021-02-12 21:57:06 +00:00
include "build/assets/objects/object_gi_butterfly/object_gi_butterfly.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_gi_ghost"
romalign 0x1000
All* Get Item objects decompiled (#668) * All get item objects OK * Name z_draw functions * fix skulltula tokens draw ids * Review suggestions, merge extract_single_asset into extract_assets as an optional argument Co-authored-by: Thar0 <maximilianc64@gmail.com>
2021-02-12 21:57:06 +00:00
include "build/assets/objects/object_gi_ghost/object_gi_ghost.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_gi_soul"
romalign 0x1000
All* Get Item objects decompiled (#668) * All get item objects OK * Name z_draw functions * fix skulltula tokens draw ids * Review suggestions, merge extract_single_asset into extract_assets as an optional argument Co-authored-by: Thar0 <maximilianc64@gmail.com>
2021-02-12 21:57:06 +00:00
include "build/assets/objects/object_gi_soul/object_gi_soul.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_bowl"
romalign 0x1000
Decompiled A LOT of objects (#815) * . * remove tools/ZAP2 from origin master * object_spot04_objects * remove accidentally added xml * object_spot00_objects * object_bombf ok * object_dy_obj * object_masterzoora * object_mastergolon and object_masterkokirihead * object_aob * object_gt * object_gt * object_geff * object_mag kinda * object_gjyo_objects OK * object_ani OK * object_door_gerudo * object_md and object_trap * object_js OK * object_goroiwa * object_gs * object_nwc * object_niw * object_ane * object_os_anime OK * object_d_hsblock OK * object_fz OK * object_ru2 OK * fixed object_mag * object_cow OK * object_spot01_objects OK * object_spot15_obj * object_umajump OK * object_spot18_obj * object_spot12_obj * fix symbols in z_item_b_heart * object_bdan_objects & object_bowl * object_ddan_objects * object_owl OK * object_spot01_matoyab.xml OK * object_haka OK * object_heavy_object * object_ingate and objet_menkuri_objects * objet_spot00_break & object_relay_objects OK * object_spot01_matoya OK * object_spot06_objects OK * undefined_syms * object_spot08_obj OK * object_efc_doughnut & object_zg * object_ik OK * object_vm * object_ei OK * object_ds OK * updated spec * map_48x85_static OK * object_zl1 & object_peehat ok * some z_parameter naming and other undefined symbol stuff, object_yukabyun OK * object_bubble & object_fw ok * object_shopnuts * restore delete file * object_timeblock OK * object_d_lift OK * object_kibako2 OK * object_mamenoki OK * matches * remove unused asm * object_mag ok now * fixed object_ani * done for now, im tired * object_bdan_objects fixed up * fix bdan * object_bombf fixed * object_bowl fixed up * object_cow fixed * did more, im tired * fixed some stuff in object_ddan_objects * fix object_ddan_object * object_door_gerudo fixed * object_ds fix * object_dy progress * fixed great fairy * some more * more * object_haka fix * progress * ingo_gate fixed * object_js * forgot collision * object_relay_objects fixed * object_kibako2 * object_mag fixed * u64* to void* * more u64* to void* * object_mamenoki fix * object_mastergolon & object_masterkokirihead fix * mido is weird * fixed build * fix object_menkuri_objects * add missing textures in object_menkuri_objects * object_ms * fixed object_peehat * some cleanup stuff * object_zg fix * object_spot00_break fix * object_niw fix * object_nwc fixed * object_ru2 object_rr and some of object_owl fix * object_spot15_obj fix * business scrub * object_spot01_matoya fixed * object_spot18_obj fix * object_spot01_objects fix * object_spot04_objects fix * object_spot04_objects actually fixed * object_spot12_obj fix * object_timeblock fix * object_spot06_objects fixed * object_spot08_obj fix * spot01_matoyab fix * object_trap fix * object_umajump fix * object_vm fix * z_en_niw_lady fix * object_yukabyun fix * object_zl1 fixed * added offsets to object_os_anime * object_md fix * object_ane fix * object_aob fix * add palette comment * object_spot00_objects fix * spot00 fix * remove unused asm * updates * Add TlutOffset to objects added in https://github.com/zeldaret/oot/pull/815 * Updated object_bdan_objects, ran format.sh * Change rgb5a1 to rgba16 in my object xmls * Addressed Anghelo's comments * review Co-authored-by: Lucas Shaw <lucas.shaw1123@gmail.com> Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-08-05 15:53:58 +00:00
include "build/assets/objects/object_bowl/object_bowl.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_po_field"
romalign 0x1000
Poe Objects (#743) * poe objects * Last unaccounted resolved, name suffix fixes * remove _tex * missed 2 * format Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-04-04 21:48:12 +00:00
include "build/assets/objects/object_po_field/object_po_field.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_demo_kekkai"
romalign 0x1000
Demo_Kekkai, its object, and its cutscenes (#627) * first pass * scene * object * name * git subrepo pull --force tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "44f5d7cb9" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "44f5d7cb9" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * now with cutscenes * one last name * git subrepo pull --force tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "0305ec2c2" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "0305ec2c2" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * ZAPD works * git subrepo pull --force tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "2e1174063" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "2e1174063" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * now with vtx arrays * revert zap changes * review Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain> Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-02-01 19:52:23 +00:00
include "build/assets/objects/object_demo_kekkai/object_demo_kekkai.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_efc_doughnut"
romalign 0x1000
Decompiled A LOT of objects (#815) * . * remove tools/ZAP2 from origin master * object_spot04_objects * remove accidentally added xml * object_spot00_objects * object_bombf ok * object_dy_obj * object_masterzoora * object_mastergolon and object_masterkokirihead * object_aob * object_gt * object_gt * object_geff * object_mag kinda * object_gjyo_objects OK * object_ani OK * object_door_gerudo * object_md and object_trap * object_js OK * object_goroiwa * object_gs * object_nwc * object_niw * object_ane * object_os_anime OK * object_d_hsblock OK * object_fz OK * object_ru2 OK * fixed object_mag * object_cow OK * object_spot01_objects OK * object_spot15_obj * object_umajump OK * object_spot18_obj * object_spot12_obj * fix symbols in z_item_b_heart * object_bdan_objects & object_bowl * object_ddan_objects * object_owl OK * object_spot01_matoyab.xml OK * object_haka OK * object_heavy_object * object_ingate and objet_menkuri_objects * objet_spot00_break & object_relay_objects OK * object_spot01_matoya OK * object_spot06_objects OK * undefined_syms * object_spot08_obj OK * object_efc_doughnut & object_zg * object_ik OK * object_vm * object_ei OK * object_ds OK * updated spec * map_48x85_static OK * object_zl1 & object_peehat ok * some z_parameter naming and other undefined symbol stuff, object_yukabyun OK * object_bubble & object_fw ok * object_shopnuts * restore delete file * object_timeblock OK * object_d_lift OK * object_kibako2 OK * object_mamenoki OK * matches * remove unused asm * object_mag ok now * fixed object_ani * done for now, im tired * object_bdan_objects fixed up * fix bdan * object_bombf fixed * object_bowl fixed up * object_cow fixed * did more, im tired * fixed some stuff in object_ddan_objects * fix object_ddan_object * object_door_gerudo fixed * object_ds fix * object_dy progress * fixed great fairy * some more * more * object_haka fix * progress * ingo_gate fixed * object_js * forgot collision * object_relay_objects fixed * object_kibako2 * object_mag fixed * u64* to void* * more u64* to void* * object_mamenoki fix * object_mastergolon & object_masterkokirihead fix * mido is weird * fixed build * fix object_menkuri_objects * add missing textures in object_menkuri_objects * object_ms * fixed object_peehat * some cleanup stuff * object_zg fix * object_spot00_break fix * object_niw fix * object_nwc fixed * object_ru2 object_rr and some of object_owl fix * object_spot15_obj fix * business scrub * object_spot01_matoya fixed * object_spot18_obj fix * object_spot01_objects fix * object_spot04_objects fix * object_spot04_objects actually fixed * object_spot12_obj fix * object_timeblock fix * object_spot06_objects fixed * object_spot08_obj fix * spot01_matoyab fix * object_trap fix * object_umajump fix * object_vm fix * z_en_niw_lady fix * object_yukabyun fix * object_zl1 fixed * added offsets to object_os_anime * object_md fix * object_ane fix * object_aob fix * add palette comment * object_spot00_objects fix * spot00 fix * remove unused asm * updates * Add TlutOffset to objects added in https://github.com/zeldaret/oot/pull/815 * Updated object_bdan_objects, ran format.sh * Change rgb5a1 to rgba16 in my object xmls * Addressed Anghelo's comments * review Co-authored-by: Lucas Shaw <lucas.shaw1123@gmail.com> Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-08-05 15:53:58 +00:00
include "build/assets/objects/object_efc_doughnut/object_efc_doughnut.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_gi_dekupouch"
romalign 0x1000
All* Get Item objects decompiled (#668) * All get item objects OK * Name z_draw functions * fix skulltula tokens draw ids * Review suggestions, merge extract_single_asset into extract_assets as an optional argument Co-authored-by: Thar0 <maximilianc64@gmail.com>
2021-02-12 21:57:06 +00:00
include "build/assets/objects/object_gi_dekupouch/object_gi_dekupouch.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_ganon_anime1"
romalign 0x1000
Add every unreserved object in an automated way (#805) * it's crashing * fix stuff * fix xmls * problematic objects * fix tabs * Fix suffixes * add missing new lines * Add comments to the problematic objects * Find and replace fixes * Add Fig's objects * I forgot to add a Name in a cutscene, so I'm adding it here * Update object decomp tutorial a little bit * Update problematic objects * Update docs/tutorial/object_decomp.md Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Change comments * comment out a few blobs * dammit tluts * Change a bunch of objects * update the last bunch * update comments on oA11 and oB2 * Ninja-edit to fix compatibility with ZAPD's PR 142 Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-05-16 16:36:40 +00:00
include "build/assets/objects/object_ganon_anime1/object_ganon_anime1.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_ganon_anime2"
romalign 0x1000
Add every unreserved object in an automated way (#805) * it's crashing * fix stuff * fix xmls * problematic objects * fix tabs * Fix suffixes * add missing new lines * Add comments to the problematic objects * Find and replace fixes * Add Fig's objects * I forgot to add a Name in a cutscene, so I'm adding it here * Update object decomp tutorial a little bit * Update problematic objects * Update docs/tutorial/object_decomp.md Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Change comments * comment out a few blobs * dammit tluts * Change a bunch of objects * update the last bunch * update comments on oA11 and oB2 * Ninja-edit to fix compatibility with ZAPD's PR 142 Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-05-16 16:36:40 +00:00
include "build/assets/objects/object_ganon_anime2/object_ganon_anime2.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_ganon_anime3"
romalign 0x1000
Add every unreserved object in an automated way (#805) * it's crashing * fix stuff * fix xmls * problematic objects * fix tabs * Fix suffixes * add missing new lines * Add comments to the problematic objects * Find and replace fixes * Add Fig's objects * I forgot to add a Name in a cutscene, so I'm adding it here * Update object decomp tutorial a little bit * Update problematic objects * Update docs/tutorial/object_decomp.md Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Change comments * comment out a few blobs * dammit tluts * Change a bunch of objects * update the last bunch * update comments on oA11 and oB2 * Ninja-edit to fix compatibility with ZAPD's PR 142 Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-05-16 16:36:40 +00:00
include "build/assets/objects/object_ganon_anime3/object_ganon_anime3.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_gi_rupy"
romalign 0x1000
All* Get Item objects decompiled (#668) * All get item objects OK * Name z_draw functions * fix skulltula tokens draw ids * Review suggestions, merge extract_single_asset into extract_assets as an optional argument Co-authored-by: Thar0 <maximilianc64@gmail.com>
2021-02-12 21:57:06 +00:00
include "build/assets/objects/object_gi_rupy/object_gi_rupy.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_spot01_matoya"
romalign 0x1000
Decompiled A LOT of objects (#815) * . * remove tools/ZAP2 from origin master * object_spot04_objects * remove accidentally added xml * object_spot00_objects * object_bombf ok * object_dy_obj * object_masterzoora * object_mastergolon and object_masterkokirihead * object_aob * object_gt * object_gt * object_geff * object_mag kinda * object_gjyo_objects OK * object_ani OK * object_door_gerudo * object_md and object_trap * object_js OK * object_goroiwa * object_gs * object_nwc * object_niw * object_ane * object_os_anime OK * object_d_hsblock OK * object_fz OK * object_ru2 OK * fixed object_mag * object_cow OK * object_spot01_objects OK * object_spot15_obj * object_umajump OK * object_spot18_obj * object_spot12_obj * fix symbols in z_item_b_heart * object_bdan_objects & object_bowl * object_ddan_objects * object_owl OK * object_spot01_matoyab.xml OK * object_haka OK * object_heavy_object * object_ingate and objet_menkuri_objects * objet_spot00_break & object_relay_objects OK * object_spot01_matoya OK * object_spot06_objects OK * undefined_syms * object_spot08_obj OK * object_efc_doughnut & object_zg * object_ik OK * object_vm * object_ei OK * object_ds OK * updated spec * map_48x85_static OK * object_zl1 & object_peehat ok * some z_parameter naming and other undefined symbol stuff, object_yukabyun OK * object_bubble & object_fw ok * object_shopnuts * restore delete file * object_timeblock OK * object_d_lift OK * object_kibako2 OK * object_mamenoki OK * matches * remove unused asm * object_mag ok now * fixed object_ani * done for now, im tired * object_bdan_objects fixed up * fix bdan * object_bombf fixed * object_bowl fixed up * object_cow fixed * did more, im tired * fixed some stuff in object_ddan_objects * fix object_ddan_object * object_door_gerudo fixed * object_ds fix * object_dy progress * fixed great fairy * some more * more * object_haka fix * progress * ingo_gate fixed * object_js * forgot collision * object_relay_objects fixed * object_kibako2 * object_mag fixed * u64* to void* * more u64* to void* * object_mamenoki fix * object_mastergolon & object_masterkokirihead fix * mido is weird * fixed build * fix object_menkuri_objects * add missing textures in object_menkuri_objects * object_ms * fixed object_peehat * some cleanup stuff * object_zg fix * object_spot00_break fix * object_niw fix * object_nwc fixed * object_ru2 object_rr and some of object_owl fix * object_spot15_obj fix * business scrub * object_spot01_matoya fixed * object_spot18_obj fix * object_spot01_objects fix * object_spot04_objects fix * object_spot04_objects actually fixed * object_spot12_obj fix * object_timeblock fix * object_spot06_objects fixed * object_spot08_obj fix * spot01_matoyab fix * object_trap fix * object_umajump fix * object_vm fix * z_en_niw_lady fix * object_yukabyun fix * object_zl1 fixed * added offsets to object_os_anime * object_md fix * object_ane fix * object_aob fix * add palette comment * object_spot00_objects fix * spot00 fix * remove unused asm * updates * Add TlutOffset to objects added in https://github.com/zeldaret/oot/pull/815 * Updated object_bdan_objects, ran format.sh * Change rgb5a1 to rgba16 in my object xmls * Addressed Anghelo's comments * review Co-authored-by: Lucas Shaw <lucas.shaw1123@gmail.com> Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-08-05 15:53:58 +00:00
include "build/assets/objects/object_spot01_matoya/object_spot01_matoya.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_spot01_matoyab"
romalign 0x1000
Decompiled A LOT of objects (#815) * . * remove tools/ZAP2 from origin master * object_spot04_objects * remove accidentally added xml * object_spot00_objects * object_bombf ok * object_dy_obj * object_masterzoora * object_mastergolon and object_masterkokirihead * object_aob * object_gt * object_gt * object_geff * object_mag kinda * object_gjyo_objects OK * object_ani OK * object_door_gerudo * object_md and object_trap * object_js OK * object_goroiwa * object_gs * object_nwc * object_niw * object_ane * object_os_anime OK * object_d_hsblock OK * object_fz OK * object_ru2 OK * fixed object_mag * object_cow OK * object_spot01_objects OK * object_spot15_obj * object_umajump OK * object_spot18_obj * object_spot12_obj * fix symbols in z_item_b_heart * object_bdan_objects & object_bowl * object_ddan_objects * object_owl OK * object_spot01_matoyab.xml OK * object_haka OK * object_heavy_object * object_ingate and objet_menkuri_objects * objet_spot00_break & object_relay_objects OK * object_spot01_matoya OK * object_spot06_objects OK * undefined_syms * object_spot08_obj OK * object_efc_doughnut & object_zg * object_ik OK * object_vm * object_ei OK * object_ds OK * updated spec * map_48x85_static OK * object_zl1 & object_peehat ok * some z_parameter naming and other undefined symbol stuff, object_yukabyun OK * object_bubble & object_fw ok * object_shopnuts * restore delete file * object_timeblock OK * object_d_lift OK * object_kibako2 OK * object_mamenoki OK * matches * remove unused asm * object_mag ok now * fixed object_ani * done for now, im tired * object_bdan_objects fixed up * fix bdan * object_bombf fixed * object_bowl fixed up * object_cow fixed * did more, im tired * fixed some stuff in object_ddan_objects * fix object_ddan_object * object_door_gerudo fixed * object_ds fix * object_dy progress * fixed great fairy * some more * more * object_haka fix * progress * ingo_gate fixed * object_js * forgot collision * object_relay_objects fixed * object_kibako2 * object_mag fixed * u64* to void* * more u64* to void* * object_mamenoki fix * object_mastergolon & object_masterkokirihead fix * mido is weird * fixed build * fix object_menkuri_objects * add missing textures in object_menkuri_objects * object_ms * fixed object_peehat * some cleanup stuff * object_zg fix * object_spot00_break fix * object_niw fix * object_nwc fixed * object_ru2 object_rr and some of object_owl fix * object_spot15_obj fix * business scrub * object_spot01_matoya fixed * object_spot18_obj fix * object_spot01_objects fix * object_spot04_objects fix * object_spot04_objects actually fixed * object_spot12_obj fix * object_timeblock fix * object_spot06_objects fixed * object_spot08_obj fix * spot01_matoyab fix * object_trap fix * object_umajump fix * object_vm fix * z_en_niw_lady fix * object_yukabyun fix * object_zl1 fixed * added offsets to object_os_anime * object_md fix * object_ane fix * object_aob fix * add palette comment * object_spot00_objects fix * spot00 fix * remove unused asm * updates * Add TlutOffset to objects added in https://github.com/zeldaret/oot/pull/815 * Updated object_bdan_objects, ran format.sh * Change rgb5a1 to rgba16 in my object xmls * Addressed Anghelo's comments * review Co-authored-by: Lucas Shaw <lucas.shaw1123@gmail.com> Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-08-05 15:53:58 +00:00
include "build/assets/objects/object_spot01_matoyab/object_spot01_matoyab.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_po_composer"
romalign 0x1000
Poe Objects (#743) * poe objects * Last unaccounted resolved, name suffix fixes * remove _tex * missed 2 * format Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-04-04 21:48:12 +00:00
include "build/assets/objects/object_po_composer/object_po_composer.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_mu"
romalign 0x1000
Add every unreserved object in an automated way (#805) * it's crashing * fix stuff * fix xmls * problematic objects * fix tabs * Fix suffixes * add missing new lines * Add comments to the problematic objects * Find and replace fixes * Add Fig's objects * I forgot to add a Name in a cutscene, so I'm adding it here * Update object decomp tutorial a little bit * Update problematic objects * Update docs/tutorial/object_decomp.md Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Change comments * comment out a few blobs * dammit tluts * Change a bunch of objects * update the last bunch * update comments on oA11 and oB2 * Ninja-edit to fix compatibility with ZAPD's PR 142 Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-05-16 16:36:40 +00:00
include "build/assets/objects/object_mu/object_mu.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_wf"
romalign 0x1000
Add every unreserved object in an automated way (#805) * it's crashing * fix stuff * fix xmls * problematic objects * fix tabs * Fix suffixes * add missing new lines * Add comments to the problematic objects * Find and replace fixes * Add Fig's objects * I forgot to add a Name in a cutscene, so I'm adding it here * Update object decomp tutorial a little bit * Update problematic objects * Update docs/tutorial/object_decomp.md Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Change comments * comment out a few blobs * dammit tluts * Change a bunch of objects * update the last bunch * update comments on oA11 and oB2 * Ninja-edit to fix compatibility with ZAPD's PR 142 Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-05-16 16:36:40 +00:00
include "build/assets/objects/object_wf/object_wf.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_skb"
romalign 0x1000
finished object_skb (#790) * finished object_skb * neglected the limbs and dlists, so I added them * adding the textures * fixing some names * ....forgot to change the c file.... * hopefully fixed formatting issue
2021-05-01 00:31:49 +00:00
include "build/assets/objects/object_skb/object_skb.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_gj"
romalign 0x1000
object_gj OK (#698) * xml Signed-off-by: Anghelo <angheloalf95@gmail.com> * add spec Signed-off-by: angie <angheloalf95@gmail.com> * replace all hardcoded pointers in demo_gj Signed-off-by: angie <angheloalf95@gmail.com> * add the rest of the unaccounted data as a blob Signed-off-by: angie <angheloalf95@gmail.com> * i forgot to erase a undefined_sym Signed-off-by: angie <angheloalf95@gmail.com> * name everything in object_gj Signed-off-by: angie <angheloalf95@gmail.com> * Categorize by how are ussed each rubble Signed-off-by: Angie <angheloalf95@gmail.com> * forgot to erase the externs Signed-off-by: angie <angheloalf95@gmail.com> * the cool laser meme is ded Signed-off-by: angie <angheloalf95@gmail.com> * delete gitkeep Signed-off-by: angie <angheloalf95@gmail.com>
2021-03-17 21:53:05 +00:00
include "build/assets/objects/object_gj/object_gj.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_geff"
romalign 0x1000
Decompiled A LOT of objects (#815) * . * remove tools/ZAP2 from origin master * object_spot04_objects * remove accidentally added xml * object_spot00_objects * object_bombf ok * object_dy_obj * object_masterzoora * object_mastergolon and object_masterkokirihead * object_aob * object_gt * object_gt * object_geff * object_mag kinda * object_gjyo_objects OK * object_ani OK * object_door_gerudo * object_md and object_trap * object_js OK * object_goroiwa * object_gs * object_nwc * object_niw * object_ane * object_os_anime OK * object_d_hsblock OK * object_fz OK * object_ru2 OK * fixed object_mag * object_cow OK * object_spot01_objects OK * object_spot15_obj * object_umajump OK * object_spot18_obj * object_spot12_obj * fix symbols in z_item_b_heart * object_bdan_objects & object_bowl * object_ddan_objects * object_owl OK * object_spot01_matoyab.xml OK * object_haka OK * object_heavy_object * object_ingate and objet_menkuri_objects * objet_spot00_break & object_relay_objects OK * object_spot01_matoya OK * object_spot06_objects OK * undefined_syms * object_spot08_obj OK * object_efc_doughnut & object_zg * object_ik OK * object_vm * object_ei OK * object_ds OK * updated spec * map_48x85_static OK * object_zl1 & object_peehat ok * some z_parameter naming and other undefined symbol stuff, object_yukabyun OK * object_bubble & object_fw ok * object_shopnuts * restore delete file * object_timeblock OK * object_d_lift OK * object_kibako2 OK * object_mamenoki OK * matches * remove unused asm * object_mag ok now * fixed object_ani * done for now, im tired * object_bdan_objects fixed up * fix bdan * object_bombf fixed * object_bowl fixed up * object_cow fixed * did more, im tired * fixed some stuff in object_ddan_objects * fix object_ddan_object * object_door_gerudo fixed * object_ds fix * object_dy progress * fixed great fairy * some more * more * object_haka fix * progress * ingo_gate fixed * object_js * forgot collision * object_relay_objects fixed * object_kibako2 * object_mag fixed * u64* to void* * more u64* to void* * object_mamenoki fix * object_mastergolon & object_masterkokirihead fix * mido is weird * fixed build * fix object_menkuri_objects * add missing textures in object_menkuri_objects * object_ms * fixed object_peehat * some cleanup stuff * object_zg fix * object_spot00_break fix * object_niw fix * object_nwc fixed * object_ru2 object_rr and some of object_owl fix * object_spot15_obj fix * business scrub * object_spot01_matoya fixed * object_spot18_obj fix * object_spot01_objects fix * object_spot04_objects fix * object_spot04_objects actually fixed * object_spot12_obj fix * object_timeblock fix * object_spot06_objects fixed * object_spot08_obj fix * spot01_matoyab fix * object_trap fix * object_umajump fix * object_vm fix * z_en_niw_lady fix * object_yukabyun fix * object_zl1 fixed * added offsets to object_os_anime * object_md fix * object_ane fix * object_aob fix * add palette comment * object_spot00_objects fix * spot00 fix * remove unused asm * updates * Add TlutOffset to objects added in https://github.com/zeldaret/oot/pull/815 * Updated object_bdan_objects, ran format.sh * Change rgb5a1 to rgba16 in my object xmls * Addressed Anghelo's comments * review Co-authored-by: Lucas Shaw <lucas.shaw1123@gmail.com> Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-08-05 15:53:58 +00:00
include "build/assets/objects/object_geff/object_geff.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_haka_door"
romalign 0x1000
Add every unreserved object in an automated way (#805) * it's crashing * fix stuff * fix xmls * problematic objects * fix tabs * Fix suffixes * add missing new lines * Add comments to the problematic objects * Find and replace fixes * Add Fig's objects * I forgot to add a Name in a cutscene, so I'm adding it here * Update object decomp tutorial a little bit * Update problematic objects * Update docs/tutorial/object_decomp.md Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Change comments * comment out a few blobs * dammit tluts * Change a bunch of objects * update the last bunch * update comments on oA11 and oB2 * Ninja-edit to fix compatibility with ZAPD's PR 142 Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-05-16 16:36:40 +00:00
include "build/assets/objects/object_haka_door/object_haka_door.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_gs"
romalign 0x1000
Decompiled A LOT of objects (#815) * . * remove tools/ZAP2 from origin master * object_spot04_objects * remove accidentally added xml * object_spot00_objects * object_bombf ok * object_dy_obj * object_masterzoora * object_mastergolon and object_masterkokirihead * object_aob * object_gt * object_gt * object_geff * object_mag kinda * object_gjyo_objects OK * object_ani OK * object_door_gerudo * object_md and object_trap * object_js OK * object_goroiwa * object_gs * object_nwc * object_niw * object_ane * object_os_anime OK * object_d_hsblock OK * object_fz OK * object_ru2 OK * fixed object_mag * object_cow OK * object_spot01_objects OK * object_spot15_obj * object_umajump OK * object_spot18_obj * object_spot12_obj * fix symbols in z_item_b_heart * object_bdan_objects & object_bowl * object_ddan_objects * object_owl OK * object_spot01_matoyab.xml OK * object_haka OK * object_heavy_object * object_ingate and objet_menkuri_objects * objet_spot00_break & object_relay_objects OK * object_spot01_matoya OK * object_spot06_objects OK * undefined_syms * object_spot08_obj OK * object_efc_doughnut & object_zg * object_ik OK * object_vm * object_ei OK * object_ds OK * updated spec * map_48x85_static OK * object_zl1 & object_peehat ok * some z_parameter naming and other undefined symbol stuff, object_yukabyun OK * object_bubble & object_fw ok * object_shopnuts * restore delete file * object_timeblock OK * object_d_lift OK * object_kibako2 OK * object_mamenoki OK * matches * remove unused asm * object_mag ok now * fixed object_ani * done for now, im tired * object_bdan_objects fixed up * fix bdan * object_bombf fixed * object_bowl fixed up * object_cow fixed * did more, im tired * fixed some stuff in object_ddan_objects * fix object_ddan_object * object_door_gerudo fixed * object_ds fix * object_dy progress * fixed great fairy * some more * more * object_haka fix * progress * ingo_gate fixed * object_js * forgot collision * object_relay_objects fixed * object_kibako2 * object_mag fixed * u64* to void* * more u64* to void* * object_mamenoki fix * object_mastergolon & object_masterkokirihead fix * mido is weird * fixed build * fix object_menkuri_objects * add missing textures in object_menkuri_objects * object_ms * fixed object_peehat * some cleanup stuff * object_zg fix * object_spot00_break fix * object_niw fix * object_nwc fixed * object_ru2 object_rr and some of object_owl fix * object_spot15_obj fix * business scrub * object_spot01_matoya fixed * object_spot18_obj fix * object_spot01_objects fix * object_spot04_objects fix * object_spot04_objects actually fixed * object_spot12_obj fix * object_timeblock fix * object_spot06_objects fixed * object_spot08_obj fix * spot01_matoyab fix * object_trap fix * object_umajump fix * object_vm fix * z_en_niw_lady fix * object_yukabyun fix * object_zl1 fixed * added offsets to object_os_anime * object_md fix * object_ane fix * object_aob fix * add palette comment * object_spot00_objects fix * spot00 fix * remove unused asm * updates * Add TlutOffset to objects added in https://github.com/zeldaret/oot/pull/815 * Updated object_bdan_objects, ran format.sh * Change rgb5a1 to rgba16 in my object xmls * Addressed Anghelo's comments * review Co-authored-by: Lucas Shaw <lucas.shaw1123@gmail.com> Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-08-05 15:53:58 +00:00
include "build/assets/objects/object_gs/object_gs.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_ps"
romalign 0x1000
Poe Objects (#743) * poe objects * Last unaccounted resolved, name suffix fixes * remove _tex * missed 2 * format Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-04-04 21:48:12 +00:00
include "build/assets/objects/object_ps/object_ps.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_bwall"
romalign 0x1000
Add every unreserved object in an automated way (#805) * it's crashing * fix stuff * fix xmls * problematic objects * fix tabs * Fix suffixes * add missing new lines * Add comments to the problematic objects * Find and replace fixes * Add Fig's objects * I forgot to add a Name in a cutscene, so I'm adding it here * Update object decomp tutorial a little bit * Update problematic objects * Update docs/tutorial/object_decomp.md Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Change comments * comment out a few blobs * dammit tluts * Change a bunch of objects * update the last bunch * update comments on oA11 and oB2 * Ninja-edit to fix compatibility with ZAPD's PR 142 Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-05-16 16:36:40 +00:00
include "build/assets/objects/object_bwall/object_bwall.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_crow"
romalign 0x1000
Various objects (#677) * object_okuta * object_crow * object_wallmaster * named wallmaster textures * object_dodongo * object_firefly * object_fire
2021-03-17 21:06:56 +00:00
include "build/assets/objects/object_crow/object_crow.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_cow"
romalign 0x1000
Decompiled A LOT of objects (#815) * . * remove tools/ZAP2 from origin master * object_spot04_objects * remove accidentally added xml * object_spot00_objects * object_bombf ok * object_dy_obj * object_masterzoora * object_mastergolon and object_masterkokirihead * object_aob * object_gt * object_gt * object_geff * object_mag kinda * object_gjyo_objects OK * object_ani OK * object_door_gerudo * object_md and object_trap * object_js OK * object_goroiwa * object_gs * object_nwc * object_niw * object_ane * object_os_anime OK * object_d_hsblock OK * object_fz OK * object_ru2 OK * fixed object_mag * object_cow OK * object_spot01_objects OK * object_spot15_obj * object_umajump OK * object_spot18_obj * object_spot12_obj * fix symbols in z_item_b_heart * object_bdan_objects & object_bowl * object_ddan_objects * object_owl OK * object_spot01_matoyab.xml OK * object_haka OK * object_heavy_object * object_ingate and objet_menkuri_objects * objet_spot00_break & object_relay_objects OK * object_spot01_matoya OK * object_spot06_objects OK * undefined_syms * object_spot08_obj OK * object_efc_doughnut & object_zg * object_ik OK * object_vm * object_ei OK * object_ds OK * updated spec * map_48x85_static OK * object_zl1 & object_peehat ok * some z_parameter naming and other undefined symbol stuff, object_yukabyun OK * object_bubble & object_fw ok * object_shopnuts * restore delete file * object_timeblock OK * object_d_lift OK * object_kibako2 OK * object_mamenoki OK * matches * remove unused asm * object_mag ok now * fixed object_ani * done for now, im tired * object_bdan_objects fixed up * fix bdan * object_bombf fixed * object_bowl fixed up * object_cow fixed * did more, im tired * fixed some stuff in object_ddan_objects * fix object_ddan_object * object_door_gerudo fixed * object_ds fix * object_dy progress * fixed great fairy * some more * more * object_haka fix * progress * ingo_gate fixed * object_js * forgot collision * object_relay_objects fixed * object_kibako2 * object_mag fixed * u64* to void* * more u64* to void* * object_mamenoki fix * object_mastergolon & object_masterkokirihead fix * mido is weird * fixed build * fix object_menkuri_objects * add missing textures in object_menkuri_objects * object_ms * fixed object_peehat * some cleanup stuff * object_zg fix * object_spot00_break fix * object_niw fix * object_nwc fixed * object_ru2 object_rr and some of object_owl fix * object_spot15_obj fix * business scrub * object_spot01_matoya fixed * object_spot18_obj fix * object_spot01_objects fix * object_spot04_objects fix * object_spot04_objects actually fixed * object_spot12_obj fix * object_timeblock fix * object_spot06_objects fixed * object_spot08_obj fix * spot01_matoyab fix * object_trap fix * object_umajump fix * object_vm fix * z_en_niw_lady fix * object_yukabyun fix * object_zl1 fixed * added offsets to object_os_anime * object_md fix * object_ane fix * object_aob fix * add palette comment * object_spot00_objects fix * spot00 fix * remove unused asm * updates * Add TlutOffset to objects added in https://github.com/zeldaret/oot/pull/815 * Updated object_bdan_objects, ran format.sh * Change rgb5a1 to rgba16 in my object xmls * Addressed Anghelo's comments * review Co-authored-by: Lucas Shaw <lucas.shaw1123@gmail.com> Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-08-05 15:53:58 +00:00
include "build/assets/objects/object_cow/object_cow.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_cob"
romalign 0x1000
Add every unreserved object in an automated way (#805) * it's crashing * fix stuff * fix xmls * problematic objects * fix tabs * Fix suffixes * add missing new lines * Add comments to the problematic objects * Find and replace fixes * Add Fig's objects * I forgot to add a Name in a cutscene, so I'm adding it here * Update object decomp tutorial a little bit * Update problematic objects * Update docs/tutorial/object_decomp.md Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Change comments * comment out a few blobs * dammit tluts * Change a bunch of objects * update the last bunch * update comments on oA11 and oB2 * Ninja-edit to fix compatibility with ZAPD's PR 142 Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-05-16 16:36:40 +00:00
include "build/assets/objects/object_cob/object_cob.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_gi_sword_1"
romalign 0x1000
All* Get Item objects decompiled (#668) * All get item objects OK * Name z_draw functions * fix skulltula tokens draw ids * Review suggestions, merge extract_single_asset into extract_assets as an optional argument Co-authored-by: Thar0 <maximilianc64@gmail.com>
2021-02-12 21:57:06 +00:00
include "build/assets/objects/object_gi_sword_1/object_gi_sword_1.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_door_killer"
romalign 0x1000
Add every unreserved object in an automated way (#805) * it's crashing * fix stuff * fix xmls * problematic objects * fix tabs * Fix suffixes * add missing new lines * Add comments to the problematic objects * Find and replace fixes * Add Fig's objects * I forgot to add a Name in a cutscene, so I'm adding it here * Update object decomp tutorial a little bit * Update problematic objects * Update docs/tutorial/object_decomp.md Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Change comments * comment out a few blobs * dammit tluts * Change a bunch of objects * update the last bunch * update comments on oA11 and oB2 * Ninja-edit to fix compatibility with ZAPD's PR 142 Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-05-16 16:36:40 +00:00
include "build/assets/objects/object_door_killer/object_door_killer.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_ouke_haka"
romalign 0x1000
Add every unreserved object in an automated way (#805) * it's crashing * fix stuff * fix xmls * problematic objects * fix tabs * Fix suffixes * add missing new lines * Add comments to the problematic objects * Find and replace fixes * Add Fig's objects * I forgot to add a Name in a cutscene, so I'm adding it here * Update object decomp tutorial a little bit * Update problematic objects * Update docs/tutorial/object_decomp.md Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Change comments * comment out a few blobs * dammit tluts * Change a bunch of objects * update the last bunch * update comments on oA11 and oB2 * Ninja-edit to fix compatibility with ZAPD's PR 142 Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-05-16 16:36:40 +00:00
include "build/assets/objects/object_ouke_haka/object_ouke_haka.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_timeblock"
romalign 0x1000
Decompiled A LOT of objects (#815) * . * remove tools/ZAP2 from origin master * object_spot04_objects * remove accidentally added xml * object_spot00_objects * object_bombf ok * object_dy_obj * object_masterzoora * object_mastergolon and object_masterkokirihead * object_aob * object_gt * object_gt * object_geff * object_mag kinda * object_gjyo_objects OK * object_ani OK * object_door_gerudo * object_md and object_trap * object_js OK * object_goroiwa * object_gs * object_nwc * object_niw * object_ane * object_os_anime OK * object_d_hsblock OK * object_fz OK * object_ru2 OK * fixed object_mag * object_cow OK * object_spot01_objects OK * object_spot15_obj * object_umajump OK * object_spot18_obj * object_spot12_obj * fix symbols in z_item_b_heart * object_bdan_objects & object_bowl * object_ddan_objects * object_owl OK * object_spot01_matoyab.xml OK * object_haka OK * object_heavy_object * object_ingate and objet_menkuri_objects * objet_spot00_break & object_relay_objects OK * object_spot01_matoya OK * object_spot06_objects OK * undefined_syms * object_spot08_obj OK * object_efc_doughnut & object_zg * object_ik OK * object_vm * object_ei OK * object_ds OK * updated spec * map_48x85_static OK * object_zl1 & object_peehat ok * some z_parameter naming and other undefined symbol stuff, object_yukabyun OK * object_bubble & object_fw ok * object_shopnuts * restore delete file * object_timeblock OK * object_d_lift OK * object_kibako2 OK * object_mamenoki OK * matches * remove unused asm * object_mag ok now * fixed object_ani * done for now, im tired * object_bdan_objects fixed up * fix bdan * object_bombf fixed * object_bowl fixed up * object_cow fixed * did more, im tired * fixed some stuff in object_ddan_objects * fix object_ddan_object * object_door_gerudo fixed * object_ds fix * object_dy progress * fixed great fairy * some more * more * object_haka fix * progress * ingo_gate fixed * object_js * forgot collision * object_relay_objects fixed * object_kibako2 * object_mag fixed * u64* to void* * more u64* to void* * object_mamenoki fix * object_mastergolon & object_masterkokirihead fix * mido is weird * fixed build * fix object_menkuri_objects * add missing textures in object_menkuri_objects * object_ms * fixed object_peehat * some cleanup stuff * object_zg fix * object_spot00_break fix * object_niw fix * object_nwc fixed * object_ru2 object_rr and some of object_owl fix * object_spot15_obj fix * business scrub * object_spot01_matoya fixed * object_spot18_obj fix * object_spot01_objects fix * object_spot04_objects fix * object_spot04_objects actually fixed * object_spot12_obj fix * object_timeblock fix * object_spot06_objects fixed * object_spot08_obj fix * spot01_matoyab fix * object_trap fix * object_umajump fix * object_vm fix * z_en_niw_lady fix * object_yukabyun fix * object_zl1 fixed * added offsets to object_os_anime * object_md fix * object_ane fix * object_aob fix * add palette comment * object_spot00_objects fix * spot00 fix * remove unused asm * updates * Add TlutOffset to objects added in https://github.com/zeldaret/oot/pull/815 * Updated object_bdan_objects, ran format.sh * Change rgb5a1 to rgba16 in my object xmls * Addressed Anghelo's comments * review Co-authored-by: Lucas Shaw <lucas.shaw1123@gmail.com> Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-08-05 15:53:58 +00:00
include "build/assets/objects/object_timeblock/object_timeblock.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "object_zl4"
romalign 0x1000
En_Zl4 (#590) * significant progress * cutscene data * match * docs * dist from link * compiler warnings * cutscene and such * object decomp * stuff * cleanup * name some things * stuff * cutscenes fixed * git subrepo pull --force tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "44f5d7cb9" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "44f5d7cb9" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * git subrepo pull --force tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "0305ec2c2" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "0305ec2c2" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * reorder * unused content * documented cutscene dlists * enviewer update * Update src/overlays/actors/ovl_En_Zl4/z_en_zl4.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Zl4/z_en_zl4.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * formatter Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain> Co-authored-by: Fig02 <fig02srl@gmail.com> Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2021-02-12 22:16:40 +00:00
include "build/assets/objects/object_zl4/object_zl4.o"
number 6
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "g_pn_01"
romalign 0x1000
Extract all "place name" title cards (#858) * Forest and shadow temple * fire temple * Water temple * Spirit temple * Deku tree * jabu jabu * DC * Inside Ganons castle * GTG * Castle courtyard * great fairy's fountain * chamber of sages * shooting gallery * Temple of time * market * back alley * kokir shop * goron shop * zora shop * House of skulltula * bazarr * potion shop * gravekeepers hut * lakeside lab * hyrule field * kak * graveyard * zoras river * kokiri forest * lake hylia * zoras domain * zoras fountain * gerudo valley * lost woods * the rest of them * cleanup * final cleanup * PR fixes (Zel) * (Re) fix case * segment 0 * Fix map name static conflict * Comment about ZAPD * number 0 * Update place_title_cards.xml * Update spec
2021-07-04 22:20:08 +00:00
include "build/assets/textures/place_title_cards/g_pn_01.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "g_pn_02"
romalign 0x1000
Extract all "place name" title cards (#858) * Forest and shadow temple * fire temple * Water temple * Spirit temple * Deku tree * jabu jabu * DC * Inside Ganons castle * GTG * Castle courtyard * great fairy's fountain * chamber of sages * shooting gallery * Temple of time * market * back alley * kokir shop * goron shop * zora shop * House of skulltula * bazarr * potion shop * gravekeepers hut * lakeside lab * hyrule field * kak * graveyard * zoras river * kokiri forest * lake hylia * zoras domain * zoras fountain * gerudo valley * lost woods * the rest of them * cleanup * final cleanup * PR fixes (Zel) * (Re) fix case * segment 0 * Fix map name static conflict * Comment about ZAPD * number 0 * Update place_title_cards.xml * Update spec
2021-07-04 22:20:08 +00:00
include "build/assets/textures/place_title_cards/g_pn_02.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "g_pn_03"
romalign 0x1000
Extract all "place name" title cards (#858) * Forest and shadow temple * fire temple * Water temple * Spirit temple * Deku tree * jabu jabu * DC * Inside Ganons castle * GTG * Castle courtyard * great fairy's fountain * chamber of sages * shooting gallery * Temple of time * market * back alley * kokir shop * goron shop * zora shop * House of skulltula * bazarr * potion shop * gravekeepers hut * lakeside lab * hyrule field * kak * graveyard * zoras river * kokiri forest * lake hylia * zoras domain * zoras fountain * gerudo valley * lost woods * the rest of them * cleanup * final cleanup * PR fixes (Zel) * (Re) fix case * segment 0 * Fix map name static conflict * Comment about ZAPD * number 0 * Update place_title_cards.xml * Update spec
2021-07-04 22:20:08 +00:00
include "build/assets/textures/place_title_cards/g_pn_03.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "g_pn_04"
romalign 0x1000
Extract all "place name" title cards (#858) * Forest and shadow temple * fire temple * Water temple * Spirit temple * Deku tree * jabu jabu * DC * Inside Ganons castle * GTG * Castle courtyard * great fairy's fountain * chamber of sages * shooting gallery * Temple of time * market * back alley * kokir shop * goron shop * zora shop * House of skulltula * bazarr * potion shop * gravekeepers hut * lakeside lab * hyrule field * kak * graveyard * zoras river * kokiri forest * lake hylia * zoras domain * zoras fountain * gerudo valley * lost woods * the rest of them * cleanup * final cleanup * PR fixes (Zel) * (Re) fix case * segment 0 * Fix map name static conflict * Comment about ZAPD * number 0 * Update place_title_cards.xml * Update spec
2021-07-04 22:20:08 +00:00
include "build/assets/textures/place_title_cards/g_pn_04.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "g_pn_05"
romalign 0x1000
Extract all "place name" title cards (#858) * Forest and shadow temple * fire temple * Water temple * Spirit temple * Deku tree * jabu jabu * DC * Inside Ganons castle * GTG * Castle courtyard * great fairy's fountain * chamber of sages * shooting gallery * Temple of time * market * back alley * kokir shop * goron shop * zora shop * House of skulltula * bazarr * potion shop * gravekeepers hut * lakeside lab * hyrule field * kak * graveyard * zoras river * kokiri forest * lake hylia * zoras domain * zoras fountain * gerudo valley * lost woods * the rest of them * cleanup * final cleanup * PR fixes (Zel) * (Re) fix case * segment 0 * Fix map name static conflict * Comment about ZAPD * number 0 * Update place_title_cards.xml * Update spec
2021-07-04 22:20:08 +00:00
include "build/assets/textures/place_title_cards/g_pn_05.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "g_pn_06"
romalign 0x1000
Extract all "place name" title cards (#858) * Forest and shadow temple * fire temple * Water temple * Spirit temple * Deku tree * jabu jabu * DC * Inside Ganons castle * GTG * Castle courtyard * great fairy's fountain * chamber of sages * shooting gallery * Temple of time * market * back alley * kokir shop * goron shop * zora shop * House of skulltula * bazarr * potion shop * gravekeepers hut * lakeside lab * hyrule field * kak * graveyard * zoras river * kokiri forest * lake hylia * zoras domain * zoras fountain * gerudo valley * lost woods * the rest of them * cleanup * final cleanup * PR fixes (Zel) * (Re) fix case * segment 0 * Fix map name static conflict * Comment about ZAPD * number 0 * Update place_title_cards.xml * Update spec
2021-07-04 22:20:08 +00:00
include "build/assets/textures/place_title_cards/g_pn_06.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "g_pn_07"
romalign 0x1000
Extract all "place name" title cards (#858) * Forest and shadow temple * fire temple * Water temple * Spirit temple * Deku tree * jabu jabu * DC * Inside Ganons castle * GTG * Castle courtyard * great fairy's fountain * chamber of sages * shooting gallery * Temple of time * market * back alley * kokir shop * goron shop * zora shop * House of skulltula * bazarr * potion shop * gravekeepers hut * lakeside lab * hyrule field * kak * graveyard * zoras river * kokiri forest * lake hylia * zoras domain * zoras fountain * gerudo valley * lost woods * the rest of them * cleanup * final cleanup * PR fixes (Zel) * (Re) fix case * segment 0 * Fix map name static conflict * Comment about ZAPD * number 0 * Update place_title_cards.xml * Update spec
2021-07-04 22:20:08 +00:00
include "build/assets/textures/place_title_cards/g_pn_07.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "g_pn_08"
romalign 0x1000
Extract all "place name" title cards (#858) * Forest and shadow temple * fire temple * Water temple * Spirit temple * Deku tree * jabu jabu * DC * Inside Ganons castle * GTG * Castle courtyard * great fairy's fountain * chamber of sages * shooting gallery * Temple of time * market * back alley * kokir shop * goron shop * zora shop * House of skulltula * bazarr * potion shop * gravekeepers hut * lakeside lab * hyrule field * kak * graveyard * zoras river * kokiri forest * lake hylia * zoras domain * zoras fountain * gerudo valley * lost woods * the rest of them * cleanup * final cleanup * PR fixes (Zel) * (Re) fix case * segment 0 * Fix map name static conflict * Comment about ZAPD * number 0 * Update place_title_cards.xml * Update spec
2021-07-04 22:20:08 +00:00
include "build/assets/textures/place_title_cards/g_pn_08.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "g_pn_09"
romalign 0x1000
Extract all "place name" title cards (#858) * Forest and shadow temple * fire temple * Water temple * Spirit temple * Deku tree * jabu jabu * DC * Inside Ganons castle * GTG * Castle courtyard * great fairy's fountain * chamber of sages * shooting gallery * Temple of time * market * back alley * kokir shop * goron shop * zora shop * House of skulltula * bazarr * potion shop * gravekeepers hut * lakeside lab * hyrule field * kak * graveyard * zoras river * kokiri forest * lake hylia * zoras domain * zoras fountain * gerudo valley * lost woods * the rest of them * cleanup * final cleanup * PR fixes (Zel) * (Re) fix case * segment 0 * Fix map name static conflict * Comment about ZAPD * number 0 * Update place_title_cards.xml * Update spec
2021-07-04 22:20:08 +00:00
include "build/assets/textures/place_title_cards/g_pn_09.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "g_pn_10"
romalign 0x1000
Extract all "place name" title cards (#858) * Forest and shadow temple * fire temple * Water temple * Spirit temple * Deku tree * jabu jabu * DC * Inside Ganons castle * GTG * Castle courtyard * great fairy's fountain * chamber of sages * shooting gallery * Temple of time * market * back alley * kokir shop * goron shop * zora shop * House of skulltula * bazarr * potion shop * gravekeepers hut * lakeside lab * hyrule field * kak * graveyard * zoras river * kokiri forest * lake hylia * zoras domain * zoras fountain * gerudo valley * lost woods * the rest of them * cleanup * final cleanup * PR fixes (Zel) * (Re) fix case * segment 0 * Fix map name static conflict * Comment about ZAPD * number 0 * Update place_title_cards.xml * Update spec
2021-07-04 22:20:08 +00:00
include "build/assets/textures/place_title_cards/g_pn_10.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "g_pn_11"
romalign 0x1000
Extract all "place name" title cards (#858) * Forest and shadow temple * fire temple * Water temple * Spirit temple * Deku tree * jabu jabu * DC * Inside Ganons castle * GTG * Castle courtyard * great fairy's fountain * chamber of sages * shooting gallery * Temple of time * market * back alley * kokir shop * goron shop * zora shop * House of skulltula * bazarr * potion shop * gravekeepers hut * lakeside lab * hyrule field * kak * graveyard * zoras river * kokiri forest * lake hylia * zoras domain * zoras fountain * gerudo valley * lost woods * the rest of them * cleanup * final cleanup * PR fixes (Zel) * (Re) fix case * segment 0 * Fix map name static conflict * Comment about ZAPD * number 0 * Update place_title_cards.xml * Update spec
2021-07-04 22:20:08 +00:00
include "build/assets/textures/place_title_cards/g_pn_11.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "g_pn_12"
romalign 0x1000
Extract all "place name" title cards (#858) * Forest and shadow temple * fire temple * Water temple * Spirit temple * Deku tree * jabu jabu * DC * Inside Ganons castle * GTG * Castle courtyard * great fairy's fountain * chamber of sages * shooting gallery * Temple of time * market * back alley * kokir shop * goron shop * zora shop * House of skulltula * bazarr * potion shop * gravekeepers hut * lakeside lab * hyrule field * kak * graveyard * zoras river * kokiri forest * lake hylia * zoras domain * zoras fountain * gerudo valley * lost woods * the rest of them * cleanup * final cleanup * PR fixes (Zel) * (Re) fix case * segment 0 * Fix map name static conflict * Comment about ZAPD * number 0 * Update place_title_cards.xml * Update spec
2021-07-04 22:20:08 +00:00
include "build/assets/textures/place_title_cards/g_pn_12.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "g_pn_13"
romalign 0x1000
Extract all "place name" title cards (#858) * Forest and shadow temple * fire temple * Water temple * Spirit temple * Deku tree * jabu jabu * DC * Inside Ganons castle * GTG * Castle courtyard * great fairy's fountain * chamber of sages * shooting gallery * Temple of time * market * back alley * kokir shop * goron shop * zora shop * House of skulltula * bazarr * potion shop * gravekeepers hut * lakeside lab * hyrule field * kak * graveyard * zoras river * kokiri forest * lake hylia * zoras domain * zoras fountain * gerudo valley * lost woods * the rest of them * cleanup * final cleanup * PR fixes (Zel) * (Re) fix case * segment 0 * Fix map name static conflict * Comment about ZAPD * number 0 * Update place_title_cards.xml * Update spec
2021-07-04 22:20:08 +00:00
include "build/assets/textures/place_title_cards/g_pn_13.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "g_pn_14"
romalign 0x1000
Extract all "place name" title cards (#858) * Forest and shadow temple * fire temple * Water temple * Spirit temple * Deku tree * jabu jabu * DC * Inside Ganons castle * GTG * Castle courtyard * great fairy's fountain * chamber of sages * shooting gallery * Temple of time * market * back alley * kokir shop * goron shop * zora shop * House of skulltula * bazarr * potion shop * gravekeepers hut * lakeside lab * hyrule field * kak * graveyard * zoras river * kokiri forest * lake hylia * zoras domain * zoras fountain * gerudo valley * lost woods * the rest of them * cleanup * final cleanup * PR fixes (Zel) * (Re) fix case * segment 0 * Fix map name static conflict * Comment about ZAPD * number 0 * Update place_title_cards.xml * Update spec
2021-07-04 22:20:08 +00:00
include "build/assets/textures/place_title_cards/g_pn_14.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "g_pn_15"
romalign 0x1000
Extract all "place name" title cards (#858) * Forest and shadow temple * fire temple * Water temple * Spirit temple * Deku tree * jabu jabu * DC * Inside Ganons castle * GTG * Castle courtyard * great fairy's fountain * chamber of sages * shooting gallery * Temple of time * market * back alley * kokir shop * goron shop * zora shop * House of skulltula * bazarr * potion shop * gravekeepers hut * lakeside lab * hyrule field * kak * graveyard * zoras river * kokiri forest * lake hylia * zoras domain * zoras fountain * gerudo valley * lost woods * the rest of them * cleanup * final cleanup * PR fixes (Zel) * (Re) fix case * segment 0 * Fix map name static conflict * Comment about ZAPD * number 0 * Update place_title_cards.xml * Update spec
2021-07-04 22:20:08 +00:00
include "build/assets/textures/place_title_cards/g_pn_15.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "g_pn_16"
romalign 0x1000
Extract all "place name" title cards (#858) * Forest and shadow temple * fire temple * Water temple * Spirit temple * Deku tree * jabu jabu * DC * Inside Ganons castle * GTG * Castle courtyard * great fairy's fountain * chamber of sages * shooting gallery * Temple of time * market * back alley * kokir shop * goron shop * zora shop * House of skulltula * bazarr * potion shop * gravekeepers hut * lakeside lab * hyrule field * kak * graveyard * zoras river * kokiri forest * lake hylia * zoras domain * zoras fountain * gerudo valley * lost woods * the rest of them * cleanup * final cleanup * PR fixes (Zel) * (Re) fix case * segment 0 * Fix map name static conflict * Comment about ZAPD * number 0 * Update place_title_cards.xml * Update spec
2021-07-04 22:20:08 +00:00
include "build/assets/textures/place_title_cards/g_pn_16.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "g_pn_17"
romalign 0x1000
Extract all "place name" title cards (#858) * Forest and shadow temple * fire temple * Water temple * Spirit temple * Deku tree * jabu jabu * DC * Inside Ganons castle * GTG * Castle courtyard * great fairy's fountain * chamber of sages * shooting gallery * Temple of time * market * back alley * kokir shop * goron shop * zora shop * House of skulltula * bazarr * potion shop * gravekeepers hut * lakeside lab * hyrule field * kak * graveyard * zoras river * kokiri forest * lake hylia * zoras domain * zoras fountain * gerudo valley * lost woods * the rest of them * cleanup * final cleanup * PR fixes (Zel) * (Re) fix case * segment 0 * Fix map name static conflict * Comment about ZAPD * number 0 * Update place_title_cards.xml * Update spec
2021-07-04 22:20:08 +00:00
include "build/assets/textures/place_title_cards/g_pn_17.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "g_pn_18"
romalign 0x1000
Extract all "place name" title cards (#858) * Forest and shadow temple * fire temple * Water temple * Spirit temple * Deku tree * jabu jabu * DC * Inside Ganons castle * GTG * Castle courtyard * great fairy's fountain * chamber of sages * shooting gallery * Temple of time * market * back alley * kokir shop * goron shop * zora shop * House of skulltula * bazarr * potion shop * gravekeepers hut * lakeside lab * hyrule field * kak * graveyard * zoras river * kokiri forest * lake hylia * zoras domain * zoras fountain * gerudo valley * lost woods * the rest of them * cleanup * final cleanup * PR fixes (Zel) * (Re) fix case * segment 0 * Fix map name static conflict * Comment about ZAPD * number 0 * Update place_title_cards.xml * Update spec
2021-07-04 22:20:08 +00:00
include "build/assets/textures/place_title_cards/g_pn_18.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "g_pn_19"
romalign 0x1000
Extract all "place name" title cards (#858) * Forest and shadow temple * fire temple * Water temple * Spirit temple * Deku tree * jabu jabu * DC * Inside Ganons castle * GTG * Castle courtyard * great fairy's fountain * chamber of sages * shooting gallery * Temple of time * market * back alley * kokir shop * goron shop * zora shop * House of skulltula * bazarr * potion shop * gravekeepers hut * lakeside lab * hyrule field * kak * graveyard * zoras river * kokiri forest * lake hylia * zoras domain * zoras fountain * gerudo valley * lost woods * the rest of them * cleanup * final cleanup * PR fixes (Zel) * (Re) fix case * segment 0 * Fix map name static conflict * Comment about ZAPD * number 0 * Update place_title_cards.xml * Update spec
2021-07-04 22:20:08 +00:00
include "build/assets/textures/place_title_cards/g_pn_19.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "g_pn_20"
romalign 0x1000
Extract all "place name" title cards (#858) * Forest and shadow temple * fire temple * Water temple * Spirit temple * Deku tree * jabu jabu * DC * Inside Ganons castle * GTG * Castle courtyard * great fairy's fountain * chamber of sages * shooting gallery * Temple of time * market * back alley * kokir shop * goron shop * zora shop * House of skulltula * bazarr * potion shop * gravekeepers hut * lakeside lab * hyrule field * kak * graveyard * zoras river * kokiri forest * lake hylia * zoras domain * zoras fountain * gerudo valley * lost woods * the rest of them * cleanup * final cleanup * PR fixes (Zel) * (Re) fix case * segment 0 * Fix map name static conflict * Comment about ZAPD * number 0 * Update place_title_cards.xml * Update spec
2021-07-04 22:20:08 +00:00
include "build/assets/textures/place_title_cards/g_pn_20.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "g_pn_21"
romalign 0x1000
Extract all "place name" title cards (#858) * Forest and shadow temple * fire temple * Water temple * Spirit temple * Deku tree * jabu jabu * DC * Inside Ganons castle * GTG * Castle courtyard * great fairy's fountain * chamber of sages * shooting gallery * Temple of time * market * back alley * kokir shop * goron shop * zora shop * House of skulltula * bazarr * potion shop * gravekeepers hut * lakeside lab * hyrule field * kak * graveyard * zoras river * kokiri forest * lake hylia * zoras domain * zoras fountain * gerudo valley * lost woods * the rest of them * cleanup * final cleanup * PR fixes (Zel) * (Re) fix case * segment 0 * Fix map name static conflict * Comment about ZAPD * number 0 * Update place_title_cards.xml * Update spec
2021-07-04 22:20:08 +00:00
include "build/assets/textures/place_title_cards/g_pn_21.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "g_pn_22"
romalign 0x1000
Extract all "place name" title cards (#858) * Forest and shadow temple * fire temple * Water temple * Spirit temple * Deku tree * jabu jabu * DC * Inside Ganons castle * GTG * Castle courtyard * great fairy's fountain * chamber of sages * shooting gallery * Temple of time * market * back alley * kokir shop * goron shop * zora shop * House of skulltula * bazarr * potion shop * gravekeepers hut * lakeside lab * hyrule field * kak * graveyard * zoras river * kokiri forest * lake hylia * zoras domain * zoras fountain * gerudo valley * lost woods * the rest of them * cleanup * final cleanup * PR fixes (Zel) * (Re) fix case * segment 0 * Fix map name static conflict * Comment about ZAPD * number 0 * Update place_title_cards.xml * Update spec
2021-07-04 22:20:08 +00:00
include "build/assets/textures/place_title_cards/g_pn_22.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "g_pn_23"
romalign 0x1000
Extract all "place name" title cards (#858) * Forest and shadow temple * fire temple * Water temple * Spirit temple * Deku tree * jabu jabu * DC * Inside Ganons castle * GTG * Castle courtyard * great fairy's fountain * chamber of sages * shooting gallery * Temple of time * market * back alley * kokir shop * goron shop * zora shop * House of skulltula * bazarr * potion shop * gravekeepers hut * lakeside lab * hyrule field * kak * graveyard * zoras river * kokiri forest * lake hylia * zoras domain * zoras fountain * gerudo valley * lost woods * the rest of them * cleanup * final cleanup * PR fixes (Zel) * (Re) fix case * segment 0 * Fix map name static conflict * Comment about ZAPD * number 0 * Update place_title_cards.xml * Update spec
2021-07-04 22:20:08 +00:00
include "build/assets/textures/place_title_cards/g_pn_23.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "g_pn_24"
romalign 0x1000
Extract all "place name" title cards (#858) * Forest and shadow temple * fire temple * Water temple * Spirit temple * Deku tree * jabu jabu * DC * Inside Ganons castle * GTG * Castle courtyard * great fairy's fountain * chamber of sages * shooting gallery * Temple of time * market * back alley * kokir shop * goron shop * zora shop * House of skulltula * bazarr * potion shop * gravekeepers hut * lakeside lab * hyrule field * kak * graveyard * zoras river * kokiri forest * lake hylia * zoras domain * zoras fountain * gerudo valley * lost woods * the rest of them * cleanup * final cleanup * PR fixes (Zel) * (Re) fix case * segment 0 * Fix map name static conflict * Comment about ZAPD * number 0 * Update place_title_cards.xml * Update spec
2021-07-04 22:20:08 +00:00
include "build/assets/textures/place_title_cards/g_pn_24.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "g_pn_25"
romalign 0x1000
Extract all "place name" title cards (#858) * Forest and shadow temple * fire temple * Water temple * Spirit temple * Deku tree * jabu jabu * DC * Inside Ganons castle * GTG * Castle courtyard * great fairy's fountain * chamber of sages * shooting gallery * Temple of time * market * back alley * kokir shop * goron shop * zora shop * House of skulltula * bazarr * potion shop * gravekeepers hut * lakeside lab * hyrule field * kak * graveyard * zoras river * kokiri forest * lake hylia * zoras domain * zoras fountain * gerudo valley * lost woods * the rest of them * cleanup * final cleanup * PR fixes (Zel) * (Re) fix case * segment 0 * Fix map name static conflict * Comment about ZAPD * number 0 * Update place_title_cards.xml * Update spec
2021-07-04 22:20:08 +00:00
include "build/assets/textures/place_title_cards/g_pn_25.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "g_pn_26"
romalign 0x1000
Extract all "place name" title cards (#858) * Forest and shadow temple * fire temple * Water temple * Spirit temple * Deku tree * jabu jabu * DC * Inside Ganons castle * GTG * Castle courtyard * great fairy's fountain * chamber of sages * shooting gallery * Temple of time * market * back alley * kokir shop * goron shop * zora shop * House of skulltula * bazarr * potion shop * gravekeepers hut * lakeside lab * hyrule field * kak * graveyard * zoras river * kokiri forest * lake hylia * zoras domain * zoras fountain * gerudo valley * lost woods * the rest of them * cleanup * final cleanup * PR fixes (Zel) * (Re) fix case * segment 0 * Fix map name static conflict * Comment about ZAPD * number 0 * Update place_title_cards.xml * Update spec
2021-07-04 22:20:08 +00:00
include "build/assets/textures/place_title_cards/g_pn_26.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "g_pn_27"
romalign 0x1000
Extract all "place name" title cards (#858) * Forest and shadow temple * fire temple * Water temple * Spirit temple * Deku tree * jabu jabu * DC * Inside Ganons castle * GTG * Castle courtyard * great fairy's fountain * chamber of sages * shooting gallery * Temple of time * market * back alley * kokir shop * goron shop * zora shop * House of skulltula * bazarr * potion shop * gravekeepers hut * lakeside lab * hyrule field * kak * graveyard * zoras river * kokiri forest * lake hylia * zoras domain * zoras fountain * gerudo valley * lost woods * the rest of them * cleanup * final cleanup * PR fixes (Zel) * (Re) fix case * segment 0 * Fix map name static conflict * Comment about ZAPD * number 0 * Update place_title_cards.xml * Update spec
2021-07-04 22:20:08 +00:00
include "build/assets/textures/place_title_cards/g_pn_27.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "g_pn_28"
romalign 0x1000
Extract all "place name" title cards (#858) * Forest and shadow temple * fire temple * Water temple * Spirit temple * Deku tree * jabu jabu * DC * Inside Ganons castle * GTG * Castle courtyard * great fairy's fountain * chamber of sages * shooting gallery * Temple of time * market * back alley * kokir shop * goron shop * zora shop * House of skulltula * bazarr * potion shop * gravekeepers hut * lakeside lab * hyrule field * kak * graveyard * zoras river * kokiri forest * lake hylia * zoras domain * zoras fountain * gerudo valley * lost woods * the rest of them * cleanup * final cleanup * PR fixes (Zel) * (Re) fix case * segment 0 * Fix map name static conflict * Comment about ZAPD * number 0 * Update place_title_cards.xml * Update spec
2021-07-04 22:20:08 +00:00
include "build/assets/textures/place_title_cards/g_pn_28.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "g_pn_29"
romalign 0x1000
Extract all "place name" title cards (#858) * Forest and shadow temple * fire temple * Water temple * Spirit temple * Deku tree * jabu jabu * DC * Inside Ganons castle * GTG * Castle courtyard * great fairy's fountain * chamber of sages * shooting gallery * Temple of time * market * back alley * kokir shop * goron shop * zora shop * House of skulltula * bazarr * potion shop * gravekeepers hut * lakeside lab * hyrule field * kak * graveyard * zoras river * kokiri forest * lake hylia * zoras domain * zoras fountain * gerudo valley * lost woods * the rest of them * cleanup * final cleanup * PR fixes (Zel) * (Re) fix case * segment 0 * Fix map name static conflict * Comment about ZAPD * number 0 * Update place_title_cards.xml * Update spec
2021-07-04 22:20:08 +00:00
include "build/assets/textures/place_title_cards/g_pn_29.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "g_pn_30"
romalign 0x1000
Extract all "place name" title cards (#858) * Forest and shadow temple * fire temple * Water temple * Spirit temple * Deku tree * jabu jabu * DC * Inside Ganons castle * GTG * Castle courtyard * great fairy's fountain * chamber of sages * shooting gallery * Temple of time * market * back alley * kokir shop * goron shop * zora shop * House of skulltula * bazarr * potion shop * gravekeepers hut * lakeside lab * hyrule field * kak * graveyard * zoras river * kokiri forest * lake hylia * zoras domain * zoras fountain * gerudo valley * lost woods * the rest of them * cleanup * final cleanup * PR fixes (Zel) * (Re) fix case * segment 0 * Fix map name static conflict * Comment about ZAPD * number 0 * Update place_title_cards.xml * Update spec
2021-07-04 22:20:08 +00:00
include "build/assets/textures/place_title_cards/g_pn_30.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "g_pn_31"
romalign 0x1000
Extract all "place name" title cards (#858) * Forest and shadow temple * fire temple * Water temple * Spirit temple * Deku tree * jabu jabu * DC * Inside Ganons castle * GTG * Castle courtyard * great fairy's fountain * chamber of sages * shooting gallery * Temple of time * market * back alley * kokir shop * goron shop * zora shop * House of skulltula * bazarr * potion shop * gravekeepers hut * lakeside lab * hyrule field * kak * graveyard * zoras river * kokiri forest * lake hylia * zoras domain * zoras fountain * gerudo valley * lost woods * the rest of them * cleanup * final cleanup * PR fixes (Zel) * (Re) fix case * segment 0 * Fix map name static conflict * Comment about ZAPD * number 0 * Update place_title_cards.xml * Update spec
2021-07-04 22:20:08 +00:00
include "build/assets/textures/place_title_cards/g_pn_31.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "g_pn_32"
romalign 0x1000
Extract all "place name" title cards (#858) * Forest and shadow temple * fire temple * Water temple * Spirit temple * Deku tree * jabu jabu * DC * Inside Ganons castle * GTG * Castle courtyard * great fairy's fountain * chamber of sages * shooting gallery * Temple of time * market * back alley * kokir shop * goron shop * zora shop * House of skulltula * bazarr * potion shop * gravekeepers hut * lakeside lab * hyrule field * kak * graveyard * zoras river * kokiri forest * lake hylia * zoras domain * zoras fountain * gerudo valley * lost woods * the rest of them * cleanup * final cleanup * PR fixes (Zel) * (Re) fix case * segment 0 * Fix map name static conflict * Comment about ZAPD * number 0 * Update place_title_cards.xml * Update spec
2021-07-04 22:20:08 +00:00
include "build/assets/textures/place_title_cards/g_pn_32.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "g_pn_33"
romalign 0x1000
Extract all "place name" title cards (#858) * Forest and shadow temple * fire temple * Water temple * Spirit temple * Deku tree * jabu jabu * DC * Inside Ganons castle * GTG * Castle courtyard * great fairy's fountain * chamber of sages * shooting gallery * Temple of time * market * back alley * kokir shop * goron shop * zora shop * House of skulltula * bazarr * potion shop * gravekeepers hut * lakeside lab * hyrule field * kak * graveyard * zoras river * kokiri forest * lake hylia * zoras domain * zoras fountain * gerudo valley * lost woods * the rest of them * cleanup * final cleanup * PR fixes (Zel) * (Re) fix case * segment 0 * Fix map name static conflict * Comment about ZAPD * number 0 * Update place_title_cards.xml * Update spec
2021-07-04 22:20:08 +00:00
include "build/assets/textures/place_title_cards/g_pn_33.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "g_pn_34"
romalign 0x1000
Extract all "place name" title cards (#858) * Forest and shadow temple * fire temple * Water temple * Spirit temple * Deku tree * jabu jabu * DC * Inside Ganons castle * GTG * Castle courtyard * great fairy's fountain * chamber of sages * shooting gallery * Temple of time * market * back alley * kokir shop * goron shop * zora shop * House of skulltula * bazarr * potion shop * gravekeepers hut * lakeside lab * hyrule field * kak * graveyard * zoras river * kokiri forest * lake hylia * zoras domain * zoras fountain * gerudo valley * lost woods * the rest of them * cleanup * final cleanup * PR fixes (Zel) * (Re) fix case * segment 0 * Fix map name static conflict * Comment about ZAPD * number 0 * Update place_title_cards.xml * Update spec
2021-07-04 22:20:08 +00:00
include "build/assets/textures/place_title_cards/g_pn_34.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "g_pn_35"
romalign 0x1000
Extract all "place name" title cards (#858) * Forest and shadow temple * fire temple * Water temple * Spirit temple * Deku tree * jabu jabu * DC * Inside Ganons castle * GTG * Castle courtyard * great fairy's fountain * chamber of sages * shooting gallery * Temple of time * market * back alley * kokir shop * goron shop * zora shop * House of skulltula * bazarr * potion shop * gravekeepers hut * lakeside lab * hyrule field * kak * graveyard * zoras river * kokiri forest * lake hylia * zoras domain * zoras fountain * gerudo valley * lost woods * the rest of them * cleanup * final cleanup * PR fixes (Zel) * (Re) fix case * segment 0 * Fix map name static conflict * Comment about ZAPD * number 0 * Update place_title_cards.xml * Update spec
2021-07-04 22:20:08 +00:00
include "build/assets/textures/place_title_cards/g_pn_35.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "g_pn_36"
romalign 0x1000
Extract all "place name" title cards (#858) * Forest and shadow temple * fire temple * Water temple * Spirit temple * Deku tree * jabu jabu * DC * Inside Ganons castle * GTG * Castle courtyard * great fairy's fountain * chamber of sages * shooting gallery * Temple of time * market * back alley * kokir shop * goron shop * zora shop * House of skulltula * bazarr * potion shop * gravekeepers hut * lakeside lab * hyrule field * kak * graveyard * zoras river * kokiri forest * lake hylia * zoras domain * zoras fountain * gerudo valley * lost woods * the rest of them * cleanup * final cleanup * PR fixes (Zel) * (Re) fix case * segment 0 * Fix map name static conflict * Comment about ZAPD * number 0 * Update place_title_cards.xml * Update spec
2021-07-04 22:20:08 +00:00
include "build/assets/textures/place_title_cards/g_pn_36.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "g_pn_37"
romalign 0x1000
Extract all "place name" title cards (#858) * Forest and shadow temple * fire temple * Water temple * Spirit temple * Deku tree * jabu jabu * DC * Inside Ganons castle * GTG * Castle courtyard * great fairy's fountain * chamber of sages * shooting gallery * Temple of time * market * back alley * kokir shop * goron shop * zora shop * House of skulltula * bazarr * potion shop * gravekeepers hut * lakeside lab * hyrule field * kak * graveyard * zoras river * kokiri forest * lake hylia * zoras domain * zoras fountain * gerudo valley * lost woods * the rest of them * cleanup * final cleanup * PR fixes (Zel) * (Re) fix case * segment 0 * Fix map name static conflict * Comment about ZAPD * number 0 * Update place_title_cards.xml * Update spec
2021-07-04 22:20:08 +00:00
include "build/assets/textures/place_title_cards/g_pn_37.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "g_pn_38"
romalign 0x1000
Extract all "place name" title cards (#858) * Forest and shadow temple * fire temple * Water temple * Spirit temple * Deku tree * jabu jabu * DC * Inside Ganons castle * GTG * Castle courtyard * great fairy's fountain * chamber of sages * shooting gallery * Temple of time * market * back alley * kokir shop * goron shop * zora shop * House of skulltula * bazarr * potion shop * gravekeepers hut * lakeside lab * hyrule field * kak * graveyard * zoras river * kokiri forest * lake hylia * zoras domain * zoras fountain * gerudo valley * lost woods * the rest of them * cleanup * final cleanup * PR fixes (Zel) * (Re) fix case * segment 0 * Fix map name static conflict * Comment about ZAPD * number 0 * Update place_title_cards.xml * Update spec
2021-07-04 22:20:08 +00:00
include "build/assets/textures/place_title_cards/g_pn_38.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "g_pn_39"
romalign 0x1000
Extract all "place name" title cards (#858) * Forest and shadow temple * fire temple * Water temple * Spirit temple * Deku tree * jabu jabu * DC * Inside Ganons castle * GTG * Castle courtyard * great fairy's fountain * chamber of sages * shooting gallery * Temple of time * market * back alley * kokir shop * goron shop * zora shop * House of skulltula * bazarr * potion shop * gravekeepers hut * lakeside lab * hyrule field * kak * graveyard * zoras river * kokiri forest * lake hylia * zoras domain * zoras fountain * gerudo valley * lost woods * the rest of them * cleanup * final cleanup * PR fixes (Zel) * (Re) fix case * segment 0 * Fix map name static conflict * Comment about ZAPD * number 0 * Update place_title_cards.xml * Update spec
2021-07-04 22:20:08 +00:00
include "build/assets/textures/place_title_cards/g_pn_39.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "g_pn_40"
romalign 0x1000
Extract all "place name" title cards (#858) * Forest and shadow temple * fire temple * Water temple * Spirit temple * Deku tree * jabu jabu * DC * Inside Ganons castle * GTG * Castle courtyard * great fairy's fountain * chamber of sages * shooting gallery * Temple of time * market * back alley * kokir shop * goron shop * zora shop * House of skulltula * bazarr * potion shop * gravekeepers hut * lakeside lab * hyrule field * kak * graveyard * zoras river * kokiri forest * lake hylia * zoras domain * zoras fountain * gerudo valley * lost woods * the rest of them * cleanup * final cleanup * PR fixes (Zel) * (Re) fix case * segment 0 * Fix map name static conflict * Comment about ZAPD * number 0 * Update place_title_cards.xml * Update spec
2021-07-04 22:20:08 +00:00
include "build/assets/textures/place_title_cards/g_pn_40.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "g_pn_41"
romalign 0x1000
Extract all "place name" title cards (#858) * Forest and shadow temple * fire temple * Water temple * Spirit temple * Deku tree * jabu jabu * DC * Inside Ganons castle * GTG * Castle courtyard * great fairy's fountain * chamber of sages * shooting gallery * Temple of time * market * back alley * kokir shop * goron shop * zora shop * House of skulltula * bazarr * potion shop * gravekeepers hut * lakeside lab * hyrule field * kak * graveyard * zoras river * kokiri forest * lake hylia * zoras domain * zoras fountain * gerudo valley * lost woods * the rest of them * cleanup * final cleanup * PR fixes (Zel) * (Re) fix case * segment 0 * Fix map name static conflict * Comment about ZAPD * number 0 * Update place_title_cards.xml * Update spec
2021-07-04 22:20:08 +00:00
include "build/assets/textures/place_title_cards/g_pn_41.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "g_pn_42"
romalign 0x1000
Extract all "place name" title cards (#858) * Forest and shadow temple * fire temple * Water temple * Spirit temple * Deku tree * jabu jabu * DC * Inside Ganons castle * GTG * Castle courtyard * great fairy's fountain * chamber of sages * shooting gallery * Temple of time * market * back alley * kokir shop * goron shop * zora shop * House of skulltula * bazarr * potion shop * gravekeepers hut * lakeside lab * hyrule field * kak * graveyard * zoras river * kokiri forest * lake hylia * zoras domain * zoras fountain * gerudo valley * lost woods * the rest of them * cleanup * final cleanup * PR fixes (Zel) * (Re) fix case * segment 0 * Fix map name static conflict * Comment about ZAPD * number 0 * Update place_title_cards.xml * Update spec
2021-07-04 22:20:08 +00:00
include "build/assets/textures/place_title_cards/g_pn_42.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "g_pn_43"
romalign 0x1000
Extract all "place name" title cards (#858) * Forest and shadow temple * fire temple * Water temple * Spirit temple * Deku tree * jabu jabu * DC * Inside Ganons castle * GTG * Castle courtyard * great fairy's fountain * chamber of sages * shooting gallery * Temple of time * market * back alley * kokir shop * goron shop * zora shop * House of skulltula * bazarr * potion shop * gravekeepers hut * lakeside lab * hyrule field * kak * graveyard * zoras river * kokiri forest * lake hylia * zoras domain * zoras fountain * gerudo valley * lost woods * the rest of them * cleanup * final cleanup * PR fixes (Zel) * (Re) fix case * segment 0 * Fix map name static conflict * Comment about ZAPD * number 0 * Update place_title_cards.xml * Update spec
2021-07-04 22:20:08 +00:00
include "build/assets/textures/place_title_cards/g_pn_43.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "g_pn_44"
romalign 0x1000
Extract all "place name" title cards (#858) * Forest and shadow temple * fire temple * Water temple * Spirit temple * Deku tree * jabu jabu * DC * Inside Ganons castle * GTG * Castle courtyard * great fairy's fountain * chamber of sages * shooting gallery * Temple of time * market * back alley * kokir shop * goron shop * zora shop * House of skulltula * bazarr * potion shop * gravekeepers hut * lakeside lab * hyrule field * kak * graveyard * zoras river * kokiri forest * lake hylia * zoras domain * zoras fountain * gerudo valley * lost woods * the rest of them * cleanup * final cleanup * PR fixes (Zel) * (Re) fix case * segment 0 * Fix map name static conflict * Comment about ZAPD * number 0 * Update place_title_cards.xml * Update spec
2021-07-04 22:20:08 +00:00
include "build/assets/textures/place_title_cards/g_pn_44.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "g_pn_45"
romalign 0x1000
Extract all "place name" title cards (#858) * Forest and shadow temple * fire temple * Water temple * Spirit temple * Deku tree * jabu jabu * DC * Inside Ganons castle * GTG * Castle courtyard * great fairy's fountain * chamber of sages * shooting gallery * Temple of time * market * back alley * kokir shop * goron shop * zora shop * House of skulltula * bazarr * potion shop * gravekeepers hut * lakeside lab * hyrule field * kak * graveyard * zoras river * kokiri forest * lake hylia * zoras domain * zoras fountain * gerudo valley * lost woods * the rest of them * cleanup * final cleanup * PR fixes (Zel) * (Re) fix case * segment 0 * Fix map name static conflict * Comment about ZAPD * number 0 * Update place_title_cards.xml * Update spec
2021-07-04 22:20:08 +00:00
include "build/assets/textures/place_title_cards/g_pn_45.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "g_pn_46"
romalign 0x1000
Extract all "place name" title cards (#858) * Forest and shadow temple * fire temple * Water temple * Spirit temple * Deku tree * jabu jabu * DC * Inside Ganons castle * GTG * Castle courtyard * great fairy's fountain * chamber of sages * shooting gallery * Temple of time * market * back alley * kokir shop * goron shop * zora shop * House of skulltula * bazarr * potion shop * gravekeepers hut * lakeside lab * hyrule field * kak * graveyard * zoras river * kokiri forest * lake hylia * zoras domain * zoras fountain * gerudo valley * lost woods * the rest of them * cleanup * final cleanup * PR fixes (Zel) * (Re) fix case * segment 0 * Fix map name static conflict * Comment about ZAPD * number 0 * Update place_title_cards.xml * Update spec
2021-07-04 22:20:08 +00:00
include "build/assets/textures/place_title_cards/g_pn_46.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "g_pn_47"
romalign 0x1000
Extract all "place name" title cards (#858) * Forest and shadow temple * fire temple * Water temple * Spirit temple * Deku tree * jabu jabu * DC * Inside Ganons castle * GTG * Castle courtyard * great fairy's fountain * chamber of sages * shooting gallery * Temple of time * market * back alley * kokir shop * goron shop * zora shop * House of skulltula * bazarr * potion shop * gravekeepers hut * lakeside lab * hyrule field * kak * graveyard * zoras river * kokiri forest * lake hylia * zoras domain * zoras fountain * gerudo valley * lost woods * the rest of them * cleanup * final cleanup * PR fixes (Zel) * (Re) fix case * segment 0 * Fix map name static conflict * Comment about ZAPD * number 0 * Update place_title_cards.xml * Update spec
2021-07-04 22:20:08 +00:00
include "build/assets/textures/place_title_cards/g_pn_47.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "g_pn_48"
romalign 0x1000
Extract all "place name" title cards (#858) * Forest and shadow temple * fire temple * Water temple * Spirit temple * Deku tree * jabu jabu * DC * Inside Ganons castle * GTG * Castle courtyard * great fairy's fountain * chamber of sages * shooting gallery * Temple of time * market * back alley * kokir shop * goron shop * zora shop * House of skulltula * bazarr * potion shop * gravekeepers hut * lakeside lab * hyrule field * kak * graveyard * zoras river * kokiri forest * lake hylia * zoras domain * zoras fountain * gerudo valley * lost woods * the rest of them * cleanup * final cleanup * PR fixes (Zel) * (Re) fix case * segment 0 * Fix map name static conflict * Comment about ZAPD * number 0 * Update place_title_cards.xml * Update spec
2021-07-04 22:20:08 +00:00
include "build/assets/textures/place_title_cards/g_pn_48.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "g_pn_49"
romalign 0x1000
Extract all "place name" title cards (#858) * Forest and shadow temple * fire temple * Water temple * Spirit temple * Deku tree * jabu jabu * DC * Inside Ganons castle * GTG * Castle courtyard * great fairy's fountain * chamber of sages * shooting gallery * Temple of time * market * back alley * kokir shop * goron shop * zora shop * House of skulltula * bazarr * potion shop * gravekeepers hut * lakeside lab * hyrule field * kak * graveyard * zoras river * kokiri forest * lake hylia * zoras domain * zoras fountain * gerudo valley * lost woods * the rest of them * cleanup * final cleanup * PR fixes (Zel) * (Re) fix case * segment 0 * Fix map name static conflict * Comment about ZAPD * number 0 * Update place_title_cards.xml * Update spec
2021-07-04 22:20:08 +00:00
include "build/assets/textures/place_title_cards/g_pn_49.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "g_pn_50"
romalign 0x1000
Extract all "place name" title cards (#858) * Forest and shadow temple * fire temple * Water temple * Spirit temple * Deku tree * jabu jabu * DC * Inside Ganons castle * GTG * Castle courtyard * great fairy's fountain * chamber of sages * shooting gallery * Temple of time * market * back alley * kokir shop * goron shop * zora shop * House of skulltula * bazarr * potion shop * gravekeepers hut * lakeside lab * hyrule field * kak * graveyard * zoras river * kokiri forest * lake hylia * zoras domain * zoras fountain * gerudo valley * lost woods * the rest of them * cleanup * final cleanup * PR fixes (Zel) * (Re) fix case * segment 0 * Fix map name static conflict * Comment about ZAPD * number 0 * Update place_title_cards.xml * Update spec
2021-07-04 22:20:08 +00:00
include "build/assets/textures/place_title_cards/g_pn_50.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "g_pn_51"
romalign 0x1000
Extract all "place name" title cards (#858) * Forest and shadow temple * fire temple * Water temple * Spirit temple * Deku tree * jabu jabu * DC * Inside Ganons castle * GTG * Castle courtyard * great fairy's fountain * chamber of sages * shooting gallery * Temple of time * market * back alley * kokir shop * goron shop * zora shop * House of skulltula * bazarr * potion shop * gravekeepers hut * lakeside lab * hyrule field * kak * graveyard * zoras river * kokiri forest * lake hylia * zoras domain * zoras fountain * gerudo valley * lost woods * the rest of them * cleanup * final cleanup * PR fixes (Zel) * (Re) fix case * segment 0 * Fix map name static conflict * Comment about ZAPD * number 0 * Update place_title_cards.xml * Update spec
2021-07-04 22:20:08 +00:00
include "build/assets/textures/place_title_cards/g_pn_51.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "g_pn_52"
romalign 0x1000
Extract all "place name" title cards (#858) * Forest and shadow temple * fire temple * Water temple * Spirit temple * Deku tree * jabu jabu * DC * Inside Ganons castle * GTG * Castle courtyard * great fairy's fountain * chamber of sages * shooting gallery * Temple of time * market * back alley * kokir shop * goron shop * zora shop * House of skulltula * bazarr * potion shop * gravekeepers hut * lakeside lab * hyrule field * kak * graveyard * zoras river * kokiri forest * lake hylia * zoras domain * zoras fountain * gerudo valley * lost woods * the rest of them * cleanup * final cleanup * PR fixes (Zel) * (Re) fix case * segment 0 * Fix map name static conflict * Comment about ZAPD * number 0 * Update place_title_cards.xml * Update spec
2021-07-04 22:20:08 +00:00
include "build/assets/textures/place_title_cards/g_pn_52.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "g_pn_53"
romalign 0x1000
Extract all "place name" title cards (#858) * Forest and shadow temple * fire temple * Water temple * Spirit temple * Deku tree * jabu jabu * DC * Inside Ganons castle * GTG * Castle courtyard * great fairy's fountain * chamber of sages * shooting gallery * Temple of time * market * back alley * kokir shop * goron shop * zora shop * House of skulltula * bazarr * potion shop * gravekeepers hut * lakeside lab * hyrule field * kak * graveyard * zoras river * kokiri forest * lake hylia * zoras domain * zoras fountain * gerudo valley * lost woods * the rest of them * cleanup * final cleanup * PR fixes (Zel) * (Re) fix case * segment 0 * Fix map name static conflict * Comment about ZAPD * number 0 * Update place_title_cards.xml * Update spec
2021-07-04 22:20:08 +00:00
include "build/assets/textures/place_title_cards/g_pn_53.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "g_pn_54"
romalign 0x1000
Extract all "place name" title cards (#858) * Forest and shadow temple * fire temple * Water temple * Spirit temple * Deku tree * jabu jabu * DC * Inside Ganons castle * GTG * Castle courtyard * great fairy's fountain * chamber of sages * shooting gallery * Temple of time * market * back alley * kokir shop * goron shop * zora shop * House of skulltula * bazarr * potion shop * gravekeepers hut * lakeside lab * hyrule field * kak * graveyard * zoras river * kokiri forest * lake hylia * zoras domain * zoras fountain * gerudo valley * lost woods * the rest of them * cleanup * final cleanup * PR fixes (Zel) * (Re) fix case * segment 0 * Fix map name static conflict * Comment about ZAPD * number 0 * Update place_title_cards.xml * Update spec
2021-07-04 22:20:08 +00:00
include "build/assets/textures/place_title_cards/g_pn_54.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "g_pn_55"
romalign 0x1000
Extract all "place name" title cards (#858) * Forest and shadow temple * fire temple * Water temple * Spirit temple * Deku tree * jabu jabu * DC * Inside Ganons castle * GTG * Castle courtyard * great fairy's fountain * chamber of sages * shooting gallery * Temple of time * market * back alley * kokir shop * goron shop * zora shop * House of skulltula * bazarr * potion shop * gravekeepers hut * lakeside lab * hyrule field * kak * graveyard * zoras river * kokiri forest * lake hylia * zoras domain * zoras fountain * gerudo valley * lost woods * the rest of them * cleanup * final cleanup * PR fixes (Zel) * (Re) fix case * segment 0 * Fix map name static conflict * Comment about ZAPD * number 0 * Update place_title_cards.xml * Update spec
2021-07-04 22:20:08 +00:00
include "build/assets/textures/place_title_cards/g_pn_55.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "g_pn_56"
romalign 0x1000
Extract all "place name" title cards (#858) * Forest and shadow temple * fire temple * Water temple * Spirit temple * Deku tree * jabu jabu * DC * Inside Ganons castle * GTG * Castle courtyard * great fairy's fountain * chamber of sages * shooting gallery * Temple of time * market * back alley * kokir shop * goron shop * zora shop * House of skulltula * bazarr * potion shop * gravekeepers hut * lakeside lab * hyrule field * kak * graveyard * zoras river * kokiri forest * lake hylia * zoras domain * zoras fountain * gerudo valley * lost woods * the rest of them * cleanup * final cleanup * PR fixes (Zel) * (Re) fix case * segment 0 * Fix map name static conflict * Comment about ZAPD * number 0 * Update place_title_cards.xml * Update spec
2021-07-04 22:20:08 +00:00
include "build/assets/textures/place_title_cards/g_pn_56.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "g_pn_57"
romalign 0x1000
Extract all "place name" title cards (#858) * Forest and shadow temple * fire temple * Water temple * Spirit temple * Deku tree * jabu jabu * DC * Inside Ganons castle * GTG * Castle courtyard * great fairy's fountain * chamber of sages * shooting gallery * Temple of time * market * back alley * kokir shop * goron shop * zora shop * House of skulltula * bazarr * potion shop * gravekeepers hut * lakeside lab * hyrule field * kak * graveyard * zoras river * kokiri forest * lake hylia * zoras domain * zoras fountain * gerudo valley * lost woods * the rest of them * cleanup * final cleanup * PR fixes (Zel) * (Re) fix case * segment 0 * Fix map name static conflict * Comment about ZAPD * number 0 * Update place_title_cards.xml * Update spec
2021-07-04 22:20:08 +00:00
include "build/assets/textures/place_title_cards/g_pn_57.o"
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "z_select_static"
romalign 0x1000
include "build/baserom/z_select_static.o"
endseg
beginseg
name "nintendo_rogo_static"
romalign 0x1000
Some static texture files "decompiled" (#658) * . * remove tools/ZAP2 from origin master * Some texture files * fix tabs in new texture files * map_i_static * some updates * update names * update more names * nintendo_rogo_static * title_static ok * Added segment= to the texture files * do_action_static update * Made suggested changes * Made suggested changes * Fixed spec
2021-02-24 18:41:43 +00:00
include "build/assets/textures/nintendo_rogo_static/nintendo_rogo_static.o"
number 1
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "title_static"
romalign 0x1000
Some static texture files "decompiled" (#658) * . * remove tools/ZAP2 from origin master * Some texture files * fix tabs in new texture files * map_i_static * some updates * update names * update more names * nintendo_rogo_static * title_static ok * Added segment= to the texture files * do_action_static update * Made suggested changes * Made suggested changes * Fixed spec
2021-02-24 18:41:43 +00:00
include "build/assets/textures/title_static/title_static.o"
number 1
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "parameter_static"
romalign 0x1000
Decompile Gameplay_Keep and fix all existing decompiled objects (#595) * First batch of files * Add missing folders back * Fix missing folders again * Finish fixing existing texture files * Gameplay_Keep XML finished * Most actor gameplay_keep undefined syms removed * Only ~200 gkeep symbols remain * All gkeep symbols that ZAP supports are fixed * Cleanup, and make gkeep names more accurate * Starting to figure out what some unknown blobs are, merge zeldaret in * fix a few more things * refactor gkeep * Change how gitkeep is handled * gkeep xml cleanup * Gkeep finished, now just waiting up ZAP updates * 100 link animations finished * 150 link animations finished * 200 link animations finished * 250 link animations finished * 350 link animations finished * 400 link animations finished * 450 link animations finished * 500 link animations finished * 550 link animations finished * All Link animations finished cannot build yet because ZAP doesn't have LinkAnimationHeader yet * xml changes for new zap stuff * finish gameplay_keep * fixing existing objects * ready for pr besides zap padding issue * mostly ready for pr * format all c files * all conflicts fixed * make changes that roman requested * fix thing i didn't mean to change * some animation symbols renamed * fixed roman's stuff * lifemeter hardcoded pointers removed * fix issue with incorrect data in gameplay_keep * removed unused asm * fixed most of fig's comments * fix all of fig's comments * reformat files * Update assets/xml/textures/icon_item_static.xml Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update assets/xml/textures/icon_item_static.xml Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * fixed stuff * fixed most of roman's comments * remove leading zeroes * should build now * git subrepo pull --force tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "f84d8337b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "f84d8337b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * all of gkeep symbols fixed * compiler error fixed * format files * final changes Co-authored-by: Zelllll <elijah@DESKTOP-NMP1I89.localdomain> Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2021-01-25 00:36:40 +00:00
include "build/assets/textures/parameter_static/parameter_static.o"
number 2
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "vr_fine0_static"
romalign 0x1000
include "build/baserom/vr_fine0_static.o"
endseg
beginseg
name "vr_fine0_pal_static"
romalign 0x1000
include "build/baserom/vr_fine0_pal_static.o"
endseg
beginseg
name "vr_fine1_static"
romalign 0x1000
include "build/baserom/vr_fine1_static.o"
endseg
beginseg
name "vr_fine1_pal_static"
romalign 0x1000
include "build/baserom/vr_fine1_pal_static.o"
endseg
beginseg
name "vr_fine2_static"
romalign 0x1000
include "build/baserom/vr_fine2_static.o"
endseg
beginseg
name "vr_fine2_pal_static"
romalign 0x1000
include "build/baserom/vr_fine2_pal_static.o"
endseg
beginseg
name "vr_fine3_static"
romalign 0x1000
include "build/baserom/vr_fine3_static.o"
endseg
beginseg
name "vr_fine3_pal_static"
romalign 0x1000
include "build/baserom/vr_fine3_pal_static.o"
endseg
beginseg
name "vr_cloud0_static"
romalign 0x1000
include "build/baserom/vr_cloud0_static.o"
endseg
beginseg
name "vr_cloud0_pal_static"
romalign 0x1000
include "build/baserom/vr_cloud0_pal_static.o"
endseg
beginseg
name "vr_cloud1_static"
romalign 0x1000
include "build/baserom/vr_cloud1_static.o"
endseg
beginseg
name "vr_cloud1_pal_static"
romalign 0x1000
include "build/baserom/vr_cloud1_pal_static.o"
endseg
beginseg
name "vr_cloud2_static"
romalign 0x1000
include "build/baserom/vr_cloud2_static.o"
endseg
beginseg
name "vr_cloud2_pal_static"
romalign 0x1000
include "build/baserom/vr_cloud2_pal_static.o"
endseg
beginseg
name "vr_cloud3_static"
romalign 0x1000
include "build/baserom/vr_cloud3_static.o"
endseg
beginseg
name "vr_cloud3_pal_static"
romalign 0x1000
include "build/baserom/vr_cloud3_pal_static.o"
endseg
beginseg
name "vr_holy0_static"
romalign 0x1000
include "build/baserom/vr_holy0_static.o"
endseg
beginseg
name "vr_holy0_pal_static"
romalign 0x1000
include "build/baserom/vr_holy0_pal_static.o"
endseg
beginseg
name "vr_holy1_static"
romalign 0x1000
include "build/baserom/vr_holy1_static.o"
endseg
beginseg
name "vr_holy1_pal_static"
romalign 0x1000
include "build/baserom/vr_holy1_pal_static.o"
endseg
beginseg
name "vr_MDVR_static"
romalign 0x1000
include "build/baserom/vr_MDVR_static.o"
endseg
beginseg
name "vr_MDVR_pal_static"
romalign 0x1000
include "build/baserom/vr_MDVR_pal_static.o"
endseg
beginseg
name "vr_MNVR_static"
romalign 0x1000
include "build/baserom/vr_MNVR_static.o"
endseg
beginseg
name "vr_MNVR_pal_static"
romalign 0x1000
include "build/baserom/vr_MNVR_pal_static.o"
endseg
beginseg
name "vr_RUVR_static"
romalign 0x1000
include "build/baserom/vr_RUVR_static.o"
endseg
beginseg
name "vr_RUVR_pal_static"
romalign 0x1000
include "build/baserom/vr_RUVR_pal_static.o"
endseg
beginseg
name "vr_LHVR_static"
romalign 0x1000
include "build/baserom/vr_LHVR_static.o"
endseg
beginseg
name "vr_LHVR_pal_static"
romalign 0x1000
include "build/baserom/vr_LHVR_pal_static.o"
endseg
beginseg
name "vr_KHVR_static"
romalign 0x1000
include "build/baserom/vr_KHVR_static.o"
endseg
beginseg
name "vr_KHVR_pal_static"
romalign 0x1000
include "build/baserom/vr_KHVR_pal_static.o"
endseg
beginseg
name "vr_K3VR_static"
romalign 0x1000
include "build/baserom/vr_K3VR_static.o"
endseg
beginseg
name "vr_K3VR_pal_static"
romalign 0x1000
include "build/baserom/vr_K3VR_pal_static.o"
endseg
beginseg
name "vr_K4VR_static"
romalign 0x1000
include "build/baserom/vr_K4VR_static.o"
endseg
beginseg
name "vr_K4VR_pal_static"
romalign 0x1000
include "build/baserom/vr_K4VR_pal_static.o"
endseg
beginseg
name "vr_K5VR_static"
romalign 0x1000
include "build/baserom/vr_K5VR_static.o"
endseg
beginseg
name "vr_K5VR_pal_static"
romalign 0x1000
include "build/baserom/vr_K5VR_pal_static.o"
endseg
beginseg
name "vr_SP1a_static"
romalign 0x1000
include "build/baserom/vr_SP1a_static.o"
endseg
beginseg
name "vr_SP1a_pal_static"
romalign 0x1000
include "build/baserom/vr_SP1a_pal_static.o"
endseg
beginseg
name "vr_MLVR_static"
romalign 0x1000
include "build/baserom/vr_MLVR_static.o"
endseg
beginseg
name "vr_MLVR_pal_static"
romalign 0x1000
include "build/baserom/vr_MLVR_pal_static.o"
endseg
beginseg
name "vr_KKRVR_static"
romalign 0x1000
include "build/baserom/vr_KKRVR_static.o"
endseg
beginseg
name "vr_KKRVR_pal_static"
romalign 0x1000
include "build/baserom/vr_KKRVR_pal_static.o"
endseg
beginseg
name "vr_KR3VR_static"
romalign 0x1000
include "build/baserom/vr_KR3VR_static.o"
endseg
beginseg
name "vr_KR3VR_pal_static"
romalign 0x1000
include "build/baserom/vr_KR3VR_pal_static.o"
endseg
beginseg
name "vr_IPVR_static"
romalign 0x1000
include "build/baserom/vr_IPVR_static.o"
endseg
beginseg
name "vr_IPVR_pal_static"
romalign 0x1000
include "build/baserom/vr_IPVR_pal_static.o"
endseg
beginseg
name "vr_KSVR_static"
romalign 0x1000
include "build/baserom/vr_KSVR_static.o"
endseg
beginseg
name "vr_KSVR_pal_static"
romalign 0x1000
include "build/baserom/vr_KSVR_pal_static.o"
endseg
beginseg
name "vr_GLVR_static"
romalign 0x1000
include "build/baserom/vr_GLVR_static.o"
endseg
beginseg
name "vr_GLVR_pal_static"
romalign 0x1000
include "build/baserom/vr_GLVR_pal_static.o"
endseg
beginseg
name "vr_ZRVR_static"
romalign 0x1000
include "build/baserom/vr_ZRVR_static.o"
endseg
beginseg
name "vr_ZRVR_pal_static"
romalign 0x1000
include "build/baserom/vr_ZRVR_pal_static.o"
endseg
beginseg
name "vr_DGVR_static"
romalign 0x1000
include "build/baserom/vr_DGVR_static.o"
endseg
beginseg
name "vr_DGVR_pal_static"
romalign 0x1000
include "build/baserom/vr_DGVR_pal_static.o"
endseg
beginseg
name "vr_ALVR_static"
romalign 0x1000
include "build/baserom/vr_ALVR_static.o"
endseg
beginseg
name "vr_ALVR_pal_static"
romalign 0x1000
include "build/baserom/vr_ALVR_pal_static.o"
endseg
beginseg
name "vr_NSVR_static"
romalign 0x1000
include "build/baserom/vr_NSVR_static.o"
endseg
beginseg
name "vr_NSVR_pal_static"
romalign 0x1000
include "build/baserom/vr_NSVR_pal_static.o"
endseg
beginseg
name "vr_LBVR_static"
romalign 0x1000
include "build/baserom/vr_LBVR_static.o"
endseg
beginseg
name "vr_LBVR_pal_static"
romalign 0x1000
include "build/baserom/vr_LBVR_pal_static.o"
endseg
beginseg
name "vr_TTVR_static"
romalign 0x1000
include "build/baserom/vr_TTVR_static.o"
endseg
beginseg
name "vr_TTVR_pal_static"
romalign 0x1000
include "build/baserom/vr_TTVR_pal_static.o"
endseg
beginseg
name "vr_FCVR_static"
romalign 0x1000
include "build/baserom/vr_FCVR_static.o"
endseg
beginseg
name "vr_FCVR_pal_static"
romalign 0x1000
include "build/baserom/vr_FCVR_pal_static.o"
endseg
beginseg
name "elf_message_field"
romalign 0x1000
Create macros for and decompile elf_message scripts (#999) * elf_message * Review suggestions
2021-11-16 23:04:31 +00:00
include "build/src/elf_message/elf_message_field.o"
number 0
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "elf_message_ydan"
romalign 0x1000
Create macros for and decompile elf_message scripts (#999) * elf_message * Review suggestions
2021-11-16 23:04:31 +00:00
include "build/src/elf_message/elf_message_ydan.o"
number 0
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ydan_scene"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/ydan/ydan_scene.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 2
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ydan_room_0"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/ydan/ydan_room_0.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ydan_room_1"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/ydan/ydan_room_1.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ydan_room_2"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/ydan/ydan_room_2.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ydan_room_3"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/ydan/ydan_room_3.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ydan_room_4"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/ydan/ydan_room_4.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ydan_room_5"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/ydan/ydan_room_5.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ydan_room_6"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/ydan/ydan_room_6.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ydan_room_7"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/ydan/ydan_room_7.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ydan_room_8"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/ydan/ydan_room_8.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ydan_room_9"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/ydan/ydan_room_9.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ydan_room_10"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/ydan/ydan_room_10.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ydan_room_11"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/ydan/ydan_room_11.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ddan_scene"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/ddan/ddan_scene.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 2
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ddan_room_0"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/ddan/ddan_room_0.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ddan_room_1"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/ddan/ddan_room_1.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ddan_room_2"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/ddan/ddan_room_2.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ddan_room_3"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/ddan/ddan_room_3.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ddan_room_4"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/ddan/ddan_room_4.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ddan_room_5"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/ddan/ddan_room_5.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ddan_room_6"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/ddan/ddan_room_6.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ddan_room_7"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/ddan/ddan_room_7.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ddan_room_8"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/ddan/ddan_room_8.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ddan_room_9"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/ddan/ddan_room_9.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ddan_room_10"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/ddan/ddan_room_10.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ddan_room_11"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/ddan/ddan_room_11.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ddan_room_12"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/ddan/ddan_room_12.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ddan_room_13"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/ddan/ddan_room_13.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ddan_room_14"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/ddan/ddan_room_14.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ddan_room_15"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/ddan/ddan_room_15.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ddan_room_16"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/ddan/ddan_room_16.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "bdan_scene"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/bdan/bdan_scene.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 2
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "bdan_room_0"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/bdan/bdan_room_0.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "bdan_room_1"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/bdan/bdan_room_1.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "bdan_room_2"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/bdan/bdan_room_2.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "bdan_room_3"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/bdan/bdan_room_3.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "bdan_room_4"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/bdan/bdan_room_4.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "bdan_room_5"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/bdan/bdan_room_5.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "bdan_room_6"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/bdan/bdan_room_6.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "bdan_room_7"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/bdan/bdan_room_7.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "bdan_room_8"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/bdan/bdan_room_8.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "bdan_room_9"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/bdan/bdan_room_9.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "bdan_room_10"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/bdan/bdan_room_10.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "bdan_room_11"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/bdan/bdan_room_11.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "bdan_room_12"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/bdan/bdan_room_12.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "bdan_room_13"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/bdan/bdan_room_13.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "bdan_room_14"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/bdan/bdan_room_14.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "bdan_room_15"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/bdan/bdan_room_15.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "Bmori1_scene"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/Bmori1/Bmori1_scene.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 2
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "Bmori1_room_0"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/Bmori1/Bmori1_room_0.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "Bmori1_room_1"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/Bmori1/Bmori1_room_1.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "Bmori1_room_2"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/Bmori1/Bmori1_room_2.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "Bmori1_room_3"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/Bmori1/Bmori1_room_3.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "Bmori1_room_4"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/Bmori1/Bmori1_room_4.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "Bmori1_room_5"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/Bmori1/Bmori1_room_5.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "Bmori1_room_6"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/Bmori1/Bmori1_room_6.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "Bmori1_room_7"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/Bmori1/Bmori1_room_7.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "Bmori1_room_8"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/Bmori1/Bmori1_room_8.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "Bmori1_room_9"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/Bmori1/Bmori1_room_9.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "Bmori1_room_10"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/Bmori1/Bmori1_room_10.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "Bmori1_room_11"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/Bmori1/Bmori1_room_11.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "Bmori1_room_12"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/Bmori1/Bmori1_room_12.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "Bmori1_room_13"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/Bmori1/Bmori1_room_13.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "Bmori1_room_14"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/Bmori1/Bmori1_room_14.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "Bmori1_room_15"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/Bmori1/Bmori1_room_15.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "Bmori1_room_16"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/Bmori1/Bmori1_room_16.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "Bmori1_room_17"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/Bmori1/Bmori1_room_17.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "Bmori1_room_18"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/Bmori1/Bmori1_room_18.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "Bmori1_room_19"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/Bmori1/Bmori1_room_19.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "Bmori1_room_20"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/Bmori1/Bmori1_room_20.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "Bmori1_room_21"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/Bmori1/Bmori1_room_21.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "Bmori1_room_22"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/Bmori1/Bmori1_room_22.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "HIDAN_scene"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/HIDAN/HIDAN_scene.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 2
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "HIDAN_room_0"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/HIDAN/HIDAN_room_0.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "HIDAN_room_1"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/HIDAN/HIDAN_room_1.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "HIDAN_room_2"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/HIDAN/HIDAN_room_2.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "HIDAN_room_3"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/HIDAN/HIDAN_room_3.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "HIDAN_room_4"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/HIDAN/HIDAN_room_4.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "HIDAN_room_5"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/HIDAN/HIDAN_room_5.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "HIDAN_room_6"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/HIDAN/HIDAN_room_6.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "HIDAN_room_7"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/HIDAN/HIDAN_room_7.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "HIDAN_room_8"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/HIDAN/HIDAN_room_8.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "HIDAN_room_9"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/HIDAN/HIDAN_room_9.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "HIDAN_room_10"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/HIDAN/HIDAN_room_10.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "HIDAN_room_11"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/HIDAN/HIDAN_room_11.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "HIDAN_room_12"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/HIDAN/HIDAN_room_12.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "HIDAN_room_13"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/HIDAN/HIDAN_room_13.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "HIDAN_room_14"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/HIDAN/HIDAN_room_14.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "HIDAN_room_15"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/HIDAN/HIDAN_room_15.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "HIDAN_room_16"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/HIDAN/HIDAN_room_16.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "HIDAN_room_17"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/HIDAN/HIDAN_room_17.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "HIDAN_room_18"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/HIDAN/HIDAN_room_18.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "HIDAN_room_19"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/HIDAN/HIDAN_room_19.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "HIDAN_room_20"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/HIDAN/HIDAN_room_20.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "HIDAN_room_21"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/HIDAN/HIDAN_room_21.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "HIDAN_room_22"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/HIDAN/HIDAN_room_22.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "HIDAN_room_23"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/HIDAN/HIDAN_room_23.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "HIDAN_room_24"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/HIDAN/HIDAN_room_24.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "HIDAN_room_25"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/HIDAN/HIDAN_room_25.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "HIDAN_room_26"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/HIDAN/HIDAN_room_26.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "MIZUsin_scene"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/MIZUsin/MIZUsin_scene.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 2
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "MIZUsin_room_0"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/MIZUsin/MIZUsin_room_0.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "MIZUsin_room_1"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/MIZUsin/MIZUsin_room_1.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "MIZUsin_room_2"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/MIZUsin/MIZUsin_room_2.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "MIZUsin_room_3"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/MIZUsin/MIZUsin_room_3.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "MIZUsin_room_4"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/MIZUsin/MIZUsin_room_4.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "MIZUsin_room_5"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/MIZUsin/MIZUsin_room_5.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "MIZUsin_room_6"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/MIZUsin/MIZUsin_room_6.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "MIZUsin_room_7"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/MIZUsin/MIZUsin_room_7.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "MIZUsin_room_8"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/MIZUsin/MIZUsin_room_8.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "MIZUsin_room_9"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/MIZUsin/MIZUsin_room_9.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "MIZUsin_room_10"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/MIZUsin/MIZUsin_room_10.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "MIZUsin_room_11"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/MIZUsin/MIZUsin_room_11.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "MIZUsin_room_12"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/MIZUsin/MIZUsin_room_12.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "MIZUsin_room_13"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/MIZUsin/MIZUsin_room_13.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "MIZUsin_room_14"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/MIZUsin/MIZUsin_room_14.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "MIZUsin_room_15"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/MIZUsin/MIZUsin_room_15.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "MIZUsin_room_16"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/MIZUsin/MIZUsin_room_16.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "MIZUsin_room_17"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/MIZUsin/MIZUsin_room_17.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "MIZUsin_room_18"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/MIZUsin/MIZUsin_room_18.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "MIZUsin_room_19"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/MIZUsin/MIZUsin_room_19.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "MIZUsin_room_20"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/MIZUsin/MIZUsin_room_20.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "MIZUsin_room_21"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/MIZUsin/MIZUsin_room_21.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "MIZUsin_room_22"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/MIZUsin/MIZUsin_room_22.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "jyasinzou_scene"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/jyasinzou/jyasinzou_scene.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 2
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "jyasinzou_room_0"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/jyasinzou/jyasinzou_room_0.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "jyasinzou_room_1"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/jyasinzou/jyasinzou_room_1.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "jyasinzou_room_2"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/jyasinzou/jyasinzou_room_2.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "jyasinzou_room_3"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/jyasinzou/jyasinzou_room_3.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "jyasinzou_room_4"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/jyasinzou/jyasinzou_room_4.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "jyasinzou_room_5"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/jyasinzou/jyasinzou_room_5.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "jyasinzou_room_6"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/jyasinzou/jyasinzou_room_6.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "jyasinzou_room_7"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/jyasinzou/jyasinzou_room_7.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "jyasinzou_room_8"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/jyasinzou/jyasinzou_room_8.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "jyasinzou_room_9"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/jyasinzou/jyasinzou_room_9.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "jyasinzou_room_10"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/jyasinzou/jyasinzou_room_10.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "jyasinzou_room_11"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/jyasinzou/jyasinzou_room_11.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "jyasinzou_room_12"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/jyasinzou/jyasinzou_room_12.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "jyasinzou_room_13"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/jyasinzou/jyasinzou_room_13.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "jyasinzou_room_14"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/jyasinzou/jyasinzou_room_14.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "jyasinzou_room_15"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/jyasinzou/jyasinzou_room_15.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "jyasinzou_room_16"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/jyasinzou/jyasinzou_room_16.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "jyasinzou_room_17"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/jyasinzou/jyasinzou_room_17.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "jyasinzou_room_18"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/jyasinzou/jyasinzou_room_18.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "jyasinzou_room_19"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/jyasinzou/jyasinzou_room_19.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "jyasinzou_room_20"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/jyasinzou/jyasinzou_room_20.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "jyasinzou_room_21"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/jyasinzou/jyasinzou_room_21.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "jyasinzou_room_22"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/jyasinzou/jyasinzou_room_22.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "jyasinzou_room_23"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/jyasinzou/jyasinzou_room_23.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "jyasinzou_room_24"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/jyasinzou/jyasinzou_room_24.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "jyasinzou_room_25"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/jyasinzou/jyasinzou_room_25.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "jyasinzou_room_26"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/jyasinzou/jyasinzou_room_26.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "jyasinzou_room_27"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/jyasinzou/jyasinzou_room_27.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "jyasinzou_room_28"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/jyasinzou/jyasinzou_room_28.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "HAKAdan_scene"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/HAKAdan/HAKAdan_scene.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 2
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "HAKAdan_room_0"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/HAKAdan/HAKAdan_room_0.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "HAKAdan_room_1"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/HAKAdan/HAKAdan_room_1.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "HAKAdan_room_2"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/HAKAdan/HAKAdan_room_2.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "HAKAdan_room_3"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/HAKAdan/HAKAdan_room_3.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "HAKAdan_room_4"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/HAKAdan/HAKAdan_room_4.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "HAKAdan_room_5"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/HAKAdan/HAKAdan_room_5.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "HAKAdan_room_6"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/HAKAdan/HAKAdan_room_6.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "HAKAdan_room_7"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/HAKAdan/HAKAdan_room_7.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "HAKAdan_room_8"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/HAKAdan/HAKAdan_room_8.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "HAKAdan_room_9"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/HAKAdan/HAKAdan_room_9.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "HAKAdan_room_10"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/HAKAdan/HAKAdan_room_10.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "HAKAdan_room_11"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/HAKAdan/HAKAdan_room_11.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "HAKAdan_room_12"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/HAKAdan/HAKAdan_room_12.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "HAKAdan_room_13"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/HAKAdan/HAKAdan_room_13.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "HAKAdan_room_14"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/HAKAdan/HAKAdan_room_14.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "HAKAdan_room_15"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/HAKAdan/HAKAdan_room_15.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "HAKAdan_room_16"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/HAKAdan/HAKAdan_room_16.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "HAKAdan_room_17"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/HAKAdan/HAKAdan_room_17.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "HAKAdan_room_18"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/HAKAdan/HAKAdan_room_18.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "HAKAdan_room_19"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/HAKAdan/HAKAdan_room_19.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "HAKAdan_room_20"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/HAKAdan/HAKAdan_room_20.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "HAKAdan_room_21"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/HAKAdan/HAKAdan_room_21.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "HAKAdan_room_22"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/HAKAdan/HAKAdan_room_22.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "HAKAdanCH_scene"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/HAKAdanCH/HAKAdanCH_scene.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 2
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "HAKAdanCH_room_0"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/HAKAdanCH/HAKAdanCH_room_0.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "HAKAdanCH_room_1"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/HAKAdanCH/HAKAdanCH_room_1.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "HAKAdanCH_room_2"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/HAKAdanCH/HAKAdanCH_room_2.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "HAKAdanCH_room_3"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/HAKAdanCH/HAKAdanCH_room_3.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "HAKAdanCH_room_4"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/HAKAdanCH/HAKAdanCH_room_4.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "HAKAdanCH_room_5"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/HAKAdanCH/HAKAdanCH_room_5.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "HAKAdanCH_room_6"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/HAKAdanCH/HAKAdanCH_room_6.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ice_doukutu_scene"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/ice_doukutu/ice_doukutu_scene.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 2
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ice_doukutu_room_0"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_0.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ice_doukutu_room_1"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_1.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ice_doukutu_room_2"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_2.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ice_doukutu_room_3"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_3.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ice_doukutu_room_4"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_4.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ice_doukutu_room_5"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_5.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ice_doukutu_room_6"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_6.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ice_doukutu_room_7"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_7.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ice_doukutu_room_8"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_8.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ice_doukutu_room_9"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_9.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ice_doukutu_room_10"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_10.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ice_doukutu_room_11"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_11.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "men_scene"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/men/men_scene.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 2
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "men_room_0"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/men/men_room_0.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "men_room_1"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/men/men_room_1.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "men_room_2"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/men/men_room_2.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "men_room_3"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/men/men_room_3.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "men_room_4"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/men/men_room_4.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "men_room_5"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/men/men_room_5.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "men_room_6"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/men/men_room_6.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "men_room_7"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/men/men_room_7.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "men_room_8"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/men/men_room_8.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "men_room_9"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/men/men_room_9.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "men_room_10"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/men/men_room_10.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ganontika_scene"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/ganontika/ganontika_scene.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 2
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ganontika_room_0"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/ganontika/ganontika_room_0.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ganontika_room_1"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/ganontika/ganontika_room_1.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ganontika_room_2"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/ganontika/ganontika_room_2.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ganontika_room_3"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/ganontika/ganontika_room_3.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ganontika_room_4"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/ganontika/ganontika_room_4.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ganontika_room_5"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/ganontika/ganontika_room_5.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ganontika_room_6"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/ganontika/ganontika_room_6.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ganontika_room_7"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/ganontika/ganontika_room_7.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ganontika_room_8"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/ganontika/ganontika_room_8.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ganontika_room_9"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/ganontika/ganontika_room_9.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ganontika_room_10"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/ganontika/ganontika_room_10.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ganontika_room_11"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/ganontika/ganontika_room_11.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ganontika_room_12"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/ganontika/ganontika_room_12.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ganontika_room_13"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/ganontika/ganontika_room_13.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ganontika_room_14"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/ganontika/ganontika_room_14.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ganontika_room_15"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/ganontika/ganontika_room_15.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ganontika_room_16"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/ganontika/ganontika_room_16.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ganontika_room_17"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/ganontika/ganontika_room_17.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ganontika_room_18"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/ganontika/ganontika_room_18.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ganontika_room_19"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/ganontika/ganontika_room_19.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "syotes_scene"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/test_levels/syotes/syotes_scene.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 2
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "syotes_room_0"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/test_levels/syotes/syotes_room_0.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "syotes2_scene"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/test_levels/syotes2/syotes2_scene.o"
ovl_en_mm2 OK (#636) * decompiled ovl_en_mm2 * resolved conflicts * add back huta * review suggestions * review 2 suggestions Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-02-02 21:41:03 +00:00
number 2
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "syotes2_room_0"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/test_levels/syotes2/syotes2_room_0.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "depth_test_scene"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/test_levels/depth_test/depth_test_scene.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 2
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "depth_test_room_0"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/test_levels/depth_test/depth_test_room_0.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "spot00_scene"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/overworld/spot00/spot00_scene.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 2
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "spot00_room_0"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/overworld/spot00/spot00_room_0.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "spot01_scene"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/overworld/spot01/spot01_scene.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 2
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "spot01_room_0"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/overworld/spot01/spot01_room_0.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "spot02_scene"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/overworld/spot02/spot02_scene.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 2
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "spot02_room_0"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/overworld/spot02/spot02_room_0.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "spot02_room_1"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/overworld/spot02/spot02_room_1.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "spot03_scene"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/overworld/spot03/spot03_scene.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 2
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "spot03_room_0"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/overworld/spot03/spot03_room_0.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "spot03_room_1"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/overworld/spot03/spot03_room_1.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "spot04_scene"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/overworld/spot04/spot04_scene.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 2
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "spot04_room_0"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/overworld/spot04/spot04_room_0.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "spot04_room_1"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/overworld/spot04/spot04_room_1.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "spot04_room_2"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/overworld/spot04/spot04_room_2.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "spot05_scene"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/overworld/spot05/spot05_scene.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 2
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "spot05_room_0"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/overworld/spot05/spot05_room_0.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "spot06_scene"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/overworld/spot06/spot06_scene.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 2
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "spot06_room_0"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/overworld/spot06/spot06_room_0.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "spot07_scene"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/overworld/spot07/spot07_scene.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 2
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "spot07_room_0"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/overworld/spot07/spot07_room_0.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "spot07_room_1"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/overworld/spot07/spot07_room_1.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "spot08_scene"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/overworld/spot08/spot08_scene.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 2
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "spot08_room_0"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/overworld/spot08/spot08_room_0.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "spot09_scene"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/overworld/spot09/spot09_scene.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 2
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "spot09_room_0"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/overworld/spot09/spot09_room_0.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "spot10_scene"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/overworld/spot10/spot10_scene.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 2
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "spot10_room_0"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/overworld/spot10/spot10_room_0.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "spot10_room_1"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/overworld/spot10/spot10_room_1.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "spot10_room_2"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/overworld/spot10/spot10_room_2.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "spot10_room_3"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/overworld/spot10/spot10_room_3.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "spot10_room_4"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/overworld/spot10/spot10_room_4.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "spot10_room_5"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/overworld/spot10/spot10_room_5.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "spot10_room_6"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/overworld/spot10/spot10_room_6.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "spot10_room_7"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/overworld/spot10/spot10_room_7.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "spot10_room_8"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/overworld/spot10/spot10_room_8.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "spot10_room_9"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/overworld/spot10/spot10_room_9.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "spot11_scene"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/overworld/spot11/spot11_scene.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 2
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "spot11_room_0"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/overworld/spot11/spot11_room_0.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "spot12_scene"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/overworld/spot12/spot12_scene.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 2
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "spot12_room_0"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/overworld/spot12/spot12_room_0.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "spot12_room_1"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/overworld/spot12/spot12_room_1.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "spot13_scene"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/overworld/spot13/spot13_scene.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 2
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "spot13_room_0"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/overworld/spot13/spot13_room_0.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "spot13_room_1"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/overworld/spot13/spot13_room_1.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "spot15_scene"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/overworld/spot15/spot15_scene.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 2
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "spot15_room_0"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/overworld/spot15/spot15_room_0.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "spot16_scene"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/overworld/spot16/spot16_scene.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 2
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "spot16_room_0"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/overworld/spot16/spot16_room_0.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "spot17_scene"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/overworld/spot17/spot17_scene.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 2
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "spot17_room_0"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/overworld/spot17/spot17_room_0.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "spot17_room_1"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/overworld/spot17/spot17_room_1.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "spot18_scene"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/overworld/spot18/spot18_scene.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 2
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "spot18_room_0"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/overworld/spot18/spot18_room_0.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "spot18_room_1"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/overworld/spot18/spot18_room_1.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "spot18_room_2"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/overworld/spot18/spot18_room_2.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "spot18_room_3"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/overworld/spot18/spot18_room_3.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "market_day_scene"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/misc/market_day/market_day_scene.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 2
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "market_day_room_0"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/misc/market_day/market_day_room_0.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "market_night_scene"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/misc/market_night/market_night_scene.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 2
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "market_night_room_0"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/misc/market_night/market_night_room_0.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "testroom_scene"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/test_levels/testroom/testroom_scene.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 2
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "testroom_room_0"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/test_levels/testroom/testroom_room_0.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "testroom_room_1"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/test_levels/testroom/testroom_room_1.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "testroom_room_2"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/test_levels/testroom/testroom_room_2.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "testroom_room_3"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/test_levels/testroom/testroom_room_3.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "testroom_room_4"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/test_levels/testroom/testroom_room_4.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "kenjyanoma_scene"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/indoors/kenjyanoma/kenjyanoma_scene.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 2
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "kenjyanoma_room_0"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/indoors/kenjyanoma/kenjyanoma_room_0.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "tokinoma_scene"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/indoors/tokinoma/tokinoma_scene.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 2
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "tokinoma_room_0"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/indoors/tokinoma/tokinoma_room_0.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "tokinoma_room_1"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/indoors/tokinoma/tokinoma_room_1.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "sutaru_scene"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/test_levels/sutaru/sutaru_scene.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 2
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "sutaru_room_0"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/test_levels/sutaru/sutaru_room_0.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "link_home_scene"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/indoors/link_home/link_home_scene.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 2
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "link_home_room_0"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/indoors/link_home/link_home_room_0.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "kokiri_shop_scene"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/shops/kokiri_shop/kokiri_shop_scene.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 2
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "kokiri_shop_room_0"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/shops/kokiri_shop/kokiri_shop_room_0.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "kokiri_home_scene"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/indoors/kokiri_home/kokiri_home_scene.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 2
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "kokiri_home_room_0"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/indoors/kokiri_home/kokiri_home_room_0.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "kakusiana_scene"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/misc/kakusiana/kakusiana_scene.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 2
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "kakusiana_room_0"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/misc/kakusiana/kakusiana_room_0.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "kakusiana_room_1"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/misc/kakusiana/kakusiana_room_1.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "kakusiana_room_2"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/misc/kakusiana/kakusiana_room_2.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "kakusiana_room_3"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/misc/kakusiana/kakusiana_room_3.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "kakusiana_room_4"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/misc/kakusiana/kakusiana_room_4.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "kakusiana_room_5"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/misc/kakusiana/kakusiana_room_5.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "kakusiana_room_6"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/misc/kakusiana/kakusiana_room_6.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "kakusiana_room_7"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/misc/kakusiana/kakusiana_room_7.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "kakusiana_room_8"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/misc/kakusiana/kakusiana_room_8.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "kakusiana_room_9"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/misc/kakusiana/kakusiana_room_9.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "kakusiana_room_10"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/misc/kakusiana/kakusiana_room_10.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "kakusiana_room_11"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/misc/kakusiana/kakusiana_room_11.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "kakusiana_room_12"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/misc/kakusiana/kakusiana_room_12.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "kakusiana_room_13"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/misc/kakusiana/kakusiana_room_13.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "entra_scene"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/overworld/entra/entra_scene.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 2
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "entra_room_0"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/overworld/entra/entra_room_0.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "moribossroom_scene"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/moribossroom/moribossroom_scene.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 2
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "moribossroom_room_0"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/moribossroom/moribossroom_room_0.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "moribossroom_room_1"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/moribossroom/moribossroom_room_1.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "syatekijyou_scene"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/indoors/syatekijyou/syatekijyou_scene.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 2
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "syatekijyou_room_0"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/indoors/syatekijyou/syatekijyou_room_0.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "shop1_scene"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/shops/shop1/shop1_scene.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 2
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "shop1_room_0"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/shops/shop1/shop1_room_0.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "hairal_niwa_scene"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/indoors/hairal_niwa/hairal_niwa_scene.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 2
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "hairal_niwa_room_0"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/indoors/hairal_niwa/hairal_niwa_room_0.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ganon_tou_scene"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/ganon_tou/ganon_tou_scene.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 2
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ganon_tou_room_0"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/ganon_tou/ganon_tou_room_0.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "sasatest_scene"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/test_levels/sasatest/sasatest_scene.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 2
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "sasatest_room_0"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/test_levels/sasatest/sasatest_room_0.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "market_alley_scene"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/misc/market_alley/market_alley_scene.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 2
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "market_alley_room_0"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/misc/market_alley/market_alley_room_0.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "spot20_scene"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/overworld/spot20/spot20_scene.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 2
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "spot20_room_0"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/overworld/spot20/spot20_room_0.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "market_ruins_scene"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/misc/market_ruins/market_ruins_scene.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 2
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "market_ruins_room_0"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/misc/market_ruins/market_ruins_room_0.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "entra_n_scene"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/misc/entra_n/entra_n_scene.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 2
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "entra_n_room_0"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/misc/entra_n/entra_n_room_0.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "enrui_scene"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/misc/enrui/enrui_scene.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 2
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "enrui_room_0"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/misc/enrui/enrui_room_0.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "market_alley_n_scene"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/misc/market_alley_n/market_alley_n_scene.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 2
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "market_alley_n_room_0"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/misc/market_alley_n/market_alley_n_room_0.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "hiral_demo_scene"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/misc/hiral_demo/hiral_demo_scene.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 2
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "hiral_demo_room_0"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/misc/hiral_demo/hiral_demo_room_0.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "kokiri_home3_scene"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/indoors/kokiri_home3/kokiri_home3_scene.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 2
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "kokiri_home3_room_0"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/indoors/kokiri_home3/kokiri_home3_room_0.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "malon_stable_scene"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/indoors/malon_stable/malon_stable_scene.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 2
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "malon_stable_room_0"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/indoors/malon_stable/malon_stable_room_0.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "kakariko_scene"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/indoors/kakariko/kakariko_scene.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 2
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "kakariko_room_0"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/indoors/kakariko/kakariko_room_0.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "bdan_boss_scene"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/bdan_boss/bdan_boss_scene.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 2
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "bdan_boss_room_0"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/bdan_boss/bdan_boss_room_0.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "bdan_boss_room_1"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/bdan_boss/bdan_boss_room_1.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "FIRE_bs_scene"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/FIRE_bs/FIRE_bs_scene.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 2
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "FIRE_bs_room_0"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/FIRE_bs/FIRE_bs_room_0.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "FIRE_bs_room_1"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/FIRE_bs/FIRE_bs_room_1.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "hut_scene"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/indoors/hut/hut_scene.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 2
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "hut_room_0"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/indoors/hut/hut_room_0.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "daiyousei_izumi_scene"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/indoors/daiyousei_izumi/daiyousei_izumi_scene.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 2
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "daiyousei_izumi_room_0"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/indoors/daiyousei_izumi/daiyousei_izumi_room_0.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "hakaana_scene"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/misc/hakaana/hakaana_scene.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 2
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "hakaana_room_0"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/misc/hakaana/hakaana_room_0.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "yousei_izumi_tate_scene"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/indoors/yousei_izumi_tate/yousei_izumi_tate_scene.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 2
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "yousei_izumi_tate_room_0"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/indoors/yousei_izumi_tate/yousei_izumi_tate_room_0.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "yousei_izumi_yoko_scene"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/indoors/yousei_izumi_yoko/yousei_izumi_yoko_scene.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 2
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "yousei_izumi_yoko_room_0"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/indoors/yousei_izumi_yoko/yousei_izumi_yoko_room_0.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "golon_scene"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/shops/golon/golon_scene.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 2
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "golon_room_0"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/shops/golon/golon_room_0.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "zoora_scene"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/shops/zoora/zoora_scene.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 2
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "zoora_room_0"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/shops/zoora/zoora_room_0.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "drag_scene"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/shops/drag/drag_scene.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 2
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "drag_room_0"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/shops/drag/drag_room_0.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "alley_shop_scene"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/shops/alley_shop/alley_shop_scene.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 2
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "alley_shop_room_0"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/shops/alley_shop/alley_shop_room_0.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "night_shop_scene"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/shops/night_shop/night_shop_scene.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 2
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "night_shop_room_0"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/shops/night_shop/night_shop_room_0.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "impa_scene"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/indoors/impa/impa_scene.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 2
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "impa_room_0"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/indoors/impa/impa_room_0.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "labo_scene"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/indoors/labo/labo_scene.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 2
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "labo_room_0"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/indoors/labo/labo_room_0.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "tent_scene"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/indoors/tent/tent_scene.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 2
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "tent_room_0"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/indoors/tent/tent_room_0.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "nakaniwa_scene"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/indoors/nakaniwa/nakaniwa_scene.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 2
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "nakaniwa_room_0"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/indoors/nakaniwa/nakaniwa_room_0.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ddan_boss_scene"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/ddan_boss/ddan_boss_scene.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 2
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ddan_boss_room_0"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/ddan_boss/ddan_boss_room_0.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ddan_boss_room_1"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/ddan_boss/ddan_boss_room_1.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ydan_boss_scene"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/ydan_boss/ydan_boss_scene.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 2
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ydan_boss_room_0"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/ydan_boss/ydan_boss_room_0.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ydan_boss_room_1"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/ydan_boss/ydan_boss_room_1.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "HAKAdan_bs_scene"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/HAKAdan_bs/HAKAdan_bs_scene.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 2
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "HAKAdan_bs_room_0"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/HAKAdan_bs/HAKAdan_bs_room_0.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "HAKAdan_bs_room_1"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/HAKAdan_bs/HAKAdan_bs_room_1.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "MIZUsin_bs_scene"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/MIZUsin_bs/MIZUsin_bs_scene.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 2
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "MIZUsin_bs_room_0"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/MIZUsin_bs/MIZUsin_bs_room_0.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "MIZUsin_bs_room_1"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/MIZUsin_bs/MIZUsin_bs_room_1.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ganon_scene"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/ganon/ganon_scene.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 2
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ganon_room_0"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/ganon/ganon_room_0.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ganon_room_1"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/ganon/ganon_room_1.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ganon_room_2"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/ganon/ganon_room_2.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ganon_room_3"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/ganon/ganon_room_3.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ganon_room_4"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/ganon/ganon_room_4.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ganon_room_5"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/ganon/ganon_room_5.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ganon_room_6"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/ganon/ganon_room_6.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ganon_room_7"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/ganon/ganon_room_7.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ganon_room_8"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/ganon/ganon_room_8.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ganon_room_9"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/ganon/ganon_room_9.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ganon_boss_scene"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/ganon_boss/ganon_boss_scene.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 2
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ganon_boss_room_0"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/ganon_boss/ganon_boss_room_0.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "jyasinboss_scene"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/jyasinboss/jyasinboss_scene.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 2
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "jyasinboss_room_0"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/jyasinboss/jyasinboss_room_0.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "jyasinboss_room_1"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/jyasinboss/jyasinboss_room_1.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "jyasinboss_room_2"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/jyasinboss/jyasinboss_room_2.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "jyasinboss_room_3"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/jyasinboss/jyasinboss_room_3.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "kokiri_home4_scene"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/indoors/kokiri_home4/kokiri_home4_scene.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 2
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "kokiri_home4_room_0"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/indoors/kokiri_home4/kokiri_home4_room_0.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "kokiri_home5_scene"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/indoors/kokiri_home5/kokiri_home5_scene.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 2
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "kokiri_home5_room_0"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/indoors/kokiri_home5/kokiri_home5_room_0.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ganon_final_scene"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/ganon_final/ganon_final_scene.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 2
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ganon_final_room_0"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/ganon_final/ganon_final_room_0.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "kakariko3_scene"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/misc/kakariko3/kakariko3_scene.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 2
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "kakariko3_room_0"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/misc/kakariko3/kakariko3_room_0.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "hairal_niwa2_scene"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/indoors/hairal_niwa2/hairal_niwa2_scene.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 2
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "hairal_niwa2_room_0"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/indoors/hairal_niwa2/hairal_niwa2_room_0.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "hakasitarelay_scene"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/indoors/hakasitarelay/hakasitarelay_scene.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 2
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "hakasitarelay_room_0"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/indoors/hakasitarelay/hakasitarelay_room_0.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "hakasitarelay_room_1"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/indoors/hakasitarelay/hakasitarelay_room_1.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "hakasitarelay_room_2"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/indoors/hakasitarelay/hakasitarelay_room_2.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "hakasitarelay_room_3"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/indoors/hakasitarelay/hakasitarelay_room_3.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "hakasitarelay_room_4"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/indoors/hakasitarelay/hakasitarelay_room_4.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "hakasitarelay_room_5"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/indoors/hakasitarelay/hakasitarelay_room_5.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "hakasitarelay_room_6"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/indoors/hakasitarelay/hakasitarelay_room_6.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "shrine_scene"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/misc/shrine/shrine_scene.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 2
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "shrine_room_0"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/misc/shrine/shrine_room_0.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "turibori_scene"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/misc/turibori/turibori_scene.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 2
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "turibori_room_0"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/misc/turibori/turibori_room_0.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "shrine_n_scene"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/misc/shrine_n/shrine_n_scene.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 2
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "shrine_n_room_0"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/misc/shrine_n/shrine_n_room_0.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "shrine_r_scene"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/misc/shrine_r/shrine_r_scene.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 2
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "shrine_r_room_0"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/misc/shrine_r/shrine_r_room_0.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "hakaana2_scene"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/misc/hakaana2/hakaana2_scene.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 2
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "hakaana2_room_0"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/misc/hakaana2/hakaana2_room_0.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "gerudoway_scene"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/gerudoway/gerudoway_scene.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 2
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "gerudoway_room_0"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/gerudoway/gerudoway_room_0.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "gerudoway_room_1"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/gerudoway/gerudoway_room_1.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "gerudoway_room_2"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/gerudoway/gerudoway_room_2.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "gerudoway_room_3"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/gerudoway/gerudoway_room_3.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "gerudoway_room_4"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/gerudoway/gerudoway_room_4.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "gerudoway_room_5"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/gerudoway/gerudoway_room_5.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "hairal_niwa_n_scene"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/indoors/hairal_niwa_n/hairal_niwa_n_scene.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 2
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "hairal_niwa_n_room_0"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/indoors/hairal_niwa_n/hairal_niwa_n_room_0.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "bowling_scene"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/indoors/bowling/bowling_scene.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 2
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "bowling_room_0"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/indoors/bowling/bowling_room_0.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "hakaana_ouke_scene"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/misc/hakaana_ouke/hakaana_ouke_scene.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 2
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "hakaana_ouke_room_0"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/misc/hakaana_ouke/hakaana_ouke_room_0.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "hakaana_ouke_room_1"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/misc/hakaana_ouke/hakaana_ouke_room_1.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "hakaana_ouke_room_2"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/misc/hakaana_ouke/hakaana_ouke_room_2.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "hylia_labo_scene"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/indoors/hylia_labo/hylia_labo_scene.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 2
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "hylia_labo_room_0"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/indoors/hylia_labo/hylia_labo_room_0.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "souko_scene"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/overworld/souko/souko_scene.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 2
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "souko_room_0"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/overworld/souko/souko_room_0.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "souko_room_1"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/overworld/souko/souko_room_1.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "souko_room_2"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/overworld/souko/souko_room_2.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "miharigoya_scene"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/indoors/miharigoya/miharigoya_scene.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 2
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "miharigoya_room_0"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/indoors/miharigoya/miharigoya_room_0.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "mahouya_scene"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/indoors/mahouya/mahouya_scene.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 2
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "mahouya_room_0"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/indoors/mahouya/mahouya_room_0.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "takaraya_scene"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/indoors/takaraya/takaraya_scene.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 2
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "takaraya_room_0"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/indoors/takaraya/takaraya_room_0.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "takaraya_room_1"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/indoors/takaraya/takaraya_room_1.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "takaraya_room_2"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/indoors/takaraya/takaraya_room_2.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "takaraya_room_3"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/indoors/takaraya/takaraya_room_3.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "takaraya_room_4"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/indoors/takaraya/takaraya_room_4.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "takaraya_room_5"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/indoors/takaraya/takaraya_room_5.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "takaraya_room_6"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/indoors/takaraya/takaraya_room_6.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ganon_sonogo_scene"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/ganon_sonogo/ganon_sonogo_scene.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 2
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ganon_sonogo_room_0"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/ganon_sonogo/ganon_sonogo_room_0.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ganon_sonogo_room_1"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/ganon_sonogo/ganon_sonogo_room_1.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ganon_sonogo_room_2"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/ganon_sonogo/ganon_sonogo_room_2.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ganon_sonogo_room_3"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/ganon_sonogo/ganon_sonogo_room_3.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ganon_sonogo_room_4"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/ganon_sonogo/ganon_sonogo_room_4.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ganon_demo_scene"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/ganon_demo/ganon_demo_scene.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 2
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ganon_demo_room_0"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/ganon_demo/ganon_demo_room_0.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "besitu_scene"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/test_levels/besitu/besitu_scene.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 2
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "besitu_room_0"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/test_levels/besitu/besitu_room_0.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "face_shop_scene"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/shops/face_shop/face_shop_scene.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 2
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "face_shop_room_0"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/shops/face_shop/face_shop_room_0.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "kinsuta_scene"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/misc/kinsuta/kinsuta_scene.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 2
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "kinsuta_room_0"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/misc/kinsuta/kinsuta_room_0.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ganontikasonogo_scene"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/ganontikasonogo/ganontikasonogo_scene.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 2
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ganontikasonogo_room_0"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/ganontikasonogo/ganontikasonogo_room_0.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "ganontikasonogo_room_1"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/dungeons/ganontikasonogo/ganontikasonogo_room_1.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "test01_scene"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/test_levels/test01/test01_scene.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 2
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "test01_room_0"
romalign 0x1000
Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 11:39:52 +00:00
include "build/assets/scenes/test_levels/test01/test01_room_0.o"
Remove submodule and use subrepo for ZAPD (#591) * remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2021-01-02 04:24:29 +00:00
number 3
First proper commit.
2020-03-17 04:31:30 +00:00
endseg
beginseg
name "bump_texture_static"
romalign 0x1000
include "build/baserom/bump_texture_static.o"
endseg
beginseg
name "anime_model_1_static"
romalign 0x1000
include "build/baserom/anime_model_1_static.o"
endseg
beginseg
name "anime_model_2_static"
romalign 0x1000
include "build/baserom/anime_model_2_static.o"
endseg
beginseg
name "anime_model_3_static"
romalign 0x1000
include "build/baserom/anime_model_3_static.o"
endseg
beginseg
name "anime_model_4_static"
romalign 0x1000
include "build/baserom/anime_model_4_static.o"
endseg
beginseg
name "anime_model_5_static"
romalign 0x1000
include "build/baserom/anime_model_5_static.o"
endseg
beginseg
name "anime_model_6_static"
romalign 0x1000
include "build/baserom/anime_model_6_static.o"
endseg
beginseg
name "anime_texture_1_static"
romalign 0x1000
include "build/baserom/anime_texture_1_static.o"
endseg
beginseg
name "anime_texture_2_static"
romalign 0x1000
include "build/baserom/anime_texture_2_static.o"
endseg
beginseg
name "anime_texture_3_static"
romalign 0x1000
include "build/baserom/anime_texture_3_static.o"
endseg
beginseg
name "anime_texture_4_static"
romalign 0x1000
include "build/baserom/anime_texture_4_static.o"
endseg
beginseg
name "anime_texture_5_static"
romalign 0x1000
include "build/baserom/anime_texture_5_static.o"
endseg
beginseg
name "anime_texture_6_static"
romalign 0x1000
include "build/baserom/anime_texture_6_static.o"
endseg
beginseg
name "softsprite_matrix_static"
romalign 0x1000
include "build/baserom/softsprite_matrix_static.o"
ovl_en_mm2 OK (#636) * decompiled ovl_en_mm2 * resolved conflicts * add back huta * review suggestions * review 2 suggestions Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-02-02 21:41:03 +00:00
endseg
Copy Permalink