diff options
| author | Anghelo Carvajal <angheloalf95@gmail.com> | 2021-04-03 13:15:16 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-03 12:15:16 -0400 |
| commit | 9834f5517e5a3c4e560c20f35eb078ba1895e773 (patch) | |
| tree | 148b8e008a89c8e65d73aa6023cc6173a3d76206 /data | |
| parent | c94e595dc1dad2d7a152b5b8492cd34bfb7e7f7e (diff) | |
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>
Diffstat (limited to 'data')
| -rw-r--r-- | data/overlays/actors/z_en_diving_game.data.s | 24 | ||||
| -rw-r--r-- | data/overlays/actors/z_en_diving_game.reloc.s | 13 |
2 files changed, 0 insertions, 37 deletions
diff --git a/data/overlays/actors/z_en_diving_game.data.s b/data/overlays/actors/z_en_diving_game.data.s deleted file mode 100644 index fc835a867..000000000 --- a/data/overlays/actors/z_en_diving_game.data.s +++ /dev/null @@ -1,24 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purpose registers - -.section .data - -.balign 16 - -glabel En_Diving_Game_InitVars - .word 0x01240400, 0x00000019, 0x00FE0000, 0x00000398 -.word EnDivingGame_Init -.word EnDivingGame_Destroy -.word EnDivingGame_Update -.word EnDivingGame_Draw -glabel D_809EF0B0 - .word 0x00000000 -glabel D_809EF0B4 - .word 0x0A000039, 0x20010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000100, 0x000A000A, 0x00000000, 0x00000000 -glabel D_809EF0E0 - .word 0x06003E40, 0x06004640, 0x06004E40, 0x00000000 - diff --git a/data/overlays/actors/z_en_diving_game.reloc.s b/data/overlays/actors/z_en_diving_game.reloc.s deleted file mode 100644 index 25651654f..000000000 --- a/data/overlays/actors/z_en_diving_game.reloc.s +++ /dev/null @@ -1,13 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purpose registers - -.section .rodata - -.balign 16 - -glabel D_809EF1D0 - .incbin "baserom/ovl_En_Diving_Game", 0x1960, 0x00000180 |