Fix grotto exit on route36 player standing on grass

Reference Rangi42#905

data/maps/setup_script_pointers.asm

@@ -59,3 +59,4 @@ MapSetupCommands:
 	add_mapsetup SetCurrentWeather ; 34
 	add_mapsetup MapConnOWFadePalettesInit ; 35
 	add_mapsetup LoadMapObjects_Connection ; 36
+	add_mapsetup GrottoUpdatePlayerTallGrassFlags ; 37

data/maps/setup_scripts.asm

@@ -43,6 +43,7 @@ MapSetupScript_Warp:
 	mapsetup DecompressMetatiles
 	mapsetup LoadMapTimeOfDay
 	mapsetup LoadMapObjects
+	mapsetup GrottoUpdatePlayerTallGrassFlags
 	mapsetup EnableLCD
 	mapsetup LoadMapPalettes
 	mapsetup SpawnInFacingDown
@@ -130,6 +131,7 @@ MapSetupScript_Train:
 	mapsetup FadeOutMapMusic
 	mapsetup EnableLCD
 	mapsetup LoadMapObjects
+	mapsetup GrottoUpdatePlayerTallGrassFlags
 	mapsetup LoadMapPalettes
 	mapsetup EnableDynPalUpdatesNoApply
 	mapsetup RefreshMapSprites

engine/overworld/map_objects.asm

@@ -245,6 +245,24 @@ CopyCurCoordsToNextCoords:
 	ld [hl], a
 	ret
 
+GrottoUpdatePlayerTallGrassFlags::
+	ld a, [wGrottoExit]
+	and a
+	ret z
+	xor a
+	ld [wGrottoExit], a
+	ld bc, wPlayerStruct
+	ld hl, OBJECT_MAP_X
+	add hl, bc
+	ld d, [hl]
+	ld hl, OBJECT_MAP_Y
+	add hl, bc
+	ld e, [hl]
+	push bc
+	call GetCoordTileCollision
+	pop bc
+	jr SetTallGrassFlags
+
 UpdateTallGrassFlags:
 	ld hl, OBJECT_FLAGS2
 	add hl, bc

home/map.asm

@@ -190,6 +190,20 @@ CopyWarpData::
 	ld a, [hli]
 	cp $ff
 	jr nz, .skip
+	ld a, [wMapGroup]
+	assert GROUP_HIDDEN_TREE_GROTTO == GROUP_HIDDEN_CAVE_GROTTO
+	cp GROUP_HIDDEN_TREE_GROTTO
+	jr nz, .not_grotto
+	ld a, [wMapNumber]
+	cp MAP_HIDDEN_TREE_GROTTO
+	jr z, .is_grotto
+	cp MAP_HIDDEN_CAVE_GROTTO
+	jr nz, .not_grotto
+.is_grotto
+	; set grotto exit flag
+	ld a, TRUE
+	ld [wGrottoExit], a
+.not_grotto
 	ld hl, wBackupWarpNumber
 	ld a, [hli]
 

ram/wramx.asm

@@ -1179,7 +1179,9 @@ wNeededPalIndex:: db
 
 wEmotePal:: db
 
-	ds 70 ; unused
+wGrottoExit:: db
+
+	ds 69 ; unused
 
 wWingAmounts::
 wHealthWingAmount:: dw