Slot machine is decompiled.

This commit is contained in:
DizzyEggg 2018-09-15 23:19:37 +02:00
parent db248dada2
commit 4d2637883a
6 changed files with 619 additions and 795 deletions

View File

@ -1,10 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
.align 2, 0 @ Don't pad with nop.

View File

@ -5,207 +5,6 @@
.align 2 .align 2
gUnknown_083ECF0C:: @ 85A78C8
.4byte sub_8105C64
.4byte sub_8105F54
.4byte sub_8105F54
.4byte sub_8105F54
.4byte sub_8105F54
.4byte sub_8105F9C
.4byte sub_8105EB4
.4byte sub_8105C64
.4byte sub_8105C64
.4byte sub_8105C6C
.4byte sub_8105CF0
.4byte sub_8105D08
.4byte sub_8105D20
.4byte sub_8105D3C
.4byte sub_8105DA4
.4byte sub_8105E08
.4byte sub_8105C64
.4byte sub_8106058
.4byte sub_81060FC
.4byte sub_81060FC
.4byte sub_81060FC
.4byte sub_81060FC
.4byte sub_81060FC
.4byte sub_81060FC
.4byte sub_81060FC
.4byte sub_81060FC
.4byte sub_81061C8
.4byte sub_81061C8
.4byte sub_81061C8
.4byte sub_81061C8
.4byte sub_81061C8
.4byte sub_81061C8
.4byte sub_81061C8
.4byte sub_81061C8
.4byte sub_8106230
gUnknown_085A7954:: @ 85A7954
.byte 0x19
.byte 0x22
.2byte 0
.byte 0x2
.byte 0
.2byte 0
.byte 0x9
.byte 0x10
.2byte 0
.byte 0xFF
.byte 0
.2byte 0
gUnknown_085A7964:: @ 85A7964
.byte 0xA
.byte 0x1
.2byte 0
.byte 0xB
.byte 2
.2byte 0
.byte 0xC
.byte 0x3
.2byte 0
.byte 0xD
.byte 4
.2byte 0
.byte 0x5
.byte 5
.2byte 0
.byte 0x8
.byte 0x6
.2byte 0
.byte 0xFF
.byte 0
.2byte 0
gUnknown_085A7980:: @ 85A7980
.byte 0x3
.byte 0x7
.2byte 0
.byte 0x8
.byte 0x11
.2byte 0
.byte 0xFF
.byte 0
.2byte 0
gUnknown_085A798C:: @ 85A798C
.byte 0x4
.byte 0x8
.2byte 0
.byte 0x6
.byte 0x9
.2byte 0
.byte 0x6
.byte 0xA
.2byte 1
.byte 0x6
.byte 0xB
.2byte 2
.byte 0x6
.byte 0xC
.2byte 3
.byte 0xFF
.byte 0
.2byte 0
gUnknown_085A79A4:: @ 85A79A4
.byte 0
.byte 0xD
.2byte 0
.byte 1
.byte 0xE
.2byte 0
.byte 0x7
.byte 0xF
.2byte 0
.byte 0xFF
.byte 0
.2byte 0
gUnknown_085A79B4:: @ 85A79B4
.byte 0x13
.byte 0x1A
.2byte 0
.byte 0x14
.byte 0x1B
.2byte 1
.byte 0x15
.byte 0x1C
.2byte 2
.byte 0xE
.byte 0x1D
.2byte 3
.byte 0xF
.byte 0x1E
.2byte 4
.byte 0x10
.byte 0x1F
.2byte 5
.byte 0x11
.byte 0x20
.2byte 6
.byte 0x12
.byte 0x21
.2byte 7
.byte 0x8
.byte 0x11
.2byte 0
.byte 0xFF
.byte 0
.2byte 0
gUnknown_085A79DC:: @ 85A79DC
.byte 0x16
.byte 0x12
.2byte 0
.byte 0x17
.byte 0x13
.2byte 1
.byte 0x18
.byte 0x14
.2byte 2
.byte 0xE
.byte 0x15
.2byte 3
.byte 0xF
.byte 0x16
.2byte 4
.byte 0x10
.byte 0x17
.2byte 5
.byte 0x11
.byte 0x18
.2byte 6
.byte 0x12
.byte 0x19
.2byte 7
.byte 0x8
.byte 0x11
.2byte 0
.byte 0xFF
.byte 0
.2byte 0
gUnknown_083ED048:: @ 85A7A04
.4byte gUnknown_085A7954
.4byte gUnknown_085A7964
.4byte gUnknown_085A7980
.4byte gUnknown_085A798C
.4byte gUnknown_085A79A4
.4byte gUnknown_085A79DC
.4byte gUnknown_085A79B4
gUnknown_083ED064:: @ 85A7A20
.4byte sub_810639C
.4byte sub_8106364
.4byte sub_8106370
.4byte nullsub_70
.4byte nullsub_70
.4byte sub_8106370
.4byte sub_8106370
gUnknown_085A7A3C:: @ 85A7A3C gUnknown_085A7A3C:: @ 85A7A3C
.2byte 0 .2byte 0
.2byte 0 .2byte 0

View File

@ -171,7 +171,6 @@ SECTIONS {
asm/cute_sketch.o(.text); asm/cute_sketch.o(.text);
src/decoration.o(.text); src/decoration.o(.text);
src/slot_machine.o(.text); src/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);
src/trader.o(.text); src/trader.o(.text);

File diff suppressed because it is too large Load Diff

View File

@ -31,9 +31,7 @@
.include "src/mauville_old_man.o" .include "src/mauville_old_man.o"
.include "src/menu_helpers.o" .include "src/menu_helpers.o"
.include "src/region_map.o" .include "src/region_map.o"
.include "src/slot_machine.o"
gUnknown_03001188: @ 3001188
.space 0x68
gUnknown_030011F0: @ 30011F0 gUnknown_030011F0: @ 30011F0
.space 0x2 .space 0x2

View File

@ -448,94 +448,7 @@ gUnknown_0203A120: @ 203A120
.include "src/menu_helpers.o" .include "src/menu_helpers.o"
.include "src/region_map.o" .include "src/region_map.o"
.include "src/decoration.o" .include "src/decoration.o"
.align 2 .include "src/slot_machine.o"
@ slot_machine
gUnknown_0203AAC8: @ 203AAC8
.space 0x4
gUnknown_0203AACC: @ 203AACC
.space 0x4
gUnknown_0203AAD0: @ 203AAD0
.space 0x4
gUnknown_0203AAD4: @ 203AAD4
.space 0x4
gUnknown_0203AAD8: @ 203AAD8
.space 0x4
gUnknown_0203AADC: @ 203AADC
.space 0x4
gUnknown_0203AAE0: @ 203AAE0
.space 0x4
gUnknown_0203AAE4: @ 203AAE4
.space 0x4
gUnknown_0203AAE8: @ 203AAE8
.space 0x4
gUnknown_0203AAEC: @ 203AAEC
.space 0x4
gUnknown_0203AAF0: @ 203AAF0
.space 0x4
gUnknown_0203AAF4: @ 203AAF4
.space 0x4
gUnknown_0203AAF8: @ 203AAF8
.space 0x4
gUnknown_0203AAFC: @ 203AAFC
.space 0x4
gUnknown_0203AB00: @ 203AB00
.space 0x4
gUnknown_0203AB04: @ 203AB04
.space 0x4
gUnknown_0203AB08: @ 203AB08
.space 0x4
gUnknown_0203AB0C: @ 203AB0C
.space 0x4
gUnknown_0203AB10: @ 203AB10
.space 0x4
gUnknown_0203AB14: @ 203AB14
.space 0x4
gUnknown_0203AB18: @ 203AB18
.space 0x4
gUnknown_0203AB1C: @ 203AB1C
.space 0x4
gUnknown_0203AB20: @ 203AB20
.space 0x4
gUnknown_0203AB24: @ 203AB24
.space 0x4
gUnknown_0203AB28: @ 203AB28
.space 0x4
gUnknown_0203AB2C: @ 203AB2C
.space 0x4
gUnknown_0203AB30: @ 203AB30
.space 0x4
sSlotMachine: @ 203AB34
.space 0x4
.include "src/battle_ai_script_commands.o" .include "src/battle_ai_script_commands.o"
.align 2 .align 2