mirror of https://github.com/zeldaret/oot.git
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> |
||
|---|---|---|
| .. | ||
| ultra64 | ||
| alloca.h | ||
| bgm.h | ||
| color.h | ||
| command_macros_base.h | ||
| fp.h | ||
| functions.h | ||
| global.h | ||
| ichain.h | ||
| initvars.h | ||
| macro.inc | ||
| macros.h | ||
| math.h | ||
| regs.h | ||
| segment_symbols.h | ||
| sfx.h | ||
| stdarg.h | ||
| stdbool.h | ||
| stddef.h | ||
| stdlib.h | ||
| ultra64.h | ||
| unk.h | ||
| variables.h | ||
| vt.h | ||
| z64.h | ||
| z64actor.h | ||
| z64animation.h | ||
| z64audio.h | ||
| z64bgcheck.h | ||
| z64camera.h | ||
| z64collision_check.h | ||
| z64cutscene.h | ||
| z64cutscene_commands.h | ||
| z64dma.h | ||
| z64effect.h | ||
| z64item.h | ||
| z64light.h | ||
| z64map_mark.h | ||
| z64math.h | ||
| z64object.h | ||
| z64player.h | ||
| z64save.h | ||
| z64scene.h | ||
| z64transition.h | ||