pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-11-16 11:27:33 -08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #139 from iimarckus/peecee

Browse Source 
PC stuff
This commit is contained in:
Bryan Bishop 2013-05-22 00:15:06 -07:00
commit dff781c057
5 changed files with 1207 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compare.sh
View File

@ -1,4 +1,4 @@
#!/bin/bash #!/bin/sh
# Compares baserom.gbc and pokecrystal.gbc # Compares baserom.gbc and pokecrystal.gbc
# create baserom.txt if necessary # create baserom.txt if necessary

9
constants.asm
View File

@ -3214,6 +3214,15 @@ MYSTERY_GIFT EQU 3
MOBILE EQU 4 MOBILE EQU 4
MOBILE_STUDIUM EQU 5 MOBILE_STUDIUM EQU 5
; kris's pc menu items
WITHDRAW_ITEM EQU 0
DEPOSIT_ITEM EQU 1
TOSS_ITEM EQU 2
MAIL_BOX EQU 3
DECORATION EQU 4
TURN_OFF EQU 5
LOG_OFF EQU 6
; name length ; name length
PLAYER_NAME_LENGTH EQU 8 PLAYER_NAME_LENGTH EQU 8
PKMN_NAME_LENGTH EQU 11 PKMN_NAME_LENGTH EQU 11

1168
main.asm
View File

File diff suppressed because it is too large Load Diff

72
text/common_2.asm
View File

@ -863,36 +863,36 @@ UnknownText_0x1c0ec6: ; 1c0ec6
db $0, ".", $58 db $0, ".", $58
; 1c0ee3 ; 1c0ee3
UnknownText_0x1c0ee3: ; 1c0ee3 _EmptyMailboxText: ; 1c0ee3
db $0, "There's no MAIL", $4f db $0, "There's no MAIL", $4f
db "here.", $58 db "here.", $58
; 1c0ef9 ; 1c0ef9
UnknownText_0x1c0ef9: ; 1c0ef9 ClearedMailPutAwayText: ; 1c0ef9
db $0, "The cleared MAIL", $4f db $0, "The cleared MAIL", $4f
db "was put away.", $58 db "was put away.", $58
; 1c0f19 ; 1c0f19
UnknownText_0x1c0f19: ; 1c0f19 MailPackFullText: ; 1c0f19
db $0, "The PACK is full.", $58 db $0, "The PACK is full.", $58
; 1c0f2c ; 1c0f2c
UnknownText_0x1c0f2c: ; 1c0f2c MailMessageLostText: ; 1c0f2c
db $0, "The MAIL's message", $4f db $0, "The MAIL's message", $4f
db "will be lost. OK?", $57 db "will be lost. OK?", $57
; 1c0f51 ; 1c0f51
UnknownText_0x1c0f51: ; 1c0f51 MailAlreadyHoldingItemText: ; 1c0f51
db $0, "It's already hold-", $4f db $0, "It's already hold-", $4f
db "ing an item.", $58 db "ing an item.", $58
; 1c0f71 ; 1c0f71
UnknownText_0x1c0f71: ; 1c0f71 MailEggText: ; 1c0f71
db $0, "An EGG can't hold", $4f db $0, "An EGG can't hold", $4f
db "any MAIL.", $58 db "any MAIL.", $58
; 1c0f8d ; 1c0f8d
UnknownText_0x1c0f8d: ; 1c0f8d MailMovedFromBoxText: ; 1c0f8d
db $0, "The MAIL was moved", $4f db $0, "The MAIL was moved", $4f
db "from the MAILBOX.", $58 db "from the MAILBOX.", $58
; 1c0fb3 ; 1c0fb3
@ -1108,12 +1108,12 @@ UnknownText_0x1c1368: ; 1c1368
db "to do?", $57 db "to do?", $57
; 1c1381 ; 1c1381
UnknownText_0x1c1381: ; 1c1381 _KrissPCHowManyWithdrawText: ; 1c1381
db $0, "How many do you", $4f db $0, "How many do you", $4f
db "want to withdraw?", $57 db "want to withdraw?", $57
; 1c13a4 ; 1c13a4
UnknownText_0x1c13a4: ; 1c13a4 _KrissPCWithdrewItemsText: ; 1c13a4
db $0, "Withdrew @" db $0, "Withdrew @"
deciram $d10c, $12 deciram $d10c, $12
db $0, $4f db $0, $4f
@ -1122,7 +1122,7 @@ UnknownText_0x1c13a4: ; 1c13a4
db $0, "(S).", $58 db $0, "(S).", $58
; 1c13bf ; 1c13bf
UnknownText_0x1c13bf: ; 1c13bf _KrissPCNoRoomWithdrawText: ; 1c13bf
db $0, "There's no room", $4f db $0, "There's no room", $4f
db "for more items.", $58 db "for more items.", $58
; 1c13df ; 1c13df
@ -1131,12 +1131,12 @@ UnknownText_0x1c13df: ; 1c13df
db $0, "No items here!", $58 db $0, "No items here!", $58
; 1c13ef ; 1c13ef
UnknownText_0x1c13ef: ; 1c13ef _KrissPCHowManyDepositText: ; 1c13ef
db $0, "How many do you", $4f db $0, "How many do you", $4f
db "want to deposit?", $57 db "want to deposit?", $57
; 1c1411 ; 1c1411
UnknownText_0x1c1411: ; 1c1411 _KrissPCDepositItemsText: ; 1c1411
db $0, "Deposited @" db $0, "Deposited @"
deciram $d10c, $12 deciram $d10c, $12
db $0, $4f db $0, $4f
@ -1145,7 +1145,7 @@ UnknownText_0x1c1411: ; 1c1411
db $0, "(S).", $58 db $0, "(S).", $58
; 1c142d ; 1c142d
UnknownText_0x1c142d: ; 1c142d _KrissPCNoRoomDepositText: ; 1c142d
db $0, "There's no room to", $4f db $0, "There's no room to", $4f
db "store items.", $58 db "store items.", $58
; 1c144d ; 1c144d
@ -1184,17 +1184,17 @@ UnknownText_0x1c1505: ; 1c1505
db "Link closed…", $57 db "Link closed…", $57
; 1c1515 ; 1c1515
UnknownText_0x1c1515: ; 1c1515 _OakPCText1: ; 1c1515
db $0, "Want to get your", $4f db $0, "Want to get your", $4f
db "#DEX rated?", $57 db "#DEX rated?", $57
; 1c1533 ; 1c1533
UnknownText_0x1c1533: ; 1c1533 _OakPCText2: ; 1c1533
db $0, "Current #DEX", $4f db $0, "Current #DEX", $4f
db "completion level:", $58 db "completion level:", $58
; 1c1553 ; 1c1553
UnknownText_0x1c1553: ; 1c1553 _OakPCText3: ; 1c1553
text_from_ram $d099 text_from_ram $d099
db $0, " #MON seen", $4f db $0, " #MON seen", $4f
db "@" db "@"
@ -1204,133 +1204,133 @@ UnknownText_0x1c1553: ; 1c1553
db "Rating:", $57 db "Rating:", $57
; 1c1585 ; 1c1585
UnknownText_0x1c1585: ; 1c1585 _OakRating01: ; 1c1585
db $0, "Look for #MON", $4f db $0, "Look for #MON", $4f
db "in grassy areas!", $57 db "in grassy areas!", $57
; 1c15a5 ; 1c15a5
UnknownText_0x1c15a5: ; 1c15a5 _OakRating02: ; 1c15a5
db $0, "Good. I see you", $4f db $0, "Good. I see you", $4f
db "understand how to", $55 db "understand how to", $55
db "use # BALLS.", $57 db "use # BALLS.", $57
; 1c15d5 ; 1c15d5
UnknownText_0x1c15d5: ; 1c15d5 _OakRating03: ; 1c15d5
db $0, "You're getting", $4f db $0, "You're getting", $4f
db "good at this.", $51 db "good at this.", $51
db "But you have a", $4f db "But you have a", $4f
db "long way to go.", $57 db "long way to go.", $57
; 1c1611 ; 1c1611
UnknownText_0x1c1611: ; 1c1611 _OakRating04: ; 1c1611
db $0, "You need to fill", $4f db $0, "You need to fill", $4f
db "up the #DEX.", $51 db "up the #DEX.", $51
db "Catch different", $4f db "Catch different", $4f
db "kinds of #MON!", $57 db "kinds of #MON!", $57
; 1c164f ; 1c164f
UnknownText_0x1c164f: ; 1c164f _OakRating05: ; 1c164f
db $0, "You're trying--I", $4f db $0, "You're trying--I", $4f
db "can see that.", $51 db "can see that.", $51
db "Your #DEX is", $4f db "Your #DEX is", $4f
db "coming together.", $57 db "coming together.", $57
; 1c168c ; 1c168c
UnknownText_0x1c168c: ; 1c168c _OakRating06: ; 1c168c
db $0, "To evolve, some", $4f db $0, "To evolve, some", $4f
db "#MON grow,", $51 db "#MON grow,", $51
db "others use the", $4f db "others use the", $4f
db "effects of STONES.", $57 db "effects of STONES.", $57
; 1c16ca ; 1c16ca
UnknownText_0x1c16ca: ; 1c16ca _OakRating07: ; 1c16ca
db $0, "Have you gotten a", $4f db $0, "Have you gotten a", $4f
db "fishing ROD? You", $51 db "fishing ROD? You", $51
db "can catch #MON", $4f db "can catch #MON", $4f
db "by fishing.", $57 db "by fishing.", $57
; 1c1709 ; 1c1709
UnknownText_0x1c1709: ; 1c1709 _OakRating08: ; 1c1709
db $0, "Excellent! You", $4f db $0, "Excellent! You", $4f
db "seem to like col-", $55 db "seem to like col-", $55
db "lecting things!", $57 db "lecting things!", $57
; 1c173b ; 1c173b
UnknownText_0x1c173b: ; 1c173b _OakRating09: ; 1c173b
db $0, "Some #MON only", $4f db $0, "Some #MON only", $4f
db "appear during", $51 db "appear during", $51
db "certain times of", $4f db "certain times of", $4f
db "the day.", $57 db "the day.", $57
; 1c1773 ; 1c1773
UnknownText_0x1c1773: ; 1c1773 _OakRating10: ; 1c1773
db $0, "Your #DEX is", $4f db $0, "Your #DEX is", $4f
db "filling up. Keep", $55 db "filling up. Keep", $55
db "up the good work!", $57 db "up the good work!", $57
; 1c17a4 ; 1c17a4
UnknownText_0x1c17a4: ; 1c17a4 _OakRating11: ; 1c17a4
db $0, "I'm impressed.", $4f db $0, "I'm impressed.", $4f
db "You're evolving", $51 db "You're evolving", $51
db "#MON, not just", $4f db "#MON, not just", $4f
db "catching them.", $57 db "catching them.", $57
; 1c17e0 ; 1c17e0
UnknownText_0x1c17e0: ; 1c17e0 _OakRating12: ; 1c17e0
db $0, "Have you met KURT?", $4f db $0, "Have you met KURT?", $4f
db "His custom BALLS", $55 db "His custom BALLS", $55
db "should help.", $57 db "should help.", $57
; 1c1812 ; 1c1812
UnknownText_0x1c1812: ; 1c1812 _OakRating13: ; 1c1812
db $0, "Wow. You've found", $4f db $0, "Wow. You've found", $4f
db "more #MON than", $51 db "more #MON than", $51
db "the last #DEX", $4f db "the last #DEX", $4f
db "research project.", $57 db "research project.", $57
; 1c1853 ; 1c1853
UnknownText_0x1c1853: ; 1c1853 _OakRating14: ; 1c1853
db $0, "Are you trading", $4f db $0, "Are you trading", $4f
db "your #MON?", $51 db "your #MON?", $51
db "It's tough to do", $4f db "It's tough to do", $4f
db "this alone!", $57 db "this alone!", $57
; 1c188b ; 1c188b
UnknownText_0x1c188b: ; 1c188b _OakRating15: ; 1c188b
db $0, "Wow! You've hit", $4f db $0, "Wow! You've hit", $4f
db "200! Your #DEX", $55 db "200! Your #DEX", $55
db "is looking great!", $57 db "is looking great!", $57
; 1c18bc ; 1c18bc
UnknownText_0x1c18bc: ; 1c18bc _OakRating16: ; 1c18bc
db $0, "You've found so", $4f db $0, "You've found so", $4f
db "many #MON!", $51 db "many #MON!", $51
db "You've really", $4f db "You've really", $4f
db "helped my studies!", $57 db "helped my studies!", $57
; 1c18f7 ; 1c18f7
UnknownText_0x1c18f7: ; 1c18f7 _OakRating17: ; 1c18f7
db $0, "Magnificent! You", $4f db $0, "Magnificent! You", $4f
db "could become a", $51 db "could become a", $51
db "#MON professor", $4f db "#MON professor", $4f
db "right now!", $57 db "right now!", $57
; 1c1932 ; 1c1932
UnknownText_0x1c1932: ; 1c1932 _OakRating18: ; 1c1932
db $0, "Your #DEX is", $4f db $0, "Your #DEX is", $4f
db "amazing! You're", $51 db "amazing! You're", $51
db "ready to turn", $4f db "ready to turn", $4f
db "professional!", $57 db "professional!", $57
; 1c196b ; 1c196b
UnknownText_0x1c196b: ; 1c196b _OakRating19: ; 1c196b
db $0, "Whoa! A perfect", $4f db $0, "Whoa! A perfect", $4f
db "#DEX! I've", $51 db "#DEX! I've", $51
db "dreamt about this!", $4f db "dreamt about this!", $4f
db "Congratulations!", $57 db "Congratulations!", $57
; 1c19aa ; 1c19aa
UnknownText_0x1c19aa: ; 1c19aa _OakPCText4: ; 1c19aa
db $0, "The link to PROF.", $4f db $0, "The link to PROF.", $4f
db "OAK's PC closed.", $57 db "OAK's PC closed.", $57
; 1c19cd ; 1c19cd

6
wram.asm
View File

@ -918,8 +918,10 @@ StringBuffer2: ; d086
ds 19 ds 19
StringBuffer3: ; d099 StringBuffer3: ; d099
ds 19 ds 19
StringBuffer4: ; d0ac
ds 19
ds 40 ds 21
CurBattleMon: ; d0d4 CurBattleMon: ; d0d4
ds 1 ds 1
@ -1811,8 +1813,10 @@ PartyMon6Nickname: ; de78
SECTION "Pokedex",BSS[$de99] SECTION "Pokedex",BSS[$de99]
PokedexSeen: ; de99 PokedexSeen: ; de99
ds 32 ds 32
EndPokedexSeen:
PokedexCaught: ; deb9 PokedexCaught: ; deb9
ds 32 ds 32
EndPokedexCaught:
UnownDex: ; ded9 UnownDex: ; ded9
ds 26 ds 26
UnlockedUnowns: ; def3 UnlockedUnowns: ; def3