ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-26 11:44:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #288 from DizzyEggg/slot_machine

Browse Source 
Port a little bit of slot machine
This commit is contained in:
Diegoisawesome 2018-08-12 12:27:23 -07:00 committed by GitHub
commit 25832810f6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 1638 additions and 2954 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3129
asm/slot_machine.s
View File

File diff suppressed because it is too large Load Diff

90
data/slot_machine.s
View File

@ -20,36 +20,36 @@ gUnknown_085A7444:: @ 85A7444
gUnknown_085A744C:: @ 85A744C gUnknown_085A744C:: @ 85A744C
.byte 3, 1, 2, 0 .byte 3, 1, 2, 0
gUnknown_085A7450:: @ 85A7450 gUnknown_083ECAAC:: @ 85A7450
.4byte sub_812AB04 .4byte sub_8101D5C
.4byte sub_812AB38 .4byte sub_8101D8C
.4byte sub_812AB60 .4byte sub_8101DB0
.4byte sub_812ABA8 .4byte sub_8101DF4
.4byte sub_812ABC8 .4byte sub_8101E10
.4byte sub_812ABF8 .4byte sub_8101E3C
.4byte sub_812ACF4 .4byte sub_8101F44
.4byte sub_812AD34 .4byte sub_8101F60
.4byte sub_812AD60 .4byte sub_8101F88
.4byte sub_812AD80 .4byte sub_8101FA4
.4byte sub_812ADF4 .4byte sub_8102008
.4byte sub_812AE24 .4byte sub_8102034
.4byte sub_812AE4C .4byte sub_8102058
.4byte sub_812AE88 .4byte sub_8102090
.4byte sub_812AEC4 .4byte sub_81020C8
.4byte sub_812AFFC .4byte sub_81021E0
.4byte sub_812B01C .4byte sub_81021FC
.4byte sub_812B094 .4byte sub_8102264
.4byte sub_812B0D8 .4byte sub_81022A0
.4byte sub_812B108 .4byte sub_81022CC
.4byte sub_812B130 .4byte sub_81022F0
.4byte sub_812B158 .4byte sub_8102318
.4byte sub_812B1B0 .4byte sub_8102344
.4byte sub_812B214 .4byte sub_810239C
.4byte sub_812B254 .4byte sub_81023B8
.4byte sub_812B280 .4byte sub_81023E0_
.4byte sub_812B2C0 .4byte sub_81023FC
.4byte sub_812B2EC .4byte sub_8102424
.4byte sub_812B32C .4byte sub_8102460
gUnknown_085A74C4:: @ 85A74C4 gUnknown_085A74C4:: @ 85A74C4
.4byte sub_812BB34 .4byte sub_812BB34
@ -203,10 +203,10 @@ gUnknown_085A766E:: @ 85A766E
gUnknown_085A76AD:: @ 85A76AD gUnknown_085A76AD:: @ 85A76AD
.byte 1, 0, 5, 4, 3, 2, 0 .byte 1, 0, 5, 4, 3, 2, 0
gUnknown_085A76B4:: @ 85A76B4 gUnknown_083ECCF8:: @ 85A76B4
.2byte 0, 6, 0, 10, 0, 2 .2byte 0, 6, 0, 10, 0, 2
gUnknown_085A76C0:: @ 85A76C0 gUnknown_083ECD04:: @ 85A76C0
.byte 1, 1, 12 .byte 1, 1, 12
.byte 1, 1, 14 .byte 1, 1, 14
.byte 2, 2, 14 .byte 2, 2, 14
@ -214,19 +214,19 @@ gUnknown_085A76C0:: @ 85A76C0
.byte 2, 3, 16 .byte 2, 3, 16
.byte 3, 3, 16 .byte 3, 3, 16
gUnknown_085A76D2:: @ 85A76D2 gUnknown_083ECD16:: @ 85A76D2
.byte 0x19, 0x19, 0x1E, 0x28, 0x28, 0x32 .byte 0x19, 0x19, 0x1E, 0x28, 0x28, 0x32
.byte 0x19, 0x19, 0x1E, 0x1E, 0x23, 0x23 .byte 0x19, 0x19, 0x1E, 0x1E, 0x23, 0x23
.byte 0x19, 0x19, 0x1E, 0x19, 0x19, 0x1E .byte 0x19, 0x19, 0x1E, 0x19, 0x19, 0x1E
gUnknown_085A76E4:: @ 85A76E4 gUnknown_083ECD28:: @ 85A76E4
.byte 0x14, 0x19, 0x19, 0x14, 0x19, 0x19 .byte 0x14, 0x19, 0x19, 0x14, 0x19, 0x19
.byte 0xC, 0xF, 0xF, 0x12, 0x13, 0x16 .byte 0xC, 0xF, 0xF, 0x12, 0x13, 0x16
.byte 0x19, 0x19, 0x19, 0x1E, 0x1E, 0x28 .byte 0x19, 0x19, 0x19, 0x1E, 0x1E, 0x28
.byte 0x19, 0x19, 0x14, 0x14, 0xF, 0xF .byte 0x19, 0x19, 0x14, 0x14, 0xF, 0xF
.byte 0x28, 0x28, 0x23, 0x23, 0x28, 0x28 .byte 0x28, 0x28, 0x23, 0x23, 0x28, 0x28
gUnknown_085A7702:: @ 85A7702 gUnknown_083ECD46:: @ 85A7702
.byte 0xF3, 0xF3, 0xF3, 0x50, 0x50, 0x50, 0x50, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x5, 0x5, 0x5, 0x5 .byte 0xF3, 0xF3, 0xF3, 0x50, 0x50, 0x50, 0x50, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x5, 0x5, 0x5, 0x5
.byte 0x5, 0x5, 0x5, 0x96, 0x96, 0x96, 0x96, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x64, 0x64, 0x64, 0x5 .byte 0x5, 0x5, 0x5, 0x96, 0x96, 0x96, 0x96, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x64, 0x64, 0x64, 0x5
.byte 0x4, 0x4, 0x4, 0x14, 0x14, 0x14, 0x14, 0x50, 0x50, 0x50, 0x50, 0x50, 0x50, 0x64, 0x64, 0x64, 0x28 .byte 0x4, 0x4, 0x4, 0x14, 0x14, 0x14, 0x14, 0x50, 0x50, 0x50, 0x50, 0x50, 0x50, 0x64, 0x64, 0x64, 0x28
@ -234,7 +234,7 @@ gUnknown_085A7702:: @ 85A7702
.byte 0x1, 0x1, 0x1, 0x2, 0x2, 0x2, 0x2, 0x2, 0x2, 0x2, 0x2, 0x2, 0x2, 0x5, 0x5, 0x5, 0x64 .byte 0x1, 0x1, 0x1, 0x2, 0x2, 0x2, 0x2, 0x2, 0x2, 0x2, 0x2, 0x2, 0x2, 0x5, 0x5, 0x5, 0x64
.byte 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x6 .byte 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x6
gUnknown_085A7768:: @ 85A7768 gUnknown_083ECDAC:: @ 85A7768
.byte 0xF3, 0xF3, 0xF3, 0xC8, 0xC8, 0xC8, 0xC8, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0x46, 0x46, 0x46, 0x05 .byte 0xF3, 0xF3, 0xF3, 0xC8, 0xC8, 0xC8, 0xC8, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0x46, 0x46, 0x46, 0x05
.byte 0x05, 0x05, 0x05, 0x19, 0x19, 0x19, 0x19, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x02, 0x02, 0x02, 0x06 .byte 0x05, 0x05, 0x05, 0x19, 0x19, 0x19, 0x19, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x02, 0x02, 0x02, 0x06
.byte 0x04, 0x04, 0x04, 0x19, 0x19, 0x19, 0x19, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x28, 0x28, 0x28, 0x23 .byte 0x04, 0x04, 0x04, 0x19, 0x19, 0x19, 0x19, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x28, 0x28, 0x28, 0x23
@ -242,45 +242,45 @@ gUnknown_085A7768:: @ 85A7768
.byte 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x28, 0x28, 0x28, 0x64 .byte 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x28, 0x28, 0x28, 0x64
.byte 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x04, 0x04, 0x04, 0x3C .byte 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x04, 0x04, 0x04, 0x3C
gUnknown_085A77CE:: @ 85A77CE gUnknown_083ECE12:: @ 85A77CE
.2byte 0x80, 0xAF, 0xC8, 0xE1, 0x100 .2byte 0x80, 0xAF, 0xC8, 0xE1, 0x100
gUnknown_085A77D8:: @ 85A77D8 gUnknown_083ECE1C:: @ 85A77D8
.byte 10, 0, 5, 0 .byte 10, 0, 5, 0
.byte 10, 0, 10, 0 .byte 10, 0, 10, 0
.byte 10, 0, 15, 0 .byte 10, 0, 15, 0
.byte 10, 0, 25, 0 .byte 10, 0, 25, 0
.byte 10, 0, 35, 0 .byte 10, 0, 35, 0
gUnknown_085A77EC:: @ 85A77EC gUnknown_083ECE30:: @ 85A77EC
.byte 0, 0 .byte 0, 0
.byte 5, 0 .byte 5, 0
.byte 10, 0 .byte 10, 0
.byte 15, 0 .byte 15, 0
.byte 20, 0 .byte 20, 0
gUnknown_085A77F6:: @ 85A77F6 gUnknown_083ECE3A:: @ 85A77F6
.byte 6, 4, 3, 2, 5, 0, 0, 0 .byte 6, 4, 3, 2, 5, 0, 0, 0
gUnknown_085A77FE:: @ 85A77FE gUnknown_083ECE42:: @ 85A77FE
.byte 0x80, 0 .byte 0x80, 0
.byte 0x20, 0 .byte 0x20, 0
.byte 0x40, 0 .byte 0x40, 0
gUnknown_085A7804:: @ 85A7804 gUnknown_083ECE48:: @ 85A7804
.byte 16, 0 .byte 16, 0
.byte 8, 0 .byte 8, 0
.byte 4, 0 .byte 4, 0
.byte 2, 0 .byte 2, 0
.byte 1, 0 .byte 1, 0
gUnknown_085A780E:: @ 85A780E sSym2Match:: @ 85A780E
.byte 7, 8, 4, 3, 0, 5, 2, 0 .byte 7, 8, 4, 3, 0, 5, 2, 0
gUnknown_085A7816:: @ 85A7816 sSlotMatchFlags:: @ 85A7816
.2byte 1, 2, 4, 8, 16, 32, 64, 128, 256 .2byte 1, 2, 4, 8, 16, 32, 64, 128, 256
gUnknown_085A7828:: @ 85A7828 sSlotPayouts:: @ 85A7828
.2byte 2, 4, 0, 6, 12, 3, 0x5A, 0x12C, 0x12C .2byte 2, 4, 0, 6, 12, 3, 0x5A, 0x12C, 0x12C
gUnknown_085A783A:: @ 85A783A gUnknown_085A783A:: @ 85A783A

1
include/main_menu.h
View File

@ -2,5 +2,6 @@
#define GUARD_MAIN_MENU_H #define GUARD_MAIN_MENU_H
void CB2_InitMainMenu(void); void CB2_InitMainMenu(void);
void sub_80323CC(u8 a, u8 b, u16 c, u16 d, u8 e, u8 f);
#endif // GUARD_MAIN_MENU_H #endif // GUARD_MAIN_MENU_H

2
include/slot_machine.h
View File

@ -1,6 +1,6 @@
#ifndef GUARD_SLOT_MACHINE_H #ifndef GUARD_SLOT_MACHINE_H
#define GUARD_SLOT_MACHINE_H #define GUARD_SLOT_MACHINE_H
void PlaySlotMachine(u8, void *); void PlaySlotMachine(u8, void (callback)(void));
#endif // GUARD_SLOT_MACHINE_H #endif // GUARD_SLOT_MACHINE_H

2
ld_script.txt
View File

@ -170,6 +170,7 @@ SECTIONS {
src/region_map.o(.text); src/region_map.o(.text);
asm/cute_sketch.o(.text); asm/cute_sketch.o(.text);
src/decoration.o(.text); src/decoration.o(.text);
src/slot_machine.o(.text);
asm/slot_machine.o(.text); asm/slot_machine.o(.text);
asm/contest_painting.o(.text); asm/contest_painting.o(.text);
src/battle_ai_script_commands.o(.text); src/battle_ai_script_commands.o(.text);
@ -464,6 +465,7 @@ SECTIONS {
src/region_map.o(.rodata); src/region_map.o(.rodata);
data/cute_sketch.o(.rodata); data/cute_sketch.o(.rodata);
src/decoration.o(.rodata); src/decoration.o(.rodata);
src/slot_machine.o(.rodata);
data/slot_machine.o(.rodata); data/slot_machine.o(.rodata);
data/contest_painting.o(.rodata); data/contest_painting.o(.rodata);
src/battle_ai_script_commands.o(.rodata); src/battle_ai_script_commands.o(.rodata);

1366
src/slot_machine.c Normal file
View File

File diff suppressed because it is too large Load Diff

2
sym_ewram.txt
View File

@ -541,7 +541,7 @@ gUnknown_0203AB2C: @ 203AB2C
gUnknown_0203AB30: @ 203AB30 gUnknown_0203AB30: @ 203AB30
.space 0x4 .space 0x4
gUnknown_0203AB34: @ 203AB34 sSlotMachine: @ 203AB34
.space 0x4 .space 0x4
.include "src/battle_ai_script_commands.o" .include "src/battle_ai_script_commands.o"