From 2207e15bc7e45a746a53d0535b0f477736b9163b Mon Sep 17 00:00:00 2001
From: Zeta_Null <z0zetanull@gmail.com>
Date: Sun, 29 Dec 2024 22:11:46 -0500
Subject: [PATCH] Water Sport doesnt seem to work correctly?

---
 constants/map_constants.asm               |   1 +
 data/maps/attributes.asm                  |   2 ++
 data/maps/blocks.asm                      |   3 ++
 data/maps/maps.asm                        |   1 +
 data/maps/scripts.asm                     |   3 +-
 data/tilesets/nihon_birdon_attributes.bin | Bin 1120 -> 1120 bytes
 data/tilesets/nihon_birdon_collision.asm  |   4 +--
 data/tilesets/nihon_birdon_metatiles.bin  | Bin 1120 -> 1120 bytes
 data/tilesets/underwater_attributes.bin   | Bin 0 -> 512 bytes
 data/tilesets/underwater_collision.asm    |  32 +++++++++++++++++++
 data/tilesets/underwater_metatiles.bin    | Bin 0 -> 512 bytes
 engine/tilesets/tileset_anims.asm         |  16 ++++++++--
 engine/tilesets/tileset_palettes.asm      |  37 ++++++++++++++++++++++
 gfx/tilesets/nihon_birdon.png             | Bin 3449 -> 3472 bytes
 gfx/tilesets/underwater.png               | Bin 1240 -> 2477 bytes
 maps/DebugRoom.asm                        |   4 +--
 maps/SunglowCity.asm                      |   5 +++
 17 files changed, 101 insertions(+), 7 deletions(-)

diff --git a/constants/map_constants.asm b/constants/map_constants.asm
index a89a49f..b5c3128 100644
--- a/constants/map_constants.asm
+++ b/constants/map_constants.asm
@@ -694,6 +694,7 @@ ENDM
 	newgroup SUNGLOW_CITY                                        ; 40
 	map_const ROUTE_57,                                   10, 27 ; 1
 	map_const SUNGLOW_CITY,                                10, 9 ; 2
+	map_const SUNGLOW_WELL,                                10, 9 ; 2
 	endgroup
 	
 	newgroup BLUE_FOREST                                          ; 41
diff --git a/data/maps/attributes.asm b/data/maps/attributes.asm
index 5335929..e75c7ef 100644
--- a/data/maps/attributes.asm
+++ b/data/maps/attributes.asm
@@ -920,6 +920,8 @@ ENDM
 
 	map_attributes SunglowCity, SUNGLOW_CITY, $03, SOUTH ; this is missing a route connection
 	connection south, Route57, ROUTE_57, 0
+	
+	map_attributes SunglowWell, SUNGLOW_WELL, $03, SOUTH ; this is missing a route connection
 
 	map_attributes BlueForest, BLUE_FOREST, $00, 0 ; this is on its own for now. add connections later.
 	
diff --git a/data/maps/blocks.asm b/data/maps/blocks.asm
index 5d4c323..772aa38 100644
--- a/data/maps/blocks.asm
+++ b/data/maps/blocks.asm
@@ -1342,5 +1342,8 @@ Route57_Blocks:
 SunglowCity_Blocks:
 	INCBIN "maps/SunglowCity.ablk"
 	
+SunglowWell_Blocks:
+	INCBIN "maps/SunglowWell.ablk"
+	
 AventurineCity_Blocks:
 	INCBIN "maps/AventurineCity.ablk"
diff --git a/data/maps/maps.asm b/data/maps/maps.asm
index 6a0b4c2..b2ed76b 100644
--- a/data/maps/maps.asm
+++ b/data/maps/maps.asm
@@ -763,6 +763,7 @@ MapGroup_SunglowCity:
 	table_width MAP_LENGTH, MapGroup_SunglowCity
 	map Route57, TILESET_NIHON_BIRDON, ROUTE, LANDMARK_ROUTE_57, MUSIC_MOBILE_ADAPTER_MENU, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
 	map SunglowCity, TILESET_NIHON_BIRDON, TOWN, LANDMARK_SUNGLOW_CITY, MUSIC_MOBILE_ADAPTER_MENU, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
+	map SunglowWell, TILESET_UNDERWATER, ROUTE, LANDMARK_SUNGLOW_CITY, MUSIC_MOBILE_ADAPTER, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
 	assert_table_length NUM_SUNGLOW_CITY_MAPS
 
 MapGroup_BlueForest:
diff --git a/data/maps/scripts.asm b/data/maps/scripts.asm
index c69a75e..4264666 100644
--- a/data/maps/scripts.asm
+++ b/data/maps/scripts.asm
@@ -649,4 +649,5 @@ INCLUDE "maps/Route52.asm"
 INCLUDE "maps/RuddyTown.asm"
 INCLUDE "maps/Route57.asm"
 INCLUDE "maps/SunglowCity.asm"
-INCLUDE "maps/AventurineCity.asm"
\ No newline at end of file
+INCLUDE "maps/AventurineCity.asm"
+INCLUDE "maps/SunglowWell.asm"
\ No newline at end of file
diff --git a/data/tilesets/nihon_birdon_attributes.bin b/data/tilesets/nihon_birdon_attributes.bin
index eff6609ff912cea97e68cefe2b48b1694b2c4262..11bd571554585b598994998a97244839e26a18b9 100644
GIT binary patch
delta 19
acmaFB@qlAP6B8Q)11l>7!{!dA8;k%t90e-?

delta 16
YcmaFB@qlAP6Vv1gjBJ}bm~Jov06InnMF0Q*

diff --git a/data/tilesets/nihon_birdon_collision.asm b/data/tilesets/nihon_birdon_collision.asm
index a7bd552..874d272 100644
--- a/data/tilesets/nihon_birdon_collision.asm
+++ b/data/tilesets/nihon_birdon_collision.asm
@@ -34,11 +34,11 @@
 	tilecoll WALL, WALL, DOOR, WALL ; 21
 	tilecoll WALL, WALL, WALL, WALL ; 22
 	tilecoll WALL, WALL, WALL, WALL ; 23
-	tilecoll WALL, WALL, WALL, WALL ; 24
+	tilecoll WALL, WALL, WALL, DIVE_DOWN ; 24
 	tilecoll WALL, WALL, WALL, WALL ; 25
 	tilecoll WALL, DOOR, FLOOR, FLOOR ; 26
 	tilecoll WALL, WALL, FLOOR, FLOOR ; 27
-	tilecoll WALL, WALL, FLOOR, FLOOR ; 28
+	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 28
 	tilecoll WALL, WALL, FLOOR, FLOOR ; 29
 	tilecoll WALL, WALL, WALL, WALL ; 2a
 	tilecoll WALL, WALL, WALL, WALL ; 2b
diff --git a/data/tilesets/nihon_birdon_metatiles.bin b/data/tilesets/nihon_birdon_metatiles.bin
index 7b1231620d963ce914e13219c8257781213b2152..c11090c3bac9325a69247f031abdeb2747637795 100644
GIT binary patch
delta 30
lcmaFB@qlB47ZY1Tf}MRr!sGxZBeswbJNuB3%^gfP7y+EA3D5ul

delta 30
lcmaFB@qlB47ZaO^h@HKN$m9SfBQ`yKJ9|6(%^gfP7y*G*2r2*o

diff --git a/data/tilesets/underwater_attributes.bin b/data/tilesets/underwater_attributes.bin
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..b3a3a6ead962112e98f86eb1216ec5a6217ab8a7 100644
GIT binary patch
literal 512
xcmZQzzz<jn01Vv()B~j%kd>h8N0uXoO>O<?=ArYM&;YtTt@-F-LaKe}`T-BJ1SbFh

literal 0
HcmV?d00001

diff --git a/data/tilesets/underwater_collision.asm b/data/tilesets/underwater_collision.asm
index e69de29..ee623ca 100644
--- a/data/tilesets/underwater_collision.asm
+++ b/data/tilesets/underwater_collision.asm
@@ -0,0 +1,32 @@
+	tilecoll WALL, WALL, WALL, WALL ; 00
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 01
+	tilecoll WALL, WALL, WALL, WALL ; 02
+	tilecoll WALL, WALL, WALL, WALL ; 03
+	tilecoll DIVE_UP, DIVE_UP, DIVE_UP, DIVE_UP ; 04
+	tilecoll WALL, WALL, WALL, WALL ; 05
+	tilecoll WALL, WALL, WALL, WALL ; 06
+	tilecoll WALL, WALL, WALL, WALL ; 07
+	tilecoll FLOOR, FLOOR, FLOOR, DIVE_UP ; 08
+	tilecoll WALL, WALL, WALL, WALL ; 09
+	tilecoll WALL, WALL, WALL, WALL ; 0a
+	tilecoll WALL, WALL, WALL, WALL ; 0b
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0c
+	tilecoll WALL, WALL, WALL, WALL ; 0d
+	tilecoll WALL, WALL, WALL, WALL ; 0e
+	tilecoll WALL, WALL, WALL, WALL ; 0f
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 10
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 11
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 12
+	tilecoll TALL_GRASS, TALL_GRASS, TALL_GRASS, TALL_GRASS ; 13
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 14
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 15
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 16
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 17
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 18
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 19
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1a
+	tilecoll WALL, WALL, WALL, WALL ; 1b
+	tilecoll WALL, WALL, WALL, WALL ; 1c
+	tilecoll WALL, WALL, WALL, WALL ; 1d
+	tilecoll WALL, WALL, WALL, WALL ; 1e
+	tilecoll WALL, WALL, WALL, WALL ; 1f
diff --git a/data/tilesets/underwater_metatiles.bin b/data/tilesets/underwater_metatiles.bin
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..3bd5329d21fcefaa5d0204be538d1f0e5eff225d 100644
GIT binary patch
literal 512
zcmaix(Gi0n42Fd}QQrVdSfGXp)Cp=Q(C)uUf5cRMYA(r7G~ba6wyJDpEiwezdFSCy
zln&#Ls0&hMZJ8*x<222$WqIdVx9#I<V`}t;BMj_H8Pj-h4I<`{dz>F<@79lSqF1(@
z3wQGUK5u`_EnFCw;h3=)j=KrRoFYD?7AYddsC0~4l`dwbm4@fKg9oKU&?<xn><JSU
tPE@#43nzTuN8Yc@n{Y2Dt)yT6%U-|@S`EK>i0=E$Z+3mZfAyUv`T|N|CcFRu

literal 0
HcmV?d00001

diff --git a/engine/tilesets/tileset_anims.asm b/engine/tilesets/tileset_anims.asm
index 296eb45..e8fb4ff 100644
--- a/engine/tilesets/tileset_anims.asm
+++ b/engine/tilesets/tileset_anims.asm
@@ -78,7 +78,7 @@ TilesetForestAnim:
 
 TilesetJohtoAnim:
 	dw vTiles2 tile $14, AnimateWaterTile
-	dw NULL,  WaitTileAnimation
+	dw vTiles2 tile $5b, AnimateDeepWaterTile
 	dw NULL,  WaitTileAnimation
 	dw NULL,  AnimateWaterPalette
 	dw NULL,  WaitTileAnimation
@@ -237,7 +237,6 @@ TilesetTowerAnim:
 	dw NULL,  DoneTileAnimation
 
 TilesetNihon1Anim:
-TilesetNihonBirdonAnim:
 TilesetNihonFontAnim:
 TilesetNihonHighTechAnim:
 TilesetNihonOldAnim:
@@ -255,6 +254,19 @@ TilesetNihonWhiteCityAnim:
 	dw NULL,  WaitTileAnimation
 	dw NULL,  StandingTileFrame8
 	dw NULL,  DoneTileAnimation
+
+TilesetNihonBirdonAnim:
+	dw vTiles2 tile $14, AnimateWaterTile
+	dw NULL,  WaitTileAnimation
+	dw vTiles2 tile $60, AnimateDeepWaterTile
+	dw NULL,  WaitTileAnimation
+	dw NULL,  AnimateWaterPalette
+	dw NULL,  WaitTileAnimation
+	dw NULL,  AnimateFlowerTile
+	dw NULL,  WaitTileAnimation
+	dw NULL,  WaitTileAnimation
+	dw NULL,  StandingTileFrame8
+	dw NULL,  DoneTileAnimation
 	
 TilesetForestKantoAnim:
 	dw NULL,  WaitTileAnimation
diff --git a/engine/tilesets/tileset_palettes.asm b/engine/tilesets/tileset_palettes.asm
index f3d028a..e7410e4 100644
--- a/engine/tilesets/tileset_palettes.asm
+++ b/engine/tilesets/tileset_palettes.asm
@@ -78,6 +78,11 @@ LoadSpecialMapPalette:
 	scf
 	ret
 	
+.underwater
+	call LoadUnderwaterPalette
+	scf
+	ret
+
 .do_nothing
 	and a
 	ret
@@ -228,6 +233,38 @@ LoadDesertPalette:
 	ret
 	
 INCLUDE "gfx/tilesets/desert.pal"
+	
+LoadUnderwaterPalette:
+	ld a, [wTimeOfDay]
+	and $7
+	cp NITE_F
+	jr z, .nite
+	cp DAY_F
+	jr z, .day
+	scf
+;morn
+	ld a, BANK(wBGPals1)
+	ld de, wBGPals1
+	ld hl, UnderwaterMornPalette
+	ld bc, 8 palettes
+	jp FarCopyWRAM
+	ret
+.day
+	ld a, BANK(wBGPals1)
+	ld de, wBGPals1
+	ld hl, UnderwaterDayPalette
+	ld bc, 8 palettes
+	jp FarCopyWRAM
+	ret
+.nite
+	ld a, BANK(wBGPals1)
+	ld de, wBGPals1
+	ld hl, UnderwaterNitePalette
+	ld bc, 8 palettes
+	jp FarCopyWRAM
+	ret
+	
+INCLUDE "gfx/tilesets/underwater.pal"
 
 
 LoadSpecialMapObjectPalette:
diff --git a/gfx/tilesets/nihon_birdon.png b/gfx/tilesets/nihon_birdon.png
index 4074ac87fcab4971c649252de151b81e478b1bb6..6f2a98d447c139e3afc3fc07f2bd789e67940430 100644
GIT binary patch
delta 3030
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
Y|G;hItKmII#{d8T07*qoM6N<$f~B55=>Px#

delta 2991
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

diff --git a/gfx/tilesets/underwater.png b/gfx/tilesets/underwater.png
index a8278a6dc463f714894353ca5721a2757c532a08..bd8cb2fdd655ebdbe466efcd70ebdda2c9a50d10 100644
GIT binary patch
delta 2431
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

delta 1185
zcmV;S1YY~C6W9rm7YY~%1^@s6G7I(Pks&mH1Z_z~K~!i%?V1a2A~6sJVegn6GCAa~
zYoO4h)AL~<D<V=-tL^@|Z4U#Aa{N0ud^7Lw?}v|%kMr#79Ohy^KR?fwYw#~&E#uza
z-X@tN*U8+pTLartEn_N~+xe5Z{7Rlvt#6Gb|DP#h1q)TuK6fEDsK3r(OH6{D=N2J<
zt`lO6V{TrDhvN8nJWj$m^O<)wGQS@3oCbA*jWyf{@d(tliKRc|t!JEPwB+CP0N4Oz
z)7r6h3kY^%v7@twY>B~#uvTIp=AnsUgINdLQg6mGN61gG0dWercl@cfSHD<K+*@52
zh()r0>v_q>0Cpc_K<h^?XEBl=!YJB*YG6DToWya)RbTp@k3CFt$r!<w8pyM*8XH<0
zg3Va{nWsHtt${#}=g3$!LcI?C_Tc(ySKHT`WZvo<AfMPJMzM<~$N5tJT5bJ2spBlB
zvABjY=&`9Q4a6{~2DXeB$2GsJ=iG6P(>F)P`e|lf_gArQ&Gih{*6kqgt~bDcSo}Qd
zKlwlmHgt}cY}Ge<oyLL<v~}7Vz*wPHYN$5XV~l2=Fjv5JZo!<czTiXXBgM7#S>qPD
z)H<*AE!bQ(>cZMPf7)pl4f-8-WUSf^r@lIbW}LbMJ2KbD7RW_dCrP`~^;P}5<h<r0
z_iPgChMdcipC)sTU+^WysDT)Na;kP*h1}}Ty4A0JFV<He>#ym(!dhs4A~Kj|1fECV
z!`R4q)Z?#M`XJWta?$ShVEsNcKQT^>uX+o0-CH!UANSxKjFY*1Am6;LSmR-T2gqhC
zTk^Ny<+B!&m#;Vn=Rhpz*DlVheU0qtR-Kn!b;d!L54=Qfy?i;nfKG3JfLR#_cO_%t
zS(_TtuXHunpl0^NTpL(JjSq5eE;egudxSvkV~aN5J*8kLMlr5x>oLDYfc%Gj1&m@}
zo=~*#l%D!Ly_T&@+!Fo)gIeV0R{~^yT_5~}3VD8FYV02DYY(}%?16cnJN;%H8q7i8
z`W7GudD!0pj6*BV@4*d!d&qg%`T*@b?Z8~^VRm3gIQ(0r`<=0dAA;JibIHpGG<n*r
zu?O;2AAoG8k_#J$&K$=clpBXFjl0Pt4`5C!(D^IaQ~xizzR(Dl?_RU7?7w@UozLmy
zVP63qESSx9bWJ5bFd4_DsoTAJvAZtXSV+6Jd+~f&XX{r%eh7enUa~K>G4`51U@VM%
z7&5NY2(hr~0WfhdOZjVc^RTjUpl%*|-6)U`Y476plKI)&5_$PTFI|6$YjtZ{bIU`J
zu^ix2Gy0r<ttv1!Fll{i?257Yn0Fd^b$-MHfaC>(7Yuo!#wOU*_)@<*oBj~=42%oA
zXkUBzio|YALd@8I=jE#;UxmL6PS3&fGA`@#N%akYt!m@cU95Jrv9HdLc?0l?RmR0l
zdR*pZ4%(eV#vuMk`sKvaKLB}g&b`q5#fykzbjF~yJAQTk%YOymLtduidU;-`e(B;M
z?YtpgnIH22fa7}6;$_ao)d%9$FaK~j9R2}Rtu3!6)JBC200000NkvXXu0mjf?n7Mn

diff --git a/maps/DebugRoom.asm b/maps/DebugRoom.asm
index 03e5f74..f8a404b 100644
--- a/maps/DebugRoom.asm
+++ b/maps/DebugRoom.asm
@@ -8,12 +8,12 @@ DebugRoom_MapScripts:
 
 DebugPokemon1Script:
 	opentext
-	getmonname STRING_BUFFER_3, MACHAMP
+	getmonname STRING_BUFFER_3, AZUMARILL
 	writetext ReceivedDebugPokemonText
 	playsound SFX_CAUGHT_MON
 	waitsfx
 	promptbutton
-	givepoke MACHAMP, 65, TM_ROCK_SMASH
+	givepoke AZUMARILL, 4, HM_WATER_SPORT
 	closetext
 	end
 
diff --git a/maps/SunglowCity.asm b/maps/SunglowCity.asm
index 51180ee..021e890 100644
--- a/maps/SunglowCity.asm
+++ b/maps/SunglowCity.asm
@@ -5,11 +5,16 @@ SunglowCity_MapScripts:
 
 	def_callbacks
 	callback MAPCALLBACK_NEWMAP, .Flypoint
+	callback MAPCALLBACK_NEWMAP, .DiveMap
 
 .Flypoint:
 	setflag ENGINE_FLYPOINT_SUNGLOW_CITY
 	return
 
+.DiveMap:
+    divemap SUNGLOW_WELL
+    return
+
 SunglowCity_MapEvents:
 	db 0, 0 ; filler