From 60f7ca40061da7ac5524636438f6bde10ea15ecb Mon Sep 17 00:00:00 2001
From: Rangi <remy.oukaour+rangi42@gmail.com>
Date: Mon, 25 May 2020 03:54:42 -0400
Subject: [PATCH] Group MoveDescriptions with PrintMoveDesc and rename that to
 PrintMoveDescription (like ItemDescriptions with PrintItemDescription)

---
 data/predef_pointers.asm                  | 2 +-
 engine/items/print_item_description.asm   | 2 +-
 engine/items/tmhm.asm                     | 2 +-
 engine/pokemon/mon_menu.asm               | 2 +-
 engine/pokemon/print_move_description.asm | 4 +++-
 main.asm                                  | 1 -
 6 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/data/predef_pointers.asm b/data/predef_pointers.asm
index 1693f22aa..a35a380b8 100644
--- a/data/predef_pointers.asm
+++ b/data/predef_pointers.asm
@@ -24,7 +24,7 @@ PredefPointers::
 	add_predef CanLearnTMHMMove
 	add_predef GetTMHMMove
 	add_predef LinkTextboxAtHL ; $ 10
-	add_predef PrintMoveDesc
+	add_predef PrintMoveDescription
 	add_predef UpdatePlayerHUD
 	add_predef PlaceGraphic
 	add_predef CheckPlayerPartyForFitMon
diff --git a/engine/items/print_item_description.asm b/engine/items/print_item_description.asm
index 5d944e206..999c2075a 100644
--- a/engine/items/print_item_description.asm
+++ b/engine/items/print_item_description.asm
@@ -11,7 +11,7 @@ PrintItemDescription:
 	pop hl
 	ld a, [wTempTMHM]
 	ld [wCurSpecies], a
-	predef PrintMoveDesc
+	predef PrintMoveDescription
 	ret
 
 .not_a_tm
diff --git a/engine/items/tmhm.asm b/engine/items/tmhm.asm
index 736f00cdb..c15be2847 100644
--- a/engine/items/tmhm.asm
+++ b/engine/items/tmhm.asm
@@ -252,7 +252,7 @@ TMHM_ShowTMMoveDescription:
 	ld a, [wTempTMHM]
 	ld [wCurSpecies], a
 	hlcoord 1, 14
-	call PrintMoveDesc
+	call PrintMoveDescription
 	jp TMHM_JoypadLoop
 
 TMHM_ChooseTMorHM:
diff --git a/engine/pokemon/mon_menu.asm b/engine/pokemon/mon_menu.asm
index d25d6cc2b..8ffba32bf 100644
--- a/engine/pokemon/mon_menu.asm
+++ b/engine/pokemon/mon_menu.asm
@@ -1214,7 +1214,7 @@ PlaceMoveData:
 
 .description
 	hlcoord 1, 14
-	predef PrintMoveDesc
+	predef PrintMoveDescription
 	ld a, $1
 	ldh [hBGMapMode], a
 	ret
diff --git a/engine/pokemon/print_move_description.asm b/engine/pokemon/print_move_description.asm
index c461f2f3d..3647e1c54 100644
--- a/engine/pokemon/print_move_description.asm
+++ b/engine/pokemon/print_move_description.asm
@@ -1,4 +1,4 @@
-PrintMoveDesc:
+PrintMoveDescription:
 	push hl
 	ld hl, MoveDescriptions
 	ld a, [wCurSpecies]
@@ -12,3 +12,5 @@ PrintMoveDesc:
 	ld d, [hl]
 	pop hl
 	jp PlaceString
+
+INCLUDE "data/moves/descriptions.asm"
diff --git a/main.asm b/main.asm
index 8f6d542a4..827bad959 100644
--- a/main.asm
+++ b/main.asm
@@ -146,7 +146,6 @@ INCLUDE "engine/events/move_deleter.asm"
 INCLUDE "engine/link/mystery_gift_2.asm"
 INCLUDE "engine/items/tmhm.asm"
 INCLUDE "engine/pokemon/print_move_description.asm"
-INCLUDE "data/moves/descriptions.asm"
 INCLUDE "engine/events/pokerus/pokerus.asm"
 INCLUDE "engine/battle/start_battle.asm"
 INCLUDE "engine/gfx/place_graphic.asm"