Oak's Lab Rewrite part 1

constants/hide_show_constants.asm

@@ -53,27 +53,29 @@ const_value = 0
 	const HS_STARTER_BALL_1               ; 2C
 	const HS_STARTER_BALL_2               ; 2D
 	const HS_STARTER_BALL_3               ; 2E
-	const HS_OAKS_LAB_OAK_1               ; 2F
-	const HS_POKEDEX_1                    ; 30
-	const HS_POKEDEX_2                    ; 31
-	const HS_OAKS_LAB_OAK_2               ; 32
-	const HS_VIRIDIAN_GYM_GIOVANNI        ; 33 X
-	const HS_VIRIDIAN_GYM_ITEM            ; 34
-	const HS_OLD_AMBER                    ; 35 X
-	const HS_UNKNOWN_DUNGEON_1_ITEM_1     ; 36 X
-	const HS_UNKNOWN_DUNGEON_1_ITEM_2     ; 37 X
-	const HS_UNKNOWN_DUNGEON_1_ITEM_3     ; 38
-	const HS_POKEMONTOWER_2_RIVAL         ; 39 X
-	const HS_POKEMONTOWER_3_ITEM          ; 3A X
-	const HS_POKEMONTOWER_4_ITEM_1        ; 3B X
-	const HS_POKEMONTOWER_4_ITEM_2        ; 3C X
-	const HS_POKEMONTOWER_4_ITEM_3        ; 3D X
-	const HS_POKEMONTOWER_5_ITEM          ; 3E X
-	const HS_POKEMONTOWER_6_ITEM_1        ; 3F X
-	const HS_POKEMONTOWER_6_ITEM_2        ; 40 X
-	const HS_POKEMONTOWER_7_ROCKET_1      ; 41 X
-	const HS_POKEMONTOWER_7_ROCKET_2      ; 42 X
-	const HS_POKEMONTOWER_7_ROCKET_3      ; 43
+
+const_value SET $2D
+	const HS_OAKS_LAB_OAK_1               ; 2D
+	const HS_POKEDEX_1                    ; 2E
+	const HS_POKEDEX_2                    ; 2F
+	const HS_OAKS_LAB_OAK_2               ; 30
+	const HS_VIRIDIAN_GYM_GIOVANNI        ; 31
+	const HS_VIRIDIAN_GYM_ITEM            ; 32
+	const HS_OLD_AMBER                    ; 33 X
+	const HS_UNKNOWN_DUNGEON_1_ITEM_1     ; 34
+	const HS_UNKNOWN_DUNGEON_1_ITEM_2     ; 35 X
+	const HS_UNKNOWN_DUNGEON_1_ITEM_3     ; 36 X
+	const HS_POKEMONTOWER_2_RIVAL         ; 37 X
+	const HS_POKEMONTOWER_3_ITEM          ; 38
+	const HS_POKEMONTOWER_4_ITEM_1        ; 39 X
+	const HS_POKEMONTOWER_4_ITEM_2        ; 3A X
+	const HS_POKEMONTOWER_4_ITEM_3        ; 3B X
+	const HS_POKEMONTOWER_5_ITEM          ; 3C X
+	const HS_POKEMONTOWER_6_ITEM_1        ; 3D X
+	const HS_POKEMONTOWER_6_ITEM_2        ; 3E X
+	const HS_POKEMONTOWER_7_ROCKET_1      ; 3F X
+	const HS_POKEMONTOWER_7_ROCKET_2      ; 40 X
+	const HS_POKEMONTOWER_7_ROCKET_3      ; 41 X
 
 const_value SET $43 ; replace the tower rockets with jessie/james
 	const HS_POKEMONTOWER_7_MR_FUJI       ; 43

data/mapObjects/oakslab.asm

@@ -7,18 +7,16 @@ OaksLabObject: ; 0x1d40a (size=88)
 
 	db $0 ; signs
 
-	db $b ; objects
-	object SPRITE_BLUE, $4, $3, STAY, NONE, $1, OPP_SONY1, $1
-	object SPRITE_BALL, $6, $3, STAY, NONE, $2 ; person
-	object SPRITE_BALL, $7, $3, STAY, NONE, $3 ; person
-	object SPRITE_BALL, $8, $3, STAY, NONE, $4 ; person
-	object SPRITE_OAK, $5, $2, STAY, DOWN, $5 ; person
-	object SPRITE_BOOK_MAP_DEX, $2, $1, STAY, NONE, $6 ; person
-	object SPRITE_BOOK_MAP_DEX, $3, $1, STAY, NONE, $7 ; person
-	object SPRITE_OAK, $5, $a, STAY, UP, $8 ; person
-	object SPRITE_GIRL, $1, $9, WALK, $1, $9 ; person
-	object SPRITE_OAK_AIDE, $2, $a, STAY, NONE, $a ; person
-	object SPRITE_OAK_AIDE, $8, $a, STAY, NONE, $b ; person
+	db $9 ; objects
+	object SPRITE_BLUE, $4, $3, STAY, NONE, $41, OPP_SONY1, $1
+	object SPRITE_BALL, $7, $3, STAY, NONE, $2 ; person
+	object SPRITE_OAK, $5, $2, STAY, DOWN, $3 ; person
+	object SPRITE_BOOK_MAP_DEX, $2, $1, STAY, NONE, $4 ; person
+	object SPRITE_BOOK_MAP_DEX, $3, $1, STAY, NONE, $5 ; person
+	object SPRITE_OAK, $5, $a, STAY, UP, $6 ; person
+	object SPRITE_GIRL, $1, $9, WALK, $1, $7 ; person
+	object SPRITE_OAK_AIDE, $2, $a, STAY, NONE, $8 ; person
+	object SPRITE_OAK_AIDE, $8, $a, STAY, NONE, $9 ; person
 
 	; warp-to
 	EVENT_DISP OAKS_LAB_WIDTH, $b, $4

main.asm

@@ -289,15 +289,22 @@ INCLUDE "data/mapHeaders/route1.asm"
 INCLUDE "data/mapObjects/route1.asm"
 Route1Blocks: ; 1c0fc
 INCBIN "maps/route1.blk"
-	dr $1c1b0,$1c21e ; headers, objects, blocks
+	dr $1c1b0,$1c1c0 ; headers, objects, blocks
+OaksLabBlocks:
+INCBIN "maps/oakslab.blk"
+	dr $1c1de,$1c21e ; headers, objects, blocks
 
 INCLUDE "engine/clear_save.asm"
 INCLUDE "engine/predefs7.asm"
 
 INCLUDE "scripts/cinnabarisland.asm"
-	; dr $1c2c2,$1c358 ; map scripts
 INCLUDE "scripts/route1.asm"
-	dr $1c386,$1e2ae ; map scripts
+
+INCLUDE "data/mapHeaders/oakslab.asm"
+INCLUDE "scripts/oakslab.asm"
+INCLUDE "data/mapObjects/oakslab.asm"
+
+	dr $1cc6e,$1e2ae ; map scripts
 
 INCLUDE "engine/menu/oaks_pc.asm"