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/contest_link_80F57C4.s
+39 -39
View File
@@ -285,12 +285,12 @@ sub_80F5A74: @ 80F5A74
bne _080F5A96
ldr r1, =gUnknown_085ED21E
adds r0, r6, 0
bl CopyString
bl StringCopy
adds r6, r0, 0
_080F5A96:
adds r1, r7, 0x2
adds r0, r6, 0
bl CopyString
bl StringCopy
ldr r4, =gUnknown_02022E2C
adds r0, r5, 0
adds r1, r4, 0
@@ -298,11 +298,11 @@ _080F5A96:
bl sub_80F7ED0
ldr r1, =gUnknown_085E8D3E
adds r0, r6, 0
bl CopyString
bl StringCopy
adds r1, r7, 0
adds r1, 0xD
adds r0, r6, 0
bl AppendString
bl StringAppend
adds r0, r5, 0
adds r1, r4, 0
movs r2, 0x32
@@ -1238,7 +1238,7 @@ _080F6334:
movs r4, 0
ldr r1, =gUnknown_02039F20
ldrb r0, [r1]
ldr r7, =gUnknown_02021CC4
ldr r7, =gStringVar1
ldr r2, =gUnknown_02039E0D
mov r8, r2
cmp r0, 0
@@ -1256,18 +1256,18 @@ _080F636E:
mov r0, r8
adds r1, r4, r0
adds r0, r7, 0
bl CopyString
bl StringCopy
adds r0, r7, 0
bl sub_81DB5AC
ldr r0, =gUnknown_02021DC4
ldr r0, =gStringVar2
mov r1, r8
subs r1, 0xB
adds r4, r1
adds r1, r4, 0
bl CopyString
bl StringCopy
ldr r1, =gUnknown_085ED1FA
mov r0, sp
bl ExpandStringRefs
bl StringExpandPlaceholders
ldr r0, =gUnknown_0203A034
ldr r0, [r0]
ldr r0, [r0]
@@ -1616,7 +1616,7 @@ sub_80F66B4: @ 80F66B4
push {r4-r7,lr}
lsls r0, 24
lsrs r7, r0, 24
ldr r0, =gUnknown_030022C0
ldr r0, =gMain
ldrh r1, [r0, 0x2E]
movs r2, 0x1
adds r0, r2, 0
@@ -3565,7 +3565,7 @@ sub_80F7670: @ 80F7670
cmp r0, 0x27
bhi _080F7732
ldr r4, =gUnknown_0858D860
bl GenerateRandomNumber
bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0xF0
@@ -3581,7 +3581,7 @@ sub_80F7670: @ 80F7670
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
bl GenerateRandomNumber
bl Random
ldr r1, =gUnknown_02020630
lsls r5, r4, 4
adds r5, r4
@@ -3590,21 +3590,21 @@ sub_80F7670: @ 80F7670
lsls r0, 23
lsrs r0, 23
strh r0, [r5, 0x2E]
bl GenerateRandomNumber
bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0x18
bl __umodsi3
adds r0, 0x10
strh r0, [r5, 0x30]
bl GenerateRandomNumber
bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0xFF
ands r0, r1
adds r0, 0x30
strh r0, [r5, 0x32]
bl GenerateRandomNumber
bl Random
ldrh r6, [r5, 0x4]
lsls r4, r6, 22
lsrs r4, 22
@@ -3656,7 +3656,7 @@ sub_80F7768: @ 80F7768
asrs r0, 24
movs r2, 0x30
ldrsh r1, [r4, r2]
bl sine
bl Sin
strh r0, [r4, 0x24]
ldrh r1, [r4, 0x32]
ldrh r0, [r4, 0x36]
@@ -4632,7 +4632,7 @@ sub_80F7F30: @ 80F7F30
ldrb r1, [r0]
movs r0, 0x64
muls r0, r1
ldr r1, =gUnknown_020244EC
ldr r1, =gPlayerParty
adds r0, r1
bl sub_80DAE0C
lsls r0, 24
@@ -4664,7 +4664,7 @@ sub_80F7F7C: @ 80F7F7C
ldrb r1, [r0]
movs r0, 0x64
muls r1, r0
ldr r0, =gUnknown_020244EC
ldr r0, =gPlayerParty
adds r2, r1, r0
ldr r0, =gUnknown_02039F2C
ldrh r0, [r0]
@@ -4703,7 +4703,7 @@ _080F7FDC:
adds r0, r2, 0
movs r1, 0x36
_080F7FE0:
bl pokemon_getattr
bl GetMonData
ldr r1, =gUnknown_02039F2E
ldrh r1, [r1]
cmp r0, r1
@@ -4754,10 +4754,10 @@ _080F8048:
ldrb r0, [r6]
movs r5, 0x64
muls r0, r5
ldr r4, =gUnknown_020244EC
ldr r4, =gPlayerParty
adds r0, r4
movs r1, 0x32
bl pokemon_getattr
bl GetMonData
lsls r0, 24
lsrs r1, r0, 24
mov r0, sp
@@ -4805,10 +4805,10 @@ _080F80B8:
ldrb r0, [r7]
movs r6, 0x64
muls r0, r6
ldr r5, =gUnknown_020244EC
ldr r5, =gPlayerParty
adds r0, r5
movs r1, 0x33
bl pokemon_getattr
bl GetMonData
strb r0, [r4]
mov r0, sp
ldrb r2, [r0]
@@ -4854,10 +4854,10 @@ _080F8124:
ldrb r0, [r7]
movs r6, 0x64
muls r0, r6
ldr r5, =gUnknown_020244EC
ldr r5, =gPlayerParty
adds r0, r5
movs r1, 0x34
bl pokemon_getattr
bl GetMonData
strb r0, [r4]
mov r0, sp
ldrb r2, [r0]
@@ -4901,10 +4901,10 @@ _080F8190:
ldrb r0, [r7]
movs r6, 0x64
muls r0, r6
ldr r5, =gUnknown_020244EC
ldr r5, =gPlayerParty
adds r0, r5
movs r1, 0x35
bl pokemon_getattr
bl GetMonData
strb r0, [r4]
mov r0, sp
ldrb r2, [r0]
@@ -4944,10 +4944,10 @@ _080F81F8:
ldrb r0, [r7]
movs r6, 0x64
muls r0, r6
ldr r5, =gUnknown_020244EC
ldr r5, =gPlayerParty
adds r0, r5
movs r1, 0x36
bl pokemon_getattr
bl GetMonData
strb r0, [r4]
mov r0, sp
ldrb r2, [r0]
@@ -4990,14 +4990,14 @@ _080F8250:
thumb_func_start sub_80F8264
sub_80F8264: @ 80F8264
push {r4,lr}
ldr r4, =gUnknown_02021CC4
ldr r4, =gStringVar1
ldr r0, =gUnknown_020375E4
ldrh r1, [r0]
lsls r1, 6
ldr r0, =gUnknown_02039E0D
adds r1, r0
adds r0, r4, 0
bl CopyString
bl StringCopy
adds r0, r4, 0
bl sub_81DB5AC
pop {r4}
@@ -5009,13 +5009,13 @@ sub_80F8264: @ 80F8264
thumb_func_start sub_80F8290
sub_80F8290: @ 80F8290
push {lr}
ldr r0, =gUnknown_02021EC4
ldr r0, =gStringVar3
ldr r1, =gUnknown_020375E4
ldrh r1, [r1]
lsls r1, 6
ldr r2, =gUnknown_02039E02
adds r1, r2
bl CopyString
bl StringCopy
pop {r0}
bx r0
.pool
@@ -5103,7 +5103,7 @@ sub_80F834C: @ 80F834C
movs r1, 0
ldr r2, =gUnknown_02039F20
ldrb r0, [r2]
ldr r4, =gUnknown_02021EC4
ldr r4, =gStringVar3
ldr r3, =gUnknown_02039E0D
cmp r0, 0
beq _080F836E
@@ -5121,7 +5121,7 @@ _080F836E:
lsls r1, 6
adds r1, r3
adds r0, r4, 0
bl CopyString
bl StringCopy
adds r0, r4, 0
bl sub_81DB5AC
pop {r4}
@@ -5136,7 +5136,7 @@ sub_80F8390: @ 80F8390
movs r1, 0
ldr r2, =gUnknown_02039F20
ldrb r0, [r2]
ldr r4, =gUnknown_02021CC4
ldr r4, =gStringVar1
ldr r3, =gUnknown_02039E02
cmp r0, 0
beq _080F83B2
@@ -5154,7 +5154,7 @@ _080F83B2:
lsls r1, 6
adds r1, r3
adds r0, r4, 0
bl CopyString
bl StringCopy
pop {r4}
pop {r0}
bx r0
@@ -5582,14 +5582,14 @@ _080F8748:
movs r4, 0x3
_080F874C:
adds r0, r5, 0
bl GetStringEnd_Limit7
bl StringGetEnd10
adds r5, 0x40
subs r4, 0x1
cmp r4, 0
bge _080F874C
adds r0, r6, 0
bl DestroyTask
ldr r0, =gUnknown_03005D8C
ldr r0, =gSaveBlock1Ptr
ldr r0, [r0]
movs r1, 0x4
ldrsb r1, [r0, r1]