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

Merge remote-tracking branch 'pret/master' into script_menu

Browse Source
This commit is contained in:
Diegoisawesome
2018-11-06 20:20:56 -06:00
parent 054a015c95 93ff71fcfd
commit 18839a4872
236 changed files with 78716 additions and 84453 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/party_menu.s
+2 -2
View File
@@ -6178,7 +6178,7 @@ sub_81B3300: @ 81B3300
movs r1, 0x1
orrs r0, r1
strb r0, [r2]
bl GetPlayerTextSpeed
bl GetPlayerTextSpeedDelay
adds r3, r0, 0
lsls r3, 24
lsrs r3, 24
@@ -15615,7 +15615,7 @@ _081B8618:
bl GetMonData
lsls r0, 16
lsrs r4, r0, 16
ldr r3, =gUnknown_08611C9A
ldr r3, =gFrontierBannedSpecies
lsls r1, r6, 1
adds r0, r1, r3
ldrh r0, [r0]