Champion's room; resolve predefs

3 files changed, 246 insertions, 246 deletions

diff --git a/data/hide_show_data.asm b/data/hide_show_data.asm
index 71a76e47..2387218b 100755
--- a/data/hide_show_data.asm
+++ b/data/hide_show_data.asm
@@ -1,7 +1,7 @@
 ; data for default hidden/shown
 ; objects for each map ($00-$F8)
 
-; Table of 2-Byte pointers, one pointer per map,
+; Table of 2-Byte pointers, one pointer per map, 
 ; goes up to Map_F7, ends with $FFFF.
 ; points to table listing all missable object in the area
 MapHSPointers: ; c69b (3:469b)
@@ -267,327 +267,327 @@ MapHSPointers: ; c69b (3:469b)
 ; This Data is loaded into RAM at wd5ce-$D5F?. (wMissableObjectList)
 
 ; These constants come from the bytes for Predef functions:
-Hide	equ $11
-Show	equ $15
+Hide EQU $11 ; (HideObjectPredef - PredefPointers) / 3
+Show EQU $15 ; (ShowObjectPredef - PredefPointers) / 3
 
 MapHSXX: ; c88f (3:488f)
-	db $FF,$FF,$FF
+	db $FF, $FF, $FF
 MapHS00: ; c892 (3:4892)
-	db PALLET_TOWN,$01,Hide
+	db PALLET_TOWN, $01, Hide
 MapHS01: ; c895 (3:4895)
-	db VIRIDIAN_CITY,$05,Show
-	db VIRIDIAN_CITY,$07,Hide
-	db VIRIDIAN_CITY,$08,Hide
+	db VIRIDIAN_CITY, $05, Show
+	db VIRIDIAN_CITY, $07, Hide
+	db VIRIDIAN_CITY, $08, Hide
 MapHS02: ; c89e (3:489e)
-	db PEWTER_CITY,$03,Show
-	db PEWTER_CITY,$05,Show
+	db PEWTER_CITY, $03, Show
+	db PEWTER_CITY, $05, Show
 MapHS03: ; c8a4 (3:48a4)
-	db CERULEAN_CITY,$01,Hide
-	db CERULEAN_CITY,$02,Show
-	db CERULEAN_CITY,$06,Hide
-	db CERULEAN_CITY,$0A,Show
-	db CERULEAN_CITY,$0B,Show
+	db CERULEAN_CITY, $01, Hide
+	db CERULEAN_CITY, $02, Show
+	db CERULEAN_CITY, $06, Hide
+	db CERULEAN_CITY, $0A, Show
+	db CERULEAN_CITY, $0B, Show
 MapHS0A: ; c8b3 (3:48b3)
-	db SAFFRON_CITY,$01,Show
-	db SAFFRON_CITY,$02,Show
-	db SAFFRON_CITY,$03,Show
-	db SAFFRON_CITY,$04,Show
-	db SAFFRON_CITY,$05,Show
-	db SAFFRON_CITY,$06,Show
-	db SAFFRON_CITY,$07,Show
-	db SAFFRON_CITY,$08,Hide
-	db SAFFRON_CITY,$09,Hide
-	db SAFFRON_CITY,$0A,Hide
-	db SAFFRON_CITY,$0B,Hide
-	db SAFFRON_CITY,$0C,Hide
-	db SAFFRON_CITY,$0D,Hide
-	db SAFFRON_CITY,$0E,Show
-	db SAFFRON_CITY,$0F,Hide
+	db SAFFRON_CITY, $01, Show
+	db SAFFRON_CITY, $02, Show
+	db SAFFRON_CITY, $03, Show
+	db SAFFRON_CITY, $04, Show
+	db SAFFRON_CITY, $05, Show
+	db SAFFRON_CITY, $06, Show
+	db SAFFRON_CITY, $07, Show
+	db SAFFRON_CITY, $08, Hide
+	db SAFFRON_CITY, $09, Hide
+	db SAFFRON_CITY, $0A, Hide
+	db SAFFRON_CITY, $0B, Hide
+	db SAFFRON_CITY, $0C, Hide
+	db SAFFRON_CITY, $0D, Hide
+	db SAFFRON_CITY, $0E, Show
+	db SAFFRON_CITY, $0F, Hide
 MapHS0D: ; c8e0 (3:48e0)
-	db ROUTE_2,$01,Show
-	db ROUTE_2,$02,Show
+	db ROUTE_2, $01, Show
+	db ROUTE_2, $02, Show
 MapHS0F: ; c8e6 (3:48e6)
-	db ROUTE_4,$03,Show
+	db ROUTE_4, $03, Show
 MapHS14: ; c8e9 (3:48e9)
-	db ROUTE_9,$0A,Show
+	db ROUTE_9, $0A, Show
 MapHS17: ; c8ec (3:48ec)
-	db ROUTE_12,$01,Show
-	db ROUTE_12,$09,Show
-	db ROUTE_12,$0A,Show
+	db ROUTE_12, $01, Show
+	db ROUTE_12, $09, Show
+	db ROUTE_12, $0A, Show
 MapHS1A: ; c8f5 (3:48f5)
-	db ROUTE_15,$0B,Show
+	db ROUTE_15, $0B, Show
 MapHS1B: ; c8f8 (3:48f8)
-	db ROUTE_16,$07,Show
+	db ROUTE_16, $07, Show
 MapHS21: ; c8fb (3:48fb)
-	db ROUTE_22,$01,Hide
-	db ROUTE_22,$02,Hide
+	db ROUTE_22, $01, Hide
+	db ROUTE_22, $02, Hide
 MapHS23: ; c901 (3:4901)
-	db ROUTE_24,$01,Show
-	db ROUTE_24,$08,Show
+	db ROUTE_24, $01, Show
+	db ROUTE_24, $08, Show
 MapHS24: ; c907 (3:4907)
-	db ROUTE_25,$0A,Show
+	db ROUTE_25, $0A, Show
 MapHS27: ; c90a (3:490a)
-	db BLUES_HOUSE,$01,Show
-	db BLUES_HOUSE,$02,Hide
-	db BLUES_HOUSE,$03,Show
+	db BLUES_HOUSE, $01, Show
+	db BLUES_HOUSE, $02, Hide
+	db BLUES_HOUSE, $03, Show
 MapHS28: ; c913 (3:4913)
-	db OAKS_LAB,$01,Show
-	db OAKS_LAB,$02,Show
-	db OAKS_LAB,$03,Hide
-	db OAKS_LAB,$04,Show
-	db OAKS_LAB,$05,Show
-	db OAKS_LAB,$06,Hide
+	db OAKS_LAB, $01, Show
+	db OAKS_LAB, $02, Show
+	db OAKS_LAB, $03, Hide
+	db OAKS_LAB, $04, Show
+	db OAKS_LAB, $05, Show
+	db OAKS_LAB, $06, Hide
 MapHS2D: ; c925 (3:4925)
-	db VIRIDIAN_GYM,$01,Show
-	db VIRIDIAN_GYM,$0B,Show
+	db VIRIDIAN_GYM, $01, Show
+	db VIRIDIAN_GYM, $0B, Show
 MapHS34: ; c92b (3:492b)
-	db MUSEUM_1F,$05,Show
+	db MUSEUM_1F, $05, Show
 MapHS3F: ; c92e (3:492e) ; bulbasaur adoption house
-	db CERULEAN_HOUSE_1,$02,Show
+	db CERULEAN_HOUSE_1, $02, Show
 MapHSE4: ; c931 (3:4931)
-	db UNKNOWN_DUNGEON_1,$01,Show
-	db UNKNOWN_DUNGEON_1,$02,Show
-	db UNKNOWN_DUNGEON_1,$03,Show
-	db UNKNOWN_DUNGEON_1,$04,Show
+	db UNKNOWN_DUNGEON_1, $01, Show
+	db UNKNOWN_DUNGEON_1, $02, Show
+	db UNKNOWN_DUNGEON_1, $03, Show
+	db UNKNOWN_DUNGEON_1, $04, Show
 MapHS8F: ; c93d (3:493d)
-	db POKEMONTOWER_2,$01,Show
+	db POKEMONTOWER_2, $01, Show
 MapHS90: ; c940 (3:4940)
-	db POKEMONTOWER_3,$04,Show
+	db POKEMONTOWER_3, $04, Show
 MapHS91: ; c943 (3:4943)
-	db POKEMONTOWER_4,$04,Show
-	db POKEMONTOWER_4,$05,Show
-	db POKEMONTOWER_4,$06,Show
+	db POKEMONTOWER_4, $04, Show
+	db POKEMONTOWER_4, $05, Show
+	db POKEMONTOWER_4, $06, Show
 MapHS92: ; c94c (3:494c)
-	db POKEMONTOWER_5,$06,Show
+	db POKEMONTOWER_5, $06, Show
 MapHS93: ; c94f (3:494f)
-	db POKEMONTOWER_6,$04,Show
-	db POKEMONTOWER_6,$05,Show
+	db POKEMONTOWER_6, $04, Show
+	db POKEMONTOWER_6, $05, Show
 MapHS94: ; c955 (3:4955)
-	db POKEMONTOWER_7,$01,Hide ; jessie & james?
-	db POKEMONTOWER_7,$02,Hide
-	db POKEMONTOWER_7,$03,Show
+	db POKEMONTOWER_7, $01, Hide ; jessie & james?
+	db POKEMONTOWER_7, $02, Hide
+	db POKEMONTOWER_7, $03, Show
 MapHS95: ; c95e (3:495e)
-	db LAVENDER_HOUSE_1,$05,Hide
+	db LAVENDER_HOUSE_1, $05, Hide
 MapHS84: ; c961 (3:4961)
-	db CELADON_MANSION_5,$02,Show
+	db CELADON_MANSION_5, $02, Show
 MapHS87: ; c964 (3:4964)
-	db GAME_CORNER,$0B,Show
+	db GAME_CORNER, $0B, Show
 MapHS9B: ; c967 (3:4967)
-	db FUCHSIA_HOUSE_2,$02,Show
+	db FUCHSIA_HOUSE_2, $02, Show
 MapHSA5: ; c96a (3:496a)
-	db MANSION_1,$02,Show
-	db MANSION_1,$03,Show
+	db MANSION_1, $02, Show
+	db MANSION_1, $03, Show
 MapHSB1: ; c970 (3:4970)
-	db FIGHTING_DOJO,$06,Show
-	db FIGHTING_DOJO,$07,Show
+	db FIGHTING_DOJO, $06, Show
+	db FIGHTING_DOJO, $07, Show
 MapHSB5: ; c976 (3:4976)
-	db SILPH_CO_1F,$01,Hide
+	db SILPH_CO_1F, $01, Hide
 MapHS53: ; c979 (3:4979)
-	db POWER_PLANT,$01,Show
-	db POWER_PLANT,$02,Show
-	db POWER_PLANT,$03,Show
-	db POWER_PLANT,$04,Show
-	db POWER_PLANT,$05,Show
-	db POWER_PLANT,$06,Show
-	db POWER_PLANT,$07,Show
-	db POWER_PLANT,$08,Show
-	db POWER_PLANT,$09,Show
-	db POWER_PLANT,$0A,Show
-	db POWER_PLANT,$0B,Show
-	db POWER_PLANT,$0C,Show
-	db POWER_PLANT,$0D,Show
-	db POWER_PLANT,$0E,Show
+	db POWER_PLANT, $01, Show
+	db POWER_PLANT, $02, Show
+	db POWER_PLANT, $03, Show
+	db POWER_PLANT, $04, Show
+	db POWER_PLANT, $05, Show
+	db POWER_PLANT, $06, Show
+	db POWER_PLANT, $07, Show
+	db POWER_PLANT, $08, Show
+	db POWER_PLANT, $09, Show
+	db POWER_PLANT, $0A, Show
+	db POWER_PLANT, $0B, Show
+	db POWER_PLANT, $0C, Show
+	db POWER_PLANT, $0D, Show
+	db POWER_PLANT, $0E, Show
 MapHSC2: ; c9a3 (3:49a3)
-	db VICTORY_ROAD_2,$06,Show
-	db VICTORY_ROAD_2,$07,Show
-	db VICTORY_ROAD_2,$08,Show
-	db VICTORY_ROAD_2,$09,Show
-	db VICTORY_ROAD_2,$0A,Show
-	db VICTORY_ROAD_2,$0D,Show
+	db VICTORY_ROAD_2, $06, Show
+	db VICTORY_ROAD_2, $07, Show
+	db VICTORY_ROAD_2, $08, Show
+	db VICTORY_ROAD_2, $09, Show
+	db VICTORY_ROAD_2, $0A, Show
+	db VICTORY_ROAD_2, $0D, Show
 MapHS58: ; c9b5 (3:49b5)
-	db BILLS_HOUSE,$01,Show
-	db BILLS_HOUSE,$02,Hide
-	db BILLS_HOUSE,$03,Hide
+	db BILLS_HOUSE, $01, Show
+	db BILLS_HOUSE, $02, Hide
+	db BILLS_HOUSE, $03, Hide
 MapHS33: ; c9be (3:49be)
-	db VIRIDIAN_FOREST,$07,Show
-	db VIRIDIAN_FOREST,$08,Show
-	db VIRIDIAN_FOREST,$09,Show
+	db VIRIDIAN_FOREST, $07, Show
+	db VIRIDIAN_FOREST, $08, Show
+	db VIRIDIAN_FOREST, $09, Show
 MapHS3B: ; c9c7 (3:49c7)
-	db MT_MOON_1,$08,Show
-	db MT_MOON_1,$09,Show
-	db MT_MOON_1,$0A,Show
-	db MT_MOON_1,$0B,Show
-	db MT_MOON_1,$0C,Show
-	db MT_MOON_1,$0D,Show
+	db MT_MOON_1, $08, Show
+	db MT_MOON_1, $09, Show
+	db MT_MOON_1, $0A, Show
+	db MT_MOON_1, $0B, Show
+	db MT_MOON_1, $0C, Show
+	db MT_MOON_1, $0D, Show
 MapHS3D: ; c9d9 (3:49d9)
-	db MT_MOON_3,$02,Hide
-	db MT_MOON_3,$06,Hide
-	db MT_MOON_3,$07,Show
-	db MT_MOON_3,$08,Show
-	db MT_MOON_3,$09,Show
-	db MT_MOON_3,$0A,Show
+	db MT_MOON_3, $02, Hide
+	db MT_MOON_3, $06, Hide
+	db MT_MOON_3, $07, Show
+	db MT_MOON_3, $08, Show
+	db MT_MOON_3, $09, Show
+	db MT_MOON_3, $0A, Show
 MapHS60: ; c9eb (3:49eb)
-	db SS_ANNE_2,$02,Hide
+	db SS_ANNE_2, $02, Hide
 MapHS66: ; c9ee (3:49ee)
-	db SS_ANNE_8,$0A,Show
+	db SS_ANNE_8, $0A, Show
 MapHS67: ; c9f1 (3:49f1)
-	db SS_ANNE_9,$06,Show
-	db SS_ANNE_9,$09,Show
+	db SS_ANNE_9, $06, Show
+	db SS_ANNE_9, $09, Show
 MapHS68: ; c9f7 (3:49f7)
-	db SS_ANNE_10,$09,Show
-	db SS_ANNE_10,$0A,Show
-	db SS_ANNE_10,$0B,Show
+	db SS_ANNE_10, $09, Show
+	db SS_ANNE_10, $0A, Show
+	db SS_ANNE_10, $0B, Show
 MapHSC6: ; ca00 (3:4a00)
-	db VICTORY_ROAD_3,$05,Show
-	db VICTORY_ROAD_3,$06,Show
-	db VICTORY_ROAD_3,$0A,Show
+	db VICTORY_ROAD_3, $05, Show
+	db VICTORY_ROAD_3, $06, Show
+	db VICTORY_ROAD_3, $0A, Show
 MapHSC7: ; ca09 (3:4a09)
-	db ROCKET_HIDEOUT_1,$06,Show
-	db ROCKET_HIDEOUT_1,$07,Show
+	db ROCKET_HIDEOUT_1, $06, Show
+	db ROCKET_HIDEOUT_1, $07, Show
 MapHSC8: ; ca0f (3:4a0f)
-	db ROCKET_HIDEOUT_2,$02,Show
-	db ROCKET_HIDEOUT_2,$03,Show
-	db ROCKET_HIDEOUT_2,$04,Show
-	db ROCKET_HIDEOUT_2,$05,Show
+	db ROCKET_HIDEOUT_2, $02, Show
+	db ROCKET_HIDEOUT_2, $03, Show
+	db ROCKET_HIDEOUT_2, $04, Show
+	db ROCKET_HIDEOUT_2, $05, Show
 MapHSC9: ; ca1b (3:4a1b)
-	db ROCKET_HIDEOUT_3,$03,Show
-	db ROCKET_HIDEOUT_3,$04,Show
+	db ROCKET_HIDEOUT_3, $03, Show
+	db ROCKET_HIDEOUT_3, $04, Show
 MapHSCA: ; ca21 (3:4a21)
-	db ROCKET_HIDEOUT_4,$01,Show
-	db ROCKET_HIDEOUT_4,$02,Hide
-	db ROCKET_HIDEOUT_4,$03,Hide
-	db ROCKET_HIDEOUT_4,$05,Show
-	db ROCKET_HIDEOUT_4,$06,Show
-	db ROCKET_HIDEOUT_4,$07,Show
-	db ROCKET_HIDEOUT_4,$08,Hide
-	db ROCKET_HIDEOUT_4,$09,Hide
+	db ROCKET_HIDEOUT_4, $01, Show
+	db ROCKET_HIDEOUT_4, $02, Hide
+	db ROCKET_HIDEOUT_4, $03, Hide
+	db ROCKET_HIDEOUT_4, $05, Show
+	db ROCKET_HIDEOUT_4, $06, Show
+	db ROCKET_HIDEOUT_4, $07, Show
+	db ROCKET_HIDEOUT_4, $08, Hide
+	db ROCKET_HIDEOUT_4, $09, Hide
 MapHSCF: ; ca39 (3:4a39)
-	db SILPH_CO_2F,$01,Show
-	db SILPH_CO_2F,$02,Show
-	db SILPH_CO_2F,$03,Show
-	db SILPH_CO_2F,$04,Show
-	db SILPH_CO_2F,$05,Show
+	db SILPH_CO_2F, $01, Show
+	db SILPH_CO_2F, $02, Show
+	db SILPH_CO_2F, $03, Show
+	db SILPH_CO_2F, $04, Show
+	db SILPH_CO_2F, $05, Show
 MapHSD0: ; ca48 (3:4a48)
-	db SILPH_CO_3F,$02,Show
-	db SILPH_CO_3F,$03,Show
-	db SILPH_CO_3F,$04,Show
+	db SILPH_CO_3F, $02, Show
+	db SILPH_CO_3F, $03, Show
+	db SILPH_CO_3F, $04, Show
 MapHSD1: ; ca51 (3:4a51)
-	db SILPH_CO_4F,$02,Show
-	db SILPH_CO_4F,$03,Show
-	db SILPH_CO_4F,$04,Show
-	db SILPH_CO_4F,$05,Show
-	db SILPH_CO_4F,$06,Show
-	db SILPH_CO_4F,$07,Show
+	db SILPH_CO_4F, $02, Show
+	db SILPH_CO_4F, $03, Show
+	db SILPH_CO_4F, $04, Show
+	db SILPH_CO_4F, $05, Show
+	db SILPH_CO_4F, $06, Show
+	db SILPH_CO_4F, $07, Show
 MapHSD2: ; ca63 (3:4a63)
-	db SILPH_CO_5F,$02,Show
-	db SILPH_CO_5F,$03,Show
-	db SILPH_CO_5F,$04,Show
-	db SILPH_CO_5F,$05,Show
-	db SILPH_CO_5F,$06,Show
-	db SILPH_CO_5F,$07,Show
-	db SILPH_CO_5F,$08,Show
+	db SILPH_CO_5F, $02, Show
+	db SILPH_CO_5F, $03, Show
+	db SILPH_CO_5F, $04, Show
+	db SILPH_CO_5F, $05, Show
+	db SILPH_CO_5F, $06, Show
+	db SILPH_CO_5F, $07, Show
+	db SILPH_CO_5F, $08, Show
 MapHSD3: ; ca78 (3:4a78)
-	db SILPH_CO_6F,$06,Show
-	db SILPH_CO_6F,$07,Show
-	db SILPH_CO_6F,$08,Show
-	db SILPH_CO_6F,$09,Show
-	db SILPH_CO_6F,$0A,Show
+	db SILPH_CO_6F, $06, Show
+	db SILPH_CO_6F, $07, Show
+	db SILPH_CO_6F, $08, Show
+	db SILPH_CO_6F, $09, Show
+	db SILPH_CO_6F, $0A, Show
 MapHSD4: ; ca87 (3:4a87)
-	db SILPH_CO_7F,$05,Show
-	db SILPH_CO_7F,$06,Show
-	db SILPH_CO_7F,$07,Show
-	db SILPH_CO_7F,$08,Show
-	db SILPH_CO_7F,$09,Show
-	db SILPH_CO_7F,$0A,Show
-	db SILPH_CO_7F,$0B,Show
-	db SILPH_CO_7F,$0C,Show
+	db SILPH_CO_7F, $05, Show
+	db SILPH_CO_7F, $06, Show
+	db SILPH_CO_7F, $07, Show
+	db SILPH_CO_7F, $08, Show
+	db SILPH_CO_7F, $09, Show
+	db SILPH_CO_7F, $0A, Show
+	db SILPH_CO_7F, $0B, Show
+	db SILPH_CO_7F, $0C, Show
 MapHSD5: ; ca9f (3:4a9f)
-	db SILPH_CO_8F,$02,Show
-	db SILPH_CO_8F,$03,Show
-	db SILPH_CO_8F,$04,Show
+	db SILPH_CO_8F, $02, Show
+	db SILPH_CO_8F, $03, Show
+	db SILPH_CO_8F, $04, Show
 MapHSE9: ; caa8 (3:4aa8)
-	db SILPH_CO_9F,$02,Show
-	db SILPH_CO_9F,$03,Show
-	db SILPH_CO_9F,$04,Show
+	db SILPH_CO_9F, $02, Show
+	db SILPH_CO_9F, $03, Show
+	db SILPH_CO_9F, $04, Show
 MapHSEA: ; cab1 (3:4ab1)
-	db SILPH_CO_10F,$01,Show
-	db SILPH_CO_10F,$02,Show
-	db SILPH_CO_10F,$03,Show
-	db SILPH_CO_10F,$04,Show
-	db SILPH_CO_10F,$05,Show
-	db SILPH_CO_10F,$06,Show
+	db SILPH_CO_10F, $01, Show
+	db SILPH_CO_10F, $02, Show
+	db SILPH_CO_10F, $03, Show
+	db SILPH_CO_10F, $04, Show
+	db SILPH_CO_10F, $05, Show
+	db SILPH_CO_10F, $06, Show
 MapHSEB: ; cac3 (3:4ac3)
-	db SILPH_CO_11F,$03,Show
-	db SILPH_CO_11F,$04,Show
-	db SILPH_CO_11F,$05,Show
-	db SILPH_CO_11F,$06,Show
+	db SILPH_CO_11F, $03, Show
+	db SILPH_CO_11F, $04, Show
+	db SILPH_CO_11F, $05, Show
+	db SILPH_CO_11F, $06, Show
 MapHSF4: ; cacf (3:4acf)
-	db $F4,$02,Show
+	db $F4, $02, Show
 MapHSD6: ; cad2 (3:4ad2)
-	db MANSION_2,$02,Show
+	db MANSION_2, $02, Show
 MapHSD7: ; cad5 (3:4ad5)
-	db MANSION_3,$03,Show
-	db MANSION_3,$04,Show
+	db MANSION_3, $03, Show
+	db MANSION_3, $04, Show
 MapHSD8: ; cadb (3:4adb)
-	db MANSION_4,$03,Show
-	db MANSION_4,$04,Show
-	db MANSION_4,$05,Show
-	db MANSION_4,$06,Show
-	db MANSION_4,$08,Show
+	db MANSION_4, $03, Show
+	db MANSION_4, $04, Show
+	db MANSION_4, $05, Show
+	db MANSION_4, $06, Show
+	db MANSION_4, $08, Show
 MapHSD9: ; caea (3:4aea)
-	db SAFARI_ZONE_EAST,$01,Show
-	db SAFARI_ZONE_EAST,$02,Show
-	db SAFARI_ZONE_EAST,$03,Show
-	db SAFARI_ZONE_EAST,$04,Show
+	db SAFARI_ZONE_EAST, $01, Show
+	db SAFARI_ZONE_EAST, $02, Show
+	db SAFARI_ZONE_EAST, $03, Show
+	db SAFARI_ZONE_EAST, $04, Show
 MapHSDA: ; caf6 (3:4af6)
-	db SAFARI_ZONE_NORTH,$01,Show
-	db SAFARI_ZONE_NORTH,$02,Show
+	db SAFARI_ZONE_NORTH, $01, Show
+	db SAFARI_ZONE_NORTH, $02, Show
 MapHSDB: ; cafc (3:4afc)
-	db SAFARI_ZONE_WEST,$01,Show
-	db SAFARI_ZONE_WEST,$02,Show
-	db SAFARI_ZONE_WEST,$03,Show
-	db SAFARI_ZONE_WEST,$04,Show
+	db SAFARI_ZONE_WEST, $01, Show
+	db SAFARI_ZONE_WEST, $02, Show
+	db SAFARI_ZONE_WEST, $03, Show
+	db SAFARI_ZONE_WEST, $04, Show
 MapHSDC: ; cb08 (3:4b08)
-	db SAFARI_ZONE_CENTER,$01,Show
+	db SAFARI_ZONE_CENTER, $01, Show
 MapHSE2: ; cb0b (3:4b0b)
-	db UNKNOWN_DUNGEON_2,$01,Show
-	db UNKNOWN_DUNGEON_2,$02,Show
-	db UNKNOWN_DUNGEON_2,$03,Show
-	db UNKNOWN_DUNGEON_2,$04,Show
+	db UNKNOWN_DUNGEON_2, $01, Show
+	db UNKNOWN_DUNGEON_2, $02, Show
+	db UNKNOWN_DUNGEON_2, $03, Show
+	db UNKNOWN_DUNGEON_2, $04, Show
 MapHSE3: ; cb17 (3:4b17)
-	db UNKNOWN_DUNGEON_3,$01,Show
-	db UNKNOWN_DUNGEON_3,$02,Show
-	db UNKNOWN_DUNGEON_3,$03,Show
-	db UNKNOWN_DUNGEON_3,$04,Show
-	db UNKNOWN_DUNGEON_3,$05,Show
+	db UNKNOWN_DUNGEON_3, $01, Show
+	db UNKNOWN_DUNGEON_3, $02, Show
+	db UNKNOWN_DUNGEON_3, $03, Show
+	db UNKNOWN_DUNGEON_3, $04, Show
+	db UNKNOWN_DUNGEON_3, $05, Show
 MapHS6C: ; cb26 (3:4b26)
-	db VICTORY_ROAD_1,$03,Show
-	db VICTORY_ROAD_1,$04,Show
+	db VICTORY_ROAD_1, $03, Show
+	db VICTORY_ROAD_1, $04, Show
 MapHS78: ; cb2c (3:4b2c)
-	db CHAMPIONS_ROOM,$02,Hide
+	db CHAMPIONS_ROOM, $02, Hide
 MapHSC0: ; cb2f (3:4b2f)
-	db SEAFOAM_ISLANDS_1,$01,Show
-	db SEAFOAM_ISLANDS_1,$02,Show
+	db SEAFOAM_ISLANDS_1, $01, Show
+	db SEAFOAM_ISLANDS_1, $02, Show
 MapHS9F: ; cb35 (3:4b35)
-	db SEAFOAM_ISLANDS_2,$01,Hide
-	db SEAFOAM_ISLANDS_2,$02,Hide
+	db SEAFOAM_ISLANDS_2, $01, Hide
+	db SEAFOAM_ISLANDS_2, $02, Hide
 MapHSA0: ; cb3b (3:4b3b)
-	db SEAFOAM_ISLANDS_3,$01,Hide
-	db SEAFOAM_ISLANDS_3,$02,Hide
+	db SEAFOAM_ISLANDS_3, $01, Hide
+	db SEAFOAM_ISLANDS_3, $02, Hide
 MapHSA1: ; cb41 (3:4b41)
-	db SEAFOAM_ISLANDS_4,$02,Show
-	db SEAFOAM_ISLANDS_4,$03,Show
-	db SEAFOAM_ISLANDS_4,$05,Hide
-	db SEAFOAM_ISLANDS_4,$06,Hide
+	db SEAFOAM_ISLANDS_4, $02, Show
+	db SEAFOAM_ISLANDS_4, $03, Show
+	db SEAFOAM_ISLANDS_4, $05, Hide
+	db SEAFOAM_ISLANDS_4, $06, Hide
 MapHSA2: ; cb4d (3:4b4d)
-	db SEAFOAM_ISLANDS_5,$01,Hide
-	db SEAFOAM_ISLANDS_5,$02,Hide
-	db SEAFOAM_ISLANDS_5,$03,Show
+	db SEAFOAM_ISLANDS_5, $01, Hide
+	db SEAFOAM_ISLANDS_5, $02, Hide
+	db SEAFOAM_ISLANDS_5, $03, Show
 
 MapHS27Copy: ; cb56 (3:4b56)
 ; doesn't seem to be referenced
-	db BLUES_HOUSE,$01,Show
-	db BLUES_HOUSE,$02,Hide
-	db BLUES_HOUSE,$03,Show
+	db BLUES_HOUSE, $01, Show
+	db BLUES_HOUSE, $02, Hide
+	db BLUES_HOUSE, $03, Show
 	
-	db $FF,$01,Show
\ No newline at end of file
+	db $FF, $01, Show
\ No newline at end of file
diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm
index 20b1e875..047dcc87 100644
--- a/data/map_header_banks.asm
+++ b/data/map_header_banks.asm
@@ -120,7 +120,7 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4)
 	db $1d ; unused
 	db BANK(HallofFameRoom_h)
 	db $18 ; db BANK(UndergroundPathNS_h)
-	db $1d ; db BANK(Gary_h)
+	db BANK(Gary_h)
 	db $18 ; db BANK(UndergroundPathWE_h)
 	db $11 ; db BANK(CeladonMart1_h)
 	db $15 ; db BANK(CeladonMart2_h)
diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm
index cbaa5da9..10db2aba 100644
--- a/data/map_header_pointers.asm
+++ b/data/map_header_pointers.asm
@@ -120,7 +120,7 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2)
 	dw Lance_h ; unused
 	dw HallofFameRoom_h
 	dw $5f31 ; dw UndergroundPathNS_h
-	dw $57a0 ; dw Gary_h ;id=120
+	dw Gary_h ;id=120
 	dw $5f55 ; dw UndergroundPathWE_h
 	dw $42b7 ; dw CeladonMart1_h
 	dw $60d9 ; dw CeladonMart2_h