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

Merge branch 'master' into link

Browse Source
This commit is contained in:
PikalaxALT
2018-01-20 22:08:41 -05:00
parent 7af3cd051e f00bbdfeca
commit 772f0aa3fd
642 changed files with 35874 additions and 4961 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/trade.s
+44 -44
View File
@@ -826,7 +826,7 @@ _080778CA:
adds r4, 0x10
_080778DE:
add r1, sp, 0x10
ldr r0, =gUnknown_0832DCAC
ldr r0, =gSpriteTemplate_832DCAC
ldm r0!, {r2,r3,r7}
stm r1!, {r2,r3,r7}
ldm r0!, {r2,r3,r7}
@@ -863,7 +863,7 @@ _080778DE:
adds r4, 0x88
_0807792C:
add r1, sp, 0x10
ldr r0, =gUnknown_0832DCAC
ldr r0, =gSpriteTemplate_832DCAC
ldm r0!, {r2,r3,r7}
stm r1!, {r2,r3,r7}
ldm r0!, {r2,r3,r7}
@@ -889,7 +889,7 @@ _0807792C:
b _08077B22
.pool
_08077970:
ldr r4, =gUnknown_0832DCAC
ldr r4, =gSpriteTemplate_832DCAC
add r1, sp, 0x10
adds r0, r4, 0
ldm r0!, {r2,r3,r7}
@@ -927,7 +927,7 @@ _08077970:
lsls r5, 13
_080779BC:
add r1, sp, 0x10
ldr r0, =gUnknown_0832DCAC
ldr r0, =gSpriteTemplate_832DCAC
ldm r0!, {r2,r3,r7}
stm r1!, {r2,r3,r7}
ldm r0!, {r2,r3,r7}
@@ -948,7 +948,7 @@ _080779BC:
adds r6, 0x1
cmp r6, 0x5
ble _080779BC
ldr r0, =gUnknown_0832DC94
ldr r0, =gSpriteTemplate_832DC94
ldr r2, =gUnknown_0832DE24
ldrb r1, [r2]
lsls r1, 19
@@ -1450,7 +1450,7 @@ _08077EA0:
adds r4, 0x10
_08077EB4:
add r1, sp, 0xC
ldr r0, =gUnknown_0832DCAC
ldr r0, =gSpriteTemplate_832DCAC
ldm r0!, {r2,r3,r7}
stm r1!, {r2,r3,r7}
ldm r0!, {r2,r3,r7}
@@ -1487,7 +1487,7 @@ _08077EB4:
adds r4, 0x88
_08077F02:
add r1, sp, 0xC
ldr r0, =gUnknown_0832DCAC
ldr r0, =gSpriteTemplate_832DCAC
ldm r0!, {r2,r3,r7}
stm r1!, {r2,r3,r7}
ldm r0!, {r2,r3,r7}
@@ -1513,7 +1513,7 @@ _08077F02:
b _080780D8
.pool
_08077F48:
ldr r4, =gUnknown_0832DCAC
ldr r4, =gSpriteTemplate_832DCAC
add r1, sp, 0xC
adds r0, r4, 0
ldm r0!, {r2,r3,r7}
@@ -1551,7 +1551,7 @@ _08077F48:
lsls r5, 13
_08077F94:
add r1, sp, 0xC
ldr r0, =gUnknown_0832DCAC
ldr r0, =gSpriteTemplate_832DCAC
ldm r0!, {r2,r3,r7}
stm r1!, {r2,r3,r7}
ldm r0!, {r2,r3,r7}
@@ -1590,7 +1590,7 @@ _08077FE4:
adds r0, 0x6
_08077FEA:
strb r0, [r2]
ldr r0, =gUnknown_0832DC94
ldr r0, =gSpriteTemplate_832DC94
ldr r3, =gUnknown_0832DE24
ldr r1, [r4]
adds r1, 0x35
@@ -1931,7 +1931,7 @@ _080782D4:
movs r2, 0
movs r3, 0
bl CopyToBgTilemapBufferRect_ChangePalette
ldr r1, =gUnknown_0832CABC
ldr r1, =gTradeStripesBG2Tilemap
movs r2, 0x80
lsls r2, 4
movs r0, 0x2
@@ -1940,7 +1940,7 @@ _080782D4:
b _0807837E
.pool
_08078324:
ldr r1, =gUnknown_0832D2BC
ldr r1, =gTradeStripesBG3Tilemap
movs r2, 0x80
lsls r2, 4
movs r0, 0x3
@@ -2394,7 +2394,7 @@ _08078726:
mov r2, sp
bl GetMonData
mov r0, sp
ldr r1, =gUnknown_0832DF94
ldr r1, =gJPText_Shedinja
bl StringCompareWithoutExtCtrlCodes
cmp r0, 0
bne _08078766
@@ -2444,7 +2444,7 @@ _080787AC:
thumb_func_start sub_80787B8
sub_80787B8: @ 80787B8
push {lr}
ldr r0, =gUnknown_0832DAE5
ldr r0, =gText_IsThisTradeOkay
ldr r1, =gUnknown_0203229C
ldr r1, [r1]
adds r1, 0x72
@@ -4438,7 +4438,7 @@ _08079772:
lsls r0, 2
add r0, r8
bl sub_80A6DEC
ldr r1, =gUnknown_0832C8BE
ldr r1, =gTradePartyBoxTilemap
ldr r0, [sp, 0x64]
subs r2, r0, r7
lsls r2, 24
@@ -4491,7 +4491,7 @@ _080798AC:
b _08079A24
.pool
_080798BC:
ldr r1, =gUnknown_0832C6C0
ldr r1, =gTradeMovesBoxTilemap
ldr r0, [sp, 0x60]
lsls r2, r0, 4
subs r2, r0
@@ -4769,7 +4769,7 @@ _08079AFE:
lsrs r4, r0, 16
cmp r4, 0x3
bls _08079ADE
ldr r1, =gUnknown_0832DABC
ldr r1, =gText_EmptyString7
adds r0, r6, 0
bl StringCopy
movs r4, 0
@@ -4789,7 +4789,7 @@ _08079B20:
bl StringAppend
_08079B3C:
adds r0, r6, 0
ldr r1, =gUnknown_0832DAD2
ldr r1, =gText_NewLine3
bl StringAppend
adds r0, r4, 0x1
lsls r0, 16
@@ -4799,10 +4799,10 @@ _08079B3C:
b _08079B6C
.pool
_08079B5C:
ldr r1, =gUnknown_0832DABC
ldr r1, =gText_EmptyString7
adds r0, r6, 0
bl StringCopy
ldr r1, =gUnknown_0832DADF
ldr r1, =gText_FourQuestionMarks
adds r0, r6, 0
bl StringAppend
_08079B6C:
@@ -5326,7 +5326,7 @@ sub_8079F88: @ 8079F88
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
ldr r1, =gUnknown_0832C8BE
ldr r1, =gTradePartyBoxTilemap
lsls r2, r4, 4
subs r2, r4
lsls r2, 24
@@ -5698,7 +5698,7 @@ _0807A2B8:
mov r0, sp
b _0807A2D6
_0807A2BC:
ldr r0, =gUnknown_0832DCE4
ldr r0, =gSpritePalette_TradeScreenText
bl LoadSpritePalette
b _0807A2DA
.pool
@@ -8571,7 +8571,7 @@ _0807BB68:
lsls r4, r0, 4
subs r4, r0
lsls r4, 2
ldr r0, =gUnknown_08338ED0
ldr r0, =gIngameTrades
adds r4, r0
ldr r0, =gStringVar1
adds r1, r4, 0
@@ -9098,7 +9098,7 @@ _0807C1DC:
beq _0807C1FC
bl _0807CFB4
_0807C1FC:
ldr r0, =gUnknown_08338D28
ldr r0, =gSpriteTemplate_8338D28
movs r1, 0x78
movs r2, 0x20
movs r3, 0
@@ -9228,7 +9228,7 @@ _0807C318:
bl _0807CFB4
_0807C328:
bl sub_807AB28
ldr r0, =gUnknown_08338E74
ldr r0, =gSpriteTemplate_8338E74
movs r1, 0x78
movs r2, 0x50
movs r3, 0
@@ -9296,7 +9296,7 @@ _0807C3B0:
beq _0807C3C4
bl _0807CFB4
_0807C3C4:
ldr r0, =gUnknown_08338DFC
ldr r0, =gSpriteTemplate_8338DFC
movs r1, 0x80
movs r2, 0x41
movs r3, 0
@@ -9316,7 +9316,7 @@ _0807C3E0:
ldr r1, [r4]
adds r1, 0x90
strb r0, [r1]
ldr r0, =gUnknown_08338DC8
ldr r0, =gSpriteTemplate_8338DC8
movs r1, 0x80
movs r2, 0x50
movs r3, 0
@@ -9455,7 +9455,7 @@ _0807C528:
movs r2, 0x10
movs r3, 0
bl BeginNormalPaletteFade
ldr r5, =gUnknown_08338DC8
ldr r5, =gSpriteTemplate_8338DC8
adds r0, r5, 0
movs r1, 0x6F
movs r2, 0xAA
@@ -9604,7 +9604,7 @@ _0807C66C:
adds r1, r4, 0
adds r1, 0x10
adds r0, r1
ldr r1, =gUnknown_08338ECC
ldr r1, =gSpriteAffineAnimTable_8338ECC
str r1, [r0]
ldrb r1, [r2]
lsls r0, r1, 4
@@ -9915,7 +9915,7 @@ _0807C8FA:
ldr r1, [r7]
adds r1, 0x90
strb r0, [r1]
ldr r0, =gUnknown_08338DC8
ldr r0, =gSpriteTemplate_8338DC8
movs r1, 0x80
adds r2, r4, 0
movs r3, 0
@@ -10091,7 +10091,7 @@ _0807CA86:
bne _0807CA92
b _0807CFB4
_0807CA92:
ldr r0, =gUnknown_08338DFC
ldr r0, =gSpriteTemplate_8338DFC
movs r1, 0x80
movs r2, 0x41
movs r3, 0
@@ -10113,7 +10113,7 @@ _0807CA92:
b _0807CFB4
.pool
_0807CAC8:
ldr r0, =gUnknown_08338E74
ldr r0, =gSpriteTemplate_8338E74
movs r1, 0x78
movs r2, 0x50
movs r3, 0
@@ -10255,7 +10255,7 @@ _0807CBEC:
b _0807CF48
.pool
_0807CBF4:
ldr r0, =gUnknown_08338D28
ldr r0, =gSpriteTemplate_8338D28
movs r2, 0x8
negs r2, r2
movs r1, 0x78
@@ -11160,7 +11160,7 @@ _0807D5B8:
beq _0807D5D8
bl _0807E400
_0807D5D8:
ldr r0, =gUnknown_08338D28
ldr r0, =gSpriteTemplate_8338D28
movs r1, 0x78
movs r2, 0x20
movs r3, 0
@@ -11290,7 +11290,7 @@ _0807D6F4:
_0807D704:
movs r0, 0x3
bl sub_807B62C
ldr r0, =gUnknown_08338E8C
ldr r0, =gSpriteTemplate_8338E8C
movs r1, 0x78
movs r2, 0x50
movs r3, 0
@@ -11386,7 +11386,7 @@ _0807D7C4:
adds r0, r1
ldr r1, =sub_807AA4C
str r1, [r0]
ldr r0, =gUnknown_08338DC8
ldr r0, =gSpriteTemplate_8338DC8
movs r1, 0x78
movs r2, 0x50
movs r3, 0
@@ -11524,7 +11524,7 @@ _0807D924:
movs r2, 0x10
movs r3, 0
bl BeginNormalPaletteFade
ldr r5, =gUnknown_08338DC8
ldr r5, =gSpriteTemplate_8338DC8
adds r0, r5, 0
movs r1, 0x6F
movs r2, 0xAA
@@ -11678,7 +11678,7 @@ _0807DA74:
adds r1, r4, 0
adds r1, 0x10
adds r0, r1
ldr r1, =gUnknown_08338ECC
ldr r1, =gSpriteAffineAnimTable_8338ECC
str r1, [r0]
ldrb r1, [r2]
lsls r0, r1, 4
@@ -12008,7 +12008,7 @@ _0807DD02:
adds r0, r1
ldr r1, =sub_807AA4C
str r1, [r0]
ldr r0, =gUnknown_08338DC8
ldr r0, =gSpriteTemplate_8338DC8
movs r1, 0x78
adds r2, r4, 0
movs r3, 0
@@ -12218,7 +12218,7 @@ _0807DF12:
strh r6, [r5]
b _0807E398
_0807DF16:
ldr r0, =gUnknown_08338E74
ldr r0, =gSpriteTemplate_8338E74
movs r1, 0x78
movs r2, 0x50
movs r3, 0
@@ -12360,7 +12360,7 @@ _0807E038:
b _0807E394
.pool
_0807E040:
ldr r0, =gUnknown_08338D28
ldr r0, =gSpriteTemplate_8338D28
movs r2, 0x8
negs r2, r2
movs r1, 0x78
@@ -13184,7 +13184,7 @@ sub_807E73C: @ 807E73C
lsls r4, r0, 4
subs r4, r0
lsls r4, 2
ldr r0, =gUnknown_08338ED0
ldr r0, =gIngameTrades
adds r4, r0
ldr r0, =gStringVar1
ldrh r1, [r4, 0x38]
@@ -13214,7 +13214,7 @@ sub_807E784: @ 807E784
lsls r4, r0, 4
subs r4, r0
lsls r4, 2
ldr r0, =gUnknown_08338ED0
ldr r0, =gIngameTrades
adds r4, r0
ldr r0, =gSpecialVar_0x8005
ldrh r1, [r0]
@@ -13253,7 +13253,7 @@ sub_807E7E8: @ 807E7E8
lsls r2, r1, 4
subs r2, r1
lsls r2, 2
ldr r1, =gUnknown_08338ED0
ldr r1, =gIngameTrades
adds r5, r2, r1
movs r1, 0x64
muls r0, r1