summaryrefslogtreecommitdiff
path: root/asm/script_menu.s
diff options
context:
space:
mode:
authorDiegoisawesome <Diegoisawesome@users.noreply.github.com>2018-05-10 18:45:35 -0500
committerGitHub <noreply@github.com>2018-05-10 18:45:35 -0500
commit7c551ef37376c3cc6193ec556d43d1c2d312e2d3 (patch)
tree2650fcf5b16620bb315581e9cf790f2cf716956b /asm/script_menu.s
parent7defc27b994069715e5749245700d20dd740e4f0 (diff)
parent2b6d2dfadd00d88c5193c63da4da46e73f791549 (diff)
Merge pull request #250 from Diegoisawesome/master
Port/decompile field_effect
Diffstat (limited to 'asm/script_menu.s')
-rw-r--r--asm/script_menu.s4
1 files changed, 2 insertions, 2 deletions
diff --git a/asm/script_menu.s b/asm/script_menu.s
index 0624dba83..a2e2ec59e 100644
--- a/asm/script_menu.s
+++ b/asm/script_menu.s
@@ -1316,7 +1316,7 @@ _080E28CA:
ldr r1, =gSprites
adds r0, r1
ldrb r1, [r4, 0xC]
- bl sub_80B6070
+ bl FreeResourcesAndDestroySprite
_080E28DE:
ldrh r0, [r4, 0x8]
adds r0, 0x1
@@ -1363,7 +1363,7 @@ ScriptMenu_ShowPokemonPic: @ 80E2900
asrs r2, 16
mov r0, r8
movs r3, 0
- bl sub_80B5F84
+ bl CreateMonSprite_PicBox
adds r5, r0, 0
lsls r5, 24
lsrs r5, 24