diff options
Diffstat (limited to 'data')
| -rwxr-xr-x | data/credits_order.asm | 17 | ||||
| -rwxr-xr-x | data/pokedex_entries.asm | 6 | ||||
| -rwxr-xr-x | data/prizes.asm | 2 | ||||
| -rwxr-xr-x | data/trades.asm | 16 |
4 files changed, 20 insertions, 21 deletions
diff --git a/data/credits_order.asm b/data/credits_order.asm index 20b9137f..8d5b932b 100755 --- a/data/credits_order.asm +++ b/data/credits_order.asm @@ -27,13 +27,12 @@ CreditsOrder: db CRED_PRODUCERS, CRED_ISHIHARA, $FE db CRED_US_STAFF, $FD db CRED_US_COORD, CRED_TILDEN, $FD - db CRED_US_COORD, CRED_KAWAKAMI, CRED_HI_NAKAMURA, $FC - db CRED_US_COORD, CRED_GIESE, CRED_OSBORNE, $FC - db CRED_TRANS, CRED_OGASAWARA, $FD - db CRED_PROGRAMMERS, CRED_MURAKAWA, CRED_FUKUI, $FD - db CRED_SPECIAL, CRED_IWATA, $FD - db CRED_SPECIAL, CRED_HARADA, $FC - db CRED_TEST, CRED_PAAD, CRED_CLUB, $FD - db CRED_PRODUCER, CRED_IZUSHI, $FD - db CRED_EXECUTIVE, CRED_YAMAUCHI, $FF + db CRED_US_COORD, CRED_KAWAKAMI, CRED_HI_NAKAMURA, CRED_GIESE, $FC + db CRED_US_COORD, CRED_OSBORNE, CRED_TRANS, CRED_OGASAWARA, $FC + db CRED_IWATA, CRED_IZUSHI, CRED_HARADA, $FD + db CRED_PROGRAMMERS, CRED_PAAD, $40, $FD + db CRED_SPECIAL, CRED_CLUB, CRED_MURAKAWA, $FC + db $41, $42, $43, $44, $FD + db $2A, $3D, $FD + db $2B, $0C, $FF db $FB, $FF, $FA diff --git a/data/pokedex_entries.asm b/data/pokedex_entries.asm index 0ac69e5e..0fe55731 100755 --- a/data/pokedex_entries.asm +++ b/data/pokedex_entries.asm @@ -1254,6 +1254,6 @@ VictreebelDexEntry: MissingNoDexEntry: db "???@" - db 10 ; 1.0 m - db 100 ; 10.0 kg - db 0,"コメント さくせいちゅう@" ; コメント作成中 (Comment to be written) + db 10 + db 100 + db 0,"コメント さくせいちゅう@" diff --git a/data/prizes.asm b/data/prizes.asm index 1120c0d0..cc879ffb 100755 --- a/data/prizes.asm +++ b/data/prizes.asm @@ -9,7 +9,7 @@ PrizeDifferentMenuPtrs: dw PrizeMenuTMsCost NoThanksText: - db "NO THANKS@" + db "NON MERCI@" PrizeMenuMon1Entries: db ABRA diff --git a/data/trades.asm b/data/trades.asm index cf0fcbfd..2a0b6dfe 100755 --- a/data/trades.asm +++ b/data/trades.asm @@ -1,12 +1,12 @@ TradeMons: ; givemonster, getmonster, textstring, nickname (11 bytes), 14 bytes total - db NIDORINO, NIDORINA, 0,"TERRY@@@@@@" + db NIDORINO, NIDORINA, 0,"BIBICHE@@@@" db ABRA, MR_MIME, 0,"MARCEL@@@@@" db BUTTERFREE,BEEDRILL, 2,"CHIKUCHIKU@" - db PONYTA, SEEL, 0,"SAILOR@@@@@" - db SPEAROW, FARFETCHD,2,"DUX@@@@@@@@" - db SLOWBRO, LICKITUNG,0,"MARC@@@@@@@" - db POLIWHIRL, JYNX, 1,"LOLA@@@@@@@" - db RAICHU, ELECTRODE,1,"DORIS@@@@@@" - db VENONAT, TANGELA, 2,"CRINKLES@@@" - db NIDORAN_M, NIDORAN_F,2,"SPOT@@@@@@@" + db PONYTA, SEEL, 0,"BIBI@@@@@@@" + db SPEAROW, FARFETCHD,2,"JULIO@@@@@@" + db SLOWBRO, LICKITUNG,0,"GLAVIOTEUR@" + db POLIWHIRL, JYNX, 1,"NINI@@@@@@@" + db RAICHU, ELECTRODE,1,"KOURJUS@@@@" + db VENONAT, TANGELA, 2,"BIGOUDI@@@@" + db NIDORAN_M, NIDORAN_F,2,"FABI@@@@@@@" |