dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/pret/master'

Browse Source
This commit is contained in:
Diegoisawesome
2017-03-04 23:32:12 -06:00
parent 56f5e8bdab 83ae14e2b9
commit d12fd5c5ce
213 changed files with 57369 additions and 61524 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/slot_machine.s
+26 -26
View File
@@ -91,7 +91,7 @@ sub_812A540: @ 812A540
sub_812A588: @ 812A588
push {lr}
sub sp, 0x4
ldr r0, =gUnknown_030022C0
ldr r0, =gMain
movs r1, 0x87
lsls r1, 3
adds r0, r1
@@ -168,7 +168,7 @@ _0812A644:
bl sub_812AA78
bl sub_812AA90
_0812A64C:
ldr r1, =gUnknown_030022C0
ldr r1, =gMain
movs r0, 0x87
lsls r0, 3
adds r1, r0
@@ -252,7 +252,7 @@ sub_812A6D4: @ 812A6D4
strh r4, [r0, 0x8]
adds r0, 0xA
adds r1, r5, 0
bl sub_806F67C
bl StoreWordInTwoHalfwords
pop {r4,r5}
pop {r0}
bx r0
@@ -279,7 +279,7 @@ sub_812A710: @ 812A710
ldr r1, [r3]
adds r1, 0x64
adds r0, r2, 0
bl sub_806F684
bl LoadWordFromTwoHalfwords
pop {r0}
bx r0
.pool
@@ -467,7 +467,7 @@ sub_812A8C4: @ 812A8C4
strb r4, [r0]
ldr r0, [r5]
strb r4, [r0, 0x2]
bl GenerateRandomNumber
bl Random
ldr r2, [r5]
movs r1, 0x1
ands r1, r0
@@ -844,7 +844,7 @@ _0812ABE8:
thumb_func_start sub_812ABF8
sub_812ABF8: @ 812ABF8
push {r4,r5,lr}
ldr r0, =gUnknown_030022C0
ldr r0, =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x4
ands r0, r1
@@ -937,7 +937,7 @@ _0812ACB2:
ldr r3, [r0]
movs r1, 0x12
ldrsh r2, [r3, r1]
ldr r4, =gUnknown_030022C0
ldr r4, =gMain
adds r5, r0, 0
cmp r2, 0x2
bgt _0812ACD0
@@ -1002,7 +1002,7 @@ sub_812ACF4: @ 812ACF4
thumb_func_start sub_812AD34
sub_812AD34: @ 812AD34
push {lr}
ldr r0, =gUnknown_030022C0
ldr r0, =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x3
ands r0, r1
@@ -1142,7 +1142,7 @@ _0812AE40:
thumb_func_start sub_812AE4C
sub_812AE4C: @ 812AE4C
push {r4,lr}
ldr r0, =gUnknown_030022C0
ldr r0, =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x1
ands r0, r1
@@ -1660,7 +1660,7 @@ sub_812B214: @ 812B214
thumb_func_start sub_812B254
sub_812B254: @ 812B254
push {lr}
ldr r0, =gUnknown_030022C0
ldr r0, =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x3
ands r0, r1
@@ -1713,7 +1713,7 @@ sub_812B280: @ 812B280
thumb_func_start sub_812B2C0
sub_812B2C0: @ 812B2C0
push {lr}
ldr r0, =gUnknown_030022C0
ldr r0, =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x3
ands r0, r1
@@ -2019,7 +2019,7 @@ _0812B5AA:
thumb_func_start sub_812B5B0
sub_812B5B0: @ 812B5B0
push {r4,lr}
bl GenerateRandomNumber
bl Random
lsls r0, 24
lsrs r0, 24
ldr r4, =gUnknown_085A76C0
@@ -2053,7 +2053,7 @@ sub_812B5EC: @ 812B5EC
movs r5, 0
ldr r6, =gUnknown_085A76D2
_0812B5F2:
bl GenerateRandomNumber
bl Random
movs r2, 0xFF
ldr r1, =gUnknown_0203AB34
ldr r3, [r1]
@@ -2095,7 +2095,7 @@ sub_812B634: @ 812B634
movs r7, 0x80
lsls r7, 17
_0812B644:
bl GenerateRandomNumber
bl Random
movs r5, 0xFF
ands r5, r0
ldr r0, =gUnknown_0203AB34
@@ -2194,7 +2194,7 @@ sub_812B700: @ 812B700
ldr r1, [r0]
movs r0, 0
strb r0, [r1, 0x5]
bl GenerateRandomNumber
bl Random
lsls r0, 24
lsrs r4, r0, 24
movs r0, 0
@@ -2215,7 +2215,7 @@ _0812B72E:
asrs r5, r0, 16
cmp r5, 0
ble _0812B74E
bl GenerateRandomNumber
bl Random
lsls r0, 24
lsrs r4, r0, 24
lsls r0, r6, 24
@@ -2242,7 +2242,7 @@ sub_812B760: @ 812B760
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
bl GenerateRandomNumber
bl Random
movs r1, 0xFF
ands r1, r0
ldr r0, =gUnknown_085A77CE
@@ -2291,7 +2291,7 @@ _0812B7BC:
ble _0812B7C2
movs r4, 0x1
_0812B7C2:
bl GenerateRandomNumber
bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0x64
@@ -2308,7 +2308,7 @@ _0812B7C2:
b _0812B822
.pool
_0812B7E8:
bl GenerateRandomNumber
bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0x64
@@ -2787,7 +2787,7 @@ _0812BB8E:
_0812BBA8:
movs r0, 0x8
strh r0, [r4, 0xA]
ldr r0, =gUnknown_030022C0
ldr r0, =gMain
ldrh r1, [r0, 0x2C]
movs r0, 0x1
ands r0, r1
@@ -2800,7 +2800,7 @@ _0812BBBC:
lsls r0, 24
cmp r0, 0
beq _0812BBF6
ldr r0, =gUnknown_030022C0
ldr r0, =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x8
ands r0, r1
@@ -7241,7 +7241,7 @@ sub_812DDC4: @ 812DDC4
push {r4,lr}
sub sp, 0x4
adds r4, r0, 0
ldr r0, =gUnknown_030022C0
ldr r0, =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x6
ands r0, r1
@@ -9139,12 +9139,12 @@ sub_812ED20: @ 812ED20
movs r1, 0x2E
ldrsh r0, [r5, r1]
movs r1, 0x14
bl cosine
bl Cos
strh r0, [r5, 0x24]
movs r2, 0x2E
ldrsh r0, [r5, r2]
movs r1, 0x6
bl sine
bl Sin
strh r0, [r5, 0x26]
adds r1, r5, 0
adds r1, 0x43
@@ -10330,7 +10330,7 @@ _0812F602:
ldrsh r0, [r0, r2]
movs r2, 0x30
ldrsh r1, [r4, r2]
bl cosine
bl Cos
strh r0, [r4, 0x24]
movs r1, 0x3A
ldrsh r0, [r4, r1]
@@ -10340,7 +10340,7 @@ _0812F602:
ldrsh r0, [r0, r2]
movs r2, 0x30
ldrsh r1, [r4, r2]
bl sine
bl Sin
strh r0, [r4, 0x26]
ldrh r1, [r4, 0x30]
movs r2, 0x30