ref: 60f7ca40061da7ac5524636438f6bde10ea15ecb
parent: 159cef004f86d134a551a3abfba2dee9020b16d0
author: Rangi <[email protected]>
date: Sun May 24 23:54:42 EDT 2020
Group MoveDescriptions with PrintMoveDesc and rename that to PrintMoveDescription (like ItemDescriptions with PrintItemDescription)
--- a/data/predef_pointers.asm
+++ b/data/predef_pointers.asm
@@ -24,7 +24,7 @@
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
--- a/engine/items/print_item_description.asm
+++ b/engine/items/print_item_description.asm
@@ -11,7 +11,7 @@
pop hl
ld a, [wTempTMHM]
ld [wCurSpecies], a
- predef PrintMoveDesc
+ predef PrintMoveDescription
ret
.not_a_tm
--- a/engine/items/tmhm.asm
+++ b/engine/items/tmhm.asm
@@ -252,7 +252,7 @@
ld a, [wTempTMHM]
ld [wCurSpecies], a
hlcoord 1, 14
- call PrintMoveDesc
+ call PrintMoveDescription
jp TMHM_JoypadLoop
TMHM_ChooseTMorHM:
--- a/engine/pokemon/mon_menu.asm
+++ b/engine/pokemon/mon_menu.asm
@@ -1214,7 +1214,7 @@
.description
hlcoord 1, 14
- predef PrintMoveDesc
+ predef PrintMoveDescription
ld a, $1
ldh [hBGMapMode], a
ret
--- 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 @@
ld d, [hl]
pop hl
jp PlaceString
+
+INCLUDE "data/moves/descriptions.asm"
--- a/main.asm
+++ b/main.asm
@@ -146,7 +146,6 @@
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"