summaryrefslogtreecommitdiff
path: root/data/scripts
diff options
context:
space:
mode:
authorluckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com>2021-07-02 12:53:12 -0400
committerluckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com>2021-07-02 12:53:12 -0400
commitb3d66f5528ccfc8b8a3f6c0d46444ad5943364f4 (patch)
tree9917de58912d28e884871cb7efc5b4d291ec4e78 /data/scripts
parent9fd27fe8552eb0716222e72bc92ffa7f7334c68d (diff)
parent3964820a84e4819bb807d601d2c3c7b196f764e8 (diff)
Merge branch 'master' of https://github.com/pret/pokeemerald
Diffstat (limited to 'data/scripts')
-rw-r--r--data/scripts/item_ball_scripts.inc4
1 files changed, 2 insertions, 2 deletions
diff --git a/data/scripts/item_ball_scripts.inc b/data/scripts/item_ball_scripts.inc
index 82633f77c..f9228134c 100644
--- a/data/scripts/item_ball_scripts.inc
+++ b/data/scripts/item_ball_scripts.inc
@@ -634,7 +634,7 @@ MagmaHideout_1F_EventScript_ItemRareCandy:: @ 82914DE
finditem ITEM_RARE_CANDY
end
-MagmaHideout_2F_2R_EventScript_MaxElixir:: @ 82914EB
+MagmaHideout_2F_2R_EventScript_ItemMaxElixir:: @ 82914EB
finditem ITEM_MAX_ELIXIR
end
@@ -650,7 +650,7 @@ MagmaHideout_3F_2R_EventScript_ItemPPMax:: @ 8291512
finditem ITEM_PP_MAX
end
-MagmaHideout_4F_EventScript_MaxRevive:: @ 829151F
+MagmaHideout_4F_EventScript_ItemMaxRevive:: @ 829151F
finditem ITEM_MAX_REVIVE
end