mirror of
https://github.com/Ninjdai1/pokeemerald.git
synced 2024-12-25 19:24:16 +01:00
fixed issues in data and include dirs
This commit is contained in:
parent
53d7e21332
commit
9ed0f77528
6
data/slot_machine.s
Normal file → Executable file
6
data/slot_machine.s
Normal file → Executable file
@ -712,7 +712,7 @@ gUnknown_083EDBC4:: @ 85A82CC
|
||||
.4byte NULL
|
||||
|
||||
.align 2
|
||||
sSlotMachineSpriteSheets:: @ 85A8334
|
||||
gSlotMachineSpriteSheets:: @ 85A8334
|
||||
obj_tiles gSlotMachineReelSymbol1Tiles, 0x0200, 0x0000
|
||||
obj_tiles gSlotMachineReelSymbol2Tiles, 0x0200, 0x0001
|
||||
obj_tiles gSlotMachineReelSymbol3Tiles, 0x0200, 0x0002
|
||||
@ -830,10 +830,10 @@ obj_pal gUnknown_08DCF230, 6
|
||||
obj_pal gUnknown_08DCF1F0, 7
|
||||
null_obj_pal
|
||||
|
||||
sReelTimeGfx:: @ 85A858C
|
||||
gReelTimeGfx:: @ 85A858C
|
||||
.incbin "graphics/slot_machine/reel_time_gfx.4bpp.lz"
|
||||
|
||||
sReelTimeWindowTilemap:: @ 85A96E0
|
||||
gReelTimeWindowTilemap:: @ 85A96E0
|
||||
@if anyone knows what this tilemap is please do share
|
||||
.incbin "graphics/slot_machine/85A96E0.bin"
|
||||
|
||||
|
@ -15,11 +15,6 @@
|
||||
#define LUCKY_BIAS_MIXED_777 (1 << 6)
|
||||
#define LUCKY_BIAS_777 (1 << 7)
|
||||
|
||||
// Rows
|
||||
#define SLOT_TOP_ROW 0x0001
|
||||
#define SLOT_MIDDLE_ROW 0x0002
|
||||
#define SLOT_BOTTOM_ROW 0x0003
|
||||
|
||||
void PlaySlotMachine(u8, void (callback)(void));
|
||||
|
||||
#endif // GUARD_SLOT_MACHINE_H
|
||||
|
Loading…
Reference in New Issue
Block a user