Remove even more address comments

That should be all of them this time
This commit is contained in:
mid-kid
2018-06-25 02:10:37 +02:00
parent 0cbe04da44
commit 5efce10789
698 changed files with 2243 additions and 4185 deletions

View File

@@ -1,743 +1,623 @@
BattleTowerText_0x1ec000: ; 0x1ec000
BattleTowerText_0x1ec000:
text "Hello, glad to"
line "meet you!"
para "I do hope we have"
line "a good battle."
done
; 0x1ec03b
BattleTowerText_0x1ec03b: ; 0x1ec03b
BattleTowerText_0x1ec03b:
text "Thank you! A most"
line "enjoyable battle!"
done
; 0x1ec060
UnknownText_0x1ec060: ; 0x1ec060
UnknownText_0x1ec060:
text "Thank you. You are"
line "formidable."
done
; 0x1ec080
BattleTowerText_0x1ec080: ; 0x1ec080
BattleTowerText_0x1ec080:
text "Work, work, work…"
line "I'm always busy!"
done
; 0x1ec0a3
UnknownText_0x1ec0a3: ; 0x1ec0a3
UnknownText_0x1ec0a3:
text "But, I work hard"
line "in battle too!"
done
; 0x1ec0c4
UnknownText_0x1ec0c4: ; 0x1ec0c4
UnknownText_0x1ec0c4:
text "I'm too busy to be"
line "battling!"
done
; 0x1ec0e1
UnknownText_0x1ec0e1: ; 0x1ec0e1
UnknownText_0x1ec0e1:
text "Brace yourself for"
line "my all-out attack!"
done
; 0x1ec108
UnknownText_0x1ec108: ; 0x1ec108
UnknownText_0x1ec108:
text "What a cakewalk!"
line "You're too easy!"
done
; 0x1ec12a
UnknownText_0x1ec12a: ; 0x1ec12a
UnknownText_0x1ec12a:
text "I won't lose next"
line "time, all right?"
done
; 0x1ec14d
UnknownText_0x1ec14d: ; 0x1ec14d
UnknownText_0x1ec14d:
text "Heh, your #MON"
line "look pretty cool."
done
; 0x1ec16f
UnknownText_0x1ec16f: ; 0x1ec16f
UnknownText_0x1ec16f:
text "Hey, hey, no way!"
line "You won't win!"
done
; 0x1ec190
UnknownText_0x1ec190: ; 0x1ec190
UnknownText_0x1ec190:
text "You serious?"
line "This is brutal!"
done
; 0x1ec1ae
UnknownText_0x1ec1ae: ; 0x1ec1ae
UnknownText_0x1ec1ae:
text "#MON every day!"
line "I love battling!"
done
; 0x1ec1d0
UnknownText_0x1ec1d0: ; 0x1ec1d0
UnknownText_0x1ec1d0:
text "I'm on top of my"
line "game, but not you!"
done
; 0x1ec1f4
UnknownText_0x1ec1f4: ; 0x1ec1f4
UnknownText_0x1ec1f4:
text "I don't care that"
line "I lost, really!"
done
; 0x1ec216
UnknownText_0x1ec216: ; 0x1ec216
UnknownText_0x1ec216:
text "Hi, there! Let's"
line "keep this clean!"
done
; 0x1ec238
UnknownText_0x1ec238: ; 0x1ec238
UnknownText_0x1ec238:
text "Whoops, sorry for"
line "that wipeout!"
done
; 0x1ec259
UnknownText_0x1ec259: ; 0x1ec259
UnknownText_0x1ec259:
text "Whoops! Come on,"
line "let me win one!"
done
; 0x1ec27b
UnknownText_0x1ec27b: ; 0x1ec27b
UnknownText_0x1ec27b:
text "Do you want to see"
line "my battle level?"
done
; 0x1ec2a0
UnknownText_0x1ec2a0: ; 0x1ec2a0
UnknownText_0x1ec2a0:
text "Hehehe, I know"
line "your level now!"
done
; 0x1ec2c0
UnknownText_0x1ec2c0: ; 0x1ec2c0
UnknownText_0x1ec2c0:
text "Ouch… I'm just too"
line "weak…"
done
; 0x1ec2d9
UnknownText_0x1ec2d9: ; 0x1ec2d9
UnknownText_0x1ec2d9:
text "Hey, let's battle."
line "I'm your opponent."
done
; 0x1ec2fe
UnknownText_0x1ec2fe: ; 0x1ec2fe
UnknownText_0x1ec2fe:
text "Wow, you're not"
line "serious about it!"
done
; 0x1ec320
UnknownText_0x1ec320: ; 0x1ec320
UnknownText_0x1ec320:
text "…Urgh… Nothing"
line "positive here…"
done
; 0x1ec33f
UnknownText_0x1ec33f: ; 0x1ec33f
UnknownText_0x1ec33f:
text "I'm your"
line "opponent."
para "Get ready to be"
line "hammered."
done
; 0x1ec36c
UnknownText_0x1ec36c: ; 0x1ec36c
UnknownText_0x1ec36c:
text "Hahah! That was a"
line "pushover!"
done
; 0x1ec389
UnknownText_0x1ec389: ; 0x1ec389
UnknownText_0x1ec389:
text "No way! There has"
line "to be a mistake!"
done
; 0x1ec3ad
UnknownText_0x1ec3ad: ; 0x1ec3ad
UnknownText_0x1ec3ad:
text "Hah!"
line "Let's get rolling!"
done
; 0x1ec3c5
UnknownText_0x1ec3c5: ; 0x1ec3c5
UnknownText_0x1ec3c5:
text "Wahahaha! Didn't"
line "break a sweat!"
done
; 0x1ec3e5
UnknownText_0x1ec3e5: ; 0x1ec3e5
UnknownText_0x1ec3e5:
text "Tough! I'm no"
line "match for you!"
done
; 0x1ec402
UnknownText_0x1ec402: ; 0x1ec402
UnknownText_0x1ec402:
text "<……><……><……>"
line "<……><……>Battle?"
done
; 0x1ec411
UnknownText_0x1ec411: ; 0x1ec411
UnknownText_0x1ec411:
text "<……><……><……>"
line "<……><……>I won?"
done
; 0x1ec41f
UnknownText_0x1ec41f: ; 0x1ec41f
UnknownText_0x1ec41f:
text "<……><……><……>"
line "<……><……>I lost?"
done
; 0x1ec42e
UnknownText_0x1ec42e: ; 0x1ec42e
UnknownText_0x1ec42e:
text "You want to be a"
line "leader?"
para "Let me battle you,"
line "then!"
done
; 0x1ec461
UnknownText_0x1ec461: ; 0x1ec461
UnknownText_0x1ec461:
text "You need another"
line "ten years of"
para "training to get"
line "better, I'd say."
done
; 0x1ec4a0
UnknownText_0x1ec4a0: ; 0x1ec4a0
UnknownText_0x1ec4a0:
text "You're incredibly"
line "talented."
para "No one can touch"
line "you now!"
done
; 0x1ec4d6
UnknownText_0x1ec4d6: ; 0x1ec4d6
UnknownText_0x1ec4d6:
text "Today, I'm going"
line "to whomp you."
done
; 0x1ec4f5
UnknownText_0x1ec4f5: ; 0x1ec4f5
UnknownText_0x1ec4f5:
text "I knew I'd win."
line "I'm so great!"
done
; 0x1ec512
UnknownText_0x1ec512: ; 0x1ec512
UnknownText_0x1ec512:
text "Uh? My plans are"
line "out of whack…"
done
; 0x1ec532
UnknownText_0x1ec532: ; 0x1ec532
UnknownText_0x1ec532:
text "I bet you can't"
line "beat me!"
done
; 0x1ec54b
UnknownText_0x1ec54b: ; 0x1ec54b
UnknownText_0x1ec54b:
text "Those #MON"
line "aren't enough!"
done
; 0x1ec565
UnknownText_0x1ec565: ; 0x1ec565
UnknownText_0x1ec565:
text "I want your"
line "#MON. Please?"
done
; 0x1ec580
UnknownText_0x1ec580: ; 0x1ec580
UnknownText_0x1ec580:
text "I'll show you a"
line "real battle!"
done
; 0x1ec59d
UnknownText_0x1ec59d: ; 0x1ec59d
UnknownText_0x1ec59d:
text "This battle…"
line "I'm bored!"
done
; 0x1ec5b5
UnknownText_0x1ec5b5: ; 0x1ec5b5
UnknownText_0x1ec5b5:
text "…I won't turn tail"
line "in battle!"
done
; 0x1ec5d3
UnknownText_0x1ec5d3: ; 0x1ec5d3
UnknownText_0x1ec5d3:
text "Let's go!"
line "No holds barred!"
done
; 0x1ec5ee
UnknownText_0x1ec5ee: ; 0x1ec5ee
UnknownText_0x1ec5ee:
text "Sorry! I wanted"
line "the win more!"
done
; 0x1ec60d
UnknownText_0x1ec60d: ; 0x1ec60d
UnknownText_0x1ec60d:
text "Wahah! Congrats!"
line "I can't do better!"
done
; 0x1ec631
UnknownText_0x1ec631: ; 0x1ec631
UnknownText_0x1ec631:
text "My #MON skills"
line "are phenomenal!"
done
; 0x1ec651
UnknownText_0x1ec651: ; 0x1ec651
UnknownText_0x1ec651:
text "You've got a long"
line "way to go."
para "Well, keep trying!"
line "Best of luck!"
done
; 0x1ec68f
UnknownText_0x1ec68f: ; 0x1ec68f
UnknownText_0x1ec68f:
text "Aww… Don't lose"
line "after beating me."
done
; 0x1ec6b1
UnknownText_0x1ec6b1: ; 0x1ec6b1
UnknownText_0x1ec6b1:
text "Who are you?"
line "I don't know you…"
done
; 0x1ec6d0
UnknownText_0x1ec6d0: ; 0x1ec6d0
UnknownText_0x1ec6d0:
text "I must've imagined"
line "that."
para "There seems to be"
line "no one here…"
done
; 0x1ec708
UnknownText_0x1ec708: ; 0x1ec708
UnknownText_0x1ec708:
text "Who am I?"
line "I don't know…"
done
; 0x1ec720
UnknownText_0x1ec720: ; 0x1ec720
UnknownText_0x1ec720:
text "Um… Are you that…"
line "um…person?"
done
; 0x1ec73e
UnknownText_0x1ec73e: ; 0x1ec73e
UnknownText_0x1ec73e:
text "It doesn't appear"
line "to be you…"
done
; 0x1ec75b
UnknownText_0x1ec75b: ; 0x1ec75b
UnknownText_0x1ec75b:
text "Then you really"
line "are the legendary…"
done
; 0x1ec77f
UnknownText_0x1ec77f: ; 0x1ec77f
UnknownText_0x1ec77f:
text "I heard that"
line "you're hot!"
done
; 0x1ec798
UnknownText_0x1ec798: ; 0x1ec798
UnknownText_0x1ec798:
text "Not bad. I was"
line "just a bit better."
done
; 0x1ec7bb
UnknownText_0x1ec7bb: ; 0x1ec7bb
UnknownText_0x1ec7bb:
text "Eh, you're not"
line "that special."
done
; 0x1ec7d8
UnknownText_0x1ec7d8: ; 0x1ec7d8
UnknownText_0x1ec7d8:
text "I'm scared about"
line "what might happen."
para "My #MON are way"
line "too strong."
done
; 0x1ec818
UnknownText_0x1ec818: ; 0x1ec818
UnknownText_0x1ec818:
text "See? My #MON"
line "were too strong."
done
; 0x1ec837
UnknownText_0x1ec837: ; 0x1ec837
UnknownText_0x1ec837:
text "Graa! My #MON"
line "were total wimps!"
done
; 0x1ec858
UnknownText_0x1ec858: ; 0x1ec858
UnknownText_0x1ec858:
text "Hey, there!"
line "I'll take you on!"
done
; 0x1ec876
UnknownText_0x1ec876: ; 0x1ec876
UnknownText_0x1ec876:
text "Don't you have a"
line "better strategy?"
done
; 0x1ec898
UnknownText_0x1ec898: ; 0x1ec898
UnknownText_0x1ec898:
text "You've got decent"
line "style!"
done
; 0x1ec8b1
UnknownText_0x1ec8b1: ; 0x1ec8b1
UnknownText_0x1ec8b1:
text "I wonder if I can"
line "battle properly…"
done
; 0x1ec8d5
UnknownText_0x1ec8d5: ; 0x1ec8d5
UnknownText_0x1ec8d5:
text "Um… Sorry…"
line "I think I won."
done
; 0x1ec8f0
UnknownText_0x1ec8f0: ; 0x1ec8f0
UnknownText_0x1ec8f0:
text "I guess I'm not"
line "good enough yet…"
done
; 0x1ec911
UnknownText_0x1ec911: ; 0x1ec911
UnknownText_0x1ec911:
text "Wrrooar!"
line "I won't lose!"
done
; 0x1ec928
UnknownText_0x1ec928: ; 0x1ec928
UnknownText_0x1ec928:
text "Wrrooar! I knew"
line "I was a genius!"
done
; 0x1ec949
UnknownText_0x1ec949: ; 0x1ec949
UnknownText_0x1ec949:
text "Arrooh! I hate it"
line "when I lose!"
done
; 0x1ec969
UnknownText_0x1ec969: ; 0x1ec969
UnknownText_0x1ec969:
text "Sorry, but I'm"
line "going to win."
done
; 0x1ec986
UnknownText_0x1ec986: ; 0x1ec986
UnknownText_0x1ec986:
text "Yeah! My #MON"
line "rule!"
done
; 0x1ec99b
UnknownText_0x1ec99b: ; 0x1ec99b
UnknownText_0x1ec99b:
text "Oh, close! I lost"
line "by just a bit!"
done
; 0x1ec9bd
UnknownText_0x1ec9bd: ; 0x1ec9bd
UnknownText_0x1ec9bd:
text "OK, I'm not"
line "fooling around!"
done
; 0x1ec9d9
UnknownText_0x1ec9d9: ; 0x1ec9d9
UnknownText_0x1ec9d9:
text "Yay! Too easy!"
line "Like, no way!"
done
; 0x1ec9f7
UnknownText_0x1ec9f7: ; 0x1ec9f7
UnknownText_0x1ec9f7:
text "No!"
line "Like, no way!"
done
; 0x1eca0a
UnknownText_0x1eca0a: ; 0x1eca0a
UnknownText_0x1eca0a:
text "Look! My #MON"
line "are really cute!"
done
; 0x1eca2a
UnknownText_0x1eca2a: ; 0x1eca2a
UnknownText_0x1eca2a:
text "Aren't they really"
line "adorable?"
done
; 0x1eca47
UnknownText_0x1eca47: ; 0x1eca47
UnknownText_0x1eca47:
text "I'm sorry, it's"
line "all my fault!"
done
; 0x1eca64
UnknownText_0x1eca64: ; 0x1eca64
UnknownText_0x1eca64:
text "Let's get our"
line "battle started!"
done
; 0x1eca82
UnknownText_0x1eca82: ; 0x1eca82
UnknownText_0x1eca82:
text "Was I too strong"
line "for you?"
done
; 0x1eca9d
UnknownText_0x1eca9d: ; 0x1eca9d
UnknownText_0x1eca9d:
text "Ooh, you're in a"
line "different class."
done
; 0x1ecabf
UnknownText_0x1ecabf: ; 0x1ecabf
UnknownText_0x1ecabf:
text "Are we going to"
line "battle? Let's!"
done
; 0x1ecade
UnknownText_0x1ecade: ; 0x1ecade
UnknownText_0x1ecade:
text "Oh, you're too"
line "weak. Shame."
done
; 0x1ecafa
UnknownText_0x1ecafa: ; 0x1ecafa
UnknownText_0x1ecafa:
text "Wow! Are you quite"
line "satisfied?"
done
; 0x1ecb19
UnknownText_0x1ecb19: ; 0x1ecb19
UnknownText_0x1ecb19:
text "Oh, you have some"
line "rare #MON."
done
; 0x1ecb37
UnknownText_0x1ecb37: ; 0x1ecb37
UnknownText_0x1ecb37:
text "May I have one of"
line "your #MON?"
done
; 0x1ecb55
UnknownText_0x1ecb55: ; 0x1ecb55
UnknownText_0x1ecb55:
text "…I want one of"
line "your #MON."
done
; 0x1ecb70
UnknownText_0x1ecb70: ; 0x1ecb70
UnknownText_0x1ecb70:
text "Want to hear about"
line "my cute #MON?"
done
; 0x1ecb92
UnknownText_0x1ecb92: ; 0x1ecb92
UnknownText_0x1ecb92:
text "What do you think"
line "about my cuties?"
done
; 0x1ecbb6
UnknownText_0x1ecbb6: ; 0x1ecbb6
UnknownText_0x1ecbb6:
text "Oh! My! You're a"
line "dreadful trainer!"
done
; 0x1ecbd9
UnknownText_0x1ecbd9: ; 0x1ecbd9
UnknownText_0x1ecbd9:
text "Battle? Sure!"
line "Right now!"
done
; 0x1ecbf3
UnknownText_0x1ecbf3: ; 0x1ecbf3
UnknownText_0x1ecbf3:
text "Oh, I love it!"
line "Battling is wild!"
done
; 0x1ecc15
UnknownText_0x1ecc15: ; 0x1ecc15
UnknownText_0x1ecc15:
text "Oh, how rude! Wait"
line "till next time!"
done
; 0x1ecc39
UnknownText_0x1ecc39: ; 0x1ecc39
UnknownText_0x1ecc39:
text "Please let me win!"
line "Please?"
done
; 0x1ecc55
UnknownText_0x1ecc55: ; 0x1ecc55
UnknownText_0x1ecc55:
text "Wow, thank you!"
line "You're so nice!"
done
; 0x1ecc75
UnknownText_0x1ecc75: ; 0x1ecc75
UnknownText_0x1ecc75:
text "You're mean!"
line "I hate meanies!"
done
; 0x1ecc92
UnknownText_0x1ecc92: ; 0x1ecc92
UnknownText_0x1ecc92:
text "Well, can we"
line "begin?"
done
; 0x1ecca7
UnknownText_0x1ecca7: ; 0x1ecca7
UnknownText_0x1ecca7:
text "Well, I beg your"
line "pardon…"
done
; 0x1eccc1
UnknownText_0x1eccc1: ; 0x1eccc1
UnknownText_0x1eccc1:
text "Sob… That's not"
line "fair!"
done
; 0x1eccd7
UnknownText_0x1eccd7: ; 0x1eccd7
UnknownText_0x1eccd7:
text "I'm good!"
line "You can't win."
done
; 0x1eccef
UnknownText_0x1eccef: ; 0x1eccef
UnknownText_0x1eccef:
text "Giving up? You're"
line "pretty weak!"
done
; 0x1ecd0e
UnknownText_0x1ecd0e: ; 0x1ecd0e
UnknownText_0x1ecd0e:
text "I won't accept"
line "this… No way!"
done
; 0x1ecd2b
UnknownText_0x1ecd2b: ; 0x1ecd2b
UnknownText_0x1ecd2b:
text "Are you treating"
line "this seriously?"
done
; 0x1ecd4d
UnknownText_0x1ecd4d: ; 0x1ecd4d
UnknownText_0x1ecd4d:
text "Oh, sorry! Looks"
line "like I won!"
done
; 0x1ecd6b
UnknownText_0x1ecd6b: ; 0x1ecd6b
UnknownText_0x1ecd6b:
text "Oh, how nasty!"
line "You were serious!"
done
; 0x1ecd8d
UnknownText_0x1ecd8d: ; 0x1ecd8d
UnknownText_0x1ecd8d:
text "Ahahah! I'll take"
line "it easy on you!"
done
; 0x1ecdaf
UnknownText_0x1ecdaf: ; 0x1ecdaf
UnknownText_0x1ecdaf:
text "Oops, sorry! But"
line "I'm happy too!"
done
; 0x1ecdcf
UnknownText_0x1ecdcf: ; 0x1ecdcf
UnknownText_0x1ecdcf:
text "Oh, oh, I lost!"
line "Thanks. Bye!"
done
; 0x1ecded
UnknownText_0x1ecded: ; 0x1ecded
UnknownText_0x1ecded:
text "BATTLE TOWER is a"
line "tough place!"
done
; 0x1ece0d
UnknownText_0x1ece0d: ; 0x1ece0d
UnknownText_0x1ece0d:
text "You might have a"
line "hard time."
done
; 0x1ece2a
UnknownText_0x1ece2a: ; 0x1ece2a
UnknownText_0x1ece2a:
text "Ooh, you might"
line "make a run here!"
done
; 0x1ece4b
UnknownText_0x1ece4b: ; 0x1ece4b
UnknownText_0x1ece4b:
text "I want to see your"
line "style in action!"
done
; 0x1ece70
UnknownText_0x1ece70: ; 0x1ece70
UnknownText_0x1ece70:
text "Every battle is a"
line "drama!"
done
; 0x1ece8a
UnknownText_0x1ece8a: ; 0x1ece8a
UnknownText_0x1ece8a:
text "Oh… Want to trade"
line "something?"
done
; 0x1ecea8
UnknownText_0x1ecea8: ; 0x1ecea8
UnknownText_0x1ecea8:
text "OK, here goes!"
line "I have momentum!"
done
; 0x1ecec9
UnknownText_0x1ecec9: ; 0x1ecec9
UnknownText_0x1ecec9:
text "See, I rolled"
line "right over you!"
done
; 0x1ecee8
UnknownText_0x1ecee8: ; 0x1ecee8
UnknownText_0x1ecee8:
text "No! This did not"
line "happen!"
done
; 0x1ecf02

View File

@@ -3,7 +3,7 @@ rating: MACRO
dbww \1, \2, \3
ENDM
OakRatings: ; 0x2667f
OakRatings:
; if you caught at most this many, play this sound, load this text
; (text is defined in engine/events/prof_oaks_pc.asm)
rating 9, SFX_DEX_FANFARE_LESS_THAN_20, OakRating01
@@ -25,5 +25,4 @@ OakRatings: ; 0x2667f
rating 239, SFX_DEX_FANFARE_230_PLUS, OakRating17
rating 248, SFX_DEX_FANFARE_230_PLUS, OakRating18
rating 255, SFX_DEX_FANFARE_230_PLUS, OakRating19
; 0x266de

View File

@@ -31,7 +31,7 @@ UnownWalls:
; db $0e, $2c, $64, $2c, $0e, -1
unownwall "H", "O", "-", "O", "H"
MenuHeaders_UnownWalls: ; 0x8aed5
MenuHeaders_UnownWalls:
; UNOWNWORDS_ESCAPE
db MENU_BACKUP_TILES ; flags
menu_coords 3, 4, 16, 9

View File

@@ -4,7 +4,7 @@ landmark: MACRO
dw \3
ENDM
Landmarks: ; 0x1ca8c3
Landmarks:
; entries correspond to constants/landmark_constants.asm
landmark 0, 0, SpecialMapName
landmark 148, 116, NewBarkTownName
@@ -102,7 +102,6 @@ Landmarks: ; 0x1ca8c3
landmark 20, 116, TohjoFallsName
landmark 28, 84, Route28Name
landmark 148, 132, FastShipName
; 0x1caa43
NewBarkTownName: db "NEW BARK¯TOWN@"
CherrygroveCityName: db "CHERRYGROVE¯CITY@"

View File

@@ -4,7 +4,7 @@ spawn: MACRO
db \2, \3
ENDM
SpawnPoints: ; 0x152ab
SpawnPoints:
; entries correspond to SPAWN_* constants
spawn PLAYERS_HOUSE_2F, 3, 3

View File

@@ -1,4 +1,4 @@
BillPhoneMornGreetingText: ; 0x1b4427
BillPhoneMornGreetingText:
text "Good morning!"
para "This is the #-"
@@ -8,7 +8,7 @@ BillPhoneMornGreetingText: ; 0x1b4427
line "SERVICE."
done
BillPhoneDayGreetingText: ; 0x1b4470
BillPhoneDayGreetingText:
text "Good day!"
para "This is the #-"
@@ -18,7 +18,7 @@ BillPhoneDayGreetingText: ; 0x1b4470
line "SERVICE."
done
BillPhoneNiteGreetingText: ; 0x1b44b5
BillPhoneNiteGreetingText:
text "Good evening!"
para "This is the #-"
@@ -28,7 +28,7 @@ BillPhoneNiteGreetingText: ; 0x1b44b5
line "SERVICE."
done
BillPhoneGenericText: ; 0x1b44fe
BillPhoneGenericText:
text "Who's calling?"
para "<PLAY_G>, is it?"
@@ -38,7 +38,7 @@ BillPhoneGenericText: ; 0x1b44fe
line $56
done
BillPhoneNotFullText: ; 0x1b452a
BillPhoneNotFullText:
text "Thanks for"
line "waiting!"
@@ -52,7 +52,7 @@ BillPhoneNotFullText: ; 0x1b452a
line "fill it up!"
done
BillPhoneNearlyFullText: ; 0x1b4587
BillPhoneNearlyFullText:
text "Thanks for"
line "waiting!"
@@ -66,7 +66,7 @@ BillPhoneNearlyFullText: ; 0x1b4587
line "switch your BOX."
done
BillPhoneFullText: ; 0x1b45ed
BillPhoneFullText:
text "Thanks for"
line "waiting!"
@@ -80,7 +80,7 @@ BillPhoneFullText: ; 0x1b45ed
line "more #MON."
done
BillPhoneNewlyFullText: ; 0x1b4652
BillPhoneNewlyFullText:
text "Hi, <PLAY_G>?"
line "It's me, BILL!"

View File

@@ -1,4 +1,4 @@
UnknownText_0xa0c28: ; 0xa0c28
UnknownText_0xa0c28:
text "Hi, this is BUENA…"
para "Oh! Good morning,"
@@ -7,18 +7,16 @@ UnknownText_0xa0c28: ; 0xa0c28
para "I'm kind of foggy"
line "in the morning…"
done
; 0xa0c72
UnknownText_0xa0c72: ; 0xa0c72
UnknownText_0xa0c72:
text "Hi, this is BUENA…"
line "Oh! Hi, <PLAY_G>!"
para "Do you tune into"
line "BUENA's show?"
done
; 0xa0caf
UnknownText_0xa0caf: ; 0xa0caf
UnknownText_0xa0caf:
text "This is BUENA."
line "I can't come to"
@@ -34,9 +32,8 @@ UnknownText_0xa0caf: ; 0xa0caf
para "give me a call"
line "after midnight!"
done
; 0xa0d42
UnknownText_0xa0d42: ; 0xa0d42
UnknownText_0xa0d42:
text "Hi, this is BUENA…"
line "Oh! Hi, <PLAY_G>!"
@@ -46,45 +43,40 @@ UnknownText_0xa0d42: ; 0xa0d42
para "Let me tell you,"
line "I'm exhausted!"
done
; 0xa0d96
UnknownText_0xa0d96: ; 0xa0d96
UnknownText_0xa0d96:
text "<PLAY_G>!"
line "Hi, it's BUENA!"
para "I got up early, so"
line "I decided to call!"
done
; 0xa0dcf
UnknownText_0xa0dcf: ; 0xa0dcf
UnknownText_0xa0dcf:
text "<PLAY_G>!"
line "Hi, it's BUENA!"
para "I needed someone"
line "to chat with!"
done
; 0xa0e01
UnknownText_0xa0e01: ; 0xa0e01
UnknownText_0xa0e01:
text "<PLAY_G>!"
line "Hi, it's BUENA!"
para "I'm just on my"
line "break."
done
; 0xa0e29
UnknownText_0xa0e29: ; 0xa0e29
UnknownText_0xa0e29:
text "<PLAY_G>!"
line "Hi, it's BUENA!"
para "I couldn't sleep,"
line "so I called you."
done
; 0xa0e5e
UnknownText_0xa0e5e: ; 0xa0e5e
UnknownText_0xa0e5e:
text "Oh. Hi, <PLAY_G>!"
para "You are how?"
@@ -101,9 +93,8 @@ UnknownText_0xa0e5e: ; 0xa0e5e
para "<PLAY_G>, you'd"
line "better be careful!"
done
; 0xa0efb
UnknownText_0xa0efb: ; 0xa0efb
UnknownText_0xa0efb:
text "The other day, I"
line "went out to eat"
@@ -125,9 +116,8 @@ UnknownText_0xa0efb: ; 0xa0efb
para "show! I'll catch"
line "you later!"
done
; 0xa0fcf
UnknownText_0xa0fcf: ; 0xa0fcf
UnknownText_0xa0fcf:
text "You know the"
line "receptionist at"
cont "the RADIO TOWER?"
@@ -149,9 +139,8 @@ UnknownText_0xa0fcf: ; 0xa0fcf
para "Catch you later!"
done
; 0xa109d
UnknownText_0xa109d: ; 0xa109d
UnknownText_0xa109d:
text "Tell me, <PLAY_G>."
line "Have you ever won"
@@ -167,9 +156,8 @@ UnknownText_0xa109d: ; 0xa109d
para "Let's chat again!"
done
; 0xa1143
UnknownText_0xa1143: ; 0xa1143
UnknownText_0xa1143:
text "You know, last"
line "night…"
@@ -198,9 +186,8 @@ UnknownText_0xa1143: ; 0xa1143
para "Uh… Um… I… Sorry,"
line "wrong number!"
done
; 0xa1244
UnknownText_0xa1244: ; 0xa1244
UnknownText_0xa1244:
text "Yesterday, PROF."
line "OAK was in the"
@@ -221,9 +208,8 @@ UnknownText_0xa1244: ; 0xa1244
para "Catch you later!"
done
; 0xa1318
UnknownText_0xa1318: ; 0xa1318
UnknownText_0xa1318:
text "…Cough, cough!"
para "Uhm sorry uh got"
@@ -242,9 +228,8 @@ UnknownText_0xa1318: ; 0xa1318
line "the fly. This has"
cont "been BUENA!"
done
; 0xa13d8
UnknownText_0xa13d8: ; 0xa13d8
UnknownText_0xa13d8:
text "Hey, <PLAY_G>."
line "You won that RADIO"
@@ -263,9 +248,8 @@ UnknownText_0xa13d8: ; 0xa13d8
para "Well, let's chat"
line "again!"
done
; 0xa1488
UnknownText_0xa1488: ; 0xa1488
UnknownText_0xa1488:
text "I'm elated that"
line "more people are"
@@ -298,9 +282,8 @@ UnknownText_0xa1488: ; 0xa1488
para "Let's chat again!"
done
; 0xa15de
UnknownText_0xa15de: ; 0xa15de
UnknownText_0xa15de:
text "Guess what?"
line "The RADIO TOWER's"
@@ -331,9 +314,8 @@ UnknownText_0xa15de: ; 0xa15de
para "Later! Tune into"
line "my show!"
done
; 0xa1717
UnknownText_0xa1717: ; 0xa1717
UnknownText_0xa1717:
text "<PLAY_G>, tell me."
para "When do you relax"
@@ -364,9 +346,8 @@ UnknownText_0xa1717: ; 0xa1717
para "Please forget this"
line "happened! Later!"
done
; 0xa183d
UnknownText_0xa183d: ; 0xa183d
UnknownText_0xa183d:
text "<PLAY_G>, what was"
line "the first #MON"
cont "you ever caught?"
@@ -405,9 +386,8 @@ UnknownText_0xa183d: ; 0xa183d
para "Bye-bye!"
done
; 0xa19b1
UnknownText_0xa19b1: ; 0xa19b1
UnknownText_0xa19b1:
text "Guess what? All of"
line "us from the RADIO"
@@ -434,9 +414,8 @@ UnknownText_0xa19b1: ; 0xa19b1
para "Bye-bye!"
done
; 0xa1ac0
UnknownText_0xa1ac0: ; 0xa1ac0
UnknownText_0xa1ac0:
text "Did you know…?"
para "BEN and FERN talk"
@@ -465,9 +444,8 @@ UnknownText_0xa1ac0: ; 0xa1ac0
para "Let's chat again!"
done
; 0xa1bed
UnknownText_0xa1bed: ; 0xa1bed
UnknownText_0xa1bed:
text "I'm going shopping"
line "with MARY and LILY"
cont "soon."
@@ -483,9 +461,8 @@ UnknownText_0xa1bed: ; 0xa1bed
para "Catch you later!"
done
; 0xa1c88
UnknownText_0xa1c88: ; 0xa1c88
UnknownText_0xa1c88:
text "I'm thinking of"
line "going to the GAME"
@@ -506,9 +483,8 @@ UnknownText_0xa1c88: ; 0xa1c88
para "Catch you later!"
done
; 0xa1d5f
UnknownText_0xa1d5f: ; 0xa1d5f
UnknownText_0xa1d5f:
text "Hey, <PLAY_G>. You"
line "use your #GEAR"
@@ -530,9 +506,8 @@ UnknownText_0xa1d5f: ; 0xa1d5f
para "Anyway, thanks for"
line "calling! Later!"
done
; 0xa1e2f
UnknownText_0xa1e2f: ; 0xa1e2f
UnknownText_0xa1e2f:
text "Is it sunny"
line "outside today?"
@@ -547,4 +522,3 @@ UnknownText_0xa1e2f: ; 0xa1e2f
para "Please call again!"
done
; 0xa1eca

View File

@@ -1,4 +1,4 @@
ElmPhoneStartText: ; 0x1b46fc
ElmPhoneStartText:
text "Hello, <PLAY_G>?"
para "Try not to overdo"
@@ -9,7 +9,7 @@ ElmPhoneStartText: ; 0x1b46fc
cont "they are hurt."
done
ElmPhoneSawMrPokemonText: ; 0x1b4749
ElmPhoneSawMrPokemonText:
text "Hello, <PLAY_G>?"
para "Did you meet MR."
@@ -17,7 +17,7 @@ ElmPhoneSawMrPokemonText: ; 0x1b4749
cont "Come back safely!"
done
ElmPhonePokemonStolenText: ; 0x1b4784
ElmPhonePokemonStolenText:
text "<PLAY_G>? I'm very"
line "upset now."
@@ -28,7 +28,7 @@ ElmPhonePokemonStolenText: ; 0x1b4784
line "do that?"
done
ElmPhoneCheckingEggText: ; 0x1b47d5
ElmPhoneCheckingEggText:
text "Hello, <PLAY_G>?"
para "We're checking the"
@@ -38,7 +38,7 @@ ElmPhoneCheckingEggText: ; 0x1b47d5
line "#MON EGG."
done
ElmPhoneAssistantText: ; 0x1b481c
ElmPhoneAssistantText:
text "Hello, <PLAY_G>?"
para "Did you see my"
@@ -48,7 +48,7 @@ ElmPhoneAssistantText: ; 0x1b481c
line "in VIOLET CITY."
done
ElmPhoneEggUnhatchedText: ; 0x1b4868
ElmPhoneEggUnhatchedText:
text "Hello, <PLAY_G>?"
para "How's the EGG? Has"
@@ -58,7 +58,7 @@ ElmPhoneEggUnhatchedText: ; 0x1b4868
line "pens, please call."
done
ElmPhoneEggHatchedText: ; 0x1b48bb
ElmPhoneEggHatchedText:
text "Hello, <PLAY_G>?"
line "How is the EGG?"
@@ -70,7 +70,7 @@ ElmPhoneEggHatchedText: ; 0x1b48bb
line "me now!"
done
ElmPhoneDiscovery1Text: ; 0x1b491f
ElmPhoneDiscovery1Text:
text "Hello, <PLAY_G>?"
para "I just made a new"
@@ -83,7 +83,7 @@ ElmPhoneDiscovery1Text: ; 0x1b491f
line "the #MON."
done
ElmPhoneDiscovery2Text: ; 0x1b4982
ElmPhoneDiscovery2Text:
text "Hello, <PLAY_G>?"
para "It's still a"
@@ -96,7 +96,7 @@ ElmPhoneDiscovery2Text: ; 0x1b4982
line "ing that now."
done
ElmPhonePokerusText: ; 0x1b49e7
ElmPhonePokerusText:
text "Hello, <PLAY_G>?"
para "I discovered an"
@@ -129,7 +129,7 @@ ElmPhonePokerusText: ; 0x1b49e7
cont "about. Bye!"
done
ElmPhoneDisasterText: ; 0x1b4b17
ElmPhoneDisasterText:
text "H-hello? <PLAY_G>?"
line "It's a disaster!"
@@ -143,7 +143,7 @@ ElmPhoneDisasterText: ; 0x1b4b17
line "here now!"
done
ElmPhoneEggAssistantText: ; 0x1b4b87
ElmPhoneEggAssistantText:
text "Hello, <PLAY_G>? We"
line "discovered some-"
@@ -158,7 +158,7 @@ ElmPhoneEggAssistantText: ; 0x1b4b87
cont "him?"
done
ElmPhoneRocketText: ; 0x1b4c06
ElmPhoneRocketText:
text "<PLAY_G>, how are"
line "things going?"
@@ -185,7 +185,7 @@ ElmPhoneRocketText: ; 0x1b4c06
line "Take care!"
done
ElmPhoneGiftText: ; 0x1b4d09
ElmPhoneGiftText:
text "Hello, <PLAY_G>?"
para "I have something"
@@ -197,7 +197,7 @@ ElmPhoneGiftText: ; 0x1b4d09
para "See you later!"
done
ElmPhoneUnusedText: ; 0x1b4d5d
ElmPhoneUnusedText:
text "Hello, <PLAY_G>?"
line "How's it going?"

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@@ -1,11 +1,11 @@
MomPhoneGreetingText: ; 0x1b4000
MomPhoneGreetingText:
text "Hello?"
para "Oh, hi, <PLAYER>!"
line "Working hard?"
done
MomPhoneLandmarkText: ; 0x1b4021
MomPhoneLandmarkText:
text "Oh, so you're in"
line "@"
text_from_ram wStringBuffer3
@@ -19,7 +19,7 @@ MomPhoneLandmarkText: ; 0x1b4021
line "take a look?"
done
MomPhoneGenericAreaText: ; 0x1b406b
MomPhoneGenericAreaText:
text "Really, you're in"
line "@"
text_from_ram wStringBuffer3
@@ -30,7 +30,7 @@ MomPhoneGenericAreaText: ; 0x1b406b
cont "of neat, <PLAYER>."
done
MomPhoneNewBarkText: ; 0x1b40b1
MomPhoneNewBarkText:
text "What? You're in"
line "@"
text_from_ram wStringBuffer3
@@ -40,7 +40,7 @@ MomPhoneNewBarkText: ; 0x1b40b1
line "sometime!"
done
MomPhoneCherrygroveText: ; 0x1b40e4
MomPhoneCherrygroveText:
text "You're visiting"
line "@"
text_from_ram wStringBuffer3
@@ -50,7 +50,7 @@ MomPhoneCherrygroveText: ; 0x1b40e4
line "home for a bit?"
done
MomOtherAreaText: ; 0x1b411c
MomOtherAreaText:
text "Wow, you're in"
line "@"
text_from_ram wStringBuffer3
@@ -60,7 +60,7 @@ MomOtherAreaText: ; 0x1b411c
line "#MON quest!"
done
MomDeterminedText: ; 0x1b4150
MomDeterminedText:
text "That sounds really"
line "tough."
@@ -71,7 +71,7 @@ MomDeterminedText: ; 0x1b4150
line "be OK, right?"
done
MomCheckBalanceText: ; 0x1b41a7
MomCheckBalanceText:
text "By the way, you've"
line "saved up ¥@"
text_from_ram wStringBuffer3
@@ -81,12 +81,12 @@ MomCheckBalanceText: ; 0x1b41a7
line "keep on saving?"
done
MomImportantToSaveText: ; 0x1b41ea
MomImportantToSaveText:
text "It's important to"
line "save your money."
done
MomYoureNotSavingText: ; 0x1b420d
MomYoureNotSavingText:
text "Oh, <PLAYER>,"
line "you're not saving"
@@ -94,7 +94,7 @@ MomYoureNotSavingText: ; 0x1b420d
line "you like to save?"
done
MomYouveSavedText: ; 0x1b4249
MomYouveSavedText:
text "By the way, you've"
line "saved up ¥@"
text_from_ram wStringBuffer3
@@ -104,23 +104,23 @@ MomYouveSavedText: ; 0x1b4249
line "saving again?"
done
MomOKIllSaveText: ; 0x1b4289
MomOKIllSaveText:
text "OK. I'll save your"
line "money."
done
MomPhoneWontSaveMoneyText: ; 0x1b42a3
MomPhoneWontSaveMoneyText:
text "OK. I won't save"
line "your money."
done
MomPhoneHangUpText: ; 0x1b42c0
MomPhoneHangUpText:
text "<PLAYER>, keep it"
line "up! I'm rooting"
cont "for you, baby!"
done
MomPhoneNoPokemonText: ; 0x1b42ea
MomPhoneNoPokemonText:
text "Hello?"
para "Oh, hi, <PLAYER>!"
@@ -128,7 +128,7 @@ MomPhoneNoPokemonText: ; 0x1b42ea
cont "waiting for you?"
done
MomPhoneNoPokedexText: ; 0x1b431d
MomPhoneNoPokedexText:
text "Hello?"
para "Oh, hi, <PLAYER>!"
@@ -138,7 +138,7 @@ MomPhoneNoPokedexText: ; 0x1b431d
line "ELM? Be good!"
done
MomPhoneNoGymQuestText: ; 0x1b435f
MomPhoneNoGymQuestText:
text "Hello?"
para "Hi, <PLAYER>! If"
@@ -148,7 +148,7 @@ MomPhoneNoGymQuestText: ; 0x1b435f
line "on home, dear."
done
MomPhoneLectureText: ; 0x1b43a1
MomPhoneLectureText:
text "Hello?"
para "…… <PLAYER>?"

File diff suppressed because it is too large Load Diff

View File

@@ -1,4 +1,4 @@
PokedexDataPointerTable: ; 0x44378
PokedexDataPointerTable:
; entries correspond to constants/pokemon_constants.asm
dw BulbasaurPokedexEntry
dw IvysaurPokedexEntry
@@ -251,4 +251,3 @@ PokedexDataPointerTable: ; 0x44378
dw LugiaPokedexEntry
dw HoOhPokedexEntry
dw CelebiPokedexEntry
; 0x4456e

View File

@@ -1,6 +1,6 @@
; Every Pokémon sorted alphabetically by name.
AlphabeticalPokedexOrder: ; 0x40c65
AlphabeticalPokedexOrder:
db ABRA
db AERODACTYL
db AIPOM
@@ -252,4 +252,3 @@ AlphabeticalPokedexOrder: ; 0x40c65
db YANMA
db ZAPDOS
db ZUBAT
; 0x40d60

View File

@@ -1,6 +1,6 @@
; Every Pokémon sorted in New Pokédex Order.
NewPokedexOrder: ; 0x40d60
NewPokedexOrder:
db CHIKORITA
db BAYLEEF
db MEGANIUM
@@ -252,4 +252,3 @@ NewPokedexOrder: ; 0x40d60
db MEWTWO
db MEW
db CELEBI
; 0x40e5b

View File

@@ -1,4 +1,4 @@
EggMovePointers:: ; 0x23b11
EggMovePointers::
dw BulbasaurEggMoves
dw NoEggMoves
dw NoEggMoves
@@ -254,4 +254,3 @@ endc
dw NoEggMoves
dw NoEggMoves
dw NoEggMoves
; 0x23d07

View File

@@ -1,6 +1,6 @@
; Evolutions and attacks are grouped together since they're both checked at level-up.
EvosAttacksPointers:: ; 0x425b1
EvosAttacksPointers::
dw BulbasaurEvosAttacks
dw IvysaurEvosAttacks
dw VenusaurEvosAttacks
@@ -252,4 +252,3 @@ EvosAttacksPointers:: ; 0x425b1
dw LugiaEvosAttacks
dw HoOhEvosAttacks
dw CelebiEvosAttacks
; 0x427a7

File diff suppressed because it is too large Load Diff

View File

@@ -8,7 +8,7 @@
; Most of these texts seem to be associated with a single NPC.
; The last text is associated with a second NPC, probably a Butterfree.
UnusedSweetHoneyText: ; 0x5578a
UnusedSweetHoneyText:
text "My #MON is an"
line "expert at collect-"
cont "ing SWEET HONEY."
@@ -17,7 +17,7 @@ UnusedSweetHoneyText: ; 0x5578a
line "with you."
done
UnusedSweetHoneyBagFullText: ; 0x557d6
UnusedSweetHoneyBagFullText:
text "I want to give you"
line "some SWEET HONEY,"
@@ -25,17 +25,17 @@ UnusedSweetHoneyBagFullText: ; 0x557d6
line "room for it."
done
UnusedSweetHoneyGiveText: ; 0x55819
UnusedSweetHoneyGiveText:
text "Here you go! Have"
line "some SWEET HONEY!"
done
UnusedGotSweetHoneyText: ; 0x5583e
UnusedGotSweetHoneyText:
text "<PLAYER> received"
line "SWEET HONEY."
done
UnusedSweetHoneyAfterText1: ; 0x55856
UnusedSweetHoneyAfterText1:
text "My little brother"
line "takes SWEET HONEY"
@@ -46,7 +46,7 @@ UnusedSweetHoneyAfterText1: ; 0x55856
line "up to?"
done
UnusedSweetHoneyAfterText2: ; 0x558b1
UnusedSweetHoneyAfterText2:
text "Did you put SWEET"
line "HONEY on a tree?"
@@ -54,7 +54,7 @@ UnusedSweetHoneyAfterText2: ; 0x558b1
line "it?"
done
UnusedSweetHoneyAfterText3: ; 0x558ea
UnusedSweetHoneyAfterText3:
text "Did you put SWEET"
line "HONEY on a tree?"
@@ -63,6 +63,6 @@ UnusedSweetHoneyAfterText3: ; 0x558ea
cont "be drawn to it."
done
UnusedSweetHoneyButterfreeText: ; 0x5593f
UnusedSweetHoneyButterfreeText:
text "BUTTERFREE: Freeh!"
done

View File

@@ -1,6 +1,6 @@
; Groups are defined in data/trainers/parties.asm.
TrainerGroups: ; 0x39999
TrainerGroups:
; entries correspond to trainer classes (see constants/trainer_constants.asm)
dw FalknerGroup
dw WhitneyGroup

View File

@@ -1,6 +1,6 @@
; Johto Pokémon in grass
JohtoGrassWildMons: ; 0x2a5e9
JohtoGrassWildMons:
map_id SPROUT_TOWER_2F
db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite

View File

@@ -1,6 +1,6 @@
; Johto Pokémon in water
JohtoWaterWildMons: ; 0x2b11d
JohtoWaterWildMons:
map_id RUINS_OF_ALPH_OUTSIDE
db 2 percent ; encounter rate

View File

@@ -1,6 +1,6 @@
; Kanto Pokémon in grass
KantoGrassWildMons: ; 0x2b274
KantoGrassWildMons:
map_id DIGLETTS_CAVE
db 4 percent, 2 percent, 8 percent ; encounter rates: morn/day/nite

View File

@@ -1,6 +1,6 @@
; Kanto Pokémon in water
KantoWaterWildMons: ; 0x2b7f7
KantoWaterWildMons:
map_id TOHJO_FALLS
db 4 percent ; encounter rate

View File

@@ -1,6 +1,6 @@
; Pokémon swarms in grass
SwarmGrassWildMons: ; 0x2b8d0
SwarmGrassWildMons:
; Dunsparce swarm
map_id DARK_CAVE_VIOLET_ENTRANCE

View File

@@ -1,6 +1,6 @@
; Pokémon swarms in water
SwarmWaterWildMons: ; 0x2b92f
SwarmWaterWildMons:
; No swarms encountered while surfing in Crystal