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

name b message functions, split battle2

Browse Source
This commit is contained in:
DizzyEggg
2017-09-07 16:35:25 +02:00
parent d7d1b97bb8
commit 8bfdc42d0e
21 changed files with 16600 additions and 16589 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
asm/contest.s
View File

@@ -1415,19 +1415,19 @@ sub_80D833C: @ 80D833C
lsls r0, 24
cmp r0, 0
bne _080D83CC
ldr r0, =gUnknown_02022E2C
ldr r0, =gDisplayedStringBattle
ldr r1, =gUnknown_0827D507
bl StringCopy
b _080D83D4
.pool
_080D83CC:
ldr r0, =gUnknown_02022E2C
ldr r0, =gDisplayedStringBattle
ldr r1, =gUnknown_0827D531
bl StringCopy
_080D83D4:
bl sub_80DB89C
ldr r4, =gStringVar4
ldr r1, =gUnknown_02022E2C
ldr r1, =gDisplayedStringBattle
adds r0, r4, 0
bl StringExpandPlaceholders
adds r0, r4, 0
@@ -1752,19 +1752,19 @@ _080D868E:
lsls r0, 24
cmp r0, 0
bne _080D86DC
ldr r0, =gUnknown_02022E2C
ldr r0, =gDisplayedStringBattle
ldr r1, =gUnknown_0827D507
bl StringCopy
b _080D86E4
.pool
_080D86DC:
ldr r0, =gUnknown_02022E2C
ldr r0, =gDisplayedStringBattle
ldr r1, =gUnknown_0827D531
bl StringCopy
_080D86E4:
bl sub_80DB89C
ldr r4, =gStringVar4
ldr r1, =gUnknown_02022E2C
ldr r1, =gDisplayedStringBattle
adds r0, r4, 0
bl StringExpandPlaceholders
adds r0, r4, 0
@@ -6406,7 +6406,7 @@ sub_80DAED4: @ 80DAED4
adds r5, r0, 0
lsls r4, r1, 24
lsrs r4, 24
ldr r0, =gUnknown_02022E2C
ldr r0, =gDisplayedStringBattle
ldr r1, =gUnknown_085ED1AB
bl StringCopy
adds r1, r0, 0
@@ -6458,7 +6458,7 @@ sub_80DAF1C: @ 80DAF1C
add r0, sp, 0x4
adds r1, r4, 0
bl sub_80DAED4
ldr r4, =gUnknown_02022E2C
ldr r4, =gDisplayedStringBattle
movs r0, 0x7
adds r1, r4, 0
movs r2, 0x60
@@ -6514,7 +6514,7 @@ sub_80DAFA0: @ 80DAFA0
ldr r0, =gUnknown_02039F26
adds r4, r0
ldrb r0, [r4]
ldr r1, =gUnknown_02022E2C
ldr r1, =gDisplayedStringBattle
movs r2, 0x7
str r2, [sp]
movs r2, 0x5