1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-12-28 15:56:51 +00:00
oot/data/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
..
z_bg_gnd_firemeiro.data.s Properly align asm & data (+ minor fixes) (#165) 2020-05-26 18:09:00 -04:00
z_bg_gnd_firemeiro.reloc.s Properly align asm & data (+ minor fixes) (#165) 2020-05-26 18:09:00 -04:00
z_bg_hidan_sekizou.data.s object_hidan_objects OK (#695) 2021-03-18 03:23:59 -04:00
z_bg_hidan_sekizou.reloc.s Properly align asm & data (+ minor fixes) (#165) 2020-05-26 18:09:00 -04:00
z_bg_ice_shelter.data.s Remove some unaligned fake symbols (#535) 2020-12-16 22:10:42 -05:00
z_bg_ice_shelter.reloc.s Properly align asm & data (+ minor fixes) (#165) 2020-05-26 18:09:00 -04:00
z_bg_jya_cobra.reloc.s Properly align asm & data (+ minor fixes) (#165) 2020-05-26 18:09:00 -04:00
z_bg_mizu_movebg.bss.s Properly align asm & data (+ minor fixes) (#165) 2020-05-26 18:09:00 -04:00
z_bg_mizu_movebg.data.s Properly align asm & data (+ minor fixes) (#165) 2020-05-26 18:09:00 -04:00
z_bg_mizu_movebg.reloc.s Properly align asm & data (+ minor fixes) (#165) 2020-05-26 18:09:00 -04:00
z_bg_spot02_objects.data.s Properly align asm & data (+ minor fixes) (#165) 2020-05-26 18:09:00 -04:00
z_bg_spot02_objects.reloc.s Properly align asm & data (+ minor fixes) (#165) 2020-05-26 18:09:00 -04:00
z_bg_spot07_taki.data.s Properly align asm & data (+ minor fixes) (#165) 2020-05-26 18:09:00 -04:00
z_bg_spot07_taki.reloc.s Properly align asm & data (+ minor fixes) (#165) 2020-05-26 18:09:00 -04:00
z_bg_sst_floor.data.s Properly align asm & data (+ minor fixes) (#165) 2020-05-26 18:09:00 -04:00
z_bg_sst_floor.reloc.s Properly align asm & data (+ minor fixes) (#165) 2020-05-26 18:09:00 -04:00
z_bg_toki_hikari.data.s Properly align asm & data (+ minor fixes) (#165) 2020-05-26 18:09:00 -04:00
z_bg_toki_hikari.reloc.s Properly align asm & data (+ minor fixes) (#165) 2020-05-26 18:09:00 -04:00
z_bg_vb_sima.data.s Properly align asm & data (+ minor fixes) (#165) 2020-05-26 18:09:00 -04:00
z_bg_vb_sima.reloc.s Properly align asm & data (+ minor fixes) (#165) 2020-05-26 18:09:00 -04:00
z_boss_dodongo.data.s Properly align asm & data (+ minor fixes) (#165) 2020-05-26 18:09:00 -04:00
z_boss_dodongo.reloc.s Properly align asm & data (+ minor fixes) (#165) 2020-05-26 18:09:00 -04:00
z_boss_fd.data.s Decompile Gameplay_Keep and fix all existing decompiled objects (#595) 2021-01-24 19:36:40 -05:00
z_boss_fd.reloc.s Properly align asm & data (+ minor fixes) (#165) 2020-05-26 18:09:00 -04:00
z_boss_fd2.data.s Properly align asm & data (+ minor fixes) (#165) 2020-05-26 18:09:00 -04:00
z_boss_fd2.reloc.s Properly align asm & data (+ minor fixes) (#165) 2020-05-26 18:09:00 -04:00
z_boss_ganon.bss.s Properly align asm & data (+ minor fixes) (#165) 2020-05-26 18:09:00 -04:00
z_boss_ganon.data.s Properly align asm & data (+ minor fixes) (#165) 2020-05-26 18:09:00 -04:00
z_boss_ganon.reloc.s Properly align asm & data (+ minor fixes) (#165) 2020-05-26 18:09:00 -04:00
z_boss_ganon2.bss.s Properly align asm & data (+ minor fixes) (#165) 2020-05-26 18:09:00 -04:00
z_boss_ganon2.data.s Properly align asm & data (+ minor fixes) (#165) 2020-05-26 18:09:00 -04:00
z_boss_ganon2.reloc.s Properly align asm & data (+ minor fixes) (#165) 2020-05-26 18:09:00 -04:00
z_boss_ganondrof.data.s Properly align asm & data (+ minor fixes) (#165) 2020-05-26 18:09:00 -04:00
z_boss_ganondrof.reloc.s Properly align asm & data (+ minor fixes) (#165) 2020-05-26 18:09:00 -04:00
z_boss_goma.data.s Properly align asm & data (+ minor fixes) (#165) 2020-05-26 18:09:00 -04:00
z_boss_goma.reloc.s Properly align asm & data (+ minor fixes) (#165) 2020-05-26 18:09:00 -04:00
z_boss_mo.bss.s Properly align asm & data (+ minor fixes) (#165) 2020-05-26 18:09:00 -04:00
z_boss_mo.data.s Properly align asm & data (+ minor fixes) (#165) 2020-05-26 18:09:00 -04:00
z_boss_mo.reloc.s Properly align asm & data (+ minor fixes) (#165) 2020-05-26 18:09:00 -04:00
z_boss_sst.bss.s Properly align asm & data (+ minor fixes) (#165) 2020-05-26 18:09:00 -04:00
z_boss_sst.data.s Properly align asm & data (+ minor fixes) (#165) 2020-05-26 18:09:00 -04:00
z_boss_sst.reloc.s Properly align asm & data (+ minor fixes) (#165) 2020-05-26 18:09:00 -04:00
z_boss_tw.bss.s Properly align asm & data (+ minor fixes) (#165) 2020-05-26 18:09:00 -04:00
z_boss_tw.data.s Properly align asm & data (+ minor fixes) (#165) 2020-05-26 18:09:00 -04:00
z_boss_tw.reloc.s Properly align asm & data (+ minor fixes) (#165) 2020-05-26 18:09:00 -04:00
z_boss_va.bss.s Properly align asm & data (+ minor fixes) (#165) 2020-05-26 18:09:00 -04:00
z_boss_va.data.s Properly align asm & data (+ minor fixes) (#165) 2020-05-26 18:09:00 -04:00
z_boss_va.reloc.s Properly align asm & data (+ minor fixes) (#165) 2020-05-26 18:09:00 -04:00
z_demo_6k.data.s Remove some unaligned fake symbols (#535) 2020-12-16 22:10:42 -05:00
z_demo_6k.reloc.s Properly align asm & data (+ minor fixes) (#165) 2020-05-26 18:09:00 -04:00
z_door_warp1.bss.s Properly align asm & data (+ minor fixes) (#165) 2020-05-26 18:09:00 -04:00
z_door_warp1.data.s Properly align asm & data (+ minor fixes) (#165) 2020-05-26 18:09:00 -04:00
z_door_warp1.reloc.s Properly align asm & data (+ minor fixes) (#165) 2020-05-26 18:09:00 -04:00
z_efc_erupc.data.s Properly align asm & data (+ minor fixes) (#165) 2020-05-26 18:09:00 -04:00
z_efc_erupc.reloc.s Properly align asm & data (+ minor fixes) (#165) 2020-05-26 18:09:00 -04:00
z_en_bdfire.data.s Properly align asm & data (+ minor fixes) (#165) 2020-05-26 18:09:00 -04:00
z_en_bdfire.reloc.s Properly align asm & data (+ minor fixes) (#165) 2020-05-26 18:09:00 -04:00
z_en_bigokuta.data.s Properly align asm & data (+ minor fixes) (#165) 2020-05-26 18:09:00 -04:00
z_en_bigokuta.reloc.s Properly align asm & data (+ minor fixes) (#165) 2020-05-26 18:09:00 -04:00
z_en_clear_tag.bss.s Properly align asm & data (+ minor fixes) (#165) 2020-05-26 18:09:00 -04:00
z_en_clear_tag.data.s Properly align asm & data (+ minor fixes) (#165) 2020-05-26 18:09:00 -04:00
z_en_clear_tag.reloc.s Properly align asm & data (+ minor fixes) (#165) 2020-05-26 18:09:00 -04:00
z_en_daiku.reloc.s Properly align asm & data (+ minor fixes) (#165) 2020-05-26 18:09:00 -04:00
z_en_dekubaba.data.s Remove some unaligned fake symbols (#535) 2020-12-16 22:10:42 -05:00
z_en_dekubaba.reloc.s Properly align asm & data (+ minor fixes) (#165) 2020-05-26 18:09:00 -04:00
z_en_diving_game.data.s Properly align asm & data (+ minor fixes) (#165) 2020-05-26 18:09:00 -04:00
z_en_diving_game.reloc.s Properly align asm & data (+ minor fixes) (#165) 2020-05-26 18:09:00 -04:00
z_en_eiyer.data.s Remove some unaligned fake symbols (#535) 2020-12-16 22:10:42 -05:00
z_en_eiyer.reloc.s Properly align asm & data (+ minor fixes) (#165) 2020-05-26 18:09:00 -04:00
z_en_elf.reloc.s Properly align asm & data (+ minor fixes) (#165) 2020-05-26 18:09:00 -04:00
z_en_fhg.data.s Properly align asm & data (+ minor fixes) (#165) 2020-05-26 18:09:00 -04:00
z_en_fhg.reloc.s Properly align asm & data (+ minor fixes) (#165) 2020-05-26 18:09:00 -04:00
z_en_fhg_fire.data.s Decompile ovl_En_Fhg_Fire (#248) 2020-07-16 06:02:27 -04:00
z_en_fhg_fire.reloc.s Properly align asm & data (+ minor fixes) (#165) 2020-05-26 18:09:00 -04:00
z_en_fish.data.s Properly align asm & data (+ minor fixes) (#165) 2020-05-26 18:09:00 -04:00
z_en_fish.reloc.s Properly align asm & data (+ minor fixes) (#165) 2020-05-26 18:09:00 -04:00
z_en_ganon_mant.data.s Properly align asm & data (+ minor fixes) (#165) 2020-05-26 18:09:00 -04:00
z_en_ganon_mant.reloc.s Properly align asm & data (+ minor fixes) (#165) 2020-05-26 18:09:00 -04:00
z_en_ganon_organ.data.s Properly align asm & data (+ minor fixes) (#165) 2020-05-26 18:09:00 -04:00
z_en_ganon_organ.reloc.s Properly align asm & data (+ minor fixes) (#165) 2020-05-26 18:09:00 -04:00
z_en_goma.data.s Properly align asm & data (+ minor fixes) (#165) 2020-05-26 18:09:00 -04:00
z_en_goma.reloc.s Properly align asm & data (+ minor fixes) (#165) 2020-05-26 18:09:00 -04:00
z_en_holl.reloc.s Properly align asm & data (+ minor fixes) (#165) 2020-05-26 18:09:00 -04:00
z_en_horse.data.s Properly align asm & data (+ minor fixes) (#165) 2020-05-26 18:09:00 -04:00
z_en_horse.reloc.s Properly align asm & data (+ minor fixes) (#165) 2020-05-26 18:09:00 -04:00
z_en_jj.data.s Properly align asm & data (+ minor fixes) (#165) 2020-05-26 18:09:00 -04:00
z_en_jj.reloc.s Properly align asm & data (+ minor fixes) (#165) 2020-05-26 18:09:00 -04:00
z_en_jsjutan.reloc.s Properly align asm & data (+ minor fixes) (#165) 2020-05-26 18:09:00 -04:00
z_en_ko.data.s Properly align asm & data (+ minor fixes) (#165) 2020-05-26 18:09:00 -04:00
z_en_ko.reloc.s Properly align asm & data (+ minor fixes) (#165) 2020-05-26 18:09:00 -04:00
z_en_m_thunder.reloc.s Properly align asm & data (+ minor fixes) (#165) 2020-05-26 18:09:00 -04:00
z_en_mm.data.s Properly align asm & data (+ minor fixes) (#165) 2020-05-26 18:09:00 -04:00
z_en_mm.reloc.s Properly align asm & data (+ minor fixes) (#165) 2020-05-26 18:09:00 -04:00
z_en_ossan.data.s Properly align asm & data (+ minor fixes) (#165) 2020-05-26 18:09:00 -04:00
z_en_ossan.reloc.s Properly align asm & data (+ minor fixes) (#165) 2020-05-26 18:09:00 -04:00
z_en_river_sound.data.s Properly align asm & data (+ minor fixes) (#165) 2020-05-26 18:09:00 -04:00
z_en_river_sound.reloc.s Properly align asm & data (+ minor fixes) (#165) 2020-05-26 18:09:00 -04:00
z_en_skb.reloc.s Properly align asm & data (+ minor fixes) (#165) 2020-05-26 18:09:00 -04:00
z_en_skj.bss.s Properly align asm & data (+ minor fixes) (#165) 2020-05-26 18:09:00 -04:00
z_en_skj.data.s Properly align asm & data (+ minor fixes) (#165) 2020-05-26 18:09:00 -04:00
z_en_skj.reloc.s Properly align asm & data (+ minor fixes) (#165) 2020-05-26 18:09:00 -04:00
z_en_skj.rodata.s Split remaining unsplit asm files and migrate more rodata (#277) 2020-07-19 21:08:50 -04:00
z_en_test.data.s Properly align asm & data (+ minor fixes) (#165) 2020-05-26 18:09:00 -04:00
z_en_test.reloc.s Properly align asm & data (+ minor fixes) (#165) 2020-05-26 18:09:00 -04:00
z_en_tg.data.s Properly align asm & data (+ minor fixes) (#165) 2020-05-26 18:09:00 -04:00
z_en_tg.reloc.s Properly align asm & data (+ minor fixes) (#165) 2020-05-26 18:09:00 -04:00
z_en_torch2.reloc.s Properly align asm & data (+ minor fixes) (#165) 2020-05-26 18:09:00 -04:00
z_en_tp.data.s Properly align asm & data (+ minor fixes) (#165) 2020-05-26 18:09:00 -04:00
z_en_tp.reloc.s Properly align asm & data (+ minor fixes) (#165) 2020-05-26 18:09:00 -04:00
z_en_tr.reloc.s Properly align asm & data (+ minor fixes) (#165) 2020-05-26 18:09:00 -04:00
z_en_vali.data.s Properly align asm & data (+ minor fixes) (#165) 2020-05-26 18:09:00 -04:00
z_en_vali.reloc.s Properly align asm & data (+ minor fixes) (#165) 2020-05-26 18:09:00 -04:00
z_en_vb_ball.data.s Properly align asm & data (+ minor fixes) (#165) 2020-05-26 18:09:00 -04:00
z_en_vb_ball.reloc.s Properly align asm & data (+ minor fixes) (#165) 2020-05-26 18:09:00 -04:00
z_en_wf.data.s Properly align asm & data (+ minor fixes) (#165) 2020-05-26 18:09:00 -04:00
z_en_wf.reloc.s Properly align asm & data (+ minor fixes) (#165) 2020-05-26 18:09:00 -04:00
z_en_xc.bss.s Properly align asm & data (+ minor fixes) (#165) 2020-05-26 18:09:00 -04:00
z_en_xc.data.s Properly align asm & data (+ minor fixes) (#165) 2020-05-26 18:09:00 -04:00
z_en_xc.reloc.s Properly align asm & data (+ minor fixes) (#165) 2020-05-26 18:09:00 -04:00
z_en_yabusame_mark.reloc.s Properly align asm & data (+ minor fixes) (#165) 2020-05-26 18:09:00 -04:00
z_en_zf.bss.s Properly align asm & data (+ minor fixes) (#165) 2020-05-26 18:09:00 -04:00
z_en_zf.data.s Properly align asm & data (+ minor fixes) (#165) 2020-05-26 18:09:00 -04:00
z_en_zf.reloc.s Properly align asm & data (+ minor fixes) (#165) 2020-05-26 18:09:00 -04:00
z_fishing.bss.s Properly align asm & data (+ minor fixes) (#165) 2020-05-26 18:09:00 -04:00
z_fishing.data.s Properly align asm & data (+ minor fixes) (#165) 2020-05-26 18:09:00 -04:00
z_fishing.reloc.s Properly align asm & data (+ minor fixes) (#165) 2020-05-26 18:09:00 -04:00
z_kaleido_collect.data.s Split ovl_file_choose and ovl_kaleido_scope (#167) 2020-06-07 13:52:43 -04:00
z_kaleido_debug.data.s Split ovl_file_choose and ovl_kaleido_scope (#167) 2020-06-07 13:52:43 -04:00
z_kaleido_equipment.data.s Split ovl_file_choose and ovl_kaleido_scope (#167) 2020-06-07 13:52:43 -04:00
z_kaleido_item.data.s Split ovl_file_choose and ovl_kaleido_scope (#167) 2020-06-07 13:52:43 -04:00
z_kaleido_map_PAL.data.s Split ovl_file_choose and ovl_kaleido_scope (#167) 2020-06-07 13:52:43 -04:00
z_kaleido_scope.reloc.s Properly align asm & data (+ minor fixes) (#165) 2020-05-26 18:09:00 -04:00
z_kaleido_scope_PAL.bss.s Split ovl_file_choose and ovl_kaleido_scope (#167) 2020-06-07 13:52:43 -04:00
z_kaleido_scope_PAL.data.s Split ovl_file_choose and ovl_kaleido_scope (#167) 2020-06-07 13:52:43 -04:00
z_lmap_mark.data.s Split ovl_file_choose and ovl_kaleido_scope (#167) 2020-06-07 13:52:43 -04:00
z_lmap_mark.rodata.s Migrated rodata (#199) 2020-06-09 12:06:23 -04:00
z_obj_bean.data.s Decompile Gameplay_Keep and fix all existing decompiled objects (#595) 2021-01-24 19:36:40 -05:00
z_obj_bean.reloc.s Properly align asm & data (+ minor fixes) (#165) 2020-05-26 18:09:00 -04:00
z_obj_lift.data.s Properly align asm & data (+ minor fixes) (#165) 2020-05-26 18:09:00 -04:00
z_obj_lift.reloc.s Properly align asm & data (+ minor fixes) (#165) 2020-05-26 18:09:00 -04:00
z_obj_mure.data.s Properly align asm & data (+ minor fixes) (#165) 2020-05-26 18:09:00 -04:00
z_obj_mure.reloc.s Properly align asm & data (+ minor fixes) (#165) 2020-05-26 18:09:00 -04:00
z_object_kankyo.data.s Decompile Gameplay_Keep and fix all existing decompiled objects (#595) 2021-01-24 19:36:40 -05:00
z_object_kankyo.reloc.s Properly align asm & data (+ minor fixes) (#165) 2020-05-26 18:09:00 -04:00