diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-10-29 23:23:44 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-10-29 23:23:44 -0400 |
| commit | b89636769c271cadc154e045cca3ea06cb4a61e1 (patch) | |
| tree | 068a164789a9a8e8b303b4322d9d268e2d6bce8b /data | |
| parent | 15ad69e0c6e35be34dc65322209d3673607d00c5 (diff) | |
Updates to more closely sync with pokecrystal
Diffstat (limited to 'data')
| -rw-r--r-- | data/moves/tmhm_moves.asm | 1 | ||||
| -rw-r--r-- | data/player_names.asm | 6 | ||||
| -rw-r--r-- | data/pokemon/palettes.asm | 1 | ||||
| -rw-r--r-- | data/radio/oaks_pkmn_talk_routes.asm | 3 | ||||
| -rw-r--r-- | data/text/battle.asm | 4 |
5 files changed, 9 insertions, 6 deletions
diff --git a/data/moves/tmhm_moves.asm b/data/moves/tmhm_moves.asm index 2834e7df..e2c44f23 100644 --- a/data/moves/tmhm_moves.asm +++ b/data/moves/tmhm_moves.asm @@ -32,6 +32,7 @@ endr db 0 ; end +; unused db 0 db 0 db 0 diff --git a/data/player_names.asm b/data/player_names.asm index 0155dac4..3291ea66 100644 --- a/data/player_names.asm +++ b/data/player_names.asm @@ -1,8 +1,8 @@ NameMenuHeader: - db STATICMENU_NO_TOP_SPACING + db STATICMENU_NO_TOP_SPACING ; flags menu_coords 0, 0, 10, TEXTBOX_Y - 1 dw .Names - db 1 + db 1 ; default option .Names: db STATICMENU_CURSOR | STATICMENU_PLACE_TITLE | STATICMENU_DISABLE_B ; flags @@ -21,5 +21,5 @@ ELIF DEF(_SILVER) db "OSCAR@" db "MAX@" ENDC - db 2 + db 2 ; ???? db "NAME@" ; title diff --git a/data/pokemon/palettes.asm b/data/pokemon/palettes.asm index e6fbf844..36d2c662 100644 --- a/data/pokemon/palettes.asm +++ b/data/pokemon/palettes.asm @@ -3,6 +3,7 @@ PokemonPalettes: ; Each back.gbcpal is generated from the corresponding .png, and ; only the middle two colors are included, not black or white. +; (Back sprites are used since they are the same in Gold and Silver.) ; Shiny palettes are defined directly, not generated. ; 000 diff --git a/data/radio/oaks_pkmn_talk_routes.asm b/data/radio/oaks_pkmn_talk_routes.asm index 254dd8e5..db244740 100644 --- a/data/radio/oaks_pkmn_talk_routes.asm +++ b/data/radio/oaks_pkmn_talk_routes.asm @@ -1,6 +1,7 @@ ; Oak's Pokémon Talk will list wild Pokémon on these maps. -OaksPKMNTalkRoutes:; there are NUM_OAKS_POKEMON_TALK_ROUTES entries +OaksPKMNTalkRoutes: +; there are NUM_OAKS_POKEMON_TALK_ROUTES entries map_id ROUTE_29 map_id ROUTE_46 map_id ROUTE_30 diff --git a/data/text/battle.asm b/data/text/battle.asm index fe14f938..811a8e8c 100644 --- a/data/text/battle.asm +++ b/data/text/battle.asm @@ -340,7 +340,7 @@ BattleText_StringBuffer1GrewToLevel: text_decimal wCurPartyLevel, 1, 3 text "!@" sound_dex_fanfare_50_79 - db "@" + text_end BattleText_WildMonIsEating: text "Wild @" @@ -1073,7 +1073,7 @@ BeatUpAttackText: ; BUG: Pokémon names 8-10 characters long can overflow the textbox, ; printing as "Enemy 1234567890 can't": up to 21 characters, over 18. -CantReceiveGiftText: +PresentFailedText: text "<TARGET> can't" line "receive the gift!" prompt |