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

fix merge conflicts

Browse Source
This commit is contained in:
DizzyEggg
2017-09-21 10:50:15 +02:00
parent 3919b7130b ed9e0e2054
commit 9ee9a20152
131 changed files with 13064 additions and 6461 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/main_menu.s
+4 -4
View File
@@ -4547,7 +4547,7 @@ fmt_time: @ 8031E94
push {r4-r6,lr}
sub sp, 0xC
ldr r4, =gStringVar4
ldr r1, =gUnknown_085EDCC3
ldr r1, =gText_ContinueMenuPlayer
adds r0, r4, 0
bl StringExpandPlaceholders
ldr r6, =gUnknown_082FF0E3
@@ -4589,7 +4589,7 @@ fmt_player: @ 8031EF8
push {r4-r6,lr}
sub sp, 0x2C
ldr r4, =gStringVar4
ldr r1, =gUnknown_085EDCCA
ldr r1, =gText_ContinueMenuTime
adds r0, r4, 0
bl StringExpandPlaceholders
ldr r6, =gUnknown_082FF0E3
@@ -4664,7 +4664,7 @@ _08031FAA:
lsls r0, 16
lsrs r7, r0, 16
ldr r4, =gStringVar4
ldr r1, =gUnknown_085EDCCF
ldr r1, =gText_ContinueMenuPokedex
adds r0, r4, 0
bl StringExpandPlaceholders
ldr r6, =gUnknown_082FF0E3
@@ -4728,7 +4728,7 @@ _08032030:
cmp r4, r0
bls _0803201C
ldr r4, =gStringVar4
ldr r1, =gUnknown_085EDCD7
ldr r1, =gText_ContinueMenuBadges
adds r0, r4, 0
bl StringExpandPlaceholders
ldr r6, =gUnknown_082FF0E3