From b51fbdf75355088c3ddb465c92c3dea858da8f76 Mon Sep 17 00:00:00 2001
From: Llinos Evans <36418502+PlagueVonKarma@users.noreply.github.com>
Date: Fri, 26 Jul 2024 17:33:16 +0100
Subject: [PATCH] nihon cut fix

You need to input the replacement blocks and such when using cut! Same for whirlpool!
---
 data/collision/field_move_blocks.asm |  13 +++++++++++++
 data/maps/outdoor_sprites.asm        |   1 +
 maps/OldCity.ablk                    | Bin 360 -> 360 bytes
 3 files changed, 14 insertions(+)

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 5e98a67c423718f0a7ca4f6185df4436ba0a3d9f..ec410ef2f1f6ae9c76ef4aa01fe0b8b3fc9bd408 100644
GIT binary patch
delta 11
TcmaFC^nz)^8AkDmXJ-QdA5aBC

delta 11
TcmaFC^nz)^8Aiv6XJ-QdANU1q