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

CreateWirelessStatusIndicatorSprite

Browse Source
This commit is contained in:
PikalaxALT
2017-12-03 22:01:06 -05:00
parent d5bc329de7
commit 8b5d6fe5d9
15 changed files with 125 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/contest.s
+1 -1
View File
@@ -643,7 +643,7 @@ _080D7C04:
bl sub_800E0E8
movs r0, 0x8
movs r1, 0x8
bl sub_800DFB4
bl CreateWirelessStatusIndicatorSprite
_080D7C56:
pop {r4-r6}
pop {r0}
asm/contest_link_80F57C4.s
+2 -2
View File
@@ -2128,9 +2128,9 @@ sub_80F6AE8: @ 80F6AE8
bl sub_800E0E8
movs r0, 0x8
movs r1, 0x8
bl sub_800DFB4
bl CreateWirelessStatusIndicatorSprite
ldr r4, =gSprites
ldr r0, =gUnknown_02022B10
ldr r0, =gWirelessStatusIndicatorSpriteId
ldrb r1, [r0]
lsls r0, r1, 4
adds r0, r1
asm/link_rfu.s
+6 -93
View File
@@ -7,98 +7,11 @@
@ file boundary?
thumb_func_start sub_800DFB4
sub_800DFB4: @ 800DFB4
push {r4,r5,lr}
lsls r0, 24
lsrs r3, r0, 24
lsls r1, 24
lsrs r2, r1, 24
cmp r3, 0
bne _0800DFCA
cmp r2, 0
bne _0800DFCA
movs r3, 0xE7
movs r2, 0x8
_0800DFCA:
ldr r0, =gUnknown_03007890
ldr r0, [r0]
ldrb r0, [r0]
cmp r0, 0x1
bne _0800E024
ldr r0, =gUnknown_082ED5F0
adds r1, r3, 0
movs r3, 0
bl CreateSprite
adds r5, r0, 0
lsls r5, 24
lsrs r5, 24
ldr r0, =gSprites
lsls r4, r5, 4
adds r4, r5
lsls r4, 2
adds r4, r0
ldr r0, =0x00001234
strh r0, [r4, 0x3C]
ldr r0, =gUnknown_082ED5E0
ldrh r0, [r0, 0x6]
bl GetSpriteTileStartByTag
strh r0, [r4, 0x3A]
adds r4, 0x3E
ldrb r0, [r4]
movs r1, 0x4
orrs r0, r1
strb r0, [r4]
ldr r0, =gUnknown_02022B10
strb r5, [r0]
b _0800E06A
.pool
_0800E024:
ldr r0, =gUnknown_082ED5F0
adds r1, r3, 0
movs r3, 0
bl CreateSprite
ldr r4, =gUnknown_02022B10
strb r0, [r4]
ldr r5, =gSprites
ldrb r1, [r4]
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
adds r0, r5
ldr r1, =0x00001234
strh r1, [r0, 0x3C]
ldr r0, =gUnknown_082ED5E0
ldrh r0, [r0, 0x6]
bl GetSpriteTileStartByTag
ldrb r2, [r4]
lsls r1, r2, 4
adds r1, r2
lsls r1, 2
adds r1, r5
strh r0, [r1, 0x3A]
ldrb r1, [r4]
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
adds r0, r5
adds r0, 0x3E
ldrb r1, [r0]
movs r2, 0x4
orrs r1, r2
strb r1, [r0]
_0800E06A:
pop {r4,r5}
pop {r0}
bx r0
.pool
thumb_func_end sub_800DFB4
thumb_func_start sub_800E084
sub_800E084: @ 800E084
push {r4,lr}
ldr r4, =gSprites
ldr r3, =gUnknown_02022B10
ldr r3, =gWirelessStatusIndicatorSpriteId
ldrb r1, [r3]
lsls r0, r1, 4
adds r0, r1
@@ -139,7 +52,7 @@ _0800E0CA:
thumb_func_start sub_800E0E8
sub_800E0E8: @ 800E0E8
push {r4,lr}
ldr r4, =gUnknown_082ED5E0
ldr r4, =sWirelessStatusIndicatorSpriteSheet
ldrh r0, [r4, 0x6]
bl GetSpriteTileStartByTag
lsls r0, 16
@@ -149,9 +62,9 @@ sub_800E0E8: @ 800E0E8
adds r0, r4, 0
bl LoadCompressedObjectPic
_0800E100:
ldr r0, =gUnknown_082ED5E8
ldr r0, =sWirelessStatusIndicatorSpritePalette
bl LoadSpritePalette
ldr r1, =gUnknown_02022B10
ldr r1, =gWirelessStatusIndicatorSpriteId
movs r0, 0xFF
strb r0, [r1]
pop {r4}
@@ -215,7 +128,7 @@ sub_800E174: @ 800E174
push {r4-r7,lr}
mov r7, r8
push {r7}
ldr r1, =gUnknown_02022B10
ldr r1, =gWirelessStatusIndicatorSpriteId
ldrb r0, [r1]
cmp r0, 0xFF
bne _0800E184
@@ -377,7 +290,7 @@ _0800E2B2:
movs r1, 0x84
lsls r1, 3
adds r0, r4, r1
ldr r1, =gUnknown_082ED570
ldr r1, =sWirelessStatusIndicatorOamData
ldr r2, [r1, 0x4]
ldr r1, [r1]
str r1, [r0]
asm/rom4.s
+2 -2
View File
@@ -3775,7 +3775,7 @@ _080864E0:
bl sub_800E0E8
movs r0, 0
movs r1, 0
bl sub_800DFB4
bl CreateWirelessStatusIndicatorSprite
b _08086506
.pool
_080864FC:
@@ -4063,7 +4063,7 @@ _0808676C:
bl sub_800E0E8
movs r0, 0
movs r1, 0
bl sub_800DFB4
bl CreateWirelessStatusIndicatorSprite
b _08086792
.pool
_08086788:
asm/rom_8011DC0.s
+9 -9
View File
@@ -764,7 +764,7 @@ _08012BF6:
bl sub_800E0E8
movs r0, 0
movs r1, 0
bl sub_800DFB4
bl CreateWirelessStatusIndicatorSprite
movs r0, 0x5
strb r0, [r6, 0x19]
ldrb r1, [r6, 0x13]
@@ -2540,7 +2540,7 @@ sub_8013BD8: @ 8013BD8
bl sub_800E0E8
movs r0, 0
movs r1, 0
bl sub_800DFB4
bl CreateWirelessStatusIndicatorSprite
ldrb r0, [r4, 0xE]
bl sub_81AE70C
ldr r0, =gStringVar1
@@ -4319,7 +4319,7 @@ _08014C82:
bl sub_800E0E8
movs r0, 0
movs r1, 0
bl sub_800DFB4
bl CreateWirelessStatusIndicatorSprite
ldr r1, [r5]
ldrb r0, [r5, 0x13]
lsls r0, 5
@@ -4816,7 +4816,7 @@ _080150D6:
bl sub_800E0E8
movs r0, 0
movs r1, 0
bl sub_800DFB4
bl CreateWirelessStatusIndicatorSprite
ldrb r0, [r7, 0xE]
bl sub_81AE70C
ldr r0, =gStringVar1
@@ -5188,7 +5188,7 @@ _08015452:
bl sub_800E0E8
movs r0, 0
movs r1, 0
bl sub_800DFB4
bl CreateWirelessStatusIndicatorSprite
ldr r0, [r5]
adds r4, r0, 0
adds r4, 0x10
@@ -22061,7 +22061,7 @@ _0801DEC8:
bl sub_800E0E8
movs r0, 0xE8
movs r1, 0x96
bl sub_800DFB4
bl CreateWirelessStatusIndicatorSprite
_0801DF04:
add sp, 0x4
pop {r4-r6}
@@ -28419,7 +28419,7 @@ _08021278:
bl sub_800E0E8
movs r0, 0
movs r1, 0
bl sub_800DFB4
bl CreateWirelessStatusIndicatorSprite
adds r0, r5, 0
bl sub_8022730
ldr r0, =gSpriteCoordOffsetY
@@ -35628,7 +35628,7 @@ _08024C5A:
bl sub_800E0E8
movs r0, 0
movs r1, 0
bl sub_800DFB4
bl CreateWirelessStatusIndicatorSprite
b _08024D20
.pool
_08024C80:
@@ -47465,7 +47465,7 @@ _0802AD0C:
bl sub_800E0E8
movs r0, 0
movs r1, 0
bl sub_800DFB4
bl CreateWirelessStatusIndicatorSprite
ldr r1, [r4]
b _0802ADC0
.pool
asm/script_pokemon_util_80F87D8.s
+1 -1
View File
@@ -1100,7 +1100,7 @@ sub_80F90DC: @ 80F90DC
bl sub_800E0E8
movs r0, 0x8
movs r1, 0x8
bl sub_800DFB4
bl CreateWirelessStatusIndicatorSprite
_080F90FE:
pop {r0}
bx r0
asm/trade.s
+3 -3
View File
@@ -563,7 +563,7 @@ _0807765C:
bl sub_800E0E8
movs r0, 0
movs r1, 0
bl sub_800DFB4
bl CreateWirelessStatusIndicatorSprite
b _08077B46
.pool
_08077680:
@@ -1189,7 +1189,7 @@ _08077C3C:
bl sub_800E0E8
movs r0, 0
movs r1, 0
bl sub_800DFB4
bl CreateWirelessStatusIndicatorSprite
_08077C50:
ldr r1, =gMain
movs r3, 0x87
@@ -7514,7 +7514,7 @@ _0807B0F0:
bl sub_800E0E8
movs r0, 0
movs r1, 0
bl sub_800DFB4
bl CreateWirelessStatusIndicatorSprite
_0807B110:
ldr r0, =sub_807EA2C
bl SetMainCallback2
asm/trainer_card.s
+1 -1
View File
@@ -198,7 +198,7 @@ _080C2836:
bl sub_800E0E8
movs r0, 0xE6
movs r1, 0x96
bl sub_800DFB4
bl CreateWirelessStatusIndicatorSprite
_080C2852:
movs r6, 0x1
negs r6, r6