Rename PAL_OW_EMOTE and PAL_NPC_EMOTE to *_GREY

constants/sprite_data_constants.asm

@@ -19,7 +19,7 @@ DEF NUM_SPRITEDATA_FIELDS EQU _RS
 	const PAL_OW_BLUE   ; 1
 	const PAL_OW_GREEN  ; 2
 	const PAL_OW_BROWN  ; 3
-	const PAL_OW_EMOTE  ; 4
+	const PAL_OW_GREY   ; 4
 	const PAL_OW_TREE   ; 5
 	const PAL_OW_ROCK   ; 6
 	const PAL_OW_MISC   ; 7
@@ -31,7 +31,7 @@ DEF NUM_SPRITEDATA_FIELDS EQU _RS
 	const PAL_NPC_BLUE   ; 9
 	const PAL_NPC_GREEN  ; a
 	const PAL_NPC_BROWN  ; b
-	const PAL_NPC_PINK   ; c
+	const PAL_NPC_GREY   ; c
-	const PAL_NPC_EMOTE  ; d
+	const PAL_NPC_TREE   ; d
-	const PAL_NPC_TREE   ; e
+	const PAL_NPC_ROCK   ; e
-	const PAL_NPC_ROCK   ; f
+	const PAL_NPC_MISC   ; f

data/sprites/sprites.asm

@@ -101,7 +101,7 @@ OverworldSprites:
 	overworld_sprite FamicomSpriteGFX, 4, STILL_SPRITE, PAL_OW_RED
 	overworld_sprite FruitTreeSpriteGFX, 4, STILL_SPRITE, PAL_OW_TREE
 	overworld_sprite GoldTrophySpriteGFX, 4, STILL_SPRITE, PAL_OW_BROWN
-	overworld_sprite SilverTrophySpriteGFX, 4, STILL_SPRITE, PAL_OW_EMOTE
+	overworld_sprite SilverTrophySpriteGFX, 4, STILL_SPRITE, PAL_OW_GREY
 	overworld_sprite KrisSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BLUE
 	overworld_sprite KrisBikeSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BLUE
 	overworld_sprite KurtOutsideSpriteGFX, 12, STANDING_SPRITE, PAL_OW_BROWN

engine/board/menu.asm

@@ -14,7 +14,7 @@ BoardMenuScript::
 
 .Upkeep:
 ; skip upkeep if we are re-entering after returning from View Map mode
-	ld a, [hCurBoardEvent]
+	ldh a, [hCurBoardEvent]
 	cp BOARDEVENT_REDISPLAY_MENU
 	ret z
 ; save after opentext to reanchor map first

engine/overworld/events.asm

@@ -426,7 +426,7 @@ CheckBoardEvent:
 	assert_table_length NUM_COLL_SPACES
 
 CheckTrainerEvent:
-	ld a, [hCurBoardEvent]
+	ldh a, [hCurBoardEvent]
 	cp BOARDEVENT_VIEW_MAP_MODE
 	ret z
 
@@ -450,7 +450,7 @@ CheckTileEvent:
 	farcall CheckMovingOffEdgeOfMap
 	jr c, .map_connection
 
-	ld a, [hCurBoardEvent]
+	ldh a, [hCurBoardEvent]
 	cp BOARDEVENT_VIEW_MAP_MODE
 	ret z
 
@@ -458,7 +458,7 @@ CheckTileEvent:
 	jr c, .warp_tile
 
 .connections_disabled
-	ld a, [hCurBoardEvent]
+	ldh a, [hCurBoardEvent]
 	cp BOARDEVENT_VIEW_MAP_MODE
 	ret z
 
@@ -537,7 +537,7 @@ SetMinTwoStepWildEncounterCooldown: ; unreferenced
 	ret
 
 RunSceneScript:
-	ld a, [hCurBoardEvent]
+	ldh a, [hCurBoardEvent]
 	cp BOARDEVENT_VIEW_MAP_MODE
 	ret z
 
@@ -589,7 +589,7 @@ endr
 	ret
 
 CheckTimeEvents:
-	ld a, [hCurBoardEvent]
+	ldh a, [hCurBoardEvent]
 	cp BOARDEVENT_VIEW_MAP_MODE
 	ret z
 
@@ -630,7 +630,7 @@ OWPlayerInput:
 	jr nz, .NoAction
 
 ; Can't perform button actions while in BOARDEVENT_HANDLE_BOARD or BOARDEVENT_VIEW_MAP_MODE
-	ld a, [hCurBoardEvent]
+	ldh a, [hCurBoardEvent]
 	cp BOARDEVENT_HANDLE_BOARD
 	jr z, .NoAction
 	cp BOARDEVENT_VIEW_MAP_MODE
@@ -1180,7 +1180,7 @@ WarpToSpawnPoint::
 	ret
 
 RunMemScript::
-	ld a, [hCurBoardEvent]
+	ldh a, [hCurBoardEvent]
 	cp BOARDEVENT_VIEW_MAP_MODE
 	ret z
 ; If there is no script here, we don't need to be here.

engine/overworld/map_objects.asm

@@ -2034,7 +2034,7 @@ SpawnShadow:
 
 .ShadowObject:
 	; vtile, palette, movement
-	db $00, PAL_OW_EMOTE, SPRITEMOVEDATA_SHADOW
+	db $00, PAL_OW_GREY, SPRITEMOVEDATA_SHADOW
 
 SpawnStrengthBoulderDust:
 	push bc
@@ -2046,7 +2046,7 @@ SpawnStrengthBoulderDust:
 
 .BoulderDustObject:
 	; vtile, palette, movement
-	db $00, PAL_OW_EMOTE, SPRITEMOVEDATA_BOULDERDUST
+	db $00, PAL_OW_GREY, SPRITEMOVEDATA_BOULDERDUST
 
 SpawnEmote:
 	push bc
@@ -2058,7 +2058,7 @@ SpawnEmote:
 
 .EmoteObject:
 	; vtile, palette, movement
-	db $00, PAL_OW_EMOTE, SPRITEMOVEDATA_EMOTE
+	db $00, PAL_OW_GREY, SPRITEMOVEDATA_EMOTE
 
 ShakeGrass:
 	push bc
@@ -2085,7 +2085,7 @@ ShakeScreen:
 
 .ScreenShakeObject:
 	; vtile, palette, movement
-	db $00, PAL_OW_EMOTE, SPRITEMOVEDATA_SCREENSHAKE
+	db $00, PAL_OW_GREY, SPRITEMOVEDATA_SCREENSHAKE
 
 DespawnEmote:
 	push bc
@@ -3216,7 +3216,7 @@ InitBranchArrowsSprites:
 	gender_to_pal
 	ld b, a
 	jr nz, .available
-	ld b, PAL_OW_EMOTE ; draw grey arrow if this direction is unavailable
+	ld b, PAL_OW_GREY ; draw grey arrow if this direction is unavailable
 
 .available
 ; draw this arrow and advance hUsedSpriteIndex
@@ -3227,7 +3227,7 @@ InitBranchArrowsSprites:
 	ld e, a
 	ld d, HIGH(wShadowOAM)
 ; copy all bytes minus the attributes one. the palette matches the
-; player's color palette, or is PAL_OW_EMOTE if direction is unavailable
+; player's color palette, or is PAL_OW_GREY if direction is unavailable
 	push bc
 	ld bc, SPRITEOAMSTRUCT_LENGTH - 1
 	call CopyBytes

engine/overworld/player_movement.asm

@@ -41,7 +41,7 @@ DoPlayerMovement::
 	ret
 
 .TranslateIntoMovement:
-	ld a, [hCurBoardEvent]
+	ldh a, [hCurBoardEvent]
 	cp BOARDEVENT_VIEW_MAP_MODE
 	jp z, .ViewMapMode
 

engine/overworld/player_step.asm

@@ -87,7 +87,7 @@ UpdatePlayerCoords:
 	jr nz, .check_step_down
 	ld hl, wYCoord
 	inc [hl]
-	ld a, [hCurBoardEvent]
+	ldh a, [hCurBoardEvent]
 	cp BOARDEVENT_VIEW_MAP_MODE
 	ret nz
 	ld hl, wViewMapModeDisplacementY
@@ -99,7 +99,7 @@ UpdatePlayerCoords:
 	jr nz, .check_step_left
 	ld hl, wYCoord
 	dec [hl]
-	ld a, [hCurBoardEvent]
+	ldh a, [hCurBoardEvent]
 	cp BOARDEVENT_VIEW_MAP_MODE
 	ret nz
 	ld hl, wViewMapModeDisplacementY
@@ -111,7 +111,7 @@ UpdatePlayerCoords:
 	jr nz, .check_step_right
 	ld hl, wXCoord
 	dec [hl]
-	ld a, [hCurBoardEvent]
+	ldh a, [hCurBoardEvent]
 	cp BOARDEVENT_VIEW_MAP_MODE
 	ret nz
 	ld hl, wViewMapModeDisplacementX
@@ -123,7 +123,7 @@ UpdatePlayerCoords:
 	ret nz
 	ld hl, wXCoord
 	inc [hl]
-	ld a, [hCurBoardEvent]
+	ldh a, [hCurBoardEvent]
 	cp BOARDEVENT_VIEW_MAP_MODE
 	ret nz
 	ld hl, wViewMapModeDisplacementX

home/map.asm

@@ -1517,7 +1517,7 @@ SaveScreen_LoadConnection::
 GetMovementPermissions::
 ; permissions are ignored in View Map mode
 ; collisions are handled differently in View Map mode
-	ld a, [hCurBoardEvent]
+	ldh a, [hCurBoardEvent]
 	cp BOARDEVENT_VIEW_MAP_MODE
 	ret z
 

macros/legacy.asm

@@ -402,6 +402,3 @@ DEF happinesschecknpc     EQUS "HappinessCheckScript"
 
 ; constants/sprite_constants.asm
 DEF SPRITE_BUENA EQUS "SPRITE_BEAUTY"
-
-DEF PAL_NPC_SILVER EQUS "PAL_NPC_EMOTE"
-DEF PAL_OW_SILVER  EQUS "PAL_OW_EMOTE"