diff options
| author | yenatch <yenatch@gmail.com> | 2017-03-22 02:01:55 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-22 02:01:55 -0400 |
| commit | e3c26e52ae6ab881ade913ca1fad2cd9629bbcb1 (patch) | |
| tree | 291912dbcf0f77d6c88b7e691efa18dcd9d4bc53 /asm/item_menu.s | |
| parent | 515ae5e00f2661559583a4720d9944755e23d141 (diff) | |
| parent | d507cdcebb39e2ec43c4d0f756570a5734fcb42e (diff) | |
Merge pull request #241 from ProjectRevoTPP/master
decompile fldeff_cut.c, script_pokemon_util_80C4BF0.c, document save.c, move data to C files, decompile the next 3 functions in item_use.c, and a lot of labeling
Diffstat (limited to 'asm/item_menu.s')
| -rw-r--r-- | asm/item_menu.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/asm/item_menu.s b/asm/item_menu.s index b5ed56b69..29109f3d9 100644 --- a/asm/item_menu.s +++ b/asm/item_menu.s @@ -5128,7 +5128,7 @@ sub_80A599C: @ 80A599C movs r4, 0 strh r2, [r1, 0x18] strh r3, [r1, 0x1A] - ldr r1, _080A59CC @ =gUnknown_03005CE0 + ldr r1, _080A59CC @ =gLastFieldPokeMenuOpened strb r4, [r1] bl sub_80A5AE4 pop {r4} @@ -5137,7 +5137,7 @@ sub_80A599C: @ 80A599C .align 2, 0 _080A59C4: .4byte gTasks _080A59C8: .4byte sub_805469C -_080A59CC: .4byte gUnknown_03005CE0 +_080A59CC: .4byte gLastFieldPokeMenuOpened thumb_func_end sub_80A599C thumb_func_start sub_80A59D0 |