dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #85 from pret/slot_machine

Browse Source 
Slot machine
This commit is contained in:
PikalaxALT
2019-08-01 21:04:16 -04:00
committed by GitHub
parent 1a34a06758 da78b51cf3
commit 00cf527c16
40 changed files with 3271 additions and 4901 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/slot_machine.s
-4794
View File
File diff suppressed because it is too large Load Diff
data/slot_machine.s
-94
View File
@@ -1,94 +0,0 @@
.section .rodata
.align 2
gUnknown_8464890:: @ 8464890
.incbin "baserom.gba", 0x464890, 0x1E
gUnknown_84648AE:: @ 84648AE
.incbin "baserom.gba", 0x4648AE, 0xF
gUnknown_84648BD:: @ 84648BD
.incbin "baserom.gba", 0x4648BD, 0x15
gUnknown_84648D2:: @ 84648D2
.incbin "baserom.gba", 0x4648D2, 0x54
gUnknown_8464926:: @ 8464926
.incbin "baserom.gba", 0x464926, 0x40
gUnknown_8464966:: @ 8464966
.incbin "baserom.gba", 0x464966, 0xC4A
gUnknown_84655B0:: @ 84655B0
.incbin "baserom.gba", 0x4655B0, 0x18
gUnknown_84655C8:: @ 84655C8
.incbin "baserom.gba", 0x4655C8, 0x40
gUnknown_8465608:: @ 8465608
.incbin "baserom.gba", 0x465608, 0xE
gUnknown_8465616:: @ 8465616
.incbin "baserom.gba", 0x465616, 0xC0
gUnknown_84656D6:: @ 84656D6
.incbin "baserom.gba", 0x4656D6, 0x10E
gUnknown_84657E4:: @ 84657E4
.incbin "baserom.gba", 0x4657E4, 0x98
gUnknown_846587C:: @ 846587C
.incbin "baserom.gba", 0x46587C, 0x5C
gUnknown_84658D8:: @ 84658D8
.incbin "baserom.gba", 0x4658D8, 0x18
gUnknown_84658F0:: @ 84658F0
.incbin "baserom.gba", 0x4658F0, 0x40
gUnknown_8465930:: @ 8465930
.incbin "baserom.gba", 0x465930, 0x20
gUnknown_8465950:: @ 8465950
.incbin "baserom.gba", 0x465950, 0x80
gUnknown_84659D0:: @ 84659D0
.incbin "baserom.gba", 0x4659D0, 0x804
gUnknown_84661D4:: @ 84661D4
.incbin "baserom.gba", 0x4661D4, 0x2E8
gUnknown_84664BC:: @ 84664BC
.incbin "baserom.gba", 0x4664BC, 0x20
gUnknown_84664DC:: @ 84664DC
.incbin "baserom.gba", 0x4664DC, 0x60
gUnknown_846653C:: @ 846653C
.incbin "baserom.gba", 0x46653C, 0x84
gUnknown_84665C0:: @ 84665C0
.incbin "baserom.gba", 0x4665C0, 0x60
gUnknown_8466620:: @ 8466620
.incbin "baserom.gba", 0x466620, 0x378
gUnknown_8466998:: @ 8466998
.incbin "baserom.gba", 0x466998, 0x178
gUnknown_8466B10:: @ 8466B10
.incbin "baserom.gba", 0x466B10, 0x10
gUnknown_8466B20:: @ 8466B20
.incbin "baserom.gba", 0x466B20, 0xEC
gUnknown_8466C0C:: @ 8466C0C
.incbin "baserom.gba", 0x466C0C, 0x28
gUnknown_8466C34:: @ 8466C34
.incbin "baserom.gba", 0x466C34, 0x4
gUnknown_8466C38:: @ 8466C38
.incbin "baserom.gba", 0x466C38, 0x8
gUnknown_8466C40:: @ 8466C40
.incbin "baserom.gba", 0x466C40, 0x18
data/strings.s
+3 -3
View File
@@ -3067,13 +3067,13 @@ gText_HatchedFromEgg:: @ 841B6FD
gText_NickHatchPrompt:: @ 841B716
.string "Would you like to nickname the newly\nhatched {STR_VAR_1}?$"
gUnknown_841B747:: @ 841B747
gString_OutOfCoins:: @ 841B747
.string "You've run out of COINS.\nGame over!$"
gUnknown_841B76B:: @ 841B76B
gString_QuitPlaying:: @ 841B76B
.string "Quit playing?$"
gUnknown_841B779:: @ 841B779
gString_SlotMachineControls:: @ 841B779
.string "{KEYGFX_DPAD_LEFT_RIGHT}COMBOS {KEYGFX_DPAD_DOWN}WAGER {KEYGFX_A_BUTTON}STOP {KEYGFX_B_BUTTON}EXIT$"
gUnknown_841B798:: @ 0x841B798
graphics/slot_machine/unk_8464974.pal
+19
View File
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
255 255 255
65 65 65
255 246 0
255 172 0
246 246 255
255 246 213
246 213 156
238 222 0
98 98 98
131 98 41
255 106 0
222 57 0
213 180 0
222 222 230
0 0 0
0 0 0
graphics/slot_machine/unk_8464994.pal
+19
View File
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
123 255 255
65 65 65
246 246 255
246 74 0
205 65 0
255 205 189
222 222 230
0 0 0
255 238 238
164 32 0
205 123 24
255 222 115
123 82 0
255 246 0
230 205 0
164 123 41
graphics/slot_machine/unk_84649b4.pal
+19
View File
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
115 255 139
65 65 65
255 0 0
255 255 255
255 131 0
255 205 0
0 0 255
0 131 255
0 205 255
156 238 74
205 205 230
222 0 0
0 156 0
131 131 148
164 164 189
180 0 0
graphics/slot_machine/unk_84649d4.pal
+19
View File
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
255 156 230
57 65 65
255 246 213
246 213 123
255 205 172
255 172 115
172 156 90
246 246 255
213 98 41
222 222 230
148 148 156
238 172 255
246 131 180
197 74 106
148 74 197
205 131 255
graphics/slot_machine/unk_84649f4.pal
+19
View File
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
255 230 115
57 65 65
106 115 115
197 205 205
230 238 238
246 246 255
164 172 172
255 90 65
65 90 255
189 213 255
255 213 189
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
graphics/slot_machine/unk_8464a14.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

graphics/slot_machine/unk_846504c.pal
+19
View File
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
0 0 0
238 172 0
156 115 115
246 205 205
123 90 90
222 164 164
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
222 123 32
255 205 32
205 90 0
graphics/slot_machine/unk_846506c.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 909 B

graphics/slot_machine/unk_8465524.pal
+19
View File
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
0 0 0
98 98 90
255 255 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 255 0
graphics/slot_machine/unk_8465544.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 215 B

graphics/slot_machine/unk_8465930.pal
+19
View File
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
0 0 0
57 57 49
230 230 230
255 255 255
238 172 0
197 74 24
205 90 0
255 205 32
222 123 32
255 164 41
57 148 255
164 222 255
0 49 123
139 0 0
98 98 90
0 0 0
graphics/slot_machine/unk_8465950.pal
+19
View File
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
222 222 222
255 255 255
238 172 0
255 90 0
222 41 0
255 90 0
222 41 0
255 90 0
222 41 0
255 90 0
222 41 0
255 90 0
222 41 0
255 205 32
156 0 0
0 0 0
graphics/slot_machine/unk_8465970.pal
+19
View File
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
0 0 0
255 255 255
74 74 213
115 172 255
115 164 74
156 238 74
255 90 0
255 164 41
255 238 32
222 41 0
189 189 189
156 156 156
123 123 123
90 90 90
65 65 65
0 0 0
graphics/slot_machine/unk_8465990.pal
+19
View File
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
0 0 0
238 172 0
172 106 106
222 156 156
148 82 82
197 131 131
8 123 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
222 123 32
255 205 32
205 90 0
graphics/slot_machine/unk_84659b0.pal
+19
View File
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
222 222 222
213 57 0
205 90 0
255 255 255
238 172 0
0 0 197
180 65 0
180 65 0
0 106 0
0 106 0
82 123 255
246 156 0
246 156 0
41 180 82
41 180 82
0 0 0
graphics/slot_machine/unk_84659d0.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.7 KiB

graphics/slot_machine/unk_84661d4.bin
BIN
View File
Binary file not shown.
graphics/slot_machine/unk_84664bc.pal
+19
View File
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
222 222 222
213 57 0
205 90 0
255 255 255
238 172 0
0 164 238
238 131 0
238 131 0
0 222 0
0 222 0
139 255 255
255 238 106
255 238 106
148 255 148
148 255 148
0 0 0
graphics/slot_machine/unk_84664dc.pal
+19
View File
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
222 222 222
255 255 255
238 172 0
255 255 131
255 180 65
255 255 255
255 255 131
255 255 131
255 180 65
255 180 65
255 90 0
255 90 0
222 41 0
255 205 32
156 0 0
0 0 0
graphics/slot_machine/unk_84664fc.pal
+19
View File
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
222 222 222
255 255 255
238 172 0
255 180 65
255 90 0
255 255 131
255 180 65
255 255 255
255 255 131
255 255 131
255 180 65
255 180 65
255 90 0
255 205 32
156 0 0
0 0 0
graphics/slot_machine/unk_846651c.pal
+19
View File
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
222 222 222
255 255 255
238 172 0
255 90 0
222 41 0
255 180 65
255 90 0
255 255 131
255 180 65
255 255 255
255 255 131
255 255 131
255 180 65
255 205 32
156 0 0
0 0 0
graphics/slot_machine/unk_846653c.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 229 B

graphics/slot_machine/unk_84665c0.pal
+19
View File
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
230 189 230
65 65 65
255 255 255
139 238 255
172 255 255
106 205 222
246 222 123
255 230 180
213 189 90
222 49 0
255 238 0
246 205 115
213 156 41
246 49 0
222 255 205
255 230 230
graphics/slot_machine/unk_84665e0.pal
+19
View File
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
197 255 255
65 65 65
246 246 246
255 82 82
49 180 255
65 213 255
255 156 82
0 156 0
156 238 74
164 164 189
255 238 0
255 246 164
197 164 57
238 222 0
222 255 205
255 230 230
graphics/slot_machine/unk_8466600.pal
+19
View File
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
197 255 255
65 65 65
246 246 246
123 131 131
197 205 205
255 139 115
90 123 255
213 131 255
148 74 197
189 90 65
255 180 172
246 230 106
246 74 0
197 255 255
222 255 205
255 230 230
graphics/slot_machine/unk_8466620.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 772 B

graphics/slot_machine/unk_8466998.bin
BIN
View File
Binary file not shown.
graphics_file_rules.mk
+7
View File
@@ -19,6 +19,7 @@ PSSGFXDIR := graphics/pokemon_storage
EVENTOBJGFXDIR := graphics/event_objects
MISCGFXDIR := graphics/misc
TEXTWINDOWGFXDIR := graphics/text_window
SLOTMACHINEGFXDIR := graphics/slot_machine
TEACHYTVGFXDIR := graphics/teachy_tv
SSANNEGFXDIR := graphics/ss_anne
ITEMPCGFXDIR := graphics/item_pc
@@ -478,6 +479,12 @@ $(MISCGFXDIR)/unk_846B008.4bpp: %.4bpp: %.png
$(TEXTWINDOWGFXDIR)/unk_8470B0C.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 19
$(SLOTMACHINEGFXDIR)/unk_8466620.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 66
$(SLOTMACHINEGFXDIR)/unk_84659d0.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 138
$(TEACHYTVGFXDIR)/tiles.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 233
include/global.h
+1 -1
View File
@@ -17,7 +17,7 @@
// Get the IDE to stfu
// We define it this way to fool preproc.
#define INCBIN(x) {0}
#define INCBIN(...) {0}
#define INCBIN_U8 INCBIN
#define INCBIN_U16 INCBIN
#define INCBIN_U32 INCBIN
include/new_menu_helpers.h
+1
View File
@@ -31,6 +31,7 @@ void DrawDialogueFrame(u8 windowId, bool8 transfer);
void DrawStdWindowFrame(u8 windowId, bool8 copyNow);
void ClearDialogWindowAndFrame(u8 windowId, bool8 copyToVram);
void ClearStdWindowAndFrame(u8 taskId, bool8 copyNow);
void sub_80F6C14(void);
void sub_80F771C(bool8 copyToVram);
void SetStdWindowBorderStyle(u8 windowId, bool8 copyToVram);
void sub_80F7768(u8 windowId, bool8 copyToVram);
include/quest_log.h
+1
View File
@@ -22,6 +22,7 @@ extern const u16 gUnknown_84566A8[];
void sub_8112720(u8);
void sub_8113550(u16, const u16 *);
void sub_811539C(void);
void sub_8115748(u16);
u8 sub_8112CAC(void);
bool8 sub_81119D4(void (*func)(void));
include/slot_machine.h
+1 -1
View File
@@ -3,6 +3,6 @@
#include "global.h"
void PlaySlotMachine(u8, void *);
void PlaySlotMachine(u16, void (*)(void));
#endif // GUARD_SLOT_MACHINE_H
include/strings.h
+5
View File
@@ -203,4 +203,9 @@ extern const u8 gString_BattleRecords_ColumnHeaders[];
extern const u8 gString_BattleRecords_7Dashes[];
extern const u8 gString_BattleRecords_4Dashes[];
// slot_machine
extern const u8 gString_OutOfCoins[];
extern const u8 gString_QuitPlaying[];
extern const u8 gString_SlotMachineControls[];
#endif //GUARD_STRINGS_H
ld_script.txt
+2 -2
View File
@@ -254,7 +254,7 @@ SECTIONS {
asm/berry_pouch.o(.text);
asm/itemfinder.o(.text);
src/buy_menu_helpers.o(.text);
asm/slot_machine.o(.text);
src/slot_machine.o(.text);
src/roamer.o(.text);
src/mystery_gift_menu.o(.text);
src/mevent.o(.text);
@@ -454,7 +454,7 @@ SECTIONS {
data/berry_pouch.o(.rodata);
data/itemfinder.o(.rodata);
src/buy_menu_helpers.o(.rodata);
data/slot_machine.o(.rodata);
src/slot_machine.o(.rodata);
src/roamer.o(.rodata);
src/mystery_gift_menu.o(.rodata);
src/mevent.o(.rodata);
src/slot_machine.c
+2886
View File
File diff suppressed because it is too large Load Diff
src/vs_seeker.c
+1 -1
View File
@@ -1,4 +1,5 @@
#include "global.h"
#include "constants/songs.h"
#include "sound.h"
#include "task.h"
#include "malloc.h"
@@ -22,7 +23,6 @@
#include "map_obj_8097404.h"
#include "unk_810c3a4.h"
#include "constants/movement_commands.h"
#include "constants/songs.h"
#include "vs_seeker.h"
typedef enum
sym_ewram.txt
+2 -5
View File
@@ -1387,11 +1387,8 @@ gUnknown_203F38C: @ 203F38C
gUnknown_203F39C: @ 203F39C
.space 0x4
gUnknown_203F3A0: @ 203F3A0
.space 0x4
gUnknown_203F3A4: @ 203F3A4
.space 0x4
.align 2
.include "src/slot_machine.o"
sLocationHistory: @ 203F3A8
.space 0x6