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

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

Browse Source
This commit is contained in:
Diegoisawesome
2017-11-09 19:43:30 -06:00
parent 2d3044aaa6 af197ccd3b
commit 09e431077a
147 changed files with 37165 additions and 72938 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/item_menu.s
+3 -3
View File
@@ -47,14 +47,14 @@ sub_81AABB0: @ 81AABB0
lsls r0, 24
cmp r0, 0
bne _081AABCC
ldr r2, =sub_8059D50
ldr r2, =SetCB2ToReshowScreenAfterMenu2
movs r0, 0x1
movs r1, 0x5
bl GoToBagMenu
b _081AABD4
.pool
_081AABCC:
ldr r1, =sub_8059D50
ldr r1, =SetCB2ToReshowScreenAfterMenu2
movs r0, 0x1
bl sub_81C4F98
_081AABD4:
@@ -5634,7 +5634,7 @@ DoWallyTutorialBagMenu: @ 81ADD70
movs r0, 0x4
movs r1, 0x1
bl AddBagItem
ldr r2, =sub_8059D50
ldr r2, =SetCB2ToReshowScreenAfterMenu2
movs r0, 0xA
movs r1, 0
bl GoToBagMenu