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/weather.s
+16 -16
View File
@@ -4221,7 +4221,7 @@ _080AD200:
sub_80AD204: @ 80AD204
push {r4-r7,lr}
adds r5, r0, 0
bl GenerateRandomNumber
bl Random
movs r1, 0x36
ldrsh r2, [r5, r1]
lsls r1, r2, 2
@@ -4267,7 +4267,7 @@ sub_80AD204: @ 80AD204
lsls r0, 7
strh r0, [r5, 0x2E]
strh r7, [r5, 0x24]
bl GenerateRandomNumber
bl Random
lsls r0, 16
lsrs r0, 16
adds r6, r0, 0
@@ -4742,7 +4742,7 @@ _080AD680:
adds r1, r4, r2
movs r0, 0x1
strb r0, [r1]
bl GenerateRandomNumber
bl Random
lsls r0, 16
lsrs r0, 16
movs r5, 0xB4
@@ -4784,7 +4784,7 @@ _080AD6E0:
adds r0, r4, r1
movs r5, 0x1
strb r5, [r0]
bl GenerateRandomNumber
bl Random
lsls r0, 16
lsrs r0, 16
ands r0, r5
@@ -4794,7 +4794,7 @@ _080AD6E0:
b _080AD768
.pool
_080AD70C:
bl GenerateRandomNumber
bl Random
ldr r1, =gUnknown_0854C14C
ldr r2, [r1]
movs r1, 0x1
@@ -4826,7 +4826,7 @@ _080AD72A:
movs r0, 0x14
bl sub_80AD9BC
_080AD74E:
bl GenerateRandomNumber
bl Random
ldr r1, =gUnknown_0854C14C
ldr r4, [r1]
lsls r0, 16
@@ -4872,7 +4872,7 @@ _080AD79E:
lsls r0, 24
cmp r0, 0
beq _080AD7E8
bl GenerateRandomNumber
bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0xF
@@ -4917,7 +4917,7 @@ _080AD80C:
b _080AD8F8
.pool
_080AD834:
bl GenerateRandomNumber
bl Random
ldr r1, =gUnknown_0854C14C
ldr r2, [r1]
lsls r0, 16
@@ -4950,7 +4950,7 @@ _080AD864:
bl sub_80AD9BC
movs r0, 0x13
bl sub_80ABC48
bl GenerateRandomNumber
bl Random
movs r1, 0xF
ands r1, r0
adds r1, 0x1E
@@ -5100,7 +5100,7 @@ sub_80AD9BC: @ 80AD9BC
ldrb r0, [r5]
cmp r0, 0
bne _080AD9EA
bl GenerateRandomNumber
bl Random
lsls r0, 16
lsrs r0, 16
adds r1, r6, 0
@@ -5138,7 +5138,7 @@ sub_80AD9F8: @ 80AD9F8
lsls r0, 24
cmp r0, 0
bne _080ADA58
bl GenerateRandomNumber
bl Random
ands r4, r0
cmp r4, 0
beq _080ADA38
@@ -7506,7 +7506,7 @@ _080AED78:
thumb_func_start sub_80AED7C
sub_80AED7C: @ 80AED7C
push {r4,r5,lr}
ldr r4, =gUnknown_03005D8C
ldr r4, =gSaveBlock1Ptr
ldr r1, [r4]
adds r1, 0x2E
ldrb r5, [r1]
@@ -7529,7 +7529,7 @@ sub_80AED7C: @ 80AED7C
thumb_func_start sav1_get_weather_probably
sav1_get_weather_probably: @ 80AEDAC
ldr r0, =gUnknown_03005D8C
ldr r0, =gSaveBlock1Ptr
ldr r0, [r0]
adds r0, 0x2E
ldrb r0, [r0]
@@ -7540,7 +7540,7 @@ sav1_get_weather_probably: @ 80AEDAC
thumb_func_start sub_80AEDBC
sub_80AEDBC: @ 80AEDBC
push {r4,r5,lr}
ldr r4, =gUnknown_03005D8C
ldr r4, =gSaveBlock1Ptr
ldr r0, [r4]
adds r0, 0x2E
ldrb r5, [r0]
@@ -7762,7 +7762,7 @@ _080AEF94:
_080AEF9C:
ldr r1, =gUnknown_0854FE60
_080AEF9E:
ldr r0, =gUnknown_03005D8C
ldr r0, =gSaveBlock1Ptr
ldr r0, [r0]
adds r0, 0x2F
ldrb r0, [r0]
@@ -7780,7 +7780,7 @@ _080AEFB6:
thumb_func_start sub_80AEFBC
sub_80AEFBC: @ 80AEFBC
lsls r0, 16
ldr r1, =gUnknown_03005D8C
ldr r1, =gSaveBlock1Ptr
ldr r2, [r1]
adds r2, 0x2F
lsrs r0, 16