Use dname macro to automatically pad names with "@" characters (#1198)

This commit is contained in:
Rangi
2025-08-17 09:48:05 -04:00
committed by GitHub
parent b1f8d423a2
commit 86acbe5b55
13 changed files with 594 additions and 574 deletions

View File

@@ -1307,7 +1307,7 @@ endr
ret
String_MysteryJP:
db "なぞナゾ@@" ; MYSTERY
dname "なぞナゾ", NAME_LENGTH_JAPANESE ; "MYSTERY"
BattleTowerAction_0F:
ldh a, [rWBK]

View File

@@ -91,6 +91,6 @@ _GiveOddEgg:
ret
.Odd:
db "ODD@@@@@@@@@"
dname "ODD", MON_NAME_LENGTH + 1
INCLUDE "data/events/odd_eggs.asm"

View File

@@ -780,9 +780,9 @@ NamePlayer:
ret
.Chris:
db "CHRIS@@@@@@"
dname "CHRIS", NAME_LENGTH
.Kris:
db "KRIS@@@@@@@"
dname "KRIS", NAME_LENGTH
GSShowPlayerNamingChoices: ; unreferenced
call LoadMenuHeader

View File

@@ -1430,13 +1430,14 @@ DebugTrade: ; unreferenced
MACRO debugtrade
; species, ot name, ot id
db \1, \2
db \1
dname \2, NAME_LENGTH_JAPANESE
dw \3
ENDM
.DebugTradeData:
debugtrade VENUSAUR, "ゲーフり@@", $0123 ; GAME FREAK
debugtrade CHARIZARD, "クりーチャ@", $0456 ; Creatures Inc.
debugtrade VENUSAUR, "ゲーフり", $0123 ; GAME FREAK
debugtrade CHARIZARD, "クりーチャ", $0456 ; Creatures Inc.
TradeGameBoyTilemap: INCBIN "gfx/trade/game_boy.tilemap" ; 6x8
TradeLinkTubeTilemap: INCBIN "gfx/trade/link_cable.tilemap" ; 12x3

View File

@@ -203,7 +203,7 @@ CorrectPartyErrors: ; unreferenced
ret
.TAMAGO:
db "タマゴ@@@"
dname "タマゴ", NAME_LENGTH_JAPANESE ; "EGG"
.GetLengthOfStringWith6CharCap:
push de