summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorLogan <log.butt@gmail.com>2016-06-01 19:00:41 +1200
committerLogan <log.butt@gmail.com>2016-06-01 19:00:41 +1200
commitdfa7040a4b75284069a62590b747101448e7c3be (patch)
treea0d6fe1b018a28cd353fced8a448c7642de0be82 /data
parentd0107462a3cbb0d6b19e96f4675d3e582dd713cb (diff)
More disasm
Diffstat (limited to 'data')
-rwxr-xr-xdata/credits_order.asm17
-rwxr-xr-xdata/prizes.asm2
-rwxr-xr-xdata/trades.asm16
3 files changed, 17 insertions, 18 deletions
diff --git a/data/credits_order.asm b/data/credits_order.asm
index 5a71a26a..ea15e140 100755
--- a/data/credits_order.asm
+++ b/data/credits_order.asm
@@ -27,13 +27,12 @@ CreditsOrder: ; 74243 (1d:4243)
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/prizes.asm b/data/prizes.asm
index 3d4102b6..66bf3301 100755
--- a/data/prizes.asm
+++ b/data/prizes.asm
@@ -9,7 +9,7 @@ PrizeDifferentMenuPtrs: ; 52843 (14:6843)
dw PrizeMenuTMsCost
NoThanksText: ; 5284f (14:684f)
- db "NO THANKS@"
+ db "NON MERCI@"
PrizeMenuMon1Entries: ; 52859 (14:6859)
db ABRA
diff --git a/data/trades.asm b/data/trades.asm
index e7f71233..5ffb4e3e 100755
--- a/data/trades.asm
+++ b/data/trades.asm
@@ -1,12 +1,12 @@
TradeMons: ; 71b7b (1c:5b7b)
; 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@@@@@@@"