ref: 364854623267a8a39242243b0cdf80144e868642
parent: 0cbe04da44744073c4c164df970b1571b1fda1a6
parent: 5efce10789bc8291ca5517bdeaacab95459b3fdb
author: yenatch <yenatch@gmail.com>
date: Sun Jun 24 16:22:13 EDT 2018
Merge pull request #532 from mid-kid/master Remove even more address comments
--- a/audio/music_pointers.asm
+++ b/audio/music_pointers.asm
@@ -3,109 +3,109 @@
Music:
; entries correspond to MUSIC_* constants
- dba Music_Nothing ; 0xe91a3
- dba Music_TitleScreen ; 0xeb808
- dba Music_Route1 ; 0xec000
- dba Music_Route3 ; 0xec2ca
- dba Music_Route12 ; 0xec506
- dba Music_MagnetTrain ; 0xef5f0
- dba Music_KantoGymBattle ; 0xec720
- dba Music_KantoTrainerBattle ; 0xec9fa
- dba Music_KantoWildBattle ; 0xed06d
- dba Music_PokemonCenter ; 0xed5c6
- dba Music_LookHiker ; 0xf7411
- dba Music_LookLass ; 0xed79b
- dba Music_LookOfficer ; 0xed82d
- dba Music_HealPokemon ; 0xf0697
- dba Music_LavenderTown ; 0xef72f
- dba Music_Route2 ; 0xed8dd
- dba Music_MtMoon ; 0xedb29
- dba Music_ShowMeAround ; 0xedbd8
- dba Music_GameCorner ; 0xedd6d
- dba Music_Bicycle ; 0xee119
- dba Music_HallOfFame ; 0xf05bf
- dba Music_ViridianCity ; 0xf4000
- dba Music_CeladonCity ; 0xf435b
- dba Music_TrainerVictory ; 0xebeab
- dba Music_WildPokemonVictory ; 0xf4518
- dba Music_GymLeaderVictory ; 0xf462c
- dba Music_MtMoonSquare ; 0xf4815
- dba Music_Gym ; 0xf48ae
- dba Music_PalletTown ; 0xf4b0c
- dba Music_ProfOaksPokemonTalk ; 0xf4c9f
- dba Music_ProfOak ; 0xf4dea
- dba Music_LookRival ; 0xf4f79
- dba Music_AfterTheRivalFight ; 0xf5127
- dba Music_Surf ; 0xf518a
- dba Music_Evolution ; 0xf06e1
- dba Music_NationalPark ; 0xf54e8
- dba Music_Credits ; 0x1f31c
- dba Music_AzaleaTown ; 0xf57e8
- dba Music_CherrygroveCity ; 0xf5b03
- dba Music_LookKimonoGirl ; 0xf79b8
- dba Music_UnionCave ; 0xf5c60
- dba Music_JohtoWildBattle ; 0xf5dc5
- dba Music_JohtoTrainerBattle ; 0xf6096
- dba Music_Route30 ; 0xefc01
- dba Music_EcruteakCity ; 0xef2d0
- dba Music_VioletCity ; 0xf0000
- dba Music_JohtoGymBattle ; 0xea50d
- dba Music_ChampionBattle ; 0xea9c1
- dba Music_RivalBattle ; 0xe974f
- dba Music_RocketBattle ; 0xe9b6f
- dba Music_ElmsLab ; 0xea040
- dba Music_DarkCave ; 0xea2be
- dba Music_Route29 ; 0xf0386
- dba Music_Route36 ; 0xe94e9
- dba Music_SSAqua ; 0xead99
- dba Music_LookYoungster ; 0xf66c3
- dba Music_LookBeauty ; 0xeee3e
- dba Music_LookRocket ; 0xf74a2
- dba Music_LookPokemaniac ; 0xebde1
- dba Music_LookSage ; 0xee35e
- dba Music_NewBarkTown ; 0xeb2d3
- dba Music_GoldenrodCity ; 0xeb453
- dba Music_VermilionCity ; 0xeb676
- dba Music_PokemonChannel ; 0xee45f
- dba Music_PokeFluteChannel ; 0xf7b13
- dba Music_TinTower ; 0xf6811
- dba Music_SproutTower ; 0xf6974
- dba Music_BurnedTower ; 0xf6a99
- dba Music_Lighthouse ; 0xee569
- dba Music_LakeOfRage ; 0xee6c5
- dba Music_IndigoPlateau ; 0xee852
- dba Music_Route37 ; 0xee94b
- dba Music_RocketHideout ; 0xeeb75
- dba Music_DragonsDen ; 0xeece8
- dba Music_JohtoWildBattleNight ; 0xf605c
- dba Music_RuinsOfAlphRadio ; 0xeedcb
- dba Music_SuccessfulCapture ; 0xf4602
- dba Music_Route26 ; 0xeefb2
- dba Music_Mom ; 0xf6bf2
- dba Music_VictoryRoad ; 0xf6c72
- dba Music_PokemonLullaby ; 0xf6d79
- dba Music_PokemonMarch ; 0xf6e23
- dba Music_GoldSilverOpening ; 0xf7055
- dba Music_GoldSilverOpening2 ; 0xf7308
- dba Music_MainMenu ; 0xf78fd
- dba Music_RuinsOfAlphInterior ; 0xebd9e
- dba Music_RocketTheme ; 0xf766d
- dba Music_DancingHall ; 0xef9bc
- dba Music_ContestResults ; 0xefb3e
- dba Music_BugCatchingContest ; 0xf7c16
- dba Music_LakeOfRageRocketRadio ; 0xef5b1
- dba Music_Printer ; 0xf07fd
- dba Music_PostCredits ; 0xcfd9e
+ dba Music_Nothing
+ dba Music_TitleScreen
+ dba Music_Route1
+ dba Music_Route3
+ dba Music_Route12
+ dba Music_MagnetTrain
+ dba Music_KantoGymBattle
+ dba Music_KantoTrainerBattle
+ dba Music_KantoWildBattle
+ dba Music_PokemonCenter
+ dba Music_LookHiker
+ dba Music_LookLass
+ dba Music_LookOfficer
+ dba Music_HealPokemon
+ dba Music_LavenderTown
+ dba Music_Route2
+ dba Music_MtMoon
+ dba Music_ShowMeAround
+ dba Music_GameCorner
+ dba Music_Bicycle
+ dba Music_HallOfFame
+ dba Music_ViridianCity
+ dba Music_CeladonCity
+ dba Music_TrainerVictory
+ dba Music_WildPokemonVictory
+ dba Music_GymLeaderVictory
+ dba Music_MtMoonSquare
+ dba Music_Gym
+ dba Music_PalletTown
+ dba Music_ProfOaksPokemonTalk
+ dba Music_ProfOak
+ dba Music_LookRival
+ dba Music_AfterTheRivalFight
+ dba Music_Surf
+ dba Music_Evolution
+ dba Music_NationalPark
+ dba Music_Credits
+ dba Music_AzaleaTown
+ dba Music_CherrygroveCity
+ dba Music_LookKimonoGirl
+ dba Music_UnionCave
+ dba Music_JohtoWildBattle
+ dba Music_JohtoTrainerBattle
+ dba Music_Route30
+ dba Music_EcruteakCity
+ dba Music_VioletCity
+ dba Music_JohtoGymBattle
+ dba Music_ChampionBattle
+ dba Music_RivalBattle
+ dba Music_RocketBattle
+ dba Music_ElmsLab
+ dba Music_DarkCave
+ dba Music_Route29
+ dba Music_Route36
+ dba Music_SSAqua
+ dba Music_LookYoungster
+ dba Music_LookBeauty
+ dba Music_LookRocket
+ dba Music_LookPokemaniac
+ dba Music_LookSage
+ dba Music_NewBarkTown
+ dba Music_GoldenrodCity
+ dba Music_VermilionCity
+ dba Music_PokemonChannel
+ dba Music_PokeFluteChannel
+ dba Music_TinTower
+ dba Music_SproutTower
+ dba Music_BurnedTower
+ dba Music_Lighthouse
+ dba Music_LakeOfRage
+ dba Music_IndigoPlateau
+ dba Music_Route37
+ dba Music_RocketHideout
+ dba Music_DragonsDen
+ dba Music_JohtoWildBattleNight
+ dba Music_RuinsOfAlphRadio
+ dba Music_SuccessfulCapture
+ dba Music_Route26
+ dba Music_Mom
+ dba Music_VictoryRoad
+ dba Music_PokemonLullaby
+ dba Music_PokemonMarch
+ dba Music_GoldSilverOpening
+ dba Music_GoldSilverOpening2
+ dba Music_MainMenu
+ dba Music_RuinsOfAlphInterior
+ dba Music_RocketTheme
+ dba Music_DancingHall
+ dba Music_ContestResults
+ dba Music_BugCatchingContest
+ dba Music_LakeOfRageRocketRadio
+ dba Music_Printer
+ dba Music_PostCredits
; Crystal adds the following songs:
- dba Music_Clair ; 0x1fa8d
- dba Music_MobileAdapterMenu ; 0x17801f
- dba Music_MobileAdapter ; 0x1fc87
- dba Music_BuenasPassword ; 0x178153
- dba Music_LookMysticalMan ; 0x17843b
- dba Music_CrystalOpening ; 0x1786e8
- dba Music_BattleTowerTheme ; 0x178889
- dba Music_SuicuneBattle ; 0x178b81
- dba Music_BattleTowerLobby ; 0x17948b
- dba Music_MobileCenter ; 0x17961d
+ dba Music_Clair
+ dba Music_MobileAdapterMenu
+ dba Music_MobileAdapter
+ dba Music_BuenasPassword
+ dba Music_LookMysticalMan
+ dba Music_CrystalOpening
+ dba Music_BattleTowerTheme
+ dba Music_SuicuneBattle
+ dba Music_BattleTowerLobby
+ dba Music_MobileCenter
--- a/data/battle_tower/trainer_text.asm
+++ b/data/battle_tower/trainer_text.asm
@@ -1,4 +1,4 @@
-BattleTowerText_0x1ec000: ; 0x1ec000
+BattleTowerText_0x1ec000:
text "Hello, glad to"
line "meet you!"
@@ -5,147 +5,123 @@
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."
@@ -152,57 +128,48 @@
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?"
@@ -209,9 +176,8 @@
para "Let me battle you,"
line "then!"
done
-; 0x1ec461
-UnknownText_0x1ec461: ; 0x1ec461
+UnknownText_0x1ec461:
text "You need another"
line "ten years of"
@@ -218,9 +184,8 @@
para "training to get"
line "better, I'd say."
done
-; 0x1ec4a0
-UnknownText_0x1ec4a0: ; 0x1ec4a0
+UnknownText_0x1ec4a0:
text "You're incredibly"
line "talented."
@@ -227,87 +192,73 @@
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."
@@ -314,21 +265,18 @@
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."
@@ -335,51 +283,43 @@
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."
@@ -386,358 +326,298 @@
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
--- a/data/events/pokedex_ratings.asm
+++ b/data/events/pokedex_ratings.asm
@@ -3,7 +3,7 @@
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 @@
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
\ No newline at end of file
--- a/data/events/unown_walls.asm
+++ b/data/events/unown_walls.asm
@@ -31,7 +31,7 @@
; 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
--- a/data/maps/landmarks.asm
+++ b/data/maps/landmarks.asm
@@ -4,7 +4,7 @@
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 @@
landmark 20, 116, TohjoFallsName
landmark 28, 84, Route28Name
landmark 148, 132, FastShipName
-; 0x1caa43
NewBarkTownName: db "NEW BARK¯TOWN@"
CherrygroveCityName: db "CHERRYGROVE¯CITY@"
--- a/data/maps/spawn_points.asm
+++ b/data/maps/spawn_points.asm
@@ -4,7 +4,7 @@
db \2, \3
ENDM
-SpawnPoints: ; 0x152ab
+SpawnPoints:
; entries correspond to SPAWN_* constants
spawn PLAYERS_HOUSE_2F, 3, 3
--- a/data/phone/text/bill.asm
+++ b/data/phone/text/bill.asm
@@ -1,4 +1,4 @@
-BillPhoneMornGreetingText: ; 0x1b4427
+BillPhoneMornGreetingText:
text "Good morning!"
para "This is the #-"
@@ -8,7 +8,7 @@
line "SERVICE."
done
-BillPhoneDayGreetingText: ; 0x1b4470
+BillPhoneDayGreetingText:
text "Good day!"
para "This is the #-"
@@ -18,7 +18,7 @@
line "SERVICE."
done
-BillPhoneNiteGreetingText: ; 0x1b44b5
+BillPhoneNiteGreetingText:
text "Good evening!"
para "This is the #-"
@@ -28,7 +28,7 @@
line "SERVICE."
done
-BillPhoneGenericText: ; 0x1b44fe
+BillPhoneGenericText:
text "Who's calling?"
para "<PLAY_G>, is it?"
@@ -38,7 +38,7 @@
line $56
done
-BillPhoneNotFullText: ; 0x1b452a
+BillPhoneNotFullText:
text "Thanks for"
line "waiting!"
@@ -52,7 +52,7 @@
line "fill it up!"
done
-BillPhoneNearlyFullText: ; 0x1b4587
+BillPhoneNearlyFullText:
text "Thanks for"
line "waiting!"
@@ -66,7 +66,7 @@
line "switch your BOX."
done
-BillPhoneFullText: ; 0x1b45ed
+BillPhoneFullText:
text "Thanks for"
line "waiting!"
@@ -80,7 +80,7 @@
line "more #MON."
done
-BillPhoneNewlyFullText: ; 0x1b4652
+BillPhoneNewlyFullText:
text "Hi, <PLAY_G>?"
line "It's me, BILL!"
--- a/data/phone/text/buena.asm
+++ b/data/phone/text/buena.asm
@@ -1,4 +1,4 @@
-UnknownText_0xa0c28: ; 0xa0c28
+UnknownText_0xa0c28:
text "Hi, this is BUENA…"
para "Oh! Good morning,"
@@ -7,9 +7,8 @@
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>!"
@@ -16,9 +15,8 @@
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 @@
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,9 +43,8 @@
para "Let me tell you,"
line "I'm exhausted!"
done
-; 0xa0d96
-UnknownText_0xa0d96: ; 0xa0d96
+UnknownText_0xa0d96:
text "<PLAY_G>!"
line "Hi, it's BUENA!"
@@ -55,9 +51,8 @@
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!"
@@ -64,9 +59,8 @@
para "I needed someone"
line "to chat with!"
done
-; 0xa0e01
-UnknownText_0xa0e01: ; 0xa0e01
+UnknownText_0xa0e01:
text "<PLAY_G>!"
line "Hi, it's BUENA!"
@@ -73,9 +67,8 @@
para "I'm just on my"
line "break."
done
-; 0xa0e29
-UnknownText_0xa0e29: ; 0xa0e29
+UnknownText_0xa0e29:
text "<PLAY_G>!"
line "Hi, it's BUENA!"
@@ -82,9 +75,8 @@
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 @@
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 @@
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 @@
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 @@
para "Let's chat again!"
done
-; 0xa1143
-UnknownText_0xa1143: ; 0xa1143
+UnknownText_0xa1143:
text "You know, last"
line "night…"
@@ -198,9 +186,8 @@
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 @@
para "Catch you later!"
done
-; 0xa1318
-UnknownText_0xa1318: ; 0xa1318
+UnknownText_0xa1318:
text "…Cough, cough!"
para "Uhm sorry uh got"
@@ -242,9 +228,8 @@
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 @@
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 @@
para "Let's chat again!"
done
-; 0xa15de
-UnknownText_0xa15de: ; 0xa15de
+UnknownText_0xa15de:
text "Guess what?"
line "The RADIO TOWER's"
@@ -331,9 +314,8 @@
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 @@
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 @@
para "Bye-bye!"
done
-; 0xa19b1
-UnknownText_0xa19b1: ; 0xa19b1
+UnknownText_0xa19b1:
text "Guess what? All of"
line "us from the RADIO"
@@ -434,9 +414,8 @@
para "Bye-bye!"
done
-; 0xa1ac0
-UnknownText_0xa1ac0: ; 0xa1ac0
+UnknownText_0xa1ac0:
text "Did you know…?"
para "BEN and FERN talk"
@@ -465,9 +444,8 @@
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 @@
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 @@
para "Catch you later!"
done
-; 0xa1d5f
-UnknownText_0xa1d5f: ; 0xa1d5f
+UnknownText_0xa1d5f:
text "Hey, <PLAY_G>. You"
line "use your #GEAR"
@@ -530,9 +506,8 @@
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 @@
para "Please call again!"
done
-; 0xa1eca
--- a/data/phone/text/elm.asm
+++ b/data/phone/text/elm.asm
@@ -1,4 +1,4 @@
-ElmPhoneStartText: ; 0x1b46fc
+ElmPhoneStartText:
text "Hello, <PLAY_G>?"
para "Try not to overdo"
@@ -9,7 +9,7 @@
cont "they are hurt."
done
-ElmPhoneSawMrPokemonText: ; 0x1b4749
+ElmPhoneSawMrPokemonText:
text "Hello, <PLAY_G>?"
para "Did you meet MR."
@@ -17,7 +17,7 @@
cont "Come back safely!"
done
-ElmPhonePokemonStolenText: ; 0x1b4784
+ElmPhonePokemonStolenText:
text "<PLAY_G>? I'm very"
line "upset now."
@@ -28,7 +28,7 @@
line "do that?"
done
-ElmPhoneCheckingEggText: ; 0x1b47d5
+ElmPhoneCheckingEggText:
text "Hello, <PLAY_G>?"
para "We're checking the"
@@ -38,7 +38,7 @@
line "#MON EGG."
done
-ElmPhoneAssistantText: ; 0x1b481c
+ElmPhoneAssistantText:
text "Hello, <PLAY_G>?"
para "Did you see my"
@@ -48,7 +48,7 @@
line "in VIOLET CITY."
done
-ElmPhoneEggUnhatchedText: ; 0x1b4868
+ElmPhoneEggUnhatchedText:
text "Hello, <PLAY_G>?"
para "How's the EGG? Has"
@@ -58,7 +58,7 @@
line "pens, please call."
done
-ElmPhoneEggHatchedText: ; 0x1b48bb
+ElmPhoneEggHatchedText:
text "Hello, <PLAY_G>?"
line "How is the EGG?"
@@ -70,7 +70,7 @@
line "me now!"
done
-ElmPhoneDiscovery1Text: ; 0x1b491f
+ElmPhoneDiscovery1Text:
text "Hello, <PLAY_G>?"
para "I just made a new"
@@ -83,7 +83,7 @@
line "the #MON."
done
-ElmPhoneDiscovery2Text: ; 0x1b4982
+ElmPhoneDiscovery2Text:
text "Hello, <PLAY_G>?"
para "It's still a"
@@ -96,7 +96,7 @@
line "ing that now."
done
-ElmPhonePokerusText: ; 0x1b49e7
+ElmPhonePokerusText:
text "Hello, <PLAY_G>?"
para "I discovered an"
@@ -129,7 +129,7 @@
cont "about. Bye!"
done
-ElmPhoneDisasterText: ; 0x1b4b17
+ElmPhoneDisasterText:
text "H-hello? <PLAY_G>?"
line "It's a disaster!"
@@ -143,7 +143,7 @@
line "here now!"
done
-ElmPhoneEggAssistantText: ; 0x1b4b87
+ElmPhoneEggAssistantText:
text "Hello, <PLAY_G>? We"
line "discovered some-"
@@ -158,7 +158,7 @@
cont "him?"
done
-ElmPhoneRocketText: ; 0x1b4c06
+ElmPhoneRocketText:
text "<PLAY_G>, how are"
line "things going?"
@@ -185,7 +185,7 @@
line "Take care!"
done
-ElmPhoneGiftText: ; 0x1b4d09
+ElmPhoneGiftText:
text "Hello, <PLAY_G>?"
para "I have something"
@@ -197,7 +197,7 @@
para "See you later!"
done
-ElmPhoneUnusedText: ; 0x1b4d5d
+ElmPhoneUnusedText:
text "Hello, <PLAY_G>?"
line "How's it going?"
--- a/data/phone/text/extra.asm
+++ b/data/phone/text/extra.asm
@@ -1,13 +1,12 @@
-UnknownText_0x64000: ; 0x64000
+UnknownText_0x64000:
text "I hate having to"
line "hang up on you!"
para "Call you later!"
done
-; 0x64032
-UnknownText_0x64032: ; 0x64032
+UnknownText_0x64032:
text "<PLAY_G>, have you"
line "heard?"
@@ -20,9 +19,8 @@
para "…Um… What's TEAM"
line "ROCKET?"
done
-; 0x64099
-UnknownText_0x64099: ; 0x64099
+UnknownText_0x64099:
text "<PLAY_G>, I heard!"
para "You defeated that"
@@ -31,9 +29,8 @@
para "It makes me proud"
line "to be your friend!"
done
-; 0x640e6
-UnknownText_0x640e6: ; 0x640e6
+UnknownText_0x640e6:
text "Hey, I heard about"
line "you!"
@@ -49,9 +46,8 @@
para "when I'm sick in"
line "bed with a cold!"
done
-; 0x6416d
-UnknownText_0x6416d: ; 0x6416d
+UnknownText_0x6416d:
text "I heard, I heard,"
line "I heard!"
@@ -64,9 +60,8 @@
para "But um… What was"
line "TEAM ROCKET?"
done
-; 0x641e8
-UnknownText_0x641e8: ; 0x641e8
+UnknownText_0x641e8:
text "I heard, I heard,"
line "I heard!"
@@ -76,9 +71,8 @@
para "RADIO TOWER! You"
line "rock so hard!"
done
-; 0x64247
-UnknownText_0x64247: ; 0x64247
+UnknownText_0x64247:
text "I saw, I saw!"
para "I saw you go into"
@@ -90,9 +84,8 @@
para "need to be modest!"
line "You can't fail!"
done
-; 0x642bb
-UnknownText_0x642bb: ; 0x642bb
+UnknownText_0x642bb:
text "Yesterday, I went"
line "out to NEW BARK"
@@ -120,9 +113,8 @@
para "if I were your"
line "mom, believe me!"
done
-; 0x643d4
-UnknownText_0x643d4: ; 0x643d4
+UnknownText_0x643d4:
text "I saw, I saw,"
line "I saw!"
@@ -135,9 +127,8 @@
para "with the sea as"
line "your backdrop!"
done
-; 0x64448
-UnknownText_0x64448: ; 0x64448
+UnknownText_0x64448:
text "I heard, I heard!"
para "You got a MAGNET"
@@ -164,9 +155,8 @@
para "What do you mean"
line "by FLY?"
done
-; 0x6455b
-UnknownText_0x6455b: ; 0x6455b
+UnknownText_0x6455b:
text "I saw, I saw!"
para "You waking up"
@@ -184,9 +174,8 @@
para "Wow! That's like"
line "magic!"
done
-; 0x645ff
-UnknownText_0x645ff: ; 0x645ff
+UnknownText_0x645ff:
text "I hear rumors"
line "about you all over"
cont "the place."
@@ -203,9 +192,8 @@
para "I'll always be"
line "cheering you on!"
done
-; 0x646a3
-IrwinCalledRightAwayText: ; 0x646a3
+IrwinCalledRightAwayText:
text "Hehe, I called"
line "right away!"
@@ -212,9 +200,8 @@
para "I think we can be"
line "good friends!"
done
-; 0x646df
-UnknownText_0x646df: ; 0x646df
+UnknownText_0x646df:
text "I saw, I heard!"
para "You beat MORTY of"
@@ -238,9 +225,8 @@
para "chickened out and"
line "took off for home…"
done
-; 0x647d8
-UnknownText_0x647d8: ; 0x647d8
+UnknownText_0x647d8:
text "<PLAY_G>, I heard!"
para "You're kicking up"
@@ -254,9 +240,8 @@
para "You so rock!"
done
-; 0x64846
-UnknownText_0x64846: ; 0x64846
+UnknownText_0x64846:
text "Hearing about your"
line "escapades rocks my"
@@ -263,9 +248,8 @@
para "soul!"
line "It sure does!"
done
-; 0x64881
-UnknownText_0x64881: ; 0x64881
+UnknownText_0x64881:
text "I'm so glad you"
line "called!"
@@ -275,9 +259,8 @@
para "I guess we must be"
line "a good match!"
done
-; 0x648dc
-UnknownText_0x648dc: ; 0x648dc
+UnknownText_0x648dc:
text "How are you?"
para "What are you"
@@ -305,9 +288,8 @@
para "chat about! This"
line "is going nowhere!"
done
-; 0x649dc
-ArnieLovesTheCuteText: ; 0x649dc
+ArnieLovesTheCuteText:
text "I'm always with my"
line "@"
text_from_ram wStringBuffer4
@@ -316,9 +298,8 @@
para "It's so cute!"
line "I just love it!"
done
-; 0x64a13
-UnknownText_0x64a13: ; 0x64a13
+UnknownText_0x64a13:
text "Changing the topic"
line "here, I saw this"
@@ -330,9 +311,8 @@
para "It was easy to"
line "beat, actually."
done
-; 0x64a71
-UnknownText_0x64a71: ; 0x64a71
+UnknownText_0x64a71:
text "I was wondering,"
line "do you happen to"
cont "have @"
@@ -345,9 +325,8 @@
para "its weakness, I"
line "wonder."
done
-; 0x64ada
-UnknownText_0x64ada: ; 0x64ada
+UnknownText_0x64ada:
text "Hey, let's battle"
line "our #MON!"
@@ -362,15 +341,13 @@
text_from_ram wStringBuffer5
text "!"
done
-; 0x64b48
-UnknownText_0x64b48: ; 0x64b48
+UnknownText_0x64b48:
text "Let's talk again,"
line "huh?"
done
-; 0x64b5f
-UnknownText_0x64b5f: ; 0x64b5f
+UnknownText_0x64b5f:
text "Boy, am I glad I"
line "caught you!"
@@ -387,9 +364,8 @@
para "You have to see"
line "this!"
done
-; 0x64bc6
-UnknownText_0x64bc6: ; 0x64bc6
+UnknownText_0x64bc6:
text "I haven't had any"
line "luck seeing rare"
cont "#MON lately…"
@@ -397,9 +373,8 @@
para "But I know they're"
line "out there!"
done
-; 0x64c13
-UnknownText_0x64c13: ; 0x64c13
+UnknownText_0x64c13:
text "Hey, where are you"
line "now?"
@@ -409,9 +384,8 @@
text_from_ram wStringBuffer5
text "!"
done
-; 0x64c5a
-UnknownText_0x64c5a: ; 0x64c5a
+UnknownText_0x64c5a:
text "Hello? Are you"
line "coming or what?"
@@ -421,9 +395,8 @@
para "Get down to ROUTE"
line "35 right now!"
done
-; 0x64cbd
-AlanGettingStrongerText: ; 0x64cbd
+AlanGettingStrongerText:
text "My @"
text_from_ram wStringBuffer4
text "'s"
@@ -432,9 +405,8 @@
para "exactly as I"
line "calculated!"
done
-; 0x64cf3
-UnknownText_0x64cf3: ; 0x64cf3
+UnknownText_0x64cf3:
text "By the way, we"
line "knocked out a wild"
@@ -446,9 +418,8 @@
para "Studying up in"
line "advance worked!"
done
-; 0x64d4f
-UnknownText_0x64d4f: ; 0x64d4f
+UnknownText_0x64d4f:
text "By the way, a wild"
line "@"
text_from_ram wStringBuffer4
@@ -458,9 +429,8 @@
para "A computational"
line "error on my part…"
done
-; 0x64da4
-UnknownText_0x64da4: ; 0x64da4
+UnknownText_0x64da4:
text "I've studied quite"
line "a bit since then,"
@@ -475,14 +445,12 @@
para "Can you come down"
line "for a battle?"
done
-; 0x64e1f
-UnknownText_0x64e1f: ; 0x64e1f
+UnknownText_0x64e1f:
text "See you later!"
done
-; 0x64e2f
-UnknownText_0x64e2f: ; 0x64e2f
+UnknownText_0x64e2f:
text "Hehehe, I picked"
line "up something nice!"
@@ -494,9 +462,8 @@
text_start
line "and pick it up?"
done
-; 0x64e90
-UnknownText_0x64e90: ; 0x64e90
+UnknownText_0x64e90:
text "I haven't picked"
line "up anything yet."
@@ -503,9 +470,8 @@
para "I'll call you if I"
line "find something."
done
-; 0x64ed4
-UnknownText_0x64ed4: ; 0x64ed4
+UnknownText_0x64ed4:
text "If we don't battle"
line "soon, I'll forget"
cont "my strategy!"
@@ -515,9 +481,8 @@
text_from_ram wStringBuffer5
text "!"
done
-; 0x64f1a
-UnknownText_0x64f1a: ; 0x64f1a
+UnknownText_0x64f1a:
text "I have to do my"
line "homework, so can"
@@ -529,9 +494,8 @@
text_from_ram wStringBuffer5
text "!"
done
-; 0x64f74
-UnknownText_0x64f74: ; 0x64f74
+UnknownText_0x64f74:
text "My @"
text_from_ram wStringBuffer4
text " is"
@@ -540,9 +504,8 @@
para "I've been taking"
line "photos galore!"
done
-; 0x64fb2
-UnknownText_0x64fb2: ; 0x64fb2
+UnknownText_0x64fb2:
text "It took only an"
line "instant to KO a"
cont "wild @"
@@ -555,9 +518,8 @@
para "battling tips last"
line "time."
done
-; 0x6501c
-UnknownText_0x6501c: ; 0x6501c
+UnknownText_0x6501c:
text "You know what?"
line "A wild @"
text_from_ram wStringBuffer4
@@ -571,9 +533,8 @@
para "little bit more,"
line "and I would've…"
done
-; 0x65091
-UnknownText_0x65091: ; 0x65091
+UnknownText_0x65091:
text "Right now, I'm on"
line "@"
text_from_ram wStringBuffer5
@@ -585,14 +546,12 @@
para "I'll be waiting"
line "for you!"
done
-; 0x650e2
-UnknownText_0x650e2: ; 0x650e2
+UnknownText_0x650e2:
text "See you!"
done
-; 0x650ec
-UnknownText_0x650ec: ; 0x650ec
+UnknownText_0x650ec:
text "You know what?"
line "I got a good gift!"
@@ -607,9 +566,8 @@
text_from_ram wStringBuffer5
text "!"
done
-; 0x65161
-UnknownText_0x65161: ; 0x65161
+UnknownText_0x65161:
text "Oh! You wanted a"
line "gift, right?"
@@ -619,9 +577,8 @@
para "Can you wait a bit"
line "longer?"
done
-; 0x651bf
-UnknownText_0x651bf: ; 0x651bf
+UnknownText_0x651bf:
text "Hi! You haven't"
line "forgotten about"
@@ -633,9 +590,8 @@
text_from_ram wStringBuffer5
text "!"
done
-; 0x6520f
-UnknownText_0x6520f: ; 0x6520f
+UnknownText_0x6520f:
text "Hello?"
para "If you don't come"
@@ -649,9 +605,8 @@
text_from_ram wStringBuffer5
text "!"
done
-; 0x65271
-ChadObservingWildText: ; 0x65271
+ChadObservingWildText:
text "I recently began"
line "observing wild"
cont "@"
@@ -670,9 +625,8 @@
para "researcher like"
line "PROF.OAK soon."
done
-; 0x65318
-UnknownText_0x65318: ; 0x65318
+UnknownText_0x65318:
text "Oh yes, I managed"
line "to knock out a"
@@ -687,9 +641,8 @@
para "do every day, it"
line "was inevitable."
done
-; 0x65399
-UnknownText_0x65399: ; 0x65399
+UnknownText_0x65399:
text "Oh yes, I came"
line "close to catching"
@@ -706,9 +659,8 @@
text_from_ram wStringBuffer4
text ". Rats…"
done
-; 0x65419
-UnknownText_0x65419: ; 0x65419
+UnknownText_0x65419:
text "Want to battle?"
line "I have to battle"
@@ -720,14 +672,12 @@
text_from_ram wStringBuffer5
text "!"
done
-; 0x65471
-UnknownText_0x65471: ; 0x65471
+UnknownText_0x65471:
text "See you later!"
done
-; 0x65481
-ChadBlueGossipText: ; 0x65481
+ChadBlueGossipText:
text "Do you know BLUE?"
para "He's PROF.OAK's"
@@ -739,9 +689,8 @@
para "He's one super"
line "#MON trainer!"
done
-; 0x654ea
-ChadDaisyGossipText: ; 0x654ea
+ChadDaisyGossipText:
text "PROF.OAK has a"
line "granddaughter"
cont "named DAISY."
@@ -752,9 +701,8 @@
para "ferocious #MON"
line "calm right down."
done
-; 0x65555
-ChadProfElmGossipText: ; 0x65555
+ChadProfElmGossipText:
text "Everyone's talking"
line "about PROF.ELM."
@@ -765,9 +713,8 @@
para "That is so cool!"
line "I envy him!"
done
-; 0x655c7
-ChadDreamGossipText: ; 0x655c7
+ChadDreamGossipText:
text "PROF.OAK's dream"
line "is to compile a"
@@ -778,9 +725,8 @@
line "taking part in"
cont "that project…"
done
-; 0x65628
-ChadKurtGossipText: ; 0x65628
+ChadKurtGossipText:
text "Do you know KURT,"
line "the BALL creator?"
@@ -791,9 +737,8 @@
line "people attract one"
cont "another!"
done
-; 0x6569b
-ChadLeagueGossipText: ; 0x6569b
+ChadLeagueGossipText:
text "#MON LEAGUE is"
line "the great gather-"
cont "ing place for all"
@@ -810,9 +755,8 @@
para "He really is a"
line "great man."
done
-; 0x6574a
-ChadRadioShowGossipText: ; 0x6574a
+ChadRadioShowGossipText:
text "PROF.OAK'S #MON"
line "TALK is a popular"
cont "radio show, right?"
@@ -830,9 +774,8 @@
para "So we have MARY to"
line "thank for it!"
done
-; 0x65810
-ChadBattlingGossipText: ; 0x65810
+ChadBattlingGossipText:
text "PROF.OAK used to"
line "be a trainer a"
cont "long time ago."
@@ -849,9 +792,8 @@
para "focus on becoming"
line "a researcher."
done
-; 0x658c6
-ChadDaisyTeaGossipText: ; 0x658c6
+ChadDaisyTeaGossipText:
text "PROF.OAK has a"
line "granddaughter"
cont "named DAISY."
@@ -868,9 +810,8 @@
para "and chat about"
line "PROF.OAK."
done
-; 0x65969
-ChadTravelGossipText: ; 0x65969
+ChadTravelGossipText:
text "Did you know?"
line "PROF.OAK traveled"
@@ -889,9 +830,8 @@
para "and learn about"
line "things too…"
done
-; 0x65a23
-UnknownText_0x65a23: ; 0x65a23
+UnknownText_0x65a23:
text "I'm going to study"
line "hard so PROF.OAK"
@@ -898,9 +838,8 @@
para "will make me his"
line "assistant!"
done
-; 0x65a63
-UnknownText_0x65a63: ; 0x65a63
+UnknownText_0x65a63:
text "Do you remember"
line "about our battle?"
@@ -912,9 +851,8 @@
para "Hurry over--I'm"
line "waiting."
done
-; 0x65ab2
-DerekCheekPincherText: ; 0x65ab2
+DerekCheekPincherText:
text "Listen to this."
line "My @"
text_from_ram wStringBuffer4
@@ -927,9 +865,8 @@
para "I must be special."
done
-; 0x65b29
-UnknownText_0x65b29: ; 0x65b29
+UnknownText_0x65b29:
text "Oh, and recently,"
line "my PIKACHU beat a"
cont "wild @"
@@ -950,9 +887,8 @@
para "My PIKACHU is the"
line "greatest!"
done
-; 0x65bc8
-UnknownText_0x65bc8: ; 0x65bc8
+UnknownText_0x65bc8:
text "Oh, and I saw a"
line "wild @"
text_from_ram wStringBuffer4
@@ -968,15 +904,13 @@
para "cute. They're no"
line "good otherwise."
done
-; 0x65c4e
-UnknownText_0x65c4e: ; 0x65c4e
+UnknownText_0x65c4e:
text "Well, let's talk"
line "again!"
done
-; 0x65c66
-DerekBugCatchingContestText: ; 0x65c66
+DerekBugCatchingContestText:
text "Did you remember?"
line "The Bug-Catching"
cont "Contest is today."
@@ -990,9 +924,8 @@
para "PIKACHU to show"
line "off its cuteness."
done
-; 0x65cf9
-UnknownText_0x65cf9: ; 0x65cf9
+UnknownText_0x65cf9:
text "I'd like you to"
line "have a NUGGET."
@@ -1003,9 +936,8 @@
line "PIKACHU will love"
cont "it too!"
done
-; 0x65d5c
-UnknownText_0x65d5c: ; 0x65d5c
+UnknownText_0x65d5c:
text "How is your"
line "PIKACHU doing?"
@@ -1013,9 +945,8 @@
line "and brag about our"
cont "PIKACHU!"
done
-; 0x65da6
-UnknownText_0x65da6: ; 0x65da6
+UnknownText_0x65da6:
text "What's wrong?"
para "I'm waiting on"
@@ -1026,9 +957,8 @@
para "Come pick this up"
line "anytime."
done
-; 0x65de4
-TullyGrownText: ; 0x65de4
+TullyGrownText:
text "My @"
text_from_ram wStringBuffer4
text " has"
@@ -1040,9 +970,8 @@
para "caught it, but now"
line "it's way bigger."
done
-; 0x65e42
-UnknownText_0x65e42: ; 0x65e42
+UnknownText_0x65e42:
text "Oh yeah, I KO'd a"
line "wild @"
text_from_ram wStringBuffer4
@@ -1055,9 +984,8 @@
line "can't tell over"
cont "the phone…"
done
-; 0x65eac
-UnknownText_0x65eac: ; 0x65eac
+UnknownText_0x65eac:
text "Oh yeah, I lost a"
line "wild @"
text_from_ram wStringBuffer4
@@ -1070,9 +998,8 @@
line "can't tell over"
cont "the phone…"
done
-; 0x65f17
-UnknownText_0x65f17: ; 0x65f17
+UnknownText_0x65f17:
text "We should get a"
line "battle going!"
@@ -1084,15 +1011,13 @@
para "Swing by if you"
line "have the time."
done
-; 0x65f6e
-UnknownText_0x65f6e: ; 0x65f6e
+UnknownText_0x65f6e:
text "Well, I'll be"
line "seeing you."
done
-; 0x65f88
-UnknownText_0x65f88: ; 0x65f88
+UnknownText_0x65f88:
text "I picked up a good"
line "little thing at"
cont "the water's edge."
@@ -1105,9 +1030,8 @@
text_from_ram wStringBuffer5
text "."
done
-; 0x65ff2
-UnknownText_0x65ff2: ; 0x65ff2
+UnknownText_0x65ff2:
text "Have I found"
line "anything good?"
@@ -1116,9 +1040,8 @@
para "It's like fishing,"
line "you need patience."
done
-; 0x66043
-UnknownText_0x66043: ; 0x66043
+UnknownText_0x66043:
text "Yup, TULLY here…"
para "<PLAY_G>? What?"
@@ -1129,9 +1052,8 @@
text_from_ram wStringBuffer5
text "."
done
-; 0x66087
-UnknownText_0x66087: ; 0x66087
+UnknownText_0x66087:
text "I've got something"
line "good for you."
@@ -1140,9 +1062,8 @@
text_from_ram wStringBuffer5
text "."
done
-; 0x660be
-BrentRareTradeText: ; 0x660be
+BrentRareTradeText:
text "Oh yeah, I got an"
line "extremely rare"
@@ -1155,9 +1076,8 @@
para "Hehe, I'm keeping"
line "it a secret!"
done
-; 0x6613c
-UnknownText_0x6613c: ; 0x6613c
+UnknownText_0x6613c:
text "Oh yeah, I took"
line "down this wild"
@@ -1169,9 +1089,8 @@
para "enough to bother"
line "catching."
done
-; 0x6618c
-UnknownText_0x6618c: ; 0x6618c
+UnknownText_0x6618c:
text "Oh yeah, I saw a"
line "rare #MON about"
cont "an hour ago."
@@ -1185,9 +1104,8 @@
para "Would BILL laugh"
line "at my mistakes?"
done
-; 0x66214
-UnknownText_0x66214: ; 0x66214
+UnknownText_0x66214:
text "You've got time"
line "like usual, right?"
@@ -1205,14 +1123,12 @@
text_from_ram wStringBuffer5
text "."
done
-; 0x662a9
-UnknownText_0x662a9: ; 0x662a9
+UnknownText_0x662a9:
text "So that's it then."
done
-; 0x662bc
-UnknownText_0x662bc: ; 0x662bc
+UnknownText_0x662bc:
text "Did you know…?"
line "BILL's father is"
@@ -1219,9 +1135,8 @@
para "supposed to be a"
line "great #MANIAC."
done
-; 0x662fc
-UnknownText_0x662fc: ; 0x662fc
+UnknownText_0x662fc:
text "Did you know…?"
line "Apparently BILL's"
@@ -1228,16 +1143,14 @@
para "grandpa isn't a"
line "#MANIAC."
done
-; 0x66335
-UnknownText_0x66335: ; 0x66335
+UnknownText_0x66335:
text "Did you know…?"
line "BILL's originally"
cont "from GOLDENROD."
done
-; 0x66366
-UnknownText_0x66366: ; 0x66366
+UnknownText_0x66366:
text "Did you know…?"
line "BILL evidently"
@@ -1244,9 +1157,8 @@
para "lives on ROUTE 25"
line "in KANTO."
done
-; 0x663a1
-UnknownText_0x663a1: ; 0x663a1
+UnknownText_0x663a1:
text "Did you know…?"
line "ABRA was the first"
@@ -1253,9 +1165,8 @@
para "#MON that BILL"
line "ostensibly caught."
done
-; 0x663e6
-UnknownText_0x663e6: ; 0x663e6
+UnknownText_0x663e6:
text "Did you know…?"
line "BILL's younger"
@@ -1262,9 +1173,8 @@
para "sister apparently"
line "can't wink."
done
-; 0x66421
-UnknownText_0x66421: ; 0x66421
+UnknownText_0x66421:
text "Did you know…?"
line "BILL supposedly"
@@ -1271,9 +1181,8 @@
para "hates milk and"
line "can't drink it."
done
-; 0x6645f
-UnknownText_0x6645f: ; 0x6645f
+UnknownText_0x6645f:
text "Did you know…?"
line "Evidently, BILL"
@@ -1280,9 +1189,8 @@
para "isn't very good at"
line "battling."
done
-; 0x6649b
-UnknownText_0x6649b: ; 0x6649b
+UnknownText_0x6649b:
text "Did you know…?"
line "BILL appears to"
@@ -1289,9 +1197,8 @@
para "like the lady at"
line "the FLOWER SHOP."
done
-; 0x664dd
-UnknownText_0x664dd: ; 0x664dd
+UnknownText_0x664dd:
text "Did you know…?"
line "BILL's mother is"
@@ -1298,9 +1205,8 @@
para "said to have been"
line "a KIMONO GIRL."
done
-; 0x6651e
-UnknownText_0x6651e: ; 0x6651e
+UnknownText_0x6651e:
text "You wanted to hear"
line "about BILL?"
@@ -1310,9 +1216,8 @@
para "I'll call when I"
line "have time."
done
-; 0x66579
-UnknownText_0x66579: ; 0x66579
+UnknownText_0x66579:
text "You want to see my"
line "rare #MON."
@@ -1321,9 +1226,8 @@
text_from_ram wStringBuffer5
text "."
done
-; 0x665ad
-UnknownText_0x665ad: ; 0x665ad
+UnknownText_0x665ad:
text "My @"
text_from_ram wStringBuffer4
text "'s"
@@ -1335,9 +1239,8 @@
para "with it--it's so"
line "fluffy and warm!"
done
-; 0x66605
-UnknownText_0x66605: ; 0x66605
+UnknownText_0x66605:
text "Oh, and we had to"
line "battle a wild"
@@ -1356,9 +1259,8 @@
text_from_ram wStringBuffer4
text "!"
done
-; 0x66688
-UnknownText_0x66688: ; 0x66688
+UnknownText_0x66688:
text "Oh, and we had to"
line "battle a wild"
@@ -1377,9 +1279,8 @@
line "feeling protective"
cont "of my CLEFAIRY."
done
-; 0x66730
-UnknownText_0x66730: ; 0x66730
+UnknownText_0x66730:
text "I know this might"
line "surprise you, but"
@@ -1392,9 +1293,8 @@
text_from_ram wStringBuffer5
text "."
done
-; 0x66796
-TiffanyItsAwfulText: ; 0x66796
+TiffanyItsAwfulText:
text_from_ram wStringBuffer4
text "!"
@@ -1409,14 +1309,12 @@
para "I have to go!"
line "Bye-bye!"
done
-; 0x667f7
-UnknownText_0x667f7: ; 0x667f7
+UnknownText_0x667f7:
text "Bye-bye!"
done
-; 0x66801
-UnknownText_0x66801: ; 0x66801
+UnknownText_0x66801:
text "I bought some PINK"
line "BOWS at GOLDENROD"
@@ -1431,15 +1329,13 @@
text_from_ram wStringBuffer5
text "."
done
-; 0x66882
-UnknownText_0x66882: ; 0x66882
+UnknownText_0x66882:
text "I love dressing up"
line "my CLEFAIRY!"
done
-; 0x668a3
-UnknownText_0x668a3: ; 0x668a3
+UnknownText_0x668a3:
text "What's wrong?"
line "Can't you visit?"
@@ -1454,9 +1350,8 @@
text_from_ram wStringBuffer5
text "!"
done
-; 0x6691d
-UnknownText_0x6691d: ; 0x6691d
+UnknownText_0x6691d:
text "What's wrong?"
line "Can't you visit?"
@@ -1469,9 +1364,8 @@
text_from_ram wStringBuffer5
text "!"
done
-; 0x66980
-VanceLiftoffText: ; 0x66980
+VanceLiftoffText:
text "My @"
text_from_ram wStringBuffer4
text "'s"
@@ -1480,9 +1374,8 @@
para "We've achieved"
line "liftoff!"
done
-; 0x669b2
-UnknownText_0x669b2: ; 0x669b2
+UnknownText_0x669b2:
text "We can easily beat"
line "@"
text_from_ram wStringBuffer4
@@ -1491,9 +1384,8 @@
para "…Huh? You too?"
line "Isn't that great?"
done
-; 0x669ed
-UnknownText_0x669ed: ; 0x669ed
+UnknownText_0x669ed:
text "But get this, a"
line "wild @"
text_from_ram wStringBuffer4
@@ -1504,9 +1396,8 @@
para "I wanted to FLY"
line "after it…"
done
-; 0x66a3a
-UnknownText_0x66a3a: ; 0x66a3a
+UnknownText_0x66a3a:
text "Right now, I'm on"
line "@"
text_from_ram wStringBuffer5
@@ -1518,21 +1409,18 @@
para "Want to battle?"
line "I'll wait here."
done
-; 0x66a93
-UnknownText_0x66a93: ; 0x66a93
+UnknownText_0x66a93:
text "OK, bye for now!"
done
-; 0x66aa5
-VanceLookingForwardText: ; 0x66aa5
+VanceLookingForwardText:
text "I'll be looking"
line "forward to our"
cont "next battle!"
done
-; 0x66ad1
-VanceHurryHurryText: ; 0x66ad1
+VanceHurryHurryText:
text "Oh, <PLAY_G>!"
line "Hurry, hurry!"
@@ -1541,9 +1429,8 @@
text "!"
line "FLY over now!"
done
-; 0x66afc
-WiltonGrownText: ; 0x66afc
+WiltonGrownText:
text "My @"
text_from_ram wStringBuffer4
text "'s"
@@ -1552,9 +1439,8 @@
para "My fishing skills"
line "have improved too!"
done
-; 0x66b3e
-UnknownText_0x66b3e: ; 0x66b3e
+UnknownText_0x66b3e:
text "We beat a wild"
line "@"
text_from_ram wStringBuffer4
@@ -1566,9 +1452,8 @@
para "than beating wild"
line "#MON."
done
-; 0x66b8f
-UnknownText_0x66b8f: ; 0x66b8f
+UnknownText_0x66b8f:
text "But a while back,"
line "we came this close"
@@ -1580,9 +1465,8 @@
para "I tell you, it was"
line "huge. Believe me."
done
-; 0x66bf3
-UnknownText_0x66bf3: ; 0x66bf3
+UnknownText_0x66bf3:
text "I'm fishing on"
line "@"
text_from_ram wStringBuffer5
@@ -1595,14 +1479,12 @@
line "time away, come"
cont "over for a battle."
done
-; 0x66c58
-UnknownText_0x66c58: ; 0x66c58
+UnknownText_0x66c58:
text "All right, later."
done
-; 0x66c6b
-UnknownText_0x66c6b: ; 0x66c6b
+UnknownText_0x66c6b:
text "I snagged an item"
line "while fishing."
@@ -1611,9 +1493,8 @@
text_from_ram wStringBuffer5
text "."
done
-; 0x66ca7
-WiltonHaventFoundAnythingText: ; 0x66ca7
+WiltonHaventFoundAnythingText:
text "Nah, I haven't"
line "found anything"
@@ -1623,9 +1504,8 @@
para "You have to have"
line "patience."
done
-; 0x66cf7
-WiltonNotBitingText: ; 0x66cf7
+WiltonNotBitingText:
text "Sigh…"
line "They're not biting"
@@ -1637,9 +1517,8 @@
para "You have to come"
line "for a battle!"
done
-; 0x66d45
-WiltonWantThisText: ; 0x66d45
+WiltonWantThisText:
text "Don't you want"
line "this item?"
@@ -1654,15 +1533,13 @@
para "MAHOGANY toward"
line "BLACKTHORN!"
done
-; 0x66dab
-UnknownText_0x66dab: ; 0x66dab
+UnknownText_0x66dab:
text "Anyway, we'll chat"
line "again!"
done
-; 0x66dc5
-UnknownText_0x66dc5: ; 0x66dc5
+UnknownText_0x66dc5:
text "Are you still on"
line "your journey?"
@@ -1671,9 +1548,8 @@
para "Oooooaaarrrgh!"
done
-; 0x66e17
-UnknownText_0x66e17: ; 0x66e17
+UnknownText_0x66e17:
text "I'm in training"
line "now. I apologize,"
@@ -1682,9 +1558,8 @@
para "Oooooaaarrrgh!"
done
-; 0x66e67
-UnknownText_0x66e67: ; 0x66e67
+UnknownText_0x66e67:
text "I apologize, but I"
line "don't have time to"
@@ -1696,9 +1571,8 @@
para "Yiiihah!"
done
-; 0x66ed3
-UnknownText_0x66ed3: ; 0x66ed3
+UnknownText_0x66ed3:
text "I plan to take a"
line "lunch break, so"
@@ -1705,9 +1579,8 @@
para "come see me then!"
line "Ayiiiyah!"
done
-; 0x66f11
-KenjiBreakText: ; 0x66f11
+KenjiBreakText:
text "I'm taking a break"
line "on ROUTE 45!"
@@ -1714,9 +1587,8 @@
para "Why not drop by if"
line "you are free?"
done
-; 0x66f52
-UnknownText_0x66f52: ; 0x66f52
+UnknownText_0x66f52:
text "I rested up over"
line "my lunch break."
@@ -1725,17 +1597,15 @@
para "Oooryaah!"
done
-; 0x66f9f
-ParryNoMatchText: ; 0x66f9f
+ParryNoMatchText:
text "Nothing can match"
line "my @"
text_from_ram wStringBuffer4
text " now."
done
-; 0x66fc0
-UnknownText_0x66fc0: ; 0x66fc0
+UnknownText_0x66fc0:
text "Yeah, we KO'd a"
line "wild @"
text_from_ram wStringBuffer4
@@ -1744,9 +1614,8 @@
para "That was OK, but I"
line "wanted to get it…"
done
-; 0x67001
-UnknownText_0x67001: ; 0x67001
+UnknownText_0x67001:
text "And yesterday, we"
line "spotted a wild"
@@ -1764,9 +1633,8 @@
para "caught it!"
line "How about that!"
done
-; 0x67096
-UnknownText_0x67096: ; 0x67096
+UnknownText_0x67096:
text "You're thinking"
line "you'd like to"
@@ -1778,21 +1646,18 @@
text_from_ram wStringBuffer5
text "!"
done
-; 0x670eb
-UnknownText_0x670eb: ; 0x670eb
+UnknownText_0x670eb:
text "OK, give me a call"
line "again!"
done
-; 0x67106
-ParryBattleWithMeText: ; 0x67106
+ParryBattleWithMeText:
text "You'll battle with"
line "me again, right?"
done
-; 0x6712a
-ParryHaventYouGottenToText: ; 0x6712a
+ParryHaventYouGottenToText:
text "Haven't you gotten"
line "to @"
text_from_ram wStringBuffer5
@@ -1802,9 +1667,8 @@
line "bad, but I'd sure"
cont "like to battle!"
done
-; 0x6717a
-UnknownText_0x6717a: ; 0x6717a
+UnknownText_0x6717a:
text_from_ram wStringBuffer3
text "'s @"
text_from_ram wStringBuffer4
@@ -1812,9 +1676,8 @@
line "is much stronger"
cont "than before!"
done
-; 0x671a4
-UnknownText_0x671a4: ; 0x671a4
+UnknownText_0x671a4:
text "And, and…"
line "I just battled and"
cont "beat @"
@@ -1824,9 +1687,8 @@
para "I've raised my"
line "#MON properly!"
done
-; 0x671eb
-UnknownText_0x671eb: ; 0x671eb
+UnknownText_0x671eb:
text "But, but…"
para "A wild @"
@@ -1837,9 +1699,8 @@
para "again. It's just"
line "not fair!"
done
-; 0x6722e
-UnknownText_0x6722e: ; 0x6722e
+UnknownText_0x6722e:
text "I'm ERIN. Want to"
line "battle me again?"
@@ -1851,14 +1712,12 @@
text_from_ram wStringBuffer5
text "!"
done
-; 0x67281
-UnknownText_0x67281: ; 0x67281
+UnknownText_0x67281:
text "See you. Bye-bye!"
done
-; 0x67294
-ErinWorkingHardText: ; 0x67294
+ErinWorkingHardText:
text "I'm working hard"
line "to raise my"
cont "#MON!"
@@ -1866,9 +1725,8 @@
para "Come back for"
line "another battle!"
done
-; 0x672d5
-ErinComeBattleText: ; 0x672d5
+ErinComeBattleText:
text "Oh, <PLAY_G>!"
line "Come battle ERIN!"
@@ -1877,4 +1735,3 @@
text_from_ram wStringBuffer5
text "!"
done
-; 0x67308
--- a/data/phone/text/extra2.asm
+++ b/data/phone/text/extra2.asm
@@ -1,4 +1,4 @@
-UnknownText_0x174000: ; 0x174000
+UnknownText_0x174000:
text "Hi, <PLAY_G>!"
line "Our BICYCLE sales"
@@ -17,9 +17,8 @@
para "keep that BICYCLE."
line "Thanks again!"
done
-; 0x1740c0
-JackIntelligenceText: ; 0x1740c0
+JackIntelligenceText:
text "My @"
text_from_ram wStringBuffer4
text "'s"
@@ -29,9 +28,8 @@
line "be smarter than"
cont "yours!"
done
-; 0x174106
-JackDefeatedMonText: ; 0x174106
+JackDefeatedMonText:
text "The other day, I"
line "easily defeated a"
cont "@"
@@ -42,9 +40,8 @@
line "tips with you is"
cont "starting to help."
done
-; 0x174165
-UnknownText_0x174165: ; 0x174165
+UnknownText_0x174165:
text "Oh, and listen."
line "I missed catching"
@@ -59,9 +56,8 @@
para "sure I would've"
line "caught it…"
done
-; 0x1741e1
-UnknownText_0x1741e1: ; 0x1741e1
+UnknownText_0x1741e1:
text "Do you want to"
line "battle? I'll show"
@@ -76,14 +72,12 @@
para "Give me a shout if"
line "you're nearby."
done
-; 0x174251
-UnknownText_0x174251: ; 0x174251
+UnknownText_0x174251:
text "See you later!"
done
-; 0x174261
-JackThunderTriviaText: ; 0x174261
+JackThunderTriviaText:
text "Did you know?"
para "When it's raining,"
@@ -90,9 +84,8 @@
line "THUNDER is sure to"
cont "strike."
done
-; 0x17429d
-JackRolloutTriviaText: ; 0x17429d
+JackRolloutTriviaText:
text "Did you know…?"
para "If you use DEFENSE"
@@ -101,9 +94,8 @@
para "power goes way up"
line "past normal."
done
-; 0x1742ee
-JackSolarbeamTriviaText: ; 0x1742ee
+JackSolarbeamTriviaText:
text "Did you know…?"
para "If the sunlight is"
@@ -112,9 +104,8 @@
para "doesn't need to be"
line "charged up."
done
-; 0x174340
-JackStompTriviaText: ; 0x174340
+JackStompTriviaText:
text "Did you know…?"
para "If the opponent"
@@ -123,9 +114,8 @@
para "your STOMP becomes"
line "more powerful."
done
-; 0x174391
-JackGustTriviaText: ; 0x174391
+JackGustTriviaText:
text "Did you know…?"
para "If your opponent"
@@ -134,9 +124,8 @@
para "GUST becomes much"
line "more powerful."
done
-; 0x1743e3
-JackTwisterTriviaText: ; 0x1743e3
+JackTwisterTriviaText:
text "Did you know…?"
para "If your opponent"
@@ -145,9 +134,8 @@
para "TWISTER becomes"
line "more powerful."
done
-; 0x174433
-JackEarthquakeTriviaText: ; 0x174433
+JackEarthquakeTriviaText:
text "Did you know…?"
para "If your opponent"
@@ -156,9 +144,8 @@
para "EARTHQUAKE becomes"
line "more powerful."
done
-; 0x174485
-JackMagnitudeTriviaText: ; 0x174485
+JackMagnitudeTriviaText:
text "Did you know…?"
para "If your opponent"
@@ -167,9 +154,8 @@
para "MAGNITUDE becomes"
line "more powerful."
done
-; 0x1744d6
-JackSandstormTriviaText: ; 0x1744d6
+JackSandstormTriviaText:
text "Did you know…?"
para "The rock, ground"
@@ -178,9 +164,8 @@
para "can't be hurt by"
line "SANDSTORM."
done
-; 0x174522
-JackSunnyDayTriviaText: ; 0x174522
+JackSunnyDayTriviaText:
text "Did you know…?"
para "If the sunlight is"
@@ -189,9 +174,8 @@
para "moves become much"
line "weaker."
done
-; 0x174571
-JackRainDanceTriviaText: ; 0x174571
+JackRainDanceTriviaText:
text "Did you know…?"
para "When it's raining,"
@@ -200,9 +184,8 @@
para "become much weaker"
line "than usual."
done
-; 0x1745c2
-UnknownText_0x1745c2: ; 0x1745c2
+UnknownText_0x1745c2:
text "My friend heard"
line "some great tips."
@@ -213,9 +196,8 @@
line "I'll call right"
cont "away and tell you."
done
-; 0x174638
-UnknownText_0x174638: ; 0x174638
+UnknownText_0x174638:
text "Hey, <PLAY_G>!"
para "Do you remember"
@@ -229,9 +211,8 @@
text_from_ram wStringBuffer5
text "."
done
-; 0x174688
-UnknownText_0x174688: ; 0x174688
+UnknownText_0x174688:
text "I fancied up my"
line "@"
text_from_ram wStringBuffer4
@@ -240,9 +221,8 @@
para "made it even cuter"
line "than before!"
done
-; 0x1746c3
-UnknownText_0x1746c3: ; 0x1746c3
+UnknownText_0x1746c3:
text "I happened to come"
line "across a wild"
cont "SNUBBULL recently."
@@ -253,9 +233,8 @@
para "far cuter than the"
line "wild one."
done
-; 0x174734
-UnknownText_0x174734: ; 0x174734
+UnknownText_0x174734:
text "I happened to see"
line "a wild MARILL the"
@@ -270,15 +249,13 @@
text ". I was"
line "quite miffed."
done
-; 0x1747ac
-UnknownText_0x1747ac: ; 0x1747ac
+UnknownText_0x1747ac:
text "You can expect a"
line "call from me."
done
-; 0x1747cc
-BeverlyFoundNuggetText: ; 0x1747cc
+BeverlyFoundNuggetText:
text "My husband got"
line "some NUGGETS."
@@ -296,9 +273,8 @@
para "Please come see me"
line "when you can."
done
-; 0x17485b
-UnknownText_0x17485b: ; 0x17485b
+UnknownText_0x17485b:
text "Are your #MON"
line "in prime form?"
@@ -305,9 +281,8 @@
para "Let's chat about"
line "#MON again."
done
-; 0x174895
-UnknownText_0x174895: ; 0x174895
+UnknownText_0x174895:
text "Pardon?"
line "Oh, the NUGGET?"
@@ -319,9 +294,8 @@
text_start
line "when you can."
done
-; 0x1748ea
-UnknownText_0x1748ea: ; 0x1748ea
+UnknownText_0x1748ea:
text "Hey, I challenge"
line "you to a battle!"
@@ -336,14 +310,12 @@
para "for you. Hustle"
line "over here pronto!"
done
-; 0x174962
-UnknownText_0x174962: ; 0x174962
+UnknownText_0x174962:
text "See ya!"
done
-; 0x17496b
-UnknownText_0x17496b: ; 0x17496b
+UnknownText_0x17496b:
text "We have to battle"
line "again sometime."
@@ -353,9 +325,8 @@
para "challenging you"
line "till I win."
done
-; 0x1749c7
-UnknownText_0x1749c7: ; 0x1749c7
+UnknownText_0x1749c7:
text "Hey, you'd better"
line "not have forgotten"
cont "about our battle!"
@@ -367,9 +338,8 @@
para "Hustle over quick!"
line "I'm waiting!"
done
-; 0x174a24
-GavenGreaterText: ; 0x174a24
+GavenGreaterText:
text "My @"
text_from_ram wStringBuffer4
text_start
@@ -382,9 +352,8 @@
text " that's"
cont "better than mine."
done
-; 0x174a80
-UnknownText_0x174a80: ; 0x174a80
+UnknownText_0x174a80:
text "Oh, and I managed"
line "to barely defeat"
@@ -406,9 +375,8 @@
line "#MON you're"
cont "used to seeing."
done
-; 0x174b2d
-UnknownText_0x174b2d: ; 0x174b2d
+UnknownText_0x174b2d:
text "And a while back,"
line "I tried to catch a"
cont "wild @"
@@ -424,9 +392,8 @@
para "failure… You ought"
line "to be careful too."
done
-; 0x174bc5
-UnknownText_0x174bc5: ; 0x174bc5
+UnknownText_0x174bc5:
text "Let's battle!"
para "I'll be waiting on"
@@ -437,21 +404,18 @@
para "Give me a shout"
line "when you're close."
done
-; 0x174c0e
-UnknownText_0x174c0e: ; 0x174c0e
+UnknownText_0x174c0e:
text "OK, I'll talk to"
line "you soon!"
done
-; 0x174c29
-UnknownText_0x174c29: ; 0x174c29
+UnknownText_0x174c29:
text "I obsess over how"
line "to beat you."
done
-; 0x174c49
-UnknownText_0x174c49: ; 0x174c49
+UnknownText_0x174c49:
text "<PLAY_G>, why"
line "aren't you here?"
@@ -460,9 +424,8 @@
text_from_ram wStringBuffer5
text "!"
done
-; 0x174c7f
-UnknownText_0x174c7f: ; 0x174c7f
+UnknownText_0x174c7f:
text "Do you remember my"
line "sweet @"
text_from_ram wStringBuffer4
@@ -479,9 +442,8 @@
para "back when it"
line "really gets going."
done
-; 0x174cf6
-UnknownText_0x174cf6: ; 0x174cf6
+UnknownText_0x174cf6:
text "Oh, have you ever"
line "seen a @"
text_from_ram wStringBuffer4
@@ -500,9 +462,8 @@
para "I still won, of"
line "course."
done
-; 0x174d86
-UnknownText_0x174d86: ; 0x174d86
+UnknownText_0x174d86:
text "Oh, I just saw a"
line "wild @"
text_from_ram wStringBuffer4
@@ -524,9 +485,8 @@
para "I hope you learn"
line "from my mistake."
done
-; 0x174e4e
-UnknownText_0x174e4e: ; 0x174e4e
+UnknownText_0x174e4e:
text "Do you want to"
line "battle? I'm going"
cont "to win this time!"
@@ -539,20 +499,17 @@
text "."
line "Look for me, OK?"
done
-; 0x174eb7
-UnknownText_0x174eb7: ; 0x174eb7
+UnknownText_0x174eb7:
text "OK, bye-bye!"
done
-; 0x174ec5
-UnknownText_0x174ec5: ; 0x174ec5
+UnknownText_0x174ec5:
text "Let's battle again"
line "sometime!"
done
-; 0x174ee2
-BethForgetDealText: ; 0x174ee2
+BethForgetDealText:
text "Um… <PLAY_G>?"
line "What's wrong?"
@@ -566,9 +523,8 @@
para "That's where I'm"
line "waiting."
done
-; 0x174f2f
-JoseAromaText: ; 0x174f2f
+JoseAromaText:
text "Hey listen, my"
line "@"
text_from_ram wStringBuffer4
@@ -580,9 +536,8 @@
para "That aroma gets my"
line "appetite going!"
done
-; 0x174f90
-UnknownText_0x174f90: ; 0x174f90
+UnknownText_0x174f90:
text "A while ago, my"
line "FARFETCH'D KO'd"
cont "this @"
@@ -595,9 +550,8 @@
para "wield that stick."
line "Amazing stuff!"
done
-; 0x174ffd
-UnknownText_0x174ffd: ; 0x174ffd
+UnknownText_0x174ffd:
text "I ran into a wild"
line "@"
text_from_ram wStringBuffer4
@@ -612,9 +566,8 @@
para "would. It was a"
line "bit disappointing."
done
-; 0x17507d
-UnknownText_0x17507d: ; 0x17507d
+UnknownText_0x17507d:
text "Want to battle"
line "again?"
@@ -632,14 +585,12 @@
para "Keep an eye out"
line "for me, OK?"
done
-; 0x175106
-UnknownText_0x175106: ; 0x175106
+UnknownText_0x175106:
text "Be seeing you!"
done
-; 0x175116
-JoseFoundSomethingText: ; 0x175116
+JoseFoundSomethingText:
text "My FARFETCH'D had"
line "something pretty"
cont "in its beak."
@@ -655,9 +606,8 @@
para "and I'll let you"
line "have it."
done
-; 0x17519b
-UnknownText_0x17519b: ; 0x17519b
+UnknownText_0x17519b:
text "I haven't gotten"
line "what I promised"
cont "you yet."
@@ -668,9 +618,8 @@
para "so could you wait"
line "a little longer?"
done
-; 0x17520a
-UnknownText_0x17520a: ; 0x17520a
+UnknownText_0x17520a:
text "<PLAY_G>, could you"
line "hurry over?"
@@ -690,9 +639,8 @@
para "Please come as"
line "soon as you can!"
done
-; 0x17529c
-UnknownText_0x17529c: ; 0x17529c
+UnknownText_0x17529c:
text "What's wrong?"
para "Don't you want"
@@ -706,9 +654,8 @@
para "and I'll let you"
line "have it."
done
-; 0x1752f5
-UnknownText_0x1752f5: ; 0x1752f5
+UnknownText_0x1752f5:
text "Listen, dear…"
para "Do you recall my"
@@ -725,9 +672,8 @@
line "it's a perfect"
cont "match for me?"
done
-; 0x17536b
-UnknownText_0x17536b: ; 0x17536b
+UnknownText_0x17536b:
text "Have I ever faced"
line "a wild @"
text_from_ram wStringBuffer4
@@ -741,9 +687,8 @@
line "beaten on numerous"
cont "occasions!"
done
-; 0x1753c5
-UnknownText_0x1753c5: ; 0x1753c5
+UnknownText_0x1753c5:
text "Have I ever failed"
line "to catch a wild"
cont "#MON?"
@@ -758,9 +703,8 @@
text "…"
line "Oh! Never mind!"
done
-; 0x17543a
-UnknownText_0x17543a: ; 0x17543a
+UnknownText_0x17543a:
text "We are going to"
line "battle!"
@@ -772,14 +716,12 @@
para "Don't make me"
line "wait! Got it?"
done
-; 0x175488
-UnknownText_0x175488: ; 0x175488
+UnknownText_0x175488:
text "Fine, you may go."
done
-; 0x17549b
-UnknownText_0x17549b: ; 0x17549b
+UnknownText_0x17549b:
text "Don't be too proud"
line "just because you"
@@ -788,9 +730,8 @@
para "It was a fluke!"
done
-; 0x1754e5
-UnknownText_0x1754e5: ; 0x1754e5
+UnknownText_0x1754e5:
text "What are you"
line "doing?"
@@ -802,9 +743,8 @@
text "!"
line "Don't try to run!"
done
-; 0x175530
-JoeySharperText: ; 0x175530
+JoeySharperText:
text "My @"
text_from_ram wStringBuffer4
text "'s"
@@ -817,9 +757,8 @@
para "this guy in your"
line "party!"
done
-; 0x175591
-UnknownText_0x175591: ; 0x175591
+UnknownText_0x175591:
text "Oh yeah, I took"
line "down a @"
text_from_ram wStringBuffer4
@@ -833,9 +772,8 @@
para "can't be helped,"
line "us being so tough."
done
-; 0x175611
-UnknownText_0x175611: ; 0x175611
+UnknownText_0x175611:
text "Oh yeah, I saw a"
line "wild @"
text_from_ram wStringBuffer4
@@ -850,9 +788,8 @@
para "only right to the"
line "extreme end."
done
-; 0x175693
-UnknownText_0x175693: ; 0x175693
+UnknownText_0x175693:
text "Let's get together"
line "and battle!"
@@ -867,14 +804,12 @@
para "Give me a shout"
line "when you come."
done
-; 0x17570a
-UnknownText_0x17570a: ; 0x17570a
+UnknownText_0x17570a:
text "All right. Later!"
done
-; 0x17571d
-UnknownText_0x17571d: ; 0x17571d
+UnknownText_0x17571d:
text "I'm checking out"
line "@"
text_from_ram wStringBuffer4
@@ -887,9 +822,8 @@
line "with a good one,"
cont "let's battle!"
done
-; 0x175786
-UnknownText_0x175786: ; 0x175786
+UnknownText_0x175786:
text "What's keeping"
line "you, <PLAYER>!"
@@ -901,9 +835,8 @@
text_from_ram wStringBuffer5
text "!"
done
-; 0x1757d4
-WadeAreYouGrowingText: ; 0x1757d4
+WadeAreYouGrowingText:
text "Are your #MON"
line "growing?"
@@ -921,9 +854,8 @@
para "quickly. I think"
line "it'll get tough."
done
-; 0x175869
-UnknownText_0x175869: ; 0x175869
+UnknownText_0x175869:
text "Oh yeah, we KO'd a"
line "wild @"
text_from_ram wStringBuffer4
@@ -937,9 +869,8 @@
para "little sorry for"
line "the poor thing."
done
-; 0x1758e4
-UnknownText_0x1758e4: ; 0x1758e4
+UnknownText_0x1758e4:
text "Oh yeah, a wild"
line "@"
text_from_ram wStringBuffer4
@@ -957,9 +888,8 @@
para "away when I almost"
line "had it."
done
-; 0x175976
-UnknownText_0x175976: ; 0x175976
+UnknownText_0x175976:
text "Do you feel like a"
line "#MON battle?"
@@ -974,14 +904,12 @@
para "Let me know when"
line "you get there."
done
-; 0x1759e7
-UnknownText_0x1759e7: ; 0x1759e7
+UnknownText_0x1759e7:
text "See you later!"
done
-; 0x1759f7
-WadeBugCatchingContestText: ; 0x1759f7
+WadeBugCatchingContestText:
text "The Bug-Catching"
line "Contest is at the"
@@ -994,9 +922,8 @@
para "I'm trying to make"
line "up my mind."
done
-; 0x175a60
-WadeFoundBerryText: ; 0x175a60
+WadeFoundBerryText:
text "I found all kinds"
line "of BERRIES. If you"
@@ -1008,9 +935,8 @@
text_from_ram wStringBuffer5
text "."
done
-; 0x175abe
-UnknownText_0x175abe: ; 0x175abe
+UnknownText_0x175abe:
text "Huh? BERRIES?"
para "Sorry, I haven't"
@@ -1020,9 +946,8 @@
line "find any. Will you"
cont "please wait?"
done
-; 0x175b1e
-UnknownText_0x175b1e: ; 0x175b1e
+UnknownText_0x175b1e:
text "Let's battle"
line "already!"
@@ -1034,9 +959,8 @@
para "Please get here as"
line "soon as you can!"
done
-; 0x175b6d
-UnknownText_0x175b6d: ; 0x175b6d
+UnknownText_0x175b6d:
text "How come you're"
line "not here yet?"
@@ -1048,9 +972,8 @@
para "Please get here as"
line "soon as you can!"
done
-; 0x175bc4
-RalphNeglectingKidsText: ; 0x175bc4
+RalphNeglectingKidsText:
text "I've been spending"
line "more time with my"
@@ -1062,9 +985,8 @@
para "That's a bit sad,"
line "actually."
done
-; 0x175c24
-UnknownText_0x175c24: ; 0x175c24
+UnknownText_0x175c24:
text "I just beat a wild"
line "@"
text_from_ram wStringBuffer4
@@ -1079,9 +1001,8 @@
para "Boy, has he gotten"
line "cocky…"
done
-; 0x175c9f
-UnknownText_0x175c9f: ; 0x175c9f
+UnknownText_0x175c9f:
text "Yesterday a wild"
line "@"
text_from_ram wStringBuffer4
@@ -1099,9 +1020,8 @@
para "Hahah, that sure"
line "made my day!"
done
-; 0x175d40
-UnknownText_0x175d40: ; 0x175d40
+UnknownText_0x175d40:
text "What do you say to"
line "a battle with me?"
@@ -1116,15 +1036,13 @@
text " is"
line "the spot!"
done
-; 0x175db7
-UnknownText_0x175db7: ; 0x175db7
+UnknownText_0x175db7:
text "You call your mom"
line "sometimes too!"
done
-; 0x175dd9
-UnknownText_0x175dd9: ; 0x175dd9
+UnknownText_0x175dd9:
text "Listen, I… Yowch!"
para "Uh, sorry! See,"
@@ -1152,9 +1070,8 @@
para "sight! Get ready"
line "to fish!"
done
-; 0x175eaf
-UnknownText_0x175eaf: ; 0x175eaf
+UnknownText_0x175eaf:
text "Yeah, I know."
para "You're looking for"
@@ -1164,9 +1081,8 @@
line "been catching are"
cont "MAGIKARP, though…"
done
-; 0x175f11
-UnknownText_0x175f11: ; 0x175f11
+UnknownText_0x175f11:
text "So where are you?"
line "I'm waiting for"
@@ -1178,9 +1094,8 @@
para "You shouldn't make"
line "your elders wait!"
done
-; 0x175f70
-UnknownText_0x175f70: ; 0x175f70
+UnknownText_0x175f70:
text "Hey, what's the"
line "matter with you?"
@@ -1191,9 +1106,8 @@
para "I'm on ROUTE 32,"
line "so hurry up!"
done
-; 0x175fda
-UnknownText_0x175fda: ; 0x175fda
+UnknownText_0x175fda:
text "Oh, you have to"
line "hear this."
@@ -1205,9 +1119,8 @@
para "It always wants to"
line "nuzzle me!"
done
-; 0x17602d
-UnknownText_0x17602d: ; 0x17602d
+UnknownText_0x17602d:
text "And, and! Um…"
para "We beat a wild"
@@ -1221,9 +1134,8 @@
para "We felt sorry for"
line "it, though."
done
-; 0x176095
-UnknownText_0x176095: ; 0x176095
+UnknownText_0x176095:
text "And, and! Uh…"
para "We just saw a"
@@ -1238,9 +1150,8 @@
para "away. It made us"
line "really angry!"
done
-; 0x17610a
-UnknownText_0x17610a: ; 0x17610a
+UnknownText_0x17610a:
text "Hi! Do you have"
line "some free time?"
@@ -1258,9 +1169,8 @@
para "Let me know when"
line "you get here!"
done
-; 0x1761a7
-LizHiTaniaText: ; 0x1761a7
+LizHiTaniaText:
text "Hi, TANIA. How are"
line "you? This is LIZ."
@@ -1270,15 +1180,13 @@
para "Huh… Wrong number?"
line "Oops! Sorry!"
done
-; 0x17620a
-UnknownText_0x17620a: ; 0x17620a
+UnknownText_0x17620a:
text "OK, I'll call you"
line "later!"
done
-; 0x176223
-UnknownText_0x176223: ; 0x176223
+UnknownText_0x176223:
text "Listen, listen!"
para "I was listening to"
@@ -1293,9 +1201,8 @@
para "I wonder what it"
line "was. So strange!"
done
-; 0x1762c3
-UnknownText_0x1762c3: ; 0x1762c3
+UnknownText_0x1762c3:
text "Listen, listen!"
para "Don't you think"
@@ -1316,9 +1223,8 @@
para "I wish I could"
line "meet him!"
done
-; 0x17638a
-UnknownText_0x17638a: ; 0x17638a
+UnknownText_0x17638a:
text "Listen, listen!"
para "Do you know EARL,"
@@ -1333,9 +1239,8 @@
para "he was running. It"
line "was wildly funny!"
done
-; 0x176424
-UnknownText_0x176424: ; 0x176424
+UnknownText_0x176424:
text "Listen, listen!"
para "I collect #MON"
@@ -1354,9 +1259,8 @@
line "brag about it if"
cont "you had one."
done
-; 0x1764eb
-UnknownText_0x1764eb: ; 0x1764eb
+UnknownText_0x1764eb:
text "Listen, listen!"
para "Do you know about"
@@ -1374,9 +1278,8 @@
para "try some. I bet"
line "it's delicious!"
done
-; 0x176599
-UnknownText_0x176599: ; 0x176599
+UnknownText_0x176599:
text "Listen, listen!"
para "There's a #MON"
@@ -1403,9 +1306,8 @@
para "trying to decide"
line "whom I should use…"
done
-; 0x1766ac
-UnknownText_0x1766ac: ; 0x1766ac
+UnknownText_0x1766ac:
text "Listen, listen!"
para "GOLDENROD GYM's"
@@ -1421,9 +1323,8 @@
para "I bet she must be"
line "totally talented."
done
-; 0x17674f
-UnknownText_0x17674f: ; 0x17674f
+UnknownText_0x17674f:
text "Listen, listen!"
para "Have you ever"
@@ -1443,9 +1344,8 @@
line "CATERPIE. Isn't"
cont "that great?"
done
-; 0x176816
-UnknownText_0x176816: ; 0x176816
+UnknownText_0x176816:
text "Listen, listen!"
para "I saw a beautiful"
@@ -1459,9 +1359,8 @@
text_from_ram wStringBuffer4
text " too."
done
-; 0x17686d
-UnknownText_0x17686d: ; 0x17686d
+UnknownText_0x17686d:
text "Listen, listen!"
para "Uh… Um… Whoops!"
@@ -1469,9 +1368,8 @@
para "I forgot what I"
line "was going to say!"
done
-; 0x1768b0
-UnknownText_0x1768b0: ; 0x1768b0
+UnknownText_0x1768b0:
text "Listen, listen!"
para "My @"
@@ -1504,9 +1402,8 @@
para "time!"
line "I love chatting!"
done
-; 0x1769da
-UnknownText_0x1769da: ; 0x1769da
+UnknownText_0x1769da:
text "I've got too much"
line "time on my hands!"
@@ -1518,9 +1415,8 @@
text_from_ram wStringBuffer5
text "!"
done
-; 0x176a2f
-AnthonyAteBerriesText: ; 0x176a2f
+AnthonyAteBerriesText:
text "The other day, I"
line "was watching my"
@@ -1541,9 +1437,8 @@
para "that stuff, but it"
line "was delicious!"
done
-; 0x176aef
-UnknownText_0x176aef: ; 0x176aef
+UnknownText_0x176aef:
text "Lately, I've been"
line "running across"
@@ -1555,9 +1450,8 @@
para "They're easily"
line "taken care of."
done
-; 0x176b45
-UnknownText_0x176b45: ; 0x176b45
+UnknownText_0x176b45:
text "Oh yeah, I was"
line "battling this"
@@ -1576,9 +1470,8 @@
para "stay focused on"
line "the job at hand!"
done
-; 0x176bee
-UnknownText_0x176bee: ; 0x176bee
+UnknownText_0x176bee:
text "Come on--let's"
line "battle right now!"
@@ -1590,15 +1483,13 @@
para "Come on down if"
line "you feel up to it!"
done
-; 0x176c47
-UnknownText_0x176c47: ; 0x176c47
+UnknownText_0x176c47:
text "All right then!"
line "Be good!"
done
-; 0x176c61
-UnknownText_0x176c61: ; 0x176c61
+UnknownText_0x176c61:
text "<PLAYER>! It's"
line "mind-blowing!"
@@ -1625,9 +1516,8 @@
para "where there are"
line "strong #MON."
done
-; 0x176d32
-UnknownText_0x176d32: ; 0x176d32
+UnknownText_0x176d32:
text "Rare #MON?"
para "Hey, sorry! I was"
@@ -1636,9 +1526,8 @@
para "hike, so I wasn't"
line "paying attention."
done
-; 0x176d85
-UnknownText_0x176d85: ; 0x176d85
+UnknownText_0x176d85:
text "Hello! You haven't"
line "forgotten about"
@@ -1650,9 +1539,8 @@
text "!"
line "I'm waiting!"
done
-; 0x176dd1
-UnknownText_0x176dd1: ; 0x176dd1
+UnknownText_0x176dd1:
text "Hello? What? Where"
line "is DUNSPARCE?"
@@ -1667,9 +1555,8 @@
para "are strong #MON"
line "around."
done
-; 0x176e5d
-ToddLooksCuteLikeMeText: ; 0x176e5d
+ToddLooksCuteLikeMeText:
text "My @"
text_from_ram wStringBuffer4
text " is"
@@ -1678,9 +1565,8 @@
para "more like me. It's"
line "getting cuter!"
done
-; 0x176e9c
-UnknownText_0x176e9c: ; 0x176e9c
+UnknownText_0x176e9c:
text "And, you know?"
para "Now we can KO"
@@ -1691,9 +1577,8 @@
para "I should challenge"
line "the GOLDENROD GYM."
done
-; 0x176eee
-UnknownText_0x176eee: ; 0x176eee
+UnknownText_0x176eee:
text "And, you know?"
line "We just failed to"
@@ -1708,9 +1593,8 @@
para "aren't high enough"
line "yet…"
done
-; 0x176f60
-UnknownText_0x176f60: ; 0x176f60
+UnknownText_0x176f60:
text "You must be a lot"
line "better now, huh?"
@@ -1725,14 +1609,12 @@
text_from_ram wStringBuffer5
text "."
done
-; 0x176fdb
-UnknownText_0x176fdb: ; 0x176fdb
+UnknownText_0x176fdb:
text "See you later!"
done
-; 0x176feb
-UnknownText_0x176feb: ; 0x176feb
+UnknownText_0x176feb:
text "This is it--the"
line "one we've all been"
cont "waiting for!"
@@ -1757,9 +1639,8 @@
line "to get there as"
cont "soon as you can!"
done
-; 0x1770fb
-UnknownText_0x1770fb: ; 0x1770fb
+UnknownText_0x1770fb:
text "I'm saving up for"
line "the next bargain"
@@ -1766,9 +1647,8 @@
para "sale. When's the"
line "next one?"
done
-; 0x177138
-UnknownText_0x177138: ; 0x177138
+UnknownText_0x177138:
text "Where are you?"
para "Let's have our"
@@ -1779,9 +1659,8 @@
text_from_ram wStringBuffer5
text "."
done
-; 0x17717c
-UnknownText_0x17717c: ; 0x17717c
+UnknownText_0x17717c:
text "Haven't you gone"
line "to GOLDENROD DEPT."
@@ -1794,9 +1673,8 @@
para "You should get"
line "there quickly."
done
-; 0x1771fd
-UnknownText_0x1771fd: ; 0x1771fd
+UnknownText_0x1771fd:
text "My @"
text_from_ram wStringBuffer4
text " and"
@@ -1805,9 +1683,8 @@
para "in sync with each"
line "other."
done
-; 0x177237
-UnknownText_0x177237: ; 0x177237
+UnknownText_0x177237:
text "We battled a wild"
line "@"
text_from_ram wStringBuffer4
@@ -1819,9 +1696,8 @@
para "We're getting into"
line "the groove!"
done
-; 0x177297
-UnknownText_0x177297: ; 0x177297
+UnknownText_0x177297:
text "But, you know?"
para "I still haven't"
@@ -1832,9 +1708,8 @@
para "It's getting past"
line "frustrating…"
done
-; 0x1772e2
-UnknownText_0x1772e2: ; 0x1772e2
+UnknownText_0x1772e2:
text "Would you be my"
line "practice partner"
cont "again sometime?"
@@ -1848,15 +1723,13 @@
line "a little easier on"
cont "me next time?"
done
-; 0x177361
-UnknownText_0x177361: ; 0x177361
+UnknownText_0x177361:
text "Bye! Let's chat"
line "again!"
done
-; 0x177378
-UnknownText_0x177378: ; 0x177378
+UnknownText_0x177378:
text "Have you heard"
line "about TEAM ROCKET?"
@@ -1867,9 +1740,8 @@
para "Are the people"
line "inside safe?"
done
-; 0x1773e7
-UnknownText_0x1773e7: ; 0x1773e7
+UnknownText_0x1773e7:
text "I picked up some-"
line "thing nice today."
@@ -1884,9 +1756,8 @@
text " is"
line "where I am."
done
-; 0x177465
-UnknownText_0x177465: ; 0x177465
+UnknownText_0x177465:
text "Sorry, I haven't"
line "found anything"
@@ -1896,9 +1767,8 @@
para "find anything, you"
line "can have it!"
done
-; 0x1774c1
-UnknownText_0x1774c1: ; 0x1774c1
+UnknownText_0x1774c1:
text "Oh, <PLAY_G>!"
line "How soon can I"
@@ -1910,9 +1780,8 @@
text_from_ram wStringBuffer5
text "!"
done
-; 0x17750e
-UnknownText_0x17750e: ; 0x17750e
+UnknownText_0x17750e:
text "I'm getting really"
line "impatient, waiting"
@@ -1924,4 +1793,3 @@
text_from_ram wStringBuffer5
text "!"
done
-; 0x177561
--- a/data/phone/text/mom.asm
+++ b/data/phone/text/mom.asm
@@ -1,4 +1,4 @@
-MomPhoneGreetingText: ; 0x1b4000
+MomPhoneGreetingText:
text "Hello?"
para "Oh, hi, <PLAYER>!"
@@ -5,7 +5,7 @@
line "Working hard?"
done
-MomPhoneLandmarkText: ; 0x1b4021
+MomPhoneLandmarkText:
text "Oh, so you're in"
line "@"
text_from_ram wStringBuffer3
@@ -19,7 +19,7 @@
line "take a look?"
done
-MomPhoneGenericAreaText: ; 0x1b406b
+MomPhoneGenericAreaText:
text "Really, you're in"
line "@"
text_from_ram wStringBuffer3
@@ -30,7 +30,7 @@
cont "of neat, <PLAYER>."
done
-MomPhoneNewBarkText: ; 0x1b40b1
+MomPhoneNewBarkText:
text "What? You're in"
line "@"
text_from_ram wStringBuffer3
@@ -40,7 +40,7 @@
line "sometime!"
done
-MomPhoneCherrygroveText: ; 0x1b40e4
+MomPhoneCherrygroveText:
text "You're visiting"
line "@"
text_from_ram wStringBuffer3
@@ -50,7 +50,7 @@
line "home for a bit?"
done
-MomOtherAreaText: ; 0x1b411c
+MomOtherAreaText:
text "Wow, you're in"
line "@"
text_from_ram wStringBuffer3
@@ -60,7 +60,7 @@
line "#MON quest!"
done
-MomDeterminedText: ; 0x1b4150
+MomDeterminedText:
text "That sounds really"
line "tough."
@@ -71,7 +71,7 @@
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 @@
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 @@
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 @@
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 @@
cont "waiting for you?"
done
-MomPhoneNoPokedexText: ; 0x1b431d
+MomPhoneNoPokedexText:
text "Hello?"
para "Oh, hi, <PLAYER>!"
@@ -138,7 +138,7 @@
line "ELM? Be good!"
done
-MomPhoneNoGymQuestText: ; 0x1b435f
+MomPhoneNoGymQuestText:
text "Hello?"
para "Hi, <PLAYER>! If"
@@ -148,7 +148,7 @@
line "on home, dear."
done
-MomPhoneLectureText: ; 0x1b43a1
+MomPhoneLectureText:
text "Hello?"
para "…… <PLAYER>?"
--- a/data/phone/text/trainers.asm
+++ b/data/phone/text/trainers.asm
@@ -1,4 +1,4 @@
-UnknownText_0x1b4dc5: ; 0x1b4dc5
+UnknownText_0x1b4dc5:
text "Hello. This is"
line "@"
text_from_ram wStringBuffer3
@@ -8,7 +8,7 @@
line "<PLAY_G>!"
done
-UnknownText_0x1b4ded: ; 0x1b4ded
+UnknownText_0x1b4ded:
text "Hello. This is"
line "@"
text_from_ram wStringBuffer3
@@ -18,7 +18,7 @@
line "<PLAY_G>?"
done
-UnknownText_0x1b4e16: ; 0x1b4e16
+UnknownText_0x1b4e16:
text "Hello. This is"
line "@"
text_from_ram wStringBuffer3
@@ -28,7 +28,7 @@
line "<PLAY_G>!"
done
-UnknownText_0x1b4e3e: ; 0x1b4e3e
+UnknownText_0x1b4e3e:
text "<PLAY_G>, good"
line "morning!"
@@ -38,7 +38,7 @@
line "How are you doing?"
done
-UnknownText_0x1b4e72: ; 0x1b4e72
+UnknownText_0x1b4e72:
text "<PLAY_G>, howdy!"
para "It's me, @"
@@ -47,7 +47,7 @@
line "Isn't it nice out?"
done
-UnknownText_0x1b4e9e: ; 0x1b4e9e
+UnknownText_0x1b4e9e:
text "<PLAY_G>, good"
line "evening!"
@@ -57,7 +57,7 @@
line "Got a minute?"
done
-UnknownText_0x1b4ecd: ; 0x1b4ecd
+UnknownText_0x1b4ecd:
text "How are your"
line "#MON doing?"
@@ -70,7 +70,7 @@
line "it's like me…"
done
-UnknownText_0x1b4f21: ; 0x1b4f21
+UnknownText_0x1b4f21:
text "Hello, this is"
line "@"
text_from_ram wStringBuffer3
@@ -80,7 +80,7 @@
line "<PLAYER>."
done
-UnknownText_0x1b4f4d: ; 0x1b4f4d
+UnknownText_0x1b4f4d:
text "Hello, this is"
line "@"
text_from_ram wStringBuffer3
@@ -90,7 +90,7 @@
line "<PLAYER>."
done
-UnknownText_0x1b4f75: ; 0x1b4f75
+UnknownText_0x1b4f75:
text "Hello, this is"
line "@"
text_from_ram wStringBuffer3
@@ -100,7 +100,7 @@
line "<PLAYER>."
done
-UnknownText_0x1b4fa1: ; 0x1b4fa1
+UnknownText_0x1b4fa1:
text "Hello, <PLAYER>."
line "Good morning."
@@ -110,7 +110,7 @@
line "Were you asleep?"
done
-UnknownText_0x1b4fda: ; 0x1b4fda
+UnknownText_0x1b4fda:
text "Hi, <PLAYER>."
line "This is @"
text_from_ram wStringBuffer3
@@ -119,7 +119,7 @@
para "How are you doing?"
done
-UnknownText_0x1b5004: ; 0x1b5004
+UnknownText_0x1b5004:
text "Hi, <PLAYER>."
line "This is @"
text_from_ram wStringBuffer3
@@ -128,7 +128,7 @@
para "Were you awake?"
done
-UnknownText_0x1b502b: ; 0x1b502b
+UnknownText_0x1b502b:
text "Keeping your"
line "#MON happy?"
@@ -139,7 +139,7 @@
cont "lot every day."
done
-UnknownText_0x1b5073: ; 0x1b5073
+UnknownText_0x1b5073:
text "Yeah, this is"
line "@"
text_from_ram wStringBuffer3
@@ -149,7 +149,7 @@
line "<PLAYER>?"
done
-UnknownText_0x1b509b: ; 0x1b509b
+UnknownText_0x1b509b:
text "Yeah, this is"
line "@"
text_from_ram wStringBuffer3
@@ -159,7 +159,7 @@
line "<PLAYER>?"
done
-UnknownText_0x1b50c2: ; 0x1b50c2
+UnknownText_0x1b50c2:
text "Yeah, this is"
line "@"
text_from_ram wStringBuffer3
@@ -169,7 +169,7 @@
line "<PLAYER>?"
done
-UnknownText_0x1b50e9: ; 0x1b50e9
+UnknownText_0x1b50e9:
text "Yo, <PLAYER>!"
line "You awake?"
@@ -179,7 +179,7 @@
line "How's it going?"
done
-UnknownText_0x1b511a: ; 0x1b511a
+UnknownText_0x1b511a:
text "Yo, <PLAYER>! You"
line "free right now?"
@@ -189,7 +189,7 @@
line "How's it going?"
done
-UnknownText_0x1b5154: ; 0x1b5154
+UnknownText_0x1b5154:
text "Yo, <PLAYER>!"
line "Were you asleep?"
@@ -199,7 +199,7 @@
line "How's it going?"
done
-UnknownText_0x1b518b: ; 0x1b518b
+UnknownText_0x1b518b:
text "How are your"
line "#MON doing?"
@@ -219,7 +219,7 @@
line "bit much for me!"
done
-UnknownText_0x1b522b: ; 0x1b522b
+UnknownText_0x1b522b:
text "My @"
text_from_ram wStringBuffer4
text "'s"
@@ -230,7 +230,7 @@
line "tougher than me!"
done
-UnknownText_0x1b5270: ; 0x1b5270
+UnknownText_0x1b5270:
text "Hello, this is"
line "@"
text_from_ram wStringBuffer3
@@ -240,7 +240,7 @@
line "Good morning!"
done
-UnknownText_0x1b52a5: ; 0x1b52a5
+UnknownText_0x1b52a5:
text "Hello, this is"
line "@"
text_from_ram wStringBuffer3
@@ -249,7 +249,7 @@
para "Hi, <PLAY_G>!"
done
-UnknownText_0x1b52cc: ; 0x1b52cc
+UnknownText_0x1b52cc:
text "Hello, this is"
line "@"
text_from_ram wStringBuffer3
@@ -259,7 +259,7 @@
line "Good evening!"
done
-UnknownText_0x1b5301: ; 0x1b5301
+UnknownText_0x1b5301:
text "<PLAY_G>, good"
line "morning!"
@@ -269,7 +269,7 @@
line "How are you doing?"
done
-UnknownText_0x1b5335: ; 0x1b5335
+UnknownText_0x1b5335:
text "Hi, <PLAY_G>!"
para "It's me, @"
@@ -278,7 +278,7 @@
line "How are you doing?"
done
-UnknownText_0x1b535f: ; 0x1b535f
+UnknownText_0x1b535f:
text "<PLAY_G>, good"
line "evening!"
@@ -288,7 +288,7 @@
line "How are you doing?"
done
-UnknownText_0x1b5393: ; 0x1b5393
+UnknownText_0x1b5393:
text "How are your"
line "#MON doing?"
@@ -303,7 +303,7 @@
cont "CHAMPS!"
done
-UnknownText_0x1b53f7: ; 0x1b53f7
+UnknownText_0x1b53f7:
text "Hello, this is"
line "@"
text_from_ram wStringBuffer3
@@ -315,7 +315,7 @@
para ""
done
-UnknownText_0x1b5424: ; 0x1b5424
+UnknownText_0x1b5424:
text "Hello, this is"
line "@"
text_from_ram wStringBuffer3
@@ -324,7 +324,7 @@
para "Oh. Hi, <PLAY_G>."
done
-UnknownText_0x1b5446: ; 0x1b5446
+UnknownText_0x1b5446:
text "Hello, this is"
line "@"
text_from_ram wStringBuffer3
@@ -334,7 +334,7 @@
line "Good evening."
done
-UnknownText_0x1b5472: ; 0x1b5472
+UnknownText_0x1b5472:
text "Good morning,"
line "<PLAY_G>!"
@@ -344,7 +344,7 @@
line "Were you sleeping?"
done
-UnknownText_0x1b54a6: ; 0x1b54a6
+UnknownText_0x1b54a6:
text "<PLAY_G>, hi!"
line "This is @"
text_from_ram wStringBuffer3
@@ -354,7 +354,7 @@
line "time?"
done
-UnknownText_0x1b54d4: ; 0x1b54d4
+UnknownText_0x1b54d4:
text "Hi, <PLAY_G>."
line "Good evening."
@@ -366,7 +366,7 @@
line "awake."
done
-UnknownText_0x1b5510: ; 0x1b5510
+UnknownText_0x1b5510:
text "Are you the kind"
line "of person who goes"
@@ -383,7 +383,7 @@
line "#MON trainer."
done
-UnknownText_0x1b55ae: ; 0x1b55ae
+UnknownText_0x1b55ae:
text "Hello, this is"
line "@"
text_from_ram wStringBuffer3
@@ -393,7 +393,7 @@
line "Good morning!"
done
-UnknownText_0x1b55da: ; 0x1b55da
+UnknownText_0x1b55da:
text "Hello, this is"
line "@"
text_from_ram wStringBuffer3
@@ -402,7 +402,7 @@
para "Oh, <PLAY_G>? Hi!"
done
-UnknownText_0x1b55fc: ; 0x1b55fc
+UnknownText_0x1b55fc:
text "Hello, this is"
line "@"
text_from_ram wStringBuffer3
@@ -412,7 +412,7 @@
line "Good evening!"
done
-UnknownText_0x1b5628: ; 0x1b5628
+UnknownText_0x1b5628:
text "Oh, <PLAY_G>?"
para "Tweet! Yeah, it's"
@@ -421,7 +421,7 @@
text "."
done
-UnknownText_0x1b564c: ; 0x1b564c
+UnknownText_0x1b564c:
text "Oh, <PLAY_G>?"
para "Tweet! Yeah, it's"
@@ -430,7 +430,7 @@
text "."
done
-UnknownText_0x1b5670: ; 0x1b5670
+UnknownText_0x1b5670:
text "Oh, <PLAY_G>?"
para "Tweet! Yeah, it's"
@@ -439,7 +439,7 @@
text "."
done
-UnknownText_0x1b5694: ; 0x1b5694
+UnknownText_0x1b5694:
text "Are your #MON"
line "still cooking?"
@@ -453,7 +453,7 @@
cont "for a while."
done
-UnknownText_0x1b5702: ; 0x1b5702
+UnknownText_0x1b5702:
text "Hello, this is"
line "@"
text_from_ram wStringBuffer3
@@ -463,7 +463,7 @@
line "What's up?"
done
-UnknownText_0x1b572e: ; 0x1b572e
+UnknownText_0x1b572e:
text "Hello, this is"
line "@"
text_from_ram wStringBuffer3
@@ -473,7 +473,7 @@
line "what's up?"
done
-UnknownText_0x1b575a: ; 0x1b575a
+UnknownText_0x1b575a:
text "Hello, this is"
line "@"
text_from_ram wStringBuffer3
@@ -483,7 +483,7 @@
line "what's up?"
done
-UnknownText_0x1b5786: ; 0x1b5786
+UnknownText_0x1b5786:
text "You're slow! Hurry"
line "up and answer!"
@@ -492,7 +492,7 @@
text "!"
done
-UnknownText_0x1b57b7: ; 0x1b57b7
+UnknownText_0x1b57b7:
text "You're slow! Hurry"
line "up and answer!"
@@ -501,7 +501,7 @@
text "!"
done
-UnknownText_0x1b57e8: ; 0x1b57e8
+UnknownText_0x1b57e8:
text "You're slow! Hurry"
line "up and answer!"
@@ -510,7 +510,7 @@
text "!"
done
-UnknownText_0x1b5819: ; 0x1b5819
+UnknownText_0x1b5819:
text "Hey, how are your"
line "#MON doing?"
@@ -526,7 +526,7 @@
line "is that?"
done
-UnknownText_0x1b589a: ; 0x1b589a
+UnknownText_0x1b589a:
text "Hi, @"
text_from_ram wStringBuffer3
text " here!"
@@ -535,7 +535,7 @@
line "doing well?"
done
-UnknownText_0x1b58c2: ; 0x1b58c2
+UnknownText_0x1b58c2:
text "Hi, @"
text_from_ram wStringBuffer3
text " here!"
@@ -544,7 +544,7 @@
line "doing well?"
done
-UnknownText_0x1b58ea: ; 0x1b58ea
+UnknownText_0x1b58ea:
text "Hi, @"
text_from_ram wStringBuffer3
text " here!"
@@ -553,7 +553,7 @@
line "doing well?"
done
-UnknownText_0x1b5912: ; 0x1b5912
+UnknownText_0x1b5912:
text "Yo, <PLAYER>!"
line "How're you doing?"
@@ -563,7 +563,7 @@
line "got a minute?"
done
-UnknownText_0x1b5948: ; 0x1b5948
+UnknownText_0x1b5948:
text "Yo, <PLAYER>! How's"
line "it going?"
@@ -573,7 +573,7 @@
line "Got a minute?"
done
-UnknownText_0x1b597c: ; 0x1b597c
+UnknownText_0x1b597c:
text "Yo, <PLAYER>!"
line "How're you doing?"
@@ -583,7 +583,7 @@
line "got a minute?"
done
-UnknownText_0x1b59b2: ; 0x1b59b2
+UnknownText_0x1b59b2:
text "How are your"
line "#MON doing?"
@@ -600,7 +600,7 @@
line "trainer with it!"
done
-UnknownText_0x1b5a3b: ; 0x1b5a3b
+UnknownText_0x1b5a3b:
text "Hello? This is"
line "@"
text_from_ram wStringBuffer3
@@ -610,7 +610,7 @@
line "Good morning!"
done
-UnknownText_0x1b5a74: ; 0x1b5a74
+UnknownText_0x1b5a74:
text "Hello? This is"
line "@"
text_from_ram wStringBuffer3
@@ -619,7 +619,7 @@
para "Oh, hi, <PLAY_G>!"
done
-UnknownText_0x1b5a9f: ; 0x1b5a9f
+UnknownText_0x1b5a9f:
text "Hello? This is"
line "@"
text_from_ram wStringBuffer3
@@ -629,7 +629,7 @@
line "Good evening!"
done
-UnknownText_0x1b5ad8: ; 0x1b5ad8
+UnknownText_0x1b5ad8:
text "<PLAY_G>, good"
line "morning!"
@@ -639,7 +639,7 @@
line "Isn't it nice out?"
done
-UnknownText_0x1b5b0b: ; 0x1b5b0b
+UnknownText_0x1b5b0b:
text "<PLAY_G>, howdy!"
para "It's me, @"
@@ -648,7 +648,7 @@
line "Isn't it nice out?"
done
-UnknownText_0x1b5b37: ; 0x1b5b37
+UnknownText_0x1b5b37:
text "Good evening,"
line "<PLAY_G>!"
@@ -658,7 +658,7 @@
line "Were you awake?"
done
-UnknownText_0x1b5b68: ; 0x1b5b68
+UnknownText_0x1b5b68:
text "How are your"
line "#MON doing?"
@@ -678,7 +678,7 @@
line "exhausting."
done
-UnknownText_0x1b5c10: ; 0x1b5c10
+UnknownText_0x1b5c10:
text "Yes? Ah, <PLAY_G>."
para "You're courteous"
@@ -688,7 +688,7 @@
line "call on the phone."
done
-UnknownText_0x1b5c63: ; 0x1b5c63
+UnknownText_0x1b5c63:
text "Yes? Ah, <PLAY_G>."
para "You're courteous"
@@ -698,7 +698,7 @@
line "call on the phone."
done
-UnknownText_0x1b5cb6: ; 0x1b5cb6
+UnknownText_0x1b5cb6:
text "Yes? Ah, <PLAY_G>."
para "You're courteous"
@@ -708,7 +708,7 @@
line "call on the phone."
done
-UnknownText_0x1b5d09: ; 0x1b5d09
+UnknownText_0x1b5d09:
text "Hiya, it's Uncle"
line "@"
text_from_ram wStringBuffer3
@@ -715,7 +715,7 @@
text "."
done
-UnknownText_0x1b5d21: ; 0x1b5d21
+UnknownText_0x1b5d21:
text "Hiya, it's Uncle"
line "@"
text_from_ram wStringBuffer3
@@ -722,7 +722,7 @@
text "."
done
-UnknownText_0x1b5d39: ; 0x1b5d39
+UnknownText_0x1b5d39:
text "Hiya, it's Uncle"
line "@"
text_from_ram wStringBuffer3
@@ -729,7 +729,7 @@
text "."
done
-UnknownText_0x1b5d51: ; 0x1b5d51
+UnknownText_0x1b5d51:
text "Are you taking"
line "good care of your"
@@ -738,7 +738,7 @@
cont "partners!"
done
-UnknownText_0x1b5d9f: ; 0x1b5d9f
+UnknownText_0x1b5d9f:
text "Hello, @"
text_from_ram wStringBuffer3
text_start
@@ -748,7 +748,7 @@
line "Good morning."
done
-UnknownText_0x1b5dcc: ; 0x1b5dcc
+UnknownText_0x1b5dcc:
text "Hello, @"
text_from_ram wStringBuffer3
text_start
@@ -758,7 +758,7 @@
line "How are you?"
done
-UnknownText_0x1b5df8: ; 0x1b5df8
+UnknownText_0x1b5df8:
text "Hello, @"
text_from_ram wStringBuffer3
text_start
@@ -768,7 +768,7 @@
line "Good evening."
done
-UnknownText_0x1b5e25: ; 0x1b5e25
+UnknownText_0x1b5e25:
text "Good morning,"
line "<PLAY_G>."
@@ -778,7 +778,7 @@
line "Were you sleeping?"
done
-UnknownText_0x1b5e59: ; 0x1b5e59
+UnknownText_0x1b5e59:
text "Hi, <PLAY_G>."
line "This is @"
text_from_ram wStringBuffer3
@@ -788,7 +788,7 @@
line "going for you?"
done
-UnknownText_0x1b5e8e: ; 0x1b5e8e
+UnknownText_0x1b5e8e:
text "Good evening,"
line "<PLAY_G>."
@@ -798,7 +798,7 @@
line "Are you awake?"
done
-UnknownText_0x1b5ebe: ; 0x1b5ebe
+UnknownText_0x1b5ebe:
text "I had some time,"
line "so I called you."
@@ -820,7 +820,7 @@
line "the receptionist!"
done
-UnknownText_0x1b5f7a: ; 0x1b5f7a
+UnknownText_0x1b5f7a:
text "Yeah, @"
text_from_ram wStringBuffer3
text " the"
@@ -829,7 +829,7 @@
para "Ah, <PLAYER>!"
done
-UnknownText_0x1b5f9e: ; 0x1b5f9e
+UnknownText_0x1b5f9e:
text "Yeah, @"
text_from_ram wStringBuffer3
text " the"
@@ -839,7 +839,7 @@
line "right?"
done
-UnknownText_0x1b5fc9: ; 0x1b5fc9
+UnknownText_0x1b5fc9:
text "Yeah, @"
text_from_ram wStringBuffer3
text " the"
@@ -849,7 +849,7 @@
line "it?"
done
-UnknownText_0x1b5ff6: ; 0x1b5ff6
+UnknownText_0x1b5ff6:
text "Yo, <PLAYER>?"
para "This is @"
@@ -858,7 +858,7 @@
line "the HIKER!"
done
-UnknownText_0x1b6017: ; 0x1b6017
+UnknownText_0x1b6017:
text "Hey, is this"
line "<PLAYER>?"
@@ -868,7 +868,7 @@
line "the HIKER!"
done
-UnknownText_0x1b6041: ; 0x1b6041
+UnknownText_0x1b6041:
text "<PLAYER>, you still"
line "awake?"
@@ -878,7 +878,7 @@
line "the HIKER!"
done
-UnknownText_0x1b606f: ; 0x1b606f
+UnknownText_0x1b606f:
text "Are your #MON"
line "as feisty as ever?"
@@ -894,7 +894,7 @@
line "all our energy."
done
-UnknownText_0x1b60f5: ; 0x1b60f5
+UnknownText_0x1b60f5:
text "Yes? This is"
line "@"
text_from_ram wStringBuffer3
@@ -903,7 +903,7 @@
para "Hey, <PLAY_G>!"
done
-UnknownText_0x1b611b: ; 0x1b611b
+UnknownText_0x1b611b:
text "Yes? This is"
line "@"
text_from_ram wStringBuffer3
@@ -913,7 +913,7 @@
line "<PLAY_G>."
done
-UnknownText_0x1b6149: ; 0x1b6149
+UnknownText_0x1b6149:
text "Yes? This is"
line "@"
text_from_ram wStringBuffer3
@@ -922,7 +922,7 @@
para "Ah, <PLAY_G>!"
done
-UnknownText_0x1b616e: ; 0x1b616e
+UnknownText_0x1b616e:
text "Hello, this is"
line "@"
text_from_ram wStringBuffer3
@@ -931,7 +931,7 @@
para "<PLAY_G>, right?"
done
-UnknownText_0x1b618f: ; 0x1b618f
+UnknownText_0x1b618f:
text "Hello, this is"
line "@"
text_from_ram wStringBuffer3
@@ -941,7 +941,7 @@
line "you doing?"
done
-UnknownText_0x1b61bd: ; 0x1b61bd
+UnknownText_0x1b61bd:
text "Hello, this is"
line "@"
text_from_ram wStringBuffer3
@@ -951,7 +951,7 @@
line "call you so late."
done
-UnknownText_0x1b61f2: ; 0x1b61f2
+UnknownText_0x1b61f2:
text "How do you raise"
line "your #MON?"
@@ -965,7 +965,7 @@
line "with items."
done
-UnknownText_0x1b626a: ; 0x1b626a
+UnknownText_0x1b626a:
text "Hello? This is"
line "@"
text_from_ram wStringBuffer3
@@ -975,7 +975,7 @@
line "Good morning!"
done
-UnknownText_0x1b6296: ; 0x1b6296
+UnknownText_0x1b6296:
text "Hello? This is"
line "@"
text_from_ram wStringBuffer3
@@ -985,7 +985,7 @@
line "Hi, how are you?"
done
-UnknownText_0x1b62c5: ; 0x1b62c5
+UnknownText_0x1b62c5:
text "Hello? This is"
line "@"
text_from_ram wStringBuffer3
@@ -995,7 +995,7 @@
line "Good evening!"
done
-UnknownText_0x1b62f1: ; 0x1b62f1
+UnknownText_0x1b62f1:
text "<PLAY_G>?"
para "It's @"
@@ -1004,7 +1004,7 @@
line "Good morning!"
done
-UnknownText_0x1b630e: ; 0x1b630e
+UnknownText_0x1b630e:
text "<PLAY_G>?"
para "It's @"
@@ -1013,7 +1013,7 @@
line "this a bad time?"
done
-UnknownText_0x1b6331: ; 0x1b6331
+UnknownText_0x1b6331:
text "<PLAY_G>?"
para "It's @"
@@ -1022,7 +1022,7 @@
line "Got time to chat?"
done
-UnknownText_0x1b6352: ; 0x1b6352
+UnknownText_0x1b6352:
text "Are your #MON"
line "still tough?"
@@ -1032,7 +1032,7 @@
text "."
done
-UnknownText_0x1b638c: ; 0x1b638c
+UnknownText_0x1b638c:
text "Hello? @"
text_from_ram wStringBuffer3
text_start
@@ -1041,7 +1041,7 @@
para "Hey, <PLAY_G>!"
done
-UnknownText_0x1b63a8: ; 0x1b63a8
+UnknownText_0x1b63a8:
text "Hello? @"
text_from_ram wStringBuffer3
text_start
@@ -1050,7 +1050,7 @@
para "Wow, <PLAY_G>!"
done
-UnknownText_0x1b63c4: ; 0x1b63c4
+UnknownText_0x1b63c4:
text "Hello? @"
text_from_ram wStringBuffer3
text_start
@@ -1059,7 +1059,7 @@
para "Yippee, <PLAY_G>!"
done
-UnknownText_0x1b63e3: ; 0x1b63e3
+UnknownText_0x1b63e3:
text "Uh, hello."
line "<PLAY_G>?"
@@ -1069,7 +1069,7 @@
text "!"
done
-UnknownText_0x1b6407: ; 0x1b6407
+UnknownText_0x1b6407:
text "Uh, hello,"
line "<PLAY_G>?"
@@ -1079,7 +1079,7 @@
text "!"
done
-UnknownText_0x1b642c: ; 0x1b642c
+UnknownText_0x1b642c:
text "Uh, hello,"
line "<PLAY_G>?"
@@ -1089,7 +1089,7 @@
text "!"
done
-UnknownText_0x1b6454: ; 0x1b6454
+UnknownText_0x1b6454:
text "Yeah, hello."
line "This is @"
text_from_ram wStringBuffer3
@@ -1098,7 +1098,7 @@
para "…Huh, <PLAY_G>? Yo!"
done
-UnknownText_0x1b647e: ; 0x1b647e
+UnknownText_0x1b647e:
text "Yeah, hello, you"
line "got @"
text_from_ram wStringBuffer3
@@ -1107,7 +1107,7 @@
para "…Huh, <PLAY_G>? Yo!"
done
-UnknownText_0x1b64a8: ; 0x1b64a8
+UnknownText_0x1b64a8:
text "Yeah, hello, you"
line "got @"
text_from_ram wStringBuffer3
@@ -1116,7 +1116,7 @@
para "…Huh, <PLAY_G>? Yo!"
done
-UnknownText_0x1b64d2: ; 0x1b64d2
+UnknownText_0x1b64d2:
text "Yeah, hello?"
line "@"
text_from_ram wStringBuffer3
@@ -1126,7 +1126,7 @@
line "to, <PLAY_G>?"
done
-UnknownText_0x1b6506: ; 0x1b6506
+UnknownText_0x1b6506:
text "Yeah, hello?"
line "@"
text_from_ram wStringBuffer3
@@ -1136,7 +1136,7 @@
line "<PLAY_G>?"
done
-UnknownText_0x1b6539: ; 0x1b6539
+UnknownText_0x1b6539:
text "Yeah, hello?"
line "@"
text_from_ram wStringBuffer3
@@ -1146,13 +1146,13 @@
line "<PLAY_G>?"
done
-UnknownText_0x1b656c: ; 0x1b656c
+UnknownText_0x1b656c:
text "I bet your #MON"
line "are a lot stronger"
cont "than before."
done
-UnknownText_0x1b659d: ; 0x1b659d
+UnknownText_0x1b659d:
text "Yup, it's @"
text_from_ram wStringBuffer3
text "!"
@@ -1161,7 +1161,7 @@
line "Good morning!"
done
-UnknownText_0x1b65c7: ; 0x1b65c7
+UnknownText_0x1b65c7:
text "Yup, it's @"
text_from_ram wStringBuffer3
text "!"
@@ -1169,7 +1169,7 @@
para "Is that <PLAY_G>?"
done
-UnknownText_0x1b65e3: ; 0x1b65e3
+UnknownText_0x1b65e3:
text "Yup, it's @"
text_from_ram wStringBuffer3
text "!"
@@ -1178,7 +1178,7 @@
line "Good evening!"
done
-UnknownText_0x1b660d: ; 0x1b660d
+UnknownText_0x1b660d:
text "Hello! It's me,"
line "@"
text_from_ram wStringBuffer3
@@ -1185,7 +1185,7 @@
text "!"
done
-UnknownText_0x1b6624: ; 0x1b6624
+UnknownText_0x1b6624:
text "Hello! It's me,"
line "@"
text_from_ram wStringBuffer3
@@ -1192,7 +1192,7 @@
text "!"
done
-UnknownText_0x1b663b: ; 0x1b663b
+UnknownText_0x1b663b:
text "Hello! It's me,"
line "@"
text_from_ram wStringBuffer3
@@ -1199,7 +1199,7 @@
text "!"
done
-UnknownText_0x1b6652: ; 0x1b6652
+UnknownText_0x1b6652:
text "<PLAY_G>, are you"
line "raising your"
cont "#MON properly?"
@@ -1212,7 +1212,7 @@
cont "love and care."
done
-UnknownText_0x1b66c8: ; 0x1b66c8
+UnknownText_0x1b66c8:
text "Hi, @"
text_from_ram wStringBuffer3
text " on the"
@@ -1221,7 +1221,7 @@
para "Hey! It's <PLAY_G>!"
done
-UnknownText_0x1b66ec: ; 0x1b66ec
+UnknownText_0x1b66ec:
text "Hi, @"
text_from_ram wStringBuffer3
text " on the"
@@ -1231,7 +1231,7 @@
line "It's <PLAY_G>!"
done
-UnknownText_0x1b6713: ; 0x1b6713
+UnknownText_0x1b6713:
text "Hi, @"
text_from_ram wStringBuffer3
text " on the"
@@ -1241,7 +1241,7 @@
line "What's up?"
done
-UnknownText_0x1b6738: ; 0x1b6738
+UnknownText_0x1b6738:
text "Uh, <PLAY_G>?"
para "It's me!"
@@ -1250,7 +1250,7 @@
text "!"
done
-UnknownText_0x1b6757: ; 0x1b6757
+UnknownText_0x1b6757:
text "Uh, <PLAY_G>?"
para "It's me!"
@@ -1259,7 +1259,7 @@
text "!"
done
-UnknownText_0x1b6776: ; 0x1b6776
+UnknownText_0x1b6776:
text "Uh, <PLAY_G>?"
para "It's me!"
@@ -1268,7 +1268,7 @@
text "!"
done
-UnknownText_0x1b6795: ; 0x1b6795
+UnknownText_0x1b6795:
text "My @"
text_from_ram wStringBuffer4
text " is"
@@ -1281,7 +1281,7 @@
line "#MON doing?"
done
-UnknownText_0x1b67e2: ; 0x1b67e2
+UnknownText_0x1b67e2:
text "Hello, this is"
line "@"
text_from_ram wStringBuffer3
@@ -1291,7 +1291,7 @@
line "Good morning!"
done
-UnknownText_0x1b680e: ; 0x1b680e
+UnknownText_0x1b680e:
text "Hello, this is"
line "@"
text_from_ram wStringBuffer3
@@ -1301,7 +1301,7 @@
line "day!"
done
-UnknownText_0x1b6836: ; 0x1b6836
+UnknownText_0x1b6836:
text "Hello, this is"
line "@"
text_from_ram wStringBuffer3
@@ -1311,7 +1311,7 @@
line "evening!"
done
-UnknownText_0x1b6862: ; 0x1b6862
+UnknownText_0x1b6862:
text "Hi, <PLAY_G>, good"
line "morning!"
@@ -1321,7 +1321,7 @@
line "How are you?"
done
-UnknownText_0x1b6890: ; 0x1b6890
+UnknownText_0x1b6890:
text "Hi, <PLAY_G>, good"
line "day!"
@@ -1331,7 +1331,7 @@
line "How are you?"
done
-UnknownText_0x1b68ba: ; 0x1b68ba
+UnknownText_0x1b68ba:
text "Hi, <PLAY_G>, good"
line "evening!"
@@ -1341,7 +1341,7 @@
line "How are you?"
done
-UnknownText_0x1b68e8: ; 0x1b68e8
+UnknownText_0x1b68e8:
text "How are your"
line "#MON doing?"
@@ -1360,7 +1360,7 @@
cont "be a big surprise."
done
-UnknownText_0x1b69a8: ; 0x1b69a8
+UnknownText_0x1b69a8:
text "Hi, <PLAY_G>?"
para "Good morning pika."
@@ -1367,7 +1367,7 @@
line "What's up pika?"
done
-UnknownText_0x1b69d2: ; 0x1b69d2
+UnknownText_0x1b69d2:
text "Hi, <PLAY_G>?"
para "Good day pika,"
@@ -1374,7 +1374,7 @@
line "what's up pika?"
done
-UnknownText_0x1b69f8: ; 0x1b69f8
+UnknownText_0x1b69f8:
text "Hi, <PLAY_G>?"
para "Good evening pika,"
@@ -1381,7 +1381,7 @@
line "what's up pika?"
done
-UnknownText_0x1b6a22: ; 0x1b6a22
+UnknownText_0x1b6a22:
text "<PLAY_G> pika, good"
line "morning!"
@@ -1391,7 +1391,7 @@
line "pika are you?"
done
-UnknownText_0x1b6a56: ; 0x1b6a56
+UnknownText_0x1b6a56:
text "<PLAY_G> pika, good"
line "pika day!"
@@ -1401,7 +1401,7 @@
line "pika are you?"
done
-UnknownText_0x1b6a8b: ; 0x1b6a8b
+UnknownText_0x1b6a8b:
text "<PLAY_G> pika, good"
line "evening!"
@@ -1411,7 +1411,7 @@
line "you pika awake?"
done
-UnknownText_0x1b6ac2: ; 0x1b6ac2
+UnknownText_0x1b6ac2:
text "You have to hear"
line "this! My lovable"
@@ -1425,7 +1425,7 @@
cont "together as one!"
done
-UnknownText_0x1b6b39: ; 0x1b6b39
+UnknownText_0x1b6b39:
text "Hello, this is"
line "@"
text_from_ram wStringBuffer3
@@ -1435,7 +1435,7 @@
line "<PLAY_G>."
done
-UnknownText_0x1b6b65: ; 0x1b6b65
+UnknownText_0x1b6b65:
text "Hello, this is"
line "@"
text_from_ram wStringBuffer3
@@ -1445,7 +1445,7 @@
line "<PLAY_G>, right?"
done
-UnknownText_0x1b6b92: ; 0x1b6b92
+UnknownText_0x1b6b92:
text "Hello, this is"
line "@"
text_from_ram wStringBuffer3
@@ -1455,7 +1455,7 @@
line "<PLAY_G>!"
done
-UnknownText_0x1b6bb9: ; 0x1b6bb9
+UnknownText_0x1b6bb9:
text "Hello!"
line "@"
text_from_ram wStringBuffer3
@@ -1465,7 +1465,7 @@
line "weather's great!"
done
-UnknownText_0x1b6bef: ; 0x1b6bef
+UnknownText_0x1b6bef:
text "Hello!"
line "@"
text_from_ram wStringBuffer3
@@ -1475,7 +1475,7 @@
line "for fishing!"
done
-UnknownText_0x1b6c23: ; 0x1b6c23
+UnknownText_0x1b6c23:
text "Hello!"
line "@"
text_from_ram wStringBuffer3
@@ -1485,7 +1485,7 @@
line "for fishing!"
done
-UnknownText_0x1b6c56: ; 0x1b6c56
+UnknownText_0x1b6c56:
text "How's your trip"
line "coming along?"
@@ -1493,7 +1493,7 @@
line "about my fishing!"
done
-UnknownText_0x1b6c96: ; 0x1b6c96
+UnknownText_0x1b6c96:
text "Yes? @"
text_from_ram wStringBuffer3
text " here…"
@@ -1502,7 +1502,7 @@
line "can I do for you?"
done
-UnknownText_0x1b6cc6: ; 0x1b6cc6
+UnknownText_0x1b6cc6:
text "Yes? @"
text_from_ram wStringBuffer3
text " here…"
@@ -1511,7 +1511,7 @@
line "can I do for you?"
done
-UnknownText_0x1b6cf6: ; 0x1b6cf6
+UnknownText_0x1b6cf6:
text "Yes? @"
text_from_ram wStringBuffer3
text " here…"
@@ -1520,7 +1520,7 @@
line "can I do for you?"
done
-UnknownText_0x1b6d26: ; 0x1b6d26
+UnknownText_0x1b6d26:
text "Hiya, <PLAYER>. How"
line "are you doing?"
@@ -1530,7 +1530,7 @@
text "."
done
-UnknownText_0x1b6d57: ; 0x1b6d57
+UnknownText_0x1b6d57:
text "Hiya, <PLAYER>, how"
line "are you doing?"
@@ -1540,7 +1540,7 @@
text "."
done
-UnknownText_0x1b6d88: ; 0x1b6d88
+UnknownText_0x1b6d88:
text "Hiya, <PLAYER>, how"
line "are you doing?"
@@ -1550,7 +1550,7 @@
text "."
done
-UnknownText_0x1b6db9: ; 0x1b6db9
+UnknownText_0x1b6db9:
text "Oh yeah, I saw you"
line "coming out of a"
@@ -1573,7 +1573,7 @@
cont "often. Heheh!"
done
-UnknownText_0x1b6e7c: ; 0x1b6e7c
+UnknownText_0x1b6e7c:
text "Yes? This is"
line "@"
text_from_ram wStringBuffer3
@@ -1583,7 +1583,7 @@
line "Good morning."
done
-UnknownText_0x1b6ea6: ; 0x1b6ea6
+UnknownText_0x1b6ea6:
text "Yes? This is"
line "@"
text_from_ram wStringBuffer3
@@ -1593,7 +1593,7 @@
line "Hello."
done
-UnknownText_0x1b6ec9: ; 0x1b6ec9
+UnknownText_0x1b6ec9:
text "Yes? This is"
line "@"
text_from_ram wStringBuffer3
@@ -1603,7 +1603,7 @@
line "evening."
done
-UnknownText_0x1b6ef3: ; 0x1b6ef3
+UnknownText_0x1b6ef3:
text "Is this <PLAY_G>?"
para "Good morning. This"
@@ -1612,7 +1612,7 @@
text "."
done
-UnknownText_0x1b6f1c: ; 0x1b6f1c
+UnknownText_0x1b6f1c:
text "Is this <PLAY_G>?"
para "Hi, it's @"
@@ -1620,7 +1620,7 @@
text "."
done
-UnknownText_0x1b6f37: ; 0x1b6f37
+UnknownText_0x1b6f37:
text "Is this <PLAY_G>?"
para "Good evening. This"
@@ -1629,7 +1629,7 @@
text "."
done
-UnknownText_0x1b6f60: ; 0x1b6f60
+UnknownText_0x1b6f60:
text "Are your #MON"
line "doing well?"
@@ -1652,7 +1652,7 @@
line "every day."
done
-UnknownText_0x1b7019: ; 0x1b7019
+UnknownText_0x1b7019:
text "Yes, hello?"
line "@"
text_from_ram wStringBuffer3
@@ -1664,7 +1664,7 @@
line "#MON?"
done
-UnknownText_0x1b7057: ; 0x1b7057
+UnknownText_0x1b7057:
text "Yes, hello?"
line "@"
text_from_ram wStringBuffer3
@@ -1676,7 +1676,7 @@
line "#MON flying?"
done
-UnknownText_0x1b7092: ; 0x1b7092
+UnknownText_0x1b7092:
text "Yes, hello?"
line "@"
text_from_ram wStringBuffer3
@@ -1689,7 +1689,7 @@
line "see some action?"
done
-UnknownText_0x1b70e7: ; 0x1b70e7
+UnknownText_0x1b70e7:
text "Good morning,"
line "<PLAY_G>!"
@@ -1699,7 +1699,7 @@
line "Good morning!"
done
-UnknownText_0x1b7112: ; 0x1b7112
+UnknownText_0x1b7112:
text "Hi, <PLAY_G>!"
para "It's @"
@@ -1708,7 +1708,7 @@
line "Remember me?"
done
-UnknownText_0x1b7132: ; 0x1b7132
+UnknownText_0x1b7132:
text "Good evening,"
line "<PLAY_G>!"
@@ -1718,7 +1718,7 @@
line "Are you free now?"
done
-UnknownText_0x1b7161: ; 0x1b7161
+UnknownText_0x1b7161:
text "Are you and your"
line "#MON fine?"
@@ -1734,7 +1734,7 @@
line "#MON!"
done
-UnknownText_0x1b71d5: ; 0x1b71d5
+UnknownText_0x1b71d5:
text "Hello, you have"
line "reached @"
text_from_ram wStringBuffer3
@@ -1743,7 +1743,7 @@
para "Ah, <PLAY_G>."
done
-UnknownText_0x1b71fc: ; 0x1b71fc
+UnknownText_0x1b71fc:
text "Hello, you have"
line "reached @"
text_from_ram wStringBuffer3
@@ -1753,7 +1753,7 @@
line "it?"
done
-UnknownText_0x1b722a: ; 0x1b722a
+UnknownText_0x1b722a:
text "Hello, you have"
line "reached @"
text_from_ram wStringBuffer3
@@ -1763,7 +1763,7 @@
line "<PLAY_G>."
done
-UnknownText_0x1b725c: ; 0x1b725c
+UnknownText_0x1b725c:
text "Ah, it's @"
text_from_ram wStringBuffer3
text "…"
@@ -1772,7 +1772,7 @@
line "moment?"
done
-UnknownText_0x1b7283: ; 0x1b7283
+UnknownText_0x1b7283:
text "Ah, it's @"
text_from_ram wStringBuffer3
text "…"
@@ -1780,7 +1780,7 @@
para "Can you talk now?"
done
-UnknownText_0x1b72a5: ; 0x1b72a5
+UnknownText_0x1b72a5:
text "Ah, it's @"
text_from_ram wStringBuffer3
text "…"
@@ -1789,7 +1789,7 @@
line "so late."
done
-UnknownText_0x1b72d0: ; 0x1b72d0
+UnknownText_0x1b72d0:
text "Have your #MON"
line "grown any?"
@@ -1799,7 +1799,7 @@
line "grown quite a bit."
done
-UnknownText_0x1b730b: ; 0x1b730b
+UnknownText_0x1b730b:
text_from_ram wStringBuffer3
text " here…"
@@ -1807,7 +1807,7 @@
line "morning, hey?"
done
-UnknownText_0x1b7331: ; 0x1b7331
+UnknownText_0x1b7331:
text_from_ram wStringBuffer3
text " here…"
@@ -1815,7 +1815,7 @@
line "weather, hey?"
done
-UnknownText_0x1b7357: ; 0x1b7357
+UnknownText_0x1b7357:
text_from_ram wStringBuffer3
text " here…"
@@ -1823,7 +1823,7 @@
line "moonlight, hey?"
done
-UnknownText_0x1b737f: ; 0x1b737f
+UnknownText_0x1b737f:
text "Hey, <PLAYER>!"
line "This is @"
text_from_ram wStringBuffer3
@@ -1830,7 +1830,7 @@
text "!"
done
-UnknownText_0x1b7397: ; 0x1b7397
+UnknownText_0x1b7397:
text "Hey, <PLAYER>!"
line "This is @"
text_from_ram wStringBuffer3
@@ -1837,7 +1837,7 @@
text "!"
done
-UnknownText_0x1b73af: ; 0x1b73af
+UnknownText_0x1b73af:
text "Hey, <PLAYER>!"
line "This is @"
text_from_ram wStringBuffer3
@@ -1844,7 +1844,7 @@
text "!"
done
-UnknownText_0x1b73c7: ; 0x1b73c7
+UnknownText_0x1b73c7:
text "Yup, yup!"
line "It's @"
text_from_ram wStringBuffer3
@@ -1854,7 +1854,7 @@
line "<PLAY_G>!"
done
-UnknownText_0x1b73ef: ; 0x1b73ef
+UnknownText_0x1b73ef:
text "Yup, yup!"
line "It's @"
text_from_ram wStringBuffer3
@@ -1864,7 +1864,7 @@
line "<PLAY_G>!"
done
-UnknownText_0x1b7417: ; 0x1b7417
+UnknownText_0x1b7417:
text "Yup, yup!"
line "It's @"
text_from_ram wStringBuffer3
@@ -1874,7 +1874,7 @@
line "<PLAY_G>!"
done
-UnknownText_0x1b743f: ; 0x1b743f
+UnknownText_0x1b743f:
text "<PLAY_G>, it's"
line "@"
text_from_ram wStringBuffer3
@@ -1884,7 +1884,7 @@
line "proper breakfast?"
done
-UnknownText_0x1b746f: ; 0x1b746f
+UnknownText_0x1b746f:
text "<PLAY_G>, it's"
line "@"
text_from_ram wStringBuffer3
@@ -1894,7 +1894,7 @@
line "proper lunch?"
done
-UnknownText_0x1b749b: ; 0x1b749b
+UnknownText_0x1b749b:
text "<PLAY_G>, it's"
line "@"
text_from_ram wStringBuffer3
@@ -1904,7 +1904,7 @@
line "proper dinner?"
done
-UnknownText_0x1b74c8: ; 0x1b74c8
+UnknownText_0x1b74c8:
text "Are your #MON"
line "looking good?"
@@ -1917,7 +1917,7 @@
line "Hahahah!"
done
-UnknownText_0x1b751a: ; 0x1b751a
+UnknownText_0x1b751a:
text "Yes, this is"
line "@"
text_from_ram wStringBuffer3
@@ -1927,7 +1927,7 @@
line "Good morning!"
done
-UnknownText_0x1b7548: ; 0x1b7548
+UnknownText_0x1b7548:
text "Yes, this is"
line "@"
text_from_ram wStringBuffer3
@@ -1937,7 +1937,7 @@
line "Yahoo!"
done
-UnknownText_0x1b756f: ; 0x1b756f
+UnknownText_0x1b756f:
text "Yes, this is"
line "@"
text_from_ram wStringBuffer3
@@ -1946,7 +1946,7 @@
para "Oh, hi, <PLAY_G>!"
done
-UnknownText_0x1b758f: ; 0x1b758f
+UnknownText_0x1b758f:
text "<PLAY_G>!"
para "It's @"
@@ -1955,7 +1955,7 @@
line "Good morning!"
done
-UnknownText_0x1b75ac: ; 0x1b75ac
+UnknownText_0x1b75ac:
text "<PLAY_G>!"
para "It's @"
@@ -1964,7 +1964,7 @@
line "Working hard?"
done
-UnknownText_0x1b75c9: ; 0x1b75c9
+UnknownText_0x1b75c9:
text "<PLAY_G>!"
para "It's @"
@@ -1973,7 +1973,7 @@
line "Were you up?"
done
-UnknownText_0x1b75e5: ; 0x1b75e5
+UnknownText_0x1b75e5:
text "Are you raising"
line "your #MON?"
@@ -1986,6 +1986,6 @@
cont "looking good!"
done
-UnusedPhoneText: ; 0x1b7624
+UnusedPhoneText:
text "Good morning."
done
--- a/data/pokemon/dex_entry_pointers.asm
+++ b/data/pokemon/dex_entry_pointers.asm
@@ -1,4 +1,4 @@
-PokedexDataPointerTable: ; 0x44378
+PokedexDataPointerTable:
; entries correspond to constants/pokemon_constants.asm
dw BulbasaurPokedexEntry
dw IvysaurPokedexEntry
@@ -251,4 +251,3 @@
dw LugiaPokedexEntry
dw HoOhPokedexEntry
dw CelebiPokedexEntry
-; 0x4456e
--- a/data/pokemon/dex_order_alpha.asm
+++ b/data/pokemon/dex_order_alpha.asm
@@ -1,6 +1,6 @@
; Every Pokémon sorted alphabetically by name.
-AlphabeticalPokedexOrder: ; 0x40c65
+AlphabeticalPokedexOrder:
db ABRA
db AERODACTYL
db AIPOM
@@ -252,4 +252,3 @@
db YANMA
db ZAPDOS
db ZUBAT
-; 0x40d60
--- a/data/pokemon/dex_order_new.asm
+++ b/data/pokemon/dex_order_new.asm
@@ -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 @@
db MEWTWO
db MEW
db CELEBI
-; 0x40e5b
--- a/data/pokemon/egg_move_pointers.asm
+++ b/data/pokemon/egg_move_pointers.asm
@@ -1,4 +1,4 @@
-EggMovePointers:: ; 0x23b11
+EggMovePointers::
dw BulbasaurEggMoves
dw NoEggMoves
dw NoEggMoves
@@ -254,4 +254,3 @@
dw NoEggMoves
dw NoEggMoves
dw NoEggMoves
-; 0x23d07
--- a/data/pokemon/evos_attacks_pointers.asm
+++ b/data/pokemon/evos_attacks_pointers.asm
@@ -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 @@
dw LugiaEvosAttacks
dw HoOhEvosAttacks
dw CelebiEvosAttacks
-; 0x427a7
--- a/data/text/battle.asm
+++ b/data/text/battle.asm
@@ -1,22 +1,20 @@
BattleText:: ; used only for BANK(BattleText)
-BattleText_PlayerPickedUpPayDayMoney: ; 0x80730
+BattleText_PlayerPickedUpPayDayMoney:
text "<PLAYER> picked up"
line "¥@"
deciram wPayDayMoney, 3, 6
text "!"
prompt
-; 0x80746
-WildPokemonAppearedText: ; 0x80746
+WildPokemonAppearedText:
text "Wild @"
text_from_ram wEnemyMonNick
text_start
line "appeared!"
prompt
-; 0x8075c
-HookedPokemonAttackedText: ; 0x8075c
+HookedPokemonAttackedText:
text "The hooked"
line "@"
text_from_ram wEnemyMonNick
@@ -23,90 +21,77 @@
text_start
cont "attacked!"
prompt
-; 0x80778
-PokemonFellFromTreeText: ; 0x80778
+PokemonFellFromTreeText:
text_from_ram wEnemyMonNick
text " fell"
line "out of the tree!"
prompt
-; 0x80793
-WildCelebiAppearedText: ; 0x80793
+WildCelebiAppearedText:
text "Wild @"
text_from_ram wEnemyMonNick
text_start
line "appeared!"
prompt
-; 0x807a9
-WantsToBattleText:: ; 0x807a9
+WantsToBattleText::
text "<ENEMY>"
line "wants to battle!"
prompt
-; 0x807bd
-BattleText_WildFled: ; 0x807bd
+BattleText_WildFled:
text "Wild @"
text_from_ram wEnemyMonNick
text_start
line "fled!"
prompt
-; 0x807cf
-BattleText_EnemyFled: ; 0x807cf
+BattleText_EnemyFled:
text "Enemy @"
text_from_ram wEnemyMonNick
text_start
line "fled!"
prompt
-; 0x807e2
-HurtByPoisonText: ; 0x807e2
+HurtByPoisonText:
text "<USER>"
line "is hurt by poison!"
prompt
-; 0x807f8
-HurtByBurnText: ; 0x807f8
+HurtByBurnText:
text "<USER>'s"
line "hurt by its burn!"
prompt
-; 0x8080e
-LeechSeedSapsText: ; 0x8080e
+LeechSeedSapsText:
text "LEECH SEED saps"
line "<USER>!"
prompt
-; 0x80822
-HasANightmareText: ; 0x80822
+HasANightmareText:
text "<USER>"
line "has a NIGHTMARE!"
prompt
-; 0x80836
-HurtByCurseText: ; 0x80836
+HurtByCurseText:
text "<USER>'s"
line "hurt by the CURSE!"
prompt
-; 0x8084d
-SandstormHitsText: ; 0x8084d
+SandstormHitsText:
text "The SANDSTORM hits"
line "<USER>!"
prompt
-; 0x80864
-PerishCountText: ; 0x80864
+PerishCountText:
text "<USER>'s"
line "PERISH count is @"
deciram wd265, 1, 1
text "!"
prompt
-; 0x80880
-BattleText_TargetRecoveredWithItem: ; 0x80880
+BattleText_TargetRecoveredWithItem:
text "<TARGET>"
line "recovered with"
cont "@"
@@ -113,9 +98,8 @@
text_from_ram wStringBuffer1
text "."
prompt
-; 0x80899
-BattleText_UserRecoveredPPUsing: ; 0x80899
+BattleText_UserRecoveredPPUsing:
text "<USER>"
line "recovered PP using"
cont "@"
@@ -122,77 +106,65 @@
text_from_ram wStringBuffer1
text "."
prompt
-; 0x808b6
-BattleText_TargetWasHitByFutureSight: ; 0x808b6
+BattleText_TargetWasHitByFutureSight:
text "<TARGET>"
line "was hit by FUTURE"
cont "SIGHT!"
prompt
-; 0x808d2
-BattleText_SafeguardFaded: ; 0x808d2
+BattleText_SafeguardFaded:
text "<USER>'s"
line "SAFEGUARD faded!"
prompt
-; 0x808e7
-BattleText_MonsLightScreenFell: ; 0x808e7
+BattleText_MonsLightScreenFell:
text_from_ram wStringBuffer1
text " #MON's"
line "LIGHT SCREEN fell!"
prompt
-; 0x80905
-BattleText_MonsReflectFaded: ; 0x80905
+BattleText_MonsReflectFaded:
text_from_ram wStringBuffer1
text " #MON's"
line "REFLECT faded!"
prompt
-; 0x8091f
-BattleText_RainContinuesToFall: ; 0x8091f
+BattleText_RainContinuesToFall:
text "Rain continues to"
line "fall."
prompt
-; 0x80938
-BattleText_TheSunlightIsStrong: ; 0x80938
+BattleText_TheSunlightIsStrong:
text "The sunlight is"
line "strong."
prompt
-; 0x80951
-BattleText_TheSandstormRages: ; 0x80951
+BattleText_TheSandstormRages:
text "The SANDSTORM"
line "rages."
prompt
-; 0x80967
-BattleText_TheRainStopped: ; 0x80967
+BattleText_TheRainStopped:
text "The rain stopped."
prompt
-; 0x8097a
-BattleText_TheSunlightFaded: ; 0x8097a
+BattleText_TheSunlightFaded:
text "The sunlight"
line "faded."
prompt
-; 0x8098f
-BattleText_TheSandstormSubsided: ; 0x8098f
+BattleText_TheSandstormSubsided:
text "The SANDSTORM"
line "subsided."
prompt
-; 0x809a8
-BattleText_EnemyMonFainted: ; 0x809a8
+BattleText_EnemyMonFainted:
text "Enemy @"
text_from_ram wEnemyMonNick
text_start
line "fainted!"
prompt
-; 0x809be
GotMoneyForWinningText:
text "<PLAYER> got ¥@"
@@ -201,17 +173,15 @@
line "for winning!"
prompt
-BattleText_EnemyWasDefeated: ; 0x809da
+BattleText_EnemyWasDefeated:
text "<ENEMY>"
line "was defeated!"
prompt
-; 0x809eb
-TiedAgainstText: ; 0x809eb
+TiedAgainstText:
text "Tied against"
line "<ENEMY>!"
prompt
-; 0x809fc
SentSomeToMomText:
text "<PLAYER> got ¥@"
@@ -229,39 +199,34 @@
text "Sent all to MOM!"
prompt
-BattleText_0x80a4f: ; 0x80a4f
+BattleText_0x80a4f:
text "<RIVAL>: Huh? I"
line "should've chosen"
cont "your #MON!"
prompt
-; 0x80a75
-BattleText_MonFainted: ; 0x80a75
+BattleText_MonFainted:
text_from_ram wBattleMonNick
text_start
line "fainted!"
prompt
-; 0x80a83
-BattleText_UseNextMon: ; 0x80a83
+BattleText_UseNextMon:
text "Use next #MON?"
done
-; 0x80a93
-BattleText_0x80a93: ; 0x80a93
+BattleText_0x80a93:
text "<RIVAL>: Yes!"
line "I guess I chose a"
cont "good #MON!"
prompt
-; 0x80ab9
-LostAgainstText: ; 0x80ab9
+LostAgainstText:
text "Lost against"
line "<ENEMY>!"
prompt
-; 0x80aca
-BattleText_EnemyIsAboutToUseWillPlayerChangeMon: ; 0x80aca
+BattleText_EnemyIsAboutToUseWillPlayerChangeMon:
text "<ENEMY>"
line "is about to use"
cont "@"
@@ -271,9 +236,8 @@
para "Will <PLAYER>"
line "change #MON?"
done
-; 0x80af8
-BattleText_EnemySentOut: ; 0x80af8
+BattleText_EnemySentOut:
text "<ENEMY>"
line "sent out"
cont "@"
@@ -280,36 +244,32 @@
text_from_ram wEnemyMonNick
text "!"
done
-; 0x80b0b
-BattleText_TheresNoWillToBattle: ; 0x80b0b
+BattleText_TheresNoWillToBattle:
text "There's no will to"
line "battle!"
prompt
-; 0x80b26
-BattleText_AnEGGCantBattle: ; 0x80b26
+BattleText_AnEGGCantBattle:
text "An EGG can't"
line "battle!"
prompt
-; 0x80b3b
-BattleText_CantEscape2: ; 0x80b3b
+BattleText_CantEscape2:
text "Can't escape!"
prompt
-; 0x80b49
-BattleText_TheresNoEscapeFromTrainerBattle: ; 0x80b49
+BattleText_TheresNoEscapeFromTrainerBattle:
text "No! There's no"
line "running from a"
cont "trainer battle!"
prompt
-BattleText_GotAwaySafely: ; 0x80b77
+BattleText_GotAwaySafely:
text "Got away safely!"
prompt
-BattleText_UserFledUsingAStringBuffer1: ; 0x80b89
+BattleText_UserFledUsingAStringBuffer1:
text "<USER>"
line "fled using a"
cont "@"
@@ -316,20 +276,17 @@
text_from_ram wStringBuffer1
text "!"
prompt
-; 0x80ba0
-BattleText_CantEscape: ; 0x80ba0
+BattleText_CantEscape:
text "Can't escape!"
prompt
-; 0x80bae
-BattleText_UserHurtBySpikes: ; 0x80bae
+BattleText_UserHurtBySpikes:
text "<USER>'s"
line "hurt by SPIKES!"
prompt
-; 0x80bc2
-RecoveredUsingText: ; 0x80bc2
+RecoveredUsingText:
text "<TARGET>"
line "recovered using a"
cont "@"
@@ -336,9 +293,8 @@
text_from_ram wStringBuffer1
text "!"
prompt
-; 0x80bde
-BattleText_UsersStringBuffer1Activated: ; 0x80bde
+BattleText_UsersStringBuffer1Activated:
text "<USER>'s"
line "@"
text_from_ram wStringBuffer1
@@ -345,54 +301,46 @@
text_start
cont "activated!"
prompt
-; 0x80bf3
-BattleText_ItemsCantBeUsedHere: ; 0x80bf3
+BattleText_ItemsCantBeUsedHere:
text "Items can't be"
line "used here."
prompt
-; 0x80c0d
-BattleText_MonIsAlreadyOut: ; 0x80c0d
+BattleText_MonIsAlreadyOut:
text_from_ram wBattleMonNick
text_start
line "is already out."
prompt
-; 0x80c22
-BattleText_MonCantBeRecalled: ; 0x80c22
+BattleText_MonCantBeRecalled:
text_from_ram wBattleMonNick
text_start
line "can't be recalled!"
prompt
-; 0x80c39
-BattleText_TheresNoPPLeftForThisMove: ; 0x80c39
+BattleText_TheresNoPPLeftForThisMove:
text "There's no PP left"
line "for this move!"
prompt
-; 0x80c5b
-BattleText_TheMoveIsDisabled: ; 0x80c5b
+BattleText_TheMoveIsDisabled:
text "The move is"
line "DISABLED!"
prompt
-; 0x80c72
-BattleText_MonHasNoMovesLeft: ; 0x80c72
+BattleText_MonHasNoMovesLeft:
text_from_ram wBattleMonNick
text_start
line "has no moves left!"
done
-; 0x80c8a
-BattleText_TargetsEncoreEnded: ; 0x80c8a
+BattleText_TargetsEncoreEnded:
text "<TARGET>'s"
line "ENCORE ended!"
prompt
-; 0x80c9c
-BattleText_StringBuffer1GrewToLevel: ; 0x80c9c
+BattleText_StringBuffer1GrewToLevel:
text_from_ram wStringBuffer1
text " grew to"
line "level @"
@@ -400,79 +348,67 @@
text "!@"
sound_dex_fanfare_50_79
db "@@"
-; 0x80cb9
-BattleText_WildMonIsEating: ; 0x80cba
+BattleText_WildMonIsEating:
text "Wild @"
text_from_ram wEnemyMonNick
text_start
line "is eating!"
prompt
-; 0x80cd1
-BattleText_WildMonIsAngry: ; 0x80cd1
+BattleText_WildMonIsAngry:
text "Wild @"
text_from_ram wEnemyMonNick
text_start
line "is angry!"
prompt
-; 0x80ce7
-FastAsleepText: ; 0x80ce7
+FastAsleepText:
text "<USER>"
line "is fast asleep!"
prompt
-; 0x80cfa
-WokeUpText: ; 0x80cfa
+WokeUpText:
text "<USER>"
line "woke up!"
prompt
-; 0x80d06
-FrozenSolidText: ; 0x80d06
+FrozenSolidText:
text "<USER>"
line "is frozen solid!"
prompt
-; 0x80d1a
-FlinchedText: ; 0x80d1a
+FlinchedText:
text "<USER>"
line "flinched!"
prompt
-; 0x80d27
-MustRechargeText: ; 0x80d27
+MustRechargeText:
text "<USER>"
line "must recharge!"
prompt
-; 0x80d39
-DisabledNoMoreText: ; 0x80d39
+DisabledNoMoreText:
text "<USER>'s"
line "disabled no more!"
prompt
-; 0x80d4f
-IsConfusedText: ; 0x80d4f
+IsConfusedText:
text "<USER>"
line "is confused!"
prompt
-; 0x80d5f
-HurtItselfText: ; 0x80d5f
+HurtItselfText:
text "It hurt itself in"
line "its confusion!"
prompt
-; 0x80d81
-ConfusedNoMoreText: ; 0x80d81
+ConfusedNoMoreText:
text "<USER>'s"
line "confused no more!"
prompt
-; 0x80d97
-BecameConfusedText: ; 0x80d97
+BecameConfusedText:
text "<TARGET>"
line "became confused!"
prompt
@@ -485,15 +421,13 @@
line "<TARGET>"
cont "of its confusion."
prompt
-; 0x80dcc
-AlreadyConfusedText: ; 0x80dcc
+AlreadyConfusedText:
text "<TARGET>'s"
line "already confused!"
prompt
-; 0x80de2
-BattleText_UsersHurtByStringBuffer1: ; 0x80de2
+BattleText_UsersHurtByStringBuffer1:
text "<USER>'s"
line "hurt by"
cont "@"
@@ -500,9 +434,8 @@
text_from_ram wStringBuffer1
text "!"
prompt
-; 0x80df5
-BattleText_UserWasReleasedFromStringBuffer1: ; 0x80df5
+BattleText_UserWasReleasedFromStringBuffer1:
text "<USER>"
line "was released from"
cont "@"
@@ -509,54 +442,46 @@
text_from_ram wStringBuffer1
text "!"
prompt
-; 0x80e11
-UsedBindText: ; 0x80e11
+UsedBindText:
text "<USER>"
line "used BIND on"
cont "<TARGET>!"
prompt
-; 0x80e24
-WhirlpoolTrapText: ; 0x80e24
+WhirlpoolTrapText:
text "<TARGET>"
line "was trapped!"
prompt
-; 0x80e34
-FireSpinTrapText: ; 0x80e34
+FireSpinTrapText:
text "<TARGET>"
line "was trapped!"
prompt
-; 0x80e44
-WrappedByText: ; 0x80e44
+WrappedByText:
text "<TARGET>"
line "was WRAPPED by"
cont "<USER>!"
prompt
-; 0x80e59
-ClampedByText: ; 0x80e59
+ClampedByText:
text "<TARGET>"
line "was CLAMPED by"
cont "<USER>!"
prompt
-; 0x80e6e
-StoringEnergyText: ; 0x80e6e
+StoringEnergyText:
text "<USER>"
line "is storing energy!"
prompt
-; 0x80e84
-UnleashedEnergyText: ; 0x80e84
+UnleashedEnergyText:
text "<USER>"
line "unleashed energy!"
prompt
-; 0x80e99
-HungOnText: ; 0x80e99
+HungOnText:
text "<TARGET>"
line "hung on with"
cont "@"
@@ -563,29 +488,25 @@
text_from_ram wStringBuffer1
text "!"
prompt
-; 0x80eb0
-EnduredText: ; 0x80eb0
+EnduredText:
text "<TARGET>"
line "ENDURED the hit!"
prompt
-; 0x80ec4
-InLoveWithText: ; 0x80ec4
+InLoveWithText:
text "<USER>"
line "is in love with"
cont "<TARGET>!"
prompt
-; 0x80eda
-InfatuationText: ; 0x80eda
+InfatuationText:
text "<USER>'s"
line "infatuation kept"
cont "it from attacking!"
prompt
-; 0x80f02
-DisabledMoveText: ; 0x80f02
+DisabledMoveText:
text "<USER>'s"
line "@"
text_from_ram wStringBuffer1
@@ -592,57 +513,49 @@
text " is"
cont "DISABLED!"
prompt
-; 0x80f19
-LoafingAroundText: ; 0x80f19
+LoafingAroundText:
text_from_ram wBattleMonNick
text " is"
line "loafing around."
prompt
-; 0x80f31
-BeganToNapText: ; 0x80f31
+BeganToNapText:
text_from_ram wBattleMonNick
text " began"
line "to nap!"
prompt
-; 0x80f44
-WontObeyText: ; 0x80f44
+WontObeyText:
text_from_ram wBattleMonNick
text " won't"
line "obey!"
prompt
-; 0x80f54
-TurnedAwayText: ; 0x80f54
+TurnedAwayText:
text_from_ram wBattleMonNick
text " turned"
line "away!"
prompt
-; 0x80f66
-IgnoredOrdersText: ; 0x80f66
+IgnoredOrdersText:
text_from_ram wBattleMonNick
text " ignored"
line "orders!"
prompt
-; 0x80f7b
-IgnoredSleepingText: ; 0x80f7b
+IgnoredSleepingText:
text_from_ram wBattleMonNick
text " ignored"
line "orders…sleeping!"
prompt
-; 0x80f99
-NoPPLeftText: ; 0x80f99
+NoPPLeftText:
text "But no PP is left"
line "for the move!"
prompt
-; 0x80fba
-HasNoPPLeftText: ; 0x80fba
+HasNoPPLeftText:
text "<USER>"
line "has no PP left for"
cont "@"
@@ -649,112 +562,94 @@
text_from_ram wStringBuffer2
text "!"
prompt
-; 0x80fd7
-WentToSleepText: ; 0x80fd7
+WentToSleepText:
text "<USER>"
line "went to sleep!"
done
-; 0x80fe9
-RestedText: ; 0x80fe9
+RestedText:
text "<USER>"
line "fell asleep and"
cont "became healthy!"
done
-; 0x8100c
-RegainedHealthText: ; 0x8100c
+RegainedHealthText:
text "<USER>"
line "regained health!"
prompt
-; 0x81020
-AttackMissedText: ; 0x81020
+AttackMissedText:
text "<USER>'s"
line "attack missed!"
prompt
-; 0x81033
-AttackMissed2Text: ; 0x81033
+AttackMissed2Text:
text "<USER>'s"
line "attack missed!"
prompt
-; 0x81046
-CrashedText: ; 0x81046
+CrashedText:
text "<USER>"
line "kept going and"
cont "crashed!"
prompt
-; 0x81061
-UnaffectedText: ; 0x81061
+UnaffectedText:
text "<TARGET>'s"
line "unaffected!"
prompt
-; 0x81071
-DoesntAffectText: ; 0x81071
+DoesntAffectText:
text "It doesn't affect"
line "<TARGET>!"
prompt
-; 0x81086
-CriticalHitText: ; 0x81086
+CriticalHitText:
text "A critical hit!"
prompt
-; 0x81097
-OneHitKOText: ; 0x81097
+OneHitKOText:
text "It's a one-hit KO!"
prompt
-; 0x810aa
-SuperEffectiveText: ; 0x810aa
+SuperEffectiveText:
text "It's super-"
line "effective!"
prompt
-; 0x810c1
-NotVeryEffectiveText: ; 0x810c1
+NotVeryEffectiveText:
text "It's not very"
line "effective…"
prompt
-; 0x810da
-TookDownWithItText: ; 0x810da
+TookDownWithItText:
text "<TARGET>"
line "took down with it,"
cont "<USER>!"
prompt
-; 0x810f3
-RageBuildingText: ; 0x810f3
+RageBuildingText:
text "<USER>'s"
line "RAGE is building!"
prompt
-; 0x81109
-GotAnEncoreText: ; 0x81109
+GotAnEncoreText:
text "<TARGET>"
line "got an ENCORE!"
prompt
-; 0x8111b
-SharedPainText: ; 0x8111b
+SharedPainText:
text "The battlers"
line "shared pain!"
prompt
-; 0x81136
-TookAimText: ; 0x81136
+TookAimText:
text "<USER>"
line "took aim!"
prompt
-; 0x81143
-SketchedText: ; 0x81143
+SketchedText:
text "<USER>"
line "SKETCHED"
cont "@"
@@ -761,16 +656,14 @@
text_from_ram wStringBuffer1
text "!"
prompt
-; 0x81156
-DestinyBondEffectText: ; 0x81156
+DestinyBondEffectText:
text "<USER>'s"
line "trying to take its"
cont "opponent with it!"
prompt
-; 0x8117f
-SpiteEffectText: ; 0x8117f
+SpiteEffectText:
text "<TARGET>'s"
line "@"
text_from_ram wStringBuffer1
@@ -779,75 +672,63 @@
deciram wd265, 1, 1
text "!"
prompt
-; 0x811a0
-BellChimedText: ; 0x811a0
+BellChimedText:
text "A bell chimed!"
line ""
prompt
-; 0x811b1
-FellAsleepText: ; 0x811b1
+FellAsleepText:
text "<TARGET>"
line "fell asleep!"
prompt
-; 0x811c1
-AlreadyAsleepText: ; 0x811c1
+AlreadyAsleepText:
text "<TARGET>'s"
line "already asleep!"
prompt
-; 0x811d5
-WasPoisonedText: ; 0x811d5
+WasPoisonedText:
text "<TARGET>"
line "was poisoned!"
prompt
-; 0x811e6
-BadlyPoisonedText: ; 0x811e6
+BadlyPoisonedText:
text "<TARGET>'s"
line "badly poisoned!"
prompt
-; 0x811fa
-AlreadyPoisonedText: ; 0x811fa
+AlreadyPoisonedText:
text "<TARGET>'s"
line "already poisoned!"
prompt
-; 0x81210
-SuckedHealthText: ; 0x81210
+SuckedHealthText:
text "Sucked health from"
line "<TARGET>!"
prompt
-; 0x81227
-DreamEatenText: ; 0x81227
+DreamEatenText:
text "<TARGET>'s"
line "dream was eaten!"
prompt
-; 0x8123c
-WasBurnedText: ; 0x8123c
+WasBurnedText:
text "<TARGET>"
line "was burned!"
prompt
-; 0x8124b
-DefrostedOpponentText: ; 0x8124b
+DefrostedOpponentText:
text "<TARGET>"
line "was defrosted!"
prompt
-; 0x8125d
-WasFrozenText: ; 0x8125d
+WasFrozenText:
text "<TARGET>"
line "was frozen solid!"
prompt
-; 0x81272
-WontRiseAnymoreText: ; 0x81272
+WontRiseAnymoreText:
text "<USER>'s"
line "@"
text_from_ram wStringBuffer2
@@ -854,9 +735,8 @@
text " won't"
cont "rise anymore!"
prompt
-; 0x8128f
-WontDropAnymoreText: ; 0x8128f
+WontDropAnymoreText:
text "<TARGET>'s"
line "@"
text_from_ram wStringBuffer2
@@ -863,97 +743,82 @@
text " won't"
cont "drop anymore!"
prompt
-; 0x812ac
-FledFromBattleText:: ; 0x812ac
+FledFromBattleText::
text "<USER>"
line "fled from battle!"
prompt
-; 0x812c1
-FledInFearText: ; 0x812c1
+FledInFearText:
text "<TARGET>"
line "fled in fear!"
prompt
-; 0x812d2
-BlownAwayText: ; 0x812d2
+BlownAwayText:
text "<TARGET>"
line "was blown away!"
prompt
-; 0x812e5
-PlayerHitTimesText: ; 0x812e5
+PlayerHitTimesText:
text "Hit @"
deciram wPlayerDamageTaken, 1, 1
text " times!"
prompt
-; 0x812f8
-EnemyHitTimesText: ; 0x812f8
+EnemyHitTimesText:
text "Hit @"
deciram wEnemyDamageTaken, 1, 1
text " times!"
prompt
-; 0x8130b
-MistText: ; 0x8130b
+MistText:
text "<USER>'s"
line "shrouded in MIST!"
prompt
-; 0x81321
-ProtectedByMistText: ; 0x81321
+ProtectedByMistText:
text "<TARGET>'s"
line "protected by MIST."
prompt
-; 0x81338
-GettingPumpedText: ; 0x81338
+GettingPumpedText:
interpret_data
text "<USER>'s"
line "getting pumped!"
prompt
-; 0x8134d
-RecoilText: ; 0x8134d
+RecoilText:
text "<USER>'s"
line "hit with recoil!"
prompt
-; 0x81362
-MadeSubstituteText: ; 0x81362
+MadeSubstituteText:
text "<USER>"
line "made a SUBSTITUTE!"
prompt
-; 0x81378
-HasSubstituteText: ; 0x81378
+HasSubstituteText:
text "<USER>"
line "has a SUBSTITUTE!"
prompt
-; 0x8138d
-TooWeakSubText: ; 0x8138d
+TooWeakSubText:
text "Too weak to make"
line "a SUBSTITUTE!"
prompt
-; 0x813ad
-SubTookDamageText: ; 0x813ad
+SubTookDamageText:
text "The SUBSTITUTE"
line "took damage for"
cont "<TARGET>!"
prompt
-; 0x813d0
-SubFadedText: ; 0x813d0
+SubFadedText:
text "<TARGET>'s"
line "SUBSTITUTE faded!"
prompt
-; 0x813e6
-LearnedMoveText: ; 0x813e6
+LearnedMoveText:
text "<USER>"
line "learned"
cont "@"
@@ -960,21 +825,18 @@
text_from_ram wStringBuffer1
text "!"
prompt
-; 0x813f8
-WasSeededText: ; 0x813f8
+WasSeededText:
text "<TARGET>"
line "was seeded!"
prompt
-; 0x81407
-EvadedText: ; 0x81407
+EvadedText:
text "<TARGET>"
line "evaded the attack!"
prompt
-; 0x8141d
-WasDisabledText: ; 0x8141d
+WasDisabledText:
text "<TARGET>'s"
line "@"
text_from_ram wStringBuffer1
@@ -981,15 +843,13 @@
text " was"
cont "DISABLED!"
prompt
-; 0x81435
-CoinsScatteredText: ; 0x81435
+CoinsScatteredText:
text "Coins scattered"
line "everywhere!"
prompt
-; 0x81452
-TransformedTypeText: ; 0x81452
+TransformedTypeText:
text "<USER>"
line "transformed into"
cont "the @"
@@ -996,15 +856,13 @@
text_from_ram wStringBuffer1
text "-type!"
prompt
-; 0x81476
-EliminatedStatsText: ; 0x81476
+EliminatedStatsText:
text "All stat changes"
line "were eliminated!"
prompt
-; 0x81499
-TransformedText: ; 0x81499
+TransformedText:
text "<USER>"
line "TRANSFORMED into"
cont "@"
@@ -1011,80 +869,67 @@
text_from_ram wStringBuffer1
text "!"
prompt
-; 0x814b4
-LightScreenEffectText: ; 0x814b4
+LightScreenEffectText:
text "<USER>'s"
line "SPCL.DEF rose!"
prompt
-; 0x814c7
-ReflectEffectText: ; 0x814c7
+ReflectEffectText:
text "<USER>'s"
line "DEFENSE rose!"
prompt
-; 0x814d9
-NothingHappenedText: ; 0x814d9
+NothingHappenedText:
text "But nothing"
line "happened."
prompt
-; 0x814f0
-ButItFailedText: ; 0x814f0
+ButItFailedText:
text "But it failed!"
prompt
-; 0x81500
-ItFailedText: ; 0x81500
+ItFailedText:
text "It failed!"
prompt
-; 0x8150c
-DidntAffect1Text: ; 0x8150c
+DidntAffect1Text:
text "It didn't affect"
line "<TARGET>!"
prompt
-; 0x81520
-DidntAffect2Text: ; 0x81520
+DidntAffect2Text:
text "It didn't affect"
line "<TARGET>!"
prompt
-; 0x81534
-HPIsFullText: ; 0x81534
+HPIsFullText:
text "<USER>'s"
line "HP is full!"
prompt
-; 0x81544
-DraggedOutText: ; 0x81544
+DraggedOutText:
text "<USER>"
line "was dragged out!"
prompt
-; 0x81558
-ParalyzedText: ; 0x81558
+ParalyzedText:
text "<TARGET>'s"
line "paralyzed! Maybe"
cont "it can't attack!"
prompt
-; 0x8157d
-FullyParalyzedText: ; 0x8157d
+FullyParalyzedText:
text "<USER>'s"
line "fully paralyzed!"
prompt
-; 0x81592
-AlreadyParalyzedText: ; 0x81592
+AlreadyParalyzedText:
text "<TARGET>'s"
line "already paralyzed!"
prompt
-; 0x815a9
-ProtectedByText: ; 0x815a9
+ProtectedByText:
text "<TARGET>'s"
line "protected by"
cont "@"
@@ -1091,15 +936,13 @@
text_from_ram wStringBuffer1
text "!"
prompt
-; 0x815c1
-MirrorMoveFailedText: ; 0x815c1
+MirrorMoveFailedText:
text "The MIRROR MOVE"
next "failed!"
prompt
-; 0x815da
-StoleText: ; 0x815da
+StoleText:
text "<USER>"
line "stole @"
text_from_ram wStringBuffer1
@@ -1106,28 +949,24 @@
text_start
cont "from its foe!"
prompt
-; 0x815f7
-CantEscapeNowText: ; 0x815f7
+CantEscapeNowText:
text "<TARGET>"
line "can't escape now!"
prompt
-; 0x8160b
-StartedNightmareText: ; 0x8160b
+StartedNightmareText:
text "<TARGET>"
line "started to have a"
cont "NIGHTMARE!"
prompt
-; 0x8162b
-WasDefrostedText: ; 0x8162b
+WasDefrostedText:
text "<USER>"
line "was defrosted!"
prompt
-; 0x8163d
-PutACurseText: ; 0x8163d
+PutACurseText:
text "<USER>"
line "cut its own HP and"
@@ -1134,117 +973,99 @@
para "put a CURSE on"
line "<TARGET>!"
prompt
-; 0x81665
-ProtectedItselfText: ; 0x81665
+ProtectedItselfText:
text "<USER>"
line "PROTECTED itself!"
prompt
-; 0x8167a
-ProtectingItselfText: ; 0x8167a
+ProtectingItselfText:
text "<TARGET>'s"
line "PROTECTING itself!"
done
-; 0x81691
-SpikesText: ; 0x81691
+SpikesText:
text "SPIKES scattered"
line "all around"
cont "<TARGET>!"
prompt
-; 0x816b1
-IdentifiedText: ; 0x816b1
+IdentifiedText:
text "<USER>"
line "identified"
cont "<TARGET>!"
prompt
-; 0x816c2
-StartPerishText: ; 0x816c2
+StartPerishText:
text "Both #MON will"
line "faint in 3 turns!"
prompt
-; 0x816e4
-SandstormBrewedText: ; 0x816e4
+SandstormBrewedText:
text "A SANDSTORM"
line "brewed!"
prompt
-; 0x816f9
-BracedItselfText: ; 0x816f9
+BracedItselfText:
text "<USER>"
line "braced itself!"
prompt
-; 0x8170b
-FellInLoveText: ; 0x8170b
+FellInLoveText:
text "<TARGET>"
line "fell in love!"
prompt
-; 0x8171c
-CoveredByVeilText: ; 0x8171c
+CoveredByVeilText:
text "<USER>'s"
line "covered by a veil!"
prompt
-; 0x81733
-SafeguardProtectText: ; 0x81733
+SafeguardProtectText:
text "<TARGET>"
line "is protected by"
cont "SAFEGUARD!"
prompt
-; 0x81751
-MagnitudeText: ; 0x81751
+MagnitudeText:
text "Magnitude @"
deciram wd265, 1, 1
text "!"
prompt
-; 0x81764
-ReleasedByText: ; 0x81764
+ReleasedByText:
text "<USER>"
line "was released by"
cont "<TARGET>!"
prompt
-; 0x8177a
-ShedLeechSeedText: ; 0x8177a
+ShedLeechSeedText:
text "<USER>"
line "shed LEECH SEED!"
prompt
-; 0x8178e
-BlewSpikesText: ; 0x8178e
+BlewSpikesText:
text "<USER>"
line "blew away SPIKES!"
prompt
-; 0x817a3
-DownpourText: ; 0x817a3
+DownpourText:
text "A downpour"
line "started!"
prompt
-; 0x817b8
-SunGotBrightText: ; 0x817b8
+SunGotBrightText:
text "The sunlight got"
line "bright!"
prompt
-; 0x817d2
-BellyDrumText: ; 0x817d2
+BellyDrumText:
text "<USER>"
line "cut its HP and"
cont "maximized ATTACK!"
prompt
-; 0x817f6
-CopiedStatsText: ; 0x817f6
+CopiedStatsText:
text "<USER>"
line "copied the stat"
@@ -1251,43 +1072,36 @@
para "changes of"
line "<TARGET>!"
prompt
-; 0x81817
-ForesawAttackText: ; 0x81817
+ForesawAttackText:
text "<USER>"
line "foresaw an attack!"
prompt
-; 0x8182d
-BeatUpAttackText: ; 0x8182d
+BeatUpAttackText:
text_from_ram wStringBuffer1
text "'s"
line "attack!"
done
-; 0x8183b
-RefusedGiftText: ; 0x8183b
+RefusedGiftText:
text "<TARGET>"
line "refused the gift!"
prompt
-; 0x81850
-IgnoredOrders2Text: ; 0x81850
+IgnoredOrders2Text:
text "<USER>"
line "ignored orders!"
prompt
-; 0x81863
-BattleText_LinkErrorBattleCanceled: ; 0x81863
+BattleText_LinkErrorBattleCanceled:
text "Link error…"
para "The battle has"
line "been canceled…"
prompt
-; 0x8188e
-BattleText_0x8188e: ; 0x8188e
+BattleText_0x8188e:
text "There is no time"
line "left today!"
done
-; 0x818ac
--- a/data/text/unused_sweet_honey.asm
+++ b/data/text/unused_sweet_honey.asm
@@ -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 @@
line "with you."
done
-UnusedSweetHoneyBagFullText: ; 0x557d6
+UnusedSweetHoneyBagFullText:
text "I want to give you"
line "some SWEET HONEY,"
@@ -25,17 +25,17 @@
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 @@
line "up to?"
done
-UnusedSweetHoneyAfterText2: ; 0x558b1
+UnusedSweetHoneyAfterText2:
text "Did you put SWEET"
line "HONEY on a tree?"
@@ -54,7 +54,7 @@
line "it?"
done
-UnusedSweetHoneyAfterText3: ; 0x558ea
+UnusedSweetHoneyAfterText3:
text "Did you put SWEET"
line "HONEY on a tree?"
@@ -63,6 +63,6 @@
cont "be drawn to it."
done
-UnusedSweetHoneyButterfreeText: ; 0x5593f
+UnusedSweetHoneyButterfreeText:
text "BUTTERFREE: Freeh!"
done
--- a/data/trainers/party_pointers.asm
+++ b/data/trainers/party_pointers.asm
@@ -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
--- a/data/wild/johto_grass.asm
+++ b/data/wild/johto_grass.asm
@@ -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
--- a/data/wild/johto_water.asm
+++ b/data/wild/johto_water.asm
@@ -1,6 +1,6 @@
; Johto Pokémon in water
-JohtoWaterWildMons: ; 0x2b11d
+JohtoWaterWildMons:
map_id RUINS_OF_ALPH_OUTSIDE
db 2 percent ; encounter rate
--- a/data/wild/kanto_grass.asm
+++ b/data/wild/kanto_grass.asm
@@ -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
--- a/data/wild/kanto_water.asm
+++ b/data/wild/kanto_water.asm
@@ -1,6 +1,6 @@
; Kanto Pokémon in water
-KantoWaterWildMons: ; 0x2b7f7
+KantoWaterWildMons:
map_id TOHJO_FALLS
db 4 percent ; encounter rate
--- a/data/wild/swarm_grass.asm
+++ b/data/wild/swarm_grass.asm
@@ -1,6 +1,6 @@
; Pokémon swarms in grass
-SwarmGrassWildMons: ; 0x2b8d0
+SwarmGrassWildMons:
; Dunsparce swarm
map_id DARK_CAVE_VIOLET_ENTRANCE
--- a/data/wild/swarm_water.asm
+++ b/data/wild/swarm_water.asm
@@ -1,6 +1,6 @@
; Pokémon swarms in water
-SwarmWaterWildMons: ; 0x2b92f
+SwarmWaterWildMons:
; No swarms encountered while surfing in Crystal
--- a/engine/battle/core.asm
+++ b/engine/battle/core.asm
@@ -2577,11 +2577,11 @@
pop de
ret
-IsKantoGymLeader: ; 0x3d123
+IsKantoGymLeader:
ld hl, KantoGymLeaders
jr IsGymLeaderCommon
-IsGymLeader: ; 0x3d128
+IsGymLeader:
ld hl, GymLeaders
IsGymLeaderCommon:
push de
@@ -2590,7 +2590,6 @@
call IsInArray
pop de
ret
-; 0x3d137
INCLUDE "data/trainers/leaders.asm"
--- a/engine/battle/menu.asm
+++ b/engine/battle/menu.asm
@@ -34,15 +34,14 @@
dw MenuData_0x24f34
db 1 ; default option
-MenuData_0x24f34: ; 0x24f34
+MenuData_0x24f34:
db STATICMENU_CURSOR | STATICMENU_DISABLE_B ; flags
dn 2, 2 ; rows, columns
db 6 ; spacing
dba Strings24f3d
dbw BANK(MenuData_0x24f34), 0
-; 0x24f3d
-Strings24f3d: ; 0x24f3d
+Strings24f3d:
db "FIGHT@"
db "<PKMN>@"
db "PACK@"
--- a/engine/events/basement_key.asm
+++ b/engine/events/basement_key.asm
@@ -27,7 +27,6 @@
ld [wItemEffectSucceeded], a
ret
-.BasementKeyScript: ; 0x507e1
+.BasementKeyScript:
closetext
farjump BasementDoorScript
-; 0x507e6
--- a/engine/events/battle_tower/battle_tower.asm
+++ b/engine/events/battle_tower/battle_tower.asm
@@ -330,7 +330,7 @@
jr .done_trainer_name
.trainer_name_okay
- ld hl, wBT_OTTempName ; 0xc608
+ ld hl, wBT_OTTempName
.done_trainer_name
ld de, wOTPlayerName
@@ -1564,7 +1564,7 @@
ld [wScriptVar], a
ret
-LoadOpponentTrainerAndPokemonWithOTSprite: ; 0x170b44
+LoadOpponentTrainerAndPokemonWithOTSprite:
farcall Function_LoadOpponentTrainerAndPokemons
ld a, [rSVBK]
push af
--- a/engine/events/battle_tower/rules.asm
+++ b/engine/events/battle_tower/rules.asm
@@ -20,11 +20,10 @@
dw JumpText_NeedAtLeastThreeMon
dw JumpText_EggDoesNotQualify
-.ExcuseMeText: ; 0x8b1fc
+.ExcuseMeText:
; Excuse me!
text_jump UnknownText_0x1c5937
db "@"
-; 0x8b201
_CheckForBattleTowerRules:
ld hl, wStringBuffer2
@@ -56,11 +55,10 @@
dw JumpText_TheMonMustNotHoldTheSameItems
dw JumpText_YouCantTakeAnEgg
-JumpText_ExcuseMeYoureNotReady: ; 0x8b22c
+JumpText_ExcuseMeYoureNotReady:
; Excuse me. You're not ready.
text_jump Text_ExcuseMeYoureNotReady
db "@"
-; 0x8b231
BattleTower_PleaseReturnWhenReady:
ld hl, .PleaseReturnWhenReady
@@ -67,47 +65,40 @@
call PrintText
ret
-.PleaseReturnWhenReady: ; 0x8b238
+.PleaseReturnWhenReady:
; Please return when you're ready.
text_jump UnknownText_0x1c5962
db "@"
-; 0x8b23d
-JumpText_NeedAtLeastThreeMon: ; 0x8b23d
+JumpText_NeedAtLeastThreeMon:
; You need at least three #MON.
text_jump UnknownText_0x1c5983
db "@"
-; 0x8b242
-JumpText_EggDoesNotQualify: ; 0x8b242
+JumpText_EggDoesNotQualify:
; Sorry, an EGG doesn't qualify.
text_jump UnknownText_0x1c59a3
db "@"
-; 0x8b247
-JumpText_OnlyThreeMonMayBeEntered: ; 0x8b247
+JumpText_OnlyThreeMonMayBeEntered:
; Only three #MON may be entered.
text_jump Text_OnlyThreeMonMayBeEntered
db "@"
-; 0x8b24c
-JumpText_TheMonMustAllBeDifferentKinds: ; 0x8b24c
+JumpText_TheMonMustAllBeDifferentKinds:
; The @ #MON must all be different kinds.
text_jump Text_TheMonMustAllBeDifferentKinds
db "@"
-; 0x8b251
-JumpText_TheMonMustNotHoldTheSameItems: ; 0x8b251
+JumpText_TheMonMustNotHoldTheSameItems:
; The @ #MON must not hold the same items.
text_jump Text_TheMonMustNotHoldTheSameItems
db "@"
-; 0x8b256
-JumpText_YouCantTakeAnEgg: ; 0x8b256
+JumpText_YouCantTakeAnEgg:
; You can't take an EGG!
text_jump Text_YouCantTakeAnEgg
db "@"
-; 0x8b25b
BattleTower_ExecuteJumptable:
ld bc, 0
--- a/engine/events/battle_tower/trainer_text.asm
+++ b/engine/events/battle_tower/trainer_text.asm
@@ -233,303 +233,303 @@
dw BTWinF15
-BTGreetingM1: ; 0x11f42e
+BTGreetingM1:
text_jump BattleTowerText_0x1ec000
db "@"
-BTLossM1: ; 0x11f433
+BTLossM1:
text_jump BattleTowerText_0x1ec03b
db "@"
-BTWinM1: ; 0x11f438
+BTWinM1:
text_jump UnknownText_0x1ec060
db "@"
-BTGreetingM2: ; 0x11f43d
+BTGreetingM2:
text_jump BattleTowerText_0x1ec080
db "@"
-BTLossM2: ; 0x11f442
+BTLossM2:
text_jump UnknownText_0x1ec0a3
db "@"
-BTWinM2: ; 0x11f447
+BTWinM2:
text_jump UnknownText_0x1ec0c4
db "@"
-BTGreetingM3: ; 0x11f44c
+BTGreetingM3:
text_jump UnknownText_0x1ec0e1
db "@"
-BTLossM3: ; 0x11f451
+BTLossM3:
text_jump UnknownText_0x1ec108
db "@"
-BTWinM3: ; 0x11f456
+BTWinM3:
text_jump UnknownText_0x1ec12a
db "@"
-BTGreetingM4: ; 0x11f45b
+BTGreetingM4:
text_jump UnknownText_0x1ec14d
db "@"
-BTLossM4: ; 0x11f460
+BTLossM4:
text_jump UnknownText_0x1ec16f
db "@"
-BTWinM4: ; 0x11f465
+BTWinM4:
text_jump UnknownText_0x1ec190
db "@"
-BTGreetingM5: ; 0x11f46a
+BTGreetingM5:
text_jump UnknownText_0x1ec1ae
db "@"
-BTLossM5: ; 0x11f46f
+BTLossM5:
text_jump UnknownText_0x1ec1d0
db "@"
-BTWinM5: ; 0x11f474
+BTWinM5:
text_jump UnknownText_0x1ec1f4
db "@"
-BTGreetingM6: ; 0x11f479
+BTGreetingM6:
text_jump UnknownText_0x1ec216
db "@"
-BTLossM6: ; 0x11f47e
+BTLossM6:
text_jump UnknownText_0x1ec238
db "@"
-BTWinM6: ; 0x11f483
+BTWinM6:
text_jump UnknownText_0x1ec259
db "@"
-BTGreetingM7: ; 0x11f488
+BTGreetingM7:
text_jump UnknownText_0x1ec27b
db "@"
-BTLossM7: ; 0x11f48d
+BTLossM7:
text_jump UnknownText_0x1ec2a0
db "@"
-BTWinM7: ; 0x11f492
+BTWinM7:
text_jump UnknownText_0x1ec2c0
db "@"
-BTGreetingM8: ; 0x11f497
+BTGreetingM8:
text_jump UnknownText_0x1ec2d9
db "@"
-BTLossM8: ; 0x11f49c
+BTLossM8:
text_jump UnknownText_0x1ec2fe
db "@"
-BTWinM8: ; 0x11f4a1
+BTWinM8:
text_jump UnknownText_0x1ec320
db "@"
-BTGreetingM9: ; 0x11f4a6
+BTGreetingM9:
text_jump UnknownText_0x1ec33f
db "@"
-BTLossM9: ; 0x11f4ab
+BTLossM9:
text_jump UnknownText_0x1ec36c
db "@"
-BTWinM9: ; 0x11f4b0
+BTWinM9:
text_jump UnknownText_0x1ec389
db "@"
-BTGreetingM10: ; 0x11f4b5
+BTGreetingM10:
text_jump UnknownText_0x1ec3ad
db "@"
-BTLossM10: ; 0x11f4ba
+BTLossM10:
text_jump UnknownText_0x1ec3c5
db "@"
-BTWinM10: ; 0x11f4bf
+BTWinM10:
text_jump UnknownText_0x1ec3e5
db "@"
-BTGreetingM11: ; 0x11f4c4
+BTGreetingM11:
text_jump UnknownText_0x1ec402
db "@"
-BTLossM11: ; 0x11f4c9
+BTLossM11:
text_jump UnknownText_0x1ec411
db "@"
-BTWinM11: ; 0x11f4ce
+BTWinM11:
text_jump UnknownText_0x1ec41f
db "@"
-BTGreetingM12: ; 0x11f4d3
+BTGreetingM12:
text_jump UnknownText_0x1ec42e
db "@"
-BTLossM12: ; 0x11f4d8
+BTLossM12:
text_jump UnknownText_0x1ec461
db "@"
-BTWinM12: ; 0x11f4dd
+BTWinM12:
text_jump UnknownText_0x1ec4a0
db "@"
-BTGreetingM13: ; 0x11f4e2
+BTGreetingM13:
text_jump UnknownText_0x1ec4d6
db "@"
-BTLossM13: ; 0x11f4e7
+BTLossM13:
text_jump UnknownText_0x1ec4f5
db "@"
-BTWinM13: ; 0x11f4ec
+BTWinM13:
text_jump UnknownText_0x1ec512
db "@"
-BTGreetingM14: ; 0x11f4f1
+BTGreetingM14:
text_jump UnknownText_0x1ec532
db "@"
-BTLossM14: ; 0x11f4f6
+BTLossM14:
text_jump UnknownText_0x1ec54b
db "@"
-BTWinM14: ; 0x11f4fb
+BTWinM14:
text_jump UnknownText_0x1ec565
db "@"
-BTGreetingM15: ; 0x11f500
+BTGreetingM15:
text_jump UnknownText_0x1ec580
db "@"
-BTLossM15: ; 0x11f505
+BTLossM15:
text_jump UnknownText_0x1ec59d
db "@"
-BTWinM15: ; 0x11f50a
+BTWinM15:
text_jump UnknownText_0x1ec5b5
db "@"
-BTGreetingM16: ; 0x11f50f
+BTGreetingM16:
text_jump UnknownText_0x1ec5d3
db "@"
-BTLossM16: ; 0x11f514
+BTLossM16:
text_jump UnknownText_0x1ec5ee
db "@"
-BTWinM16: ; 0x11f519
+BTWinM16:
text_jump UnknownText_0x1ec60d
db "@"
-BTGreetingM17: ; 0x11f51e
+BTGreetingM17:
text_jump UnknownText_0x1ec631
db "@"
-BTLossM17: ; 0x11f523
+BTLossM17:
text_jump UnknownText_0x1ec651
db "@"
-BTWinM17: ; 0x11f528
+BTWinM17:
text_jump UnknownText_0x1ec68f
db "@"
-BTGreetingM18: ; 0x11f52d
+BTGreetingM18:
text_jump UnknownText_0x1ec6b1
db "@"
-BTLossM18: ; 0x11f532
+BTLossM18:
text_jump UnknownText_0x1ec6d0
db "@"
-BTWinM18: ; 0x11f537
+BTWinM18:
text_jump UnknownText_0x1ec708
db "@"
-BTGreetingM19: ; 0x11f53c
+BTGreetingM19:
text_jump UnknownText_0x1ec720
db "@"
-BTLossM19: ; 0x11f541
+BTLossM19:
text_jump UnknownText_0x1ec73e
db "@"
-BTWinM19: ; 0x11f546
+BTWinM19:
text_jump UnknownText_0x1ec75b
db "@"
-BTGreetingM20: ; 0x11f54b
+BTGreetingM20:
text_jump UnknownText_0x1ec77f
db "@"
-BTLossM20: ; 0x11f550
+BTLossM20:
text_jump UnknownText_0x1ec798
db "@"
-BTWinM20: ; 0x11f555
+BTWinM20:
text_jump UnknownText_0x1ec7bb
db "@"
-BTGreetingM21: ; 0x11f55a
+BTGreetingM21:
text_jump UnknownText_0x1ec7d8
db "@"
-BTLossM21: ; 0x11f55f
+BTLossM21:
text_jump UnknownText_0x1ec818
db "@"
-BTWinM21: ; 0x11f564
+BTWinM21:
text_jump UnknownText_0x1ec837
db "@"
-BTGreetingM22: ; 0x11f569
+BTGreetingM22:
text_jump UnknownText_0x1ec858
db "@"
-BTLossM22: ; 0x11f56e
+BTLossM22:
text_jump UnknownText_0x1ec876
db "@"
-BTWinM22: ; 0x11f573
+BTWinM22:
text_jump UnknownText_0x1ec898
db "@"
-BTGreetingM23: ; 0x11f578
+BTGreetingM23:
text_jump UnknownText_0x1ec8b1
db "@"
-BTLossM23: ; 0x11f57d
+BTLossM23:
text_jump UnknownText_0x1ec8d5
db "@"
-BTWinM23: ; 0x11f582
+BTWinM23:
text_jump UnknownText_0x1ec8f0
db "@"
-BTGreetingM24: ; 0x11f587
+BTGreetingM24:
text_jump UnknownText_0x1ec911
db "@"
-BTLossM24: ; 0x11f58c
+BTLossM24:
text_jump UnknownText_0x1ec928
db "@"
-BTWinM24: ; 0x11f591
+BTWinM24:
text_jump UnknownText_0x1ec949
db "@"
-BTGreetingM25: ; 0x11f596
+BTGreetingM25:
text_jump UnknownText_0x1ec969
db "@"
-BTLossM25: ; 0x11f59b
+BTLossM25:
text_jump UnknownText_0x1ec986
db "@"
-BTWinM25: ; 0x11f5a0
+BTWinM25:
text_jump UnknownText_0x1ec99b
db "@"
@@ -536,182 +536,182 @@
-BTGreetingF1: ; 0x11f5a5
+BTGreetingF1:
text_jump UnknownText_0x1ec9bd
db "@"
-BTLossF1: ; 0x11f5aa
+BTLossF1:
text_jump UnknownText_0x1ec9d9
db "@"
-BTWinF1: ; 0x11f5af
+BTWinF1:
text_jump UnknownText_0x1ec9f7
db "@"
-BTGreetingF2: ; 0x11f5b4
+BTGreetingF2:
text_jump UnknownText_0x1eca0a
db "@"
-BTLossF2: ; 0x11f5b9
+BTLossF2:
text_jump UnknownText_0x1eca2a
db "@"
-BTWinF2: ; 0x11f5be
+BTWinF2:
text_jump UnknownText_0x1eca47
db "@"
-BTGreetingF3: ; 0x11f5c3
+BTGreetingF3:
text_jump UnknownText_0x1eca64
db "@"
-BTLossF3: ; 0x11f5c8
+BTLossF3:
text_jump UnknownText_0x1eca82
db "@"
-BTWinF3: ; 0x11f5cd
+BTWinF3:
text_jump UnknownText_0x1eca9d
db "@"
-BTGreetingF4: ; 0x11f5d2
+BTGreetingF4:
text_jump UnknownText_0x1ecabf
db "@"
-BTLossF4: ; 0x11f5d7
+BTLossF4:
text_jump UnknownText_0x1ecade
db "@"
-BTWinF4: ; 0x11f5dc
+BTWinF4:
text_jump UnknownText_0x1ecafa
db "@"
-BTGreetingF5: ; 0x11f5e1
+BTGreetingF5:
text_jump UnknownText_0x1ecb19
db "@"
-BTLossF5: ; 0x11f5e6
+BTLossF5:
text_jump UnknownText_0x1ecb37
db "@"
-BTWinF5: ; 0x11f5eb
+BTWinF5:
text_jump UnknownText_0x1ecb55
db "@"
-BTGreetingF6: ; 0x11f5f0
+BTGreetingF6:
text_jump UnknownText_0x1ecb70
db "@"
-BTLossF6: ; 0x11f5f5
+BTLossF6:
text_jump UnknownText_0x1ecb92
db "@"
-BTWinF6: ; 0x11f5fa
+BTWinF6:
text_jump UnknownText_0x1ecbb6
db "@"
-BTGreetingF7: ; 0x11f5ff
+BTGreetingF7:
text_jump UnknownText_0x1ecbd9
db "@"
-BTLossF7: ; 0x11f604
+BTLossF7:
text_jump UnknownText_0x1ecbf3
db "@"
-BTWinF7: ; 0x11f609
+BTWinF7:
text_jump UnknownText_0x1ecc15
db "@"
-BTGreetingF8: ; 0x11f60e
+BTGreetingF8:
text_jump UnknownText_0x1ecc39
db "@"
-BTLossF8: ; 0x11f613
+BTLossF8:
text_jump UnknownText_0x1ecc55
db "@"
-BTWinF8: ; 0x11f618
+BTWinF8:
text_jump UnknownText_0x1ecc75
db "@"
-BTGreetingF9: ; 0x11f61d
+BTGreetingF9:
text_jump UnknownText_0x1ecc92
db "@"
-BTLossF9: ; 0x11f622
+BTLossF9:
text_jump UnknownText_0x1ecca7
db "@"
-BTWinF9: ; 0x11f627
+BTWinF9:
text_jump UnknownText_0x1eccc1
db "@"
-BTGreetingF10: ; 0x11f62c
+BTGreetingF10:
text_jump UnknownText_0x1eccd7
db "@"
-BTLossF10: ; 0x11f631
+BTLossF10:
text_jump UnknownText_0x1eccef
db "@"
-BTWinF10: ; 0x11f636
+BTWinF10:
text_jump UnknownText_0x1ecd0e
db "@"
-BTGreetingF11: ; 0x11f63b
+BTGreetingF11:
text_jump UnknownText_0x1ecd2b
db "@"
-BTLossF11: ; 0x11f640
+BTLossF11:
text_jump UnknownText_0x1ecd4d
db "@"
-BTWinF11: ; 0x11f645
+BTWinF11:
text_jump UnknownText_0x1ecd6b
db "@"
-BTGreetingF12: ; 0x11f64a
+BTGreetingF12:
text_jump UnknownText_0x1ecd8d
db "@"
-BTLossF12: ; 0x11f64f
+BTLossF12:
text_jump UnknownText_0x1ecdaf
db "@"
-BTWinF12: ; 0x11f654
+BTWinF12:
text_jump UnknownText_0x1ecdcf
db "@"
-BTGreetingF13: ; 0x11f659
+BTGreetingF13:
text_jump UnknownText_0x1ecded
db "@"
-BTLossF13: ; 0x11f65e
+BTLossF13:
text_jump UnknownText_0x1ece0d
db "@"
-BTWinF13: ; 0x11f663
+BTWinF13:
text_jump UnknownText_0x1ece2a
db "@"
-BTGreetingF14: ; 0x11f668
+BTGreetingF14:
text_jump UnknownText_0x1ece4b
db "@"
-BTLossF14: ; 0x11f66d
+BTLossF14:
text_jump UnknownText_0x1ece70
db "@"
-BTWinF14: ; 0x11f672
+BTWinF14:
text_jump UnknownText_0x1ece8a
db "@"
-BTGreetingF15: ; 0x11f677
+BTGreetingF15:
text_jump UnknownText_0x1ecea8
db "@"
-BTLossF15: ; 0x11f67c
+BTLossF15:
text_jump UnknownText_0x1ecec9
db "@"
-BTWinF15: ; 0x11f681
+BTWinF15:
text_jump UnknownText_0x1ecee8
db "@"
--- a/engine/events/buena.asm
+++ b/engine/events/buena.asm
@@ -27,21 +27,19 @@
ld [wScriptVar], a
ret
-.MenuHeader: ; 0x8afa9
+.MenuHeader:
db MENU_BACKUP_TILES ; flags
menu_coords 0, 0, 10, 7
dw .MenuData
db 1 ; default option
-; 0x8afb1
db 0
-.MenuData: ; 0x8afb2
+.MenuData:
db STATICMENU_CURSOR | STATICMENU_DISABLE_B ; flags
db 0 ; items
dw .PasswordIndices
dw .PlacePasswordChoices
-; 0x8afb4
.PasswordIndices:
db NUM_PASSWORDS_PER_CATEGORY
@@ -148,40 +146,34 @@
call PlayClickSFX
ret
-.Text_AskWhichPrize: ; 0x8b072
+.Text_AskWhichPrize:
; Which prize would you like?
text_jump UnknownText_0x1c589f
db "@"
-; 0x8b077
-.Text_IsThatRight: ; 0x8b077
+.Text_IsThatRight:
; ? Is that right?
text_jump UnknownText_0x1c58bc
db "@"
-; 0x8b07c
.Text_HereYouGo: ; Here you go!
text_jump UnknownText_0x1c58d1
db "@"
-; 0x8b081
-.Text_NotEnoughPoints: ; 0x8b081
+.Text_NotEnoughPoints:
; You don't have enough points.
text_jump UnknownText_0x1c58e0
db "@"
-; 0x8b086
-.Text_NoRoom: ; 0x8b086
+.Text_NoRoom:
; You have no room for it.
text_jump UnknownText_0x1c58ff
db "@"
-; 0x8b08b
-.Text_PleaseComeBackAgain: ; 0x8b08b
+.Text_PleaseComeBackAgain:
; Oh. Please come back again!
text_jump UnknownText_0x1c591a
db "@"
-; 0x8b090
Buena_DisplayBlueCardBalance:
ld hl, BlueCardBalanceMenuHeader
@@ -220,7 +212,7 @@
.Points_string:
db "Points@"
-BlueCardBalanceMenuHeader: ; 0x8b0d1
+BlueCardBalanceMenuHeader:
db MENU_BACKUP_TILES ; flags
menu_coords 0, 11, 11, 13
@@ -229,7 +221,7 @@
call LoadMenuHeader
ret
-.MenuHeader ; 0x8b0dd
+.MenuHeader
db MENU_BACKUP_TILES ; flags
menu_coords 0, 0, 17, TEXTBOX_Y - 1
@@ -259,16 +251,15 @@
xor a
ret
-.MenuHeader: ; 0x8b113
+.MenuHeader:
db MENU_BACKUP_TILES ; flags
menu_coords 1, 1, 16, 9
dw .MenuData
db 1 ; default option
-; 0x8b11b
db 0
-.MenuData: ; 0x8b11c
+.MenuData:
db SCROLLINGMENU_DISPLAY_ARROWS ; flags
db 4, 13 ; rows, columns
db 1 ; spacing
--- a/engine/events/bug_contest/caught_mon.asm
+++ b/engine/events/bug_contest/caught_mon.asm
@@ -32,7 +32,7 @@
ld hl, wContestMon
jp GeneratePartyMonStats
-.caughttext ; 0xe71d
+.caughttext
; Caught @ !
text_jump UnknownText_0x1c10c0
db "@"
--- a/engine/events/bug_contest/contest.asm
+++ b/engine/events/bug_contest/contest.asm
@@ -6,7 +6,7 @@
farcall StartBugContestTimer
ret
-BugCatchingContestBattleScript:: ; 0x135eb
+BugCatchingContestBattleScript::
writecode VAR_BATTLETYPE, BATTLETYPE_CONTEST
randomwildmon
startbattle
@@ -15,7 +15,7 @@
iffalse BugCatchingContestOutOfBallsScript
end
-BugCatchingContestOverScript:: ; 0x135f8
+BugCatchingContestOverScript::
playsound SFX_ELEVATOR_END
opentext
writetext BugCatchingContestText_BeeepTimesUp
@@ -22,22 +22,22 @@
waitbutton
jump BugCatchingContestReturnToGateScript
-BugCatchingContestOutOfBallsScript: ; 0x13603
+BugCatchingContestOutOfBallsScript:
playsound SFX_ELEVATOR_END
opentext
writetext BugCatchingContestText_ContestIsOver
waitbutton
-BugCatchingContestReturnToGateScript: ; 0x1360b
+BugCatchingContestReturnToGateScript:
closetext
jumpstd bugcontestresultswarp
-BugCatchingContestText_BeeepTimesUp: ; 0x1360f
+BugCatchingContestText_BeeepTimesUp:
; ANNOUNCER: BEEEP! Time's up!
text_jump UnknownText_0x1bd2ca
db "@"
-BugCatchingContestText_ContestIsOver: ; 0x13614
+BugCatchingContestText_ContestIsOver:
; ANNOUNCER: The Contest is over!
text_jump UnknownText_0x1bd2e7
db "@"
--- a/engine/events/bug_contest/display_stats.asm
+++ b/engine/events/bug_contest/display_stats.asm
@@ -96,7 +96,7 @@
ld hl, .AlreadyCaughtText
jp PrintText
-.AlreadyCaughtText: ; 0xcc0d0
+.AlreadyCaughtText:
; You already caught a @ .
text_jump UnknownText_0x1c10dd
db "@"
--- a/engine/events/bug_contest/judging.asm
+++ b/engine/events/bug_contest/judging.asm
@@ -25,7 +25,7 @@
call PrintText
jp BugContest_GetPlayersResult
-BugContest_FirstPlaceText: ; 0x136eb
+BugContest_FirstPlaceText:
text_jump ContestJudging_FirstPlaceText
start_asm
ld de, SFX_1ST_PLACE
@@ -34,13 +34,12 @@
ld hl, BugContest_FirstPlaceScoreText
ret
-BugContest_FirstPlaceScoreText: ; 0x136fd
+BugContest_FirstPlaceScoreText:
; The winning score was @ points!
text_jump ContestJudging_FirstPlaceScoreText
db "@"
-; 0x13702
-BugContest_SecondPlaceText: ; 0x13702
+BugContest_SecondPlaceText:
; Placing second was @ , who caught a @ !@ @
text_jump ContestJudging_SecondPlaceText
start_asm
@@ -50,13 +49,12 @@
ld hl, BugContest_SecondPlaceScoreText
ret
-BugContest_SecondPlaceScoreText: ; 0x13714
+BugContest_SecondPlaceScoreText:
; The score was @ points!
text_jump ContestJudging_SecondPlaceScoreText
db "@"
-; 0x13719
-BugContest_ThirdPlaceText: ; 0x13719
+BugContest_ThirdPlaceText:
; Placing third was @ , who caught a @ !@ @
text_jump ContestJudging_ThirdPlaceText
start_asm
@@ -66,11 +64,10 @@
ld hl, BugContest_ThirdPlaceScoreText
ret
-BugContest_ThirdPlaceScoreText: ; 0x1372b
+BugContest_ThirdPlaceScoreText:
; The score was @ points!
text_jump ContestJudging_ThirdPlaceScoreText
db "@"
-; 0x13730
LoadContestantName:
; If a = 1, get your name.
--- a/engine/events/card_key.asm
+++ b/engine/events/card_key.asm
@@ -32,7 +32,6 @@
ld [wItemEffectSucceeded], a
ret
-.CardKeyScript: ; 0x507af
+.CardKeyScript:
closetext
farjump CardKeySlotScript
-; 0x507b4
--- a/engine/events/daycare.asm
+++ b/engine/events/daycare.asm
@@ -166,11 +166,10 @@
scf
ret
-.DummyText: ; 0x167f1
+.DummyText:
;
text_jump UnknownText_0x1bdaa7
db "@"
-; 0x167f6
DayCare_DepositPokemonText:
ld a, DAYCARETEXT_DEPOSIT
@@ -296,125 +295,105 @@
dw .OhFineThen ; 12
dw .ComeAgain ; 13
-.DayCareManIntro: ; 0x168d2
+.DayCareManIntro:
; I'm the DAY-CARE MAN. Want me to raise a #MON?
text_jump UnknownText_0x1bdaa9
db "@"
-; 0x168d7
-.DayCareManOddEgg: ; 0x168d7
+.DayCareManOddEgg:
; I'm the DAY-CARE MAN. Do you know about EGGS? I was raising #MON with my wife, you see. We were shocked to find an EGG! How incredible is that? So, want me to raise a #MON?
text_jump UnknownText_0x1bdad8
db "@"
-; 0x168dc
-.DayCareLadyIntro: ; 0x168dc
+.DayCareLadyIntro:
; I'm the DAY-CARE LADY. Should I raise a #MON for you?
text_jump UnknownText_0x1bdb85
db "@"
-; 0x168e1
-.DayCareLadyOddEgg: ; 0x168e1
+.DayCareLadyOddEgg:
; I'm the DAY-CARE LADY. Do you know about EGGS? My husband and I were raising some #MON, you see. We were shocked to find an EGG! How incredible could that be? Should I raise a #MON for you?
text_jump UnknownText_0x1bdbbb
db "@"
-; 0x168e6
-.WhichOne: ; 0x168e6
+.WhichOne:
; What should I raise for you?
text_jump UnknownText_0x1bdc79
db "@"
-; 0x168eb
-.JustOneMon: ; 0x168eb
+.JustOneMon:
; Oh? But you have just one #MON.
text_jump UnknownText_0x1bdc97
db "@"
-; 0x168f0
-.CantAcceptEgg: ; 0x168f0
+.CantAcceptEgg:
; Sorry, but I can't accept an EGG.
text_jump UnknownText_0x1bdcb8
db "@"
-; 0x168f5
-.RemoveMail: ; 0x168f5
+.RemoveMail:
; Remove MAIL before you come see me.
text_jump UnknownText_0x1bdcda
db "@"
-; 0x168fa
-.LastHealthyMon: ; 0x168fa
+.LastHealthyMon:
; If you give me that, what will you battle with?
text_jump UnknownText_0x1bdcff
db "@"
-; 0x168ff
-.OkayIllRaiseYourMon: ; 0x168ff
+.OkayIllRaiseYourMon:
; OK. I'll raise your @ .
text_jump UnknownText_0x1bdd30
db "@"
-; 0x16904
-.ComeBackForItLater: ; 0x16904
+.ComeBackForItLater:
; Come back for it later.
text_jump UnknownText_0x1bdd4b
db "@"
-; 0x16909
-.AreWeGeniusesOrWhat: ; 0x16909
+.AreWeGeniusesOrWhat:
; Are we geniuses or what? Want to see your @ ?
text_jump UnknownText_0x1bdd64
db "@"
-; 0x1690e
-.AskRetrieveMon: ; 0x1690e
+.AskRetrieveMon:
; Your @ has grown a lot. By level, it's grown by @ . If you want your #MON back, it will cost ¥@ .
text_jump UnknownText_0x1bdd96
db "@"
-; 0x16913
-.PerfectHeresYourMon: ; 0x16913
+.PerfectHeresYourMon:
; Perfect! Here's your #MON.
text_jump UnknownText_0x1bde04
db "@"
-; 0x16918
-.GotBackMon: ; 0x16918
+.GotBackMon:
; got back @ .
text_jump UnknownText_0x1bde1f
db "@"
-; 0x1691d
-.ImmediatelyWithdrawMon: ; 0x1691d
+.ImmediatelyWithdrawMon:
; Huh? Back already? Your @ needs a little more time with us. If you want your #MON back, it will cost ¥100.
text_jump UnknownText_0x1bde32
db "@"
-; 0x16922
-.PartyFull: ; 0x16922
+.PartyFull:
; You have no room for it.
text_jump UnknownText_0x1bdea2
db "@"
-; 0x16927
-.NotEnoughMoney: ; 0x16927
+.NotEnoughMoney:
; You don't have enough money.
text_jump UnknownText_0x1bdebc
db "@"
-; 0x1692c
-.OhFineThen: ; 0x1692c
+.OhFineThen:
; Oh, fine then.
text_jump UnknownText_0x1bded9
db "@"
-; 0x16931
-.ComeAgain: ; 0x16931
+.ComeAgain:
; Come again.
text_jump UnknownText_0x1bdee9
db "@"
-; 0x16936
DayCareManOutside:
ld hl, wDayCareMan
@@ -424,11 +403,10 @@
call PrintText
ret
-.NotYet: ; 0x16944
+.NotYet:
; Not yet…
text_jump UnknownText_0x1bdef6
db "@"
-; 0x16949
.AskGiveEgg:
ld hl, .IntroText
@@ -467,35 +445,30 @@
ld [wScriptVar], a
ret
-.IntroText: ; 0x16993
+.IntroText:
; Ah, it's you! We were raising your #MON, and my goodness, were we surprised! Your #MON had an EGG! We don't know how it got there, but your #MON had it. You want it?
text_jump UnknownText_0x1bdf00
db "@"
-; 0x16998
-.GotEggText: ; 0x16998
+.GotEggText:
; received the EGG!
text_jump UnknownText_0x1bdfa5
db "@"
-; 0x1699d
-.TakeGoodCareOfItText: ; 0x1699d
+.TakeGoodCareOfItText:
; Take good care of it.
text_jump UnknownText_0x1bdfba
db "@"
-; 0x169a2
-.IllKeepItThanksText: ; 0x169a2
+.IllKeepItThanksText:
; Well then, I'll keep it. Thanks!
text_jump UnknownText_0x1bdfd1
db "@"
-; 0x169a7
-.PartyFullText: ; 0x169a7
+.PartyFullText:
; You have no room in your party. Come back later.
text_jump UnknownText_0x1bdff2
db "@"
-; 0x169ac
DayCare_GiveEgg:
ld a, [wEggMonLevel]
--- a/engine/events/dratini.asm
+++ b/engine/events/dratini.asm
@@ -1,4 +1,4 @@
-GiveDratini: ; 0x8b170
+GiveDratini:
; if wScriptVar is 0 or 1, change the moveset of the last Dratini in the party.
; 0: give it a special moveset with Extremespeed.
; 1: give it the normal moveset of a level 15 Dratini.
@@ -84,7 +84,7 @@
db TWISTER
db 0
-.GetNthPartyMon: ; 0x8b1ce
+.GetNthPartyMon:
; inputs:
; hl must be set to 0 before calling this function.
; a must be set to the number of Pokémon in the party.
--- a/engine/events/elevator.asm
+++ b/engine/events/elevator.asm
@@ -137,11 +137,10 @@
scf
ret
-Elevator_WhichFloorText: ; 0x1350d
+Elevator_WhichFloorText:
; Which floor?
text_jump UnknownText_0x1bd2bc
db "@"
-; 0x13512
Elevator_GetCurrentFloorText:
@@ -178,14 +177,13 @@
call GetFloorString
ret
-Elevator_MenuHeader: ; 0x13550
+Elevator_MenuHeader:
db MENU_BACKUP_TILES ; flags
menu_coords 12, 1, 18, 9
dw Elevator_MenuData
db 1 ; default option
-; 0x13558
-Elevator_MenuData: ; 0x13558
+Elevator_MenuData:
db SCROLLINGMENU_DISPLAY_ARROWS ; flags
db 4, 0 ; rows, columns
db 1 ; horizontal spacing
--- a/engine/events/forced_movement.asm
+++ b/engine/events/forced_movement.asm
@@ -1,4 +1,4 @@
-Script_ForcedMovement:: ; 0x1253d
+Script_ForcedMovement::
checkcode VAR_FACING
ifequal DOWN, .down
ifequal UP, .up
@@ -5,56 +5,47 @@
ifequal LEFT, .left
ifequal RIGHT, .right
end
-; 0x12550
-.up ; 0x12550
+.up
applymovement PLAYER, .MovementData_up
end
-; 0x12555
-.down ; 0x12555
+.down
applymovement PLAYER, .MovementData_down
end
-; 0x1255a
-.right ; 0x1255a
+.right
applymovement PLAYER, .MovementData_right
end
-; 0x1255f
-.left ; 0x1255f
+.left
applymovement PLAYER, .MovementData_left
end
-; 0x12564
-.MovementData_up: ; 0x12564
+.MovementData_up:
step_dig 16
turn_in DOWN
step_dig 16
turn_head DOWN
step_end
-; 0x1256b
-.MovementData_down: ; 0x1256b
+.MovementData_down:
step_dig 16
turn_in UP
step_dig 16
turn_head UP
step_end
-; 0x12572
-.MovementData_right: ; 0x12572
+.MovementData_right:
step_dig 16
turn_in LEFT
step_dig 16
turn_head LEFT
step_end
-; 0x12579
-.MovementData_left: ; 0x12579
+.MovementData_left:
step_dig 16
turn_in RIGHT
step_dig 16
turn_head RIGHT
step_end
-; 0x12580
--- a/engine/events/halloffame.asm
+++ b/engine/events/halloffame.asm
@@ -1,6 +1,6 @@
HALLOFFAME_COLON EQU $63
-HallOfFame:: ; 0x8640e
+HallOfFame::
call HallOfFame_FadeOutMusic
ld a, [wStatusFlags]
push af
@@ -33,7 +33,6 @@
ld b, a
farcall Credits
ret
-; 0x86455
RedCredits::
ld a, LOW(MUSIC_NONE)
--- a/engine/events/itemfinder.asm
+++ b/engine/events/itemfinder.asm
@@ -26,7 +26,7 @@
jr nz, .sfx_loop
ret
-.Script_FoundSomething: ; 0x125ad
+.Script_FoundSomething:
reloadmappart
special UpdateTimePals
callasm .ItemfinderSound
@@ -33,24 +33,20 @@
writetext .Text_FoundSomething
closetext
end
-; 0x125ba
-.Script_FoundNothing: ; 0x125ba
+.Script_FoundNothing:
reloadmappart
special UpdateTimePals
writetext .Text_FoundNothing
closetext
end
-; 0x125c3
-.Text_FoundSomething: ; 0x125c3
+.Text_FoundSomething:
; Yes! ITEMFINDER indicates there's an item nearby.
text_jump UnknownText_0x1c0a77
db "@"
-; 0x125c8
-.Text_FoundNothing: ; 0x125c8
+.Text_FoundNothing:
; Nope! ITEMFINDER isn't responding.
text_jump UnknownText_0x1c0aa9
db "@"
-; 0x125cd
--- a/engine/events/kurt.asm
+++ b/engine/events/kurt.asm
@@ -3,11 +3,10 @@
call PrintText
ret
-.Text: ; 0x88007
+.Text:
; Which APRICORN should I use?
text_jump UnknownText_0x1bc06b
db "@"
-; 0x8800c
Kurt_PrintTextHowMany:
ld hl, .Text
@@ -14,11 +13,10 @@
call PrintText
ret
-.Text: ; 0x88013
+.Text:
; How many should I make?
text_jump UnknownText_0x1bc089
db "@"
-; 0x88018
SelectApricornForKurt:
call LoadStandardMenuHeader
@@ -79,16 +77,15 @@
ld c, a
ret
-.MenuHeader: ; 0x88086
+.MenuHeader:
db MENU_BACKUP_TILES ; flags
menu_coords 1, 1, 13, 10
dw .MenuData
db 1 ; default option
-; 0x8808e
db 0 ; XXX
-.MenuData: ; 0x8808f
+.MenuData:
db SCROLLINGMENU_DISPLAY_ARROWS ; flags
db 4, 7
db 1
@@ -150,7 +147,7 @@
call CloseWindow
ret
-.MenuHeader: ; 0x8810d
+.MenuHeader:
db MENU_BACKUP_TILES ; flags
menu_coords 6, 9, SCREEN_WIDTH - 1, 12
dw NULL
--- a/engine/events/lucky_number.asm
+++ b/engine/events/lucky_number.asm
@@ -206,12 +206,12 @@
dba sBox13
dba sBox14
-.FoundPartymonText: ; 0x4d9c9
+.FoundPartymonText:
; Congratulations! We have a match with the ID number of @ in your party.
text_jump UnknownText_0x1c1261
db "@"
-.FoundBoxmonText: ; 0x4d9ce
+.FoundBoxmonText:
; Congratulations! We have a match with the ID number of @ in your PC BOX.
text_jump UnknownText_0x1c12ae
db "@"
--- a/engine/events/magikarp.asm
+++ b/engine/events/magikarp.asm
@@ -71,11 +71,10 @@
ld [wScriptVar], a
ret
-.MeasureItText: ; 0xfbba9
+.MeasureItText:
; Let me measure that MAGIKARP. …Hm, it measures @ .
text_jump UnknownText_0x1c1203
db "@"
-; 0xfbbae
Magikarp_LoadFeetInchesChars:
ld hl, vTiles2 tile "′" ; $6e
@@ -315,8 +314,7 @@
call PrintText
ret
-.CurrentRecordtext: ; 0xfbce8
+.CurrentRecordtext:
; "CURRENT RECORD"
text_jump UnknownText_0x1c123a
db "@"
-; 0xfbced
--- a/engine/events/misc_scripts.asm
+++ b/engine/events/misc_scripts.asm
@@ -1,4 +1,4 @@
-Script_AbortBugContest: ; 0x122c1
+Script_AbortBugContest:
checkflag ENGINE_BUG_CONTEST_TIMER
iffalse .finish
setflag ENGINE_DAILY_BUG_CONTEST
@@ -6,7 +6,7 @@
.finish
end
-FindItemInBallScript:: ; 0x122ce
+FindItemInBallScript::
callasm .TryReceiveItem
iffalse .no_room
disappear LAST_TALKED
@@ -17,9 +17,8 @@
itemnotify
closetext
end
-; 0x122e3
-.no_room ; 0x122e3
+.no_room
opentext
writetext .text_found
waitbutton
@@ -27,19 +26,16 @@
waitbutton
closetext
end
-; 0x122ee
-.text_found ; 0x122ee
+.text_found
; found @ !
text_jump UnknownText_0x1c0a1c
db "@"
-; 0x122f3
-.text_bag_full ; 0x122f3
+.text_bag_full
; But can't carry any more items.
text_jump UnknownText_0x1c0a2c
db "@"
-; 0x122f8
.TryReceiveItem:
xor a
--- a/engine/events/misc_scripts_2.asm
+++ b/engine/events/misc_scripts_2.asm
@@ -1,4 +1,4 @@
-RepelWoreOffScript:: ; 0x13619
+RepelWoreOffScript::
opentext
writetext .text
waitbutton
@@ -5,12 +5,12 @@
closetext
end
-.text ; 0x13620
+.text
; REPEL's effect wore off.
text_jump UnknownText_0x1bd308
db "@"
-HiddenItemScript:: ; 0x13625
+HiddenItemScript::
opentext
copybytetovar wEngineBuffer3
itemtotext USE_SCRIPT_VAR, MEM_BUFFER_0
@@ -22,7 +22,7 @@
itemnotify
jump .finish
-.bag_full ; 0x1363e
+.bag_full
buttonsound
writetext .no_room_text
waitbutton
@@ -31,12 +31,12 @@
closetext
end
-.found_text ; 0x13645
+.found_text
; found @ !
text_jump UnknownText_0x1bd321
db "@"
-.no_room_text ; 0x1364a
+.no_room_text
; But has no space left…
text_jump UnknownText_0x1bd331
db "@"
--- a/engine/events/mom.asm
+++ b/engine/events/mom.asm
@@ -389,42 +389,36 @@
call ClearBox
ret
-.Text_AdjustClock: ; 0x164f4
+.Text_AdjustClock:
; Do you want to adjust your clock for Daylight Saving Time?
text_jump UnknownText_0x1c6095
db "@"
-; 0x164f9
-.Text_LostInstructionBooklet: ; 0x164f9
+.Text_LostInstructionBooklet:
; I lost the instruction booklet for the POKéGEAR.
; Come back again in a while.
text_jump UnknownText_0x1c60d1
db "@"
-; 0x164fe
-.Text_SwitchToDST: ; 0x164fe
+.Text_SwitchToDST:
; Do you want to switch to Daylight Saving Time?
text_jump UnknownText_0x1c6000
db "@"
-; 0x16503
-.Text_SetClockForward: ; 0x16503
+.Text_SetClockForward:
; I set the clock forward by one hour.
text_jump UnknownText_0x1c6030
db "@"
-; 0x16508
-.Text_IsDSTOver: ; 0x16508
+.Text_IsDSTOver:
; Is Daylight Saving Time over?
text_jump UnknownText_0x1c6056
db "@"
-; 0x1650d
-.Text_SetClockBack: ; 0x1650d
+.Text_SetClockBack:
; I put the clock back one hour.
text_jump UnknownText_0x1c6075
db "@"
-; 0x16512
Mom_SetUpWithdrawMenu:
ld de, Mon_WithdrawString
@@ -596,101 +590,85 @@
dt 90
dt 9
-UnknownText_0x16649: ; 0x16649
+UnknownText_0x16649:
; Wow, that's a cute #MON. Where did you get it? … So, you're leaving on an adventure… OK! I'll help too. But what can I do for you? I know! I'll save money for you. On a long journey, money's important. Do you want me to save your money?
text_jump UnknownText_0x1bd77f
db "@"
-; 0x1664e
-UnknownText_0x1664e: ; 0x1664e
+UnknownText_0x1664e:
; OK, I'll take care of your money.
text_jump UnknownText_0x1bd868
db "@"
-; 0x16653
-UnknownText_0x16653: ; 0x16653
+UnknownText_0x16653:
; Be careful. #MON are your friends. You need to work as a team. Now, go on!
text_jump UnknownText_0x1bd88e
db "@"
-; 0x16658
-UnknownText_0x16658: ; 0x16658
+UnknownText_0x16658:
; Hi! Welcome home! You're trying very hard, I see. I've kept your room tidy. Or is this about your money?
text_jump UnknownText_0x1bd8da
db "@"
-; 0x1665d
-UnknownText_0x1665d: ; 0x1665d
+UnknownText_0x1665d:
; What do you want to do?
text_jump UnknownText_0x1bd942
db "@"
-; 0x16662
-UnknownText_0x16662: ; 0x16662
+UnknownText_0x16662:
; How much do you want to save?
text_jump UnknownText_0x1bd95b
db "@"
-; 0x16667
-UnknownText_0x16667: ; 0x16667
+UnknownText_0x16667:
; How much do you want to take?
text_jump UnknownText_0x1bd97a
db "@"
-; 0x1666c
-UnknownText_0x1666c: ; 0x1666c
+UnknownText_0x1666c:
; Do you want to save some money?
text_jump UnknownText_0x1bd999
db "@"
-; 0x16671
-UnknownText_0x16671: ; 0x16671
+UnknownText_0x16671:
; You haven't saved that much.
text_jump UnknownText_0x1bd9ba
db "@"
-; 0x16676
-UnknownText_0x16676: ; 0x16676
+UnknownText_0x16676:
; You can't take that much.
text_jump UnknownText_0x1bd9d7
db "@"
-; 0x1667b
-UnknownText_0x1667b: ; 0x1667b
+UnknownText_0x1667b:
; You don't have that much.
text_jump UnknownText_0x1bd9f1
db "@"
-; 0x16680
-UnknownText_0x16680: ; 0x16680
+UnknownText_0x16680:
; You can't save that much.
text_jump UnknownText_0x1bda0b
db "@"
-; 0x16685
-UnknownText_0x16685: ; 0x16685
+UnknownText_0x16685:
; OK, I'll save your money. Trust me! , stick with it!
text_jump UnknownText_0x1bda25
db "@"
-; 0x1668a
-UnknownText_0x1668a: ; 0x1668a
+UnknownText_0x1668a:
; Your money's safe here! Get going!
text_jump UnknownText_0x1bda5b
db "@"
-; 0x1668f
-UnknownText_0x1668f: ; 0x1668f
+UnknownText_0x1668f:
; , don't give up!
text_jump UnknownText_0x1bda7e
db "@"
-; 0x16694
-UnknownText_0x16694: ; 0x16694
+UnknownText_0x16694:
; Just do what you can.
text_jump UnknownText_0x1bda90
db "@"
-; 0x16699
Mom_SavedString:
db "SAVED@"
@@ -704,14 +682,13 @@
Mom_HeldString:
db "HELD@"
-MenuHeader_0x166b5: ; 0x166b5
+MenuHeader_0x166b5:
db MENU_BACKUP_TILES ; flags
menu_coords 0, 0, 10, 10
dw MenuData_0x166bd
db 1 ; default option
-; 0x166bd
-MenuData_0x166bd: ; 0x166bd
+MenuData_0x166bd:
db STATICMENU_CURSOR ; flags
db 4 ; items
db "GET@"
@@ -718,4 +695,3 @@
db "SAVE@"
db "CHANGE@"
db "CANCEL@"
-; 0x166d6
--- a/engine/events/mom_phone.asm
+++ b/engine/events/mom_phone.asm
@@ -24,10 +24,9 @@
scf
ret
-.Script: ; 0xfd00f
+.Script:
callasm .ASMFunction
farjump Script_ReceivePhoneCall
-; 0xfd017
.ASMFunction:
call MomBuysItem_DeductFunds
@@ -166,21 +165,19 @@
ld de, .DollScript
ret
-.ItemScript: ; 0xfd0fd
+.ItemScript:
writetext _MomText_HiHowAreYou
writetext _MomText_FoundAnItem
writetext _MomText_BoughtWithYourMoney
writetext _MomText_ItsInPC
end
-; 0xfd10a
-.DollScript: ; 0xfd10a
+.DollScript:
writetext _MomText_HiHowAreYou
writetext _MomText_FoundADoll
writetext _MomText_BoughtWithYourMoney
writetext _MomText_ItsInRoom
end
-; 0xfd117
GetItemFromMom:
@@ -213,41 +210,35 @@
db 0, 0, 0 ; unused
-_MomText_HiHowAreYou: ; 0xfd1b1
+_MomText_HiHowAreYou:
; Hi, ! How are you?
text_jump UnknownText_0x1bc615
db "@"
-; 0xfd1b6
-_MomText_FoundAnItem: ; 0xfd1b6
+_MomText_FoundAnItem:
; I found a useful item shopping, so
text_jump UnknownText_0x1bc62a
db "@"
-; 0xfd1bb
-_MomText_BoughtWithYourMoney: ; 0xfd1bb
+_MomText_BoughtWithYourMoney:
; I bought it with your money. Sorry!
text_jump UnknownText_0x1bc64e
db "@"
-; 0xfd1c0
-_MomText_ItsInPC: ; 0xfd1c0
+_MomText_ItsInPC:
; It's in your PC. You'll like it!
text_jump UnknownText_0x1bc673
db "@"
-; 0xfd1c5
-_MomText_FoundADoll: ; 0xfd1c5
+_MomText_FoundADoll:
; While shopping today, I saw this adorable doll, so
text_jump UnknownText_0x1bc693
db "@"
-; 0xfd1ca
-_MomText_ItsInRoom: ; 0xfd1ca
+_MomText_ItsInRoom:
; It's in your room. You'll love it!
text_jump UnknownText_0x1bc6c7
db "@"
-; 0xfd1cf
db 0 ; unused
--- a/engine/events/move_deleter.asm
+++ b/engine/events/move_deleter.asm
@@ -59,53 +59,45 @@
call PrintText
ret
-.OnlyOneMoveText: ; 0x2c5d1
+.OnlyOneMoveText:
; That #MON knows only one move.
text_jump UnknownText_0x1c5eba
db "@"
-; 0x2c5d6
-.ConfirmDeleteText: ; 0x2c5d6
+.ConfirmDeleteText:
; Oh, make it forget @ ?
text_jump UnknownText_0x1c5eda
db "@"
-; 0x2c5db
-.MoveDeletedText: ; 0x2c5db
+.MoveDeletedText:
; Done! Your #MON forgot the move.
text_jump UnknownText_0x1c5ef5
db "@"
-; 0x2c5e0
-.EggText: ; 0x2c5e0
+.EggText:
; An EGG doesn't know any moves!
text_jump UnknownText_0x1c5f17
db "@"
-; 0x2c5e5
-.DeclinedDeletionText: ; 0x2c5e5
+.DeclinedDeletionText:
; No? Come visit me again.
text_jump UnknownText_0x1c5f36
db "@"
-; 0x2c5ea
-.AskWhichMoveText: ; 0x2c5ea
+.AskWhichMoveText:
; Which move should it forget, then?
text_jump UnknownText_0x1c5f50
db "@"
-; 0x2c5ef
-.IntroText: ; 0x2c5ef
+.IntroText:
; Um… Oh, yes, I'm the MOVE DELETER. I can make #MON forget moves. Shall I make a #MON forget?
text_jump UnknownText_0x1c5f74
db "@"
-; 0x2c5f4
-.AskWhichMonText: ; 0x2c5f4
+.AskWhichMonText:
; Which #MON?
text_jump UnknownText_0x1c5fd1
db "@"
-; 0x2c5f9
.DeleteMove:
ld a, b
--- a/engine/events/move_tutor.asm
+++ b/engine/events/move_tutor.asm
@@ -98,6 +98,6 @@
scf
ret
-.MenuHeader: ; 0x4930a
+.MenuHeader:
db MENU_BACKUP_TILES ; flags
menu_coords 0, 12, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1
--- a/engine/events/name_rater.asm
+++ b/engine/events/name_rater.asm
@@ -178,68 +178,58 @@
jr nz, .loop
ret
-NameRaterIntroText: ; 0xfb80f
+NameRaterIntroText:
; Hello, hello! I'm the NAME RATER.
; I rate the names of #MON.
; Would you like me to rate names?
text_jump UnknownText_0x1c0043
db "@"
-; 0xfb814
-NameRaterWhichMonText: ; 0xfb814
+NameRaterWhichMonText:
; Which #MON's nickname should I rate for you?
text_jump UnknownText_0x1c00a0
db "@"
-; 0xfb819
-NameRaterIsGoodText: ; 0xfb819
+NameRaterIsGoodText:
; Hm… @ … That's a fairly decent name.
; But, how about a slightly better nickname?
; Want me to give it a better name?
text_jump UnknownText_0x1c00cd
db "@"
-; 0xfb81e
-NameRaterWhichNameText: ; 0xfb81e
+NameRaterWhichNameText:
; All right. What name should we give it, then?
text_jump UnknownText_0x1c0142
db "@"
-; 0xfb823
-NameRaterEvenBetterText: ; 0xfb823
+NameRaterEvenBetterText:
; That's a better name than before! Well done!
text_jump UnknownText_0x1c0171
db "@"
-; 0xfb828
-NameRaterCancelText: ; 0xfb828
+NameRaterCancelText:
; OK, then. Come again sometime.
text_jump UnknownText_0x1c019e
db "@"
-; 0xfb82d
-NameRaterTradedText: ; 0xfb82d
+NameRaterTradedText:
; Hm… @ ? What a great name! It's perfect.
; Treat @ with loving care.
text_jump UnknownText_0x1c01be
db "@"
-; 0xfb832
-NameRaterEggText: ; 0xfb832
+NameRaterEggText:
; Whoa… That's just an EGG.
text_jump UnknownText_0x1c0208
db "@"
-; 0xfb837
-NameRaterSameAsBeforeText: ; 0xfb837
+NameRaterSameAsBeforeText:
; It might look the different as before,
; but this new name is much better! Well done!
text_jump UnknownText_0x1c0222
db "@"
-; 0xfb83c
-NameRaterDoneText: ; 0xfb83c
+NameRaterDoneText:
; All right. This #MON is now named @ .
text_jump UnknownText_0x1c0272
db "@"
-; 0xfb841
--- a/engine/events/npc_trade.asm
+++ b/engine/events/npc_trade.asm
@@ -272,7 +272,7 @@
ret
-GetTradeAttribute: ; 0xfcdc2
+GetTradeAttribute:
ld d, 0
push de
ld a, [wJumptableIndex]
@@ -286,7 +286,6 @@
pop de
add hl, de
ret
-; 0xfcdd7
Trade_GetAttributeOfCurrentPartymon:
ld a, [wCurPartyMon]
@@ -435,14 +434,13 @@
dw TradeAfterText4
-ConnectLinkCableText: ; 0xfcf7b
+ConnectLinkCableText:
; OK, connect the Game Link Cable.
text_jump UnknownText_0x1bd407
db "@"
-; 0xfcf80
-TradedForText: ; 0xfcf80
+TradedForText:
; traded givemon for getmon
text_jump UnknownText_0x1bd429
start_asm
@@ -457,113 +455,95 @@
; interpret_data
text_jump UnknownText_0x1bd445
db "@"
-; 0xfcf97
-TradeIntroText1: ; 0xfcf97
+TradeIntroText1:
; I collect #MON. Do you have @ ? Want to trade it for my @ ?
text_jump UnknownText_0x1bd449
db "@"
-; 0xfcf9c
-TradeCancelText1: ; 0xfcf9c
+TradeCancelText1:
; You don't want to trade? Aww…
text_jump UnknownText_0x1bd48c
db "@"
-; 0xfcfa1
-TradeWrongText1: ; 0xfcfa1
+TradeWrongText1:
; Huh? That's not @ . What a letdown…
text_jump UnknownText_0x1bd4aa
db "@"
-; 0xfcfa6
-TradeCompleteText1: ; 0xfcfa6
+TradeCompleteText1:
; Yay! I got myself @ ! Thanks!
text_jump UnknownText_0x1bd4d2
db "@"
-; 0xfcfab
-TradeAfterText1: ; 0xfcfab
+TradeAfterText1:
; Hi, how's my old @ doing?
text_jump UnknownText_0x1bd4f4
db "@"
-; 0xfcfb0
TradeIntroText2:
-TradeIntroText3: ; 0xfcfb0
+TradeIntroText3:
; Hi, I'm looking for this #MON. If you have @ , would you trade it for my @ ?
text_jump UnknownText_0x1bd512
db "@"
-; 0xfcfb5
TradeCancelText2:
-TradeCancelText3: ; 0xfcfb5
+TradeCancelText3:
; You don't have one either? Gee, that's really disappointing…
text_jump UnknownText_0x1bd565
db "@"
-; 0xfcfba
TradeWrongText2:
-TradeWrongText3: ; 0xfcfba
+TradeWrongText3:
; You don't have @ ? That's too bad, then.
text_jump UnknownText_0x1bd5a1
db "@"
-; 0xfcfbf
-TradeCompleteText2: ; 0xfcfbf
+TradeCompleteText2:
; Great! Thank you! I finally got @ .
text_jump UnknownText_0x1bd5cc
db "@"
-; 0xfcfc4
-TradeAfterText2: ; 0xfcfc4
+TradeAfterText2:
; Hi! The @ you traded me is doing great!
text_jump UnknownText_0x1bd5f4
db "@"
-; 0xfcfc9
-TradeIntroText4: ; 0xfcfc9
+TradeIntroText4:
; 's cute, but I don't have it. Do you have @ ? Want to trade it for my @ ?
text_jump UnknownText_0x1bd621
db "@"
-; 0xfcfce
-TradeCancelText4: ; 0xfcfce
+TradeCancelText4:
; You don't want to trade? Oh, darn…
text_jump UnknownText_0x1bd673
db "@"
-; 0xfcfd3
-TradeWrongText4: ; 0xfcfd3
+TradeWrongText4:
; That's not @ . Please trade with me if you get one.
text_jump UnknownText_0x1bd696
db "@"
-; 0xfcfd8
-TradeCompleteText4: ; 0xfcfd8
+TradeCompleteText4:
; Wow! Thank you! I always wanted @ !
text_jump UnknownText_0x1bd6cd
db "@"
-; 0xfcfdd
-TradeAfterText4: ; 0xfcfdd
+TradeAfterText4:
; How is that @ I traded you doing? Your @ 's so cute!
text_jump UnknownText_0x1bd6f5
db "@"
-; 0xfcfe2
-TradeCompleteText3: ; 0xfcfe2
+TradeCompleteText3:
; Uh? What happened?
text_jump UnknownText_0x1bd731
db "@"
-; 0xfcfe7
-TradeAfterText3: ; 0xfcfe7
+TradeAfterText3:
; Trading is so odd… I still have a lot to learn about it.
text_jump UnknownText_0x1bd745
db "@"
-; 0xfcfec
--- a/engine/events/overworld.asm
+++ b/engine/events/overworld.asm
@@ -112,7 +112,7 @@
call MenuTextBoxBackup
ret
-.CantUseHere: ; 0xc780
+.CantUseHere:
; Can't use that here.
text_jump UnknownText_0x1c05c8
db "@"
@@ -161,12 +161,12 @@
ld a, $80
ret
-Text_UsedCut: ; 0xc7c4
+Text_UsedCut:
; used CUT!
text_jump UnknownText_0x1c05dd
db "@"
-Text_NothingToCut: ; 0xc7c9
+Text_NothingToCut:
; There's nothing to CUT here.
text_jump UnknownText_0x1c05ec
db "@"
@@ -210,7 +210,7 @@
reloadmappart
special UpdateTimePals
-Script_Cut: ; 0xc802
+Script_Cut:
callasm GetPartyNick
writetext Text_UsedCut
reloadmappart
@@ -316,7 +316,7 @@
ld hl, Script_UseFlash
jp QueueScript
-Script_UseFlash: ; 0xc8e6
+Script_UseFlash:
reloadmappart
special UpdateTimePals
writetext UnknownText_0xc8f3
@@ -324,7 +324,7 @@
closetext
end
-UnknownText_0xc8f3: ; 0xc8f3
+UnknownText_0xc8f3:
text_jump UnknownText_0x1c0609
start_asm
call WaitSFX
@@ -334,7 +334,7 @@
ld hl, .BlankText
ret
-.BlankText: ; 0xc908
+.BlankText:
db "@"
SurfFunction:
@@ -617,7 +617,7 @@
ld a, $82
ret
-.FlyScript: ; 0xcaa3
+.FlyScript:
reloadmappart
callasm HideSprites
special UpdateTimePals
@@ -678,11 +678,11 @@
scf
ret
-Script_WaterfallFromMenu: ; 0xcb1c
+Script_WaterfallFromMenu:
reloadmappart
special UpdateTimePals
-Script_UsedWaterfall: ; 0xcb20
+Script_UsedWaterfall:
callasm GetPartyNick
writetext .Text_UsedWaterfall
waitbutton
@@ -709,7 +709,7 @@
turn_waterfall UP
step_end
-.Text_UsedWaterfall: ; 0xcb51
+.Text_UsedWaterfall:
; used WATERFALL!
text_jump UnknownText_0x1c068e
db "@"
@@ -736,15 +736,15 @@
scf
ret
-Script_CantDoWaterfall: ; 0xcb7e
+Script_CantDoWaterfall:
jumptext .Text_CantDoWaterfall
-.Text_CantDoWaterfall: ; 0xcb81
+.Text_CantDoWaterfall:
; Wow, it's a huge waterfall.
text_jump UnknownText_0x1c06a3
db "@"
-Script_AskWaterfall: ; 0xcb86
+Script_AskWaterfall:
opentext
writetext .AskUseWaterfall
yesorno
@@ -752,7 +752,7 @@
closetext
end
-.AskUseWaterfall: ; 0xcb90
+.AskUseWaterfall:
; Do you want to use WATERFALL?
text_jump UnknownText_0x1c06bf
db "@"
@@ -839,33 +839,33 @@
ld a, $80
ret
-.Text_UsedDig: ; 0xcc1c
+.Text_UsedDig:
; used DIG!
text_jump UnknownText_0x1c06de
db "@"
-.Text_UsedEscapeRope: ; 0xcc21
+.Text_UsedEscapeRope:
; used an ESCAPE ROPE.
text_jump UnknownText_0x1c06ed
db "@"
-.Text_CantUseHere: ; 0xcc26
+.Text_CantUseHere:
; Can't use that here.
text_jump UnknownText_0x1c0705
db "@"
-.UsedEscapeRopeScript: ; 0xcc2b
+.UsedEscapeRopeScript:
reloadmappart
special UpdateTimePals
writetext .Text_UsedEscapeRope
jump .UsedDigOrEscapeRopeScript
-.UsedDigScript: ; 0xcc35
+.UsedDigScript:
reloadmappart
special UpdateTimePals
writetext .Text_UsedDig
-.UsedDigOrEscapeRopeScript: ; 0xcc3c
+.UsedDigOrEscapeRopeScript:
waitbutton
closetext
playsound SFX_WARP_TO
@@ -878,12 +878,12 @@
applymovement PLAYER, .DigReturn
end
-.DigOut: ; 0xcc59
+.DigOut:
step_dig 32
hide_object
step_end
-.DigReturn: ; 0xcc5d
+.DigReturn:
show_object
return_dig 32
step_end
@@ -938,17 +938,17 @@
ld a, $80
ret
-.Text_ReturnToLastMonCenter: ; 0xccb1
+.Text_ReturnToLastMonCenter:
; Return to the last #MON CENTER.
text_jump UnknownText_0x1c071a
db "@"
-.Text_CantUseHere: ; 0xccb6
+.Text_CantUseHere:
; Can't use that here.
text_jump UnknownText_0x1c073b
db "@"
-.TeleportScript: ; 0xccbb
+.TeleportScript:
reloadmappart
special UpdateTimePals
writetext .Text_ReturnToLastMonCenter
@@ -992,7 +992,7 @@
ld a, $80
ret
-.JumpText: ; 0xcd01
+.JumpText:
text_jump UnknownText_0x1c0751
db "@"
@@ -1019,11 +1019,11 @@
call GetPartyNick
ret
-Script_StrengthFromMenu: ; 0xcd29
+Script_StrengthFromMenu:
reloadmappart
special UpdateTimePals
-Script_UsedStrength: ; 0xcd2d
+Script_UsedStrength:
callasm SetStrengthFlag
writetext .UsedStrength
copybytetovar wBuffer6
@@ -1033,11 +1033,11 @@
closetext
end
-.UsedStrength: ; 0xcd41
+.UsedStrength:
text_jump UnknownText_0x1c0774
db "@"
-.StrengthAllowedItToMoveBoulders: ; 0xcd46
+.StrengthAllowedItToMoveBoulders:
text_jump UnknownText_0x1c0788
db "@"
@@ -1047,13 +1047,13 @@
ifequal $1, .DontMeetRequirements
jump .AlreadyUsedStrength
-.DontMeetRequirements: ; 0xcd59
+.DontMeetRequirements:
jumptext UnknownText_0xcd73
-.AlreadyUsedStrength: ; 0xcd5c
+.AlreadyUsedStrength:
jumptext UnknownText_0xcd6e
-.AskStrength: ; 0xcd5f
+.AskStrength:
opentext
writetext UnknownText_0xcd69
yesorno
@@ -1061,17 +1061,17 @@
closetext
end
-UnknownText_0xcd69: ; 0xcd69
+UnknownText_0xcd69:
; A #MON may be able to move this. Want to use STRENGTH?
text_jump UnknownText_0x1c07a0
db "@"
-UnknownText_0xcd6e: ; 0xcd6e
+UnknownText_0xcd6e:
; Boulders may now be moved!
text_jump UnknownText_0x1c07d8
db "@"
-UnknownText_0xcd73: ; 0xcd73
+UnknownText_0xcd73:
; A #MON may be able to move this.
text_jump UnknownText_0x1c07f4
db "@"
@@ -1147,7 +1147,7 @@
ld a, $80
ret
-Text_UsedWhirlpool: ; 0xcdd9
+Text_UsedWhirlpool:
; used WHIRLPOOL!
text_jump UnknownText_0x1c0816
db "@"
@@ -1181,11 +1181,11 @@
scf
ret
-Script_WhirlpoolFromMenu: ; 0xce0b
+Script_WhirlpoolFromMenu:
reloadmappart
special UpdateTimePals
-Script_UsedWhirlpool: ; 0xce0f
+Script_UsedWhirlpool:
callasm GetPartyNick
writetext Text_UsedWhirlpool
reloadmappart
@@ -1232,14 +1232,14 @@
scf
ret
-Script_MightyWhirlpool: ; 0xce66
+Script_MightyWhirlpool:
jumptext .MightyWhirlpoolText
-.MightyWhirlpoolText: ; 0xce69
+.MightyWhirlpoolText:
text_jump UnknownText_0x1c082b
db "@"
-Script_AskWhirlpoolOW: ; 0xce6e
+Script_AskWhirlpoolOW:
opentext
writetext UnknownText_0xce78
yesorno
@@ -1247,7 +1247,7 @@
closetext
end
-UnknownText_0xce78: ; 0xce78
+UnknownText_0xce78:
text_jump UnknownText_0x1c0864
db "@"
@@ -1272,21 +1272,21 @@
ld a, $80
ret
-UnknownText_0xce9d: ; 0xce9d
+UnknownText_0xce9d:
; did a HEADBUTT!
text_jump UnknownText_0x1c0897
db "@"
-UnknownText_0xcea2: ; 0xcea2
+UnknownText_0xcea2:
; Nope. Nothing…
text_jump UnknownText_0x1c08ac
db "@"
-HeadbuttFromMenuScript: ; 0xcea7
+HeadbuttFromMenuScript:
reloadmappart
special UpdateTimePals
-HeadbuttScript: ; 0xceab
+HeadbuttScript:
callasm GetPartyNick
writetext UnknownText_0xce9d
@@ -1322,7 +1322,7 @@
xor a
ret
-AskHeadbuttScript: ; 0xcedc
+AskHeadbuttScript:
opentext
writetext UnknownText_0xcee6
yesorno
@@ -1330,7 +1330,7 @@
closetext
end
-UnknownText_0xcee6: ; 0xcee6
+UnknownText_0xcee6:
; A #MON could be in this tree. Want to HEADBUTT it?
text_jump UnknownText_0x1c08bc
db "@"
@@ -1380,7 +1380,7 @@
scf
ret
-RockSmashFromMenuScript: ; 0xcf2e
+RockSmashFromMenuScript:
reloadmappart
special UpdateTimePals
@@ -1403,15 +1403,15 @@
.done
end
-MovementData_0xcf55: ; 0xcf55
+MovementData_0xcf55:
rock_smash 10
step_end
-UnknownText_0xcf58: ; 0xcf58
+UnknownText_0xcf58:
text_jump UnknownText_0x1c08f0
db "@"
-AskRockSmashScript: ; 0xcf5d
+AskRockSmashScript:
callasm HasRockSmash
ifequal 1, .no
@@ -1424,12 +1424,12 @@
.no
jumptext UnknownText_0xcf72
-UnknownText_0xcf72: ; 0xcf72
+UnknownText_0xcf72:
; Maybe a #MON can break this.
text_jump UnknownText_0x1c0906
db "@"
-UnknownText_0xcf77: ; 0xcf77
+UnknownText_0xcf77:
; This rock looks breakable. Want to use ROCK SMASH?
text_jump UnknownText_0x1c0924
db "@"
@@ -1538,22 +1538,22 @@
ld a, $81
ret
-Script_NotEvenANibble: ; 0xd01e
+Script_NotEvenANibble:
scall Script_FishCastRod
writetext UnknownText_0xd0a9
jump Script_NotEvenANibble_FallThrough
-Script_NotEvenANibble2: ; 0xd027
+Script_NotEvenANibble2:
scall Script_FishCastRod
writetext UnknownText_0xd0a9
-Script_NotEvenANibble_FallThrough: ; 0xd02d
+Script_NotEvenANibble_FallThrough:
loademote EMOTE_SHADOW
callasm PutTheRodAway
closetext
end
-Script_GotABite: ; 0xd035
+Script_GotABite:
scall Script_FishCastRod
callasm Fishing_CheckFacingUp
iffalse .NotFacingUp
@@ -1560,10 +1560,10 @@
applymovement PLAYER, .Movement_FacingUp
jump .FightTheHookedPokemon
-.NotFacingUp: ; 0xd046
+.NotFacingUp:
applymovement PLAYER, .Movement_NotFacingUp
-.FightTheHookedPokemon: ; 0xd04a
+.FightTheHookedPokemon:
pause 40
applymovement PLAYER, .Movement_RestoreRod
writetext UnknownText_0xd0a4
@@ -1608,7 +1608,7 @@
ld [wScriptVar], a
ret
-Script_FishCastRod: ; 0xd07c
+Script_FishCastRod:
reloadmappart
loadvar hBGMapMode, $0
special UpdateTimePals
@@ -1632,12 +1632,12 @@
call ReplaceKrisSprite
ret
-UnknownText_0xd0a4: ; 0xd0a4
+UnknownText_0xd0a4:
; Oh! A bite!
text_jump UnknownText_0x1c0958
db "@"
-UnknownText_0xd0a9: ; 0xd0a9
+UnknownText_0xd0a9:
; Not even a nibble!
text_jump UnknownText_0x1c0965
db "@"
@@ -1733,7 +1733,7 @@
scf
ret
-Script_GetOnBike: ; 0xd13e
+Script_GetOnBike:
reloadmappart
special UpdateTimePals
writecode VAR_MOVEMENT, PLAYER_BIKE
@@ -1743,7 +1743,7 @@
special ReplaceKrisSprite
end
-Script_GetOnBike_Register: ; 0xd14e
+Script_GetOnBike_Register:
writecode VAR_MOVEMENT, PLAYER_BIKE
closetext
special ReplaceKrisSprite
@@ -1753,7 +1753,7 @@
nop
ret
-Script_GetOffBike: ; 0xd158
+Script_GetOffBike:
reloadmappart
special UpdateTimePals
writecode VAR_MOVEMENT, PLAYER_NORMAL
@@ -1766,27 +1766,27 @@
special PlayMapMusic
end
-Script_GetOffBike_Register: ; 0xd16b
+Script_GetOffBike_Register:
writecode VAR_MOVEMENT, PLAYER_NORMAL
jump FinishGettingOffBike
-Script_CantGetOffBike: ; 0xd171
+Script_CantGetOffBike:
writetext .CantGetOffBikeText
waitbutton
closetext
end
-.CantGetOffBikeText: ; 0xd177
+.CantGetOffBikeText:
; You can't get off here!
text_jump UnknownText_0x1c099a
db "@"
-GotOnTheBikeText: ; 0xd17c
+GotOnTheBikeText:
; got on the @ .
text_jump UnknownText_0x1c09b2
db "@"
-GotOffTheBikeText: ; 0xd181
+GotOffTheBikeText:
; got off the @ .
text_jump UnknownText_0x1c09c7
db "@"
@@ -1813,7 +1813,7 @@
scf
ret
-AskCutScript: ; 0xd1a9
+AskCutScript:
opentext
writetext UnknownText_0xd1c8
yesorno
@@ -1833,13 +1833,13 @@
ld [wScriptVar], a
ret
-UnknownText_0xd1c8: ; 0xd1c8
+UnknownText_0xd1c8:
text_jump UnknownText_0x1c09dd
db "@"
-CantCutScript: ; 0xd1cd
+CantCutScript:
jumptext UnknownText_0xd1d0
-UnknownText_0xd1d0: ; 0xd1d0
+UnknownText_0xd1d0:
text_jump UnknownText_0x1c0a05
db "@"
--- a/engine/events/poke_seer.asm
+++ b/engine/events/poke_seer.asm
@@ -297,53 +297,45 @@
dw SeerEggText
dw SeerLevelOnlyText
-SeerIntroText: ; 0x4f28c
+SeerIntroText:
; I see all. I know all… Certainly, I know of your #MON!
text_jump UnknownText_0x1c475f
db "@"
-; 0x4f291
-SeerCantTellText: ; 0x4f291
+SeerCantTellText:
; Whaaaat? I can't tell a thing! How could I not know of this?
text_jump UnknownText_0x1c4797
db "@"
-; 0x4f296
-SeerMetAtText: ; 0x4f296
+SeerMetAtText:
; Hm… I see you met @ here: @ !
text_jump UnknownText_0x1c47d4
db "@"
-; 0x4f29b
-SeerTimeLevelText: ; 0x4f29b
+SeerTimeLevelText:
; The time was @ ! Its level was @ ! Am I good or what?
text_jump UnknownText_0x1c47fa
db "@"
-; 0x4f2a0
-SeerTradedText: ; 0x4f2a0
+SeerTradedText:
; Hm… @ came from @ in a trade? @ was where @ met @ !
text_jump UnknownText_0x1c4837
db "@"
-; 0x4f2a5
-SeerLevelOnlyText: ; 0x4f2a5
+SeerLevelOnlyText:
; What!? Incredible! I don't understand how, but it is incredible! You are special. I can't tell where you met it, but it was at level @ . Am I good or what?
text_jump UnknownText_0x1c487f
db "@"
-; 0x4f2aa
-SeerEggText: ; 0x4f2aa
+SeerEggText:
; Hey! That's an EGG! You can't say that you've met it yet…
text_jump UnknownText_0x1c491d
db "@"
-; 0x4f2af
-SeerCancelText: ; 0x4f2af
+SeerCancelText:
; Fufufu! I saw that you'd do nothing!
text_jump UnknownText_0x1c4955
db "@"
-; 0x4f2b4
SeerAdvice:
@@ -381,35 +373,30 @@
dbw 100, SeerAdvice5
dbw 255, SeerAdvice1
-SeerAdvice1: ; 0x4f2e8
+SeerAdvice1:
; Incidentally… It would be wise to raise your #MON with a little more care.
text_jump UnknownText_0x1c497a
db "@"
-; 0x4f2ed
-SeerAdvice2: ; 0x4f2ed
+SeerAdvice2:
; Incidentally… It seems to have grown a little. @ seems to be becoming more confident.
text_jump UnknownText_0x1c49c6
db "@"
-; 0x4f2f2
-SeerAdvice3: ; 0x4f2f2
+SeerAdvice3:
; Incidentally… @ has grown. It's gained much strength.
text_jump UnknownText_0x1c4a21
db "@"
-; 0x4f2f7
-SeerAdvice4: ; 0x4f2f7
+SeerAdvice4:
; Incidentally… It certainly has grown mighty! This @ must have come through numerous #MON battles. It looks brimming with confidence.
text_jump UnknownText_0x1c4a5b
db "@"
-; 0x4f2fc
-SeerAdvice5: ; 0x4f2fc
+SeerAdvice5:
; Incidentally… I'm impressed by your dedication. It's been a long time since I've seen a #MON as mighty as this @ . I'm sure that seeing @ in battle would excite anyone.
text_jump UnknownText_0x1c4ae5
db "@"
-; 0x4f301
GetCaughtGender:
--- a/engine/events/pokecenter_pc.asm
+++ b/engine/events/pokecenter_pc.asm
@@ -113,7 +113,6 @@
; Bzzzzt! You must have a #MON to use this!
text_jump UnknownText_0x1c1328
db "@"
-; 0x15668
BillsPC:
call PC_PlayChoosePCSound
@@ -200,11 +199,10 @@
ld c, $1
ret
-UnknownText_0x156ff: ; 0x156ff
+UnknownText_0x156ff:
; turned on the PC.
text_jump UnknownText_0x1c1353
db "@"
-; 0x15704
_PlayersPC:
ld a, b
@@ -236,7 +234,7 @@
call ExitMenu
ret
-PlayersPCMenuData: ; 0x15736
+PlayersPCMenuData:
db MENU_BACKUP_TILES ; flags
db 0, 0 ; top left corner coords (y, x)
db 12, 15 ; bottom right corner coords (y, x)
@@ -258,7 +256,7 @@
PLAYERSPC_TURN_OFF EQU 5
PLAYERSPC_LOG_OFF EQU 6
-.PlayersPCMenuPointers: ; 0x15746
+.PlayersPCMenuPointers:
; entries correspond to PLAYERSPC_* constants
dw PlayerWithdrawItemMenu, .WithdrawItem
dw PlayerDepositItemMenu, .DepositItem
@@ -305,13 +303,12 @@
ld [wOptions], a
ret
-UnknownText_0x157cc: ; 0x157cc
+UnknownText_0x157cc:
; What do you want to do?
text_jump UnknownText_0x1c1368
db "@"
-; 0x157d1
-PlayerWithdrawItemMenu: ; 0x157d1
+PlayerWithdrawItemMenu:
call LoadStandardMenuHeader
farcall ClearPCItemScreen
.loop
@@ -375,19 +372,19 @@
.done
ret
-.HowManyText: ; 0x15850
+.HowManyText:
text_jump _PlayersPCHowManyWithdrawText
db "@"
-.WithdrewText: ; 0x15855
+.WithdrewText:
text_jump _PlayersPCWithdrewItemsText
db "@"
-.NoRoomText: ; 0x1585a
+.NoRoomText:
text_jump _PlayersPCNoRoomWithdrawText
db "@"
-PlayerTossItemMenu: ; 0x1585f
+PlayerTossItemMenu:
call LoadStandardMenuHeader
farcall ClearPCItemScreen
.loop
@@ -401,9 +398,8 @@
call CloseSubmenu
xor a
ret
-; 0x1587d
-PlayerDecorationMenu: ; 0x1587d
+PlayerDecorationMenu:
farcall _PlayerDecorationMenu
ld a, c
and a
@@ -410,15 +406,13 @@
ret z
scf
ret
-; 0x15888
-PlayerLogOffMenu: ; 0x15888
+PlayerLogOffMenu:
xor a
scf
ret
-; 0x1588b
-PlayerDepositItemMenu: ; 0x1588b
+PlayerDepositItemMenu:
call .CheckItemsInBag
jr c, .nope
call DisableSpriteUpdates
@@ -538,25 +532,24 @@
and a
ret
-.HowManyText: ; 0x1596e
+.HowManyText:
text_jump _PlayersPCHowManyDepositText
db "@"
-.DepositText: ; 0x15973
+.DepositText:
text_jump _PlayersPCDepositItemsText
db "@"
-.NoRoomText: ; 0x15978
+.NoRoomText:
text_jump _PlayersPCNoRoomDepositText
db "@"
-PlayerMailBoxMenu: ; 0x1597d
+PlayerMailBoxMenu:
farcall _PlayerMailBoxMenu
xor a
ret
-; 0x15985
-PCItemsJoypad: ; 0x15985
+PCItemsJoypad:
xor a
ld [wSwitchItem], a
.loop
@@ -645,38 +638,32 @@
call ExitMenu
ret
-PokecenterPCText_BootedUpPC: ; 0x15a27
+PokecenterPCText_BootedUpPC:
; turned on the PC.
text_jump UnknownText_0x1c144d
db "@"
-; 0x15a2c
-PokecenterPCText_AccessWhosePC: ; 0x15a2c
+PokecenterPCText_AccessWhosePC:
; Access whose PC?
text_jump UnknownText_0x1c1462
db "@"
-; 0x15a31
-PokecenterPCText_AccessedBillsPC: ; 0x15a31
+PokecenterPCText_AccessedBillsPC:
; BILL's PC accessed. #MON Storage System opened.
text_jump UnknownText_0x1c1474
db "@"
-; 0x15a36
-PokecenterPCText_AccessedOwnPC: ; 0x15a36
+PokecenterPCText_AccessedOwnPC:
; Accessed own PC. Item Storage System opened.
text_jump UnknownText_0x1c14a4
db "@"
-; 0x15a3b
-PokecenterPCText_AccessedOaksPC: ; 0x15a3b
+PokecenterPCText_AccessedOaksPC:
; PROF.OAK's PC accessed. #DEX Rating System opened.
text_jump UnknownText_0x1c14d2
db "@"
-; 0x15a40
-PokecenterPCText_LinkClosed: ; 0x15a40
+PokecenterPCText_LinkClosed:
; … Link closed…
text_jump UnknownText_0x1c1505
db "@"
-; 0x15a45
--- a/engine/events/pokepic.asm
+++ b/engine/events/pokepic.asm
@@ -41,7 +41,7 @@
call LoadStandardFont
ret
-PokepicMenuHeader: ; 0x24547
+PokepicMenuHeader:
db MENU_BACKUP_TILES ; flags
menu_coords 6, 4, 14, 13
dw NULL
--- a/engine/events/print_photo.asm
+++ b/engine/events/print_photo.asm
@@ -29,32 +29,27 @@
call PrintText
ret
-.Text_AskWhichMon: ; 0x16e04
+.Text_AskWhichMon:
; Which #MON should I photo- graph?
text_jump UnknownText_0x1be024
db "@"
-; 0x16e09
-.Text_HoldStill: ; 0x16e09
+.Text_HoldStill:
; All righty. Hold still for a bit.
text_jump UnknownText_0x1be047
db "@"
-; 0x16e0e
-.Text_Presto: ; 0x16e0e
+.Text_Presto:
; Presto! All done. Come again, OK?
text_jump UnknownText_0x1be06a
db "@"
-; 0x16e13
-.Text_NoPicture: ; 0x16e13
+.Text_NoPicture:
; Oh, no picture? Come again, OK?
text_jump UnknownText_0x1c0000
db "@"
-; 0x16e18
-.Text_Egg: ; 0x16e18
+.Text_Egg:
; An EGG? My talent is worth more…
text_jump UnknownText_0x1c0021
db "@"
-; 0x16e1d
--- a/engine/events/prof_oaks_pc.asm
+++ b/engine/events/prof_oaks_pc.asm
@@ -1,4 +1,4 @@
-ProfOaksPC: ; 0x265d3
+ProfOaksPC:
ld hl, OakPCText1
call MenuTextBox
call YesNoBox
@@ -11,7 +11,7 @@
call ExitMenu
ret
-ProfOaksPCBoot ; 0x265ee
+ProfOaksPCBoot:
ld hl, OakPCText2
call PrintText
call Rate
@@ -20,7 +20,7 @@
call WaitSFX
ret
-ProfOaksPCRating: ; 0x26601
+ProfOaksPCRating:
call Rate
push de
ld de, MUSIC_NONE
@@ -31,7 +31,7 @@
call WaitSFX
ret
-Rate: ; 0x26616
+Rate:
; calculate Seen/Owned
ld hl, wPokedexSeen
ld b, wEndPokedexSeen - wPokedexSeen
@@ -55,7 +55,7 @@
pop de
ret
-.UpdateRatingBuffers: ; 0x26647
+.UpdateRatingBuffers:
ld hl, wStringBuffer3
ld de, wd002
call .UpdateRatingBuffer
@@ -64,7 +64,7 @@
call .UpdateRatingBuffer
ret
-.UpdateRatingBuffer: ; 0x2665a
+.UpdateRatingBuffer:
push hl
ld a, "@"
ld bc, ITEM_NAME_LENGTH
@@ -74,7 +74,7 @@
call PrintNum
ret
-FindOakRating: ; 0x2666b
+FindOakRating:
; return sound effect in de
; return text pointer in hl
nop
@@ -100,15 +100,15 @@
INCLUDE "data/events/pokedex_ratings.asm"
-OakPCText1: ; 0x266de
+OakPCText1:
text_jump _OakPCText1
db "@"
-OakPCText2: ; 0x266e3
+OakPCText2:
text_jump _OakPCText2
db "@"
-OakPCText3: ; 0x266e8
+OakPCText3:
text_jump _OakPCText3
db "@"
@@ -188,6 +188,6 @@
text_jump _OakRating19
db "@"
-OakPCText4: ; 0x2674c
+OakPCText4:
text_jump _OakPCText4
db "@"
--- a/engine/events/sacred_ash.asm
+++ b/engine/events/sacred_ash.asm
@@ -46,7 +46,7 @@
scf
ret
-SacredAshScript: ; 0x50821
+SacredAshScript:
special HealParty
reloadmappart
playsound SFX_WARP_TO
@@ -63,10 +63,8 @@
waitbutton
closetext
end
-; 0x50845
-UnknownText_0x50845: ; 0x50845
+UnknownText_0x50845:
; 's #MON were all healed!
text_jump UnknownText_0x1c0b65
db "@"
-; 0x5084a
--- a/engine/events/specials.asm
+++ b/engine/events/specials.asm
@@ -83,7 +83,7 @@
ld [wScriptVar], a
ret
-NameRival: ; 0xc29d
+NameRival:
ld b, $2 ; rival
ld de, wRivalName
farcall _NamingScreen
@@ -95,7 +95,6 @@
.default
db "SILVER@"
-; 0xc2b9
NameRater:
farcall _NameRater
@@ -168,11 +167,10 @@
ld [wScriptVar], a
ret
-.ReceiveItemText: ; 0xc345
+.ReceiveItemText:
; received item
text_jump UnknownText_0x1bd3be
db "@"
-; 0xc34a
BugContestJudging:
farcall _BugContestJudging
@@ -257,17 +255,15 @@
scf
ret
-.NoCoinsText: ; 0xc3d1
+.NoCoinsText:
; You have no coins.
text_jump UnknownText_0x1bd3d7
db "@"
-; 0xc3d6
-.NoCoinCaseText: ; 0xc3d6
+.NoCoinCaseText:
; You don't have a COIN CASE.
text_jump UnknownText_0x1bd3eb
db "@"
-; 0xc3db
ClearBGPalettesBufferScreen:
call ClearBGPalettes
@@ -331,7 +327,7 @@
farcall _CheckLuckyNumberShowFlag
jp ScriptReturnCarry
-SnorlaxAwake: ; 0xc43d
+SnorlaxAwake:
; Check if the Poké Flute channel is playing, and if the player is standing
; next to Snorlax.
@@ -430,7 +426,7 @@
call ExitAllMenus
ret
-TrainerHouse: ; 0xc4b9
+TrainerHouse:
ld a, BANK(sMysteryGiftTrainerHouseFlag)
call GetSRAMBank
ld a, [sMysteryGiftTrainerHouseFlag]
--- a/engine/events/std_collision.asm
+++ b/engine/events/std_collision.asm
@@ -25,5 +25,5 @@
INCLUDE "data/events/collision_stdscripts.asm"
-Script_JumpStdFromRAM: ; 0x1369a
+Script_JumpStdFromRAM:
jump wJumpStdScriptBuffer
--- a/engine/events/std_scripts.asm
+++ b/engine/events/std_scripts.asm
@@ -216,7 +216,7 @@
closetext
end
-TrashCanScript: ; 0xbc1a5
+TrashCanScript:
farjumptext TrashCanText
PCScript:
@@ -335,9 +335,8 @@
farwritetext ContestResults_DidNotWinText
buttonsound
jump BugContestResults_FinishUp
-; 0xbc2b1
-BugContestResults_ReturnAfterWinnersPrize: ; 0xbc2b1
+BugContestResults_ReturnAfterWinnersPrize:
farwritetext ContestResults_JoinUsNextTimeText
buttonsound
@@ -381,9 +380,8 @@
setflag ENGINE_DAILY_BUG_CONTEST
special PlayMapMusic
end
-; 0xbc31e
-BugContestResults_FirstPlace: ; 0xbc31e
+BugContestResults_FirstPlace:
setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
itemtotext SUN_STONE, MEM_BUFFER_1
farwritetext ContestResults_PlayerWonAPrizeText
@@ -391,9 +389,8 @@
verbosegiveitem SUN_STONE
iffalse BugContestResults_NoRoomForSunStone
jump BugContestResults_ReturnAfterWinnersPrize
-; 0xbc332
-BugContestResults_SecondPlace: ; 0xbc332
+BugContestResults_SecondPlace:
itemtotext EVERSTONE, MEM_BUFFER_1
farwritetext ContestResults_PlayerWonAPrizeText
waitbutton
@@ -400,9 +397,8 @@
verbosegiveitem EVERSTONE
iffalse BugContestResults_NoRoomForEverstone
jump BugContestResults_ReturnAfterWinnersPrize
-; 0xbc343
-BugContestResults_ThirdPlace: ; 0xbc343
+BugContestResults_ThirdPlace:
itemtotext GOLD_BERRY, MEM_BUFFER_1
farwritetext ContestResults_PlayerWonAPrizeText
waitbutton
@@ -409,37 +405,32 @@
verbosegiveitem GOLD_BERRY
iffalse BugContestResults_NoRoomForGoldBerry
jump BugContestResults_ReturnAfterWinnersPrize
-; 0xbc354
-BugContestResults_NoRoomForSunStone: ; 0xbc354
+BugContestResults_NoRoomForSunStone:
farwritetext BugContestPrizeNoRoomText
buttonsound
setevent EVENT_CONTEST_OFFICER_HAS_SUN_STONE
jump BugContestResults_ReturnAfterWinnersPrize
-; 0xbc35f
-BugContestResults_NoRoomForEverstone: ; 0xbc35f
+BugContestResults_NoRoomForEverstone:
farwritetext BugContestPrizeNoRoomText
buttonsound
setevent EVENT_CONTEST_OFFICER_HAS_EVERSTONE
jump BugContestResults_ReturnAfterWinnersPrize
-; 0xbc36a
-BugContestResults_NoRoomForGoldBerry: ; 0xbc36a
+BugContestResults_NoRoomForGoldBerry:
farwritetext BugContestPrizeNoRoomText
buttonsound
setevent EVENT_CONTEST_OFFICER_HAS_GOLD_BERRY
jump BugContestResults_ReturnAfterWinnersPrize
-; 0xbc375
-BugContestResults_NoRoomForBerry: ; 0xbc375
+BugContestResults_NoRoomForBerry:
farwritetext BugContestPrizeNoRoomText
buttonsound
setevent EVENT_CONTEST_OFFICER_HAS_BERRY
jump BugContestResults_DidNotWin
-; 0xbc380
-BugContestResults_CopyContestantsToResults: ; 0xbc380
+BugContestResults_CopyContestantsToResults:
checkevent EVENT_BUG_CATCHING_CONTESTANT_1A
iftrue .skip1
clearevent EVENT_BUG_CATCHING_CONTESTANT_1B
@@ -1489,7 +1480,7 @@
buttonsound
end
-NumberAcceptedFScript: ; 0xbcbd3
+NumberAcceptedFScript:
checkcode VAR_CALLERID
ifequal PHONE_POKEFAN_BEVERLY, .Beverly
ifequal PHONE_COOLTRAINERF_BETH, .Beth
@@ -1777,23 +1768,21 @@
closetext
end
-ReceiveItemScript: ; 0xbcdb9
+ReceiveItemScript:
waitsfx
farwritetext ReceivedItemText
playsound SFX_ITEM
waitsfx
end
-; 0xbcdc3
-ReceiveTogepiEggScript: ; 0xbcdc3
+ReceiveTogepiEggScript:
waitsfx
farwritetext ReceivedItemText
playsound SFX_GET_EGG_FROM_DAY_CARE_LADY
waitsfx
end
-; 0xbcdcd
-GameCornerCoinVendorScript: ; 0xbcdcd
+GameCornerCoinVendorScript:
faceplayer
opentext
farwritetext CoinVendor_WelcomeText
@@ -1804,12 +1793,11 @@
waitbutton
closetext
end
-; 0xbcde0
-CoinVendor_IntroScript: ; 0xbcde0
+CoinVendor_IntroScript:
farwritetext CoinVendor_IntroText
-.loop ; 0xbcde4
+.loop
special DisplayMoneyAndCoinBalance
loadmenu .MenuHeader
verticalmenu
@@ -1817,9 +1805,8 @@
ifequal 1, .Buy50
ifequal 2, .Buy500
jump .Cancel
-; 0xbcdf7
-.Buy50: ; 0xbcdf7
+.Buy50:
checkcoins MAX_COINS - 50
ifequal HAVE_MORE, .CoinCaseFull
checkmoney YOUR_MONEY, 1000
@@ -1831,9 +1818,8 @@
farwritetext CoinVendor_Buy50CoinsText
waitbutton
jump .loop
-; 0xbce1b
-.Buy500: ; 0xbce1b
+.Buy500:
checkcoins MAX_COINS - 500
ifequal HAVE_MORE, .CoinCaseFull
checkmoney YOUR_MONEY, 10000
@@ -1845,28 +1831,24 @@
farwritetext CoinVendor_Buy500CoinsText
waitbutton
jump .loop
-; 0xbce3f
-.NotEnoughMoney: ; 0xbce3f
+.NotEnoughMoney:
farwritetext CoinVendor_NotEnoughMoneyText
waitbutton
closetext
end
-; 0xbce46
-.CoinCaseFull: ; 0xbce46
+.CoinCaseFull:
farwritetext CoinVendor_CoinCaseFullText
waitbutton
closetext
end
-; 0xbce4d
-.Cancel: ; 0xbce4d
+.Cancel:
farwritetext CoinVendor_CancelText
waitbutton
closetext
end
-; 0xbce54
.MenuHeader:
@@ -1881,7 +1863,6 @@
db " 50 : ¥1000@"
db "500 : ¥10000@"
db "CANCEL@"
-; 0xbce7f
HappinessCheckScript:
--- a/engine/events/sweet_scent.asm
+++ b/engine/events/sweet_scent.asm
@@ -5,7 +5,7 @@
ld [wFieldMoveSucceeded], a
ret
-.SweetScent: ; 0x506c8
+.SweetScent:
reloadmappart
special UpdateTimePals
callasm GetPartyNick
@@ -19,18 +19,15 @@
startbattle
reloadmapafterbattle
end
-; 0x506e5
-.BugCatchingContest: ; 0x506e5
+.BugCatchingContest:
farjump BugCatchingContestBattleScript
-; 0x506e9
-SweetScentNothing: ; 0x506e9
+SweetScentNothing:
writetext UnknownText_0x5072b
waitbutton
closetext
end
-; 0x506ef
SweetScentEncounter:
farcall CanUseSweetScent
@@ -60,14 +57,12 @@
ld [wBattleType], a
ret
-UnknownText_0x50726: ; 0x50726
+UnknownText_0x50726:
; used SWEET SCENT!
text_jump UnknownText_0x1c0b03
db "@"
-; 0x5072b
-UnknownText_0x5072b: ; 0x5072b
+UnknownText_0x5072b:
; Looks like there's nothing here…
text_jump UnknownText_0x1c0b1a
db "@"
-; 0x50730
--- a/engine/events/trainer_scripts.asm
+++ b/engine/events/trainer_scripts.asm
@@ -1,4 +1,4 @@
-TalkToTrainerScript:: ; 0xbe66a
+TalkToTrainerScript::
faceplayer
trainerflagaction CHECK_FLAG
iftrue AlreadyBeatenTrainerScript
@@ -6,7 +6,7 @@
encountermusic
jump StartBattleWithMapTrainerScript
-SeenByTrainerScript:: ; 0xbe675
+SeenByTrainerScript::
loadmemtrainer
encountermusic
showemote EMOTE_SHOCK, LAST_TALKED, 30
@@ -16,7 +16,7 @@
faceobject PLAYER, LAST_TALKED
jump StartBattleWithMapTrainerScript
-StartBattleWithMapTrainerScript: ; 0xbe68a
+StartBattleWithMapTrainerScript:
opentext
trainertext $0
waitbutton
--- a/engine/events/unown_walls.asm
+++ b/engine/events/unown_walls.asm
@@ -1,4 +1,4 @@
-HoOhChamber: ; 0x8addb
+HoOhChamber:
ld hl, wPartySpecies
ld a, [hl]
cp HO_OH ; is Ho-oh the first Pokémon in the party?
@@ -9,7 +9,6 @@
call EventFlagAction
.done
ret
-; 0x8adef
OmanyteChamber:
call GetMapAttributesPointer ; pointless?
--- a/engine/events/whiteout.asm
+++ b/engine/events/whiteout.asm
@@ -1,13 +1,12 @@
-Script_BattleWhiteout:: ; 0x124c1
+Script_BattleWhiteout::
callasm BattleBGMap
jump Script_Whiteout
-; 0x124c8
-Script_OverworldWhiteout:: ; 0x124c8
+Script_OverworldWhiteout::
refreshscreen
callasm OverworldBGMap
-Script_Whiteout: ; 0x124ce
+Script_Whiteout:
writetext .WhitedOutText
waitbutton
special FadeOutPalettes
@@ -24,13 +23,11 @@
.bug_contest
jumpstd bugcontestresultswarp
-; 0x124f5
-.WhitedOutText: ; 0x124f5
+.WhitedOutText:
; is out of useable #MON! whited out!
text_jump UnknownText_0x1c0a4e
db "@"
-; 0x124fa
OverworldBGMap:
call ClearPalettes
--- a/engine/games/card_flip.asm
+++ b/engine/games/card_flip.asm
@@ -115,11 +115,10 @@
ld [wJumptableIndex], a
ret
-.PlayWithThreeCoinsText: ; 0xe01cd
+.PlayWithThreeCoinsText:
; Play with three coins?
text_jump UnknownText_0x1c5793
db "@"
-; 0xe01d2
.DeductCoins:
ld a, [wCoins]
@@ -156,11 +155,10 @@
call .Increment
ret
-.NotEnoughCoinsText: ; 0xe0212
+.NotEnoughCoinsText:
; Not enough coins…
text_jump UnknownText_0x1c57ab
db "@"
-; 0xe0217
.ChooseACard:
xor a
@@ -234,11 +232,10 @@
call .Increment
ret
-.ChooseACardText: ; 0xe02b2
+.ChooseACardText:
; Choose a card.
text_jump UnknownText_0x1c57be
db "@"
-; 0xe02b7
.PlaceYourBet:
ld hl, .PlaceYourBetText
@@ -257,11 +254,10 @@
call .Increment
ret
-.PlaceYourBetText: ; 0xe02d5
+.PlaceYourBetText:
; Place your bet.
text_jump UnknownText_0x1c57ce
db "@"
-; 0xe02da
.CheckTheCard:
xor a
@@ -329,17 +325,15 @@
ld [wJumptableIndex], a
ret
-.PlayAgainText: ; 0xe0356
+.PlayAgainText:
; Want to play again?
text_jump UnknownText_0x1c57df
db "@"
-; 0xe035b
-.CardsShuffledText: ; 0xe035b
+.CardsShuffledText:
; The cards have been shuffled.
text_jump UnknownText_0x1c57f4
db "@"
-; 0xe0360
.Quit:
ld hl, wJumptableIndex
@@ -1119,17 +1113,15 @@
jr nz, .loop
ret
-.Text_Yeah: ; 0xe0811
+.Text_Yeah:
; Yeah!
text_jump UnknownText_0x1c5813
db "@"
-; 0xe0816
-.Text_Darn: ; 0xe0816
+.Text_Darn:
; Darn…
text_jump UnknownText_0x1c581a
db "@"
-; 0xe081b
.AddCoinPlaySFX:
ld a, [wCoins]
--- a/engine/games/dummy_game.asm
+++ b/engine/games/dummy_game.asm
@@ -322,17 +322,15 @@
ret
-DummyGameText_Yeah: ; 0xe2093
+DummyGameText_Yeah:
; , yeah!
text_jump UnknownText_0x1c1a5b
db "@"
-; 0xe2098
-DummyGameText_Darn: ; 0xe2098
+DummyGameText_Darn:
; Darn…
text_jump UnknownText_0x1c1a65
db "@"
-; 0xe209d
DummyGame_InitBoard:
ld hl, wDummyGameCards
--- a/engine/games/slot_machine.asm
+++ b/engine/games/slot_machine.asm
@@ -1795,38 +1795,33 @@
ret
-.Text_BetHowManyCoins: ; 0x930c7
+.Text_BetHowManyCoins:
; Bet how many coins?
text_jump UnknownText_0x1c5049
db "@"
-; 0x930cc
-.Text_Start: ; 0x930cc
+.Text_Start:
; Start!
text_jump UnknownText_0x1c505e
db "@"
-; 0x930d1
-.Text_NotEnoughCoins: ; 0x930d1
+.Text_NotEnoughCoins:
; Not enough coins.
text_jump UnknownText_0x1c5066
db "@"
-; 0x930d6
-.MenuHeader: ; 0x930d6
+.MenuHeader:
db MENU_BACKUP_TILES ; flags
menu_coords 14, 10, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1
dw .MenuData
db 1 ; default option
-; 0x930de
-.MenuData: ; 0x930de
+.MenuData:
db STATICMENU_CURSOR ; flags
db 3 ; items
db " 3@"
db " 2@"
db " 1@"
-; 0x930e9
Slots_AskPlayAgain:
ld hl, wCoins
@@ -1941,7 +1936,7 @@
dbw "10@@", .LinedUpMonOrCherry
dbw "15@@", .LinedUpMonOrCherry
-.Text_PrintPayout: ; 0x931b9
+.Text_PrintPayout:
start_asm
ld a, [wSlotMatched]
add $25
@@ -1961,17 +1956,15 @@
ret
-.Text_LinedUpWonCoins: ; 0x931db
+.Text_LinedUpWonCoins:
; lined up! Won @ coins!
text_jump UnknownText_0x1c509f
db "@"
-; 0x931e0
-.Text_Darn: ; 0x931e0
+.Text_Darn:
; Darn!
text_jump UnknownText_0x1c50bb
db "@"
-; 0x931e5
.LinedUpSevens:
ld a, SFX_2ND_PLACE
--- a/engine/gfx/color.asm
+++ b/engine/gfx/color.asm
@@ -1128,7 +1128,7 @@
ld [rBGP], a
ret
-CopyData: ; 0x9a52
+CopyData:
; copy bc bytes of data from hl to de
.loop
ld a, [hli]
@@ -1139,9 +1139,8 @@
or b
jr nz, .loop
ret
-; 0x9a5b
-ClearBytes: ; 0x9a5b
+ClearBytes:
; clear bc bytes of data starting from de
.loop
xor a
@@ -1152,9 +1151,8 @@
or b
jr nz, .loop
ret
-; 0x9a64
-DrawDefaultTiles: ; 0x9a64
+DrawDefaultTiles:
; Draw 240 tiles (2/3 of the screen) from tiles in VRAM
hlbgcoord 0, 0 ; BG Map 0
ld de, BG_MAP_WIDTH - SCREEN_WIDTH
@@ -1172,7 +1170,6 @@
dec c
jr nz, .line
ret
-; 0x9a7a
SGBDelayCycles:
ld de, 7000
--- a/engine/items/buy_sell_toss.asm
+++ b/engine/items/buy_sell_toss.asm
@@ -201,23 +201,20 @@
call WaitBGMap
ret
-TossItem_MenuHeader: ; 0x250ed
+TossItem_MenuHeader:
db MENU_BACKUP_TILES ; flags
menu_coords 15, 9, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
dw ret_25097
db 0 ; default option
-; 0x250f5
-BuyItem_MenuHeader: ; 0x250f5
+BuyItem_MenuHeader:
db MENU_BACKUP_TILES ; flags
menu_coords 7, 15, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1
dw DisplayPurchasePrice
db -1 ; default option
-; 0x250fd
-SellItem_MenuHeader: ; 0x250fd
+SellItem_MenuHeader:
db MENU_BACKUP_TILES ; flags
menu_coords 7, 15, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1
dw DisplaySellingPrice
db 0 ; default option
-; 0x25105
--- a/engine/items/item_effects.asm
+++ b/engine/items/item_effects.asm
@@ -1064,43 +1064,37 @@
; These two texts were carried over from gen 1.
; They are not used in gen 2, and are dummied out.
-Text_RBY_CatchMarowak: ; 0xedab
+Text_RBY_CatchMarowak:
; It dodged the thrown BALL! This #MON can't be caught!
text_jump UnknownText_0x1c5a5a
db "@"
-; 0xedb0
-Text_RBY_NoShake: ; 0xedb0
+Text_RBY_NoShake:
; You missed the #MON!
text_jump UnknownText_0x1c5a90
db "@"
-; 0xedb5
-Text_NoShake: ; 0xedb5
+Text_NoShake:
; Oh no! The #MON broke free!
text_jump UnknownText_0x1c5aa6
db "@"
-; 0xedba
-Text_OneShake: ; 0xedba
+Text_OneShake:
; Aww! It appeared to be caught!
text_jump UnknownText_0x1c5ac3
db "@"
-; 0xedbf
-Text_TwoShakes: ; 0xedbf
+Text_TwoShakes:
; Aargh! Almost had it!
text_jump UnknownText_0x1c5ae3
db "@"
-; 0xedc4
-Text_ThreeShakes: ; 0xedc4
+Text_ThreeShakes:
; Shoot! It was so close too!
text_jump UnknownText_0x1c5afa
db "@"
-; 0xedc9
-Text_GotchaMonWasCaught: ; 0xedc9
+Text_GotchaMonWasCaught:
; Gotcha! @ was caught!@ @
text_jump UnknownText_0x1c5b17
start_asm
@@ -1115,29 +1109,25 @@
ld hl, TextJump_Waitbutton
ret
-TextJump_Waitbutton: ; 0xede6
+TextJump_Waitbutton:
; @
text_jump Text_Waitbutton_2
db "@"
-; 0xedeb
-Text_SentToBillsPC: ; 0xedeb
+Text_SentToBillsPC:
; was sent to BILL's PC.
text_jump UnknownText_0x1c5b38
db "@"
-; 0xedf0
-Text_AddedToPokedex: ; 0xedf0
+Text_AddedToPokedex:
; 's data was newly added to the #DEX.@ @
text_jump UnknownText_0x1c5b53
db "@"
-; 0xedf5
-Text_AskNicknameNewlyCaughtMon: ; 0xedf5
+Text_AskNicknameNewlyCaughtMon:
; Give a nickname to @ ?
text_jump UnknownText_0x1c5b7f
db "@"
-; 0xedfa
ReturnToBattle_UseBall:
farcall _ReturnToBattle_UseBall
@@ -1251,11 +1241,10 @@
jp ClearPalettes
-Text_StatRose: ; 0xeea6
+Text_StatRose:
; 's @ rose.
text_jump UnknownText_0x1c5b9a
db "@"
-; 0xeeab
StatStrings:
@@ -1309,7 +1298,6 @@
ld hl, wPartyMonNicknames
call GetNick
ret
-; 0xef14
RareCandyEffect:
@@ -2097,11 +2085,10 @@
pop bc
jr .loop
-.Text_CantBeUsed: ; 0xf44a
+.Text_CantBeUsed:
; That can't be used on this #MON.
text_jump UnknownText_0x1c5bac
db "@"
-; 0xf44f
EscapeRopeEffect:
@@ -2137,11 +2124,10 @@
jp UseItemText
-TextJump_RepelUsedEarlierIsStillInEffect: ; 0xf47d
+TextJump_RepelUsedEarlierIsStillInEffect:
; The REPEL used earlier is still in effect.
text_jump Text_RepelUsedEarlierIsStillInEffect
db "@"
-; 0xf482
XAccuracyEffect:
@@ -2287,19 +2273,17 @@
ret
-.CatchyTune: ; 0xf56c
+.CatchyTune:
; Played the # FLUTE. Now, that's a catchy tune!
text_jump UnknownText_0x1c5bf9
db "@"
-; 0xf571
-.AllSleepingMonWokeUp: ; 0xf571
+.AllSleepingMonWokeUp:
; All sleeping #MON woke up.
text_jump UnknownText_0x1c5c28
db "@"
-; 0xf576
-.PlayedTheFlute: ; 0xf576
+.PlayedTheFlute:
; played the # FLUTE.@ @
text_jump UnknownText_0x1c5c44
start_asm
@@ -2587,35 +2571,30 @@
xor a
ret
-TextJump_RaiseThePPOfWhichMove: ; 0xf725
+TextJump_RaiseThePPOfWhichMove:
; Raise the PP of which move?
text_jump Text_RaiseThePPOfWhichMove
db "@"
-; 0xf72a
-TextJump_RestoreThePPOfWhichMove: ; 0xf72a
+TextJump_RestoreThePPOfWhichMove:
; Restore the PP of which move?
text_jump Text_RestoreThePPOfWhichMove
db "@"
-; 0xf72f
-TextJump_PPIsMaxedOut: ; 0xf72f
+TextJump_PPIsMaxedOut:
; 's PP is maxed out.
text_jump Text_PPIsMaxedOut
db "@"
-; 0xf734
-TextJump_PPsIncreased: ; 0xf734
+TextJump_PPsIncreased:
; 's PP increased.
text_jump Text_PPsIncreased
db "@"
-; 0xf739
-UnknownText_0xf739: ; 0xf739
+UnknownText_0xf739:
; PP was restored.
text_jump UnknownText_0x1c5cf1
db "@"
-; 0xf73e
SquirtbottleEffect:
@@ -2656,11 +2635,10 @@
jp UseDisposableItem
-.text ; 0xf778
+.text
; There was a trophy inside!
text_jump UnknownText_0x1c5d03
db "@"
-; 0xf77d
NoEffect:
jp IsntTheTimeMessage
@@ -2753,83 +2731,70 @@
ld [wItemEffectSucceeded], a
jp PrintText
-LooksBitterText: ; 0xf80b
+LooksBitterText:
; It looks bitter…
text_jump UnknownText_0x1c5d3e
db "@"
-; 0xf810
-CantUseOnEggText: ; 0xf810
+CantUseOnEggText:
; That can't be used on an EGG.
text_jump UnknownText_0x1c5d50
db "@"
-; 0xf815
-IsntTheTimeText: ; 0xf815
+IsntTheTimeText:
; OAK: ! This isn't the time to use that!
text_jump UnknownText_0x1c5d6e
db "@"
-; 0xf81a
-BelongsToSomeoneElseText: ; 0xf81a
+BelongsToSomeoneElseText:
; That belongs to someone else!
text_jump UnknownText_0x1c5d97
db "@"
-; 0xf81f
-WontHaveAnyEffectText: ; 0xf81f
+WontHaveAnyEffectText:
; It won't have any effect.
text_jump UnknownText_0x1c5db6
db "@"
-; 0xf824
-BlockedTheBallText: ; 0xf824
+BlockedTheBallText:
; The trainer blocked the BALL!
text_jump UnknownText_0x1c5dd0
db "@"
-; 0xf829
-DontBeAThiefText: ; 0xf829
+DontBeAThiefText:
; Don't be a thief!
text_jump UnknownText_0x1c5def
db "@"
-; 0xf82e
-CyclingIsntAllowedText: ; 0xf82e
+CyclingIsntAllowedText:
; Cycling isn't allowed here.
text_jump UnknownText_0x1c5e01
db "@"
-; 0xf833
-CantGetOnYourBikeText: ; 0xf833
+CantGetOnYourBikeText:
; Can't get on your @ now.
text_jump UnknownText_0x1c5e1d
db "@"
-; 0xf838
-Ball_BoxIsFullText: ; 0xf838
+Ball_BoxIsFullText:
; The #MON BOX is full. That can't be used now.
text_jump UnknownText_0x1c5e3a
db "@"
-; 0xf83d
-UsedItemText: ; 0xf83d
+UsedItemText:
; used the@ .
text_jump UnknownText_0x1c5e68
db "@"
-; 0xf842
-GotOnTheItemText: ; 0xf842
+GotOnTheItemText:
; got on the@ .
text_jump UnknownText_0x1c5e7b
db "@"
-; 0xf847
-GotOffTheItemText: ; 0xf847
+GotOffTheItemText:
; got off@ the @ .
text_jump UnknownText_0x1c5e90
db "@"
-; 0xf84c
ApplyPPUp:
--- a/engine/items/mart.asm
+++ b/engine/items/mart.asm
@@ -572,26 +572,23 @@
ret
-Text_Mart_HowMany: ; 0x15e0e
+Text_Mart_HowMany:
; How many?
text_jump UnknownText_0x1c4bfd
db "@"
-; 0x15e13
-Text_Mart_CostsThisMuch: ; 0x15e13
+Text_Mart_CostsThisMuch:
; @ (S) will be ¥@ .
text_jump UnknownText_0x1c4c08
db "@"
-; 0x15e18
-MenuHeader_Buy: ; 0x15e18
+MenuHeader_Buy:
db MENU_BACKUP_TILES ; flags
menu_coords 1, 3, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
dw .MenuData
db 1 ; default option
-; 0x15e20
-.MenuData ; 0x15e20
+.MenuData
db SCROLLINGMENU_DISPLAY_ARROWS | SCROLLINGMENU_ENABLE_FUNCTION3 ; flags
db 4, 8 ; rows, columns
db 1 ; horizontal spacing
@@ -618,131 +615,110 @@
call PrintBCDNumber
ret
-Text_HerbShop_Intro: ; 0x15e4a
+Text_HerbShop_Intro:
; Hello, dear. I sell inexpensive herbal medicine. They're good, but a trifle bitter. Your #MON may not like them. Hehehehe…
text_jump UnknownText_0x1c4c28
db "@"
-; 0x15e4f
-Text_HerbShop_HowMany: ; 0x15e4f
+Text_HerbShop_HowMany:
; How many?
text_jump UnknownText_0x1c4ca3
db "@"
-; 0x15e54
-Text_HerbShop_CostsThisMuch: ; 0x15e54
+Text_HerbShop_CostsThisMuch:
; @ (S) will be ¥@ .
text_jump UnknownText_0x1c4cae
db "@"
-; 0x15e59
-Text_HerbShop_HereYouGo: ; 0x15e59
+Text_HerbShop_HereYouGo:
; Thank you, dear. Hehehehe…
text_jump UnknownText_0x1c4cce
db "@"
-; 0x15e5e
-Text_HerbShop_BagFull: ; 0x15e5e
+Text_HerbShop_BagFull:
; Oh? Your PACK is full, dear.
text_jump UnknownText_0x1c4cea
db "@"
-; 0x15e63
-Text_HerbShop_InsufficientFunds: ; 0x15e63
+Text_HerbShop_InsufficientFunds:
; Hehehe… You don't have the money.
text_jump UnknownText_0x1c4d08
db "@"
-; 0x15e68
-Text_HerbShop_ComeAgain: ; 0x15e68
+Text_HerbShop_ComeAgain:
; Come again, dear. Hehehehe…
text_jump UnknownText_0x1c4d2a
db "@"
-; 0x15e6d
-Text_BargainShop_Intro: ; 0x15e6d
+Text_BargainShop_Intro:
; Hiya! Care to see some bargains? I sell rare items that nobody else carries--but only one of each item.
text_jump UnknownText_0x1c4d47
db "@"
-; 0x15e72
-Text_BargainShop_CostsThisMuch: ; 0x15e72
+Text_BargainShop_CostsThisMuch:
; costs ¥@ . Want it?
text_jump UnknownText_0x1c4db0
db "@"
-; 0x15e77
-Text_BargainShop_HereYouGo: ; 0x15e77
+Text_BargainShop_HereYouGo:
; Thanks.
text_jump UnknownText_0x1c4dcd
db "@"
-; 0x15e7c
-Text_BargainShop_BagFull: ; 0x15e7c
+Text_BargainShop_BagFull:
; Uh-oh, your PACK is chock-full.
text_jump UnknownText_0x1c4dd6
db "@"
-; 0x15e81
-Text_BargainShop_SoldOut: ; 0x15e81
+Text_BargainShop_SoldOut:
; You bought that already. I'm all sold out of it.
text_jump UnknownText_0x1c4df7
db "@"
-; 0x15e86
-Text_BargainShop_InsufficientFunds: ; 0x15e86
+Text_BargainShop_InsufficientFunds:
; Uh-oh, you're short on funds.
text_jump UnknownText_0x1c4e28
db "@"
-; 0x15e8b
-Text_BargainShop_ComeAgain: ; 0x15e8b
+Text_BargainShop_ComeAgain:
; Come by again sometime.
text_jump UnknownText_0x1c4e46
db "@"
-; 0x15e90
-Text_Pharmacist_Intro: ; 0x15e90
+Text_Pharmacist_Intro:
; What's up? Need some medicine?
text_jump UnknownText_0x1c4e5f
db "@"
-; 0x15e95
-Text_Pharmacy_HowMany: ; 0x15e95
+Text_Pharmacy_HowMany:
; How many?
text_jump UnknownText_0x1c4e7e
db "@"
-; 0x15e9a
-Text_Pharmacy_CostsThisMuch: ; 0x15e9a
+Text_Pharmacy_CostsThisMuch:
; @ (S) will cost ¥@ .
text_jump UnknownText_0x1c4e89
db "@"
-; 0x15e9f
-Text_Pharmacy_HereYouGo: ; 0x15e9f
+Text_Pharmacy_HereYouGo:
; Thanks much!
text_jump UnknownText_0x1c4eab
db "@"
-; 0x15ea4
-Text_Pharmacy_BagFull: ; 0x15ea4
+Text_Pharmacy_BagFull:
; You don't have any more space.
text_jump UnknownText_0x1c4eb9
db "@"
-; 0x15ea9
-Text_Pharmacy_InsufficientFunds: ; 0x15ea9
+Text_Pharmacy_InsufficientFunds:
; Huh? That's not enough money.
text_jump UnknownText_0x1c4ed8
db "@"
-; 0x15eae
-Text_Pharmacist_ComeAgain: ; 0x15eae
+Text_Pharmacist_ComeAgain:
; All right. See you around.
text_jump UnknownText_0x1c4ef6
db "@"
-; 0x15eb3
SellMenu:
@@ -767,11 +743,10 @@
and a
ret
-.NothingToSellText: ; 0x15edb
+.NothingToSellText:
; You don't have anything to sell.
text_jump UnknownText_0x1c4f12
db "@"
-; 0x15ee0
.TryToSellItem:
@@ -839,81 +814,69 @@
and a
ret
-Text_Mart_SellHowMany: ; 0x15f73
+Text_Mart_SellHowMany:
; How many?
text_jump UnknownText_0x1c4f33
db "@"
-; 0x15f78
-Text_Mart_ICanPayThisMuch: ; 0x15f78
+Text_Mart_ICanPayThisMuch:
; I can pay you ¥@ . Is that OK?
text_jump UnknownText_0x1c4f3e
db "@"
-; 0x15f7d
.UnusedString15f7d:
db "！ダミー！@"
-Text_Mart_HowMayIHelpYou: ; 0x15f83
+Text_Mart_HowMayIHelpYou:
; Welcome! How may I help you?
text_jump UnknownText_0x1c4f62
db "@"
-; 0x15f88
-MenuHeader_BuySell: ; 0x15f88
+MenuHeader_BuySell:
db MENU_BACKUP_TILES ; flags
menu_coords 0, 0, 7, 8
dw .MenuData
db 1 ; default option
-; 0x15f90
-.MenuData ; 0x15f90
+.MenuData
db STATICMENU_CURSOR ; strings
db 3 ; items
db "BUY@"
db "SELL@"
db "QUIT@"
-; 0x15f96
-Text_Mart_HereYouGo: ; 0x15fa0
+Text_Mart_HereYouGo:
; Here you are. Thank you!
text_jump UnknownText_0x1c4f80
db "@"
-; 0x15fa5
-Text_Mart_InsufficientFunds: ; 0x15fa5
+Text_Mart_InsufficientFunds:
; You don't have enough money.
text_jump UnknownText_0x1c4f9a
db "@"
-; 0x15faa
-Text_Mart_BagFull: ; 0x15faa
+Text_Mart_BagFull:
; You can't carry any more items.
text_jump UnknownText_0x1c4fb7
db "@"
-; 0x15faf
-TextMart_CantBuyFromYou: ; 0x15faf
+TextMart_CantBuyFromYou:
; Sorry, I can't buy that from you.
text_jump UnknownText_0x1c4fd7
db "@"
-; 0x15fb4
-Text_Mart_ComeAgain: ; 0x15fb4
+Text_Mart_ComeAgain:
; Please come again!
text_jump UnknownText_0x1c4ff9
db "@"
-; 0x15fb9
-Text_Mart_AnythingElse: ; 0x15fb9
+Text_Mart_AnythingElse:
text_jump UnknownText_0x1c500d
db "@"
-; 0x15fbe
-Text_Mart_SoldForAmount: ; 0x15fbe
+Text_Mart_SoldForAmount:
text_jump UnknownText_0x1c502e
db "@"
-; 0x15fc3
PlayTransactionSound:
call WaitSFX
--- a/engine/items/pack.asm
+++ b/engine/items/pack.asm
@@ -158,19 +158,17 @@
call Pack_GetJumptablePointer
jp hl
-.MenuHeader1: ; 0x10124
+.MenuHeader1:
db MENU_BACKUP_TILES ; flags
menu_coords 13, 7, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
dw .MenuData_1
db 1 ; default option
-; 0x1012c
-.MenuData_1: ; 0x1012c
+.MenuData_1:
db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING ; flags
db 2 ; items
db "USE@"
db "QUIT@"
-; 0x10137
.Jumptable1:
dw .UseItem
@@ -177,20 +175,18 @@
dw QuitItemSubmenu
-.MenuHeader2: ; 0x1013b
+.MenuHeader2:
db MENU_BACKUP_TILES ; flags
menu_coords 13, 5, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
dw .MenuData_2
db 1 ; default option
-; 0x10143
-.MenuData_2: ; 0x10143
+.MenuData_2:
db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING ; flags
db 3 ; items
db "USE@"
db "GIVE@"
db "QUIT@"
-; 0x10153
.Jumptable2:
dw .UseItem
@@ -314,14 +310,13 @@
call Pack_GetJumptablePointer
jp hl
-MenuHeader_UsableKeyItem: ; 0x10249
+MenuHeader_UsableKeyItem:
db MENU_BACKUP_TILES ; flags
menu_coords 13, 1, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
dw .MenuData
db 1 ; default option
-; 0x10251
-.MenuData: ; 0x10251
+.MenuData:
db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING ; flags
db 5 ; items
db "USE@"
@@ -329,7 +324,6 @@
db "TOSS@"
db "SEL@"
db "QUIT@"
-; 0x1026a
Jumptable_UseGiveTossRegisterQuit:
dw UseItem
@@ -338,14 +332,13 @@
dw RegisterItem
dw QuitItemSubmenu
-MenuHeader_UsableItem: ; 0x10274
+MenuHeader_UsableItem:
db MENU_BACKUP_TILES ; flags
menu_coords 13, 3, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
dw .MenuData
db 1 ; default option
-; 0x1027c
-.MenuData: ; 0x1027c
+.MenuData:
db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING ; flags
db 4 ; items
db "USE@"
@@ -352,7 +345,6 @@
db "GIVE@"
db "TOSS@"
db "QUIT@"
-; 0x10291
Jumptable_UseGiveTossQuit:
dw UseItem
@@ -360,38 +352,34 @@
dw TossMenu
dw QuitItemSubmenu
-MenuHeader_UnusableItem: ; 0x10299
+MenuHeader_UnusableItem:
db MENU_BACKUP_TILES ; flags
menu_coords 13, 7, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
dw .MenuData
db 1 ; default option
-; 0x102a1
-.MenuData: ; 0x102a1
+.MenuData:
db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING ; flags
db 2 ; items
db "USE@"
db "QUIT@"
-; 0x102ac
Jumptable_UseQuit:
dw UseItem
dw QuitItemSubmenu
-MenuHeader_UnusableKeyItem: ; 0x102b0
+MenuHeader_UnusableKeyItem:
db MENU_BACKUP_TILES ; flags
menu_coords 13, 5, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
dw .MenuData
db 1 ; default option
-; 0x102b8
-.MenuData: ; 0x102b8
+.MenuData:
db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING ; flags
db 3 ; items
db "USE@"
db "SEL@"
db "QUIT@"
-; 0x102c7
Jumptable_UseRegisterQuit:
dw UseItem
@@ -398,14 +386,13 @@
dw RegisterItem
dw QuitItemSubmenu
-MenuHeader_HoldableKeyItem: ; 0x102cd
+MenuHeader_HoldableKeyItem:
db MENU_BACKUP_TILES ; flags
menu_coords 13, 3, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
dw .MenuData
db 1 ; default option
-; 0x102d5
-.MenuData: ; 0x102d5
+.MenuData:
db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING ; flags
db 4 ; items
db "GIVE@"
@@ -412,7 +399,6 @@
db "TOSS@"
db "SEL@"
db "QUIT@"
-; 0x102ea
Jumptable_GiveTossRegisterQuit:
dw GiveItem
@@ -420,20 +406,18 @@
dw RegisterItem
dw QuitItemSubmenu
-MenuHeader_HoldableItem: ; 0x102f2
+MenuHeader_HoldableItem:
db MENU_BACKUP_TILES ; flags
menu_coords 13, 5, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
dw .MenuData
db 1 ; default option
-; 0x102fa
-.MenuData: ; 0x102fa
+.MenuData:
db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING ; flags
db 3 ; items
db "GIVE@"
db "TOSS@"
db "QUIT@"
-; 0x1030b
Jumptable_GiveTossQuit:
dw GiveItem
@@ -633,11 +617,10 @@
ld hl, TextJump_YouDontHaveAMon
call Pack_PrintTextNoScroll
ret
-.Egg: ; 0x1048d
+.Egg:
; An EGG can't hold an item.
text_jump Text_AnEGGCantHoldAnItem
db "@"
-; 0x10492
QuitItemSubmenu:
ret
@@ -824,36 +807,32 @@
call Pack_GetJumptablePointer
jp hl
-.UsableMenuHeader: ; 0x10601
+.UsableMenuHeader:
db MENU_BACKUP_TILES ; flags
menu_coords 13, 7, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
dw .UsableMenuData
db 1 ; default option
-; 0x10609
-.UsableMenuData: ; 0x10609
+.UsableMenuData:
db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING ; flags
db 2 ; items
db "USE@"
db "QUIT@"
-; 0x10614
.UsableJumptable:
dw .Use
dw .Quit
-.UnusableMenuHeader: ; 0x10618
+.UnusableMenuHeader:
db MENU_BACKUP_TILES ; flags
menu_coords 13, 9, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
dw .UnusableMenuData
db 1 ; default option
-; 0x10620
-.UnusableMenuData: ; 0x10620
+.UnusableMenuData:
db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING ; flags
db 1 ; items
db "QUIT@"
-; 0x10627
.UnusableJumptable:
dw .Quit
@@ -1122,14 +1101,13 @@
ld hl, .ItemsMenuHeader
jr .DisplayPocket
-.ItemsMenuHeader: ; 0x107ef
+.ItemsMenuHeader:
db MENU_BACKUP_TILES ; flags
menu_coords 7, 1, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
dw .ItemsMenuData
db 1 ; default option
-; 0x107f7
-.ItemsMenuData: ; 0x107f7
+.ItemsMenuData:
db STATICMENU_ENABLE_SELECT | STATICMENU_ENABLE_LEFT_RIGHT | STATICMENU_ENABLE_START | STATICMENU_WRAP | STATICMENU_CURSOR ; flags
db 5, 8 ; rows, columns
db 2 ; horizontal spacing
@@ -1143,14 +1121,13 @@
ld hl, .KeyItemsMenuHeader
jr .DisplayPocket
-.KeyItemsMenuHeader: ; 0x1080e
+.KeyItemsMenuHeader:
db MENU_BACKUP_TILES ; flags
menu_coords 7, 1, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
dw .KeyItemsMenuData
db 1 ; default option
-; 0x10816
-.KeyItemsMenuData: ; 0x10816
+.KeyItemsMenuData:
db STATICMENU_ENABLE_SELECT | STATICMENU_ENABLE_LEFT_RIGHT | STATICMENU_ENABLE_START | STATICMENU_WRAP | STATICMENU_CURSOR ; flags
db 5, 8 ; rows, columns
db 1 ; horizontal spacing
@@ -1173,14 +1150,13 @@
ld hl, .BallsMenuHeader
jr .DisplayPocket
-.BallsMenuHeader: ; 0x10842
+.BallsMenuHeader:
db MENU_BACKUP_TILES ; flags
menu_coords 7, 1, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
dw .BallsMenuData
db 1 ; default option
-; 0x1084a
-.BallsMenuData: ; 0x1084a
+.BallsMenuData:
db STATICMENU_ENABLE_SELECT | STATICMENU_ENABLE_LEFT_RIGHT | STATICMENU_ENABLE_START | STATICMENU_WRAP | STATICMENU_CURSOR ; flags
db 5, 8 ; rows, columns
db 2 ; horizontal spacing
@@ -1486,14 +1462,13 @@
call DelayFrame
ret
-ItemsPocketMenuHeader: ; 0x10a4f
+ItemsPocketMenuHeader:
db MENU_BACKUP_TILES ; flags
menu_coords 7, 1, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
dw .MenuData
db 1 ; default option
-; 0x10a57
-.MenuData: ; 0x10a57
+.MenuData:
db STATICMENU_ENABLE_SELECT | STATICMENU_ENABLE_LEFT_RIGHT | STATICMENU_ENABLE_START | STATICMENU_WRAP | STATICMENU_CURSOR ; flags
db 5, 8 ; rows, columns
db 2 ; horizontal spacing
@@ -1502,14 +1477,13 @@
dba PlaceMenuItemQuantity
dba UpdateItemDescription
-PC_Mart_ItemsPocketMenuHeader: ; 0x10a67
+PC_Mart_ItemsPocketMenuHeader:
db MENU_BACKUP_TILES ; flags
menu_coords 7, 1, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
dw .MenuData
db 1 ; default option
-; 0x10a6f
-.MenuData: ; 0x10a6f
+.MenuData:
db STATICMENU_ENABLE_SELECT | STATICMENU_ENABLE_LEFT_RIGHT | STATICMENU_ENABLE_START | STATICMENU_WRAP ; flags
db 5, 8 ; rows, columns
db 2 ; horizontal spacing
@@ -1518,14 +1492,13 @@
dba PlaceMenuItemQuantity
dba UpdateItemDescription
-KeyItemsPocketMenuHeader: ; 0x10a7f
+KeyItemsPocketMenuHeader:
db MENU_BACKUP_TILES ; flags
menu_coords 7, 1, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
dw .MenuData
db 1 ; default option
-; 0x10a87
-.MenuData: ; 0x10a87
+.MenuData:
db STATICMENU_ENABLE_SELECT | STATICMENU_ENABLE_LEFT_RIGHT | STATICMENU_ENABLE_START | STATICMENU_WRAP | STATICMENU_CURSOR ; flags
db 5, 8 ; rows, columns
db 1 ; horizontal spacing
@@ -1534,14 +1507,13 @@
dba PlaceMenuItemQuantity
dba UpdateItemDescription
-PC_Mart_KeyItemsPocketMenuHeader: ; 0x10a97
+PC_Mart_KeyItemsPocketMenuHeader:
db MENU_BACKUP_TILES ; flags
menu_coords 7, 1, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
dw .MenuData
db 1 ; default option
-; 0x10a9f
-.MenuData: ; 0x10a9f
+.MenuData:
db STATICMENU_ENABLE_SELECT | STATICMENU_ENABLE_LEFT_RIGHT | STATICMENU_ENABLE_START | STATICMENU_WRAP ; flags
db 5, 8 ; rows, columns
db 1 ; horizontal spacing
@@ -1550,14 +1522,13 @@
dba PlaceMenuItemQuantity
dba UpdateItemDescription
-BallsPocketMenuHeader: ; 0x10aaf
+BallsPocketMenuHeader:
db MENU_BACKUP_TILES ; flags
menu_coords 7, 1, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
dw .MenuData
db 1 ; default option
-; 0x10ab7
-.MenuData: ; 0x10ab7
+.MenuData:
db STATICMENU_ENABLE_SELECT | STATICMENU_ENABLE_LEFT_RIGHT | STATICMENU_ENABLE_START | STATICMENU_WRAP | STATICMENU_CURSOR ; flags
db 5, 8 ; rows, columns
db 2 ; horizontal spacing
@@ -1566,14 +1537,13 @@
dba PlaceMenuItemQuantity
dba UpdateItemDescription
-PC_Mart_BallsPocketMenuHeader: ; 0x10ac7
+PC_Mart_BallsPocketMenuHeader:
db MENU_BACKUP_TILES ; flags
menu_coords 7, 1, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
dw .MenuData
db 1 ; default option
-; 0x10acf
-.MenuData: ; 0x10acf
+.MenuData:
db STATICMENU_ENABLE_SELECT | STATICMENU_ENABLE_LEFT_RIGHT | STATICMENU_ENABLE_START | STATICMENU_WRAP ; flags
db 5, 8 ; rows, columns
db 2 ; horizontal spacing
@@ -1582,72 +1552,61 @@
dba PlaceMenuItemQuantity
dba UpdateItemDescription
-Text_PackNoItems: ; 0x10adf
+Text_PackNoItems:
; No items.
text_jump UnknownText_0x1c0b9a
db "@"
-; 0x10ae4
-Text_ThrowAwayHowMany: ; 0x10ae4
+Text_ThrowAwayHowMany:
; Throw away how many?
text_jump UnknownText_0x1c0ba5
db "@"
-; 0x10ae9
-Text_ConfirmThrowAway: ; 0x10ae9
+Text_ConfirmThrowAway:
; Throw away @ @ (S)?
text_jump UnknownText_0x1c0bbb
db "@"
-; 0x10aee
-Text_ThrewAway: ; 0x10aee
+Text_ThrewAway:
; Threw away @ (S).
text_jump UnknownText_0x1c0bd8
db "@"
-; 0x10af3
-Text_ThisIsntTheTime: ; 0x10af3
+Text_ThisIsntTheTime:
; OAK: ! This isn't the time to use that!
text_jump UnknownText_0x1c0bee
db "@"
-; 0x10af8
-TextJump_YouDontHaveAMon: ; 0x10af8
+TextJump_YouDontHaveAMon:
; You don't have a #MON!
text_jump Text_YouDontHaveAMon
db "@"
-; 0x10afd
-Text_RegisteredItem: ; 0x10afd
+Text_RegisteredItem:
; Registered the @ .
text_jump UnknownText_0x1c0c2e
db "@"
-; 0x10b02
-Text_CantRegister: ; 0x10b02
+Text_CantRegister:
; You can't register that item.
text_jump UnknownText_0x1c0c45
db "@"
-; 0x10b07
-Text_MoveItemWhere: ; 0x10b07
+Text_MoveItemWhere:
; Where should this be moved to?
text_jump UnknownText_0x1c0c63
db "@"
-; 0x10b0c
-Text_PackEmptyString: ; 0x10b0c
+Text_PackEmptyString:
;
text_jump UnknownText_0x1c0c83
db "@"
-; 0x10b11
-TextJump_YouCantUseItInABattle: ; 0x10b11
+TextJump_YouCantUseItInABattle:
; Doesn't seem to be used anywhere
; "You can't use it in a battle."
text_jump Text_YouCantUseItInABattle
db "@"
-; 0x10b16
PackMenuGFX:
INCBIN "gfx/pack/pack_menu.2bpp"
--- a/engine/items/print_item_description.asm
+++ b/engine/items/print_item_description.asm
@@ -1,4 +1,4 @@
-PrintItemDescription: ; 0x1c8955
+PrintItemDescription:
; Print the description for item [wCurSpecies] at de.
ld a, [wCurSpecies]
@@ -28,4 +28,3 @@
ld d, [hl]
pop hl
jp PlaceString
-; 0x1c8987
--- a/engine/items/tmhm.asm
+++ b/engine/items/tmhm.asm
@@ -166,29 +166,25 @@
scf
ret
-Text_BootedTM: ; 0x2c8bf
+Text_BootedTM:
; Booted up a TM.
text_jump UnknownText_0x1c0373
db "@"
-; 0x2c8c4
-Text_BootedHM: ; 0x2c8c4
+Text_BootedHM:
; Booted up an HM.
text_jump UnknownText_0x1c0384
db "@"
-; 0x2c8c9
-Text_ItContained: ; 0x2c8c9
+Text_ItContained:
; It contained @ . Teach @ to a #MON?
text_jump UnknownText_0x1c0396
db "@"
-; 0x2c8ce
-Text_TMHMNotCompatible: ; 0x2c8ce
+Text_TMHMNotCompatible:
; is not compatible with @ . It can't learn @ .
text_jump UnknownText_0x1c03c2
db "@"
-; 0x2c8d3
TMHM_PocketLoop:
xor a
@@ -501,17 +497,15 @@
jp PrintText
-.NoRoomText: ; 0x2caf0
+.NoRoomText:
; You have no room for any more @ S.
text_jump UnknownText_0x1c03fa
db "@"
-; 0x2caf5
-.ReceivedText: ; 0x2caf5
+.ReceivedText:
; You received @ !
text_jump UnknownText_0x1c0421
db "@"
-; 0x2cafa
.CheckHaveRoomForTMHM:
ld a, [wd265]
--- a/engine/items/update_item_description.asm
+++ b/engine/items/update_item_description.asm
@@ -1,4 +1,4 @@
-UpdateItemDescription: ; 0x244c3
+UpdateItemDescription:
ld a, [wMenuSelection]
ld [wCurSpecies], a
hlcoord 0, 12
--- a/engine/link/link.asm
+++ b/engine/link/link.asm
@@ -505,11 +505,10 @@
call WaitBGMap2
ret
-.TooMuchTimeHasElapsed: ; 0x283ed
+.TooMuchTimeHasElapsed:
; Too much time has elapsed. Please try again.
text_jump UnknownText_0x1c4183
db "@"
-; 0x283f2
ExchangeBytes:
ld a, TRUE
@@ -1491,20 +1490,18 @@
jp InitTradeMenuDisplay
-.Text_CantTradeLastMon: ; 0x28aaf
+.Text_CantTradeLastMon:
; If you trade that #MON, you won't be able to battle.
text_jump UnknownText_0x1c41b1
db "@"
-; 0x28ab4
.String_Stats_Trade:
db "STATS TRADE@"
-.Text_Abnormal: ; 0x28ac4
+.Text_Abnormal:
; Your friend's @ appears to be abnormal!
text_jump UnknownText_0x1c41e6
db "@"
-; 0x28ac9
Function28ac9:
@@ -1955,11 +1952,10 @@
db "TRADE"
next "CANCEL@"
-UnknownText_0x28eb8: ; 0x28eb8
+UnknownText_0x28eb8:
; Trade @ for @ ?
text_jump UnknownText_0x1c4212
db "@"
-; 0x28ebd
String28ebd:
db "Trade completed!@"
--- a/engine/menus/delete_save.asm
+++ b/engine/menus/delete_save.asm
@@ -18,18 +18,18 @@
farcall EmptyAllSRAMBanks
ret
-.Text_ClearAllSaveData: ; 0x4d580
+.Text_ClearAllSaveData:
; Clear all save data?
text_jump UnknownText_0x1c564a
db "@"
-.NoYesMenuHeader: ; 0x4d585
+.NoYesMenuHeader:
db 0 ; flags
menu_coords 14, 7, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
dw .MenuData
db 1 ; default option
-.MenuData: ; 0x4d58d
+.MenuData:
db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING ; flags
db 2 ; items
db "NO@"
--- a/engine/menus/init_gender.asm
+++ b/engine/menus/init_gender.asm
@@ -41,25 +41,22 @@
call DelayFrames
ret
-.MenuHeader: ; 0x48dfc
+.MenuHeader:
db MENU_BACKUP_TILES ; flags
menu_coords 6, 4, 12, 9
dw .MenuData
db 1 ; default option
-; 0x48e04
-.MenuData: ; 0x48e04
+.MenuData:
db STATICMENU_CURSOR | STATICMENU_WRAP | STATICMENU_DISABLE_B ; flags
db 2 ; items
db "Boy@"
db "Girl@"
-; 0x48e0f
-TextJump_AreYouABoyOrAreYouAGirl: ; 0x48e0f
+TextJump_AreYouABoyOrAreYouAGirl:
; Are you a boy? Or are you a girl?
text_jump Text_AreYouABoyOrAreYouAGirl
db "@"
-; 0x48e14
InitGenderScreen:
ld a, $10
--- a/engine/menus/intro_menu.asm
+++ b/engine/menus/intro_menu.asm
@@ -627,7 +627,7 @@
jp PrintNum
-OakSpeech: ; 0x5f99
+OakSpeech:
farcall InitClock
call RotateFourPalettesLeft
call ClearTileMap
@@ -705,11 +705,11 @@
call PrintText
ret
-OakText1: ; 0x6045
+OakText1:
text_jump _OakText1
db "@"
-OakText2: ; 0x604a
+OakText2:
text_jump _OakText2
start_asm
ld a, WOOPER
@@ -718,27 +718,27 @@
ld hl, OakText3
ret
-OakText3: ; 0x605b
+OakText3:
text_jump _OakText3
db "@"
-OakText4: ; 0x6060
+OakText4:
text_jump _OakText4
db "@"
-OakText5: ; 0x6065
+OakText5:
text_jump _OakText5
db "@"
-OakText6: ; 0x606a
+OakText6:
text_jump _OakText6
db "@"
-OakText7: ; 0x606f
+OakText7:
text_jump _OakText7
db "@"
-NamePlayer: ; 0x6074
+NamePlayer:
farcall MovePlayerPicRight
farcall ShowPlayerNamingChoices
ld a, [wMenuCursorY]
@@ -867,7 +867,7 @@
jr nz, .loop
ret
-IntroFadePalettes: ; 0x617c
+IntroFadePalettes:
db %01010100
db %10101000
db %11111100
--- a/engine/menus/main_menu.asm
+++ b/engine/menus/main_menu.asm
@@ -48,7 +48,7 @@
db "MOBILE@"
db "MOBILE STUDIUM@"
-.Jumptable: ; 0x49d60
+.Jumptable:
dw MainMenu_Continue
dw MainMenu_NewGame
dw MainMenu_Options
@@ -55,7 +55,6 @@
dw MainMenu_MysteryGift
dw MainMenu_Mobile
dw MainMenu_MobileStudium
-; 0x49d6c
CONTINUE EQU 0
NEW_GAME EQU 1
@@ -66,13 +65,13 @@
MainMenuItems:
-NewGameMenu: ; 0x49d6c
+NewGameMenu:
db 2
db NEW_GAME
db OPTION
db -1
-ContinueMenu: ; 0x49d70
+ContinueMenu:
db 3
db CONTINUE
db NEW_GAME
@@ -79,7 +78,7 @@
db OPTION
db -1
-MobileMysteryMenu: ; 0x49d75
+MobileMysteryMenu:
db 5
db CONTINUE
db NEW_GAME
@@ -88,7 +87,7 @@
db MOBILE
db -1
-MobileMenu: ; 0x49d7c
+MobileMenu:
db 4
db CONTINUE
db NEW_GAME
@@ -96,7 +95,7 @@
db MOBILE
db -1
-MobileStudiumMenu: ; 0x49d82
+MobileStudiumMenu:
db 5
db CONTINUE
db NEW_GAME
@@ -105,7 +104,7 @@
db MOBILE_STUDIUM
db -1
-MysteryMobileStudiumMenu: ; 0x49d89
+MysteryMobileStudiumMenu:
db 6
db CONTINUE
db NEW_GAME
@@ -115,7 +114,7 @@
db MOBILE_STUDIUM
db -1
-MysteryMenu: ; 0x49d91
+MysteryMenu:
db 4
db CONTINUE
db NEW_GAME
@@ -123,7 +122,7 @@
db MYSTERY_GIFT
db -1
-MysteryStudiumMenu: ; 0x49d97
+MysteryStudiumMenu:
db 5
db CONTINUE
db NEW_GAME
@@ -132,7 +131,7 @@
db MOBILE_STUDIUM
db -1
-StudiumMenu: ; 0x49d9e
+StudiumMenu:
db 4
db CONTINUE
db NEW_GAME
--- a/engine/menus/menu_2.asm
+++ b/engine/menus/menu_2.asm
@@ -1,4 +1,4 @@
-PlaceMenuItemName: ; 0x24ab4
+PlaceMenuItemName:
push de
ld a, [wMenuSelection]
ld [wNamedObjectIndexBuffer], a
@@ -7,7 +7,7 @@
call PlaceString
ret
-PlaceMenuItemQuantity: ; 0x24ac3
+PlaceMenuItemQuantity:
push de
ld a, [wMenuSelection]
ld [wCurItem], a
@@ -52,13 +52,13 @@
call PrintNum
ret
-MenuHeader_0x24b15: ; 0x24b15
+MenuHeader_0x24b15:
db MENU_BACKUP_TILES ; flags
menu_coords 11, 0, SCREEN_WIDTH - 1, 2
dw NULL
db 1 ; default option
-MenuHeader_0x24b1d: ; 0x24b1d
+MenuHeader_0x24b1d:
db MENU_BACKUP_TILES ; flags
menu_coords 0, 11, 8, 13
dw NULL
--- a/engine/menus/naming_screen.asm
+++ b/engine/menus/naming_screen.asm
@@ -4,13 +4,12 @@
NAMINGSCREEN_MIDDLELINE EQUS "\"→\"" ; $eb
NAMINGSCREEN_UNDERLINE EQUS "\"<DOT>\"" ; $f2
-_NamingScreen: ; 0x116b7
+_NamingScreen:
call DisableSpriteUpdates
call NamingScreen
call ReturnToMapWithSpeechTextbox
ret
-; 0x116c1
NamingScreen:
ld hl, wNamingScreenDestinationPointer
--- a/engine/menus/save.asm
+++ b/engine/menus/save.asm
@@ -1112,50 +1112,42 @@
ret
-Text_WouldYouLikeToSaveTheGame: ; 0x15283
+Text_WouldYouLikeToSaveTheGame:
; Would you like to save the game?
text_jump UnknownText_0x1c454b
db "@"
-; 0x15288
-Text_SavingDontTurnOffThePower: ; 0x15288
+Text_SavingDontTurnOffThePower:
; SAVING… DON'T TURN OFF THE POWER.
text_jump UnknownText_0x1c456d
db "@"
-; 0x1528d
-Text_PlayerSavedTheGame: ; 0x1528d
+Text_PlayerSavedTheGame:
; saved the game.
text_jump UnknownText_0x1c4590
db "@"
-; 0x15292
-Text_AlreadyASaveFile: ; 0x15292
+Text_AlreadyASaveFile:
; There is already a save file. Is it OK to overwrite?
text_jump UnknownText_0x1c45a3
db "@"
-; 0x15297
-Text_AnotherSaveFile: ; 0x15297
+Text_AnotherSaveFile:
; There is another save file. Is it OK to overwrite?
text_jump UnknownText_0x1c45d9
db "@"
-; 0x1529c
-Text_SaveFileCorrupted: ; 0x1529c
+Text_SaveFileCorrupted:
; The save file is corrupted!
text_jump UnknownText_0x1c460d
db "@"
-; 0x152a1
-Text_SaveOnBoxSwitch: ; 0x152a1
+Text_SaveOnBoxSwitch:
; When you change a #MON BOX, data will be saved. OK?
text_jump UnknownText_0x1c462a
db "@"
-; 0x152a6
-Text_SaveOnMoveMonWOMail: ; 0x152a6
+Text_SaveOnMoveMonWOMail:
; Each time you move a #MON, data will be saved. OK?
text_jump UnknownText_0x1c465f
db "@"
-; 0x152ab
--- a/engine/menus/start_menu.asm
+++ b/engine/menus/start_menu.asm
@@ -647,7 +647,6 @@
; That's too impor- tant to toss out!
text_jump UnknownText_0x1c1adf
db "@"
-; 0x12a60
CantUseItem:
ld hl, CantUseItemText
@@ -1137,7 +1136,6 @@
menu_coords 12, 10, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1
dw .MenuData
db 1 ; default option
-; 0x12dd1
.MenuData:
db STATICMENU_CURSOR ; flags
@@ -1145,7 +1143,6 @@
db "READ@"
db "TAKE@"
db "QUIT@"
-; 0x12de2
.mailwilllosemessagetext
@@ -1152,37 +1149,31 @@
; The MAIL will lose its message. OK?
text_jump UnknownText_0x1c1c22
db "@"
-; 0x12de7
.tookmailfrommontext
; MAIL detached from <POKEMON>.
text_jump UnknownText_0x1c1c47
db "@"
-; 0x12dec
.bagfulltext
; There's no space for removing MAIL.
text_jump UnknownText_0x1c1c62
db "@"
-; 0x12df1
.sendmailtopctext
; Send the removed MAIL to your PC?
text_jump UnknownText_0x1c1c86
db "@"
-; 0x12df6
.mailboxfulltext
; Your PC's MAILBOX is full.
text_jump UnknownText_0x1c1ca9
db "@"
-; 0x12dfb
.sentmailtopctext
; The MAIL was sent to your PC.
text_jump UnknownText_0x1c1cc4
db "@"
-; 0x12e00
OpenPartyStats:
@@ -1348,7 +1339,6 @@
; Not enough HP!
text_jump UnknownText_0x1c1ce3
db "@"
-; 0x12f05
.CheckMonHasEnoughHP:
; Need to have at least (MaxHP / 5) HP left.
--- a/engine/movie/init_hof_credits.asm
+++ b/engine/movie/init_hof_credits.asm
@@ -23,7 +23,7 @@
call SetPalettes
ret
-.SavingRecordDontTurnOff: ; 0x4e8bd
+.SavingRecordDontTurnOff:
; SAVING RECORD… DON'T TURN OFF!
text_jump UnknownText_0x1bd39e
db "@"
--- a/engine/movie/trade_animation.asm
+++ b/engine/movie/trade_animation.asm
@@ -1247,17 +1247,15 @@
ret
-.Text_WasSentTo: ; 0x29732
+.Text_WasSentTo:
; was sent to @ .
text_jump UnknownText_0x1bc6e9
db "@"
-; 0x29737
-.Text_MonName: ; 0x29737
+.Text_MonName:
;
text_jump UnknownText_0x1bc701
db "@"
-; 0x2973c
TradeAnim_OTBidsFarewell:
ld hl, .Text_BidsFarewellToMon
@@ -1270,17 +1268,15 @@
ret
-.Text_BidsFarewellToMon: ; 0x29752
+.Text_BidsFarewellToMon:
; bids farewell to
text_jump UnknownText_0x1bc703
db "@"
-; 0x29757
-.Text_MonName: ; 0x29757
+.Text_MonName:
; .
text_jump UnknownText_0x1bc719
db "@"
-; 0x2975c
TradeAnim_TakeCareOfText:
call WaitTop
@@ -1296,11 +1292,10 @@
ret
-.Text_TakeGoodCareOfMon: ; 0x2977a
+.Text_TakeGoodCareOfMon:
; Take good care of @ .
text_jump UnknownText_0x1bc71f
db "@"
-; 0x2977f
TradeAnim_OTSendsText1:
ld hl, .Text_ForYourMon
@@ -1315,17 +1310,15 @@
ret
-.Text_ForYourMon: ; 0x2979a
+.Text_ForYourMon:
; For @ 's @ ,
text_jump UnknownText_0x1bc739
db "@"
-; 0x2979f
-.Text_OTSends: ; 0x2979f
+.Text_OTSends:
; sends @ .
text_jump UnknownText_0x1bc74c
db "@"
-; 0x297a4
TradeAnim_OTSendsText2:
ld hl, .Text_WillTrade
@@ -1340,17 +1333,15 @@
ret
-.Text_WillTrade: ; 0x297bf
+.Text_WillTrade:
; will trade @ @
text_jump UnknownText_0x1bc75e
db "@"
-; 0x297c4
-.Text_ForYourMon: ; 0x297c4
+.Text_ForYourMon:
; for @ 's @ .
text_jump UnknownText_0x1bc774
db "@"
-; 0x297c9
TradeAnim_Wait80Frames:
ld c, 80
--- a/engine/overworld/decorations.asm
+++ b/engine/overworld/decorations.asm
@@ -5,7 +5,7 @@
ld [wDecoPoster], a
ret
-_PlayerDecorationMenu: ; 0x2675c
+_PlayerDecorationMenu:
ld a, [wWhichIndexSet]
push af
ld hl, .MenuHeader
@@ -34,22 +34,19 @@
ld a, [wBuffer5]
ld c, a
ret
-; 0x2679a
-.MenuHeader: ; 0x2679a
+.MenuHeader:
db MENU_BACKUP_TILES ; flags
menu_coords 5, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1
dw .MenuData
db 1 ; default option
-; 0x267a2
-.MenuData: ; 0x267a2
+.MenuData:
db STATICMENU_CURSOR | STATICMENU_WRAP ; flags
db 0 ; items
dw wd002
dw PlaceNthMenuStrings
dw .pointers
-; 0x267aa
.pointers
dw DecoBedMenu, .bed
@@ -385,35 +382,31 @@
call MenuTextBoxBackup
ret
-.Text_nothing_to_choose: ; 0x269b0
+.Text_nothing_to_choose:
; There's nothing to choose.
text_jump UnknownText_0x1bc471
db "@"
-; 0x269b5
-.NonscrollingMenuHeader: ; 0x269b5
+.NonscrollingMenuHeader:
db MENU_BACKUP_TILES ; flags
menu_coords 0, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1
dw .NonscrollingMenuData
db 1 ; default option
-; 0x269bd
-.NonscrollingMenuData: ; 0x269bd
+.NonscrollingMenuData:
db STATICMENU_CURSOR | STATICMENU_WRAP ; flags
db 0 ; items
dw wd002
dw DecorationMenuFunction
dw DecorationAttributes
-; 0x269c5
-.ScrollingMenuHeader: ; 0x269c5
+.ScrollingMenuHeader:
db MENU_BACKUP_TILES ; flags
menu_coords 1, 1, SCREEN_WIDTH - 2, SCREEN_HEIGHT - 2
dw .ScrollingMenuData
db 1 ; default option
-; 0x269cd
-.ScrollingMenuData: ; 0x269cd
+.ScrollingMenuData:
db SCROLLINGMENU_DISPLAY_ARROWS ; flags
db 8, 0 ; rows, columns
db 1 ; horizontal spacing
@@ -814,11 +807,10 @@
ld [wOtherDecoration], a
ret
-UnknownText_0x26e41: ; 0x26e41
+UnknownText_0x26e41:
; Which side do you want to put it on?
text_jump UnknownText_0x1bc48c
db "@"
-; 0x26e46
DecoAction_PutItAway_Ornament:
ld a, [wSelectedDecoration]
@@ -841,11 +833,10 @@
xor a
ret
-DecoText_WhichSide: ; 0x26e6b
+DecoText_WhichSide:
; Which side do you want to put away?
text_jump UnknownText_0x1bc4b2
db "@"
-; 0x26e70
DecoAction_AskWhichSide:
call MenuTextBox
@@ -882,50 +873,43 @@
pop de
ret
-MenuHeader_0x26eab: ; 0x26eab
+MenuHeader_0x26eab:
db MENU_BACKUP_TILES ; flags
menu_coords 0, 0, 13, 7
dw MenuData_0x26eb3
db 1 ; default option
-; 0x26eb3
-MenuData_0x26eb3: ; 0x26eb3
+MenuData_0x26eb3:
db STATICMENU_CURSOR ; flags
db 3 ; items
db "RIGHT SIDE@"
db "LEFT SIDE@"
db "CANCEL@"
-; 0x26ed1
-DecoText_PutAwayTheDeco: ; 0x26ed1
+DecoText_PutAwayTheDeco:
; Put away the @ .
text_jump UnknownText_0x1bc4d7
db "@"
-; 0x26ed6
-DecoText_NothingToPutAway: ; 0x26ed6
+DecoText_NothingToPutAway:
; There's nothing to put away.
text_jump UnknownText_0x1bc4ec
db "@"
-; 0x26edb
-DecoText_SetUpTheDeco: ; 0x26edb
+DecoText_SetUpTheDeco:
; Set up the @ .
text_jump UnknownText_0x1bc509
db "@"
-; 0x26ee0
-DecoText_PutAwayAndSetUp: ; 0x26ee0
+DecoText_PutAwayAndSetUp:
; Put away the @ and set up the @ .
text_jump UnknownText_0x1bc51c
db "@"
-; 0x26ee5
-DecoText_AlreadySetUp: ; 0x26ee5
+DecoText_AlreadySetUp:
; That's already set up.
text_jump UnknownText_0x1bc546
db "@"
-; 0x26eea
GetDecorationName_c_de:
ld a, c
@@ -1024,7 +1008,7 @@
dbw DECO_JIGGLYPUFF_POSTER, DecorationDesc_JigglypuffPoster
db -1
-DecorationDesc_TownMapPoster: ; 0x26f91
+DecorationDesc_TownMapPoster:
opentext
writetext .TownMapText
waitbutton
@@ -1031,43 +1015,35 @@
special OverworldTownMap
closetext
end
-; 0x26f9b
-.TownMapText: ; 0x26f9b
+.TownMapText:
; It's the TOWN MAP.
text_jump UnknownText_0x1bc55d
db "@"
-; 0x26fa0
-DecorationDesc_PikachuPoster: ; 0x26fa0
+DecorationDesc_PikachuPoster:
jumptext .PikaPosterText
-; 0x26fa3
-.PikaPosterText: ; 0x26fa3
+.PikaPosterText:
; It's a poster of a cute PIKACHU.
text_jump UnknownText_0x1bc570
db "@"
-; 0x26fa8
-DecorationDesc_ClefairyPoster: ; 0x26fa8
+DecorationDesc_ClefairyPoster:
jumptext .ClefairyPosterText
-; 0x26fab
-.ClefairyPosterText: ; 0x26fab
+.ClefairyPosterText:
; It's a poster of a cute CLEFAIRY.
text_jump UnknownText_0x1bc591
db "@"
-; 0x26fb0
-DecorationDesc_JigglypuffPoster: ; 0x26fb0
+DecorationDesc_JigglypuffPoster:
jumptext .JigglypuffPosterText
-; 0x26fb3
-.JigglypuffPosterText: ; 0x26fb3
+.JigglypuffPosterText:
; It's a poster of a cute JIGGLYPUFF.
text_jump UnknownText_0x1bc5b3
db "@"
-; 0x26fb8
DecorationDesc_NullPoster:
end
@@ -1095,11 +1071,10 @@
.OrnamentConsoleScript:
jumptext .OrnamentConsoleText
-.OrnamentConsoleText: ; 0x26fd8
+.OrnamentConsoleText:
; It's an adorable @ .
text_jump UnknownText_0x1bc5d7
db "@"
-; 0x26fdd
DecorationDesc_GiantOrnament:
ld b, BANK(.BigDollScript)
@@ -1109,11 +1084,10 @@
.BigDollScript:
jumptext .BigDollText
-.BigDollText: ; 0x26fe6
+.BigDollText:
; A giant doll! It's fluffy and cuddly.
text_jump UnknownText_0x1bc5ef
db "@"
-; 0x26feb
ToggleMaptileDecorations:
lb de, 0, 4
--- a/engine/overworld/landmarks.asm
+++ b/engine/overworld/landmarks.asm
@@ -1,4 +1,4 @@
-GetLandmarkCoords: ; 0x1ca896
+GetLandmarkCoords:
; Return coordinates (d, e) of landmark e.
push hl
ld l, e
@@ -12,10 +12,9 @@
ld d, [hl]
pop hl
ret
-; 0x1ca8a5
-GetLandmarkName:: ; 0x1ca8a5
+GetLandmarkName::
; Copy the name of landmark e to wStringBuffer1.
push hl
push de
@@ -44,13 +43,12 @@
pop de
pop hl
ret
-; 0x1ca8c3
INCLUDE "data/maps/landmarks.asm"
-RegionCheck: ; 0x1caea1
+RegionCheck:
; Checks if the player is in Kanto or Johto.
; If in Johto, returns 0 in e.
; If in Kanto, returns 1 in e.
--- a/engine/overworld/wildmons.asm
+++ b/engine/overworld/wildmons.asm
@@ -842,7 +842,6 @@
; I just saw some rare @ in @ . I'll call you if I see another rare #MON, OK?
text_jump UnknownText_0x1bd34b
db "@"
-; 0x2a51f
RandomPhoneWildMon:
farcall GetCallerLocation
--- a/engine/phone/phone.asm
+++ b/engine/phone/phone.asm
@@ -282,10 +282,9 @@
xor a
ret
-.script ; 0x90173
+.script
pause 30
jump Script_ReceivePhoneCall
-; 0x90178
.DoSpecialPhoneCall:
ld a, [wSpecialPhoneCallID]
@@ -381,15 +380,13 @@
call ExecuteCallbackScript
ret
-UnknownScript_0x90205: ; 0x90205
+UnknownScript_0x90205:
ptcall wd002
return
-; 0x90209
-UnknownScript_0x90209: ; 0x90209
+UnknownScript_0x90209:
scall UnknownScript_0x90657
return
-; 0x9020d
LoadCallerScript:
nop
@@ -425,7 +422,7 @@
text_jump UnknownText_0x1c5565
db "@"
-Script_ReceivePhoneCall: ; 0x90241
+Script_ReceivePhoneCall:
refreshscreen
callasm RingTwice_StartCall
ptcall wPhoneScriptPointer
@@ -434,9 +431,8 @@
closetext
callasm InitCallReceiveDelay
end
-; 0x90255
-Script_SpecialBillCall:: ; 0x90255
+Script_SpecialBillCall::
callasm .LoadBillScript
jump Script_ReceivePhoneCall
@@ -444,7 +440,7 @@
ld e, PHONE_BILL
jp LoadCallerScript
-UnknownScript_0x90261: ; 0x90261
+UnknownScript_0x90261:
callasm .LoadElmScript
pause 30
jump Script_ReceivePhoneCall
@@ -558,10 +554,9 @@
call PrintText
ret
-UnknownText_0x90336: ; 0x90336
+UnknownText_0x90336:
text_jump UnknownText_0x1c5588
db "@"
-; 0x9033b
HangUp_BoopOff:
@@ -721,35 +716,29 @@
INCLUDE "data/phone/special_calls.asm"
-UnknownScript_0x90657: ; 0x90657
+UnknownScript_0x90657:
writetext UnknownText_0x9065b
end
-; 0x9065b
-UnknownText_0x9065b: ; 0x9065b
+UnknownText_0x9065b:
; That number is out of the area.
text_jump UnknownText_0x1c558b
db "@"
-; 0x90660
-PhoneScript_JustTalkToThem: ; 0x90660
+PhoneScript_JustTalkToThem:
writetext UnknownText_0x90664
end
-; 0x90664
-UnknownText_0x90664: ; 0x90664
+UnknownText_0x90664:
; Just go talk to that person!
text_jump UnknownText_0x1c55ac
db "@"
-; 0x90669
-UnknownScript_0x90669: ; 0x90669
+UnknownScript_0x90669:
writetext UnknownText_0x9066d
end
-; 0x9066d
-UnknownText_0x9066d: ; 0x9066d
+UnknownText_0x9066d:
; Thank you!
text_jump UnknownText_0x1c55ca
db "@"
-; 0x90672
--- a/engine/phone/phone_scripts.asm
+++ b/engine/phone/phone_scripts.asm
@@ -1,10 +1,10 @@
-UnusedPhoneScript: ; 0xbcea5
+UnusedPhoneScript:
farwritetext UnusedPhoneText
end
; Mom
-MomPhoneScript: ; 0xbceaa
+MomPhoneScript:
checkevent EVENT_TALKED_TO_MOM_AFTER_MYSTERY_EGG_QUEST
iftrue .bcec5
checkevent EVENT_DUDE_TALKED_TO_YOU
@@ -15,7 +15,7 @@
iftrue MomPhoneNoPokedexScript
jump MomPhoneNoPokemonScript
-.bcec5 ; 0xbcec5
+.bcec5
checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_8
iftrue MomPhoneHangUpScript
farwritetext MomPhoneGreetingText
@@ -26,12 +26,12 @@
ifequal 2, MomPhonePalette2
jump MomPhoneOther
-MomPhoneLandmark: ; 0xbcedf
+MomPhoneLandmark:
farwritetext MomPhoneLandmarkText
buttonsound
jump MomSavingMoney
-MomPhonePalette1: ; 0xbcee7
+MomPhonePalette1:
checkcode VAR_MAPGROUP
ifequal GROUP_NEW_BARK_TOWN, .newbark
ifequal GROUP_CHERRYGROVE_CITY, .cherrygrove
@@ -42,37 +42,37 @@
buttonsound
jump MomSavingMoney
-.newbark ; 0xbcf05
+.newbark
farwritetext MomPhoneNewBarkText
buttonsound
jump MomSavingMoney
-.cherrygrove ; 0xbcf0d
+.cherrygrove
farwritetext MomPhoneCherrygroveText
buttonsound
jump MomSavingMoney
-.violet ; 0xbcf15
+.violet
landmarktotext SPROUT_TOWER, MEM_BUFFER_1
jump MomPhoneLandmark
-.azalea ; 0xbcf1b
+.azalea
landmarktotext SLOWPOKE_WELL, MEM_BUFFER_1
jump MomPhoneLandmark
-.goldenrod ; 0xbcf21
+.goldenrod
landmarktotext RADIO_TOWER, MEM_BUFFER_1
jump MomPhoneLandmark
-MomPhonePalette2: ; 0xbcf27
+MomPhonePalette2:
farwritetext MomOtherAreaText
buttonsound
jump MomSavingMoney
-MomPhoneOther: ; 0xbcf2f
+MomPhoneOther:
farwritetext MomDeterminedText
buttonsound
jump MomSavingMoney
-MomSavingMoney: ; 0xbcf37
+MomSavingMoney:
checkflag ENGINE_MOM_SAVING_MONEY
iffalse .NotSaving
checkmoney MOMS_MONEY, 0
@@ -79,12 +79,12 @@
ifequal HAVE_MORE, .SavingHasMoney
jump .SavingNoMoney
-.NotSaving: ; 0xbcf49
+.NotSaving:
checkmoney MOMS_MONEY, 0
ifequal HAVE_MORE, .HasMoney
jump .NoMoney
-.SavingHasMoney: ; 0xbcf55
+.SavingHasMoney:
readmoney MOMS_MONEY, MEM_BUFFER_0
farwritetext MomCheckBalanceText
yesorno
@@ -91,19 +91,19 @@
iftrue MomPhoneSaveMoneyScript
jump MomPhoneWontSaveMoneyScript
-.SavingNoMoney: ; 0xbcf63
+.SavingNoMoney:
farwritetext MomImportantToSaveText
yesorno
iftrue MomPhoneSaveMoneyScript
jump MomPhoneWontSaveMoneyScript
-.NoMoney: ; 0xbcf6e
+.NoMoney:
farwritetext MomYoureNotSavingText
yesorno
iftrue MomPhoneSaveMoneyScript
jump MomPhoneWontSaveMoneyScript
-.HasMoney: ; 0xbcf79
+.HasMoney:
readmoney MOMS_MONEY, MEM_BUFFER_0
farwritetext MomYouveSavedText
yesorno
@@ -110,35 +110,35 @@
iftrue MomPhoneSaveMoneyScript
jump MomPhoneWontSaveMoneyScript
-MomPhoneSaveMoneyScript: ; 0xbcf87
+MomPhoneSaveMoneyScript:
setflag ENGINE_MOM_SAVING_MONEY
farwritetext MomOKIllSaveText
buttonsound
jump MomPhoneHangUpScript
-MomPhoneWontSaveMoneyScript: ; 0xbcf92
+MomPhoneWontSaveMoneyScript:
clearflag ENGINE_MOM_SAVING_MONEY
farwritetext MomPhoneWontSaveMoneyText
buttonsound
jump MomPhoneHangUpScript
-MomPhoneHangUpScript: ; 0xbcf9d
+MomPhoneHangUpScript:
farwritetext MomPhoneHangUpText
end
-MomPhoneNoPokemonScript: ; 0xbcfa2
+MomPhoneNoPokemonScript:
farwritetext MomPhoneNoPokemonText
end
-MomPhoneNoPokedexScript: ; 0xbcfa7
+MomPhoneNoPokedexScript:
farwritetext MomPhoneNoPokedexText
end
-MomPhoneNoGymQuestScript: ; 0xbcfac
+MomPhoneNoGymQuestScript:
farwritetext MomPhoneNoGymQuestText
end
-MomPhoneLectureScript: ; 0xbcfb1
+MomPhoneLectureScript:
setevent EVENT_TALKED_TO_MOM_AFTER_MYSTERY_EGG_QUEST
setflag ENGINE_MOM_ACTIVE
specialphonecall SPECIALCALL_NONE
@@ -149,7 +149,7 @@
; Bill
-BillPhoneScript1: ; 0xbcfc5
+BillPhoneScript1:
checktime DAY
iftrue .daygreet
checktime NITE
@@ -158,17 +158,17 @@
buttonsound
jump .main
-.daygreet ; 0xbcfd7
+.daygreet
farwritetext BillPhoneDayGreetingText
buttonsound
jump .main
-.nitegreet ; 0xbcfdf
+.nitegreet
farwritetext BillPhoneNiteGreetingText
buttonsound
jump .main
-.main ; 0xbcfe7
+.main
farwritetext BillPhoneGenericText
buttonsound
checkcode VAR_BOXSPACE
@@ -178,15 +178,15 @@
farwritetext BillPhoneNotFullText
end
-.nearlyfull ; 0xbcffd
+.nearlyfull
farwritetext BillPhoneNearlyFullText
end
-.full ; 0xbd002
+.full
farwritetext BillPhoneFullText
end
-BillPhoneScript2: ; 0xbd007
+BillPhoneScript2:
farwritetext BillPhoneNewlyFullText
waitbutton
end
@@ -193,7 +193,7 @@
; Elm
-ElmPhoneScript1: ; 0xbd00d
+ElmPhoneScript1:
checkcode VAR_SPECIALPHONECALL
ifequal SPECIALCALL_POKERUS, .pokerus
checkevent EVENT_SHOWED_TOGEPI_TO_ELM
@@ -216,47 +216,47 @@
farwritetext ElmPhoneStartText
end
-.sawmrpokemon ; 0xbd048
+.sawmrpokemon
farwritetext ElmPhoneSawMrPokemonText
end
-.stolen ; 0xbd04d
+.stolen
farwritetext ElmPhonePokemonStolenText
end
-.checkingegg ; 0xbd052
+.checkingegg
farwritetext ElmPhoneCheckingEggText
end
-.assistant ; 0xbd057
+.assistant
farwritetext ElmPhoneAssistantText
end
-.eggunhatched ; 0xbd05c
+.eggunhatched
farwritetext ElmPhoneEggUnhatchedText
end
-.egghatched ; 0xbd061
+.egghatched
farwritetext ElmPhoneEggHatchedText
setevent EVENT_TOLD_ELM_ABOUT_TOGEPI_OVER_THE_PHONE
end
-.discovery ; 0xbd069
+.discovery
random 2
ifequal 0, .nextdiscovery
farwritetext ElmPhoneDiscovery1Text
end
-.nextdiscovery ; 0xbd074
+.nextdiscovery
farwritetext ElmPhoneDiscovery2Text
end
-.pokerus ; 0xbd079
+.pokerus
farwritetext ElmPhonePokerusText
specialphonecall SPECIALCALL_NONE
end
-ElmPhoneScript2: ; 0xbd081
+ElmPhoneScript2:
checkcode VAR_SPECIALPHONECALL
ifequal SPECIALCALL_ROBBED, .disaster
ifequal SPECIALCALL_ASSISTANT, .assistant
@@ -267,13 +267,13 @@
specialphonecall SPECIALCALL_NONE
end
-.disaster ; 0xbd09f
+.disaster
farwritetext ElmPhoneDisasterText
specialphonecall SPECIALCALL_NONE
setevent EVENT_ELM_CALLED_ABOUT_STOLEN_POKEMON
end
-.assistant ; 0xbd0aa
+.assistant
farwritetext ElmPhoneEggAssistantText
specialphonecall SPECIALCALL_NONE
clearevent EVENT_ELMS_AIDE_IN_VIOLET_POKEMON_CENTER
@@ -280,17 +280,17 @@
setevent EVENT_ELMS_AIDE_IN_LAB
end
-.rocket ; 0xbd0b8
+.rocket
farwritetext ElmPhoneRocketText
specialphonecall SPECIALCALL_NONE
end
-.gift ; 0xbd0c0
+.gift
farwritetext ElmPhoneGiftText
specialphonecall SPECIALCALL_NONE
end
-.unused ; 0xbd0c8
+.unused
farwritetext ElmPhoneUnusedText
specialphonecall SPECIALCALL_NONE
end
--- a/engine/pokegear/pokegear.asm
+++ b/engine/pokegear/pokegear.asm
@@ -539,11 +539,10 @@
db "ごぜん@"
db "ごご@"
-.DayText: ; 0x90faf
+.DayText:
text_jump UnknownText_0x1c5821
db "@"
-; 0x90fb4
PokegearMap_CheckRegion:
ld a, [wPokegearMapPlayerIconLandmark]
@@ -950,19 +949,17 @@
ret
-.dotdotdot ; 0x9124c
+.dotdotdot
;
text_jump UnknownText_0x1c5824
db "@"
-; 0x91251
-.OutOfServiceArea: ; 0x91251
+.OutOfServiceArea:
; You're out of the service area.
text_jump UnknownText_0x1c5827
db "@"
-; 0x91256
PokegearPhone_FinishPhoneCall:
ld a, [hJoyPressed]
@@ -1382,26 +1379,23 @@
jr .loop
-PokegearText_WhomToCall: ; 0x914ce
+PokegearText_WhomToCall:
; Whom do you want to call?
text_jump UnknownText_0x1c5847
db "@"
-; 0x914d3
-PokegearText_PressAnyButtonToExit: ; 0x914d3
+PokegearText_PressAnyButtonToExit:
; Press any button to exit.
text_jump UnknownText_0x1c5862
db "@"
-; 0x914d8
-PokegearText_DeleteStoredNumber: ; 0x914d8
+PokegearText_DeleteStoredNumber:
; Delete this stored phone number?
text_jump UnknownText_0x1c587d
db "@"
-; 0x914dd
PokegearSpritesGFX:
INCBIN "gfx/pokegear/pokegear_sprites.2bpp.lz"
@@ -2868,7 +2862,6 @@
ld [hl], d
ret
-; 0x91ff2
LoadTownMapGFX:
ld hl, TownMapGFX
--- a/engine/pokemon/bills_pc.asm
+++ b/engine/pokemon/bills_pc.asm
@@ -231,7 +231,6 @@
menu_coords 9, 4, SCREEN_WIDTH - 1, 13
dw .MenuData
db 1 ; default option
-; 0xe2545
.MenuData: ; 0xe2545 (38:6545)
db STATICMENU_CURSOR ; flags
@@ -482,14 +481,13 @@
ld [wJumptableIndex], a
ret
-.MenuHeader: ; 0xe2731
+.MenuHeader:
db MENU_BACKUP_TILES ; flags
menu_coords 9, 4, SCREEN_WIDTH - 1, 13
dw .MenuData
db 1 ; default option
-; 0xe2739
-.MenuData: ; 0xe2739
+.MenuData:
db STATICMENU_CURSOR ; flags
db 4 ; items
db "WITHDRAW@"
@@ -496,7 +494,6 @@
db "STATS@"
db "RELEASE@"
db "CANCEL@"
-; 0xe2759
_MovePKMNWithoutMail:
ld hl, wOptions
@@ -694,20 +691,18 @@
ld [wJumptableIndex], a
ret
-.MenuHeader: ; 0xe28c3
+.MenuHeader:
db MENU_BACKUP_TILES ; flags
menu_coords 9, 4, SCREEN_WIDTH - 1, 13
dw .MenuData
db 1 ; default option
-; 0xe28cb
-.MenuData: ; 0xe28cb
+.MenuData:
db STATICMENU_CURSOR ; flags
db 3 ; items
db "MOVE@"
db "STATS@"
db "CANCEL@"
-; 0xe28df
.PrepInsertCursor:
xor a
@@ -2272,14 +2267,13 @@
call ByteFill
ret
-_ChangeBox_MenuHeader: ; 0xe35f1
+_ChangeBox_MenuHeader:
db MENU_BACKUP_TILES ; flags
menu_coords 1, 5, 9, 12
dw .MenuData
db 1 ; default option
-; 0xe35f9
-.MenuData ; 0xe35f9
+.MenuData
db MENU_UNUSED_1 | MENU_UNUSED_3 ; flags
db 4, 0
db 1
@@ -2488,14 +2482,13 @@
hlcoord 11, 7 ; unused
-.MenuHeader: ; 0xe377b
+.MenuHeader:
db MENU_BACKUP_TILES ; flags
menu_coords 11, 4, SCREEN_WIDTH - 1, 13
dw .MenuData
db 1 ; default option
-; 0xe3783
-.MenuData: ; 0xe3783
+.MenuData:
db STATICMENU_CURSOR ; flags
db 4 ; items
db "SWITCH@"
@@ -2502,7 +2495,6 @@
db "NAME@"
db "PRINT@"
db "QUIT@"
-; 0xe379c
BillsPC_PlaceChooseABoxString:
ld de, .ChooseABox
--- a/engine/pokemon/bills_pc_top.asm
+++ b/engine/pokemon/bills_pc_top.asm
@@ -14,7 +14,7 @@
scf
ret
-.Text_GottaHavePokemon: ; 0xe417
+.Text_GottaHavePokemon:
; You gotta have #MON to call!
text_jump UnknownText_0x1c1006
db "@"
@@ -35,7 +35,7 @@
call LoadFontsBattleExtra
ret
-.Text_What: ; 0xe43a
+.Text_What:
; What?
text_jump UnknownText_0x1c1024
db "@"
@@ -68,13 +68,13 @@
call CloseWindow
ret
-.MenuHeader: ; 0xe46f
+.MenuHeader:
db MENU_BACKUP_TILES ; flags
menu_coords 0, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1
dw .MenuData
db 1 ; default option
-.MenuData: ; 0xe477
+.MenuData:
db STATICMENU_CURSOR ; flags
db 0 ; items
dw .items
@@ -128,7 +128,7 @@
and a
ret
-.Text_MonHoldingMail: ; 0xe4f9
+.Text_MonHoldingMail:
; There is a #MON holding MAIL. Please remove the MAIL.
text_jump UnknownText_0x1c102b
db "@"
@@ -163,12 +163,12 @@
scf
ret
-.Text_NoMon: ; 0xe52e
+.Text_NoMon:
; You don't have a single #MON!
text_jump UnknownText_0x1c1062
db "@"
-.Text_ItsYourLastMon: ; 0xe533
+.Text_ItsYourLastMon:
; You can't deposit your last #MON!
text_jump UnknownText_0x1c1080
db "@"
@@ -224,7 +224,7 @@
scf
ret
-UnknownText_0xe57e: ; 0xe57e
+UnknownText_0xe57e:
; You can't take any more #MON.
text_jump UnknownText_0x1c10a2
db "@"
--- a/engine/pokemon/breeding.asm
+++ b/engine/pokemon/breeding.asm
@@ -355,7 +355,7 @@
.done
ret
-.Text_HatchEgg: ; 0x1708b
+.Text_HatchEgg:
; Huh? @ @
text_jump UnknownText_0x1c0db0
start_asm
@@ -377,23 +377,20 @@
ld hl, .CameOutOfItsEgg
ret
-.ClearTextbox: ; 0x170b0
+.ClearTextbox:
;
text_jump UnknownText_0x1c0db8
db "@"
-; 0x170b5
-.CameOutOfItsEgg: ; 0x170b5
+.CameOutOfItsEgg:
; came out of its EGG!@ @
text_jump UnknownText_0x1c0dba
db "@"
-; 0x170ba
-.Text_NicknameHatchling: ; 0x170ba
+.Text_NicknameHatchling:
; Give a nickname to @ ?
text_jump UnknownText_0x1c0dd8
db "@"
-; 0x170bf
InitEggMoves:
call GetHeritableMoves
@@ -898,17 +895,15 @@
DayCareMonCursor:
jp WaitPressAorB_BlinkCursor
-DayCareMon2Text: ; 0x17462
+DayCareMon2Text:
; It's @ that was left with the DAY-CARE LADY.
text_jump UnknownText_0x1c0df3
db "@"
-; 0x17467
-DayCareMon1Text: ; 0x17467
+DayCareMon1Text:
; It's @ that was left with the DAY-CARE MAN.
text_jump UnknownText_0x1c0e24
db "@"
-; 0x1746c
DayCareMonCompatibilityText:
push bc
@@ -935,35 +930,30 @@
.done
ret
-.AllAlone: ; 0x1749c
+.AllAlone:
; It's brimming with energy.
text_jump UnknownText_0x1c0e54
db "@"
-; 0x174a1
-.Incompatible: ; 0x174a1
+.Incompatible:
; It has no interest in @ .
text_jump UnknownText_0x1c0e6f
db "@"
-; 0x174a6
-.HighCompatibility: ; 0x174a6
+.HighCompatibility:
; It appears to care for @ .
text_jump UnknownText_0x1c0e8d
db "@"
-; 0x174ab
-.ModerateCompatibility: ; 0x174ab
+.ModerateCompatibility:
; It's friendly with @ .
text_jump UnknownText_0x1c0eac
db "@"
-; 0x174b0
-.SlightCompatibility: ; 0x174b0
+.SlightCompatibility:
; It shows interest in @ .
text_jump UnknownText_0x1c0ec6
db "@"
-; 0x174b5
Unreferenced_DayCareMonPrintEmptyString:
ld hl, .string
--- a/engine/pokemon/caught_data.asm
+++ b/engine/pokemon/caught_data.asm
@@ -156,7 +156,7 @@
call PrintText
jp YesNoBox
-TextJump_GiveANickname: ; 0x4db44
+TextJump_GiveANickname:
; Give a nickname to the @ you received?
text_jump UnknownText_0x1c12fc
db "@"
--- a/engine/pokemon/evolve.asm
+++ b/engine/pokemon/evolve.asm
@@ -399,29 +399,25 @@
pop hl
ret
-Text_CongratulationsYourPokemon: ; 0x42473
+Text_CongratulationsYourPokemon:
; Congratulations! Your @ @
text_jump UnknownText_0x1c4b92
db "@"
-; 0x42478
-Text_EvolvedIntoPKMN: ; 0x42478
+Text_EvolvedIntoPKMN:
; evolved into @ !
text_jump UnknownText_0x1c4baf
db "@"
-; 0x4247d
-Text_StoppedEvolving: ; 0x4247d
+Text_StoppedEvolving:
; Huh? @ stopped evolving!
text_jump UnknownText_0x1c4bc5
db "@"
-; 0x42482
-Text_WhatEvolving: ; 0x42482
+Text_WhatEvolving:
; What? @ is evolving!
text_jump UnknownText_0x1c4be3
db "@"
-; 0x42487
LearnLevelMoves:
--- a/engine/pokemon/knows_move.asm
+++ b/engine/pokemon/knows_move.asm
@@ -19,7 +19,7 @@
scf
ret
-.Text_knows: ; 0xfa06
+.Text_knows:
; knows @ .
text_jump UnknownText_0x1c5ea8
db "@"
--- a/engine/pokemon/mail.asm
+++ b/engine/pokemon/mail.asm
@@ -301,7 +301,7 @@
and a
ret
-_PlayerMailBoxMenu: ; 0x447a0
+_PlayerMailBoxMenu:
call InitMail
jr z, .nomail
call LoadStandardMenuHeader
@@ -311,13 +311,12 @@
.nomail
ld hl, .EmptyMailboxText
jp MenuTextBoxBackup
-; 0x447b4
-.EmptyMailboxText: ; 0x447b4
+.EmptyMailboxText:
text_jump _EmptyMailboxText
db "@"
-InitMail: ; 0x447b9
+InitMail:
; initialize wMailboxCount and beyond with incrementing values, one per mail
; set z if no mail
ld a, BANK(sMailboxCount)
@@ -344,9 +343,8 @@
ld a, [wMailboxCount]
and a
ret
-; 0x447da
-MailboxPC_GetMailAuthor: ; 0x447da
+MailboxPC_GetMailAuthor:
dec a
ld hl, sMailbox1Author
ld bc, MAIL_STRUCT_LENGTH
@@ -362,17 +360,15 @@
call CloseSRAM
pop de
ret
-; 0x447fb
-MailboxPC_PrintMailAuthor: ; 0x447fb
+MailboxPC_PrintMailAuthor:
push de
ld a, [wMenuSelection]
call MailboxPC_GetMailAuthor
pop hl
jp PlaceString
-; 0x44806
-MailboxPC: ; 0x44806
+MailboxPC:
xor a
ld [wCurMessageScrollPosition], a
ld a, 1
@@ -405,9 +401,8 @@
.exit
xor a
ret
-; 0x4484a
-.Submenu: ; 0x4484a
+.Submenu:
ld hl, .SubMenuHeader
call LoadMenuHeader
call VerticalMenu
@@ -420,7 +415,6 @@
.subexit
ret
-; 0x44861
.JumpTable:
dw .ReadMail
@@ -428,7 +422,7 @@
dw .AttachMail
dw .Cancel
-.ReadMail: ; 0x44869
+.ReadMail:
call FadeToMenu
ld a, [wMenuSelection]
dec a
@@ -435,9 +429,8 @@
ld b, a
call ReadMailMessage
jp CloseSubmenu
-; 0x44877
-.PutInPack: ; 0x44877
+.PutInPack:
ld hl, .MessageLostText
call MenuTextBox
call YesNoBox
@@ -461,21 +454,20 @@
call DeleteMailFromPC
ld hl, .PutAwayText
jp MenuTextBoxBackup
-; 0x448ac
-.PutAwayText: ; 0x448ac
+.PutAwayText:
text_jump ClearedMailPutAwayText
db "@"
-.PackFullText: ; 0x448b1
+.PackFullText:
text_jump MailPackFullText
db "@"
-.MessageLostText: ; 0x448b6
+.MessageLostText:
text_jump MailMessageLostText
db "@"
-.GetMailType: ; 0x448bb
+.GetMailType:
push af
ld a, BANK(sMailboxCount)
call GetSRAMBank
@@ -486,9 +478,8 @@
ld a, [hl]
ld [wCurItem], a
jp CloseSRAM
-; 0x448d2
-.AttachMail: ; 0x448d2
+.AttachMail:
call FadeToMenu
xor a
ld [wPartyMenuActionText], a
@@ -531,17 +522,16 @@
.exit2
jp CloseSubmenu
-; 0x4493c
-.HoldingMailText: ; 0x4493c
+.HoldingMailText:
text_jump MailAlreadyHoldingItemText
db "@"
-.EggText: ; 0x44941
+.EggText:
text_jump MailEggText
db "@"
-.MailMovedText: ; 0x44946
+.MailMovedText:
text_jump MailMovedFromBoxText
db "@"
@@ -548,7 +538,7 @@
.Cancel:
ret
-.TopMenuHeader: ; 0x4494c
+.TopMenuHeader:
db MENU_BACKUP_TILES ; flags
menu_coords 8, 1, SCREEN_WIDTH - 2, 10
dw .TopMenuData
@@ -563,7 +553,7 @@
dba NULL
dba NULL
-.SubMenuHeader: ; 0x44964
+.SubMenuHeader:
db MENU_BACKUP_TILES ; flags
menu_coords 0, 0, 13, 9
dw .SubMenuData
--- a/engine/pokemon/move_mon.asm
+++ b/engine/pokemon/move_mon.asm
@@ -1799,11 +1799,10 @@
ld b, $2
ret
-TextJump_WasSentToBillsPC: ; 0xe3d9
+TextJump_WasSentToBillsPC:
; was sent to BILL's PC.
text_jump Text_WasSentToBillsPC
db "@"
-; 0xe3de
InitNickname:
push de
--- a/engine/pokemon/party_menu.asm
+++ b/engine/pokemon/party_menu.asm
@@ -42,7 +42,7 @@
ret
-WritePartyMenuTilemap: ; 0x5005f
+WritePartyMenuTilemap:
ld hl, wOptions
ld a, [hl]
push af
@@ -67,7 +67,6 @@
pop af
ld [wOptions], a
ret
-; 0x50089
.Jumptable:
; entries correspond to PARTYMENUQUALITY_* constants
@@ -644,7 +643,7 @@
ld [wMenuJoypadFilter], a
ret
-InitPartyMenuNoCancel: ; 0x5042d
+InitPartyMenuNoCancel:
; no cancel
ld de, PartyMenuAttributes
call SetMenuAttributes
@@ -680,7 +679,7 @@
dn 2, 0
db 0
-PartyMenuSelect: ; 0x50457
+PartyMenuSelect:
; sets carry if exitted menu.
call StaticMenuJoypad
call PlaceHollowCursor
@@ -717,7 +716,6 @@
call WaitSFX
scf
ret
-; 0x5049a
PrintPartyMenuText:
@@ -750,9 +748,8 @@
pop af
ld [wOptions], a
ret
-; 0x504d2
-PartyMenuStrings: ; 0x504d2
+PartyMenuStrings:
dw ChooseAMonString
dw UseOnWhichPKMNString
dw WhichPKMNString
@@ -763,33 +760,33 @@
dw ChooseAMonString ; Probably used to be ChooseAMalePKMNString
dw ToWhichPKMNString
-ChooseAMonString: ; 0x504e4
+ChooseAMonString:
db "Choose a #MON.@"
-UseOnWhichPKMNString: ; 0x504f3
+UseOnWhichPKMNString:
db "Use on which <PK><MN>?@"
-WhichPKMNString: ; 0x50504
+WhichPKMNString:
db "Which <PK><MN>?@"
-TeachWhichPKMNString: ; 0x5050e
+TeachWhichPKMNString:
db "Teach which <PK><MN>?@"
-MoveToWhereString: ; 0x5051e
+MoveToWhereString:
db "Move to where?@"
-ChooseAFemalePKMNString: ; 0x5052d
+ChooseAFemalePKMNString:
; unused
db "Choose a ♀<PK><MN>.@"
-ChooseAMalePKMNString: ; 0x5053b
+ChooseAMalePKMNString:
; unused
db "Choose a ♂<PK><MN>.@"
-ToWhichPKMNString: ; 0x50549
+ToWhichPKMNString:
db "To which <PK><MN>?@"
-YouHaveNoPKMNString: ; 0x50556
+YouHaveNoPKMNString:
db "You have no <PK><MN>!@"
PrintPartyMenuActionText:
@@ -815,65 +812,55 @@
dw .Text_GrewToLevel
dw .Text_CameToItsSenses
-.Text_RecoveredSomeHP: ; 0x5058f
+.Text_RecoveredSomeHP:
; recovered @ HP!
text_jump UnknownText_0x1bc0a2
db "@"
-; 0x50594
-.Text_CuredOfPoison: ; 0x50594
+.Text_CuredOfPoison:
; 's cured of poison.
text_jump UnknownText_0x1bc0bb
db "@"
-; 0x50599
-.Text_RidOfParalysis: ; 0x50599
+.Text_RidOfParalysis:
; 's rid of paralysis.
text_jump UnknownText_0x1bc0d2
db "@"
-; 0x5059e
-.Text_BurnWasHealed: ; 0x5059e
+.Text_BurnWasHealed:
; 's burn was healed.
text_jump UnknownText_0x1bc0ea
db "@"
-; 0x505a3
-.Text_Defrosted: ; 0x505a3
+.Text_Defrosted:
; was defrosted.
text_jump UnknownText_0x1bc101
db "@"
-; 0x505a8
-.Text_WokeUp: ; 0x505a8
+.Text_WokeUp:
; woke up.
text_jump UnknownText_0x1bc115
db "@"
-; 0x505ad
-.Text_HealthReturned: ; 0x505ad
+.Text_HealthReturned:
; 's health returned.
text_jump UnknownText_0x1bc123
db "@"
-; 0x505b2
-.Text_Revitalized: ; 0x505b2
+.Text_Revitalized:
; is revitalized.
text_jump UnknownText_0x1bc13a
db "@"
-; 0x505b7
-.Text_GrewToLevel: ; 0x505b7
+.Text_GrewToLevel:
; grew to level @ !@ @
text_jump UnknownText_0x1bc14f
db "@"
-; 0x505bc
-.Text_CameToItsSenses: ; 0x505bc
+.Text_CameToItsSenses:
; came to its senses.
text_jump UnknownText_0x1bc16e
db "@"
-; 0x505c1
.PrintText:
--- a/engine/pokemon/search.asm
+++ b/engine/pokemon/search.asm
@@ -1,4 +1,4 @@
-BeastsCheck: ; 0x4a6e8
+BeastsCheck:
; Check if the player owns all three legendary beasts.
; They must exist in either party or PC, and have the player's OT and ID.
; Return the result in wScriptVar.
@@ -29,7 +29,7 @@
ret
-MonCheck: ; 0x4a711
+MonCheck:
; Check if the player owns any Pokémon of the species in wScriptVar.
; Return the result in wScriptVar.
@@ -47,7 +47,7 @@
ret
-CheckOwnMonAnywhere: ; 0x4a721
+CheckOwnMonAnywhere:
; Check if the player owns any monsters of the species in wScriptVar.
; It must exist in either party or PC, and have the player's OT and ID.
@@ -179,7 +179,7 @@
ret
-CheckOwnMon: ; 0x4a7ba
+CheckOwnMon:
; Check if a Pokémon belongs to the player and is of a specific species.
; inputs:
@@ -246,7 +246,6 @@
pop bc
scf
ret
-; 0x4a810
BoxAddressTable1:
dba sBox1
@@ -264,7 +263,7 @@
dba sBox13
dba sBox14
-UpdateOTPointer: ; 0x4a83a
+UpdateOTPointer:
push hl
ld hl, NAME_LENGTH
add hl, bc
@@ -272,4 +271,3 @@
ld c, l
pop hl
ret
-; 0x4a843
--- a/engine/pokemon/stats_screen.asm
+++ b/engine/pokemon/stats_screen.asm
@@ -56,9 +56,8 @@
pop af
ld [hMapAnims], a
ret
-; 0x4dcd2
-StatsScreenMain: ; 0x4dcd2
+StatsScreenMain:
xor a
ld [wJumptableIndex], a
; stupid interns
@@ -77,7 +76,6 @@
bit 7, a
jr z, .loop
ret
-; 0x4dcf7
StatsScreenMobile:
xor a
@@ -175,7 +173,6 @@
inc a
ld [wJumptableIndex], a
ret
-; 0x4ddac
EggStatsJoypad:
@@ -1004,7 +1001,6 @@
ld de, SFX_2_BOOPS
call PlaySFX
ret
-; 0x4e3c0
EggString:
db "EGG@"
@@ -1012,27 +1008,26 @@
FiveQMarkString:
db "?????@"
-EggSoonString: ; 0x4e3ca
+EggSoonString:
db "It's making sounds"
next "inside. It's going"
next "to hatch soon!@"
-EggCloseString: ; 0x4e3fd
+EggCloseString:
db "It moves around"
next "inside sometimes."
next "It must be close"
next "to hatching.@"
-EggMoreTimeString: ; 0x4e43d
+EggMoreTimeString:
db "Wonder what's"
next "inside? It needs"
next "more time, though.@"
-EggALotMoreTimeString: ; 0x4e46e
+EggALotMoreTimeString:
db "This EGG needs a"
next "lot more time to"
next "hatch.@"
-; 0x4e497
StatsScreen_AnimateEgg:
--- a/engine/rtc/reset_password.asm
+++ b/engine/rtc/reset_password.asm
@@ -31,28 +31,28 @@
call PrintText
ret
-.text_okay ; 0x4d3fe
+.text_okay
; Password OK. Select CONTINUE & reset settings.
text_jump UnknownText_0x1c55db
db "@"
-.text_wrong ; 0x4d403
+.text_wrong
; Wrong password!
text_jump UnknownText_0x1c560b
db "@"
-.text_askreset ; 0x4d408
+.text_askreset
; Reset the clock?
text_jump UnknownText_0x1c561c
db "@"
-.NoYes_MenuHeader: ; 0x4d40d
+.NoYes_MenuHeader:
db 0 ; flags
menu_coords 14, 7, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
dw .NoYes_MenuData
db 1 ; default option
-.NoYes_MenuData: ; 0x4d415
+.NoYes_MenuData:
db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING ; flags
db 2 ; items
db "NO@"
@@ -101,7 +101,7 @@
scf
ret
-.pleaseenterpasswordtext ; 0x4d463
+.pleaseenterpasswordtext
; Please enter the password.
text_jump UnknownText_0x1c562e
db "@"
--- a/engine/rtc/restart_clock.asm
+++ b/engine/rtc/restart_clock.asm
@@ -47,17 +47,15 @@
ld c, a
ret
-.Text_ClockTimeMayBeWrong: ; 0x20047
+.Text_ClockTimeMayBeWrong:
; The clock's time may be wrong. Please reset the time.
text_jump UnknownText_0x1c40e6
db "@"
-; 0x2004c
-.Text_SetWithControlPad: ; 0x2004c
+.Text_SetWithControlPad:
; Set with the Control Pad. Confirm: A Button Cancel: B Button
text_jump UnknownText_0x1c411c
db "@"
-; 0x20051
.SetClock:
ld a, 1
@@ -103,17 +101,15 @@
ld a, $1
ret
-.Text_IsThisOK: ; 0x200b0
+.Text_IsThisOK:
; Is this OK?
text_jump UnknownText_0x1c415b
db "@"
-; 0x200b5
-.Text_ClockReset: ; 0x200b5
+.Text_ClockReset:
; The clock has been reset.
text_jump UnknownText_0x1c4168
db "@"
-; 0x200ba
.joy_loop
call JoyTextDelay_ForcehJoyDown
--- a/engine/rtc/timeset.asm
+++ b/engine/rtc/timeset.asm
@@ -289,22 +289,20 @@
call PrintNum
ret
-Text_WokeUpOak: ; 0x90874
+Text_WokeUpOak:
; Zzz… Hm? Wha…? You woke me up! Will you check the clock for me?
text_jump UnknownText_0x1bc29c
db "@"
-; 0x90879
-Text_WhatTimeIsIt: ; 0x90879
+Text_WhatTimeIsIt:
; What time is it?
text_jump UnknownText_0x1bc2eb
db "@"
-; 0x9087e
String_oclock:
db "o'clock@"
-Text_WhatHrs: ; 0x90886
+Text_WhatHrs:
; What?@ @
text_jump UnknownText_0x1bc2fd
start_asm
@@ -313,22 +311,20 @@
ld hl, .QuestionMark
ret
-.QuestionMark: ; 0x90895
+.QuestionMark:
; ?
text_jump UnknownText_0x1bc305
db "@"
-; 0x9089a
-Text_HowManyMinutes: ; 0x9089a
+Text_HowManyMinutes:
; How many minutes?
text_jump UnknownText_0x1bc308
db "@"
-; 0x9089f
String_min:
db "min.@"
-Text_WhoaMins: ; 0x908a4
+Text_WhoaMins:
; Whoa!@ @
text_jump UnknownText_0x1bc31b
start_asm
@@ -337,13 +333,12 @@
ld hl, .QuestionMark
ret
-.QuestionMark: ; 0x908b3
+.QuestionMark:
; ?
text_jump UnknownText_0x1bc323
db "@"
-; 0x908b8
-OakText_ResponseToSetTime: ; 0x908b8
+OakText_ResponseToSetTime:
start_asm
decoord 1, 14
ld a, [wInitHourBuffer]
@@ -373,23 +368,20 @@
ld hl, .yikes
ret
-.overslept ; 0x908ec
+.overslept
; ! I overslept!
text_jump UnknownText_0x1bc326
db "@"
-; 0x908f1
-.yikes ; 0x908f1
+.yikes
; ! Yikes! I over- slept!
text_jump UnknownText_0x1bc336
db "@"
-; 0x908f6
-.sodark ; 0x908f6
+.sodark
; ! No wonder it's so dark!
text_jump UnknownText_0x1bc34f
db "@"
-; 0x908fb
TimeSetBackgroundGFX:
INCBIN "gfx/new_game/timeset_bg.1bpp"
@@ -541,13 +533,12 @@
.Saturday: db "SATURDAY@"
-.WhatDayIsItText: ; 0x90a3f
+.WhatDayIsItText:
; What day is it?
text_jump UnknownText_0x1bc369
db "@"
-; 0x90a44
-.ConfirmWeekdayText: ; 0x90a44
+.ConfirmWeekdayText:
start_asm
hlcoord 1, 14
call .PlaceWeekdayString
@@ -554,11 +545,10 @@
ld hl, .IsIt
ret
-.IsIt: ; 0x90a4f
+.IsIt:
; , is it?
text_jump UnknownText_0x1bc37a
db "@"
-; 0x90a54
InitialSetDSTFlag:
ld a, [wDST]
@@ -583,11 +573,10 @@
ld hl, .DSTIsThatOK
ret
-.DSTIsThatOK: ; 0x90a83
+.DSTIsThatOK:
; DST, is that OK?
text_jump Text_DSTIsThatOK
db "@"
-; 0x90a88
InitialClearDSTFlag:
ld a, [wDST]
@@ -612,11 +601,10 @@
ld hl, .IsThatOK
ret
-.IsThatOK: ; 0x90ab7
+.IsThatOK:
; , is that OK?
text_jump UnknownText_0x1c5ff1
db "@"
-; 0x90abc
DebugDisplayTime:
hlcoord 1, 14
@@ -626,7 +614,7 @@
call PlaceHLTextAtBC
ret
-.Text: ; 0x90acc
+.Text:
start_asm
call UpdateTime
@@ -677,10 +665,9 @@
ld hl, .NowOnDebug
ret
-.NowOnDebug: ; 0x90b13
+.NowOnDebug:
text "<PARA>Now on DEBUG…"
prompt
-; 0x90b23
.PrintTime:
lb bc, 1, 3
--- a/engine/tilesets/tileset_anims.asm
+++ b/engine/tilesets/tileset_anims.asm
@@ -33,9 +33,9 @@
jp hl
-Tileset0Anim: ; 0xfc01b
-TilesetJohtoModernAnim: ; 0xfc01b
-TilesetKantoAnim: ; 0xfc01b
+Tileset0Anim:
+TilesetJohtoModernAnim:
+TilesetKantoAnim:
dw vTiles2 tile $14, AnimateWaterTile
dw NULL, WaitTileAnimation
dw NULL, WaitTileAnimation
@@ -47,9 +47,8 @@
dw NULL, WaitTileAnimation
dw NULL, StandingTileFrame8
dw NULL, DoneTileAnimation
-; 0xfc047
-TilesetParkAnim: ; 0xfc047
+TilesetParkAnim:
dw vTiles2 tile $14, AnimateWaterTile
dw NULL, WaitTileAnimation
dw vTiles2 tile $5f, AnimateFountain
@@ -61,9 +60,8 @@
dw NULL, WaitTileAnimation
dw NULL, StandingTileFrame8
dw NULL, DoneTileAnimation
-; 0xfc073
-TilesetForestAnim: ; 0xfc073
+TilesetForestAnim:
dw NULL, ForestTreeLeftAnimation
dw NULL, ForestTreeRightAnimation
dw NULL, WaitTileAnimation
@@ -76,9 +74,8 @@
dw NULL, TileAnimationPalette
dw NULL, StandingTileFrame8
dw NULL, DoneTileAnimation
-; 0xfc0a3
-TilesetJohtoAnim: ; 0xfc0a3
+TilesetJohtoAnim:
dw vTiles2 tile $14, AnimateWaterTile
dw NULL, WaitTileAnimation
dw NULL, WaitTileAnimation
@@ -92,9 +89,8 @@
dw NULL, WaitTileAnimation
dw NULL, StandingTileFrame8
dw NULL, DoneTileAnimation
-; 0xfc0d7
-UnusedTilesetAnim_fc0d7: ; 0xfc0d7
+UnusedTilesetAnim_fc0d7:
dw vTiles2 tile $03, WriteTileToBuffer
dw wTileAnimBuffer, ScrollTileRightLeft
dw vTiles2 tile $03, WriteTileFromBuffer
@@ -106,9 +102,8 @@
dw NULL, WaitTileAnimation
dw NULL, WaitTileAnimation
dw NULL, DoneTileAnimation
-; 0xfc103
-UnusedTilesetAnim_fc103: ; 0xfc103
+UnusedTilesetAnim_fc103:
dw vTiles2 tile $14, WriteTileToBuffer
dw wTileAnimBuffer, ScrollTileRightLeft
dw vTiles2 tile $14, WriteTileFromBuffer
@@ -120,9 +115,8 @@
dw NULL, WaitTileAnimation
dw NULL, WaitTileAnimation
dw NULL, DoneTileAnimation
-; 0xfc12f
-TilesetPortAnim: ; 0xfc12f
+TilesetPortAnim:
dw vTiles2 tile $14, AnimateWaterTile
dw NULL, WaitTileAnimation
dw NULL, WaitTileAnimation
@@ -135,9 +129,8 @@
dw NULL, WaitTileAnimation
dw NULL, StandingTileFrame8
dw NULL, DoneTileAnimation
-; 0xfc15f
-TilesetEliteFourRoomAnim: ; 0xfc15f
+TilesetEliteFourRoomAnim:
dw NULL, LavaBubbleAnim2
dw NULL, WaitTileAnimation
dw NULL, WaitTileAnimation
@@ -146,9 +139,8 @@
dw NULL, WaitTileAnimation
dw NULL, StandingTileFrame8
dw NULL, DoneTileAnimation
-; 0xfc17f
-UnusedTilesetAnim_fc17f: ; 0xfc17f
+UnusedTilesetAnim_fc17f:
dw vTiles2 tile $53, WriteTileToBuffer
dw wTileAnimBuffer, ScrollTileDown
dw wTileAnimBuffer, ScrollTileDown
@@ -161,9 +153,8 @@
dw wTileAnimBuffer, ScrollTileDown
dw vTiles2 tile $53, WriteTileFromBuffer
dw NULL, DoneTileAnimation
-; 0xfc1af
-UnusedTilesetAnim_fc1af: ; 0xfc1af
+UnusedTilesetAnim_fc1af:
dw vTiles2 tile $54, WriteTileToBuffer
dw wTileAnimBuffer, ScrollTileDown
dw wTileAnimBuffer, ScrollTileDown
@@ -178,10 +169,9 @@
dw wTileAnimBuffer, ScrollTileDown
dw vTiles2 tile $54, WriteTileFromBuffer
dw NULL, DoneTileAnimation
-; 0xfc1e7
-TilesetCaveAnim: ; 0xfc1e7
-TilesetDarkCaveAnim: ; 0xfc1e7
+TilesetCaveAnim:
+TilesetDarkCaveAnim:
dw vTiles2 tile $14, WriteTileToBuffer
dw NULL, FlickeringCaveEntrancePalette
dw wTileAnimBuffer, ScrollTileRightLeft
@@ -201,9 +191,8 @@
dw vTiles2 tile $40, WriteTileFromBuffer
dw NULL, FlickeringCaveEntrancePalette
dw NULL, DoneTileAnimation
-; 0xfc233
-TilesetIcePathAnim: ; 0xfc233
+TilesetIcePathAnim:
dw vTiles2 tile $35, WriteTileToBuffer
dw NULL, FlickeringCaveEntrancePalette
dw wTileAnimBuffer, ScrollTileRightLeft
@@ -223,9 +212,8 @@
dw vTiles2 tile $31, WriteTileFromBuffer
dw NULL, FlickeringCaveEntrancePalette
dw NULL, DoneTileAnimation
-; 0xfc27f
-TilesetTowerAnim: ; 0xfc27f
+TilesetTowerAnim:
dw TowerPillarTilePointer9, AnimateTowerPillarTile
dw TowerPillarTilePointer10, AnimateTowerPillarTile
dw TowerPillarTilePointer7, AnimateTowerPillarTile
@@ -242,9 +230,8 @@
dw NULL, WaitTileAnimation
dw NULL, WaitTileAnimation
dw NULL, DoneTileAnimation
-; 0xfc2bf
-UnusedTilesetAnim_fc2bf: ; 0xfc2bf
+UnusedTilesetAnim_fc2bf:
dw vTiles2 tile $4f, WriteTileToBuffer
dw wTileAnimBuffer, ScrollTileRightLeft
dw vTiles2 tile $4f, WriteTileFromBuffer
@@ -255,39 +242,37 @@
dw NULL, WaitTileAnimation
dw NULL, WaitTileAnimation
dw NULL, DoneTileAnimation
-; 0xfc2e7
-TilesetBattleTowerOutsideAnim: ; 0xfc2e7
-TilesetHouseAnim: ; 0xfc2e7
-TilesetPlayersHouseAnim: ; 0xfc2e7
-TilesetPokecenterAnim: ; 0xfc2e7
-TilesetGateAnim: ; 0xfc2e7
-TilesetLabAnim: ; 0xfc2e7
-TilesetFacilityAnim: ; 0xfc2e7
-TilesetMartAnim: ; 0xfc2e7
-TilesetMansionAnim: ; 0xfc2e7
-TilesetGameCornerAnim: ; 0xfc2e7
-TilesetTraditionalHouseAnim: ; 0xfc2e7
-TilesetTrainStationAnim: ; 0xfc2e7
-TilesetChampionsRoomAnim: ; 0xfc2e7
-TilesetLighthouseAnim: ; 0xfc2e7
-TilesetPlayersRoomAnim: ; 0xfc2e7
-TilesetPokeComCenterAnim: ; 0xfc2e7
-TilesetBattleTowerAnim: ; 0xfc2e7
-TilesetRuinsOfAlphAnim: ; 0xfc2e7
-TilesetRadioTowerAnim: ; 0xfc2e7
-TilesetUndergroundAnim: ; 0xfc2e7
-TilesetBetaWordRoomAnim: ; 0xfc2e7
-TilesetHoOhWordRoomAnim: ; 0xfc2e7
-TilesetKabutoWordRoomAnim: ; 0xfc2e7
-TilesetOmanyteWordRoomAnim: ; 0xfc2e7
-TilesetAerodactylWordRoomAnim: ; 0xfc2e7
+TilesetBattleTowerOutsideAnim:
+TilesetHouseAnim:
+TilesetPlayersHouseAnim:
+TilesetPokecenterAnim:
+TilesetGateAnim:
+TilesetLabAnim:
+TilesetFacilityAnim:
+TilesetMartAnim:
+TilesetMansionAnim:
+TilesetGameCornerAnim:
+TilesetTraditionalHouseAnim:
+TilesetTrainStationAnim:
+TilesetChampionsRoomAnim:
+TilesetLighthouseAnim:
+TilesetPlayersRoomAnim:
+TilesetPokeComCenterAnim:
+TilesetBattleTowerAnim:
+TilesetRuinsOfAlphAnim:
+TilesetRadioTowerAnim:
+TilesetUndergroundAnim:
+TilesetBetaWordRoomAnim:
+TilesetHoOhWordRoomAnim:
+TilesetKabutoWordRoomAnim:
+TilesetOmanyteWordRoomAnim:
+TilesetAerodactylWordRoomAnim:
dw NULL, WaitTileAnimation
dw NULL, WaitTileAnimation
dw NULL, WaitTileAnimation
dw NULL, WaitTileAnimation
dw NULL, DoneTileAnimation
-; 0xfc2fb
DoneTileAnimation:
; Reset the animation command loop.
--- a/gfx/icons.asm
+++ b/gfx/icons.asm
@@ -1,41 +1,41 @@
Icons: ; used only for BANK(Icons)
NullIcon:
-PoliwagIcon: INCBIN "gfx/icons/poliwag.2bpp" ; 0x8ec0d
-JigglypuffIcon: INCBIN "gfx/icons/jigglypuff.2bpp" ; 0x8ec8d
-DiglettIcon: INCBIN "gfx/icons/diglett.2bpp" ; 0x8ed0d
-PikachuIcon: INCBIN "gfx/icons/pikachu.2bpp" ; 0x8ed8d
-StaryuIcon: INCBIN "gfx/icons/staryu.2bpp" ; 0x8ee0d
-FishIcon: INCBIN "gfx/icons/fish.2bpp" ; 0x8ee8d
-BirdIcon: INCBIN "gfx/icons/bird.2bpp" ; 0x8ef0d
-MonsterIcon: INCBIN "gfx/icons/monster.2bpp" ; 0x8ef8d
-ClefairyIcon: INCBIN "gfx/icons/clefairy.2bpp" ; 0x8f00d
-OddishIcon: INCBIN "gfx/icons/oddish.2bpp" ; 0x8f08d
-BugIcon: INCBIN "gfx/icons/bug.2bpp" ; 0x8f10d
-GhostIcon: INCBIN "gfx/icons/ghost.2bpp" ; 0x8f18d
-LaprasIcon: INCBIN "gfx/icons/lapras.2bpp" ; 0x8f20d
-HumanshapeIcon: INCBIN "gfx/icons/humanshape.2bpp" ; 0x8f28d
-FoxIcon: INCBIN "gfx/icons/fox.2bpp" ; 0x8f30d
-EquineIcon: INCBIN "gfx/icons/equine.2bpp" ; 0x8f38d
-ShellIcon: INCBIN "gfx/icons/shell.2bpp" ; 0x8f40d
-BlobIcon: INCBIN "gfx/icons/blob.2bpp" ; 0x8f48d
-SerpentIcon: INCBIN "gfx/icons/serpent.2bpp" ; 0x8f50d
-VoltorbIcon: INCBIN "gfx/icons/voltorb.2bpp" ; 0x8f58d
-SquirtleIcon: INCBIN "gfx/icons/squirtle.2bpp" ; 0x8f60d
-BulbasaurIcon: INCBIN "gfx/icons/bulbasaur.2bpp" ; 0x8f68d
-CharmanderIcon: INCBIN "gfx/icons/charmander.2bpp" ; 0x8f70d
-CaterpillarIcon: INCBIN "gfx/icons/caterpillar.2bpp" ; 0x8f78d
-UnownIcon: INCBIN "gfx/icons/unown.2bpp" ; 0x8f80d
-GeodudeIcon: INCBIN "gfx/icons/geodude.2bpp" ; 0x8f88d
-FighterIcon: INCBIN "gfx/icons/fighter.2bpp" ; 0x8f90d
-EggIcon: INCBIN "gfx/icons/egg.2bpp" ; 0x8f98d
-JellyfishIcon: INCBIN "gfx/icons/jellyfish.2bpp" ; 0x8fa0d
-MothIcon: INCBIN "gfx/icons/moth.2bpp" ; 0x8fa8d
-BatIcon: INCBIN "gfx/icons/bat.2bpp" ; 0x8fb0d
-SnorlaxIcon: INCBIN "gfx/icons/snorlax.2bpp" ; 0x8fb8d
-HoOhIcon: INCBIN "gfx/icons/ho_oh.2bpp" ; 0x8fc0d
-LugiaIcon: INCBIN "gfx/icons/lugia.2bpp" ; 0x8fc8d
-GyaradosIcon: INCBIN "gfx/icons/gyarados.2bpp" ; 0x8fd0d
-SlowpokeIcon: INCBIN "gfx/icons/slowpoke.2bpp" ; 0x8fd8d
-SudowoodoIcon: INCBIN "gfx/icons/sudowoodo.2bpp" ; 0x8fe0d
-BigmonIcon: INCBIN "gfx/icons/bigmon.2bpp" ; 0x8fe8d
+PoliwagIcon: INCBIN "gfx/icons/poliwag.2bpp"
+JigglypuffIcon: INCBIN "gfx/icons/jigglypuff.2bpp"
+DiglettIcon: INCBIN "gfx/icons/diglett.2bpp"
+PikachuIcon: INCBIN "gfx/icons/pikachu.2bpp"
+StaryuIcon: INCBIN "gfx/icons/staryu.2bpp"
+FishIcon: INCBIN "gfx/icons/fish.2bpp"
+BirdIcon: INCBIN "gfx/icons/bird.2bpp"
+MonsterIcon: INCBIN "gfx/icons/monster.2bpp"
+ClefairyIcon: INCBIN "gfx/icons/clefairy.2bpp"
+OddishIcon: INCBIN "gfx/icons/oddish.2bpp"
+BugIcon: INCBIN "gfx/icons/bug.2bpp"
+GhostIcon: INCBIN "gfx/icons/ghost.2bpp"
+LaprasIcon: INCBIN "gfx/icons/lapras.2bpp"
+HumanshapeIcon: INCBIN "gfx/icons/humanshape.2bpp"
+FoxIcon: INCBIN "gfx/icons/fox.2bpp"
+EquineIcon: INCBIN "gfx/icons/equine.2bpp"
+ShellIcon: INCBIN "gfx/icons/shell.2bpp"
+BlobIcon: INCBIN "gfx/icons/blob.2bpp"
+SerpentIcon: INCBIN "gfx/icons/serpent.2bpp"
+VoltorbIcon: INCBIN "gfx/icons/voltorb.2bpp"
+SquirtleIcon: INCBIN "gfx/icons/squirtle.2bpp"
+BulbasaurIcon: INCBIN "gfx/icons/bulbasaur.2bpp"
+CharmanderIcon: INCBIN "gfx/icons/charmander.2bpp"
+CaterpillarIcon: INCBIN "gfx/icons/caterpillar.2bpp"
+UnownIcon: INCBIN "gfx/icons/unown.2bpp"
+GeodudeIcon: INCBIN "gfx/icons/geodude.2bpp"
+FighterIcon: INCBIN "gfx/icons/fighter.2bpp"
+EggIcon: INCBIN "gfx/icons/egg.2bpp"
+JellyfishIcon: INCBIN "gfx/icons/jellyfish.2bpp"
+MothIcon: INCBIN "gfx/icons/moth.2bpp"
+BatIcon: INCBIN "gfx/icons/bat.2bpp"
+SnorlaxIcon: INCBIN "gfx/icons/snorlax.2bpp"
+HoOhIcon: INCBIN "gfx/icons/ho_oh.2bpp"
+LugiaIcon: INCBIN "gfx/icons/lugia.2bpp"
+GyaradosIcon: INCBIN "gfx/icons/gyarados.2bpp"
+SlowpokeIcon: INCBIN "gfx/icons/slowpoke.2bpp"
+SudowoodoIcon: INCBIN "gfx/icons/sudowoodo.2bpp"
+BigmonIcon: INCBIN "gfx/icons/bigmon.2bpp"
--- a/gfx/pokemon/abra/anim.asm
+++ b/gfx/pokemon/abra/anim.asm
@@ -4,4 +4,3 @@
frame 2, 09
dorepeat 1
endanim
-; 0xd0c5a
--- a/gfx/pokemon/abra/anim_idle.asm
+++ b/gfx/pokemon/abra/anim_idle.asm
@@ -3,4 +3,3 @@
frame 3, 07
dorepeat 1
endanim
-; 0xd1b38
--- a/gfx/pokemon/aerodactyl/anim.asm
+++ b/gfx/pokemon/aerodactyl/anim.asm
@@ -6,4 +6,3 @@
frame 1, 08
dorepeat 4
endanim
-; 0xd10a1
--- a/gfx/pokemon/aerodactyl/anim_idle.asm
+++ b/gfx/pokemon/aerodactyl/anim_idle.asm
@@ -3,4 +3,3 @@
frame 3, 06
dorepeat 1
endanim
-; 0xd1e2b
--- a/gfx/pokemon/aipom/anim.asm
+++ b/gfx/pokemon/aipom/anim.asm
@@ -4,4 +4,3 @@
frame 2, 12
dorepeat 2
endanim
-; 0xd1369
--- a/gfx/pokemon/aipom/anim_idle.asm
+++ b/gfx/pokemon/aipom/anim_idle.asm
@@ -3,4 +3,3 @@
frame 3, 06
dorepeat 1
endanim
-; 0xd200b
--- a/gfx/pokemon/alakazam/anim.asm
+++ b/gfx/pokemon/alakazam/anim.asm
@@ -6,4 +6,3 @@
dorepeat 2
frame 3, 07
endanim
-; 0xd0c76
--- a/gfx/pokemon/alakazam/anim_idle.asm
+++ b/gfx/pokemon/alakazam/anim_idle.asm
@@ -2,4 +2,3 @@
frame 5, 45
frame 3, 10
endanim
-; 0xd1b48
--- a/gfx/pokemon/ampharos/anim.asm
+++ b/gfx/pokemon/ampharos/anim.asm
@@ -7,4 +7,3 @@
frame 1, 06
frame 4, 06
endanim
-; 0xd12fa
--- a/gfx/pokemon/ampharos/anim_idle.asm
+++ b/gfx/pokemon/ampharos/anim_idle.asm
@@ -4,4 +4,3 @@
frame 6, 06
dorepeat 2
endanim
-; 0xd1fb6
--- a/gfx/pokemon/arbok/anim.asm
+++ b/gfx/pokemon/arbok/anim.asm
@@ -12,4 +12,3 @@
frame 3, 05
dorepeat 8
endanim
-; 0xd09ed
--- a/gfx/pokemon/arbok/anim_idle.asm
+++ b/gfx/pokemon/arbok/anim_idle.asm
@@ -5,4 +5,3 @@
frame 5, 04
frame 4, 06
endanim
-; 0xd19a9
--- a/gfx/pokemon/arcanine/anim.asm
+++ b/gfx/pokemon/arcanine/anim.asm
@@ -4,4 +4,3 @@
frame 4, 10
frame 7, 25
endanim
-; 0xd0c26
--- a/gfx/pokemon/arcanine/anim_idle.asm
+++ b/gfx/pokemon/arcanine/anim_idle.asm
@@ -3,4 +3,3 @@
frame 6, 09
dorepeat 1
endanim
-; 0xd1b0c
--- a/gfx/pokemon/ariados/anim.asm
+++ b/gfx/pokemon/ariados/anim.asm
@@ -5,4 +5,3 @@
dorepeat 2
frame 1, 24
endanim
-; 0xd124d
--- a/gfx/pokemon/ariados/anim_idle.asm
+++ b/gfx/pokemon/ariados/anim_idle.asm
@@ -5,4 +5,3 @@
dorepeat 2
frame 1, 08
endanim
-; 0xd1f3b
--- a/gfx/pokemon/articuno/anim.asm
+++ b/gfx/pokemon/articuno/anim.asm
@@ -6,4 +6,3 @@
dorepeat 2
frame 5, 12
endanim
-; 0xd10c1
--- a/gfx/pokemon/articuno/anim_idle.asm
+++ b/gfx/pokemon/articuno/anim_idle.asm
@@ -5,4 +5,3 @@
dorepeat 2
frame 5, 12
endanim
-; 0xd1e41
--- a/gfx/pokemon/azumarill/anim.asm
+++ b/gfx/pokemon/azumarill/anim.asm
@@ -6,4 +6,3 @@
frame 1, 08
frame 4, 08
endanim
-; 0xd1329
--- a/gfx/pokemon/azumarill/anim_idle.asm
+++ b/gfx/pokemon/azumarill/anim_idle.asm
@@ -3,4 +3,3 @@
frame 4, 06
dorepeat 1
endanim
-; 0xd1fd3
--- a/gfx/pokemon/bayleef/anim.asm
+++ b/gfx/pokemon/bayleef/anim.asm
@@ -2,4 +2,3 @@
frame 2, 11
frame 3, 15
endanim
-; 0xd116c
--- a/gfx/pokemon/bayleef/anim_idle.asm
+++ b/gfx/pokemon/bayleef/anim_idle.asm
@@ -3,4 +3,3 @@
frame 4, 06
dorepeat 1
endanim
-; 0xd1ea8
--- a/gfx/pokemon/beedrill/anim.asm
+++ b/gfx/pokemon/beedrill/anim.asm
@@ -9,4 +9,3 @@
frame 3, 10
dorepeat 7
endanim
-; 0xd0954
--- a/gfx/pokemon/beedrill/anim_idle.asm
+++ b/gfx/pokemon/beedrill/anim_idle.asm
@@ -7,4 +7,3 @@
frame 0, 25
frame 3, 10
endanim
-; 0xd193c
--- a/gfx/pokemon/bellossom/anim.asm
+++ b/gfx/pokemon/bellossom/anim.asm
@@ -7,4 +7,3 @@
frame 5, 12
frame 4, 10
endanim
-; 0xd130b
--- a/gfx/pokemon/bellossom/anim_idle.asm
+++ b/gfx/pokemon/bellossom/anim_idle.asm
@@ -3,4 +3,3 @@
frame 6, 06
dorepeat 1
endanim
-; 0xd1fbf
--- a/gfx/pokemon/bellsprout/anim.asm
+++ b/gfx/pokemon/bellsprout/anim.asm
@@ -9,4 +9,3 @@
frame 1, 08
dorepeat 5
endanim
-; 0xd0cb2
--- a/gfx/pokemon/bellsprout/anim_idle.asm
+++ b/gfx/pokemon/bellsprout/anim_idle.asm
@@ -5,4 +5,3 @@
frame 6, 05
dorepeat 3
endanim
-; 0xd1b78
--- a/gfx/pokemon/blastoise/anim.asm
+++ b/gfx/pokemon/blastoise/anim.asm
@@ -3,4 +3,3 @@
frame 3, 08
frame 1, 04
endanim
-; 0xd0908
--- a/gfx/pokemon/blastoise/anim_idle.asm
+++ b/gfx/pokemon/blastoise/anim_idle.asm
@@ -3,4 +3,3 @@
frame 4, 12
dorepeat 1
endanim
-; 0xd18f0
--- a/gfx/pokemon/blissey/anim.asm
+++ b/gfx/pokemon/blissey/anim.asm
@@ -5,4 +5,3 @@
frame 0, 06
frame 3, 08
endanim
-; 0xd1607
--- a/gfx/pokemon/blissey/anim_idle.asm
+++ b/gfx/pokemon/blissey/anim_idle.asm
@@ -3,4 +3,3 @@
frame 4, 07
dorepeat 1
endanim
-; 0xd21c1
--- a/gfx/pokemon/bulbasaur/anim.asm
+++ b/gfx/pokemon/bulbasaur/anim.asm
@@ -7,4 +7,3 @@
frame 0, 05
frame 5, 05
endanim
-; 0xd089c
--- a/gfx/pokemon/bulbasaur/anim_idle.asm
+++ b/gfx/pokemon/bulbasaur/anim_idle.asm
@@ -2,4 +2,3 @@
frame 0, 05
frame 5, 05
endanim
-; 0xd18a0
--- a/gfx/pokemon/butterfree/anim.asm
+++ b/gfx/pokemon/butterfree/anim.asm
@@ -5,4 +5,3 @@
frame 1, 06
dorepeat 3
endanim
-; 0xd0929
--- a/gfx/pokemon/butterfree/anim_idle.asm
+++ b/gfx/pokemon/butterfree/anim_idle.asm
@@ -3,4 +3,3 @@
frame 1, 10
dorepeat 1
endanim
-; 0xd190d
--- a/gfx/pokemon/caterpie/anim.asm
+++ b/gfx/pokemon/caterpie/anim.asm
@@ -5,4 +5,3 @@
frame 2, 08
frame 1, 08
endanim
-; 0xd0915
--- a/gfx/pokemon/caterpie/anim_idle.asm
+++ b/gfx/pokemon/caterpie/anim_idle.asm
@@ -3,4 +3,3 @@
frame 3, 06
dorepeat 1
endanim
-; 0xd18f9
--- a/gfx/pokemon/celebi/anim.asm
+++ b/gfx/pokemon/celebi/anim.asm
@@ -13,4 +13,3 @@
frame 13, 05
dorepeat 11
endanim
-; 0xd1696
--- a/gfx/pokemon/celebi/anim_idle.asm
+++ b/gfx/pokemon/celebi/anim_idle.asm
@@ -5,4 +5,3 @@
frame 11, 05
dorepeat 3
endanim
-; 0xd2222
--- a/gfx/pokemon/chansey/anim.asm
+++ b/gfx/pokemon/chansey/anim.asm
@@ -7,4 +7,3 @@
frame 3, 05
dorepeat 5
endanim
-; 0xd0f26
--- a/gfx/pokemon/chansey/anim_idle.asm
+++ b/gfx/pokemon/chansey/anim_idle.asm
@@ -3,4 +3,3 @@
frame 3, 05
dorepeat 1
endanim
-; 0xd1d16
--- a/gfx/pokemon/charizard/anim.asm
+++ b/gfx/pokemon/charizard/anim.asm
@@ -5,4 +5,3 @@
frame 1, 09
dorepeat 3
endanim
-; 0xd08e1
--- a/gfx/pokemon/charizard/anim_idle.asm
+++ b/gfx/pokemon/charizard/anim_idle.asm
@@ -3,4 +3,3 @@
frame 3, 06
dorepeat 1
endanim
-; 0xd18d5
--- a/gfx/pokemon/charmander/anim.asm
+++ b/gfx/pokemon/charmander/anim.asm
@@ -6,4 +6,3 @@
frame 0, 10
frame 4, 10
endanim
-; 0xd08c5
--- a/gfx/pokemon/charmander/anim_idle.asm
+++ b/gfx/pokemon/charmander/anim_idle.asm
@@ -3,4 +3,3 @@
frame 3, 06
dorepeat 1
endanim
-; 0xd18bf
--- a/gfx/pokemon/charmeleon/anim.asm
+++ b/gfx/pokemon/charmeleon/anim.asm
@@ -6,4 +6,3 @@
frame 3, 08
frame 4, 30
endanim
-; 0xd08d4
--- a/gfx/pokemon/charmeleon/anim_idle.asm
+++ b/gfx/pokemon/charmeleon/anim_idle.asm
@@ -5,4 +5,3 @@
frame 1, 10
dorepeat 3
endanim
-; 0xd18cc
--- a/gfx/pokemon/chikorita/anim.asm
+++ b/gfx/pokemon/chikorita/anim.asm
@@ -7,4 +7,3 @@
frame 4, 05
dorepeat 4
endanim
-; 0xd1165
--- a/gfx/pokemon/chikorita/anim_idle.asm
+++ b/gfx/pokemon/chikorita/anim_idle.asm
@@ -3,4 +3,3 @@
frame 5, 06
dorepeat 1
endanim
-; 0xd1e9f
--- a/gfx/pokemon/chinchou/anim.asm
+++ b/gfx/pokemon/chinchou/anim.asm
@@ -8,4 +8,3 @@
dorepeat 5
frame 3, 10
endanim
-; 0xd1271
--- a/gfx/pokemon/chinchou/anim_idle.asm
+++ b/gfx/pokemon/chinchou/anim_idle.asm
@@ -3,4 +3,3 @@
frame 4, 06
dorepeat 1
endanim
-; 0xd1f4d
--- a/gfx/pokemon/clefable/anim.asm
+++ b/gfx/pokemon/clefable/anim.asm
@@ -3,4 +3,3 @@
frame 2, 10
frame 1, 10
endanim
-; 0xd0aa7
--- a/gfx/pokemon/clefable/anim_idle.asm
+++ b/gfx/pokemon/clefable/anim_idle.asm
@@ -3,4 +3,3 @@
frame 3, 07
dorepeat 1
endanim
-; 0xd1a29
--- a/gfx/pokemon/clefairy/anim.asm
+++ b/gfx/pokemon/clefairy/anim.asm
@@ -6,4 +6,3 @@
frame 3, 05
dorepeat 4
endanim
-; 0xd0a9e
--- a/gfx/pokemon/clefairy/anim_idle.asm
+++ b/gfx/pokemon/clefairy/anim_idle.asm
@@ -5,4 +5,3 @@
frame 0, 05
frame 3, 05
endanim
-; 0xd1a20
--- a/gfx/pokemon/cleffa/anim.asm
+++ b/gfx/pokemon/cleffa/anim.asm
@@ -2,4 +2,3 @@
frame 2, 10
frame 3, 10
endanim
-; 0xd1290
--- a/gfx/pokemon/cleffa/anim_idle.asm
+++ b/gfx/pokemon/cleffa/anim_idle.asm
@@ -3,4 +3,3 @@
frame 1, 08
dorepeat 1
endanim
-; 0xd1f68
--- a/gfx/pokemon/cloyster/anim.asm
+++ b/gfx/pokemon/cloyster/anim.asm
@@ -4,4 +4,3 @@
dorepeat 1
frame 3, 09
endanim
-; 0xd0dd0
--- a/gfx/pokemon/cloyster/anim_idle.asm
+++ b/gfx/pokemon/cloyster/anim_idle.asm
@@ -1,4 +1,3 @@
frame 4, 52
dorepeat 1
endanim
-; 0xd1c4e
--- a/gfx/pokemon/corsola/anim.asm
+++ b/gfx/pokemon/corsola/anim.asm
@@ -4,4 +4,3 @@
frame 0, 12
frame 3, 18
endanim
-; 0xd1501
--- a/gfx/pokemon/corsola/anim_idle.asm
+++ b/gfx/pokemon/corsola/anim_idle.asm
@@ -3,4 +3,3 @@
frame 4, 07
dorepeat 1
endanim
-; 0xd210b
--- a/gfx/pokemon/crobat/anim.asm
+++ b/gfx/pokemon/crobat/anim.asm
@@ -7,4 +7,3 @@
frame 5, 05
dorepeat 1
endanim
-; 0xd125e
--- a/gfx/pokemon/crobat/anim_idle.asm
+++ b/gfx/pokemon/crobat/anim_idle.asm
@@ -3,4 +3,3 @@
frame 1, 07
dorepeat 1
endanim
-; 0xd1f44
--- a/gfx/pokemon/croconaw/anim.asm
+++ b/gfx/pokemon/croconaw/anim.asm
@@ -4,4 +4,3 @@
frame 1, 05
dorepeat 1
endanim
-; 0xd11d2
--- a/gfx/pokemon/croconaw/anim_idle.asm
+++ b/gfx/pokemon/croconaw/anim_idle.asm
@@ -3,4 +3,3 @@
frame 4, 10
dorepeat 1
endanim
-; 0xd1ee0
--- a/gfx/pokemon/cubone/anim.asm
+++ b/gfx/pokemon/cubone/anim.asm
@@ -9,4 +9,3 @@
frame 6, 02
frame 1, 08
endanim
-; 0xd0e9f
--- a/gfx/pokemon/cubone/anim_idle.asm
+++ b/gfx/pokemon/cubone/anim_idle.asm
@@ -3,4 +3,3 @@
frame 5, 08
dorepeat 1
endanim
-; 0xd1cc3
--- a/gfx/pokemon/cyndaquil/anim.asm
+++ b/gfx/pokemon/cyndaquil/anim.asm
@@ -9,4 +9,3 @@
frame 3, 09
frame 1, 03
endanim
-; 0xd1194
--- a/gfx/pokemon/cyndaquil/anim_idle.asm
+++ b/gfx/pokemon/cyndaquil/anim_idle.asm
@@ -3,4 +3,3 @@
frame 4, 10
dorepeat 1
endanim
-; 0xd1eba
--- a/gfx/pokemon/delibird/anim.asm
+++ b/gfx/pokemon/delibird/anim.asm
@@ -9,4 +9,3 @@
frame 0, 05
frame 6, 05
endanim
-; 0xd152a
--- a/gfx/pokemon/delibird/anim_idle.asm
+++ b/gfx/pokemon/delibird/anim_idle.asm
@@ -3,4 +3,3 @@
frame 5, 06
dorepeat 1
endanim
-; 0xd2126
--- a/gfx/pokemon/dewgong/anim.asm
+++ b/gfx/pokemon/dewgong/anim.asm
@@ -4,4 +4,3 @@
frame 4, 09
frame 5, 14
endanim
-; 0xd0daa
--- a/gfx/pokemon/dewgong/anim_idle.asm
+++ b/gfx/pokemon/dewgong/anim_idle.asm
@@ -6,4 +6,3 @@
frame 9, 06
dorepeat 1
endanim
-; 0xd1c2a
--- a/gfx/pokemon/diglett/anim.asm
+++ b/gfx/pokemon/diglett/anim.asm
@@ -4,4 +4,3 @@
frame 1, 09
dorepeat 2
endanim
-; 0xd0b97
--- a/gfx/pokemon/diglett/anim_idle.asm
+++ b/gfx/pokemon/diglett/anim_idle.asm
@@ -3,4 +3,3 @@
frame 4, 08
dorepeat 1
endanim
-; 0xd1aad
--- a/gfx/pokemon/ditto/anim.asm
+++ b/gfx/pokemon/ditto/anim.asm
@@ -8,4 +8,3 @@
frame 7, 12
frame 8, 12
endanim
-; 0xd1029
--- a/gfx/pokemon/ditto/anim_idle.asm
+++ b/gfx/pokemon/ditto/anim_idle.asm
@@ -3,4 +3,3 @@
frame 4, 07
dorepeat 1
endanim
-; 0xd1dc9
--- a/gfx/pokemon/dodrio/anim.asm
+++ b/gfx/pokemon/dodrio/anim.asm
@@ -3,4 +3,3 @@
frame 4, 10
frame 1, 09
endanim
-; 0xd0d92
--- a/gfx/pokemon/dodrio/anim_idle.asm
+++ b/gfx/pokemon/dodrio/anim_idle.asm
@@ -3,4 +3,3 @@
frame 0, 08
dorepeat 1
endanim
-; 0xd1c10
--- a/gfx/pokemon/doduo/anim.asm
+++ b/gfx/pokemon/doduo/anim.asm
@@ -6,4 +6,3 @@
frame 1, 08
dorepeat 4
endanim
-; 0xd0d89
--- a/gfx/pokemon/doduo/anim_idle.asm
+++ b/gfx/pokemon/doduo/anim_idle.asm
@@ -5,4 +5,3 @@
dorepeat 2
frame 1, 30
endanim
-; 0xd1c07
--- a/gfx/pokemon/donphan/anim.asm
+++ b/gfx/pokemon/donphan/anim.asm
@@ -3,4 +3,3 @@
frame 3, 10
frame 4, 06
endanim
-; 0xd1587
--- a/gfx/pokemon/donphan/anim_idle.asm
+++ b/gfx/pokemon/donphan/anim_idle.asm
@@ -3,4 +3,3 @@
frame 5, 08
dorepeat 1
endanim
-; 0xd2169
--- a/gfx/pokemon/dragonair/anim.asm
+++ b/gfx/pokemon/dragonair/anim.asm
@@ -5,4 +5,3 @@
frame 2, 08
dorepeat 1
endanim
-; 0xd10fd
--- a/gfx/pokemon/dragonair/anim_idle.asm
+++ b/gfx/pokemon/dragonair/anim_idle.asm
@@ -7,4 +7,3 @@
frame 6, 06
frame 5, 06
endanim
-; 0xd1e71
--- a/gfx/pokemon/dragonite/anim.asm
+++ b/gfx/pokemon/dragonite/anim.asm
@@ -10,4 +10,3 @@
frame 1, 12
dorepeat 8
endanim
-; 0xd1114
--- a/gfx/pokemon/dragonite/anim_idle.asm
+++ b/gfx/pokemon/dragonite/anim_idle.asm
@@ -5,4 +5,3 @@
frame 5, 05
dorepeat 3
endanim
-; 0xd1e7e
--- a/gfx/pokemon/dratini/anim.asm
+++ b/gfx/pokemon/dratini/anim.asm
@@ -5,4 +5,3 @@
frame 2, 09
frame 3, 09
endanim
-; 0xd10f0
--- a/gfx/pokemon/dratini/anim_idle.asm
+++ b/gfx/pokemon/dratini/anim_idle.asm
@@ -3,4 +3,3 @@
frame 4, 05
dorepeat 1
endanim
-; 0xd1e60
--- a/gfx/pokemon/drowzee/anim.asm
+++ b/gfx/pokemon/drowzee/anim.asm
@@ -8,4 +8,3 @@
frame 3, 05
frame 4, 05
endanim
-; 0xd0e1b
--- a/gfx/pokemon/drowzee/anim_idle.asm
+++ b/gfx/pokemon/drowzee/anim_idle.asm
@@ -5,4 +5,3 @@
frame 0, 08
frame 5, 08
endanim
-; 0xd1c81
--- a/gfx/pokemon/dugtrio/anim.asm
+++ b/gfx/pokemon/dugtrio/anim.asm
@@ -13,4 +13,3 @@
frame 2, 06
frame 1, 06
endanim
-; 0xd0bb4
--- a/gfx/pokemon/dugtrio/anim_idle.asm
+++ b/gfx/pokemon/dugtrio/anim_idle.asm
@@ -7,4 +7,3 @@
dorepeat 4
frame 6, 20
endanim
-; 0xd1abe
--- a/gfx/pokemon/dunsparce/anim.asm
+++ b/gfx/pokemon/dunsparce/anim.asm
@@ -5,4 +5,3 @@
dorepeat 2
frame 4, 12
endanim
-; 0xd1441
--- a/gfx/pokemon/dunsparce/anim_idle.asm
+++ b/gfx/pokemon/dunsparce/anim_idle.asm
@@ -3,4 +3,3 @@
frame 5, 08
dorepeat 1
endanim
-; 0xd2089
--- a/gfx/pokemon/eevee/anim.asm
+++ b/gfx/pokemon/eevee/anim.asm
@@ -6,4 +6,3 @@
dorepeat 3
frame 2, 10
endanim
-; 0xd1038
--- a/gfx/pokemon/eevee/anim_idle.asm
+++ b/gfx/pokemon/eevee/anim_idle.asm
@@ -5,4 +5,3 @@
frame 0, 09
frame 5, 13
endanim
-; 0xd1dd6
--- a/gfx/pokemon/egg/anim.asm
+++ b/gfx/pokemon/egg/anim.asm
@@ -5,4 +5,3 @@
frame 0, 04
dorepeat 1
endanim
-; 0xd16a3
--- a/gfx/pokemon/egg/anim_idle.asm
+++ b/gfx/pokemon/egg/anim_idle.asm
@@ -2,4 +2,3 @@
frame 0, 03
frame 2, 03
endanim
-; 0xd2229
--- a/gfx/pokemon/ekans/anim.asm
+++ b/gfx/pokemon/ekans/anim.asm
@@ -6,4 +6,3 @@
dorepeat 3
frame 2, 20
endanim
-; 0xd09d2
--- a/gfx/pokemon/ekans/anim_idle.asm
+++ b/gfx/pokemon/ekans/anim_idle.asm
@@ -5,4 +5,3 @@
frame 0, 02
dorepeat 1
endanim
-; 0xd199c
--- a/gfx/pokemon/electabuzz/anim.asm
+++ b/gfx/pokemon/electabuzz/anim.asm
@@ -10,4 +10,3 @@
dorepeat 7
dorepeat 7
endanim
-; 0xd0fcc
--- a/gfx/pokemon/electabuzz/anim_idle.asm
+++ b/gfx/pokemon/electabuzz/anim_idle.asm
@@ -3,4 +3,3 @@
frame 5, 04
dorepeat 1
endanim
-; 0xd1d8a
--- a/gfx/pokemon/electrode/anim.asm
+++ b/gfx/pokemon/electrode/anim.asm
@@ -1,4 +1,3 @@
frame 1, 05
frame 2, 40
endanim
-; 0xd0e5c
--- a/gfx/pokemon/electrode/anim_idle.asm
+++ b/gfx/pokemon/electrode/anim_idle.asm
@@ -1,3 +1,2 @@
frame 3, 45
endanim
-; 0xd1ca8
--- a/gfx/pokemon/elekid/anim.asm
+++ b/gfx/pokemon/elekid/anim.asm
@@ -8,4 +8,3 @@
frame 3, 03
dorepeat 6
endanim
-; 0xd15e0
--- a/gfx/pokemon/elekid/anim_idle.asm
+++ b/gfx/pokemon/elekid/anim_idle.asm
@@ -4,4 +4,3 @@
dorepeat 1
frame 3, 20
endanim
-; 0xd21a6
--- a/gfx/pokemon/entei/anim.asm
+++ b/gfx/pokemon/entei/anim.asm
@@ -3,4 +3,3 @@
frame 2, 12
frame 3, 30
endanim
-; 0xd161d
--- a/gfx/pokemon/entei/anim_idle.asm
+++ b/gfx/pokemon/entei/anim_idle.asm
@@ -3,4 +3,3 @@
frame 4, 08
dorepeat 1
endanim
-; 0xd21d7
--- a/gfx/pokemon/espeon/anim.asm
+++ b/gfx/pokemon/espeon/anim.asm
@@ -6,4 +6,3 @@
frame 3, 07
dorepeat 3
endanim
-; 0xd13af
--- a/gfx/pokemon/espeon/anim_idle.asm
+++ b/gfx/pokemon/espeon/anim_idle.asm
@@ -3,4 +3,3 @@
frame 4, 07
dorepeat 1
endanim
-; 0xd203d
--- a/gfx/pokemon/exeggcute/anim.asm
+++ b/gfx/pokemon/exeggcute/anim.asm
@@ -14,4 +14,3 @@
frame 0, 08
frame 3, 08
endanim
-; 0xd0e7b
--- a/gfx/pokemon/exeggcute/anim_idle.asm
+++ b/gfx/pokemon/exeggcute/anim_idle.asm
@@ -3,4 +3,3 @@
frame 3, 06
dorepeat 1
endanim
-; 0xd1cb1
--- a/gfx/pokemon/exeggutor/anim.asm
+++ b/gfx/pokemon/exeggutor/anim.asm
@@ -6,4 +6,3 @@
frame 0, 06
dorepeat 4
endanim
-; 0xd0e8a
--- a/gfx/pokemon/exeggutor/anim_idle.asm
+++ b/gfx/pokemon/exeggutor/anim_idle.asm
@@ -3,4 +3,3 @@
frame 1, 06
dorepeat 1
endanim
-; 0xd1cba
--- a/gfx/pokemon/farfetch_d/anim.asm
+++ b/gfx/pokemon/farfetch_d/anim.asm
@@ -3,4 +3,3 @@
frame 3, 14
frame 2, 06
endanim
-; 0xd0d7a
--- a/gfx/pokemon/farfetch_d/anim_idle.asm
+++ b/gfx/pokemon/farfetch_d/anim_idle.asm
@@ -2,4 +2,3 @@
frame 5, 07
frame 4, 07
endanim
-; 0xd1bfa
--- a/gfx/pokemon/fearow/anim.asm
+++ b/gfx/pokemon/fearow/anim.asm
@@ -5,4 +5,3 @@
frame 2, 06
dorepeat 2
endanim
-; 0xd09c3
--- a/gfx/pokemon/fearow/anim_idle.asm
+++ b/gfx/pokemon/fearow/anim_idle.asm
@@ -3,4 +3,3 @@
frame 0, 05
dorepeat 1
endanim
-; 0xd198f
--- a/gfx/pokemon/feraligatr/anim.asm
+++ b/gfx/pokemon/feraligatr/anim.asm
@@ -4,4 +4,3 @@
frame 3, 36
frame 2, 12
endanim
-; 0xd11dd
--- a/gfx/pokemon/feraligatr/anim_idle.asm
+++ b/gfx/pokemon/feraligatr/anim_idle.asm
@@ -3,4 +3,3 @@
frame 4, 06
dorepeat 1
endanim
-; 0xd1ee9
--- a/gfx/pokemon/flaaffy/anim.asm
+++ b/gfx/pokemon/flaaffy/anim.asm
@@ -5,4 +5,3 @@
dorepeat 2
frame 3, 18
endanim
-; 0xd12e9
--- a/gfx/pokemon/flaaffy/anim_idle.asm
+++ b/gfx/pokemon/flaaffy/anim_idle.asm
@@ -3,4 +3,3 @@
frame 4, 07
dorepeat 1
endanim
-; 0xd1fab
--- a/gfx/pokemon/flareon/anim.asm
+++ b/gfx/pokemon/flareon/anim.asm
@@ -4,4 +4,3 @@
frame 3, 08
dorepeat 2
endanim
-; 0xd105f
--- a/gfx/pokemon/flareon/anim_idle.asm
+++ b/gfx/pokemon/flareon/anim_idle.asm
@@ -3,4 +3,3 @@
frame 4, 06
dorepeat 1
endanim
-; 0xd1df1
--- a/gfx/pokemon/forretress/anim.asm
+++ b/gfx/pokemon/forretress/anim.asm
@@ -8,4 +8,3 @@
frame 2, 25
frame 1, 08
endanim
-; 0xd1434
--- a/gfx/pokemon/forretress/anim_idle.asm
+++ b/gfx/pokemon/forretress/anim_idle.asm
@@ -3,4 +3,3 @@
frame 5, 06
dorepeat 1
endanim
-; 0xd2080
--- a/gfx/pokemon/furret/anim.asm
+++ b/gfx/pokemon/furret/anim.asm
@@ -5,4 +5,3 @@
frame 2, 08
dorepeat 2
endanim
-; 0xd11f3
--- a/gfx/pokemon/furret/anim_idle.asm
+++ b/gfx/pokemon/furret/anim_idle.asm
@@ -3,4 +3,3 @@
frame 4, 06
dorepeat 1
endanim
-; 0xd1efb
--- a/gfx/pokemon/gastly/anim.asm
+++ b/gfx/pokemon/gastly/anim.asm
@@ -5,4 +5,3 @@
frame 0, 12
frame 1, 12
endanim
-; 0xd0ddd
--- a/gfx/pokemon/gastly/anim_idle.asm
+++ b/gfx/pokemon/gastly/anim_idle.asm
@@ -3,4 +3,3 @@
frame 3, 06
dorepeat 1
endanim
-; 0xd1c57
--- a/gfx/pokemon/gengar/anim.asm
+++ b/gfx/pokemon/gengar/anim.asm
@@ -6,4 +6,3 @@
frame 3, 09
dorepeat 4
endanim
-; 0xd0df7
--- a/gfx/pokemon/gengar/anim_idle.asm
+++ b/gfx/pokemon/gengar/anim_idle.asm
@@ -6,4 +6,3 @@
frame 6, 09
frame 5, 09
endanim
-; 0xd1c69
--- a/gfx/pokemon/geodude/anim.asm
+++ b/gfx/pokemon/geodude/anim.asm
@@ -5,4 +5,3 @@
frame 1, 07
dorepeat 3
endanim
-; 0xd0ceb
--- a/gfx/pokemon/geodude/anim_idle.asm
+++ b/gfx/pokemon/geodude/anim_idle.asm
@@ -3,4 +3,3 @@
frame 3, 08
dorepeat 1
endanim
-; 0xd1ba9
--- a/gfx/pokemon/girafarig/anim.asm
+++ b/gfx/pokemon/girafarig/anim.asm
@@ -11,4 +11,3 @@
frame 5, 05
frame 3, 05
endanim
-; 0xd141c
--- a/gfx/pokemon/girafarig/anim_idle.asm
+++ b/gfx/pokemon/girafarig/anim_idle.asm
@@ -1,4 +1,3 @@
frame 5, 16
frame 3, 16
endanim
-; 0xd206e
--- a/gfx/pokemon/gligar/anim.asm
+++ b/gfx/pokemon/gligar/anim.asm
@@ -1,3 +1,2 @@
frame 1, 35
endanim
-; 0xd1444
--- a/gfx/pokemon/gligar/anim_idle.asm
+++ b/gfx/pokemon/gligar/anim_idle.asm
@@ -1,3 +1,2 @@
frame 1, 35
endanim
-; 0xd208c
--- a/gfx/pokemon/gloom/anim.asm
+++ b/gfx/pokemon/gloom/anim.asm
@@ -9,4 +9,3 @@
frame 0, 06
frame 5, 06
endanim
-; 0xd0b35
--- a/gfx/pokemon/gloom/anim_idle.asm
+++ b/gfx/pokemon/gloom/anim_idle.asm
@@ -3,4 +3,3 @@
frame 5, 10
dorepeat 1
endanim
-; 0xd1a75
--- a/gfx/pokemon/golbat/anim.asm
+++ b/gfx/pokemon/golbat/anim.asm
@@ -8,4 +8,3 @@
frame 1, 08
dorepeat 6
endanim
-; 0xd0b0d
--- a/gfx/pokemon/golbat/anim_idle.asm
+++ b/gfx/pokemon/golbat/anim_idle.asm
@@ -3,4 +3,3 @@
frame 4, 06
dorepeat 1
endanim
-; 0xd1a63
--- a/gfx/pokemon/goldeen/anim.asm
+++ b/gfx/pokemon/goldeen/anim.asm
@@ -5,4 +5,3 @@
frame 0, 12
dorepeat 3
endanim
-; 0xd0f61
--- a/gfx/pokemon/goldeen/anim_idle.asm
+++ b/gfx/pokemon/goldeen/anim_idle.asm
@@ -3,4 +3,3 @@
frame 3, 07
dorepeat 1
endanim
-; 0xd1d49
--- a/gfx/pokemon/golduck/anim.asm
+++ b/gfx/pokemon/golduck/anim.asm
@@ -10,4 +10,3 @@
frame 6, 10
dorepeat 8
endanim
-; 0xd0bf4
--- a/gfx/pokemon/golduck/anim_idle.asm
+++ b/gfx/pokemon/golduck/anim_idle.asm
@@ -3,4 +3,3 @@
frame 7, 15
dorepeat 1
endanim
-; 0xd1ae2
--- a/gfx/pokemon/golem/anim.asm
+++ b/gfx/pokemon/golem/anim.asm
@@ -4,4 +4,3 @@
frame 1, 12
frame 3, 12
endanim
-; 0xd0d07
--- a/gfx/pokemon/golem/anim_idle.asm
+++ b/gfx/pokemon/golem/anim_idle.asm
@@ -3,4 +3,3 @@
frame 4, 08
dorepeat 1
endanim
-; 0xd1bbd
--- a/gfx/pokemon/granbull/anim.asm
+++ b/gfx/pokemon/granbull/anim.asm
@@ -5,4 +5,3 @@
frame 0, 07
dorepeat 3
endanim
-; 0xd146f
--- a/gfx/pokemon/granbull/anim_idle.asm
+++ b/gfx/pokemon/granbull/anim_idle.asm
@@ -3,4 +3,3 @@
frame 2, 06
dorepeat 1
endanim
-; 0xd20a7
--- a/gfx/pokemon/graveler/anim.asm
+++ b/gfx/pokemon/graveler/anim.asm
@@ -7,4 +7,3 @@
frame 4, 09
dorepeat 5
endanim
-; 0xd0cfc
--- a/gfx/pokemon/graveler/anim_idle.asm
+++ b/gfx/pokemon/graveler/anim_idle.asm
@@ -4,4 +4,3 @@
frame 5, 20
dorepeat 2
endanim
-; 0xd1bb4
--- a/gfx/pokemon/grimer/anim.asm
+++ b/gfx/pokemon/grimer/anim.asm
@@ -3,4 +3,3 @@
frame 1, 08
frame 2, 28
endanim
-; 0xd0db3
--- a/gfx/pokemon/grimer/anim_idle.asm
+++ b/gfx/pokemon/grimer/anim_idle.asm
@@ -5,4 +5,3 @@
dorepeat 2
frame 2, 16
endanim
-; 0xd1c37
--- a/gfx/pokemon/growlithe/anim.asm
+++ b/gfx/pokemon/growlithe/anim.asm
@@ -6,4 +6,3 @@
frame 2, 08
dorepeat 4
endanim
-; 0xd0c1b
--- a/gfx/pokemon/growlithe/anim_idle.asm
+++ b/gfx/pokemon/growlithe/anim_idle.asm
@@ -4,4 +4,3 @@
dorepeat 1
frame 2, 16
endanim
-; 0xd1b03
--- a/gfx/pokemon/gyarados/anim.asm
+++ b/gfx/pokemon/gyarados/anim.asm
@@ -3,4 +3,3 @@
frame 2, 11
dorepeat 1
endanim
-; 0xd100b
--- a/gfx/pokemon/gyarados/anim_idle.asm
+++ b/gfx/pokemon/gyarados/anim_idle.asm
@@ -3,4 +3,3 @@
frame 3, 08
dorepeat 1
endanim
-; 0xd1db7
--- a/gfx/pokemon/haunter/anim.asm
+++ b/gfx/pokemon/haunter/anim.asm
@@ -4,4 +4,3 @@
frame 2, 10
frame 1, 10
endanim
-; 0xd0de8
--- a/gfx/pokemon/haunter/anim_idle.asm
+++ b/gfx/pokemon/haunter/anim_idle.asm
@@ -1,3 +1,2 @@
frame 4, 58
endanim
-; 0xd1c5a
--- a/gfx/pokemon/heracross/anim.asm
+++ b/gfx/pokemon/heracross/anim.asm
@@ -2,4 +2,3 @@
frame 1, 20
frame 2, 18
endanim
-; 0xd14a5
--- a/gfx/pokemon/heracross/anim_idle.asm
+++ b/gfx/pokemon/heracross/anim_idle.asm
@@ -3,4 +3,3 @@
frame 3, 08
dorepeat 1
endanim
-; 0xd20cb
--- a/gfx/pokemon/hitmonchan/anim.asm
+++ b/gfx/pokemon/hitmonchan/anim.asm
@@ -8,4 +8,3 @@
frame 1, 40
frame 2, 10
endanim
-; 0xd0eda
--- a/gfx/pokemon/hitmonchan/anim_idle.asm
+++ b/gfx/pokemon/hitmonchan/anim_idle.asm
@@ -5,4 +5,3 @@
dorepeat 2
frame 4, 20
endanim
-; 0xd1ce2
--- a/gfx/pokemon/hitmonlee/anim.asm
+++ b/gfx/pokemon/hitmonlee/anim.asm
@@ -10,4 +10,3 @@
frame 4, 05
frame 1, 08
endanim
-; 0xd0ec7
--- a/gfx/pokemon/hitmonlee/anim_idle.asm
+++ b/gfx/pokemon/hitmonlee/anim_idle.asm
@@ -3,4 +3,3 @@
frame 5, 08
dorepeat 1
endanim
-; 0xd1cd5
--- a/gfx/pokemon/hitmontop/anim.asm
+++ b/gfx/pokemon/hitmontop/anim.asm
@@ -6,4 +6,3 @@
dorepeat 3
frame 4, 25
endanim
-; 0xd15c6
--- a/gfx/pokemon/hitmontop/anim_idle.asm
+++ b/gfx/pokemon/hitmontop/anim_idle.asm
@@ -4,4 +4,3 @@
dorepeat 1
frame 4, 30
endanim
-; 0xd2192
--- a/gfx/pokemon/ho_oh/anim.asm
+++ b/gfx/pokemon/ho_oh/anim.asm
@@ -8,4 +8,3 @@
frame 0, 06
frame 4, 12
endanim
-; 0xd1679
--- a/gfx/pokemon/ho_oh/anim_idle.asm
+++ b/gfx/pokemon/ho_oh/anim_idle.asm
@@ -3,4 +3,3 @@
frame 4, 06
dorepeat 1
endanim
-; 0xd2215
--- a/gfx/pokemon/hoothoot/anim.asm
+++ b/gfx/pokemon/hoothoot/anim.asm
@@ -9,4 +9,3 @@
frame 5, 05
dorepeat 7
endanim
-; 0xd1208
--- a/gfx/pokemon/hoothoot/anim_idle.asm
+++ b/gfx/pokemon/hoothoot/anim_idle.asm
@@ -5,4 +5,3 @@
frame 0, 13
frame 5, 05
endanim
-; 0xd1f08
--- a/gfx/pokemon/hoppip/anim.asm
+++ b/gfx/pokemon/hoppip/anim.asm
@@ -3,4 +3,3 @@
frame 2, 10
dorepeat 1
endanim
-; 0xd134e
--- a/gfx/pokemon/hoppip/anim_idle.asm
+++ b/gfx/pokemon/hoppip/anim_idle.asm
@@ -4,4 +4,3 @@
dorepeat 1
frame 2, 20
endanim
-; 0xd1ff0
--- a/gfx/pokemon/horsea/anim.asm
+++ b/gfx/pokemon/horsea/anim.asm
@@ -5,4 +5,3 @@
frame 3, 03
dorepeat 3
endanim
-; 0xd0f49
--- a/gfx/pokemon/horsea/anim_idle.asm
+++ b/gfx/pokemon/horsea/anim_idle.asm
@@ -3,4 +3,3 @@
frame 4, 06
dorepeat 1
endanim
-; 0xd1d35
--- a/gfx/pokemon/houndoom/anim.asm
+++ b/gfx/pokemon/houndoom/anim.asm
@@ -7,4 +7,3 @@
frame 3, 04
frame 4, 08
endanim
-; 0xd1560
--- a/gfx/pokemon/houndoom/anim_idle.asm
+++ b/gfx/pokemon/houndoom/anim_idle.asm
@@ -3,4 +3,3 @@
frame 5, 12
dorepeat 1
endanim
-; 0xd214e
--- a/gfx/pokemon/houndour/anim.asm
+++ b/gfx/pokemon/houndour/anim.asm
@@ -4,4 +4,3 @@
frame 0, 07
frame 3, 07
endanim
-; 0xd154f
--- a/gfx/pokemon/houndour/anim_idle.asm
+++ b/gfx/pokemon/houndour/anim_idle.asm
@@ -5,4 +5,3 @@
dorepeat 2
frame 3, 16
endanim
-; 0xd2145
--- a/gfx/pokemon/hypno/anim.asm
+++ b/gfx/pokemon/hypno/anim.asm
@@ -4,4 +4,3 @@
frame 3, 15
dorepeat 1
endanim
-; 0xd0e26
--- a/gfx/pokemon/hypno/anim_idle.asm
+++ b/gfx/pokemon/hypno/anim_idle.asm
@@ -3,4 +3,3 @@
frame 4, 08
dorepeat 1
endanim
-; 0xd1c8a
--- a/gfx/pokemon/igglybuff/anim.asm
+++ b/gfx/pokemon/igglybuff/anim.asm
@@ -3,4 +3,3 @@
frame 2, 14
frame 1, 06
endanim
-; 0xd1299
--- a/gfx/pokemon/igglybuff/anim_idle.asm
+++ b/gfx/pokemon/igglybuff/anim_idle.asm
@@ -3,4 +3,3 @@
frame 3, 06
dorepeat 1
endanim
-; 0xd1f71
--- a/gfx/pokemon/ivysaur/anim.asm
+++ b/gfx/pokemon/ivysaur/anim.asm
@@ -3,4 +3,3 @@
frame 2, 20
frame 1, 06
endanim
-; 0xd08a5
--- a/gfx/pokemon/ivysaur/anim_idle.asm
+++ b/gfx/pokemon/ivysaur/anim_idle.asm
@@ -5,4 +5,3 @@
frame 0, 08
frame 1, 06
endanim
-; 0xd18ad
--- a/gfx/pokemon/jigglypuff/anim.asm
+++ b/gfx/pokemon/jigglypuff/anim.asm
@@ -8,4 +8,3 @@
frame 4, 05
dorepeat 6
endanim
-; 0xd0ade
--- a/gfx/pokemon/jigglypuff/anim_idle.asm
+++ b/gfx/pokemon/jigglypuff/anim_idle.asm
@@ -3,4 +3,3 @@
frame 1, 07
dorepeat 1
endanim
-; 0xd1a46
--- a/gfx/pokemon/jolteon/anim.asm
+++ b/gfx/pokemon/jolteon/anim.asm
@@ -7,4 +7,3 @@
frame 4, 06
dorepeat 5
endanim
-; 0xd1054
--- a/gfx/pokemon/jolteon/anim_idle.asm
+++ b/gfx/pokemon/jolteon/anim_idle.asm
@@ -3,4 +3,3 @@
frame 3, 08
dorepeat 1
endanim
-; 0xd1de8
--- a/gfx/pokemon/jumpluff/anim.asm
+++ b/gfx/pokemon/jumpluff/anim.asm
@@ -2,4 +2,3 @@
frame 2, 09
frame 3, 09
endanim
-; 0xd135e
--- a/gfx/pokemon/jumpluff/anim_idle.asm
+++ b/gfx/pokemon/jumpluff/anim_idle.asm
@@ -3,4 +3,3 @@
frame 4, 08
dorepeat 1
endanim
-; 0xd2002
--- a/gfx/pokemon/jynx/anim.asm
+++ b/gfx/pokemon/jynx/anim.asm
@@ -5,4 +5,3 @@
frame 1, 16
dorepeat 1
endanim
-; 0xd0fb5
--- a/gfx/pokemon/jynx/anim_idle.asm
+++ b/gfx/pokemon/jynx/anim_idle.asm
@@ -3,4 +3,3 @@
frame 3, 06
dorepeat 1
endanim
-; 0xd1d81
--- a/gfx/pokemon/kabuto/anim.asm
+++ b/gfx/pokemon/kabuto/anim.asm
@@ -3,4 +3,3 @@
frame 1, 16
frame 2, 12
endanim
-; 0xd1085
--- a/gfx/pokemon/kabuto/anim_idle.asm
+++ b/gfx/pokemon/kabuto/anim_idle.asm
@@ -5,4 +5,3 @@
frame 0, 18
frame 3, 04
endanim
-; 0xd1e19
--- a/gfx/pokemon/kabutops/anim.asm
+++ b/gfx/pokemon/kabutops/anim.asm
@@ -5,4 +5,3 @@
dorepeat 2
frame 1, 25
endanim
-; 0xd1092
--- a/gfx/pokemon/kabutops/anim_idle.asm
+++ b/gfx/pokemon/kabutops/anim_idle.asm
@@ -3,4 +3,3 @@
frame 3, 08
dorepeat 1
endanim
-; 0xd1e22
--- a/gfx/pokemon/kadabra/anim.asm
+++ b/gfx/pokemon/kadabra/anim.asm
@@ -5,4 +5,3 @@
dorepeat 2
frame 1, 12
endanim
-; 0xd0c67
--- a/gfx/pokemon/kadabra/anim_idle.asm
+++ b/gfx/pokemon/kadabra/anim_idle.asm
@@ -3,4 +3,3 @@
frame 4, 07
dorepeat 1
endanim
-; 0xd1b41
--- a/gfx/pokemon/kakuna/anim.asm
+++ b/gfx/pokemon/kakuna/anim.asm
@@ -1,4 +1,3 @@
frame 0, 12
frame 1, 24
endanim
-; 0xd093f
--- a/gfx/pokemon/kakuna/anim_idle.asm
+++ b/gfx/pokemon/kakuna/anim_idle.asm
@@ -3,4 +3,3 @@
frame 1, 07
dorepeat 1
endanim
-; 0xd192b
--- a/gfx/pokemon/kangaskhan/anim.asm
+++ b/gfx/pokemon/kangaskhan/anim.asm
@@ -6,4 +6,3 @@
frame 3, 09
frame 4, 15
endanim
-; 0xd0f3c
--- a/gfx/pokemon/kangaskhan/anim_idle.asm
+++ b/gfx/pokemon/kangaskhan/anim_idle.asm
@@ -5,4 +5,3 @@
frame 0, 15
frame 4, 25
endanim
-; 0xd1d2c
--- a/gfx/pokemon/kingdra/anim.asm
+++ b/gfx/pokemon/kingdra/anim.asm
@@ -7,4 +7,3 @@
frame 5, 06
dorepeat 5
endanim
-; 0xd1571
--- a/gfx/pokemon/kingdra/anim_idle.asm
+++ b/gfx/pokemon/kingdra/anim_idle.asm
@@ -3,4 +3,3 @@
frame 6, 06
dorepeat 1
endanim
-; 0xd2157
--- a/gfx/pokemon/kingler/anim.asm
+++ b/gfx/pokemon/kingler/anim.asm
@@ -7,4 +7,3 @@
frame 0, 15
frame 2, 15
endanim
-; 0xd0e4a
--- a/gfx/pokemon/kingler/anim_idle.asm
+++ b/gfx/pokemon/kingler/anim_idle.asm
@@ -3,4 +3,3 @@
frame 3, 10
dorepeat 1
endanim
-; 0xd1c9a
--- a/gfx/pokemon/koffing/anim.asm
+++ b/gfx/pokemon/koffing/anim.asm
@@ -4,4 +4,3 @@
frame 4, 10
frame 5, 15
endanim
-; 0xd0ef0
--- a/gfx/pokemon/koffing/anim_idle.asm
+++ b/gfx/pokemon/koffing/anim_idle.asm
@@ -1,3 +1,2 @@
frame 5, 48
endanim
-; 0xd1cee
--- a/gfx/pokemon/krabby/anim.asm
+++ b/gfx/pokemon/krabby/anim.asm
@@ -8,4 +8,3 @@
frame 4, 03
dorepeat 3
endanim
-; 0xd0e39
--- a/gfx/pokemon/krabby/anim_idle.asm
+++ b/gfx/pokemon/krabby/anim_idle.asm
@@ -2,4 +2,3 @@
frame 7, 06
dorepeat 3
endanim
-; 0xd1c91
--- a/gfx/pokemon/lanturn/anim.asm
+++ b/gfx/pokemon/lanturn/anim.asm
@@ -6,4 +6,3 @@
frame 4, 05
dorepeat 4
endanim
-; 0xd1280
--- a/gfx/pokemon/lanturn/anim_idle.asm
+++ b/gfx/pokemon/lanturn/anim_idle.asm
@@ -3,4 +3,3 @@
frame 4, 06
dorepeat 1
endanim
-; 0xd1f56
--- a/gfx/pokemon/lapras/anim.asm
+++ b/gfx/pokemon/lapras/anim.asm
@@ -4,4 +4,3 @@
frame 2, 09
frame 1, 10
endanim
-; 0xd1016
--- a/gfx/pokemon/lapras/anim_idle.asm
+++ b/gfx/pokemon/lapras/anim_idle.asm
@@ -3,4 +3,3 @@
frame 0, 12
frame 5, 12
endanim
-; 0xd1dc0
--- a/gfx/pokemon/larvitar/anim.asm
+++ b/gfx/pokemon/larvitar/anim.asm
@@ -3,4 +3,3 @@
frame 2, 28
frame 3, 08
endanim
-; 0xd163d
--- a/gfx/pokemon/larvitar/anim_idle.asm
+++ b/gfx/pokemon/larvitar/anim_idle.asm
@@ -3,4 +3,3 @@
frame 3, 06
dorepeat 1
endanim
-; 0xd21eb
--- a/gfx/pokemon/ledian/anim.asm
+++ b/gfx/pokemon/ledian/anim.asm
@@ -6,4 +6,3 @@
dorepeat 3
frame 1, 08
endanim
-; 0xd1233
--- a/gfx/pokemon/ledian/anim_idle.asm
+++ b/gfx/pokemon/ledian/anim_idle.asm
@@ -3,4 +3,3 @@
frame 4, 05
dorepeat 1
endanim
-; 0xd1f25
--- a/gfx/pokemon/ledyba/anim.asm
+++ b/gfx/pokemon/ledyba/anim.asm
@@ -4,4 +4,3 @@
frame 3, 12
dorepeat 2
endanim
-; 0xd1224
--- a/gfx/pokemon/ledyba/anim_idle.asm
+++ b/gfx/pokemon/ledyba/anim_idle.asm
@@ -4,4 +4,3 @@
frame 3, 05
dorepeat 2
endanim
-; 0xd1f1c
--- a/gfx/pokemon/lickitung/anim.asm
+++ b/gfx/pokemon/lickitung/anim.asm
@@ -4,4 +4,3 @@
frame 0, 06
frame 3, 06
endanim
-; 0xd0ee5
--- a/gfx/pokemon/lickitung/anim_idle.asm
+++ b/gfx/pokemon/lickitung/anim_idle.asm
@@ -3,4 +3,3 @@
frame 4, 06
dorepeat 1
endanim
-; 0xd1ceb
--- a/gfx/pokemon/lugia/anim.asm
+++ b/gfx/pokemon/lugia/anim.asm
@@ -5,4 +5,3 @@
frame 5, 14
frame 6, 11
endanim
-; 0xd1666
--- a/gfx/pokemon/lugia/anim_idle.asm
+++ b/gfx/pokemon/lugia/anim_idle.asm
@@ -5,4 +5,3 @@
frame 8, 10
frame 3, 10
endanim
-; 0xd220c
--- a/gfx/pokemon/machamp/anim.asm
+++ b/gfx/pokemon/machamp/anim.asm
@@ -8,4 +8,3 @@
dorepeat 3
frame 7, 08
endanim
-; 0xd0c9d
--- a/gfx/pokemon/machamp/anim_idle.asm
+++ b/gfx/pokemon/machamp/anim_idle.asm
@@ -3,4 +3,3 @@
frame 5, 07
dorepeat 1
endanim
-; 0xd1b6b
--- a/gfx/pokemon/machoke/anim.asm
+++ b/gfx/pokemon/machoke/anim.asm
@@ -2,4 +2,3 @@
frame 2, 40
frame 1, 10
endanim
-; 0xd0c8a
--- a/gfx/pokemon/machoke/anim_idle.asm
+++ b/gfx/pokemon/machoke/anim_idle.asm
@@ -7,4 +7,3 @@
frame 6, 08
dorepeat 5
endanim
-; 0xd1b62
--- a/gfx/pokemon/machop/anim.asm
+++ b/gfx/pokemon/machop/anim.asm
@@ -5,4 +5,3 @@
frame 1, 12
dorepeat 3
endanim
-; 0xd0c83
--- a/gfx/pokemon/machop/anim_idle.asm
+++ b/gfx/pokemon/machop/anim_idle.asm
@@ -3,4 +3,3 @@
frame 3, 06
dorepeat 1
endanim
-; 0xd1b51
--- a/gfx/pokemon/magby/anim.asm
+++ b/gfx/pokemon/magby/anim.asm
@@ -5,4 +5,3 @@
dorepeat 2
frame 4, 16
endanim
-; 0xd15ed
--- a/gfx/pokemon/magby/anim_idle.asm
+++ b/gfx/pokemon/magby/anim_idle.asm
@@ -3,4 +3,3 @@
frame 5, 09
dorepeat 1
endanim
-; 0xd21af
--- a/gfx/pokemon/magcargo/anim.asm
+++ b/gfx/pokemon/magcargo/anim.asm
@@ -4,4 +4,3 @@
frame 4, 10
frame 1, 25
endanim
-; 0xd14e4
--- a/gfx/pokemon/magcargo/anim_idle.asm
+++ b/gfx/pokemon/magcargo/anim_idle.asm
@@ -1,3 +1,2 @@
frame 1, 60
endanim
-; 0xd20f0
--- a/gfx/pokemon/magikarp/anim.asm
+++ b/gfx/pokemon/magikarp/anim.asm
@@ -4,4 +4,3 @@
frame 2, 07
dorepeat 2
endanim
-; 0xd1002
--- a/gfx/pokemon/magikarp/anim_idle.asm
+++ b/gfx/pokemon/magikarp/anim_idle.asm
@@ -3,4 +3,3 @@
frame 3, 10
dorepeat 1
endanim
-; 0xd1dae
--- a/gfx/pokemon/magmar/anim.asm
+++ b/gfx/pokemon/magmar/anim.asm
@@ -4,4 +4,3 @@
frame 3, 07
dorepeat 2
endanim
-; 0xd0fd7
--- a/gfx/pokemon/magmar/anim_idle.asm
+++ b/gfx/pokemon/magmar/anim_idle.asm
@@ -3,4 +3,3 @@
frame 4, 07
dorepeat 1
endanim
-; 0xd1d93
--- a/gfx/pokemon/magnemite/anim.asm
+++ b/gfx/pokemon/magnemite/anim.asm
@@ -5,4 +5,3 @@
frame 0, 08
dorepeat 1
endanim
-; 0xd0d5c
--- a/gfx/pokemon/magnemite/anim_idle.asm
+++ b/gfx/pokemon/magnemite/anim_idle.asm
@@ -4,4 +4,3 @@
frame 6, 08
dorepeat 1
endanim
-; 0xd1be4
--- a/gfx/pokemon/magneton/anim.asm
+++ b/gfx/pokemon/magneton/anim.asm
@@ -9,4 +9,3 @@
frame 2, 04
frame 3, 04
endanim
-; 0xd0d71
--- a/gfx/pokemon/magneton/anim_idle.asm
+++ b/gfx/pokemon/magneton/anim_idle.asm
@@ -6,4 +6,3 @@
frame 2, 24
frame 3, 24
endanim
-; 0xd1bf3
--- a/gfx/pokemon/mankey/anim.asm
+++ b/gfx/pokemon/mankey/anim.asm
@@ -4,4 +4,3 @@
frame 2, 08
dorepeat 2
endanim
-; 0xd0bff
--- a/gfx/pokemon/mankey/anim_idle.asm
+++ b/gfx/pokemon/mankey/anim_idle.asm
@@ -3,4 +3,3 @@
frame 3, 06
dorepeat 1
endanim
-; 0xd1aeb
--- a/gfx/pokemon/mantine/anim.asm
+++ b/gfx/pokemon/mantine/anim.asm
@@ -6,4 +6,3 @@
frame 0, 15
frame 5, 15
endanim
-; 0xd1539
--- a/gfx/pokemon/mantine/anim_idle.asm
+++ b/gfx/pokemon/mantine/anim_idle.asm
@@ -3,4 +3,3 @@
frame 6, 08
dorepeat 1
endanim
-; 0xd212f
--- a/gfx/pokemon/mareep/anim.asm
+++ b/gfx/pokemon/mareep/anim.asm
@@ -6,4 +6,3 @@
frame 2, 06
dorepeat 4
endanim
-; 0xd12dc
--- a/gfx/pokemon/mareep/anim_idle.asm
+++ b/gfx/pokemon/mareep/anim_idle.asm
@@ -3,4 +3,3 @@
frame 2, 07
dorepeat 1
endanim
-; 0xd1fa2
--- a/gfx/pokemon/marill/anim.asm
+++ b/gfx/pokemon/marill/anim.asm
@@ -6,4 +6,3 @@
frame 3, 10
dorepeat 4
endanim
-; 0xd131a
--- a/gfx/pokemon/marill/anim_idle.asm
+++ b/gfx/pokemon/marill/anim_idle.asm
@@ -4,4 +4,3 @@
frame 5, 08
dorepeat 2
endanim
-; 0xd1fca
--- a/gfx/pokemon/marowak/anim.asm
+++ b/gfx/pokemon/marowak/anim.asm
@@ -7,4 +7,3 @@
frame 4, 07
dorepeat 5
endanim
-; 0xd0eb0
--- a/gfx/pokemon/marowak/anim_idle.asm
+++ b/gfx/pokemon/marowak/anim_idle.asm
@@ -3,4 +3,3 @@
frame 5, 15
dorepeat 1
endanim
-; 0xd1ccc
--- a/gfx/pokemon/meganium/anim.asm
+++ b/gfx/pokemon/meganium/anim.asm
@@ -8,4 +8,3 @@
frame 3, 07
dorepeat 6
endanim
-; 0xd117f
--- a/gfx/pokemon/meganium/anim_idle.asm
+++ b/gfx/pokemon/meganium/anim_idle.asm
@@ -3,4 +3,3 @@
frame 4, 06
dorepeat 1
endanim
-; 0xd1eb1
--- a/gfx/pokemon/meowth/anim.asm
+++ b/gfx/pokemon/meowth/anim.asm
@@ -4,4 +4,3 @@
frame 3, 14
dorepeat 2
endanim
-; 0xd0bbf
--- a/gfx/pokemon/meowth/anim_idle.asm
+++ b/gfx/pokemon/meowth/anim_idle.asm
@@ -3,4 +3,3 @@
frame 4, 08
dorepeat 1
endanim
-; 0xd1ac7
--- a/gfx/pokemon/metapod/anim.asm
+++ b/gfx/pokemon/metapod/anim.asm
@@ -2,4 +2,3 @@
frame 2, 24
frame 1, 12
endanim
-; 0xd091c
--- a/gfx/pokemon/metapod/anim_idle.asm
+++ b/gfx/pokemon/metapod/anim_idle.asm
@@ -4,4 +4,3 @@
frame 4, 06
dorepeat 1
endanim
-; 0xd1904
--- a/gfx/pokemon/mew/anim.asm
+++ b/gfx/pokemon/mew/anim.asm
@@ -15,4 +15,3 @@
frame 0, 15
frame 4, 15
endanim
-; 0xd1154
--- a/gfx/pokemon/mew/anim_idle.asm
+++ b/gfx/pokemon/mew/anim_idle.asm
@@ -6,4 +6,3 @@
frame 4, 20
dorepeat 1
endanim
-; 0xd1e96
--- a/gfx/pokemon/mewtwo/anim.asm
+++ b/gfx/pokemon/mewtwo/anim.asm
@@ -14,4 +14,3 @@
frame 5, 14
frame 3, 04
endanim
-; 0xd1133
--- a/gfx/pokemon/mewtwo/anim_idle.asm
+++ b/gfx/pokemon/mewtwo/anim_idle.asm
@@ -3,4 +3,3 @@
frame 1, 06
dorepeat 1
endanim
-; 0xd1e87
--- a/gfx/pokemon/miltank/anim.asm
+++ b/gfx/pokemon/miltank/anim.asm
@@ -5,4 +5,3 @@
dorepeat 2
frame 3, 05
endanim
-; 0xd15fa
--- a/gfx/pokemon/miltank/anim_idle.asm
+++ b/gfx/pokemon/miltank/anim_idle.asm
@@ -3,4 +3,3 @@
frame 3, 05
dorepeat 1
endanim
-; 0xd21b8
--- a/gfx/pokemon/misdreavus/anim.asm
+++ b/gfx/pokemon/misdreavus/anim.asm
@@ -2,4 +2,3 @@
frame 2, 13
frame 3, 13
endanim
-; 0xd13e9
--- a/gfx/pokemon/misdreavus/anim_idle.asm
+++ b/gfx/pokemon/misdreavus/anim_idle.asm
@@ -3,4 +3,3 @@
frame 0, 08
dorepeat 1
endanim
-; 0xd205d
--- a/gfx/pokemon/moltres/anim.asm
+++ b/gfx/pokemon/moltres/anim.asm
@@ -10,4 +10,3 @@
frame 0, 12
frame 1, 12
endanim
-; 0xd10e3
--- a/gfx/pokemon/moltres/anim_idle.asm
+++ b/gfx/pokemon/moltres/anim_idle.asm
@@ -6,4 +6,3 @@
frame 1, 12
frame 5, 12
endanim
-; 0xd1e57
--- a/gfx/pokemon/mr__mime/anim.asm
+++ b/gfx/pokemon/mr__mime/anim.asm
@@ -8,4 +8,3 @@
frame 0, 32
frame 6, 06
endanim
-; 0xd0f99
--- a/gfx/pokemon/mr__mime/anim_idle.asm
+++ b/gfx/pokemon/mr__mime/anim_idle.asm
@@ -3,4 +3,3 @@
frame 6, 06
dorepeat 1
endanim
-; 0xd1d6f
--- a/gfx/pokemon/muk/anim.asm
+++ b/gfx/pokemon/muk/anim.asm
@@ -3,4 +3,3 @@
frame 3, 12
frame 1, 12
endanim
-; 0xd0dbc
--- a/gfx/pokemon/muk/anim_idle.asm
+++ b/gfx/pokemon/muk/anim_idle.asm
@@ -3,4 +3,3 @@
frame 4, 12
dorepeat 1
endanim
-; 0xd1c40
--- a/gfx/pokemon/murkrow/anim.asm
+++ b/gfx/pokemon/murkrow/anim.asm
@@ -7,4 +7,3 @@
frame 0, 07
frame 1, 07
endanim
-; 0xd13cf
--- a/gfx/pokemon/murkrow/anim_idle.asm
+++ b/gfx/pokemon/murkrow/anim_idle.asm
@@ -3,4 +3,3 @@
frame 3, 07
dorepeat 1
endanim
-; 0xd204f
--- a/gfx/pokemon/natu/anim.asm
+++ b/gfx/pokemon/natu/anim.asm
@@ -3,4 +3,3 @@
frame 3, 25
frame 2, 10
endanim
-; 0xd12bc
--- a/gfx/pokemon/natu/anim_idle.asm
+++ b/gfx/pokemon/natu/anim_idle.asm
@@ -1,3 +1,2 @@
frame 4, 35
endanim
-; 0xd1f86
--- a/gfx/pokemon/nidoking/anim.asm
+++ b/gfx/pokemon/nidoking/anim.asm
@@ -3,4 +3,3 @@
frame 2, 36
frame 1, 12
endanim
-; 0xd0a8f
--- a/gfx/pokemon/nidoking/anim_idle.asm
+++ b/gfx/pokemon/nidoking/anim_idle.asm
@@ -3,4 +3,3 @@
frame 3, 06
dorepeat 1
endanim
-; 0xd1a13
--- a/gfx/pokemon/nidoqueen/anim.asm
+++ b/gfx/pokemon/nidoqueen/anim.asm
@@ -7,4 +7,3 @@
frame 0, 10
frame 5, 10
endanim
-; 0xd0a64
--- a/gfx/pokemon/nidoqueen/anim_idle.asm
+++ b/gfx/pokemon/nidoqueen/anim_idle.asm
@@ -4,4 +4,3 @@
frame 6, 07
dorepeat 2
endanim
-; 0xd19f4
--- a/gfx/pokemon/nidoran_f/anim.asm
+++ b/gfx/pokemon/nidoran_f/anim.asm
@@ -5,4 +5,3 @@
frame 0, 05
dorepeat 3
endanim
-; 0xd0a44
--- a/gfx/pokemon/nidoran_f/anim_idle.asm
+++ b/gfx/pokemon/nidoran_f/anim_idle.asm
@@ -3,4 +3,3 @@
frame 4, 05
dorepeat 1
endanim
-; 0xd19e0
--- a/gfx/pokemon/nidoran_m/anim.asm
+++ b/gfx/pokemon/nidoran_m/anim.asm
@@ -5,4 +5,3 @@
frame 1, 06
dorepeat 3
endanim
-; 0xd0a71
--- a/gfx/pokemon/nidoran_m/anim_idle.asm
+++ b/gfx/pokemon/nidoran_m/anim_idle.asm
@@ -3,4 +3,3 @@
frame 3, 06
dorepeat 1
endanim
-; 0xd19fd
--- a/gfx/pokemon/nidorina/anim.asm
+++ b/gfx/pokemon/nidorina/anim.asm
@@ -6,4 +6,3 @@
frame 2, 06
dorepeat 2
endanim
-; 0xd0a53
--- a/gfx/pokemon/nidorina/anim_idle.asm
+++ b/gfx/pokemon/nidorina/anim_idle.asm
@@ -3,4 +3,3 @@
frame 4, 04
dorepeat 1
endanim
-; 0xd19e9
--- a/gfx/pokemon/nidorino/anim.asm
+++ b/gfx/pokemon/nidorino/anim.asm
@@ -9,4 +9,3 @@
frame 3, 06
dorepeat 6
endanim
-; 0xd0a86
--- a/gfx/pokemon/nidorino/anim_idle.asm
+++ b/gfx/pokemon/nidorino/anim_idle.asm
@@ -5,4 +5,3 @@
frame 0, 06
frame 4, 06
endanim
-; 0xd1a0a
--- a/gfx/pokemon/ninetales/anim.asm
+++ b/gfx/pokemon/ninetales/anim.asm
@@ -7,4 +7,3 @@
frame 2, 10
frame 1, 08
endanim
-; 0xd0acb
--- a/gfx/pokemon/ninetales/anim_idle.asm
+++ b/gfx/pokemon/ninetales/anim_idle.asm
@@ -3,4 +3,3 @@
frame 5, 06
dorepeat 1
endanim
-; 0xd1a3d
--- a/gfx/pokemon/noctowl/anim.asm
+++ b/gfx/pokemon/noctowl/anim.asm
@@ -7,4 +7,3 @@
frame 2, 06
dorepeat 5
endanim
-; 0xd1219
--- a/gfx/pokemon/noctowl/anim_idle.asm
+++ b/gfx/pokemon/noctowl/anim_idle.asm
@@ -3,4 +3,3 @@
frame 5, 08
dorepeat 1
endanim
-; 0xd1f11
--- a/gfx/pokemon/octillery/anim.asm
+++ b/gfx/pokemon/octillery/anim.asm
@@ -5,4 +5,3 @@
frame 0, 05
dorepeat 3
endanim
-; 0xd1515
--- a/gfx/pokemon/octillery/anim_idle.asm
+++ b/gfx/pokemon/octillery/anim_idle.asm
@@ -3,4 +3,3 @@
frame 3, 06
dorepeat 1
endanim
-; 0xd211d
--- a/gfx/pokemon/oddish/anim.asm
+++ b/gfx/pokemon/oddish/anim.asm
@@ -8,4 +8,3 @@
frame 3, 07
dorepeat 6
endanim
-; 0xd0b20
--- a/gfx/pokemon/oddish/anim_idle.asm
+++ b/gfx/pokemon/oddish/anim_idle.asm
@@ -3,4 +3,3 @@
frame 4, 05
dorepeat 1
endanim
-; 0xd1a6c
--- a/gfx/pokemon/omanyte/anim.asm
+++ b/gfx/pokemon/omanyte/anim.asm
@@ -2,4 +2,3 @@
frame 2, 22
frame 1, 08
endanim
-; 0xd1075
--- a/gfx/pokemon/omanyte/anim_idle.asm
+++ b/gfx/pokemon/omanyte/anim_idle.asm
@@ -3,4 +3,3 @@
frame 3, 08
dorepeat 1
endanim
-; 0xd1e03
--- a/gfx/pokemon/omastar/anim.asm
+++ b/gfx/pokemon/omastar/anim.asm
@@ -2,4 +2,3 @@
frame 2, 40
frame 1, 06
endanim
-; 0xd107c
--- a/gfx/pokemon/omastar/anim_idle.asm
+++ b/gfx/pokemon/omastar/anim_idle.asm
@@ -3,4 +3,3 @@
frame 3, 11
dorepeat 1
endanim
-; 0xd1e0c
--- a/gfx/pokemon/onix/anim.asm
+++ b/gfx/pokemon/onix/anim.asm
@@ -7,4 +7,3 @@
frame 5, 12
frame 6, 12
endanim
-; 0xd0e08
--- a/gfx/pokemon/onix/anim_idle.asm
+++ b/gfx/pokemon/onix/anim_idle.asm
@@ -4,4 +4,3 @@
frame 8, 10
dorepeat 1
endanim
-; 0xd1c74
--- a/gfx/pokemon/paras/anim.asm
+++ b/gfx/pokemon/paras/anim.asm
@@ -3,4 +3,3 @@
frame 2, 32
frame 1, 08
endanim
-; 0xd0b4f
--- a/gfx/pokemon/paras/anim_idle.asm
+++ b/gfx/pokemon/paras/anim_idle.asm
@@ -3,4 +3,3 @@
frame 3, 06
dorepeat 1
endanim
-; 0xd1a8b
--- a/gfx/pokemon/parasect/anim.asm
+++ b/gfx/pokemon/parasect/anim.asm
@@ -10,4 +10,3 @@
frame 4, 04
dorepeat 8
endanim
-; 0xd0b66
--- a/gfx/pokemon/parasect/anim_idle.asm
+++ b/gfx/pokemon/parasect/anim_idle.asm
@@ -2,4 +2,3 @@
frame 0, 05
frame 4, 20
endanim
-; 0xd1a92
--- a/gfx/pokemon/persian/anim.asm
+++ b/gfx/pokemon/persian/anim.asm
@@ -7,4 +7,3 @@
frame 3, 08
frame 2, 06
endanim
-; 0xd0bd0
--- a/gfx/pokemon/persian/anim_idle.asm
+++ b/gfx/pokemon/persian/anim_idle.asm
@@ -3,4 +3,3 @@
frame 4, 05
dorepeat 1
endanim
-; 0xd1ad0
--- a/gfx/pokemon/phanpy/anim.asm
+++ b/gfx/pokemon/phanpy/anim.asm
@@ -5,4 +5,3 @@
frame 3, 05
dorepeat 3
endanim
-; 0xd157e
--- a/gfx/pokemon/phanpy/anim_idle.asm
+++ b/gfx/pokemon/phanpy/anim_idle.asm
@@ -3,4 +3,3 @@
frame 3, 05
dorepeat 1
endanim
-; 0xd2160
--- a/gfx/pokemon/pichu/anim.asm
+++ b/gfx/pokemon/pichu/anim.asm
@@ -3,4 +3,3 @@
frame 2, 12
frame 4, 08
endanim
-; 0xd1289
--- a/gfx/pokemon/pichu/anim_idle.asm
+++ b/gfx/pokemon/pichu/anim_idle.asm
@@ -3,4 +3,3 @@
frame 3, 06
dorepeat 1
endanim
-; 0xd1f5f
--- a/gfx/pokemon/pidgeot/anim.asm
+++ b/gfx/pokemon/pidgeot/anim.asm
@@ -5,4 +5,3 @@
frame 2, 06
dorepeat 3
endanim
-; 0xd0987
--- a/gfx/pokemon/pidgeot/anim_idle.asm
+++ b/gfx/pokemon/pidgeot/anim_idle.asm
@@ -6,4 +6,3 @@
frame 0, 06
frame 2, 06
endanim
-; 0xd1961
--- a/gfx/pokemon/pidgeotto/anim.asm
+++ b/gfx/pokemon/pidgeotto/anim.asm
@@ -8,4 +8,3 @@
dorepeat 5
frame 2, 20
endanim
-; 0xd097a
--- a/gfx/pokemon/pidgeotto/anim_idle.asm
+++ b/gfx/pokemon/pidgeotto/anim_idle.asm
@@ -3,4 +3,3 @@
frame 4, 05
dorepeat 1
endanim
-; 0xd1952
--- a/gfx/pokemon/pidgey/anim.asm
+++ b/gfx/pokemon/pidgey/anim.asm
@@ -8,4 +8,3 @@
frame 1, 03
dorepeat 4
endanim
-; 0xd0967
--- a/gfx/pokemon/pidgey/anim_idle.asm
+++ b/gfx/pokemon/pidgey/anim_idle.asm
@@ -5,4 +5,3 @@
frame 1, 04
dorepeat 1
endanim
-; 0xd1949
--- a/gfx/pokemon/pikachu/anim.asm
+++ b/gfx/pokemon/pikachu/anim.asm
@@ -9,4 +9,3 @@
frame 4, 05
dorepeat 7
endanim
-; 0xd0a02
--- a/gfx/pokemon/pikachu/anim_idle.asm
+++ b/gfx/pokemon/pikachu/anim_idle.asm
@@ -7,4 +7,3 @@
frame 4, 05
dorepeat 5
endanim
-; 0xd19ba
--- a/gfx/pokemon/piloswine/anim.asm
+++ b/gfx/pokemon/piloswine/anim.asm
@@ -2,4 +2,3 @@
frame 2, 10
frame 3, 10
endanim
-; 0xd14f6
--- a/gfx/pokemon/piloswine/anim_idle.asm
+++ b/gfx/pokemon/piloswine/anim_idle.asm
@@ -3,4 +3,3 @@
frame 3, 12
dorepeat 1
endanim
-; 0xd2102
--- a/gfx/pokemon/pineco/anim.asm
+++ b/gfx/pokemon/pineco/anim.asm
@@ -1,4 +1,3 @@
frame 1, 06
frame 2, 18
endanim
-; 0xd1421
--- a/gfx/pokemon/pineco/anim_idle.asm
+++ b/gfx/pokemon/pineco/anim_idle.asm
@@ -3,4 +3,3 @@
frame 3, 06
dorepeat 1
endanim
-; 0xd2077
--- a/gfx/pokemon/pinsir/anim.asm
+++ b/gfx/pokemon/pinsir/anim.asm
@@ -5,4 +5,3 @@
frame 4, 12
dorepeat 3
endanim
-; 0xd0fe4
--- a/gfx/pokemon/pinsir/anim_idle.asm
+++ b/gfx/pokemon/pinsir/anim_idle.asm
@@ -3,4 +3,3 @@
frame 1, 08
dorepeat 1
endanim
-; 0xd1d9c
--- a/gfx/pokemon/politoed/anim.asm
+++ b/gfx/pokemon/politoed/anim.asm
@@ -6,4 +6,3 @@
dorepeat 3
frame 1, 08
endanim
-; 0xd1345
--- a/gfx/pokemon/politoed/anim_idle.asm
+++ b/gfx/pokemon/politoed/anim_idle.asm
@@ -3,4 +3,3 @@
frame 4, 07
dorepeat 1
endanim
-; 0xd1fe5
--- a/gfx/pokemon/poliwag/anim.asm
+++ b/gfx/pokemon/poliwag/anim.asm
@@ -5,4 +5,3 @@
frame 1, 08
dorepeat 3
endanim
-; 0xd0c33
--- a/gfx/pokemon/poliwag/anim_idle.asm
+++ b/gfx/pokemon/poliwag/anim_idle.asm
@@ -7,4 +7,3 @@
frame 2, 10
dorepeat 5
endanim
-; 0xd1b1d
--- a/gfx/pokemon/poliwhirl/anim.asm
+++ b/gfx/pokemon/poliwhirl/anim.asm
@@ -6,4 +6,3 @@
dorepeat 3
frame 2, 16
endanim
-; 0xd0c42
--- a/gfx/pokemon/poliwhirl/anim_idle.asm
+++ b/gfx/pokemon/poliwhirl/anim_idle.asm
@@ -3,4 +3,3 @@
frame 5, 05
dorepeat 1
endanim
-; 0xd1b26
--- a/gfx/pokemon/poliwrath/anim.asm
+++ b/gfx/pokemon/poliwrath/anim.asm
@@ -5,4 +5,3 @@
frame 2, 08
dorepeat 3
endanim
-; 0xd0c4f
--- a/gfx/pokemon/poliwrath/anim_idle.asm
+++ b/gfx/pokemon/poliwrath/anim_idle.asm
@@ -3,4 +3,3 @@
frame 3, 06
dorepeat 1
endanim
-; 0xd1b2f
--- a/gfx/pokemon/ponyta/anim.asm
+++ b/gfx/pokemon/ponyta/anim.asm
@@ -7,4 +7,3 @@
frame 0, 06
frame 3, 06
endanim
-; 0xd0d18
--- a/gfx/pokemon/ponyta/anim_idle.asm
+++ b/gfx/pokemon/ponyta/anim_idle.asm
@@ -2,4 +2,3 @@
frame 0, 06
frame 5, 06
endanim
-; 0xd1bc4
--- a/gfx/pokemon/porygon/anim.asm
+++ b/gfx/pokemon/porygon/anim.asm
@@ -6,4 +6,3 @@
frame 2, 06
frame 1, 06
endanim
-; 0xd106e
--- a/gfx/pokemon/porygon/anim_idle.asm
+++ b/gfx/pokemon/porygon/anim_idle.asm
@@ -3,4 +3,3 @@
frame 3, 07
dorepeat 1
endanim
-; 0xd1dfa
--- a/gfx/pokemon/porygon2/anim.asm
+++ b/gfx/pokemon/porygon2/anim.asm
@@ -4,4 +4,3 @@
frame 0, 06
dorepeat 1
endanim
-; 0xd1592
--- a/gfx/pokemon/porygon2/anim_idle.asm
+++ b/gfx/pokemon/porygon2/anim_idle.asm
@@ -1,3 +1,2 @@
frame 3, 30
endanim
-; 0xd216c
--- a/gfx/pokemon/primeape/anim.asm
+++ b/gfx/pokemon/primeape/anim.asm
@@ -5,4 +5,3 @@
frame 2, 05
frame 3, 25
endanim
-; 0xd0c0c
--- a/gfx/pokemon/primeape/anim_idle.asm
+++ b/gfx/pokemon/primeape/anim_idle.asm
@@ -5,4 +5,3 @@
frame 3, 06
dorepeat 3
endanim
-; 0xd1af8
--- a/gfx/pokemon/psyduck/anim.asm
+++ b/gfx/pokemon/psyduck/anim.asm
@@ -5,4 +5,3 @@
frame 2, 14
dorepeat 3
endanim
-; 0xd0bdd
--- a/gfx/pokemon/psyduck/anim_idle.asm
+++ b/gfx/pokemon/psyduck/anim_idle.asm
@@ -3,4 +3,3 @@
frame 1, 10
dorepeat 1
endanim
-; 0xd1ad9
--- a/gfx/pokemon/pupitar/anim.asm
+++ b/gfx/pokemon/pupitar/anim.asm
@@ -5,4 +5,3 @@
frame 2, 04
dorepeat 2
endanim
-; 0xd164a
--- a/gfx/pokemon/pupitar/anim_idle.asm
+++ b/gfx/pokemon/pupitar/anim_idle.asm
@@ -4,4 +4,3 @@
frame 2, 04
dorepeat 1
endanim
-; 0xd21f6
--- a/gfx/pokemon/quagsire/anim.asm
+++ b/gfx/pokemon/quagsire/anim.asm
@@ -3,4 +3,3 @@
frame 3, 09
frame 4, 09
endanim
-; 0xd13a0
--- a/gfx/pokemon/quagsire/anim_idle.asm
+++ b/gfx/pokemon/quagsire/anim_idle.asm
@@ -1,4 +1,3 @@
frame 2, 35
frame 1, 08
endanim
-; 0xd2034
--- a/gfx/pokemon/quilava/anim.asm
+++ b/gfx/pokemon/quilava/anim.asm
@@ -6,4 +6,3 @@
frame 0, 10
frame 4, 08
endanim
-; 0xd11a3
--- a/gfx/pokemon/quilava/anim_idle.asm
+++ b/gfx/pokemon/quilava/anim_idle.asm
@@ -3,4 +3,3 @@
frame 3, 06
dorepeat 1
endanim
-; 0xd1ec3
--- a/gfx/pokemon/qwilfish/anim.asm
+++ b/gfx/pokemon/qwilfish/anim.asm
@@ -5,4 +5,3 @@
frame 3, 11
dorepeat 3
endanim
-; 0xd147c
--- a/gfx/pokemon/qwilfish/anim_idle.asm
+++ b/gfx/pokemon/qwilfish/anim_idle.asm
@@ -3,4 +3,3 @@
frame 1, 13
dorepeat 1
endanim
-; 0xd20b0
--- a/gfx/pokemon/raichu/anim.asm
+++ b/gfx/pokemon/raichu/anim.asm
@@ -5,4 +5,3 @@
frame 2, 10
frame 1, 08
endanim
-; 0xd0a0f
--- a/gfx/pokemon/raichu/anim_idle.asm
+++ b/gfx/pokemon/raichu/anim_idle.asm
@@ -3,4 +3,3 @@
frame 0, 04
frame 4, 04
endanim
-; 0xd19c3
--- a/gfx/pokemon/raikou/anim.asm
+++ b/gfx/pokemon/raikou/anim.asm
@@ -5,4 +5,3 @@
dorepeat 2
frame 2, 35
endanim
-; 0xd1614
--- a/gfx/pokemon/raikou/anim_idle.asm
+++ b/gfx/pokemon/raikou/anim_idle.asm
@@ -5,4 +5,3 @@
frame 6, 05
frame 4, 30
endanim
-; 0xd21ce
--- a/gfx/pokemon/rapidash/anim.asm
+++ b/gfx/pokemon/rapidash/anim.asm
@@ -11,4 +11,3 @@
frame 3, 12
dorepeat 9
endanim
-; 0xd0d31
--- a/gfx/pokemon/rapidash/anim_idle.asm
+++ b/gfx/pokemon/rapidash/anim_idle.asm
@@ -3,4 +3,3 @@
frame 0, 06
frame 4, 06
endanim
-; 0xd1bcd
--- a/gfx/pokemon/raticate/anim.asm
+++ b/gfx/pokemon/raticate/anim.asm
@@ -4,4 +4,3 @@
frame 1, 04
dorepeat 2
endanim
-; 0xd09a3
--- a/gfx/pokemon/raticate/anim_idle.asm
+++ b/gfx/pokemon/raticate/anim_idle.asm
@@ -7,4 +7,3 @@
frame 1, 04
dorepeat 5
endanim
-; 0xd197b
--- a/gfx/pokemon/rattata/anim.asm
+++ b/gfx/pokemon/rattata/anim.asm
@@ -7,4 +7,3 @@
frame 4, 05
dorepeat 5
endanim
-; 0xd0998
--- a/gfx/pokemon/rattata/anim_idle.asm
+++ b/gfx/pokemon/rattata/anim_idle.asm
@@ -3,4 +3,3 @@
frame 4, 05
dorepeat 1
endanim
-; 0xd196a
--- a/gfx/pokemon/remoraid/anim.asm
+++ b/gfx/pokemon/remoraid/anim.asm
@@ -2,4 +2,3 @@
frame 2, 10
frame 3, 10
endanim
-; 0xd1508
--- a/gfx/pokemon/remoraid/anim_idle.asm
+++ b/gfx/pokemon/remoraid/anim_idle.asm
@@ -3,4 +3,3 @@
frame 4, 07
dorepeat 1
endanim
-; 0xd2114
--- a/gfx/pokemon/rhydon/anim.asm
+++ b/gfx/pokemon/rhydon/anim.asm
@@ -7,4 +7,3 @@
frame 2, 02
dorepeat 5
endanim
-; 0xd0f15
--- a/gfx/pokemon/rhydon/anim_idle.asm
+++ b/gfx/pokemon/rhydon/anim_idle.asm
@@ -3,4 +3,3 @@
frame 4, 06
dorepeat 1
endanim
-; 0xd1d0d
--- a/gfx/pokemon/rhyhorn/anim.asm
+++ b/gfx/pokemon/rhyhorn/anim.asm
@@ -2,4 +2,3 @@
frame 2, 13
frame 1, 40
endanim
-; 0xd0f04
--- a/gfx/pokemon/rhyhorn/anim_idle.asm
+++ b/gfx/pokemon/rhyhorn/anim_idle.asm
@@ -3,4 +3,3 @@
frame 3, 13
dorepeat 1
endanim
-; 0xd1d04
--- a/gfx/pokemon/sandshrew/anim.asm
+++ b/gfx/pokemon/sandshrew/anim.asm
@@ -10,4 +10,3 @@
frame 4, 05
dorepeat 8
endanim
-; 0xd0a26
--- a/gfx/pokemon/sandshrew/anim_idle.asm
+++ b/gfx/pokemon/sandshrew/anim_idle.asm
@@ -4,4 +4,3 @@
dorepeat 1
frame 4, 13
endanim
-; 0xd19ce
--- a/gfx/pokemon/sandslash/anim.asm
+++ b/gfx/pokemon/sandslash/anim.asm
@@ -7,4 +7,3 @@
frame 4, 07
frame 2, 08
endanim
-; 0xd0a37
--- a/gfx/pokemon/sandslash/anim_idle.asm
+++ b/gfx/pokemon/sandslash/anim_idle.asm
@@ -3,4 +3,3 @@
frame 0, 04
frame 3, 04
endanim
-; 0xd19d7
--- a/gfx/pokemon/scizor/anim.asm
+++ b/gfx/pokemon/scizor/anim.asm
@@ -7,4 +7,3 @@
dorepeat 3
frame 6, 18
endanim
-; 0xd148d
--- a/gfx/pokemon/scizor/anim_idle.asm
+++ b/gfx/pokemon/scizor/anim_idle.asm
@@ -3,4 +3,3 @@
frame 4, 08
dorepeat 1
endanim
-; 0xd20b9
--- a/gfx/pokemon/scyther/anim.asm
+++ b/gfx/pokemon/scyther/anim.asm
@@ -6,4 +6,3 @@
frame 5, 04
dorepeat 4
endanim
-; 0xd0fa8
--- a/gfx/pokemon/scyther/anim_idle.asm
+++ b/gfx/pokemon/scyther/anim_idle.asm
@@ -3,4 +3,3 @@
frame 6, 04
dorepeat 1
endanim
-; 0xd1d78
--- a/gfx/pokemon/seadra/anim.asm
+++ b/gfx/pokemon/seadra/anim.asm
@@ -4,4 +4,3 @@
frame 2, 10
dorepeat 1
endanim
-; 0xd0f54
--- a/gfx/pokemon/seadra/anim_idle.asm
+++ b/gfx/pokemon/seadra/anim_idle.asm
@@ -4,4 +4,3 @@
frame 3, 10
dorepeat 1
endanim
-; 0xd1d40
--- a/gfx/pokemon/seaking/anim.asm
+++ b/gfx/pokemon/seaking/anim.asm
@@ -4,4 +4,3 @@
frame 2, 12
dorepeat 1
endanim
-; 0xd0f6c
--- a/gfx/pokemon/seaking/anim_idle.asm
+++ b/gfx/pokemon/seaking/anim_idle.asm
@@ -4,4 +4,3 @@
frame 4, 15
dorepeat 1
endanim
-; 0xd1d54
--- a/gfx/pokemon/seel/anim.asm
+++ b/gfx/pokemon/seel/anim.asm
@@ -5,4 +5,3 @@
frame 1, 10
dorepeat 3
endanim
-; 0xd0d9f
--- a/gfx/pokemon/seel/anim_idle.asm
+++ b/gfx/pokemon/seel/anim_idle.asm
@@ -4,4 +4,3 @@
frame 3, 06
dorepeat 2
endanim
-; 0xd1c1b
--- a/gfx/pokemon/sentret/anim.asm
+++ b/gfx/pokemon/sentret/anim.asm
@@ -3,4 +3,3 @@
frame 1, 15
dorepeat 1
endanim
-; 0xd11e6
--- a/gfx/pokemon/sentret/anim_idle.asm
+++ b/gfx/pokemon/sentret/anim_idle.asm
@@ -3,4 +3,3 @@
frame 2, 07
dorepeat 1
endanim
-; 0xd1ef2
--- a/gfx/pokemon/shellder/anim.asm
+++ b/gfx/pokemon/shellder/anim.asm
@@ -3,4 +3,3 @@
frame 1, 07
dorepeat 1
endanim
-; 0xd0dc5
--- a/gfx/pokemon/shellder/anim_idle.asm
+++ b/gfx/pokemon/shellder/anim_idle.asm
@@ -3,4 +3,3 @@
frame 3, 08
dorepeat 1
endanim
-; 0xd1c49
--- a/gfx/pokemon/shuckle/anim.asm
+++ b/gfx/pokemon/shuckle/anim.asm
@@ -7,4 +7,3 @@
frame 4, 05
dorepeat 5
endanim
-; 0xd149e
--- a/gfx/pokemon/shuckle/anim_idle.asm
+++ b/gfx/pokemon/shuckle/anim_idle.asm
@@ -3,4 +3,3 @@
frame 4, 05
dorepeat 1
endanim
-; 0xd20c2
--- a/gfx/pokemon/skarmory/anim.asm
+++ b/gfx/pokemon/skarmory/anim.asm
@@ -4,4 +4,3 @@
dorepeat 1
frame 1, 08
endanim
-; 0xd1544
--- a/gfx/pokemon/skarmory/anim_idle.asm
+++ b/gfx/pokemon/skarmory/anim_idle.asm
@@ -3,4 +3,3 @@
frame 1, 07
dorepeat 1
endanim
-; 0xd2138
--- a/gfx/pokemon/skiploom/anim.asm
+++ b/gfx/pokemon/skiploom/anim.asm
@@ -3,4 +3,3 @@
frame 2, 14
frame 3, 14
endanim
-; 0xd1357
--- a/gfx/pokemon/skiploom/anim_idle.asm
+++ b/gfx/pokemon/skiploom/anim_idle.asm
@@ -3,4 +3,3 @@
frame 4, 06
dorepeat 1
endanim
-; 0xd1ff9
--- a/gfx/pokemon/slowbro/anim.asm
+++ b/gfx/pokemon/slowbro/anim.asm
@@ -10,4 +10,3 @@
frame 0, 10
frame 4, 10
endanim
-; 0xd0d4f
--- a/gfx/pokemon/slowbro/anim_idle.asm
+++ b/gfx/pokemon/slowbro/anim_idle.asm
@@ -3,4 +3,3 @@
frame 4, 08
dorepeat 1
endanim
-; 0xd1bd9
--- a/gfx/pokemon/slowking/anim.asm
+++ b/gfx/pokemon/slowking/anim.asm
@@ -8,4 +8,3 @@
frame 1, 06
dorepeat 6
endanim
-; 0xd13e2
--- a/gfx/pokemon/slowking/anim_idle.asm
+++ b/gfx/pokemon/slowking/anim_idle.asm
@@ -1,4 +1,3 @@
frame 1, 07
frame 2, 50
endanim
-; 0xd2054
--- a/gfx/pokemon/slowpoke/anim.asm
+++ b/gfx/pokemon/slowpoke/anim.asm
@@ -2,4 +2,3 @@
frame 2, 28
frame 1, 10
endanim
-; 0xd0d38
--- a/gfx/pokemon/slowpoke/anim_idle.asm
+++ b/gfx/pokemon/slowpoke/anim_idle.asm
@@ -1,3 +1,2 @@
frame 3, 20
endanim
-; 0xd1bd0
--- a/gfx/pokemon/slugma/anim.asm
+++ b/gfx/pokemon/slugma/anim.asm
@@ -7,4 +7,3 @@
frame 8, 06
frame 0, 14
endanim
-; 0xd14d9
--- a/gfx/pokemon/slugma/anim_idle.asm
+++ b/gfx/pokemon/slugma/anim_idle.asm
@@ -3,4 +3,3 @@
frame 5, 08
dorepeat 1
endanim
-; 0xd20ed
--- a/gfx/pokemon/smeargle/anim.asm
+++ b/gfx/pokemon/smeargle/anim.asm
@@ -4,4 +4,3 @@
frame 1, 07
dorepeat 1
endanim
-; 0xd15ac
--- a/gfx/pokemon/smeargle/anim_idle.asm
+++ b/gfx/pokemon/smeargle/anim_idle.asm
@@ -3,4 +3,3 @@
frame 3, 08
dorepeat 1
endanim
-; 0xd217e
--- a/gfx/pokemon/smoochum/anim.asm
+++ b/gfx/pokemon/smoochum/anim.asm
@@ -2,4 +2,3 @@
frame 2, 08
frame 3, 24
endanim
-; 0xd15cd
--- a/gfx/pokemon/smoochum/anim_idle.asm
+++ b/gfx/pokemon/smoochum/anim_idle.asm
@@ -3,4 +3,3 @@
frame 1, 06
dorepeat 1
endanim
-; 0xd219b
--- a/gfx/pokemon/sneasel/anim.asm
+++ b/gfx/pokemon/sneasel/anim.asm
@@ -1,4 +1,3 @@
frame 1, 04
frame 2, 30
endanim
-; 0xd14aa
--- a/gfx/pokemon/sneasel/anim_idle.asm
+++ b/gfx/pokemon/sneasel/anim_idle.asm
@@ -2,4 +2,3 @@
frame 0, 09
frame 4, 08
endanim
-; 0xd20d2
--- a/gfx/pokemon/snorlax/anim.asm
+++ b/gfx/pokemon/snorlax/anim.asm
@@ -7,4 +7,3 @@
frame 3, 09
dorepeat 5
endanim
-; 0xd10b2
--- a/gfx/pokemon/snorlax/anim_idle.asm
+++ b/gfx/pokemon/snorlax/anim_idle.asm
@@ -3,4 +3,3 @@
frame 3, 10
dorepeat 1
endanim
-; 0xd1e34
--- a/gfx/pokemon/snubbull/anim.asm
+++ b/gfx/pokemon/snubbull/anim.asm
@@ -8,4 +8,3 @@
frame 0, 08
dorepeat 6
endanim
-; 0xd1462
--- a/gfx/pokemon/snubbull/anim_idle.asm
+++ b/gfx/pokemon/snubbull/anim_idle.asm
@@ -3,4 +3,3 @@
frame 5, 12
dorepeat 1
endanim
-; 0xd209e
--- a/gfx/pokemon/spearow/anim.asm
+++ b/gfx/pokemon/spearow/anim.asm
@@ -8,4 +8,3 @@
frame 4, 04
dorepeat 6
endanim
-; 0xd09b6
--- a/gfx/pokemon/spearow/anim_idle.asm
+++ b/gfx/pokemon/spearow/anim_idle.asm
@@ -4,4 +4,3 @@
dorepeat 1
frame 6, 07
endanim
-; 0xd1986
--- a/gfx/pokemon/spinarak/anim.asm
+++ b/gfx/pokemon/spinarak/anim.asm
@@ -5,4 +5,3 @@
frame 3, 05
dorepeat 3
endanim
-; 0xd1240
--- a/gfx/pokemon/spinarak/anim_idle.asm
+++ b/gfx/pokemon/spinarak/anim_idle.asm
@@ -3,4 +3,3 @@
frame 4, 08
dorepeat 1
endanim
-; 0xd1f2e
--- a/gfx/pokemon/squirtle/anim.asm
+++ b/gfx/pokemon/squirtle/anim.asm
@@ -7,4 +7,3 @@
frame 3, 15
frame 4, 05
endanim
-; 0xd08f2
--- a/gfx/pokemon/squirtle/anim_idle.asm
+++ b/gfx/pokemon/squirtle/anim_idle.asm
@@ -3,4 +3,3 @@
frame 5, 05
dorepeat 1
endanim
-; 0xd18de
--- a/gfx/pokemon/stantler/anim.asm
+++ b/gfx/pokemon/stantler/anim.asm
@@ -6,4 +6,3 @@
frame 0, 08
frame 2, 08
endanim
-; 0xd15a1
--- a/gfx/pokemon/stantler/anim_idle.asm
+++ b/gfx/pokemon/stantler/anim_idle.asm
@@ -3,4 +3,3 @@
frame 3, 08
dorepeat 1
endanim
-; 0xd2175
--- a/gfx/pokemon/starmie/anim.asm
+++ b/gfx/pokemon/starmie/anim.asm
@@ -5,4 +5,3 @@
frame 2, 07
frame 3, 07
endanim
-; 0xd0f86
--- a/gfx/pokemon/starmie/anim_idle.asm
+++ b/gfx/pokemon/starmie/anim_idle.asm
@@ -2,4 +2,3 @@
frame 3, 08
dorepeat 1
endanim
-; 0xd1d66
--- a/gfx/pokemon/staryu/anim.asm
+++ b/gfx/pokemon/staryu/anim.asm
@@ -5,4 +5,3 @@
frame 3, 04
frame 2, 04
endanim
-; 0xd0f79
--- a/gfx/pokemon/staryu/anim_idle.asm
+++ b/gfx/pokemon/staryu/anim_idle.asm
@@ -4,4 +4,3 @@
frame 3, 04
dorepeat 1
endanim
-; 0xd1d5f
--- a/gfx/pokemon/steelix/anim.asm
+++ b/gfx/pokemon/steelix/anim.asm
@@ -4,4 +4,3 @@
frame 2, 08
frame 1, 06
endanim
-; 0xd144f
--- a/gfx/pokemon/steelix/anim_idle.asm
+++ b/gfx/pokemon/steelix/anim_idle.asm
@@ -3,4 +3,3 @@
frame 4, 08
dorepeat 1
endanim
-; 0xd2095
--- a/gfx/pokemon/sudowoodo/anim.asm
+++ b/gfx/pokemon/sudowoodo/anim.asm
@@ -5,4 +5,3 @@
frame 1, 10
dorepeat 1
endanim
-; 0xd1336
--- a/gfx/pokemon/sudowoodo/anim_idle.asm
+++ b/gfx/pokemon/sudowoodo/anim_idle.asm
@@ -3,4 +3,3 @@
frame 3, 09
dorepeat 1
endanim
-; 0xd1fdc
--- a/gfx/pokemon/suicune/anim.asm
+++ b/gfx/pokemon/suicune/anim.asm
@@ -10,4 +10,3 @@
frame 0, 03
dorepeat 6
endanim
-; 0xd1634
--- a/gfx/pokemon/suicune/anim_idle.asm
+++ b/gfx/pokemon/suicune/anim_idle.asm
@@ -4,4 +4,3 @@
frame 9, 06
dorepeat 2
endanim
-; 0xd21e2
--- a/gfx/pokemon/sunflora/anim.asm
+++ b/gfx/pokemon/sunflora/anim.asm
@@ -2,4 +2,3 @@
frame 2, 06
frame 3, 16
endanim
-; 0xd137b
--- a/gfx/pokemon/sunflora/anim_idle.asm
+++ b/gfx/pokemon/sunflora/anim_idle.asm
@@ -3,4 +3,3 @@
frame 4, 08
dorepeat 1
endanim
-; 0xd201d
--- a/gfx/pokemon/sunkern/anim.asm
+++ b/gfx/pokemon/sunkern/anim.asm
@@ -4,4 +4,3 @@
frame 2, 04
dorepeat 2
endanim
-; 0xd1374
--- a/gfx/pokemon/sunkern/anim_idle.asm
+++ b/gfx/pokemon/sunkern/anim_idle.asm
@@ -3,4 +3,3 @@
frame 3, 06
dorepeat 1
endanim
-; 0xd2014
--- a/gfx/pokemon/swinub/anim.asm
+++ b/gfx/pokemon/swinub/anim.asm
@@ -4,4 +4,3 @@
frame 2, 09
dorepeat 2
endanim
-; 0xd14ef
--- a/gfx/pokemon/swinub/anim_idle.asm
+++ b/gfx/pokemon/swinub/anim_idle.asm
@@ -3,4 +3,3 @@
frame 3, 07
dorepeat 1
endanim
-; 0xd20f9
--- a/gfx/pokemon/tangela/anim.asm
+++ b/gfx/pokemon/tangela/anim.asm
@@ -2,4 +2,3 @@
frame 0, 24
frame 2, 10
endanim
-; 0xd0f2d
--- a/gfx/pokemon/tangela/anim_idle.asm
+++ b/gfx/pokemon/tangela/anim_idle.asm
@@ -3,4 +3,3 @@
frame 2, 06
dorepeat 1
endanim
-; 0xd1d1f
--- a/gfx/pokemon/tauros/anim.asm
+++ b/gfx/pokemon/tauros/anim.asm
@@ -8,4 +8,3 @@
dorepeat 5
frame 1, 07
endanim
-; 0xd0ff7
--- a/gfx/pokemon/tauros/anim_idle.asm
+++ b/gfx/pokemon/tauros/anim_idle.asm
@@ -3,4 +3,3 @@
frame 4, 06
dorepeat 1
endanim
-; 0xd1da5
--- a/gfx/pokemon/teddiursa/anim.asm
+++ b/gfx/pokemon/teddiursa/anim.asm
@@ -6,4 +6,3 @@
frame 3, 10
dorepeat 4
endanim
-; 0xd14b9
--- a/gfx/pokemon/teddiursa/anim_idle.asm
+++ b/gfx/pokemon/teddiursa/anim_idle.asm
@@ -3,4 +3,3 @@
frame 4, 06
dorepeat 1
endanim
-; 0xd20db
--- a/gfx/pokemon/tentacool/anim.asm
+++ b/gfx/pokemon/tentacool/anim.asm
@@ -3,4 +3,3 @@
frame 4, 10
frame 5, 16
endanim
-; 0xd0cd3
--- a/gfx/pokemon/tentacool/anim_idle.asm
+++ b/gfx/pokemon/tentacool/anim_idle.asm
@@ -3,4 +3,3 @@
frame 3, 08
dorepeat 1
endanim
-; 0xd1b95
--- a/gfx/pokemon/tentacruel/anim.asm
+++ b/gfx/pokemon/tentacruel/anim.asm
@@ -4,4 +4,3 @@
dorepeat 1
frame 2, 08
endanim
-; 0xd0cde
--- a/gfx/pokemon/tentacruel/anim_idle.asm
+++ b/gfx/pokemon/tentacruel/anim_idle.asm
@@ -4,4 +4,3 @@
frame 3, 03
dorepeat 2
endanim
-; 0xd1ba0
--- a/gfx/pokemon/togepi/anim.asm
+++ b/gfx/pokemon/togepi/anim.asm
@@ -5,4 +5,3 @@
frame 0, 06
frame 2, 06
endanim
-; 0xd12a6
--- a/gfx/pokemon/togepi/anim_idle.asm
+++ b/gfx/pokemon/togepi/anim_idle.asm
@@ -3,4 +3,3 @@
frame 2, 06
dorepeat 1
endanim
-; 0xd1f7a
--- a/gfx/pokemon/togetic/anim.asm
+++ b/gfx/pokemon/togetic/anim.asm
@@ -5,4 +5,3 @@
frame 4, 09
dorepeat 3
endanim
-; 0xd12b3
--- a/gfx/pokemon/togetic/anim_idle.asm
+++ b/gfx/pokemon/togetic/anim_idle.asm
@@ -3,4 +3,3 @@
frame 3, 06
dorepeat 1
endanim
-; 0xd1f83
--- a/gfx/pokemon/totodile/anim.asm
+++ b/gfx/pokemon/totodile/anim.asm
@@ -7,4 +7,3 @@
frame 2, 10
dorepeat 5
endanim
-; 0xd11c7
--- a/gfx/pokemon/totodile/anim_idle.asm
+++ b/gfx/pokemon/totodile/anim_idle.asm
@@ -4,4 +4,3 @@
frame 3, 06
dorepeat 2
endanim
-; 0xd1ed7
--- a/gfx/pokemon/typhlosion/anim.asm
+++ b/gfx/pokemon/typhlosion/anim.asm
@@ -8,4 +8,3 @@
frame 1, 03
dorepeat 6
endanim
-; 0xd11b6
--- a/gfx/pokemon/typhlosion/anim_idle.asm
+++ b/gfx/pokemon/typhlosion/anim_idle.asm
@@ -3,4 +3,3 @@
frame 4, 08
dorepeat 1
endanim
-; 0xd1ecc
--- a/gfx/pokemon/tyranitar/anim.asm
+++ b/gfx/pokemon/tyranitar/anim.asm
@@ -6,4 +6,3 @@
frame 0, 16
frame 4, 16
endanim
-; 0xd1659
--- a/gfx/pokemon/tyranitar/anim_idle.asm
+++ b/gfx/pokemon/tyranitar/anim_idle.asm
@@ -3,4 +3,3 @@
frame 5, 08
dorepeat 1
endanim
-; 0xd21ff
--- a/gfx/pokemon/tyrogue/anim.asm
+++ b/gfx/pokemon/tyrogue/anim.asm
@@ -4,4 +4,3 @@
frame 3, 06
dorepeat 2
endanim
-; 0xd15b7
--- a/gfx/pokemon/tyrogue/anim_idle.asm
+++ b/gfx/pokemon/tyrogue/anim_idle.asm
@@ -3,4 +3,3 @@
frame 4, 05
dorepeat 1
endanim
-; 0xd2187
--- a/gfx/pokemon/umbreon/anim.asm
+++ b/gfx/pokemon/umbreon/anim.asm
@@ -6,4 +6,3 @@
dorepeat 3
frame 2, 30
endanim
-; 0xd13be
--- a/gfx/pokemon/umbreon/anim_idle.asm
+++ b/gfx/pokemon/umbreon/anim_idle.asm
@@ -3,4 +3,3 @@
frame 4, 04
dorepeat 1
endanim
-; 0xd2046
--- a/gfx/pokemon/unown/anim.asm
+++ b/gfx/pokemon/unown/anim.asm
@@ -9,4 +9,3 @@
frame 9, 05
frame 10, 05
endanim
-; 0xd13fe
--- a/gfx/pokemon/unown/anim_idle.asm
+++ b/gfx/pokemon/unown/anim_idle.asm
@@ -3,4 +3,3 @@
frame 11, 05
dorepeat 1
endanim
-; 0xd2066
--- a/gfx/pokemon/unown/bitmask.asm
+++ b/gfx/pokemon/unown/bitmask.asm
@@ -28,4 +28,3 @@
db %00010000
db %00000000
db %00000000
-; 0xd36ab
--- a/gfx/pokemon/unown/frames.asm
+++ b/gfx/pokemon/unown/frames.asm
@@ -42,4 +42,3 @@
.frame11
db $05 ; bitmask
db $27
-; 0xd8e5e
--- a/gfx/pokemon/unown_a/anim.asm
+++ b/gfx/pokemon/unown_a/anim.asm
@@ -10,4 +10,3 @@
frame 0, 07
dorepeat 6
endanim
-; 0xd2274
--- a/gfx/pokemon/unown_a/anim_idle.asm
+++ b/gfx/pokemon/unown_a/anim_idle.asm
@@ -3,4 +3,3 @@
frame 5, 06
dorepeat 1
endanim
-; 0xd240e
--- a/gfx/pokemon/unown_b/anim.asm
+++ b/gfx/pokemon/unown_b/anim.asm
@@ -6,4 +6,3 @@
frame 5, 04
dorepeat 4
endanim
-; 0xd2283
--- a/gfx/pokemon/unown_b/anim_idle.asm
+++ b/gfx/pokemon/unown_b/anim_idle.asm
@@ -3,4 +3,3 @@
frame 6, 04
dorepeat 1
endanim
-; 0xd2417
--- a/gfx/pokemon/unown_c/anim.asm
+++ b/gfx/pokemon/unown_c/anim.asm
@@ -6,4 +6,3 @@
frame 2, 04
dorepeat 4
endanim
-; 0xd2292
--- a/gfx/pokemon/unown_c/anim_idle.asm
+++ b/gfx/pokemon/unown_c/anim_idle.asm
@@ -3,4 +3,3 @@
frame 4, 05
dorepeat 1
endanim
-; 0xd2420
--- a/gfx/pokemon/unown_d/anim.asm
+++ b/gfx/pokemon/unown_d/anim.asm
@@ -5,4 +5,3 @@
frame 0, 08
dorepeat 1
endanim
-; 0xd229f
--- a/gfx/pokemon/unown_d/anim_idle.asm
+++ b/gfx/pokemon/unown_d/anim_idle.asm
@@ -3,4 +3,3 @@
frame 3, 05
dorepeat 1
endanim
-; 0xd2429
--- a/gfx/pokemon/unown_e/anim.asm
+++ b/gfx/pokemon/unown_e/anim.asm
@@ -6,4 +6,3 @@
frame 0, 02
dorepeat 4
endanim
-; 0xd22ae
--- a/gfx/pokemon/unown_e/anim_idle.asm
+++ b/gfx/pokemon/unown_e/anim_idle.asm
@@ -3,4 +3,3 @@
frame 3, 05
dorepeat 1
endanim
-; 0xd2432
--- a/gfx/pokemon/unown_f/anim.asm
+++ b/gfx/pokemon/unown_f/anim.asm
@@ -7,4 +7,3 @@
frame 3, 08
dorepeat 5
endanim
-; 0xd22bf
--- a/gfx/pokemon/unown_f/anim_idle.asm
+++ b/gfx/pokemon/unown_f/anim_idle.asm
@@ -3,4 +3,3 @@
frame 4, 05
dorepeat 1
endanim
-; 0xd243b
--- a/gfx/pokemon/unown_g/anim.asm
+++ b/gfx/pokemon/unown_g/anim.asm
@@ -4,4 +4,3 @@
frame 0, 06
dorepeat 1
endanim
-; 0xd22ca
--- a/gfx/pokemon/unown_g/anim_idle.asm
+++ b/gfx/pokemon/unown_g/anim_idle.asm
@@ -3,4 +3,3 @@
frame 3, 05
dorepeat 1
endanim
-; 0xd2444
--- a/gfx/pokemon/unown_h/anim.asm
+++ b/gfx/pokemon/unown_h/anim.asm
@@ -8,4 +8,3 @@
frame 3, 02
frame 4, 02
endanim
-; 0xd22dd
--- a/gfx/pokemon/unown_h/anim_idle.asm
+++ b/gfx/pokemon/unown_h/anim_idle.asm
@@ -3,4 +3,3 @@
frame 5, 05
dorepeat 1
endanim
-; 0xd244d
--- a/gfx/pokemon/unown_i/anim.asm
+++ b/gfx/pokemon/unown_i/anim.asm
@@ -5,4 +5,3 @@
frame 0, 05
dorepeat 1
endanim
-; 0xd22ea
--- a/gfx/pokemon/unown_i/anim_idle.asm
+++ b/gfx/pokemon/unown_i/anim_idle.asm
@@ -3,4 +3,3 @@
frame 3, 05
dorepeat 1
endanim
-; 0xd2456
--- a/gfx/pokemon/unown_j/anim.asm
+++ b/gfx/pokemon/unown_j/anim.asm
@@ -5,4 +5,3 @@
frame 1, 05
dorepeat 1
endanim
-; 0xd22f7
--- a/gfx/pokemon/unown_j/anim_idle.asm
+++ b/gfx/pokemon/unown_j/anim_idle.asm
@@ -3,4 +3,3 @@
frame 3, 05
dorepeat 1
endanim
-; 0xd245f
--- a/gfx/pokemon/unown_k/anim.asm
+++ b/gfx/pokemon/unown_k/anim.asm
@@ -5,4 +5,3 @@
frame 1, 07
dorepeat 1
endanim
-; 0xd2304
--- a/gfx/pokemon/unown_k/anim_idle.asm
+++ b/gfx/pokemon/unown_k/anim_idle.asm
@@ -3,4 +3,3 @@
frame 3, 05
dorepeat 1
endanim
-; 0xd2468
--- a/gfx/pokemon/unown_l/anim.asm
+++ b/gfx/pokemon/unown_l/anim.asm
@@ -9,4 +9,3 @@
frame 4, 12
frame 3, 11
endanim
-; 0xd2319
--- a/gfx/pokemon/unown_l/anim_idle.asm
+++ b/gfx/pokemon/unown_l/anim_idle.asm
@@ -3,4 +3,3 @@
frame 5, 05
dorepeat 1
endanim
-; 0xd2471
--- a/gfx/pokemon/unown_m/anim.asm
+++ b/gfx/pokemon/unown_m/anim.asm
@@ -9,4 +9,3 @@
frame 1, 02
dorepeat 5
endanim
-; 0xd232e
--- a/gfx/pokemon/unown_m/anim_idle.asm
+++ b/gfx/pokemon/unown_m/anim_idle.asm
@@ -3,4 +3,3 @@
frame 3, 05
dorepeat 1
endanim
-; 0xd247a
--- a/gfx/pokemon/unown_n/anim.asm
+++ b/gfx/pokemon/unown_n/anim.asm
@@ -7,4 +7,3 @@
frame 2, 04
frame 1, 03
endanim
-; 0xd233f
--- a/gfx/pokemon/unown_n/anim_idle.asm
+++ b/gfx/pokemon/unown_n/anim_idle.asm
@@ -3,4 +3,3 @@
frame 3, 05
dorepeat 1
endanim
-; 0xd2483
--- a/gfx/pokemon/unown_o/anim.asm
+++ b/gfx/pokemon/unown_o/anim.asm
@@ -5,4 +5,3 @@
frame 1, 10
frame 3, 04
endanim
-; 0xd234c
--- a/gfx/pokemon/unown_o/anim_idle.asm
+++ b/gfx/pokemon/unown_o/anim_idle.asm
@@ -3,4 +3,3 @@
frame 3, 05
dorepeat 1
endanim
-; 0xd248c
--- a/gfx/pokemon/unown_p/anim.asm
+++ b/gfx/pokemon/unown_p/anim.asm
@@ -2,4 +2,3 @@
frame 2, 36
frame 1, 06
endanim
-; 0xd2353
--- a/gfx/pokemon/unown_p/anim_idle.asm
+++ b/gfx/pokemon/unown_p/anim_idle.asm
@@ -3,4 +3,3 @@
frame 3, 05
dorepeat 1
endanim
-; 0xd2495
--- a/gfx/pokemon/unown_q/anim.asm
+++ b/gfx/pokemon/unown_q/anim.asm
@@ -5,4 +5,3 @@
frame 1, 05
dorepeat 1
endanim
-; 0xd2360
--- a/gfx/pokemon/unown_q/anim_idle.asm
+++ b/gfx/pokemon/unown_q/anim_idle.asm
@@ -3,4 +3,3 @@
frame 3, 05
dorepeat 1
endanim
-; 0xd249e
--- a/gfx/pokemon/unown_r/anim.asm
+++ b/gfx/pokemon/unown_r/anim.asm
@@ -5,4 +5,3 @@
frame 1, 07
dorepeat 1
endanim
-; 0xd236d
--- a/gfx/pokemon/unown_r/anim_idle.asm
+++ b/gfx/pokemon/unown_r/anim_idle.asm
@@ -3,4 +3,3 @@
frame 3, 05
dorepeat 1
endanim
-; 0xd24a7
--- a/gfx/pokemon/unown_s/anim.asm
+++ b/gfx/pokemon/unown_s/anim.asm
@@ -7,4 +7,3 @@
frame 2, 03
dorepeat 5
endanim
-; 0xd237e
--- a/gfx/pokemon/unown_s/anim_idle.asm
+++ b/gfx/pokemon/unown_s/anim_idle.asm
@@ -3,4 +3,3 @@
frame 3, 05
dorepeat 1
endanim
-; 0xd24b0
--- a/gfx/pokemon/unown_t/anim.asm
+++ b/gfx/pokemon/unown_t/anim.asm
@@ -5,4 +5,3 @@
frame 0, 05
dorepeat 1
endanim
-; 0xd238b
--- a/gfx/pokemon/unown_t/anim_idle.asm
+++ b/gfx/pokemon/unown_t/anim_idle.asm
@@ -3,4 +3,3 @@
frame 3, 05
dorepeat 1
endanim
-; 0xd24b9
--- a/gfx/pokemon/unown_u/anim.asm
+++ b/gfx/pokemon/unown_u/anim.asm
@@ -3,4 +3,3 @@
frame 2, 14
frame 1, 12
endanim
-; 0xd2394
--- a/gfx/pokemon/unown_u/anim_idle.asm
+++ b/gfx/pokemon/unown_u/anim_idle.asm
@@ -3,4 +3,3 @@
frame 3, 05
dorepeat 1
endanim
-; 0xd24c2
--- a/gfx/pokemon/unown_v/anim.asm
+++ b/gfx/pokemon/unown_v/anim.asm
@@ -3,4 +3,3 @@
frame 2, 10
frame 1, 10
endanim
-; 0xd239d
--- a/gfx/pokemon/unown_v/anim_idle.asm
+++ b/gfx/pokemon/unown_v/anim_idle.asm
@@ -3,4 +3,3 @@
frame 3, 05
dorepeat 1
endanim
-; 0xd24cb
--- a/gfx/pokemon/unown_w/anim.asm
+++ b/gfx/pokemon/unown_w/anim.asm
@@ -3,4 +3,3 @@
frame 0, 06
frame 2, 12
endanim
-; 0xd23a6
--- a/gfx/pokemon/unown_w/anim_idle.asm
+++ b/gfx/pokemon/unown_w/anim_idle.asm
@@ -3,4 +3,3 @@
frame 3, 05
dorepeat 1
endanim
-; 0xd24d4
--- a/gfx/pokemon/unown_x/anim.asm
+++ b/gfx/pokemon/unown_x/anim.asm
@@ -5,4 +5,3 @@
frame 2, 06
dorepeat 1
endanim
-; 0xd23b3
--- a/gfx/pokemon/unown_x/anim_idle.asm
+++ b/gfx/pokemon/unown_x/anim_idle.asm
@@ -3,4 +3,3 @@
frame 3, 05
dorepeat 1
endanim
-; 0xd24dd
--- a/gfx/pokemon/unown_y/anim.asm
+++ b/gfx/pokemon/unown_y/anim.asm
@@ -6,4 +6,3 @@
frame 2, 05
dorepeat 4
endanim
-; 0xd23c2
--- a/gfx/pokemon/unown_y/anim_idle.asm
+++ b/gfx/pokemon/unown_y/anim_idle.asm
@@ -3,4 +3,3 @@
frame 4, 05
dorepeat 1
endanim
-; 0xd24e6
--- a/gfx/pokemon/unown_z/anim.asm
+++ b/gfx/pokemon/unown_z/anim.asm
@@ -6,4 +6,3 @@
frame 0, 03
frame 3, 03
endanim
-; 0xd23d1
--- a/gfx/pokemon/unown_z/anim_idle.asm
+++ b/gfx/pokemon/unown_z/anim_idle.asm
@@ -3,4 +3,3 @@
frame 4, 05
dorepeat 1
endanim
-; 0xd24ef
--- a/gfx/pokemon/ursaring/anim.asm
+++ b/gfx/pokemon/ursaring/anim.asm
@@ -6,4 +6,3 @@
dorepeat 3
frame 1, 10
endanim
-; 0xd14c8
--- a/gfx/pokemon/ursaring/anim_idle.asm
+++ b/gfx/pokemon/ursaring/anim_idle.asm
@@ -3,4 +3,3 @@
frame 5, 09
dorepeat 1
endanim
-; 0xd20e4
--- a/gfx/pokemon/vaporeon/anim.asm
+++ b/gfx/pokemon/vaporeon/anim.asm
@@ -4,4 +4,3 @@
frame 2, 10
dorepeat 2
endanim
-; 0xd1043
--- a/gfx/pokemon/vaporeon/anim_idle.asm
+++ b/gfx/pokemon/vaporeon/anim_idle.asm
@@ -3,4 +3,3 @@
frame 3, 06
dorepeat 1
endanim
-; 0xd1ddf
--- a/gfx/pokemon/venomoth/anim.asm
+++ b/gfx/pokemon/venomoth/anim.asm
@@ -3,4 +3,3 @@
frame 1, 06
dorepeat 1
endanim
-; 0xd0b8c
--- a/gfx/pokemon/venomoth/anim_idle.asm
+++ b/gfx/pokemon/venomoth/anim_idle.asm
@@ -3,4 +3,3 @@
frame 2, 04
dorepeat 1
endanim
-; 0xd1aa4
--- a/gfx/pokemon/venonat/anim.asm
+++ b/gfx/pokemon/venonat/anim.asm
@@ -13,4 +13,3 @@
frame 0, 02
dorepeat 11
endanim
-; 0xd0b83
--- a/gfx/pokemon/venonat/anim_idle.asm
+++ b/gfx/pokemon/venonat/anim_idle.asm
@@ -3,4 +3,3 @@
frame 2, 16
dorepeat 1
endanim
-; 0xd1a9b
--- a/gfx/pokemon/venusaur/anim.asm
+++ b/gfx/pokemon/venusaur/anim.asm
@@ -7,4 +7,3 @@
frame 5, 10
dorepeat 5
endanim
-; 0xd08b6
--- a/gfx/pokemon/venusaur/anim_idle.asm
+++ b/gfx/pokemon/venusaur/anim_idle.asm
@@ -3,4 +3,3 @@
frame 6, 13
frame 7, 13
endanim
-; 0xd18b6
--- a/gfx/pokemon/victreebel/anim.asm
+++ b/gfx/pokemon/victreebel/anim.asm
@@ -4,4 +4,3 @@
frame 4, 10
frame 5, 10
endanim
-; 0xd0cca
--- a/gfx/pokemon/victreebel/anim_idle.asm
+++ b/gfx/pokemon/victreebel/anim_idle.asm
@@ -4,4 +4,3 @@
frame 5, 05
dorepeat 1
endanim
-; 0xd1b8c
--- a/gfx/pokemon/vileplume/anim.asm
+++ b/gfx/pokemon/vileplume/anim.asm
@@ -7,4 +7,3 @@
frame 0, 07
frame 1, 07
endanim
-; 0xd0b46
--- a/gfx/pokemon/vileplume/anim_idle.asm
+++ b/gfx/pokemon/vileplume/anim_idle.asm
@@ -5,4 +5,3 @@
frame 0, 12
frame 3, 07
endanim
-; 0xd1a82
--- a/gfx/pokemon/voltorb/anim.asm
+++ b/gfx/pokemon/voltorb/anim.asm
@@ -5,4 +5,3 @@
frame 1, 04
dorepeat 3
endanim
-; 0xd0e57
--- a/gfx/pokemon/voltorb/anim_idle.asm
+++ b/gfx/pokemon/voltorb/anim_idle.asm
@@ -4,4 +4,3 @@
frame 0, 08
dorepeat 2
endanim
-; 0xd1ca5
--- a/gfx/pokemon/vulpix/anim.asm
+++ b/gfx/pokemon/vulpix/anim.asm
@@ -8,4 +8,3 @@
frame 3, 05
dorepeat 6
endanim
-; 0xd0aba
--- a/gfx/pokemon/vulpix/anim_idle.asm
+++ b/gfx/pokemon/vulpix/anim_idle.asm
@@ -4,4 +4,3 @@
frame 0, 05
frame 3, 05
endanim
-; 0xd1a34
--- a/gfx/pokemon/wartortle/anim.asm
+++ b/gfx/pokemon/wartortle/anim.asm
@@ -5,4 +5,3 @@
frame 1, 09
dorepeat 3
endanim
-; 0xd08ff
--- a/gfx/pokemon/wartortle/anim_idle.asm
+++ b/gfx/pokemon/wartortle/anim_idle.asm
@@ -3,4 +3,3 @@
frame 3, 06
dorepeat 1
endanim
-; 0xd18e7
--- a/gfx/pokemon/weedle/anim.asm
+++ b/gfx/pokemon/weedle/anim.asm
@@ -7,4 +7,3 @@
frame 3, 06
dorepeat 3
endanim
-; 0xd093a
--- a/gfx/pokemon/weedle/anim_idle.asm
+++ b/gfx/pokemon/weedle/anim_idle.asm
@@ -9,4 +9,3 @@
frame 3, 05
dorepeat 5
endanim
-; 0xd1922
--- a/gfx/pokemon/weepinbell/anim.asm
+++ b/gfx/pokemon/weepinbell/anim.asm
@@ -5,4 +5,3 @@
dorepeat 1
frame 3, 12
endanim
-; 0xd0cbf
--- a/gfx/pokemon/weepinbell/anim_idle.asm
+++ b/gfx/pokemon/weepinbell/anim_idle.asm
@@ -3,4 +3,3 @@
frame 3, 07
dorepeat 1
endanim
-; 0xd1b81
--- a/gfx/pokemon/weezing/anim.asm
+++ b/gfx/pokemon/weezing/anim.asm
@@ -5,4 +5,3 @@
frame 4, 10
dorepeat 2
endanim
-; 0xd0efd
--- a/gfx/pokemon/weezing/anim_idle.asm
+++ b/gfx/pokemon/weezing/anim_idle.asm
@@ -5,4 +5,3 @@
dorepeat 2
frame 1, 12
endanim
-; 0xd1cfb
--- a/gfx/pokemon/wigglytuff/anim.asm
+++ b/gfx/pokemon/wigglytuff/anim.asm
@@ -6,4 +6,3 @@
frame 0, 06
frame 2, 04
endanim
-; 0xd0aed
--- a/gfx/pokemon/wigglytuff/anim_idle.asm
+++ b/gfx/pokemon/wigglytuff/anim_idle.asm
@@ -3,4 +3,3 @@
frame 3, 06
dorepeat 1
endanim
-; 0xd1a4f
--- a/gfx/pokemon/wobbuffet/anim.asm
+++ b/gfx/pokemon/wobbuffet/anim.asm
@@ -1,4 +1,3 @@
frame 1, 07
frame 2, 30
endanim
-; 0xd1403
--- a/gfx/pokemon/wobbuffet/anim_idle.asm
+++ b/gfx/pokemon/wobbuffet/anim_idle.asm
@@ -1,3 +1,2 @@
frame 0, 30
endanim
-; 0xd2069
--- a/gfx/pokemon/wooper/anim.asm
+++ b/gfx/pokemon/wooper/anim.asm
@@ -5,4 +5,3 @@
frame 0, 08
frame 4, 08
endanim
-; 0xd1397
--- a/gfx/pokemon/wooper/anim_idle.asm
+++ b/gfx/pokemon/wooper/anim_idle.asm
@@ -3,4 +3,3 @@
frame 3, 06
dorepeat 1
endanim
-; 0xd202f
--- a/gfx/pokemon/xatu/anim.asm
+++ b/gfx/pokemon/xatu/anim.asm
@@ -7,4 +7,3 @@
frame 4, 12
dorepeat 5
endanim
-; 0xd12cd
--- a/gfx/pokemon/xatu/anim_idle.asm
+++ b/gfx/pokemon/xatu/anim_idle.asm
@@ -8,4 +8,3 @@
frame 2, 08
dorepeat 6
endanim
-; 0xd1f99
--- a/gfx/pokemon/yanma/anim.asm
+++ b/gfx/pokemon/yanma/anim.asm
@@ -6,4 +6,3 @@
frame 2, 03
dorepeat 4
endanim
-; 0xd138a
--- a/gfx/pokemon/yanma/anim_idle.asm
+++ b/gfx/pokemon/yanma/anim_idle.asm
@@ -3,4 +3,3 @@
frame 3, 04
dorepeat 1
endanim
-; 0xd2026
--- a/gfx/pokemon/zapdos/anim.asm
+++ b/gfx/pokemon/zapdos/anim.asm
@@ -4,4 +4,3 @@
frame 3, 10
dorepeat 2
endanim
-; 0xd10cc
--- a/gfx/pokemon/zapdos/anim_idle.asm
+++ b/gfx/pokemon/zapdos/anim_idle.asm
@@ -2,4 +2,3 @@
frame 2, 50
frame 1, 06
endanim
-; 0xd1e48
--- a/gfx/pokemon/zubat/anim.asm
+++ b/gfx/pokemon/zubat/anim.asm
@@ -5,4 +5,3 @@
frame 3, 07
frame 0, 07
endanim
-; 0xd0afa
--- a/gfx/pokemon/zubat/anim_idle.asm
+++ b/gfx/pokemon/zubat/anim_idle.asm
@@ -4,4 +4,3 @@
frame 3, 12
dorepeat 2
endanim
-; 0xd1a5a
--- a/gfx/tileset_palette_maps.asm
+++ b/gfx/tileset_palette_maps.asm
@@ -10,139 +10,107 @@
ENDM
-TilesetKantoPalMap: ; 0x4c075
+TilesetKantoPalMap:
INCLUDE "gfx/tilesets/kanto_palette_map.asm"
-; 0x4c0e5
-Tileset0PalMap: ; 0x4c0e5
-TilesetJohtoPalMap: ; 0x4c0e5
+Tileset0PalMap:
+TilesetJohtoPalMap:
INCLUDE "gfx/tilesets/johto_palette_map.asm"
-; 0x4c155
-TilesetJohtoModernPalMap: ; 0x4c155
+TilesetJohtoModernPalMap:
INCLUDE "gfx/tilesets/johto_modern_palette_map.asm"
-; 0x4c1c5
-TilesetHousePalMap: ; 0x4c1c5
+TilesetHousePalMap:
INCLUDE "gfx/tilesets/house_palette_map.asm"
-; 0x4c235
-TilesetPlayersHousePalMap: ; 0x4c235
+TilesetPlayersHousePalMap:
INCLUDE "gfx/tilesets/players_house_palette_map.asm"
-; 0x4c2a5
-TilesetPokecenterPalMap: ; 0x4c2a5
+TilesetPokecenterPalMap:
INCLUDE "gfx/tilesets/pokecenter_palette_map.asm"
-; 0x4c315
-TilesetGatePalMap: ; 0x4c315
+TilesetGatePalMap:
INCLUDE "gfx/tilesets/gate_palette_map.asm"
-; 0x4c385
-TilesetPortPalMap: ; 0x4c385
+TilesetPortPalMap:
INCLUDE "gfx/tilesets/port_palette_map.asm"
-; 0x4c3f5
-TilesetLabPalMap: ; 0x4c3f5
+TilesetLabPalMap:
INCLUDE "gfx/tilesets/lab_palette_map.asm"
-; 0x4c465
-TilesetFacilityPalMap: ; 0x4c465
+TilesetFacilityPalMap:
INCLUDE "gfx/tilesets/facility_palette_map.asm"
-; 0x4c4d5
-TilesetMartPalMap: ; 0x4c4d5
+TilesetMartPalMap:
INCLUDE "gfx/tilesets/mart_palette_map.asm"
-; 0x4c545
-TilesetMansionPalMap: ; 0x4c545
+TilesetMansionPalMap:
INCLUDE "gfx/tilesets/mansion_palette_map.asm"
-; 0x4c5b5
-TilesetGameCornerPalMap: ; 0x4c5b5
+TilesetGameCornerPalMap:
INCLUDE "gfx/tilesets/game_corner_palette_map.asm"
-; 0x4c625
-TilesetEliteFourRoomPalMap: ; 0x4c625
+TilesetEliteFourRoomPalMap:
INCLUDE "gfx/tilesets/elite_four_room_palette_map.asm"
-; 0x4c695
-TilesetTraditionalHousePalMap: ; 0x4c695
+TilesetTraditionalHousePalMap:
INCLUDE "gfx/tilesets/traditional_house_palette_map.asm"
-; 0x4c705
-TilesetTowerPalMap: ; 0x4c705
+TilesetTowerPalMap:
INCLUDE "gfx/tilesets/tower_palette_map.asm"
-; 0x4c775
-TilesetCavePalMap: ; 0x4c775
-TilesetDarkCavePalMap: ; 0x4c775
+TilesetCavePalMap:
+TilesetDarkCavePalMap:
INCLUDE "gfx/tilesets/cave_palette_map.asm"
-; 0x4c7e5
-TilesetParkPalMap: ; 0x4c7e5
+TilesetParkPalMap:
INCLUDE "gfx/tilesets/park_palette_map.asm"
-; 0x4c855
-TilesetRuinsOfAlphPalMap: ; 0x4c855
-TilesetBetaWordRoomPalMap: ; 0x4c855
-TilesetHoOhWordRoomPalMap: ; 0x4c855
-TilesetKabutoWordRoomPalMap: ; 0x4c855
-TilesetOmanyteWordRoomPalMap: ; 0x4c855
-TilesetAerodactylWordRoomPalMap: ; 0x4c855
+TilesetRuinsOfAlphPalMap:
+TilesetBetaWordRoomPalMap:
+TilesetHoOhWordRoomPalMap:
+TilesetKabutoWordRoomPalMap:
+TilesetOmanyteWordRoomPalMap:
+TilesetAerodactylWordRoomPalMap:
INCLUDE "gfx/tilesets/ruins_of_alph_palette_map.asm"
-; 0x4c8c5
-TilesetRadioTowerPalMap: ; 0x4c8c5
+TilesetRadioTowerPalMap:
INCLUDE "gfx/tilesets/radio_tower_palette_map.asm"
-; 0x4c935
-TilesetTrainStationPalMap: ; 0x4c935
+TilesetTrainStationPalMap:
INCLUDE "gfx/tilesets/train_station_palette_map.asm"
-; 0x4c9a5
-TilesetUndergroundPalMap: ; 0x4c9a5
+TilesetUndergroundPalMap:
INCLUDE "gfx/tilesets/underground_palette_map.asm"
-; 0x4ca15
-TilesetChampionsRoomPalMap: ; 0x4ca15
+TilesetChampionsRoomPalMap:
INCLUDE "gfx/tilesets/champions_room_palette_map.asm"
-; 0x4ca85
-TilesetLighthousePalMap: ; 0x4ca85
+TilesetLighthousePalMap:
INCLUDE "gfx/tilesets/lighthouse_palette_map.asm"
-; 0x4caf5
-TilesetPlayersRoomPalMap: ; 0x4caf5
+TilesetPlayersRoomPalMap:
INCLUDE "gfx/tilesets/players_room_palette_map.asm"
-; 0x4cb65
-UnusedMuseumPalMap: ; 0x4cb65
+UnusedMuseumPalMap:
INCLUDE "gfx/tilesets/unused_museum_palette_map.asm"
-TilesetIcePathPalMap: ; 0x4cbd5
+TilesetIcePathPalMap:
INCLUDE "gfx/tilesets/ice_path_palette_map.asm"
-; 0x4cc45
-TilesetForestPalMap: ; 0x4cc45
+TilesetForestPalMap:
INCLUDE "gfx/tilesets/forest_palette_map.asm"
-; 0x4ccb5
-TilesetPokeComCenterPalMap: ; 0x4ccb5
+TilesetPokeComCenterPalMap:
INCLUDE "gfx/tilesets/pokecom_center_palette_map.asm"
-; 0x4cd25
-TilesetBattleTowerPalMap: ; 0x4cd25
+TilesetBattleTowerPalMap:
INCLUDE "gfx/tilesets/battle_tower_palette_map.asm"
-; 0x4cd95
-TilesetBattleTowerOutsidePalMap: ; 0x4cd95
+TilesetBattleTowerOutsidePalMap:
INCLUDE "gfx/tilesets/battle_tower_outside_palette_map.asm"
-; 0x4ce05
; unused
-; 0x4ce05
rept 26
db $06
endr
-; 0x4ce1f
--- a/gfx/tilesets.asm
+++ b/gfx/tilesets.asm
@@ -6,430 +6,332 @@
SECTION "Tileset Data 1", ROMX
-TilesetKantoGFX: ; 0x18000
+TilesetKantoGFX:
INCBIN "gfx/tilesets/kanto.2bpp.lz"
-; 0x18606
-TilesetKantoMeta: ; 0x18606
+TilesetKantoMeta:
INCBIN "data/tilesets/kanto_metatiles.bin"
-; 0x18e06
-TilesetKantoColl: ; 0x18e06
+TilesetKantoColl:
INCLUDE "data/tilesets/kanto_collision.asm"
-; 0x19006
-Tileset0GFX: ; 0x19006
-TilesetJohtoGFX: ; 0x19006
+Tileset0GFX:
+TilesetJohtoGFX:
INCBIN "gfx/tilesets/johto.2bpp.lz"
-; 0x19c0e
-Tileset0Meta: ; 0x19c0e
-TilesetJohtoMeta: ; 0x19c0e
+Tileset0Meta:
+TilesetJohtoMeta:
INCBIN "data/tilesets/johto_metatiles.bin"
-; 0x1a40e
-Tileset0Coll: ; 0x1a40e
-TilesetJohtoColl: ; 0x1a40e
+Tileset0Coll:
+TilesetJohtoColl:
INCLUDE "data/tilesets/johto_collision.asm"
-; 0x1a60e
-TilesetIcePathGFX: ; 0x1a60e
+TilesetIcePathGFX:
INCBIN "gfx/tilesets/ice_path.2bpp.lz"
-; 0x1af3e
-TilesetIcePathMeta: ; 0x1af3e
+TilesetIcePathMeta:
INCBIN "data/tilesets/ice_path_metatiles.bin"
-; 0x1b33e
-TilesetIcePathColl: ; 0x1b33e
+TilesetIcePathColl:
INCLUDE "data/tilesets/ice_path_collision.asm"
-; 0x1b43e
-TilesetPlayersRoomGFX: ; 0x1b43e
+TilesetPlayersRoomGFX:
INCBIN "gfx/tilesets/players_room.2bpp.lz"
-; 0x1b8fe
-TilesetPlayersRoomMeta: ; 0x1b8fe
+TilesetPlayersRoomMeta:
INCBIN "data/tilesets/players_room_metatiles.bin"
-; 0x1bcfe
-TilesetPlayersRoomColl: ; 0x1bcfe
+TilesetPlayersRoomColl:
INCLUDE "data/tilesets/players_room_collision.asm"
-; 0x1bdfe
SECTION "Tileset Data 2", ROMX
-TilesetPokecenterGFX: ; 0x1c30c
+TilesetPokecenterGFX:
INCBIN "gfx/tilesets/pokecenter.2bpp.lz"
-; 0x1c73c
-TilesetPokecenterMeta: ; 0x1c73c
+TilesetPokecenterMeta:
INCBIN "data/tilesets/pokecenter_metatiles.bin"
-; 0x1cb3c
-TilesetPokecenterColl: ; 0x1cb3c
+TilesetPokecenterColl:
INCLUDE "data/tilesets/pokecenter_collision.asm"
-; 0x1cc3c
-TilesetPortGFX: ; 0x1cc3c
+TilesetPortGFX:
INCBIN "gfx/tilesets/port.2bpp.lz"
-; 0x1d04c
-TilesetPortMeta: ; 0x1d04c
+TilesetPortMeta:
INCBIN "data/tilesets/port_metatiles.bin"
-; 0x1d44c
-TilesetPortColl: ; 0x1d44c
+TilesetPortColl:
INCLUDE "data/tilesets/port_collision.asm"
-; 0x1d54c
-TilesetPlayersHouseGFX: ; 0x1d54c
+TilesetPlayersHouseGFX:
INCBIN "gfx/tilesets/players_house.2bpp.lz"
-; 0x1d92c
-TilesetPlayersHouseMeta: ; 0x1d92c
+TilesetPlayersHouseMeta:
INCBIN "data/tilesets/players_house_metatiles.bin"
-; 0x1dd2c
-TilesetPlayersHouseColl: ; 0x1dd2c
+TilesetPlayersHouseColl:
INCLUDE "data/tilesets/players_house_collision.asm"
-; 0x1de2c
-TilesetMansionGFX: ; 0x1de2c
+TilesetMansionGFX:
INCBIN "gfx/tilesets/mansion.2bpp.lz"
-; 0x1e58c
-TilesetMansionMeta: ; 0x1e58c
+TilesetMansionMeta:
INCBIN "data/tilesets/mansion_metatiles.bin"
-; 0x1e98c
-TilesetMansionColl: ; 0x1e98c
+TilesetMansionColl:
INCLUDE "data/tilesets/mansion_collision.asm"
-; 0x1ea8c
-TilesetCaveGFX: ; 0x1ea8c
+TilesetCaveGFX:
INCBIN "gfx/tilesets/cave.2bpp.lz"
-; 0x1ee1c
-TilesetCaveMeta: ; 0x1ee1c
-TilesetDarkCaveMeta: ; 0x1ee1c
+TilesetCaveMeta:
+TilesetDarkCaveMeta:
INCBIN "data/tilesets/cave_metatiles.bin"
-; 0x1f21c
-TilesetCaveColl: ; 0x1f21c
-TilesetDarkCaveColl: ; 0x1f21c
+TilesetCaveColl:
+TilesetDarkCaveColl:
INCLUDE "data/tilesets/cave_collision.asm"
-; 0x1f31c
SECTION "Tileset Data 3", ROMX
-TilesetTowerGFX: ; 0x20181
+TilesetTowerGFX:
INCBIN "gfx/tilesets/tower.2bpp.lz"
-; 0x206e1
-TilesetTowerMeta: ; 0x206e1
+TilesetTowerMeta:
INCBIN "data/tilesets/tower_metatiles.bin"
-; 0x20ae1
-TilesetTowerColl: ; 0x20ae1
+TilesetTowerColl:
INCLUDE "data/tilesets/tower_collision.asm"
-; 0x20be1
-TilesetLabGFX: ; 0x20be1
+TilesetLabGFX:
INCBIN "gfx/tilesets/lab.2bpp.lz"
-; 0x213e1
-TilesetLabMeta: ; 0x213e1
+TilesetLabMeta:
INCBIN "data/tilesets/lab_metatiles.bin"
-; 0x217e1
-TilesetLabColl: ; 0x217e1
+TilesetLabColl:
INCLUDE "data/tilesets/lab_collision.asm"
-; 0x218e1
-TilesetMartGFX: ; 0x218e1
+TilesetMartGFX:
INCBIN "gfx/tilesets/mart.2bpp.lz"
-; 0x22031
-TilesetMartMeta: ; 0x22031
+TilesetMartMeta:
INCBIN "data/tilesets/mart_metatiles.bin"
-; 0x22431
-TilesetMartColl: ; 0x22431
+TilesetMartColl:
INCLUDE "data/tilesets/mart_collision.asm"
-; 0x22531
-TilesetGameCornerGFX: ; 0x22531
+TilesetGameCornerGFX:
INCBIN "gfx/tilesets/game_corner.2bpp.lz"
-; 0x22af1
-TilesetGameCornerMeta: ; 0x22af1
+TilesetGameCornerMeta:
INCBIN "data/tilesets/game_corner_metatiles.bin"
-; 0x22ef1
-TilesetGameCornerColl: ; 0x22ef1
+TilesetGameCornerColl:
INCLUDE "data/tilesets/game_corner_collision.asm"
-; 0x22ff1
-TilesetTrainStationGFX: ; 0x22ff1
+TilesetTrainStationGFX:
INCBIN "gfx/tilesets/train_station.2bpp.lz"
-; 0x23391
-TilesetTrainStationMeta: ; 0x23391
+TilesetTrainStationMeta:
INCBIN "data/tilesets/train_station_metatiles.bin"
-; 0x23791
-TilesetTrainStationColl: ; 0x23791
+TilesetTrainStationColl:
INCLUDE "data/tilesets/train_station_collision.asm"
-; 0x23891
-TilesetForestMeta: ; 0x23891
+TilesetForestMeta:
INCBIN "data/tilesets/forest_metatiles.bin"
-; 0x23b11
SECTION "Tileset Data 4", ROMX
-TilesetEliteFourRoomGFX: ; 0x30000
+TilesetEliteFourRoomGFX:
INCBIN "gfx/tilesets/elite_four_room.2bpp.lz"
-; 0x304e0
-TilesetEliteFourRoomMeta: ; 0x304e0
+TilesetEliteFourRoomMeta:
INCBIN "data/tilesets/elite_four_room_metatiles.bin"
-; 0x308e0
-TilesetEliteFourRoomColl: ; 0x308e0
+TilesetEliteFourRoomColl:
INCLUDE "data/tilesets/elite_four_room_collision.asm"
-; 0x309e0
-TilesetParkGFX: ; 0x309e0
+TilesetParkGFX:
INCBIN "gfx/tilesets/park.2bpp.lz"
-; 0x30e80
-TilesetParkMeta: ; 0x30e80
+TilesetParkMeta:
INCBIN "data/tilesets/park_metatiles.bin"
-; 0x31280
-TilesetParkColl: ; 0x31280
+TilesetParkColl:
INCLUDE "data/tilesets/park_collision.asm"
-; 0x31380
-TilesetRadioTowerGFX: ; 0x31380
+TilesetRadioTowerGFX:
INCBIN "gfx/tilesets/radio_tower.2bpp.lz"
-; 0x318e0
-TilesetRadioTowerMeta: ; 0x318e0
+TilesetRadioTowerMeta:
INCBIN "data/tilesets/radio_tower_metatiles.bin"
-; 0x31ce0
-TilesetRadioTowerColl: ; 0x31ce0
+TilesetRadioTowerColl:
INCLUDE "data/tilesets/radio_tower_collision.asm"
-; 0x31de0
-TilesetUndergroundGFX: ; 0x31de0
+TilesetUndergroundGFX:
INCBIN "gfx/tilesets/underground.2bpp.lz"
-; 0x321b0
-TilesetUndergroundMeta: ; 0x321b0
+TilesetUndergroundMeta:
INCBIN "data/tilesets/underground_metatiles.bin"
-; 0x325b0
-TilesetUndergroundColl: ; 0x325b0
+TilesetUndergroundColl:
INCLUDE "data/tilesets/underground_collision.asm"
-; 0x326b0
-TilesetDarkCaveGFX: ; 0x326b0
+TilesetDarkCaveGFX:
INCBIN "gfx/tilesets/dark_cave.2bpp.lz"
-; 0x329f0
-UnusedTilesetDarkCaveMeta: ; 0x329f0
+UnusedTilesetDarkCaveMeta:
INCBIN "data/tilesets/unused_dark_cave_metatiles.bin"
-; 0x331f0
-UnusedTilesetDarkCaveColl: ; 0x331f0
+UnusedTilesetDarkCaveColl:
INCLUDE "data/tilesets/unused_dark_cave_collision.asm"
-; 0x333f0
SECTION "Tileset Data 5", ROMX
-TilesetPokeComCenterGFX: ; 0xb4000
+TilesetPokeComCenterGFX:
INCBIN "gfx/tilesets/pokecom_center.2bpp.lz"
-; 0xb48a0
-TilesetPokeComCenterMeta: ; 0xb48a0
+TilesetPokeComCenterMeta:
INCBIN "data/tilesets/pokecom_center_metatiles.bin"
-; 0xb4ca0
-TilesetPokeComCenterColl: ; 0xb4ca0
+TilesetPokeComCenterColl:
INCLUDE "data/tilesets/pokecom_center_collision.asm"
-; 0xb4da0
-TilesetBattleTowerGFX: ; 0xb4da0
+TilesetBattleTowerGFX:
INCBIN "gfx/tilesets/battle_tower.2bpp.lz"
-; 0xb50e0
-TilesetBattleTowerMeta: ; 0xb50e0
+TilesetBattleTowerMeta:
INCBIN "data/tilesets/battle_tower_metatiles.bin"
-; 0xb54e0
-TilesetBattleTowerColl: ; 0xb54e0
+TilesetBattleTowerColl:
INCLUDE "data/tilesets/battle_tower_collision.asm"
-; 0xb55e0
-TilesetGateGFX: ; 0xb55e0
+TilesetGateGFX:
INCBIN "gfx/tilesets/gate.2bpp.lz"
-; 0xb59e0
-TilesetGateMeta: ; 0xb59e0
+TilesetGateMeta:
INCBIN "data/tilesets/gate_metatiles.bin"
-; 0xb5de0
-TilesetGateColl: ; 0xb5de0
+TilesetGateColl:
INCLUDE "data/tilesets/gate_collision.asm"
-; 0xb5ee0
-TilesetJohtoModernGFX: ; 0xb5ee0
-TilesetBattleTowerOutsideGFX: ; 0xb5ee0
+TilesetJohtoModernGFX:
+TilesetBattleTowerOutsideGFX:
INCBIN "gfx/tilesets/johto_modern.2bpp.lz"
-; 0xb6ae8
-TilesetJohtoModernMeta: ; 0xb6ae8
+TilesetJohtoModernMeta:
INCBIN "data/tilesets/johto_modern_metatiles.bin"
-; 0xb72e8
-TilesetJohtoModernColl: ; 0xb72e8
+TilesetJohtoModernColl:
INCLUDE "data/tilesets/johto_modern_collision.asm"
-; 0xb74e8
-TilesetTraditionalHouseGFX: ; 0xb74e8
+TilesetTraditionalHouseGFX:
INCBIN "gfx/tilesets/traditional_house.2bpp.lz"
-; 0xb79a8
-TilesetTraditionalHouseMeta: ; 0xb79a8
+TilesetTraditionalHouseMeta:
INCBIN "data/tilesets/traditional_house_metatiles.bin"
-; 0xb7da8
-TilesetTraditionalHouseColl: ; 0xb7da8
+TilesetTraditionalHouseColl:
INCLUDE "data/tilesets/traditional_house_collision.asm"
-; 0xb7ea8
SECTION "Tileset Data 6", ROMX
-TilesetForestGFX: ; 0xdc000
+TilesetForestGFX:
INCBIN "gfx/tilesets/forest.2bpp.lz"
-; 0xdc3d0
-TilesetChampionsRoomGFX: ; 0xdc3d0
+TilesetChampionsRoomGFX:
INCBIN "gfx/tilesets/champions_room.2bpp.lz"
-; 0xdcc50
-TilesetChampionsRoomMeta: ; 0xdcc50
+TilesetChampionsRoomMeta:
INCBIN "data/tilesets/champions_room_metatiles.bin"
-; 0xdd050
-TilesetChampionsRoomColl: ; 0xdd050
+TilesetChampionsRoomColl:
INCLUDE "data/tilesets/champions_room_collision.asm"
-; 0xdd150
-TilesetHouseGFX: ; 0xdd150
+TilesetHouseGFX:
INCBIN "gfx/tilesets/house.2bpp.lz"
-; 0xdd600
-TilesetHouseMeta: ; 0xdd600
+TilesetHouseMeta:
INCBIN "data/tilesets/house_metatiles.bin"
-; 0xdda00
-TilesetHouseColl: ; 0xdda00
+TilesetHouseColl:
INCLUDE "data/tilesets/house_collision.asm"
-; 0xddb00
-TilesetLighthouseGFX: ; 0xddb00
+TilesetLighthouseGFX:
INCBIN "gfx/tilesets/lighthouse.2bpp.lz"
-; 0xddf70
-TilesetLighthouseMeta: ; 0xddf70
+TilesetLighthouseMeta:
INCBIN "data/tilesets/lighthouse_metatiles.bin"
-; 0xde370
-TilesetLighthouseColl: ; 0xde370
+TilesetLighthouseColl:
INCLUDE "data/tilesets/lighthouse_collision.asm"
-; 0xde470
-TilesetForestColl: ; 0xde470
+TilesetForestColl:
INCLUDE "data/tilesets/forest_collision.asm"
-; 0xde570
-TilesetFacilityGFX: ; 0xde570
+TilesetFacilityGFX:
INCBIN "gfx/tilesets/facility.2bpp.lz"
-; 0xde990
-TilesetFacilityMeta: ; 0xde990
+TilesetFacilityMeta:
INCBIN "data/tilesets/facility_metatiles.bin"
-; 0xded90
-TilesetFacilityColl: ; 0xded90
+TilesetFacilityColl:
INCLUDE "data/tilesets/facility_collision.asm"
-; 0xdee90
-TilesetBattleTowerOutsideMeta: ; 0xdee90
+TilesetBattleTowerOutsideMeta:
INCBIN "data/tilesets/battle_tower_outside_metatiles.bin"
-; 0xdf690
-TilesetBattleTowerOutsideColl: ; 0xdf690
+TilesetBattleTowerOutsideColl:
INCLUDE "data/tilesets/battle_tower_outside_collision.asm"
-; 0xdf890
-TilesetBetaWordRoomMeta: ; 0xdf890
+TilesetBetaWordRoomMeta:
INCBIN "data/tilesets/beta_word_room_metatiles.bin"
-; 0xdfc90
-TilesetBetaWordRoomColl: ; 0xdfc90
-TilesetHoOhWordRoomColl: ; 0xdfc90
-TilesetKabutoWordRoomColl: ; 0xdfc90
-TilesetOmanyteWordRoomColl: ; 0xdfc90
-TilesetAerodactylWordRoomColl: ; 0xdfc90
+TilesetBetaWordRoomColl:
+TilesetHoOhWordRoomColl:
+TilesetKabutoWordRoomColl:
+TilesetOmanyteWordRoomColl:
+TilesetAerodactylWordRoomColl:
INCLUDE "data/tilesets/beta_word_room_collision.asm"
-; 0xdfd90
SECTION "Tileset Data 7", ROMX
-TilesetRuinsOfAlphGFX: ; 0x1dc5a1
-TilesetBetaWordRoomGFX: ; 0x1dc5a1
-TilesetHoOhWordRoomGFX: ; 0x1dc5a1
-TilesetKabutoWordRoomGFX: ; 0x1dc5a1
-TilesetOmanyteWordRoomGFX: ; 0x1dc5a1
-TilesetAerodactylWordRoomGFX: ; 0x1dc5a1
+TilesetRuinsOfAlphGFX:
+TilesetBetaWordRoomGFX:
+TilesetHoOhWordRoomGFX:
+TilesetKabutoWordRoomGFX:
+TilesetOmanyteWordRoomGFX:
+TilesetAerodactylWordRoomGFX:
INCBIN "gfx/tilesets/ruins_of_alph.2bpp.lz"
-; 0x1dd1a9
-TilesetRuinsOfAlphMeta: ; 0x1dd1a9
+TilesetRuinsOfAlphMeta:
INCBIN "data/tilesets/ruins_of_alph_metatiles.bin"
-; 0x1dd5a9
-TilesetRuinsOfAlphColl: ; 0x1dd5a9
+TilesetRuinsOfAlphColl:
INCLUDE "data/tilesets/ruins_of_alph_collision.asm"
-; 0x1dd6a9
SECTION "Tileset Data 8", ROMX
-TilesetHoOhWordRoomMeta: ; 0x1e0000
+TilesetHoOhWordRoomMeta:
INCBIN "data/tilesets/ho_oh_word_room_metatiles.bin"
-; 0x1e0400
-TilesetKabutoWordRoomMeta: ; 0x1e0400
+TilesetKabutoWordRoomMeta:
INCBIN "data/tilesets/kabuto_word_room_metatiles.bin"
-; 0x1e0800
-TilesetOmanyteWordRoomMeta: ; 0x1e0800
+TilesetOmanyteWordRoomMeta:
INCBIN "data/tilesets/omanyte_word_room_metatiles.bin"
-; 0x1e0c00
-TilesetAerodactylWordRoomMeta: ; 0x1e0c00
+TilesetAerodactylWordRoomMeta:
INCBIN "data/tilesets/aerodactyl_word_room_metatiles.bin"
-; 0x1e1000
--- a/home.asm
+++ b/home.asm
@@ -132,7 +132,7 @@
scf
ret
-SkipNames:: ; 0x30f4
+SkipNames::
; Skip a names.
ld bc, NAME_LENGTH
and a
@@ -142,7 +142,6 @@
dec a
jr nz, .loop
ret
-; 0x30fe
INCLUDE "home/math.asm"
INCLUDE "home/print_text.asm"
@@ -189,7 +188,6 @@
dec c
jr nz, .loop
ret
-; 0x31e4
CompareLong::
; Compare bc bytes at de and hl.
@@ -217,7 +215,7 @@
INCLUDE "home/tilemap.asm"
INCLUDE "home/hp_pals.asm"
-CountSetBits:: ; 0x335f
+CountSetBits::
; Count the number of set bits in b bytes starting from hl.
; Return in a, c and [wd265].
ld c, 0
@@ -240,7 +238,6 @@
ld a, c
ld [wd265], a
ret
-; 0x3376
GetWeekday::
ld a, [wCurDay]
--- a/home/copy.asm
+++ b/home/copy.asm
@@ -155,7 +155,6 @@
pop af
rst Bankswitch
ret
-; 0xe9b
FarCopyBytesDouble::
@@ -194,7 +193,6 @@
pop af
rst Bankswitch
ret
-; 0xeba
Request2bpp::
--- a/home/copy2.asm
+++ b/home/copy2.asm
@@ -1,4 +1,4 @@
-CopyBytes:: ; 0x3026
+CopyBytes::
; copy bc bytes from hl to de
inc b ; we bail the moment b hits 0, so include the last run
inc c ; same thing; include last byte
@@ -14,7 +14,7 @@
jr nz, .CopyByte
ret
-SwapBytes:: ; 0x3034
+SwapBytes::
; swap bc bytes between hl and de
.Loop:
; stash [hl] away on the stack
@@ -37,7 +37,7 @@
jr nz, .Loop
ret
-ByteFill:: ; 0x3041
+ByteFill::
; fill bc bytes with the value of a, starting at hl
inc b ; we bail the moment b hits 0, so include the last run
inc c ; same thing; include last byte
@@ -51,7 +51,7 @@
jr nz, .PutByte
ret
-GetFarByte:: ; 0x304d
+GetFarByte::
; retrieve a single byte from a:hl, and return it in a.
; bankswitch to new bank
ld [hBuffer], a
@@ -72,7 +72,7 @@
ld a, [hBuffer]
ret
-GetFarHalfword:: ; 0x305d
+GetFarHalfword::
; retrieve a halfword from a:hl, and return it in hl.
; bankswitch to new bank
ld [hBuffer], a
@@ -90,7 +90,6 @@
pop af
rst Bankswitch
ret
-; 0x306b
FarCopyWRAM::
ld [hBuffer], a
--- a/home/flag.asm
+++ b/home/flag.asm
@@ -25,12 +25,12 @@
ret
-EventFlagAction:: ; 0x2e6f
+EventFlagAction::
ld hl, wEventFlags
call FlagAction
ret
-FlagAction:: ; 0x2e76
+FlagAction::
; Perform action b on bit de in flag array hl.
; inputs:
@@ -96,7 +96,6 @@
and [hl]
ld [hl], a
ret
-; 0x2ead
CheckReceivedDex::
--- a/home/map.asm
+++ b/home/map.asm
@@ -1076,7 +1076,7 @@
rst Bankswitch
ret
-GetScriptByte:: ; 0x26d4
+GetScriptByte::
; Return byte at wScriptBank:wScriptPos in a.
push hl
@@ -1105,16 +1105,13 @@
pop bc
pop hl
ret
-; 0x26ef
-ObjectEvent:: ; 0x26ef
+ObjectEvent::
jumptextfaceplayer ObjectEventText
-; 0x26f2
ObjectEventText::
text_jump _ObjectEventText
db "@"
-; 0x26f7
BGEvent::
jumptext BGEventText
@@ -1929,7 +1926,7 @@
call EnableSpriteUpdates
ret
-ReturnToMapWithSpeechTextbox:: ; 0x2b74
+ReturnToMapWithSpeechTextbox::
push af
ld a, $1
ld [wSpriteUpdatesEnabled], a
@@ -1952,7 +1949,6 @@
ld [hMapAnims], a
pop af
ret
-; 0x2bae
ReloadTilesetAndPalettes::
call DisableLCD
@@ -1983,7 +1979,7 @@
ld b, a
ld a, [wMapNumber]
ld c, a
-GetAnyMapPointer:: ; 0x2bed
+GetAnyMapPointer::
; Prior to calling this function, you must have switched banks so that
; MapGroupPointers is visible.
@@ -2013,9 +2009,8 @@
ld a, 9
call AddNTimes
ret
-; 0x2c04
-GetMapField:: ; 0x2c04
+GetMapField::
; Extract data from the current map's group entry.
; inputs:
@@ -2029,7 +2024,7 @@
ld b, a
ld a, [wMapNumber]
ld c, a
-GetAnyMapField:: ; 0x2c0c
+GetAnyMapField::
; bankswitch
ld a, [hROMBank]
push af
@@ -2046,7 +2041,6 @@
pop af
rst Bankswitch
ret
-; 0x2c1c
SwitchToMapAttributesBank::
ld a, [wMapGroup]
@@ -2128,7 +2122,7 @@
pop hl
ret
-GetMapAttributesPointer:: ; 0x2c7d
+GetMapAttributesPointer::
; returns the current map's data pointer in hl.
push bc
push de
@@ -2172,7 +2166,7 @@
ld a, c
ret
-GetWorldMapLocation:: ; 0x2caf
+GetWorldMapLocation::
; given a map group/id in bc, return its location on the Pokégear map.
push hl
push de
@@ -2186,7 +2180,6 @@
pop de
pop hl
ret
-; 0x2cbd
GetMapMusic::
push hl
--- a/home/math.asm
+++ b/home/math.asm
@@ -1,4 +1,4 @@
-AddNTimes:: ; 0x30fe
+AddNTimes::
; Add bc * a to hl.
and a
ret z
@@ -7,7 +7,6 @@
dec a
jr nz, .loop
ret
-; 0x3105
SimpleMultiply::
; Return a * c.
--- a/home/menu.asm
+++ b/home/menu.asm
@@ -13,7 +13,6 @@
ld a, [hROMBank]
ld [wMenuDataBank], a
ret
-; 0x1d4b
StoreTo_wMenuCursorBuffer::
ld [wMenuCursorBuffer], a
@@ -109,7 +108,6 @@
pop bc
pop hl
ret
-; 0x1dcf
YesNoBox::
@@ -246,7 +244,6 @@
pop af
ld [hOAMUpdate], a
ret
-; 0x1ea6
AutomaticGetMenuBottomCoord::
ld a, [wMenuBorderLeftCoord]
@@ -505,7 +502,6 @@
call PlaySFX
pop de
ret
-; 0x2012
MenuTextBoxWaitButton::
call MenuTextBox
--- a/home/menu_window.asm
+++ b/home/menu_window.asm
@@ -2,17 +2,17 @@
callfar _PushWindow
ret
-ExitMenu:: ; 0x1c07
+ExitMenu::
push af
callfar _ExitMenu
pop af
ret
-InitVerticalMenuCursor:: ; 0x1c10
+InitVerticalMenuCursor::
callfar _InitVerticalMenuCursor
ret
-CloseWindow:: ; 0x1c17
+CloseWindow::
push af
call ExitMenu
call ApplyTilemap
@@ -20,15 +20,14 @@
pop af
ret
-RestoreTileBackup:: ; 0x1c23
+RestoreTileBackup::
call MenuBoxCoord2Tile
call .copy
call MenuBoxCoord2Attr
call .copy
ret
-; 0x1c30
-.copy ; 0x1c30
+.copy
call GetMenuBoxDims
inc b
inc c
@@ -53,7 +52,7 @@
ret
-PopWindow:: ; 0x1c47
+PopWindow::
ld b, $10
ld de, wMenuFlags
.loop
@@ -64,7 +63,7 @@
jr nz, .loop ; 0x1c50 $fa
ret
-GetMenuBoxDims:: ; 0x1c53
+GetMenuBoxDims::
ld a, [wMenuBorderTopCoord] ; top
ld b, a
ld a, [wMenuBorderBottomCoord] ; bottom
@@ -76,7 +75,6 @@
sub c
ld c, a
ret
-; 0x1c66
CopyMenuData::
push hl
--- a/home/print_bcd.asm
+++ b/home/print_bcd.asm
@@ -48,7 +48,6 @@
inc hl
.done
ret
-; 0x38f2
PrintBCDDigit::
and %00001111
@@ -78,4 +77,3 @@
ld a, " "
ld [hli], a ; if right-aligned, "print" a space by advancing the pointer
ret
-; 0x3917
--- a/home/print_text.asm
+++ b/home/print_text.asm
@@ -97,7 +97,6 @@
cp c
jr nz, CopyDataUntil
ret
-; 0x3198
PrintNum::
homecall _PrintNum
--- a/home/sprite_updates.asm
+++ b/home/sprite_updates.asm
@@ -1,4 +1,4 @@
-DisableSpriteUpdates:: ; 0x2ed3
+DisableSpriteUpdates::
xor a
ld [hMapAnims], a
ld a, [wVramState]
@@ -7,7 +7,6 @@
ld a, $0
ld [wSpriteUpdatesEnabled], a
ret
-; 0x2ee4
EnableSpriteUpdates::
ld a, $1
--- a/home/text.asm
+++ b/home/text.asm
@@ -284,7 +284,6 @@
ld [hli], a
call PrintLetterDelay
jp NextChar
-; 0x117b
DayOfWeekChar::
@@ -399,7 +398,6 @@
ld l, c
pop de
jp NextChar
-; 0x1273
TMCharText:: db "TM@"
TrainerCharText:: db "TRAINER@"
@@ -480,7 +478,6 @@
hlcoord TEXTBOX_INNERX, TEXTBOX_INNERY + 2
push hl
jp NextChar
-; 0x12f2
Paragraph::
push de
--- a/home/tilemap.asm
+++ b/home/tilemap.asm
@@ -9,7 +9,7 @@
call DelayFrames
ret
-WaitBGMap2:: ; 0x3200
+WaitBGMap2::
ld a, [hCGB]
and a
jr z, .bg0
@@ -25,7 +25,6 @@
ld c, 4
call DelayFrames
ret
-; 0x3218
IsCGB::
ld a, [hCGB]
--- a/lib/mobile/main.asm
+++ b/lib/mobile/main.asm
@@ -2349,23 +2349,23 @@
ld [$c86a], a
jp Function110432
-URIPrefix: ; 0x110fad
+URIPrefix:
db "http://"
.End
-HTTPDownloadURL: ; 0x110fb4
+HTTPDownloadURL:
db "gameboy.datacenter.ne.jp/cgb/download"
.End
-HTTPUploadURL: ; 0x110fd9
+HTTPUploadURL:
db "gameboy.datacenter.ne.jp/cgb/upload"
.End
-HTTPUtilityURL: ; 0x110ffc
+HTTPUtilityURL:
db "gameboy.datacenter.ne.jp/cgb/utility"
.End
-HTTPRankingURL: ; 0x111020
+HTTPRankingURL:
db "gameboy.datacenter.ne.jp/cgb/ranking"
.End
--- a/mobile/mobile_12.asm
+++ b/mobile/mobile_12.asm
@@ -551,41 +551,38 @@
MobileDesc_Address: db "Where do you live?@"
MobileDesc_ZipCode: db "Your zip code?@"
-MenuHeader_0x484f1: ; 0x484f1
+MenuHeader_0x484f1:
db MENU_BACKUP_TILES ; flags
menu_coords 11, 2, SCREEN_WIDTH - 1, 7
dw MenuData_0x484f9
db 1 ; default option
-; 0x484f9
-MenuData_0x484f9: ; 0x484f9
+MenuData_0x484f9:
db STATICMENU_CURSOR | STATICMENU_WRAP ; flags
db 2 ; items
Strings_484fb:
String_484fb: db "Boy@"
String_484ff: db "Girl@"
-; 0x48504
-MenuHeader_0x48504: ; 0x48504
+MenuHeader_0x48504:
db MENU_BACKUP_TILES ; flags
menu_coords 10, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1
-MenuHeader_0x48509: ; 0x48509
+MenuHeader_0x48509:
db MENU_BACKUP_TILES ; flags
menu_coords 10, 5, SCREEN_WIDTH - 1, 7
-MenuHeader_0x4850e: ; 0x4850e
+MenuHeader_0x4850e:
db MENU_BACKUP_TILES ; flags
menu_coords 10, 9, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
-MenuHeader_0x48513: ; 0x48513
+MenuHeader_0x48513:
db MENU_BACKUP_TILES ; flags
menu_coords 11, 1, 18, 12
dw MenuData_0x4851b
db 1 ; default option
-; 0x4851b
-MenuData_0x4851b: ; 0x4851b
+MenuData_0x4851b:
db SCROLLINGMENU_DISPLAY_ARROWS | SCROLLINGMENU_ENABLE_RIGHT | SCROLLINGMENU_ENABLE_LEFT | SCROLLINGMENU_CALL_FUNCTION1_CANCEL ; flags
db 6 ; items
@@ -1252,7 +1249,7 @@
scf
ret
-MenuHeader_0x48a9c: ; 0x48a9c
+MenuHeader_0x48a9c:
db MENU_BACKUP_TILES ; flags
menu_coords 10, 8, SCREEN_WIDTH - 1, 13
--- a/mobile/mobile_12_2.asm
+++ b/mobile/mobile_12_2.asm
@@ -239,11 +239,10 @@
call PrintText
jr .asm_4a974
-UnknownText_0x4a9be: ; 0x4a9be
+UnknownText_0x4a9be:
; Pick three #MON for battle.
text_jump UnknownText_0x1c51d7
db "@"
-; 0x4a9c3
Function4a9c3:
ld hl, wd002
@@ -293,11 +292,10 @@
call YesNoBox
ret
-UnknownText_0x4aa1d: ; 0x4aa1d
+UnknownText_0x4aa1d:
; , @ and @ . Use these three?
text_jump UnknownText_0x1c51f4
db "@"
-; 0x4aa22
Function4aa22:
call ClearBGPalettes
@@ -694,12 +692,11 @@
and a
ret
-MenuHeader_0x4aca2: ; 0x4aca2
+MenuHeader_0x4aca2:
db MENU_BACKUP_TILES ; flags
menu_coords 11, 9, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1
dw NULL
db 1 ; default option
-; 0x4acaa
Function4acaa:
.asm_4acaa
@@ -795,11 +792,10 @@
call Function4adc2
ret
-UnknownText_0x4ad51: ; 0x4ad51
+UnknownText_0x4ad51:
; Only three #MON may enter.
text_jump UnknownText_0x1c521c
db "@"
-; 0x4ad56
Function4ad56:
farcall OpenPartyStats
--- a/mobile/mobile_22.asm
+++ b/mobile/mobile_22.asm
@@ -261,19 +261,17 @@
scf
ret
-MenuHeader_0x892a3: ; 0x892a3
+MenuHeader_0x892a3:
db MENU_BACKUP_TILES ; flags
menu_coords 10, 5, 15, 9
dw MenuData_0x892ab
db 1 ; default option
-; 0x892ab
-MenuData_0x892ab: ; 0x892ab
+MenuData_0x892ab:
db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING ; flags
db 2 ; items
db "はい@"
db "いいえ@"
-; 0x892b4
Function892b4:
call Function8931b
@@ -1004,7 +1002,7 @@
inc hl
ld b, 2
-ClearScreenArea: ; 0x896ff
+ClearScreenArea:
; clears an area of the screen
; INPUT:
; hl = address of upper left corner of the area
@@ -1039,7 +1037,6 @@
dec c
jr nz, .asm_89713 ; 0x8971c $f5
ret
-; 0x8971f
Function8971f:
ld a, $2c
@@ -2659,29 +2656,25 @@
Function8a0ff:
jp Function89e36
-UnknownText_0x8a102: ; 0x8a102
+UnknownText_0x8a102:
; The CARD FOLDER stores your and your friends' CARDS. A CARD contains information like the person's name, phone number and profile.
text_jump UnknownText_0x1c5238
db "@"
-; 0x8a107
-UnknownText_0x8a107: ; 0x8a107
+UnknownText_0x8a107:
; This is your CARD. Once you've entered your phone number, you can trade CARDS with your friends.
text_jump UnknownText_0x1c52bc
db "@"
-; 0x8a10c
-UnknownText_0x8a10c: ; 0x8a10c
+UnknownText_0x8a10c:
; If you have your friend's CARD, you can use it to make a call from a mobile phone on the 2nd floor of a #MON CENTER.
text_jump UnknownText_0x1c531e
db "@"
-; 0x8a111
-UnknownText_0x8a111: ; 0x8a111
+UnknownText_0x8a111:
; To safely store your collection of CARDS, you must set a PASSCODE for your CARD FOLDER.
text_jump UnknownText_0x1c5394
db "@"
-; 0x8a116
Function8a116:
ld a, $1
@@ -2729,7 +2722,7 @@
scf
ret
-MenuHeader_0x8a176: ; 0x8a176
+MenuHeader_0x8a176:
db MENU_BACKUP_TILES ; flags
menu_coords 14, 0, SCREEN_WIDTH - 1, 6
@@ -2749,20 +2742,18 @@
ld d, a
ret
-MenuHeader_0x8a19a: ; 0x8a19a
+MenuHeader_0x8a19a:
db MENU_BACKUP_TILES ; flags
menu_coords 14, 0, SCREEN_WIDTH - 1, 6
dw MenuData_0x8a1a2
db 1 ; default option
-; 0x8a1a2
-MenuData_0x8a1a2: ; 0x8a1a2
+MenuData_0x8a1a2:
db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING | STATICMENU_WRAP ; flags
db 3 ; items
db "ひらく@"
db "すてる@"
db "もどる@"
-; 0x8a1b0
Function8a1b0:
hlcoord 0, 12
@@ -2810,23 +2801,20 @@
and a
ret
-UnknownText_0x8a232: ; 0x8a232
+UnknownText_0x8a232:
; If the CARD FOLDER is deleted, all its CARDS and the PASSCODE will also be deleted. Beware--a deleted CARD FOLDER can't be restored. Want to delete your CARD FOLDER?
text_jump UnknownText_0x1c53ee
db "@"
-; 0x8a237
-UnknownText_0x8a237: ; 0x8a237
+UnknownText_0x8a237:
; Are you sure you want to delete it?
text_jump UnknownText_0x1c5494
db "@"
-; 0x8a23c
-UnknownText_0x8a23c: ; 0x8a23c
+UnknownText_0x8a23c:
; The CARD FOLDER has been deleted.
text_jump UnknownText_0x1c54b9
db "@"
-; 0x8a241
Function8a241:
call LoadStandardMenuHeader
@@ -2904,21 +2892,19 @@
scf
ret
-MenuHeader_0x8a2ef: ; 0x8a2ef
+MenuHeader_0x8a2ef:
db MENU_BACKUP_TILES ; flags
menu_coords 0, 12, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1
-UnknownText_0x8a2f4: ; 0x8a2f4
+UnknownText_0x8a2f4:
; There is an older CARD FOLDER from a previous journey. Do you want to open it?
text_jump UnknownText_0x1c54dd
db "@"
-; 0x8a2f9
-UnknownText_0x8a2f9: ; 0x8a2f9
+UnknownText_0x8a2f9:
; Delete the old CARD FOLDER?
text_jump UnknownText_0x1c552d
db "@"
-; 0x8a2fe
Function8a2fe:
call Function8a313
@@ -3063,14 +3049,13 @@
Unknown_8a408: db 1, 2, -1
Unknown_8a40b: db 1, 2, 3, -1
-MenuHeader_0x8a40f: ; 0x8a40f
+MenuHeader_0x8a40f:
db MENU_BACKUP_TILES ; flags
menu_coords 0, 2, 10, TEXTBOX_Y - 1
dw MenuData_0x8a417
db 1 ; default option
-; 0x8a417
-MenuData_0x8a417: ; 0x8a417
+MenuData_0x8a417:
db STATICMENU_CURSOR | STATICMENU_WRAP ; flags
db 4 ; items
db "めいしりスト@"
@@ -3077,22 +3062,19 @@
db "じぶんの めいし@"
db "めいしこうかん@"
db "やめる@"
-; 0x8a435
-MenuHeader_0x8a435: ; 0x8a435
+MenuHeader_0x8a435:
db MENU_BACKUP_TILES ; flags
menu_coords 0, 2, 10, 9
dw MenuData_0x8a43d
db 1 ; default option
-; 0x8a43d
-MenuData_0x8a43d: ; 0x8a43d
+MenuData_0x8a43d:
db STATICMENU_CURSOR | STATICMENU_WRAP ; flags
db 3 ; items
db "めいしりスト@"
db "じぶんの めいし@"
db "やめる@"
-; 0x8a453
Function8a453:
hlcoord 0, 12
@@ -3788,7 +3770,7 @@
dw Function8aa0a
dw Function8ab3b
-MenuHeader_0x8a9c9: ; 0x8a9c9
+MenuHeader_0x8a9c9:
db MENU_BACKUP_TILES ; flags
menu_coords 11, 4, 18, TEXTBOX_Y - 1
@@ -3815,20 +3797,18 @@
scf
ret
-MenuHeader_0x8a9f2: ; 0x8a9f2
+MenuHeader_0x8a9f2:
db MENU_BACKUP_TILES ; flags
menu_coords 11, 4, 18, TEXTBOX_Y - 1
dw MenuData_0x8a9fa
db 1 ; default option
-; 0x8a9fa
-MenuData_0x8a9fa: ; 0x8a9fa
+MenuData_0x8a9fa:
db STATICMENU_CURSOR | STATICMENU_WRAP ; flags
db 3 ; items
db "へんしゅう@"
db "みる@"
db "やめる@"
-; 0x8aa09
Function8aa09:
ret
@@ -4198,11 +4178,10 @@
scf
ret
-UnknownText_0x8ad06: ; 0x8ad06
+UnknownText_0x8ad06:
; Finish registering CARDS?
text_jump UnknownText_0x1c554a
db "@"
-; 0x8ad0b
Function8ad0b:
.asm_8ad0b
--- a/mobile/mobile_22_2.asm
+++ b/mobile/mobile_22_2.asm
@@ -458,35 +458,30 @@
pop af
ret
-UnknownText_0x8b5ce: ; 0x8b5ce
+UnknownText_0x8b5ce:
; Please enter any four-digit number.
text_jump UnknownText_0x1bc187
db "@"
-; 0x8b5d3
-UnknownText_0x8b5d3: ; 0x8b5d3
+UnknownText_0x8b5d3:
; Enter the same number to confirm.
text_jump UnknownText_0x1bc1ac
db "@"
-; 0x8b5d8
-UnknownText_0x8b5d8: ; 0x8b5d8
+UnknownText_0x8b5d8:
; That's not the same number.
text_jump UnknownText_0x1bc1cf
db "@"
-; 0x8b5dd
-UnknownText_0x8b5dd: ; 0x8b5dd
+UnknownText_0x8b5dd:
; Your PASSCODE has been set. Enter this number next time to open the CARD FOLDER.
text_jump UnknownText_0x1bc1eb
db "@"
-; 0x8b5e2
-UnknownText_0x8b5e2: ; 0x8b5e2
+UnknownText_0x8b5e2:
; 0000 is invalid!
text_jump UnknownText_0x1bc23e
db "@"
-; 0x8b5e7
Function8b5e7:
ld bc, wd013
@@ -528,19 +523,17 @@
pop af
ret
-UnknownText_0x8b642: ; 0x8b642
+UnknownText_0x8b642:
; Enter the CARD FOLDER PASSCODE.
text_jump UnknownText_0x1bc251
db "@"
-; 0x8b647
-UnknownText_0x8b647: ; 0x8b647
+UnknownText_0x8b647:
; Incorrect PASSCODE!
text_jump UnknownText_0x1bc272
db "@"
-; 0x8b64c
-UnknownText_0x8b64c: ; 0x8b64c
+UnknownText_0x8b64c:
; CARD FOLDER open.@ @
text_jump UnknownText_0x1bc288
start_asm
@@ -880,16 +873,15 @@
ld [hl], a
ret
-MenuHeader_0x8b867: ; 0x8b867
+MenuHeader_0x8b867:
db MENU_BACKUP_TILES ; flags
menu_coords 1, 3, 18, 13
dw MenuData_0x8b870
db 1 ; default option
-; 0x8b86f
db 0
-MenuData_0x8b870: ; 0x8b870
+MenuData_0x8b870:
db SCROLLINGMENU_ENABLE_FUNCTION3 | SCROLLINGMENU_DISPLAY_ARROWS | SCROLLINGMENU_ENABLE_RIGHT | SCROLLINGMENU_ENABLE_LEFT ; flags
db 5 ; items
db 3, 1
@@ -1044,33 +1036,30 @@
Function8b9ab:
ret
-MenuHeader_0x8b9ac: ; 0x8b9ac
+MenuHeader_0x8b9ac:
db MENU_BACKUP_TILES ; flags
menu_coords 11, 0, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
-MenuHeader_0x8b9b1: ; 0x8b9b1
+MenuHeader_0x8b9b1:
db MENU_BACKUP_TILES ; flags
menu_coords 11, 0, SCREEN_WIDTH - 1, 7
dw MenuData_0x8b9b9
db 1 ; default option
-; 0x8b9b9
-MenuData_0x8b9b9: ; 0x8b9b9
+MenuData_0x8b9b9:
db STATICMENU_CURSOR | STATICMENU_WRAP ; flags
db 3 ; items
db "へんしゅう@" ; EDIT
db "いれかえ@" ; REPLACE
db "やめる@" ; QUIT
-; 0x8b9ca
-MenuHeader_0x8b9ca: ; 0x8b9ca
+MenuHeader_0x8b9ca:
db MENU_BACKUP_TILES ; flags
menu_coords 11, 0, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
dw MenuData_0x8b9d2
db 1 ; default option
-; 0x8b9d2
-MenuData_0x8b9d2: ; 0x8b9d2
+MenuData_0x8b9d2:
db STATICMENU_CURSOR | STATICMENU_WRAP ; flags
db 5 ; items
db "みる@" ; VIEW
@@ -1078,7 +1067,6 @@
db "いれかえ@" ; REPLACE
db "けす@" ; ERASE
db "やめる@" ; QUIT
-; 0x8b9e9
Function8b9e9:
call OpenSRAMBank4
--- a/mobile/mobile_40.asm
+++ b/mobile/mobile_40.asm
@@ -90,7 +90,6 @@
ei
ret
-; 0x1000a4
DisableMobile:
di
@@ -7507,34 +7506,27 @@
db "やめる@"
db "せつめい@"
-UnknownText_0x10375d: ; 0x10375d
+UnknownText_0x10375d:
text_jump UnknownText_0x1c422a
db "@"
-; 0x103762
-UnknownText_0x103762: ; 0x103762
+UnknownText_0x103762:
text_jump UnknownText_0x1c4275
db "@"
-; 0x103767
-UnknownText_0x103767: ; 0x103767
+UnknownText_0x103767:
text_jump UnknownText_0x1c4298
db "@"
-; 0x10376c
-UnknownText_0x10376c: ; 0x10376c
+UnknownText_0x10376c:
text_jump UnknownText_0x1c439c
db "@"
-; 0x103771
-UnknownText_0x103771: ; 0x103771
+UnknownText_0x103771:
text_jump UnknownText_0x1c43dc
db "@"
-; 0x103776
-UnknownText_0x103776: ; 0x103776
+UnknownText_0x103776:
text_jump UnknownText_0x1c4419
db "@"
-; 0x10377b
-UnknownText_0x10377b: ; 0x10377b
+UnknownText_0x10377b:
text_jump UnknownText_0x1c445a
db "@"
-; 0x103780
Function103780:
ld a, [wd265]
@@ -7596,10 +7588,9 @@
ld [wScriptVar], a
ret
-UnknownText_0x1037e6: ; 0x1037e6
+UnknownText_0x1037e6:
text_jump UnknownText_0x1c449c
db "@"
-; 0x1037eb
Function1037eb:
call Function103823
@@ -7627,15 +7618,13 @@
ld [wScriptVar], a
ret
-UnknownText_0x103819: ; 0x103819
+UnknownText_0x103819:
text_jump UnknownText_0x1c44c0
db "@"
-; 0x10381e
-UnknownText_0x10381e: ; 0x10381e
+UnknownText_0x10381e:
text_jump UnknownText_0x1c44e7
db "@"
-; 0x103823
Function103823:
farcall Mobile_AlwaysReturnNotCarry
@@ -7681,10 +7670,9 @@
ld [wScriptVar], a
ret
-UnknownText_0x103876: ; 0x103876
+UnknownText_0x103876:
text_jump UnknownText_0x1c4508
db "@"
-; 0x10387b
Function10387b:
farcall Mobile_AlwaysReturnNotCarry
@@ -7698,7 +7686,6 @@
call JoyWaitAorB
ret
-UnknownText_0x103898: ; 0x103898
+UnknownText_0x103898:
text_jump UnknownText_0x1c4525
db "@"
-; 0x10389d
--- a/mobile/mobile_41.asm
+++ b/mobile/mobile_41.asm
@@ -2,7 +2,7 @@
; which were used for Trainer Rankings in Pokémon News.
; Copies certain values at the time the player enters the Hall of Fame.
-StubbedTrainerRankings_HallOfFame2:: ; 0x105ef6
+StubbedTrainerRankings_HallOfFame2::
ret
ld a, BANK(sTrainerRankingGameTimeHOF)
call GetSRAMBank
@@ -287,7 +287,7 @@
ld hl, sTrainerRankingUnused1
jp StubbedTrainerRankings_Increment3Byte
-StubbedTrainerRankings_HallOfFame:: ; 0x106078
+StubbedTrainerRankings_HallOfFame::
ret
ld hl, sTrainerRankingHOFEntries
jp StubbedTrainerRankings_Increment3Byte
--- a/mobile/mobile_42.asm
+++ b/mobile/mobile_42.asm
@@ -1549,20 +1549,17 @@
call DelayFrames
ret
-.PlayerWillTradeMon: ; 0x108c07
+.PlayerWillTradeMon:
text_jump UnknownText_0x1bc787
db "@"
-; 0x108c0c
-.ForPartnersMon: ; 0x108c0c
+.ForPartnersMon:
text_jump UnknownText_0x1bc79d
db "@"
-; 0x108c11
-.UnusedTextPlayersMonTrade: ; 0x108c11
+.UnusedTextPlayersMonTrade:
text_jump UnknownText_0x1bc7b0
db "@"
-; 0x108c16
Function108c16:
ld a, $90
@@ -1573,10 +1570,9 @@
call DelayFrames
ret
-.TakeGoodCareOfMon: ; 0x108c26
+.TakeGoodCareOfMon:
text_jump UnknownText_0x1bc7c3
db "@"
-; 0x108c2b
Function108c2b:
ld a, $90
@@ -1587,10 +1583,9 @@
call DelayFrames
ret
-.PlayersMonTrade: ; 0x108c3b
+.PlayersMonTrade:
text_jump UnknownText_0x1bc7dd
db "@"
-; 0x108c40
Function108c40:
ld a, $90
@@ -1611,15 +1606,13 @@
call DelayFrames
ret
-.TakeGoodCareOf: ; 0x108c63
+.TakeGoodCareOf:
text_jump UnknownText_0x1bc7f0
db "@"
-; 0x108c68
-.CameBack: ; 0x108c68
+.CameBack:
text_jump UnknownText_0x1bc80a
db "@"
-; 0x108c6d
Function108c6d:
ld hl, LZ_108fe7
--- a/mobile/mobile_45.asm
+++ b/mobile/mobile_45.asm
@@ -7224,7 +7224,7 @@
; everything from here to the end of the bank is related to the
; Mobile Stadium option from the continue/newgame menu.
; Needs better function names
-MobileStudium: ; 0x117a7f
+MobileStudium:
ld a, [hInMenu]
push af
ld a, $1
@@ -7234,16 +7234,14 @@
ld [hInMenu], a
ret
-; 0x117a8d
-Function117a8d: ; 0x117a8d
+Function117a8d:
call Function117a94
call Function117acd
ret
-; 0x117a94
-Function117a94: ; 0x117a94
+Function117a94:
xor a
ld [wJumptableIndex], a
ld [wcf64], a
@@ -7255,9 +7253,8 @@
farcall HDMATransferAttrMapAndTileMapToWRAMBank3
ret
-; 0x117ab4
-Function117ab4: ; 0x117ab4
+Function117ab4:
call ClearBGPalettes
call ClearSprites
farcall Function172e78
@@ -7265,9 +7262,8 @@
farcall ReloadMapPart
ret
-; 0x117acd
-Function117acd: ; 0x117acd
+Function117acd:
call JoyTextDelay
ld a, [wJumptableIndex]
bit 7, a
@@ -7281,7 +7277,7 @@
call ClearSprites
ret
-Function117ae9: ; 0x117ae9
+Function117ae9:
ld a, [wJumptableIndex]
ld e, a
ld d, $0
@@ -7293,7 +7289,7 @@
ld l, a
jp hl
-.Jumptable: ; 0x117af8
+.Jumptable:
dw Function117b06
dw Function117b14
dw Function117b28
@@ -7530,31 +7526,31 @@
call CloseSRAM
ret
-MenuHeader_117cbc: ; 0x117cbc
+MenuHeader_117cbc:
db MENU_BACKUP_TILES ; flags
menu_coords 0, 12, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1
dw NULL
db 0 ; default option
-MenuHeader_117cc4: ; 0x117cc4
+MenuHeader_117cc4:
db MENU_BACKUP_TILES ; flags
menu_coords 14, 7, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
dw NULL
db 0 ; default item
-YesNo117ccc: ; 0x117ccc
+YesNo117ccc:
db "はい"
next "いいえ@"
-MobileStadiumEntryText: ; 0x117cd3
+MobileStadiumEntryText:
text_jump _MobileStadiumEntryText
db "@"
-MobileStadiumSuccessText: ; 0x117cd8
+MobileStadiumSuccessText:
text_jump _MobileStadiumSuccessText
db "@"
-MobileStudium_JumptableIncrement: ; 0x117cdd
+MobileStudium_JumptableIncrement:
ld hl, wJumptableIndex
inc [hl]
ret
--- a/mobile/mobile_46.asm
+++ b/mobile/mobile_46.asm
@@ -1492,19 +1492,19 @@
charmap " ", $20 ; revert to ascii
-ExchangeDownloadURL: ; 0x118ba5
+ExchangeDownloadURL:
db "http://gameboy.datacenter.ne.jp/cgb/download?name=/01/CGB-BXTJ/exchange/index.txt", 0
-BattleDownloadURL: ; 0x118bf7
+BattleDownloadURL:
db "http://gameboy.datacenter.ne.jp/cgb/download?name=/01/CGB-BXTJ/battle/index.txt", 0
-NewsDownloadURL: ; 0x118c47
+NewsDownloadURL:
db "http://gameboy.datacenter.ne.jp/cgb/download?name=/01/CGB-BXTJ/news/index.txt", 0
-MenuDownloadURL: ; 0x118c95
+MenuDownloadURL:
db "http://gameboy.datacenter.ne.jp/cgb/download?name=/01/CGB-BXTJ/POKESTA/menu.cgb", 0
-IndexDownloadURL: ; 0x118ce5
+IndexDownloadURL:
db "http://gameboy.datacenter.ne.jp/cgb/download?name=/01/CGB-BXTJ/tamago/index.txt", 0
@@ -5411,64 +5411,54 @@
and a
ret
-Text_SaveFileWillBeSent: ; 0x11aa13
+Text_SaveFileWillBeSent:
text "SAVE FILE will be"
line "sent."
done
-; 0x11aa2c
-Text_SentSaveFileReadingNews: ; 0x11aa2c
+Text_SentSaveFileReadingNews:
text "Sent SAVE FILE."
line "Reading NEWS…"
done
-; 0x11aa4b
-Text_ReadingNews: ; 0x11aa4b
+Text_ReadingNews:
text "Reading NEWS…"
done
-; 0x11aa5a
-Text_ReceivedNews: ; 0x11aa5a
+Text_ReceivedNews:
text "Received NEWS!"
done
-; 0x11aa6a
-Text_QuitReadingNews: ; 0x11aa6a
+Text_QuitReadingNews:
text "Quit reading NEWS?"
done
-; 0x11aa7e
-Text_CanceledSendingSaveFile: ; 0x11aa7e
+Text_CanceledSendingSaveFile:
text "Canceled sending"
line "SAVE FILE."
done
-; 0x11aa9b
-Text_ReceivedOddEgg: ; 0x11aa9b
+Text_ReceivedOddEgg:
text "ODD EGG"
line "was received!"
done
-; 0x11aab2
-Text_RegisteringRecord: ; 0x11aab2
+Text_RegisteringRecord:
text "Registering your"
line "record…"
done
-; 0x11aacc
-Text_BattleRoomVisitLimit: ; 0x11aacc
+Text_BattleRoomVisitLimit:
text "One visit per day"
line "per BATTLE ROOM!"
done
-; 0x11aaf0
-Text_PartyMonTopsThisLevel: ; 0x11aaf0
+Text_PartyMonTopsThisLevel:
text "A party #MON"
line "tops this level."
done
-; 0x11ab0f
-Text_UberRestriction: ; 0x11ab0f
+Text_UberRestriction:
text_from_ram wcd49
text " may go"
line "only to BATTLE"
@@ -5476,50 +5466,42 @@
para "ROOMS that are"
line "Lv.70 or higher."
done
-; 0x11ab4a
-Text_CancelBattleRoomChallenge: ; 0x11ab4a
+Text_CancelBattleRoomChallenge:
text "Cancel your BATTLE"
line "ROOM challenge?"
done
-; 0x11ab6e
-Text_ExitGymLeaderHonorRoll: ; 0x11ab6e
+Text_ExitGymLeaderHonorRoll:
text "Exit GYM LEADER"
line "HONOR ROLL?"
done
-; 0x11ab8b
-Text_LinkingWithCenter: ; 0x11ab8b
+Text_LinkingWithCenter:
text "Linking with the"
line "CENTER…"
done
-; 0x11aba5
-Text_WhatLevelDoYouWantToChallenge: ; 0x11aba5
+Text_WhatLevelDoYouWantToChallenge:
text "What level do you"
line "want to challenge?"
done
-; 0x11abcb
-Text_CheckBattleRoomListByMaxLevel: ; 0x11abcb
+Text_CheckBattleRoomListByMaxLevel:
text "Check BATTLE ROOM"
line "list by max level?"
done
-; 0x11abf1
-Text_EnterWhichBattleRoom: ; 0x11abf1
+Text_EnterWhichBattleRoom:
text "Enter which"
line "BATTLE ROOM?"
done
-; 0x11ac0b
-Text_WhichBattleRoom: ; 0x11ac0b
+Text_WhichBattleRoom:
text "Which BATTLE ROOM?"
done
-; 0x11ac1f
-Text_ThisBattleRoomPleaseWait: ; 0x11ac1f
+Text_ThisBattleRoomPleaseWait:
text_from_ram wStringBuffer3
text "'s ROOM"
line "@"
@@ -5527,7 +5509,6 @@
text "?"
cont "Please wait…"
done
-; 0x11ac3e
Function11ac3e:
call SpeechTextBox
--- a/mobile/mobile_menu.asm
+++ b/mobile/mobile_menu.asm
@@ -448,7 +448,7 @@
xor a
ret
-MenuHeader_0x4a346: ; 0x4a346
+MenuHeader_0x4a346:
db MENU_BACKUP_TILES ; flags
menu_coords 12, 0, SCREEN_WIDTH - 1, 6
@@ -457,31 +457,27 @@
next "けす"
next "もどる@"
-UnknownText_0x4a358: ; 0x4a358
+UnknownText_0x4a358:
; Delete the saved LOG-IN PASSWORD?
text_jump UnknownText_0x1c5196
db "@"
-; 0x4a35d
-UnknownText_0x4a35d: ; 0x4a35d
+UnknownText_0x4a35d:
; Deleted the LOG-IN PASSWORD.
text_jump UnknownText_0x1c51b9
db "@"
-; 0x4a362
-DeletePassword_YesNo_MenuHeader: ; 0x4a362
+DeletePassword_YesNo_MenuHeader:
db MENU_BACKUP_TILES ; flags
menu_coords 14, 7, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
dw MenuData_0x4a36a
db 2 ; default option
-; 0x4a36a
-MenuData_0x4a36a: ; 0x4a36a
+MenuData_0x4a36a:
db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING | STATICMENU_WRAP ; flags
db 2 ; items
db "はい@"
db "いいえ@"
-; 0x4a373
Function4a373:
ld hl, w2DMenuCursorInitY