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

Merge branch 'master' into pokemon

Browse Source
This commit is contained in:
jiangzhengwenjz
2019-07-16 23:22:52 +08:00
parent b7bdad5b25 e13e7eccaf
commit c7d3ad06b0
26 changed files with 750 additions and 1524 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/pokemon_summary_screen.s
+4 -6
View File
@@ -10482,7 +10482,7 @@ _08139BA0:
bl __floatsidf
str r0, [sp]
str r1, [sp, 0x4]
ldr r3, _08139BDC @ =0x9999999a
ldr r3, _08139BD8+4 @ =0x9999999a
ldr r2, _08139BD8 @ =0x3fe99999
bl __muldf3
adds r5, r1, 0
@@ -10503,11 +10503,10 @@ _08139BA0:
movs r0, 0x2
b _08139C16
.align 2, 0
_08139BD8: .4byte 0x3fe99999
_08139BDC: .4byte 0x9999999a
_08139BD8: .double 0.8
_08139BE0: .4byte gUnknown_203B170
_08139BE4:
ldr r3, _08139C08 @ =0x33333333
ldr r3, _08139C04+4 @ =0x33333333
ldr r2, _08139C04 @ =0x3fe33333
ldr r0, [sp]
ldr r1, [sp, 0x4]
@@ -10522,8 +10521,7 @@ _08139BE4:
movs r0, 0x1
b _08139C16
.align 2, 0
_08139C04: .4byte 0x3fe33333
_08139C08: .4byte 0x33333333
_08139C04: .double 0.6
_08139C0C: .4byte gUnknown_203B170
_08139C10:
ldr r0, _08139C38 @ =gUnknown_203B170