Bar Back Alley Lost Girl Scene

RetroMoi · Aug 24, 2023 · db90826 · db90826
1 parent 4bfb1c8
commit db90826
Show file tree

Hide file tree

Showing 21 changed files with 406 additions and 29 deletions.
diff --git a/constants/event_flags.asm b/constants/event_flags.asm
@@ -689,7 +689,7 @@
 	const EVENT_DONE_PORYGON_ENCOUNTER
 	const EVENT_LOST_GIRLS_QUEST_ACTIVE
 	const EVENT_ROUTE_21_TRASHCAN
-	const EVENT_LUSTER_TRASHCAN_1_ITEM
+	const EVENT_ROUTE_21_TRASHCAN_ITEM
 	const EVENT_ROUTE_17_DISGUISEMAN1
 	const EVENT_ROUTE_17_DISGUISEMAN2
 	const EVENT_TALKED_TO_SEASIDE_CAVE_GUY_1
@@ -798,6 +798,9 @@
 	const EVENT_UNDERGROUND_PASSAGE_HIDDEN_RARE_CANDY
 	const EVENT_UNDERGROUND_PASSAGE_HIDDEN_MAX_REVIVE
 	const EVENT_ROUTE_21_TUNNEL_GATE_IS_UP
+	const EVENT_BACK_ALLEY_TRASHCAN_1
+	const EVENT_BACK_ALLEY_TRASHCAN_2
+	const EVENT_BACK_ALLEY_TRASHCAN_3
 	const EVENT_UNUSED_1
 	const EVENT_UNUSED_2
 	const EVENT_UNUSED_3
@@ -814,9 +817,6 @@
 	const EVENT_UNUSED_14
 	const EVENT_UNUSED_15
 	const EVENT_UNUSED_16
-	const EVENT_UNUSED_17
-	const EVENT_UNUSED_18
-	const EVENT_UNUSED_19
 
 
 

diff --git a/constants/sprite_constants.asm b/constants/sprite_constants.asm
@@ -174,7 +174,7 @@
 	const SPRITE_GOLD_TROPHY
 	const SPRITE_SAILBOAT
 	const SPRITE_MISC_OVERHEAD
-	const SPRITE_ROWBOAT
+	const SPRITE_SUNBATHER
 	const SPRITE_UMBRELLA
 	const SPRITE_SITTING_YOUNGSTER
 	const SPRITE_SITTING_BIRD_KEEPER
@@ -194,7 +194,7 @@
 	const SPRITE_HANGAR_PARTS
 	const SPRITE_KOFFING_BEAN
 	const SPRITE_CLOTHES_RACKS
-	const SPRITE_ICE_BLOCK
+	const SPRITE_MISC_BAGGAGE
 	const SPRITE_BIG_MAMOSWINE
 	const SPRITE_LIGHTHOUSE
 	const SPRITE_SUNBEAM_VIEW

diff --git a/data/sprites/sprites.asm b/data/sprites/sprites.asm
@@ -178,7 +178,7 @@ SpriteHeaders:
 	overworld_sprite GoldTrophySpriteGFX, STANDING_SPRITE, PAL_OW_BROWN
 	overworld_sprite SailboatSpriteGFX, STANDING_SPRITE, PAL_OW_PURPLE
 	overworld_sprite MiscOverheadSpriteGFX, STANDING_SPRITE, PAL_OW_BROWN
-	overworld_sprite RowboatSpriteGFX, STANDING_SPRITE, PAL_OW_BROWN
+	overworld_sprite SunbatherSpriteGFX, STANDING_SPRITE, PAL_OW_BROWN
 	overworld_sprite UmbrellaSpriteGFX, STANDING_SPRITE, PAL_OW_SILVER
 	overworld_sprite SittingYoungsterGFX, STANDING_SPRITE, PAL_OW_RED
 	overworld_sprite SittingBirdKeeperGFX, STANDING_SPRITE, PAL_OW_RED
@@ -198,7 +198,7 @@ SpriteHeaders:
 	overworld_sprite HangarPartsGFX, STANDING_SPRITE, PAL_OW_SILVER
 	overworld_sprite KoffingBeanGFX, STANDING_SPRITE, PAL_OW_SILVER
 	overworld_sprite ClothesRacksGFX, STANDING_SPRITE, PAL_OW_SILVER
-	overworld_sprite IceBlockGFX, STANDING_SPRITE, PAL_OW_SILVER
+	overworld_sprite MiscBaggageGFX, STANDING_SPRITE, PAL_OW_SILVER
 	overworld_sprite BigMamoswineSpriteGFX, STANDING_SPRITE, PAL_OW_BLUE
 	overworld_sprite LighthouseSpriteGFX, STANDING_SPRITE, PAL_OW_SILVER
 	overworld_sprite SunbeamViewSpriteGFX, STANDING_SPRITE, PAL_OW_SILVER

diff --git a/data/tilesets/highway_attributes.bin b/data/tilesets/highway_attributes.bin
diff --git a/data/tilesets/highway_attributes.bin.lz b/data/tilesets/highway_attributes.bin.lz
diff --git a/data/tilesets/highway_collision.asm b/data/tilesets/highway_collision.asm
@@ -130,7 +130,7 @@
 	tilecoll PUDDLE, PUDDLE, FLOOR, PUDDLE ; 81
 	tilecoll WALL, WALL, WALL, DOOR ; 82
 	tilecoll WALL, WALL, WALL, WALL ; 83
-	tilecoll PUDDLE, FLOOR, PUDDLE, FLOOR ; 84
+	tilecoll WALL, WALL, WALL, WALL ; 84
 	tilecoll FLOOR, WALL, WALL, WALL ; 85
 	tilecoll WALL, WALL, WALL, WALL ; 86
 	tilecoll WALL, WALL, WALL, WALL ; 87
@@ -203,18 +203,18 @@
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; ca
 	tilecoll WALL, WALL, WALL, WALL ; cb
 	tilecoll WARP_CARPET_RIGHT, NO_OLLIE, WARP_CARPET_RIGHT, NO_OLLIE ; cc
-	tilecoll WATER, PUDDLE, WATER, PUDDLE ; cd
-	tilecoll PUDDLE, WATER, PUDDLE, WATER ; ce
+	tilecoll WARP_CARPET_LEFT, WARP_CARPET_RIGHT, WALL, WALL ; cd
+	tilecoll WARP_CARPET_LEFT, WARP_CARPET_RIGHT, WALL, WALL ; ce
 	tilecoll WALL, WALL, WALL, WALL ; cf
 	tilecoll WARP_CARPET_RIGHT, NO_OLLIE, WARP_CARPET_RIGHT, NO_OLLIE ; d0
-	tilecoll WATER, PUDDLE, WATER, PUDDLE ; d1
-	tilecoll PUDDLE, WATER, PUDDLE, WATER ; d2
+	tilecoll WARP_CARPET_LEFT, WARP_CARPET_RIGHT, WALL, WALL ; d1
+	tilecoll WARP_CARPET_LEFT, WARP_CARPET_RIGHT, WALL, WALL ; d2
 	tilecoll WALL, WALL, WALL, WALL ; d3
 	tilecoll WALL, WALL, WALL, WALL ; d4
 	tilecoll FLOOR, FLOOR, NO_OLLIE, DOOR ; d5
 	tilecoll WALL, WALL, WALL, WALL ; d6
 	tilecoll WALL, WALL, WALL, WALL ; d7
-	tilecoll WATER, WATER, PUDDLE, PUDDLE ; d8
+	tilecoll WALL, WALL, WALL, WALL ; d8
 	tilecoll WALL, WALL, WALL, WALL ; d9
 	tilecoll WALL, WALL, WALL, WALL ; da
 	tilecoll WALL, WALL, WALL, WALL ; db

diff --git a/data/tilesets/highway_metatiles.bin b/data/tilesets/highway_metatiles.bin
diff --git a/data/tilesets/highway_metatiles.bin.lz b/data/tilesets/highway_metatiles.bin.lz
diff --git a/engine/color.asm b/engine/color.asm
@@ -1544,6 +1544,12 @@ LoadMapPals::
 	ld bc, 8 palettes
 	ld a, $5 ; BANK(UnknOBPals)
 	call FarCopyWRAM
+	ld a, [wMapNumber]
+	cp MAP_BAR_BACK_ALLEY
+	jr z, .alley
+	ret
+.alley
+	ld hl, MapObjectPalsEvilMeowth
 	jp .copy_single_pal_to_pal_7
 .lab
 	call .normal
@@ -1912,6 +1918,9 @@ INCLUDE "maps/palettes/obpals/fakeroute1.pal"
 MapObjectPalsLeilaniBed::
 INCLUDE "maps/palettes/obpals/leilanibed.pal"
 
+MapObjectPalsEvilMeowth::
+INCLUDE "maps/palettes/obpals/evilmeowth.pal"
+
 RoofPals::
 INCLUDE "maps/palettes/roofpals/roof.pal"
 

diff --git a/engine/events/std_scripts.asm b/engine/events/std_scripts.asm
@@ -620,7 +620,7 @@ InitializeEventsScript:
 	variablesprite SPRITE_BATHER_VARIABLE_2, SPRITE_BATHER_1
 	variablesprite SPRITE_GENERAL_VARIABLE_1, SPRITE_ELDER
 	variablesprite SPRITE_ICESKATER_VARIABLE, SPRITE_SNOWGIRL_SKATE
-	variablesprite SPRITE_BAGGAGE, SPRITE_ICE_BLOCK
+	variablesprite SPRITE_BAGGAGE, SPRITE_MISC_BAGGAGE
 	return
 
 AskNumber1MScript:

diff --git a/gfx/sprites.asm b/gfx/sprites.asm
@@ -182,7 +182,7 @@ CandleSpriteGFX::        	   INCBIN "gfx/sprites/candle.2bpp"
 GoldTrophySpriteGFX::          INCBIN "gfx/sprites/gold_trophy.2bpp"
 SailboatSpriteGFX::            INCBIN "gfx/sprites/sailboat.2bpp"
 MiscOverheadSpriteGFX::        INCBIN "gfx/sprites/misc_overhead.2bpp"
-RowboatSpriteGFX::       	   INCBIN "gfx/sprites/rowboat.2bpp"
+SunbatherSpriteGFX::       	   INCBIN "gfx/sprites/sunbather.2bpp"
 UmbrellaSpriteGFX::			   INCBIN "gfx/sprites/umbrella.2bpp"
 Bikini1SpriteGFX::             INCBIN "gfx/sprites/bikini1.2bpp"
 Bikini2SpriteGFX::             INCBIN "gfx/sprites/bikini2.2bpp"
@@ -206,7 +206,7 @@ TrafficLightGFX::			   INCBIN "gfx/sprites/traffic_light.2bpp"
 HangarPartsGFX::			   INCBIN "gfx/sprites/hangar_parts.2bpp"
 KoffingBeanGFX::			   INCBIN "gfx/sprites/koffing_bean.2bpp"
 ClothesRacksGFX::			   INCBIN "gfx/sprites/clothes_racks.2bpp"
-IceBlockGFX::			  	   INCBIN "gfx/sprites/ice_block.2bpp"
+MiscBaggageGFX::			   INCBIN "gfx/sprites/misc_baggage.2bpp"
 BigMamoswineSpriteGFX::        INCBIN "gfx/sprites/big_mamoswine.2bpp"
 LighthouseSpriteGFX::      	   INCBIN "gfx/sprites/lighthouse.2bpp"
 FrankieSpriteGFX::             INCBIN "gfx/sprites/frankie.2bpp"

diff --git a/gfx/sprites/ice_block.2bpp b/gfx/sprites/ice_block.2bpp
diff --git a/gfx/sprites/misc_baggage.2bpp b/gfx/sprites/misc_baggage.2bpp
diff --git a/gfx/sprites/rowboat.2bpp → gfx/sprites/sunbather.2bpp b/gfx/sprites/rowboat.2bpp → gfx/sprites/sunbather.2bpp
diff --git a/maps/Airport.asm b/maps/Airport.asm
@@ -53,7 +53,7 @@ AirportCallback:
 	clearevent EVENT_AIRPORT_LUGGAGE_3
 	clearevent EVENT_AIRPORT_LUGGAGE_4
 	clearevent EVENT_AIRPORT_SLOWPOKE
-	variablesprite SPRITE_BAGGAGE, SPRITE_ICE_BLOCK
+	variablesprite SPRITE_BAGGAGE, SPRITE_MISC_BAGGAGE
 	callasm AirportBaggageAsm
 	return
 	
@@ -74,7 +74,7 @@ AirportTrigger2:
 	clearevent EVENT_AIRPORT_LUGGAGE_4
 	clearevent EVENT_AIRPORT_SLOWPOKE
 	special Special_UpdatePalsInstant
-	variablesprite SPRITE_BAGGAGE, SPRITE_ICE_BLOCK
+	variablesprite SPRITE_BAGGAGE, SPRITE_MISC_BAGGAGE
 	jump .end
 .change2
 	clearevent EVENT_AIRPORT_LUGGAGE_1

diff --git a/maps/BarBackAlley.ablk b/maps/BarBackAlley.ablk
@@ -1 +1 @@
-5555555555����������??=====?�?>><<<<<>���D�M��ڹ����
+5555555555����������??=====?�?>><���<>���D�M��ڹ����
diff --git a/maps/BarBackAlley.ablk.lz b/maps/BarBackAlley.ablk.lz
@@ -1 +1 @@
-)5)�!?$=B?�!>$<>���D�M��ڹ�������
+)5)�!?$=?�?>><���<>���D�M��ڹ�������
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		5555555555��??=====?�?>><<<<<>��D�M��ڹ��
		5555555555��??=====?�?>><��<>��D�M��ڹ��
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		)5)�!?$=B?�!>$<>��D�M��ڹ��
		)5)�!?$=?�?>><��<>��D�M��ڹ��