Finish frontier util

This commit is contained in:
DizzyEggg
2018-11-01 21:31:10 +01:00
parent 37d742cbd8
commit 0bb51037d7
64 changed files with 1169 additions and 675 deletions
+1 -1
View File
@@ -2163,7 +2163,7 @@ sub_8196D74: @ 8196D74
ldr r0, =gSaveBlock2Ptr
ldr r0, [r0]
adds r0, 0xA
bl ReadUnalignedWord
bl GetTrainerId
adds r6, r0, 0
ldr r0, =0x0000ffff
ands r6, r0
+2 -2
View File
@@ -3664,7 +3664,7 @@ _081A7108:
b _081A70D6
_081A710E:
movs r0, 0x5
bl sub_81A5030
bl SetFrontierBrainEventObjGfx
_081A7114:
movs r7, 0x1C
movs r4, 0
@@ -6227,7 +6227,7 @@ sub_81A8590: @ 81A8590
lsls r0, 16
lsrs r4, r0, 16
movs r0, 0x5
bl sub_81A3B30
bl GetPlayerSymbolCountForFacility
lsls r0, 24
lsrs r2, r0, 24
cmp r2, 0
+1 -1
View File
@@ -15615,7 +15615,7 @@ _081B8618:
bl GetMonData
lsls r0, 16
lsrs r4, r0, 16
ldr r3, =gUnknown_08611C9A
ldr r3, =gFrontierBannedSpecies
lsls r1, r6, 1
adds r0, r1, r3
ldrh r0, [r0]
+1 -1
View File
@@ -11490,7 +11490,7 @@ _0801B628:
ldr r1, [r0]
adds r1, 0xA
adds r0, r4, 0
bl CopyUnalignedWord
bl CopyTrainerId
mov r2, r8
ldr r1, [r2]
adds r0, r6, 0