Merge branch 'master' into audio-macros

.gitignore

@@ -36,6 +36,8 @@ pokecrystal.txt
 .*.swp
 # swap files for gedit
 *~
+# osx files
+.DS_STORE
 
 *.dimensions
 *.gbcpal

FAQ.md

@@ -38,11 +38,11 @@ You need to install `gcc`. If you're using Cygwin, re-run its setup, and at "Sel
 
 ### "ERROR: `UNION` already defined"
 
-Download [**rgbds 0.3.8**][rgbds]. Older versions will not work.
+Download [**rgbds 0.3.9**][rgbds] or newer. Older versions will not work.
 
 ### "Expression must be 8-bit"
 
-Download [**rgbds 0.3.8**][rgbds]. Older versions will not work.
+Download [**rgbds 0.3.9**][rgbds] or newer. Older versions will not work.
 
 ### "Segmentation fault" from `rgbgfx`
 

INSTALL.md

@@ -38,7 +38,7 @@ Double click on the text that says "**Skip**" next to each package to select the
 
 Then download [**rgbds**](https://github.com/rednex/rgbds/releases/): the latest **win64.zip** or **win32.zip** release. Extract it and put all the `exe` and `dll` files individually in **C:\cygwin64\usr\local\bin**.
 
-**Note: If you already have an older rgbds, you will need to update to 0.3.8.** Ignore this if you have never installed rgbds before. If a version newer than 0.3.8 does not work, try downloading 0.3.8.
+**Note: If you already have an older rgbds, you will need to update to 0.3.9.** Ignore this if you have never installed rgbds before. If a version newer than 0.3.9 does not work, try downloading 0.3.9.
 
 Now open the **Cygwin terminal** and enter the following commands.
 

Makefile

@@ -14,6 +14,7 @@ engine/movie/credits.o \
 engine/overworld/events.o \
 gfx/pics.o \
 gfx/sprites.o \
+gfx/tilesets.o \
 lib/mobile/main.o
 
 crystal11_obj := $(crystal_obj:.o=11.o)
@@ -166,6 +167,7 @@ gfx/mail/flower_mail_border.1bpp: tools/gfx += --remove-whitespace
 gfx/mail/litebluemail_border.1bpp: tools/gfx += --remove-whitespace
 
 gfx/pokedex/pokedex.2bpp: tools/gfx += --trim-whitespace
+gfx/pokedex/question_mark.2bpp: rgbgfx += -h
 gfx/pokedex/sgb.2bpp: tools/gfx += --trim-whitespace
 gfx/pokedex/slowpoke.2bpp: tools/gfx += --trim-whitespace
 

README.md

@@ -40,7 +40,7 @@ Other disassembly projects:
 [docs]: https://pret.github.io/pokecrystal/
 [wiki]: https://github.com/pret/pokecrystal/wiki
 [tutorials]: https://github.com/pret/pokecrystal/wiki/Tutorials
-[discord]: https://discord.gg/6EuWgX9
+[discord]: https://discord.gg/d5dubZ3
 [irc]: https://kiwiirc.com/client/irc.freenode.net/?#pret
 [travis]: https://travis-ci.org/pret/pokecrystal
 [travis-badge]: https://travis-ci.org/pret/pokecrystal.svg?branch=master

audio/engine.asm

@@ -6,7 +6,7 @@
 ; 	FadeMusic
 ; 	PlayStereoSFX
 
-_MapSetup_Sound_Off::
+_InitSound::
 ; restart sound operation
 ; clear all relevant hardware registers & wram
 	push hl
@@ -62,7 +62,7 @@ MusicFadeRestart:
 	push af
 	ld a, [wMusicFadeID]
 	push af
-	call _MapSetup_Sound_Off
+	call _InitSound
 	pop af
 	ld [wMusicFadeID], a
 	pop af
@@ -1364,7 +1364,7 @@ ParseMusicCommand:
 	jp hl
 
 MusicCommands:
-; entries correspond to macros/sound.asm enumeration
+; entries correspond to macros/scripts/audio.asm enumeration
 	dw Music_Octave8 ; octave 8
 	dw Music_Octave7 ; octave 7
 	dw Music_Octave6 ; octave 6
@@ -2798,7 +2798,7 @@ ChannelPointers:
 
 ClearChannels::
 ; runs ClearChannel for all 4 channels
-; doesn't seem to be used, but functionally identical to MapSetup_Sound_Off
+; doesn't seem to be used, but functionally identical to InitSound
 	ld hl, rNR50
 	xor a
 	ld [hli], a

audio/sfx.asm

@@ -1174,16 +1174,14 @@ Sfx_3rdPlace_Ch7:
 
 	toggle_sfx
 
-Sfx_GetEggFromDayCareMan:
+Sfx_GetEgg:
-Sfx_GetEggFromDayCareLady:
 	channel_count 4
-	channel 5, Sfx_GetEggFromDayCareLady_Ch5
+	channel 5, Sfx_GetEgg_Ch5
-	channel 6, Sfx_GetEggFromDayCareLady_Ch6
+	channel 6, Sfx_GetEgg_Ch6
-	channel 7, Sfx_GetEggFromDayCareLady_Ch7
+	channel 7, Sfx_GetEgg_Ch7
-	channel 8, Sfx_GetEggFromDayCareLady_Ch8
+	channel 8, Sfx_GetEgg_Ch8
 
-Sfx_GetEggFromDayCareMan_Ch5:
+Sfx_GetEgg_Ch5:
-Sfx_GetEggFromDayCareLady_Ch5:
 	toggle_sfx
 	tempo 120
 	volume 7, 7
@@ -1215,8 +1213,7 @@ Sfx_GetEggFromDayCareLady_Ch5:
 
 	toggle_sfx
 
-Sfx_GetEggFromDayCareMan_Ch6:
+Sfx_GetEgg_Ch6:
-Sfx_GetEggFromDayCareLady_Ch6:
 	toggle_sfx
 	vibrato 18, 3, 4
 	duty_cycle 3
@@ -1245,8 +1242,7 @@ Sfx_GetEggFromDayCareLady_Ch6:
 
 	toggle_sfx
 
-Sfx_GetEggFromDayCareMan_Ch7:
+Sfx_GetEgg_Ch7:
-Sfx_GetEggFromDayCareLady_Ch7:
 	toggle_sfx
 	note_type 8, 2, 5
 	rest 2
@@ -1265,8 +1261,7 @@ Sfx_GetEggFromDayCareLady_Ch7:
 
 	toggle_sfx
 
-Sfx_GetEggFromDayCareMan_Ch8:
+Sfx_GetEgg_Ch8:
-Sfx_GetEggFromDayCareLady_Ch8:
 	toggle_sfx
 	sfx_toggle_noise 4
 	drum_speed 8

audio/sfx_pointers.asm

@@ -149,8 +149,8 @@ SFX:
 	dba Sfx_Fanfare2
 	dba Sfx_RegisterPhoneNumber
 	dba Sfx_3rdPlace
-	dba Sfx_GetEggFromDayCareMan
+	dba Sfx_GetEgg
-	dba Sfx_GetEggFromDayCareLady
+	dba Sfx_GetEgg
 	dba Sfx_MoveDeleted
 	dba Sfx_2ndPlace
 	dba Sfx_1stPlace

charmap.asm

@@ -416,3 +416,8 @@
 	charmap "７", $fd
 	charmap "８", $fe
 	charmap "９", $ff
+
+; ASCII charmap, for mobile functions
+pushc
+newcharmap ascii
+popc

constants/engine_flags.asm

@@ -1,4 +1,4 @@
-; EngineFlags indexes (see engine/engine_flags.asm)
+; EngineFlags indexes (see data/engine_flags.asm)
 	const_def
 ; wPokegearFlags
 	const ENGINE_RADIO_CARD
@@ -64,7 +64,7 @@
 	const ENGINE_UNLOCKED_UNOWNS_UNUSED_7
 ; wVisitedSpawns
 	const ENGINE_FLYPOINT_PLAYERS_HOUSE
-	const ENGINE_FLYPOINT_VIRIDIAN_POKECENTER
+	const ENGINE_FLYPOINT_DEBUG
 	const ENGINE_FLYPOINT_PALLET
 	const ENGINE_FLYPOINT_VIRIDIAN
 	const ENGINE_FLYPOINT_PEWTER

constants/map_object_constants.asm

@@ -34,7 +34,7 @@
 	const OBJECT_1F                  ; 1f
 	const OBJECT_RANGE               ; 20
 	; 21-27 are not used
-OBJECT_STRUCT_LENGTH EQU 40
+OBJECT_LENGTH EQU 40
 NUM_OBJECT_STRUCTS EQU 13 ; see wObjectStructs
 
 ; object_struct OBJECT_FACING values
@@ -114,7 +114,7 @@ ABSOLUTE_TILE_ID    EQU 1 << ABSOLUTE_TILE_ID_F
 	const MAPOBJECT_FLAG_HI ; d
 	const MAPOBJECT_E ; unused
 	const MAPOBJECT_F ; unused
-OBJECT_LENGTH EQU const_value
+MAPOBJECT_LENGTH EQU const_value
 
 ; SpriteMovementData struct members (see data/sprites/map_objects.asm)
 	const_def

constants/map_setup_constants.asm

@@ -15,55 +15,53 @@
 	const MAPSETUP_FLY        ; fc
 
 ; MapSetupCommands indexes (see engine/overworld/map_setup.asm)
-; Names taken from Condensation water's scripting compendium
-; https://hax.iimarck.us/files/scriptingcodes_eng.htm
 	const_def
-	const map_lcd_on              ; 00
+	const map_enable_lcd                 ; 00
-	const map_lcd_off             ; 01
+	const map_disable_lcd                ; 01
-	const map_sound_off           ; 02
+	const map_init_sound                 ; 02
-	const map_music               ; 03
+	const map_play_music                 ; 03
-	const map_start_music         ; 04
+	const map_restart_music              ; 04
-	const map_fade_music          ; 05
+	const map_fade_to_music              ; 05
-	const map_fade                ; 06
+	const map_fade_music_and_palettes    ; 06
-	const map_bike_music          ; 07
+	const map_play_music_bike            ; 07
-	const map_music_force         ; 08
+	const map_force_music                ; 08
-	const map_max_volume          ; 09
+	const map_fade_in_music              ; 09
-	const map_load_blocks         ; 0a
+	const map_load_block_data            ; 0a
-	const map_connection_blocks   ; 0b
+	const map_load_connection_block_data ; 0b
-	const map_save_screen         ; 0c
+	const map_save_screen                ; 0c
-	const map_buffer_screen       ; 0d
+	const map_buffer_screen              ; 0d
-	const map_load_graphics       ; 0e
+	const map_load_graphics              ; 0e
-	const map_load_tileset        ; 0f
+	const map_load_tileset               ; 0f
-	const map_time_of_day         ; 10
+	const map_load_time_of_day           ; 10
-	const map_palettes            ; 11
+	const map_load_palettes              ; 11
-	const map_wildmons            ; 12
+	const map_load_wild_mon_data         ; 12
-	const map_sprites             ; 13
+	const map_refresh_sprites            ; 13
-	const map_change_callback     ; 14
+	const map_handle_new                 ; 14
-	const map_start_callback      ; 15
+	const map_handle_continue            ; 15
-	const map_load_objects        ; 16
+	const map_load_objects               ; 16
-	const map_load_spawn          ; 17
+	const map_enter_spawn_point          ; 17
-	const map_load_connection     ; 18
+	const map_enter_connection           ; 18
-	const map_load_warp           ; 19
+	const map_enter_warp                 ; 19
-	const map_load_attributes     ; 1a
+	const map_load_attributes            ; 1a
-	const map_load_attributes_2   ; 1b
+	const map_load_attributes_no_objects ; 1b
-	const map_clear_bg_palettes   ; 1c
+	const map_clear_bg_palettes          ; 1c
-	const map_fade_out_palettes   ; 1d
+	const map_fade_out_palettes          ; 1d
-	const map_fade_in_palettes    ; 1e
+	const map_fade_in_palettes           ; 1e
-	const map_anchor_screen       ; 1f
+	const map_get_screen_coords          ; 1f
-	const map_warp_face           ; 20
+	const map_get_warp_dest_coords       ; 20
-	const map_face_down           ; 21
+	const map_spawn_in_facing_down       ; 21
-	const map_spawn_coord         ; 22
+	const map_spawn_player               ; 22
-	const map_player_coord        ; 23
+	const map_refresh_player_coords      ; 23
-	const map_prolong_sprites     ; 24
+	const map_reset_player_object_action ; 24
-	const map_delay_sprites       ; 25
+	const map_skip_update_sprites        ; 25
-	const map_update_roam         ; 26
+	const map_update_roam_mons           ; 26
-	const map_keep_roam           ; 27
+	const map_jump_roam_mons             ; 27
-	const map_fade_out_music      ; 28
+	const map_fade_out_music             ; 28
-	const map_animations_on       ; 29
+	const map_activate_anims             ; 29
-	const map_animations_off      ; 2a
+	const map_suspend_anims              ; 2a
-	const map_keep_palettes       ; 2b
+	const map_apply_palettes             ; 2b
-	const map_text_scroll_off     ; 2c
+	const map_enable_text_acceleration   ; 2c
-	const map_stop_script         ; 2d
+	const map_init_name_sign             ; 2d
 map_end EQU -1
 
 ; callback types

constants/mobile_constants.asm

@@ -19,3 +19,8 @@
 NUM_KANA EQU 45 ; length of SortedPokemon table (see mobile/fixed_words.asm)
 
 MOBILE_LOGIN_PASSWORD_LENGTH EQU 17
+MOBILE_PHONE_NUMBER_LENGTH EQU 20
+
+; Maximum amount of time allowed for mobile battles each day
+MOBILE_BATTLE_ALLOWED_SECONDS EQU 0
+MOBILE_BATTLE_ALLOWED_MINUTES EQU 10

constants/script_constants.asm

@@ -92,6 +92,17 @@ RETVAR_EXECUTE EQU (2 << 6)
 	const PLAYEREVENT_JOYCHANGEFACING
 NUM_PLAYER_EVENTS EQU const_value
 
+; PlayerMovement.pointers indexes (see engine/overworld/events.asm)
+	const_def
+	const PLAYERMOVEMENT_NORMAL
+	const PLAYERMOVEMENT_WARP
+	const PLAYERMOVEMENT_TURN
+	const PLAYERMOVEMENT_FORCE_TURN
+	const PLAYERMOVEMENT_FINISH
+	const PLAYERMOVEMENT_CONTINUE
+	const PLAYERMOVEMENT_EXIT_WATER
+	const PLAYERMOVEMENT_JUMP
+
 ; script data sizes (see macros/scripts/maps.asm)
 SCENE_SCRIPT_SIZE EQU 4 ; scene_script
 CALLBACK_SIZE     EQU 3 ; callback

constants/serial_constants.asm

@@ -1,4 +1,4 @@
-; link types
+; wLinkMode
 	const_def
 	const LINK_NULL        ; 0
 	const LINK_TIMECAPSULE ; 1

constants/sfx_constants.asm

@@ -150,8 +150,8 @@
 	const SFX_FANFARE_2                   ; 92
 	const SFX_REGISTER_PHONE_NUMBER       ; 93
 	const SFX_3RD_PLACE                   ; 94
-	const SFX_GET_EGG_FROM_DAY_CARE_MAN   ; 95
+	const SFX_GET_EGG_UNUSED              ; 95
-	const SFX_GET_EGG_FROM_DAY_CARE_LADY  ; 96
+	const SFX_GET_EGG                     ; 96
 	const SFX_MOVE_DELETED                ; 97
 	const SFX_2ND_PLACE                   ; 98
 	const SFX_1ST_PLACE                   ; 99

constants/text_constants.asm

@@ -33,12 +33,12 @@ TEXTBOX_INNERY EQU TEXTBOX_Y + 2
 ; PrintNum bit flags
 	const_def 5
 	const PRINTNUM_MONEY_F        ; 5
-	const PRINTNUM_RIGHTALIGN_F   ; 6
+	const PRINTNUM_LEFTALIGN_F    ; 6
 	const PRINTNUM_LEADINGZEROS_F ; 7
 
 ; PrintNum arguments (see engine/math/print_num.asm)
 PRINTNUM_MONEY          EQU 1 << PRINTNUM_MONEY_F
-PRINTNUM_RIGHTALIGN     EQU 1 << PRINTNUM_RIGHTALIGN_F
+PRINTNUM_LEFTALIGN      EQU 1 << PRINTNUM_LEFTALIGN_F
 PRINTNUM_LEADINGZEROS   EQU 1 << PRINTNUM_LEADINGZEROS_F
 
 ; character sets (see charmap.asm)

constants/tileset_constants.asm

@@ -21,7 +21,7 @@
 	const TILESET_LIGHTHOUSE           ; 13
 	const TILESET_PLAYERS_ROOM         ; 14
 	const TILESET_POKECOM_CENTER       ; 15
-	const TILESET_BATTLE_TOWER         ; 16
+	const TILESET_BATTLE_TOWER_INSIDE  ; 16
 	const TILESET_TOWER                ; 17
 	const TILESET_CAVE                 ; 18
 	const TILESET_PARK                 ; 19

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

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"

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 BattleTower1F, TILESET_BATTLE_TOWER_INSIDE, 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 BattleTowerBattleRoom, TILESET_BATTLE_TOWER_INSIDE, 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 BattleTowerElevator, TILESET_BATTLE_TOWER_INSIDE, 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 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
 

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_disable_lcd
-	db map_sound_off
+	db map_init_sound
-	db map_load_spawn
+	db map_enter_spawn_point
 	db map_load_attributes
-	db map_change_callback
+	db map_handle_new
-	db map_spawn_coord
+	db map_spawn_player
-	db map_player_coord
+	db map_refresh_player_coords
-	db map_anchor_screen
+	db map_get_screen_coords
-	db map_load_blocks
+	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_enable_lcd
-	db map_palettes
+	db map_load_palettes
-	db map_face_down
+	db map_spawn_in_facing_down
-	db map_sprites
+	db map_refresh_sprites
-	db map_bike_music
+	db map_play_music_bike
-	db map_max_volume
+	db map_fade_in_music
 	db map_fade_in_palettes
-	db map_animations_on
+	db map_activate_anims
-	db map_wildmons
+	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_handle_new
-	db map_spawn_coord
+	db map_spawn_player
-	db map_player_coord
+	db map_refresh_player_coords
-	db map_anchor_screen
+	db map_get_screen_coords
-	db map_load_blocks
+	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_load_palettes
-	db map_face_down
+	db map_spawn_in_facing_down
-	db map_sprites
+	db map_refresh_sprites
-	db map_fade_music
+	db map_fade_to_music
 	db map_fade_in_palettes
-	db map_animations_on
+	db map_activate_anims
-	db map_wildmons
+	db map_load_wild_mon_data
 	db map_end
 
 MapSetupScript_Connection:
-	db map_animations_off
+	db map_suspend_anims
-	db map_load_connection
+	db map_enter_connection
 	db map_load_attributes
-	db map_change_callback
+	db map_handle_new
-	db map_player_coord
+	db map_refresh_player_coords
-	db map_load_blocks
+	db map_load_block_data
 	db map_load_tileset
 	db map_save_screen
 	db map_load_objects
-	db map_fade_music
+	db map_fade_to_music
-	db map_palettes
+	db map_load_palettes
-	db map_stop_script
+	db map_init_name_sign
-	db map_keep_palettes
+	db map_apply_palettes
-	db map_wildmons
+	db map_load_wild_mon_data
-	db map_update_roam
+	db map_update_roam_mons
-	db map_animations_on
+	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_get_warp_dest_coords
-	db map_change_callback
+	db map_handle_new
-	db map_player_coord
+	db map_refresh_player_coords
-	db map_load_blocks
+	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_load_palettes
-	db map_sprites
+	db map_refresh_sprites
-	db map_fade_music
+	db map_fade_to_music
 	db map_fade_in_palettes
-	db map_animations_on
+	db map_activate_anims
-	db map_wildmons
+	db map_load_wild_mon_data
-	db map_update_roam
+	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_disable_lcd
-	db map_sound_off
+	db map_init_sound
-	db map_load_blocks
+	db map_load_block_data
-	db map_connection_blocks
+	db map_load_connection_block_data
 	db map_load_graphics
-	db map_time_of_day
+	db map_load_time_of_day
-	db map_lcd_on
+	db map_enable_lcd
-	db map_palettes
+	db map_load_palettes
-	db map_sprites
+	db map_refresh_sprites
-	db map_music_force
+	db map_force_music
 	db map_fade_in_palettes
-	db map_animations_on
+	db map_activate_anims
-	db map_wildmons
+	db map_load_wild_mon_data
 	db map_end
 
 MapSetupScript_LinkReturn:
-	db map_fade
+	db map_fade_music_and_palettes
-	db map_lcd_off
+	db map_disable_lcd
-	db map_sound_off
+	db map_init_sound
-	db map_change_callback
+	db map_handle_new
-	db map_load_blocks
+	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_lcd_on
+	db map_enable_lcd
-	db map_palettes
+	db map_load_palettes
-	db map_sprites
+	db map_refresh_sprites
-	db map_bike_music
+	db map_play_music_bike
 	db map_fade_in_palettes
-	db map_animations_on
+	db map_activate_anims
-	db map_wildmons
+	db map_load_wild_mon_data
-	db map_text_scroll_off
+	db map_enable_text_acceleration
 	db map_end
 
 MapSetupScript_Continue:
-	db map_lcd_off
+	db map_disable_lcd
-	db map_sound_off
+	db map_init_sound
-	db map_load_attributes_2
+	db map_load_attributes_no_objects
-	db map_anchor_screen
+	db map_get_screen_coords
-	db map_start_callback
+	db map_handle_continue
-	db map_load_blocks
+	db map_load_block_data
-	db map_connection_blocks
+	db map_load_connection_block_data
 	db map_buffer_screen
 	db map_load_graphics
-	db map_time_of_day
+	db map_load_time_of_day
-	db map_lcd_on
+	db map_enable_lcd
-	db map_palettes
+	db map_load_palettes
-	db map_sprites
+	db map_refresh_sprites
-	db map_bike_music
+	db map_play_music_bike
 	db map_fade_in_palettes
-	db map_animations_on
+	db map_activate_anims
-	db map_wildmons
+	db map_load_wild_mon_data
 	db map_end
 
 MapSetupScript_Submenu:
-	db map_load_blocks
+	db map_load_block_data
-	db map_connection_blocks
+	db map_load_connection_block_data
 	db map_end

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?"

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"
 

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?"
 

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?"
 

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."

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?"
 

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"
 

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?"
 

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?"
 

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?"
 

data/phone/text/bike_shop.asm

@@ -1,4 +1,4 @@
-UnknownText_0x174000:
+BikeShopPhoneCallerText:
 	text "Hi, <PLAY_G>!"
 	line "Our BICYCLE sales"
 

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"
 

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."
 

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?"
 

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?"
 

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?"
 

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"

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"

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"
 

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"

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?"
 

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?"
 

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
 

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?"
 

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?"
 

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?"
 

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"
 

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?"
 

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!"

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>?"
 

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"

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?"
 

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"

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?"
 

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>!"
 

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?"
 

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"

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

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."
 

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."
 

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!"
 

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?"
 

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

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"
 

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?"
 

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?"
 

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?"
 

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?"
 

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?"
 

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?"
 

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."
 

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?"
 

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."
 

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"

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?"
 

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
 

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?"
 

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?"
 

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?"
 

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."
 

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,   128,  129 ; BULBASAUR
-	mon_cry CRY_BULBASAUR,   $020,  $100 ; IVYSAUR
+	mon_cry CRY_BULBASAUR,    32,  256 ; IVYSAUR
-	mon_cry CRY_BULBASAUR,   $000,  $140 ; VENUSAUR
+	mon_cry CRY_BULBASAUR,     0,  320 ; VENUSAUR
-	mon_cry CRY_CHARMANDER,  $060,  $0c0 ; CHARMANDER
+	mon_cry CRY_CHARMANDER,   96,  192 ; CHARMANDER
-	mon_cry CRY_CHARMANDER,  $020,  $0c0 ; CHARMELEON
+	mon_cry CRY_CHARMANDER,   32,  192 ; CHARMELEON
-	mon_cry CRY_CHARMANDER,  $000,  $100 ; CHARIZARD
+	mon_cry CRY_CHARMANDER,    0,  256 ; CHARIZARD
-	mon_cry CRY_SQUIRTLE,    $060,  $0c0 ; SQUIRTLE
+	mon_cry CRY_SQUIRTLE,     96,  192 ; SQUIRTLE
-	mon_cry CRY_SQUIRTLE,    $020,  $0c0 ; WARTORTLE
+	mon_cry CRY_SQUIRTLE,     32,  192 ; WARTORTLE
-	mon_cry CRY_BLASTOISE,   $000,  $100 ; BLASTOISE
+	mon_cry CRY_BLASTOISE,     0,  256 ; BLASTOISE
-	mon_cry CRY_CATERPIE,    $080,  $0a0 ; CATERPIE
+	mon_cry CRY_CATERPIE,    128,  160 ; CATERPIE
-	mon_cry CRY_METAPOD,     $0cc,  $081 ; METAPOD
+	mon_cry CRY_METAPOD,     204,  129 ; METAPOD
-	mon_cry CRY_CATERPIE,    $077,  $0c0 ; BUTTERFREE
+	mon_cry CRY_CATERPIE,    119,  192 ; BUTTERFREE
-	mon_cry CRY_WEEDLE,      $0ee,  $081 ; WEEDLE
+	mon_cry CRY_WEEDLE,      238,  129 ; WEEDLE
-	mon_cry CRY_BLASTOISE,   $0ff,  $081 ; KAKUNA
+	mon_cry CRY_BLASTOISE,   255,  129 ; KAKUNA
-	mon_cry CRY_BLASTOISE,   $060,  $100 ; BEEDRILL
+	mon_cry CRY_BLASTOISE,    96,  256 ; BEEDRILL
-	mon_cry CRY_PIDGEY,      $0df,  $084 ; PIDGEY
+	mon_cry CRY_PIDGEY,      223,  132 ; PIDGEY
-	mon_cry CRY_PIDGEOTTO,   $028,  $140 ; PIDGEOTTO
+	mon_cry CRY_PIDGEOTTO,    40,  320 ; PIDGEOTTO
-	mon_cry CRY_PIDGEOTTO,   $011,  $17f ; PIDGEOT
+	mon_cry CRY_PIDGEOTTO,    17,  383 ; PIDGEOT
-	mon_cry CRY_RATTATA,     $000,  $100 ; RATTATA
+	mon_cry CRY_RATTATA,       0,  256 ; RATTATA
-	mon_cry CRY_RATTATA,     $020,  $17f ; RATICATE
+	mon_cry CRY_RATTATA,      32,  383 ; RATICATE
-	mon_cry CRY_SPEAROW,     $000,  $100 ; SPEAROW
+	mon_cry CRY_SPEAROW,       0,  256 ; SPEAROW
-	mon_cry CRY_FEAROW,      $040,  $120 ; FEAROW
+	mon_cry CRY_FEAROW,       64,  288 ; FEAROW
-	mon_cry CRY_EKANS,       $012,  $0c0 ; EKANS
+	mon_cry CRY_EKANS,        18,  192 ; EKANS
-	mon_cry CRY_EKANS,       $0e0,  $090 ; ARBOK
+	mon_cry CRY_EKANS,       224,  144 ; ARBOK
-	mon_cry CRY_BULBASAUR,   $0ee,  $081 ; PIKACHU
+	mon_cry CRY_BULBASAUR,   238,  129 ; PIKACHU
-	mon_cry CRY_RAICHU,      $0ee,  $088 ; RAICHU
+	mon_cry CRY_RAICHU,      238,  136 ; RAICHU
-	mon_cry CRY_NIDORAN_M,   $020,  $0c0 ; SANDSHREW
+	mon_cry CRY_NIDORAN_M,    32,  192 ; SANDSHREW
-	mon_cry CRY_NIDORAN_M,   $0ff,  $17f ; SANDSLASH
+	mon_cry CRY_NIDORAN_M,   255,  383 ; SANDSLASH
-	mon_cry CRY_NIDORAN_F,   $000,  $100 ; NIDORAN_F
+	mon_cry CRY_NIDORAN_F,     0,  256 ; NIDORAN_F
-	mon_cry CRY_NIDORAN_F,   $02c,  $160 ; NIDORINA
+	mon_cry CRY_NIDORAN_F,    44,  352 ; NIDORINA
-	mon_cry CRY_NIDOQUEEN,   $000,  $100 ; NIDOQUEEN
+	mon_cry CRY_NIDOQUEEN,     0,  256 ; NIDOQUEEN
-	mon_cry CRY_NIDORAN_M,   $000,  $100 ; NIDORAN_M
+	mon_cry CRY_NIDORAN_M,     0,  256 ; NIDORAN_M
-	mon_cry CRY_NIDORAN_M,   $02c,  $140 ; NIDORINO
+	mon_cry CRY_NIDORAN_M,    44,  320 ; NIDORINO
-	mon_cry CRY_RAICHU,      $000,  $100 ; NIDOKING
+	mon_cry CRY_RAICHU,        0,  256 ; NIDOKING
-	mon_cry CRY_CLEFAIRY,    $0cc,  $081 ; CLEFAIRY
+	mon_cry CRY_CLEFAIRY,    204,  129 ; CLEFAIRY
-	mon_cry CRY_CLEFAIRY,    $0aa,  $0a0 ; CLEFABLE
+	mon_cry CRY_CLEFAIRY,    170,  160 ; CLEFABLE
-	mon_cry CRY_VULPIX,      $04f,  $090 ; VULPIX
+	mon_cry CRY_VULPIX,       79,  144 ; VULPIX
-	mon_cry CRY_VULPIX,      $088,  $0e0 ; NINETALES
+	mon_cry CRY_VULPIX,      136,  224 ; NINETALES
-	mon_cry CRY_PIDGEY,      $0ff,  $0b5 ; JIGGLYPUFF
+	mon_cry CRY_PIDGEY,      255,  181 ; JIGGLYPUFF
-	mon_cry CRY_PIDGEY,      $068,  $0e0 ; WIGGLYTUFF
+	mon_cry CRY_PIDGEY,      104,  224 ; WIGGLYTUFF
-	mon_cry CRY_SQUIRTLE,    $0e0,  $100 ; ZUBAT
+	mon_cry CRY_SQUIRTLE,    224,  256 ; ZUBAT
-	mon_cry CRY_SQUIRTLE,    $0fa,  $100 ; GOLBAT
+	mon_cry CRY_SQUIRTLE,    250,  256 ; GOLBAT
-	mon_cry CRY_ODDISH,      $0dd,  $081 ; ODDISH
+	mon_cry CRY_ODDISH,      221,  129 ; ODDISH
-	mon_cry CRY_ODDISH,      $0aa,  $0c0 ; GLOOM
+	mon_cry CRY_ODDISH,      170,  192 ; GLOOM
-	mon_cry CRY_VILEPLUME,   $022,  $17f ; VILEPLUME
+	mon_cry CRY_VILEPLUME,    34,  383 ; VILEPLUME
-	mon_cry CRY_PARAS,       $020,  $160 ; PARAS
+	mon_cry CRY_PARAS,        32,  352 ; PARAS
-	mon_cry CRY_PARAS,       $042,  $17f ; PARASECT
+	mon_cry CRY_PARAS,        66,  383 ; PARASECT
-	mon_cry CRY_VENONAT,     $044,  $0c0 ; VENONAT
+	mon_cry CRY_VENONAT,      68,  192 ; VENONAT
-	mon_cry CRY_VENONAT,     $029,  $100 ; VENOMOTH
+	mon_cry CRY_VENONAT,      41,  256 ; VENOMOTH
-	mon_cry CRY_DIGLETT,     $0aa,  $081 ; DIGLETT
+	mon_cry CRY_DIGLETT,     170,  129 ; DIGLETT
-	mon_cry CRY_DIGLETT,     $02a,  $090 ; DUGTRIO
+	mon_cry CRY_DIGLETT,      42,  144 ; DUGTRIO
-	mon_cry CRY_CLEFAIRY,    $077,  $090 ; MEOWTH
+	mon_cry CRY_CLEFAIRY,    119,  144 ; MEOWTH
-	mon_cry CRY_CLEFAIRY,    $099,  $17f ; PERSIAN
+	mon_cry CRY_CLEFAIRY,    153,  383 ; PERSIAN
-	mon_cry CRY_PSYDUCK,     $020,  $0e0 ; PSYDUCK
+	mon_cry CRY_PSYDUCK,      32,  224 ; PSYDUCK
-	mon_cry CRY_PSYDUCK,     $0ff,  $0c0 ; GOLDUCK
+	mon_cry CRY_PSYDUCK,     255,  192 ; GOLDUCK
-	mon_cry CRY_NIDOQUEEN,   $0dd,  $0e0 ; MANKEY
+	mon_cry CRY_NIDOQUEEN,   221,  224 ; MANKEY
-	mon_cry CRY_NIDOQUEEN,   $0af,  $0c0 ; PRIMEAPE
+	mon_cry CRY_NIDOQUEEN,   175,  192 ; PRIMEAPE
-	mon_cry CRY_GROWLITHE,   $020,  $0c0 ; GROWLITHE
+	mon_cry CRY_GROWLITHE,    32,  192 ; GROWLITHE
-	mon_cry CRY_WEEDLE,      $000,  $100 ; ARCANINE
+	mon_cry CRY_WEEDLE,        0,  256 ; ARCANINE
-	mon_cry CRY_PIDGEY,      $0ff,  $17f ; POLIWAG
+	mon_cry CRY_PIDGEY,      255,  383 ; POLIWAG
-	mon_cry CRY_PIDGEY,      $077,  $0e0 ; POLIWHIRL
+	mon_cry CRY_PIDGEY,      119,  224 ; POLIWHIRL
-	mon_cry CRY_PIDGEY,      $000,  $17f ; POLIWRATH
+	mon_cry CRY_PIDGEY,        0,  383 ; POLIWRATH
-	mon_cry CRY_METAPOD,     $0c0,  $081 ; ABRA
+	mon_cry CRY_METAPOD,     192,  129 ; ABRA
-	mon_cry CRY_METAPOD,     $0a8,  $140 ; KADABRA
+	mon_cry CRY_METAPOD,     168,  320 ; KADABRA
-	mon_cry CRY_METAPOD,     $098,  $17f ; ALAKAZAM
+	mon_cry CRY_METAPOD,     152,  383 ; ALAKAZAM
-	mon_cry CRY_GROWLITHE,   $0ee,  $081 ; MACHOP
+	mon_cry CRY_GROWLITHE,   238,  129 ; MACHOP
-	mon_cry CRY_GROWLITHE,   $048,  $0e0 ; MACHOKE
+	mon_cry CRY_GROWLITHE,    72,  224 ; MACHOKE
-	mon_cry CRY_GROWLITHE,   $008,  $140 ; MACHAMP
+	mon_cry CRY_GROWLITHE,     8,  320 ; MACHAMP
-	mon_cry CRY_PSYDUCK,     $055,  $081 ; BELLSPROUT
+	mon_cry CRY_PSYDUCK,      85,  129 ; BELLSPROUT
-	mon_cry CRY_WEEPINBELL,  $044,  $0a0 ; WEEPINBELL
+	mon_cry CRY_WEEPINBELL,   68,  160 ; WEEPINBELL
-	mon_cry CRY_WEEPINBELL,  $066,  $14c ; VICTREEBEL
+	mon_cry CRY_WEEPINBELL,  102,  332 ; VICTREEBEL
-	mon_cry CRY_VENONAT,     $000,  $100 ; TENTACOOL
+	mon_cry CRY_VENONAT,       0,  256 ; TENTACOOL
-	mon_cry CRY_VENONAT,     $0ee,  $17f ; TENTACRUEL
+	mon_cry CRY_VENONAT,     238,  383 ; TENTACRUEL
-	mon_cry CRY_VULPIX,      $0f0,  $090 ; GEODUDE
+	mon_cry CRY_VULPIX,      240,  144 ; GEODUDE
-	mon_cry CRY_VULPIX,      $000,  $100 ; GRAVELER
+	mon_cry CRY_VULPIX,        0,  256 ; GRAVELER
-	mon_cry CRY_GOLEM,       $0e0,  $0c0 ; GOLEM
+	mon_cry CRY_GOLEM,       224,  192 ; GOLEM
-	mon_cry CRY_WEEPINBELL,  $000,  $100 ; PONYTA
+	mon_cry CRY_WEEPINBELL,    0,  256 ; PONYTA
-	mon_cry CRY_WEEPINBELL,  $020,  $140 ; RAPIDASH
+	mon_cry CRY_WEEPINBELL,   32,  320 ; RAPIDASH
-	mon_cry CRY_SLOWPOKE,    $000,  $100 ; SLOWPOKE
+	mon_cry CRY_SLOWPOKE,      0,  256 ; SLOWPOKE
-	mon_cry CRY_GROWLITHE,   $000,  $100 ; SLOWBRO
+	mon_cry CRY_GROWLITHE,     0,  256 ; SLOWBRO
-	mon_cry CRY_METAPOD,     $080,  $0e0 ; MAGNEMITE
+	mon_cry CRY_METAPOD,     128,  224 ; MAGNEMITE
-	mon_cry CRY_METAPOD,     $020,  $140 ; MAGNETON
+	mon_cry CRY_METAPOD,      32,  320 ; MAGNETON
-	mon_cry CRY_SPEAROW,     $0dd,  $081 ; FARFETCH_D
+	mon_cry CRY_SPEAROW,     221,  129 ; FARFETCH_D
-	mon_cry CRY_DIGLETT,     $0bb,  $081 ; DODUO
+	mon_cry CRY_DIGLETT,     187,  129 ; DODUO
-	mon_cry CRY_DIGLETT,     $099,  $0a0 ; DODRIO
+	mon_cry CRY_DIGLETT,     153,  160 ; DODRIO
-	mon_cry CRY_SEEL,        $088,  $140 ; SEEL
+	mon_cry CRY_SEEL,        136,  320 ; SEEL
-	mon_cry CRY_SEEL,        $023,  $17f ; DEWGONG
+	mon_cry CRY_SEEL,         35,  383 ; DEWGONG
-	mon_cry CRY_GRIMER,      $000,  $100 ; GRIMER
+	mon_cry CRY_GRIMER,        0,  256 ; GRIMER
-	mon_cry CRY_MUK,         $0ef,  $17f ; MUK
+	mon_cry CRY_MUK,         239,  383 ; MUK
-	mon_cry CRY_FEAROW,      $000,  $100 ; SHELLDER
+	mon_cry CRY_FEAROW,        0,  256 ; SHELLDER
-	mon_cry CRY_FEAROW,      $06f,  $160 ; CLOYSTER
+	mon_cry CRY_FEAROW,      111,  352 ; CLOYSTER
-	mon_cry CRY_METAPOD,     $000,  $100 ; GASTLY
+	mon_cry CRY_METAPOD,       0,  256 ; GASTLY
-	mon_cry CRY_METAPOD,     $030,  $0c0 ; HAUNTER
+	mon_cry CRY_METAPOD,      48,  192 ; HAUNTER
-	mon_cry CRY_MUK,         $000,  $17f ; GENGAR
+	mon_cry CRY_MUK,           0,  383 ; GENGAR
-	mon_cry CRY_EKANS,       $0ff,  $140 ; ONIX
+	mon_cry CRY_EKANS,       255,  320 ; ONIX
-	mon_cry CRY_DROWZEE,     $088,  $0a0 ; DROWZEE
+	mon_cry CRY_DROWZEE,     136,  160 ; DROWZEE
-	mon_cry CRY_DROWZEE,     $0ee,  $0c0 ; HYPNO
+	mon_cry CRY_DROWZEE,     238,  192 ; HYPNO
-	mon_cry CRY_KRABBY,      $020,  $160 ; KRABBY
+	mon_cry CRY_KRABBY,       32,  352 ; KRABBY
-	mon_cry CRY_KRABBY,      $0ee,  $160 ; KINGLER
+	mon_cry CRY_KRABBY,      238,  352 ; KINGLER
-	mon_cry CRY_VOLTORB,     $0ed,  $100 ; VOLTORB
+	mon_cry CRY_VOLTORB,     237,  256 ; VOLTORB
-	mon_cry CRY_VOLTORB,     $0a8,  $110 ; ELECTRODE
+	mon_cry CRY_VOLTORB,     168,  272 ; ELECTRODE
-	mon_cry CRY_DIGLETT,     $000,  $100 ; EXEGGCUTE
+	mon_cry CRY_DIGLETT,       0,  256 ; EXEGGCUTE
-	mon_cry CRY_DROWZEE,     $000,  $100 ; EXEGGUTOR
+	mon_cry CRY_DROWZEE,       0,  256 ; EXEGGUTOR
-	mon_cry CRY_CLEFAIRY,    $000,  $100 ; CUBONE
+	mon_cry CRY_CLEFAIRY,      0,  256 ; CUBONE
-	mon_cry CRY_ODDISH,      $04f,  $0e0 ; MAROWAK
+	mon_cry CRY_ODDISH,       79,  224 ; MAROWAK
-	mon_cry CRY_GOLEM,       $080,  $140 ; HITMONLEE
+	mon_cry CRY_GOLEM,       128,  320 ; HITMONLEE
-	mon_cry CRY_SEEL,        $0ee,  $140 ; HITMONCHAN
+	mon_cry CRY_SEEL,        238,  320 ; HITMONCHAN
-	mon_cry CRY_SEEL,        $000,  $100 ; LICKITUNG
+	mon_cry CRY_SEEL,          0,  256 ; LICKITUNG
-	mon_cry CRY_GOLEM,       $0e6,  $15d ; KOFFING
+	mon_cry CRY_GOLEM,       230,  349 ; KOFFING
-	mon_cry CRY_GOLEM,       $0ff,  $17f ; WEEZING
+	mon_cry CRY_GOLEM,       255,  383 ; WEEZING
-	mon_cry CRY_CHARMANDER,  $000,  $100 ; RHYHORN
+	mon_cry CRY_CHARMANDER,    0,  256 ; RHYHORN
-	mon_cry CRY_RHYDON,      $000,  $100 ; RHYDON
+	mon_cry CRY_RHYDON,        0,  256 ; RHYDON
-	mon_cry CRY_PIDGEOTTO,   $00a,  $140 ; CHANSEY
+	mon_cry CRY_PIDGEOTTO,    10,  320 ; CHANSEY
-	mon_cry CRY_GOLEM,       $000,  $100 ; TANGELA
+	mon_cry CRY_GOLEM,         0,  256 ; TANGELA
-	mon_cry CRY_KANGASKHAN,  $000,  $100 ; KANGASKHAN
+	mon_cry CRY_KANGASKHAN,    0,  256 ; KANGASKHAN
-	mon_cry CRY_CLEFAIRY,    $099,  $090 ; HORSEA
+	mon_cry CRY_CLEFAIRY,    153,  144 ; HORSEA
-	mon_cry CRY_CLEFAIRY,    $03c,  $081 ; SEADRA
+	mon_cry CRY_CLEFAIRY,     60,  129 ; SEADRA
-	mon_cry CRY_CATERPIE,    $080,  $0c0 ; GOLDEEN
+	mon_cry CRY_CATERPIE,    128,  192 ; GOLDEEN
-	mon_cry CRY_CATERPIE,    $010,  $17f ; SEAKING
+	mon_cry CRY_CATERPIE,     16,  383 ; SEAKING
-	mon_cry CRY_PARAS,       $002,  $0a0 ; STARYU
+	mon_cry CRY_PARAS,         2,  160 ; STARYU
-	mon_cry CRY_PARAS,       $000,  $100 ; STARMIE
+	mon_cry CRY_PARAS,         0,  256 ; STARMIE
-	mon_cry CRY_KRABBY,      $008,  $0c0 ; MR__MIME
+	mon_cry CRY_KRABBY,        8,  192 ; MR__MIME
-	mon_cry CRY_CATERPIE,    $000,  $100 ; SCYTHER
+	mon_cry CRY_CATERPIE,      0,  256 ; SCYTHER
-	mon_cry CRY_DROWZEE,     $0ff,  $17f ; JYNX
+	mon_cry CRY_DROWZEE,     255,  383 ; JYNX
-	mon_cry CRY_VOLTORB,     $08f,  $17f ; ELECTABUZZ
+	mon_cry CRY_VOLTORB,     143,  383 ; ELECTABUZZ
-	mon_cry CRY_CHARMANDER,  $0ff,  $0b0 ; MAGMAR
+	mon_cry CRY_CHARMANDER,  255,  176 ; MAGMAR
-	mon_cry CRY_PIDGEOTTO,   $000,  $100 ; PINSIR
+	mon_cry CRY_PIDGEOTTO,     0,  256 ; PINSIR
-	mon_cry CRY_SQUIRTLE,    $011,  $0c0 ; TAUROS
+	mon_cry CRY_SQUIRTLE,     17,  192 ; TAUROS
-	mon_cry CRY_EKANS,       $080,  $080 ; MAGIKARP
+	mon_cry CRY_EKANS,       128,  128 ; MAGIKARP
-	mon_cry CRY_EKANS,       $000,  $100 ; GYARADOS
+	mon_cry CRY_EKANS,         0,  256 ; GYARADOS
-	mon_cry CRY_LAPRAS,      $000,  $100 ; LAPRAS
+	mon_cry CRY_LAPRAS,        0,  256 ; LAPRAS
-	mon_cry CRY_PIDGEY,      $0ff,  $17f ; DITTO
+	mon_cry CRY_PIDGEY,      255,  383 ; DITTO
-	mon_cry CRY_VENONAT,     $088,  $0e0 ; EEVEE
+	mon_cry CRY_VENONAT,     136,  224 ; EEVEE
-	mon_cry CRY_VENONAT,     $0aa,  $17f ; VAPOREON
+	mon_cry CRY_VENONAT,     170,  383 ; VAPOREON
-	mon_cry CRY_VENONAT,     $03d,  $100 ; JOLTEON
+	mon_cry CRY_VENONAT,      61,  256 ; JOLTEON
-	mon_cry CRY_VENONAT,     $010,  $0a0 ; FLAREON
+	mon_cry CRY_VENONAT,      16,  160 ; FLAREON
-	mon_cry CRY_WEEPINBELL,  $0aa,  $17f ; PORYGON
+	mon_cry CRY_WEEPINBELL,  170,  383 ; PORYGON
-	mon_cry CRY_GROWLITHE,   $0f0,  $081 ; OMANYTE
+	mon_cry CRY_GROWLITHE,   240,  129 ; OMANYTE
-	mon_cry CRY_GROWLITHE,   $0ff,  $0c0 ; OMASTAR
+	mon_cry CRY_GROWLITHE,   255,  192 ; OMASTAR
-	mon_cry CRY_CATERPIE,    $0bb,  $0c0 ; KABUTO
+	mon_cry CRY_CATERPIE,    187,  192 ; KABUTO
-	mon_cry CRY_FEAROW,      $0ee,  $081 ; KABUTOPS
+	mon_cry CRY_FEAROW,      238,  129 ; KABUTOPS
-	mon_cry CRY_VILEPLUME,   $020,  $170 ; AERODACTYL
+	mon_cry CRY_VILEPLUME,    32,  368 ; AERODACTYL
-	mon_cry CRY_GRIMER,      $055,  $081 ; SNORLAX
+	mon_cry CRY_GRIMER,       85,  129 ; SNORLAX
-	mon_cry CRY_RAICHU,      $080,  $0c0 ; ARTICUNO
+	mon_cry CRY_RAICHU,      128,  192 ; ARTICUNO
-	mon_cry CRY_FEAROW,      $0ff,  $100 ; ZAPDOS
+	mon_cry CRY_FEAROW,      255,  256 ; ZAPDOS
-	mon_cry CRY_RAICHU,      $0f8,  $0c0 ; MOLTRES
+	mon_cry CRY_RAICHU,      248,  192 ; MOLTRES
-	mon_cry CRY_BULBASAUR,   $060,  $0c0 ; DRATINI
+	mon_cry CRY_BULBASAUR,    96,  192 ; DRATINI
-	mon_cry CRY_BULBASAUR,   $040,  $100 ; DRAGONAIR
+	mon_cry CRY_BULBASAUR,    64,  256 ; DRAGONAIR
-	mon_cry CRY_BULBASAUR,   $03c,  $140 ; DRAGONITE
+	mon_cry CRY_BULBASAUR,    60,  320 ; DRAGONITE
-	mon_cry CRY_PARAS,       $099,  $17f ; MEWTWO
+	mon_cry CRY_PARAS,       153,  383 ; MEWTWO
-	mon_cry CRY_PARAS,       $0ee,  $17f ; MEW
+	mon_cry CRY_PARAS,       238,  383 ; MEW
-	mon_cry CRY_CHIKORITA,  -$010,  $0b0 ; CHIKORITA
+	mon_cry CRY_CHIKORITA,   -16,  176 ; CHIKORITA
-	mon_cry CRY_CHIKORITA,  -$022,  $120 ; BAYLEEF
+	mon_cry CRY_CHIKORITA,   -34,  288 ; BAYLEEF
-	mon_cry CRY_CHIKORITA,  -$0b7,  $200 ; MEGANIUM
+	mon_cry CRY_CHIKORITA,  -183,  512 ; MEGANIUM
-	mon_cry CRY_CYNDAQUIL,   $347,  $080 ; CYNDAQUIL
+	mon_cry CRY_CYNDAQUIL,   839,  128 ; CYNDAQUIL
-	mon_cry CRY_CYNDAQUIL,   $321,  $120 ; QUILAVA
+	mon_cry CRY_CYNDAQUIL,   801,  288 ; QUILAVA
-	mon_cry CRY_TYPHLOSION,  $f00,  $0d4 ; TYPHLOSION
+	mon_cry CRY_TYPHLOSION, 3840,  212 ; TYPHLOSION
-	mon_cry CRY_TOTODILE,    $46c,  $0e8 ; TOTODILE
+	mon_cry CRY_TOTODILE,   1132,  232 ; TOTODILE
-	mon_cry CRY_TOTODILE,    $440,  $110 ; CROCONAW
+	mon_cry CRY_TOTODILE,   1088,  272 ; CROCONAW
-	mon_cry CRY_TOTODILE,    $3fc,  $180 ; FERALIGATR
+	mon_cry CRY_TOTODILE,   1020,  384 ; FERALIGATR
-	mon_cry CRY_SENTRET,     $08a,  $0b8 ; SENTRET
+	mon_cry CRY_SENTRET,     138,  184 ; SENTRET
-	mon_cry CRY_SENTRET,     $06b,  $102 ; FURRET
+	mon_cry CRY_SENTRET,     107,  258 ; FURRET
-	mon_cry CRY_HOOTHOOT,    $091,  $0d8 ; HOOTHOOT
+	mon_cry CRY_HOOTHOOT,    145,  216 ; HOOTHOOT
-	mon_cry CRY_HOOTHOOT,    $000,  $1a0 ; NOCTOWL
+	mon_cry CRY_HOOTHOOT,      0,  416 ; NOCTOWL
-	mon_cry CRY_LEDYBA,      $000,  $0de ; LEDYBA
+	mon_cry CRY_LEDYBA,        0,  222 ; LEDYBA
-	mon_cry CRY_LEDYBA,     -$096,  $138 ; LEDIAN
+	mon_cry CRY_LEDYBA,     -150,  312 ; LEDIAN
-	mon_cry CRY_SPINARAK,    $011,  $200 ; SPINARAK
+	mon_cry CRY_SPINARAK,     17,  512 ; SPINARAK
-	mon_cry CRY_SPINARAK,   -$0ae,  $1e2 ; ARIADOS
+	mon_cry CRY_SPINARAK,   -174,  482 ; ARIADOS
-	mon_cry CRY_SQUIRTLE,   -$010,  $140 ; CROBAT
+	mon_cry CRY_SQUIRTLE,    -16,  320 ; CROBAT
-	mon_cry CRY_CYNDAQUIL,   $3c9,  $140 ; CHINCHOU
+	mon_cry CRY_CYNDAQUIL,   969,  320 ; CHINCHOU
-	mon_cry CRY_CYNDAQUIL,   $2d0,  $110 ; LANTURN
+	mon_cry CRY_CYNDAQUIL,   720,  272 ; LANTURN
-	mon_cry CRY_PICHU,       $000,  $140 ; PICHU
+	mon_cry CRY_PICHU,         0,  320 ; PICHU
-	mon_cry CRY_CLEFFA,      $061,  $091 ; CLEFFA
+	mon_cry CRY_CLEFFA,       97,  145 ; CLEFFA
-	mon_cry CRY_CHIKORITA,   $0e8,  $0e8 ; IGGLYBUFF
+	mon_cry CRY_CHIKORITA,   232,  232 ; IGGLYBUFF
-	mon_cry CRY_TOGEPI,      $010,  $100 ; TOGEPI
+	mon_cry CRY_TOGEPI,       16,  256 ; TOGEPI
-	mon_cry CRY_TOGETIC,     $03b,  $038 ; TOGETIC
+	mon_cry CRY_TOGETIC,      59,   56 ; TOGETIC
-	mon_cry CRY_NATU,       -$067,  $100 ; NATU
+	mon_cry CRY_NATU,       -103,  256 ; NATU
-	mon_cry CRY_NATU,       -$0a7,  $168 ; XATU
+	mon_cry CRY_NATU,       -167,  360 ; XATU
-	mon_cry CRY_MAREEP,      $022,  $0d8 ; MAREEP
+	mon_cry CRY_MAREEP,       34,  216 ; MAREEP
-	mon_cry CRY_MAREEP,     -$007,  $180 ; FLAAFFY
+	mon_cry CRY_MAREEP,       -7,  384 ; FLAAFFY
-	mon_cry CRY_AMPHAROS,   -$07c,  $0e8 ; AMPHAROS
+	mon_cry CRY_AMPHAROS,   -124,  232 ; AMPHAROS
-	mon_cry CRY_CLEFFA,      $084,  $150 ; BELLOSSOM
+	mon_cry CRY_CLEFFA,      132,  336 ; BELLOSSOM
-	mon_cry CRY_MARILL,      $11b,  $120 ; MARILL
+	mon_cry CRY_MARILL,      283,  288 ; MARILL
-	mon_cry CRY_MARILL,      $0b6,  $180 ; AZUMARILL
+	mon_cry CRY_MARILL,      182,  384 ; AZUMARILL
-	mon_cry CRY_CLEFFA,      $f40,  $180 ; SUDOWOODO
+	mon_cry CRY_CLEFFA,     3904,  384 ; SUDOWOODO
-	mon_cry CRY_CLEFFA,     -$2a3,  $1c8 ; POLITOED
+	mon_cry CRY_CLEFFA,     -675,  456 ; POLITOED
-	mon_cry CRY_CLEFFA,      $03b,  $0c8 ; HOPPIP
+	mon_cry CRY_CLEFFA,       59,  200 ; HOPPIP
-	mon_cry CRY_CLEFFA,      $027,  $138 ; SKIPLOOM
+	mon_cry CRY_CLEFFA,       39,  312 ; SKIPLOOM
-	mon_cry CRY_CLEFFA,      $000,  $180 ; JUMPLUFF
+	mon_cry CRY_CLEFFA,        0,  384 ; JUMPLUFF
-	mon_cry CRY_AIPOM,      -$051,  $0e8 ; AIPOM
+	mon_cry CRY_AIPOM,       -81,  232 ; AIPOM
-	mon_cry CRY_MARILL,      $12b,  $0b8 ; SUNKERN
+	mon_cry CRY_MARILL,      299,  184 ; SUNKERN
-	mon_cry CRY_SUNFLORA,   -$020,  $180 ; SUNFLORA
+	mon_cry CRY_SUNFLORA,    -32,  384 ; SUNFLORA
-	mon_cry CRY_TOTODILE,    $031,  $0c8 ; YANMA
+	mon_cry CRY_TOTODILE,     49,  200 ; YANMA
-	mon_cry CRY_WOOPER,      $093,  $0af ; WOOPER
+	mon_cry CRY_WOOPER,      147,  175 ; WOOPER
-	mon_cry CRY_WOOPER,     -$0c6,  $140 ; QUAGSIRE
+	mon_cry CRY_WOOPER,     -198,  320 ; QUAGSIRE
-	mon_cry CRY_AIPOM,       $0a2,  $140 ; ESPEON
+	mon_cry CRY_AIPOM,       162,  320 ; ESPEON
-	mon_cry CRY_VENONAT,    -$0e9,  $0f0 ; UMBREON
+	mon_cry CRY_VENONAT,    -233,  240 ; UMBREON
-	mon_cry CRY_MARILL,     -$01f,  $180 ; MURKROW
+	mon_cry CRY_MARILL,      -31,  384 ; MURKROW
-	mon_cry CRY_SLOWKING,    $104,  $200 ; SLOWKING
+	mon_cry CRY_SLOWKING,    260,  512 ; SLOWKING
-	mon_cry CRY_HOOTHOOT,    $130,  $0e8 ; MISDREAVUS
+	mon_cry CRY_HOOTHOOT,    304,  232 ; MISDREAVUS
-	mon_cry CRY_HOOTHOOT,    $162,  $100 ; UNOWN
+	mon_cry CRY_HOOTHOOT,    354,  256 ; UNOWN
-	mon_cry CRY_AMPHAROS,    $27b,  $144 ; WOBBUFFET
+	mon_cry CRY_AMPHAROS,    635,  324 ; WOBBUFFET
-	mon_cry CRY_GIRAFARIG,   $041,  $200 ; GIRAFARIG
+	mon_cry CRY_GIRAFARIG,    65,  512 ; GIRAFARIG
-	mon_cry CRY_SLOWKING,    $080,  $100 ; PINECO
+	mon_cry CRY_SLOWKING,    128,  256 ; PINECO
-	mon_cry CRY_SLOWKING,    $000,  $180 ; FORRETRESS
+	mon_cry CRY_SLOWKING,      0,  384 ; FORRETRESS
-	mon_cry CRY_DUNSPARCE,   $1c4,  $100 ; DUNSPARCE
+	mon_cry CRY_DUNSPARCE,   452,  256 ; DUNSPARCE
-	mon_cry CRY_GLIGAR,     -$102,  $100 ; GLIGAR
+	mon_cry CRY_GLIGAR,     -258,  256 ; GLIGAR
-	mon_cry CRY_TYPHLOSION,  $0ef,  $0f7 ; STEELIX
+	mon_cry CRY_TYPHLOSION,  239,  247 ; STEELIX
-	mon_cry CRY_DUNSPARCE,   $112,  $0e8 ; SNUBBULL
+	mon_cry CRY_DUNSPARCE,   274,  232 ; SNUBBULL
-	mon_cry CRY_DUNSPARCE,   $000,  $180 ; GRANBULL
+	mon_cry CRY_DUNSPARCE,     0,  384 ; GRANBULL
-	mon_cry CRY_SLOWKING,    $160,  $0e0 ; QWILFISH
+	mon_cry CRY_SLOWKING,    352,  224 ; QWILFISH
-	mon_cry CRY_AMPHAROS,    $000,  $160 ; SCIZOR
+	mon_cry CRY_AMPHAROS,      0,  352 ; SCIZOR
-	mon_cry CRY_DUNSPARCE,   $290,  $0a8 ; SHUCKLE
+	mon_cry CRY_DUNSPARCE,   656,  168 ; SHUCKLE
-	mon_cry CRY_AMPHAROS,    $035,  $0e0 ; HERACROSS
+	mon_cry CRY_AMPHAROS,     53,  224 ; HERACROSS
-	mon_cry CRY_WOOPER,      $053,  $0af ; SNEASEL
+	mon_cry CRY_WOOPER,       83,  175 ; SNEASEL
-	mon_cry CRY_TEDDIURSA,   $7a2,  $06e ; TEDDIURSA
+	mon_cry CRY_TEDDIURSA,  1954,  110 ; TEDDIURSA
-	mon_cry CRY_TEDDIURSA,   $640,  $0d8 ; URSARING
+	mon_cry CRY_TEDDIURSA,  1600,  216 ; URSARING
-	mon_cry CRY_SLUGMA,     -$1d8,  $140 ; SLUGMA
+	mon_cry CRY_SLUGMA,     -472,  320 ; SLUGMA
-	mon_cry CRY_MAGCARGO,   -$20d,  $1c0 ; MAGCARGO
+	mon_cry CRY_MAGCARGO,   -525,  448 ; MAGCARGO
-	mon_cry CRY_CYNDAQUIL,   $1fe,  $140 ; SWINUB
+	mon_cry CRY_CYNDAQUIL,   510,  320 ; SWINUB
-	mon_cry CRY_MAGCARGO,   -$109,  $100 ; PILOSWINE
+	mon_cry CRY_MAGCARGO,   -265,  256 ; PILOSWINE
-	mon_cry CRY_MAGCARGO,    $0a1,  $0e8 ; CORSOLA
+	mon_cry CRY_MAGCARGO,    161,  232 ; CORSOLA
-	mon_cry CRY_SUNFLORA,    $00d,  $100 ; REMORAID
+	mon_cry CRY_SUNFLORA,     13,  256 ; REMORAID
-	mon_cry CRY_TOTODILE,    $000,  $180 ; OCTILLERY
+	mon_cry CRY_TOTODILE,      0,  384 ; OCTILLERY
-	mon_cry CRY_TEDDIURSA,   $002,  $06a ; DELIBIRD
+	mon_cry CRY_TEDDIURSA,     2,  106 ; DELIBIRD
-	mon_cry CRY_MANTINE,    -$0be,  $0f0 ; MANTINE
+	mon_cry CRY_MANTINE,    -190,  240 ; MANTINE
-	mon_cry CRY_AMPHAROS,    $8a9,  $180 ; SKARMORY
+	mon_cry CRY_AMPHAROS,   2217,  384 ; SKARMORY
-	mon_cry CRY_CYNDAQUIL,   $039,  $140 ; HOUNDOUR
+	mon_cry CRY_CYNDAQUIL,    57,  320 ; HOUNDOUR
-	mon_cry CRY_TOTODILE,   -$10a,  $100 ; HOUNDOOM
+	mon_cry CRY_TOTODILE,   -266,  256 ; HOUNDOOM
-	mon_cry CRY_SLUGMA,      $2fb,  $100 ; KINGDRA
+	mon_cry CRY_SLUGMA,      763,  256 ; KINGDRA
-	mon_cry CRY_SENTRET,     $048,  $230 ; PHANPY
+	mon_cry CRY_SENTRET,      72,  560 ; PHANPY
-	mon_cry CRY_DONPHAN,     $000,  $1a0 ; DONPHAN
+	mon_cry CRY_DONPHAN,       0,  416 ; DONPHAN
-	mon_cry CRY_GIRAFARIG,   $073,  $240 ; PORYGON2
+	mon_cry CRY_GIRAFARIG,   115,  576 ; PORYGON2
-	mon_cry CRY_AIPOM,      -$160,  $180 ; STANTLER
+	mon_cry CRY_AIPOM,      -352,  384 ; STANTLER
-	mon_cry CRY_PICHU,      -$21a,  $1f0 ; SMEARGLE
+	mon_cry CRY_PICHU,      -538,  496 ; SMEARGLE
-	mon_cry CRY_AIPOM,       $02c,  $108 ; TYROGUE
+	mon_cry CRY_AIPOM,        44,  264 ; TYROGUE
-	mon_cry CRY_SLUGMA,      $000,  $100 ; HITMONTOP
+	mon_cry CRY_SLUGMA,        0,  256 ; HITMONTOP
-	mon_cry CRY_MARILL,      $068,  $100 ; SMOOCHUM
+	mon_cry CRY_MARILL,      104,  256 ; SMOOCHUM
-	mon_cry CRY_SUNFLORA,   -$2d8,  $0b4 ; ELEKID
+	mon_cry CRY_SUNFLORA,   -728,  180 ; ELEKID
-	mon_cry CRY_TEDDIURSA,   $176,  $03a ; MAGBY
+	mon_cry CRY_TEDDIURSA,   374,   58 ; MAGBY
-	mon_cry CRY_GLIGAR,     -$1cd,  $1a0 ; MILTANK
+	mon_cry CRY_GLIGAR,     -461,  416 ; MILTANK
-	mon_cry CRY_SLOWKING,    $293,  $140 ; BLISSEY
+	mon_cry CRY_SLOWKING,    659,  320 ; BLISSEY
-	mon_cry CRY_RAIKOU,      $22e,  $120 ; RAIKOU
+	mon_cry CRY_RAIKOU,      558,  288 ; RAIKOU
-	mon_cry CRY_ENTEI,       $000,  $1a0 ; ENTEI
+	mon_cry CRY_ENTEI,         0,  416 ; ENTEI
-	mon_cry CRY_MAGCARGO,    $000,  $180 ; SUICUNE
+	mon_cry CRY_MAGCARGO,      0,  384 ; SUICUNE
-	mon_cry CRY_RAIKOU,      $05f,  $0d0 ; LARVITAR
+	mon_cry CRY_RAIKOU,       95,  208 ; LARVITAR
-	mon_cry CRY_SPINARAK,   -$1db,  $150 ; PUPITAR
+	mon_cry CRY_SPINARAK,   -475,  336 ; PUPITAR
-	mon_cry CRY_RAIKOU,     -$100,  $180 ; TYRANITAR
+	mon_cry CRY_RAIKOU,     -256,  384 ; TYRANITAR
-	mon_cry CRY_TYPHLOSION,  $000,  $100 ; LUGIA
+	mon_cry CRY_TYPHLOSION,    0,  256 ; LUGIA
-	mon_cry CRY_AIPOM,       $000,  $180 ; HO_OH
+	mon_cry CRY_AIPOM,         0,  384 ; HO_OH
-	mon_cry CRY_ENTEI,       $14a,  $111 ; CELEBI
+	mon_cry CRY_ENTEI,       330,  273 ; CELEBI
-	mon_cry CRY_NIDORAN_M,      0,     0 ; 252
+	mon_cry CRY_NIDORAN_M,     0,    0 ; 252
-	mon_cry CRY_NIDORAN_M,      0,     0 ; 253
+	mon_cry CRY_NIDORAN_M,     0,    0 ; 253
-	mon_cry CRY_NIDORAN_M,      0,     0 ; 254
+	mon_cry CRY_NIDORAN_M,     0,    0 ; 254
-	mon_cry CRY_NIDORAN_M,      0,     0 ; 255
+	mon_cry CRY_NIDORAN_M,     0,    0 ; 255

data/text/battle.asm

@@ -819,7 +819,7 @@ SubFadedText:
 	line "SUBSTITUTE faded!"
 	prompt
 
-LearnedMoveText:
+MimicLearnedMoveText:
 	text "<USER>"
 	line "learned"
 	cont "@"

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

data/text/std_text.asm

@@ -159,7 +159,7 @@ MerchandiseShelfText:
 	line "merchandise!"
 	done
 
-TownMapText:
+LookTownMapText:
 	text "It's the TOWN MAP."
 	done
 

data/tilesets.asm

@@ -34,7 +34,7 @@ Tilesets::
 	tileset TilesetLighthouse
 	tileset TilesetPlayersRoom
 	tileset TilesetPokeComCenter
-	tileset TilesetBattleTower
+	tileset TilesetBattleTowerInside
 	tileset TilesetTower
 	tileset TilesetCave
 	tileset TilesetPark

docs/bugs_and_glitches.md

@@ -15,12 +15,16 @@ Some fixes are mentioned as breaking compatibility with link battles. This can b
 
 ## Contents
 
+- [Perish Song and Spikes can leave a Pokémon with 0 HP and not faint](#perish-song-and-spikes-can-leave-a-pokémon-with-0-hp-and-not-faint)
 - [Thick Club and Light Ball can make (Special) Attack wrap around above 1024](#thick-club-and-light-ball-can-make-special-attack-wrap-around-above-1024)
 - [Metal Powder can increase damage taken with boosted (Special) Defense](#metal-powder-can-increase-damage-taken-with-boosted-special-defense)
 - [Reflect and Light Screen can make (Special) Defense wrap around above 1024](#reflect-and-light-screen-can-make-special-defense-wrap-around-above-1024)
+- [Glacier Badge may not boost Special Defense depending on the value of Special Attack](#glacier-badge-may-not-boost-special-defense-depending-on-the-value-of-special-attack)
 - [Moves with a 100% secondary effect chance will not trigger it in 1/256 uses](#moves-with-a-100-secondary-effect-chance-will-not-trigger-it-in-1256-uses)
 - [Belly Drum sharply boosts Attack even with under 50% HP](#belly-drum-sharply-boosts-attack-even-with-under-50-hp)
+- [Berserk Gene's confusion lasts for 256 turns or the previous Pokémon's confusion count](#berserk-genes-confusion-lasts-for-256-turns-or-the-previous-Pokémons-confusion-count)
 - [Confusion damage is affected by type-boosting items and Explosion/Self-Destruct doubling](#confusion-damage-is-affected-by-type-boosting-items-and-explosionself-destruct-doubling)
+- [Saves corrupted by mid-save shutoff are not handled](#saves-corrupted-by-mid-save-shutoff-are-not-handled)
 - [Moves that lower Defense can do so after breaking a Substitute](#moves-that-lower-defense-can-do-so-after-breaking-a-substitute)
 - [Counter and Mirror Coat still work if the opponent uses an item](#counter-and-mirror-coat-still-work-if-the-opponent-uses-an-item)
 - [A Disabled but PP Up–enhanced move may not trigger Struggle](#a-disabled-but-pp-upenhanced-move-may-not-trigger-struggle)
@@ -31,9 +35,11 @@ Some fixes are mentioned as breaking compatibility with link battles. This can b
 - [Beat Up may fail to raise Substitute](#beat-up-may-fail-to-raise-substitute)
 - [Beat Up may trigger King's Rock even if it failed](#beat-up-may-trigger-kings-rock-even-if-it-failed)
 - [Present damage is incorrect in link battles](#present-damage-is-incorrect-in-link-battles)
+- [A Transformed Pokémon can use Sketch and learn otherwise unobtainable moves](#a-transformed-pokémon-can-use-sketch-and-learn-otherwise-unobtainable-moves)
 - ["Smart" AI encourages Mean Look if its own Pokémon is badly poisoned](#smart-ai-encourages-mean-look-if-its-own-pokémon-is-badly-poisoned)
 - [AI makes a false assumption about `CheckTypeMatchup`](#ai-makes-a-false-assumption-about-checktypematchup)
 - [NPC use of Full Heal or Full Restore does not cure Nightmare status](#npc-use-of-full-heal-or-full-restore-does-not-cure-nightmare-status)
+- [NPC use of Full Heal does not cure confusion status](#npc-use-of-full-heal-does-not-cure-confusion-status)
 - [HP bar animation is slow for high HP](#hp-bar-animation-is-slow-for-high-hp)
 - [HP bar animation off-by-one error for low HP](#hp-bar-animation-off-by-one-error-for-low-hp)
 - [Experience underflow for level 1 Pokémon with Medium-Slow growth rate](#experience-underflow-for-level-1-pokémon-with-medium-slow-growth-rate)
@@ -74,6 +80,54 @@ Some fixes are mentioned as breaking compatibility with link battles. This can b
 - [`BattleAnimCmd_ClearObjs` only clears the first 6⅔ objects](#battleanimcmd_clearobjs-only-clears-the-first-6-objects)
 
 
+## Perish Song and Spikes can leave a Pokémon with 0 HP and not faint
+
+*Fixing this bug will break compatibility with standard Pokémon Crystal for link battles.*
+
+([Video](https://www.youtube.com/watch?v=1IiPWw5fMf8&t=85))
+
+**Fix:** Edit `CheckFaint_PlayerThenEnemy` and `CheckFaint_EnemyThenPlayer` in [engine/battle/core.asm](https://github.com/pret/pokecrystal/blob/master/engine/battle/core.asm):
+
+```diff
+ 	jp HandleEncore
+
++HasAnyoneFainted:
++	call HasPlayerFainted
++	call nz, HasEnemyFainted
++	ret
++
+ CheckFaint_PlayerThenEnemy:
++.faint_loop
++	call .Function
++	ret c
++	call HasAnyoneFainted
++	ret nz
++	jr .faint_loop
++
++.Function:
+ 	call HasPlayerFainted
+ 	jr nz, .PlayerNotFainted
+ 	call HandlePlayerMonFaint
+ 	...
+```
+
+```diff
+ CheckFaint_EnemyThenPlayer:
++.faint_loop
++	call .Function
++	ret c
++	call HasAnyoneFainted
++	ret nz
++	jr .faint_loop
++
++.Function:
+ 	call HasEnemyFainted
+ 	jr nz, .EnemyNotFainted
+ 	call HandleEnemyMonFaint
+ 	...
+```
+
+
 ## Thick Club and Light Ball can make (Special) Attack wrap around above 1024
 
 *Fixing this bug will break compatibility with standard Pokémon Crystal for link battles.*
@@ -167,6 +221,34 @@ This bug existed for all battles in Gold and Silver, and was only fixed for sing
 (This fix also affects Thick Club, Light Ball, and Metal Powder, as described above, but their specific fixes in the above bugs allow more accurate damage calculations.)
 
 
+## Glacier Badge may not boost Special Defense depending on the value of Special Attack
+
+As Pryce's dialog ("That BADGE will raise the SPECIAL stats of POKéMON.") implies, Glacier Badge is intended to boost both Special Attack and Special Defense. However, due to BoostStat overwriting `a` when boosting Special Attack, the Special Defense boost will not happen if the unboosted Special Attack stat is either 0-205 or 433-660.
+
+**Fix:** Edit `BadgeStatBoosts.CheckBadge` in [engine/battle/core.asm](https://github.com/pret/pokecrystal/blob/master/engine/battle/core.asm):
+
+```diff
+ .CheckBadge:
+ 	ld a, b
+ 	srl b
++	push af
+ 	call c, BoostStat
++	pop af
+ 	inc hl
+ 	inc hl
+ ; Check every other badge.
+ 	srl b
+ 	dec c
+ 	jr nz, .CheckBadge
+ ; Check GlacierBadge again for Special Defense.
+-; This check is buggy because it assumes that a is set by the "ld a, b" in the above loop,
+-; but it can actually be overwritten by the call to BoostStat.
+ 	srl a
+ 	call c, BoostStat
+ 	ret
+```
+
+
 ## Moves with a 100% secondary effect chance will not trigger it in 1/256 uses
 
 *Fixing this bug **may** break compatibility with standard Pokémon Crystal for link battles.*
@@ -242,6 +324,39 @@ This bug existed for all battles in Gold and Silver, and was only fixed for sing
 ```
 
 
+## Berserk Gene's confusion lasts for 256 turns or the previous Pokémon's confusion count
+
+*Fixing this bug will break compatibility with standard Pokémon Crystal for link battles.*
+
+([Video](https://youtube.com/watch?v=Pru3mohq20A))
+
+**Fix:** Edit `HandleBerserkGene` in [engine/battle/core.asm](https://github.com/pret/pokecrystal/blob/master/engine/battle/core.asm):
+
+```diff
+ HandleBerserkGene:
+ 	...
+ 	ld a, BATTLE_VARS_SUBSTATUS3
+ 	call GetBattleVarAddr
+ 	push af
+ 	set SUBSTATUS_CONFUSED, [hl]
++	ld a, [hBattleTurn]
++	and a
++	ld hl, wEnemyConfuseCount
++	jr z, .set_confuse_count
++	ld hl, wPlayerConfuseCount
++.set_confuse_count
++	call BattleRandom
++	and %11
++	add a, 2
++	ld [hl], a
+ 	ld a, BATTLE_VARS_MOVE_ANIM
+ 	call GetBattleVarAddr
+ 	...
+```
+
+This makes the Berserk Gene use the regular confusion duration (2-5 turns).
+
+
 ## Confusion damage is affected by type-boosting items and Explosion/Self-Destruct doubling
 
 *Fixing this bug will break compatibility with standard Pokémon Crystal for link battles.*
@@ -250,11 +365,15 @@ This bug existed for all battles in Gold and Silver, and was only fixed for sing
 
 **Fix:**
 
-First, edit [hram.asm](https://github.com/pret/pokecrystal/blob/master/hram.asm):
+First, edit [wram.asm](https://github.com/pret/pokecrystal/blob/master/wram.asm):
 
 ```diff
- hClockResetTrigger:: db ; ffeb
+ wTurnEnded:: db ; c6b4
-+hIsConfusionDamage:: db ; ffec
+
+-	ds 1
++wIsConfusionDamage:: db ; c6b5
+
+ wPlayerStats:: ; c6b6
 ```
 
 Then edit four routines in [engine/battle/effect_commands.asm](https://github.com/pret/pokecrystal/blob/master/engine/battle/effect_commands.asm):
@@ -267,7 +386,7 @@ Then edit four routines in [engine/battle/effect_commands.asm](https://github.co
  	pop af
  	ld e, a
 +	ld a, TRUE
-+	ldh [hIsConfusionDamage], a
++	ld [wIsConfusionDamage], a
  	ret
 ```
 
@@ -277,7 +396,7 @@ Then edit four routines in [engine/battle/effect_commands.asm](https://github.co
  	...
  .skip_zero_damage_check
 +	xor a ; Not confusion damage
-+	ldh [hIsConfusionDamage], a
++	ld [wIsConfusionDamage], a
 +	; fallthrough
 +
 +ConfusionDamageCalc:
@@ -293,7 +412,7 @@ Then edit four routines in [engine/battle/effect_commands.asm](https://github.co
  ; Item boosts
 +
 +; Item boosts don't apply to confusion damage
-+	ldh a, [hIsConfusionDamage]
++	ld a, [wIsConfusionDamage]
 +	and a
 +	jr nz, .DoneItem
 +
@@ -332,6 +451,109 @@ Then edit four routines in [engine/battle/effect_commands.asm](https://github.co
 ```
 
 
+## Saves corrupted by mid-save shutoff are not handled
+
+([Video 1](https://www.youtube.com/watch?v=ukqtK0l6bu0), [Video 2](https://www.youtube.com/watch?v=c2zHd1BPtvc))
+
+**Fix:** Edit `MoveMonWOMail_InsertMon_SaveGame` and `_SaveGameData` in [engine/menus/save.asm](https://github.com/pret/pokecrystal/blob/master/engine/menus/save.asm):
+
+```diff
+ MoveMonWOMail_InsertMon_SaveGame:
+ 	...
+ 	ld a, TRUE
+ 	ld [wSaveFileExists], a
+ 	farcall StageRTCTimeForSave
+ 	farcall BackupMysteryGift
+-	call ValidateSave
++	call InvalidateSave
+ 	call SaveOptions
+ 	call SavePlayerData
+ 	call SavePokemonData
+ 	call SaveChecksum
+-	call ValidateBackupSave
++	call ValidateSave
++	call InvalidateBackupSave
+ 	call SaveBackupOptions
+ 	call SaveBackupPlayerData
+ 	call SaveBackupPokemonData
+ 	call SaveBackupChecksum
++	call ValidateBackupSave
+ 	farcall BackupPartyMonMail
+ 	farcall BackupMobileEventIndex
+ 	farcall SaveRTC
+ 	...
+```
+
+```diff
+ _SaveGameData:
+ 	...
+ 	ld a, TRUE
+ 	ld [wSaveFileExists], a
+ 	farcall StageRTCTimeForSave
+ 	farcall BackupMysteryGift
+-	call ValidateSave
++	call InvalidateSave
+ 	call SaveOptions
+ 	call SavePlayerData
+ 	call SavePokemonData
+ 	call SaveBox
+ 	call SaveChecksum
+-	call ValidateBackupSave
++	call ValidateSave
++	call InvalidateBackupSave
+ 	call SaveBackupOptions
+ 	call SaveBackupPlayerData
+ 	call SaveBackupPokemonData
+ 	call SaveBackupChecksum
++	call ValidateBackupSave
+ 	call UpdateStackTop
+ 	farcall BackupPartyMonMail
+ 	farcall BackupMobileEventIndex
+ 	farcall SaveRTC
+ 	...
+```
+
+Then create two new routines, `InvalidateSave` and `InvalidateBackupSave`:
+
+```diff
+ ValidateSave:
+ 	ld a, BANK(sCheckValue1) ; aka BANK(sCheckValue2)
+ 	call GetSRAMBank
+ 	ld a, SAVE_CHECK_VALUE_1
+ 	ld [sCheckValue1], a
+ 	ld a, SAVE_CHECK_VALUE_2
+ 	ld [sCheckValue2], a
+ 	jp CloseSRAM
+
++InvalidateSave:
++	ld a, BANK(sCheckValue1) ; aka BANK(sCheckValue2)
++	call GetSRAMBank
++	xor a
++	ld [sCheckValue1], a
++	ld [sCheckValue2], a
++	jp CloseSRAM
+```
+
+```diff
+ ValidateBackupSave:
+ 	ld a, BANK(sBackupCheckValue1) ; aka BANK(sBackupCheckValue2)
+ 	call GetSRAMBank
+ 	ld a, SAVE_CHECK_VALUE_1
+ 	ld [sBackupCheckValue1], a
+ 	ld a, SAVE_CHECK_VALUE_2
+ 	ld [sBackupCheckValue2], a
+ 	jp CloseSRAM
+
++InvalidateBackupSave:
++	ld a, BANK(sBackupCheckValue1) ; aka BANK(sBackupCheckValue2)
++	call GetSRAMBank
++	xor a
++	ld [sBackupCheckValue1], a
++	ld [sBackupCheckValue2], a
++	jp CloseSRAM
+```
+
+
 ## Moves that lower Defense can do so after breaking a Substitute
 
 *Fixing this bug will break compatibility with standard Pokémon Crystal for link battles.*
@@ -615,6 +837,23 @@ This bug existed for all battles in Gold and Silver, and was only fixed for sing
 ```
 
 
+## A Transformed Pokémon can use Sketch and learn otherwise unobtainable moves
+
+([Video](https://www.youtube.com/watch?v=AFiBxAOkCGI))
+
+**Fix:** Edit `BattleCommand_Sketch` in [engine/battle/move_effects/sketch.asm](https://github.com/pret/pokecrystal/blob/master/engine/battle/move_effects/sketch.asm):
+
+```diff
+-; If the opponent is transformed, fail.
++; If the user is transformed, fail.
+-	ld a, BATTLE_VARS_SUBSTATUS5_OPP
++	ld a, BATTLE_VARS_SUBSTATUS5
+ 	call GetBattleVarAddr
+ 	bit SUBSTATUS_TRANSFORMED, [hl]
+ 	jp nz, .fail
+```
+
+
 ## "Smart" AI encourages Mean Look if its own Pokémon is badly poisoned
 
 ([Video](https://www.youtube.com/watch?v=cygMO-zHTls))
@@ -641,10 +880,8 @@ This bug existed for all battles in Gold and Silver, and was only fixed for sing
  	ld hl, wEnemyMonType1
  	ldh a, [hBattleTurn]
  	and a
- 	jr z, CheckTypeMatchup
+	jr z, CheckTypeMatchup
  	ld hl, wBattleMonType1
-+	ld a, BATTLE_VARS_MOVE_TYPE
-+	call GetBattleVar ; preserves hl, de, and bc
  CheckTypeMatchup:
 -; There is an incorrect assumption about this function made in the AI related code: when
 -; the AI calls CheckTypeMatchup (not BattleCheckTypeMatchup), it assumes that placing the
@@ -652,6 +889,8 @@ This bug existed for all battles in Gold and Silver, and was only fixed for sing
 -; this assumption is incorrect. A simple fix would be to load the move type for the
 -; current move into a in BattleCheckTypeMatchup, before falling through, which is
 -; consistent with how the rest of the code assumes this code works like.
++	ld a, BATTLE_VARS_MOVE_TYPE
++	call GetBattleVar ; preserves hl, de, and bc
  	push hl
  	push de
  	push bc
@@ -677,12 +916,67 @@ This bug existed for all battles in Gold and Silver, and was only fixed for sing
  	xor a
  	ld [hl], a
  	ld [wEnemyMonStatus], a
--	; Bug: this should reset SUBSTATUS_NIGHTMARE too
+-	; Bug: this should reset SUBSTATUS_NIGHTMARE
--	; Uncomment the lines below to fix
+-	; Uncomment the 2 lines below to fix
 -	; ld hl, wEnemySubStatus1
 -	; res SUBSTATUS_NIGHTMARE, [hl]
 +	ld hl, wEnemySubStatus1
 +	res SUBSTATUS_NIGHTMARE, [hl]
+	; Bug: this should reset SUBSTATUS_CONFUSED
+	; Uncomment the 2 lines below to fix
+	; ld hl, wEnemySubStatus3
+	; res SUBSTATUS_CONFUSED, [hl]
+ 	ld hl, wEnemySubStatus5
+ 	res SUBSTATUS_TOXIC, [hl]
+ 	ret
+```
+
+
+## NPC use of Full Heal does not cure confusion status
+
+**Fix:** Edit `EnemyUsedFullRestore`, `EnemyUsedFullHeal`, and `AI_HealStatus` in [engine/battle/ai/items.asm](https://github.com/pret/pokecrystal/blob/master/engine/battle/ai/items.asm):
+
+```diff
+ EnemyUsedFullRestore:
+ 	call AI_HealStatus
+ 	ld a, FULL_RESTORE
+ 	ld [wCurEnemyItem], a
+-	ld hl, wEnemySubStatus3
+-	res SUBSTATUS_CONFUSED, [hl]
+ 	xor a
+ 	ld [wEnemyConfuseCount], a
+```
+
+```diff
+ EnemyUsedFullHeal:
+ 	call AIUsedItemSound
+ 	call AI_HealStatus
+ 	ld a, FULL_HEAL
++	ld [wCurEnemyItem], a
++	xor a
++	ld [wEnemyConfuseCount], a
+ 	jp PrintText_UsedItemOn_AND_AIUpdateHUD
+```
+
+```diff
+ AI_HealStatus:
+ 	ld a, [wCurOTMon]
+ 	ld hl, wOTPartyMon1Status
+ 	ld bc, PARTYMON_STRUCT_LENGTH
+ 	call AddNTimes
+ 	xor a
+ 	ld [hl], a
+ 	ld [wEnemyMonStatus], a
+	; Bug: this should reset SUBSTATUS_NIGHTMARE
+	; Uncomment the 2 lines below to fix
+	; ld hl, wEnemySubStatus1
+	; res SUBSTATUS_NIGHTMARE, [hl]
+-	; Bug: this should reset SUBSTATUS_CONFUSED
+-	; Uncomment the 2 lines below to fix
+-	; ld hl, wEnemySubStatus3
+-	; res SUBSTATUS_CONFUSED, [hl]
++	ld hl, wEnemySubStatus3
++	res SUBSTATUS_CONFUSED, [hl]
  	ld hl, wEnemySubStatus5
  	res SUBSTATUS_TOXIC, [hl]
  	ret
@@ -780,10 +1074,10 @@ This can bring Pokémon straight from level 1 to 100 by gaining just a few exper
 
 ([Video](https://www.youtube.com/watch?v=o54VjpAEoO8))
 
-**Fix:** Edit `Text_ABoostedStringBuffer2ExpPoints` and `Text_StringBuffer2ExpPoints` in [data/text/common_2.asm](https://github.com/pret/pokecrystal/blob/master/data/text/common_2.asm):
+**Fix:** Edit `_BoostedExpPointsText` and `_ExpPointsText` in [data/text/common_2.asm](https://github.com/pret/pokecrystal/blob/master/data/text/common_2.asm):
 
 ```diff
- Text_ABoostedStringBuffer2ExpPoints::
+ _BoostedExpPointsText::
  	text_start
  	line "a boosted"
  	cont "@"
@@ -792,7 +1086,7 @@ This can bring Pokémon straight from level 1 to 100 by gaining just a few exper
  	text " EXP. Points!"
  	prompt
 
- Text_StringBuffer2ExpPoints::
+ _ExpPointsText::
  	text_start
  	line "@"
 -	text_decimal wStringBuffer2, 2, 4
@@ -1036,7 +1330,7 @@ CopyPokemonName_Buffer1_Buffer3:
  	jr nc, .GenerateDVs
 ```
 
-**Better fix:** Rewrite the whole system to use millimeters instead of feet and inches, since they have better precision (1 in = 25.4 mm); and only convert from metric to imperial units for display purposes (or don't, of course). 
+**Better fix:** Rewrite the whole system to use millimeters instead of feet and inches, since they have better precision (1 in = 25.4 mm); and only convert from metric to imperial units for display purposes (or don't, of course).
 
 
 ## Magikarp lengths can be miscalculated
@@ -1233,7 +1527,7 @@ Finally, edit [engine/battle/read_trainer_party.asm](https://github.com/pret/pok
 
 ([Video](https://www.youtube.com/watch?v=ojq3xqfRF6I))
 
-**Fix:** Edit `Slots_PayoutAnim` in [engine/games/slot_machine.asm](https://github.com/pret/pokecrystal/blob/master/engine/games/slot_machine.asm):
+**Fix:** Edit `SlotsAction_PayoutAnim` in [engine/games/slot_machine.asm](https://github.com/pret/pokecrystal/blob/master/engine/games/slot_machine.asm):
 
 ```diff
  .okay
@@ -1383,7 +1677,7 @@ If you want to make sure `hInMenu` always has a defined value in the move select
  	...
 
  	jp .loop
- 
+
  .quit
 +	pop af
 +	ldh [hInMenu], a
@@ -1442,12 +1736,12 @@ First, edit `UsedSurfScript` in [engine/events/overworld.asm](https://github.com
  	writetext UsedSurfText ; "used SURF!"
  	waitbutton
  	closetext
- 
+
  	callasm .empty_fn ; empty function
- 
+
  	readmem wBuffer2
  	writevar VAR_MOVEMENT
- 
+
  	special ReplaceKrisSprite
  	special PlayMapMusic
 -; step into the water (slow_step DIR, step_end)
@@ -1784,8 +2078,9 @@ This supports up to six entries.
  	ld de, 3
  	ld hl, .pointers
  	call IsInArray
- 	jr nc, .nope
+- 	jr nc, .nope
  	pop bc
++	jr nc, .nope
 
  	inc hl
  	ld a, [hli]
@@ -1795,7 +2090,6 @@ This supports up to six entries.
 
  .nope
 -	; pop bc
-+	pop bc
  	xor a
  	ret
 ```

docs/design_flaws.md

@@ -216,6 +216,17 @@ INCBIN "gfx/footprints/wartortle.1bpp"
 Edit `Pokedex_LoadAnyFootprint`:
 
 ```diff
+ 	ld a, [wTempSpecies]
+ 	dec a
+ 	and %111
+ 	swap a ; * $10
++	add a, a
+ 	ld l, a
+ 	ld h, 0
+ 	add hl, de
+ 	ld de, Footprints
+ 	add hl, de
+
 -	push hl
  	ld e, l
  	ld d, h

docs/event_commands.md

@@ -298,7 +298,7 @@ If <code><i>item_id</i></code> = `USE_SCRIPT_VAR`, then it uses `[wScriptVar]` i
 ## `$54`: `waitbutton`
 
 
-## `$55`: `buttonsound`
+## `$55`: `promptbutton`
 
 
 ## `$56`: <code>pokepic <i>mon_id</i></code>

docs/text_commands.md

@@ -35,7 +35,7 @@ Draw a box.
 Write text at (1, 16).
 
 
-## `$06`: `text_waitbutton`
+## `$06`: `text_promptbutton`
 
 Wait for button press; show arrow.
 
@@ -71,7 +71,7 @@ Play `SFX_DEX_FANFARE_50_79`.
 Print *n* `"…"`s, pausing for 10 frames after each; interrupt if A or B is pressed.
 
 
-## `$0D`: `text_linkwaitbutton`
+## `$0D`: `text_linkpromptbutton`
 
 Wait for button press; show arrow.
 

engine/battle/ai/items.asm

@@ -687,7 +687,7 @@ AI_Switch:
 	pop af
 
 	jr c, .skiptext
-	ld hl, TextJump_EnemyWithdrew
+	ld hl, EnemyWithdrewText
 	call PrintText
 
 .skiptext
@@ -707,8 +707,8 @@ AI_Switch:
 	scf
 	ret
 
-TextJump_EnemyWithdrew:
+EnemyWithdrewText:
-	text_far Text_EnemyWithdrew
+	text_far _EnemyWithdrewText
 	text_end
 
 Function384d5: ; This appears to be unused
@@ -725,10 +725,14 @@ AI_HealStatus:
 	xor a
 	ld [hl], a
 	ld [wEnemyMonStatus], a
-	; Bug: this should reset SUBSTATUS_NIGHTMARE too
+	; Bug: this should reset SUBSTATUS_NIGHTMARE
-	; Uncomment the lines below to fix
+	; Uncomment the 2 lines below to fix
 	; ld hl, wEnemySubStatus1
 	; res SUBSTATUS_NIGHTMARE, [hl]
+	; Bug: this should reset SUBSTATUS_CONFUSED
+	; Uncomment the 2 lines below to fix
+	; ld hl, wEnemySubStatus3
+	; res SUBSTATUS_CONFUSED, [hl]
 	ld hl, wEnemySubStatus5
 	res SUBSTATUS_TOXIC, [hl]
 	ret
@@ -824,9 +828,9 @@ PrintText_UsedItemOn:
 	ld de, wMonOrItemNameBuffer
 	ld bc, ITEM_NAME_LENGTH
 	call CopyBytes
-	ld hl, TextJump_EnemyUsedOn
+	ld hl, EnemyUsedOnText
 	jp PrintText
 
-TextJump_EnemyUsedOn:
+EnemyUsedOnText:
-	text_far Text_EnemyUsedOn
+	text_far _EnemyUsedOnText
 	text_end

engine/battle/core.asm

@@ -6758,12 +6758,12 @@ BadgeStatBoosts:
 ; depending on which badges have been obtained.
 
 ; Every other badge boosts a stat, starting from the first.
+; GlacierBadge also boosts Special Defense, although the relevant code is buggy (see below).
 
 ; 	ZephyrBadge:  Attack
 ; 	PlainBadge:   Speed
 ; 	MineralBadge: Defense
-; 	GlacierBadge: Special Attack
+; 	GlacierBadge: Special Attack and Special Defense
-; 	RisingBadge:  Special Defense
 
 ; The boosted stats are in order, except PlainBadge and MineralBadge's boosts are swapped.
 
@@ -6806,7 +6806,9 @@ BadgeStatBoosts:
 	srl b
 	dec c
 	jr nz, .CheckBadge
-; And the last one (RisingBadge) too.
+; Check GlacierBadge again for Special Defense.
+; This check is buggy because it assumes that a is set by the "ld a, b" in the above loop,
+; but it can actually be overwritten by the call to BoostStat.
 	srl a
 	call c, BoostStat
 	ret
@@ -7405,20 +7407,20 @@ BoostExp:
 Text_MonGainedExpPoint:
 	text_far Text_Gained
 	text_asm
-	ld hl, TextJump_StringBuffer2ExpPoints
+	ld hl, ExpPointsText
 	ld a, [wStringBuffer2 + 2] ; IsTradedMon
 	and a
 	ret z
 
-	ld hl, TextJump_ABoostedStringBuffer2ExpPoints
+	ld hl, BoostedExpPointsText
 	ret
 
-TextJump_ABoostedStringBuffer2ExpPoints:
+BoostedExpPointsText:
-	text_far Text_ABoostedStringBuffer2ExpPoints
+	text_far _BoostedExpPointsText
 	text_end
 
-TextJump_StringBuffer2ExpPoints:
+ExpPointsText:
-	text_far Text_StringBuffer2ExpPoints
+	text_far _ExpPointsText
 	text_end
 
 AnimateExpBar:
@@ -7687,11 +7689,11 @@ JumpText_YourFoesWeakGetmMon:
 	text_far Text_YourFoesWeakGetmMon
 	text_asm
 Function_TextJump_BattleMonNick01:
-	ld hl, TextJump_BattleMonNick01
+	ld hl, BattleMonNicknameText
 	ret
 
-TextJump_BattleMonNick01:
+BattleMonNicknameText:
-	text_far Text_BattleMonNick01
+	text_far _BattleMonNicknameText
 	text_end
 
 WithdrawMonText:
@@ -7734,40 +7736,40 @@ WithdrawMonText:
 	pop bc
 	pop de
 	ldh a, [hQuotient + 3]
-	ld hl, TextJump_ThatsEnoughComeBack
+	ld hl, ThatsEnoughComeBackText
 	and a
 	ret z
 
-	ld hl, TextJump_ComeBack
+	ld hl, ComeBackText
 	cp 30
 	ret c
 
-	ld hl, TextJump_OKComeBack
+	ld hl, OKComeBackText
 	cp 70
 	ret c
 
-	ld hl, TextJump_GoodComeBack
+	ld hl, GoodComeBackText
 	ret
 
-TextJump_ThatsEnoughComeBack:
+ThatsEnoughComeBackText:
-	text_far Text_ThatsEnoughComeBack
+	text_far _ThatsEnoughComeBackText
 	text_end
 
-TextJump_OKComeBack:
+OKComeBackText:
-	text_far Text_OKComeBack
+	text_far _OKComeBackText
 	text_end
 
-TextJump_GoodComeBack:
+GoodComeBackText:
-	text_far Text_GoodComeBack
+	text_far _GoodComeBackText
 	text_end
 
 Unreferenced_TextJump_ComeBack:
 ; this function doesn't seem to be used
-	ld hl, TextJump_ComeBack
+	ld hl, ComeBackText
 	ret
 
-TextJump_ComeBack:
+ComeBackText:
-	text_far Text_ComeBack
+	text_far _ComeBackText
 	text_end
 
 Unreferenced_HandleSafariAngerEatingStatus:

engine/battle/effect_commands.asm

@@ -4546,21 +4546,21 @@ BattleCommand_StatUpMessage:
 	jp BattleTextbox
 
 .stat
-	text_far UnknownText_0x1c0cc6
+	text_far Text_BattleEffectActivate
 	text_asm
-	ld hl, .up
+	ld hl, .BattleStatWentUpText
 	ld a, [wLoweredStat]
 	and $f0
 	ret z
-	ld hl, .wayup
+	ld hl, .BattleStatWentWayUpText
 	ret
 
-.wayup
+.BattleStatWentWayUpText:
-	text_far UnknownText_0x1c0cd0
+	text_far _BattleStatWentWayUpText
 	text_end
 
-.up
+.BattleStatWentUpText:
-	text_far UnknownText_0x1c0ce0
+	text_far _BattleStatWentUpText
 	text_end
 
 BattleCommand_StatDownMessage:
@@ -4576,21 +4576,21 @@ BattleCommand_StatDownMessage:
 	jp BattleTextbox
 
 .stat
-	text_far UnknownText_0x1c0ceb
+	text_far Text_BattleFoeEffectActivate
 	text_asm
-	ld hl, .fell
+	ld hl, .BattleStatFellText
 	ld a, [wLoweredStat]
 	and $f0
 	ret z
-	ld hl, .sharplyfell
+	ld hl, .BattleStatSharplyFellText
 	ret
 
-.sharplyfell
+.BattleStatSharplyFellText:
-	text_far UnknownText_0x1c0cf5
+	text_far _BattleStatSharplyFellText
 	text_end
 
-.fell
+.BattleStatFellText:
-	text_far UnknownText_0x1c0d06
+	text_far _BattleStatFellText
 	text_end
 
 TryLowerStat:
@@ -5641,64 +5641,58 @@ BattleCommand_Charge:
 	jp EndMoveEffect
 
 .UsedText:
-	text_far UnknownText_0x1c0d0e ; "<USER>"
+	text_far Text_BattleUser ; "<USER>"
 	text_asm
 	ld a, BATTLE_VARS_MOVE_ANIM
 	call GetBattleVar
 	cp RAZOR_WIND
-	ld hl, .RazorWind
+	ld hl, .BattleMadeWhirlwindText
 	jr z, .done
 
 	cp SOLARBEAM
-	ld hl, .Solarbeam
+	ld hl, .BattleTookSunlightText
 	jr z, .done
 
 	cp SKULL_BASH
-	ld hl, .SkullBash
+	ld hl, .BattleLoweredHeadText
 	jr z, .done
 
 	cp SKY_ATTACK
-	ld hl, .SkyAttack
+	ld hl, .BattleGlowingText
 	jr z, .done
 
 	cp FLY
-	ld hl, .Fly
+	ld hl, .BattleFlewText
 	jr z, .done
 
 	cp DIG
-	ld hl, .Dig
+	ld hl, .BattleDugText
 
 .done
 	ret
 
-.RazorWind:
+.BattleMadeWhirlwindText:
-; 'made a whirlwind!'
+	text_far _BattleMadeWhirlwindText
-	text_far UnknownText_0x1c0d12
 	text_end
 
-.Solarbeam:
+.BattleTookSunlightText:
-; 'took in sunlight!'
+	text_far _BattleTookSunlightText
-	text_far UnknownText_0x1c0d26
 	text_end
 
-.SkullBash:
+.BattleLoweredHeadText:
-; 'lowered its head!'
+	text_far _BattleLoweredHeadText
-	text_far UnknownText_0x1c0d3a
 	text_end
 
-.SkyAttack:
+.BattleGlowingText:
-; 'is glowing!'
+	text_far _BattleGlowingText
-	text_far UnknownText_0x1c0d4e
 	text_end
 
-.Fly:
+.BattleFlewText:
-; 'flew up high!'
+	text_far _BattleFlewText
-	text_far UnknownText_0x1c0d5c
 	text_end
 
-.Dig:
+.BattleDugText:
-; 'dug a hole!'
+	text_far _BattleDugText
-	text_far UnknownText_0x1c0d6c
 	text_end
 
 BattleCommand3c:

engine/battle/move_effects/mimic.asm

@@ -43,7 +43,7 @@ BattleCommand_Mimic:
 	ld [hl], 5
 	call GetMoveName
 	call AnimateCurrentMove
-	ld hl, LearnedMoveText
+	ld hl, MimicLearnedMoveText
 	jp StdBattleTextbox
 
 .fail

engine/events/battle_tower/get_trainer_class.asm

@@ -21,7 +21,7 @@ GetMobileOTTrainerClass: ; mobile function
 
 .skip_male_trainers
 	ld a, [de]
-	cp $1
+	cp FEMALE
 	ld hl, MaleTrainers
 	jr nz, .finished