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

Merge pull request #47 from PikalaxALT/split_data3

Browse Source 
Split data3
This commit is contained in:
yenatch
2017-09-26 18:16:52 -04:00
committed by GitHub
parent 701d53be8d def827fcd4
commit 3c8091393c
82 changed files with 7195 additions and 3904 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/decoration.s
+2 -2
View File
@@ -1264,7 +1264,7 @@ sub_8127454: @ 8127454
ldr r1, =gStringVar1
bl StringCopy
lsls r4, 5
ldr r0, =gUnknown_085A5C09
ldr r0, =gDecorations + 1
adds r4, r0
adds r0, r5, 0
adds r1, r4, 0
@@ -7083,7 +7083,7 @@ sub_812A3D4: @ 812A3D4
adds r1, r2
ldrb r1, [r1]
lsls r1, 5
ldr r2, =gUnknown_085A5C09
ldr r2, =gDecorations + 1
adds r1, r2
bl StringCopy
ldr r4, =gStringVar4
asm/scrcmd.s
+1 -1
View File
@@ -3977,7 +3977,7 @@ sub_809B114: @ 809B114
adds r4, r0
ldr r0, [r4]
lsrs r1, 11
ldr r2, =gUnknown_085A5C09
ldr r2, =gDecorations + 1
adds r1, r2
bl StringCopy
movs r0, 0
asm/shop.s
+2 -2
View File
@@ -657,7 +657,7 @@ BuyMenuSetListEntry: @ 80E0000
.pool
_080E0020:
lsls r1, r4, 5
ldr r0, =gUnknown_085A5C09
ldr r0, =gDecorations + 1
adds r1, r0
adds r0, r5, 0
bl StringCopy
@@ -2106,7 +2106,7 @@ _080E0C28:
_080E0C38:
ldr r0, =gStringVar1
lsls r1, r5, 5
ldr r2, =gUnknown_085A5C09
ldr r2, =gDecorations + 1
adds r1, r2
bl StringCopy
ldr r0, =gStringVar2
asm/trader.s
+3 -3
View File
@@ -113,7 +113,7 @@ _08133AC2:
_08133AF0:
ldrb r1, [r1]
lsls r1, 5
ldr r0, =gUnknown_085A5C09
ldr r0, =gDecorations + 1
adds r1, r0
movs r0, 0x1
movs r2, 0
@@ -172,7 +172,7 @@ _08133B70:
ldrb r0, [r7, 0x6]
ldrb r2, [r1]
lsls r2, 5
ldr r1, =gUnknown_085A5C09
ldr r1, =gDecorations + 1
adds r2, r1
lsls r1, r5, 4
adds r1, 0x1
@@ -450,7 +450,7 @@ sub_8133DA0: @ 8133DA0
ldr r1, =gSpecialVar_0x8004
ldrh r1, [r1]
lsls r1, 5
ldr r4, =gUnknown_085A5C09
ldr r4, =gDecorations + 1
adds r1, r4
bl StringCopy
ldr r0, =gStringVar2
asm/tv.s
+4 -4
View File
@@ -14911,7 +14911,7 @@ _080F4414:
ldr r0, =gStringVar2
ldrb r1, [r5, 0x4]
lsls r1, 5
ldr r2, =gUnknown_085A5C09
ldr r2, =gDecorations + 1
adds r1, r2
bl StringCopy
ldrb r0, [r5, 0x3]
@@ -14932,7 +14932,7 @@ _080F4448:
ldr r0, =gStringVar2
ldrb r1, [r5, 0x5]
lsls r1, 5
ldr r2, =gUnknown_085A5C09
ldr r2, =gDecorations + 1
adds r1, r2
bl StringCopy
ldrb r1, [r5, 0x3]
@@ -14970,7 +14970,7 @@ _080F449C:
ldr r0, =gStringVar2
ldrb r1, [r5, 0x6]
lsls r1, 5
ldr r4, =gUnknown_085A5C09
ldr r4, =gDecorations + 1
adds r1, r4
bl StringCopy
ldr r0, =gStringVar3
@@ -14983,7 +14983,7 @@ _080F44C0:
ldr r0, =gStringVar2
ldrb r1, [r5, 0x6]
lsls r1, 5
ldr r2, =gUnknown_085A5C09
ldr r2, =gDecorations + 1
adds r1, r2
_080F44CA:
bl StringCopy