1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-11-11 03:39:59 +00:00
oot/asm/non_matchings/overlays/actors
Anghelo Carvajal 833dc2928d
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-27 22:47:25 -04:00
..
ovl_Bg_Gnd_Firemeiro Demo_Kekkai, its object, and its cutscenes (#627) 2021-02-01 14:52:23 -05:00
ovl_Bg_Hidan_Sekizou object_hidan_objects OK (#695) 2021-03-18 03:23:59 -04:00
ovl_Bg_Ice_Shelter Document Collision_Check (#468) 2021-01-17 21:13:36 -05:00
ovl_Bg_Jya_Cobra Decompile Bg Jya Cobra (#588) 2021-01-21 09:55:11 -05:00
ovl_Bg_Mizu_Movebg Actor Struct Changes (and a few related things) (#617) 2021-01-18 16:04:04 -05:00
ovl_Bg_Spot02_Objects Actor Struct Changes (and a few related things) (#617) 2021-01-18 16:04:04 -05:00
ovl_Bg_Spot07_Taki z_bgcheck.c, 800430A0.c, 80043480.c (#256) 2021-01-08 06:12:58 -05:00
ovl_Bg_Sst_Floor Actor Struct Changes (and a few related things) (#617) 2021-01-18 16:04:04 -05:00
ovl_Bg_Toki_Hikari Rename Matrix_Pull to Matrix_Pop (#703) 2021-02-24 14:28:04 -05:00
ovl_Bg_Vb_Sima z_bgcheck.c, 800430A0.c, 80043480.c (#256) 2021-01-08 06:12:58 -05:00
ovl_Boss_Dodongo Rename Matrix_Pull to Matrix_Pop (#703) 2021-02-24 14:28:04 -05:00
ovl_Boss_Fd Rename Matrix_Pull to Matrix_Pop (#703) 2021-02-24 14:28:04 -05:00
ovl_Boss_Fd2 Rename Matrix_Pull to Matrix_Pop (#703) 2021-02-24 14:28:04 -05:00
ovl_Boss_Ganon Rename Matrix_Pull to Matrix_Pop (#703) 2021-02-24 14:28:04 -05:00
ovl_Boss_Ganon2 Rename Matrix_Pull to Matrix_Pop (#703) 2021-02-24 14:28:04 -05:00
ovl_Boss_Ganondrof Rename Matrix_Pull to Matrix_Pop (#703) 2021-02-24 14:28:04 -05:00
ovl_Boss_Goma Rename Matrix_Pull to Matrix_Pop (#703) 2021-02-24 14:28:04 -05:00
ovl_Boss_Mo Rename Matrix_Pull to Matrix_Pop (#703) 2021-02-24 14:28:04 -05:00
ovl_Boss_Sst Armos and object_am OK (#652) 2021-02-15 19:41:55 +01:00
ovl_Boss_Tw Rename Matrix_Pull to Matrix_Pop (#703) 2021-02-24 14:28:04 -05:00
ovl_Boss_Va Rename Matrix_Pull to Matrix_Pop (#703) 2021-02-24 14:28:04 -05:00
ovl_Demo_6K Rename Matrix_Pull to Matrix_Pop (#703) 2021-02-24 14:28:04 -05:00
ovl_Door_Warp1 Rename Matrix_Pull to Matrix_Pop (#703) 2021-02-24 14:28:04 -05:00
ovl_Efc_Erupc Rename Matrix_Pull to Matrix_Pop (#703) 2021-02-24 14:28:04 -05:00
ovl_En_Bdfire Actor Struct Changes (and a few related things) (#617) 2021-01-18 16:04:04 -05:00
ovl_En_Bigokuta Armos and object_am OK (#652) 2021-02-15 19:41:55 +01:00
ovl_En_Clear_Tag Armos and object_am OK (#652) 2021-02-15 19:41:55 +01:00
ovl_En_Daiku ovl_En_Daiku OK and documented (#422) 2020-12-03 16:58:05 -05:00
ovl_En_Dekubaba Armos and object_am OK (#652) 2021-02-15 19:41:55 +01:00
ovl_En_Diving_Game Actor Struct Changes (and a few related things) (#617) 2021-01-18 16:04:04 -05:00
ovl_En_Eiyer Armos and object_am OK (#652) 2021-02-15 19:41:55 +01:00
ovl_En_Elf Three new matching functions (#492) 2020-11-19 16:49:08 -05:00
ovl_En_fHG Docs for the Anime part of SkelAnime (#517) 2020-12-29 17:46:46 -05:00
ovl_En_Fhg_Fire Actor Struct Changes (and a few related things) (#617) 2021-01-18 16:04:04 -05:00
ovl_En_Fish Decompile Gameplay_Keep and fix all existing decompiled objects (#595) 2021-01-24 19:36:40 -05:00
ovl_En_Ganon_Mant Rename Matrix_Pull to Matrix_Pop (#703) 2021-02-24 14:28:04 -05:00
ovl_En_Goma Rename Matrix_Pull to Matrix_Pop (#703) 2021-02-24 14:28:04 -05:00
ovl_En_Holl decompile z_camera (#398) 2020-12-06 17:39:47 -05:00
ovl_En_Horse Actor Struct Changes (and a few related things) (#617) 2021-01-18 16:04:04 -05:00
ovl_En_Jj Document Collision_Check (#468) 2021-01-17 21:13:36 -05:00
ovl_En_Jsjutan ovl_En_Jsjutan with 1 non_matching (#713) 2021-03-27 22:47:25 -04:00
ovl_En_Ko Actor Struct Changes (and a few related things) (#617) 2021-01-18 16:04:04 -05:00
ovl_En_M_Thunder Decompile Gameplay_Keep and fix all existing decompiled objects (#595) 2021-01-24 19:36:40 -05:00
ovl_En_Mm Actor Struct Changes (and a few related things) (#617) 2021-01-18 16:04:04 -05:00
ovl_En_Ossan Decompile Gameplay_Keep and fix all existing decompiled objects (#595) 2021-01-24 19:36:40 -05:00
ovl_En_River_Sound z_bgcheck.c, 800430A0.c, 80043480.c (#256) 2021-01-08 06:12:58 -05:00
ovl_En_Skb z_en skb, 1 non-matching, with some documentation (#669) 2021-02-15 17:52:22 -05:00
ovl_En_Skj Rename Matrix_Pull to Matrix_Pop (#703) 2021-02-24 14:28:04 -05:00
ovl_En_Test Armos and object_am OK (#652) 2021-02-15 19:41:55 +01:00
ovl_En_Tg Actor Struct Changes (and a few related things) (#617) 2021-01-18 16:04:04 -05:00
ovl_En_Torch2 Armos and object_am OK (#652) 2021-02-15 19:41:55 +01:00
ovl_En_Tp Armos and object_am OK (#652) 2021-02-15 19:41:55 +01:00
ovl_En_Tr EnTr, 1 nonmatching, mostly documented (#621) 2021-01-31 00:07:58 -05:00
ovl_En_Vali Armos and object_am OK (#652) 2021-02-15 19:41:55 +01:00
ovl_En_Vb_Ball Decompile Gameplay_Keep and fix all existing decompiled objects (#595) 2021-01-24 19:36:40 -05:00
ovl_En_Wf Armos and object_am OK (#652) 2021-02-15 19:41:55 +01:00
ovl_En_Xc Rename Matrix_Pull to Matrix_Pop (#703) 2021-02-24 14:28:04 -05:00
ovl_En_Yabusame_Mark ovl_en_yabusame_mark, 1 nonmatching (#707) 2021-02-21 19:10:24 -05:00
ovl_En_Zf Armos and object_am OK (#652) 2021-02-15 19:41:55 +01:00
ovl_Fishing Rename Matrix_Pull to Matrix_Pop (#703) 2021-02-24 14:28:04 -05:00
ovl_kaleido_scope Rename Matrix_Pull to Matrix_Pop (#703) 2021-02-24 14:28:04 -05:00
ovl_Obj_Bean Actor Struct Changes (and a few related things) (#617) 2021-01-18 16:04:04 -05:00
ovl_Obj_Lift z_bgcheck.c, 800430A0.c, 80043480.c (#256) 2021-01-08 06:12:58 -05:00
ovl_Obj_Mure Consistent naming for Math_ functions (#542) 2020-12-26 05:44:53 -05:00
ovl_Object_Kankyo Demo_Kekkai, its object, and its cutscenes (#627) 2021-02-01 14:52:23 -05:00