Sweepthrough of ClearBox arg conversion to lb

15 files changed, 97 insertions, 87 deletions

diff --git a/battle/bg_effects.asm b/battle/bg_effects.asm
index 5b22308f2..f7245ce3b 100644
--- a/battle/bg_effects.asm
+++ b/battle/bg_effects.asm
@@ -338,7 +338,7 @@ Functionc81c0: ; c81c0 (32:41c0)
 	jr .asm_c81d7
 .asm_c81d1
 	hlcoord 2, 6
-	ld bc, $606
+	lb bc, 6, 6
 .asm_c81d7
 	call ClearBox
 	pop bc
@@ -437,7 +437,7 @@ Functionc825a: ; c825a (32:425a)
 	jr .asm_c8271
 .asm_c826b
 	hlcoord 2, 6
-	ld bc, $106
+	lb bc, 1, 6
 .asm_c8271
 	call ClearBox
 	ld a, $1
@@ -503,7 +503,7 @@ Functionc82c7: ; c82c7 (32:42c7)
 	jr .asm_c82de
 .asm_c82d8
 	hlcoord 2, 6
-	ld bc, $206
+	lb bc, 2, 6
 .asm_c82de
 	call ClearBox
 	ld a, $1
diff --git a/battle/core.asm b/battle/core.asm
index a0d72da3b..2aacc2783 100644
--- a/battle/core.asm
+++ b/battle/core.asm
@@ -9336,7 +9336,7 @@ Function3fb6c: ; 3fb6c
 	call TextBox
 	callba MobileTextBorder
 	hlcoord 1, 5
-	ld bc, $0307
+	lb bc, 3, 7
 	call ClearBox
 	call Functione51
 	call Function3ed9f
diff --git a/battle/effect_commands.asm b/battle/effect_commands.asm
index 95ce78a80..bd4e060f1 100644
--- a/battle/effect_commands.asm
+++ b/battle/effect_commands.asm
@@ -7257,7 +7257,7 @@ BattleCommand23: ; 3680f
 	ld c, $14
 	call DelayFrames
 	hlcoord 1, 0
-	ld bc, $040a
+	lb bc, 4, 10
 	call ClearBox
 	ld c, $14
 	call DelayFrames
@@ -7351,7 +7351,7 @@ BattleCommand23: ; 3680f
 	ld c, $14
 	call DelayFrames
 	hlcoord 9, 7
-	ld bc, $050b
+	lb bc, 5, 11
 	call ClearBox
 	ld c, $14
 	call DelayFrames
diff --git a/engine/events_2.asm b/engine/events_2.asm
index 42bae51fc..5acc72346 100644
--- a/engine/events_2.asm
+++ b/engine/events_2.asm
@@ -109,7 +109,7 @@ RandomEncounter:: ; 97cc0
 	call CanUseSweetScent
 	jr nc, .nope
 	ld hl, StatusFlags2
-	bit 2, [hl]
+	bit 2, [hl] ; bug contest
 	jr nz, .bug_contest
 	callba TryWildEncounter
 	jr nz, .nope
@@ -153,11 +153,11 @@ CanUseSweetScent:: ; 97cfd
 	bit 5, [hl]
 	jr nz, .no
 	ld a, [wPermission]
-	cp $4
+	cp CAVE
 	jr z, .ice_check
-	cp $7
+	cp DUNGEON
 	jr z, .ice_check
-	callba Function149dd
+	callba CheckGrassCollision
 	jr nc, .no
 
 .ice_check
@@ -237,9 +237,9 @@ ChooseWildEncounter_BugContest:: ; 97d31
 TryWildEncounter_BugContest: ; 97d64
 	ld a, [StandingTile]
 	call CheckSuperTallGrassTile
-	ld b, $66
+	ld b, 40 percent
 	jr z, .ok
-	ld b, $33
+	ld b, 20 percent
 
 .ok
 	callba ApplyMusicEffectOnEncounterRate
@@ -473,11 +473,11 @@ endr
 ; 97e94
 
 Table97e94: ; 97e94
-	dbw BANK(Function97eb7), Function97eb7
-	dbw BANK(Function97eb8), Function97eb8
-	dbw BANK(Function97f42), Function97f42
-	dbw BANK(Function97ef9), Function97ef9
-	dbw BANK(Function97ebc), Function97ebc
+	dba Function97eb7
+	dba Function97eb8
+	dba Function97f42
+	dba Function97ef9
+	dba Function97ebc
 ; 97ea3
 
 Function97ea3: ; 97ea3
diff --git a/engine/map_objects.asm b/engine/map_objects.asm
index c7d799e7f..69c6321f5 100644
--- a/engine/map_objects.asm
+++ b/engine/map_objects.asm
@@ -2928,7 +2928,7 @@ Function56cd: ; 56cd
 	sub $20
 
 .ok3
-	ld [$ffbd], a
+	ld [hUsedSpriteIndex], a
 	ld a, [wd14d]
 	ld e, a
 	ld hl, OBJECT_SPRITE_Y_OFFSET
@@ -2960,7 +2960,7 @@ Function56cd: ; 56cd
 	sub $20
 
 .ok6
-	ld [$ffbe], a
+	ld [hUsedSpriteTile], a
 	ld hl, OBJECT_PALETTE
 	add hl, bc
 	bit 7, [hl]
@@ -2978,14 +2978,14 @@ Function56cd: ; 56cd
 .loop
 	ld a, [$ffbf]
 	ld d, a
-	ld a, [$ffbe]
+	ld a, [hUsedSpriteTile]
 	add e
 	dec a
 	cp $12
 	jr nc, .ok9
 	ld b, a
 .next
-	ld a, [$ffbd]
+	ld a, [hUsedSpriteIndex]
 	add d
 	dec a
 	cp $14
@@ -3336,7 +3336,7 @@ RefreshMapAppearDisappear:: ; 5920
 	bit 0, a
 	ret z
 	xor a
-	ld [$ffbd], a
+	ld [hUsedSpriteIndex], a
 	ld a, [hOAMUpdate]
 	push af
 	ld a, 1
@@ -3356,7 +3356,7 @@ Function593a: ; 593a
 	ld b, $70
 
 .ok
-	ld a, [$ffbd]
+	ld a, [hUsedSpriteIndex]
 	cp b
 	ret nc
 	ld l, a
@@ -3596,11 +3596,11 @@ Function5a0d: ; 5a0d
 	ld h, [hl]
 	ld l, a
 
-	ld a, [$ffbd]
+	ld a, [hUsedSpriteIndex]
 	ld c, a
 	ld b, Sprites / $100
 	ld a, [hli]
-	ld [$ffbe], a
+	ld [hUsedSpriteTile], a
 	add c
 	cp SpritesEnd % $100
 	jr nc, .full
@@ -3645,13 +3645,13 @@ Function5a0d: ; 5a0d
 	ld [bc], a
 	inc c
 
-	ld a, [$ffbe]
+	ld a, [hUsedSpriteTile]
 	dec a
-	ld [$ffbe], a
+	ld [hUsedSpriteTile], a
 	jr nz, .addsprite
 
 	ld a, c
-	ld [$ffbd], a
+	ld [hUsedSpriteIndex], a
 
 .done
 	xor a
diff --git a/engine/pack.asm b/engine/pack.asm
index ecdb35c74..a414ecf49 100644
--- a/engine/pack.asm
+++ b/engine/pack.asm
@@ -1408,7 +1408,7 @@ Function10955: ; 10955
 	ld a, BANK(PackMenuGFX)
 	call FarCopyBytes
 	hlcoord 0, 1
-	ld bc, $00dc
+	lb bc, 0, 220
 	ld a, $24
 	call ByteFill
 	hlcoord 5, 1
diff --git a/engine/radio2.asm b/engine/radio2.asm
index b843315d4..039631130 100644
--- a/engine/radio2.asm
+++ b/engine/radio2.asm
@@ -385,7 +385,7 @@ NoRadioName: ; 918a9 (24:58a9)
 	xor a
 	ld [hBGMapMode], a ; $ff00+$d4
 	hlcoord 1, 8
-	ld bc, $312
+	lb bc, 3, 18
 	call ClearBox
 	hlcoord 0, 12
 	ld bc, $412
diff --git a/event/mom.asm b/event/mom.asm
index e1feba805..161b338ac 100644
--- a/event/mom.asm
+++ b/event/mom.asm
@@ -401,7 +401,7 @@ Function164d1: ; 164d1
 
 Function164ea: ; 164ea
 	hlcoord 1, 14
-	ld bc, $0312
+	lb bc, 3, 18
 	call ClearBox
 	ret
 ; 164f4
diff --git a/home/tilemap.asm b/home/tilemap.asm
index d6a8f31b1..928c6a983 100644
--- a/home/tilemap.asm
+++ b/home/tilemap.asm
@@ -175,7 +175,7 @@ Function1cc6:: ; 1cc6
 
 Function1ce1:: ; 1ce1
 	call GetMemTileCoord
-	ld bc, $0015
+	lb bc, 0, 21
 	add hl, bc
 	call GetMenuBoxDims
 	dec b
diff --git a/hram.asm b/hram.asm
index 54e7a90ce..49e6864a3 100644
--- a/hram.asm
+++ b/hram.asm
@@ -58,6 +58,8 @@ hPrintNum5         EQU $ffb7
 hPrintNum6         EQU $ffb8
 hPrintNum7         EQU $ffb9
 
+hUsedSpriteIndex   EQU $ffbd
+hUsedSpriteTile    EQU $ffbe
 hMoneyTemp         EQU $ffc3
 
 hLCDStatCustom     EQU $ffc6
diff --git a/macros.asm b/macros.asm
index 16b298268..68436697f 100644
--- a/macros.asm
+++ b/macros.asm
@@ -79,11 +79,17 @@ bigdw: MACRO ; big-endian word
 	ENDM
 
 dba: MACRO ; dbw bank, address
+	rept _NARG
 	dbw BANK(\1), \1
+	shift
+	endr
 	ENDM
 
 dab: MACRO ; dwb address, bank
+	rept _NARG
 	dwb \1, BANK(\1)
+	shift
+	endr
 	ENDM
 
 lb: MACRO ; r, hi, lo
diff --git a/main.asm b/main.asm
index 584068b97..16dfa31a6 100644
--- a/main.asm
+++ b/main.asm
@@ -10702,10 +10702,10 @@ Function118a8: ; 118a8
 	ld a, $60
 	call ByteFill
 	hlcoord 1, 1
-	ld bc, $0612
+	lb bc, 6, 18
 	call Function1189c
 	jr nz, .asm_118c4
-	ld bc, $0412
+	lb bc, 4, 18
 
 .asm_118c4
 	call ClearBox
@@ -10721,16 +10721,16 @@ Function118ca: ; 118ca
 .asm_118d5
 	push de
 	hlcoord 1, 8
-	ld bc, $0712
+	lb bc, 7, 18
 	call Function1189c
 	jr nz, .asm_118e7
 	hlcoord 1, 6
-	ld bc, $0912
+	lb bc, 9, 18
 
 .asm_118e7
 	call ClearBox
 	hlcoord 1, 16
-	ld bc, $0112
+	lb bc, 1, 18
 	call ClearBox
 	pop de
 	hlcoord 2, 8
@@ -10788,7 +10788,7 @@ Function11940: ; 11940
 	hlcoord 1, 3
 
 .asm_1194e
-	ld bc, $0112
+	lb bc, 1, 18
 	call ClearBox
 	ld hl, wc6d0
 	ld e, [hl]
@@ -11521,7 +11521,7 @@ Function11feb: ; 11feb (4:5feb)
 	xor a
 	ld [hBGMapMode], a ; $ff00+$d4
 	hlcoord 1, 1
-	ld bc, $412
+	lb bc, 4, 18
 	call ClearBox
 	ld hl, wc6d0
 	ld e, [hl]
@@ -12800,7 +12800,7 @@ endr
 	call .IsMenuAccountOn
 	ret z
 	hlcoord 0, 13
-	ld bc, $050a
+	lb bc, 5, 10
 	call ClearBox
 	hlcoord 0, 13
 	ld b, 3
@@ -13114,7 +13114,7 @@ CancelPokemonAction: ; 12a79
 
 PokemonActionSubmenu: ; 12a88
 	hlcoord 1, 15
-	ld bc, $0212 ; box size
+	lb bc, 2, 18
 	call ClearBox
 	callba Function24d19
 	call GetCurNick
@@ -14124,10 +14124,10 @@ Function12fd5: ; 12fd5
 	call PlaySFX
 	call WaitSFX
 	hlcoord 1, 2
-	ld bc, $0812
+	lb bc, 8, 18
 	call ClearBox
 	hlcoord 10, 10
-	ld bc, $0109
+	lb bc, 1, 9
 	call ClearBox
 	jp .asm_12fe8
 ; 1313a
@@ -14198,7 +14198,7 @@ Function13172: ; 13172
 	ld c, $12
 	call TextBox
 	hlcoord 2, 0
-	ld bc, $0203
+	lb bc, 2, 3
 	call ClearBox
 	xor a
 	ld [MonType], a
@@ -14216,7 +14216,7 @@ Function13172: ; 13172
 	ld b, $e
 	call GetSGBLayout
 	hlcoord 16, 0
-	ld bc, $0103
+	lb bc, 1, 3
 	jp ClearBox
 ; 131ef
 
@@ -16160,9 +16160,9 @@ GetEmote2bpp: ; 1412a
 Function14135:: ; 14135
 	call GetPlayerSprite
 	ld a, [UsedSprites]
-	ld [$ffbd], a
+	ld [hUsedSpriteIndex], a
 	ld a, [UsedSprites + 1]
-	ld [$ffbe], a
+	ld [hUsedSpriteTile], a
 	call Function143c8
 	ret
 ; 14146
@@ -16736,9 +16736,9 @@ Function1439b: ; 1439b
 	ld a, [hli]
 	and a
 	jr z, .done
-	ld [$ffbd], a
+	ld [hUsedSpriteIndex], a
 	ld a, [hli]
-	ld [$ffbe], a
+	ld [hUsedSpriteTile], a
 	bit 7, a
 	jr z, .dont_set
 	ld a, [wd13e]
@@ -16759,10 +16759,10 @@ Function1439b: ; 1439b
 ; 143c8
 
 Function143c8: ; 143c8
-	ld a, [$ffbd]
+	ld a, [hUsedSpriteIndex]
 	call SafeGetSprite
-	ld a, [$ffbe]
-	call Function14406
+	ld a, [hUsedSpriteTile]
+	call GetTileAddr
 	push hl
 	push de
 	push bc
@@ -16788,7 +16788,7 @@ endr
 	jr nz, .asm_14405
 	bit 6, a
 	jr nz, .asm_14405
-	ld a, [$ffbd]
+	ld a, [hUsedSpriteIndex]
 	call Function142a7
 	jr c, .asm_14405
 	ld a, h
@@ -16800,7 +16800,8 @@ endr
 	ret
 ; 14406
 
-Function14406: ; 14406
+GetTileAddr: ; 14406
+; Return the address of tile (a) in (hl).
 	and (VTiles1 - VTiles0) / $10 - 1
 	ld l, a
 	ld h, 0
@@ -17716,7 +17717,7 @@ CheckWarpCollision: ; 149c6
 	db -1
 ; 149dd
 
-Function149dd:: ; 149dd
+CheckGrassCollision:: ; 149dd
 	ld a, [StandingTile]
 	ld hl, .blocks
 	ld de, 1
@@ -19345,7 +19346,7 @@ Function15ee0: ; 15ee0
 	call ExitMenu
 	jr c, .asm_15f6e
 	hlcoord 1, 14
-	ld bc, $0312
+	lb bc, 3, 18
 	call ClearBox
 	ld hl, UnknownText_0x15f78
 	call PrintTextBoxText
@@ -19359,7 +19360,7 @@ Function15ee0: ; 15ee0
 	call TossItem
 	predef PartyMonItemName
 	hlcoord 1, 14
-	ld bc, $0312
+	lb bc, 3, 18
 	call ClearBox
 	ld hl, UnknownText_0x15fbe
 	call PrintTextBoxText
@@ -25075,7 +25076,7 @@ Function2530a: ; 2530a (9:530a)
 	bit 0, a
 	ret nz
 	hlcoord 1, 9
-	ld bc, $211
+	lb bc, 2, 17
 	call ClearBox
 	ret
 ; 2534c (9:534c)
@@ -33726,7 +33727,7 @@ Function2c9e2: ; 2c9e2 (b:49e2)
 	jp z, Function2caca
 
 	hlcoord 5, 2
-	ld bc, $a0f
+	lb bc, 10, 15
 	ld a, " "
 	call ClearBox
 	call Function2cab5
@@ -36942,7 +36943,7 @@ Function48187: ; 48187 (12:4187)
 	ld d, a
 	call Function48725
 	jr c, .asm_481a2
-	ld bc, $104
+	lb bc, 1, 4
 	hlcoord 2, 12
 	call ClearBox
 	jr .asm_481ad
@@ -36958,19 +36959,19 @@ Function48187: ; 48187 (12:4187)
 	jr nz, .asm_481c1
 	bit 0, d
 	jr nz, .asm_481c1
-	ld bc, $108
+	lb bc, 1, 8
 	hlcoord 11, 4
 	call ClearBox
 .asm_481c1
 	bit 1, d
 	jr nz, .asm_481ce
-	ld bc, $108
+	lb bc, 1, 8
 	hlcoord 11, 6
 	call ClearBox
 .asm_481ce
 	bit 2, d
 	jr nz, .asm_481db
-	ld bc, $208
+	lb bc, 2, 8
 	hlcoord 11, 7
 	call ClearBox
 .asm_481db
@@ -36979,7 +36980,7 @@ Function48187: ; 48187 (12:4187)
 	ld a, [wd479]
 	bit 0, a
 	jr nz, .asm_481f8
-	ld bc, $108
+	lb bc, 1, 8
 	hlcoord 11, 10
 	call ClearBox
 	jr .asm_48201
@@ -37060,7 +37061,7 @@ String_48275: ; 48275
 ; 48283
 
 Function48283: ; 48283 (12:4283)
-	ld bc, $212
+	lb bc, 2, 18
 	hlcoord 1, 15
 	call ClearBox
 	ret
@@ -37949,7 +37950,7 @@ asm_48972: ; 48972 (12:4972)
 	hlcoord 11, 10
 	call Function489ea
 	hlcoord 11, 9
-	ld bc, $108
+	lb bc, 1, 8
 	call ClearBox
 	pop af
 	ld [hInMenu], a
@@ -40521,7 +40522,7 @@ asm_4a19d: ; 4a19d (12:619d)
 	pop bc
 	ld hl, wcfa9
 	ld [hl], b
-	ld bc, $601
+	lb bc, 6, 1
 	hlcoord 2, 3
 	call ClearBox
 	jp Function4a195
@@ -42001,7 +42002,7 @@ endr
 
 .asm_4ac29
 	hlcoord 0, 1
-	ld bc, $0d01
+	lb bc, 13, 1
 	call ClearBox
 	call Function4aab6
 	ld a, [PartyCount]
@@ -42031,7 +42032,7 @@ endr
 ; 4ac58
 
 Function4ac58: ; 4ac58
-	ld bc, $0212
+	lb bc, 2, 18
 	hlcoord 1, 15
 	call ClearBox
 	callba Function8ea4a
@@ -44432,7 +44433,7 @@ Function4dfda: ; 4dfda (13:5fda)
 	ld c, a
 	call Function4e4cd
 	hlcoord 0, 8
-	ld bc, $a14
+	lb bc, 10, 20
 	call ClearBox
 	ret
 
@@ -52882,7 +52883,7 @@ Function847bd: ; 847bd
 	xor a
 	ld [hBGMapMode], a
 	hlcoord 2, 4
-	ld bc, $0d10
+	lb bc, 13, 16
 	call ClearBox
 	pop af
 	ld e, a
@@ -53000,7 +53001,7 @@ Function848b7: ; 848b7 (21:48b7)
 	call ByteFill
 	call Function84a0e
 	hlcoord 1, 15
-	ld bc, $212
+	lb bc, 2, 18
 	call ClearBox
 	call Function849e9
 	call Function849fc
@@ -59112,7 +59113,7 @@ Special_InitialSetDSTFlag: ; 90a54
 	set 7, a
 	ld [wDST], a
 	hlcoord 1, 14
-	ld bc, $0312
+	lb bc, 3, 18
 	call ClearBox
 	ld hl, UnknownText_0x90a6c
 	call PlaceWholeStringInBoxAtOnce
@@ -59143,7 +59144,7 @@ Special_InitialClearDSTFlag: ; 90a88
 	res 7, a
 	ld [wDST], a
 	hlcoord 1, 14
-	ld bc, $0312
+	lb bc, 3, 18
 	call ClearBox
 	ld hl, UnknownText_0x90aa0
 	call PlaceWholeStringInBoxAtOnce
@@ -71577,10 +71578,10 @@ Functione307c: ; e307c (38:707c)
 	ld a, [CurPartySpecies]
 	call PlayCry
 	hlcoord 0, 0
-	ld bc, $f08
+	lb bc, 15, 8
 	call ClearBox
 	hlcoord 8, 14
-	ld bc, $103
+	lb bc, 1, 3
 	call ClearBox
 	hlcoord 0, 15
 	ld bc, $112
@@ -71631,10 +71632,10 @@ TryWithdrawPokemon: ; e30fa (38:70fa)
 	ld a, [CurPartySpecies]
 	call PlayCry
 	hlcoord 0, 0
-	ld bc, $f08
+	lb bc, 15, 8
 	call ClearBox
 	hlcoord 8, 14
-	ld bc, $103
+	lb bc, 1, 3
 	call ClearBox
 	hlcoord 0, 15
 	ld bc, $112
@@ -71666,10 +71667,10 @@ TryWithdrawPokemon: ; e30fa (38:70fa)
 
 Functione3180: ; e3180 (38:7180)
 	hlcoord 0, 0
-	ld bc, $f08
+	lb bc, 15, 8
 	call ClearBox
 	hlcoord 8, 14
-	ld bc, $103
+	lb bc, 1, 3
 	call ClearBox
 	hlcoord 0, 15
 	ld bc, $112
@@ -80016,7 +80017,7 @@ Function1057d7: ; 1057d7 (41:57d7)
 	ld bc, SCREEN_HEIGHT * SCREEN_WIDTH
 	call ByteFill
 	hlcoord 3, 7
-	ld bc, $90f
+	lb bc, 9, 15
 	call ClearBox
 	hlcoord 0, 0
 	ld a, $0
@@ -81728,7 +81729,7 @@ Function1dc1b0: ; 1dc1b0
 	ld [hli], a
 	ld [hl], a
 	ld hl, wcb6e
-	ld bc, $0512
+	lb bc, 5, 18
 	call ClearBox
 	ld a, [wd265]
 	dec a
@@ -82179,10 +82180,10 @@ INCBIN "gfx/unknown/1de0e1.2bpp.lz"
 Function1de171: ; 1de171 (77:6171)
 	ld a, $32
 	hlcoord 0, 17
-	ld bc, $c
+	lb bc, 0, 12
 	call ByteFill
 	hlcoord 0, 1
-	ld bc, $f0b
+	lb bc, 15, 11
 	call ClearBox
 	ld a, $34
 	hlcoord 0, 0
diff --git a/misc/crystal_misc.asm b/misc/crystal_misc.asm
index 956ee30dd..0c833295b 100644
--- a/misc/crystal_misc.asm
+++ b/misc/crystal_misc.asm
@@ -483,7 +483,7 @@ Function17a964: ; 17a964 (5e:6964)
 
 Function17a97b: ; 17a97b (5e:697b)
 	hlcoord 1, 1
-	ld bc, $212
+	lb bc, 2, 18
 	call ClearBox
 	hlcoord 3, 2
 	ld de, Buffer1
diff --git a/misc/mobile_45.asm b/misc/mobile_45.asm
index c978bffec..ce62a30b3 100644
--- a/misc/mobile_45.asm
+++ b/misc/mobile_45.asm
@@ -24234,9 +24234,9 @@ Function_LoadOpponentTrainerAndPokemonsWithOTSprite: ; 0x170b44
 	ld hl, UsedSprites
 	add hl, de
 	ld [hli], a
-	ld [$ffbd], a
+	ld [hUsedSpriteIndex], a
 	ld a, [hl]
-	ld [$ffbe], a
+	ld [hUsedSpriteTile], a
 	callba Function143c8
 	ret
 ; 170b90
diff --git a/wram.asm b/wram.asm
index bde772d92..2444c8f00 100644
--- a/wram.asm
+++ b/wram.asm
@@ -1606,6 +1606,7 @@ wd182:: ds 1
 wd191:: ds 1
 wd192:: ds 1
 wd193:: ds 1
+UsedSpritesEnd::
 wd194:: ds 1
 wd195:: ds 1
 wd196:: ds 1