diff --git a/data/hide_show_data.asm b/data/hide_show_data.asm index 499970a..a43a8c1 100644 --- a/data/hide_show_data.asm +++ b/data/hide_show_data.asm @@ -48,15 +48,15 @@ MapHSPointers: dw MapHS28 ;oak'slab dw MapHSXX dw MapHSMart;viridian pokemart - dw MapHSXX - dw MapHSXX - dw MapHS2D - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHS33 + dw MapHSXX ;school + dw MapHSXX ;vhouse + dw MapHS2D ;gym + dw MapHSXX ;diglett + dw MapHSXX ;r2h + dw MapHSXX ;r2g + dw MapHSXX ; V Entrance + dw MapHSXX ;Viridian Forest + dw MapHS33 ; Museum dw MapHS34 dw MapHSXX dw MapHSXX @@ -108,9 +108,9 @@ MapHSPointers: dw MapHSXX dw MapHSXX dw MapHS66 - dw MapHS67 - dw MapHS68 - dw MapHSXX + dw MapHS67 ;SS Anne + dw MapHS68 ;SS Anne + dw MapHSsilver ;Mt Silver Hopefully dw MapHSXX dw MapHSXX dw MapHS6C @@ -437,6 +437,8 @@ MapHS68: db SS_ANNE_10, $09, Show db SS_ANNE_10, $0A, Show db SS_ANNE_10, $0B, Show +MapHSsilver: + db MT_SILVER_CAVE, $03, Show MapHSC6: db VICTORY_ROAD_3, $05, Show db VICTORY_ROAD_3, $06, Show diff --git a/data/mapObjects/mtsilvercave.asm b/data/mapObjects/mtsilvercave.asm index 50f7bbc..424c51b 100644 --- a/data/mapObjects/mtsilvercave.asm +++ b/data/mapObjects/mtsilvercave.asm @@ -2,15 +2,15 @@ MtSilverCaveObject: db $19 ; border block db $2 ; warps - db $5, $5, $0, MT_SILVER - db $1f, $25, $0, MT_SILVER + db $4, $4, $0, JOHTO_FALLS ;warp from here loc, then location to. The location you end up on the other side is determined by that map's WARP TO, see below for example. + db $1f, $25, $0, MT_SILVER ;warp from? db $0 ; signs - db $2 ; objects + db $3 ; objects object SPRITE_BUG_CATCHER,$1e, $1b, STAY, RIGHT, $1, OPP_BUG_CATCHER, $8 object SPRITE_RED, $21, $3, STAY, DOWN, $2, OPP_RANDTRAINER, $1 - ;object SPRITE_BALL, $1e, $1c, STAY, NONE, $3, POTION not totally sure how items work + object SPRITE_BALL, $1e, $1c, STAY, NONE, $3, RARE_CANDY ;for items you also have to mess with hide/show sprite and hidden items list. ; warp-to - EVENT_DISP DIGLETTS_CAVE_WIDTH, $5, $5 ; silv + EVENT_DISP DIGLETTS_CAVE_WIDTH, $5, $5 ; Warps FROM Johto or anywhere else calling our first warp point will end up here in the cave. EVENT_DISP DIGLETTS_CAVE_WIDTH, $1f, $25 ; silv \ No newline at end of file diff --git a/scripts/silvercave.asm b/scripts/silvercave.asm index ce35a51..1505a9b 100644 --- a/scripts/silvercave.asm +++ b/scripts/silvercave.asm @@ -16,6 +16,7 @@ SilverCaveScriptPointers: SilverCaveTextPointers: dw SilverCaveText1 dw SilverCaveText2 + dw PickUpItemText SilverCaveTrainerHeaders: SilverCaveTrainerHeader1: