mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-11-11 03:39:59 +00:00
Code Issues Projects Releases Wiki Activity
oot/data/overlays/actors
History
Anghelo Carvajal 9834f5517e
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 12:15:16 -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_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_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.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_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_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_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_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_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