mirror of
https://github.com/zeldaret/oot.git
synced 2024-11-26 02:04:18 +00:00
9834f5517e
* 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> |
||
|---|---|---|
| .. | ||
| ovl_Bg_Gnd_Firemeiro | ||
| ovl_Bg_Hidan_Sekizou | ||
| ovl_Bg_Jya_Cobra | ||
| ovl_Bg_Mizu_Movebg | ||
| ovl_Bg_Spot02_Objects | ||
| ovl_Bg_Spot07_Taki | ||
| ovl_Bg_Sst_Floor | ||
| ovl_Bg_Toki_Hikari | ||
| ovl_Bg_Vb_Sima | ||
| ovl_Boss_Dodongo | ||
| ovl_Boss_Fd | ||
| ovl_Boss_Fd2 | ||
| ovl_Boss_Ganon | ||
| ovl_Boss_Ganon2 | ||
| ovl_Boss_Goma | ||
| ovl_Boss_Mo | ||
| ovl_Boss_Sst | ||
| ovl_Boss_Tw | ||
| ovl_Boss_Va | ||
| ovl_Demo_6K | ||
| ovl_Door_Warp1 | ||
| ovl_Efc_Erupc | ||
| ovl_En_Bdfire | ||
| ovl_En_Bigokuta | ||
| ovl_En_Daiku | ||
| ovl_En_Dekubaba | ||
| ovl_En_Eiyer | ||
| ovl_En_Elf | ||
| ovl_En_Fish | ||
| ovl_En_Ganon_Mant | ||
| ovl_En_Goma | ||
| ovl_En_Holl | ||
| ovl_En_Horse | ||
| ovl_En_Jsjutan | ||
| ovl_En_Ko | ||
| ovl_En_M_Thunder | ||
| ovl_En_Ossan | ||
| ovl_En_River_Sound | ||
| ovl_En_Skb | ||
| ovl_En_Skj | ||
| ovl_En_Test | ||
| ovl_En_Tg | ||
| ovl_En_Torch2 | ||
| ovl_En_Tp | ||
| ovl_En_Tr | ||
| ovl_En_Vali | ||
| ovl_En_Vb_Ball | ||
| ovl_En_Wf | ||
| ovl_En_Xc | ||
| ovl_En_Yabusame_Mark | ||
| ovl_En_Zf | ||
| ovl_Fishing | ||
| ovl_kaleido_scope | ||
| ovl_Obj_Bean | ||
| ovl_Obj_Lift | ||
| ovl_Obj_Mure | ||
| ovl_Object_Kankyo | ||