diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-06-15 13:12:56 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-06-15 13:12:56 -0400 |
| commit | 9f01e33a0428f8a8c206b3f6018f526a41d65b43 (patch) | |
| tree | 7f3c8606ebbe0f882955761a899ec9f819412c17 /engine/pokemon | |
| parent | 0bc1e91d217fb1a724c08ed6c5826c2379f10507 (diff) | |
Port miscellaneous recent updates from pokecrystal
Diffstat (limited to 'engine/pokemon')
| -rw-r--r-- | engine/pokemon/mon_menu.asm | 2 | ||||
| -rw-r--r-- | engine/pokemon/party_menu.asm | 4 | ||||
| -rw-r--r-- | engine/pokemon/print_move_description.asm | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/engine/pokemon/mon_menu.asm b/engine/pokemon/mon_menu.asm index aa211ae1..3bf31474 100644 --- a/engine/pokemon/mon_menu.asm +++ b/engine/pokemon/mon_menu.asm @@ -1213,7 +1213,7 @@ PlaceMoveData: .description hlcoord 1, 14 - predef PrintMoveDesc + predef PrintMoveDescription ld a, $1 ldh [hBGMapMode], a ret diff --git a/engine/pokemon/party_menu.asm b/engine/pokemon/party_menu.asm index 93f9b93b..c899b5cb 100644 --- a/engine/pokemon/party_menu.asm +++ b/engine/pokemon/party_menu.asm @@ -104,11 +104,11 @@ PlacePartyNicknames: .end dec hl dec hl - ld de, .CANCEL + ld de, .CancelString call PlaceString ret -.CANCEL: +.CancelString: db "CANCEL@" PlacePartyHPBar: diff --git a/engine/pokemon/print_move_description.asm b/engine/pokemon/print_move_description.asm index e002e3d1..fd12f82b 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] |