More WRAM tidying

15 files changed, 128 insertions, 130 deletions

diff --git a/engine/breeding/egg.asm b/engine/breeding/egg.asm
index 0573e2ecd..cfe4d9a1c 100755
--- a/engine/breeding/egg.asm
+++ b/engine/breeding/egg.asm
@@ -677,9 +677,9 @@ Hatch_UpdateFrontpicBGMapCenter: ; 17254 (5:7254)
 	ld a, b
 	ld [hBGMapAddress + 1], a
 	ld a, c
-	ld [hFillBox], a
+	ld [hGraphicStartTile], a
 	lb bc, 7, 7
-	predef FillBox
+	predef PlaceGraphic
 	pop af
 	call Hatch_LoadFrontpicPal
 	call SetPalettes
diff --git a/engine/debug.asm b/engine/debug.asm
index df5dbee56..d69cd254b 100755
--- a/engine/debug.asm
+++ b/engine/debug.asm
@@ -401,10 +401,10 @@ Function81adb: ; 81adb
 	ld de, VTiles2 tile $31
 	predef GetBackpic
 	ld a, $31
-	ld [hFillBox], a
+	ld [hGraphicStartTile], a
 	hlcoord 2, 4
 	lb bc, 6, 6
-	predef FillBox
+	predef PlaceGraphic
 	ld a, [wd003]
 	and a
 	jr z, .asm_81b66
@@ -433,10 +433,10 @@ Function81adb: ; 81adb
 	callab GetTrainerPic
 	xor a
 	ld [TempEnemyMonSpecies], a
-	ld [hFillBox], a
+	ld [hGraphicStartTile], a
 	hlcoord 2, 3
 	lb bc, 7, 7
-	predef FillBox
+	predef PlaceGraphic
 
 .asm_81ba9
 	ld a, $1
diff --git a/engine/engine_flags.asm b/engine/engine_flags.asm
index d8be9c494..2b441bab4 100644
--- a/engine/engine_flags.asm
+++ b/engine/engine_flags.asm
@@ -108,7 +108,7 @@ ENDM
 	engine_flag wMomSavingMoney, 0 ; mom saving money ; $8
 	engine_flag wMomSavingMoney, 7 ; dst
 
-	engine_flag wdc39, 0 ; unused, possibly related to a 2-day timer
+	engine_flag wUnusedTwoDayTimerOn, 0 ; unused, possibly related to a 2-day timer
 
 	engine_flag StatusFlags, 0 ; pokedex
 	engine_flag StatusFlags, 1 ; unown dex
diff --git a/engine/events.asm b/engine/events.asm
index 5e6e359cd..9b701be8a 100644
--- a/engine/events.asm
+++ b/engine/events.asm
@@ -124,8 +124,8 @@ StartMap: ; 96724
 	call ClearJoypad
 EnterMap: ; 9673e
 	xor a
-	ld [wd453], a
-	ld [wd454], a
+	ld [wXYComparePointer], a
+	ld [wXYComparePointer + 1], a
 	call SetUpFiveStepWildEncounterCooldown
 	callba RunMapSetupScript
 	call DisableEvents
diff --git a/engine/events_3.asm b/engine/events_3.asm
index 57554d3f1..55dc59a1a 100755
--- a/engine/events_3.asm
+++ b/engine/events_3.asm
@@ -288,7 +288,7 @@ CheckForHiddenItems: ; b8172
 	add SCREEN_HEIGHT / 4
 	ld [wd1ec], a
 ; Get the pointer for the first signpost header in the map...
-	ld hl, wdc02
+	ld hl, wCurrentMapSignpostHeaderPointer
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
diff --git a/engine/evolve.asm b/engine/evolve.asm
index 4a959529a..b04a245e0 100755
--- a/engine/evolve.asm
+++ b/engine/evolve.asm
@@ -6,7 +6,6 @@ EvolvePokemon: ; 421d8
 	ld c, a
 	ld b, SET_FLAG
 	call EvoFlagAction
-
 EvolveAfterBattle: ; 421e6
 	xor a
 	ld [wMonTriedToEvolve], a
@@ -19,7 +18,7 @@ EvolveAfterBattle: ; 421e6
 
 	push hl
 
-CheckForEvolvablePokemon: ; 421f5
+EvolveAfterBattle_MasterLoop
 	ld hl, CurPartyMon
 	inc [hl]
 
@@ -28,7 +27,7 @@ CheckForEvolvablePokemon: ; 421f5
 	inc hl
 	ld a, [hl]
 	cp $ff
-	jp z, Evolution_ReturnToMap
+	jp z, .ReturnToMap
 
 	ld [Buffer1], a
 
@@ -40,7 +39,7 @@ CheckForEvolvablePokemon: ; 421f5
 	call EvoFlagAction
 	ld a, c
 	and a
-	jp z, CheckForEvolvablePokemon
+	jp z, EvolveAfterBattle_MasterLoop
 
 	ld a, [Buffer1]
 	dec a
@@ -63,7 +62,7 @@ endr
 .loop
 	ld a, [hli]
 	and a
-	jr z, CheckForEvolvablePokemon
+	jr z, EvolveAfterBattle_MasterLoop
 
 	ld b, a
 
@@ -324,7 +323,7 @@ endr
 	push hl
 	ld l, e
 	ld h, d
-	jp CheckForEvolvablePokemon
+	jp EvolveAfterBattle_MasterLoop
 ; 423f8
 
 .dont_evolve_1
@@ -334,12 +333,10 @@ endr
 .dont_evolve_3
 	inc hl
 	jp .loop
-; 423fe
 
-; dummy pop
+; XXX
 	pop hl
-
-Evolution_ReturnToMap: ; 423ff
+.ReturnToMap
 	pop de
 	pop bc
 	pop hl
@@ -393,7 +390,7 @@ CancelEvolution: ; 42454
 	call PrintText
 	call ClearTileMap
 	pop hl
-	jp CheckForEvolvablePokemon
+	jp EvolveAfterBattle_MasterLoop
 ; 42461
 
 IsMonHoldingEverstone: ; 42461
diff --git a/engine/intro_menu.asm b/engine/intro_menu.asm
index 42a8943ed..6ece8e384 100755
--- a/engine/intro_menu.asm
+++ b/engine/intro_menu.asm
@@ -947,10 +947,10 @@ Intro_PrepTrainerPic: ; 619c
 	ld de, VTiles2
 	callba GetTrainerPic
 	xor a
-	ld [hFillBox], a
+	ld [hGraphicStartTile], a
 	hlcoord 6, 4
 	lb bc, 7, 7
-	predef FillBox
+	predef PlaceGraphic
 	ret
 ; 61b4
 
@@ -959,10 +959,10 @@ ShrinkFrame: ; 61b4
 	ld c, $31
 	predef DecompressPredef
 	xor a
-	ld [hFillBox], a
+	ld [hGraphicStartTile], a
 	hlcoord 6, 4
 	lb bc, 7, 7
-	predef FillBox
+	predef PlaceGraphic
 	ret
 ; 61cd
 
diff --git a/engine/npctrade.asm b/engine/npctrade.asm
index 7342f8a6c..a8d3b71aa 100755
--- a/engine/npctrade.asm
+++ b/engine/npctrade.asm
@@ -430,21 +430,22 @@ GetTradeMonNames: ; fce1b
 
 NPCTrades: ; fce58
 npctrade: MACRO
-	db \1, \2, \3, \4
-	dw \5
-	db \6
-	dw \7
-	db \8, \9, 0
+	db \1, \2, \3, \4 ; dialog set, requested mon, offered mon, nickname
+	db \5, \6 ; dvs
+	shift
+	db \6 ; item
+	dw \7 ; OT ID
+	db \8, \9, 0 ; OT name, gender requested
 ENDM
 
 
-	npctrade 0, ABRA,       MACHOP,     "MUSCLE@@@@@", $6637, GOLD_BERRY,   37460, "MIKE@@@@@@@", TRADE_EITHER_GENDER
-	npctrade 0, BELLSPROUT, ONIX,       "ROCKY@@@@@@", $6696, BITTER_BERRY, 48926, "KYLE@@@@@@@", TRADE_EITHER_GENDER
-	npctrade 1, KRABBY,     VOLTORB,    "VOLTY@@@@@@", $8898, PRZCUREBERRY, 29189, "TIM@@@@@@@@", TRADE_EITHER_GENDER
-	npctrade 3, DRAGONAIR,  DODRIO,     "DORIS@@@@@@", $6677, SMOKE_BALL,   00283, "EMY@@@@@@@@", TRADE_FEMALE_ONLY
-	npctrade 2, HAUNTER,    XATU,       "PAUL@@@@@@@", $8696, MYSTERYBERRY, 15616, "CHRIS@@@@@@", TRADE_EITHER_GENDER
-	npctrade 3, CHANSEY,    AERODACTYL, "AEROY@@@@@@", $6696, GOLD_BERRY,   26491, "KIM@@@@@@@@", TRADE_EITHER_GENDER
-	npctrade 0, DUGTRIO,    MAGNETON,   "MAGGIE@@@@@", $6696, METAL_COAT,   50082, "FOREST@@@@@", TRADE_EITHER_GENDER
+	npctrade 0, ABRA,       MACHOP,     "MUSCLE@@@@@", $37, $66, GOLD_BERRY,   37460, "MIKE@@@@@@@", TRADE_EITHER_GENDER
+	npctrade 0, BELLSPROUT, ONIX,       "ROCKY@@@@@@", $96, $66, BITTER_BERRY, 48926, "KYLE@@@@@@@", TRADE_EITHER_GENDER
+	npctrade 1, KRABBY,     VOLTORB,    "VOLTY@@@@@@", $98, $88, PRZCUREBERRY, 29189, "TIM@@@@@@@@", TRADE_EITHER_GENDER
+	npctrade 3, DRAGONAIR,  DODRIO,     "DORIS@@@@@@", $77, $66, SMOKE_BALL,   00283, "EMY@@@@@@@@", TRADE_FEMALE_ONLY
+	npctrade 2, HAUNTER,    XATU,       "PAUL@@@@@@@", $96, $86, MYSTERYBERRY, 15616, "CHRIS@@@@@@", TRADE_EITHER_GENDER
+	npctrade 3, CHANSEY,    AERODACTYL, "AEROY@@@@@@", $96, $66, GOLD_BERRY,   26491, "KIM@@@@@@@@", TRADE_EITHER_GENDER
+	npctrade 0, DUGTRIO,    MAGNETON,   "MAGGIE@@@@@", $96, $66, METAL_COAT,   50082, "FOREST@@@@@", TRADE_EITHER_GENDER
 ; fcf38
 
 
diff --git a/engine/phone.asm b/engine/phone.asm
index 4b856568e..1a3023bf1 100644
--- a/engine/phone.asm
+++ b/engine/phone.asm
@@ -777,44 +777,44 @@ phone: MACRO
 	dba \7 ; script 2
 ENDM
 
-	phone TRAINER_NONE, PHONE_00, N_A,                          0, UnusedPhoneScript,   0, UnusedPhoneScript
-	phone TRAINER_NONE, PHONECONTACT_MOM, KRISS_HOUSE_1F,              7, MomPhoneScript,      0, UnusedPhoneScript
-	phone TRAINER_NONE, PHONECONTACT_BIKESHOP, OAKS_LAB,                    0, UnusedPhoneScript,   0, UnusedPhoneScript
-	phone TRAINER_NONE, PHONECONTACT_BILL, N_A,                        7, BillPhoneScript1,    0, BillPhoneScript2
-	phone TRAINER_NONE, PHONECONTACT_ELM, ELMS_LAB,                    7, ElmPhoneScript1,     0, ElmPhoneScript2
-	phone SCHOOLBOY, JACK1, NATIONAL_PARK,               7, JackPhoneScript1,    7, JackPhoneScript2
-	phone POKEFANF, BEVERLY1, NATIONAL_PARK,             7, BeverlyPhoneScript1, 7, BeverlyPhoneScript2
-	phone SAILOR, HUEY1, OLIVINE_LIGHTHOUSE_2F,          7, HueyPhoneScript1,    7, HueyPhoneScript2
-	phone TRAINER_NONE, PHONE_00, N_A,                          0, UnusedPhoneScript,   0, UnusedPhoneScript
-	phone TRAINER_NONE, PHONE_00, N_A,                          0, UnusedPhoneScript,   0, UnusedPhoneScript
-	phone TRAINER_NONE, PHONE_00, N_A,                          0, UnusedPhoneScript,   0, UnusedPhoneScript
-	phone COOLTRAINERM, GAVEN3, ROUTE_26,                7, GavenPhoneScript1,   7, GavenPhoneScript2
-	phone COOLTRAINERF, BETH1, ROUTE_26,                 7, BethPhoneScript1,    7, BethPhoneScript2
-	phone BIRD_KEEPER, JOSE2, ROUTE_27,                  7, JosePhoneScript1,    7, JosePhoneScript2
-	phone COOLTRAINERF, REENA1, ROUTE_27,                7, ReenaPhoneScript1,   7, ReenaPhoneScript2
-	phone YOUNGSTER, JOEY1, ROUTE_30,                    7, JoeyPhoneScript1,    7, JoeyPhoneScript2
-	phone BUG_CATCHER, WADE1, ROUTE_31,                  7, WadePhoneScript1,    7, WadePhoneScript2
-	phone FISHER, RALPH1, ROUTE_32,                      7, RalphPhoneScript1,   7, RalphPhoneScript2
-	phone PICNICKER, LIZ1, ROUTE_32,                     7, LizPhoneScript1,     7, LizPhoneScript2
-	phone HIKER, ANTHONY2, ROUTE_33,                     7, AnthonyPhoneScript1, 7, AnthonyPhoneScript2
-	phone CAMPER, TODD1, ROUTE_34,                       7, ToddPhoneScript1,    7, ToddPhoneScript2
-	phone PICNICKER, GINA1, ROUTE_34,                    7, GinaPhoneScript1,    7, GinaPhoneScript2
-	phone JUGGLER, IRWIN1, ROUTE_35,                     7, IrwinPhoneScript1,   7, IrwinPhoneScript2
-	phone BUG_CATCHER, ARNIE1, ROUTE_35,                 7, ArniePhoneScript1,   7, ArniePhoneScript2
-	phone SCHOOLBOY, ALAN1, ROUTE_36,                    7, AlanPhoneScript1,    7, AlanPhoneScript2
-	phone TRAINER_NONE, PHONE_00, N_A,                          0, UnusedPhoneScript,   0, UnusedPhoneScript
-	phone LASS, DANA1, ROUTE_38,                         7, DanaPhoneScript1,    7, DanaPhoneScript2
-	phone SCHOOLBOY, CHAD1, ROUTE_38,                    7, ChadPhoneScript1,    7, ChadPhoneScript2
-	phone POKEFANM, DEREK1, ROUTE_39,                    7, DerekPhoneScript1,   7, DerekPhoneScript2
-	phone FISHER, TULLY1, ROUTE_42,                      7, TullyPhoneScript1,   7, TullyPhoneScript2
-	phone POKEMANIAC, BRENT1, ROUTE_43,                  7, BrentPhoneScript1,   7, BrentPhoneScript2
-	phone PICNICKER, TIFFANY3, ROUTE_43,                 7, TiffanyPhoneScript1, 7, TiffanyPhoneScript2
-	phone BIRD_KEEPER, VANCE1, ROUTE_44,                 7, VancePhoneScript1,   7, VancePhoneScript2
-	phone FISHER, WILTON1, ROUTE_44,                     7, WiltonPhoneScript1,  7, WiltonPhoneScript2
-	phone BLACKBELT_T, KENJI3, ROUTE_45,                 7, KenjiPhoneScript1,   7, KenjiPhoneScript2
-	phone HIKER, PARRY1, ROUTE_45,                       7, ParryPhoneScript1,   7, ParryPhoneScript2
-	phone PICNICKER, ERIN1, ROUTE_46,                    7, ErinPhoneScript1,    7, ErinPhoneScript2
-	phone TRAINER_NONE, PHONECONTACT_BUENA, GOLDENROD_DEPT_STORE_ROOF, 7, BuenaPhoneScript1,   7, BuenaPhoneScript2
+	phone TRAINER_NONE, PHONE_00,              N_A,                       0, UnusedPhoneScript,   0, UnusedPhoneScript
+	phone TRAINER_NONE, PHONECONTACT_MOM,      KRISS_HOUSE_1F,            7, MomPhoneScript,      0, UnusedPhoneScript
+	phone TRAINER_NONE, PHONECONTACT_BIKESHOP, OAKS_LAB,                  0, UnusedPhoneScript,   0, UnusedPhoneScript
+	phone TRAINER_NONE, PHONECONTACT_BILL,     N_A,                       7, BillPhoneScript1,    0, BillPhoneScript2
+	phone TRAINER_NONE, PHONECONTACT_ELM,      ELMS_LAB,                  7, ElmPhoneScript1,     0, ElmPhoneScript2
+	phone SCHOOLBOY,    JACK1,                 NATIONAL_PARK,             7, JackPhoneScript1,    7, JackPhoneScript2
+	phone POKEFANF,     BEVERLY1,              NATIONAL_PARK,             7, BeverlyPhoneScript1, 7, BeverlyPhoneScript2
+	phone SAILOR,       HUEY1,                 OLIVINE_LIGHTHOUSE_2F,     7, HueyPhoneScript1,    7, HueyPhoneScript2
+	phone TRAINER_NONE, PHONE_00,              N_A,                       0, UnusedPhoneScript,   0, UnusedPhoneScript
+	phone TRAINER_NONE, PHONE_00,              N_A,                       0, UnusedPhoneScript,   0, UnusedPhoneScript
+	phone TRAINER_NONE, PHONE_00,              N_A,                       0, UnusedPhoneScript,   0, UnusedPhoneScript
+	phone COOLTRAINERM, GAVEN3,                ROUTE_26,                  7, GavenPhoneScript1,   7, GavenPhoneScript2
+	phone COOLTRAINERF, BETH1,                 ROUTE_26,                  7, BethPhoneScript1,    7, BethPhoneScript2
+	phone BIRD_KEEPER,  JOSE2,                 ROUTE_27,                  7, JosePhoneScript1,    7, JosePhoneScript2
+	phone COOLTRAINERF, REENA1,                ROUTE_27,                  7, ReenaPhoneScript1,   7, ReenaPhoneScript2
+	phone YOUNGSTER,    JOEY1,                 ROUTE_30,                  7, JoeyPhoneScript1,    7, JoeyPhoneScript2
+	phone BUG_CATCHER,  WADE1,                 ROUTE_31,                  7, WadePhoneScript1,    7, WadePhoneScript2
+	phone FISHER,       RALPH1,                ROUTE_32,                  7, RalphPhoneScript1,   7, RalphPhoneScript2
+	phone PICNICKER,    LIZ1,                  ROUTE_32,                  7, LizPhoneScript1,     7, LizPhoneScript2
+	phone HIKER,        ANTHONY2,              ROUTE_33,                  7, AnthonyPhoneScript1, 7, AnthonyPhoneScript2
+	phone CAMPER,       TODD1,                 ROUTE_34,                  7, ToddPhoneScript1,    7, ToddPhoneScript2
+	phone PICNICKER,    GINA1,                 ROUTE_34,                  7, GinaPhoneScript1,    7, GinaPhoneScript2
+	phone JUGGLER,      IRWIN1,                ROUTE_35,                  7, IrwinPhoneScript1,   7, IrwinPhoneScript2
+	phone BUG_CATCHER,  ARNIE1,                ROUTE_35,                  7, ArniePhoneScript1,   7, ArniePhoneScript2
+	phone SCHOOLBOY,    ALAN1,                 ROUTE_36,                  7, AlanPhoneScript1,    7, AlanPhoneScript2
+	phone TRAINER_NONE, PHONE_00,              N_A,                       0, UnusedPhoneScript,   0, UnusedPhoneScript
+	phone LASS,         DANA1,                 ROUTE_38,                  7, DanaPhoneScript1,    7, DanaPhoneScript2
+	phone SCHOOLBOY,    CHAD1,                 ROUTE_38,                  7, ChadPhoneScript1,    7, ChadPhoneScript2
+	phone POKEFANM,     DEREK1,                ROUTE_39,                  7, DerekPhoneScript1,   7, DerekPhoneScript2
+	phone FISHER,       TULLY1,                ROUTE_42,                  7, TullyPhoneScript1,   7, TullyPhoneScript2
+	phone POKEMANIAC,   BRENT1,                ROUTE_43,                  7, BrentPhoneScript1,   7, BrentPhoneScript2
+	phone PICNICKER,    TIFFANY3,              ROUTE_43,                  7, TiffanyPhoneScript1, 7, TiffanyPhoneScript2
+	phone BIRD_KEEPER,  VANCE1,                ROUTE_44,                  7, VancePhoneScript1,   7, VancePhoneScript2
+	phone FISHER,       WILTON1,               ROUTE_44,                  7, WiltonPhoneScript1,  7, WiltonPhoneScript2
+	phone BLACKBELT_T,  KENJI3,                ROUTE_45,                  7, KenjiPhoneScript1,   7, KenjiPhoneScript2
+	phone HIKER,        PARRY1,                ROUTE_45,                  7, ParryPhoneScript1,   7, ParryPhoneScript2
+	phone PICNICKER,    ERIN1,                 ROUTE_46,                  7, ErinPhoneScript1,    7, ErinPhoneScript2
+	phone TRAINER_NONE, PHONECONTACT_BUENA,    GOLDENROD_DEPT_STORE_ROOF, 7, BuenaPhoneScript1,   7, BuenaPhoneScript2
 ; 90627
 
 SpecialPhoneCallList: ; 90627
diff --git a/engine/pokedex.asm b/engine/pokedex.asm
index d1e2d7edf..00c600a9d 100644
--- a/engine/pokedex.asm
+++ b/engine/pokedex.asm
@@ -1051,14 +1051,14 @@ asm_4073f: ; 4073f (10:473f)
 	scf
 	ret
 
-Function40741: ; 40741
+Pokedex_FillColumn: ; 40741
 	push de
-	ld de, $0014
-.asm_40745
+	ld de, SCREEN_WIDTH
+.loop
 	ld [hl], a
 	add hl, de
 	dec b
-	jr nz, .asm_40745
+	jr nz, .loop
 	pop de
 	ret
 ; 4074c
@@ -1076,7 +1076,7 @@ Function4074c: ; 4074c (10:474c)
 	lb bc, 7, 7
 	call Pokedex_PlaceBorder
 	hlcoord 0, 9
-	ld bc, $607
+	lb bc, 6, 7
 	call Pokedex_PlaceBorder
 	hlcoord 1, 11
 	ld de, String_SEEN
@@ -1102,13 +1102,13 @@ Function4074c: ; 4074c (10:474c)
 	ld de, String_SELECT_OPTION
 	call Pokedex_PlaceString
 	hlcoord 8, 1
-	ld b, $7
+	ld b, 7
 	ld a, $5a
-	call Function40741
+	call Pokedex_FillColumn
 	hlcoord 8, 10
-	ld b, $6
+	ld b, 6
 	ld a, $5a
-	call Function40741
+	call Pokedex_FillColumn
 	hlcoord 8, 0
 	ld [hl], $59
 	hlcoord 8, 8
@@ -1134,22 +1134,22 @@ String_START_SEARCH: ; 407f2
 Function407fd: ; 407fd
 	call Pokedex_FillBackgroundColor2
 	hlcoord 0, 0
-	ld bc, $0f12
+	lb bc, 15, 18
 	call Pokedex_PlaceBorder
 	hlcoord 19, 0
 	ld [hl], $34
 	hlcoord 19, 1
-	ld a, $7f
-	ld b, $f
-	call Function40741
+	ld a, " "
+	ld b, 15
+	call Pokedex_FillColumn
 	ld [hl], $39
 	hlcoord 1, 10
-	ld bc, $0013
+	ld bc, 19
 	ld a, $61
 	call ByteFill
 	hlcoord 1, 17
-	ld bc, $0012
-	ld a, $7f
+	ld bc, 18
+	ld a, " "
 	call ByteFill
 	hlcoord 9, 7
 	ld de, Unknown_40852
@@ -1218,38 +1218,38 @@ Function408f0: ; 408f0 (10:48f0)
 	lb bc, 14, 18
 	call Pokedex_PlaceBorder
 	hlcoord 0, 1
-	ld de, Unknown_4092a
+	ld de, .SEARCH
 	call Pokedex_PlaceString
 	hlcoord 8, 4
-	ld de, Unknown_40935
+	ld de, .BLANK
 	call Pokedex_PlaceString
 	hlcoord 8, 6
-	ld de, Unknown_40935
+	ld de, .BLANK
 	call Pokedex_PlaceString
 	hlcoord 3, 4
-	ld de, String_40940
+	ld de, .Type1Type2
 	call PlaceString
 	hlcoord 3, 13
-	ld de, String_4094c
+	ld de, BeginSearch_Cancel
 	call PlaceString
 	ret
 ; 4092a (10:492a)
 
-Unknown_4092a: ; 4092a
+.SEARCH: ; 4092a
 	db $3b, " SEARCH ", $3c, $ff
 ; 40925
 
-Unknown_40935: ; 40935
+.BLANK: ; 40935
 	db $3d, "        ", $3e, $ff
 ; 40940
 
-String_40940: ; 40940
+.Type1Type2: ; 40940
 	db   "TYPE1"
 	next "TYPE2"
 	db   "@"
 ; 4094c
 
-String_4094c: ; 4094c
+BeginSearch_Cancel: ; 4094c
 	db   "BEGIN SEARCH!!"
 	next "CANCEL"
 	db   "@"
@@ -1273,9 +1273,9 @@ Function40962: ; 40962 (10:4962)
 	hlcoord 8, 0
 	ld [hl], $59
 	hlcoord 8, 1
-	ld b, $7
+	ld b, 7
 	ld a, $5a
-	call Function40741
+	call Pokedex_FillColumn
 	hlcoord 8, 8
 	ld [hl], $53
 	hlcoord 8, 9
@@ -1736,7 +1736,7 @@ Function40e5b: ; 40e5b
 	xor a
 	ld [hBGMapMode], a
 	hlcoord 0, 12
-	lb bc, 4, SCREEN_WIDTH - 2
+	lb bc, 4, 18
 	call Pokedex_PlaceBorder
 	ld a, [wc7d8]
 	ld hl, Unknown_40e7d
@@ -1781,7 +1781,7 @@ Function40f08: ; 40f08 (10:4f08)
 	xor a
 	ld [hBGMapMode], a
 	hlcoord 0, 12
-	lb bc, 4, SCREEN_WIDTH - 2
+	lb bc, 4, 18
 	call Pokedex_PlaceBorder
 	ld de, String_ChangingModesPleaseWait
 	hlcoord 1, 14
@@ -2018,7 +2018,7 @@ Function41107: ; 41107
 	xor a
 	ld [hBGMapMode], a
 	hlcoord 0, 12
-	ld bc, $0412
+	lb bc, 4, 18
 	call Pokedex_PlaceBorder
 	ld de, String_41126
 	hlcoord 1, 14
diff --git a/engine/pokegear.asm b/engine/pokegear.asm
index 939507429..5379734e6 100755
--- a/engine/pokegear.asm
+++ b/engine/pokegear.asm
@@ -199,14 +199,14 @@ TownMap_InitCursorAndPlayerIconPositions: ; 90d70 (24:4d70)
 	ld c, a
 	call GetWorldMapLocation
 .LoadLandmark
-	ld [wTownMapPlayerIconLandmark], a
-	ld [wTownMapCursorLandmark], a
+	ld [wPokegearMapPlayerIconLandmark], a
+	ld [wPokegearMapCursorLandmark], a
 	ret
 
 .FastShip
-	ld [wTownMapPlayerIconLandmark], a
+	ld [wPokegearMapPlayerIconLandmark], a
 	ld a, NEW_BARK_TOWN
-	ld [wTownMapCursorLandmark], a
+	ld [wPokegearMapCursorLandmark], a
 	ret
 
 Pokegear_InitJumptableIndices: ; 90d9e (24:4d9e)
@@ -307,7 +307,7 @@ InitPokegearTilemap: ; 90da8 (24:4da8)
 ; 90e3f
 
 .Map: ; 90e3f
-	ld a, [wTownMapPlayerIconLandmark]
+	ld a, [wPokegearMapPlayerIconLandmark]
 	cp FAST_SHIP
 	jr z, .johto
 	cp KANTO_LANDMARK
@@ -328,7 +328,7 @@ InitPokegearTilemap: ; 90da8 (24:4da8)
 	ld [hl], $6
 	hlcoord 19, 2
 	ld [hl], $17
-	ld a, [wTownMapCursorLandmark]
+	ld a, [wPokegearMapCursorLandmark]
 	call PokegearMap_UpdateLandmarkName
 	ret
 
@@ -530,7 +530,7 @@ Pokegear_UpdateClock: ; 90f86 (24:4f86)
 ; 0x90fb4
 
 PokegearMap_CheckRegion: ; 90fb4 (24:4fb4)
-	ld a, [wTownMapPlayerIconLandmark]
+	ld a, [wPokegearMapPlayerIconLandmark]
 	cp FAST_SHIP
 	jr z, .johto
 	cp KANTO_LANDMARK
@@ -549,9 +549,9 @@ PokegearMap_CheckRegion: ; 90fb4 (24:4fb4)
 
 PokegearMap_Init: ; 90fcd (24:4fcd)
 	call InitPokegearTilemap
-	ld a, [wTownMapPlayerIconLandmark]
+	ld a, [wPokegearMapPlayerIconLandmark]
 	call PokegearMap_InitPlayerIcon
-	ld a, [wTownMapCursorLandmark]
+	ld a, [wPokegearMapCursorLandmark]
 	call PokegearMap_InitCursor
 	ld a, c
 	ld [wPokegearMapCursorObjectPointer], a
@@ -621,7 +621,7 @@ PokegearMap_ContinueMap: ; 90ff2 (24:4ff2)
 	ret
 
 .up
-	ld hl, wTownMapCursorLandmark
+	ld hl, wPokegearMapCursorLandmark
 	ld a, [hl]
 	cp d
 	jr c, .wrap_around_up
@@ -633,7 +633,7 @@ PokegearMap_ContinueMap: ; 90ff2 (24:4ff2)
 	jr .done_dpad
 
 .down
-	ld hl, wTownMapCursorLandmark
+	ld hl, wPokegearMapCursorLandmark
 	ld a, [hl]
 	cp e
 	jr nz, .wrap_around_down
@@ -643,13 +643,13 @@ PokegearMap_ContinueMap: ; 90ff2 (24:4ff2)
 .wrap_around_down
 	dec [hl]
 .done_dpad
-	ld a, [wTownMapCursorLandmark]
+	ld a, [wPokegearMapCursorLandmark]
 	call PokegearMap_UpdateLandmarkName
 	ld a, [wPokegearMapCursorObjectPointer]
 	ld c, a
 	ld a, [wPokegearMapCursorObjectPointer + 1]
 	ld b, a
-	ld a, [wTownMapCursorLandmark]
+	ld a, [wPokegearMapCursorLandmark]
 	call PokegearMap_UpdateCursorPosition
 	ret
 
@@ -1552,7 +1552,7 @@ RadioChannels:
 	jp LoadStation_BuenasPassword
 
 .RuinsOfAlphRadio
-	ld a, [wTownMapPlayerIconLandmark]
+	ld a, [wPokegearMapPlayerIconLandmark]
 	cp RUINS_OF_ALPH
 	jr nz, .NoSignal
 	jp LoadStation_UnownRadio
@@ -1586,7 +1586,7 @@ RadioChannels:
 	ld a, [StatusFlags]
 	bit 4, a
 	jr z, .NoSignal
-	ld a, [wTownMapPlayerIconLandmark]
+	ld a, [wPokegearMapPlayerIconLandmark]
 	cp MAHOGANY_TOWN
 	jr z, .ok
 	cp ROUTE_43
@@ -1604,7 +1604,7 @@ RadioChannels:
 ; if in Johto or on the S.S. Aqua, set carry
 
 ; otherwise clear carry
-	ld a, [wTownMapPlayerIconLandmark]
+	ld a, [wPokegearMapPlayerIconLandmark]
 	cp FAST_SHIP
 	jr z, .johto
 	cp KANTO_LANDMARK
diff --git a/engine/predef.asm b/engine/predef.asm
index f459747bb..f52127311 100644
--- a/engine/predef.asm
+++ b/engine/predef.asm
@@ -49,7 +49,7 @@ PredefPointers:: ; 856b
 	add_predef Predef_LinkTextbox ; $ 10
 	add_predef PrintMoveDesc
 	add_predef UpdatePlayerHUD
-	add_predef FillBox
+	add_predef PlaceGraphic
 	add_predef CheckPlayerPartyForFitPkmn
 	add_predef UpdateEnemyHUD
 	add_predef StartBattle
@@ -88,7 +88,7 @@ PredefPointers:: ; 856b
 	add_predef PlayBattleAnim
 	add_predef Predef38 ; $38
 	add_predef Predef39
-	add_predef Functionfd1d0
+	add_predef Predef3A
 	add_predef PartyMonItemName
 	add_predef GetFrontpic
 	add_predef GetBackpic
@@ -103,6 +103,6 @@ PredefPointers:: ; 856b
 	add_predef LoadMonAnimation
 	add_predef AnimateFrontpic
 	add_predef Functiond0669 ; $48
-	add_predef Functiond066e
+	add_predef HOF_AnimateFrontpic
 	dbw $ff, Function2d43 ; ????
 ; 864c
diff --git a/engine/scripting.asm b/engine/scripting.asm
index 0a68243d3..42d060e9b 100644
--- a/engine/scripting.asm
+++ b/engine/scripting.asm
@@ -2806,9 +2806,9 @@ Script_xycompare: ; 97a01
 ;     pointer (MultiByteParam)
 
 	call GetScriptByte
-	ld [wd453], a
+	ld [wXYComparePointer], a
 	call GetScriptByte
-	ld [wd454], a
+	ld [wXYComparePointer + 1], a
 	ret
 ; 97a0e
 
diff --git a/engine/trade/animation.asm b/engine/trade/animation.asm
index 31e46b2c7..719a230ff 100755
--- a/engine/trade/animation.asm
+++ b/engine/trade/animation.asm
@@ -864,9 +864,9 @@ TradeAnim_ShowFrontpic: ; 294c3
 	call Function297cf
 	hlcoord 7, 2
 	xor a
-	ld [hFillBox], a
+	ld [hGraphicStartTile], a
 	lb bc, 7, 7
-	predef FillBox
+	predef PlaceGraphic
 	call WaitBGMap
 	ret
 ; 294e7
diff --git a/engine/trainer_card.asm b/engine/trainer_card.asm
index ae8ad2aa5..4898d657a 100755
--- a/engine/trainer_card.asm
+++ b/engine/trainer_card.asm
@@ -245,8 +245,8 @@ TrainerCard_PrintTopHalfOfCard: ; 25299 (9:5299)
 	hlcoord 14, 1
 	lb bc, 5, 7
 	xor a
-	ld [hFillBox], a
-	predef FillBox
+	ld [hGraphicStartTile], a
+	predef PlaceGraphic
 	ret
 
 ; 252ec (9:52ec)