Merge pull request #1116 from GriffinRichards/doc-slotmachine

Document slot machine
2020-08-01 09:56:44 -04:00
commit 03eba6a62c
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-98 98 90
-255 189 16
-131 0 0
-197 65 16
-197 65 16
-197 65 16
-197 65 16
-255 0 255
-255 0 255
-255 0 255
-255 0 255
-255 0 255
-255 0 255
-255 0 255
-255 0 255
-0 0 0
@@ -1,42 +1,6 @@
 #ifndef GUARD_CONSTANTS_SLOT_MACHINE_H
 #define GUARD_CONSTANTS_SLOT_MACHINE_H

-#define NUM_REELS           3
-#define REEL_NUM_TAGS      21
-#define REEL_TAG_HEIGHT    24
 #define SLOT_MACHINE_COUNT 12

-// Lucky Flags
-#define LUCKY_BIAS_REPLAY    (1 << 0)
-#define LUCKY_BIAS_CHERRY    (1 << 1)
-#define LUCKY_BIAS_LOTAD     (1 << 2)
-#define LUCKY_BIAS_AZURILL   (1 << 3)
-#define LUCKY_BIAS_POWER     (1 << 4)
-#define LUCKY_BIAS_REELTIME  (1 << 5)
-#define LUCKY_BIAS_MIXED_777 (1 << 6)
-#define LUCKY_BIAS_777       (1 << 7)
-
-#define SLOT_MACHINE_TAG_7_RED   0
-#define SLOT_MACHINE_TAG_7_BLUE  1
-#define SLOT_MACHINE_TAG_AZURILL 2
-#define SLOT_MACHINE_TAG_LOTAD   3
-#define SLOT_MACHINE_TAG_CHERRY  4
-#define SLOT_MACHINE_TAG_POWER   5
-#define SLOT_MACHINE_TAG_REPLAY  6
-
-#define SLOT_MACHINE_MATCHED_1CHERRY   0
-#define SLOT_MACHINE_MATCHED_2CHERRY   1
-#define SLOT_MACHINE_MATCHED_REPLAY    2
-#define SLOT_MACHINE_MATCHED_LOTAD     3
-#define SLOT_MACHINE_MATCHED_AZURILL   4
-#define SLOT_MACHINE_MATCHED_POWER     5
-#define SLOT_MACHINE_MATCHED_777_MIXED 6
-#define SLOT_MACHINE_MATCHED_777_RED   7
-#define SLOT_MACHINE_MATCHED_777_BLUE  8
-#define SLOT_MACHINE_MATCHED_NONE      9
-
-#define LEFT_REEL   0
-#define MIDDLE_REEL 1
-#define RIGHT_REEL  2
-
-#endif // GUARD_CONSTANTS_SLOT_MACHINE_H
+#endif // GUARD_CONSTANTS_SLOT_MACHINE_H
@@ -4824,7 +4824,7 @@ extern const u32 gUnknown_08D91DB8[];
 extern const u32 gUnknown_08D927EC[];

 // Slot Machine
-extern const u32 gSlotMachineReelTime_Gfx[];
+extern const u32 gSlotMachineDigitalDisplay_Gfx[];
 extern const u8 gSlotMachineReelTimeNumber0[];
 extern const u8 gSlotMachineReelTimeNumber1[];
 extern const u8 gSlotMachineReelTimeNumber2[];
@@ -4832,15 +4832,15 @@ extern const u8 gSlotMachineReelTimeNumber3[];
 extern const u8 gSlotMachineReelTimeNumber4[];
 extern const u8 gSlotMachineReelTimeNumber5[];
 extern const u8 gSlotMachineReelTimeShadow[];
-extern const u8 gUnknown_08DD1A18[];
-extern const u8 gSlotMachineReelTimeLargeBolt0[];
-extern const u8 gSlotMachineReelTimeLargeBolt1[];
+extern const u8 gSlotMachineReelTimeNumberGap_Gfx[];
+extern const u8 gSlotMachineReelTimeBolt0[];
+extern const u8 gSlotMachineReelTimeBolt1[];
 extern const u8 gSlotMachineReelTimePikaAura[];
 extern const u8 gSlotMachineReelTimeExplosion0[];
 extern const u8 gSlotMachineReelTimeExplosion1[];
 extern const u8 gSlotMachineReelTimeDuck[];
 extern const u8 gSlotMachineReelTimeSmoke[];
-extern const u8 gSlotMachineReelTimeBolt[];
+extern const u8 gSlotMachinePikaPowerBolt[];
 extern const u8 gSlotMachineReelSymbol1Tiles[];
 extern const u8 gSlotMachineReelSymbol2Tiles[];
 extern const u8 gSlotMachineReelSymbol3Tiles[];
@@ -4858,19 +4858,18 @@ extern const u8 gSlotMachineNumber6Tiles[];
 extern const u8 gSlotMachineNumber7Tiles[];
 extern const u8 gSlotMachineNumber8Tiles[];
 extern const u8 gSlotMachineNumber9Tiles[];
-extern const u8 gUnknown_08DD19F8[];
+extern const u8 gSlotMachineReelBackground_Tilemap[];
 extern const u32 gSlotMachineMenu_Gfx[];
 extern const u16 gSlotMachineMenu_Tilemap[];
-extern const u16 gUnknown_08DCEC70[];
+extern const u16 gSlotMachineInfoBox_Tilemap[];
 extern const u16 gSlotMachineMenu_Pal[];
-extern const u16 gUnknown_08DCF230[];
-extern const u16 gUnknown_08DCF170[];
-extern const u16 gUnknown_08DCF1B0[];
-extern const u16 gSlotMachineReelTime_Pal[];
-extern const u16 gUnknown_08DCF1F0[];
-extern const u16 gUnknown_08DCF210[];
-extern const u16 gUnknown_08DCF230[];
-extern const u16 gUnknown_08DCF190[];
+extern const u16 gSlotMachineReelSymbols_Pal[];
+extern const u16 gSlotMachineReelTimeMisc_Pal[];
+extern const u16 gSlotMachineReelTimeMachine_Pal[];
+extern const u16 gSlotMachineMisc_Pal[];
+extern const u16 gSlotMachineReelTimeExplosion_Pal[];
+extern const u16 gSlotMachineDigitalDisplay_Pal[];
+extern const u16 gSlotMachineReelTimePikachu_Pal[];

 extern const u32 gBattleAnimBgTilemap_Sandstorm[];
 extern const u32 gBattleAnimBgImage_Sandstorm[];
@@ -88,6 +88,12 @@ extern const u8 gText_Slots[];
 extern const u8 gText_Roulette[];
 extern const u8 gText_Jackpot[];

+extern const u8 gText_YouDontHaveThreeCoins[];
+extern const u8 gText_QuitTheGame[];
+extern const u8 gText_YouveGot9999Coins[];
+extern const u8 gText_YouveRunOutOfCoins[];
+extern const u8 gText_ReelTimeHelp[];
+
 extern const u8 gText_First[];
 extern const u8 gText_Second[];
 extern const u8 gText_Third[];
@@ -2,21 +2,15 @@ const u16 gSlotMachineMenu_Pal[] = INCBIN_U16("graphics/slot_machine/menu.gbapal
 const u32 gSlotMachineMenu_Gfx[] = INCBIN_U32("graphics/slot_machine/menu.4bpp.lz");
 const u16 gSlotMachineMenu_Tilemap[] = INCBIN_U16("graphics/slot_machine/menu.bin");

-const u16 gUnknown_08DCEC70[] = INCBIN_U16("graphics/slot_machine/slots_layout.bin");
+const u16 gSlotMachineInfoBox_Tilemap[] = INCBIN_U16("graphics/slot_machine/info_box.bin");

-const u16 gUnknown_08DCF170[] = INCBIN_U16("graphics/slot_machine/reel_symbols/1.gbapal");
-
-const u16 gUnknown_08DCF190[] = INCBIN_U16("graphics/slot_machine/reel_pikachu.gbapal");
-
-const u16 gUnknown_08DCF1B0[] = INCBIN_U16("graphics/slot_machine/shadow.gbapal");
-
-const u16 gSlotMachineReelTime_Pal[] = INCBIN_U16("graphics/slot_machine/reel_time.gbapal");
-
-const u16 gUnknown_08DCF1F0[] = INCBIN_U16("graphics/slot_machine/smoke.gbapal"); // also duck and pika aura
-
-const u16 gUnknown_08DCF210[] = INCBIN_U16("graphics/slot_machine/reel_time_explosion/0.gbapal");
-
-const u16 gUnknown_08DCF230[] = INCBIN_U16("graphics/slot_machine/spr6.gbapal");
+const u16 gSlotMachineReelSymbols_Pal[] = INCBIN_U16("graphics/slot_machine/reel_symbols/1.gbapal");
+const u16 gSlotMachineReelTimePikachu_Pal[] = INCBIN_U16("graphics/slot_machine/reel_time_pikachu.gbapal");
+const u16 gSlotMachineReelTimeMisc_Pal[] = INCBIN_U16("graphics/slot_machine/shadow.gbapal");
+const u16 gSlotMachineReelTimeMachine_Pal[] = INCBIN_U16("graphics/slot_machine/reel_time_machine.gbapal");
+const u16 gSlotMachineMisc_Pal[] = INCBIN_U16("graphics/slot_machine/smoke.gbapal");
+const u16 gSlotMachineReelTimeExplosion_Pal[] = INCBIN_U16("graphics/slot_machine/reel_time_explosion/0.gbapal");
+const u16 gSlotMachineDigitalDisplay_Pal[] = INCBIN_U16("graphics/slot_machine/digital_display.gbapal");

 const u8 gSlotMachineReelSymbol1Tiles[] = INCBIN_U8("graphics/slot_machine/reel_symbols/1.4bpp");
 const u8 gSlotMachineReelSymbol2Tiles[] = INCBIN_U8("graphics/slot_machine/reel_symbols/2.4bpp");
@@ -26,7 +20,7 @@ const u8 gSlotMachineReelSymbol5Tiles[] = INCBIN_U8("graphics/slot_machine/reel_
 const u8 gSlotMachineReelSymbol6Tiles[] = INCBIN_U8("graphics/slot_machine/reel_symbols/6.4bpp");
 const u8 gSlotMachineReelSymbol7Tiles[] = INCBIN_U8("graphics/slot_machine/reel_symbols/7.4bpp");

-const u32 gSlotMachineReelTime_Gfx[] = INCBIN_U32("graphics/slot_machine/reel_time.4bpp.lz");
+const u32 gSlotMachineDigitalDisplay_Gfx[] = INCBIN_U32("graphics/slot_machine/digital_display.4bpp.lz");

 const u8 gSlotMachineNumber0Tiles[] = INCBIN_U8("graphics/slot_machine/numbers/0.4bpp");
 const u8 gSlotMachineNumber1Tiles[] = INCBIN_U8("graphics/slot_machine/numbers/1.4bpp");
@@ -39,7 +33,7 @@ const u8 gSlotMachineNumber7Tiles[] = INCBIN_U8("graphics/slot_machine/numbers/7
 const u8 gSlotMachineNumber8Tiles[] = INCBIN_U8("graphics/slot_machine/numbers/8.4bpp");
 const u8 gSlotMachineNumber9Tiles[] = INCBIN_U8("graphics/slot_machine/numbers/9.4bpp");

-const u8 gSlotMachineReelTimeBolt[] = INCBIN_U8("graphics/slot_machine/bolt.4bpp");
+const u8 gSlotMachinePikaPowerBolt[] = INCBIN_U8("graphics/slot_machine/bolt.4bpp");
 const u8 gSlotMachineReelTimeDuck[] = INCBIN_U8("graphics/slot_machine/duck.4bpp");
 const u8 gSlotMachineReelTimeSmoke[] = INCBIN_U8("graphics/slot_machine/smoke.4bpp");

@@ -50,8 +44,8 @@ const u8 gSlotMachineReelTimeNumber3[] = INCBIN_U8("graphics/slot_machine/reel_t
 const u8 gSlotMachineReelTimeNumber4[] = INCBIN_U8("graphics/slot_machine/reel_time_numbers/4.4bpp");
 const u8 gSlotMachineReelTimeNumber5[] = INCBIN_U8("graphics/slot_machine/reel_time_numbers/5.4bpp");

-const u8 gSlotMachineReelTimeLargeBolt0[] = INCBIN_U8("graphics/slot_machine/large_bolt/0.4bpp");
-const u8 gSlotMachineReelTimeLargeBolt1[] = INCBIN_U8("graphics/slot_machine/large_bolt/1.4bpp");
+const u8 gSlotMachineReelTimeBolt0[] = INCBIN_U8("graphics/slot_machine/large_bolt/0.4bpp");
+const u8 gSlotMachineReelTimeBolt1[] = INCBIN_U8("graphics/slot_machine/large_bolt/1.4bpp");

 const u8 gSlotMachineReelTimeExplosion0[] = INCBIN_U8("graphics/slot_machine/reel_time_explosion/0.4bpp");
 const u8 gSlotMachineReelTimeExplosion1[] = INCBIN_U8("graphics/slot_machine/reel_time_explosion/1.4bpp");
@@ -59,5 +53,5 @@ const u8 gSlotMachineReelTimeExplosion1[] = INCBIN_U8("graphics/slot_machine/ree
 const u8 gSlotMachineReelTimeShadow[] = INCBIN_U8("graphics/slot_machine/shadow.4bpp");
 const u8 gSlotMachineReelTimePikaAura[] = INCBIN_U8("graphics/slot_machine/pika_aura.4bpp");

-const u8 gUnknown_08DD19F8[] = INCBIN_U8("graphics/unknown/unknown_DD19F8.bin");
-const u8 gUnknown_08DD1A18[] = INCBIN_U8("graphics/unknown/unknown_DD1A18.4bpp");
+const u8 gSlotMachineReelBackground_Tilemap[] = INCBIN_U8("graphics/slot_machine/reel_background.bin");
+const u8 gSlotMachineReelTimeNumberGap_Gfx[] = INCBIN_U8("graphics/slot_machine/reel_time_number_gap.4bpp");