Route 23

6 files changed, 152 insertions, 145 deletions

diff --git a/constants/hide_show_constants.asm b/constants/hide_show_constants.asm
index 9877fba7..db37b9d9 100755
--- a/constants/hide_show_constants.asm
+++ b/constants/hide_show_constants.asm
@@ -74,38 +74,38 @@ const_value = 0
 	const HS_POKEMONTOWER_7_ROCKET_1      ; 41 X
 	const HS_POKEMONTOWER_7_ROCKET_2      ; 42 X
 	const HS_POKEMONTOWER_7_ROCKET_3      ; 43
-	const HS_POKEMONTOWER_7_MR_FUJI       ; 44
-	const HS_LAVENDER_HOUSE_1_MR_FUJI     ; 45
-	const HS_CELADON_MANSION_5_GIFT       ; 46
-	const HS_GAME_CORNER_ROCKET           ; 47 X
-	const HS_FUCHSIA_HOUSE_2_ITEM         ; 48 X
-	const HS_MANSION_1_ITEM_1             ; 49 X
-	const HS_MANSION_1_ITEM_2             ; 4A
-	const HS_FIGHTING_DOJO_GIFT_1         ; 4B
-	const HS_FIGHTING_DOJO_GIFT_2         ; 4C
-	const HS_SILPH_CO_1F_RECEPTIONIST     ; 4D X
-	const HS_VOLTORB_1                    ; 4E X
-	const HS_VOLTORB_2                    ; 4F X
-	const HS_VOLTORB_3                    ; 50 X
-	const HS_ELECTRODE_1                  ; 51 X
-	const HS_VOLTORB_4                    ; 52 X
-	const HS_VOLTORB_5                    ; 53 X
-	const HS_ELECTRODE_2                  ; 54 X
-	const HS_VOLTORB_6                    ; 55 X
-	const HS_ZAPDOS                       ; 56 X
-	const HS_POWER_PLANT_ITEM_1           ; 57 X
-	const HS_POWER_PLANT_ITEM_2           ; 58 X
-	const HS_POWER_PLANT_ITEM_3           ; 59 X
-	const HS_POWER_PLANT_ITEM_4           ; 5A X
-	const HS_POWER_PLANT_ITEM_5           ; 5B X
-	const HS_MOLTRES                      ; 5C X
-	const HS_VICTORY_ROAD_2_ITEM_1        ; 5D X
-	const HS_VICTORY_ROAD_2_ITEM_2        ; 5E X
-	const HS_VICTORY_ROAD_2_ITEM_3        ; 5F X
-	const HS_VICTORY_ROAD_2_ITEM_4        ; 60
-	const HS_VICTORY_ROAD_2_BOULDER       ; 61
 
-const_value SET $61 ; something above was deleted, idk what yet
+const_value SET $43 ; something above was deleted, idk what yet
+	const HS_POKEMONTOWER_7_MR_FUJI       ; 43
+	const HS_LAVENDER_HOUSE_1_MR_FUJI     ; 44
+	const HS_CELADON_MANSION_5_GIFT       ; 45
+	const HS_GAME_CORNER_ROCKET           ; 46
+	const HS_FUCHSIA_HOUSE_2_ITEM         ; 47 X
+	const HS_MANSION_1_ITEM_1             ; 48 X
+	const HS_MANSION_1_ITEM_2             ; 49 X
+	const HS_FIGHTING_DOJO_GIFT_1         ; 4A
+	const HS_FIGHTING_DOJO_GIFT_2         ; 4B
+	const HS_SILPH_CO_1F_RECEPTIONIST     ; 4C
+	const HS_VOLTORB_1                    ; 4D X
+	const HS_VOLTORB_2                    ; 4E X
+	const HS_VOLTORB_3                    ; 4F X
+	const HS_ELECTRODE_1                  ; 50 X
+	const HS_VOLTORB_4                    ; 51 X
+	const HS_VOLTORB_5                    ; 52 X
+	const HS_ELECTRODE_2                  ; 53 X
+	const HS_VOLTORB_6                    ; 54 X
+	const HS_ZAPDOS                       ; 55 X
+	const HS_POWER_PLANT_ITEM_1           ; 56 X
+	const HS_POWER_PLANT_ITEM_2           ; 57 X
+	const HS_POWER_PLANT_ITEM_3           ; 58 X
+	const HS_POWER_PLANT_ITEM_4           ; 59 X
+	const HS_POWER_PLANT_ITEM_5           ; 5A X
+	const HS_MOLTRES                      ; 5B X
+	const HS_VICTORY_ROAD_2_ITEM_1        ; 5C X
+	const HS_VICTORY_ROAD_2_ITEM_2        ; 5D X
+	const HS_VICTORY_ROAD_2_ITEM_3        ; 5E X
+	const HS_VICTORY_ROAD_2_ITEM_4        ; 5F X
+	const HS_VICTORY_ROAD_2_BOULDER       ; 60
 	const HS_BILL_POKEMON                 ; 61
 	const HS_BILL_1                       ; 62
 	const HS_BILL_2                       ; 63
@@ -131,109 +131,111 @@ const_value SET $61 ; something above was deleted, idk what yet
 	const HS_SS_ANNE_10_ITEM_3            ; 77 X
 	const HS_VICTORY_ROAD_3_ITEM_1        ; 78 X
 	const HS_VICTORY_ROAD_3_ITEM_2        ; 79 X
-	const HS_VICTORY_ROAD_3_BOULDER       ; 7A
-	const HS_ROCKET_HIDEOUT_1_ITEM_1      ; 7B X
-	const HS_ROCKET_HIDEOUT_1_ITEM_2      ; 7C X
-	const HS_ROCKET_HIDEOUT_2_ITEM_1      ; 7D X
-	const HS_ROCKET_HIDEOUT_2_ITEM_2      ; 7E X
-	const HS_ROCKET_HIDEOUT_2_ITEM_3      ; 7F X
-	const HS_ROCKET_HIDEOUT_2_ITEM_4      ; 80 X
-	const HS_ROCKET_HIDEOUT_3_ITEM_1      ; 81 X
-	const HS_ROCKET_HIDEOUT_3_ITEM_2      ; 82 X
-	const HS_ROCKET_HIDEOUT_4_GIOVANNI    ; 83
-	const HS_ROCKET_HIDEOUT_4_ITEM_1      ; 84 X
-	const HS_ROCKET_HIDEOUT_4_ITEM_2      ; 85 X
-	const HS_ROCKET_HIDEOUT_4_ITEM_3      ; 86 X
-	const HS_ROCKET_HIDEOUT_4_ITEM_4      ; 87
-	const HS_ROCKET_HIDEOUT_4_ITEM_5      ; 88
-	const HS_SILPH_CO_2F_1                ; 89 XXX never (de)activated?
-	const HS_SILPH_CO_2F_2                ; 8A
-	const HS_SILPH_CO_2F_3                ; 8B
-	const HS_SILPH_CO_2F_4                ; 8C
-	const HS_SILPH_CO_2F_5                ; 8D
-	const HS_SILPH_CO_3F_1                ; 8E
-	const HS_SILPH_CO_3F_2                ; 8F
-	const HS_SILPH_CO_3F_ITEM             ; 90 X
-	const HS_SILPH_CO_4F_1                ; 91
-	const HS_SILPH_CO_4F_2                ; 92
-	const HS_SILPH_CO_4F_3                ; 93
-	const HS_SILPH_CO_4F_ITEM_1           ; 94 X
-	const HS_SILPH_CO_4F_ITEM_2           ; 95 X
-	const HS_SILPH_CO_4F_ITEM_3           ; 96 X
-	const HS_SILPH_CO_5F_1                ; 97
-	const HS_SILPH_CO_5F_2                ; 98
-	const HS_SILPH_CO_5F_3                ; 99
-	const HS_SILPH_CO_5F_4                ; 9A
-	const HS_SILPH_CO_5F_ITEM_1           ; 9B X
-	const HS_SILPH_CO_5F_ITEM_2           ; 9C X
-	const HS_SILPH_CO_5F_ITEM_3           ; 9D X
-	const HS_SILPH_CO_6F_1                ; 9E
-	const HS_SILPH_CO_6F_2                ; 9F
-	const HS_SILPH_CO_6F_3                ; A0
-	const HS_SILPH_CO_6F_ITEM_1           ; A1 X
-	const HS_SILPH_CO_6F_ITEM_2           ; A2 X
-	const HS_SILPH_CO_7F_1                ; A3
-	const HS_SILPH_CO_7F_2                ; A4
-	const HS_SILPH_CO_7F_3                ; A5
-	const HS_SILPH_CO_7F_4                ; A6
-	const HS_SILPH_CO_7F_RIVAL            ; A7
-	const HS_SILPH_CO_7F_ITEM_1           ; A8 X
-	const HS_SILPH_CO_7F_ITEM_2           ; A9 X
-	const HS_SILPH_CO_7F_8                ; AA XXX sprite doesn't exist
-	const HS_SILPH_CO_8F_1                ; AB
-	const HS_SILPH_CO_8F_2                ; AC
-	const HS_SILPH_CO_8F_3                ; AD
-	const HS_SILPH_CO_9F_1                ; AE
-	const HS_SILPH_CO_9F_2                ; AF
-	const HS_SILPH_CO_9F_3                ; B0
-	const HS_SILPH_CO_10F_1               ; B1
-	const HS_SILPH_CO_10F_2               ; B2
-	const HS_SILPH_CO_10F_3               ; B3 XXX never (de)activated?
-	const HS_SILPH_CO_10F_ITEM_1          ; B4 X
-	const HS_SILPH_CO_10F_ITEM_2          ; B5 X
-	const HS_SILPH_CO_10F_ITEM_3          ; B6 X
-	const HS_SILPH_CO_11F_1               ; B7
-	const HS_SILPH_CO_11F_2               ; B8
-	const HS_SILPH_CO_11F_3               ; B9
-	const HS_MAP_F4_1                     ; BA XXX sprite doesn't exist
-	const HS_MANSION_2_ITEM               ; BB X
-	const HS_MANSION_3_ITEM_1             ; BC X
-	const HS_MANSION_3_ITEM_2             ; BD X
-	const HS_MANSION_4_ITEM_1             ; BE X
-	const HS_MANSION_4_ITEM_2             ; BF X
-	const HS_MANSION_4_ITEM_3             ; C0 X
-	const HS_MANSION_4_ITEM_4             ; C1 X
-	const HS_MANSION_4_ITEM_5             ; C2 X
-	const HS_SAFARI_ZONE_EAST_ITEM_1      ; C3 X
-	const HS_SAFARI_ZONE_EAST_ITEM_2      ; C4 X
-	const HS_SAFARI_ZONE_EAST_ITEM_3      ; C5 X
-	const HS_SAFARI_ZONE_EAST_ITEM_4      ; C6 X
-	const HS_SAFARI_ZONE_NORTH_ITEM_1     ; C7 X
-	const HS_SAFARI_ZONE_NORTH_ITEM_2     ; C8 X
-	const HS_SAFARI_ZONE_WEST_ITEM_1      ; C9 X
-	const HS_SAFARI_ZONE_WEST_ITEM_2      ; CA X
-	const HS_SAFARI_ZONE_WEST_ITEM_3      ; CB X
-	const HS_SAFARI_ZONE_WEST_ITEM_4      ; CC X
-	const HS_SAFARI_ZONE_CENTER_ITEM      ; CD X
-	const HS_UNKNOWN_DUNGEON_2_ITEM_1     ; CE X
-	const HS_UNKNOWN_DUNGEON_2_ITEM_2     ; CF X
-	const HS_UNKNOWN_DUNGEON_2_ITEM_3     ; D0 X
-	const HS_MEWTWO                       ; D1 X
-	const HS_UNKNOWN_DUNGEON_3_ITEM_1     ; D2 X
-	const HS_UNKNOWN_DUNGEON_3_ITEM_2     ; D3 X
-	const HS_VICTORY_ROAD_1_ITEM_1        ; D4 X
-	const HS_VICTORY_ROAD_1_ITEM_2        ; D5 X
-	const HS_CHAMPIONS_ROOM_OAK           ; D6
-	const HS_SEAFOAM_ISLANDS_1_BOULDER_1  ; D7
-	const HS_SEAFOAM_ISLANDS_1_BOULDER_2  ; D8
-	const HS_SEAFOAM_ISLANDS_2_BOULDER_1  ; D9
-	const HS_SEAFOAM_ISLANDS_2_BOULDER_2  ; DA
-	const HS_SEAFOAM_ISLANDS_3_BOULDER_1  ; DB
-	const HS_SEAFOAM_ISLANDS_3_BOULDER_2  ; DC
-	const HS_SEAFOAM_ISLANDS_4_BOULDER_1  ; DD
-	const HS_SEAFOAM_ISLANDS_4_BOULDER_2  ; DE
-	const HS_SEAFOAM_ISLANDS_4_BOULDER_3  ; DF
-	const HS_SEAFOAM_ISLANDS_4_BOULDER_4  ; E0
-	const HS_SEAFOAM_ISLANDS_5_BOULDER_1  ; E1
-	const HS_SEAFOAM_ISLANDS_5_BOULDER_2  ; E2
-	const HS_ARTICUNO                     ; E3 X
+
+const_value SET $7c ; idk anymore lol
+	const HS_VICTORY_ROAD_3_BOULDER       ; 7C X
+	const HS_ROCKET_HIDEOUT_1_ITEM_1      ; 7D X
+	const HS_ROCKET_HIDEOUT_1_ITEM_2      ; 7E X
+	const HS_ROCKET_HIDEOUT_2_ITEM_1      ; 7F X
+	const HS_ROCKET_HIDEOUT_2_ITEM_2      ; 80 X
+	const HS_ROCKET_HIDEOUT_2_ITEM_3      ; 81 X
+	const HS_ROCKET_HIDEOUT_2_ITEM_4      ; 82 X
+	const HS_ROCKET_HIDEOUT_3_ITEM_1      ; 83
+	const HS_ROCKET_HIDEOUT_3_ITEM_2      ; 84 X
+	const HS_ROCKET_HIDEOUT_4_GIOVANNI    ; 85 X
+	const HS_ROCKET_HIDEOUT_4_ITEM_1      ; 86 X
+	const HS_ROCKET_HIDEOUT_4_ITEM_2      ; 87
+	const HS_ROCKET_HIDEOUT_4_ITEM_3      ; 88
+	const HS_ROCKET_HIDEOUT_4_ITEM_4      ; 89 XXX never (de)activated?
+	const HS_ROCKET_HIDEOUT_4_ITEM_5      ; 8A
+	const HS_SILPH_CO_2F_1                ; 8B
+	const HS_SILPH_CO_2F_2                ; 8C
+	const HS_SILPH_CO_2F_3                ; 8D
+	const HS_SILPH_CO_2F_4                ; 8E
+	const HS_SILPH_CO_2F_5                ; 8F
+	const HS_SILPH_CO_3F_1                ; 90 X
+	const HS_SILPH_CO_3F_2                ; 91
+	const HS_SILPH_CO_3F_ITEM             ; 92
+	const HS_SILPH_CO_4F_1                ; 93
+	const HS_SILPH_CO_4F_2                ; 94 X
+	const HS_SILPH_CO_4F_3                ; 95 X
+	const HS_SILPH_CO_4F_ITEM_1           ; 96 X
+	const HS_SILPH_CO_4F_ITEM_2           ; 97
+	const HS_SILPH_CO_4F_ITEM_3           ; 98
+	const HS_SILPH_CO_5F_1                ; 99
+	const HS_SILPH_CO_5F_2                ; 9A
+	const HS_SILPH_CO_5F_3                ; 9B X
+	const HS_SILPH_CO_5F_4                ; 9C X
+	const HS_SILPH_CO_5F_ITEM_1           ; 9D X
+	const HS_SILPH_CO_5F_ITEM_2           ; 9E
+	const HS_SILPH_CO_5F_ITEM_3           ; 9F
+	const HS_SILPH_CO_6F_1                ; A0
+	const HS_SILPH_CO_6F_2                ; A1 X
+	const HS_SILPH_CO_6F_3                ; A2 X
+	const HS_SILPH_CO_6F_ITEM_1           ; A3
+	const HS_SILPH_CO_6F_ITEM_2           ; A4
+	const HS_SILPH_CO_7F_1                ; A5
+	const HS_SILPH_CO_7F_2                ; A6
+	const HS_SILPH_CO_7F_3                ; A7
+	const HS_SILPH_CO_7F_4                ; A8 X
+	const HS_SILPH_CO_7F_RIVAL            ; A9 X
+	const HS_SILPH_CO_7F_ITEM_1           ; AA XXX sprite doesn't exist
+	const HS_SILPH_CO_7F_ITEM_2           ; AB
+	const HS_SILPH_CO_7F_8                ; AC
+	const HS_SILPH_CO_8F_1                ; AD
+	const HS_SILPH_CO_8F_2                ; AE
+	const HS_SILPH_CO_8F_3                ; AF
+	const HS_SILPH_CO_9F_1                ; B0
+	const HS_SILPH_CO_9F_2                ; B1
+	const HS_SILPH_CO_9F_3                ; B2
+	const HS_SILPH_CO_10F_1               ; B3 XXX never (de)activated?
+	const HS_SILPH_CO_10F_2               ; B4 X
+	const HS_SILPH_CO_10F_3               ; B5 X
+	const HS_SILPH_CO_10F_ITEM_1          ; B6 X
+	const HS_SILPH_CO_10F_ITEM_2          ; B7
+	const HS_SILPH_CO_10F_ITEM_3          ; B8
+	const HS_SILPH_CO_11F_1               ; B9
+	const HS_SILPH_CO_11F_2               ; BA XXX sprite doesn't exist
+	const HS_SILPH_CO_11F_3               ; BB X
+	const HS_MAP_F4_1                     ; BC X
+	const HS_MANSION_2_ITEM               ; BD X
+	const HS_MANSION_3_ITEM_1             ; BE X
+	const HS_MANSION_3_ITEM_2             ; BF X
+	const HS_MANSION_4_ITEM_1             ; C0 X
+	const HS_MANSION_4_ITEM_2             ; C1 X
+	const HS_MANSION_4_ITEM_3             ; C2 X
+	const HS_MANSION_4_ITEM_4             ; C3 X
+	const HS_MANSION_4_ITEM_5             ; C4 X
+	const HS_SAFARI_ZONE_EAST_ITEM_1      ; C5 X
+	const HS_SAFARI_ZONE_EAST_ITEM_2      ; C6 X
+	const HS_SAFARI_ZONE_EAST_ITEM_3      ; C7 X
+	const HS_SAFARI_ZONE_EAST_ITEM_4      ; C8 X
+	const HS_SAFARI_ZONE_NORTH_ITEM_1     ; C9 X
+	const HS_SAFARI_ZONE_NORTH_ITEM_2     ; CA X
+	const HS_SAFARI_ZONE_WEST_ITEM_1      ; CB X
+	const HS_SAFARI_ZONE_WEST_ITEM_2      ; CC X
+	const HS_SAFARI_ZONE_WEST_ITEM_3      ; CD X
+	const HS_SAFARI_ZONE_WEST_ITEM_4      ; CE X
+	const HS_SAFARI_ZONE_CENTER_ITEM      ; CF X
+	const HS_UNKNOWN_DUNGEON_2_ITEM_1     ; D0 X
+	const HS_UNKNOWN_DUNGEON_2_ITEM_2     ; D1 X
+	const HS_UNKNOWN_DUNGEON_2_ITEM_3     ; D2 X
+	const HS_MEWTWO                       ; D3 X
+	const HS_UNKNOWN_DUNGEON_3_ITEM_1     ; D4 X
+	const HS_UNKNOWN_DUNGEON_3_ITEM_2     ; D5 X
+	const HS_VICTORY_ROAD_1_ITEM_1        ; D6
+	const HS_VICTORY_ROAD_1_ITEM_2        ; D7
+	const HS_CHAMPIONS_ROOM_OAK           ; D8
+	const HS_SEAFOAM_ISLANDS_1_BOULDER_1  ; D9
+	const HS_SEAFOAM_ISLANDS_1_BOULDER_2  ; DA
+	const HS_SEAFOAM_ISLANDS_2_BOULDER_1  ; DB
+	const HS_SEAFOAM_ISLANDS_2_BOULDER_2  ; DC
+	const HS_SEAFOAM_ISLANDS_3_BOULDER_1  ; DD
+	const HS_SEAFOAM_ISLANDS_3_BOULDER_2  ; DE
+	const HS_SEAFOAM_ISLANDS_4_BOULDER_1  ; DF
+	const HS_SEAFOAM_ISLANDS_4_BOULDER_2  ; E0
+	const HS_SEAFOAM_ISLANDS_4_BOULDER_3  ; E1
+	const HS_SEAFOAM_ISLANDS_4_BOULDER_4  ; E2
+	const HS_SEAFOAM_ISLANDS_5_BOULDER_1  ; E3 X
+	const HS_SEAFOAM_ISLANDS_5_BOULDER_2  ; E4
+	const HS_ARTICUNO                     ; E5
diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm
index 1f3e4967..e181c2a3 100644
--- a/data/map_header_banks.asm
+++ b/data/map_header_banks.asm
@@ -34,7 +34,7 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4)
 	db $14 ; db BANK(Route20_h) ; ROUTE_20
 	db $15 ; db BANK(Route21_h) ; ROUTE_21
 	db BANK(Route22_h) ; ROUTE_22
-	db $14 ; db BANK(Route23_h) ; ROUTE_23
+	db BANK(Route23_h) ; ROUTE_23
 	db BANK(Route24_h) ; ROUTE_24
 	db BANK(Route25_h) ; ROUTE_25
 	db $12 ; db BANK(RedsHouse1F_h)
diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm
index e93c3def..9909b09f 100644
--- a/data/map_header_pointers.asm
+++ b/data/map_header_pointers.asm
@@ -34,7 +34,7 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2)
 	dw $40f1 ; dw Route20_h
 	dw $500f ; dw Route21_h
 	dw Route22_h
-	dw $433f ; dw Route23_h
+	dw Route23_h
 	dw Route24_h
 	dw Route25_h
 	dw $40f6 ; dw RedsHouse1F_h
diff --git a/engine/overworld/missable_objects.asm b/engine/overworld/missable_objects.asm
index f18a0823..65305d30 100644
--- a/engine/overworld/missable_objects.asm
+++ b/engine/overworld/missable_objects.asm
@@ -209,4 +209,4 @@ MissableObjectFlagAction: ; f062 (3:7062)
 	pop de
 	pop hl
 	ld c, a
-	ret
\ No newline at end of file
+	ret
diff --git a/main.asm b/main.asm
index 803dc68c..c0001587 100755
--- a/main.asm
+++ b/main.asm
@@ -782,7 +782,10 @@ INCLUDE "data/mapHeaders/route22.asm"
 INCLUDE "data/mapObjects/route22.asm"
 Route22Blocks:
 INCBIN "maps/route22.blk"
-	dr $500f1,$503b2
+	dr $500f1,$5033f
+
+INCLUDE "data/mapHeaders/route23.asm"
+INCLUDE "data/mapObjects/route23.asm"
 Route23Blocks:
 INCBIN "maps/route23.blk"
 
@@ -796,8 +799,10 @@ INCLUDE "data/mapObjects/route25.asm"
 Route25Blocks: ; 50816 (14:4816)
 INCBIN "maps/route25.blk"
 
-; victoryroad2
-	dr $50924,$509aa
+; indigoplateau
+	dr $50924,$50950
+IndigoPlateauBlocks: ; 50950 (14:4950)
+INCBIN "maps/indigoplateau.blk"
 
 INCLUDE "data/mapHeaders/saffroncity.asm"
 INCLUDE "data/mapObjects/saffroncity.asm"
@@ -807,7 +812,7 @@ INCLUDE "scripts/saffroncity.asm"
 
 	dr $50ca9,$50eb2
 INCLUDE "scripts/route22.asm"
-	dr $51193,$51366
+INCLUDE "scripts/route23.asm"
 INCLUDE "scripts/route24.asm"
 INCLUDE "scripts/route25.asm"
 
diff --git a/scripts/route23.asm b/scripts/route23.asm
index 6fc0eef1..f324963b 100755
--- a/scripts/route23.asm
+++ b/scripts/route23.asm
@@ -3,7 +3,7 @@ Route23Script: ; 511da (14:51da)
 	call EnableAutoTextBoxDrawing
 	ld hl, Route23ScriptPointers
 	ld a, [W_ROUTE23CURSCRIPT]
-	jp CallFunctionInTable
+	jp JumpTable
 
 Route23Script_511e9: ; 511e9 (14:51e9)
 	ld hl, wd126