pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-09-09 09:51:34 -07:00
Code Issues Packages Projects Releases Wiki Activity

Group MoveDescriptions with PrintMoveDesc and rename that to PrintMoveDescription (like ItemDescriptions with PrintItemDescription)

Browse Source
This commit is contained in:
Rangi 2020-05-25 03:54:42 -04:00
parent 159cef004f
commit 60f7ca4006
6 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/predef_pointers.asm
View File

@ -24,7 +24,7 @@ PredefPointers::
add_predef CanLearnTMHMMove add_predef CanLearnTMHMMove
add_predef GetTMHMMove add_predef GetTMHMMove
add_predef LinkTextboxAtHL ; $ 10 add_predef LinkTextboxAtHL ; $ 10
add_predef PrintMoveDesc add_predef PrintMoveDescription
add_predef UpdatePlayerHUD add_predef UpdatePlayerHUD
add_predef PlaceGraphic add_predef PlaceGraphic
add_predef CheckPlayerPartyForFitMon add_predef CheckPlayerPartyForFitMon

2
engine/items/print_item_description.asm
View File

@ -11,7 +11,7 @@ PrintItemDescription:
pop hl pop hl
ld a, [wTempTMHM] ld a, [wTempTMHM]
ld [wCurSpecies], a ld [wCurSpecies], a
predef PrintMoveDesc predef PrintMoveDescription
ret ret
.not_a_tm .not_a_tm

2
engine/items/tmhm.asm
View File

@ -252,7 +252,7 @@ TMHM_ShowTMMoveDescription:
ld a, [wTempTMHM] ld a, [wTempTMHM]
ld [wCurSpecies], a ld [wCurSpecies], a
hlcoord 1, 14 hlcoord 1, 14
call PrintMoveDesc call PrintMoveDescription
jp TMHM_JoypadLoop jp TMHM_JoypadLoop
TMHM_ChooseTMorHM: TMHM_ChooseTMorHM:

2
engine/pokemon/mon_menu.asm
View File

@ -1214,7 +1214,7 @@ PlaceMoveData:
.description .description
hlcoord 1, 14 hlcoord 1, 14
predef PrintMoveDesc predef PrintMoveDescription
ld a, $1 ld a, $1
ldh [hBGMapMode], a ldh [hBGMapMode], a
ret ret

4
engine/pokemon/print_move_description.asm
View File

@ -1,4 +1,4 @@
PrintMoveDesc: PrintMoveDescription:
push hl push hl
ld hl, MoveDescriptions ld hl, MoveDescriptions
ld a, [wCurSpecies] ld a, [wCurSpecies]
@ -12,3 +12,5 @@ PrintMoveDesc:
ld d, [hl] ld d, [hl]
pop hl pop hl
jp PlaceString jp PlaceString
INCLUDE "data/moves/descriptions.asm"

1
main.asm
View File

@ -146,7 +146,6 @@ INCLUDE "engine/events/move_deleter.asm"
INCLUDE "engine/link/mystery_gift_2.asm" INCLUDE "engine/link/mystery_gift_2.asm"
INCLUDE "engine/items/tmhm.asm" INCLUDE "engine/items/tmhm.asm"
INCLUDE "engine/pokemon/print_move_description.asm" INCLUDE "engine/pokemon/print_move_description.asm"
INCLUDE "data/moves/descriptions.asm"
INCLUDE "engine/events/pokerus/pokerus.asm" INCLUDE "engine/events/pokerus/pokerus.asm"
INCLUDE "engine/battle/start_battle.asm" INCLUDE "engine/battle/start_battle.asm"
INCLUDE "engine/gfx/place_graphic.asm" INCLUDE "engine/gfx/place_graphic.asm"