From 8a6d46f3d9ba4fb6939eb9ea9949f47aa8608d4a Mon Sep 17 00:00:00 2001
From: dannye <corrnondacqb@yahoo.com>
Date: Sun, 9 Aug 2015 23:56:20 -0500
Subject: Replace some hardcoded data sizes

---
 scripts/celadonmartelevator.asm   | 3 ++-
 scripts/namerater.asm             | 6 +++---
 scripts/pewterpokecenter.asm      | 5 +++--
 scripts/rockethideoutelevator.asm | 3 ++-
 scripts/silphcoelevator.asm       | 3 ++-
 scripts/vermiliondock.asm         | 6 +++---
 6 files changed, 15 insertions(+), 11 deletions(-)

(limited to 'scripts')

diff --git a/scripts/celadonmartelevator.asm b/scripts/celadonmartelevator.asm
index 53f1f434..ea4792c0 100755
--- a/scripts/celadonmartelevator.asm
+++ b/scripts/celadonmartelevator.asm
@@ -36,7 +36,7 @@ CeladonMartElevatorScript_48631: ; 48631 (12:4631)
 	call LoadItemList
 	ld hl, CeldaonMartElevatorWarpMaps
 	ld de, wcc5b
-	ld bc, $000a
+	ld bc, CeldaonMartElevatorWarpMapsEnd - CeldaonMartElevatorWarpMaps
 	jp CopyData
 
 CeladonMartElavatorFloors: ; 48643 (12:4643)
@@ -53,6 +53,7 @@ CeldaonMartElevatorWarpMaps: ; 4864a (12:464a)
 	db $02, CELADON_MART_3
 	db $02, CELADON_MART_4
 	db $02, CELADON_MART_5
+CeldaonMartElevatorWarpMapsEnd:
 
 CeladonMartElevatorScript_48654: ; 48654 (12:4654)
 	jpba ShakeElevator
diff --git a/scripts/namerater.asm b/scripts/namerater.asm
index c2d028ef..0222d596 100755
--- a/scripts/namerater.asm
+++ b/scripts/namerater.asm
@@ -10,15 +10,15 @@ NameRaterScript_1da15: ; 1da15 (7:5a15)
 
 NameRaterScript_1da20: ; 1da20 (7:5a20)
 	ld hl, wPartyMonOT
-	ld bc, $000b
+	ld bc, 11
 	ld a, [wWhichPokemon]
 	call AddNTimes
 	ld de, wPlayerName
-	ld c, $b
+	ld c, 11
 	call .asm_1da47
 	jr c, .asm_1da52
 	ld hl, wPartyMon1OTID
-	ld bc, $002c
+	ld bc, wPartyMon2 - wPartyMon1
 	ld a, [wWhichPokemon]
 	call AddNTimes
 	ld de, wPlayerID
diff --git a/scripts/pewterpokecenter.asm b/scripts/pewterpokecenter.asm
index 584878eb..1e64032b 100755
--- a/scripts/pewterpokecenter.asm
+++ b/scripts/pewterpokecenter.asm
@@ -27,7 +27,7 @@ PewterPokecenterText3: ; 5c59b (17:459b)
 	call DelayFrames
 	ld hl, JigglypuffFacingDirections
 	ld de, wJigglypuffFacingDirections
-	ld bc, 4
+	ld bc, JigglypuffFacingDirectionsEnd - JigglypuffFacingDirections
 	call CopyData
 
 	ld a, [wSpriteStateData1 + 3 * $10 + $2]
@@ -50,7 +50,7 @@ PewterPokecenterText3: ; 5c59b (17:459b)
 	push hl
 	ld hl, wJigglypuffFacingDirections
 	ld de, wJigglypuffFacingDirections - 1
-	ld bc, 4
+	ld bc, JigglypuffFacingDirectionsEnd - JigglypuffFacingDirections
 	call CopyData
 	ld a, [wJigglypuffFacingDirections - 1]
 	ld [wJigglypuffFacingDirections + 3], a
@@ -79,6 +79,7 @@ JigglypuffFacingDirections: ; 5c608 (17:4608)
 	db $30 | SPRITE_FACING_LEFT
 	db $30 | SPRITE_FACING_UP
 	db $30 | SPRITE_FACING_RIGHT
+JigglypuffFacingDirectionsEnd:
 
 PewterPokecenterText4: ; 5c60c (17:460c)
 	db $f6
diff --git a/scripts/rockethideoutelevator.asm b/scripts/rockethideoutelevator.asm
index 52c7fad3..ac936b46 100755
--- a/scripts/rockethideoutelevator.asm
+++ b/scripts/rockethideoutelevator.asm
@@ -36,7 +36,7 @@ RocketHideoutElevatorScript_45741: ; 45741 (11:5741)
 	call LoadItemList
 	ld hl, RocketHideoutElevatorWarpMaps
 	ld de, wcc5b
-	ld bc, $0006
+	ld bc, RocketHideoutElevatorWarpMapsEnd - RocketHideoutElevatorWarpMaps
 	call CopyData
 	ret
 
@@ -52,6 +52,7 @@ RocketHideoutElevatorWarpMaps: ; 45759 (11:5759)
 	db $04, ROCKET_HIDEOUT_1
 	db $04, ROCKET_HIDEOUT_2
 	db $02, ROCKET_HIDEOUT_4
+RocketHideoutElevatorWarpMapsEnd:
 
 RocketHideoutElevatorScript_4575f: ; 4575f (11:575f)
 	call Delay3
diff --git a/scripts/silphcoelevator.asm b/scripts/silphcoelevator.asm
index 36dbb6d2..5bd189ae 100755
--- a/scripts/silphcoelevator.asm
+++ b/scripts/silphcoelevator.asm
@@ -36,7 +36,7 @@ SilphCoElevatorScript_457f1: ; 457f1 (11:57f1)
 	call LoadItemList
 	ld hl, SilphCoElevatorWarpMaps
 	ld de, wcc5b
-	ld bc, $16
+	ld bc, SilphCoElevatorWarpMapsEnd - SilphCoElevatorWarpMaps
 	call CopyData
 	ret
 
@@ -60,6 +60,7 @@ SilphCoElevatorWarpMaps: ; 45811 (11:45811)
 	db $02, SILPH_CO_9F
 	db $02, SILPH_CO_10F
 	db $01, SILPH_CO_11F
+SilphCoElevatorWarpMapsEnd:
 
 SilphCoElevatorScript_45827: ; 45827 (11:5827)
 	call Delay3
diff --git a/scripts/vermiliondock.asm b/scripts/vermiliondock.asm
index a65b3603..6157ba8d 100755
--- a/scripts/vermiliondock.asm
+++ b/scripts/vermiliondock.asm
@@ -53,8 +53,8 @@ VermilionDock_1db9b: ; 1db9b (7:5b9b)
 	ld b, $9c
 	call CopyScreenTileBufferToVRAM
 	coord hl, 0, 10
-	ld bc, $0078
-	ld a, $14
+	ld bc, SCREEN_WIDTH * 6
+	ld a, $14 ; water tile
 	call FillMemory
 	ld a, 1
 	ld [H_AUTOBGTRANSFERENABLED], a
@@ -180,7 +180,7 @@ VermilionDock_1dc7c: ; 1dc7c (7:5c7c)
 
 VermilionDock_1dc94: ; 1dc94 (7:5c94)
 	ld hl, wcc5b
-	ld bc, $00b4
+	ld bc, SCREEN_WIDTH * 9
 	ld a, $14
 	call FillMemory
 	ld hl, vBGMap0 + 10 * 32
-- 
cgit v1.2.3