summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorhondew <pokehondew@gmail.com>2019-02-22 16:03:35 -0500
committerhuderlem <huderlem@gmail.com>2019-02-28 21:21:56 -0600
commitdd8ecabe26e5e525306047507d33bc1640040871 (patch)
treeea4f52fbdd26d81e1d8662e4a7b9f2827d118964 /include
parentf965f1b13dd30293b99307c869ef5f6f382a374f (diff)
fix mistakes and bad formatting
Diffstat (limited to 'include')
-rw-r--r--include/slot_machine.h8
-rw-r--r--include/tv.h6
2 files changed, 7 insertions, 7 deletions
diff --git a/include/slot_machine.h b/include/slot_machine.h
index 2eb00d92b..bd0af49af 100644
--- a/include/slot_machine.h
+++ b/include/slot_machine.h
@@ -1,13 +1,15 @@
#ifndef GUARD_SLOT_MACHINE_H
#define GUARD_SLOT_MACHINE_H
-#define REEL_NUM_TAGS 21
+#define NUM_REELS 3
+#define REEL_NUM_TAGS 21
+#define REEL_TAG_HEIGHT 24
// Lucky Flags
#define LUCKY_BIAS_REPLAY 0x0001
#define LUCKY_BIAS_CHERRY 0x0002
#define LUCKY_BIAS_LOTAD 0x0004
-#define LUCKY_BIAS_AZURRILL 0x0008
+#define LUCKY_BIAS_AZURILL 0x0008
#define LUCKY_BIAS_POWER 0x0010
#define LUCKY_BIAS_REELTIME 0x0020
#define LUCKY_BIAS_MIXED_777 0x0040
@@ -18,8 +20,6 @@
#define SLOT_MIDDLE_ROW 0x0002
#define SLOT_BOTTOM_ROW 0x0003
-
-
void PlaySlotMachine(u8, void (callback)(void));
#endif // GUARD_SLOT_MACHINE_H
diff --git a/include/tv.h b/include/tv.h
index a5c26af0c..ec01717e2 100644
--- a/include/tv.h
+++ b/include/tv.h
@@ -26,9 +26,9 @@ bool8 GetPriceReduction(u8 newsKind);
void sub_80F14F8(TVShow *shows);
size_t CountDigits(int value);
u8 GetRibbonCount(struct Pokemon *pokemon);
-void AlertTVThatYouPlayedSlotMachine(u16 nCoinsSpent);
-void AlertTVThatYouPlayedRoulette(u16 nCoinsSpent);
-void reportNewCoinTotal(u16 nCoinsPaidOut);
+void AlertTVThatPlayerPlayedSlotMachine(u16 nCoinsSpent);
+void AlertTVThatPlayerPlayedRoulette(u16 nCoinsSpent);
+void AlertTVOfNewCointTotal(u16 nCoinsPaidOut);
void sub_80EEA70(void);
void sub_80EDB44(void);
void sub_80EDC60(const u16 *words);