summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorU-Fish-PC\Daniel <corrnondacqb@yahoo.com>2013-12-11 02:00:10 -0500
committerU-Fish-PC\Daniel <corrnondacqb@yahoo.com>2013-12-11 02:00:10 -0500
commitd4d4481df061dc250e2f85ea17103b873df8b49a (patch)
tree5528b34fde4b221c17ef50af19ebff49dc48868b
parent9c4be8a91e0df8c2eb8a75a5108898d4f33d01de (diff)
Move slot machine constants
-rw-r--r--constants.asm2
-rwxr-xr-xconstants/slotmachine_constants.asm6
-rwxr-xr-xmain.asm7
3 files changed, 7 insertions, 8 deletions
diff --git a/constants.asm b/constants.asm
index 8191adee..c453884b 100644
--- a/constants.asm
+++ b/constants.asm
@@ -72,8 +72,6 @@ INCLUDE "constants/palette_constants.asm"
INCLUDE "constants/map_constants.asm"
INCLUDE "constants/map_dimensions.asm"
-INCLUDE "constants/slotmachine_constants.asm"
-
; Evolution types
EV_LEVEL EQU 1
EV_ITEM EQU 2
diff --git a/constants/slotmachine_constants.asm b/constants/slotmachine_constants.asm
deleted file mode 100755
index 651383e6..00000000
--- a/constants/slotmachine_constants.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-SLOTS7 EQU $0200
-SLOTSBAR EQU $0604
-SLOTSCHERRY EQU $0A08
-SLOTSFISH EQU $0E0C
-SLOTSBIRD EQU $1210
-SLOTSMOUSE EQU $1614
diff --git a/main.asm b/main.asm
index c677b316..39313346 100755
--- a/main.asm
+++ b/main.asm
@@ -49172,6 +49172,13 @@ Func_378a8: ; 378a8 (d:78a8)
SlotMachineMap: ; 378f5 (d:78f5)
INCBIN "gfx/tilemaps/slotmachine.map"
+SLOTS7 EQU $0200
+SLOTSBAR EQU $0604
+SLOTSCHERRY EQU $0A08
+SLOTSFISH EQU $0E0C
+SLOTSBIRD EQU $1210
+SLOTSMOUSE EQU $1614
+
SlotMachineWheel1: ; 379e5 (d:79e5)
dw SLOTS7
dw SLOTSMOUSE