Merge pull request #135 from YamaArashi/master

sync tileset WRAM labels

31 files changed, 412 insertions, 375 deletions

diff --git a/charmap.asm b/charmap.asm
index 980c79a3..8f57a130 100644
--- a/charmap.asm
+++ b/charmap.asm
@@ -147,9 +147,16 @@ charmap "ゅ", $E1
 charmap "ょ", $E2
 charmap "ー", $E3
 
+charmap "<pkmn>", $4A ; PkMn
 charmap "@", $50
+charmap "<PLAYER>", $52
+charmap "<RIVAL>", $53
 charmap "#", $54
 ;charmap "POKé", $54
+charmap "<TARGET>", $59
+charmap "<USER>", $5A
+charmap "′", $71
+charmap "″", $73
 charmap "…", $75
 
 charmap "┌", $79
@@ -233,6 +240,7 @@ charmap "'m", $E5
 charmap "?", $E6
 charmap "!", $E7
 charmap ".", $E8
+charmap "▷", $EC
 charmap "▶", $ED
 charmap "♂", $EF
 charmap "¥", $F0
diff --git a/constants.asm b/constants.asm
index 8bca86eb..d4e453ec 100644
--- a/constants.asm
+++ b/constants.asm
@@ -30,3 +30,4 @@ INCLUDE "constants/tilesets.asm"
 INCLUDE "constants/starter_mons.asm"
 INCLUDE "constants/event_constants.asm"
 INCLUDE "constants/event_macros.asm"
+INCLUDE "constants/text_constants.asm"
diff --git a/constants/misc_constants.asm b/constants/misc_constants.asm
index de777c5d..cc10de70 100644
--- a/constants/misc_constants.asm
+++ b/constants/misc_constants.asm
@@ -29,6 +29,16 @@ D_LEFT   EQU %00100000
 D_UP     EQU %01000000
 D_DOWN   EQU %10000000
 
+const_value set 0
+	const BIT_A_BUTTON
+	const BIT_B_BUTTON
+	const BIT_SELECT
+	const BIT_START
+	const BIT_D_RIGHT
+	const BIT_D_LEFT
+	const BIT_D_UP
+	const BIT_D_DOWN
+
 SCREEN_WIDTH  EQU 20
 SCREEN_HEIGHT EQU 18
 
@@ -152,20 +162,6 @@ FLAG_RESET EQU 0
 FLAG_SET   EQU 1
 FLAG_TEST  EQU 2
 
-; special text IDs
-TEXT_MON_FAINTED      EQU $d0
-TEXT_BLACKED_OUT      EQU $d1
-TEXT_REPEL_WORE_OFF   EQU $d2
-TEXT_SAFARI_GAME_OVER EQU $d3
-
-; PrintNumber
-
-BIT_LEFT_ALIGN     EQU 6
-BIT_LEADING_ZEROES EQU 7
-
-LEFT_ALIGN EQU     (1 << BIT_LEFT_ALIGN)
-LEADING_ZEROES EQU (1 << BIT_LEADING_ZEROES)
-
 ; HP bar
 HP_BAR_GREEN  EQU 0
 HP_BAR_YELLOW EQU 1
diff --git a/constants/text_constants.asm b/constants/text_constants.asm
new file mode 100644
index 00000000..3cddce26
--- /dev/null
+++ b/constants/text_constants.asm
@@ -0,0 +1,14 @@
+; special text IDs
+TEXT_MON_FAINTED      EQU $d0
+TEXT_BLACKED_OUT      EQU $d1
+TEXT_REPEL_WORE_OFF   EQU $d2
+TEXT_SAFARI_GAME_OVER EQU $d3
+
+; PrintNumber
+BIT_MONEY_SIGN     EQU 5
+BIT_LEFT_ALIGN     EQU 6
+BIT_LEADING_ZEROES EQU 7
+
+MONEY_SIGN EQU     (1 << BIT_MONEY_SIGN)
+LEFT_ALIGN EQU     (1 << BIT_LEFT_ALIGN)
+LEADING_ZEROES EQU (1 << BIT_LEADING_ZEROES)
diff --git a/engine/cable_club.asm b/engine/cable_club.asm
index 9d72d220..c3a5e235 100755
--- a/engine/cable_club.asm
+++ b/engine/cable_club.asm
@@ -900,16 +900,16 @@ CableClub_Run:
 	call CableClub_DoBattleOrTrade
 	ld hl, Club_GFX
 	ld a, h
-	ld [wTileSetGFXPtr + 1], a
+	ld [wTilesetGfxPtr + 1], a
 	ld a, l
-	ld [wTileSetGFXPtr], a
+	ld [wTilesetGfxPtr], a
 	ld a, Bank(Club_GFX)
-	ld [wTileSetBank], a
+	ld [wTilesetBank], a
 	ld hl, Club_Coll
 	ld a, h
-	ld [wTileSetCollisionPtr + 1], a
+	ld [wTilesetCollisionPtr + 1], a
 	ld a, l
-	ld [wTileSetCollisionPtr], a
+	ld [wTilesetCollisionPtr], a
 	xor a
 	ld [wGrassRate], a
 	inc a ; LINK_STATE_IN_CABLE_CLUB
diff --git a/engine/gamefreak.asm b/engine/gamefreak.asm
index 69c059ff..5226072b 100755
--- a/engine/gamefreak.asm
+++ b/engine/gamefreak.asm
@@ -199,7 +199,6 @@ MoveDownSmallStars:
 	add hl, de
 	dec c
 	jr nz, .innerLoop
-
 ; Toggle the palette so that the lower star in the small stars tile blinks in
 ; and out.
 	ld a, [rOBP1]
diff --git a/engine/hall_of_fame.asm b/engine/hall_of_fame.asm
index dc1026a8..9eb4edc5 100755
--- a/engine/hall_of_fame.asm
+++ b/engine/hall_of_fame.asm
@@ -58,8 +58,8 @@ AnimateHallOfFame:
 	ld c, 80
 	call DelayFrames
 	coord hl, 2, 13
-	ld b, $3
-	ld c, $e
+	ld b, 3
+	ld c, 14
 	call TextBoxBorder
 	coord hl, 4, 15
 	ld de, HallOfFameText
diff --git a/engine/items/items.asm b/engine/items/items.asm
index a6717494..24489690 100755
--- a/engine/items/items.asm
+++ b/engine/items/items.asm
@@ -695,7 +695,7 @@ ItemUseSurfboard:
 	ld hl,TilePairCollisionsWater
 	call CheckForTilePairCollisions
 	jr c,.cannotStopSurfing
-	ld hl,wTileSetCollisionPtr ; pointer to list of passable tiles
+	ld hl,wTilesetCollisionPtr ; pointer to list of passable tiles
 	ld a,[hli]
 	ld h,[hl]
 	ld l,a ; hl now points to passable tiles
diff --git a/engine/overworld/movement.asm b/engine/overworld/movement.asm
index 9302b6e3..6d05859e 100644
--- a/engine/overworld/movement.asm
+++ b/engine/overworld/movement.asm
@@ -589,9 +589,9 @@ CanWalkOntoTile:
 	and a
 	ret
 .notScripted
-	ld a, [wTileSetCollisionPtr]
+	ld a, [wTilesetCollisionPtr]
 	ld l, a
-	ld a, [wTileSetCollisionPtr+1]
+	ld a, [wTilesetCollisionPtr+1]
 	ld h, a
 .tilePassableLoop
 	ld a, [hli]
diff --git a/home.asm b/home.asm
index 8d3c7207..bce51e4f 100644
--- a/home.asm
+++ b/home.asm
@@ -117,7 +117,6 @@ INCLUDE "home/joypad.asm"
 INCLUDE "data/map_header_pointers.asm"
 INCLUDE "home/overworld.asm"
 
-
 CheckForUserInterruption::
 ; Return carry if Up+Select+B, Start or A are pressed in c frames.
 ; Used only in the intro and title screen.
@@ -255,7 +254,6 @@ DrawHPBar::
 LoadMonData::
 	jpab LoadMonData_
 
-
 OverwritewMoves::
 ; Write c to [wMoves + b]. Unused.
 	ld hl, wMoves
@@ -327,7 +325,7 @@ GetCryData::
 	add hl, bc
 	add hl, bc
 
-	ld a, Bank(CryData)
+	ld a, BANK(CryData)
 	call BankswitchHome
 	ld a, [hli]
 	ld b, a ; cry id
@@ -347,7 +345,6 @@ GetCryData::
 	add c
 	ret
 
-
 DisplayPartyMenu::
 	ld a,[hTilesetType]
 	push af
@@ -497,6 +494,7 @@ PrintStatusCondition::
 	ld [hl],"T"
 	and a
 	ret
+
 PrintStatusConditionNotFainted:
 	ld a,[H_LOADEDROMBANK]
 	push af
@@ -519,7 +517,7 @@ PrintLevel::
 	ld [hli],a
 	ld c,2 ; number of digits
 	ld a,[wLoadedMonLevel] ; level
-	cp a,100
+	cp 100
 	jr c,PrintLevelCommon
 ; if level at least 100, write over the ":L" tile
 	dec hl
@@ -569,25 +567,25 @@ GetMonHeader::
 	ld [wd11e],a
 	ld de,FossilKabutopsPic
 	ld b,$66 ; size of Kabutops fossil and Ghost sprites
-	cp a,FOSSIL_KABUTOPS ; Kabutops fossil
+	cp FOSSIL_KABUTOPS ; Kabutops fossil
 	jr z,.specialID
 	ld de,GhostPic
-	cp a,MON_GHOST ; Ghost
+	cp MON_GHOST ; Ghost
 	jr z,.specialID
 	ld de,FossilAerodactylPic
 	ld b,$77 ; size of Aerodactyl fossil sprite
-	cp a,FOSSIL_AERODACTYL ; Aerodactyl fossil
+	cp FOSSIL_AERODACTYL ; Aerodactyl fossil
 	jr z,.specialID
 	cp a,MEW
 	jr z,.mew
 	predef IndexToPokedex   ; convert pokemon ID in [wd11e] to pokedex number
 	ld a,[wd11e]
 	dec a
-	ld bc,MonBaseStatsEnd - MonBaseStats
+	ld bc, MonBaseStatsEnd - MonBaseStats
 	ld hl,BaseStats
 	call AddNTimes
 	ld de,wMonHeader
-	ld bc,MonBaseStatsEnd - MonBaseStats
+	ld bc, MonBaseStatsEnd - MonBaseStats
 	call CopyData
 	jr .done
 .specialID
@@ -703,7 +701,7 @@ PrintBCDDigit::
 .skipCurrencySymbol
 	res 7,b ; unset 7 to indicate that a nonzero digit has been reached
 .outputDigit
-	add a,"0"
+	add "0"
 	ld [hli],a
 	jp PrintLetterDelay
 .zeroDigit
@@ -968,7 +966,6 @@ PokeCenterSignText::
 	db "@"
 
 PickUpItemText::
-; XXX better label (what does predef $5C do?)
 	TX_ASM
 	predef PickUpItem
 	jp TextScriptEnd
@@ -1000,15 +997,15 @@ ResetPlayerSpriteData_ClearSpriteData::
 
 FadeOutAudio::
 	ld a, [wAudioFadeOutControl]
-	and a
-	jr nz, .asm_28dc
+	and a ; currently fading out audio?
+	jr nz, .fadingOut
 	ld a, [wd72c]
 	bit 1, a
 	ret nz
 	ld a, $77
 	ld [rNR50], a
 	ret
-.asm_28dc
+.fadingOut
 	ld a, [wAudioFadeOutCounter]
 	and a
 	jr z, .counterReachedZero
@@ -1019,8 +1016,8 @@ FadeOutAudio::
 	ld a, [wAudioFadeOutCounterReloadValue]
 	ld [wAudioFadeOutCounter], a
 	ld a, [rNR50]
-	and a
-	jr z, .asm_2903
+	and a ; has the volume reached 0?
+	jr z, .fadeOutComplete
 	ld b, a
 	and $f
 	dec a
@@ -1033,7 +1030,7 @@ FadeOutAudio::
 	or c
 	ld [rNR50], a
 	ret
-.asm_2903
+.fadeOutComplete
 	ld a, [wAudioFadeOutControl]
 	ld b, a
 	xor a
@@ -1071,13 +1068,13 @@ DisplayTextID::
 	ld [wSpriteIndex],a
 	and a
 	jp z,DisplayStartMenu
-	cp a,TEXT_SAFARI_GAME_OVER
+	cp TEXT_SAFARI_GAME_OVER
 	jp z,DisplaySafariGameOverText
-	cp a,TEXT_MON_FAINTED
+	cp TEXT_MON_FAINTED
 	jp z,DisplayPokemonFaintedText
-	cp a,TEXT_BLACKED_OUT
+	cp TEXT_BLACKED_OUT
 	jp z,DisplayPlayerBlackedOutText
-	cp a,TEXT_REPEL_WORE_OFF
+	cp TEXT_REPEL_WORE_OFF
 	jp z,DisplayRepelWoreOffText
 	ld a,[wNumSprites]
 	ld e,a
@@ -1116,24 +1113,24 @@ DisplayTextID::
 	ld l,a ; hl = address of the text
 	ld a,[hl] ; a = first byte of text
 ; check first byte of text for special cases
-	cp a,$fe   ; Pokemart NPC
+	cp $fe   ; Pokemart NPC
 	jp z,DisplayPokemartDialogue
-	cp a,$ff   ; Pokemon Center NPC
+	cp $ff   ; Pokemon Center NPC
 	jp z,DisplayPokemonCenterDialogue
-	cp a,$fc   ; Item Storage PC
+	cp $fc   ; Item Storage PC
 	jp z,FuncTX_ItemStoragePC
-	cp a,$fd   ; Bill's PC
+	cp $fd   ; Bill's PC
 	jp z,FuncTX_BillsPC
-	cp a,$f9   ; Pokemon Center PC
+	cp $f9   ; Pokemon Center PC
 	jp z,FuncTX_PokemonCenterPC
-	cp a,$f5   ; Vending Machine
+	cp $f5   ; Vending Machine
 	jr nz,.notVendingMachine
 	callba VendingMachineMenu ; jump banks to vending machine routine
 	jr AfterDisplayingTextID
 .notVendingMachine
-	cp a,$f7   ; slot machine
-	jp z,FuncTX_SlotMachine
-	cp a,$f6   ; cable connection NPC in Pokemon Center
+	cp $f7   ; prize menu
+	jp z, FuncTX_GameCornerPrizeMenu
+	cp $f6   ; cable connection NPC in Pokemon Center
 	jr nz,.notSpecialCase
 	callab CableClubNPC
 	jr AfterDisplayingTextID
@@ -1228,7 +1225,7 @@ LoadItemList::
 	ld a,[hli]
 	ld [de],a
 	inc de
-	cp a,$ff
+	cp $ff
 	jr nz,.loop
 	ret
 
@@ -1382,7 +1379,7 @@ DisplayListMenuID::
 	ld a,$01 ; hardcoded bank
 	jr .bankswitch
 .specialBattleType ; Old Man battle
-	ld a, Bank(DisplayBattleMenu)
+	ld a, BANK(DisplayBattleMenu)
 .bankswitch
 	call BankswitchHome
 	ld hl,wd730
@@ -1411,7 +1408,7 @@ DisplayListMenuID::
 	ld a,1 ; max menu item ID is 1 if the list has less than 2 entries
 	ld [wMenuWatchMovingOutOfBounds],a
 	ld a,[wListCount]
-	cp a,2 ; does the list have less than 2 entries?
+	cp 2 ; does the list have less than 2 entries?
 	jr c,.setMenuVariables
 	ld a,2 ; max menu item ID is 2 if the list has at least 2 entries
 .setMenuVariables
@@ -1481,7 +1478,7 @@ DisplayListMenuIDLoop::
 	ld a,c
 	ld [wWhichPokemon],a
 	ld a,[wListMenuID]
-	cp a,ITEMLISTMENU
+	cp ITEMLISTMENU
 	jr nz,.skipMultiplying
 ; if it's an item menu
 	sla c ; item entries are 2 bytes long, so multiply by 2
@@ -1502,7 +1499,7 @@ DisplayListMenuIDLoop::
 	call GetItemPrice
 	pop hl
 	ld a,[wListMenuID]
-	cp a,ITEMLISTMENU
+	cp ITEMLISTMENU
 	jr nz,.skipGettingQuantity
 ; if it's an item menu
 	inc hl
@@ -1548,7 +1545,7 @@ DisplayListMenuIDLoop::
 	jr z,.upPressed
 .downPressed
 	ld a,[hl]
-	add a,3
+	add 3
 	ld b,a
 	ld a,[wListCount]
 	cp b ; will going down scroll past the Cancel button?
@@ -1568,7 +1565,7 @@ DisplayChooseQuantityMenu::
 	ld b,1 ; height
 	ld c,3 ; width
 	ld a,[wListMenuID]
-	cp a,PRICEDITEMLISTMENU
+	cp PRICEDITEMLISTMENU
 	jr nz,.drawTextBox
 ; text box dimensions/coordinates for quantity and price
 	coord hl, 7, 9
@@ -1578,7 +1575,7 @@ DisplayChooseQuantityMenu::
 	call TextBoxBorder
 	coord hl, 16, 10
 	ld a,[wListMenuID]
-	cp a,PRICEDITEMLISTMENU
+	cp PRICEDITEMLISTMENU
 	jr nz,.printInitialQuantity
 	coord hl, 8, 10
 .printInitialQuantity
@@ -1622,7 +1619,7 @@ DisplayChooseQuantityMenu::
 .handleNewQuantity
 	coord hl, 17, 10
 	ld a,[wListMenuID]
-	cp a,PRICEDITEMLISTMENU
+	cp PRICEDITEMLISTMENU
 	jr nz,.printQuantity
 .printPrice
 	ld c,$03
@@ -1716,7 +1713,7 @@ PrintListMenuEntries::
 	ld a,[wListScrollOffset]
 	ld c,a
 	ld a,[wListMenuID]
-	cp a,ITEMLISTMENU
+	cp ITEMLISTMENU
 	ld a,c
 	jr nz,.skipMultiplying
 ; if it's an item menu
@@ -1736,7 +1733,7 @@ PrintListMenuEntries::
 	ld [wWhichPokemon],a
 	ld a,[de]
 	ld [wd11e],a
-	cp a,$ff
+	cp $ff
 	jp z,.printCancelMenuItem
 	push bc
 	push de
@@ -1746,7 +1743,7 @@ PrintListMenuEntries::
 	ld a,[wListMenuID]
 	and a
 	jr z,.pokemonPCMenu
-	cp a,$01
+	cp MOVESLISTMENU
 	jr z,.movesMenu
 .itemMenu
 	call GetItemName
@@ -1834,7 +1831,7 @@ PrintListMenuEntries::
 	pop de
 	inc de
 	ld a,[wListMenuID]
-	cp a,ITEMLISTMENU
+	cp ITEMLISTMENU
 	jr nz,.nextListEntry
 .printItemQuantity
 	ld a,[wd11e]
@@ -1991,7 +1988,6 @@ GetMachineName::
 	inc de
 	ld a,"@"
 	ld [de],a
-
 	pop af
 	ld [wd11e],a
 	pop bc
@@ -2007,9 +2003,9 @@ HiddenPrefix::
 ; sets carry if item is HM, clears carry if item is not HM
 ; Input: a = item ID
 IsItemHM::
-	cp a,HM_01
+	cp HM_01
 	jr c,.notHM
-	cp a,TM_01
+	cp TM_01
 	ret
 .notHM
 	and a
@@ -2189,6 +2185,7 @@ RunNPCMovementScript::
 	ld [H_LOADEDROMBANK], a
 	ld [MBC1RomBank], a
 	ret
+
 .NPCMovementScriptPointerTables
 	dw PalletMovementScriptPointerTable
 	dw PewterMuseumGuyMovementScriptPointerTable
@@ -2679,7 +2676,7 @@ FuncTX_BillsPC::
 	ld hl, BillsPC_
 	jr bankswitchAndContinue
 
-FuncTX_SlotMachine::
+FuncTX_GameCornerPrizeMenu::
 ; XXX find a better name for this function
 ; special_F7
 	ld b,BANK(CeladonPrizeMenu)
@@ -2752,7 +2749,7 @@ CheckCoords::
 	ld [wCoordIndex],a
 .loop
 	ld a,[hli]
-	cp a,$ff ; reached terminator?
+	cp $ff ; reached terminator?
 	jr z,.notInArray
 	push hl
 	ld hl,wCoordIndex
@@ -2871,7 +2868,7 @@ GetSpriteMovementByte1Pointer::
 	ld h,$C2
 	ld a,[H_SPRITEINDEX]
 	swap a
-	add a,6
+	add 6
 	ld l,a
 	ret
 
@@ -2924,7 +2921,6 @@ GetTrainerInformation::
 GetTrainerName::
 	jpba GetTrainerName_
 
-
 HasEnoughMoney::
 ; Check if the player has at least as much
 ; money as the 3-byte BCD value at hMoney.
@@ -3006,12 +3002,13 @@ YesNoChoicePokeCenter::
 	lb bc, 8, 12
 	jr DisplayYesNoChoice
 
-Func_361a::
+WideYesNoChoice:: ; unused
 	call SaveScreenTilesToBuffer1
 	ld a, WIDE_YES_NO_MENU
 	ld [wTwoOptionMenuID], a
 	coord hl, 12, 7
 	lb bc, 8, 13
+
 DisplayYesNoChoice::
 	ld a, TWO_OPTION_MENU
 	ld [wTextBoxID], a
@@ -3045,7 +3042,7 @@ MoveSprite_::
 	ld [hli],a
 	inc de
 	inc c
-	cp a,$FF ; have we reached the end of the movement data?
+	cp $FF ; have we reached the end of the movement data?
 	jr nz,.loop
 
 	ld a,c
@@ -3066,7 +3063,7 @@ MoveSprite_::
 ; divides [hDividend2] by [hDivisor2] and stores the quotient in [hQuotient2]
 DivideBytes::
 	push hl
-	ld hl, $ffe7
+	ld hl, hQuotient2
 	xor a
 	ld [hld], a
 	ld a, [hld]
@@ -3157,7 +3154,6 @@ UncompressSpriteFromDE::
 	ld [hl], d
 	jp UncompressSpriteData
 
-
 SaveScreenTilesToBuffer2::
 	coord hl, 0, 0
 	ld de, wTileMapBackup2
@@ -3199,7 +3195,7 @@ LoadScreenTilesFromBuffer1::
 	ret
 
 DelayFrames::
-; wait n frames, where n is the value in c
+; wait c frames
 	call DelayFrame
 	dec c
 	jr nz,DelayFrames
@@ -3300,7 +3296,7 @@ GetName::
 	ld e,l
 .nextChar
 	ld a,[hli]
-	cp a, "@"
+	cp "@"
 	jr nz,.nextChar
 	inc c           ;entry counter
 	ld a,b          ;wanted entry
@@ -3332,9 +3328,9 @@ GetItemPrice::
 	ld a, [wListMenuID]
 	cp MOVESLISTMENU
 	ld a, BANK(ItemPrices)
-	jr nz, .asm_37ed
+	jr nz, .ok
 	ld a, $f ; hardcoded Bank
-.asm_37ed
+.ok
 	ld [H_LOADEDROMBANK], a
 	ld [MBC1RomBank], a
 	ld hl, wItemPrices
@@ -3345,10 +3341,10 @@ GetItemPrice::
 	cp HM_01
 	jr nc, .getTMPrice
 	ld bc, $3
-.asm_3802
+.loop
 	add hl, bc
 	dec a
-	jr nz, .asm_3802
+	jr nz, .loop
 	dec hl
 	ld a, [hld]
 	ld [hItemPrice + 2], a
@@ -3356,13 +3352,13 @@ GetItemPrice::
 	ld [hItemPrice + 1], a
 	ld a, [hl]
 	ld [hItemPrice], a
-	jr .asm_381c
+	jr .done
 .getTMPrice
 	ld a, Bank(GetMachinePrice)
 	ld [H_LOADEDROMBANK], a
 	ld [MBC1RomBank], a
 	call GetMachinePrice
-.asm_381c
+.done
 	ld de, hItemPrice
 	pop af
 	ld [H_LOADEDROMBANK], a
@@ -4075,7 +4071,7 @@ PlaceMenuCursor::
 	jr nz,.currentMenuItemLoop
 .checkForArrow2
 	ld a,[hl]
-	cp a,"▶" ; has the right arrow already been placed?
+	cp "▶" ; has the right arrow already been placed?
 	jr z,.skipSavingTile ; if so, don't lose the saved tile
 	ld [wTileBehindCursor],a ; save tile before overwriting with right arrow
 .skipSavingTile
@@ -4656,6 +4652,8 @@ SetMapTextPointer::
 	ret
 
 TextPredefs::
+const_value = 1
+
 	add_tx_pre CardKeySuccessText                   ; 01
 	add_tx_pre CardKeyFailText                      ; 02
 	add_tx_pre RedBedroomPCText                     ; 03
diff --git a/home/fade.asm b/home/fade.asm
index 08e087b4..9482fcb0 100644
--- a/home/fade.asm
+++ b/home/fade.asm
@@ -1,7 +1,7 @@
 ; These routines manage gradual fading
 ; (e.g., entering a doorway)
 LoadGBPal::
-	ld a, [wMapPalOffset] ;tells if cur.map is dark (requires HM5_FLASH?)
+	ld a, [wMapPalOffset] ;tells if wCurMap is dark (requires HM5_FLASH?)
 	ld b, a
 	ld hl, FadePal4
 	ld a, l
diff --git a/home/overworld.asm b/home/overworld.asm
index fad9f29d..f71bb68a 100644
--- a/home/overworld.asm
+++ b/home/overworld.asm
@@ -59,7 +59,7 @@ OverworldLoopLessDelay::
 	res 3,[hl]
 	jp nz,WarpFound2
 	ld a,[wd732]
-	and a,1 << 4 | 1 << 3 ; fly warp or dungeon warp
+	and 1 << 4 | 1 << 3 ; fly warp or dungeon warp
 	jp nz,HandleFlyWarpOrDungeonWarp
 	ld a,[wCurOpponent]
 	and a
@@ -133,7 +133,7 @@ OverworldLoopLessDelay::
 	ld hl,wFlags_0xcd60
 	res 2,[hl]
 	call UpdateSprites
-	ld a,1
+	ld a, 1
 	ld [wCheckFor180DegreeTurn],a
 	ld a,[wPlayerMovingDirection] ; the direction that was pressed last time
 	and a
@@ -143,6 +143,7 @@ OverworldLoopLessDelay::
 	xor a
 	ld [wPlayerMovingDirection],a ; zero the direction
 	jp OverworldLoop
+
 .checkIfDownButtonIsPressed
 	ld a,[hJoyHeld] ; current joypad state
 	bit 7,a ; down button
@@ -151,6 +152,7 @@ OverworldLoopLessDelay::
 	ld [wSpriteStateData1 + 3],a ; delta Y
 	ld a,PLAYER_DIR_DOWN
 	jr .handleDirectionButtonPress
+
 .checkIfUpButtonIsPressed
 	bit 6,a ; up button
 	jr z,.checkIfLeftButtonIsPressed
@@ -158,6 +160,7 @@ OverworldLoopLessDelay::
 	ld [wSpriteStateData1 + 3],a ; delta Y
 	ld a,PLAYER_DIR_UP
 	jr .handleDirectionButtonPress
+
 .checkIfLeftButtonIsPressed
 	bit 5,a ; left button
 	jr z,.checkIfRightButtonIsPressed
@@ -165,11 +168,14 @@ OverworldLoopLessDelay::
 	ld [wSpriteStateData1 + 5],a ; delta X
 	ld a,PLAYER_DIR_LEFT
 	jr .handleDirectionButtonPress
+
 .checkIfRightButtonIsPressed
 	bit 4,a ; right button
 	jr z,.noDirectionButtonsPressed
-	ld a,1 ; PLAYER_DIR_RIGHT
+	ld a, 1
 	ld [wSpriteStateData1 + 5],a ; delta X
+
+
 .handleDirectionButtonPress
 	ld [wPlayerDirection],a ; new direction
 	ld a,[wd730]
@@ -226,12 +232,13 @@ OverworldLoopLessDelay::
 	call NewBattle
 	jp c,.battleOccurred
 	jp OverworldLoop
+
 .noDirectionChange
 	ld a,[wPlayerDirection] ; current direction
 	ld [wPlayerMovingDirection],a ; save direction
 	call UpdateSprites
 	ld a,[wWalkBikeSurfState]
-	cp a,$02 ; surfing
+	cp $02 ; surfing
 	jr z,.surfing
 ; not surfing
 	call CollisionCheckOnLand
@@ -248,20 +255,24 @@ OverworldLoopLessDelay::
 	pop hl
 	jp c,CheckWarpsCollision
 	jp OverworldLoop
+
 .surfing
 	call CollisionCheckOnWater
 	jp c,OverworldLoop
+
 .noCollision
 	ld a,$08
 	ld [wWalkCounter],a
 	jr .moveAhead2
+
 .moveAhead
 	ld a,[wd736]
 	bit 7,a
 	jr z,.noSpinning
-	callba LoadSpinnerArrowTiles ; spin while moving
+	callba LoadSpinnerArrowTiles
 .noSpinning
 	call UpdateSprites
+
 .moveAhead2
 	ld hl,wFlags_0xcd60
 	res 2,[hl]
@@ -271,7 +282,7 @@ OverworldLoopLessDelay::
 	ld a,[wd736]
 	bit 6,a ; jumping a ledge?
 	jr nz,.normalPlayerSpriteAdvancement
-	call BikeSpeedup ; if riding a bike and not jumping a ledge
+	call DoBikeSpeedup
 .normalPlayerSpriteAdvancement
 	call AdvancePlayerSprite
 	ld a,[wWalkCounter]
@@ -323,14 +334,14 @@ OverworldLoopLessDelay::
 	xor a
 	ld [hJoyHeld],a
 	ld a,[wCurMap]
-	cp a,CINNABAR_GYM
+	cp CINNABAR_GYM
 	jr nz,.notCinnabarGym
 	SetEvent EVENT_2A7
 .notCinnabarGym
 	ld hl,wd72e
 	set 5,[hl]
 	ld a,[wCurMap]
-	cp a,OAKS_LAB
+	cp OAKS_LAB
 	jp z,.noFaintCheck ; no blacking out if the player lost to the rival in Oak's lab
 	callab AnyPartyAlive
 	ld a,d
@@ -363,15 +374,15 @@ NewBattle::
 	ret
 
 ; function to make bikes twice as fast as walking
-BikeSpeedup::
+DoBikeSpeedup::
 	ld a,[wNPCMovementScriptPointerTableNum]
 	and a
 	ret nz
 	ld a,[wCurMap]
-	cp a,ROUTE_17 ; Cycling Road
+	cp ROUTE_17 ; Cycling Road
 	jr nz,.goFaster
 	ld a,[hJoyHeld]
-	and a,D_UP | D_LEFT | D_RIGHT
+	and D_UP | D_LEFT | D_RIGHT
 	ret nz
 .goFaster
 	jp AdvancePlayerSprite
@@ -421,7 +432,7 @@ CheckWarpsNoCollisionLoop::
 	pop bc
 	pop de
 	ld a,[hJoyHeld]
-	and a,D_DOWN | D_UP | D_LEFT | D_RIGHT
+	and D_DOWN | D_UP | D_LEFT | D_RIGHT
 	jr z,CheckWarpsNoCollisionRetry2 ; if directional buttons aren't being pressed, do not pass through the warp
 	jr WarpFound1
 
@@ -483,7 +494,7 @@ WarpFound2::
 	ld [wUnusedD366],a ; not read
 	ld a,[hWarpDestinationMap]
 	ld [wCurMap],a
-	cp a,ROCK_TUNNEL_1
+	cp ROCK_TUNNEL_1
 	jr nz,.notRockTunnel
 	ld a,$06
 	ld [wMapPalOffset],a
@@ -491,10 +502,12 @@ WarpFound2::
 .notRockTunnel
 	call PlayMapChangeSound
 	jr .done
-; for maps that can have the 0xFF destination map, which means to return to the outside map; not all these maps are necessarily indoors, though
+
+; for maps that can have the 0xFF destination map, which means to return to the outside map
+; not all these maps are necessarily indoors, though
 .indoorMaps
 	ld a,[hWarpDestinationMap] ; destination map
-	cp a,$ff
+	cp $ff
 	jr z,.goBackOutside
 ; if not going back to the previous map
 	ld [wCurMap],a
@@ -535,7 +548,7 @@ ContinueCheckWarpsNoCollisionLoop::
 CheckMapConnections::
 .checkWestMap
 	ld a,[wXCoord]
-	cp a,$ff
+	cp $ff
 	jr nz,.checkEastMap
 	ld a,[wMapConn3Ptr]
 	ld [wCurMap],a
@@ -555,7 +568,7 @@ CheckMapConnections::
 	jr z,.savePointer1
 .pointerAdjustmentLoop1
 	ld a,[wWestConnectedMapWidth] ; width of connected map
-	add a,MAP_BORDER * 2
+	add MAP_BORDER * 2
 	ld e,a
 	ld d,0
 	ld b,0
@@ -568,6 +581,7 @@ CheckMapConnections::
 	ld a,h
 	ld [wCurrentTileBlockMapViewPointer + 1],a
 	jp .loadNewMap
+
 .checkEastMap
 	ld b,a
 	ld a,[wCurrentMapWidth2] ; map width
@@ -591,7 +605,7 @@ CheckMapConnections::
 	jr z,.savePointer2
 .pointerAdjustmentLoop2
 	ld a,[wEastConnectedMapWidth]
-	add a,MAP_BORDER * 2
+	add MAP_BORDER * 2
 	ld e,a
 	ld d,0
 	ld b,0
@@ -604,9 +618,10 @@ CheckMapConnections::
 	ld a,h
 	ld [wCurrentTileBlockMapViewPointer + 1],a
 	jp .loadNewMap
+
 .checkNorthMap
 	ld a,[wYCoord]
-	cp a,$ff
+	cp $ff
 	jr nz,.checkSouthMap
 	ld a,[wMapConn1Ptr]
 	ld [wCurMap],a
@@ -630,6 +645,7 @@ CheckMapConnections::
 	ld a,h
 	ld [wCurrentTileBlockMapViewPointer + 1],a
 	jp .loadNewMap
+
 .checkSouthMap
 	ld b,a
 	ld a,[wCurrentMapHeight2]
@@ -666,13 +682,14 @@ CheckMapConnections::
 	callba InitMapSprites
 	call LoadTileBlockMap
 	jp OverworldLoopLessDelay
+
 .didNotEnterConnectedMap
 	jp OverworldLoop
 
 ; function to play a sound when changing maps
 PlayMapChangeSound::
 	aCoord 8, 8 ; upper left tile of the 4x4 square the player's sprite is standing on
-	cp a,$0b ; door tile in tileset 0
+	cp $0b ; door tile in tileset 0
 	jr nz,.didNotGoThroughDoor
 	ld a,SFX_GO_INSIDE
 	jr .playSound
@@ -854,13 +871,13 @@ INCLUDE "data/bike_riding_tilesets.asm"
 
 ; load the tile pattern data of the current tileset into VRAM
 LoadTilesetTilePatternData::
-	ld a,[wTileSetGFXPtr]
+	ld a,[wTilesetGfxPtr]
 	ld l,a
-	ld a,[wTileSetGFXPtr + 1]
+	ld a,[wTilesetGfxPtr + 1]
 	ld h,a
 	ld de,vTileset
 	ld bc,$600
-	ld a,[wTileSetBank]
+	ld a,[wTilesetBank]
 	jp FarCopyData2
 
 ; this loads the current maps complete tile map (which references blocks, not individual tiles) to C6E8
@@ -883,7 +900,7 @@ LoadTileBlockMap::
 	ld hl,wOverworldMap
 	ld a,[wCurMapWidth]
 	ld [hMapWidth],a
-	add a,MAP_BORDER * 2 ; east and west
+	add MAP_BORDER * 2 ; east and west
 	ld [hMapStride],a ; map width + border
 	ld b,0
 	ld c,a
@@ -921,7 +938,7 @@ LoadTileBlockMap::
 	jr nz,.rowLoop
 .northConnection
 	ld a,[wMapConn1Ptr]
-	cp a,$ff
+	cp $ff
 	jr z,.southConnection
 	call SwitchToMapRomBank
 	ld a,[wNorthConnectionStripSrc]
@@ -939,7 +956,7 @@ LoadTileBlockMap::
 	call LoadNorthSouthConnectionsTileMap
 .southConnection
 	ld a,[wMapConn2Ptr]
-	cp a,$ff
+	cp $ff
 	jr z,.westConnection
 	call SwitchToMapRomBank
 	ld a,[wSouthConnectionStripSrc]
@@ -957,7 +974,7 @@ LoadTileBlockMap::
 	call LoadNorthSouthConnectionsTileMap
 .westConnection
 	ld a,[wMapConn3Ptr]
-	cp a,$ff
+	cp $ff
 	jr z,.eastConnection
 	call SwitchToMapRomBank
 	ld a,[wWestConnectionStripSrc]
@@ -975,7 +992,7 @@ LoadTileBlockMap::
 	call LoadEastWestConnectionsTileMap
 .eastConnection
 	ld a,[wMapConn4Ptr]
-	cp a,$ff
+	cp $ff
 	jr z,.done
 	call SwitchToMapRomBank
 	ld a,[wEastConnectionStripSrc]
@@ -1016,7 +1033,7 @@ LoadNorthSouthConnectionsTileMap::
 	inc h
 .noCarry1
 	ld a,[wCurMapWidth]
-	add a,MAP_BORDER * 2
+	add MAP_BORDER * 2
 	add e
 	ld e,a
 	jr nc,.noCarry2
@@ -1045,7 +1062,7 @@ LoadEastWestConnectionsTileMap::
 	inc h
 .noCarry1
 	ld a,[wCurMapWidth]
-	add a,MAP_BORDER * 2
+	add MAP_BORDER * 2
 	add e
 	ld e,a
 	jr nc,.noCarry2
@@ -1100,7 +1117,7 @@ IsSpriteOrSignInFrontOfPlayer::
 ; check if the player is front of a counter in a pokemon center, pokemart, etc. and if so, extend the range at which he can talk to the NPC
 .extendRangeOverCounter
 	predef GetTileAndCoordsInFrontOfPlayer ; get the tile in front of the player in c
-	ld hl,wTileSetTalkingOverTiles ; list of tiles that extend talking range (counter tiles)
+	ld hl,wTilesetTalkingOverTiles ; list of tiles that extend talking range (counter tiles)
 	ld b,3
 	ld d,$20 ; talking range in pixels (long range)
 .counterTilesLoop
@@ -1126,6 +1143,7 @@ IsSpriteInFrontOfPlayer2::
 	ld b,a
 	ld a,PLAYER_DIR_UP
 	jr .doneCheckingDirection
+
 .checkIfPlayerFacingDown
 	cp SPRITE_FACING_DOWN
 	jr nz,.checkIfPlayerFacingRight
@@ -1135,6 +1153,7 @@ IsSpriteInFrontOfPlayer2::
 	ld b,a
 	ld a,PLAYER_DIR_DOWN
 	jr .doneCheckingDirection
+
 .checkIfPlayerFacingRight
 	cp SPRITE_FACING_RIGHT
 	jr nz,.playerFacingLeft
@@ -1144,6 +1163,7 @@ IsSpriteInFrontOfPlayer2::
 	ld c,a
 	ld a,PLAYER_DIR_RIGHT
 	jr .doneCheckingDirection
+
 .playerFacingLeft
 ; facing left
 	ld a,c
@@ -1225,7 +1245,7 @@ CollisionCheckOnLand::
 	jr nc,.noCollision
 .collision
 	ld a,[wChannelSoundIDs + CH4]
-	cp a,SFX_COLLISION ; check if collision sound is already playing
+	cp SFX_COLLISION ; check if collision sound is already playing
 	jr z,.setCarry
 	ld a,SFX_COLLISION
 	call PlaySound ; play collision sound (if it's not already playing)
@@ -1242,7 +1262,7 @@ CheckTilePassable::
 	predef GetTileAndCoordsInFrontOfPlayer ; get tile in front of player
 	ld a,[wTileInFrontOfPlayer] ; tile in front of player
 	ld c,a
-	ld hl,wTileSetCollisionPtr ; pointer to list of passable tiles
+	ld hl,wTilesetCollisionPtr ; pointer to list of passable tiles
 	ld a,[hli]
 	ld h,[hl]
 	ld l,a ; hl now points to passable tiles
@@ -1287,7 +1307,7 @@ CheckForTilePairCollisions::
 	ld a,[wCurMapTileset] ; tileset number
 	ld b,a
 	ld a,[hli]
-	cp a,$ff
+	cp $ff
 	jr z,.noMatch
 	cp b
 	jr z,.tilesetMatches
@@ -1354,7 +1374,7 @@ TilePairCollisionsWater::
 LoadCurrentMapView::
 	ld a,[H_LOADEDROMBANK]
 	push af
-	ld a,[wTileSetBank] ; tile data ROM bank
+	ld a,[wTilesetBank] ; tile data ROM bank
 	ld [H_LOADEDROMBANK],a
 	ld [MBC1RomBank],a ; switch to ROM bank that contains tile data
 	ld a,[wCurrentTileBlockMapViewPointer] ; address of upper left corner of current map view
@@ -1387,7 +1407,7 @@ LoadCurrentMapView::
 ; update tile block map pointer to next row's address
 	pop de
 	ld a,[wCurMapWidth]
-	add a,MAP_BORDER * 2
+	add MAP_BORDER * 2
 	add e
 	ld e,a
 	jr nc,.noCarry
@@ -1722,8 +1742,8 @@ ScheduleSouthRowRedraw::
 	ld bc,$0200
 	add hl,bc
 	ld a,h
-	and a,$03
-	or a,$98
+	and $03
+	or $98
 	ld [hRedrawRowOrColumnDest + 1],a
 	ld a,l
 	ld [hRedrawRowOrColumnDest],a
@@ -1736,11 +1756,11 @@ ScheduleEastColumnRedraw::
 	call ScheduleColumnRedrawHelper
 	ld a,[wMapViewVRAMPointer]
 	ld c,a
-	and a,$e0
+	and $e0
 	ld b,a
 	ld a,c
-	add a,18
-	and a,$1f
+	add 18
+	and $1f
 	or b
 	ld [hRedrawRowOrColumnDest],a
 	ld a,[wMapViewVRAMPointer + 1]
@@ -1784,17 +1804,17 @@ ScheduleWestColumnRedraw::
 ; Input: c = tile block ID, hl = destination address
 DrawTileBlock::
 	push hl
-	ld a,[wTileSetBlocksPtr] ; pointer to tiles
+	ld a,[wTilesetBlocksPtr] ; pointer to tiles
 	ld l,a
-	ld a,[wTileSetBlocksPtr + 1]
+	ld a,[wTilesetBlocksPtr + 1]
 	ld h,a
 	ld a,c
 	swap a
 	ld b,a
-	and a,$f0
+	and $f0
 	ld c,a
 	ld a,b
-	and a,$0f
+	and $0f
 	ld b,a ; bc = tile block ID * 0x10
 	add hl,bc
 	ld d,h
@@ -1833,10 +1853,10 @@ JoypadOverworld::
 	bit 3,a ; check if a trainer wants a challenge
 	jr nz,.notForcedDownwards
 	ld a,[wCurMap]
-	cp a,ROUTE_17 ; Cycling Road
+	cp ROUTE_17 ; Cycling Road
 	jr nz,.notForcedDownwards
 	ld a,[hJoyHeld]
-	and a,D_DOWN | D_UP | D_LEFT | D_RIGHT | B_BUTTON | A_BUTTON
+	and D_DOWN | D_UP | D_LEFT | D_RIGHT | B_BUTTON | A_BUTTON
 	jr nz,.notForcedDownwards
 	ld a,D_DOWN
 	ld [hJoyHeld],a ; on the cycling road, if there isn't a trainer and the player isn't pressing buttons, simulate a down press
@@ -1868,6 +1888,7 @@ JoypadOverworld::
 	ld [hJoyPressed],a
 	ld [hJoyReleased],a
 	ret
+
 ; if done simulating button presses
 .doneSimulating
 	xor a
@@ -1878,7 +1899,7 @@ JoypadOverworld::
 	ld [hJoyHeld],a
 	ld hl,wd736
 	ld a,[hl]
-	and a,$f8
+	and $f8
 	ld [hl],a
 	ld hl,wd730
 	res 7,[hl]
@@ -1915,7 +1936,7 @@ CollisionCheckOnWater::
 	jr z,.noCollision ; keep surfing
 ; check if the [land] tile in front of the player is passable
 .checkIfNextTileIsPassable
-	ld hl,wTileSetCollisionPtr ; pointer to list of passable tiles
+	ld hl,wTilesetCollisionPtr ; pointer to list of passable tiles
 	ld a,[hli]
 	ld h,[hl]
 	ld l,a
@@ -1928,7 +1949,7 @@ CollisionCheckOnWater::
 	jr .loop
 .collision
 	ld a,[wChannelSoundIDs + CH4]
-	cp a,SFX_COLLISION ; check if collision sound is already playing
+	cp SFX_COLLISION ; check if collision sound is already playing
 	jr z,.setCarry
 	ld a,SFX_COLLISION
 	call PlaySound ; play collision sound (if it's not already playing)
@@ -2386,7 +2407,7 @@ IgnoreInputForHalfSecond:
 	ld [wIgnoreInputCounter], a
 	ld hl, wd730
 	ld a, [hl]
-	or $26
+	or %00100110
 	ld [hl], a ; set ignore input bit
 	ret
 
diff --git a/home/pic.asm b/home/pic.asm
index 15ee53ad..444a9f05 100644
--- a/home/pic.asm
+++ b/home/pic.asm
@@ -531,9 +531,9 @@ ReverseNybble::
 	ld de, NybbleReverseTable
 	add e
 	ld e, a
-	jr nc, .asm_283f
+	jr nc, .noCarry
 	inc d
-.asm_283f
+.noCarry
 	ld a, [de]
 	ret
 
diff --git a/home/serial.asm b/home/serial.asm
index 7a515118..6c412239 100644
--- a/home/serial.asm
+++ b/home/serial.asm
@@ -91,79 +91,79 @@ Serial_ExchangeByte::
 	ld [hSerialReceivedNewData], a
 	ld a, [hSerialConnectionStatus]
 	cp USING_INTERNAL_CLOCK
-	jr nz, .asm_21a7
+	jr nz, .loop
 	ld a, START_TRANSFER_INTERNAL_CLOCK
 	ld [rSC], a
-.asm_21a7
+.loop
 	ld a, [hSerialReceivedNewData]
 	and a
-	jr nz, .asm_21f1
+	jr nz, .ok
 	ld a, [hSerialConnectionStatus]
 	cp USING_EXTERNAL_CLOCK
-	jr nz, .asm_21cc
+	jr nz, .doNotIncrementUnknownCounter
 	call IsUnknownCounterZero
-	jr z, .asm_21cc
+	jr z, .doNotIncrementUnknownCounter
 	call WaitLoop_15Iterations
 	push hl
 	ld hl, wUnknownSerialCounter + 1
 	inc [hl]
-	jr nz, .asm_21c3
+	jr nz, .noCarry
 	dec hl
 	inc [hl]
-.asm_21c3
+.noCarry
 	pop hl
 	call IsUnknownCounterZero
-	jr nz, .asm_21a7
+	jr nz, .loop
 	jp SetUnknownCounterToFFFF
-.asm_21cc
+.doNotIncrementUnknownCounter
 	ld a, [rIE]
 	and (1 << SERIAL) | (1 << TIMER) | (1 << LCD_STAT) | (1 << VBLANK)
 	cp (1 << SERIAL)
-	jr nz, .asm_21a7
+	jr nz, .loop
 	ld a, [wUnknownSerialCounter2]
 	dec a
 	ld [wUnknownSerialCounter2], a
-	jr nz, .asm_21a7
+	jr nz, .loop
 	ld a, [wUnknownSerialCounter2 + 1]
 	dec a
 	ld [wUnknownSerialCounter2 + 1], a
-	jr nz, .asm_21a7
+	jr nz, .loop
 	ld a, [hSerialConnectionStatus]
 	cp USING_EXTERNAL_CLOCK
-	jr z, .asm_21f1
+	jr z, .ok
 	ld a, 255
 .waitLoop
 	dec a
 	jr nz, .waitLoop
-.asm_21f1
+.ok
 	xor a
 	ld [hSerialReceivedNewData], a
 	ld a, [rIE]
 	and (1 << SERIAL) | (1 << TIMER) | (1 << LCD_STAT) | (1 << VBLANK)
 	sub (1 << SERIAL)
-	jr nz, .asm_2204
+	jr nz, .skipReloadingUnknownCounter2
 	ld [wUnknownSerialCounter2], a
 	ld a, $50
 	ld [wUnknownSerialCounter2 + 1], a
-.asm_2204
+.skipReloadingUnknownCounter2
 	ld a, [hSerialReceiveData]
 	cp SERIAL_NO_DATA_BYTE
 	ret nz
 	call IsUnknownCounterZero
-	jr z, .asm_221f
+	jr z, .done
 	push hl
 	ld hl, wUnknownSerialCounter + 1
 	ld a, [hl]
 	dec a
 	ld [hld], a
 	inc a
-	jr nz, .asm_2219
+	jr nz, .noBorrow
 	dec [hl]
-.asm_2219
+.noBorrow
 	pop hl
 	call IsUnknownCounterZero
 	jr z, SetUnknownCounterToFFFF
-.asm_221f
+.done
 	ld a, [rIE]
 	and (1 << SERIAL) | (1 << TIMER) | (1 << LCD_STAT) | (1 << VBLANK)
 	cp (1 << SERIAL)
diff --git a/home/vblank.asm b/home/vblank.asm
index f69d4a86..e80fba75 100644
--- a/home/vblank.asm
+++ b/home/vblank.asm
@@ -27,7 +27,7 @@ VBlank::
 	call VBlankCopyDouble
 	call UpdateMovingBgTiles
 	call $ff80 ; hOAMDMA
-	ld a, Bank(PrepareOAMData)
+	ld a, BANK(PrepareOAMData)
 	ld [H_LOADEDROMBANK], a
 	ld [MBC1RomBank], a
 	call PrepareOAMData
diff --git a/home/vcopy.asm b/home/vcopy.asm
index b7fb099e..3fe19745 100644
--- a/home/vcopy.asm
+++ b/home/vcopy.asm
@@ -33,13 +33,13 @@ ClearBgMap::
 	jr nz,.loop
 	ret
 
-RedrawRowOrColumn::
 ; This function redraws a BG row of height 2 or a BG column of width 2.
 ; One of its main uses is redrawing the row or column that will be exposed upon
 ; scrolling the BG when the player takes a step. Redrawing only the exposed
 ; row or column is more efficient than redrawing the entire screen.
 ; However, this function is also called repeatedly to redraw the whole screen
 ; when necessary. It is also used in trade animation and elevator code.
+RedrawRowOrColumn::
 	ld a,[hRedrawRowOrColumnMode]
 	and a
 	ret z
diff --git a/main.asm b/main.asm
index 6c51de59..53d2dfdb 100755
--- a/main.asm
+++ b/main.asm
@@ -2435,7 +2435,7 @@ GetTileTwoStepsInFrontOfPlayer:
 
 CheckForCollisionWhenPushingBoulder:
 	call GetTileTwoStepsInFrontOfPlayer
-	ld hl, wTileSetCollisionPtr
+	ld hl, wTilesetCollisionPtr
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
@@ -2665,7 +2665,7 @@ LoadTilesetHeader:
 	ld e, a
 	ld hl, Tilesets
 	add hl, de
-	ld de, wTileSetBank
+	ld de, wTilesetBank
 	ld c, $b
 .copyTilesetHeaderLoop
 	ld a, [hli]
diff --git a/text.asm b/text.asm
index 49c246ee..866d4a7f 100644
--- a/text.asm
+++ b/text.asm
@@ -1,4 +1,5 @@
-
+INCLUDE "charmap.asm"
+INCLUDE "constants/text_constants.asm"
 TEXT_1  EQU $20
 TEXT_2  EQU TEXT_1 + 1
 TEXT_3  EQU TEXT_2 + 1
@@ -15,7 +16,6 @@ POKEDEX_TEXT EQU TEXT_11 + 1
 MOVE_NAMES   EQU POKEDEX_TEXT + 1
 
 INCLUDE "macros.asm"
-INCLUDE "charmap.asm"
 INCLUDE "hram.asm"
 
 
@@ -25,7 +25,7 @@ _CardKeySuccessText1::
 	text "Bingo!@@"
 
 _CardKeySuccessText2::
-	db $0
+	text ""
 	line "The CARD KEY"
 	cont "opened the door!"
 	done
@@ -79,7 +79,7 @@ _PokeCenterSignText::
 	done
 
 _FoundItemText::
-	text $52, " found"
+	text "<PLAYER> found"
 	line "@"
 	TX_RAM wcf4b
 	text "!@@"
@@ -96,7 +96,7 @@ _OaksAideHiText::
 
 	para "If you caught @"
 	TX_NUM hOaksAideRequirement, 1, 3
-	db $0
+	text ""
 	line "kinds of #MON,"
 	cont "I'm supposed to"
 	cont "give you an"
@@ -104,7 +104,7 @@ _OaksAideHiText::
 	TX_RAM wOaksAideRewardItemName
 	text "!"
 
-	para "So, ", $52, "! Have"
+	para "So, <PLAYER>! Have"
 	line "you caught at"
 	cont "least @"
 	TX_NUM hOaksAideRequirement, 1, 3
@@ -117,7 +117,7 @@ _OaksAideUhOhText::
 	line "Uh-oh! You have"
 	cont "caught only @"
 	TX_NUM hOaksAideNumMonsOwned, 1, 3
-	db $0
+	text ""
 	cont "kinds of #MON!"
 
 	para "You need @"
@@ -134,7 +134,7 @@ _OaksAideComeBackText::
 
 	para "When you get @"
 	TX_NUM hOaksAideRequirement, 1, 3
-	db $0
+	text ""
 	line "kinds, come back"
 	cont "for @"
 	TX_RAM wOaksAideRewardItemName
@@ -153,7 +153,7 @@ _OaksAideHereYouGoText::
 	prompt
 
 _OaksAideGotItemText::
-	text $52, " got the"
+	text "<PLAYER> got the"
 	line "@"
 	TX_RAM wOaksAideRewardItemName
 	text "!@@"
@@ -239,10 +239,10 @@ _AIBattleWithdrawText::
 
 _AIBattleUseItemText::
 	TX_RAM wTrainerName
-	db $0
+	text ""
 	line "used @"
 	TX_RAM wcd6d
-	db $0
+	text ""
 	cont "on @"
 	TX_RAM wEnemyMonNick
 	text "!"
@@ -257,7 +257,7 @@ _TradeWentToText::
 	done
 
 _TradeForText::
-	text "For ", $52, "'s"
+	text "For <PLAYER>'s"
 	line "@"
 	TX_RAM wcf4b
 	text ","
@@ -295,11 +295,11 @@ _TradeWillTradeText::
 	text " will"
 	line "trade @"
 	TX_RAM wcd6d
-	db $0
+	text ""
 	done
 
 _TradeforText::
-	text "for ", $52, "'s"
+	text "for <PLAYER>'s"
 	line "@"
 	TX_RAM wcf4b
 	text "."
@@ -351,7 +351,7 @@ _YeahText::
 _DexSeenOwnedText::
 	text "#DEX   Seen:@"
 	TX_NUM wDexRatingNumMonsSeen, 1, 3
-	db $0
+	text ""
 	line "         Owned:@"
 	TX_NUM wDexRatingNumMonsOwned, 1, 3
 	db "@"
@@ -362,27 +362,27 @@ _DexRatingText::
 
 _GymStatueText1::
 	TX_RAM wGymCityName
-	db $0
+	text ""
 	line "#MON GYM"
 	cont "LEADER: @"
 	TX_RAM wGymLeaderName
-	db $0
+	text ""
 
 	para "WINNING TRAINERS:"
-	line $53
+	line "<RIVAL>"
 	done
 
 _GymStatueText2::
 	TX_RAM wGymCityName
-	db $0
+	text ""
 	line "#MON GYM"
 	cont "LEADER: @"
 	TX_RAM wGymLeaderName
-	db $0
+	text ""
 
 	para "WINNING TRAINERS:"
-	line $53
-	cont $52
+	line "<RIVAL>"
+	cont "<PLAYER>"
 	done
 
 _ViridianCityPokecenterGuyText::
@@ -627,7 +627,7 @@ _BillsHouseMonitorText::
 	done
 
 _BillsHouseInitiatedText::
-	text $52, " initiated"
+	text "<PLAYER> initiated"
 	line "TELEPORTER's Cell"
 	cont "Separator!@@"
 
@@ -801,7 +801,7 @@ _IndigoPlateauHQText::
 	done
 
 _RedBedroomSNESText::
-	text $52, " is"
+	text "<PLAYER> is"
 	line "playing the SNES!"
 	cont "...Okay!"
 	cont "It's time to go!"
@@ -972,31 +972,31 @@ _VermilionGymTrashFailText::
 	cont "locks were reset!@@"
 
 _FoundHiddenItemText::
-	text $52, " found"
+	text "<PLAYER> found"
 	line "@"
 	TX_RAM wcd6d
 	text "!@@"
 
 _HiddenItemBagFullText::
-	text "But, ", $52, " has"
+	text "But, <PLAYER> has"
 	line "no more room for"
 	cont "other items!"
 	done
 
 _FoundHiddenCoinsText::
-	text $52, " found"
+	text "<PLAYER> found"
 	line "@"
-	TX_BCD hCoins, $c2
+	TX_BCD hCoins, 2 | LEADING_ZEROES | LEFT_ALIGN
 	text " coins!@@"
 
 _FoundHiddenCoins2Text::
-	text $52, " found"
+	text "<PLAYER> found"
 	line "@"
-	TX_BCD hCoins, $c2
+	TX_BCD hCoins, 2 | LEADING_ZEROES | LEFT_ALIGN
 	text " coins!@@"
 
 _DroppedHiddenCoinsText::
-	db $0
+	text ""
 	para "Oops! Dropped"
 	line "some coins!"
 	done
@@ -1050,48 +1050,48 @@ _OutOfSafariBallsText::
 _WildRanText::
 	text "Wild @"
 	TX_RAM wEnemyMonNick
-	db $0
+	text ""
 	line "ran!"
 	prompt
 
 _EnemyRanText::
 	text "Enemy @"
 	TX_RAM wEnemyMonNick
-	db $0
+	text ""
 	line "ran!"
 	prompt
 
 _HurtByPoisonText::
-	text $5a, "'s"
+	text "<USER>'s"
 	line "hurt by poison!"
 	prompt
 
 _HurtByBurnText::
-	text $5a, "'s"
+	text "<USER>'s"
 	line "hurt by the burn!"
 	prompt
 
 _HurtByLeechSeedText::
 	text "LEECH SEED saps"
-	line $5a, "!"
+	line "<USER>!"
 	prompt
 
 _EnemyMonFaintedText::
 	text "Enemy @"
 	TX_RAM wEnemyMonNick
-	db $0
+	text ""
 	line "fainted!"
 	prompt
 
 _MoneyForWinningText::
-	text $52, " got ¥@"
-	TX_BCD wAmountMoneyWon, $c3
-	db $0
+	text "<PLAYER> got ¥@"
+	TX_BCD wAmountMoneyWon, 3 | LEADING_ZEROES | LEFT_ALIGN
+	text ""
 	line "for winning!"
 	prompt
 
 _TrainerDefeatedText::
-	text $52, " defeated"
+	text "<PLAYER> defeated"
 	line "@"
 	TX_RAM wTrainerName
 	text "!"
@@ -1099,7 +1099,7 @@ _TrainerDefeatedText::
 
 _PlayerMonFaintedText::
 	TX_RAM wBattleMonNick
-	db $0
+	text ""
 	line "fainted!"
 	prompt
 
@@ -1108,20 +1108,20 @@ _UseNextMonText::
 	done
 
 _Sony1WinText::
-	text $53, ": Yeah! Am"
+	text "<RIVAL>: Yeah! Am"
 	line "I great or what?"
 	prompt
 
 _PlayerBlackedOutText2::
-	text $52, " is out of"
+	text "<PLAYER> is out of"
 	line "useable #MON!"
 
-	para $52, " blacked"
+	para "<PLAYER> blacked"
 	line "out!"
 	prompt
 
 _LinkBattleLostText::
-	text $52, " lost to"
+	text "<PLAYER> lost to"
 	line "@"
 	TX_RAM wTrainerName
 	text "!"
@@ -1135,7 +1135,7 @@ _TrainerAboutToUseText::
 	TX_RAM wEnemyMonNick
 	text "!"
 
-	para "Will ", $52
+	para "Will <PLAYER>"
 	line "change #MON?"
 	done
 
@@ -1212,42 +1212,42 @@ _GetOutText::
 	prompt
 
 _FastAsleepText::
-	text $5A
+	text "<USER>"
 	line "is fast asleep!"
 	prompt
 
 _WokeUpText::
-	text $5A
+	text "<USER>"
 	line "woke up!"
 	prompt
 
 _IsFrozenText::
-	text $5A
+	text "<USER>"
 	line "is frozen solid!"
 	prompt
 
 _FullyParalyzedText::
-	text $5A,"'s"
+	text "<USER>'s"
 	line "fully paralyzed!"
 	prompt
 
 _FlinchedText::
-	text $5A
+	text "<USER>"
 	line "flinched!"
 	prompt
 
 _MustRechargeText::
-	text $5A
+	text "<USER>"
 	line "must recharge!"
 	prompt
 
 _DisabledNoMoreText::
-	text $5A,"'s"
+	text "<USER>'s"
 	line "disabled no more!"
 	prompt
 
 _IsConfusedText::
-	text $5A
+	text "<USER>"
 	line "is confused!"
 	prompt
 
@@ -1257,37 +1257,37 @@ _HurtItselfText::
 	prompt
 
 _ConfusedNoMoreText::
-	text $5A,"'s"
+	text "<USER>'s"
 	line "confused no more!"
 	prompt
 
 _SavingEnergyText::
-	text $5A
+	text "<USER>"
 	line "is saving energy!"
 	prompt
 
 _UnleashedEnergyText::
-	text $5A
+	text "<USER>"
 	line "unleashed energy!"
 	prompt
 
 _ThrashingAboutText::
-	text $5A,"'s"
+	text "<USER>'s"
 	line "thrashing about!"
 	done
 
 _AttackContinuesText::
-	text $5A,"'s"
+	text "<USER>'s"
 	line "attack continues!"
 	done
 
 _CantMoveText::
-	text $5A
+	text "<USER>"
 	line "can't move!"
 	prompt
 
 _MoveIsDisabledText::
-	text $5a, "'s"
+	text "<USER>'s"
 	line "@"
 	TX_RAM wcd6d
 	text " is"
@@ -1295,14 +1295,14 @@ _MoveIsDisabledText::
 	prompt
 
 _MonName1Text::
-	text $5a, "@@"
+	text "<USER>@@"
 
 _Used1Text::
-	db $0
+	text ""
 	line "used @@"
 
 _Used2Text::
-	db $0
+	text ""
 	line "used @@"
 
 _InsteadText::
@@ -1334,24 +1334,24 @@ _ExclamationPoint5Text::
 	done
 
 _AttackMissedText::
-	text $5a, "'s"
+	text "<USER>'s"
 	line "attack missed!"
 	prompt
 
 _KeptGoingAndCrashedText::
-	text $5a
+	text "<USER>"
 	line "kept going and"
 	cont "crashed!"
 	prompt
 
 _UnaffectedText::
-	text $59, "'s"
+	text "<TARGET>'s"
 	line "unaffected!"
 	prompt
 
 _DoesntAffectMonText::
 	text "It doesn't affect"
-	line $59, "!"
+	line "<TARGET>!"
 	prompt
 
 _CriticalHitText::
@@ -1388,23 +1388,23 @@ _TurnedAwayText::
 
 _IgnoredOrdersText::
 	TX_RAM wBattleMonNick
-	db $0
+	text ""
 	line "ignored orders!"
 	prompt
 
 _SubstituteTookDamageText::
 	text "The SUBSTITUTE"
 	line "took damage for"
-	cont $59, "!"
+	cont "<TARGET>!"
 	prompt
 
 _SubstituteBrokeText::
-	text $59, "'s"
+	text "<TARGET>'s"
 	line "SUBSTITUTE broke!"
 	prompt
 
 _BuildingRageText::
-	text $5a, "'s"
+	text "<USER>'s"
 	line "RAGE is building!"
 	prompt
 
@@ -1431,6 +1431,7 @@ _WithExpAllText::
 _BoostedText::
 	text "a boosted"
 	cont "@@"
+
 _ExpPointsText::
 	TX_NUM wExpAmountGained, 2, 4
 	text " EXP. Points!"
@@ -1446,7 +1447,7 @@ _GrewLevelText::
 _WildMonAppearedText::
 	text "Wild @"
 	TX_RAM wEnemyMonNick
-	db $0
+	text ""
 	line "appeared!"
 	prompt
 
@@ -1454,13 +1455,13 @@ _HookedMonAttackedText::
 	text "The hooked"
 	line "@"
 	TX_RAM wEnemyMonNick
-	db $0
+	text ""
 	cont "attacked!"
 	prompt
 
 _EnemyAppearedText::
 	TX_RAM wEnemyMonNick
-	db $0
+	text ""
 	line "appeared!"
 	prompt
 
@@ -1513,7 +1514,7 @@ _GoodText::
 	text "good!@@"
 
 _ComeBackText::
-	db $0
+	text ""
 	line "Come back!"
 	done
 
@@ -1543,9 +1544,9 @@ _SafariZoneAngryText::
 
 ; money related
 _PickUpPayDayMoneyText::
-	text $52, " picked up"
+	text "<PLAYER> picked up"
 	line "¥@"
-	TX_BCD wTotalPayDayMoney, $c3
+	TX_BCD wTotalPayDayMoney, 3 | LEADING_ZEROES | LEFT_ALIGN
 	text "!"
 	prompt
 
@@ -1585,7 +1586,7 @@ _PartyMenuSwapMonText::
 
 _PotionText::
 	TX_RAM wcd6d
-	db $0
+	text ""
 	line "recovered by @"
 	TX_NUM wHPBarHPDifference, 2, 3
 	text "!"
@@ -1617,7 +1618,7 @@ _IceHealText::
 
 _AwakeningText::
 	TX_RAM wcd6d
-	db $0
+	text ""
 	line "woke up!"
 	done
 
@@ -1629,7 +1630,7 @@ _FullHealText::
 
 _ReviveText::
 	TX_RAM wcd6d
-	db $0
+	text ""
 	line "is revitalized!"
 	done
 
@@ -1637,11 +1638,11 @@ _RareCandyText::
 	TX_RAM wcd6d
 	text " grew"
 	line "to level @"
-	TX_NUM wCurEnemyLVL, $1,$3
+	TX_NUM wCurEnemyLVL, 1, 3
 	text "!@@"
 
 _TurnedOnPC1Text::
-	text $52, " turned on"
+	text "<PLAYER> turned on"
 	line "the PC."
 	prompt
 
@@ -1669,7 +1670,7 @@ _AccessedMyPCText::
 	prompt
 
 _TurnedOnPC2Text::
-	text $52, " turned on"
+	text "<PLAYER> turned on"
 	line "the PC."
 	prompt
 
@@ -1902,13 +1903,13 @@ _DoYouWantToNicknameText::
 
 _YourNameIsText::
 	text "Right! So your"
-	line "name is ", $52, "!"
+	line "name is <PLAYER>!"
 	prompt
 
 _HisNameIsText::
 	text "That's right! I"
 	line "remember now! His"
-	cont "name is ", $53, "!"
+	cont "name is <RIVAL>!"
 	prompt
 
 _WillBeTradedText::
@@ -2011,7 +2012,7 @@ _WouldYouLikeToSaveText::
 	done
 
 _GameSavedText::
-	text $52, " saved"
+	text "<PLAYER> saved"
 	line "the game!"
 	done
 
@@ -2031,7 +2032,7 @@ _WhenYouChangeBoxText::
 
 _ChooseABoxText::
 	text "Choose a"
-	line $4a, " BOX.@@"
+	line "<pkmn> BOX.@@"
 
 _EvolvedText::
 	TX_RAM wcf4b
@@ -2039,7 +2040,7 @@ _EvolvedText::
 	done
 
 _IntoText::
-	db $0
+	text ""
 	line "into @"
 	TX_RAM wcd6d
 	text "!"
@@ -2048,54 +2049,54 @@ _IntoText::
 _StoppedEvolvingText::
 	text "Huh? @"
 	TX_RAM wcf4b
-	db $0
+	text ""
 	line "stopped evolving!"
 	prompt
 
 _IsEvolvingText::
 	text "What? @"
 	TX_RAM wcf4b
-	db $0
+	text ""
 	line "is evolving!"
 	done
 
 _FellAsleepText::
-	text $59
+	text "<TARGET>"
 	line "fell asleep!"
 	prompt
 
 _AlreadyAsleepText::
-	text $59, "'s"
+	text "<TARGET>'s"
 	line "already asleep!"
 	prompt
 
 _PoisonedText::
-	text $59
+	text "<TARGET>"
 	line "was poisoned!"
 	prompt
 
 _BadlyPoisonedText::
-	text $59, "'s"
+	text "<TARGET>'s"
 	line "badly poisoned!"
 	prompt
 
 _BurnedText::
-	text $59
+	text "<TARGET>"
 	line "was burned!"
 	prompt
 
 _FrozenText::
-	text $59
+	text "<TARGET>"
 	line "was frozen solid!"
 	prompt
 
 _FireDefrostedText::
 	text "Fire defrosted"
-	line $59, "!"
+	line "<TARGET>!"
 	prompt
 
 _MonsStatsRoseText::
-	text $5a, "'s"
+	text "<USER>'s"
 	line "@"
 	TX_RAM wcf4b
 	text "@@"
@@ -2108,7 +2109,7 @@ _RoseText::
 	prompt
 
 _MonsStatsFellText::
-	text $59, "'s"
+	text "<TARGET>'s"
 	line "@"
 	TX_RAM wcf4b
 	text "@@"
@@ -2121,60 +2122,60 @@ _FellText::
 	prompt
 
 _RanFromBattleText::
-	text $5a
+	text "<USER>"
 	line "ran from battle!"
 	prompt
 
 _RanAwayScaredText::
-	text $59
+	text "<TARGET>"
 	line "ran away scared!"
 	prompt
 
 _WasBlownAwayText::
-	text $59
+	text "<TARGET>"
 	line "was blown away!"
 	prompt
 
 _ChargeMoveEffectText::
-	text $5a, "@@"
+	text "<USER>@@"
 
 _MadeWhirlwindText::
-	db $0
+	text ""
 	line "made a whirlwind!"
 	prompt
 
 _TookInSunlightText::
-	db $0
+	text ""
 	line "took in sunlight!"
 	prompt
 
 _LoweredItsHeadText::
-	db $0
+	text ""
 	line "lowered its head!"
 	prompt
 
 _SkyAttackGlowingText::
-	db $0
+	text ""
 	line "is glowing!"
 	prompt
 
 _FlewUpHighText::
-	db $0
+	text ""
 	line "flew up high!"
 	prompt
 
 _DugAHoleText::
-	db $0
+	text ""
 	line "dug a hole!"
 	prompt
 
 _BecameConfusedText::
-	text $59
+	text "<TARGET>"
 	line "became confused!"
 	prompt
 
 _MimicLearnedMoveText::
-	text $5a
+	text "<USER>"
 	line "learned"
 	cont "@"
 	TX_RAM wcd6d
@@ -2182,7 +2183,7 @@ _MimicLearnedMoveText::
 	prompt
 
 _MoveWasDisabledText::
-	text $59, "'s"
+	text "<TARGET>'s"
 	line "@"
 	TX_RAM wcd6d
 	text " was"
@@ -2203,16 +2204,16 @@ _ButItFailedText::
 
 _DidntAffectText::
 	text "It didn't affect"
-	line $59, "!"
+	line "<TARGET>!"
 	prompt
 
 _IsUnaffectedText::
-	text $59
+	text "<TARGET>"
 	line "is unaffected!"
 	prompt
 
 _ParalyzedMayNotAttackText::
-	text $59, "'s"
+	text "<TARGET>'s"
 	line "paralyzed! It may"
 	cont "not attack!"
 	prompt
@@ -2223,7 +2224,7 @@ _SubstituteText::
 	prompt
 
 _HasSubstituteText::
-	text $5a
+	text "<USER>"
 	line "has a SUBSTITUTE!"
 	prompt
 
@@ -2243,23 +2244,23 @@ _GettingPumpedText::
 	prompt
 
 _WasSeededText::
-	text $59
+	text "<TARGET>"
 	line "was seeded!"
 	prompt
 
 _EvadedAttackText::
-	text $59
+	text "<TARGET>"
 	line "evaded attack!"
 	prompt
 
 _HitWithRecoilText::
-	text $5a, "'s"
+	text "<USER>'s"
 	line "hit with recoil!"
 	prompt
 
 _ConvertedTypeText::
 	text "Converted type to"
-	line $59, "'s!"
+	line "<TARGET>'s!"
 	prompt
 
 _StatusChangesEliminatedText::
@@ -2268,23 +2269,23 @@ _StatusChangesEliminatedText::
 	prompt
 
 _StartedSleepingEffect::
-	text $5a
+	text "<USER>"
 	line "started sleeping!"
 	done
 
 _FellAsleepBecameHealthyText::
-	text $5a
+	text "<USER>"
 	line "fell asleep and"
 	cont "became healthy!"
 	done
 
 _RegainedHealthText::
-	text $5a
+	text "<USER>"
 	line "regained health!"
 	prompt
 
 _TransformedText::
-	text $5a
+	text "<USER>"
 	line "transformed into"
 	cont "@"
 	TX_RAM wcd6d
@@ -2292,28 +2293,28 @@ _TransformedText::
 	prompt
 
 _LightScreenProtectedText::
-	text $5a, "'s"
+	text "<USER>'s"
 	line "protected against"
 	cont "special attacks!"
 	prompt
 
 _ReflectGainedArmorText::
-	text $5a
+	text "<USER>"
 	line "gained armor!"
 	prompt
 
 _ShroudedInMistText::
-	text $5a, "'s"
+	text "<USER>'s"
 	line "shrouded in mist!"
 	prompt
 
 _SuckedHealthText::
 	text "Sucked health from"
-	line $59, "!"
+	line "<TARGET>!"
 	prompt
 
 _DreamWasEatenText::
-	text $59, "'s"
+	text "<TARGET>'s"
 	line "dream was eaten!"
 	prompt
 
@@ -2433,15 +2434,15 @@ _PokemartGreetingText::
 
 _PokemonFaintedText::
 	TX_RAM wcd6d
-	db $0
+	text ""
 	line "fainted!"
 	done
 
 _PlayerBlackedOutText::
-	text $52, " is out of"
+	text "<PLAYER> is out of"
 	line "useable #MON!"
 
-	para $52, " blacked"
+	para "<PLAYER> blacked"
 	line "out!"
 	prompt
 
@@ -2459,7 +2460,7 @@ _PokemartTellBuyPriceText::
 	text "?"
 	line "That will be"
 	cont "¥@"
-	TX_BCD hMoney, $c3
+	TX_BCD hMoney, 3 | LEADING_ZEROES | LEFT_ALIGN
 	text ". OK?"
 	done
 
@@ -2486,7 +2487,7 @@ _PokemonSellingGreetingText::
 _PokemartTellSellPriceText::
 	text "I can pay you"
 	line "¥@"
-	TX_BCD hMoney, $c3
+	TX_BCD hMoney, 3 | LEADING_ZEROES | LEFT_ALIGN
 	text " for that."
 	done
 
@@ -2530,7 +2531,7 @@ _AbandonLearningText::
 
 _DidNotLearnText::
 	TX_RAM wLearnMoveMonName
-	db $0
+	text ""
 	line "did not learn"
 	cont "@"
 	TX_RAM wcf4b
@@ -2547,7 +2548,7 @@ _TryingToLearnText::
 
 	para "But, @"
 	TX_RAM wLearnMoveMonName
-	db $0
+	text ""
 	line "can't learn more"
 	cont "than 4 moves!"
 
@@ -2565,7 +2566,7 @@ _PoofText::
 	text " Poof!@@"
 
 _ForgotAndText::
-	db $0
+	text ""
 	para "@"
 	TX_RAM wLearnMoveMonName
 	text " forgot"
@@ -2721,7 +2722,7 @@ _CannotGetOffHereText::
 	prompt
 
 _GotMonText::
-	text $52, " got"
+	text "<PLAYER> got"
 	line "@"
 	TX_RAM wcd6d
 	text "!@@"
@@ -2818,7 +2819,7 @@ _ItemUseBallText06::
 	text "!@@"
 
 _SurfingGotOnText::
-	text $52, " got on"
+	text "<PLAYER> got on"
 	line "@"
 	TX_RAM wcd6d
 	text "!"
@@ -2843,12 +2844,12 @@ _VitaminNoEffectText::
 	prompt
 
 _ThrewBaitText::
-	text $52, " threw"
+	text "<PLAYER> threw"
 	line "some BAIT."
 	done
 
 _ThrewRockText::
-	text $52, " threw a"
+	text "<PLAYER> threw a"
 	line "ROCK."
 	done
 
@@ -2866,13 +2867,13 @@ _FluteWokeUpText::
 	prompt
 
 _PlayedFluteHadEffectText::
-	text $52, " played the"
+	text "<PLAYER> played the"
 	line "# FLUTE.@@"
 
 _CoinCaseNumCoinsText::
 	text "Coins"
 	line "@"
-	TX_BCD wPlayerCoins, $c2
+	TX_BCD wPlayerCoins, 2 | LEADING_ZEROES | LEFT_ALIGN
 	text " "
 	prompt
 
@@ -2929,7 +2930,7 @@ _TeachMachineMoveText::
 
 	para "Teach @"
 	TX_RAM wcf4b
-	db $0
+	text ""
 	line "to a #MON?"
 	done
 
@@ -2948,7 +2949,7 @@ _MonCannotLearnMachineMoveText::
 	prompt
 
 _ItemUseNotTimeText::
-	text "OAK: ", $52, "!"
+	text "OAK: <PLAYER>!"
 	line "This isn't the"
 	cont "time to use that! "
 	prompt
@@ -2994,7 +2995,7 @@ _BoxFullCannotThrowBallText::
 SECTION "Text 11", ROMX, BANK[TEXT_11]
 
 _ItemUseText001::
-	text $52," used@@"
+	text "<PLAYER> used@@"
 
 _ItemUseText002::
 	TX_RAM wcf4b
@@ -3002,7 +3003,7 @@ _ItemUseText002::
 	done
 
 _GotOnBicycleText1::
-	text $52, " got on the@@"
+	text "<PLAYER> got on the@@"
 
 _GotOnBicycleText2::
 	TX_RAM wcf4b
@@ -3010,7 +3011,7 @@ _GotOnBicycleText2::
 	prompt
 
 _GotOffBicycleText1::
-	text $52, " got off@@"
+	text "<PLAYER> got off@@"
 
 _GotOffBicycleText2::
 	text "the @"
@@ -3051,7 +3052,7 @@ _ConnectCableText::
 	prompt
 
 _TradedForText::
-	text $52, " traded"
+	text "<PLAYER> traded"
 	line "@"
 	TX_RAM wInGameTradeGiveMonName
 	text " for"
@@ -3103,7 +3104,7 @@ _WannaTrade2Text::
 
 	para "your @"
 	TX_RAM wInGameTradeGiveMonName
-	db $0
+	text ""
 	line "for @"
 	TX_RAM wInGameTradeReceiveMonName
 	text "?"
diff --git a/text/maps/bike_shop.asm b/text/maps/bike_shop.asm
index 33f53ee9..86799865 100644
--- a/text/maps/bike_shop.asm
+++ b/text/maps/bike_shop.asm
@@ -25,7 +25,7 @@ _BikeShopText_1d81f::
 	prompt
 
 _BikeShopText_1d824::
-	text $52, " exchanged"
+	text "<PLAYER> exchanged"
 	line "the BIKE VOUCHER"
 	cont "for a BICYCLE.@@"
 
diff --git a/text/maps/celadon_dept_store_3f.asm b/text/maps/celadon_dept_store_3f.asm
index 1aad756f..8211750d 100644
--- a/text/maps/celadon_dept_store_3f.asm
+++ b/text/maps/celadon_dept_store_3f.asm
@@ -8,7 +8,7 @@ _TM18PreReceiveText::
 	prompt
 
 _ReceivedTM18Text::
-	text $52, " received"
+	text "<PLAYER> received"
 	line "@"
 	TX_RAM wcf4b
 	text "!@@"
diff --git a/text/maps/fan_club.asm b/text/maps/fan_club.asm
index 7477405c..4827f2e8 100644
--- a/text/maps/fan_club.asm
+++ b/text/maps/fan_club.asm
@@ -83,13 +83,13 @@ FanClubChairStoryText::
 	prompt
 
 ReceivedBikeVoucherText::
-	text $52, " received"
+	text "<PLAYER> received"
 	line "a @"
 	TX_RAM wcf4b
 	text "!@@"
 
 ExplainBikeVoucherText::
-	db $0
+	text ""
 	para "Exchange that for"
 	line "a BICYCLE!"
 
@@ -111,7 +111,7 @@ FanClubNoStoryText::
 	done
 
 FanClubChairFinalText::
-	text "Hello, ", $52, "!"
+	text "Hello, <PLAYER>!"
 
 	para "Did you come see"
 	line "me about my"
diff --git a/text/maps/hall_of_fame.asm b/text/maps/hall_of_fame.asm
index 6c5dd40e..c799268b 100644
--- a/text/maps/hall_of_fame.asm
+++ b/text/maps/hall_of_fame.asm
@@ -1,7 +1,7 @@
 _HallofFameRoomText1::
 	text "OAK: Er-hem!"
 	line "Congratulations"
-	cont $52, "!"
+	cont "<PLAYER>!"
 
 	para "This floor is the"
 	line "#MON HALL OF"
@@ -16,13 +16,13 @@ _HallofFameRoomText1::
 	line "also recorded in"
 	cont "the HALL OF FAME!"
 
-	para $52, "! You have"
+	para "<PLAYER>! You have"
 	line "endeavored hard"
 	cont "to become the new"
 	cont "LEAGUE champion!"
 
 	para "Congratulations,"
-	line $52, ", you and"
+	line "<PLAYER>, you and"
 	cont "your #MON are"
 	cont "HALL OF FAMERs!"
 	done
diff --git a/text/maps/lance.asm b/text/maps/lance.asm
index 3c75ce47..0313b158 100644
--- a/text/maps/lance.asm
+++ b/text/maps/lance.asm
@@ -1,6 +1,6 @@
 _LanceBeforeBattleText::
 	text "Ah! I heard about"
-	line "you ", $52, "!"
+	line "you <PLAYER>!"
 
 	para "I lead the ELITE"
 	line "FOUR! You can"
diff --git a/text/maps/museum_1f.asm b/text/maps/museum_1f.asm
index 46b4484c..16431bda 100644
--- a/text/maps/museum_1f.asm
+++ b/text/maps/museum_1f.asm
@@ -81,7 +81,7 @@ _Museum1FText_5c28e::
 	prompt
 
 _ReceivedOldAmberText::
-	text $52, " received"
+	text "<PLAYER> received"
 	line "OLD AMBER!@@"
 
 _Museum1FText_5c299::
diff --git a/text/maps/oaks_lab.asm b/text/maps/oaks_lab.asm
index 52af450d..1f02c355 100644
--- a/text/maps/oaks_lab.asm
+++ b/text/maps/oaks_lab.asm
@@ -1,11 +1,11 @@
 _OaksLabGaryText1::
-	text $53,": Yo"
-	line $52,"! Gramps"
+	text "<RIVAL>: Yo"
+	line "<PLAYER>! Gramps"
 	cont "isn't around!"
 	done
 
 _OaksLabText40::
-	text $53,": Heh, I"
+	text "<RIVAL>: Heh, I"
 	line "don't need to be"
 	cont "greedy like you!"
 
@@ -14,7 +14,7 @@ _OaksLabText40::
 	done
 
 _OaksLabText41::
-	text $53,": My"
+	text "<RIVAL>: My"
 	line "#MON looks a"
 	cont "lot stronger."
 	done
@@ -60,7 +60,7 @@ _OaksLabLastMonText::
 	done
 
 _OaksLabText_1d2f0::
-	text "OAK: Now, ", $52, ","
+	text "OAK: Now, <PLAYER>,"
 	line "which #MON do"
 	cont "you want?"
 	done
@@ -73,14 +73,14 @@ _OaksLabText_1d2f5::
 	done
 
 _OaksLabText_1d2fa::
-	text "OAK: ", $52, ","
+	text "OAK: <PLAYER>,"
 	line "raise your young"
 	cont "#MON by making"
 	cont "it fight!"
 	done
 
 _OaksLabDeliverParcelText1::
-	text "OAK: Oh, ", $52, "!"
+	text "OAK: Oh, <PLAYER>!"
 
 	para "How is my old"
 	line "#MON?"
@@ -95,11 +95,11 @@ _OaksLabDeliverParcelText1::
 	para "What? You have"
 	line "something for me?"
 
-	para $52, " delivered"
+	para "<PLAYER> delivered"
 	line "OAK's PARCEL.@@"
 
 _OaksLabDeliverParcelText2::
-	db $0
+	text ""
 	para "Ah! This is the"
 	line "custom # BALL"
 	cont "I ordered!"
@@ -109,7 +109,7 @@ _OaksLabDeliverParcelText2::
 _OaksLabAroundWorldText::
 	text "#MON around the"
 	line "world wait for"
-	cont "you, ", $52, "!"
+	cont "you, <PLAYER>!"
 	done
 
 _OaksLabGivePokeballsText1::
@@ -123,11 +123,11 @@ _OaksLabGivePokeballsText1::
 	cont "to capture wild"
 	cont "#MON."
 
-	para $52, " got 5"
+	para "<PLAYER> got 5"
 	line "# BALLs!@@"
 
 _OaksLabGivePokeballsText2::
-	db $0
+	text ""
 	para "When a wild"
 	line "#MON appears,"
 	cont "it's fair game."
@@ -182,20 +182,20 @@ _OaksLabText_1d340::
 	done
 
 _OaksLabRivalWaitingText::
-	text $53, ": Gramps!"
+	text "<RIVAL>: Gramps!"
 	line "I'm fed up with"
 	cont "waiting!"
 	done
 
 _OaksLabChooseMonText::
-	text "OAK: ", $53, "?"
+	text "OAK: <RIVAL>?"
 	line "Let me think..."
 
 	para "Oh, that's right,"
 	line "I told you to"
 	cont "come! Just wait!"
 
-	para "Here, ", $52, "!"
+	para "Here, <PLAYER>!"
 
 	para "There are 3"
 	line "#MON here!"
@@ -216,14 +216,14 @@ _OaksLabChooseMonText::
 	done
 
 _OaksLabRivalInterjectionText::
-	text $53, ": Hey!"
+	text "<RIVAL>: Hey!"
 	line "Gramps! What"
 	cont "about me?"
 	done
 
 _OaksLabBePatientText::
 	text "OAK: Be patient!"
-	line $53, ", you can"
+	line "<RIVAL>, you can"
 	cont "have one too!"
 	done
 
@@ -233,19 +233,19 @@ _OaksLabLeavingText::
 	done
 
 _OaksLabRivalPickingMonText::
-	text $53, ": I'll take"
+	text "<RIVAL>: I'll take"
 	line "this one, then!"
 	done
 
 _OaksLabRivalReceivedMonText::
-	text $53, " received"
+	text "<RIVAL> received"
 	line "a @"
 	TX_RAM wcd6d
 	text "!@@"
 
 _OaksLabRivalChallengeText::
-	text $53, ": Wait"
-	line $52, "!"
+	text "<RIVAL>: Wait"
+	line "<PLAYER>!"
 	cont "Let's check out"
 	cont "our #MON!"
 
@@ -261,26 +261,26 @@ _OaksLabText_1d3be::
 	prompt
 
 _OaksLabText_1d3c3::
-	text $53, ": Yeah! Am"
+	text "<RIVAL>: Yeah! Am"
 	line "I great or what?"
 	prompt
 
 _OaksLabRivalToughenUpText::
-	text $53, ": Okay!"
+	text "<RIVAL>: Okay!"
 	line "I'll make my"
 	cont "#MON fight to"
 	cont "toughen it up!"
 
-	para $52, "! Gramps!"
+	para "<PLAYER>! Gramps!"
 	line "Smell you later!"
 	done
 
 _OaksLabText21::
-	text $53, ": Gramps!"
+	text "<RIVAL>: Gramps!"
 	done
 
 _OaksLabText22::
-	text $53, ": What did"
+	text "<RIVAL>: What did"
 	line "you call me for?"
 	done
 
@@ -305,11 +305,11 @@ _OaksLabText24::
 	done
 
 _OaksLabText25::
-	text "OAK: ", $52, " and"
-	line $53, "! Take"
+	text "OAK: <PLAYER> and"
+	line "<RIVAL>! Take"
 	cont "these with you!"
 
-	para $52, " got"
+	para "<PLAYER> got"
 	line "#DEX from OAK!@@"
 
 _OaksLabText26::
@@ -336,11 +336,11 @@ _OaksLabText26::
 	done
 
 _OaksLabText27::
-	text $53, ": Alright"
+	text "<RIVAL>: Alright"
 	line "Gramps! Leave it"
 	cont "all to me!"
 
-	para $52, ", I hate to"
+	para "<PLAYER>, I hate to"
 	line "say it, but I"
 	cont "don't need you!"
 
@@ -350,7 +350,7 @@ _OaksLabText27::
 
 	para "I'll tell her not"
 	line "to lend you one,"
-	cont $52, "! Hahaha!"
+	cont "<PLAYER>! Hahaha!"
 	done
 
 _OaksLabText_1d405::
diff --git a/text/maps/reds_house_1f.asm b/text/maps/reds_house_1f.asm
index 8b82f2de..07768af9 100644
--- a/text/maps/reds_house_1f.asm
+++ b/text/maps/reds_house_1f.asm
@@ -10,7 +10,7 @@ _MomWakeUpText::
 	done
 
 _MomHealText1::
-	text "MOM: ",$52,"!"
+	text "MOM: <PLAYER>!"
 	line "You should take a"
 	cont "quick rest."
 	prompt
diff --git a/text/maps/route_22.asm b/text/maps/route_22.asm
index f2d7ae96..ac4141eb 100644
--- a/text/maps/route_22.asm
+++ b/text/maps/route_22.asm
@@ -60,7 +60,7 @@ _Route22RivalBeforeBattleText2::
 	cont "That's cool!"
 
 	para "Then I'll whip you"
-	line $52, " as a"
+	line "<PLAYER> as a"
 	cont "warm up for"
 	cont "#MON LEAGUE!"
 
@@ -88,8 +88,8 @@ _Route22RivalDefeatedText2::
 	prompt
 
 _Route22Text_511d0::
-	text $53, ": Hahaha!"
-	line $52, "! That's"
+	text "<RIVAL>: Hahaha!"
+	line "<PLAYER>! That's"
 	cont "your best? You're"
 	cont "nowhere near as"
 	cont "good as me, pal!"
diff --git a/text/maps/silph_co_11f.asm b/text/maps/silph_co_11f.asm
index 7fccab4f..8e7a3848 100644
--- a/text/maps/silph_co_11f.asm
+++ b/text/maps/silph_co_11f.asm
@@ -58,7 +58,7 @@ _SilphCo11Text2::
 	done
 
 _SilphCo11Text3::
-	text "Ah ", $52, "!"
+	text "Ah <PLAYER>!"
 	line "So we meet again!"
 
 	para "The PRESIDENT and"
diff --git a/text/maps/vermilion_city.asm b/text/maps/vermilion_city.asm
index ff90cbef..b060a123 100644
--- a/text/maps/vermilion_city.asm
+++ b/text/maps/vermilion_city.asm
@@ -35,7 +35,7 @@ _SSAnneWelcomeText9::
 	prompt
 
 _SSAnneFlashedTicketText::
-	text $52, " flashed"
+	text "<PLAYER> flashed"
 	line "the S.S.TICKET!"
 
 	para "Great! Welcome to"
@@ -43,7 +43,7 @@ _SSAnneFlashedTicketText::
 	done
 
 _SSAnneNoTicketText::
-	text $52, " doesn't"
+	text "<PLAYER> doesn't"
 	line "have the needed"
 	cont "S.S.TICKET."
 
@@ -71,7 +71,7 @@ _VermilionCityText5::
 	line "Gogogoh!@@"
 
 _VermilionCityText14::
-	db $0
+	text ""
 	para "A MACHOP is"
 	line "stomping the land"
 	cont "flat."
diff --git a/text/oakspeech.asm b/text/oakspeech.asm
index 91aaf5c3..5911092c 100644
--- a/text/oakspeech.asm
+++ b/text/oakspeech.asm
@@ -53,4 +53,3 @@ _OakSpeechText3::
 	cont "with #MON"
 	cont "awaits! Let's go!"
 	done
-
diff --git a/wram.asm b/wram.asm
index d5d6a025..0321545c 100755
--- a/wram.asm
+++ b/wram.asm
@@ -2637,21 +2637,21 @@ wPlayerDirection:: ; d52a
 ; if the player is not moving, the last the direction in which the player moved
 	ds 1
 
-wTileSetBank:: ; d52b
+wTilesetBank:: ; d52b
 	ds 1
 
-wTileSetBlocksPtr:: ; d52c
+wTilesetBlocksPtr:: ; d52c
 ; maps blocks (4x4 tiles) to tiles
 	ds 2
 
-wTileSetGFXPtr:: ; d52e
+wTilesetGfxPtr:: ; d52e
 	ds 2
 
-wTileSetCollisionPtr:: ; d530
+wTilesetCollisionPtr:: ; d530
 ; list of all walkable tiles
 	ds 2
 
-wTileSetTalkingOverTiles:: ; d532
+wTilesetTalkingOverTiles:: ; d532
 	ds 3
 
 wGrassTile:: ; d535