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

battle dome cards sensibly renamed

Browse Source
This commit is contained in:
DizzyEggg
2018-08-19 01:06:10 +02:00
parent e4649245ba
commit fb19a8fc59
21 changed files with 342 additions and 372 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
asm/battle_frontier_1.s
View File

@@ -121,7 +121,7 @@ _081925B6:
ldr r1, =0x0000ffff
str r1, [sp, 0x4]
movs r1, 0x1
bl sub_818D8AC
bl CreateTrainerPicSprite
ldr r1, =gUnknown_0203CD78
ldr r1, [r1]
adds r1, r5
@@ -1701,7 +1701,7 @@ _081932F8:
ldr r1, =0x0000ffff
str r1, [sp, 0x4]
movs r1, 0x1
bl sub_818D8AC
bl CreateTrainerPicSprite
ldr r1, =gUnknown_0203CD78
ldr r1, [r1]
ldr r2, [sp, 0x3C]
@@ -1789,7 +1789,7 @@ _081933B8:
ldr r1, =0x0000ffff
str r1, [sp, 0x4]
movs r1, 0x1
bl sub_818D8AC
bl CreateTrainerPicSprite
ldr r1, =gUnknown_0203CD78
ldr r1, [r1]
add r1, r9

22
asm/battle_frontier_2.s
View File

@@ -2935,7 +2935,7 @@ sub_819BD70: @ 819BD70
adds r0, r5, 0
mov r2, r8
movs r3, 0x1
bl sub_818D7D8
bl CreateMonPicSprite_HandleDeoxys
ldr r1, [r6]
movs r2, 0xA6
lsls r2, 2
@@ -3053,7 +3053,7 @@ sub_819BE34: @ 819BE34
adds r0, r5, 0
mov r2, r9
movs r3, 0x1
bl sub_818D7D8
bl CreateMonPicSprite_HandleDeoxys
ldr r1, [r6]
movs r2, 0xA6
lsls r2, 2
@@ -3166,7 +3166,7 @@ _0819BF48:
adds r0, r5, 0
adds r2, r6, 0
movs r3, 0x1
bl sub_818D7D8
bl CreateMonPicSprite_HandleDeoxys
mov r2, r9
ldr r1, [r2]
add r1, r8
@@ -3846,19 +3846,19 @@ sub_819C568: @ 819C568
lsls r1, 2
adds r0, r1
ldrb r0, [r0]
bl sub_818D820
bl FreeAndDestroyMonPicSprite
ldr r0, [r4]
movs r1, 0xA6
lsls r1, 2
adds r0, r1
ldrb r0, [r0]
bl sub_818D820
bl FreeAndDestroyMonPicSprite
ldr r0, [r4]
movs r1, 0xA7
lsls r1, 2
adds r0, r1
ldrb r0, [r0]
bl sub_818D820
bl FreeAndDestroyMonPicSprite
ldr r0, =sub_819C2D4
movs r1, 0x1
bl CreateTask
@@ -6709,7 +6709,7 @@ _0819DDA8:
bl ResetSpriteData
bl ResetTasks
bl FreeAllSpritePalettes
bl dp13_810BB8C
bl ResetAllPicSprites
ldr r0, =gFrontierFactorySelectMenu_Gfx
ldr r5, =gUnknown_0203CE40
ldr r1, [r5]
@@ -9315,7 +9315,7 @@ sub_819F304: @ 819F304
adds r0, r5, 0
mov r1, r9
movs r3, 0x1
bl sub_818D7D8
bl CreateMonPicSprite_HandleDeoxys
ldr r1, [r6]
adds r1, 0x2C
strb r0, [r1]
@@ -9370,7 +9370,7 @@ sub_819F3F8: @ 819F3F8
lsrs r5, 24
lsls r0, r4, 24
lsrs r0, 24
bl sub_818D820
bl FreeAndDestroyMonPicSprite
ldr r0, =sub_819F7B4
movs r1, 0x1
bl CreateTask
@@ -9403,7 +9403,7 @@ sub_819F444: @ 819F444
adds r6, r1, 0
lsls r0, r4, 24
lsrs r0, 24
bl sub_818D820
bl FreeAndDestroyMonPicSprite
ldr r5, =gSprites
lsls r4, 16
lsrs r1, r4, 24
@@ -9996,7 +9996,7 @@ _0819F908:
adds r0, r4, 0
adds r2, r5, 0
movs r3, 0x1
bl sub_818D7D8
bl CreateMonPicSprite_HandleDeoxys
ldr r2, =gUnknown_03001284
ldr r1, [r2]
adds r1, 0x2C

8
asm/pokenav.s
View File

@@ -20169,7 +20169,7 @@ sub_81D1148: @ 81D1148
add r2, sp, 0x8
mov r0, sp
bl sub_81D0760
bl dp13_810BB8C
bl ResetAllPicSprites
movs r0, 0x28
movs r1, 0x68
bl sub_81D1184
@@ -20187,7 +20187,7 @@ sub_81D1148: @ 81D1148
sub_81D1178: @ 81D1178
push {lr}
ldrh r0, [r0, 0x10]
bl sub_818D820
bl FreeAndDestroyMonPicSprite
pop {r0}
bx r0
thumb_func_end sub_81D1178
@@ -20213,7 +20213,7 @@ sub_81D1184: @ 81D1184
ldr r3, =0x0000ffff
str r3, [sp, 0xC]
movs r3, 0x1
bl sub_818D7D8
bl CreateMonPicSprite_HandleDeoxys
lsls r0, 16
lsrs r0, 16
ldr r1, =gSprites
@@ -20256,7 +20256,7 @@ sub_81D11FC: @ 81D11FC
push {r4,r5,lr}
adds r4, r0, 0
ldrh r0, [r4, 0x10]
bl sub_818D820
bl FreeAndDestroyMonPicSprite
movs r5, 0x20
negs r5, r5
adds r0, r5, 0