diff --git a/data/collision/field_move_blocks.asm b/data/collision/field_move_blocks.asm index 444be14..aebd007 100644 --- a/data/collision/field_move_blocks.asm +++ b/data/collision/field_move_blocks.asm @@ -6,6 +6,8 @@ CutTreeBlockPointers: dbw TILESET_KANTO, .kanto dbw TILESET_PARK, .park dbw TILESET_FOREST, .forest + dbw TILESET_NIHON_01, .nihon01 + dbw TILESET_NIHON_OLD, .oldCity db -1 ; end .johto: @@ -43,6 +45,16 @@ CutTreeBlockPointers: db $0f, $17, 0 db -1 ; end +.nihon01: +; facing block, replacement block, animation + db $03, $02, 1 ; grass + db $6d, $88, 0 ; tree + db -1 ; end + +.oldCity: +; facing block, replacement block, animation + db $17, $41, 0 ; tree + db -1 ; end ; these blocks all use COLL_WHIRLPOOL in one quadrant WhirlpoolBlockPointers: @@ -53,3 +65,4 @@ WhirlpoolBlockPointers: ; facing block, replacement block, animation db $07, $36, 0 db -1 ; end + diff --git a/data/maps/outdoor_sprites.asm b/data/maps/outdoor_sprites.asm index fa19737..7d835ea 100644 --- a/data/maps/outdoor_sprites.asm +++ b/data/maps/outdoor_sprites.asm @@ -717,6 +717,7 @@ SilentHillsGroupSprites: db SPRITE_BLUE db SPRITE_POKEFAN_M db SPRITE_SUPER_NERD + db SPRITE_COOLTRAINER_M ; 2 non-walking sprites db SPRITE_POKE_BALL db SPRITE_FRUIT_TREE diff --git a/maps/OldCity.ablk b/maps/OldCity.ablk index 5e98a67..ec410ef 100644 Binary files a/maps/OldCity.ablk and b/maps/OldCity.ablk differ