From 35f2bb90d4a8f8e4dcac3fbab7d89cbc590285e8 Mon Sep 17 00:00:00 2001
From: yenatch <yenatch@gmail.com>
Date: Mon, 16 Jun 2014 13:03:05 -0700
Subject: Rename predef functions so they aren't excessive in length.

This is mostly because of an rgbasm bug that prevents macro arguments
from exceeding 16 characters, but the names were bad anyway.
---
 engine/overworld/emotion_bubbles.asm   | 2 +-
 engine/overworld/item.asm              | 2 +-
 engine/overworld/player_animations.asm | 2 +-
 engine/overworld/trainers.asm          | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'engine/overworld')

diff --git a/engine/overworld/emotion_bubbles.asm b/engine/overworld/emotion_bubbles.asm
index a8d863df..ae7702b4 100755
--- a/engine/overworld/emotion_bubbles.asm
+++ b/engine/overworld/emotion_bubbles.asm
@@ -1,4 +1,4 @@
-PrintEmotionBubble: ; 17c47 (5:7c47)
+EmotionBubble: ; 17c47 (5:7c47)
 	ld a, [wcd50]
 	ld c, a
 	ld b, $0
diff --git a/engine/overworld/item.asm b/engine/overworld/item.asm
index c66fc143..a75c393c 100644
--- a/engine/overworld/item.asm
+++ b/engine/overworld/item.asm
@@ -32,7 +32,7 @@ PickupItem:
 
 	ld a, [$ffdb]
 	ld [wcc4d], a
-	ld a, $11 ; RemoveMissableObject
+	ld a, $11 ; HideObject
 	call Predef
 	ld a, 1
 	ld [wcc3c], a
diff --git a/engine/overworld/player_animations.asm b/engine/overworld/player_animations.asm
index 68a6b170..184d38f4 100755
--- a/engine/overworld/player_animations.asm
+++ b/engine/overworld/player_animations.asm
@@ -89,7 +89,7 @@ Func_705aa: ; 705aa (1c:45aa)
 	ld [hl], a
 	jp Func_70755
 
-_DoFlyOrTeleportAwayGraphics: ; 705ba (1c:45ba)
+_LeaveMapAnim: ; 705ba (1c:45ba)
 	call Func_706ef
 	call Func_70787
 	ld a, b
diff --git a/engine/overworld/trainers.asm b/engine/overworld/trainers.asm
index 583decb9..b05ddbf1 100755
--- a/engine/overworld/trainers.asm
+++ b/engine/overworld/trainers.asm
@@ -159,7 +159,7 @@ Func_56903: ; 56903 (15:6903)
 	ret
 
 ; tests if this trainer is in the right position to engage the player and do so if she is.
-CheckEngagePlayer: ; 5690f (15:690f)
+TrainerEngage: ; 5690f (15:690f)
 	push hl
 	push de
 	ld a, [wTrainerSpriteOffset] ; wWhichTrade
-- 
cgit v1.2.3