Replace raw hex values with HRAM constants

To do: turn constants into labels and use ldh

3 files changed, 26 insertions, 26 deletions

diff --git a/data/events/hidden_objects.asm b/data/events/hidden_objects.asm
index 737947a7..8fc539ef 100755
--- a/data/events/hidden_objects.asm
+++ b/data/events/hidden_objects.asm
@@ -224,7 +224,7 @@ OaksLabHiddenObjects:
 	db $FF
 ViridianPokecenterHiddenObjects:
 	db $04,$00,$08
-	db Bank(PrintBenchGuyText)
+	db BANK(PrintBenchGuyText)
 	dw PrintBenchGuyText
 	db $03,$0d,$04
 	db BANK(OpenPokemonCenterPC)
@@ -234,7 +234,7 @@ ViridianMartHiddenObjects:
 	db $FF
 ViridianSchoolHiddenObjects:
 	db $04,$03,(ViridianSchoolNotebook_id - TextPredefs) / 2 + 1
-	db Bank(PrintNotebookText)
+	db BANK(PrintNotebookText)
 	dw PrintNotebookText
 	db $00,$03,(ViridianSchoolBlackboard_id - TextPredefs) / 2 + 1
 	db BANK(PrintBlackboardLinkCableText)
@@ -262,7 +262,7 @@ PewterMartHiddenObjects:
 	db $FF
 PewterPokecenterHiddenObjects:
 	db $04,$00,$08
-	db Bank(PrintBenchGuyText)
+	db BANK(PrintBenchGuyText)
 	dw PrintBenchGuyText
 	db $03,$0d,$04
 	db BANK(OpenPokemonCenterPC)
@@ -270,7 +270,7 @@ PewterPokecenterHiddenObjects:
 	db $FF
 CeruleanPokecenterHiddenObjects:
 	db $04,$00,$08
-	db Bank(PrintBenchGuyText)
+	db BANK(PrintBenchGuyText)
 	dw PrintBenchGuyText
 	db $03,$0d,$04
 	db BANK(OpenPokemonCenterPC)
@@ -286,7 +286,7 @@ CeruleanMartHiddenObjects:
 	db $FF
 LavenderPokecenterHiddenObjects:
 	db $04,$00,$08
-	db Bank(PrintBenchGuyText)
+	db BANK(PrintBenchGuyText)
 	dw PrintBenchGuyText
 	db $03,$0d,$04
 	db BANK(OpenPokemonCenterPC)
@@ -297,7 +297,7 @@ VermilionPokecenterHiddenObjects:
 	db BANK(OpenPokemonCenterPC)
 	dw OpenPokemonCenterPC
 	db $04,$00,$04
-	db Bank(PrintBenchGuyText)
+	db BANK(PrintBenchGuyText)
 	dw PrintBenchGuyText
 	db $FF
 VermilionGymHiddenObjects:
@@ -345,7 +345,7 @@ CeladonMansion2HiddenObjects:
 	db $FF
 CeladonPokecenterHiddenObjects:
 	db $04,$00,$08
-	db Bank(PrintBenchGuyText)
+	db BANK(PrintBenchGuyText)
 	dw PrintBenchGuyText
 	db $03,$0d,$04
 	db BANK(OpenPokemonCenterPC)
@@ -460,7 +460,7 @@ CeladonHotelHiddenObjects:
 	db BANK(OpenPokemonCenterPC)
 	dw OpenPokemonCenterPC
 	db $04,$00,$08
-	db Bank(PrintBenchGuyText)
+	db BANK(PrintBenchGuyText)
 	dw PrintBenchGuyText
 	db $FF
 FuchsiaPokecenterHiddenObjects:
@@ -468,7 +468,7 @@ FuchsiaPokecenterHiddenObjects:
 	db BANK(OpenPokemonCenterPC)
 	dw OpenPokemonCenterPC
 	db $04,$00,$04
-	db Bank(PrintBenchGuyText)
+	db BANK(PrintBenchGuyText)
 	dw PrintBenchGuyText
 	db $FF
 FuchsiaGymHiddenObjects:
@@ -481,27 +481,27 @@ CinnabarGymHiddenObjects:
 	db $0d,$11,$04
 	dbw BANK(GymStatues),GymStatues
 	db $07,$0f,$01
-	db Bank(PrintCinnabarQuiz)
+	db BANK(PrintCinnabarQuiz)
 	dw PrintCinnabarQuiz
 	db $01,$0a,$12
-	db Bank(PrintCinnabarQuiz)
+	db BANK(PrintCinnabarQuiz)
 	dw PrintCinnabarQuiz
 	db $07,$09,$13
-	db Bank(PrintCinnabarQuiz)
+	db BANK(PrintCinnabarQuiz)
 	dw PrintCinnabarQuiz
 	db $0d,$09,$14
-	db Bank(PrintCinnabarQuiz)
+	db BANK(PrintCinnabarQuiz)
 	dw PrintCinnabarQuiz
 	db $0d,$01,$05
-	db Bank(PrintCinnabarQuiz)
+	db BANK(PrintCinnabarQuiz)
 	dw PrintCinnabarQuiz
 	db $07,$01,$16
-	db Bank(PrintCinnabarQuiz)
+	db BANK(PrintCinnabarQuiz)
 	dw PrintCinnabarQuiz
 	db $FF
 CinnabarPokecenterHiddenObjects:
 	db $04,$00,$04
-	db Bank(PrintBenchGuyText)
+	db BANK(PrintBenchGuyText)
 	dw PrintBenchGuyText
 	db $03,$0d,$04
 	db BANK(OpenPokemonCenterPC)
@@ -513,7 +513,7 @@ SaffronGymHiddenObjects:
 	db $FF
 MtMoonPokecenterHiddenObjects:
 	db $04,$00,$08
-	db Bank(PrintBenchGuyText)
+	db BANK(PrintBenchGuyText)
 	dw PrintBenchGuyText
 	db $03,$0d,$04
 	db BANK(OpenPokemonCenterPC)
@@ -521,7 +521,7 @@ MtMoonPokecenterHiddenObjects:
 	db $FF
 RockTunnelPokecenterHiddenObjects:
 	db $04,$00,$08
-	db Bank(PrintBenchGuyText)
+	db BANK(PrintBenchGuyText)
 	dw PrintBenchGuyText
 	db $03,$0d,$04
 	db BANK(OpenPokemonCenterPC)
@@ -589,7 +589,7 @@ RocketHideout4HiddenObjects:
 	db $FF
 SaffronPokecenterHiddenObjects:
 	db $04,$00,$04
-	db Bank(PrintBenchGuyText)
+	db BANK(PrintBenchGuyText)
 	dw PrintBenchGuyText
 	db $03,$0d,$04
 	db BANK(OpenPokemonCenterPC)
@@ -704,7 +704,7 @@ ViridianCityHiddenObjects:
 	db $FF
 SafariZoneRestHouse2HiddenObjects:
 	db $04,$00,$08
-	db Bank(PrintBenchGuyText)
+	db BANK(PrintBenchGuyText)
 	dw PrintBenchGuyText
 	db $03,$0d,$04
 	db BANK(OpenPokemonCenterPC)
@@ -712,7 +712,7 @@ SafariZoneRestHouse2HiddenObjects:
 	db $FF
 SafariZoneRestHouse3HiddenObjects:
 	db $04,$00,$08
-	db Bank(PrintBenchGuyText)
+	db BANK(PrintBenchGuyText)
 	dw PrintBenchGuyText
 	db $03,$0d,$04
 	db BANK(OpenPokemonCenterPC)
@@ -720,7 +720,7 @@ SafariZoneRestHouse3HiddenObjects:
 	db $FF
 SafariZoneRestHouse4HiddenObjects:
 	db $04,$00,$08
-	db Bank(PrintBenchGuyText)
+	db BANK(PrintBenchGuyText)
 	dw PrintBenchGuyText
 	db $03,$0d,$04
 	db BANK(OpenPokemonCenterPC)
@@ -750,7 +750,7 @@ CeladonMansion5HiddenObjects:
 	db BANK(PrintBlackboardLinkCableText)
 	dw PrintBlackboardLinkCableText
 	db $04,$03,(TMNotebook_id - TextPredefs) / 2 + 1
-	db Bank(PrintNotebookText)
+	db BANK(PrintNotebookText)
 	dw PrintNotebookText
 	db $FF
 FightingDojoHiddenObjects:
diff --git a/data/maps/hide_show_data.asm b/data/maps/hide_show_data.asm
index 7f4593ca..bc89d600 100755
--- a/data/maps/hide_show_data.asm
+++ b/data/maps/hide_show_data.asm
@@ -2,7 +2,7 @@
 ; objects for each map ($00-$F8)
 
 ; Table of 2-Byte pointers, one pointer per map,
-; goes up to Map_F7, ends with $FFFF.
+; goes up to Map_F7, ends with -1.
 ; points to table listing all missable object in the area
 MapHSPointers:
 	dw MapHS00
@@ -253,7 +253,7 @@ MapHSPointers:
 	dw MapHSXX
 	dw MapHSXX
 	dw MapHSXX
-	dw $FFFF
+	dw -1 ; end
 
 ; Structure:
 ; 3 bytes per object
diff --git a/data/wild/grass_water.asm b/data/wild/grass_water.asm
index f1dd461e..9dc41f82 100755
--- a/data/wild/grass_water.asm
+++ b/data/wild/grass_water.asm
@@ -247,7 +247,7 @@ WildDataPointers:
 	dw NoMons
 	dw NoMons
 	dw NoMons
-	dw $FFFF
+	dw -1 ; end
 
 ; wild pokemon data is divided into two parts.
 ; first part:  pokemon found in grass