summaryrefslogtreecommitdiff
path: root/engine
diff options
context:
space:
mode:
authorxCrystal <rgr.crystal@gmail.com>2018-01-02 16:25:40 +0100
committerxCrystal <rgr.crystal@gmail.com>2018-01-02 16:25:40 +0100
commit7c0e903c4821b3e7ded9b795661ed3608e023cc2 (patch)
tree282fb5f3a1d09494bcc071917eb32c9c5ed2ca2e /engine
parent6f0b81504d6471afe7df6adae83791cc81933ca6 (diff)
Clean up leftover code from main.asm
Diffstat (limited to 'engine')
-rwxr-xr-xengine/card_flip.asm7
-rwxr-xr-xengine/dummy_game.asm4
-rwxr-xr-xengine/sprite_anims.asm2
3 files changed, 10 insertions, 3 deletions
diff --git a/engine/card_flip.asm b/engine/card_flip.asm
index 158f3fa05..f1b985012 100755
--- a/engine/card_flip.asm
+++ b/engine/card_flip.asm
@@ -2,6 +2,13 @@ CARDFLIP_LIGHT_OFF EQU $ef
CARDFLIP_LIGHT_ON EQU $f5
CARDFLIP_DECK_SIZE EQU 4 * 6
+; two labels below called from inside ./dummy_game.asm
+Unknown_e00ed: ; e00ed (38:40ed)
+; Graphics for an unused Game Corner
+; game were meant to be here.
+Ret_e00ed: ; e00ed (38:40ed)
+ ret
+
_CardFlip: ; e00ee (38:40ee)
ld hl, Options
set 4, [hl]
diff --git a/engine/dummy_game.asm b/engine/dummy_game.asm
index aecaa7425..9abffb232 100755
--- a/engine/dummy_game.asm
+++ b/engine/dummy_game.asm
@@ -77,7 +77,7 @@ _DummyGame: ; e1e5b (38:5e5b)
ret
.ResetBoard:
- call ret_e00ed
+ call Ret_e00ed
jr nc, .proceed
ld hl, wJumptableIndex
set 7, [hl]
@@ -232,7 +232,7 @@ endr
ld hl, wJumptableIndex
inc [hl]
.AskPlayAgain:
- call ret_e00ed
+ call Ret_e00ed
jr nc, .restart
ld hl, wJumptableIndex
set 7, [hl]
diff --git a/engine/sprite_anims.asm b/engine/sprite_anims.asm
index 9fb78a5d7..e141f5243 100755
--- a/engine/sprite_anims.asm
+++ b/engine/sprite_anims.asm
@@ -404,7 +404,7 @@ DoAnimFrame: ; 8d24b
ret
.ForUnusedCursor ; 8d46e (23:546e)
- callfar ret_e00ed
+ callfar Ret_e00ed
ret
.PokegearArrow ; 8d475 (23:5475)