diff options
Diffstat (limited to 'data')
73 files changed, 1489 insertions, 1455 deletions
diff --git a/data/battle_tower/trainer_text.asm b/data/battle_tower/trainer_text.asm index 9937f8bf9..5e9aadcbd 100644 --- a/data/battle_tower/trainer_text.asm +++ b/data/battle_tower/trainer_text.asm @@ -1,4 +1,4 @@ -BattleTowerText_0x1ec000: +_BTGreetingM1Text: text "Hello, glad to" line "meet you!" @@ -6,122 +6,122 @@ BattleTowerText_0x1ec000: line "a good battle." done -BattleTowerText_0x1ec03b: +_BTLossM1Text: text "Thank you! A most" line "enjoyable battle!" done -UnknownText_0x1ec060: +_BTWinM1Text: text "Thank you. You are" line "formidable." done -BattleTowerText_0x1ec080: +_BTGreetingM2Text: text "Work, work, work…" line "I'm always busy!" done -UnknownText_0x1ec0a3: +_BTLossM2Text: text "But, I work hard" line "in battle too!" done -UnknownText_0x1ec0c4: +_BTWinM2Text: text "I'm too busy to be" line "battling!" done -UnknownText_0x1ec0e1: +_BTGreetingM3Text: text "Brace yourself for" line "my all-out attack!" done -UnknownText_0x1ec108: +_BTLossM3Text: text "What a cakewalk!" line "You're too easy!" done -UnknownText_0x1ec12a: +_BTWinM3Text: text "I won't lose next" line "time, all right?" done -UnknownText_0x1ec14d: +_BTGreetingM4Text: text "Heh, your #MON" line "look pretty cool." done -UnknownText_0x1ec16f: +_BTLossM4Text: text "Hey, hey, no way!" line "You won't win!" done -UnknownText_0x1ec190: +_BTWinM4Text: text "You serious?" line "This is brutal!" done -UnknownText_0x1ec1ae: +_BTGreetingM5Text: text "#MON every day!" line "I love battling!" done -UnknownText_0x1ec1d0: +_BTLossM5Text: text "I'm on top of my" line "game, but not you!" done -UnknownText_0x1ec1f4: +_BTWinM5Text: text "I don't care that" line "I lost, really!" done -UnknownText_0x1ec216: +_BTGreetingM6Text: text "Hi, there! Let's" line "keep this clean!" done -UnknownText_0x1ec238: +_BTLossM6Text: text "Whoops, sorry for" line "that wipeout!" done -UnknownText_0x1ec259: +_BTWinM6Text: text "Whoops! Come on," line "let me win one!" done -UnknownText_0x1ec27b: +_BTGreetingM7Text: text "Do you want to see" line "my battle level?" done -UnknownText_0x1ec2a0: +_BTLossM7Text: text "Hehehe, I know" line "your level now!" done -UnknownText_0x1ec2c0: +_BTWinM7Text: text "Ouch… I'm just too" line "weak…" done -UnknownText_0x1ec2d9: +_BTGreetingM8Text: text "Hey, let's battle." line "I'm your opponent." done -UnknownText_0x1ec2fe: +_BTLossM8Text: text "Wow, you're not" line "serious about it!" done -UnknownText_0x1ec320: +_BTWinM8Text: text "…Urgh… Nothing" line "positive here…" done -UnknownText_0x1ec33f: +_BTGreetingM9Text: text "I'm your" line "opponent." @@ -129,47 +129,47 @@ UnknownText_0x1ec33f: line "hammered." done -UnknownText_0x1ec36c: +_BTLossM9Text: text "Hahah! That was a" line "pushover!" done -UnknownText_0x1ec389: +_BTWinM9Text: text "No way! There has" line "to be a mistake!" done -UnknownText_0x1ec3ad: +_BTGreetingM10Text: text "Hah!" line "Let's get rolling!" done -UnknownText_0x1ec3c5: +_BTLossM10Text: text "Wahahaha! Didn't" line "break a sweat!" done -UnknownText_0x1ec3e5: +_BTWinM10Text: text "Tough! I'm no" line "match for you!" done -UnknownText_0x1ec402: +_BTGreetingM11Text: text "<……><……><……>" line "<……><……>Battle?" done -UnknownText_0x1ec411: +_BTLossM11Text: text "<……><……><……>" line "<……><……>I won?" done -UnknownText_0x1ec41f: +_BTWinM11Text: text "<……><……><……>" line "<……><……>I lost?" done -UnknownText_0x1ec42e: +_BTGreetingM12Text: text "You want to be a" line "leader?" @@ -177,7 +177,7 @@ UnknownText_0x1ec42e: line "then!" done -UnknownText_0x1ec461: +_BTLossM12Text: text "You need another" line "ten years of" @@ -185,7 +185,7 @@ UnknownText_0x1ec461: line "better, I'd say." done -UnknownText_0x1ec4a0: +_BTWinM12Text: text "You're incredibly" line "talented." @@ -193,72 +193,72 @@ UnknownText_0x1ec4a0: line "you now!" done -UnknownText_0x1ec4d6: +_BTGreetingM13Text: text "Today, I'm going" line "to whomp you." done -UnknownText_0x1ec4f5: +_BTLossM13Text: text "I knew I'd win." line "I'm so great!" done -UnknownText_0x1ec512: +_BTWinM13Text: text "Uh? My plans are" line "out of whack…" done -UnknownText_0x1ec532: +_BTGreetingM14Text: text "I bet you can't" line "beat me!" done -UnknownText_0x1ec54b: +_BTLossM14Text: text "Those #MON" line "aren't enough!" done -UnknownText_0x1ec565: +_BTWinM14Text: text "I want your" line "#MON. Please?" done -UnknownText_0x1ec580: +_BTGreetingM15Text: text "I'll show you a" line "real battle!" done -UnknownText_0x1ec59d: +_BTLossM15Text: text "This battle…" line "I'm bored!" done -UnknownText_0x1ec5b5: +_BTWinM15Text: text "…I won't turn tail" line "in battle!" done -UnknownText_0x1ec5d3: +_BTGreetingM16Text: text "Let's go!" line "No holds barred!" done -UnknownText_0x1ec5ee: +_BTLossM16Text: text "Sorry! I wanted" line "the win more!" done -UnknownText_0x1ec60d: +_BTWinM16Text: text "Wahah! Congrats!" line "I can't do better!" done -UnknownText_0x1ec631: +_BTGreetingM17Text: text "My #MON skills" line "are phenomenal!" done -UnknownText_0x1ec651: +_BTLossM17Text: text "You've got a long" line "way to go." @@ -266,17 +266,17 @@ UnknownText_0x1ec651: line "Best of luck!" done -UnknownText_0x1ec68f: +_BTWinM17Text: text "Aww… Don't lose" line "after beating me." done -UnknownText_0x1ec6b1: +_BTGreetingM18Text: text "Who are you?" line "I don't know you…" done -UnknownText_0x1ec6d0: +_BTLossM18Text: text "I must've imagined" line "that." @@ -284,42 +284,42 @@ UnknownText_0x1ec6d0: line "no one here…" done -UnknownText_0x1ec708: +_BTWinM18Text: text "Who am I?" line "I don't know…" done -UnknownText_0x1ec720: +_BTGreetingM19Text: text "Um… Are you that…" line "um…person?" done -UnknownText_0x1ec73e: +_BTLossM19Text: text "It doesn't appear" line "to be you…" done -UnknownText_0x1ec75b: +_BTWinM19Text: text "Then you really" line "are the legendary…" done -UnknownText_0x1ec77f: +_BTGreetingM20Text: text "I heard that" line "you're hot!" done -UnknownText_0x1ec798: +_BTLossM20Text: text "Not bad. I was" line "just a bit better." done -UnknownText_0x1ec7bb: +_BTWinM20Text: text "Eh, you're not" line "that special." done -UnknownText_0x1ec7d8: +_BTGreetingM21Text: text "I'm scared about" line "what might happen." @@ -327,297 +327,297 @@ UnknownText_0x1ec7d8: line "too strong." done -UnknownText_0x1ec818: +_BTLossM21Text: text "See? My #MON" line "were too strong." done -UnknownText_0x1ec837: +_BTWinM21Text: text "Graa! My #MON" line "were total wimps!" done -UnknownText_0x1ec858: +_BTGreetingM22Text: text "Hey, there!" line "I'll take you on!" done -UnknownText_0x1ec876: +_BTLossM22Text: text "Don't you have a" line "better strategy?" done -UnknownText_0x1ec898: +_BTWinM22Text: text "You've got decent" line "style!" done -UnknownText_0x1ec8b1: +_BTGreetingM23Text: text "I wonder if I can" line "battle properly…" done -UnknownText_0x1ec8d5: +_BTLossM23Text: text "Um… Sorry…" line "I think I won." done -UnknownText_0x1ec8f0: +_BTWinM23Text: text "I guess I'm not" line "good enough yet…" done -UnknownText_0x1ec911: +_BTGreetingM24Text: text "Wrrooar!" line "I won't lose!" done -UnknownText_0x1ec928: +_BTLossM24Text: text "Wrrooar! I knew" line "I was a genius!" done -UnknownText_0x1ec949: +_BTWinM24Text: text "Arrooh! I hate it" line "when I lose!" done -UnknownText_0x1ec969: +_BTGreetingM25Text: text "Sorry, but I'm" line "going to win." done -UnknownText_0x1ec986: +_BTLossM25Text: text "Yeah! My #MON" line "rule!" done -UnknownText_0x1ec99b: +_BTWinM25Text: text "Oh, close! I lost" line "by just a bit!" done -UnknownText_0x1ec9bd: +_BTGreetingF1Text: text "OK, I'm not" line "fooling around!" done -UnknownText_0x1ec9d9: +_BTLossF1Text: text "Yay! Too easy!" line "Like, no way!" done -UnknownText_0x1ec9f7: +_BTWinF1Text: text "No!" line "Like, no way!" done -UnknownText_0x1eca0a: +_BTGreetingF2Text: text "Look! My #MON" line "are really cute!" done -UnknownText_0x1eca2a: +_BTLossF2Text: text "Aren't they really" line "adorable?" done -UnknownText_0x1eca47: +_BTWinF2Text: text "I'm sorry, it's" line "all my fault!" done -UnknownText_0x1eca64: +_BTGreetingF3Text: text "Let's get our" line "battle started!" done -UnknownText_0x1eca82: +_BTLossF3Text: text "Was I too strong" line "for you?" done -UnknownText_0x1eca9d: +_BTWinF3Text: text "Ooh, you're in a" line "different class." done -UnknownText_0x1ecabf: +_BTGreetingF4Text: text "Are we going to" line "battle? Let's!" done -UnknownText_0x1ecade: +_BTLossF4Text: text "Oh, you're too" line "weak. Shame." done -UnknownText_0x1ecafa: +_BTWinF4Text: text "Wow! Are you quite" line "satisfied?" done -UnknownText_0x1ecb19: +_BTGreetingF5Text: text "Oh, you have some" line "rare #MON." done -UnknownText_0x1ecb37: +_BTLossF5Text: text "May I have one of" line "your #MON?" done -UnknownText_0x1ecb55: +_BTWinF5Text: text "…I want one of" line "your #MON." done -UnknownText_0x1ecb70: +_BTGreetingF6Text: text "Want to hear about" line "my cute #MON?" done -UnknownText_0x1ecb92: +_BTLossF6Text: text "What do you think" line "about my cuties?" done -UnknownText_0x1ecbb6: +_BTWinF6Text: text "Oh! My! You're a" line "dreadful trainer!" done -UnknownText_0x1ecbd9: +_BTGreetingF7Text: text "Battle? Sure!" line "Right now!" done -UnknownText_0x1ecbf3: +_BTLossF7Text: text "Oh, I love it!" line "Battling is wild!" done -UnknownText_0x1ecc15: +_BTWinF7Text: text "Oh, how rude! Wait" line "till next time!" done -UnknownText_0x1ecc39: +_BTGreetingF8Text: text "Please let me win!" line "Please?" done -UnknownText_0x1ecc55: +_BTLossF8Text: text "Wow, thank you!" line "You're so nice!" done -UnknownText_0x1ecc75: +_BTWinF8Text: text "You're mean!" line "I hate meanies!" done -UnknownText_0x1ecc92: +_BTGreetingF9Text: text "Well, can we" line "begin?" done -UnknownText_0x1ecca7: +_BTLossF9Text: text "Well, I beg your" line "pardon…" done -UnknownText_0x1eccc1: +_BTWinF9Text: text "Sob… That's not" line "fair!" done -UnknownText_0x1eccd7: +_BTGreetingF10Text: text "I'm good!" line "You can't win." done -UnknownText_0x1eccef: +_BTLossF10Text: text "Giving up? You're" line "pretty weak!" done -UnknownText_0x1ecd0e: +_BTWinF10Text: text "I won't accept" line "this… No way!" done -UnknownText_0x1ecd2b: +_BTGreetingF11Text: text "Are you treating" line "this seriously?" done -UnknownText_0x1ecd4d: +_BTLossF11Text: text "Oh, sorry! Looks" line "like I won!" done -UnknownText_0x1ecd6b: +_BTWinF11Text: text "Oh, how nasty!" line "You were serious!" done -UnknownText_0x1ecd8d: +_BTGreetingF12Text: text "Ahahah! I'll take" line "it easy on you!" done -UnknownText_0x1ecdaf: +_BTLossF12Text: text "Oops, sorry! But" line "I'm happy too!" done -UnknownText_0x1ecdcf: +_BTWinF12Text: text "Oh, oh, I lost!" line "Thanks. Bye!" done -UnknownText_0x1ecded: +_BTGreetingF13Text: text "BATTLE TOWER is a" line "tough place!" done -UnknownText_0x1ece0d: +_BTLossF13Text: text "You might have a" line "hard time." done -UnknownText_0x1ece2a: +_BTWinF13Text: text "Ooh, you might" line "make a run here!" done -UnknownText_0x1ece4b: +_BTGreetingF14Text: text "I want to see your" line "style in action!" done -UnknownText_0x1ece70: +_BTLossF14Text: text "Every battle is a" line "drama!" done -UnknownText_0x1ece8a: +_BTWinF14Text: text "Oh… Want to trade" line "something?" done -UnknownText_0x1ecea8: +_BTGreetingF15Text: text "OK, here goes!" line "I have momentum!" done -UnknownText_0x1ecec9: +_BTLossF15Text: text "See, I rolled" line "right over you!" done -UnknownText_0x1ecee8: +_BTWinF15Text: text "No! This did not" line "happen!" done diff --git a/data/maps/map_data.asm b/data/maps/map_data.asm index 15ff249fe..ad29646ab 100644 --- a/data/maps/map_data.asm +++ b/data/maps/map_data.asm @@ -6,6 +6,8 @@ SECTION "Maps", ROMX INCLUDE "data/maps/maps.asm" INCLUDE "data/maps/attributes.asm" + INCLUDE "data/maps/blocks.asm" + INCLUDE "data/maps/scripts.asm" diff --git a/data/maps/maps.asm b/data/maps/maps.asm index 1cc528738..268c4be8d 100644 --- a/data/maps/maps.asm +++ b/data/maps/maps.asm @@ -416,10 +416,10 @@ MapGroup_Cianwood: map CianwoodPhotoStudio, TILESET_HOUSE, INDOOR, CIANWOOD_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE map CianwoodLugiaSpeechHouse, TILESET_HOUSE, INDOOR, CIANWOOD_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE map PokeSeersHouse, TILESET_HOUSE, INDOOR, CIANWOOD_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map BattleTower1F, TILESET_BATTLE_TOWER, INDOOR, BATTLE_TOWER, MUSIC_BATTLE_TOWER_LOBBY, TRUE, PALETTE_DAY, FISHGROUP_SHORE - map BattleTowerBattleRoom, TILESET_BATTLE_TOWER, INDOOR, BATTLE_TOWER, MUSIC_BATTLE_TOWER_THEME, TRUE, PALETTE_DAY, FISHGROUP_SHORE - map BattleTowerElevator, TILESET_BATTLE_TOWER, INDOOR, BATTLE_TOWER, MUSIC_NONE, TRUE, PALETTE_DAY, FISHGROUP_SHORE - map BattleTowerHallway, TILESET_BATTLE_TOWER, INDOOR, BATTLE_TOWER, MUSIC_BATTLE_TOWER_THEME, TRUE, PALETTE_DAY, FISHGROUP_SHORE + map BattleTower1F, TILESET_BATTLE_TOWER_INSIDE, INDOOR, BATTLE_TOWER, MUSIC_BATTLE_TOWER_LOBBY, TRUE, PALETTE_DAY, FISHGROUP_SHORE + map BattleTowerBattleRoom, TILESET_BATTLE_TOWER_INSIDE, INDOOR, BATTLE_TOWER, MUSIC_BATTLE_TOWER_THEME, TRUE, PALETTE_DAY, FISHGROUP_SHORE + map BattleTowerElevator, TILESET_BATTLE_TOWER_INSIDE, INDOOR, BATTLE_TOWER, MUSIC_NONE, TRUE, PALETTE_DAY, FISHGROUP_SHORE + map BattleTowerHallway, TILESET_BATTLE_TOWER_INSIDE, INDOOR, BATTLE_TOWER, MUSIC_BATTLE_TOWER_THEME, TRUE, PALETTE_DAY, FISHGROUP_SHORE map Route40BattleTowerGate, TILESET_GATE, GATE, BATTLE_TOWER, MUSIC_ROUTE_36, FALSE, PALETTE_DAY, FISHGROUP_SHORE map BattleTowerOutside, TILESET_BATTLE_TOWER_OUTSIDE, ROUTE, BATTLE_TOWER, MUSIC_BATTLE_TOWER_THEME, FALSE, PALETTE_AUTO, FISHGROUP_SHORE diff --git a/data/maps/setup_scripts.asm b/data/maps/setup_scripts.asm index 218c81e06..3df4ac404 100644 --- a/data/maps/setup_scripts.asm +++ b/data/maps/setup_scripts.asm @@ -14,163 +14,163 @@ MapSetupScripts: dw MapSetupScript_Fly MapSetupScript_Teleport: - db map_prolong_sprites + db map_reset_player_object_action MapSetupScript_Fly: db map_fade_out_palettes - db map_keep_roam + db map_jump_roam_mons MapSetupScript_Warp: - db map_lcd_off - db map_sound_off - db map_load_spawn + db map_disable_lcd + db map_init_sound + db map_enter_spawn_point db map_load_attributes - db map_change_callback - db map_spawn_coord - db map_player_coord - db map_anchor_screen - db map_load_blocks + db map_handle_new + db map_spawn_player + db map_refresh_player_coords + db map_get_screen_coords + db map_load_block_data db map_buffer_screen db map_load_graphics - db map_time_of_day + db map_load_time_of_day db map_load_objects - db map_lcd_on - db map_palettes - db map_face_down - db map_sprites - db map_bike_music - db map_max_volume + db map_enable_lcd + db map_load_palettes + db map_spawn_in_facing_down + db map_refresh_sprites + db map_play_music_bike + db map_fade_in_music db map_fade_in_palettes - db map_animations_on - db map_wildmons + db map_activate_anims + db map_load_wild_mon_data db map_end MapSetupScript_BadWarp: - db map_load_spawn + db map_enter_spawn_point db map_load_attributes - db map_change_callback - db map_spawn_coord - db map_player_coord - db map_anchor_screen - db map_load_blocks + db map_handle_new + db map_spawn_player + db map_refresh_player_coords + db map_get_screen_coords + db map_load_block_data db map_buffer_screen - db map_lcd_off + db map_disable_lcd db map_load_graphics - db map_time_of_day + db map_load_time_of_day db map_fade_out_music - db map_lcd_on + db map_enable_lcd db map_load_objects - db map_palettes - db map_face_down - db map_sprites - db map_fade_music + db map_load_palettes + db map_spawn_in_facing_down + db map_refresh_sprites + db map_fade_to_music db map_fade_in_palettes - db map_animations_on - db map_wildmons + db map_activate_anims + db map_load_wild_mon_data db map_end MapSetupScript_Connection: - db map_animations_off - db map_load_connection + db map_suspend_anims + db map_enter_connection db map_load_attributes - db map_change_callback - db map_player_coord - db map_load_blocks + db map_handle_new + db map_refresh_player_coords + db map_load_block_data db map_load_tileset db map_save_screen db map_load_objects - db map_fade_music - db map_palettes - db map_stop_script - db map_keep_palettes - db map_wildmons - db map_update_roam - db map_animations_on + db map_fade_to_music + db map_load_palettes + db map_init_name_sign + db map_apply_palettes + db map_load_wild_mon_data + db map_update_roam_mons + db map_activate_anims db map_end MapSetupScript_Fall: - db map_prolong_sprites + db map_reset_player_object_action MapSetupScript_Door: db map_fade_out_palettes MapSetupScript_Train: - db map_load_warp + db map_enter_warp db map_load_attributes - db map_warp_face - db map_change_callback - db map_player_coord - db map_load_blocks + db map_get_warp_dest_coords + db map_handle_new + db map_refresh_player_coords + db map_load_block_data db map_buffer_screen - db map_lcd_off + db map_disable_lcd db map_load_graphics - db map_time_of_day + db map_load_time_of_day db map_fade_out_music - db map_lcd_on + db map_enable_lcd db map_load_objects - db map_palettes - db map_sprites - db map_fade_music + db map_load_palettes + db map_refresh_sprites + db map_fade_to_music db map_fade_in_palettes - db map_animations_on - db map_wildmons - db map_update_roam + db map_activate_anims + db map_load_wild_mon_data + db map_update_roam_mons db map_end MapSetupScript_ReloadMap: - db map_fade + db map_fade_music_and_palettes db map_clear_bg_palettes - db map_lcd_off - db map_sound_off - db map_load_blocks - db map_connection_blocks + db map_disable_lcd + db map_init_sound + db map_load_block_data + db map_load_connection_block_data db map_load_graphics - db map_time_of_day - db map_lcd_on - db map_palettes - db map_sprites - db map_music_force + db map_load_time_of_day + db map_enable_lcd + db map_load_palettes + db map_refresh_sprites + db map_force_music db map_fade_in_palettes - db map_animations_on - db map_wildmons + db map_activate_anims + db map_load_wild_mon_data db map_end MapSetupScript_LinkReturn: - db map_fade - db map_lcd_off - db map_sound_off - db map_change_callback - db map_load_blocks + db map_fade_music_and_palettes + db map_disable_lcd + db map_init_sound + db map_handle_new + db map_load_block_data db map_buffer_screen db map_load_graphics - db map_time_of_day - db map_lcd_on - db map_palettes - db map_sprites - db map_bike_music + db map_load_time_of_day + db map_enable_lcd + db map_load_palettes + db map_refresh_sprites + db map_play_music_bike db map_fade_in_palettes - db map_animations_on - db map_wildmons - db map_text_scroll_off + db map_activate_anims + db map_load_wild_mon_data + db map_enable_text_acceleration db map_end MapSetupScript_Continue: - db map_lcd_off - db map_sound_off - db map_load_attributes_2 - db map_anchor_screen - db map_start_callback - db map_load_blocks - db map_connection_blocks + db map_disable_lcd + db map_init_sound + db map_load_attributes_no_objects + db map_get_screen_coords + db map_handle_continue + db map_load_block_data + db map_load_connection_block_data db map_buffer_screen db map_load_graphics - db map_time_of_day - db map_lcd_on - db map_palettes - db map_sprites - db map_bike_music + db map_load_time_of_day + db map_enable_lcd + db map_load_palettes + db map_refresh_sprites + db map_play_music_bike db map_fade_in_palettes - db map_animations_on - db map_wildmons + db map_activate_anims + db map_load_wild_mon_data db map_end MapSetupScript_Submenu: - db map_load_blocks - db map_connection_blocks + db map_load_block_data + db map_load_connection_block_data db map_end diff --git a/data/phone/text/alan_callee.asm b/data/phone/text/alan_callee.asm index a7f62f89d..8121b8e48 100644 --- a/data/phone/text/alan_callee.asm +++ b/data/phone/text/alan_callee.asm @@ -1,4 +1,4 @@ -UnknownText_0x1b659d: +AlanAnswerPhoneText: text "Yup, it's @" text_ram wStringBuffer3 text "!" @@ -7,7 +7,7 @@ UnknownText_0x1b659d: line "Good morning!" done -UnknownText_0x1b65c7: +AlanAnswerPhoneDayText: text "Yup, it's @" text_ram wStringBuffer3 text "!" @@ -15,7 +15,7 @@ UnknownText_0x1b65c7: para "Is that <PLAY_G>?" done -UnknownText_0x1b65e3: +AlanAnswerPhoneNiteText: text "Yup, it's @" text_ram wStringBuffer3 text "!" @@ -24,28 +24,28 @@ UnknownText_0x1b65e3: line "Good evening!" done -UnknownText_0x1b660d: +AlanGreetText: text "Hello! It's me," line "@" text_ram wStringBuffer3 text "!" done -UnknownText_0x1b6624: +AlanGreetDayText: text "Hello! It's me," line "@" text_ram wStringBuffer3 text "!" done -UnknownText_0x1b663b: +AlanGreetNiteText: text "Hello! It's me," line "@" text_ram wStringBuffer3 text "!" done -UnknownText_0x1b6652: +AlanGenericText: text "<PLAY_G>, are you" line "raising your" cont "#MON properly?" diff --git a/data/phone/text/alan_caller.asm b/data/phone/text/alan_caller.asm index fad41cafb..1755ffb91 100644 --- a/data/phone/text/alan_caller.asm +++ b/data/phone/text/alan_caller.asm @@ -8,7 +8,7 @@ AlanGettingStrongerText: line "calculated!" done -UnknownText_0x64cf3: +AlanDefeatedMonText: text "By the way, we" line "knocked out a wild" @@ -21,7 +21,7 @@ UnknownText_0x64cf3: line "advance worked!" done -UnknownText_0x64d4f: +AlanLostAMonText: text "By the way, a wild" line "@" text_ram wStringBuffer4 @@ -32,7 +32,7 @@ UnknownText_0x64d4f: line "error on my part…" done -UnknownText_0x64da4: +AlanBattleRematchText: text "I've studied quite" line "a bit since then," @@ -48,11 +48,11 @@ UnknownText_0x64da4: line "for a battle?" done -UnknownText_0x64e1f: +AlanHangUpText: text "See you later!" done -UnknownText_0x64e2f: +AlanFoundItemText: text "Hehehe, I picked" line "up something nice!" @@ -65,7 +65,7 @@ UnknownText_0x64e2f: line "and pick it up?" done -UnknownText_0x64e90: +AlanHaventPickedUpAnythingText: text "I haven't picked" line "up anything yet." @@ -73,7 +73,7 @@ UnknownText_0x64e90: line "find something." done -UnknownText_0x64ed4: +AlanReminderText: text "If we don't battle" line "soon, I'll forget" cont "my strategy!" @@ -84,7 +84,7 @@ UnknownText_0x64ed4: text "!" done -UnknownText_0x64f1a: +AlanComePickUpGiftText: text "I have to do my" line "homework, so can" diff --git a/data/phone/text/anthony_callee.asm b/data/phone/text/anthony_callee.asm index 8919d41c2..ab968e32d 100644 --- a/data/phone/text/anthony_callee.asm +++ b/data/phone/text/anthony_callee.asm @@ -1,4 +1,4 @@ -UnknownText_0x1b5f7a: +AnthonyAnswerPhoneText: text "Yeah, @" text_ram wStringBuffer3 text " the" @@ -7,7 +7,7 @@ UnknownText_0x1b5f7a: para "Ah, <PLAYER>!" done -UnknownText_0x1b5f9e: +AnthonyAnswerPhoneDayText: text "Yeah, @" text_ram wStringBuffer3 text " the" @@ -17,7 +17,7 @@ UnknownText_0x1b5f9e: line "right?" done -UnknownText_0x1b5fc9: +AnthonyAnswerPhoneNiteText: text "Yeah, @" text_ram wStringBuffer3 text " the" @@ -27,7 +27,7 @@ UnknownText_0x1b5fc9: line "it?" done -UnknownText_0x1b5ff6: +AnthonyGreetText: text "Yo, <PLAYER>?" para "This is @" @@ -36,7 +36,7 @@ UnknownText_0x1b5ff6: line "the HIKER!" done -UnknownText_0x1b6017: +AnthonyGreetDayText: text "Hey, is this" line "<PLAYER>?" @@ -46,7 +46,7 @@ UnknownText_0x1b6017: line "the HIKER!" done -UnknownText_0x1b6041: +AnthonyGreetNiteText: text "<PLAYER>, you still" line "awake?" @@ -56,7 +56,7 @@ UnknownText_0x1b6041: line "the HIKER!" done -UnknownText_0x1b606f: +AnthonyGenericText: text "Are your #MON" line "as feisty as ever?" diff --git a/data/phone/text/anthony_caller.asm b/data/phone/text/anthony_caller.asm index 5cbf011b7..29b311250 100644 --- a/data/phone/text/anthony_caller.asm +++ b/data/phone/text/anthony_caller.asm @@ -1,4 +1,4 @@ -AnthonyAteBerriesText: +AnthonyMonAteSomeBerriesText: text "The other day, I" line "was watching my" @@ -20,7 +20,7 @@ AnthonyAteBerriesText: line "was delicious!" done -UnknownText_0x176aef: +AnthonyDefeatedMonText: text "Lately, I've been" line "running across" @@ -33,7 +33,7 @@ UnknownText_0x176aef: line "taken care of." done -UnknownText_0x176b45: +AnthonyLostAMonText: text "Oh yeah, I was" line "battling this" @@ -53,7 +53,7 @@ UnknownText_0x176b45: line "the job at hand!" done -UnknownText_0x176bee: +AnthonyBattleRematchText: text "Come on--let's" line "battle right now!" @@ -66,12 +66,12 @@ UnknownText_0x176bee: line "you feel up to it!" done -UnknownText_0x176c47: +AnthonyHangUpText: text "All right then!" line "Be good!" done -UnknownText_0x176c61: +AnthonySwarmText: text "<PLAYER>! It's" line "mind-blowing!" @@ -99,7 +99,7 @@ UnknownText_0x176c61: line "strong #MON." done -UnknownText_0x176d32: +AnthonyWasntPayingAttentionText: text "Rare #MON?" para "Hey, sorry! I was" @@ -109,7 +109,7 @@ UnknownText_0x176d32: line "paying attention." done -UnknownText_0x176d85: +AnthonyReminderText: text "Hello! You haven't" line "forgotten about" @@ -122,7 +122,7 @@ UnknownText_0x176d85: line "I'm waiting!" done -UnknownText_0x176dd1: +AnthonyHurryText: text "Hello? What? Where" line "is DUNSPARCE?" diff --git a/data/phone/text/arnie_callee.asm b/data/phone/text/arnie_callee.asm index ace24befe..51a70c8ef 100644 --- a/data/phone/text/arnie_callee.asm +++ b/data/phone/text/arnie_callee.asm @@ -1,4 +1,4 @@ -UnknownText_0x1b6454: +ArnieAnswerPhoneText: text "Yeah, hello." line "This is @" text_ram wStringBuffer3 @@ -7,7 +7,7 @@ UnknownText_0x1b6454: para "…Huh, <PLAY_G>? Yo!" done -UnknownText_0x1b647e: +ArnieAnswerPhoneDayText: text "Yeah, hello, you" line "got @" text_ram wStringBuffer3 @@ -16,7 +16,7 @@ UnknownText_0x1b647e: para "…Huh, <PLAY_G>? Yo!" done -UnknownText_0x1b64a8: +ArnieAnswerPhoneNiteText: text "Yeah, hello, you" line "got @" text_ram wStringBuffer3 @@ -25,7 +25,7 @@ UnknownText_0x1b64a8: para "…Huh, <PLAY_G>? Yo!" done -UnknownText_0x1b64d2: +ArnieGreetText: text "Yeah, hello?" line "@" text_ram wStringBuffer3 @@ -35,7 +35,7 @@ UnknownText_0x1b64d2: line "to, <PLAY_G>?" done -UnknownText_0x1b6506: +ArnieGreetDayText: text "Yeah, hello?" line "@" text_ram wStringBuffer3 @@ -45,7 +45,7 @@ UnknownText_0x1b6506: line "<PLAY_G>?" done -UnknownText_0x1b6539: +ArnieGreetNiteText: text "Yeah, hello?" line "@" text_ram wStringBuffer3 @@ -55,7 +55,7 @@ UnknownText_0x1b6539: line "<PLAY_G>?" done -UnknownText_0x1b656c: +ArnieGenericText: text "I bet your #MON" line "are a lot stronger" cont "than before." diff --git a/data/phone/text/arnie_caller.asm b/data/phone/text/arnie_caller.asm index ce3a52b63..96e3623ea 100644 --- a/data/phone/text/arnie_caller.asm +++ b/data/phone/text/arnie_caller.asm @@ -1,4 +1,4 @@ -ArnieLovesTheCuteText: +ArnieMonIsSoCuteText: text "I'm always with my" line "@" text_ram wStringBuffer4 @@ -8,7 +8,7 @@ ArnieLovesTheCuteText: line "I just love it!" done -UnknownText_0x64a13: +ArnieDefeatedMonText: text "Changing the topic" line "here, I saw this" @@ -21,7 +21,7 @@ UnknownText_0x64a13: line "beat, actually." done -UnknownText_0x64a71: +ArnieLostAMonText: text "I was wondering," line "do you happen to" cont "have @" @@ -35,7 +35,7 @@ UnknownText_0x64a71: line "wonder." done -UnknownText_0x64ada: +ArnieBattleRematchText: text "Hey, let's battle" line "our #MON!" @@ -51,12 +51,12 @@ UnknownText_0x64ada: text "!" done -UnknownText_0x64b48: +ArnieHangUpText: text "Let's talk again," line "huh?" done -UnknownText_0x64b5f: +ArnieSwarmText: text "Boy, am I glad I" line "caught you!" @@ -74,7 +74,7 @@ UnknownText_0x64b5f: line "this!" done -UnknownText_0x64bc6: +ArnieHaventSeenRareMonText: text "I haven't had any" line "luck seeing rare" cont "#MON lately…" @@ -83,7 +83,7 @@ UnknownText_0x64bc6: line "out there!" done -UnknownText_0x64c13: +ArnieReminderText: text "Hey, where are you" line "now?" @@ -94,7 +94,7 @@ UnknownText_0x64c13: text "!" done -UnknownText_0x64c5a: +ArnieHurryText: text "Hello? Are you" line "coming or what?" diff --git a/data/phone/text/beth_callee.asm b/data/phone/text/beth_callee.asm index 61bf7298f..289c3e606 100644 --- a/data/phone/text/beth_callee.asm +++ b/data/phone/text/beth_callee.asm @@ -1,4 +1,4 @@ -UnknownText_0x1b53f7: +BethAnswerPhoneText: text "Hello, this is" line "@" text_ram wStringBuffer3 @@ -10,7 +10,7 @@ UnknownText_0x1b53f7: para "" done -UnknownText_0x1b5424: +BethAnswerPhoneDayText: text "Hello, this is" line "@" text_ram wStringBuffer3 @@ -19,7 +19,7 @@ UnknownText_0x1b5424: para "Oh. Hi, <PLAY_G>." done -UnknownText_0x1b5446: +BethAnswerPhoneNiteText: text "Hello, this is" line "@" text_ram wStringBuffer3 @@ -29,7 +29,7 @@ UnknownText_0x1b5446: line "Good evening." done -UnknownText_0x1b5472: +BethGreetText: text "Good morning," line "<PLAY_G>!" @@ -39,7 +39,7 @@ UnknownText_0x1b5472: line "Were you sleeping?" done -UnknownText_0x1b54a6: +BethGreetDayText: text "<PLAY_G>, hi!" line "This is @" text_ram wStringBuffer3 @@ -49,7 +49,7 @@ UnknownText_0x1b54a6: line "time?" done -UnknownText_0x1b54d4: +BethGreetNiteText: text "Hi, <PLAY_G>." line "Good evening." @@ -61,7 +61,7 @@ UnknownText_0x1b54d4: line "awake." done -UnknownText_0x1b5510: +BethGenericText: text "Are you the kind" line "of person who goes" diff --git a/data/phone/text/beth_caller.asm b/data/phone/text/beth_caller.asm index d7cac6298..b42ad9918 100644 --- a/data/phone/text/beth_caller.asm +++ b/data/phone/text/beth_caller.asm @@ -1,4 +1,4 @@ -UnknownText_0x174c7f: +BethExhilaratingRideText: text "Do you remember my" line "sweet @" text_ram wStringBuffer4 @@ -16,7 +16,7 @@ UnknownText_0x174c7f: line "really gets going." done -UnknownText_0x174cf6: +BethDefeatedMonText: text "Oh, have you ever" line "seen a @" text_ram wStringBuffer4 @@ -36,7 +36,7 @@ UnknownText_0x174cf6: line "course." done -UnknownText_0x174d86: +BethLostAMonText: text "Oh, I just saw a" line "wild @" text_ram wStringBuffer4 @@ -59,7 +59,7 @@ UnknownText_0x174d86: line "from my mistake." done -UnknownText_0x174e4e: +BethBattleRematchText: text "Do you want to" line "battle? I'm going" cont "to win this time!" @@ -73,16 +73,16 @@ UnknownText_0x174e4e: line "Look for me, OK?" done -UnknownText_0x174eb7: +BethHangUpText: text "OK, bye-bye!" done -UnknownText_0x174ec5: +BethLetsBattleAgainSometimeText: text "Let's battle again" line "sometime!" done -BethForgetDealText: +BethReminderText: text "Um… <PLAY_G>?" line "What's wrong?" diff --git a/data/phone/text/beverly_callee.asm b/data/phone/text/beverly_callee.asm index bac2e24bd..da97a75b7 100644 --- a/data/phone/text/beverly_callee.asm +++ b/data/phone/text/beverly_callee.asm @@ -1,4 +1,4 @@ -UnknownText_0x1b4f21: +BeverlyAnswerPhoneText: text "Hello, this is" line "@" text_ram wStringBuffer3 @@ -8,7 +8,7 @@ UnknownText_0x1b4f21: line "<PLAYER>." done -UnknownText_0x1b4f4d: +BeverlyAnswerPhoneDayText: text "Hello, this is" line "@" text_ram wStringBuffer3 @@ -18,7 +18,7 @@ UnknownText_0x1b4f4d: line "<PLAYER>." done -UnknownText_0x1b4f75: +BeverlyAnswerPhoneNiteText: text "Hello, this is" line "@" text_ram wStringBuffer3 @@ -28,7 +28,7 @@ UnknownText_0x1b4f75: line "<PLAYER>." done -UnknownText_0x1b4fa1: +BeverlyGreetText: text "Hello, <PLAYER>." line "Good morning." @@ -38,7 +38,7 @@ UnknownText_0x1b4fa1: line "Were you asleep?" done -UnknownText_0x1b4fda: +BeverlyGreetDayText: text "Hi, <PLAYER>." line "This is @" text_ram wStringBuffer3 @@ -47,7 +47,7 @@ UnknownText_0x1b4fda: para "How are you doing?" done -UnknownText_0x1b5004: +BeverlyGreetNiteText: text "Hi, <PLAYER>." line "This is @" text_ram wStringBuffer3 @@ -56,7 +56,7 @@ UnknownText_0x1b5004: para "Were you awake?" done -UnknownText_0x1b502b: +BeverlyGenericText: text "Keeping your" line "#MON happy?" diff --git a/data/phone/text/beverly_caller.asm b/data/phone/text/beverly_caller.asm index 73fd4b215..761f4fe36 100644 --- a/data/phone/text/beverly_caller.asm +++ b/data/phone/text/beverly_caller.asm @@ -1,4 +1,4 @@ -UnknownText_0x174688: +BeverlyMadeMonEvenCuterText: text "I fancied up my" line "@" text_ram wStringBuffer4 @@ -8,7 +8,7 @@ UnknownText_0x174688: line "than before!" done -UnknownText_0x1746c3: +BeverlyDefeatedMonText: text "I happened to come" line "across a wild" cont "SNUBBULL recently." @@ -20,7 +20,7 @@ UnknownText_0x1746c3: line "wild one." done -UnknownText_0x174734: +BeverlyLostAMonText: text "I happened to see" line "a wild MARILL the" @@ -36,12 +36,12 @@ UnknownText_0x174734: line "quite miffed." done -UnknownText_0x1747ac: +BeverlyHangUpText: text "You can expect a" line "call from me." done -BeverlyFoundNuggetText: +BeverlyFoundItemText: text "My husband got" line "some NUGGETS." @@ -60,7 +60,7 @@ BeverlyFoundNuggetText: line "when you can." done -UnknownText_0x17485b: +BeverlyLetsChatAboutMonAgainText: text "Are your #MON" line "in prime form?" @@ -68,7 +68,7 @@ UnknownText_0x17485b: line "#MON again." done -UnknownText_0x174895: +BeverlyComePickUpText: text "Pardon?" line "Oh, the NUGGET?" diff --git a/data/phone/text/bike_shop.asm b/data/phone/text/bike_shop.asm index e410fc3be..30ccfeaf1 100644 --- a/data/phone/text/bike_shop.asm +++ b/data/phone/text/bike_shop.asm @@ -1,4 +1,4 @@ -UnknownText_0x174000: +BikeShopPhoneCallerText: text "Hi, <PLAY_G>!" line "Our BICYCLE sales" diff --git a/data/phone/text/brent_callee.asm b/data/phone/text/brent_callee.asm index 9dcacdc4e..351ea6b0c 100644 --- a/data/phone/text/brent_callee.asm +++ b/data/phone/text/brent_callee.asm @@ -1,4 +1,4 @@ -UnknownText_0x1b6c96: +BrentAnswerPhoneText: text "Yes? @" text_ram wStringBuffer3 text " here…" @@ -7,7 +7,7 @@ UnknownText_0x1b6c96: line "can I do for you?" done -UnknownText_0x1b6cc6: +BrentAnswerPhoneDayText: text "Yes? @" text_ram wStringBuffer3 text " here…" @@ -16,7 +16,7 @@ UnknownText_0x1b6cc6: line "can I do for you?" done -UnknownText_0x1b6cf6: +BrentAnswerPhoneNiteText: text "Yes? @" text_ram wStringBuffer3 text " here…" @@ -25,7 +25,7 @@ UnknownText_0x1b6cf6: line "can I do for you?" done -UnknownText_0x1b6d26: +BrentGreetText: text "Hiya, <PLAYER>. How" line "are you doing?" @@ -35,7 +35,7 @@ UnknownText_0x1b6d26: text "." done -UnknownText_0x1b6d57: +BrentGreetDayText: text "Hiya, <PLAYER>, how" line "are you doing?" @@ -45,7 +45,7 @@ UnknownText_0x1b6d57: text "." done -UnknownText_0x1b6d88: +BrentGreetNiteText: text "Hiya, <PLAYER>, how" line "are you doing?" @@ -55,7 +55,7 @@ UnknownText_0x1b6d88: text "." done -UnknownText_0x1b6db9: +BrentGenericText: text "Oh yeah, I saw you" line "coming out of a" diff --git a/data/phone/text/brent_caller.asm b/data/phone/text/brent_caller.asm index dcca0840f..e1ef65d74 100644 --- a/data/phone/text/brent_caller.asm +++ b/data/phone/text/brent_caller.asm @@ -12,7 +12,7 @@ BrentRareTradeText: line "it a secret!" done -UnknownText_0x6613c: +BrentDefeatedMonText: text "Oh yeah, I took" line "down this wild" @@ -25,7 +25,7 @@ UnknownText_0x6613c: line "catching." done -UnknownText_0x6618c: +BrentLostAMonText: text "Oh yeah, I saw a" line "rare #MON about" cont "an hour ago." @@ -40,7 +40,7 @@ UnknownText_0x6618c: line "at my mistakes?" done -UnknownText_0x66214: +BrentBattleRematchText: text "You've got time" line "like usual, right?" @@ -59,11 +59,11 @@ UnknownText_0x66214: text "." done -UnknownText_0x662a9: +BrentHangUpText: text "So that's it then." done -UnknownText_0x662bc: +BrentFatherGossipText: text "Did you know…?" line "BILL's father is" @@ -71,7 +71,7 @@ UnknownText_0x662bc: line "great #MANIAC." done -UnknownText_0x662fc: +BrentGrandpaGossipText: text "Did you know…?" line "Apparently BILL's" @@ -79,13 +79,13 @@ UnknownText_0x662fc: line "#MANIAC." done -UnknownText_0x66335: +BrentGoldenrodGossipText: text "Did you know…?" line "BILL's originally" cont "from GOLDENROD." done -UnknownText_0x66366: +BrentRoute25GossipText: text "Did you know…?" line "BILL evidently" @@ -93,7 +93,7 @@ UnknownText_0x66366: line "in KANTO." done -UnknownText_0x663a1: +BrentAbraGossipText: text "Did you know…?" line "ABRA was the first" @@ -101,7 +101,7 @@ UnknownText_0x663a1: line "ostensibly caught." done -UnknownText_0x663e6: +BrentSisterGossipText: text "Did you know…?" line "BILL's younger" @@ -109,7 +109,7 @@ UnknownText_0x663e6: line "can't wink." done -UnknownText_0x66421: +BrentMilkGossipText: text "Did you know…?" line "BILL supposedly" @@ -117,7 +117,7 @@ UnknownText_0x66421: line "can't drink it." done -UnknownText_0x6645f: +BrentBattlingGossipText: text "Did you know…?" line "Evidently, BILL" @@ -125,7 +125,7 @@ UnknownText_0x6645f: line "battling." done -UnknownText_0x6649b: +BrentFlowerShopGossipText: text "Did you know…?" line "BILL appears to" @@ -133,7 +133,7 @@ UnknownText_0x6649b: line "the FLOWER SHOP." done -UnknownText_0x664dd: +BrentKimonoGirlGossipText: text "Did you know…?" line "BILL's mother is" @@ -141,7 +141,7 @@ UnknownText_0x664dd: line "a KIMONO GIRL." done -UnknownText_0x6651e: +BrentSorryImTooBusyText: text "You wanted to hear" line "about BILL?" @@ -152,7 +152,7 @@ UnknownText_0x6651e: line "have time." done -UnknownText_0x66579: +BrentReminderText: text "You want to see my" line "rare #MON." diff --git a/data/phone/text/buena.asm b/data/phone/text/buena.asm index 2503ae73c..72ce8fccb 100644 --- a/data/phone/text/buena.asm +++ b/data/phone/text/buena.asm @@ -1,4 +1,4 @@ -UnknownText_0xa0c28: +BuenaPhoneMorningAnswerText: text "Hi, this is BUENA…" para "Oh! Good morning," @@ -8,7 +8,7 @@ UnknownText_0xa0c28: line "in the morning…" done -UnknownText_0xa0c72: +BuenaPhoneDayAnswerText: text "Hi, this is BUENA…" line "Oh! Hi, <PLAY_G>!" @@ -16,7 +16,7 @@ UnknownText_0xa0c72: line "BUENA's show?" done -UnknownText_0xa0caf: +BuenaPhoneMidnightAnswerText: text "This is BUENA." line "I can't come to" @@ -33,7 +33,7 @@ UnknownText_0xa0caf: line "after midnight!" done -UnknownText_0xa0d42: +BuenaPhoneNiteAnswerText: text "Hi, this is BUENA…" line "Oh! Hi, <PLAY_G>!" @@ -44,7 +44,7 @@ UnknownText_0xa0d42: line "I'm exhausted!" done -UnknownText_0xa0d96: +BuenaPhoneMorningText: text "<PLAY_G>!" line "Hi, it's BUENA!" @@ -52,7 +52,7 @@ UnknownText_0xa0d96: line "I decided to call!" done -UnknownText_0xa0dcf: +BuenaPhoneDayText: text "<PLAY_G>!" line "Hi, it's BUENA!" @@ -60,7 +60,7 @@ UnknownText_0xa0dcf: line "to chat with!" done -UnknownText_0xa0e01: +BuenaPhoneMidnightText: text "<PLAY_G>!" line "Hi, it's BUENA!" @@ -68,7 +68,7 @@ UnknownText_0xa0e01: line "break." done -UnknownText_0xa0e29: +BuenaPhoneNiteText: text "<PLAY_G>!" line "Hi, it's BUENA!" @@ -76,7 +76,7 @@ UnknownText_0xa0e29: line "so I called you." done -UnknownText_0xa0e5e: +BuenaPhoneRocketText: text "Oh. Hi, <PLAY_G>!" para "You are how?" @@ -94,7 +94,7 @@ UnknownText_0xa0e5e: line "better be careful!" done -UnknownText_0xa0efb: +BuenaPhoneWentOutWithBenText: text "The other day, I" line "went out to eat" @@ -117,7 +117,7 @@ UnknownText_0xa0efb: line "you later!" done -UnknownText_0xa0fcf: +BuenaPhoneReceptionistText: text "You know the" line "receptionist at" cont "the RADIO TOWER?" @@ -140,7 +140,7 @@ UnknownText_0xa0fcf: para "Catch you later!" done -UnknownText_0xa109d: +BuenaPhoneLuckyNumberShowText: text "Tell me, <PLAY_G>." line "Have you ever won" @@ -157,7 +157,7 @@ UnknownText_0xa109d: para "Let's chat again!" done -UnknownText_0xa1143: +BuenaPhoneStressedFromWorkText: text "You know, last" line "night…" @@ -187,7 +187,7 @@ UnknownText_0xa1143: line "wrong number!" done -UnknownText_0xa1244: +BuenaPhoneProfessorOakText: text "Yesterday, PROF." line "OAK was in the" @@ -209,7 +209,7 @@ UnknownText_0xa1244: para "Catch you later!" done -UnknownText_0xa1318: +BuenaPhoneGotAColdText: text "…Cough, cough!" para "Uhm sorry uh got" @@ -229,7 +229,7 @@ UnknownText_0xa1318: cont "been BUENA!" done -UnknownText_0xa13d8: +BuenaPhoneRadioCardQuestionsText: text "Hey, <PLAY_G>." line "You won that RADIO" @@ -249,7 +249,7 @@ UnknownText_0xa13d8: line "again!" done -UnknownText_0xa1488: +BuenaPhonePikachuFanClubText: text "I'm elated that" line "more people are" @@ -283,7 +283,7 @@ UnknownText_0xa1488: para "Let's chat again!" done -UnknownText_0xa15de: +BuenaPhoneRadioTowerDirectorText: text "Guess what?" line "The RADIO TOWER's" @@ -315,7 +315,7 @@ UnknownText_0xa15de: line "my show!" done -UnknownText_0xa1717: +BuenaPhoneWhenDoYouRelaxText: text "<PLAY_G>, tell me." para "When do you relax" @@ -347,7 +347,7 @@ UnknownText_0xa1717: line "happened! Later!" done -UnknownText_0xa183d: +BuenaPhoneStarterPokemonText: text "<PLAY_G>, what was" line "the first #MON" cont "you ever caught?" @@ -387,7 +387,7 @@ UnknownText_0xa183d: para "Bye-bye!" done -UnknownText_0xa19b1: +BuenaPhoneCompanyVacationText: text "Guess what? All of" line "us from the RADIO" @@ -415,7 +415,7 @@ UnknownText_0xa19b1: para "Bye-bye!" done -UnknownText_0xa1ac0: +BuenaPhoneBenAndFernText: text "Did you know…?" para "BEN and FERN talk" @@ -445,7 +445,7 @@ UnknownText_0xa1ac0: para "Let's chat again!" done -UnknownText_0xa1bed: +BuenaPhoneGoingShoppingText: text "I'm going shopping" line "with MARY and LILY" cont "soon." @@ -462,7 +462,7 @@ UnknownText_0xa1bed: para "Catch you later!" done -UnknownText_0xa1c88: +BuenaPhoneFavoriteSlotMachineAnswerText: text "I'm thinking of" line "going to the GAME" @@ -489,7 +489,7 @@ endc para "Catch you later!" done -UnknownText_0xa1d5f: +BuenaPhonePokegearAnswerText: text "Hey, <PLAY_G>. You" line "use your #GEAR" @@ -512,7 +512,7 @@ UnknownText_0xa1d5f: line "calling! Later!" done -UnknownText_0xa1e2f: +BuenaPhoneCoopedUpInRadioTowerAnswerText: text "Is it sunny" line "outside today?" diff --git a/data/phone/text/chad_callee.asm b/data/phone/text/chad_callee.asm index f7602dbe2..52c711dce 100644 --- a/data/phone/text/chad_callee.asm +++ b/data/phone/text/chad_callee.asm @@ -1,4 +1,4 @@ -UnknownText_0x1b67e2: +ChadAnswerPhoneText: text "Hello, this is" line "@" text_ram wStringBuffer3 @@ -8,7 +8,7 @@ UnknownText_0x1b67e2: line "Good morning!" done -UnknownText_0x1b680e: +ChadAnswerPhoneDayText: text "Hello, this is" line "@" text_ram wStringBuffer3 @@ -18,7 +18,7 @@ UnknownText_0x1b680e: line "day!" done -UnknownText_0x1b6836: +ChadAnswerPhoneNiteText: text "Hello, this is" line "@" text_ram wStringBuffer3 @@ -28,7 +28,7 @@ UnknownText_0x1b6836: line "evening!" done -UnknownText_0x1b6862: +ChadGreetText: text "Hi, <PLAY_G>, good" line "morning!" @@ -38,7 +38,7 @@ UnknownText_0x1b6862: line "How are you?" done -UnknownText_0x1b6890: +ChadGreetDayText: text "Hi, <PLAY_G>, good" line "day!" @@ -48,7 +48,7 @@ UnknownText_0x1b6890: line "How are you?" done -UnknownText_0x1b68ba: +ChadGreetNiteText: text "Hi, <PLAY_G>, good" line "evening!" @@ -58,7 +58,7 @@ UnknownText_0x1b68ba: line "How are you?" done -UnknownText_0x1b68e8: +ChadGenericText: text "How are your" line "#MON doing?" diff --git a/data/phone/text/chad_caller.asm b/data/phone/text/chad_caller.asm index f65035c27..d4442d158 100644 --- a/data/phone/text/chad_caller.asm +++ b/data/phone/text/chad_caller.asm @@ -18,7 +18,7 @@ ChadObservingWildText: line "PROF.OAK soon." done -UnknownText_0x65318: +ChadDefeatedMonText: text "Oh yes, I managed" line "to knock out a" @@ -34,7 +34,7 @@ UnknownText_0x65318: line "was inevitable." done -UnknownText_0x65399: +ChadLostAMonText: text "Oh yes, I came" line "close to catching" @@ -52,7 +52,7 @@ UnknownText_0x65399: text ". Rats…" done -UnknownText_0x65419: +ChadBattleRematchText: text "Want to battle?" line "I have to battle" @@ -65,7 +65,7 @@ UnknownText_0x65419: text "!" done -UnknownText_0x65471: +ChadHangUpText: text "See you later!" done @@ -106,7 +106,7 @@ ChadProfElmGossipText: line "I envy him!" done -ChadDreamGossipText: +ChadProfOaksDreamGossipText: text "PROF.OAK's dream" line "is to compile a" @@ -148,7 +148,7 @@ ChadLeagueGossipText: line "great man." done -ChadRadioShowGossipText: +ChadPokemonTalkGossipText: text "PROF.OAK'S #MON" line "TALK is a popular" cont "radio show, right?" @@ -167,7 +167,7 @@ ChadRadioShowGossipText: line "thank for it!" done -ChadBattlingGossipText: +ChadProfOakTrainerGossipText: text "PROF.OAK used to" line "be a trainer a" cont "long time ago." @@ -203,7 +203,7 @@ ChadDaisyTeaGossipText: line "PROF.OAK." done -ChadTravelGossipText: +ChadProfOakTravelingGossipText: text "Did you know?" line "PROF.OAK traveled" @@ -223,7 +223,7 @@ ChadTravelGossipText: line "things too…" done -UnknownText_0x65a23: +ChadGoingToStudyHardText: text "I'm going to study" line "hard so PROF.OAK" @@ -231,7 +231,7 @@ UnknownText_0x65a23: line "assistant!" done -UnknownText_0x65a63: +ChadReminderText: text "Do you remember" line "about our battle?" diff --git a/data/phone/text/dana_callee.asm b/data/phone/text/dana_callee.asm index 8b90785bf..350196fe3 100644 --- a/data/phone/text/dana_callee.asm +++ b/data/phone/text/dana_callee.asm @@ -1,4 +1,4 @@ -UnknownText_0x1b66c8: +DanaAnswerPhoneText: text "Hi, @" text_ram wStringBuffer3 text " on the" @@ -7,7 +7,7 @@ UnknownText_0x1b66c8: para "Hey! It's <PLAY_G>!" done -UnknownText_0x1b66ec: +DanaAnswerPhoneDayText: text "Hi, @" text_ram wStringBuffer3 text " on the" @@ -17,7 +17,7 @@ UnknownText_0x1b66ec: line "It's <PLAY_G>!" done -UnknownText_0x1b6713: +DanaAnswerPhoneNiteText: text "Hi, @" text_ram wStringBuffer3 text " on the" @@ -27,7 +27,7 @@ UnknownText_0x1b6713: line "What's up?" done -UnknownText_0x1b6738: +DanaGreetText: text "Uh, <PLAY_G>?" para "It's me!" @@ -36,7 +36,7 @@ UnknownText_0x1b6738: text "!" done -UnknownText_0x1b6757: +DanaGreetDayText: text "Uh, <PLAY_G>?" para "It's me!" @@ -45,7 +45,7 @@ UnknownText_0x1b6757: text "!" done -UnknownText_0x1b6776: +DanaGreetNiteText: text "Uh, <PLAY_G>?" para "It's me!" @@ -54,7 +54,7 @@ UnknownText_0x1b6776: text "!" done -UnknownText_0x1b6795: +DanaGenericText: text "My @" text_ram wStringBuffer4 text " is" diff --git a/data/phone/text/dana_caller.asm b/data/phone/text/dana_caller.asm index 0209b2ae2..b4bb55b19 100644 --- a/data/phone/text/dana_caller.asm +++ b/data/phone/text/dana_caller.asm @@ -1,4 +1,4 @@ -UnknownText_0x64f74: +DanaTakingPhotosText: text "My @" text_ram wStringBuffer4 text " is" @@ -8,7 +8,7 @@ UnknownText_0x64f74: line "photos galore!" done -UnknownText_0x64fb2: +DanaDefeatedMonText: text "It took only an" line "instant to KO a" cont "wild @" @@ -22,7 +22,7 @@ UnknownText_0x64fb2: line "time." done -UnknownText_0x6501c: +DanaLostAMonText: text "You know what?" line "A wild @" text_ram wStringBuffer4 @@ -37,7 +37,7 @@ UnknownText_0x6501c: line "and I would've…" done -UnknownText_0x65091: +DanaBattleRematchText: text "Right now, I'm on" line "@" text_ram wStringBuffer5 @@ -50,11 +50,11 @@ UnknownText_0x65091: line "for you!" done -UnknownText_0x650e2: +DanaHangUpText: text "See you!" done -UnknownText_0x650ec: +DanaFoundItemText: text "You know what?" line "I got a good gift!" @@ -70,7 +70,7 @@ UnknownText_0x650ec: text "!" done -UnknownText_0x65161: +DanaCanYouWaitABitLongerText: text "Oh! You wanted a" line "gift, right?" @@ -81,7 +81,7 @@ UnknownText_0x65161: line "longer?" done -UnknownText_0x651bf: +DanaReminderText: text "Hi! You haven't" line "forgotten about" @@ -94,7 +94,7 @@ UnknownText_0x651bf: text "!" done -UnknownText_0x6520f: +DanaComePickUpText: text "Hello?" para "If you don't come" diff --git a/data/phone/text/derek_callee.asm b/data/phone/text/derek_callee.asm index be0784140..e2024cb1d 100644 --- a/data/phone/text/derek_callee.asm +++ b/data/phone/text/derek_callee.asm @@ -1,25 +1,25 @@ -UnknownText_0x1b69a8: +DerekAnswerPhoneText: text "Hi, <PLAY_G>?" para "Good morning pika." line "What's up pika?" done -UnknownText_0x1b69d2: +DerekAnswerPhoneDayText: text "Hi, <PLAY_G>?" para "Good day pika," line "what's up pika?" done -UnknownText_0x1b69f8: +DerekAnswerPhoneNiteText: text "Hi, <PLAY_G>?" para "Good evening pika," line "what's up pika?" done -UnknownText_0x1b6a22: +DerekGreetText: text "<PLAY_G> pika, good" line "morning!" @@ -29,7 +29,7 @@ UnknownText_0x1b6a22: line "pika are you?" done -UnknownText_0x1b6a56: +DerekGreetDayText: text "<PLAY_G> pika, good" line "pika day!" @@ -39,7 +39,7 @@ UnknownText_0x1b6a56: line "pika are you?" done -UnknownText_0x1b6a8b: +DerekGreetNiteText: text "<PLAY_G> pika, good" line "evening!" @@ -49,7 +49,7 @@ UnknownText_0x1b6a8b: line "you pika awake?" done -UnknownText_0x1b6ac2: +DerekGenericText: text "You have to hear" line "this! My lovable" diff --git a/data/phone/text/derek_caller.asm b/data/phone/text/derek_caller.asm index a96768faa..a6ed1abd7 100644 --- a/data/phone/text/derek_caller.asm +++ b/data/phone/text/derek_caller.asm @@ -1,4 +1,4 @@ -DerekCheekPincherText: +DerekCheekPinchingText: text "Listen to this." line "My @" text_ram wStringBuffer4 @@ -12,7 +12,7 @@ DerekCheekPincherText: para "I must be special." done -UnknownText_0x65b29: +DerekDefeatedMonText: text "Oh, and recently," line "my PIKACHU beat a" cont "wild @" @@ -34,7 +34,7 @@ UnknownText_0x65b29: line "greatest!" done -UnknownText_0x65bc8: +DerekLostAMonText: text "Oh, and I saw a" line "wild @" text_ram wStringBuffer4 @@ -51,7 +51,7 @@ UnknownText_0x65bc8: line "good otherwise." done -UnknownText_0x65c4e: +DerekHangUpText: text "Well, let's talk" line "again!" done @@ -71,7 +71,7 @@ DerekBugCatchingContestText: line "off its cuteness." done -UnknownText_0x65cf9: +DerekFoundItemText: text "I'd like you to" line "have a NUGGET." @@ -83,7 +83,7 @@ UnknownText_0x65cf9: cont "it too!" done -UnknownText_0x65d5c: +DerekLetsGetTogetherText: text "How is your" line "PIKACHU doing?" @@ -92,7 +92,7 @@ UnknownText_0x65d5c: cont "PIKACHU!" done -UnknownText_0x65da6: +DerekComePickUpText: text "What's wrong?" para "I'm waiting on" diff --git a/data/phone/text/elm.asm b/data/phone/text/elm.asm index 0e4dc5bc3..8685367f0 100644 --- a/data/phone/text/elm.asm +++ b/data/phone/text/elm.asm @@ -1,4 +1,4 @@ -ElmPhoneStartText: +ElmPhoneHealYourMonText: text "Hello, <PLAY_G>?" para "Try not to overdo" @@ -28,7 +28,7 @@ ElmPhonePokemonStolenText: line "do that?" done -ElmPhoneCheckingEggText: +ElmPhoneCheckingTheEggText: text "Hello, <PLAY_G>?" para "We're checking the" @@ -48,7 +48,7 @@ ElmPhoneAssistantText: line "in VIOLET CITY." done -ElmPhoneEggUnhatchedText: +ElmPhoneHowIsTheEggText: text "Hello, <PLAY_G>?" para "How's the EGG? Has" @@ -70,7 +70,7 @@ ElmPhoneEggHatchedText: line "me now!" done -ElmPhoneDiscovery1Text: +ElmPhoneDiscoveredHatchTimeText: text "Hello, <PLAY_G>?" para "I just made a new" @@ -83,7 +83,7 @@ ElmPhoneDiscovery1Text: line "the #MON." done -ElmPhoneDiscovery2Text: +ElmPhoneInvestigatingEggMovesText: text "Hello, <PLAY_G>?" para "It's still a" @@ -96,7 +96,7 @@ ElmPhoneDiscovery2Text: line "ing that now." done -ElmPhonePokerusText: +ElmPhoneDiscoveredPokerusText: text "Hello, <PLAY_G>?" para "I discovered an" @@ -158,7 +158,7 @@ ElmPhoneEggAssistantText: cont "him?" done -ElmPhoneRocketText: +ElmPhoneRadioTowerRocketTakeoverText: text "<PLAY_G>, how are" line "things going?" @@ -197,7 +197,8 @@ ElmPhoneGiftText: para "See you later!" done -ElmPhoneUnusedText: +; unused +ElmPhoneGotAholdOfSomethingNeatText: text "Hello, <PLAY_G>?" line "How's it going?" diff --git a/data/phone/text/erin_callee.asm b/data/phone/text/erin_callee.asm index a39a19f80..c2685cee7 100644 --- a/data/phone/text/erin_callee.asm +++ b/data/phone/text/erin_callee.asm @@ -1,4 +1,4 @@ -UnknownText_0x1b751a: +ErinAnswerPhoneText: text "Yes, this is" line "@" text_ram wStringBuffer3 @@ -8,7 +8,7 @@ UnknownText_0x1b751a: line "Good morning!" done -UnknownText_0x1b7548: +ErinAnswerPhoneDayText: text "Yes, this is" line "@" text_ram wStringBuffer3 @@ -18,7 +18,7 @@ UnknownText_0x1b7548: line "Yahoo!" done -UnknownText_0x1b756f: +ErinAnswerPhoneNiteText: text "Yes, this is" line "@" text_ram wStringBuffer3 @@ -27,7 +27,7 @@ UnknownText_0x1b756f: para "Oh, hi, <PLAY_G>!" done -UnknownText_0x1b758f: +ErinGreetText: text "<PLAY_G>!" para "It's @" @@ -36,7 +36,7 @@ UnknownText_0x1b758f: line "Good morning!" done -UnknownText_0x1b75ac: +ErinGreetDayText: text "<PLAY_G>!" para "It's @" @@ -45,7 +45,7 @@ UnknownText_0x1b75ac: line "Working hard?" done -UnknownText_0x1b75c9: +ErinGreetNiteText: text "<PLAY_G>!" para "It's @" @@ -54,7 +54,7 @@ UnknownText_0x1b75c9: line "Were you up?" done -UnknownText_0x1b75e5: +ErinGenericText: text "Are you raising" line "your #MON?" diff --git a/data/phone/text/erin_caller.asm b/data/phone/text/erin_caller.asm index a7e3fd94f..ee54d3121 100644 --- a/data/phone/text/erin_caller.asm +++ b/data/phone/text/erin_caller.asm @@ -1,4 +1,4 @@ -UnknownText_0x6717a: +ErinMonIsMuchStrongerText: text_ram wStringBuffer3 text "'s @" text_ram wStringBuffer4 @@ -7,7 +7,7 @@ UnknownText_0x6717a: cont "than before!" done -UnknownText_0x671a4: +ErinDefeatedMonText: text "And, and…" line "I just battled and" cont "beat @" @@ -18,7 +18,7 @@ UnknownText_0x671a4: line "#MON properly!" done -UnknownText_0x671eb: +ErinLostAMonText: text "But, but…" para "A wild @" @@ -30,7 +30,7 @@ UnknownText_0x671eb: line "not fair!" done -UnknownText_0x6722e: +ErinBattleRematchText: text "I'm ERIN. Want to" line "battle me again?" @@ -43,7 +43,7 @@ UnknownText_0x6722e: text "!" done -UnknownText_0x67281: +ErinHangUpText: text "See you. Bye-bye!" done diff --git a/data/phone/text/gaven_callee.asm b/data/phone/text/gaven_callee.asm index 3191ca7db..4e8584057 100644 --- a/data/phone/text/gaven_callee.asm +++ b/data/phone/text/gaven_callee.asm @@ -1,4 +1,4 @@ -UnknownText_0x1b5270: +GavenAnswerPhoneText: text "Hello, this is" line "@" text_ram wStringBuffer3 @@ -8,7 +8,7 @@ UnknownText_0x1b5270: line "Good morning!" done -UnknownText_0x1b52a5: +GavenAnswerPhoneDayText: text "Hello, this is" line "@" text_ram wStringBuffer3 @@ -17,7 +17,7 @@ UnknownText_0x1b52a5: para "Hi, <PLAY_G>!" done -UnknownText_0x1b52cc: +GavenAnswerPhoneNiteText: text "Hello, this is" line "@" text_ram wStringBuffer3 @@ -27,7 +27,7 @@ UnknownText_0x1b52cc: line "Good evening!" done -UnknownText_0x1b5301: +GavenGreetText: text "<PLAY_G>, good" line "morning!" @@ -37,7 +37,7 @@ UnknownText_0x1b5301: line "How are you doing?" done -UnknownText_0x1b5335: +GavenGreetDayText: text "Hi, <PLAY_G>!" para "It's me, @" @@ -46,7 +46,7 @@ UnknownText_0x1b5335: line "How are you doing?" done -UnknownText_0x1b535f: +GavenGreetNiteText: text "<PLAY_G>, good" line "evening!" @@ -56,7 +56,7 @@ UnknownText_0x1b535f: line "How are you doing?" done -UnknownText_0x1b5393: +GavenGenericText: text "How are your" line "#MON doing?" diff --git a/data/phone/text/gaven_caller.asm b/data/phone/text/gaven_caller.asm index 96b5c9086..f552d4148 100644 --- a/data/phone/text/gaven_caller.asm +++ b/data/phone/text/gaven_caller.asm @@ -1,4 +1,4 @@ -GavenGreaterText: +GavenMonGreaterThanImaginedText: text "My @" text_ram wStringBuffer4 text_start @@ -12,7 +12,7 @@ GavenGreaterText: cont "better than mine." done -UnknownText_0x174a80: +GavenDefeatedMonText: text "Oh, and I managed" line "to barely defeat" @@ -35,7 +35,7 @@ UnknownText_0x174a80: cont "used to seeing." done -UnknownText_0x174b2d: +GavenLostAMonText: text "And a while back," line "I tried to catch a" cont "wild @" @@ -52,7 +52,7 @@ UnknownText_0x174b2d: line "to be careful too." done -UnknownText_0x174bc5: +GavenBattleRematchText: text "Let's battle!" para "I'll be waiting on" @@ -64,17 +64,17 @@ UnknownText_0x174bc5: line "when you're close." done -UnknownText_0x174c0e: +GavenHangUpText: text "OK, I'll talk to" line "you soon!" done -UnknownText_0x174c29: +GavenHangUpNotThursdayText: text "I obsess over how" line "to beat you." done -UnknownText_0x174c49: +GavenReminderText: text "<PLAY_G>, why" line "aren't you here?" diff --git a/data/phone/text/gina_callee.asm b/data/phone/text/gina_callee.asm index 3c86e94e6..81325f670 100644 --- a/data/phone/text/gina_callee.asm +++ b/data/phone/text/gina_callee.asm @@ -1,4 +1,4 @@ -UnknownText_0x1b626a: +GinaAnswerPhoneText: text "Hello? This is" line "@" text_ram wStringBuffer3 @@ -8,7 +8,7 @@ UnknownText_0x1b626a: line "Good morning!" done -UnknownText_0x1b6296: +GinaAnswerPhoneDayText: text "Hello? This is" line "@" text_ram wStringBuffer3 @@ -18,7 +18,7 @@ UnknownText_0x1b6296: line "Hi, how are you?" done -UnknownText_0x1b62c5: +GinaAnswerPhoneNiteText: text "Hello? This is" line "@" text_ram wStringBuffer3 @@ -28,7 +28,7 @@ UnknownText_0x1b62c5: line "Good evening!" done -UnknownText_0x1b62f1: +GinaGreetText: text "<PLAY_G>?" para "It's @" @@ -37,7 +37,7 @@ UnknownText_0x1b62f1: line "Good morning!" done -UnknownText_0x1b630e: +GinaGreetDayText: text "<PLAY_G>?" para "It's @" @@ -46,7 +46,7 @@ UnknownText_0x1b630e: line "this a bad time?" done -UnknownText_0x1b6331: +GinaGreetNiteText: text "<PLAY_G>?" para "It's @" @@ -55,7 +55,7 @@ UnknownText_0x1b6331: line "Got time to chat?" done -UnknownText_0x1b6352: +GinaGenericText: text "Are your #MON" line "still tough?" diff --git a/data/phone/text/gina_caller.asm b/data/phone/text/gina_caller.asm index eb65d3786..34bbbaedc 100644 --- a/data/phone/text/gina_caller.asm +++ b/data/phone/text/gina_caller.asm @@ -1,4 +1,4 @@ -UnknownText_0x1771fd: +GinaGettingInSyncWithMonText: text "My @" text_ram wStringBuffer4 text " and" @@ -8,7 +8,7 @@ UnknownText_0x1771fd: line "other." done -UnknownText_0x177237: +GinaDefeatedMonText: text "We battled a wild" line "@" text_ram wStringBuffer4 @@ -21,7 +21,7 @@ UnknownText_0x177237: line "the groove!" done -UnknownText_0x177297: +GinaLostAMonText: text "But, you know?" para "I still haven't" @@ -33,7 +33,7 @@ UnknownText_0x177297: line "frustrating…" done -UnknownText_0x1772e2: +GinaBattleRematchText: text "Would you be my" line "practice partner" cont "again sometime?" @@ -48,12 +48,12 @@ UnknownText_0x1772e2: cont "me next time?" done -UnknownText_0x177361: +GinaHangUpText: text "Bye! Let's chat" line "again!" done -UnknownText_0x177378: +GinaRocketTakeoverRumorText: text "Have you heard" line "about TEAM ROCKET?" @@ -65,7 +65,7 @@ UnknownText_0x177378: line "inside safe?" done -UnknownText_0x1773e7: +GinaFoundItemText: text "I picked up some-" line "thing nice today." @@ -81,7 +81,7 @@ UnknownText_0x1773e7: line "where I am." done -UnknownText_0x177465: +GinaHaventFoundAnythingYetText: text "Sorry, I haven't" line "found anything" @@ -92,7 +92,7 @@ UnknownText_0x177465: line "can have it!" done -UnknownText_0x1774c1: +GinaReminderText: text "Oh, <PLAY_G>!" line "How soon can I" @@ -105,7 +105,7 @@ UnknownText_0x1774c1: text "!" done -UnknownText_0x17750e: +GinaComePickUpText: text "I'm getting really" line "impatient, waiting" diff --git a/data/phone/text/huey_callee.asm b/data/phone/text/huey_callee.asm index 9fc78d76f..82afaad4a 100644 --- a/data/phone/text/huey_callee.asm +++ b/data/phone/text/huey_callee.asm @@ -1,4 +1,4 @@ -UnknownText_0x1b5073: +HueyAnswerPhoneText: text "Yeah, this is" line "@" text_ram wStringBuffer3 @@ -8,7 +8,7 @@ UnknownText_0x1b5073: line "<PLAYER>?" done -UnknownText_0x1b509b: +HueyAnswerPhoneDayText: text "Yeah, this is" line "@" text_ram wStringBuffer3 @@ -18,7 +18,7 @@ UnknownText_0x1b509b: line "<PLAYER>?" done -UnknownText_0x1b50c2: +HueyAnswerPhoneNiteText: text "Yeah, this is" line "@" text_ram wStringBuffer3 @@ -28,7 +28,7 @@ UnknownText_0x1b50c2: line "<PLAYER>?" done -UnknownText_0x1b50e9: +HueyGreetText: text "Yo, <PLAYER>!" line "You awake?" @@ -38,7 +38,7 @@ UnknownText_0x1b50e9: line "How's it going?" done -UnknownText_0x1b511a: +HueyGreetDayText: text "Yo, <PLAYER>! You" line "free right now?" @@ -48,7 +48,7 @@ UnknownText_0x1b511a: line "How's it going?" done -UnknownText_0x1b5154: +HueyGreetNiteText: text "Yo, <PLAYER>!" line "Were you asleep?" diff --git a/data/phone/text/huey_caller.asm b/data/phone/text/huey_caller.asm index a4822f059..b06f2be58 100644 --- a/data/phone/text/huey_caller.asm +++ b/data/phone/text/huey_caller.asm @@ -1,4 +1,4 @@ -UnknownText_0x1748ea: +HueyBattleRematchText: text "Hey, I challenge" line "you to a battle!" @@ -14,11 +14,11 @@ UnknownText_0x1748ea: line "over here pronto!" done -UnknownText_0x174962: +HueyHangUpText: text "See ya!" done -UnknownText_0x17496b: +HueyWeHaveToBattleAgainSometimeText: text "We have to battle" line "again sometime." @@ -29,7 +29,7 @@ UnknownText_0x17496b: line "till I win." done -UnknownText_0x1749c7: +HueyReminderText: text "Hey, you'd better" line "not have forgotten" cont "about our battle!" diff --git a/data/phone/text/irwin_callee.asm b/data/phone/text/irwin_callee.asm index 46bcda8b4..61a98b169 100644 --- a/data/phone/text/irwin_callee.asm +++ b/data/phone/text/irwin_callee.asm @@ -1,4 +1,4 @@ -UnknownText_0x1b638c: +IrwinAnswerPhoneText: text "Hello? @" text_ram wStringBuffer3 text_start @@ -7,7 +7,7 @@ UnknownText_0x1b638c: para "Hey, <PLAY_G>!" done -UnknownText_0x1b63a8: +IrwinAnswerPhoneDayText: text "Hello? @" text_ram wStringBuffer3 text_start @@ -16,7 +16,7 @@ UnknownText_0x1b63a8: para "Wow, <PLAY_G>!" done -UnknownText_0x1b63c4: +IrwinAnswerPhoneNiteText: text "Hello? @" text_ram wStringBuffer3 text_start @@ -25,7 +25,7 @@ UnknownText_0x1b63c4: para "Yippee, <PLAY_G>!" done -UnknownText_0x1b63e3: +IrwinGreetText: text "Uh, hello." line "<PLAY_G>?" @@ -35,7 +35,7 @@ UnknownText_0x1b63e3: text "!" done -UnknownText_0x1b6407: +IrwinGreetDayText: text "Uh, hello," line "<PLAY_G>?" @@ -45,7 +45,7 @@ UnknownText_0x1b6407: text "!" done -UnknownText_0x1b642c: +IrwinGreetNiteText: text "Uh, hello," line "<PLAY_G>?" diff --git a/data/phone/text/irwin_caller.asm b/data/phone/text/irwin_caller.asm index 552cf8259..d45646909 100644 --- a/data/phone/text/irwin_caller.asm +++ b/data/phone/text/irwin_caller.asm @@ -1,11 +1,11 @@ -UnknownText_0x64000: +IrwinHangUpText: text "I hate having to" line "hang up on you!" para "Call you later!" done -UnknownText_0x64032: +IrwinRocketTakeoverRumorText: text "<PLAY_G>, have you" line "heard?" @@ -19,7 +19,7 @@ UnknownText_0x64032: line "ROCKET?" done -UnknownText_0x64099: +IrwinPlainBadgeGossipText: text "<PLAY_G>, I heard!" para "You defeated that" @@ -29,7 +29,7 @@ UnknownText_0x64099: line "to be your friend!" done -UnknownText_0x640e6: +IrwinJasmineReturnedGossipText: text "Hey, I heard about" line "you!" @@ -46,7 +46,7 @@ UnknownText_0x640e6: line "bed with a cold!" done -UnknownText_0x6416d: +IrwinRocketHideoutGossipText: text "I heard, I heard," line "I heard!" @@ -60,7 +60,7 @@ UnknownText_0x6416d: line "TEAM ROCKET?" done -UnknownText_0x641e8: +IrwinRadioTowerGossipText: text "I heard, I heard," line "I heard!" @@ -71,7 +71,7 @@ UnknownText_0x641e8: line "rock so hard!" done -UnknownText_0x64247: +IrwinRisingBadgeGossipText: text "I saw, I saw!" para "I saw you go into" @@ -84,7 +84,7 @@ UnknownText_0x64247: line "You can't fail!" done -UnknownText_0x642bb: +IrwinEliteFourGossipText: text "Yesterday, I went" line "out to NEW BARK" @@ -113,7 +113,7 @@ UnknownText_0x642bb: line "mom, believe me!" done -UnknownText_0x643d4: +IrwinVermilionCityGossipText: text "I saw, I saw," line "I saw!" @@ -127,7 +127,7 @@ UnknownText_0x643d4: line "your backdrop!" done -UnknownText_0x64448: +IrwinTrainPassGossipText: text "I heard, I heard!" para "You got a MAGNET" @@ -155,7 +155,7 @@ UnknownText_0x64448: line "by FLY?" done -UnknownText_0x6455b: +IrwinSnorlaxGossipText: text "I saw, I saw!" para "You waking up" @@ -174,7 +174,7 @@ UnknownText_0x6455b: line "magic!" done -UnknownText_0x645ff: +IrwinMtSilverGossipText: text "I hear rumors" line "about you all over" cont "the place." @@ -200,7 +200,7 @@ IrwinCalledRightAwayText: line "good friends!" done -UnknownText_0x646df: +IrwinFogBadgeGossipText: text "I saw, I heard!" para "You beat MORTY of" @@ -225,7 +225,7 @@ UnknownText_0x646df: line "took off for home…" done -UnknownText_0x647d8: +IrwinMarshBadgeGossipText: text "<PLAY_G>, I heard!" para "You're kicking up" @@ -240,7 +240,7 @@ UnknownText_0x647d8: para "You so rock!" done -UnknownText_0x64846: +IrwinYourEscapadesRockText: text "Hearing about your" line "escapades rocks my" @@ -248,7 +248,7 @@ UnknownText_0x64846: line "It sure does!" done -UnknownText_0x64881: +IrwinGoodMatchText: text "I'm so glad you" line "called!" @@ -259,7 +259,7 @@ UnknownText_0x64881: line "a good match!" done -UnknownText_0x648dc: +IrwinSoMuchToChatAboutText: text "How are you?" para "What are you" diff --git a/data/phone/text/jack_callee.asm b/data/phone/text/jack_callee.asm index 18c0ec1a4..2559c62fa 100644 --- a/data/phone/text/jack_callee.asm +++ b/data/phone/text/jack_callee.asm @@ -1,4 +1,4 @@ -UnknownText_0x1b4dc5: +JackAnswerPhoneText: text "Hello. This is" line "@" text_ram wStringBuffer3 @@ -8,7 +8,7 @@ UnknownText_0x1b4dc5: line "<PLAY_G>!" done -UnknownText_0x1b4ded: +JackAnswerPhoneDayText: text "Hello. This is" line "@" text_ram wStringBuffer3 @@ -18,7 +18,7 @@ UnknownText_0x1b4ded: line "<PLAY_G>?" done -UnknownText_0x1b4e16: +JackAnswerPhoneNiteText: text "Hello. This is" line "@" text_ram wStringBuffer3 @@ -28,7 +28,7 @@ UnknownText_0x1b4e16: line "<PLAY_G>!" done -UnknownText_0x1b4e3e: +JackGreetText: text "<PLAY_G>, good" line "morning!" @@ -38,7 +38,7 @@ UnknownText_0x1b4e3e: line "How are you doing?" done -UnknownText_0x1b4e72: +JackGreetDayText: text "<PLAY_G>, howdy!" para "It's me, @" @@ -47,7 +47,7 @@ UnknownText_0x1b4e72: line "Isn't it nice out?" done -UnknownText_0x1b4e9e: +JackGreetNiteText: text "<PLAY_G>, good" line "evening!" @@ -57,7 +57,7 @@ UnknownText_0x1b4e9e: line "Got a minute?" done -UnknownText_0x1b4ecd: +JackGenericText: text "How are your" line "#MON doing?" diff --git a/data/phone/text/jack_caller.asm b/data/phone/text/jack_caller.asm index 671097a34..92299d326 100644 --- a/data/phone/text/jack_caller.asm +++ b/data/phone/text/jack_caller.asm @@ -1,4 +1,4 @@ -JackIntelligenceText: +JackIntelligenceKeepsRisingText: text "My @" text_ram wStringBuffer4 text "'s" @@ -21,7 +21,7 @@ JackDefeatedMonText: cont "starting to help." done -UnknownText_0x174165: +JackLostAMonText: text "Oh, and listen." line "I missed catching" @@ -37,7 +37,7 @@ UnknownText_0x174165: line "caught it…" done -UnknownText_0x1741e1: +JackBattleRematchText: text "Do you want to" line "battle? I'll show" @@ -53,7 +53,7 @@ UnknownText_0x1741e1: line "you're nearby." done -UnknownText_0x174251: +JackHangUpText: text "See you later!" done @@ -165,7 +165,7 @@ JackRainDanceTriviaText: line "than usual." done -UnknownText_0x1745c2: +JackHeardSomeGreatTipsText: text "My friend heard" line "some great tips." @@ -177,7 +177,7 @@ UnknownText_0x1745c2: cont "away and tell you." done -UnknownText_0x174638: +JackReminderText: text "Hey, <PLAY_G>!" para "Do you remember" diff --git a/data/phone/text/joey_callee.asm b/data/phone/text/joey_callee.asm index c86ba29fc..7bbe3397d 100644 --- a/data/phone/text/joey_callee.asm +++ b/data/phone/text/joey_callee.asm @@ -1,4 +1,4 @@ -UnknownText_0x1b589a: +JoeyAnswerPhoneText: text "Hi, @" text_ram wStringBuffer3 text " here!" @@ -7,7 +7,7 @@ UnknownText_0x1b589a: line "doing well?" done -UnknownText_0x1b58c2: +JoeyAnswerPhoneDayText: text "Hi, @" text_ram wStringBuffer3 text " here!" @@ -16,7 +16,7 @@ UnknownText_0x1b58c2: line "doing well?" done -UnknownText_0x1b58ea: +JoeyAnswerPhoneNiteText: text "Hi, @" text_ram wStringBuffer3 text " here!" @@ -25,7 +25,7 @@ UnknownText_0x1b58ea: line "doing well?" done -UnknownText_0x1b5912: +JoeyGreetText: text "Yo, <PLAYER>!" line "How're you doing?" @@ -35,7 +35,7 @@ UnknownText_0x1b5912: line "got a minute?" done -UnknownText_0x1b5948: +JoeyGreetDayText: text "Yo, <PLAYER>! How's" line "it going?" @@ -45,7 +45,7 @@ UnknownText_0x1b5948: line "Got a minute?" done -UnknownText_0x1b597c: +JoeyGreetNiteText: text "Yo, <PLAYER>!" line "How're you doing?" @@ -55,7 +55,7 @@ UnknownText_0x1b597c: line "got a minute?" done -UnknownText_0x1b59b2: +JoeyGenericText: text "How are your" line "#MON doing?" diff --git a/data/phone/text/joey_caller.asm b/data/phone/text/joey_caller.asm index dcf1dfd71..07704fd28 100644 --- a/data/phone/text/joey_caller.asm +++ b/data/phone/text/joey_caller.asm @@ -1,4 +1,4 @@ -JoeySharperText: +JoeyMonLookingSharperText: text "My @" text_ram wStringBuffer4 text "'s" @@ -12,7 +12,7 @@ JoeySharperText: line "party!" done -UnknownText_0x175591: +JoeyDefeatedMonText: text "Oh yeah, I took" line "down a @" text_ram wStringBuffer4 @@ -27,7 +27,7 @@ UnknownText_0x175591: line "us being so tough." done -UnknownText_0x175611: +JoeyLostAMonText: text "Oh yeah, I saw a" line "wild @" text_ram wStringBuffer4 @@ -43,7 +43,7 @@ UnknownText_0x175611: line "extreme end." done -UnknownText_0x175693: +JoeyBattleRematchText: text "Let's get together" line "and battle!" @@ -59,11 +59,11 @@ UnknownText_0x175693: line "when you come." done -UnknownText_0x17570a: +JoeyHangUpText: text "All right. Later!" done -UnknownText_0x17571d: +JoeyDevisingStrategiesText: text "I'm checking out" line "@" text_ram wStringBuffer4 @@ -77,7 +77,7 @@ UnknownText_0x17571d: cont "let's battle!" done -UnknownText_0x175786: +JoeyReminderText: text "What's keeping" line "you, <PLAYER>!" diff --git a/data/phone/text/jose_callee.asm b/data/phone/text/jose_callee.asm index c476d431b..01ae5f5a2 100644 --- a/data/phone/text/jose_callee.asm +++ b/data/phone/text/jose_callee.asm @@ -1,4 +1,4 @@ -UnknownText_0x1b55ae: +JoseAnswerPhoneText: text "Hello, this is" line "@" text_ram wStringBuffer3 @@ -8,7 +8,7 @@ UnknownText_0x1b55ae: line "Good morning!" done -UnknownText_0x1b55da: +JoseAnswerPhoneDayText: text "Hello, this is" line "@" text_ram wStringBuffer3 @@ -17,7 +17,7 @@ UnknownText_0x1b55da: para "Oh, <PLAY_G>? Hi!" done -UnknownText_0x1b55fc: +JoseAnswerPhoneNiteText: text "Hello, this is" line "@" text_ram wStringBuffer3 @@ -27,7 +27,7 @@ UnknownText_0x1b55fc: line "Good evening!" done -UnknownText_0x1b5628: +JoseGreetText: text "Oh, <PLAY_G>?" para "Tweet! Yeah, it's" @@ -36,7 +36,7 @@ UnknownText_0x1b5628: text "." done -UnknownText_0x1b564c: +JoseGreetDayText: text "Oh, <PLAY_G>?" para "Tweet! Yeah, it's" @@ -45,7 +45,7 @@ UnknownText_0x1b564c: text "." done -UnknownText_0x1b5670: +JoseGreetNiteText: text "Oh, <PLAY_G>?" para "Tweet! Yeah, it's" @@ -54,7 +54,7 @@ UnknownText_0x1b5670: text "." done -UnknownText_0x1b5694: +JoseGenericText: text "Are your #MON" line "still cooking?" diff --git a/data/phone/text/jose_caller.asm b/data/phone/text/jose_caller.asm index 33d022855..7ab165359 100644 --- a/data/phone/text/jose_caller.asm +++ b/data/phone/text/jose_caller.asm @@ -1,4 +1,4 @@ -JoseAromaText: +JoseMonsStickHasADeliciousAromaText: text "Hey listen, my" line "@" text_ram wStringBuffer4 @@ -11,7 +11,7 @@ JoseAromaText: line "appetite going!" done -UnknownText_0x174f90: +JoseDefeatedMonText: text "A while ago, my" line "FARFETCH'D KO'd" cont "this @" @@ -25,7 +25,7 @@ UnknownText_0x174f90: line "Amazing stuff!" done -UnknownText_0x174ffd: +JoseLostAMonText: text "I ran into a wild" line "@" text_ram wStringBuffer4 @@ -41,7 +41,7 @@ UnknownText_0x174ffd: line "bit disappointing." done -UnknownText_0x17507d: +JoseBattleRematchText: text "Want to battle" line "again?" @@ -60,11 +60,11 @@ UnknownText_0x17507d: line "for me, OK?" done -UnknownText_0x175106: +JoseHangUpText: text "Be seeing you!" done -JoseFoundSomethingText: +JoseFoundItemText: text "My FARFETCH'D had" line "something pretty" cont "in its beak." @@ -81,7 +81,7 @@ JoseFoundSomethingText: line "have it." done -UnknownText_0x17519b: +JoseHaventGottenItemYetText: text "I haven't gotten" line "what I promised" cont "you yet." @@ -93,7 +93,7 @@ UnknownText_0x17519b: line "a little longer?" done -UnknownText_0x17520a: +JoseReminderText: text "<PLAY_G>, could you" line "hurry over?" @@ -114,7 +114,7 @@ UnknownText_0x17520a: line "soon as you can!" done -UnknownText_0x17529c: +JoseComePickUpText: text "What's wrong?" para "Don't you want" diff --git a/data/phone/text/kenji_callee.asm b/data/phone/text/kenji_callee.asm index e108aa778..94adbb264 100644 --- a/data/phone/text/kenji_callee.asm +++ b/data/phone/text/kenji_callee.asm @@ -1,4 +1,4 @@ -UnknownText_0x1b730b: +KenjiAnswerPhoneText: text_ram wStringBuffer3 text " here…" @@ -6,7 +6,7 @@ UnknownText_0x1b730b: line "morning, hey?" done -UnknownText_0x1b7331: +KenjiAnswerPhoneDayText: text_ram wStringBuffer3 text " here…" @@ -14,7 +14,7 @@ UnknownText_0x1b7331: line "weather, hey?" done -UnknownText_0x1b7357: +KenjiAnswerPhoneNiteText: text_ram wStringBuffer3 text " here…" @@ -22,21 +22,21 @@ UnknownText_0x1b7357: line "moonlight, hey?" done -UnknownText_0x1b737f: +KenjiGreetText: text "Hey, <PLAYER>!" line "This is @" text_ram wStringBuffer3 text "!" done -UnknownText_0x1b7397: +KenjiGreetDayText: text "Hey, <PLAYER>!" line "This is @" text_ram wStringBuffer3 text "!" done -UnknownText_0x1b73af: +KenjiGreetNiteText: text "Hey, <PLAYER>!" line "This is @" text_ram wStringBuffer3 diff --git a/data/phone/text/kenji_caller.asm b/data/phone/text/kenji_caller.asm index d0f527d3b..52eba3a8f 100644 --- a/data/phone/text/kenji_caller.asm +++ b/data/phone/text/kenji_caller.asm @@ -1,9 +1,9 @@ -UnknownText_0x66dab: +KenjiHangUpText: text "Anyway, we'll chat" line "again!" done -UnknownText_0x66dc5: +KenjiRemainDedicatedText: text "Are you still on" line "your journey?" @@ -13,7 +13,7 @@ UnknownText_0x66dc5: para "Oooooaaarrrgh!" done -UnknownText_0x66e17: +KenjiCallMeBackAnotherTimeText: text "I'm in training" line "now. I apologize," @@ -23,7 +23,7 @@ UnknownText_0x66e17: para "Oooooaaarrrgh!" done -UnknownText_0x66e67: +KenjiIllHaveTimeToChatTomorrowText: text "I apologize, but I" line "don't have time to" @@ -36,7 +36,7 @@ UnknownText_0x66e67: para "Yiiihah!" done -UnknownText_0x66ed3: +KenjiHangUpMorningText: text "I plan to take a" line "lunch break, so" @@ -44,7 +44,7 @@ UnknownText_0x66ed3: line "Ayiiiyah!" done -KenjiBreakText: +KenjiTakingABreakText: text "I'm taking a break" line "on ROUTE 45!" @@ -52,7 +52,7 @@ KenjiBreakText: line "you are free?" done -UnknownText_0x66f52: +KenjiHangUpNightText: text "I rested up over" line "my lunch break." diff --git a/data/phone/text/liz_callee.asm b/data/phone/text/liz_callee.asm index 93ea88923..57d3c95bb 100644 --- a/data/phone/text/liz_callee.asm +++ b/data/phone/text/liz_callee.asm @@ -1,4 +1,4 @@ -UnknownText_0x1b5d9f: +LizAnswerPhoneText: text "Hello, @" text_ram wStringBuffer3 text_start @@ -8,7 +8,7 @@ UnknownText_0x1b5d9f: line "Good morning." done -UnknownText_0x1b5dcc: +LizAnswerPhoneDayText: text "Hello, @" text_ram wStringBuffer3 text_start @@ -18,7 +18,7 @@ UnknownText_0x1b5dcc: line "How are you?" done -UnknownText_0x1b5df8: +LizAnswerPhoneNiteText: text "Hello, @" text_ram wStringBuffer3 text_start @@ -28,7 +28,7 @@ UnknownText_0x1b5df8: line "Good evening." done -UnknownText_0x1b5e25: +LizGreetText: text "Good morning," line "<PLAY_G>." @@ -38,7 +38,7 @@ UnknownText_0x1b5e25: line "Were you sleeping?" done -UnknownText_0x1b5e59: +LizGreetDayText: text "Hi, <PLAY_G>." line "This is @" text_ram wStringBuffer3 @@ -48,7 +48,7 @@ UnknownText_0x1b5e59: line "going for you?" done -UnknownText_0x1b5e8e: +LizGreetNiteText: text "Good evening," line "<PLAY_G>." @@ -58,7 +58,7 @@ UnknownText_0x1b5e8e: line "Are you awake?" done -UnknownText_0x1b5ebe: +LizGenericText: text "I had some time," line "so I called you." diff --git a/data/phone/text/liz_caller.asm b/data/phone/text/liz_caller.asm index f0c7a7025..b9dc1a00b 100644 --- a/data/phone/text/liz_caller.asm +++ b/data/phone/text/liz_caller.asm @@ -1,4 +1,4 @@ -UnknownText_0x175fda: +LizMonAlwaysWantsToNuzzleText: text "Oh, you have to" line "hear this." @@ -11,7 +11,7 @@ UnknownText_0x175fda: line "nuzzle me!" done -UnknownText_0x17602d: +LizDefeatedMonText: text "And, and! Um…" para "We beat a wild" @@ -26,7 +26,7 @@ UnknownText_0x17602d: line "it, though." done -UnknownText_0x176095: +LizLostAMonText: text "And, and! Uh…" para "We just saw a" @@ -42,7 +42,7 @@ UnknownText_0x176095: line "really angry!" done -UnknownText_0x17610a: +LizBattleRematchText: text "Hi! Do you have" line "some free time?" @@ -61,7 +61,7 @@ UnknownText_0x17610a: line "you get here!" done -LizHiTaniaText: +LizWrongNumberText: text "Hi, TANIA. How are" line "you? This is LIZ." @@ -72,12 +72,12 @@ LizHiTaniaText: line "Oops! Sorry!" done -UnknownText_0x17620a: +LizHangUpText: text "OK, I'll call you" line "later!" done -UnknownText_0x176223: +LizRuinsOfAlphGossipText: text "Listen, listen!" para "I was listening to" @@ -93,7 +93,7 @@ UnknownText_0x176223: line "was. So strange!" done -UnknownText_0x1762c3: +LizFalknerGossipText: text "Listen, listen!" para "Don't you think" @@ -115,7 +115,7 @@ UnknownText_0x1762c3: line "meet him!" done -UnknownText_0x17638a: +LizEarlGossipText: text "Listen, listen!" para "Do you know EARL," @@ -131,7 +131,7 @@ UnknownText_0x17638a: line "was wildly funny!" done -UnknownText_0x176424: +LizSurfPikachuGossipText: text "Listen, listen!" para "I collect #MON" @@ -151,7 +151,7 @@ UnknownText_0x176424: cont "you had one." done -UnknownText_0x1764eb: +LizMooMooMilkGossipText: text "Listen, listen!" para "Do you know about" @@ -170,7 +170,7 @@ UnknownText_0x1764eb: line "it's delicious!" done -UnknownText_0x176599: +LizSalonGossipText: text "Listen, listen!" para "There's a #MON" @@ -198,7 +198,7 @@ UnknownText_0x176599: line "whom I should use…" done -UnknownText_0x1766ac: +LizWhitneyGossipText: text "Listen, listen!" para "GOLDENROD GYM's" @@ -215,7 +215,7 @@ UnknownText_0x1766ac: line "totally talented." done -UnknownText_0x17674f: +LizBugCatchingContestGossipText: text "Listen, listen!" para "Have you ever" @@ -236,7 +236,7 @@ UnknownText_0x17674f: cont "that great?" done -UnknownText_0x176816: +LizBeautifulMonGossipText: text "Listen, listen!" para "I saw a beautiful" @@ -251,7 +251,7 @@ UnknownText_0x176816: text " too." done -UnknownText_0x17686d: +LizForgotGossipText: text "Listen, listen!" para "Uh… Um… Whoops!" @@ -260,7 +260,7 @@ UnknownText_0x17686d: line "was going to say!" done -UnknownText_0x1768b0: +LizFawningOverMonText: text "Listen, listen!" para "My @" @@ -294,7 +294,7 @@ UnknownText_0x1768b0: line "I love chatting!" done -UnknownText_0x1769da: +LizReminderText: text "I've got too much" line "time on my hands!" diff --git a/data/phone/text/parry_callee.asm b/data/phone/text/parry_callee.asm index 247566b54..6258bf690 100644 --- a/data/phone/text/parry_callee.asm +++ b/data/phone/text/parry_callee.asm @@ -1,4 +1,4 @@ -UnknownText_0x1b73c7: +ParryAnswerPhoneText: text "Yup, yup!" line "It's @" text_ram wStringBuffer3 @@ -8,7 +8,7 @@ UnknownText_0x1b73c7: line "<PLAY_G>!" done -UnknownText_0x1b73ef: +ParryAnswerPhoneDayText: text "Yup, yup!" line "It's @" text_ram wStringBuffer3 @@ -18,7 +18,7 @@ UnknownText_0x1b73ef: line "<PLAY_G>!" done -UnknownText_0x1b7417: +ParryAnswerPhoneNiteText: text "Yup, yup!" line "It's @" text_ram wStringBuffer3 @@ -28,7 +28,7 @@ UnknownText_0x1b7417: line "<PLAY_G>!" done -UnknownText_0x1b743f: +ParryGreetText: text "<PLAY_G>, it's" line "@" text_ram wStringBuffer3 @@ -38,7 +38,7 @@ UnknownText_0x1b743f: line "proper breakfast?" done -UnknownText_0x1b746f: +ParryGreetDayText: text "<PLAY_G>, it's" line "@" text_ram wStringBuffer3 @@ -48,7 +48,7 @@ UnknownText_0x1b746f: line "proper lunch?" done -UnknownText_0x1b749b: +ParryGreetNiteText: text "<PLAY_G>, it's" line "@" text_ram wStringBuffer3 @@ -58,7 +58,7 @@ UnknownText_0x1b749b: line "proper dinner?" done -UnknownText_0x1b74c8: +ParryGenericText: text "Are your #MON" line "looking good?" diff --git a/data/phone/text/parry_caller.asm b/data/phone/text/parry_caller.asm index ca20b1c2c..090b8e0d9 100644 --- a/data/phone/text/parry_caller.asm +++ b/data/phone/text/parry_caller.asm @@ -1,11 +1,11 @@ -ParryNoMatchText: +ParryNothingCanMatchText: text "Nothing can match" line "my @" text_ram wStringBuffer4 text " now." done -UnknownText_0x66fc0: +ParryDefeatedMonText: text "Yeah, we KO'd a" line "wild @" text_ram wStringBuffer4 @@ -15,7 +15,7 @@ UnknownText_0x66fc0: line "wanted to get it…" done -UnknownText_0x67001: +ParryLostAMonText: text "And yesterday, we" line "spotted a wild" @@ -34,7 +34,7 @@ UnknownText_0x67001: line "How about that!" done -UnknownText_0x67096: +ParryBattleRematchText: text "You're thinking" line "you'd like to" @@ -47,7 +47,7 @@ UnknownText_0x67096: text "!" done -UnknownText_0x670eb: +ParryHangUpText: text "OK, give me a call" line "again!" done diff --git a/data/phone/text/ralph_callee.asm b/data/phone/text/ralph_callee.asm index cbb647cd7..ec6da0199 100644 --- a/data/phone/text/ralph_callee.asm +++ b/data/phone/text/ralph_callee.asm @@ -1,4 +1,4 @@ -UnknownText_0x1b5c10: +RalphAnswerPhoneText: text "Yes? Ah, <PLAY_G>." para "You're courteous" @@ -8,7 +8,7 @@ UnknownText_0x1b5c10: line "call on the phone." done -UnknownText_0x1b5c63: +RalphAnswerPhoneDayText: text "Yes? Ah, <PLAY_G>." para "You're courteous" @@ -18,7 +18,7 @@ UnknownText_0x1b5c63: line "call on the phone." done -UnknownText_0x1b5cb6: +RalphAnswerPhoneNiteText: text "Yes? Ah, <PLAY_G>." para "You're courteous" @@ -28,28 +28,28 @@ UnknownText_0x1b5cb6: line "call on the phone." done -UnknownText_0x1b5d09: +RalphGreetText: text "Hiya, it's Uncle" line "@" text_ram wStringBuffer3 text "." done -UnknownText_0x1b5d21: +RalphGreetDayText: text "Hiya, it's Uncle" line "@" text_ram wStringBuffer3 text "." done -UnknownText_0x1b5d39: +RalphGreetNiteText: text "Hiya, it's Uncle" line "@" text_ram wStringBuffer3 text "." done -UnknownText_0x1b5d51: +RalphGenericText: text "Are you taking" line "good care of your" diff --git a/data/phone/text/ralph_caller.asm b/data/phone/text/ralph_caller.asm index f890be10f..667ee1896 100644 --- a/data/phone/text/ralph_caller.asm +++ b/data/phone/text/ralph_caller.asm @@ -11,7 +11,7 @@ RalphNeglectingKidsText: line "actually." done -UnknownText_0x175c24: +RalphDefeatedMonText: text "I just beat a wild" line "@" text_ram wStringBuffer4 @@ -27,7 +27,7 @@ UnknownText_0x175c24: line "cocky…" done -UnknownText_0x175c9f: +RalphLostAMonText: text "Yesterday a wild" line "@" text_ram wStringBuffer4 @@ -46,7 +46,7 @@ UnknownText_0x175c9f: line "made my day!" done -UnknownText_0x175d40: +RalphBattleRematchText: text "What do you say to" line "a battle with me?" @@ -62,12 +62,12 @@ UnknownText_0x175d40: line "the spot!" done -UnknownText_0x175db7: +RalphHangUpText: text "You call your mom" line "sometimes too!" done -UnknownText_0x175dd9: +RalphItemText: text "Listen, I… Yowch!" para "Uh, sorry! See," @@ -96,7 +96,7 @@ UnknownText_0x175dd9: line "to fish!" done -UnknownText_0x175eaf: +RalphNoItemText: text "Yeah, I know." para "You're looking for" @@ -107,7 +107,7 @@ UnknownText_0x175eaf: cont "MAGIKARP, though…" done -UnknownText_0x175f11: +RalphReminderText: text "So where are you?" line "I'm waiting for" @@ -120,7 +120,7 @@ UnknownText_0x175f11: line "your elders wait!" done -UnknownText_0x175f70: +RalphHurryText: text "Hey, what's the" line "matter with you?" diff --git a/data/phone/text/reena_callee.asm b/data/phone/text/reena_callee.asm index 980ced9da..e1a880bb5 100644 --- a/data/phone/text/reena_callee.asm +++ b/data/phone/text/reena_callee.asm @@ -1,4 +1,4 @@ -UnknownText_0x1b5702: +ReenaAnswerPhoneText: text "Hello, this is" line "@" text_ram wStringBuffer3 @@ -8,7 +8,7 @@ UnknownText_0x1b5702: line "What's up?" done -UnknownText_0x1b572e: +ReenaAnswerPhoneDayText: text "Hello, this is" line "@" text_ram wStringBuffer3 @@ -18,7 +18,7 @@ UnknownText_0x1b572e: line "what's up?" done -UnknownText_0x1b575a: +ReenaAnswerPhoneNiteText: text "Hello, this is" line "@" text_ram wStringBuffer3 @@ -28,7 +28,7 @@ UnknownText_0x1b575a: line "what's up?" done -UnknownText_0x1b5786: +ReenaGreetText: text "You're slow! Hurry" line "up and answer!" @@ -37,7 +37,7 @@ UnknownText_0x1b5786: text "!" done -UnknownText_0x1b57b7: +ReenaGreetDayText: text "You're slow! Hurry" line "up and answer!" @@ -46,7 +46,7 @@ UnknownText_0x1b57b7: text "!" done -UnknownText_0x1b57e8: +ReenaGreetNiteText: text "You're slow! Hurry" line "up and answer!" @@ -55,7 +55,7 @@ UnknownText_0x1b57e8: text "!" done -UnknownText_0x1b5819: +ReenaGenericText: text "Hey, how are your" line "#MON doing?" diff --git a/data/phone/text/reena_caller.asm b/data/phone/text/reena_caller.asm index 815e2f596..59bb71c84 100644 --- a/data/phone/text/reena_caller.asm +++ b/data/phone/text/reena_caller.asm @@ -1,4 +1,4 @@ -UnknownText_0x1752f5: +ReenaMonsIsAPerfectMatchText: text "Listen, dear…" para "Do you recall my" @@ -16,7 +16,7 @@ UnknownText_0x1752f5: cont "match for me?" done -UnknownText_0x17536b: +ReenaDefeatedMonText: text "Have I ever faced" line "a wild @" text_ram wStringBuffer4 @@ -31,7 +31,7 @@ UnknownText_0x17536b: cont "occasions!" done -UnknownText_0x1753c5: +ReenaLostAMonText: text "Have I ever failed" line "to catch a wild" cont "#MON?" @@ -47,7 +47,7 @@ UnknownText_0x1753c5: line "Oh! Never mind!" done -UnknownText_0x17543a: +ReenaBattleRematchText: text "We are going to" line "battle!" @@ -60,11 +60,11 @@ UnknownText_0x17543a: line "wait! Got it?" done -UnknownText_0x175488: +ReenaHangUpText: text "Fine, you may go." done -UnknownText_0x17549b: +ReenaForwardText: text "Don't be too proud" line "just because you" @@ -74,7 +74,7 @@ UnknownText_0x17549b: para "It was a fluke!" done -UnknownText_0x1754e5: +ReenaHurryText: text "What are you" line "doing?" diff --git a/data/phone/text/tiffany_callee.asm b/data/phone/text/tiffany_callee.asm index 1bac8dc73..3b6becf97 100644 --- a/data/phone/text/tiffany_callee.asm +++ b/data/phone/text/tiffany_callee.asm @@ -1,4 +1,4 @@ -UnknownText_0x1b6e7c: +TiffanyAnswerPhoneText: text "Yes? This is" line "@" text_ram wStringBuffer3 @@ -8,7 +8,7 @@ UnknownText_0x1b6e7c: line "Good morning." done -UnknownText_0x1b6ea6: +TiffanyAnswerPhoneDayText: text "Yes? This is" line "@" text_ram wStringBuffer3 @@ -18,7 +18,7 @@ UnknownText_0x1b6ea6: line "Hello." done -UnknownText_0x1b6ec9: +TiffanyAnswerPhoneNiteText: text "Yes? This is" line "@" text_ram wStringBuffer3 @@ -28,7 +28,7 @@ UnknownText_0x1b6ec9: line "evening." done -UnknownText_0x1b6ef3: +TiffanyGreetText: text "Is this <PLAY_G>?" para "Good morning. This" @@ -37,7 +37,7 @@ UnknownText_0x1b6ef3: text "." done -UnknownText_0x1b6f1c: +TiffanyGreetDayText: text "Is this <PLAY_G>?" para "Hi, it's @" @@ -45,7 +45,7 @@ UnknownText_0x1b6f1c: text "." done -UnknownText_0x1b6f37: +TiffanyGreetNiteText: text "Is this <PLAY_G>?" para "Good evening. This" @@ -54,7 +54,7 @@ UnknownText_0x1b6f37: text "." done -UnknownText_0x1b6f60: +TiffanyGenericText: text "Are your #MON" line "doing well?" diff --git a/data/phone/text/tiffany_caller.asm b/data/phone/text/tiffany_caller.asm index 220d4ef3c..a10fe07b9 100644 --- a/data/phone/text/tiffany_caller.asm +++ b/data/phone/text/tiffany_caller.asm @@ -1,4 +1,4 @@ -UnknownText_0x665ad: +TiffanyMonIsAdorableText: text "My @" text_ram wStringBuffer4 text "'s" @@ -11,7 +11,7 @@ UnknownText_0x665ad: line "fluffy and warm!" done -UnknownText_0x66605: +TiffanyDefeatedMonText: text "Oh, and we had to" line "battle a wild" @@ -31,7 +31,7 @@ UnknownText_0x66605: text "!" done -UnknownText_0x66688: +TiffanyLostAMonText: text "Oh, and we had to" line "battle a wild" @@ -51,7 +51,7 @@ UnknownText_0x66688: cont "of my CLEFAIRY." done -UnknownText_0x66730: +TiffanyBattleRematchText: text "I know this might" line "surprise you, but" @@ -81,11 +81,11 @@ TiffanyItsAwfulText: line "Bye-bye!" done -UnknownText_0x667f7: +TiffanyHangUpText: text "Bye-bye!" done -UnknownText_0x66801: +TiffanyFoundItemText: text "I bought some PINK" line "BOWS at GOLDENROD" @@ -101,12 +101,12 @@ UnknownText_0x66801: text "." done -UnknownText_0x66882: +TiffanyNoItemText: text "I love dressing up" line "my CLEFAIRY!" done -UnknownText_0x668a3: +TiffanyAsleepText: text "What's wrong?" line "Can't you visit?" @@ -122,7 +122,7 @@ UnknownText_0x668a3: text "!" done -UnknownText_0x6691d: +TiffanyHurryText: text "What's wrong?" line "Can't you visit?" diff --git a/data/phone/text/todd_callee.asm b/data/phone/text/todd_callee.asm index f795d29c2..9ba4931ad 100644 --- a/data/phone/text/todd_callee.asm +++ b/data/phone/text/todd_callee.asm @@ -1,4 +1,4 @@ -UnknownText_0x1b60f5: +ToddAnswerPhoneText: text "Yes? This is" line "@" text_ram wStringBuffer3 @@ -7,7 +7,7 @@ UnknownText_0x1b60f5: para "Hey, <PLAY_G>!" done -UnknownText_0x1b611b: +ToddAnswerPhoneDayText: text "Yes? This is" line "@" text_ram wStringBuffer3 @@ -17,7 +17,7 @@ UnknownText_0x1b611b: line "<PLAY_G>." done -UnknownText_0x1b6149: +ToddAnswerPhoneNiteText: text "Yes? This is" line "@" text_ram wStringBuffer3 @@ -26,7 +26,7 @@ UnknownText_0x1b6149: para "Ah, <PLAY_G>!" done -UnknownText_0x1b616e: +ToddGreetText: text "Hello, this is" line "@" text_ram wStringBuffer3 @@ -35,7 +35,7 @@ UnknownText_0x1b616e: para "<PLAY_G>, right?" done -UnknownText_0x1b618f: +ToddGreetDayText: text "Hello, this is" line "@" text_ram wStringBuffer3 @@ -45,7 +45,7 @@ UnknownText_0x1b618f: line "you doing?" done -UnknownText_0x1b61bd: +ToddGreetNiteText: text "Hello, this is" line "@" text_ram wStringBuffer3 @@ -55,7 +55,7 @@ UnknownText_0x1b61bd: line "call you so late." done -UnknownText_0x1b61f2: +ToddGenericText: text "How do you raise" line "your #MON?" diff --git a/data/phone/text/todd_caller.asm b/data/phone/text/todd_caller.asm index 3b647d1b5..d713b8aa3 100644 --- a/data/phone/text/todd_caller.asm +++ b/data/phone/text/todd_caller.asm @@ -8,7 +8,7 @@ ToddLooksCuteLikeMeText: line "getting cuter!" done -UnknownText_0x176e9c: +ToddDefeatedMonText: text "And, you know?" para "Now we can KO" @@ -20,7 +20,7 @@ UnknownText_0x176e9c: line "the GOLDENROD GYM." done -UnknownText_0x176eee: +ToddLostAMonText: text "And, you know?" line "We just failed to" @@ -36,7 +36,7 @@ UnknownText_0x176eee: line "yet…" done -UnknownText_0x176f60: +ToddBattleRematchText: text "You must be a lot" line "better now, huh?" @@ -52,11 +52,11 @@ UnknownText_0x176f60: text "." done -UnknownText_0x176fdb: +ToddHangUpText: text "See you later!" done -UnknownText_0x176feb: +ToddDepartmentStoreBargainSaleText: text "This is it--the" line "one we've all been" cont "waiting for!" @@ -82,7 +82,7 @@ UnknownText_0x176feb: cont "soon as you can!" done -UnknownText_0x1770fb: +ToddSavingUpForBargainSaleText: text "I'm saving up for" line "the next bargain" @@ -90,7 +90,7 @@ UnknownText_0x1770fb: line "next one?" done -UnknownText_0x177138: +ToddLookingForwardToBattleText: text "Where are you?" para "Let's have our" @@ -102,7 +102,7 @@ UnknownText_0x177138: text "." done -UnknownText_0x17717c: +ToddHaveYouGoneToDepartmentStoreText: text "Haven't you gone" line "to GOLDENROD DEPT." diff --git a/data/phone/text/tully_callee.asm b/data/phone/text/tully_callee.asm index 9156cd1e6..92b3fb5a0 100644 --- a/data/phone/text/tully_callee.asm +++ b/data/phone/text/tully_callee.asm @@ -1,4 +1,4 @@ -UnknownText_0x1b6b39: +TullyAnswerPhoneText: text "Hello, this is" line "@" text_ram wStringBuffer3 @@ -8,7 +8,7 @@ UnknownText_0x1b6b39: line "<PLAY_G>." done -UnknownText_0x1b6b65: +TullyAnswerPhoneDayText: text "Hello, this is" line "@" text_ram wStringBuffer3 @@ -18,7 +18,7 @@ UnknownText_0x1b6b65: line "<PLAY_G>, right?" done -UnknownText_0x1b6b92: +TullyAnswerPhoneNiteText: text "Hello, this is" line "@" text_ram wStringBuffer3 @@ -28,7 +28,7 @@ UnknownText_0x1b6b92: line "<PLAY_G>!" done -UnknownText_0x1b6bb9: +TullyGreetText: text "Hello!" line "@" text_ram wStringBuffer3 @@ -38,7 +38,7 @@ UnknownText_0x1b6bb9: line "weather's great!" done -UnknownText_0x1b6bef: +TullyGreetDayText: text "Hello!" line "@" text_ram wStringBuffer3 @@ -48,7 +48,7 @@ UnknownText_0x1b6bef: line "for fishing!" done -UnknownText_0x1b6c23: +TullyGreetNiteText: text "Hello!" line "@" text_ram wStringBuffer3 @@ -58,7 +58,7 @@ UnknownText_0x1b6c23: line "for fishing!" done -UnknownText_0x1b6c56: +TullyGenericText: text "How's your trip" line "coming along?" diff --git a/data/phone/text/tully_caller.asm b/data/phone/text/tully_caller.asm index cf1fc5d23..727c31a4a 100644 --- a/data/phone/text/tully_caller.asm +++ b/data/phone/text/tully_caller.asm @@ -1,4 +1,4 @@ -TullyGrownText: +TullyMonHasGrownText: text "My @" text_ram wStringBuffer4 text " has" @@ -11,7 +11,7 @@ TullyGrownText: line "it's way bigger." done -UnknownText_0x65e42: +TullyDefeatedMonText: text "Oh yeah, I KO'd a" line "wild @" text_ram wStringBuffer4 @@ -25,7 +25,7 @@ UnknownText_0x65e42: cont "the phone…" done -UnknownText_0x65eac: +TullyLostAMonText: text "Oh yeah, I lost a" line "wild @" text_ram wStringBuffer4 @@ -39,7 +39,7 @@ UnknownText_0x65eac: cont "the phone…" done -UnknownText_0x65f17: +TullyBattleRematchText: text "We should get a" line "battle going!" @@ -52,12 +52,12 @@ UnknownText_0x65f17: line "have the time." done -UnknownText_0x65f6e: +TullyHangUpText: text "Well, I'll be" line "seeing you." done -UnknownText_0x65f88: +TullyFoundItemText: text "I picked up a good" line "little thing at" cont "the water's edge." @@ -71,7 +71,7 @@ UnknownText_0x65f88: text "." done -UnknownText_0x65ff2: +TullyNoItemText: text "Have I found" line "anything good?" @@ -81,7 +81,7 @@ UnknownText_0x65ff2: line "you need patience." done -UnknownText_0x66043: +TullyForwardText: text "Yup, TULLY here…" para "<PLAY_G>? What?" @@ -93,7 +93,7 @@ UnknownText_0x66043: text "." done -UnknownText_0x66087: +TullyHurryText: text "I've got something" line "good for you." diff --git a/data/phone/text/unknown_callee.asm b/data/phone/text/unknown_callee.asm index 570618b05..02b26926a 100644 --- a/data/phone/text/unknown_callee.asm +++ b/data/phone/text/unknown_callee.asm @@ -1,4 +1,4 @@ -UnknownText_0x1b518b: +UnknownGenericText: text "How are your" line "#MON doing?" @@ -18,7 +18,7 @@ UnknownText_0x1b518b: line "bit much for me!" done -UnknownText_0x1b522b: +UnknownTougherThanEverText: text "My @" text_ram wStringBuffer4 text "'s" diff --git a/data/phone/text/vance_callee.asm b/data/phone/text/vance_callee.asm index c1c8948b4..0297e3af4 100644 --- a/data/phone/text/vance_callee.asm +++ b/data/phone/text/vance_callee.asm @@ -1,4 +1,4 @@ -UnknownText_0x1b7019: +VanceAnswerPhoneText: text "Yes, hello?" line "@" text_ram wStringBuffer3 @@ -10,7 +10,7 @@ UnknownText_0x1b7019: line "#MON?" done -UnknownText_0x1b7057: +VanceAnswerPhoneDayText: text "Yes, hello?" line "@" text_ram wStringBuffer3 @@ -22,7 +22,7 @@ UnknownText_0x1b7057: line "#MON flying?" done -UnknownText_0x1b7092: +VanceAnswerPhoneNiteText: text "Yes, hello?" line "@" text_ram wStringBuffer3 @@ -35,7 +35,7 @@ UnknownText_0x1b7092: line "see some action?" done -UnknownText_0x1b70e7: +VanceGreetText: text "Good morning," line "<PLAY_G>!" @@ -45,7 +45,7 @@ UnknownText_0x1b70e7: line "Good morning!" done -UnknownText_0x1b7112: +VanceGreetDayText: text "Hi, <PLAY_G>!" para "It's @" @@ -54,7 +54,7 @@ UnknownText_0x1b7112: line "Remember me?" done -UnknownText_0x1b7132: +VanceGreetNiteText: text "Good evening," line "<PLAY_G>!" @@ -64,7 +64,7 @@ UnknownText_0x1b7132: line "Are you free now?" done -UnknownText_0x1b7161: +VanceGenericText: text "Are you and your" line "#MON fine?" diff --git a/data/phone/text/vance_caller.asm b/data/phone/text/vance_caller.asm index 97cf2ec14..bc08e4f1d 100644 --- a/data/phone/text/vance_caller.asm +++ b/data/phone/text/vance_caller.asm @@ -1,4 +1,4 @@ -VanceLiftoffText: +VanceMonHasBecomeTougherText: text "My @" text_ram wStringBuffer4 text "'s" @@ -8,7 +8,7 @@ VanceLiftoffText: line "liftoff!" done -UnknownText_0x669b2: +VanceDefeatedMonText: text "We can easily beat" line "@" text_ram wStringBuffer4 @@ -18,7 +18,7 @@ UnknownText_0x669b2: line "Isn't that great?" done -UnknownText_0x669ed: +VanceLostAMonText: text "But get this, a" line "wild @" text_ram wStringBuffer4 @@ -30,7 +30,7 @@ UnknownText_0x669ed: line "after it…" done -UnknownText_0x66a3a: +VanceBattleRematchText: text "Right now, I'm on" line "@" text_ram wStringBuffer5 @@ -43,7 +43,7 @@ UnknownText_0x66a3a: line "I'll wait here." done -UnknownText_0x66a93: +VanceHangUpText: text "OK, bye for now!" done diff --git a/data/phone/text/wade_callee.asm b/data/phone/text/wade_callee.asm index ab8a1cd3a..602db6f0d 100644 --- a/data/phone/text/wade_callee.asm +++ b/data/phone/text/wade_callee.asm @@ -1,4 +1,4 @@ -UnknownText_0x1b5a3b: +WadeAnswerPhoneText: text "Hello? This is" line "@" text_ram wStringBuffer3 @@ -8,7 +8,7 @@ UnknownText_0x1b5a3b: line "Good morning!" done -UnknownText_0x1b5a74: +WadeAnswerPhoneDayText: text "Hello? This is" line "@" text_ram wStringBuffer3 @@ -17,7 +17,7 @@ UnknownText_0x1b5a74: para "Oh, hi, <PLAY_G>!" done -UnknownText_0x1b5a9f: +WadeAnswerPhoneNiteText: text "Hello? This is" line "@" text_ram wStringBuffer3 @@ -27,7 +27,7 @@ UnknownText_0x1b5a9f: line "Good evening!" done -UnknownText_0x1b5ad8: +WadeGreetText: text "<PLAY_G>, good" line "morning!" @@ -37,7 +37,7 @@ UnknownText_0x1b5ad8: line "Isn't it nice out?" done -UnknownText_0x1b5b0b: +WadeGreetDayText: text "<PLAY_G>, howdy!" para "It's me, @" @@ -46,7 +46,7 @@ UnknownText_0x1b5b0b: line "Isn't it nice out?" done -UnknownText_0x1b5b37: +WadeGreetNiteText: text "Good evening," line "<PLAY_G>!" @@ -56,7 +56,7 @@ UnknownText_0x1b5b37: line "Were you awake?" done -UnknownText_0x1b5b68: +WadeGenericText: text "How are your" line "#MON doing?" diff --git a/data/phone/text/wade_caller.asm b/data/phone/text/wade_caller.asm index 6f8ccc841..b00df640c 100644 --- a/data/phone/text/wade_caller.asm +++ b/data/phone/text/wade_caller.asm @@ -1,4 +1,4 @@ -WadeAreYouGrowingText: +WadeAreYourMonGrowingText: text "Are your #MON" line "growing?" @@ -17,7 +17,7 @@ WadeAreYouGrowingText: line "it'll get tough." done -UnknownText_0x175869: +WadeDefeatedMonText: text "Oh yeah, we KO'd a" line "wild @" text_ram wStringBuffer4 @@ -32,7 +32,7 @@ UnknownText_0x175869: line "the poor thing." done -UnknownText_0x1758e4: +WadeLostAMonText: text "Oh yeah, a wild" line "@" text_ram wStringBuffer4 @@ -51,7 +51,7 @@ UnknownText_0x1758e4: line "had it." done -UnknownText_0x175976: +WadeBattleRematchText: text "Do you feel like a" line "#MON battle?" @@ -67,7 +67,7 @@ UnknownText_0x175976: line "you get there." done -UnknownText_0x1759e7: +WadeHangUpText: text "See you later!" done @@ -85,7 +85,7 @@ WadeBugCatchingContestText: line "up my mind." done -WadeFoundBerryText: +WadeFoundItemText: text "I found all kinds" line "of BERRIES. If you" @@ -98,7 +98,7 @@ WadeFoundBerryText: text "." done -UnknownText_0x175abe: +WadeNoBerriesText: text "Huh? BERRIES?" para "Sorry, I haven't" @@ -109,7 +109,7 @@ UnknownText_0x175abe: cont "please wait?" done -UnknownText_0x175b1e: +WadeQuickBattleText: text "Let's battle" line "already!" @@ -122,7 +122,7 @@ UnknownText_0x175b1e: line "soon as you can!" done -UnknownText_0x175b6d: +WadeComeQuickText: text "How come you're" line "not here yet?" diff --git a/data/phone/text/wilton_callee.asm b/data/phone/text/wilton_callee.asm index 2d9dd1813..beed917e1 100644 --- a/data/phone/text/wilton_callee.asm +++ b/data/phone/text/wilton_callee.asm @@ -1,4 +1,4 @@ -UnknownText_0x1b71d5: +WiltonAnswerPhoneText: text "Hello, you have" line "reached @" text_ram wStringBuffer3 @@ -7,7 +7,7 @@ UnknownText_0x1b71d5: para "Ah, <PLAY_G>." done -UnknownText_0x1b71fc: +WiltonAnswerPhoneDayText: text "Hello, you have" line "reached @" text_ram wStringBuffer3 @@ -17,7 +17,7 @@ UnknownText_0x1b71fc: line "it?" done -UnknownText_0x1b722a: +WiltonAnswerPhoneNiteText: text "Hello, you have" line "reached @" text_ram wStringBuffer3 @@ -27,7 +27,7 @@ UnknownText_0x1b722a: line "<PLAY_G>." done -UnknownText_0x1b725c: +WiltonGreetText: text "Ah, it's @" text_ram wStringBuffer3 text "…" @@ -36,7 +36,7 @@ UnknownText_0x1b725c: line "moment?" done -UnknownText_0x1b7283: +WiltonGreetDayText: text "Ah, it's @" text_ram wStringBuffer3 text "…" @@ -44,7 +44,7 @@ UnknownText_0x1b7283: para "Can you talk now?" done -UnknownText_0x1b72a5: +WiltonGreetNiteText: text "Ah, it's @" text_ram wStringBuffer3 text "…" @@ -53,7 +53,7 @@ UnknownText_0x1b72a5: line "so late." done -UnknownText_0x1b72d0: +WiltonGenericText: text "Have your #MON" line "grown any?" diff --git a/data/phone/text/wilton_caller.asm b/data/phone/text/wilton_caller.asm index 9e95e95d6..661e3f3c7 100644 --- a/data/phone/text/wilton_caller.asm +++ b/data/phone/text/wilton_caller.asm @@ -1,4 +1,4 @@ -WiltonGrownText: +WiltonMonHasGrownText: text "My @" text_ram wStringBuffer4 text "'s" @@ -8,7 +8,7 @@ WiltonGrownText: line "have improved too!" done -UnknownText_0x66b3e: +WiltonDefeatedMonText: text "We beat a wild" line "@" text_ram wStringBuffer4 @@ -21,7 +21,7 @@ UnknownText_0x66b3e: line "#MON." done -UnknownText_0x66b8f: +WiltonLostAMonText: text "But a while back," line "we came this close" @@ -34,7 +34,7 @@ UnknownText_0x66b8f: line "huge. Believe me." done -UnknownText_0x66bf3: +WiltonBattleRematchText: text "I'm fishing on" line "@" text_ram wStringBuffer5 @@ -48,11 +48,11 @@ UnknownText_0x66bf3: cont "over for a battle." done -UnknownText_0x66c58: +WiltonHangUpText: text "All right, later." done -UnknownText_0x66c6b: +WiltonFoundItemText: text "I snagged an item" line "while fishing." diff --git a/data/pokemon/cries.asm b/data/pokemon/cries.asm index a57eac98c..e6255e040 100644 --- a/data/pokemon/cries.asm +++ b/data/pokemon/cries.asm @@ -5,258 +5,258 @@ ENDM PokemonCries:: ; entries correspond to constants/pokemon_constants.asm - mon_cry CRY_BULBASAUR, $080, $081 ; BULBASAUR - mon_cry CRY_BULBASAUR, $020, $100 ; IVYSAUR - mon_cry CRY_BULBASAUR, $000, $140 ; VENUSAUR - mon_cry CRY_CHARMANDER, $060, $0c0 ; CHARMANDER - mon_cry CRY_CHARMANDER, $020, $0c0 ; CHARMELEON - mon_cry CRY_CHARMANDER, $000, $100 ; CHARIZARD - mon_cry CRY_SQUIRTLE, $060, $0c0 ; SQUIRTLE - mon_cry CRY_SQUIRTLE, $020, $0c0 ; WARTORTLE - mon_cry CRY_BLASTOISE, $000, $100 ; BLASTOISE - mon_cry CRY_CATERPIE, $080, $0a0 ; CATERPIE - mon_cry CRY_METAPOD, $0cc, $081 ; METAPOD - mon_cry CRY_CATERPIE, $077, $0c0 ; BUTTERFREE - mon_cry CRY_WEEDLE, $0ee, $081 ; WEEDLE - mon_cry CRY_BLASTOISE, $0ff, $081 ; KAKUNA - mon_cry CRY_BLASTOISE, $060, $100 ; BEEDRILL - mon_cry CRY_PIDGEY, $0df, $084 ; PIDGEY - mon_cry CRY_PIDGEOTTO, $028, $140 ; PIDGEOTTO - mon_cry CRY_PIDGEOTTO, $011, $17f ; PIDGEOT - mon_cry CRY_RATTATA, $000, $100 ; RATTATA - mon_cry CRY_RATTATA, $020, $17f ; RATICATE - mon_cry CRY_SPEAROW, $000, $100 ; SPEAROW - mon_cry CRY_FEAROW, $040, $120 ; FEAROW - mon_cry CRY_EKANS, $012, $0c0 ; EKANS - mon_cry CRY_EKANS, $0e0, $090 ; ARBOK - mon_cry CRY_BULBASAUR, $0ee, $081 ; PIKACHU - mon_cry CRY_RAICHU, $0ee, $088 ; RAICHU - mon_cry CRY_NIDORAN_M, $020, $0c0 ; SANDSHREW - mon_cry CRY_NIDORAN_M, $0ff, $17f ; SANDSLASH - mon_cry CRY_NIDORAN_F, $000, $100 ; NIDORAN_F - mon_cry CRY_NIDORAN_F, $02c, $160 ; NIDORINA - mon_cry CRY_NIDOQUEEN, $000, $100 ; NIDOQUEEN - mon_cry CRY_NIDORAN_M, $000, $100 ; NIDORAN_M - mon_cry CRY_NIDORAN_M, $02c, $140 ; NIDORINO - mon_cry CRY_RAICHU, $000, $100 ; NIDOKING - mon_cry CRY_CLEFAIRY, $0cc, $081 ; CLEFAIRY - mon_cry CRY_CLEFAIRY, $0aa, $0a0 ; CLEFABLE - mon_cry CRY_VULPIX, $04f, $090 ; VULPIX - mon_cry CRY_VULPIX, $088, $0e0 ; NINETALES - mon_cry CRY_PIDGEY, $0ff, $0b5 ; JIGGLYPUFF - mon_cry CRY_PIDGEY, $068, $0e0 ; WIGGLYTUFF - mon_cry CRY_SQUIRTLE, $0e0, $100 ; ZUBAT - mon_cry CRY_SQUIRTLE, $0fa, $100 ; GOLBAT - mon_cry CRY_ODDISH, $0dd, $081 ; ODDISH - mon_cry CRY_ODDISH, $0aa, $0c0 ; GLOOM - mon_cry CRY_VILEPLUME, $022, $17f ; VILEPLUME - mon_cry CRY_PARAS, $020, $160 ; PARAS - mon_cry CRY_PARAS, $042, $17f ; PARASECT - mon_cry CRY_VENONAT, $044, $0c0 ; VENONAT - mon_cry CRY_VENONAT, $029, $100 ; VENOMOTH - mon_cry CRY_DIGLETT, $0aa, $081 ; DIGLETT - mon_cry CRY_DIGLETT, $02a, $090 ; DUGTRIO - mon_cry CRY_CLEFAIRY, $077, $090 ; MEOWTH - mon_cry CRY_CLEFAIRY, $099, $17f ; PERSIAN - mon_cry CRY_PSYDUCK, $020, $0e0 ; PSYDUCK - mon_cry CRY_PSYDUCK, $0ff, $0c0 ; GOLDUCK - mon_cry CRY_NIDOQUEEN, $0dd, $0e0 ; MANKEY - mon_cry CRY_NIDOQUEEN, $0af, $0c0 ; PRIMEAPE - mon_cry CRY_GROWLITHE, $020, $0c0 ; GROWLITHE - mon_cry CRY_WEEDLE, $000, $100 ; ARCANINE - mon_cry CRY_PIDGEY, $0ff, $17f ; POLIWAG - mon_cry CRY_PIDGEY, $077, $0e0 ; POLIWHIRL - mon_cry CRY_PIDGEY, $000, $17f ; POLIWRATH - mon_cry CRY_METAPOD, $0c0, $081 ; ABRA - mon_cry CRY_METAPOD, $0a8, $140 ; KADABRA - mon_cry CRY_METAPOD, $098, $17f ; ALAKAZAM - mon_cry CRY_GROWLITHE, $0ee, $081 ; MACHOP - mon_cry CRY_GROWLITHE, $048, $0e0 ; MACHOKE - mon_cry CRY_GROWLITHE, $008, $140 ; MACHAMP - mon_cry CRY_PSYDUCK, $055, $081 ; BELLSPROUT - mon_cry CRY_WEEPINBELL, $044, $0a0 ; WEEPINBELL - mon_cry CRY_WEEPINBELL, $066, $14c ; VICTREEBEL - mon_cry CRY_VENONAT, $000, $100 ; TENTACOOL - mon_cry CRY_VENONAT, $0ee, $17f ; TENTACRUEL - mon_cry CRY_VULPIX, $0f0, $090 ; GEODUDE - mon_cry CRY_VULPIX, $000, $100 ; GRAVELER - mon_cry CRY_GOLEM, $0e0, $0c0 ; GOLEM - mon_cry CRY_WEEPINBELL, $000, $100 ; PONYTA - mon_cry CRY_WEEPINBELL, $020, $140 ; RAPIDASH - mon_cry CRY_SLOWPOKE, $000, $100 ; SLOWPOKE - mon_cry CRY_GROWLITHE, $000, $100 ; SLOWBRO - mon_cry CRY_METAPOD, $080, $0e0 ; MAGNEMITE - mon_cry CRY_METAPOD, $020, $140 ; MAGNETON - mon_cry CRY_SPEAROW, $0dd, $081 ; FARFETCH_D - mon_cry CRY_DIGLETT, $0bb, $081 ; DODUO - mon_cry CRY_DIGLETT, $099, $0a0 ; DODRIO - mon_cry CRY_SEEL, $088, $140 ; SEEL - mon_cry CRY_SEEL, $023, $17f ; DEWGONG - mon_cry CRY_GRIMER, $000, $100 ; GRIMER - mon_cry CRY_MUK, $0ef, $17f ; MUK - mon_cry CRY_FEAROW, $000, $100 ; SHELLDER - mon_cry CRY_FEAROW, $06f, $160 ; CLOYSTER - mon_cry CRY_METAPOD, $000, $100 ; GASTLY - mon_cry CRY_METAPOD, $030, $0c0 ; HAUNTER - mon_cry CRY_MUK, $000, $17f ; GENGAR - mon_cry CRY_EKANS, $0ff, $140 ; ONIX - mon_cry CRY_DROWZEE, $088, $0a0 ; DROWZEE - mon_cry CRY_DROWZEE, $0ee, $0c0 ; HYPNO - mon_cry CRY_KRABBY, $020, $160 ; KRABBY - mon_cry CRY_KRABBY, $0ee, $160 ; KINGLER - mon_cry CRY_VOLTORB, $0ed, $100 ; VOLTORB - mon_cry CRY_VOLTORB, $0a8, $110 ; ELECTRODE - mon_cry CRY_DIGLETT, $000, $100 ; EXEGGCUTE - mon_cry CRY_DROWZEE, $000, $100 ; EXEGGUTOR - mon_cry CRY_CLEFAIRY, $000, $100 ; CUBONE - mon_cry CRY_ODDISH, $04f, $0e0 ; MAROWAK - mon_cry CRY_GOLEM, $080, $140 ; HITMONLEE - mon_cry CRY_SEEL, $0ee, $140 ; HITMONCHAN - mon_cry CRY_SEEL, $000, $100 ; LICKITUNG - mon_cry CRY_GOLEM, $0e6, $15d ; KOFFING - mon_cry CRY_GOLEM, $0ff, $17f ; WEEZING - mon_cry CRY_CHARMANDER, $000, $100 ; RHYHORN - mon_cry CRY_RHYDON, $000, $100 ; RHYDON - mon_cry CRY_PIDGEOTTO, $00a, $140 ; CHANSEY - mon_cry CRY_GOLEM, $000, $100 ; TANGELA - mon_cry CRY_KANGASKHAN, $000, $100 ; KANGASKHAN - mon_cry CRY_CLEFAIRY, $099, $090 ; HORSEA - mon_cry CRY_CLEFAIRY, $03c, $081 ; SEADRA - mon_cry CRY_CATERPIE, $080, $0c0 ; GOLDEEN - mon_cry CRY_CATERPIE, $010, $17f ; SEAKING - mon_cry CRY_PARAS, $002, $0a0 ; STARYU - mon_cry CRY_PARAS, $000, $100 ; STARMIE - mon_cry CRY_KRABBY, $008, $0c0 ; MR__MIME - mon_cry CRY_CATERPIE, $000, $100 ; SCYTHER - mon_cry CRY_DROWZEE, $0ff, $17f ; JYNX - mon_cry CRY_VOLTORB, $08f, $17f ; ELECTABUZZ - mon_cry CRY_CHARMANDER, $0ff, $0b0 ; MAGMAR - mon_cry CRY_PIDGEOTTO, $000, $100 ; PINSIR - mon_cry CRY_SQUIRTLE, $011, $0c0 ; TAUROS - mon_cry CRY_EKANS, $080, $080 ; MAGIKARP - mon_cry CRY_EKANS, $000, $100 ; GYARADOS - mon_cry CRY_LAPRAS, $000, $100 ; LAPRAS - mon_cry CRY_PIDGEY, $0ff, $17f ; DITTO - mon_cry CRY_VENONAT, $088, $0e0 ; EEVEE - mon_cry CRY_VENONAT, $0aa, $17f ; VAPOREON - mon_cry CRY_VENONAT, $03d, $100 ; JOLTEON - mon_cry CRY_VENONAT, $010, $0a0 ; FLAREON - mon_cry CRY_WEEPINBELL, $0aa, $17f ; PORYGON - mon_cry CRY_GROWLITHE, $0f0, $081 ; OMANYTE - mon_cry CRY_GROWLITHE, $0ff, $0c0 ; OMASTAR - mon_cry CRY_CATERPIE, $0bb, $0c0 ; KABUTO - mon_cry CRY_FEAROW, $0ee, $081 ; KABUTOPS - mon_cry CRY_VILEPLUME, $020, $170 ; AERODACTYL - mon_cry CRY_GRIMER, $055, $081 ; SNORLAX - mon_cry CRY_RAICHU, $080, $0c0 ; ARTICUNO - mon_cry CRY_FEAROW, $0ff, $100 ; ZAPDOS - mon_cry CRY_RAICHU, $0f8, $0c0 ; MOLTRES - mon_cry CRY_BULBASAUR, $060, $0c0 ; DRATINI - mon_cry CRY_BULBASAUR, $040, $100 ; DRAGONAIR - mon_cry CRY_BULBASAUR, $03c, $140 ; DRAGONITE - mon_cry CRY_PARAS, $099, $17f ; MEWTWO - mon_cry CRY_PARAS, $0ee, $17f ; MEW - mon_cry CRY_CHIKORITA, -$010, $0b0 ; CHIKORITA - mon_cry CRY_CHIKORITA, -$022, $120 ; BAYLEEF - mon_cry CRY_CHIKORITA, -$0b7, $200 ; MEGANIUM - mon_cry CRY_CYNDAQUIL, $347, $080 ; CYNDAQUIL - mon_cry CRY_CYNDAQUIL, $321, $120 ; QUILAVA - mon_cry CRY_TYPHLOSION, $f00, $0d4 ; TYPHLOSION - mon_cry CRY_TOTODILE, $46c, $0e8 ; TOTODILE - mon_cry CRY_TOTODILE, $440, $110 ; CROCONAW - mon_cry CRY_TOTODILE, $3fc, $180 ; FERALIGATR - mon_cry CRY_SENTRET, $08a, $0b8 ; SENTRET - mon_cry CRY_SENTRET, $06b, $102 ; FURRET - mon_cry CRY_HOOTHOOT, $091, $0d8 ; HOOTHOOT - mon_cry CRY_HOOTHOOT, $000, $1a0 ; NOCTOWL - mon_cry CRY_LEDYBA, $000, $0de ; LEDYBA - mon_cry CRY_LEDYBA, -$096, $138 ; LEDIAN - mon_cry CRY_SPINARAK, $011, $200 ; SPINARAK - mon_cry CRY_SPINARAK, -$0ae, $1e2 ; ARIADOS - mon_cry CRY_SQUIRTLE, -$010, $140 ; CROBAT - mon_cry CRY_CYNDAQUIL, $3c9, $140 ; CHINCHOU - mon_cry CRY_CYNDAQUIL, $2d0, $110 ; LANTURN - mon_cry CRY_PICHU, $000, $140 ; PICHU - mon_cry CRY_CLEFFA, $061, $091 ; CLEFFA - mon_cry CRY_CHIKORITA, $0e8, $0e8 ; IGGLYBUFF - mon_cry CRY_TOGEPI, $010, $100 ; TOGEPI - mon_cry CRY_TOGETIC, $03b, $038 ; TOGETIC - mon_cry CRY_NATU, -$067, $100 ; NATU - mon_cry CRY_NATU, -$0a7, $168 ; XATU - mon_cry CRY_MAREEP, $022, $0d8 ; MAREEP - mon_cry CRY_MAREEP, -$007, $180 ; FLAAFFY - mon_cry CRY_AMPHAROS, -$07c, $0e8 ; AMPHAROS - mon_cry CRY_CLEFFA, $084, $150 ; BELLOSSOM - mon_cry CRY_MARILL, $11b, $120 ; MARILL - mon_cry CRY_MARILL, $0b6, $180 ; AZUMARILL - mon_cry CRY_CLEFFA, $f40, $180 ; SUDOWOODO - mon_cry CRY_CLEFFA, -$2a3, $1c8 ; POLITOED - mon_cry CRY_CLEFFA, $03b, $0c8 ; HOPPIP - mon_cry CRY_CLEFFA, $027, $138 ; SKIPLOOM - mon_cry CRY_CLEFFA, $000, $180 ; JUMPLUFF - mon_cry CRY_AIPOM, -$051, $0e8 ; AIPOM - mon_cry CRY_MARILL, $12b, $0b8 ; SUNKERN - mon_cry CRY_SUNFLORA, -$020, $180 ; SUNFLORA - mon_cry CRY_TOTODILE, $031, $0c8 ; YANMA - mon_cry CRY_WOOPER, $093, $0af ; WOOPER - mon_cry CRY_WOOPER, -$0c6, $140 ; QUAGSIRE - mon_cry CRY_AIPOM, $0a2, $140 ; ESPEON - mon_cry CRY_VENONAT, -$0e9, $0f0 ; UMBREON - mon_cry CRY_MARILL, -$01f, $180 ; MURKROW - mon_cry CRY_SLOWKING, $104, $200 ; SLOWKING - mon_cry CRY_HOOTHOOT, $130, $0e8 ; MISDREAVUS - mon_cry CRY_HOOTHOOT, $162, $100 ; UNOWN - mon_cry CRY_AMPHAROS, $27b, $144 ; WOBBUFFET - mon_cry CRY_GIRAFARIG, $041, $200 ; GIRAFARIG - mon_cry CRY_SLOWKING, $080, $100 ; PINECO - mon_cry CRY_SLOWKING, $000, $180 ; FORRETRESS - mon_cry CRY_DUNSPARCE, $1c4, $100 ; DUNSPARCE - mon_cry CRY_GLIGAR, -$102, $100 ; GLIGAR - mon_cry CRY_TYPHLOSION, $0ef, $0f7 ; STEELIX - mon_cry CRY_DUNSPARCE, $112, $0e8 ; SNUBBULL - mon_cry CRY_DUNSPARCE, $000, $180 ; GRANBULL - mon_cry CRY_SLOWKING, $160, $0e0 ; QWILFISH - mon_cry CRY_AMPHAROS, $000, $160 ; SCIZOR - mon_cry CRY_DUNSPARCE, $290, $0a8 ; SHUCKLE - mon_cry CRY_AMPHAROS, $035, $0e0 ; HERACROSS - mon_cry CRY_WOOPER, $053, $0af ; SNEASEL - mon_cry CRY_TEDDIURSA, $7a2, $06e ; TEDDIURSA - mon_cry CRY_TEDDIURSA, $640, $0d8 ; URSARING - mon_cry CRY_SLUGMA, -$1d8, $140 ; SLUGMA - mon_cry CRY_MAGCARGO, -$20d, $1c0 ; MAGCARGO - mon_cry CRY_CYNDAQUIL, $1fe, $140 ; SWINUB - mon_cry CRY_MAGCARGO, -$109, $100 ; PILOSWINE - mon_cry CRY_MAGCARGO, $0a1, $0e8 ; CORSOLA - mon_cry CRY_SUNFLORA, $00d, $100 ; REMORAID - mon_cry CRY_TOTODILE, $000, $180 ; OCTILLERY - mon_cry CRY_TEDDIURSA, $002, $06a ; DELIBIRD - mon_cry CRY_MANTINE, -$0be, $0f0 ; MANTINE - mon_cry CRY_AMPHAROS, $8a9, $180 ; SKARMORY - mon_cry CRY_CYNDAQUIL, $039, $140 ; HOUNDOUR - mon_cry CRY_TOTODILE, -$10a, $100 ; HOUNDOOM - mon_cry CRY_SLUGMA, $2fb, $100 ; KINGDRA - mon_cry CRY_SENTRET, $048, $230 ; PHANPY - mon_cry CRY_DONPHAN, $000, $1a0 ; DONPHAN - mon_cry CRY_GIRAFARIG, $073, $240 ; PORYGON2 - mon_cry CRY_AIPOM, -$160, $180 ; STANTLER - mon_cry CRY_PICHU, -$21a, $1f0 ; SMEARGLE - mon_cry CRY_AIPOM, $02c, $108 ; TYROGUE - mon_cry CRY_SLUGMA, $000, $100 ; HITMONTOP - mon_cry CRY_MARILL, $068, $100 ; SMOOCHUM - mon_cry CRY_SUNFLORA, -$2d8, $0b4 ; ELEKID - mon_cry CRY_TEDDIURSA, $176, $03a ; MAGBY - mon_cry CRY_GLIGAR, -$1cd, $1a0 ; MILTANK - mon_cry CRY_SLOWKING, $293, $140 ; BLISSEY - mon_cry CRY_RAIKOU, $22e, $120 ; RAIKOU - mon_cry CRY_ENTEI, $000, $1a0 ; ENTEI - mon_cry CRY_MAGCARGO, $000, $180 ; SUICUNE - mon_cry CRY_RAIKOU, $05f, $0d0 ; LARVITAR - mon_cry CRY_SPINARAK, -$1db, $150 ; PUPITAR - mon_cry CRY_RAIKOU, -$100, $180 ; TYRANITAR - mon_cry CRY_TYPHLOSION, $000, $100 ; LUGIA - mon_cry CRY_AIPOM, $000, $180 ; HO_OH - mon_cry CRY_ENTEI, $14a, $111 ; CELEBI - mon_cry CRY_NIDORAN_M, 0, 0 ; 252 - mon_cry CRY_NIDORAN_M, 0, 0 ; 253 - mon_cry CRY_NIDORAN_M, 0, 0 ; 254 - mon_cry CRY_NIDORAN_M, 0, 0 ; 255 + mon_cry CRY_BULBASAUR, 128, 129 ; BULBASAUR + mon_cry CRY_BULBASAUR, 32, 256 ; IVYSAUR + mon_cry CRY_BULBASAUR, 0, 320 ; VENUSAUR + mon_cry CRY_CHARMANDER, 96, 192 ; CHARMANDER + mon_cry CRY_CHARMANDER, 32, 192 ; CHARMELEON + mon_cry CRY_CHARMANDER, 0, 256 ; CHARIZARD + mon_cry CRY_SQUIRTLE, 96, 192 ; SQUIRTLE + mon_cry CRY_SQUIRTLE, 32, 192 ; WARTORTLE + mon_cry CRY_BLASTOISE, 0, 256 ; BLASTOISE + mon_cry CRY_CATERPIE, 128, 160 ; CATERPIE + mon_cry CRY_METAPOD, 204, 129 ; METAPOD + mon_cry CRY_CATERPIE, 119, 192 ; BUTTERFREE + mon_cry CRY_WEEDLE, 238, 129 ; WEEDLE + mon_cry CRY_BLASTOISE, 255, 129 ; KAKUNA + mon_cry CRY_BLASTOISE, 96, 256 ; BEEDRILL + mon_cry CRY_PIDGEY, 223, 132 ; PIDGEY + mon_cry CRY_PIDGEOTTO, 40, 320 ; PIDGEOTTO + mon_cry CRY_PIDGEOTTO, 17, 383 ; PIDGEOT + mon_cry CRY_RATTATA, 0, 256 ; RATTATA + mon_cry CRY_RATTATA, 32, 383 ; RATICATE + mon_cry CRY_SPEAROW, 0, 256 ; SPEAROW + mon_cry CRY_FEAROW, 64, 288 ; FEAROW + mon_cry CRY_EKANS, 18, 192 ; EKANS + mon_cry CRY_EKANS, 224, 144 ; ARBOK + mon_cry CRY_BULBASAUR, 238, 129 ; PIKACHU + mon_cry CRY_RAICHU, 238, 136 ; RAICHU + mon_cry CRY_NIDORAN_M, 32, 192 ; SANDSHREW + mon_cry CRY_NIDORAN_M, 255, 383 ; SANDSLASH + mon_cry CRY_NIDORAN_F, 0, 256 ; NIDORAN_F + mon_cry CRY_NIDORAN_F, 44, 352 ; NIDORINA + mon_cry CRY_NIDOQUEEN, 0, 256 ; NIDOQUEEN + mon_cry CRY_NIDORAN_M, 0, 256 ; NIDORAN_M + mon_cry CRY_NIDORAN_M, 44, 320 ; NIDORINO + mon_cry CRY_RAICHU, 0, 256 ; NIDOKING + mon_cry CRY_CLEFAIRY, 204, 129 ; CLEFAIRY + mon_cry CRY_CLEFAIRY, 170, 160 ; CLEFABLE + mon_cry CRY_VULPIX, 79, 144 ; VULPIX + mon_cry CRY_VULPIX, 136, 224 ; NINETALES + mon_cry CRY_PIDGEY, 255, 181 ; JIGGLYPUFF + mon_cry CRY_PIDGEY, 104, 224 ; WIGGLYTUFF + mon_cry CRY_SQUIRTLE, 224, 256 ; ZUBAT + mon_cry CRY_SQUIRTLE, 250, 256 ; GOLBAT + mon_cry CRY_ODDISH, 221, 129 ; ODDISH + mon_cry CRY_ODDISH, 170, 192 ; GLOOM + mon_cry CRY_VILEPLUME, 34, 383 ; VILEPLUME + mon_cry CRY_PARAS, 32, 352 ; PARAS + mon_cry CRY_PARAS, 66, 383 ; PARASECT + mon_cry CRY_VENONAT, 68, 192 ; VENONAT + mon_cry CRY_VENONAT, 41, 256 ; VENOMOTH + mon_cry CRY_DIGLETT, 170, 129 ; DIGLETT + mon_cry CRY_DIGLETT, 42, 144 ; DUGTRIO + mon_cry CRY_CLEFAIRY, 119, 144 ; MEOWTH + mon_cry CRY_CLEFAIRY, 153, 383 ; PERSIAN + mon_cry CRY_PSYDUCK, 32, 224 ; PSYDUCK + mon_cry CRY_PSYDUCK, 255, 192 ; GOLDUCK + mon_cry CRY_NIDOQUEEN, 221, 224 ; MANKEY + mon_cry CRY_NIDOQUEEN, 175, 192 ; PRIMEAPE + mon_cry CRY_GROWLITHE, 32, 192 ; GROWLITHE + mon_cry CRY_WEEDLE, 0, 256 ; ARCANINE + mon_cry CRY_PIDGEY, 255, 383 ; POLIWAG + mon_cry CRY_PIDGEY, 119, 224 ; POLIWHIRL + mon_cry CRY_PIDGEY, 0, 383 ; POLIWRATH + mon_cry CRY_METAPOD, 192, 129 ; ABRA + mon_cry CRY_METAPOD, 168, 320 ; KADABRA + mon_cry CRY_METAPOD, 152, 383 ; ALAKAZAM + mon_cry CRY_GROWLITHE, 238, 129 ; MACHOP + mon_cry CRY_GROWLITHE, 72, 224 ; MACHOKE + mon_cry CRY_GROWLITHE, 8, 320 ; MACHAMP + mon_cry CRY_PSYDUCK, 85, 129 ; BELLSPROUT + mon_cry CRY_WEEPINBELL, 68, 160 ; WEEPINBELL + mon_cry CRY_WEEPINBELL, 102, 332 ; VICTREEBEL + mon_cry CRY_VENONAT, 0, 256 ; TENTACOOL + mon_cry CRY_VENONAT, 238, 383 ; TENTACRUEL + mon_cry CRY_VULPIX, 240, 144 ; GEODUDE + mon_cry CRY_VULPIX, 0, 256 ; GRAVELER + mon_cry CRY_GOLEM, 224, 192 ; GOLEM + mon_cry CRY_WEEPINBELL, 0, 256 ; PONYTA + mon_cry CRY_WEEPINBELL, 32, 320 ; RAPIDASH + mon_cry CRY_SLOWPOKE, 0, 256 ; SLOWPOKE + mon_cry CRY_GROWLITHE, 0, 256 ; SLOWBRO + mon_cry CRY_METAPOD, 128, 224 ; MAGNEMITE + mon_cry CRY_METAPOD, 32, 320 ; MAGNETON + mon_cry CRY_SPEAROW, 221, 129 ; FARFETCH_D + mon_cry CRY_DIGLETT, 187, 129 ; DODUO + mon_cry CRY_DIGLETT, 153, 160 ; DODRIO + mon_cry CRY_SEEL, 136, 320 ; SEEL + mon_cry CRY_SEEL, 35, 383 ; DEWGONG + mon_cry CRY_GRIMER, 0, 256 ; GRIMER + mon_cry CRY_MUK, 239, 383 ; MUK + mon_cry CRY_FEAROW, 0, 256 ; SHELLDER + mon_cry CRY_FEAROW, 111, 352 ; CLOYSTER + mon_cry CRY_METAPOD, 0, 256 ; GASTLY + mon_cry CRY_METAPOD, 48, 192 ; HAUNTER + mon_cry CRY_MUK, 0, 383 ; GENGAR + mon_cry CRY_EKANS, 255, 320 ; ONIX + mon_cry CRY_DROWZEE, 136, 160 ; DROWZEE + mon_cry CRY_DROWZEE, 238, 192 ; HYPNO + mon_cry CRY_KRABBY, 32, 352 ; KRABBY + mon_cry CRY_KRABBY, 238, 352 ; KINGLER + mon_cry CRY_VOLTORB, 237, 256 ; VOLTORB + mon_cry CRY_VOLTORB, 168, 272 ; ELECTRODE + mon_cry CRY_DIGLETT, 0, 256 ; EXEGGCUTE + mon_cry CRY_DROWZEE, 0, 256 ; EXEGGUTOR + mon_cry CRY_CLEFAIRY, 0, 256 ; CUBONE + mon_cry CRY_ODDISH, 79, 224 ; MAROWAK + mon_cry CRY_GOLEM, 128, 320 ; HITMONLEE + mon_cry CRY_SEEL, 238, 320 ; HITMONCHAN + mon_cry CRY_SEEL, 0, 256 ; LICKITUNG + mon_cry CRY_GOLEM, 230, 349 ; KOFFING + mon_cry CRY_GOLEM, 255, 383 ; WEEZING + mon_cry CRY_CHARMANDER, 0, 256 ; RHYHORN + mon_cry CRY_RHYDON, 0, 256 ; RHYDON + mon_cry CRY_PIDGEOTTO, 10, 320 ; CHANSEY + mon_cry CRY_GOLEM, 0, 256 ; TANGELA + mon_cry CRY_KANGASKHAN, 0, 256 ; KANGASKHAN + mon_cry CRY_CLEFAIRY, 153, 144 ; HORSEA + mon_cry CRY_CLEFAIRY, 60, 129 ; SEADRA + mon_cry CRY_CATERPIE, 128, 192 ; GOLDEEN + mon_cry CRY_CATERPIE, 16, 383 ; SEAKING + mon_cry CRY_PARAS, 2, 160 ; STARYU + mon_cry CRY_PARAS, 0, 256 ; STARMIE + mon_cry CRY_KRABBY, 8, 192 ; MR__MIME + mon_cry CRY_CATERPIE, 0, 256 ; SCYTHER + mon_cry CRY_DROWZEE, 255, 383 ; JYNX + mon_cry CRY_VOLTORB, 143, 383 ; ELECTABUZZ + mon_cry CRY_CHARMANDER, 255, 176 ; MAGMAR + mon_cry CRY_PIDGEOTTO, 0, 256 ; PINSIR + mon_cry CRY_SQUIRTLE, 17, 192 ; TAUROS + mon_cry CRY_EKANS, 128, 128 ; MAGIKARP + mon_cry CRY_EKANS, 0, 256 ; GYARADOS + mon_cry CRY_LAPRAS, 0, 256 ; LAPRAS + mon_cry CRY_PIDGEY, 255, 383 ; DITTO + mon_cry CRY_VENONAT, 136, 224 ; EEVEE + mon_cry CRY_VENONAT, 170, 383 ; VAPOREON + mon_cry CRY_VENONAT, 61, 256 ; JOLTEON + mon_cry CRY_VENONAT, 16, 160 ; FLAREON + mon_cry CRY_WEEPINBELL, 170, 383 ; PORYGON + mon_cry CRY_GROWLITHE, 240, 129 ; OMANYTE + mon_cry CRY_GROWLITHE, 255, 192 ; OMASTAR + mon_cry CRY_CATERPIE, 187, 192 ; KABUTO + mon_cry CRY_FEAROW, 238, 129 ; KABUTOPS + mon_cry CRY_VILEPLUME, 32, 368 ; AERODACTYL + mon_cry CRY_GRIMER, 85, 129 ; SNORLAX + mon_cry CRY_RAICHU, 128, 192 ; ARTICUNO + mon_cry CRY_FEAROW, 255, 256 ; ZAPDOS + mon_cry CRY_RAICHU, 248, 192 ; MOLTRES + mon_cry CRY_BULBASAUR, 96, 192 ; DRATINI + mon_cry CRY_BULBASAUR, 64, 256 ; DRAGONAIR + mon_cry CRY_BULBASAUR, 60, 320 ; DRAGONITE + mon_cry CRY_PARAS, 153, 383 ; MEWTWO + mon_cry CRY_PARAS, 238, 383 ; MEW + mon_cry CRY_CHIKORITA, -16, 176 ; CHIKORITA + mon_cry CRY_CHIKORITA, -34, 288 ; BAYLEEF + mon_cry CRY_CHIKORITA, -183, 512 ; MEGANIUM + mon_cry CRY_CYNDAQUIL, 839, 128 ; CYNDAQUIL + mon_cry CRY_CYNDAQUIL, 801, 288 ; QUILAVA + mon_cry CRY_TYPHLOSION, 3840, 212 ; TYPHLOSION + mon_cry CRY_TOTODILE, 1132, 232 ; TOTODILE + mon_cry CRY_TOTODILE, 1088, 272 ; CROCONAW + mon_cry CRY_TOTODILE, 1020, 384 ; FERALIGATR + mon_cry CRY_SENTRET, 138, 184 ; SENTRET + mon_cry CRY_SENTRET, 107, 258 ; FURRET + mon_cry CRY_HOOTHOOT, 145, 216 ; HOOTHOOT + mon_cry CRY_HOOTHOOT, 0, 416 ; NOCTOWL + mon_cry CRY_LEDYBA, 0, 222 ; LEDYBA + mon_cry CRY_LEDYBA, -150, 312 ; LEDIAN + mon_cry CRY_SPINARAK, 17, 512 ; SPINARAK + mon_cry CRY_SPINARAK, -174, 482 ; ARIADOS + mon_cry CRY_SQUIRTLE, -16, 320 ; CROBAT + mon_cry CRY_CYNDAQUIL, 969, 320 ; CHINCHOU + mon_cry CRY_CYNDAQUIL, 720, 272 ; LANTURN + mon_cry CRY_PICHU, 0, 320 ; PICHU + mon_cry CRY_CLEFFA, 97, 145 ; CLEFFA + mon_cry CRY_CHIKORITA, 232, 232 ; IGGLYBUFF + mon_cry CRY_TOGEPI, 16, 256 ; TOGEPI + mon_cry CRY_TOGETIC, 59, 56 ; TOGETIC + mon_cry CRY_NATU, -103, 256 ; NATU + mon_cry CRY_NATU, -167, 360 ; XATU + mon_cry CRY_MAREEP, 34, 216 ; MAREEP + mon_cry CRY_MAREEP, -7, 384 ; FLAAFFY + mon_cry CRY_AMPHAROS, -124, 232 ; AMPHAROS + mon_cry CRY_CLEFFA, 132, 336 ; BELLOSSOM + mon_cry CRY_MARILL, 283, 288 ; MARILL + mon_cry CRY_MARILL, 182, 384 ; AZUMARILL + mon_cry CRY_CLEFFA, 3904, 384 ; SUDOWOODO + mon_cry CRY_CLEFFA, -675, 456 ; POLITOED + mon_cry CRY_CLEFFA, 59, 200 ; HOPPIP + mon_cry CRY_CLEFFA, 39, 312 ; SKIPLOOM + mon_cry CRY_CLEFFA, 0, 384 ; JUMPLUFF + mon_cry CRY_AIPOM, -81, 232 ; AIPOM + mon_cry CRY_MARILL, 299, 184 ; SUNKERN + mon_cry CRY_SUNFLORA, -32, 384 ; SUNFLORA + mon_cry CRY_TOTODILE, 49, 200 ; YANMA + mon_cry CRY_WOOPER, 147, 175 ; WOOPER + mon_cry CRY_WOOPER, -198, 320 ; QUAGSIRE + mon_cry CRY_AIPOM, 162, 320 ; ESPEON + mon_cry CRY_VENONAT, -233, 240 ; UMBREON + mon_cry CRY_MARILL, -31, 384 ; MURKROW + mon_cry CRY_SLOWKING, 260, 512 ; SLOWKING + mon_cry CRY_HOOTHOOT, 304, 232 ; MISDREAVUS + mon_cry CRY_HOOTHOOT, 354, 256 ; UNOWN + mon_cry CRY_AMPHAROS, 635, 324 ; WOBBUFFET + mon_cry CRY_GIRAFARIG, 65, 512 ; GIRAFARIG + mon_cry CRY_SLOWKING, 128, 256 ; PINECO + mon_cry CRY_SLOWKING, 0, 384 ; FORRETRESS + mon_cry CRY_DUNSPARCE, 452, 256 ; DUNSPARCE + mon_cry CRY_GLIGAR, -258, 256 ; GLIGAR + mon_cry CRY_TYPHLOSION, 239, 247 ; STEELIX + mon_cry CRY_DUNSPARCE, 274, 232 ; SNUBBULL + mon_cry CRY_DUNSPARCE, 0, 384 ; GRANBULL + mon_cry CRY_SLOWKING, 352, 224 ; QWILFISH + mon_cry CRY_AMPHAROS, 0, 352 ; SCIZOR + mon_cry CRY_DUNSPARCE, 656, 168 ; SHUCKLE + mon_cry CRY_AMPHAROS, 53, 224 ; HERACROSS + mon_cry CRY_WOOPER, 83, 175 ; SNEASEL + mon_cry CRY_TEDDIURSA, 1954, 110 ; TEDDIURSA + mon_cry CRY_TEDDIURSA, 1600, 216 ; URSARING + mon_cry CRY_SLUGMA, -472, 320 ; SLUGMA + mon_cry CRY_MAGCARGO, -525, 448 ; MAGCARGO + mon_cry CRY_CYNDAQUIL, 510, 320 ; SWINUB + mon_cry CRY_MAGCARGO, -265, 256 ; PILOSWINE + mon_cry CRY_MAGCARGO, 161, 232 ; CORSOLA + mon_cry CRY_SUNFLORA, 13, 256 ; REMORAID + mon_cry CRY_TOTODILE, 0, 384 ; OCTILLERY + mon_cry CRY_TEDDIURSA, 2, 106 ; DELIBIRD + mon_cry CRY_MANTINE, -190, 240 ; MANTINE + mon_cry CRY_AMPHAROS, 2217, 384 ; SKARMORY + mon_cry CRY_CYNDAQUIL, 57, 320 ; HOUNDOUR + mon_cry CRY_TOTODILE, -266, 256 ; HOUNDOOM + mon_cry CRY_SLUGMA, 763, 256 ; KINGDRA + mon_cry CRY_SENTRET, 72, 560 ; PHANPY + mon_cry CRY_DONPHAN, 0, 416 ; DONPHAN + mon_cry CRY_GIRAFARIG, 115, 576 ; PORYGON2 + mon_cry CRY_AIPOM, -352, 384 ; STANTLER + mon_cry CRY_PICHU, -538, 496 ; SMEARGLE + mon_cry CRY_AIPOM, 44, 264 ; TYROGUE + mon_cry CRY_SLUGMA, 0, 256 ; HITMONTOP + mon_cry CRY_MARILL, 104, 256 ; SMOOCHUM + mon_cry CRY_SUNFLORA, -728, 180 ; ELEKID + mon_cry CRY_TEDDIURSA, 374, 58 ; MAGBY + mon_cry CRY_GLIGAR, -461, 416 ; MILTANK + mon_cry CRY_SLOWKING, 659, 320 ; BLISSEY + mon_cry CRY_RAIKOU, 558, 288 ; RAIKOU + mon_cry CRY_ENTEI, 0, 416 ; ENTEI + mon_cry CRY_MAGCARGO, 0, 384 ; SUICUNE + mon_cry CRY_RAIKOU, 95, 208 ; LARVITAR + mon_cry CRY_SPINARAK, -475, 336 ; PUPITAR + mon_cry CRY_RAIKOU, -256, 384 ; TYRANITAR + mon_cry CRY_TYPHLOSION, 0, 256 ; LUGIA + mon_cry CRY_AIPOM, 0, 384 ; HO_OH + mon_cry CRY_ENTEI, 330, 273 ; CELEBI + mon_cry CRY_NIDORAN_M, 0, 0 ; 252 + mon_cry CRY_NIDORAN_M, 0, 0 ; 253 + mon_cry CRY_NIDORAN_M, 0, 0 ; 254 + mon_cry CRY_NIDORAN_M, 0, 0 ; 255 diff --git a/data/text/battle.asm b/data/text/battle.asm index 722c3e289..39554bf61 100644 --- a/data/text/battle.asm +++ b/data/text/battle.asm @@ -819,7 +819,7 @@ SubFadedText: line "SUBSTITUTE faded!" prompt -LearnedMoveText: +MimicLearnedMoveText: text "<USER>" line "learned" cont "@" diff --git a/data/text/common_1.asm b/data/text/common_1.asm index 5c3686350..765260883 100644 --- a/data/text/common_1.asm +++ b/data/text/common_1.asm @@ -94,7 +94,7 @@ _GrewToLevelText:: text_decimal wCurPartyLevel, 1, 3 text "!@" sound_dex_fanfare_50_79 ; plays SFX_DEX_FANFARE_50_79, identical to SFX_LEVEL_UP - text_waitbutton + text_promptbutton text_end text_end ; unused @@ -153,7 +153,7 @@ _CardFolderOpenText:: text "CARD FOLDER open.@" text_end -_OakTimeText1:: +_OakTimeWokeUpText:: text "<……><……><……><……><……><……>" line "<……><……><……><……><……><……>" @@ -164,55 +164,57 @@ _OakTimeText1:: line "clock for me?" prompt -_OakTimeText2:: +_OakTimeWhatTimeIsItText:: text "What time is it?" done -_OakTimeText3:: +_OakTimeWhatHoursText:: text "What?@" text_end -_OakTimeText4:: +_OakTimeHoursQuestionMarkText:: text "?" done -_OakTimeText5:: +_OakTimeHowManyMinutesText:: text "How many minutes?" done -_OakTimeText6:: +_OakTimeWhoaMinutesText:: text "Whoa!@" text_end -_OakTimeText7:: +_OakTimeMinutesQuestionMarkText:: text "?" done -_OakTimeText8:: +_OakTimeOversleptText:: text "!" line "I overslept!" done -_OakTimeText11:: +_OakTimeYikesText:: text "!" line "Yikes! I over-" cont "slept!" done -_OakTimeText12:: +_OakTimeSoDarkText:: text "!" line "No wonder it's so" cont "dark!" done -_OakTimeText13:: +_OakTimeWhatDayIsItText:: text "What day is it?" done -_OakTimeText14:: +_OakTimeIsItText:: text ", is it?" done +; Mobile Adapter + UnknownText_0x1bc384:: text "There is nothing" line "connected." @@ -258,6 +260,8 @@ UnknownText_0x1bc44c:: line "ID no." done +; Mobile Adapter End + UnknownText_0x1bc45e:: text "Enter the" line "amount." @@ -345,38 +349,38 @@ _LookGiantDecoText:: line "fluffy and cuddly." done -_MomShoppingText1:: +_MomHiHowAreYouText:: text "Hi, <PLAYER>!" line "How are you?" prompt -_MomShoppingText2:: +_MomFoundAnItemText:: text "I found a useful" line "item shopping, so" prompt -_MomShoppingText3:: +_MomBoughtWithYourMoneyText:: text "I bought it with" line "your money. Sorry!" prompt -_MomShoppingText4:: +_MomItsInPCText:: text "It's in your PC." line "You'll like it!" done -_MomShoppingText5:: +_MomFoundADollText:: text "While shopping" line "today, I saw this" cont "adorable doll, so" prompt -_MomShoppingText6:: +_MomItsInYourRoomText:: text "It's in your room." line "You'll love it!" done -_TradingText1:: +_MonWasSentToText:: text_ram wPlayerTrademonSpeciesName text " was" line "sent to @" @@ -384,29 +388,29 @@ _TradingText1:: text "." done -_TradingText2:: +_MonNameSentToText:: text_start done -_TradingText3:: +_BidsFarewellToMonText:: text_ram wOTTrademonSenderName text " bids" line "farewell to" done -_TradingText4:: +_MonNameBidsFarewellText:: text_ram wOTTrademonSpeciesName text "." done -_TradingText5:: +_TakeGoodCareOfMonText:: text "Take good care of" line "@" text_ram wOTTrademonSpeciesName text "." done -_TradingText6:: +_ForYourMonSendsText:: text "For @" text_ram wPlayerTrademonSenderName text "'s" @@ -415,7 +419,7 @@ _TradingText6:: text "," done -_TradingText7:: +_OTSendsText:: text_ram wOTTrademonSenderName text " sends" line "@" @@ -423,7 +427,7 @@ _TradingText7:: text "." done -_TradingText8:: +_WillTradeText:: text_ram wOTTrademonSenderName text " will" line "trade @" @@ -432,7 +436,7 @@ _TradingText8:: text_end ; unused -_TradingText9:: +_ForYourMonWillTradeText:: text "for @" text_ram wPlayerTrademonSenderName text "'s" @@ -441,7 +445,7 @@ _TradingText9:: text "." done -_TradingText10:: +_MobilePlayerWillTradeMonText:: text_ram wPlayerTrademonSenderName text " will" line "trade @" @@ -450,7 +454,7 @@ _TradingText10:: text_end ; unused -_TradingText11:: +_MobileForPartnersMonText:: text "for @" text_ram wOTTrademonSenderName text "'s" @@ -459,7 +463,8 @@ _TradingText11:: text "." done -_TradingText12:: +; unused +_MobilePlayersMonTradeText:: text_ram wPlayerTrademonSenderName text "'s" line "@" @@ -467,14 +472,14 @@ _TradingText12:: text " trade…" done -_TradingText13:: +_MobileTakeGoodCareOfMonText:: text "Take good care of" line "@" text_ram wOTTrademonSpeciesName text "." done -_TradingText14:: +_MobilePlayersMonTrade2Text:: text_ram wPlayerTrademonSenderName text "'s" line "@" @@ -482,14 +487,14 @@ _TradingText14:: text " trade…" done -_TradingText15:: +_MobileTakeGoodCareOfText:: text "Take good care of" line "@" text_ram wOTTrademonSpeciesName text "." done -_TradingText16:: +_MobileTradeCameBackText:: text_ram wOTTrademonSpeciesName text " came" line "back!" @@ -539,162 +544,162 @@ _OPT_MaryText1:: text "'s" done -OPT_SweetAdorably:: +_OPT_SweetAdorablyText:: text_start line "sweet and adorably" done -OPT_WigglySlickly:: +_OPT_WigglySlicklyText:: text_start line "wiggly and slickly" done -OPT_AptlyNamed:: +_OPT_AptlyNamedText:: text_start line "aptly named and" done -OPT_UndeniablyKindOf:: +_OPT_UndeniablyKindOfText:: text_start line "undeniably kind of" done -OPT_Unbearably:: +_OPT_UnbearablyText:: text_start line "so, so unbearably" done -OPT_WowImpressively:: +_OPT_WowImpressivelyText:: text_start line "wow, impressively" done -OPT_AlmostPoisonously:: +_OPT_AlmostPoisonouslyText:: text_start line "almost poisonously" done -OPT_Sensually:: +_OPT_SensuallyText:: text_start line "ooh, so sensually" done -OPT_Mischievously:: +_OPT_MischievouslyText:: text_start line "so mischievously" done -OPT_Topically:: +_OPT_TopicallyText:: text_start line "so very topically" done -OPT_Addictively:: +_OPT_AddictivelyText:: text_start line "sure addictively" done -OPT_LooksInWater:: +_OPT_LooksInWaterText:: text_start line "looks in water is" done -OPT_EvolutionMustBe:: +_OPT_EvolutionMustBeText:: text_start line "evolution must be" done -OPT_Provocatively:: +_OPT_ProvocativelyText:: text_start line "provocatively" done -OPT_FlippedOut:: +_OPT_FlippedOutText:: text_start line "so flipped out and" done -OPT_HeartMeltingly:: +_OPT_HeartMeltinglyText:: text_start line "heart-meltingly" done -OPT_Cute:: +_OPT_CuteText:: text_start line "cute." done -OPT_Weird:: +_OPT_WeirdText:: text_start line "weird." done -OPT_Pleasant:: +_OPT_PleasantText:: text_start line "pleasant." done -OPT_BoldSortOf:: +_OPT_BoldSortOfText:: text_start line "bold, sort of." done -OPT_Frightening:: +_OPT_FrighteningText:: text_start line "frightening." done -OPT_SuaveDebonair:: +_OPT_SuaveDebonairText:: text_start line "suave & debonair!" done -OPT_Powerful:: +_OPT_PowerfulText:: text_start line "powerful." done -OPT_Exciting:: +_OPT_ExcitingText:: text_start line "exciting." done -OPT_Groovy:: +_OPT_GroovyText:: text_start line "groovy!" done -OPT_Inspiring:: +_OPT_InspiringText:: text_start line "inspiring." done -OPT_Friendly:: +_OPT_FriendlyText:: text_start line "friendly." done -OPT_HotHotHot:: +_OPT_HotHotHotText:: text_start line "hot, hot, hot!" done -OPT_Stimulating:: +_OPT_StimulatingText:: text_start line "stimulating." done -OPT_Guarded:: +_OPT_GuardedText:: text_start line "guarded." done -OPT_Lovely:: +_OPT_LovelyText:: text_start line "lovely." done -OPT_Speedy:: +_OPT_SpeedyText:: text_start line "speedy." done @@ -862,82 +867,82 @@ _PnP_Text4:: text_end ; unused -_PnP_cute:: +_PnP_CuteText:: text_start line "is cute." done -_PnP_lazy:: +_PnP_LazyText:: text_start line "is sort of lazy." done -_PnP_happy:: +_PnP_HappyText:: text_start line "is always happy." done -_PnP_noisy:: +_PnP_NoisyText:: text_start line "is quite noisy." done -_PnP_precocious:: +_PnP_PrecociousText:: text_start line "is precocious." done -_PnP_bold:: +_PnP_BoldText:: text_start line "is somewhat bold." done -_PnP_picky:: +_PnP_PickyText:: text_start line "is too picky!" done -_PnP_sortofok:: +_PnP_SortOfOKText:: text_start line "is sort of OK." done -_PnP_soso:: +_PnP_SoSoText:: text_start line "is just so-so." done -_PnP_great:: +_PnP_GreatText:: text_start line "is actually great." done -_PnP_mytype:: +_PnP_MyTypeText:: text_start line "is just my type." done -_PnP_cool:: +_PnP_CoolText:: text_start line "is so cool, no?" done -_PnP_inspiring:: +_PnP_InspiringText:: text_start line "is inspiring!" done -_PnP_weird:: +_PnP_WeirdText:: text_start line "is kind of weird." done -_PnP_rightforme:: +_PnP_RightForMeText:: text_start line "is right for me?" done -_PnP_odd:: +_PnP_OddText:: text_start line "is definitely odd!" done @@ -1098,7 +1103,7 @@ _BuenaOffTheAirText:: line "" done -Text_EnemyWithdrew:: +_EnemyWithdrewText:: text "<ENEMY>" line "withdrew" cont "@" @@ -1106,7 +1111,7 @@ Text_EnemyWithdrew:: text "!" prompt -Text_EnemyUsedOn:: +_EnemyUsedOnText:: text "<ENEMY>" line "used @" text_ram wMonOrItemNameBuffer @@ -1280,17 +1285,17 @@ UnknownText_0x1bd2a0:: line "VOLTORBBADGE!" done -UnknownText_0x1bd2bc:: +_AskFloorElevatorText:: text "Which floor?" done -UnknownText_0x1bd2ca:: +_BugCatchingContestTimeUpText:: text "ANNOUNCER: BEEEP!" para "Time's up!" done -UnknownText_0x1bd2e7:: +_BugCatchingContestIsOverText:: text "ANNOUNCER: The" line "Contest is over!" done @@ -1338,7 +1343,7 @@ _ReceiveItemText:: text_ram wStringBuffer1 text "!@" sound_item - text_waitbutton + text_promptbutton text_end text_end ; unused @@ -1352,12 +1357,12 @@ _NoCoinCaseText:: line "COIN CASE." prompt -UnknownText_0x1bd407:: +_NPCTradeCableText:: text "OK, connect the" line "Game Link Cable." prompt -UnknownText_0x1bd429:: +Text_NPCTraded:: text "<PLAYER> traded" line "@" text_ram wMonOrItemNameBuffer @@ -1367,7 +1372,7 @@ UnknownText_0x1bd429:: text ".@" text_end -UnknownText_0x1bd445:: +_NPCTradeFanfareText:: sound_dex_fanfare_80_109 text_pause text_end @@ -1408,7 +1413,7 @@ _NPCTradeCompleteText1:: cont "Thanks!" done -_NPCTradeAFterText1:: +_NPCTradeAfterText1:: text "Hi, how's my old" line "@" text_ram wStringBuffer2 @@ -1571,7 +1576,7 @@ _MomLeavingText3:: para "Now, go on!" done -_MomVisitingText1:: +_MomIsThisAboutYourMoneyText:: text "Hi! Welcome home!" line "You're trying very" cont "hard, I see." @@ -1583,47 +1588,47 @@ _MomVisitingText1:: line "your money?" done -_MomVisitingText2:: +_MomBankWhatDoYouWantToDoText:: text "What do you want" line "to do?" done -_MomVisitingText3:: +_MomStoreMoneyText:: text "How much do you" line "want to save?" done -_MomVisitingText4:: +_MomTakeMoneyText:: text "How much do you" line "want to take?" done -_MomVisitingText5:: +_MomSaveMoneyText:: text "Do you want to" line "save some money?" done -_MomVisitingText6:: +_MomHaventSavedThatMuchText:: text "You haven't saved" line "that much." prompt -_MomVisitingText7:: +_MomNotEnoughRoomInWalletText:: text "You can't take" line "that much." prompt -_MomVisitingText8:: +_MomInsufficientFundsInWalletText:: text "You don't have" line "that much." prompt -_MomVisitingText9:: +_MomNotEnoughRoomInBankText:: text "You can't save" line "that much." prompt -_MomVisitingText10:: +_MomStartSavingMoneyText:: text "OK, I'll save your" line "money. Trust me!" @@ -1631,17 +1636,17 @@ _MomVisitingText10:: line "with it!" done -_MomVisitingText11:: +_MomStoredMoneyText:: text "Your money's safe" line "here! Get going!" done -_MomVisitingText12:: +_MomTakenMoneyText:: text "<PLAYER>, don't" line "give up!" done -_MomVisitingText13:: +_MomJustDoWhatYouCanText:: text "Just do what" line "you can." done @@ -1712,7 +1717,7 @@ _OnlyOneMonText:: line "just one #MON." prompt -_CantRaiseEggText:: +_CantAcceptEggText:: text "Sorry, but I can't" line "accept an EGG." prompt @@ -1796,7 +1801,7 @@ _HaveNoRoomText:: line "for it." prompt -_DCNotEnoughMoneyText:: +_NotEnoughMoneyText:: text "You don't have" line "enough money." prompt @@ -1842,7 +1847,7 @@ _TakeGoodCareOfEggText:: line "it." done -_RefuseEggText:: +_IllKeepItThanksText:: text "Well then, I'll" line "keep it. Thanks!" done @@ -1859,7 +1864,7 @@ _WhichMonPhotoText:: cont "graph?" prompt -_HoldOnText:: +_HoldStillText:: text "All righty. Hold" line "still for a bit." prompt diff --git a/data/text/common_2.asm b/data/text/common_2.asm index 29f5dc0bb..d71a69c20 100644 --- a/data/text/common_2.asm +++ b/data/text/common_2.asm @@ -1,14 +1,14 @@ -UnknownText_0x1c0000:: +_NoPhotoText:: text "Oh, no picture?" line "Come again, OK?" done -UnknownText_0x1c0021:: +_EggPhotoText:: text "An EGG? My talent" line "is worth more…" done -UnknownText_0x1c0043:: +_NameRaterHelloText:: text "Hello, hello! I'm" line "the NAME RATER." @@ -19,13 +19,13 @@ UnknownText_0x1c0043:: line "to rate names?" done -UnknownText_0x1c00a0:: +_NameRaterWhichMonText:: text "Which #MON's" line "nickname should I" cont "rate for you?" prompt -UnknownText_0x1c00cd:: +_NameRaterBetterNameText:: text "Hm… @" text_ram wStringBuffer1 text "…" @@ -40,25 +40,25 @@ UnknownText_0x1c00cd:: line "a better name?" done -UnknownText_0x1c0142:: +_NameRaterWhatNameText:: text "All right. What" line "name should we" cont "give it, then?" prompt -UnknownText_0x1c0171:: +_NameRaterFinishedText:: text "That's a better" line "name than before!" para "Well done!" done -UnknownText_0x1c019e:: +_NameRaterComeAgainText:: text "OK, then. Come" line "again sometime." done -UnknownText_0x1c01be:: +_NameRaterPerfectNameText:: text "Hm… @" text_ram wStringBuffer1 text "?" @@ -71,12 +71,12 @@ UnknownText_0x1c01be:: line "with loving care." done -UnknownText_0x1c0208:: +_NameRaterEggText:: text "Whoa… That's just" line "an EGG." done -UnknownText_0x1c0222:: +_NameRaterSameNameText:: text "It might look the" line "same as before," @@ -86,7 +86,7 @@ UnknownText_0x1c0222:: para "Well done!" done -UnknownText_0x1c0272:: +_NameRaterNamedText:: text "All right. This" line "#MON is now" cont "named @" @@ -99,7 +99,7 @@ Text_Gained:: text " gained@" text_end -Text_ABoostedStringBuffer2ExpPoints:: +_BoostedExpPointsText:: text_start line "a boosted" cont "@" @@ -107,7 +107,7 @@ Text_ABoostedStringBuffer2ExpPoints:: text " EXP. Points!" prompt -Text_StringBuffer2ExpPoints:: +_ExpPointsText:: text_start line "@" text_decimal wStringBuffer2, 2, 4 @@ -132,7 +132,7 @@ Text_YourFoesWeakGetmMon:: line "Get'm, @" text_end -Text_BattleMonNick01:: +_BattleMonNicknameText:: text_ram wBattleMonNick text "!" done @@ -142,35 +142,35 @@ Text_BattleMonNickComma:: text ",@" text_end -Text_ThatsEnoughComeBack:: +_ThatsEnoughComeBackText:: text " that's" line "enough! Come back!@" text_end -Text_OKComeBack:: +_OKComeBackText:: text " OK!" line "Come back!@" text_end -Text_GoodComeBack:: +_GoodComeBackText:: text " good!" line "Come back!@" text_end -Text_ComeBack:: +_ComeBackText:: text " come" line "back!" done -UnknownText_0x1c0373:: +_BootedTMText:: text "Booted up a TM." prompt -UnknownText_0x1c0384:: +_BootedHMText:: text "Booted up an HM." prompt -UnknownText_0x1c0396:: +_ContainedMoveText:: text "It contained" line "@" text_ram wStringBuffer2 @@ -182,7 +182,7 @@ UnknownText_0x1c0396:: line "to a #MON?" done -UnknownText_0x1c03c2:: +_TMHMNotCompatibleText:: text_ram wStringBuffer2 text " is" line "not compatible" @@ -196,7 +196,7 @@ UnknownText_0x1c03c2:: text "." prompt -UnknownText_0x1c03fa:: +_NoRoomTMHMText:: text "You have no room" line "for any more" cont "@" @@ -204,44 +204,44 @@ UnknownText_0x1c03fa:: text "S." prompt -UnknownText_0x1c0421:: +_ReceivedTMHMText:: text "You received" line "@" text_ram wStringBuffer1 text "!" prompt -UnknownText_0x1c0436:: +_MysteryGiftCanceledText:: text "The link has been" line "cancelled." prompt -UnknownText_0x1c0454:: +_MysteryGiftCommErrorText:: text "Communication" line "error." prompt -UnknownText_0x1c046a:: +_RetrieveMysteryGiftText:: text "Must retrieve GIFT" line "at #MON CENTER." prompt -UnknownText_0x1c048e:: +_YourFriendIsNotReadyText:: text "Your friend isn't" line "ready." prompt -UnknownText_0x1c04a7:: +_MysteryGiftFiveADayText:: text "Sorry--only five" line "GIFTS a day." prompt -UnknownText_0x1c04c6:: +_MysteryGiftOneADayText:: text "Sorry. One GIFT" line "a day per person." prompt -UnknownText_0x1c04e9:: +_MysteryGiftSentText:: text_ram wMysteryGiftPartnerName text " sent" line "@" @@ -249,7 +249,7 @@ UnknownText_0x1c04e9:: text "." prompt -UnknownText_0x1c04fa:: +_MysteryGiftSentHomeText:: text_ram wMysteryGiftPartnerName text " sent" line "@" @@ -260,14 +260,14 @@ UnknownText_0x1c04fa:: text "'s home." prompt -UnknownText_0x1c051a:: +_MysteryGiftReceivedCardText:: text "Received" line "@" text_ram wc850 text "'s CARD." prompt -UnknownText_0x1c0531:: +_MysteryGiftListedCardText:: text_ram wc850 text "'s CARD was" line "listed as no.@" @@ -275,17 +275,17 @@ UnknownText_0x1c0531:: text "." prompt -UnknownText_0x1c0555:: +_MysteryGiftNotRegisteredCardText:: text "The CARD was not" line "registered." prompt -UnknownText_0x1c0573:: +_MysteryGiftLinkCancelledText:: text "The link has been" line "cancelled." prompt -UnknownText_0x1c0591:: +_MysteryGiftLinkCommErrorText:: text "Communication" line "error." prompt @@ -295,26 +295,26 @@ _BadgeRequiredText:: line "is required." prompt -UnknownText_0x1c05c8:: +_CantUseItemText:: text "Can't use that" line "here." prompt -UnknownText_0x1c05dd:: +_UseCutText:: text_ram wStringBuffer2 text " used" line "CUT!" prompt -UnknownText_0x1c05ec:: +_CutNothingText:: text "There's nothing to" line "CUT here." prompt -UnknownText_0x1c0609:: +_BlindingFlashText:: text "A blinding FLASH" line "lights the area!@" - text_waitbutton + text_promptbutton text_end text_end ; unused @@ -340,68 +340,68 @@ _AskSurfText:: line "Want to SURF?" done -UnknownText_0x1c068e:: +_UseWaterfallText:: text_ram wStringBuffer2 text " used" line "WATERFALL!" done -UnknownText_0x1c06a3:: +_HugeWaterfallText:: text "Wow, it's a huge" line "waterfall." done -UnknownText_0x1c06bf:: +_AskWaterfallText:: text "Do you want to use" line "WATERFALL?" done -UnknownText_0x1c06de:: +_UseDigText:: text_ram wStringBuffer2 text " used" line "DIG!" done -UnknownText_0x1c06ed:: +_UseEscapeRopeText:: text "<PLAYER> used an" line "ESCAPE ROPE." done -UnknownText_0x1c0705:: +_CantUseDigText:: text "Can't use that" line "here." done -UnknownText_0x1c071a:: +_TeleportReturnText:: text "Return to the last" line "#MON CENTER." done -UnknownText_0x1c073b:: +_CantUseTeleportText:: text "Can't use that" line "here." para "" done -UnknownText_0x1c0751:: +_AlreadyUsingStrengthText:: text "A #MON is using" line "STRENGTH already." prompt -UnknownText_0x1c0774:: +_UseStrengthText:: text_ram wStringBuffer2 text " used" line "STRENGTH!" done -UnknownText_0x1c0788:: +_MoveBoulderText:: text_ram wStringBuffer1 text " can" line "move boulders." prompt -UnknownText_0x1c07a0:: +_AskStrengthText:: text "A #MON may be" line "able to move this." @@ -409,23 +409,23 @@ UnknownText_0x1c07a0:: line "STRENGTH?" done -UnknownText_0x1c07d8:: +_BouldersMoveText:: text "Boulders may now" line "be moved!" done -UnknownText_0x1c07f4:: +_BouldersMayMoveText:: text "A #MON may be" line "able to move this." done -UnknownText_0x1c0816:: +_UseWhirlpoolText:: text_ram wStringBuffer2 text " used" line "WHIRLPOOL!" prompt -UnknownText_0x1c082b:: +_MayPassWhirlpoolText:: text "It's a vicious" line "whirlpool!" @@ -433,7 +433,7 @@ UnknownText_0x1c082b:: line "able to pass it." done -UnknownText_0x1c0864:: +_AskWhirlpoolText:: text "A whirlpool is in" line "the way." @@ -441,17 +441,17 @@ UnknownText_0x1c0864:: line "WHIRLPOOL?" done -UnknownText_0x1c0897:: +_UseHeadbuttText:: text_ram wStringBuffer2 text " did a" line "HEADBUTT!" prompt -UnknownText_0x1c08ac:: +_HeadbuttNothingText:: text "Nope. Nothing…" done -UnknownText_0x1c08bc:: +_AskHeadbuttText:: text "A #MON could be" line "in this tree." @@ -459,18 +459,18 @@ UnknownText_0x1c08bc:: line "it?" done -UnknownText_0x1c08f0:: +_UseRockSmashText:: text_ram wStringBuffer2 text " used" line "ROCK SMASH!" prompt -UnknownText_0x1c0906:: +_MaySmashText:: text "Maybe a #MON" line "can break this." done -UnknownText_0x1c0924:: +_AskRockSmashText:: text "This rock looks" line "breakable." @@ -478,65 +478,66 @@ UnknownText_0x1c0924:: line "SMASH?" done -UnknownText_0x1c0958:: +_RodBiteText:: text "Oh!" line "A bite!" prompt -UnknownText_0x1c0965:: +_RodNothingText:: text "Not even a nibble!" prompt -UnknownText_0x1c0979:: +; unused +_UnusedNothingHereText:: text "Looks like there's" line "nothing here." prompt -UnknownText_0x1c099a:: +_CantGetOffBikeText:: text "You can't get off" line "here!" done -UnknownText_0x1c09b2:: +_GotOnBikeText:: text "<PLAYER> got on the" line "@" text_ram wStringBuffer2 text "." done -UnknownText_0x1c09c7:: +_GotOffBikeText:: text "<PLAYER> got off" line "the @" text_ram wStringBuffer2 text "." done -UnknownText_0x1c09dd:: +_AskCutText:: text "This tree can be" line "CUT!" para "Want to use CUT?" done -UnknownText_0x1c0a05:: +_CanCutText:: text "This tree can be" line "CUT!" done -UnknownText_0x1c0a1c:: +_FoundItemText:: text "<PLAYER> found" line "@" text_ram wStringBuffer3 text "!" done -UnknownText_0x1c0a2c:: +_CantCarryItemText:: text "But <PLAYER> can't" line "carry any more" cont "items." done -UnknownText_0x1c0a4e:: +_WhitedOutText:: text "<PLAYER> is out of" line "useable #MON!" @@ -544,24 +545,24 @@ UnknownText_0x1c0a4e:: line "out!" done -UnknownText_0x1c0a77:: +_ItemfinderItemNearbyText:: text "Yes! ITEMFINDER" line "indicates there's" cont "an item nearby." prompt -UnknownText_0x1c0aa9:: +_ItemfinderNopeText:: text "Nope! ITEMFINDER" line "isn't responding." prompt -UnknownText_0x1c0acc:: +_PoisonFaintText:: text_ram wStringBuffer3 text_start line "fainted!" prompt -UnknownText_0x1c0ada:: +_PoisonWhiteoutText:: text "<PLAYER> is out of" line "useable #MON!" @@ -569,18 +570,18 @@ UnknownText_0x1c0ada:: line "out!" prompt -UnknownText_0x1c0b03:: +_UseSweetScentText:: text_ram wStringBuffer3 text " used" line "SWEET SCENT!" done -UnknownText_0x1c0b1a:: +_SweetScentNothingText:: text "Looks like there's" line "nothing here…" done -UnknownText_0x1c0b3b:: +_SquirtbottleNothingText:: text "<PLAYER> sprinkled" line "water." @@ -588,26 +589,26 @@ UnknownText_0x1c0b3b:: line "happened…" done -UnknownText_0x1c0b65:: +_UseSacredAshText:: text "<PLAYER>'s #MON" line "were all healed!" done -Text_AnEGGCantHoldAnItem:: +_AnEggCantHoldAnItemText:: text "An EGG can't hold" line "an item." prompt -UnknownText_0x1c0b9a:: +_PackNoItemText:: text "No items." done -UnknownText_0x1c0ba5:: +_AskThrowAwayText:: text "Throw away how" line "many?" done -UnknownText_0x1c0bbb:: +_AskQuantityThrowAwayText:: text "Throw away @" text_decimal wItemQuantityChangeBuffer, 1, 2 text_start @@ -616,56 +617,56 @@ UnknownText_0x1c0bbb:: text "(S)?" done -UnknownText_0x1c0bd8:: +_ThrewAwayText:: text "Threw away" line "@" text_ram wStringBuffer2 text "(S)." prompt -UnknownText_0x1c0bee:: +_OakThisIsntTheTimeText:: text "OAK: <PLAYER>!" line "This isn't the" cont "time to use that!" prompt -Text_YouDontHaveAMon:: +_YouDontHaveAMonText:: text "You don't have a" line "#MON!" prompt -UnknownText_0x1c0c2e:: +_RegisteredItemText:: text "Registered the" line "@" text_ram wStringBuffer2 text "." prompt -UnknownText_0x1c0c45:: +_CantRegisterText:: text "You can't register" line "that item." prompt -UnknownText_0x1c0c63:: +_AskItemMoveText:: text "Where should this" line "be moved to?" done -UnknownText_0x1c0c83:: +_PackEmptyText:: text_start done -Text_YouCantUseItInABattle:: +_YouCantUseItInABattleText:: text "You can't use it" line "in a battle." prompt -Text_AreYouABoyOrAreYouAGirl:: +_AreYouABoyOrAreYouAGirlText:: text "Are you a boy?" line "Or are you a girl?" done -UnknownText_0x1c0cc6:: +Text_BattleEffectActivate:: text "<USER>'s" line "@" text_ram wStringBuffer2 @@ -673,16 +674,16 @@ UnknownText_0x1c0cc6:: text_end ; unused -UnknownText_0x1c0cd0:: +_BattleStatWentWayUpText:: text_pause text "<SCROLL>went way up!" prompt -UnknownText_0x1c0ce0:: +_BattleStatWentUpText:: text " went up!" prompt -UnknownText_0x1c0ceb:: +Text_BattleFoeEffectActivate:: text "<TARGET>'s" line "@" text_ram wStringBuffer2 @@ -690,45 +691,45 @@ UnknownText_0x1c0ceb:: text_end ; unused -UnknownText_0x1c0cf5:: +_BattleStatSharplyFellText:: text_pause text "<SCROLL>sharply fell!" prompt -UnknownText_0x1c0d06:: +_BattleStatFellText:: text " fell!" prompt -UnknownText_0x1c0d0e:: +Text_BattleUser:: text "<USER>@" text_end -UnknownText_0x1c0d12:: +_BattleMadeWhirlwindText:: text_start line "made a whirlwind!" prompt -UnknownText_0x1c0d26:: +_BattleTookSunlightText:: text_start line "took in sunlight!" prompt -UnknownText_0x1c0d3a:: +_BattleLoweredHeadText:: text_start line "lowered its head!" prompt -UnknownText_0x1c0d4e:: +_BattleGlowingText:: text_start line "is glowing!" prompt -UnknownText_0x1c0d5c:: +_BattleFlewText:: text_start line "flew up high!" prompt -UnknownText_0x1c0d6c:: +_BattleDugText:: text_start line "dug a hole!" prompt @@ -778,34 +779,34 @@ _EndUsedMove5Text:: text "!" done -UnknownText_0x1c0db0:: +Text_BreedHuh:: text "Huh?" para "@" text_end -UnknownText_0x1c0db8:: +_BreedClearboxText:: text_start done -UnknownText_0x1c0dba:: +_BreedEggHatchText:: text_ram wStringBuffer1 text " came" line "out of its EGG!@" sound_caught_mon - text_waitbutton + text_promptbutton text_end text_end ; unused -UnknownText_0x1c0dd8:: +_BreedAskNicknameText:: text "Give a nickname to" line "@" text_ram wStringBuffer1 text "?" done -UnknownText_0x1c0df3:: +_LeftWithDayCareLadyText:: text "It's @" text_ram wBreedMon2Nick text_start @@ -813,7 +814,7 @@ UnknownText_0x1c0df3:: cont "the DAY-CARE LADY." done -UnknownText_0x1c0e24:: +_LeftWithDayCareManText:: text "It's @" text_ram wBreedMon1Nick text_start @@ -821,33 +822,33 @@ UnknownText_0x1c0e24:: cont "the DAY-CARE MAN." done -UnknownText_0x1c0e54:: +_BreedBrimmingWithEnergyText:: text "It's brimming with" line "energy." prompt -UnknownText_0x1c0e6f:: +_BreedNoInterestText:: text "It has no interest" line "in @" text_ram wStringBuffer1 text "." prompt -UnknownText_0x1c0e8d:: +_BreedAppearsToCareForText:: text "It appears to care" line "for @" text_ram wStringBuffer1 text "." prompt -UnknownText_0x1c0eac:: +_BreedFriendlyText:: text "It's friendly with" line "@" text_ram wStringBuffer1 text "." prompt -UnknownText_0x1c0ec6:: +_BreedShowsInterestText:: text "It shows interest" line "in @" text_ram wStringBuffer1 @@ -859,44 +860,47 @@ _EmptyMailboxText:: line "here." prompt -ClearedMailPutAwayText:: +_MailClearedPutAwayText:: text "The cleared MAIL" line "was put away." prompt -MailPackFullText:: +_MailPackFullText:: text "The PACK is full." prompt -MailMessageLostText:: +_MailMessageLostText:: text "The MAIL's message" line "will be lost. OK?" done -MailAlreadyHoldingItemText:: +_MailAlreadyHoldingItemText:: text "It's already hold-" line "ing an item." prompt -MailEggText:: +_MailEggText:: text "An EGG can't hold" line "any MAIL." prompt -MailMovedFromBoxText:: +_MailMovedFromBoxText:: text "The MAIL was moved" line "from the MAILBOX." prompt -UnknownText_0x1c0fb3:: +; unused +_YesPromptText:: text "Yes" prompt -UnknownText_0x1c0fb8:: +; unused +_NoPromptText:: text "No" prompt -UnknownText_0x1c0fbc:: +; unused +_AnimationTypeText:: text_decimal wcf64, 1, 3 text " @" text_ram wStringBuffer1 @@ -907,26 +911,27 @@ UnknownText_0x1c0fbc:: text_end ; unused -UnknownText_0x1c0fdd:: +; unused +_MonNumberText:: text "#MON number?" done -Text_WasSentToBillsPC:: +_WasSentToBillsPCText:: text_ram wStringBuffer1 text " was" line "sent to BILL's PC." prompt -UnknownText_0x1c1006:: +_PCGottaHavePokemonText:: text "You gotta have" line "#MON to call!" prompt -UnknownText_0x1c1024:: +_PCWhatText:: text "What?" done -UnknownText_0x1c102b:: +_PCMonHoldingMailText:: text "There is a #MON" line "holding MAIL." @@ -934,39 +939,39 @@ UnknownText_0x1c102b:: line "MAIL." prompt -UnknownText_0x1c1062:: +_PCNoSingleMonText:: text "You don't have a" line "single #MON!" prompt -UnknownText_0x1c1080:: +_PCCantDepositLastMonText:: text "You can't deposit" line "your last #MON!" prompt -UnknownText_0x1c10a2:: +_PCCantTakeText:: text "You can't take any" line "more #MON." prompt -UnknownText_0x1c10c0:: +_ContestCaughtMonText:: text "Caught @" text_ram wStringBuffer1 text "!" prompt -UnknownText_0x1c10cf:: +_ContestAskSwitchText:: text "Switch #MON?" done -UnknownText_0x1c10dd:: +_ContestAlreadyCaughtText:: text "You already caught" line "a @" text_ram wStringBuffer1 text "." prompt -ContestJudging_FirstPlaceText:: +_ContestJudging_FirstPlaceText:: text "This Bug-Catching" line "Contest winner is@" text_pause @@ -981,7 +986,7 @@ ContestJudging_FirstPlaceText:: text "!@" text_end -ContestJudging_FirstPlaceScoreText:: +_ContestJudging_FirstPlaceScoreText:: text_start para "The winning score" @@ -990,7 +995,7 @@ ContestJudging_FirstPlaceScoreText:: text " points!" prompt -ContestJudging_SecondPlaceText:: +_ContestJudging_SecondPlaceText:: text "Placing second was" line "@" text_ram wBugContestWinnerName @@ -1002,7 +1007,7 @@ ContestJudging_SecondPlaceText:: text "!@" text_end -ContestJudging_SecondPlaceScoreText:: +_ContestJudging_SecondPlaceScoreText:: text_start para "The score was" @@ -1011,7 +1016,7 @@ ContestJudging_SecondPlaceScoreText:: text " points!" prompt -ContestJudging_ThirdPlaceText:: +_ContestJudging_ThirdPlaceText:: text "Placing third was" line "@" text_ram wBugContestWinnerName @@ -1023,7 +1028,7 @@ ContestJudging_ThirdPlaceText:: text "!@" text_end -ContestJudging_ThirdPlaceScoreText:: +_ContestJudging_ThirdPlaceScoreText:: text_start para "The score was" @@ -1032,7 +1037,7 @@ ContestJudging_ThirdPlaceScoreText:: text " points!" prompt -UnknownText_0x1c1203:: +_MagikarpGuruMeasureText:: text "Let me measure" line "that MAGIKARP." @@ -1042,7 +1047,7 @@ UnknownText_0x1c1203:: text "." prompt -UnknownText_0x1c123a:: +_KarpGuruRecordText:: text "CURRENT RECORD" para "@" @@ -1050,12 +1055,12 @@ UnknownText_0x1c123a:: text " caught by" line "@" text_ram wMagikarpRecordHoldersName - text_waitbutton + text_promptbutton text_end text_end ; unused -UnknownText_0x1c1261:: +_LuckyNumberMatchPartyText:: text "Congratulations!" para "We have a match" @@ -1067,7 +1072,7 @@ UnknownText_0x1c1261:: line "your party." prompt -UnknownText_0x1c12ae:: +_LuckyNumberMatchPCText:: text "Congratulations!" para "We have a match" @@ -1079,7 +1084,7 @@ UnknownText_0x1c12ae:: line "your PC BOX." prompt -UnknownText_0x1c12fc:: +_CaughtAskNicknameText:: text "Give a nickname to" line "the @" text_ram wStringBuffer1 @@ -1087,18 +1092,18 @@ UnknownText_0x1c12fc:: cont "received?" done -UnknownText_0x1c1328:: +_PokecenterPCCantUseText:: text "Bzzzzt! You must" line "have a #MON to" cont "use this!" prompt -UnknownText_0x1c1353:: +_PlayersPCTurnOnText:: text "<PLAYER> turned on" line "the PC." prompt -UnknownText_0x1c1368:: +_PlayersPCAskWhatDoText:: text "What do you want" line "to do?" done @@ -1122,7 +1127,7 @@ _PlayersPCNoRoomWithdrawText:: line "for more items." prompt -UnknownText_0x1c13df:: +_PlayersPCNoItemsText:: text "No items here!" prompt @@ -1145,16 +1150,16 @@ _PlayersPCNoRoomDepositText:: line "store items." prompt -UnknownText_0x1c144d:: +_PokecenterPCTurnOnText:: text "<PLAYER> turned on" line "the PC." prompt -UnknownText_0x1c1462:: +_PokecenterPCWhoseText:: text "Access whose PC?" done -UnknownText_0x1c1474:: +_PokecenterBillsPCText:: text "BILL's PC" line "accessed." @@ -1162,14 +1167,14 @@ UnknownText_0x1c1474:: line "System opened." prompt -UnknownText_0x1c14a4:: +_PokecenterPlayersPCText:: text "Accessed own PC." para "Item Storage" line "System opened." prompt -UnknownText_0x1c14d2:: +_PokecenterOaksPCText:: text "PROF.OAK's PC" line "accessed." @@ -1177,7 +1182,7 @@ UnknownText_0x1c14d2:: line "System opened." prompt -UnknownText_0x1c1505:: +_PokecenterPCOaksClosedText:: text "…" line "Link closed…" done @@ -1347,7 +1352,8 @@ _OakPCText4:: line "OAK's PC closed." done -UnknownText_0x1c19cd:: +; unused +_TrainerRankingExplanationText:: text "Triple-theme" line "trainer ranking!" @@ -1358,7 +1364,8 @@ UnknownText_0x1c19cd:: para "" done -UnknownText_0x1c1a22:: +; unused +_TrainerRankingNoDataText:: text "There is no" line "ranking data." @@ -1368,27 +1375,27 @@ UnknownText_0x1c1a22:: para "" done -UnknownText_0x1c1a5b:: +_DummyGameYeahText:: text " , yeah!" done -UnknownText_0x1c1a65:: +_DummyGameDarnText:: text "Darn…" done -UnknownText_0x1c1a6c:: +_StartMenuContestEndText:: text "Would you like to" line "end the Contest?" done -UnknownText_0x1c1a90:: +_ItemsTossOutHowManyText:: text "Toss out how many" line "@" text_ram wStringBuffer2 text "(S)?" done -UnknownText_0x1c1aad:: +_ItemsThrowAwayText:: text "Throw away @" text_decimal wItemQuantityChangeBuffer, 1, 2 text_start @@ -1397,25 +1404,25 @@ UnknownText_0x1c1aad:: text "(S)?" done -UnknownText_0x1c1aca:: +_ItemsDiscardedText:: text "Discarded" line "@" text_ram wStringBuffer1 text "(S)." prompt -UnknownText_0x1c1adf:: +_ItemsTooImportantText:: text "That's too impor-" line "tant to toss out!" prompt -UnknownText_0x1c1b03:: +_ItemsOakWarningText:: text "OAK: <PLAYER>!" line "This isn't the" cont "time to use that!" done -UnknownText_0x1c1b2c:: +_PokemonSwapItemText:: text "Took @" text_ram wMonOrItemNameBuffer text "'s" @@ -1429,7 +1436,7 @@ UnknownText_0x1c1b2c:: text "." prompt -UnknownText_0x1c1b57:: +_PokemonHoldItemText:: text "Made @" text_ram wMonOrItemNameBuffer text_start @@ -1438,23 +1445,23 @@ UnknownText_0x1c1b57:: text "." prompt -UnknownText_0x1c1b6f:: +_PokemonRemoveMailText:: text "Please remove the" line "MAIL first." prompt -UnknownText_0x1c1b8e:: +_PokemonNotHoldingText:: text_ram wMonOrItemNameBuffer text " isn't" line "holding anything." prompt -UnknownText_0x1c1baa:: +_ItemStorageFullText:: text "Item storage space" line "full." prompt -UnknownText_0x1c1bc4:: +_PokemonTookItemText:: text "Took @" text_ram wStringBuffer1 text_start @@ -1463,7 +1470,7 @@ UnknownText_0x1c1bc4:: text "." prompt -UnknownText_0x1c1bdc:: +_PokemonAskSwapItemText:: text_ram wMonOrItemNameBuffer text " is" line "already holding" @@ -1474,48 +1481,48 @@ UnknownText_0x1c1bdc:: line "Switch items?" done -UnknownText_0x1c1c09:: +_ItemCantHeldText:: text "This item can't be" line "held." prompt -UnknownText_0x1c1c22:: +_MailLoseMessageText:: text "The MAIL will lose" line "its message. OK?" done -UnknownText_0x1c1c47:: +_MailDetachedText:: text "MAIL detached from" line "@" text_ram wStringBuffer1 text "." prompt -UnknownText_0x1c1c62:: +_MailNoSpaceText:: text "There's no space" line "for removing MAIL." prompt -UnknownText_0x1c1c86:: +_MailAskSendToPCText:: text "Send the removed" line "MAIL to your PC?" done -UnknownText_0x1c1ca9:: +_MailboxFullText:: text "Your PC's MAILBOX" line "is full." prompt -UnknownText_0x1c1cc4:: +_MailSentToPCText:: text "The MAIL was sent" line "to your PC." prompt -UnknownText_0x1c1ce3:: +_PokemonNotEnoughHPText:: text "Not enough HP!" prompt -UnknownText_0x1c1cf3:: +_MayRegisterItemText:: text "An item in your" line "PACK may be" @@ -1544,7 +1551,7 @@ _OakText2:: text_end _OakText3:: - text_waitbutton + text_promptbutton text_end text_end ; unused diff --git a/data/text/common_3.asm b/data/text/common_3.asm index 09278eb29..19c1b7aeb 100644 --- a/data/text/common_3.asm +++ b/data/text/common_3.asm @@ -25,7 +25,7 @@ _OakText7:: line "later!" done -UnknownText_0x1c40e6:: +_ClockTimeMayBeWrongText:: text "The clock's time" line "may be wrong." @@ -33,7 +33,7 @@ UnknownText_0x1c40e6:: line "time." prompt -UnknownText_0x1c411c:: +_ClockSetWithControlPadText:: text "Set with the" line "Control Pad." @@ -41,28 +41,28 @@ UnknownText_0x1c411c:: line "Cancel: B Button" done -UnknownText_0x1c415b:: +_ClockIsThisOKText:: text "Is this OK?" done -UnknownText_0x1c4168:: +_ClockHasResetText:: text "The clock has been" line "reset." done -UnknownText_0x1c4183:: +_LinkTimeoutText:: text "Too much time has" line "elapsed. Please" cont "try again." prompt -UnknownText_0x1c41b1:: +_LinkTradeCantBattleText:: text "If you trade that" line "#MON, you won't" cont "be able to battle." prompt -UnknownText_0x1c41e6:: +_LinkAbnormalMonText:: text "Your friend's" line "@" text_ram wStringBuffer1 @@ -70,7 +70,7 @@ UnknownText_0x1c41e6:: cont "to be abnormal!" prompt -UnknownText_0x1c4212:: +_LinkAskTradeForText:: text "Trade @" text_ram wd004 text_start @@ -162,12 +162,12 @@ UnknownText_0x1c449c:: line "the same settings?" done -UnknownText_0x1c44c0:: +_MobileBattleLessThanOneMinuteLeftText:: text "There is less than" line "1 min. left today!" done -UnknownText_0x1c44e7:: +_MobileBattleNoTimeLeftForLinkingText:: text "No time left for" line "linking today." done @@ -184,61 +184,63 @@ UnknownText_0x1c4525:: text " min." done -UnknownText_0x1c454b:: +_WouldYouLikeToSaveTheGameText:: text "Would you like to" line "save the game?" done -UnknownText_0x1c456d:: +_SavingDontTurnOffThePowerText:: text "SAVING… DON'T TURN" line "OFF THE POWER." done -UnknownText_0x1c4590:: +_SavedTheGameText:: text "<PLAYER> saved" line "the game." done -UnknownText_0x1c45a3:: +_AlreadyASaveFileText:: text "There is already a" line "save file. Is it" cont "OK to overwrite?" done -UnknownText_0x1c45d9:: +_AnotherSaveFileText:: text "There is another" line "save file. Is it" cont "OK to overwrite?" done -UnknownText_0x1c460d:: +_SaveFileCorruptedText:: text "The save file is" line "corrupted!" prompt -UnknownText_0x1c462a:: +_ChangeBoxSaveText:: text "When you change a" line "#MON BOX, data" cont "will be saved. OK?" done -UnknownText_0x1c465f:: +_MoveMonWOMailSaveText:: text "Each time you move" line "a #MON, data" cont "will be saved. OK?" done -UnknownText_0x1c4693:: +; unused +_WindowAreaExceededErrorText:: text "The window save" line "area was exceeded." done -UnknownText_0x1c46b7:: +_WindowPoppingErrorText:: text "No windows avail-" line "able for popping." done -UnknownText_0x1c46dc:: +; unused +_CorruptedEventErrorText:: text "Corrupted event!" prompt @@ -246,22 +248,22 @@ _ObjectEventText:: text "Object event" done -UnknownText_0x1c46fc:: +_BGEventText:: text "BG event" done -UnknownText_0x1c4706:: +_CoordinatesEventText:: text "Coordinates event" done -UnknownText_0x1c4719:: +_ReceivedItemText:: text "<PLAYER> received" line "@" text_ram wStringBuffer4 text "." done -UnknownText_0x1c472c:: +_PutItemInPocketText:: text "<PLAYER> put the" line "@" text_ram wStringBuffer1 @@ -271,14 +273,14 @@ UnknownText_0x1c472c:: text "." prompt -UnknownText_0x1c474b:: +_PocketIsFullText:: text "The @" text_ram wStringBuffer3 text_start line "is full…" prompt -UnknownText_0x1c475f:: +_SeerSeeAllText:: text "I see all." line "I know all…" @@ -286,7 +288,7 @@ UnknownText_0x1c475f:: line "of your #MON!" done -UnknownText_0x1c4797:: +_SeerCantTellAThingText:: text "Whaaaat? I can't" line "tell a thing!" @@ -294,7 +296,7 @@ UnknownText_0x1c4797:: line "know of this?" done -UnknownText_0x1c47d4:: +_SeerNameLocationText:: text "Hm… I see you met" line "@" text_ram wSeerNickname @@ -304,7 +306,7 @@ UnknownText_0x1c47d4:: text "!" prompt -UnknownText_0x1c47fa:: +_SeerTimeLevelText:: text "The time was" line "@" text_ram wSeerTimeOfDay @@ -317,7 +319,7 @@ UnknownText_0x1c47fa:: para "Am I good or what?" prompt -UnknownText_0x1c4837:: +_SeerTradeText:: text "Hm… @" text_ram wSeerNickname text_start @@ -337,7 +339,7 @@ UnknownText_0x1c4837:: text "!" prompt -UnknownText_0x1c487f:: +_SeerNoLocationText:: text "What!? Incredible!" para "I don't understand" @@ -355,7 +357,7 @@ UnknownText_0x1c487f:: para "Am I good or what?" prompt -UnknownText_0x1c491d:: +_SeerEggText:: text "Hey!" para "That's an EGG!" @@ -364,12 +366,12 @@ UnknownText_0x1c491d:: line "you've met it yet…" done -UnknownText_0x1c4955:: +_SeerDoNothingText:: text "Fufufu! I saw that" line "you'd do nothing!" done -UnknownText_0x1c497a:: +_SeerMoreCareText:: text "Incidentally…" para "It would be wise" @@ -379,7 +381,7 @@ UnknownText_0x1c497a:: line "little more care." done -UnknownText_0x1c49c6:: +_SeerMoreConfidentText:: text "Incidentally…" para "It seems to have" @@ -392,7 +394,7 @@ UnknownText_0x1c49c6:: cont "more confident." done -UnknownText_0x1c4a21:: +_SeerMuchStrengthText:: text "Incidentally…" para "@" @@ -402,7 +404,7 @@ UnknownText_0x1c4a21:: cont "much strength." done -UnknownText_0x1c4a5b:: +_SeerMightyText:: text "Incidentally…" para "It certainly has" @@ -420,7 +422,7 @@ UnknownText_0x1c4a5b:: line "with confidence." done -UnknownText_0x1c4ae5:: +_SeerImpressedText:: text "Incidentally…" para "I'm impressed by" @@ -444,7 +446,7 @@ UnknownText_0x1c4ae5:: line "excite anyone." done -UnknownText_0x1c4b92:: +_CongratulationsYourPokemonText:: text "Congratulations!" line "Your @" text_ram wStringBuffer2 @@ -452,7 +454,7 @@ UnknownText_0x1c4b92:: text_end ; unused -UnknownText_0x1c4baf:: +_EvolvedIntoText:: text_start para "evolved into" @@ -461,25 +463,25 @@ UnknownText_0x1c4baf:: text "!" done -UnknownText_0x1c4bc5:: +_StoppedEvolvingText:: text "Huh? @" text_ram wStringBuffer2 text_start line "stopped evolving!" prompt -UnknownText_0x1c4be3:: +_EvolvingText:: text "What? @" text_ram wStringBuffer2 text_start line "is evolving!" done -UnknownText_0x1c4bfd:: +_MartHowManyText:: text "How many?" done -UnknownText_0x1c4c08:: +_MartFinalPriceText:: text_decimal wItemQuantityChangeBuffer, 1, 2 text " @" text_ram wStringBuffer2 @@ -489,7 +491,7 @@ UnknownText_0x1c4c08:: text "." done -UnknownText_0x1c4c28:: +_HerbShopLadyIntroText:: text "Hello, dear." para "I sell inexpensive" @@ -504,11 +506,11 @@ UnknownText_0x1c4c28:: para "Hehehehe…" done -UnknownText_0x1c4ca3:: +_HerbalLadyHowManyText:: text "How many?" done -UnknownText_0x1c4cae:: +_HerbalLadyFinalPriceText:: text_decimal wItemQuantityChangeBuffer, 1, 2 text " @" text_ram wStringBuffer2 @@ -518,27 +520,27 @@ UnknownText_0x1c4cae:: text "." done -UnknownText_0x1c4cce:: +_HerbalLadyThanksText:: text "Thank you, dear." line "Hehehehe…" done -UnknownText_0x1c4cea:: +_HerbalLadyPackFullText:: text "Oh? Your PACK is" line "full, dear." done -UnknownText_0x1c4d08:: +_HerbalLadyNoMoneyText:: text "Hehehe… You don't" line "have the money." done -UnknownText_0x1c4d2a:: +_HerbalLadyComeAgainText:: text "Come again, dear." line "Hehehehe…" done -UnknownText_0x1c4d47:: +_BargainShopIntroText:: text "Hiya! Care to see" line "some bargains?" @@ -549,7 +551,7 @@ UnknownText_0x1c4d47:: line "one of each item." done -UnknownText_0x1c4db0:: +_BargainShopFinalPriceText:: text_ram wStringBuffer2 text " costs" line "¥@" @@ -557,41 +559,41 @@ UnknownText_0x1c4db0:: text ". Want it?" done -UnknownText_0x1c4dcd:: +_BargainShopThanksText:: text "Thanks." done -UnknownText_0x1c4dd6:: +_BargainShopPackFullText:: text "Uh-oh, your PACK" line "is chock-full." done -UnknownText_0x1c4df7:: +_BargainShopSoldOutText:: text "You bought that" line "already. I'm all" cont "sold out of it." done -UnknownText_0x1c4e28:: +_BargainShopNoFundsText:: text "Uh-oh, you're" line "short on funds." done -UnknownText_0x1c4e46:: +_BargainShopComeAgainText:: text "Come by again" line "sometime." done -UnknownText_0x1c4e5f:: +_PharmacyIntroText:: text "What's up? Need" line "some medicine?" done -UnknownText_0x1c4e7e:: +_PharmacyHowManyText:: text "How many?" done -UnknownText_0x1c4e89:: +_PharmacyFinalPriceText:: text_decimal wItemQuantityChangeBuffer, 1, 2 text " @" text_ram wStringBuffer2 @@ -601,35 +603,36 @@ UnknownText_0x1c4e89:: text "." done -UnknownText_0x1c4eab:: +_PharmacyThanksText:: text "Thanks much!" done -UnknownText_0x1c4eb9:: +_PharmacyPackFullText:: text "You don't have any" line "more space." done -UnknownText_0x1c4ed8:: +_PharmacyNoMoneyText:: text "Huh? That's not" line "enough money." done -UnknownText_0x1c4ef6:: +_PharmacyComeAgainText:: text "All right." line "See you around." done -UnknownText_0x1c4f12:: +; unused +_NothingToSellText:: text "You don't have" line "anything to sell." prompt -UnknownText_0x1c4f33:: +_MartSellHowManyText:: text "How many?" done -UnknownText_0x1c4f3e:: +_MartSellPriceText:: text "I can pay you" line "¥@" text_decimal hMoneyTemp, 3, 6 @@ -638,41 +641,41 @@ UnknownText_0x1c4f3e:: para "Is that OK?" done -UnknownText_0x1c4f62:: +_MartWelcomeText:: text "Welcome! How may I" line "help you?" done -UnknownText_0x1c4f80:: +_MartThanksText:: text "Here you are." line "Thank you!" done -UnknownText_0x1c4f9a:: +_MartNoMoneyText:: text "You don't have" line "enough money." done -UnknownText_0x1c4fb7:: +_MartPackFullText:: text "You can't carry" line "any more items." done -UnknownText_0x1c4fd7:: +_MartCantBuyText:: text "Sorry, I can't buy" line "that from you." prompt -UnknownText_0x1c4ff9:: +_MartComeAgainText:: text "Please come again!" done -UnknownText_0x1c500d:: +_MartAskMoreText:: text "Can I do anything" line "else for you?" done -UnknownText_0x1c502e:: +_MartBoughtText:: text "Got ¥@" text_decimal hMoneyTemp, 3, 6 text " for" @@ -681,37 +684,37 @@ UnknownText_0x1c502e:: text "(S)." done -UnknownText_0x1c5049:: +_SlotsBetHowManyCoinsText:: text "Bet how many" line "coins?" done -UnknownText_0x1c505e:: +_SlotsStartText:: text "Start!" done -UnknownText_0x1c5066:: +_SlotsNotEnoughCoinsText:: text "Not enough" line "coins." prompt -UnknownText_0x1c5079:: +_SlotsRanOutOfCoinsText:: text "Darn… Ran out of" line "coins…" done -UnknownText_0x1c5092:: +_SlotsPlayAgainText:: text "Play again?" done -UnknownText_0x1c509f:: +_SlotsLinedUpText:: text "lined up!" line "Won @" text_ram wStringBuffer2 text " coins!" done -UnknownText_0x1c50bb:: +_SlotsDarnText:: text "Darn!" done @@ -739,26 +742,30 @@ _MobileStadiumSuccessText:: para "" done -UnknownText_0x1c5182:: +_MainMenuTimeUnknownText:: text "Clock time unknown" done -UnknownText_0x1c5196:: +; unused mobile +_DeleteSavedLoginPasswordText:: text "Delete the saved" line "LOG-IN PASSWORD?" done -UnknownText_0x1c51b9:: +; unused mobile +_DeletedTheLoginPasswordText:: text "Deleted the LOG-IN" line "PASSWORD." done -UnknownText_0x1c51d7:: +; unused mobile +_MobilePickThreeMonForBattle:: text "Pick three #MON" line "for battle." prompt -UnknownText_0x1c51f4:: +; unused mobile +_MobileUseTheseThreeMonText:: text_ram wMobileParticipant1Nickname text "," line "@" @@ -771,12 +778,14 @@ UnknownText_0x1c51f4:: para "Use these three?" done -UnknownText_0x1c521c:: +; unused mobile +_MobileOnlyThreeMonMayEnterText:: text "Only three #MON" line "may enter." prompt -UnknownText_0x1c5238:: +; unused mobile +_MobileCardFolderIntro1Text:: text "The CARD FOLDER" line "stores your and" @@ -793,7 +802,8 @@ UnknownText_0x1c5238:: para "" done -UnknownText_0x1c52bc:: +; unused mobile +_MobileCardFolderIntro2Text:: text "This is your CARD." para "Once you've" @@ -806,7 +816,8 @@ UnknownText_0x1c52bc:: para "" done -UnknownText_0x1c531e:: +; unused mobile +_MobileCardFolderIntro3Text:: text "If you have your" line "friend's CARD, you" @@ -820,7 +831,8 @@ UnknownText_0x1c531e:: para "" done -UnknownText_0x1c5394:: +; unused mobile +_MobileCardFolderIntro4Text:: text "To safely store" line "your collection of" @@ -831,7 +843,8 @@ UnknownText_0x1c5394:: para "" done -UnknownText_0x1c53ee:: +; unused mobile +_MobileCardFolderAskDeleteText:: text "If the CARD FOLDER" line "is deleted, all" @@ -847,19 +860,22 @@ UnknownText_0x1c53ee:: line "your CARD FOLDER?" done -UnknownText_0x1c5494:: +; unused mobile +_MobileCardFolderDeleteAreYouSureText:: text "Are you sure you" line "want to delete it?" done -UnknownText_0x1c54b9:: +; unused mobile +_MobileCardFolderDeletedText:: text "The CARD FOLDER" line "has been deleted." para "" done -UnknownText_0x1c54dd:: +; unused mobile +_MobileCardFolderAskOpenOldText:: text "There is an older" line "CARD FOLDER from a" cont "previous journey." @@ -868,96 +884,99 @@ UnknownText_0x1c54dd:: line "open it?" done -UnknownText_0x1c552d:: +; unused mobile +_MobileCardFolderAskDeleteOldText:: text "Delete the old" line "CARD FOLDER?" done -UnknownText_0x1c554a:: +; unused mobile +_MobileCardFolderFinishRegisteringCardsText:: text "Finish registering" line "CARDS?" done -UnknownText_0x1c5565:: +_PhoneWrongNumberText:: text "Huh? Sorry, wrong" line "number!" done -UnknownText_0x1c5580:: +_PhoneClickText:: text "Click!" done -UnknownText_0x1c5588:: +_PhoneEllipseText:: text "<……>" done -UnknownText_0x1c558b:: +_PhoneOutOfAreaText:: text "That number is out" line "of the area." done -UnknownText_0x1c55ac:: +_PhoneJustTalkToThemText:: text "Just go talk to" line "that person!" done -UnknownText_0x1c55ca:: +_PhoneThankYouText:: text "Thank you!" done +; unused UnknownText_0x1c55d6:: text " :" done -UnknownText_0x1c55db:: +_PasswordAskResetText:: text "Password OK." line "Select CONTINUE &" cont "reset settings." prompt -UnknownText_0x1c560b:: +_PasswordWrongText:: text "Wrong password!" prompt -UnknownText_0x1c561c:: +_PasswordAskResetClockText:: text "Reset the clock?" done -UnknownText_0x1c562e:: +_PasswordAskEnterText:: text "Please enter the" line "password." done -UnknownText_0x1c564a:: +_ClearAllSaveDataText:: text "Clear all save" line "data?" done -UnknownText_0x1c5660:: +_LearnedMoveText:: text_ram wMonOrItemNameBuffer text " learned" line "@" text_ram wStringBuffer2 text "!@" sound_dex_fanfare_50_79 - text_waitbutton + text_promptbutton text_end text_end ; unused -UnknownText_0x1c5678:: +_MoveAskForgetText:: text "Which move should" next "be forgotten?" done -UnknownText_0x1c5699:: +_StopLearningMoveText:: text "Stop learning" line "@" text_ram wStringBuffer2 text "?" done -UnknownText_0x1c56af:: +_DidNotLearnMoveText:: text_ram wMonOrItemNameBuffer text_start line "did not learn" @@ -966,7 +985,7 @@ UnknownText_0x1c56af:: text "." prompt -UnknownText_0x1c56c9:: +_AskForgetMoveText:: text_ram wMonOrItemNameBuffer text " is" line "trying to learn" @@ -987,14 +1006,14 @@ UnknownText_0x1c56c9:: text "?" done -UnknownText_0x1c5740:: +Text_MoveForgetCount:: text "1, 2 and…@" text_pause text_end text_end ; unused -UnknownText_0x1c574e:: +_MoveForgotText:: text " Poof!@" text_pause text_start @@ -1009,126 +1028,126 @@ UnknownText_0x1c574e:: para "And…" prompt -UnknownText_0x1c5772:: +_MoveCantForgetHMText:: text "HM moves can't be" line "forgotten now." prompt -UnknownText_0x1c5793:: +_CardFlipPlayWithThreeCoinsText:: text "Play with three" line "coins?" done -UnknownText_0x1c57ab:: +_CardFlipNotEnoughCoinsText:: text "Not enough coins…" prompt -UnknownText_0x1c57be:: +_CardFlipChooseACardText:: text "Choose a card." done -UnknownText_0x1c57ce:: +_CardFlipPlaceYourBetText:: text "Place your bet." done -UnknownText_0x1c57df:: +_CardFlipPlayAgainText:: text "Want to play" line "again?" done -UnknownText_0x1c57f4:: +_CardFlipShuffledText:: text "The cards have" line "been shuffled." prompt -UnknownText_0x1c5813:: +_CardFlipYeahText:: text "Yeah!" done -UnknownText_0x1c581a:: +_CardFlipDarnText:: text "Darn…" done -UnknownText_0x1c5821:: +_GearTodayText:: text_today text_end text_end ; unused -UnknownText_0x1c5824:: +_GearEllipseText:: text "<……>" done -UnknownText_0x1c5827:: +_GearOutOfServiceText:: text "You're out of the" line "service area." prompt -UnknownText_0x1c5847:: +_PokegearAskWhoCallText:: text "Whom do you want" line "to call?" done -UnknownText_0x1c5862:: +_PokegearPressButtonText:: text "Press any button" line "to exit." done -UnknownText_0x1c587d:: +_PokegearAskDeleteText:: text "Delete this stored" line "phone number?" done -UnknownText_0x1c589f:: +_BuenaAskWhichPrizeText:: text "Which prize would" line "you like?" done -UnknownText_0x1c58bc:: +_BuenaIsThatRightText:: text_ram wStringBuffer1 text "?" line "Is that right?" done -UnknownText_0x1c58d1:: +_BuenaHereYouGoText:: text "Here you go!" para "" done -UnknownText_0x1c58e0:: +_BuenaNotEnoughPointsText:: text "You don't have" line "enough points." para "" done -UnknownText_0x1c58ff:: +_BuenaNoRoomText:: text "You have no room" line "for it." para "" done -UnknownText_0x1c591a:: +_BuenaComeAgainText:: text "Oh. Please come" line "back again!" done -UnknownText_0x1c5937:: +_BTExcuseMeText:: text "Excuse me!" para "" done -Text_ExcuseMeYoureNotReady:: +_ExcuseMeYoureNotReadyText:: text "Excuse me." line "You're not ready." para "" done -UnknownText_0x1c5962:: +_BattleTowerReturnWhenReadyText:: text "Please return when" line "you're ready." done @@ -1181,7 +1200,7 @@ _YouCantTakeAnEggText:: para "" done -UnknownText_0x1c5a5a:: +_BallDodgedText:: text "It dodged the" line "thrown BALL!" @@ -1189,32 +1208,32 @@ UnknownText_0x1c5a5a:: line "can't be caught!" prompt -UnknownText_0x1c5a90:: +_BallMissedText:: text "You missed the" line "#MON!" prompt -UnknownText_0x1c5aa6:: +_BallBrokeFreeText:: text "Oh no! The #MON" line "broke free!" prompt -UnknownText_0x1c5ac3:: +_BallAppearedCaughtText:: text "Aww! It appeared" line "to be caught!" prompt -UnknownText_0x1c5ae3:: +_BallAlmostHadItText:: text "Aargh!" line "Almost had it!" prompt -UnknownText_0x1c5afa:: +_BallSoCloseText:: text "Shoot! It was so" line "close too!" prompt -UnknownText_0x1c5b17:: +Text_BallCaught:: text "Gotcha! @" text_ram wEnemyMonNick text_start @@ -1224,37 +1243,37 @@ UnknownText_0x1c5b17:: text_end ; unused -Text_Waitbutton_2:: - text_waitbutton +_WaitButtonText:: + text_promptbutton text_end text_end ; unused -UnknownText_0x1c5b38:: +_BallSentToPCText:: text_ram wMonOrItemNameBuffer text " was" line "sent to BILL's PC." prompt -UnknownText_0x1c5b53:: +_NewDexDataText:: text_ram wEnemyMonNick text "'s data" line "was newly added to" cont "the #DEX.@" sound_slot_machine_start - text_waitbutton + text_promptbutton text_end text_end ; unused -UnknownText_0x1c5b7f:: +_AskGiveNicknameText:: text "Give a nickname to" line "@" text_ram wStringBuffer1 text "?" done -UnknownText_0x1c5b9a:: +_ItemStatRoseText:: text_ram wStringBuffer1 text "'s" line "@" @@ -1262,18 +1281,18 @@ UnknownText_0x1c5b9a:: text " rose." prompt -UnknownText_0x1c5bac:: +_ItemCantUseOnMonText:: text "That can't be used" line "on this #MON." prompt -Text_RepelUsedEarlierIsStillInEffect:: +_RepelUsedEarlierIsStillInEffectText:: text "The REPEL used" line "earlier is still" cont "in effect." prompt -UnknownText_0x1c5bf9:: +_PlayedFluteText:: text "Played the #" line "FLUTE." @@ -1281,27 +1300,27 @@ UnknownText_0x1c5bf9:: line "catchy tune!" prompt -UnknownText_0x1c5c28:: +_FluteWakeUpText:: text "All sleeping" line "#MON woke up." prompt -UnknownText_0x1c5c44:: +Text_PlayedPokeFlute:: text "<PLAYER> played the" line "# FLUTE.@" - text_waitbutton + text_promptbutton text_end text_end ; unused -UnknownText_0x1c5c5e:: +_BlueCardBalanceText:: text "You now have" line "@" text_decimal wBlueCardBalance, 1, 2 text " points." done -UnknownText_0x1c5c7b:: +_CoinCaseCountText:: text "Coins:" line "@" text_decimal wCoins, 2, 4 @@ -1309,33 +1328,33 @@ UnknownText_0x1c5c7b:: text_end ; unused -Text_RaiseThePPOfWhichMove:: +_RaiseThePPOfWhichMoveText:: text "Raise the PP of" line "which move?" done -Text_RestoreThePPOfWhichMove:: +_RestoreThePPOfWhichMoveText:: text "Restore the PP of" line "which move?" done -Text_PPIsMaxedOut:: +_PPIsMaxedOutText:: text_ram wStringBuffer2 text "'s PP" line "is maxed out." prompt -Text_PPsIncreased:: +_PPsIncreasedText:: text_ram wStringBuffer2 text "'s PP" line "increased." prompt -UnknownText_0x1c5cf1:: +_PPRestoredText:: text "PP was restored." prompt -UnknownText_0x1c5d03:: +_SentTrophyHomeText:: text "There was a trophy" line "inside!@" sound_dex_fanfare_50_79 @@ -1347,73 +1366,73 @@ UnknownText_0x1c5d03:: line "trophy home." prompt -UnknownText_0x1c5d3e:: +_ItemLooksBitterText:: text "It looks bitter…" prompt -UnknownText_0x1c5d50:: +_ItemCantUseOnEggText:: text "That can't be used" line "on an EGG." prompt -UnknownText_0x1c5d6e:: +_ItemOakWarningText:: text "OAK: <PLAYER>!" line "This isn't the" cont "time to use that!" prompt -UnknownText_0x1c5d97:: +_ItemBelongsToSomeoneElseText:: text "That belongs to" line "someone else!" prompt -UnknownText_0x1c5db6:: +_ItemWontHaveEffectText:: text "It won't have any" line "effect." prompt -UnknownText_0x1c5dd0:: +_BallBlockedText:: text "The trainer" line "blocked the BALL!" prompt -UnknownText_0x1c5def:: +_BallDontBeAThiefText:: text "Don't be a thief!" prompt -UnknownText_0x1c5e01:: +_NoCyclingText:: text "Cycling isn't" line "allowed here." prompt -UnknownText_0x1c5e1d:: +_ItemCantGetOnText:: text "Can't get on your" line "@" text_ram wStringBuffer1 text " now." prompt -UnknownText_0x1c5e3a:: +_BallBoxFullText:: text "The #MON BOX" line "is full. That" cont "can't be used now." prompt -UnknownText_0x1c5e68:: +_ItemUsedText:: text "<PLAYER> used the@" text_low text_ram wStringBuffer2 text "." done -UnknownText_0x1c5e7b:: +_ItemGotOnText:: text "<PLAYER> got on the@" text_low text_ram wStringBuffer2 text "." prompt -UnknownText_0x1c5e90:: +_ItemGotOffText:: text "<PLAYER> got off@" text_low text "the @" @@ -1421,7 +1440,7 @@ UnknownText_0x1c5e90:: text "." prompt -UnknownText_0x1c5ea8:: +_KnowsMoveText:: text_ram wStringBuffer1 text " knows" line "@" @@ -1429,39 +1448,39 @@ UnknownText_0x1c5ea8:: text "." prompt -UnknownText_0x1c5eba:: +_MoveKnowsOneText:: text "That #MON knows" line "only one move." done -UnknownText_0x1c5eda:: +_AskDeleteMoveText:: text "Oh, make it forget" line "@" text_ram wStringBuffer1 text "?" done -UnknownText_0x1c5ef5:: +_DeleterForgotMoveText:: text "Done! Your #MON" line "forgot the move." done -UnknownText_0x1c5f17:: +_DeleterEggText:: text "An EGG doesn't" line "know any moves!" done -UnknownText_0x1c5f36:: +_DeleterNoComeAgainText:: text "No? Come visit me" line "again." done -UnknownText_0x1c5f50:: +_DeleterAskWhichMoveText:: text "Which move should" line "it forget, then?" prompt -UnknownText_0x1c5f74:: +_DeleterIntroText:: text "Um… Oh, yes, I'm" line "the MOVE DELETER." @@ -1472,43 +1491,43 @@ UnknownText_0x1c5f74:: line "#MON forget?" done -UnknownText_0x1c5fd1:: +_DeleterAskWhichMonText:: text "Which #MON?" prompt -Text_DSTIsThatOK:: +_DSTIsThatOKText:: text " DST," line "is that OK?" done -UnknownText_0x1c5ff1:: +_TimeAskOkayText:: text "," line "is that OK?" done -UnknownText_0x1c6000:: +_TimesetAskDSTText:: text "Do you want to" line "switch to Daylight" cont "Saving Time?" done -UnknownText_0x1c6030:: +_TimesetDSTText:: text "I set the clock" line "forward by one" cont "hour." prompt -UnknownText_0x1c6056:: +_TimesetAskNotDSTText:: text "Is Daylight Saving" line "Time over?" done -UnknownText_0x1c6075:: +_TimesetNotDSTText:: text "I put the clock" line "back one hour." prompt -UnknownText_0x1c6095:: +_TimesetAskAdjustDSTText:: text "Do you want to" line "adjust your clock" @@ -1516,7 +1535,7 @@ UnknownText_0x1c6095:: line "Saving Time?" done -UnknownText_0x1c60d1:: +_MomLostGearBookletText:: text "I lost the in-" line "struction booklet" cont "for the #GEAR." diff --git a/data/text/std_text.asm b/data/text/std_text.asm index d431a0fd1..5415c4876 100644 --- a/data/text/std_text.asm +++ b/data/text/std_text.asm @@ -159,7 +159,7 @@ MerchandiseShelfText: line "merchandise!" done -TownMapText: +LookTownMapText: text "It's the TOWN MAP." done diff --git a/data/tilesets.asm b/data/tilesets.asm index b95c20f40..eb5b6fe49 100644 --- a/data/tilesets.asm +++ b/data/tilesets.asm @@ -34,7 +34,7 @@ Tilesets:: tileset TilesetLighthouse tileset TilesetPlayersRoom tileset TilesetPokeComCenter - tileset TilesetBattleTower + tileset TilesetBattleTowerInside tileset TilesetTower tileset TilesetCave tileset TilesetPark diff --git a/data/tilesets/battle_tower_collision.asm b/data/tilesets/battle_tower_inside_collision.asm index 97e09bf5d..97e09bf5d 100644 --- a/data/tilesets/battle_tower_collision.asm +++ b/data/tilesets/battle_tower_inside_collision.asm diff --git a/data/tilesets/battle_tower_metatiles.bin b/data/tilesets/battle_tower_inside_metatiles.bin Binary files differindex c64ef0a12..c64ef0a12 100644 --- a/data/tilesets/battle_tower_metatiles.bin +++ b/data/tilesets/battle_tower_inside_metatiles.bin |