1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-11-13 12:59:59 +00:00
oot/asm/non_matchings/overlays/actors
Nicholas Estelami b95643b397
Updated Texture Asset Handling (#478)
* Auto stash before rebase of "upstream/master"

* A large number of scenes have been decompiled.

* Fixed makefile

* Decompiled around 40 scenes.

* Removed old file

* Finished matching remaining scenes.

* Removed old commented out spec lines

* Decompiled a few object files.

* Reorganized xmls a bit. Updated pu_box overlay to use proper symbol.

* Updated texture and object file decomp

* Fixed newline issue with ZAPD

* Moved scenes/ into the assets/ folder

* Fixed a few compile errors

* Auto stash before rebase of "upstream/master"

* A large number of scenes have been decompiled.

* Fixed makefile

* Decompiled around 40 scenes.

* Removed old file

* Finished matching remaining scenes.

* Removed old commented out spec lines

* Decompiled a few object files.

* Reorganized xmls a bit. Updated pu_box overlay to use proper symbol.

* Updated texture and object file decomp

* Moved scenes/ into the assets/ folder

* Fixed a few compile errors

* Fixed merge issues.

* Fixed makefile merge error

* Fixed additional merge error

* Fixed several more merge issues

* Commented out gameplay_keep and sk2 extraction, since currently unused.

* Reenabled gameplay_keep extraction since it's used in the spec

* Fixed build error

* Removed test struct

* Fixed makefile error that would happen on fresh builds

* Fixed merge issue

* Removed relative paths

* Multithreading on extraction, spec uses numbers, few changes to XMLs

* Removed redundant code from the extract_assets script

* object_sk2 and object_spot09_obj OK

* object_spot11_obj OK

* object_spot17_obj OK

* Test: One of the gameplay_keep dlists given a proper symbol

* Updated asset symbol names based on new naming scheme

* XMLs use "Offset" instead of "Address" now

* Fixed merge issues, updated ovl_Magic_Dark xml and gfx file

* Updated to use latest build of ZAPD

* Updated ZAPD again

* Updated ZAP to remove assimp dependency

* Jenkins Test: Added .gitkeep file

* Updated ZAP once more

* Updated png file name to comply with new naming scheme.

* Fixed bad include

Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 06:39:52 -05:00
..
ovl_Bg_Bombwall Consistent naming for Math_ functions (#542) 2020-12-26 05:44:53 -05:00
ovl_Bg_Breakwall Consistent naming for Math_ functions (#542) 2020-12-26 05:44:53 -05:00
ovl_Bg_Dy_Yoseizo Consistent naming for Math_ functions (#542) 2020-12-26 05:44:53 -05:00
ovl_Bg_Gnd_Firemeiro Consistent naming for Math_ functions (#542) 2020-12-26 05:44:53 -05:00
ovl_Bg_Gnd_Iceblock Consistent naming for Math_ functions (#542) 2020-12-26 05:44:53 -05:00
ovl_Bg_Haka_Gate Consistent naming for Math_ functions (#542) 2020-12-26 05:44:53 -05:00
ovl_Bg_Haka_Huta Consistent naming for Math_ functions (#542) 2020-12-26 05:44:53 -05:00
ovl_Bg_Haka_Ship Consistent naming for Math_ functions (#542) 2020-12-26 05:44:53 -05:00
ovl_Bg_Haka_Zou Consistent naming for Math_ functions (#542) 2020-12-26 05:44:53 -05:00
ovl_Bg_Hidan_Hamstep Consistent naming for Math_ functions (#542) 2020-12-26 05:44:53 -05:00
ovl_Bg_Hidan_Hrock Consistent naming for Math_ functions (#542) 2020-12-26 05:44:53 -05:00
ovl_Bg_Hidan_Kowarerukabe Consistent naming for Math_ functions (#542) 2020-12-26 05:44:53 -05:00
ovl_Bg_Hidan_Rock Consistent naming for Math_ functions (#542) 2020-12-26 05:44:53 -05:00
ovl_Bg_Hidan_Sekizou Consistent naming for Math_ functions (#542) 2020-12-26 05:44:53 -05:00
ovl_Bg_Hidan_Sima Consistent naming for Math_ functions (#542) 2020-12-26 05:44:53 -05:00
ovl_Bg_Ice_Objects Consistent naming for Math_ functions (#542) 2020-12-26 05:44:53 -05:00
ovl_Bg_Ice_Shelter Consistent naming for Math_ functions (#542) 2020-12-26 05:44:53 -05:00
ovl_Bg_Jya_Bigmirror Undefined Symbols in the ASM (#527) 2020-12-12 14:22:33 -05:00
ovl_Bg_Jya_Cobra Consistent naming for Math_ functions (#542) 2020-12-26 05:44:53 -05:00
ovl_Bg_Jya_Ironobj Consistent naming for Math_ functions (#542) 2020-12-26 05:44:53 -05:00
ovl_Bg_Mizu_Bwall Consistent naming for Math_ functions (#542) 2020-12-26 05:44:53 -05:00
ovl_Bg_Mizu_Movebg Consistent naming for Math_ functions (#542) 2020-12-26 05:44:53 -05:00
ovl_Bg_Spot00_Hanebasi Consistent naming for Math_ functions (#542) 2020-12-26 05:44:53 -05:00
ovl_Bg_Spot02_Objects Consistent naming for Math_ functions (#542) 2020-12-26 05:44:53 -05:00
ovl_Bg_Spot06_Objects Consistent naming for Math_ functions (#542) 2020-12-26 05:44:53 -05:00
ovl_Bg_Spot07_Taki Undefined Symbols in the ASM (#527) 2020-12-12 14:22:33 -05:00
ovl_Bg_Spot08_Iceblock Consistent naming for Math_ functions (#542) 2020-12-26 05:44:53 -05:00
ovl_Bg_Sst_Floor Consistent naming for Math_ functions (#542) 2020-12-26 05:44:53 -05:00
ovl_Bg_Toki_Hikari Undefined Symbols in the ASM (#527) 2020-12-12 14:22:33 -05:00
ovl_Bg_Vb_Sima Consistent naming for Math_ functions (#542) 2020-12-26 05:44:53 -05:00
ovl_Bg_Ydan_Sp Consistent naming for Math_ functions (#542) 2020-12-26 05:44:53 -05:00
ovl_Boss_Dodongo Consistent naming for Math_ functions (#542) 2020-12-26 05:44:53 -05:00
ovl_Boss_Fd Consistent naming for Math_ functions (#542) 2020-12-26 05:44:53 -05:00
ovl_Boss_Fd2 Consistent naming for Math_ functions (#542) 2020-12-26 05:44:53 -05:00
ovl_Boss_Ganon Consistent naming for Math_ functions (#542) 2020-12-26 05:44:53 -05:00
ovl_Boss_Ganon2 Consistent naming for Math_ functions (#542) 2020-12-26 05:44:53 -05:00
ovl_Boss_Ganondrof Consistent naming for Math_ functions (#542) 2020-12-26 05:44:53 -05:00
ovl_Boss_Goma Consistent naming for Math_ functions (#542) 2020-12-26 05:44:53 -05:00
ovl_Boss_Mo Consistent naming for Math_ functions (#542) 2020-12-26 05:44:53 -05:00
ovl_Boss_Sst Consistent naming for Math_ functions (#542) 2020-12-26 05:44:53 -05:00
ovl_Boss_Tw Consistent naming for Math_ functions (#542) 2020-12-26 05:44:53 -05:00
ovl_Boss_Va Consistent naming for Math_ functions (#542) 2020-12-26 05:44:53 -05:00
ovl_Demo_6K Updated Texture Asset Handling (#478) 2020-12-26 06:39:52 -05:00
ovl_Demo_Du Consistent naming for Math_ functions (#542) 2020-12-26 05:44:53 -05:00
ovl_Demo_Ext Undefined Symbols in the ASM (#527) 2020-12-12 14:22:33 -05:00
ovl_Demo_Gj Consistent naming for Math_ functions (#542) 2020-12-26 05:44:53 -05:00
ovl_Demo_Ik Undefined Symbols in the ASM (#527) 2020-12-12 14:22:33 -05:00
ovl_Demo_Kankyo Updated Texture Asset Handling (#478) 2020-12-26 06:39:52 -05:00
ovl_Demo_Kekkai Consistent naming for Math_ functions (#542) 2020-12-26 05:44:53 -05:00
ovl_Door_Killer Consistent naming for Math_ functions (#542) 2020-12-26 05:44:53 -05:00
ovl_Door_Warp1 Consistent naming for Math_ functions (#542) 2020-12-26 05:44:53 -05:00
ovl_Efc_Erupc Consistent naming for Math_ functions (#542) 2020-12-26 05:44:53 -05:00
ovl_Eff_Dust Consistent naming for Math_ functions (#542) 2020-12-26 05:44:53 -05:00
ovl_En_Am Consistent naming for Math_ functions (#542) 2020-12-26 05:44:53 -05:00
ovl_En_Anubice Consistent naming for Math_ functions (#542) 2020-12-26 05:44:53 -05:00
ovl_En_Anubice_Fire Consistent naming for Math_ functions (#542) 2020-12-26 05:44:53 -05:00
ovl_En_Arrow Consistent naming for Math_ functions (#542) 2020-12-26 05:44:53 -05:00
ovl_En_Ba Consistent naming for Math_ functions (#542) 2020-12-26 05:44:53 -05:00
ovl_En_Bb Consistent naming for Math_ functions (#542) 2020-12-26 05:44:53 -05:00
ovl_En_Bdfire Consistent naming for Math_ functions (#542) 2020-12-26 05:44:53 -05:00
ovl_En_Bigokuta Consistent naming for Math_ functions (#542) 2020-12-26 05:44:53 -05:00
ovl_En_Bili Consistent naming for Math_ functions (#542) 2020-12-26 05:44:53 -05:00
ovl_En_Bom_Chu Consistent naming for Math_ functions (#542) 2020-12-26 05:44:53 -05:00
ovl_En_Brob Consistent naming for Math_ functions (#542) 2020-12-26 05:44:53 -05:00
ovl_En_Bubble Consistent naming for Math_ functions (#542) 2020-12-26 05:44:53 -05:00
ovl_En_Bw Consistent naming for Math_ functions (#542) 2020-12-26 05:44:53 -05:00
ovl_En_Clear_Tag Consistent naming for Math_ functions (#542) 2020-12-26 05:44:53 -05:00
ovl_En_Cs Consistent naming for Math_ functions (#542) 2020-12-26 05:44:53 -05:00
ovl_En_Daiku ovl_En_Daiku OK and documented (#422) 2020-12-03 16:58:05 -05:00
ovl_En_Daiku_Kakariko Consistent naming for Math_ functions (#542) 2020-12-26 05:44:53 -05:00
ovl_En_Dekubaba Consistent naming for Math_ functions (#542) 2020-12-26 05:44:53 -05:00
ovl_En_Dekunuts Consistent naming for Math_ functions (#542) 2020-12-26 05:44:53 -05:00
ovl_En_Diving_Game Consistent naming for Math_ functions (#542) 2020-12-26 05:44:53 -05:00
ovl_En_Dnt_Demo Consistent naming for Math_ functions (#542) 2020-12-26 05:44:53 -05:00
ovl_En_Dnt_Jiji Consistent naming for Math_ functions (#542) 2020-12-26 05:44:53 -05:00
ovl_En_Dnt_Nomal Consistent naming for Math_ functions (#542) 2020-12-26 05:44:53 -05:00
ovl_En_Dodojr Consistent naming for Math_ functions (#542) 2020-12-26 05:44:53 -05:00
ovl_En_Du Consistent naming for Math_ functions (#542) 2020-12-26 05:44:53 -05:00
ovl_En_Eiyer Consistent naming for Math_ functions (#542) 2020-12-26 05:44:53 -05:00
ovl_En_Elf Three new matching functions (#492) 2020-11-19 16:49:08 -05:00
ovl_En_Encount2 Consistent naming for Math_ functions (#542) 2020-12-26 05:44:53 -05:00
ovl_En_Ex_Item Consistent naming for Math_ functions (#542) 2020-12-26 05:44:53 -05:00
ovl_En_fHG Consistent naming for Math_ functions (#542) 2020-12-26 05:44:53 -05:00
ovl_En_Fhg_Fire Consistent naming for Math_ functions (#542) 2020-12-26 05:44:53 -05:00
ovl_En_Fire_Rock Consistent naming for Math_ functions (#542) 2020-12-26 05:44:53 -05:00
ovl_En_Fish Consistent naming for Math_ functions (#542) 2020-12-26 05:44:53 -05:00
ovl_En_Fr Consistent naming for Math_ functions (#542) 2020-12-26 05:44:53 -05:00
ovl_En_Fz Consistent naming for Math_ functions (#542) 2020-12-26 05:44:53 -05:00
ovl_En_Ganon_Mant Consistent naming for Math_ functions (#542) 2020-12-26 05:44:53 -05:00
ovl_En_Gb Consistent naming for Math_ functions (#542) 2020-12-26 05:44:53 -05:00
ovl_En_Ge1 Consistent naming for Math_ functions (#542) 2020-12-26 05:44:53 -05:00
ovl_En_Ge2 Consistent naming for Math_ functions (#542) 2020-12-26 05:44:53 -05:00
ovl_En_Ge3 Consistent naming for Math_ functions (#542) 2020-12-26 05:44:53 -05:00
ovl_En_GeldB En_GeldB (#516) 2020-12-10 15:00:17 -05:00
ovl_En_Go Consistent naming for Math_ functions (#542) 2020-12-26 05:44:53 -05:00
ovl_En_Go2 Consistent naming for Math_ functions (#542) 2020-12-26 05:44:53 -05:00
ovl_En_Goma Consistent naming for Math_ functions (#542) 2020-12-26 05:44:53 -05:00
ovl_En_Holl decompile z_camera (#398) 2020-12-06 17:39:47 -05:00
ovl_En_Honotrap Consistent naming for Math_ functions (#542) 2020-12-26 05:44:53 -05:00
ovl_En_Horse Consistent naming for Math_ functions (#542) 2020-12-26 05:44:53 -05:00
ovl_En_Horse_Game_Check Math3D and olib updates (#315) 2020-08-17 15:42:08 -04:00
ovl_En_Hy Consistent naming for Math_ functions (#542) 2020-12-26 05:44:53 -05:00
ovl_En_In Consistent naming for Math_ functions (#542) 2020-12-26 05:44:53 -05:00
ovl_En_Jj Consistent naming for Math_ functions (#542) 2020-12-26 05:44:53 -05:00
ovl_En_Jsjutan Consistent naming for Math_ functions (#542) 2020-12-26 05:44:53 -05:00
ovl_En_Kanban Consistent naming for Math_ functions (#542) 2020-12-26 05:44:53 -05:00
ovl_En_Ko Consistent naming for Math_ functions (#542) 2020-12-26 05:44:53 -05:00
ovl_En_M_Thunder Consistent naming for Math_ functions (#542) 2020-12-26 05:44:53 -05:00
ovl_En_Mk Consistent naming for Math_ functions (#542) 2020-12-26 05:44:53 -05:00
ovl_En_Mm Consistent naming for Math_ functions (#542) 2020-12-26 05:44:53 -05:00
ovl_En_Mm2 Consistent naming for Math_ functions (#542) 2020-12-26 05:44:53 -05:00
ovl_En_Mu Consistent naming for Math_ functions (#542) 2020-12-26 05:44:53 -05:00
ovl_En_Ny Consistent naming for Math_ functions (#542) 2020-12-26 05:44:53 -05:00
ovl_En_Ossan Consistent naming for Math_ functions (#542) 2020-12-26 05:44:53 -05:00
ovl_En_Owl Consistent naming for Math_ functions (#542) 2020-12-26 05:44:53 -05:00
ovl_En_Peehat Consistent naming for Math_ functions (#542) 2020-12-26 05:44:53 -05:00
ovl_En_River_Sound Fix all RAM pointers in overlays (#81) 2020-04-19 11:57:38 -04:00
ovl_En_Sa Consistent naming for Math_ functions (#542) 2020-12-26 05:44:53 -05:00
ovl_En_Sda Fix all RAM pointers in overlays (#81) 2020-04-19 11:57:38 -04:00
ovl_En_Shopnuts Consistent naming for Math_ functions (#542) 2020-12-26 05:44:53 -05:00
ovl_En_Skb Consistent naming for Math_ functions (#542) 2020-12-26 05:44:53 -05:00
ovl_En_Skj Consistent naming for Math_ functions (#542) 2020-12-26 05:44:53 -05:00
ovl_En_Sth Consistent naming for Math_ functions (#542) 2020-12-26 05:44:53 -05:00
ovl_En_Sw Consistent naming for Math_ functions (#542) 2020-12-26 05:44:53 -05:00
ovl_En_Test Consistent naming for Math_ functions (#542) 2020-12-26 05:44:53 -05:00
ovl_En_Tg Undefined Symbols in the ASM (#527) 2020-12-12 14:22:33 -05:00
ovl_En_Tite Consistent naming for Math_ functions (#542) 2020-12-26 05:44:53 -05:00
ovl_En_Torch2 Consistent naming for Math_ functions (#542) 2020-12-26 05:44:53 -05:00
ovl_En_Toryo Undefined Symbols in the ASM (#527) 2020-12-12 14:22:33 -05:00
ovl_En_Tp Consistent naming for Math_ functions (#542) 2020-12-26 05:44:53 -05:00
ovl_En_Tr Consistent naming for Math_ functions (#542) 2020-12-26 05:44:53 -05:00
ovl_En_Trap Consistent naming for Math_ functions (#542) 2020-12-26 05:44:53 -05:00
ovl_En_Vali Consistent naming for Math_ functions (#542) 2020-12-26 05:44:53 -05:00
ovl_En_Vb_Ball Consistent naming for Math_ functions (#542) 2020-12-26 05:44:53 -05:00
ovl_En_Viewer Consistent naming for Math_ functions (#542) 2020-12-26 05:44:53 -05:00
ovl_En_Weiyer Consistent naming for Math_ functions (#542) 2020-12-26 05:44:53 -05:00
ovl_En_Wf Consistent naming for Math_ functions (#542) 2020-12-26 05:44:53 -05:00
ovl_En_Wood02 Consistent naming for Math_ functions (#542) 2020-12-26 05:44:53 -05:00
ovl_En_Xc Consistent naming for Math_ functions (#542) 2020-12-26 05:44:53 -05:00
ovl_En_Yabusame_Mark All Effect Overlays and z_effect_soft_sprite_old_init.c OK (#396) 2020-09-29 20:18:46 -04:00
ovl_En_Zf Consistent naming for Math_ functions (#542) 2020-12-26 05:44:53 -05:00
ovl_En_Zl4 Consistent naming for Math_ functions (#542) 2020-12-26 05:44:53 -05:00
ovl_Fishing Consistent naming for Math_ functions (#542) 2020-12-26 05:44:53 -05:00
ovl_Item_Shield Consistent naming for Math_ functions (#542) 2020-12-26 05:44:53 -05:00
ovl_kaleido_scope Consistent naming for Math_ functions (#542) 2020-12-26 05:44:53 -05:00
ovl_Magic_Fire Consistent naming for Math_ functions (#542) 2020-12-26 05:44:53 -05:00
ovl_Obj_Bean Consistent naming for Math_ functions (#542) 2020-12-26 05:44:53 -05:00
ovl_Obj_Kibako2 Consistent naming for Math_ functions (#542) 2020-12-26 05:44:53 -05:00
ovl_Obj_Lift Consistent naming for Math_ functions (#542) 2020-12-26 05:44:53 -05:00
ovl_Obj_Mure Consistent naming for Math_ functions (#542) 2020-12-26 05:44:53 -05:00
ovl_Obj_Mure2 Consistent naming for Math_ functions (#542) 2020-12-26 05:44:53 -05:00
ovl_Obj_Mure3 Consistent naming for Math_ functions (#542) 2020-12-26 05:44:53 -05:00
ovl_Obj_Tsubo Consistent naming for Math_ functions (#542) 2020-12-26 05:44:53 -05:00
ovl_Obj_Warp2block Undefined Symbols in the ASM (#527) 2020-12-12 14:22:33 -05:00
ovl_Object_Kankyo Consistent naming for Math_ functions (#542) 2020-12-26 05:44:53 -05:00
ovl_player_actor Consistent naming for Math_ functions (#542) 2020-12-26 05:44:53 -05:00