dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into trade

Browse Source
This commit is contained in:
PikalaxALT
2019-10-14 10:41:27 -04:00
parent 9fe74ac590 8efae5c807
commit b8fec3d9f6
145 changed files with 17677 additions and 37125 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/trade.s
+10 -10
View File
@@ -8258,7 +8258,7 @@ _0805139C:
adds r1, r0
lsls r1, 2
adds r1, r3
ldr r2, _08051410 @ =gUnknown_82349CC
ldr r2, _08051410 @ =gMonFrontPicCoords
adds r0, r4, 0
adds r0, 0xF0
ldrh r0, [r0]
@@ -8282,7 +8282,7 @@ _0805139C:
.align 2, 0
_08051408: .4byte gSprites
_0805140C: .4byte 0x0000ff4c
_08051410: .4byte gUnknown_82349CC
_08051410: .4byte gMonFrontPicCoords
_08051414:
ldr r5, [r7]
adds r6, r5, 0
@@ -9797,7 +9797,7 @@ _08052070:
adds r1, r0
lsls r1, 2
adds r1, r4
ldr r3, _08052120 @ =gUnknown_82349CC
ldr r3, _08052120 @ =gMonFrontPicCoords
adds r2, 0xF2
ldrh r0, [r2]
lsls r0, 2
@@ -9864,7 +9864,7 @@ _08052070:
b _080522AC
.align 2, 0
_0805211C: .4byte gSprites
_08052120: .4byte gUnknown_82349CC
_08052120: .4byte gMonFrontPicCoords
_08052124: .4byte 0x000fffff
_08052128:
movs r1, 0xAA
@@ -10434,7 +10434,7 @@ _0805278C:
adds r1, r0
lsls r1, 2
adds r1, r3
ldr r2, _08052800 @ =gUnknown_82349CC
ldr r2, _08052800 @ =gMonFrontPicCoords
adds r0, r4, 0
adds r0, 0xF0
ldrh r0, [r0]
@@ -10458,7 +10458,7 @@ _0805278C:
.align 2, 0
_080527F8: .4byte gSprites
_080527FC: .4byte 0x0000ff4c
_08052800: .4byte gUnknown_82349CC
_08052800: .4byte gMonFrontPicCoords
_08052804:
ldr r5, [r7]
adds r6, r5, 0
@@ -12022,7 +12022,7 @@ _080534CC:
adds r1, r0
lsls r1, 2
adds r1, r4
ldr r3, _0805357C @ =gUnknown_82349CC
ldr r3, _0805357C @ =gMonFrontPicCoords
adds r2, 0xF2
ldrh r0, [r2]
lsls r0, 2
@@ -12089,7 +12089,7 @@ _080534CC:
b _08053708
.align 2, 0
_08053578: .4byte gSprites
_0805357C: .4byte gUnknown_82349CC
_0805357C: .4byte gMonFrontPicCoords
_08053580: .4byte 0x000fffff
_08053584:
movs r1, 0xAA
@@ -13401,7 +13401,7 @@ _080540DC:
movs r0, 0x32
strb r0, [r1]
ldr r4, _080540FC @ =gStringVar4
ldr r1, _08054100 @ =gUnknown_8419F54
ldr r1, _08054100 @ =gText_SavingDontTurnOffThePower2
_080540EA:
adds r0, r4, 0
bl StringExpandPlaceholders
@@ -13412,7 +13412,7 @@ _080540EA:
b _08054396
.align 2, 0
_080540FC: .4byte gStringVar4
_08054100: .4byte gUnknown_8419F54
_08054100: .4byte gText_SavingDontTurnOffThePower2
_08054104:
bl InUnionRoom
cmp r0, 0