Tree/clifftop tiles in Shamouti Island

ergotcake · Jan 22, 2018 · ef0c46a · ef0c46a
1 parent c664d60
commit ef0c46a
Show file tree

Hide file tree

Showing 9 changed files with 89 additions and 87 deletions.
diff --git a/contents/bank_ends.txt b/contents/bank_ends.txt
@@ -5,7 +5,7 @@
 > -- Morimoto, Pokémon Ultra Sun/Ultra Moon
 > <https://www.serebii.net/ultrasunultramoon/virtualconsole.shtml>
 
-Free space: 80287/2097152 (3.83%)
+Free space: 80230/2097152 (3.83%)
 
 bank	end	free
 $00	$3ef3	$010d
@@ -39,7 +39,7 @@ $1b	$7ffb	$0005
 $1c	$7ff8	$0008
 $1d	$7ffa	$0006
 $1e	$7fb0	$0050
-$1f	$7fd6	$002a
+$1f	$7feb	$0015
 $20	$7f88	$0078
 $21	$8000	$0000
 $22	$7f93	$006d
@@ -68,7 +68,7 @@ $38	$7fbc	$0044
 $39	$7fc0	$0040
 $3a	$7f80	$0080
 $3b	$7f80	$0080
-$3c	$7de4	$021c
+$3c	$7e06	$01fa
 $3d	$7f9e	$0062
 $3e	$7f4b	$00b5
 $3f	$7ff0	$0010
@@ -85,7 +85,7 @@ $49	$7ff8	$0008
 $4a	$7ff4	$000c
 $4b	$7feb	$0015
 $4c	$7f5d	$00a3
-$4d	$7ff5	$000b
+$4d	$7ff7	$0009
 $4e	$7fe0	$0020
 $4f	$7ebd	$0143
 $50	$7fe6	$001a

diff --git a/contents/polishedcrystal.sym b/contents/polishedcrystal.sym
@@ -21545,38 +21545,18 @@
 1F:41A1 Sfx_Twinkle_Ch5
 1F:41C2 Sfx_Puddle
 1F:41C5 Sfx_Puddle_Ch5
-1F:41D0 HitmonchanFrontpic
-1F:440B HitmonchanBackpic
-1F:4570 KoffingFrontpic
-1F:474F KoffingBackpic
-1F:48C4 WeezingFrontpic
-1F:4C3B WeezingBackpic
-1F:4D87 RhyhornFrontpic
-1F:5116 RhyhornBackpic
-1F:5242 RhydonFrontpic
-1F:55EB RhydonBackpic
-1F:5785 ChanseyFrontpic
-1F:59E9 ChanseyBackpic
-1F:5B12 TangelaFrontpic
-1F:5D79 TangelaBackpic
-1F:5E59 KangaskhanFrontpic
-1F:6218 KangaskhanBackpic
-1F:63C4 HorseaFrontpic
-1F:650B HorseaBackpic
-1F:660B SeadraFrontpic
-1F:6836 SeadraBackpic
-1F:69CD TogepiFrontpic
-1F:6B0A TogepiBackpic
-1F:6C12 TogeticFrontpic
-1F:6E85 TogeticBackpic
-1F:6FE6 TogekissFrontpic
-1F:744D TogekissBackpic
-1F:753B StaryuFrontpic
-1F:7733 StaryuBackpic
-1F:784C StarmieFrontpic
-1F:7AD4 StarmieBackpic
-1F:7BD6 MrMimeFrontpic
-1F:7EBF MrMimeBackpic
+1F:41D0 TilesetBattleTowerGFX
+1F:4683 TilesetBattleTowerMeta
+1F:49C3 TilesetBattleTowerColl
+1F:4A93 TilesetTunnelGFX
+1F:5353 TilesetTunnelMeta
+1F:5A53 TilesetTunnelColl
+1F:5C13 TilesetDecorGFX
+1F:606F TilesetDecorMeta
+1F:63FF TilesetDecorColl
+1F:64E3 TilesetShamoutiGFX
+1F:6EE3 TilesetShamoutiMeta
+1F:7C83 TilesetShamoutiColl
 20:4000 PokeAnims
 20:4012 PokeAnims.Slow
 20:4016 PokeAnims.Normal
@@ -30922,18 +30902,38 @@
 3B:7E00 SylveonIcon
 3B:7E80 PorygonZIcon
 3B:7F00 EggIcon
-3C:4000 TilesetBattleTowerGFX
-3C:44B3 TilesetBattleTowerMeta
-3C:47F3 TilesetBattleTowerColl
-3C:48C3 TilesetTunnelGFX
-3C:5183 TilesetTunnelMeta
-3C:5883 TilesetTunnelColl
-3C:5A43 TilesetDecorGFX
-3C:5E9F TilesetDecorMeta
-3C:622F TilesetDecorColl
-3C:6313 TilesetShamoutiGFX
-3C:6D04 TilesetShamoutiMeta
-3C:7A84 TilesetShamoutiColl
+3C:4000 HitmonchanFrontpic
+3C:423B HitmonchanBackpic
+3C:43A0 KoffingFrontpic
+3C:457F KoffingBackpic
+3C:46F4 WeezingFrontpic
+3C:4A6B WeezingBackpic
+3C:4BB7 RhyhornFrontpic
+3C:4F46 RhyhornBackpic
+3C:5072 RhydonFrontpic
+3C:541B RhydonBackpic
+3C:55B5 ChanseyFrontpic
+3C:5819 ChanseyBackpic
+3C:5942 TangelaFrontpic
+3C:5BA9 TangelaBackpic
+3C:5C89 KangaskhanFrontpic
+3C:6048 KangaskhanBackpic
+3C:61F4 HorseaFrontpic
+3C:633B HorseaBackpic
+3C:643B SeadraFrontpic
+3C:6666 SeadraBackpic
+3C:67FD TogepiFrontpic
+3C:693A TogepiBackpic
+3C:6A42 TogeticFrontpic
+3C:6CB5 TogeticBackpic
+3C:6E16 TogekissFrontpic
+3C:727D TogekissBackpic
+3C:736B StaryuFrontpic
+3C:7563 StaryuBackpic
+3C:767C StarmieFrontpic
+3C:7904 StarmieBackpic
+3C:7A06 MrMimeFrontpic
+3C:7CEF MrMimeBackpic
 3D:4000 PokefanMSpriteGFX
 3D:4180 PokefanFSpriteGFX
 3D:4300 GrampsSpriteGFX
@@ -33683,11 +33683,11 @@
 4D:7A28 TilesetTunnelPalMap
 4D:7AF8 TilesetDecorPalMap
 4D:7B68 TilesetShamoutiPalMap
-4D:7C5B TilesetMuseumPalMap
-4D:7D22 TilesetHotelPalMap
-4D:7DAE TilesetValenciaPalMap
-4D:7DFE TilesetJohto4PalMap
-4D:7EF5 TileCollisionTable
+4D:7C5D TilesetMuseumPalMap
+4D:7D24 TilesetHotelPalMap
+4D:7DB0 TilesetValenciaPalMap
+4D:7E00 TilesetJohto4PalMap
+4D:7EF7 TileCollisionTable
 4E:4000 Route39_MapScriptHeader
 4E:4002 Route39_MapEventHeader
 4E:40CD TrainerPokefanmDerek1

diff --git a/gfx/tilesets/shamouti.2bpp.lz b/gfx/tilesets/shamouti.2bpp.lz
diff --git a/maps/BeautifulBeach.blk b/maps/BeautifulBeach.blk
@@ -3,7 +3,7 @@
 111555555557777;;;;X55555555555577;;Tzzz}555555555555;;Tz}5555555555555555
 z}555555555555555555111111111NKKKO55
 555555555555P[RO55555
-111111125L	O5555}5NKKKKKK33FO55
+111111125L	O5555}5NKKKKKK���FO55
 55P[RG377IIIIIJO5555�;;;M55555PZZZZRSQ55550115555PZZZZZQ5
 511
 555555

diff --git a/maps/RockyBeach.blk b/maps/RockyBeach.blk
@@ -3,7 +3,7 @@
 5556114555655jppkjpp5
 55111115Nhqqqpp
 qq5655555555Llrrrrrrrr015555555
-L3333345NKKKE7777745P[R3337777745�333377777777NKKK;;;VW;;;777777tWW	;;7777v
+L3333345N����KKKE7777745P[R3337777745�333377777777NKKK;;;VW;;;777777tWW	;;7777v
 7777v33
 7777v77
 333E33337777v77333377777777777x;;;;;;;;;77777777
diff --git a/roms.md5 b/roms.md5
@@ -1 +1 @@
-0403498143ed09a6a496356d33842f66 *polishedcrystal-3.0.0-beta.gbc
+86cf17fb458b532ddb31b9e17aaf249d *polishedcrystal-3.0.0-beta.gbc
diff --git a/tilesets/shamouti_collision.asm b/tilesets/shamouti_collision.asm
@@ -214,3 +214,5 @@
 	tilecoll WALL, WALL, WALL, WALL
 	tilecoll LEDGE_DOWN, FLOOR, WALL, FLOOR
 	tilecoll FLOOR, LEDGE_DOWN, FLOOR, WALL
+	tilecoll WALL, WALL, WALL, WALL
+	tilecoll WALL, WALL, WALL, WALL
diff --git a/tilesets/shamouti_metatiles.bin b/tilesets/shamouti_metatiles.bin
diff --git a/tilesets/shamouti_palette_map.asm b/tilesets/shamouti_palette_map.asm
@@ -1,31 +1,31 @@
-	tilepal 0, BROWN, GREEN, GREEN, RED, GRAY, GREEN, GREEN, YELLOW
-	tilepal 0, GRAY, GRAY, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
-	tilepal 0, ROOF, ROOF, ROOF, RED, WATER, WATER, ROOF, ROOF
-	tilepal 0, GRAY, GREEN, BROWN, BROWN, GREEN, GREEN, GREEN, GREEN
-	tilepal 0, BROWN, BROWN, GRAY, GRAY, BROWN, BROWN, GRAY, BROWN
-	tilepal 0, GRAY, BROWN, BROWN, BROWN, GREEN, GREEN, GREEN, GREEN
-	tilepal 0, GRAY, BROWN, GREEN, GREEN, BROWN, GRAY, GRAY, GRAY
-	tilepal 0, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN
-	tilepal 0, BROWN, BROWN, GREEN, GREEN, BROWN, BROWN, BROWN, GREEN
-	tilepal 0, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN, GREEN, GREEN
-	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
-	tilepal 0, BROWN, WATER, GRAY, GRAY, GREEN, GREEN, GREEN, GREEN
-	tilepal 0, BROWN, BROWN, YELLOW, YELLOW, GRAY, GRAY, GRAY, GRAY
-	tilepal 0, GRAY, WATER, WATER, GREEN, GREEN, BROWN, BROWN, GREEN
-	tilepal 0, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY
-	tilepal 0, GRAY, WATER, WATER, GREEN, GREEN, BROWN, BROWN, TEXT
-	tilepal 1, ROOF, ROOF, ROOF, GRAY, GRAY, GRAY, GRAY, GRAY
-	tilepal 1, GRAY, GRAY, GRAY, GRAY, GREEN, GREEN, GREEN, GREEN
-	tilepal 1, ROOF, ROOF, ROOF, GRAY, GRAY, GRAY, GRAY, GRAY
-	tilepal 1, GRAY, GRAY, GRAY, GRAY, GREEN, GREEN, GREEN, GREEN
-	tilepal 1, ROOF, ROOF, ROOF, GRAY, GRAY, GRAY, GRAY, BROWN
-	tilepal 1, RED, RED, BROWN, GRAY, GREEN, GREEN, GREEN, GREEN
-	tilepal 1, ROOF, ROOF, ROOF, BROWN, BROWN, BROWN, BROWN, BROWN
-	tilepal 1, BROWN, BROWN, BROWN, GRAY, GREEN, BROWN, BROWN, GREEN
-	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, RED, RED
-	tilepal 1, RED, RED, RED, RED, RED, RED, RED, RED
-	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, RED, RED
-	tilepal 1, RED, RED, RED, RED, RED, RED, RED, RED
-	tilepal 1, RED, GRAY, GRAY, GRAY, GRAY, YELLOW, YELLOW, YELLOW
-	tilepal 1, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN
-	tilepal 1, BROWN, BROWN, BROWN
+	tilepal 0, BROWN, GREEN, GREEN, RED, GRAY, GREEN, GREEN, YELLOW
+	tilepal 0, GRAY, GRAY, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 0, ROOF, ROOF, ROOF, RED, WATER, WATER, ROOF, ROOF
+	tilepal 0, GRAY, GREEN, BROWN, BROWN, GREEN, GREEN, GREEN, GREEN
+	tilepal 0, BROWN, BROWN, GRAY, GRAY, BROWN, BROWN, GRAY, BROWN
+	tilepal 0, GRAY, BROWN, BROWN, BROWN, GREEN, GREEN, GREEN, GREEN
+	tilepal 0, GRAY, BROWN, GREEN, GREEN, BROWN, GRAY, GRAY, GRAY
+	tilepal 0, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN
+	tilepal 0, BROWN, BROWN, GREEN, GREEN, BROWN, BROWN, BROWN, GREEN
+	tilepal 0, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN, GREEN, GREEN
+	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 0, BROWN, WATER, GRAY, GRAY, GREEN, GREEN, GREEN, GREEN
+	tilepal 0, BROWN, BROWN, YELLOW, YELLOW, GRAY, GRAY, GRAY, GRAY
+	tilepal 0, GRAY, WATER, WATER, GREEN, GREEN, BROWN, BROWN, GREEN
+	tilepal 0, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY
+	tilepal 0, GRAY, WATER, WATER, GREEN, GREEN, BROWN, BROWN, TEXT
+	tilepal 1, ROOF, ROOF, ROOF, GRAY, GRAY, GRAY, GRAY, GRAY
+	tilepal 1, GRAY, GRAY, GRAY, GRAY, GREEN, GREEN, GREEN, GREEN
+	tilepal 1, ROOF, ROOF, ROOF, GRAY, GRAY, GRAY, GRAY, GRAY
+	tilepal 1, GRAY, GRAY, GRAY, GRAY, GREEN, GREEN, GREEN, GREEN
+	tilepal 1, ROOF, ROOF, ROOF, GRAY, GRAY, GRAY, GRAY, BROWN
+	tilepal 1, RED, RED, BROWN, GRAY, GREEN, GREEN, GREEN, GREEN
+	tilepal 1, ROOF, ROOF, ROOF, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 1, BROWN, BROWN, BROWN, GRAY, GREEN, BROWN, BROWN, GREEN
+	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, RED, RED
+	tilepal 1, RED, RED, RED, RED, RED, RED, RED, RED
+	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, RED, RED
+	tilepal 1, RED, RED, RED, RED, RED, RED, RED, RED
+	tilepal 1, RED, GRAY, GRAY, GRAY, GRAY, YELLOW, YELLOW, YELLOW
+	tilepal 1, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN
+	tilepal 1, BROWN, BROWN, BROWN, GREEN, GREEN
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		0403498143ed09a6a496356d33842f66 *polishedcrystal-3.0.0-beta.gbc
		86cf17fb458b532ddb31b9e17aaf249d *polishedcrystal-3.0.0-beta.gbc