diff options
Diffstat (limited to 'engine')
| -rwxr-xr-x | engine/debug.asm | 2 | ||||
| -rw-r--r-- | engine/link_2.asm | 2 | ||||
| -rwxr-xr-x | engine/link_trade.asm | 2 | ||||
| -rw-r--r-- | engine/load_font.asm | 8 | ||||
| -rw-r--r-- | engine/routines/checknickerrors.asm | 14 |
5 files changed, 14 insertions, 14 deletions
diff --git a/engine/debug.asm b/engine/debug.asm index dcfb1b4cf..f58891987 100755 --- a/engine/debug.asm +++ b/engine/debug.asm @@ -384,7 +384,7 @@ Function81adb: ; 81adb ret ; 81baf -String_81baf: db "レアぅぅ@" ; rare (shiny) +String_81baf: db "レア", DEBUGTEST_BLACK, DEBUGTEST_BLACK, "@" ; rare (shiny) String_81bb4: db "ノーマル@" ; normal String_81bb9: db DEBUGTEST_A, "きりかえ▶@" ; (A) switches ; 81bc0 diff --git a/engine/link_2.asm b/engine/link_2.asm index 7923f9c9d..866126cd2 100644 --- a/engine/link_2.asm +++ b/engine/link_2.asm @@ -56,7 +56,7 @@ LinkTextbox2: ; 4d35b .PlaceBorder: ; 4d37e push hl - ld a, "ぁ" ; $76 + ld a, $76 ld [hli], a inc a call .PlaceRow diff --git a/engine/link_trade.asm b/engine/link_trade.asm index 9a7a2e3d7..ae84a7beb 100755 --- a/engine/link_trade.asm +++ b/engine/link_trade.asm @@ -139,7 +139,7 @@ _LoadTradeScreenBorder: ; 16d696 LinkComms_LoadPleaseWaitTextboxBorderGFX: ; 16d69a ld de, LinkCommsBorderGFX + $30 tiles - ld hl, vTiles2 tile "ぁ" + ld hl, vTiles2 tile $76 lb bc, BANK(LinkCommsBorderGFX), 8 call Get2bpp ret diff --git a/engine/load_font.asm b/engine/load_font.asm index 3dd692968..345fa6ff6 100644 --- a/engine/load_font.asm +++ b/engine/load_font.asm @@ -56,7 +56,7 @@ _LoadFontsExtra1:: ; fb48a ld hl, vTiles2 tile "☎" ; $62 lb bc, BANK(PokegearPhoneIconGFX), 1 call Get2bpp_2 - ld de, FontExtra tile 3 + ld de, FontExtra + 3 tiles ; "<BOLD_D>" ld hl, vTiles2 tile "<BOLD_D>" lb bc, BANK(FontExtra), 22 ; "<BOLD_D>" to "ぉ" call Get2bpp_2 @@ -104,8 +104,8 @@ LoadBattleFontsHPBar: ; fb4f2 lb bc, BANK(FontBattleExtra), 12 call Get2bpp_2 ld hl, vTiles2 tile $70 - ld de, FontBattleExtra tile 16 - lb bc, BANK(FontBattleExtra), 3 ; "<ど>" to "『" + ld de, FontBattleExtra + 16 tiles ; "<DO>" + lb bc, BANK(FontBattleExtra), 3 ; "<DO>" to "『" call Get2bpp_2 call LoadFrame @@ -122,7 +122,7 @@ LoadHPBar: ; fb50d ld hl, vTiles2 tile $55 lb bc, BANK(ExpBarGFX), 9 call Get2bpp_2 - ld de, MobilePhoneTilesGFX tile 7 ; mobile phone icon + ld de, MobilePhoneTilesGFX + 7 tiles ; mobile phone icon ld hl, vTiles2 tile $5e lb bc, BANK(MobilePhoneTilesGFX), 2 call Get2bpp_2 diff --git a/engine/routines/checknickerrors.asm b/engine/routines/checknickerrors.asm index 70cc8d058..245c28586 100644 --- a/engine/routines/checknickerrors.asm +++ b/engine/routines/checknickerrors.asm @@ -64,11 +64,11 @@ CheckNickErrors:: ; 669f ; table defining which characters are actually text commands ; format: ; ≥ < - db TX_START, TX_BOX + 1 - db "<PLAY_G>", "<CTRL_18>" + 1 - db "<NI>", "<NO>" + 1 - db "<ROUTE>", "<GREEN>" + 1 - db "<ENEMY>", "<ENEMY>" + 1 - db "<MOM>", "<TM>" + 1 - db "<ROCKET>", "┘" + 1 + db TX_START, TX_BOX + 1 + db "<PLAY_G>", "<JP_18>" + 1 + db "<NI>", "<NO>" + 1 + db "<ROUTE>", "<GREEN>" + 1 + db "<ENEMY>", "<ENEMY>" + 1 + db "<MOM>", "<TM>" + 1 + db "<ROCKET>", "┘" + 1 db -1 ; end |