From 1bd681722bdf3f918f15aaf9d6c7ae2becfa9457 Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Tue, 18 Oct 2016 19:51:37 -0700 Subject: name missed field effect function --- asm/rom6.s | 6 +++--- data/field_effect_scripts.s | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/asm/rom6.s b/asm/rom6.s index e9941f11e..b33b2d436 100644 --- a/asm/rom6.s +++ b/asm/rom6.s @@ -32692,8 +32692,8 @@ _0811B6A8: _0811B6B0: .4byte sub_811B578 thumb_func_end sub_811B688 - thumb_func_start sub_811B6B4 -sub_811B6B4: @ 811B6B4 + thumb_func_start FldEff_Pokeball +FldEff_Pokeball: @ 811B6B4 push {r4,r5,lr} ldr r0, _0811B710 ldr r5, _0811B714 @@ -32742,7 +32742,7 @@ _0811B710: .4byte gSpriteTemplate_83FD98C _0811B714: .4byte gUnknown_0202FF84 _0811B718: .4byte gSprites _0811B71C: .4byte 0x0000ffff - thumb_func_end sub_811B6B4 + thumb_func_end FldEff_Pokeball thumb_func_start sub_811B720 sub_811B720: @ 811B720 diff --git a/data/field_effect_scripts.s b/data/field_effect_scripts.s index 65e96f630..a1f796f83 100644 --- a/data/field_effect_scripts.s +++ b/data/field_effect_scripts.s @@ -254,7 +254,7 @@ gFieldEffectScript_UseDive: @ 81D9D99 gFieldEffectScript_Pokeball: @ 81D9D9F loadpal gFieldEffectObjectPaletteInfo10 - callnative sub_811B6B4 + callnative FldEff_Pokeball end gFieldEffectScript_HeartIcon: @ 81D9DAA -- cgit v1.2.3