Identify some more labels

2024-11-16 11:27:33 -08:00 · 2021-02-05 12:44:21 -05:00 · 2021-02-05 12:44:21 -05:00 · 4264d53eb6
commit 4264d53eb6
parent 7d3ea88611
17 changed files with 197 additions and 201 deletions
--- a/data/text/common_1.asm
+++ b/data/text/common_1.asm
@ -215,32 +215,32 @@ _OakTimeIsItText::

 ; Mobile Adapter

-UnknownText_0x1bc384:: ; unreferenced
+_ThereIsNothingConnectedText:: ; unreferenced
 	text "There is nothing"
 	line "connected."
 	done

-UnknownText_0x1bc3a1:: ; unreferenced
+_CheckCellPhoneAdapterText:: ; unreferenced
 	text "Check cell phone"
 	line "adapter."
 	done

-UnknownText_0x1bc3bc:: ; unreferenced
+_CheckCDMAAdapterText:: ; unreferenced
 	text "Check CDMA"
 	line "adapter."
 	done

-UnknownText_0x1bc3d1:: ; unreferenced
+_CheckDOCOMOPHSAdapterText:: ; unreferenced
 	text "Check DOCOMO PHS"
 	line "adapter."
 	done

-UnknownText_0x1bc3ec:: ; unreferenced
+_CheckDDIPHSAdapterText:: ; unreferenced
 	text "Check DDI PHS"
 	line "adapter."
 	done

-UnknownText_0x1bc404:: ; unreferenced
+_CheckMobileAdapterText:: ; unreferenced
 	text "Check unlimited"
 	line "battle mobile"
 	cont "adapter."
@ -1225,19 +1225,19 @@ _TheBoxIsFullText:: ; unreferenced

 ; Mobile Adapter

-UnknownText_0x1bd19a::
+_NewCardArrivedText::
 	text "A new CARD arrived"
 	line "from @"
 	text_ram wStringBuffer2
 	text "."
 	done

-UnknownText_0x1bd1ba::
+_PutCardInCardFolderText::
 	text "Put this CARD in"
 	line "the CARD FOLDER?"
 	done

-UnknownText_0x1bd1dd::
+_CardWasListedText::
 	text_ram wStringBuffer2
 	text "'s CARD was"
 	line "listed as no.@"
@ -1245,34 +1245,34 @@ UnknownText_0x1bd1dd::
 	text "."
 	prompt

-UnknownText_0x1bd201::
+_StartingLinkText::
 	text "Starting link."
 	done

-UnknownText_0x1bd211::
+_LinkTerminatedText::
 	text "Link terminated."
 	done

-UnknownText_0x1bd223::
+_ClosingLinkText::
 	text "Closing link."
 	done

-UnknownText_0x1bd232:: ; unreferenced
+_ClearTimeLimitText:: ; unreferenced
 	text "Clear the time"
 	line "limit?"
 	done

-UnknownText_0x1bd249:: ; unreferenced
+_TimeLimitWasClearedText:: ; unreferenced
 	text "The time limit was"
 	line "cleared."
 	done

-UnknownText_0x1bd266:: ; unreferenced
+_PickErrorPacketText:: ; unreferenced
 	text "Pick which packet"
 	line "as an error?"
 	done

-UnknownText_0x1bd286::
+_TradingMonForOTMonText::
 	text "Trading @"
 	text_ram wStringBuffer2
 	text_start
--- a/data/text/common_3.asm
+++ b/data/text/common_3.asm
@ -79,7 +79,7 @@ _LinkAskTradeForText::
 	text "?"
 	done

-UnknownText_0x1c422a::
+_MobileBattleMustPickThreeMonText::
 	text "To enter a mobile"
 	line "battle, you must"

@ -89,12 +89,12 @@ UnknownText_0x1c422a::
 	para "Is that OK?"
 	done

-UnknownText_0x1c4275::
+_MobileBattleMoreInfoText::
 	text "Need more info on"
 	line "mobile battles?"
 	done

-UnknownText_0x1c4298::
+_MobileBattleRulesText::
 	text "For a mobile"
 	line "battle, choose"
 	cont "three #MON."
@ -121,7 +121,7 @@ UnknownText_0x1c4298::
 	line "wins."
 	done

-UnknownText_0x1c439c::
+_WouldYouLikeToMobileBattleText::
 	text "Today's remaining"
 	line "time is @"
 	text_decimal wStringBuffer2, 1, 2
@ -131,7 +131,7 @@ UnknownText_0x1c439c::
 	line "battle?"
 	done

-UnknownText_0x1c43dc::
+_WantAQuickMobileBattleText::
 	text "There are only @"
 	text_decimal wStringBuffer2, 1, 2
 	text_start
@ -141,7 +141,7 @@ UnknownText_0x1c43dc::
 	line "battle?"
 	done

-UnknownText_0x1c4419::
+_WantToRushThroughAMobileBattleText::
 	text "There is only"
 	line "1 min. left today!"

@ -149,7 +149,7 @@ UnknownText_0x1c4419::
 	line "through a battle?"
 	done

-UnknownText_0x1c445a::
+_PleaseTryAgainTomorrowText::
 	text "There is less than"
 	line "1 min. left today!"

@ -157,7 +157,7 @@ UnknownText_0x1c445a::
 	line "tomorrow."
 	done

-UnknownText_0x1c449c::
+_TryAgainUsingSameSettingsText::
 	text "Try again using"
 	line "the same settings?"
 	done
@ -172,12 +172,12 @@ _MobileBattleNoTimeLeftForLinkingText::
 	line "linking today."
 	done

-UnknownText_0x1c4508::
+_PickThreeMonForMobileBattleText::
 	text "Pick three #MON"
 	line "for battle."
 	done

-UnknownText_0x1c4525::
+_MobileBattleRemainingTimeText::
 	text "Today's remaining"
 	line "time is @"
 	text_decimal wStringBuffer2, 1, 2
@ -753,7 +753,7 @@ _DeletedTheLoginPasswordText::
 	line "PASSWORD."
 	done

-_MobilePickThreeMonForBattle::
+_MobilePickThreeMonForBattleText::
 	text "Pick three #MON"
 	line "for battle."
 	prompt
--- a/engine/battle/core.asm
+++ b/engine/battle/core.asm
@ -158,7 +158,7 @@ WildFled_EnemyFled_LinkBattleCanceled:

 BattleTurn:
 .loop
-	call Stubbed_Function3c1bf
+	call Stubbed_Increments5_a89a
 	call CheckContestBattleOver
 	jp c, .quit

@ -228,11 +228,11 @@ BattleTurn:
 .quit
 	ret

-Stubbed_Function3c1bf:
+Stubbed_Increments5_a89a:
 	ret
-	ld a, BANK(s5_a89b) ; MBC30 bank used by JP Crystal; inaccessible by MBC3
+	ld a, BANK(s5_a89a) ; MBC30 bank used by JP Crystal; inaccessible by MBC3
 	call OpenSRAM
-	ld hl, s5_a89b ; address of MBC30 bank
+	ld hl, s5_a89a + 1 ; address of MBC30 bank
 	inc [hl]
 	jr nz, .finish
 	dec hl
--- a/engine/battle_anims/anim_commands.asm
+++ b/engine/battle_anims/anim_commands.asm
@ -26,11 +26,11 @@ _PlayBattleAnim:

 	ld c, 1
 	ldh a, [rKEY1]
-	bit 7, a
-	jr nz, .asm_cc0ff
+	bit 7, a ; check CGB double speed mode
+	jr nz, .got_speed
 	ld c, 3

-.asm_cc0ff
+.got_speed
 	ld hl, hVBlank
 	ld a, [hl]
 	push af
--- a/engine/events/battle_tower/battle_tower.asm
+++ b/engine/events/battle_tower/battle_tower.asm
@ -5,6 +5,7 @@ BattleTowerRoomMenu:
 	ret

 Function1700ba:
+; special
 	call InitBattleTowerChallengeRAM
 	farcall Function11811a
 	ret
@ -136,7 +137,7 @@ Function170139: ; unreferenced
 	ld l, a
 	ld a, [wcd4c]
 	ld h, a
-	ld bc, $0006
+	ld bc, 6
 	call CopyBytes
 	ld a, l
 	ld [wcd4b], a
@ -156,7 +157,7 @@ Function170139: ; unreferenced
 	ld a, BANK(s5_a894) ; aka BANK(s5_a948)
 	call OpenSRAM
 	ld hl, s5_a894
-	ld bc, NAME_LENGTH_JAPANESE
+	ld bc, 6
 	call CopyBytes
 	ld hl, wc608
 	ld de, s5_a948
--- a/engine/movie/intro.asm
+++ b/engine/movie/intro.asm
@ -693,30 +693,30 @@ IntroScene14:
 	jr z, .done
 	cp $60
 	jr z, .jump
-	jr nc, .asm_e4e1a
+	jr nc, .run_after_jump
 	cp $40
-	jr nc, .asm_e4e33
+	jr nc, .run
 	ret

 .jump
 	ld de, SFX_INTRO_SUICUNE_4
 	call PlaySFX

-.asm_e4e1a
+.run_after_jump
 	ld a, $1
 	ld [wIntroSceneTimer], a
 	ld a, [wGlobalAnimXOffset]
 	cp $88
-	jr c, .asm_e4e2c
+	jr c, .disappear
 	sub $8
 	ld [wGlobalAnimXOffset], a
 	ret

-.asm_e4e2c
+.disappear
 	farcall DeinitializeAllSprites
 	ret

-.asm_e4e33
+.run
 	ld a, [wGlobalAnimXOffset]
 	sub $2
 	ld [wGlobalAnimXOffset], a
--- a/engine/printer/print_party.asm
+++ b/engine/printer/print_party.asm
@ -217,10 +217,9 @@ PrintPartyMonPage1:
 	ld [hl], a
 	ld a, [wCurPartySpecies]
 	cp UNOWN
-	jr z, .asm_1dc469
+	jr z, .got_alignment
 	inc [hl]
-
-.asm_1dc469
+.got_alignment
 	hlcoord 0, 0
 	call _PrepMonFrontpic
 	call WaitBGMap
--- a/engine/tilesets/tileset_anims.asm
+++ b/engine/tilesets/tileset_anims.asm
@ -477,11 +477,11 @@ ForestTreeLeftAnimation:
 ; Only during the Celebi event.
 	ld a, [wCelebiEvent]
 	bit CELEBIEVENT_FOREST_IS_RESTLESS_F, a
-	jr nz, .asm_fc46c
+	jr nz, .do_animation
 	ld hl, ForestTreeLeftFrames
-	jr .asm_fc47d
+	jr .got_frames

-.asm_fc46c
+.do_animation
 	ld a, [wTileAnimationTimer]
 	call GetForestTreeFrame
 	add a
@ -493,7 +493,7 @@ ForestTreeLeftAnimation:
 	adc HIGH(ForestTreeLeftFrames)
 	ld h, a

-.asm_fc47d
+.got_frames
 	ld sp, hl
 	ld hl, vTiles2 tile $0c
 	jp WriteTile
@ -514,11 +514,11 @@ ForestTreeRightAnimation:
 ; Only during the Celebi event.
 	ld a, [wCelebiEvent]
 	bit CELEBIEVENT_FOREST_IS_RESTLESS_F, a
-	jr nz, .asm_fc4d4
+	jr nz, .do_animation
 	ld hl, ForestTreeRightFrames
-	jr .asm_fc4eb
+	jr .got_frames

-.asm_fc4d4
+.do_animation
 	ld a, [wTileAnimationTimer]
 	call GetForestTreeFrame
 	add a
@ -534,7 +534,7 @@ ForestTreeRightAnimation:
 	add hl, bc
 	pop bc

-.asm_fc4eb
+.got_frames
 	ld sp, hl
 	ld hl, vTiles2 tile $0f
 	jp WriteTile
@ -547,14 +547,14 @@ ForestTreeLeftAnimation2:
 ; Only during the Celebi event.
 	ld a, [wCelebiEvent]
 	bit CELEBIEVENT_FOREST_IS_RESTLESS_F, a
-	jr nz, .asm_fc502
+	jr nz, .do_animation
 	ld hl, ForestTreeLeftFrames
-	jr .asm_fc515
+	jr .got_frames

-.asm_fc502
+.do_animation
 	ld a, [wTileAnimationTimer]
 	call GetForestTreeFrame
-	xor 2
+	xor %10
 	add a
 	add a
 	add a
@ -564,7 +564,7 @@ ForestTreeLeftAnimation2:
 	adc HIGH(ForestTreeLeftFrames)
 	ld h, a

-.asm_fc515
+.got_frames
 	ld sp, hl
 	ld hl, vTiles2 tile $0c
 	jp WriteTile
@ -577,14 +577,14 @@ ForestTreeRightAnimation2:
 ; Only during the Celebi event.
 	ld a, [wCelebiEvent]
 	bit CELEBIEVENT_FOREST_IS_RESTLESS_F, a
-	jr nz, .asm_fc52c
+	jr nz, .do_animation
 	ld hl, ForestTreeRightFrames
-	jr .asm_fc545
+	jr .got_frames

-.asm_fc52c
+.do_animation
 	ld a, [wTileAnimationTimer]
 	call GetForestTreeFrame
-	xor 2
+	xor %10
 	add a
 	add a
 	add a
@ -598,7 +598,7 @@ ForestTreeRightAnimation2:
 	add hl, bc
 	pop bc

-.asm_fc545
+.got_frames
 	ld sp, hl
 	ld hl, vTiles2 tile $0f
 	jp WriteTile
--- a/maps/EcruteakTinTowerEntrance.asm
+++ b/maps/EcruteakTinTowerEntrance.asm
@ -41,27 +41,27 @@ EcruteakTinTowerEntrance_MapScripts:
 	clearevent EVENT_ECRUTEAK_TIN_TOWER_ENTRANCE_WANDERING_SAGE
 	endcallback

-EcruteakTinTowerEntrance_CoordEvent1:
+EcruteakTinTowerEntranceSageBlocksLeft:
 	checkevent EVENT_RANG_CLEAR_BELL_2
-	iftrue EcruteakTinTowerEntrance_CoordEvent_DontMove
-	applymovement ECRUTEAKTINTOWERENTRANCE_SAGE2, MovementData_0x980c7
+	iftrue EcruteakTinTowerEntranceAlreadyBlocked
+	applymovement ECRUTEAKTINTOWERENTRANCE_SAGE2, EcruteakTinTowerEntranceSageBlocksLeftMovement
 	moveobject ECRUTEAKTINTOWERENTRANCE_SAGE1, 4, 6
 	appear ECRUTEAKTINTOWERENTRANCE_SAGE1
 	pause 5
 	disappear ECRUTEAKTINTOWERENTRANCE_SAGE2
 	end

-EcruteakTinTowerEntrance_CoordEvent2:
+EcruteakTinTowerEntranceSageBlocksRight:
 	checkevent EVENT_RANG_CLEAR_BELL_1
-	iftrue EcruteakTinTowerEntrance_CoordEvent_DontMove
-	applymovement ECRUTEAKTINTOWERENTRANCE_SAGE1, MovementData_0x980cc
+	iftrue EcruteakTinTowerEntranceAlreadyBlocked
+	applymovement ECRUTEAKTINTOWERENTRANCE_SAGE1, EcruteakTinTowerEntranceSageBlocksRightMovement
 	moveobject ECRUTEAKTINTOWERENTRANCE_SAGE2, 5, 6
 	appear ECRUTEAKTINTOWERENTRANCE_SAGE2
 	pause 5
 	disappear ECRUTEAKTINTOWERENTRANCE_SAGE1
 	end

-EcruteakTinTowerEntrance_CoordEvent_DontMove:
+EcruteakTinTowerEntranceAlreadyBlocked:
 	end

 EcruteakTinTowerEntranceSageScript:
@ -135,14 +135,14 @@ EcruteakTinTowerEntranceWanderingSageScript:
 EcruteakTinTowerEntranceGrampsScript:
 	jumptextfaceplayer EcruteakTinTowerEntranceGrampsText

-MovementData_0x980c7:
+EcruteakTinTowerEntranceSageBlocksLeftMovement:
 	fix_facing
 	big_step LEFT
 	remove_fixed_facing
 	turn_head DOWN
 	step_end

-MovementData_0x980cc:
+EcruteakTinTowerEntranceSageBlocksRightMovement:
 	fix_facing
 	big_step RIGHT
 	remove_fixed_facing
@ -286,8 +286,8 @@ EcruteakTinTowerEntrance_MapEvents:
 	warp_event 17,  3, WISE_TRIOS_ROOM, 3

 	def_coord_events
-	coord_event  4,  7, SCENE_DEFAULT, EcruteakTinTowerEntrance_CoordEvent1
-	coord_event  5,  7, SCENE_DEFAULT, EcruteakTinTowerEntrance_CoordEvent2
+	coord_event  4,  7, SCENE_DEFAULT, EcruteakTinTowerEntranceSageBlocksLeft
+	coord_event  5,  7, SCENE_DEFAULT, EcruteakTinTowerEntranceSageBlocksRight

 	def_bg_events

--- a/maps/IlexForest.asm
+++ b/maps/IlexForest.asm
@ -457,7 +457,7 @@ IlexForestShrineScript:
 	pause 20
 	showemote EMOTE_SHOCK, PLAYER, 20
 	special FadeOutMusic
-	applymovement PLAYER, MovementData_0x6ef58
+	applymovement PLAYER, IlexForestPlayerStepsDownMovement
 	pause 30
 	turnobject PLAYER, DOWN
 	pause 20
@ -470,12 +470,12 @@ IlexForestShrineScript:
 	special CheckCaughtCelebi
 	iffalse .DidntCatchCelebi
 	appear ILEXFOREST_KURT
-	applymovement ILEXFOREST_KURT, MovementData_0x6ef4e
+	applymovement ILEXFOREST_KURT, IlexForestKurtStepsUpMovement
 	opentext
 	writetext Text_KurtCaughtCelebi
 	waitbutton
 	closetext
-	applymovement ILEXFOREST_KURT, MovementData_0x6ef53
+	applymovement ILEXFOREST_KURT, IlexFOrestKurtStepsDownMovement
 	disappear ILEXFOREST_KURT
 .DidntCatchCelebi:
 	end
@ -715,21 +715,21 @@ MovementData_Farfetched_Pos9_Pos8_Down:
 	big_step UP
 	step_end

-MovementData_0x6ef4e:
+IlexForestKurtStepsUpMovement:
 	step UP
 	step UP
 	step UP
 	step UP
 	step_end

-MovementData_0x6ef53:
+IlexFOrestKurtStepsDownMovement:
 	step DOWN
 	step DOWN
 	step DOWN
 	step DOWN
 	step_end

-MovementData_0x6ef58:
+IlexForestPlayerStepsDownMovement:
 	fix_facing
 	slow_step DOWN
 	remove_fixed_facing
--- a/maps/Route34IlexForestGate.asm
+++ b/maps/Route34IlexForestGate.asm
@ -29,14 +29,14 @@ Route34IlexForestGateCelebiEvent:
 	turnobject ROUTE34ILEXFORESTGATE_TEACHER2, LEFT
 	turnobject PLAYER, RIGHT
 	follow PLAYER, ROUTE34ILEXFORESTGATE_TEACHER2
-	applymovement PLAYER, MovementData_0x62d97
+	applymovement PLAYER, Route34IlexForestGateTeacherBlocksPlayerMovement
 	stopfollow
 	turnobject PLAYER, DOWN
 	opentext
 	writetext Route34IlexForestGateTeacher_ForestIsRestless
 	waitbutton
 	closetext
-	applymovement ROUTE34ILEXFORESTGATE_TEACHER2, MovementData_0x62d9a
+	applymovement ROUTE34ILEXFORESTGATE_TEACHER2, Route34IlexForestGateTeacherReturnsMovement
 .skip:
 	end

@ -76,12 +76,12 @@ Route34IlexForestGateButterfreeScript:
 Route34IlexForestGateLassScript:
 	jumptextfaceplayer Route34IlexForestGateLassText

-MovementData_0x62d97:
+Route34IlexForestGateTeacherBlocksPlayerMovement:
 	step UP
 	step UP
 	step_end

-MovementData_0x62d9a:
+Route34IlexForestGateTeacherReturnsMovement:
 	step DOWN
 	step RIGHT
 	step_end
--- a/maps/TinTower1F.asm
+++ b/maps/TinTower1F.asm
@ -82,17 +82,17 @@ TinTower1F_MapScripts:
 	endcallback

 .SuicuneBattle:
-	applymovement PLAYER, TinTowerPlayerMovement1
+	applymovement PLAYER, TinTower1FPlayerEntersMovement
 	pause 15
 	setval RAIKOU
 	special MonCheck
 	iftrue .Next1 ; if player caught Raikou, it doesn't appear in Tin Tower
-	applymovement TINTOWER1F_RAIKOU, TinTowerRaikouMovement1
+	applymovement TINTOWER1F_RAIKOU, TinTower1FRaikouApproachesMovement
 	turnobject PLAYER, LEFT
 	cry RAIKOU
 	pause 10
 	playsound SFX_WARP_FROM
-	applymovement TINTOWER1F_RAIKOU, TinTowerRaikouMovement2
+	applymovement TINTOWER1F_RAIKOU, TinTower1FRaikouLeavesMovement
 	disappear TINTOWER1F_RAIKOU
 	playsound SFX_EXIT_BUILDING
 	waitsfx
@ -100,20 +100,20 @@ TinTower1F_MapScripts:
 	setval ENTEI
 	special MonCheck
 	iftrue .Next2 ; if player caught Entei, it doesn't appear in Tin Tower
-	applymovement TINTOWER1F_ENTEI, TinTowerEnteiMovement1
+	applymovement TINTOWER1F_ENTEI, TinTower1FEnteiApproachesMovement
 	turnobject PLAYER, RIGHT
 	cry ENTEI
 	pause 10
 	playsound SFX_WARP_FROM
-	applymovement TINTOWER1F_ENTEI, TinTowerEnteiMovement2
+	applymovement TINTOWER1F_ENTEI, TinTower1FEnteiLeavesMovement
 	disappear TINTOWER1F_ENTEI
 	playsound SFX_EXIT_BUILDING
 	waitsfx
 .Next2:
 	turnobject PLAYER, UP
 	pause 10
-	applymovement PLAYER, TinTowerPlayerMovement2
-	applymovement TINTOWER1F_SUICUNE, TinTowerSuicuneMovement
+	applymovement PLAYER, TinTower1FPlayerBacksUpMovement
+	applymovement TINTOWER1F_SUICUNE, TinTower1FSuicuneApproachesMovement
 	cry SUICUNE
 	pause 20
 	loadwildmon SUICUNE, 40
@ -137,28 +137,28 @@ TinTower1F_MapScripts:
 	playsound SFX_ENTER_DOOR
 	moveobject TINTOWER1F_EUSINE, 10, 15
 	appear TINTOWER1F_EUSINE
-	applymovement TINTOWER1F_EUSINE, MovementData_0x1851ec
+	applymovement TINTOWER1F_EUSINE, TinTower1FEusineEntersMovement
 	playsound SFX_ENTER_DOOR
 	moveobject TINTOWER1F_SAGE1, 9, 15
 	appear TINTOWER1F_SAGE1
-	applymovement TINTOWER1F_SAGE1, MovementData_0x1851f5
+	applymovement TINTOWER1F_SAGE1, TinTower1FSage1EntersMovement
 	playsound SFX_ENTER_DOOR
 	moveobject TINTOWER1F_SAGE2, 9, 15
 	appear TINTOWER1F_SAGE2
-	applymovement TINTOWER1F_SAGE2, MovementData_0x1851fb
+	applymovement TINTOWER1F_SAGE2, TinTower1FSage2EntersMovement
 	playsound SFX_ENTER_DOOR
 	moveobject TINTOWER1F_SAGE3, 9, 15
 	appear TINTOWER1F_SAGE3
-	applymovement TINTOWER1F_SAGE3, MovementData_0x1851fe
+	applymovement TINTOWER1F_SAGE3, TinTower1FSage3EntersMovement
 	moveobject TINTOWER1F_SAGE1, 7, 13
 	moveobject TINTOWER1F_SAGE2, 9, 13
 	moveobject TINTOWER1F_SAGE3, 11, 13
 	turnobject PLAYER, RIGHT
 	opentext
-	writetext TinTowerEusineSuicuneText
+	writetext TinTower1FEusineSuicuneText
 	waitbutton
 	closetext
-	applymovement TINTOWER1F_EUSINE, MovementData_0x1851f1
+	applymovement TINTOWER1F_EUSINE, TinTower1FEusineLeavesMovement
 	playsound SFX_EXIT_BUILDING
 	disappear TINTOWER1F_EUSINE
 	waitsfx
@ -224,23 +224,23 @@ TinTower1FSage6Script:
 .FoughtHoOh:
 	jumptextfaceplayer TinTower1FSage6Text2

-TinTowerEusine:
-	jumptextfaceplayer TinTowerEusineHoOhText
+TinTower1FEusine:
+	jumptextfaceplayer TinTower1FEusineHoOhText

-TinTowerPlayerMovement1:
+TinTower1FPlayerEntersMovement:
 	slow_step UP
 	slow_step UP
 	slow_step UP
 	slow_step UP
 	step_end

-TinTowerRaikouMovement1:
+TinTower1FRaikouApproachesMovement:
 	set_sliding
 	fast_jump_step DOWN
 	remove_sliding
 	step_end

-TinTowerRaikouMovement2:
+TinTower1FRaikouLeavesMovement:
 	set_sliding
 	fast_jump_step DOWN
 	fast_jump_step RIGHT
@ -248,13 +248,13 @@ TinTowerRaikouMovement2:
 	remove_sliding
 	step_end

-TinTowerEnteiMovement1:
+TinTower1FEnteiApproachesMovement:
 	set_sliding
 	fast_jump_step DOWN
 	remove_sliding
 	step_end

-TinTowerEnteiMovement2:
+TinTower1FEnteiLeavesMovement:
 	set_sliding
 	fast_jump_step DOWN
 	fast_jump_step LEFT
@ -262,32 +262,32 @@ TinTowerEnteiMovement2:
 	remove_sliding
 	step_end

-TinTowerSuicuneMovement:
+TinTower1FSuicuneApproachesMovement:
 	set_sliding
 	fast_jump_step DOWN
 	remove_sliding
 	step_end

-TinTowerPlayerMovement2:
+TinTower1FPlayerBacksUpMovement:
 	fix_facing
 	big_step DOWN
 	remove_fixed_facing
 	step_end

-MovementData_0x1851ec:
+TinTower1FEusineEntersMovement:
 	step UP
 	step UP
 	step UP
 	turn_head LEFT
 	step_end

-MovementData_0x1851f1:
+TinTower1FEusineLeavesMovement:
 	step DOWN
 	step DOWN
 	step DOWN
 	step_end

-MovementData_0x1851f5:
+TinTower1FSage1EntersMovement:
 	step UP
 	step UP
 	step LEFT
@ -295,19 +295,19 @@ MovementData_0x1851f5:
 	turn_head UP
 	step_end

-MovementData_0x1851fb:
+TinTower1FSage2EntersMovement:
 	step UP
 	step UP
 	step_end

-MovementData_0x1851fe:
+TinTower1FSage3EntersMovement:
 	step UP
 	step RIGHT
 	step RIGHT
 	step UP
 	step_end

-TinTowerEusineSuicuneText:
+TinTower1FEusineSuicuneText:
 	text "EUSINE: Awesome!"
 	line "Too awesome, even!"

@ -440,7 +440,7 @@ TinTower1FSage6Text1:
 	cont "and advance."
 	done

-TinTowerEusineHoOhText:
+TinTower1FEusineHoOhText:
 	text "I knew it."

 	para "I knew you'd get"
@ -536,7 +536,7 @@ TinTower1F_MapEvents:
 	object_event  9,  9, SPRITE_SUICUNE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TIN_TOWER_1F_SUICUNE
 	object_event  7,  9, SPRITE_RAIKOU, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TIN_TOWER_1F_RAIKOU
 	object_event 12,  9, SPRITE_ENTEI, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TIN_TOWER_1F_ENTEI
-	object_event  8,  3, SPRITE_SUPER_NERD, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, TinTowerEusine, EVENT_TIN_TOWER_1F_EUSINE
+	object_event  8,  3, SPRITE_SUPER_NERD, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, TinTower1FEusine, EVENT_TIN_TOWER_1F_EUSINE
 	object_event  5,  9, SPRITE_SAGE, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TinTower1FSage1Script, EVENT_TIN_TOWER_1F_WISE_TRIO_1
 	object_event 11, 11, SPRITE_SAGE, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TinTower1FSage2Script, EVENT_TIN_TOWER_1F_WISE_TRIO_1
 	object_event 14,  6, SPRITE_SAGE, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TinTower1FSage3Script, EVENT_TIN_TOWER_1F_WISE_TRIO_1
--- a/maps/WiseTriosRoom.asm
+++ b/maps/WiseTriosRoom.asm
@ -55,14 +55,14 @@ WiseTriosRoom_CannotEnterTinTowerScript:
 	turnobject PLAYER, DOWN
 	showemote EMOTE_SHOCK, WISETRIOSROOM_SAGE3, 20
 	follow PLAYER, WISETRIOSROOM_SAGE3
-	applymovement PLAYER, MovementData_0x98622
+	applymovement PLAYER, WiseTriosRoomSageBlocksPlayerMovement
 	stopfollow
 	turnobject PLAYER, RIGHT
 	opentext
 	writetext WiseTriosRoomSage3BlocksExitText
 	waitbutton
 	closetext
-	applymovement WISETRIOSROOM_SAGE3, MovementData_0x98625
+	applymovement WISETRIOSROOM_SAGE3, WiseTriosRoomSageReturnsMovement
 	turnobject WISETRIOSROOM_SAGE3, LEFT
 	end

@ -100,7 +100,7 @@ TrainerSageKoji:
 	writetext SageKojiAfterBattleSpeechText
 	waitbutton
 	closetext
-	applymovement WISETRIOSROOM_SAGE6, MovementData_0x98628
+	applymovement WISETRIOSROOM_SAGE6, WiseTriosRoomSageAllowsPassageMovement
 	turnobject WISETRIOSROOM_SAGE6, UP
 	setevent EVENT_KOJI_ALLOWS_YOU_PASSAGE_TO_TIN_TOWER
 	setscene SCENE_FINISHED
@ -113,17 +113,17 @@ TrainerSageKoji:
 	closetext
 	end

-MovementData_0x98622:
+WiseTriosRoomSageBlocksPlayerMovement:
 	step LEFT
 	step LEFT
 	step_end

-MovementData_0x98625:
+WiseTriosRoomSageReturnsMovement:
 	step RIGHT
 	step DOWN
 	step_end

-MovementData_0x98628:
+WiseTriosRoomSageAllowsPassageMovement:
 	step RIGHT
 	step DOWN
 	step_end
--- a/mobile/mobile_12_2.asm
+++ b/mobile/mobile_12_2.asm
@ -235,12 +235,12 @@ Function4a94e:
 .asm_4a9b0
 	ld de, SFX_WRONG
 	call PlaySFX
-	ld hl, MobilePickThreeMonForBattle
+	ld hl, MobilePickThreeMonForBattleText
 	call PrintText
 	jr .asm_4a974

-MobilePickThreeMonForBattle:
-	text_far _MobilePickThreeMonForBattle
+MobilePickThreeMonForBattleText:
+	text_far _MobilePickThreeMonForBattleText
 	text_end

 Function4a9c3:
--- a/mobile/mobile_40.asm
+++ b/mobile/mobile_40.asm
@ -2712,7 +2712,7 @@ Jumptable_101247:
 Function101251:
 	call UpdateSprites
 	call RefreshScreen
-	ld hl, UnknownText_0x1021f4
+	ld hl, ClosingLinkText
 	call Function1021e0
 	call Function1020ea
 	ret c
@ -2720,14 +2720,14 @@ Function101251:
 	ret

 Function101265:
-	ld hl, UnknownText_0x1021ef
+	ld hl, LinkTerminatedText
 	call Function1021e0
 	ret

 Function10126c:
 	call UpdateSprites
 	farcall Script_reloadmappart
-	ld hl, UnknownText_0x1021f4
+	ld hl, ClosingLinkText
 	call Function1021e0
 	ret

@ -4733,14 +4733,14 @@ Function102112:
 Function102142:
 	call Function10218d
 	call Function102180
-	ld hl, UnknownText_0x1021d1
+	ld hl, NewCardArrivedText
 	call MenuTextbox
 	ld de, SFX_LEVEL_UP
 	call PlaySFX
 	call JoyWaitAorB
 	call ExitMenu
 	call Function10219f
-	ld hl, UnknownText_0x1021d6
+	ld hl, PutCardInCardFolderText
 	call MenuTextbox
 	call YesNoBox
 	call ExitMenu
@ -4749,7 +4749,7 @@ Function102142:
 	jr c, .asm_10217c
 	call Function10218d
 	call Function102180
-	ld hl, UnknownText_0x1021db
+	ld hl, CardWasListedText
 	call PrintText

 .asm_10217c
@ -4794,16 +4794,16 @@ Function1021b8:
 	pop af
 	ret

-UnknownText_0x1021d1:
-	text_far UnknownText_0x1bd19a
+NewCardArrivedText:
+	text_far _NewCardArrivedText
 	text_end

-UnknownText_0x1021d6:
-	text_far UnknownText_0x1bd1ba
+PutCardInCardFolderText:
+	text_far _PutCardInCardFolderText
 	text_end

-UnknownText_0x1021db:
-	text_far UnknownText_0x1bd1dd
+CardWasListedText:
+	text_far _CardWasListedText
 	text_end

 Function1021e0:
@ -4812,16 +4812,16 @@ Function1021e0:
 	call ExitMenu
 	ret

-UnknownText_0x1021ea: ; unreferenced
-	text_far UnknownText_0x1bd201
+StartingLinkText: ; unreferenced
+	text_far _StartingLinkText
 	text_end

-UnknownText_0x1021ef:
-	text_far UnknownText_0x1bd211
+LinkTerminatedText:
+	text_far _LinkTerminatedText
 	text_end

-UnknownText_0x1021f4:
-	text_far UnknownText_0x1bd223
+ClosingLinkText:
+	text_far _ClosingLinkText
 	text_end

 Function1021f9:
@ -6565,12 +6565,12 @@ Function102ea8:
 	ld a, [hl]
 	ld [wNamedObjectIndex], a
 	call GetPokemonName
-	ld hl, UnknownText_0x102ee2
+	ld hl, TradingMonForOTMonText
 	call PrintTextboxText
 	ret

-UnknownText_0x102ee2:
-	text_far UnknownText_0x1bd286
+TradingMonForOTMonText:
+	text_far _TradingMonForOTMonText
 	text_end

 Function102ee7:
@ -7339,7 +7339,7 @@ Mobile_SelectThreeMons:
 	farcall Mobile_AlwaysReturnNotCarry
 	bit 7, c
 	jr z, .asm_10369b
-	ld hl, UnknownText_0x10375d
+	ld hl, MobileBattleMustPickThreeMonText
 	call PrintText
 	call YesNoBox
 	jr c, .asm_103696
@ -7363,7 +7363,7 @@ Mobile_SelectThreeMons:
 	bit 7, [hl]
 	set 7, [hl]
 	jr nz, .asm_1036b5
-	ld hl, UnknownText_0x103762
+	ld hl, MobileBattleMoreInfoText
 	call PrintText
 	call YesNoBox
 	jr c, .asm_1036b5
@ -7409,49 +7409,48 @@ Mobile_SelectThreeMons:
 	ret

 Function1036f9:
-	ld hl, UnknownText_0x103767
+	ld hl, MobileBattleRulesText
 	call PrintText
 	ret

 Function103700:
-	ld c, $0a
+	ld c, 10
 	ld hl, wSwarmFlags
 	bit SWARMFLAGS_MOBILE_4_F, [hl]
 	jr z, .asm_10370f
 	farcall MobileBattleGetRemainingTime
-
 .asm_10370f
 	ld a, c
 	ld [wStringBuffer2], a
 	ld a, [wStringBuffer2]
-	cp $05
-	jr nc, .asm_103724
-	cp $02
-	jr nc, .asm_10372c
-	cp $01
-	jr nc, .asm_103734
-	jr .asm_10373c
+	cp 5
+	jr nc, .five_or_more_mins
+	cp 2
+	jr nc, .two_to_five_mins
+	cp 1
+	jr nc, .one_min
+	jr .times_up

-.asm_103724
-	ld hl, UnknownText_0x10376c
+.five_or_more_mins
+	ld hl, WouldYouLikeToMobileBattleText
 	call PrintText
 	and a
 	ret

-.asm_10372c
-	ld hl, UnknownText_0x103771
+.two_to_five_mins
+	ld hl, WantAQuickMobileBattleText
 	call PrintText
 	and a
 	ret

-.asm_103734
-	ld hl, UnknownText_0x103776
+.one_min
+	ld hl, WantToRushThroughAMobileBattleText
 	call PrintText
 	and a
 	ret

-.asm_10373c
-	ld hl, UnknownText_0x10377b
+.times_up
+	ld hl, PleaseTryAgainTomorrowText
 	call PrintText
 	call JoyWaitAorB
 	scf
@ -7470,32 +7469,32 @@ MenuData_10374f:
 	db "やめる@"
 	db "せつめい@"

-UnknownText_0x10375d:
-	text_far UnknownText_0x1c422a
+MobileBattleMustPickThreeMonText:
+	text_far _MobileBattleMustPickThreeMonText
 	text_end

-UnknownText_0x103762:
-	text_far UnknownText_0x1c4275
+MobileBattleMoreInfoText:
+	text_far _MobileBattleMoreInfoText
 	text_end

-UnknownText_0x103767:
-	text_far UnknownText_0x1c4298
+MobileBattleRulesText:
+	text_far _MobileBattleRulesText
 	text_end

-UnknownText_0x10376c:
-	text_far UnknownText_0x1c439c
+WouldYouLikeToMobileBattleText:
+	text_far _WouldYouLikeToMobileBattleText
 	text_end

-UnknownText_0x103771:
-	text_far UnknownText_0x1c43dc
+WantAQuickMobileBattleText:
+	text_far _WantAQuickMobileBattleText
 	text_end

-UnknownText_0x103776:
-	text_far UnknownText_0x1c4419
+WantToRushThroughAMobileBattleText:
+	text_far _WantToRushThroughAMobileBattleText
 	text_end

-UnknownText_0x10377b:
-	text_far UnknownText_0x1c445a
+PleaseTryAgainTomorrowText:
+	text_far _PleaseTryAgainTomorrowText
 	text_end

 Function103780:
@ -7544,7 +7543,7 @@ Function1037c2:
 	ld a, [wdc5f]
 	and a
 	jr z, .nope
-	ld hl, UnknownText_0x1037e6
+	ld hl, TryAgainUsingSameSettingsText
 	call PrintText
 	call YesNoBox
 	jr c, .nope
@ -7558,8 +7557,8 @@ Function1037c2:
 	ld [wScriptVar], a
 	ret

-UnknownText_0x1037e6:
-	text_far UnknownText_0x1c449c
+TryAgainUsingSameSettingsText:
+	text_far _TryAgainUsingSameSettingsText
 	text_end

 Function1037eb:
@ -7622,7 +7621,7 @@ Function10383c:
 	ld [hli], a
 	ld [hli], a
 	ld [hl], a
-	ld hl, UnknownText_0x103876
+	ld hl, PickThreeMonForMobileBattleText
 	call PrintText
 	call JoyWaitAorB
 	farcall Script_reloadmappart
@ -7641,8 +7640,8 @@ Function10383c:
 	ld [wScriptVar], a
 	ret

-UnknownText_0x103876:
-	text_far UnknownText_0x1c4508
+PickThreeMonForMobileBattleText:
+	text_far _PickThreeMonForMobileBattleText
 	text_end

 Function10387b:
@ -7652,11 +7651,11 @@ Function10387b:
 	farcall MobileBattleGetRemainingTime
 	ld a, c
 	ld [wStringBuffer2], a
-	ld hl, UnknownText_0x103898
+	ld hl, MobileBattleRemainingTimeText
 	call PrintText
 	call JoyWaitAorB
 	ret

-UnknownText_0x103898:
-	text_far UnknownText_0x1c4525
+MobileBattleRemainingTimeText:
+	text_far _MobileBattleRemainingTimeText
 	text_end
--- a/mobile/mobile_5c.asm
+++ b/mobile/mobile_5c.asm
@ -74,19 +74,19 @@ Function17005a:
 INCLUDE "engine/events/battle_tower/battle_tower.asm"

 Function170be4:
-	ld a, $5
+	ld a, BANK(s5_a894)
 	call OpenSRAM
 	xor a
-	ld hl, $a894
-	ld bc, $0008
+	ld hl, s5_a894
+	ld bc, 6 + 2
 	call ByteFill
 	call CloseSRAM
 	ret

 Clears5_a89a:
-	ld a, $5
+	ld a, BANK(s5_a89a)
 	call OpenSRAM
-	ld hl, $a89a
+	ld hl, s5_a89a
 	xor a
 	ld [hli], a
 	ld [hl], a
@ -94,9 +94,9 @@ Clears5_a89a:
 	ret

 Function170c06: ; unreferenced
-	ld a, $5
+	ld a, BANK(s5_a894)
 	call OpenSRAM
-	ld hl, $a894
+	ld hl, s5_a894
 	ld a, [wBattleResult]
 	and a ; WIN?
 	jr nz, .asm_170c15
@ -105,10 +105,10 @@ Function170c06: ; unreferenced
 .asm_170c15
 	inc hl
 	inc hl
-	ld a, [$a89b]
+	ld a, [s5_a89a + 1]
 	add [hl]
 	ld [hld], a
-	ld a, [$a89a]
+	ld a, [s5_a89a]
 	adc [hl]
 	ld [hli], a
 	jr nc, .asm_170c27
--- a/sram.asm
+++ b/sram.asm
@ -331,11 +331,8 @@ s5_a826:: db

 	ds $6d

-s5_a894:: ds NAME_LENGTH_JAPANESE
-
-	ds $1
-
-s5_a89b:: ds 1
+s5_a894:: ds 6
+s5_a89a:: dw
 s5_a89c:: ds 22
 s5_a8b2:: ds 150