diff options
| author | klektron <klektron@users.noreply.github.com> | 2021-01-02 15:24:25 +0100 |
|---|---|---|
| committer | klektron <klektron@users.noreply.github.com> | 2021-01-02 15:24:25 +0100 |
| commit | 419eac2a656d5dd034e46c5f93ce808e583050de (patch) | |
| tree | e624efa8f0f96b763e8a610c0a616988ef72a1b0 /data | |
| parent | 36d4d6fe0aeeb60b5137b812b779fa82b05b4a5a (diff) | |
fixes here and there
Diffstat (limited to 'data')
| -rw-r--r-- | data/moves/field_moves.asm | 10 | ||||
| -rwxr-xr-x | data/pokemon/dex_entries.asm | 8 | ||||
| -rw-r--r-- | data/text/text_6.asm | 1 | ||||
| -rw-r--r-- | data/text_boxes.asm | 4 |
4 files changed, 11 insertions, 12 deletions
diff --git a/data/moves/field_moves.asm b/data/moves/field_moves.asm index d7e9219b..c67f4d6d 100644 --- a/data/moves/field_moves.asm +++ b/data/moves/field_moves.asm @@ -6,9 +6,9 @@ FieldMoveDisplayData: db FLY, 2, $0C db ANIM_B4, 3, $0C ; unused db SURF, 4, $0C - db STRENGTH, 5, $0A - db FLASH, 6, $0C - db DIG, 7, $0C - db TELEPORT, 8, $0A - db SOFTBOILED, 9, $08 + db STRENGTH, 5, $0C + db FLASH, 6, $0A + db DIG, 7, $0B + db TELEPORT, 8, $07 + db SOFTBOILED, 9, $06 db -1 ; end diff --git a/data/pokemon/dex_entries.asm b/data/pokemon/dex_entries.asm index f54b7616..d100919f 100755 --- a/data/pokemon/dex_entries.asm +++ b/data/pokemon/dex_entries.asm @@ -679,14 +679,14 @@ NinetalesDexEntry: text_end PikachuDexEntry: - db "RATAÓN@" + db "RATÓN@" db 4 dw 60 text_far _PikachuDexEntry text_end RaichuDexEntry: - db "RATAÓN@" + db "RATÓN@" db 8 dw 300 text_far _RaichuDexEntry @@ -735,14 +735,14 @@ SeadraDexEntry: text_end SandshrewDexEntry: - db "RATAÓN@" + db "RATÓN@" db 6 dw 120 text_far _SandshrewDexEntry text_end SandslashDexEntry: - db "RATAÓN@" + db "RATÓN@" db 10 dw 295 text_far _SandslashDexEntry diff --git a/data/text/text_6.asm b/data/text/text_6.asm index d1be9a86..998d591b 100644 --- a/data/text/text_6.asm +++ b/data/text/text_6.asm @@ -185,7 +185,6 @@ _TeachMachineMoveText:: done _MonCannotLearnMachineMoveText:: - text_start text_ram wcd6d text " no es" line "compatible con" diff --git a/data/text_boxes.asm b/data/text_boxes.asm index b9fc70a1..a593a053 100644 --- a/data/text_boxes.asm +++ b/data/text_boxes.asm @@ -25,13 +25,13 @@ ENDM TextBoxTextAndCoordTable: ; text box ID, upper-left X, upper-left Y, lower-right X, lower-right Y, text pointer, text X, text Y text_box_text JP_MOCHIMONO_MENU_TEMPLATE, 0, 0, 14, 17, BuySellQuitText, 3, 0 - text_box_text USE_TOSS_MENU_TEMPLATE, 12, 10, 19, 14, UseTossText, 16, 11 + text_box_text USE_TOSS_MENU_TEMPLATE, 12, 10, 19, 14, UseTossText, 14, 11 text_box_text JP_SAVE_MESSAGE_MENU_TEMPLATE, 0, 0, 7, 5, BuySellQuitText, 2, 2 text_box_text JP_SPEED_OPTIONS_MENU_TEMPLATE, 0, 6, 5, 10, BuySellQuitText, 2, 7 text_box_text BATTLE_MENU_TEMPLATE, 8, 12, 19, 17, BattleMenuText, 10, 14 text_box_text SAFARI_BATTLE_MENU_TEMPLATE, 0, 12, 19, 17, SafariZoneBattleMenuText, 2, 14 text_box_text SWITCH_STATS_CANCEL_MENU_TEMPLATE, 11, 11, 19, 17, SwitchStatsCancelText, 13, 12 - text_box_text BUY_SELL_QUIT_MENU_TEMPLATE, 0, 0, 10, 6, $7482, 2, 1 + text_box_text BUY_SELL_QUIT_MENU_TEMPLATE, 0, 0, 10, 6, BuySellQuitText+1, 2, 1 text_box_text MONEY_BOX_TEMPLATE, 11, 0, 19, 2, MoneyText, 13, 0 text_box_text JP_AH_MENU_TEMPLATE, 7, 6, 11, 10, BuySellQuitText, 8, 8 text_box_text JP_POKEDEX_MENU_TEMPLATE, 11, 8, 19, 17, BuySellQuitText, 12, 10 |