pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-04-09 05:44:44 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rename PAL_OW_EMOTE and PAL_NPC_EMOTE to *_GREY

Browse Source
This commit is contained in:
xCrystal
2023-11-05 11:07:32 +01:00
parent 2df937cbee
commit 29bea311fe
9 changed files with 26 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
engine/board/menu.asm
View File

@@ -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

14
engine/overworld/events.asm
View File

@@ -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.

12
engine/overworld/map_objects.asm
View File

@@ -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

2
engine/overworld/player_movement.asm
View File

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

8
engine/overworld/player_step.asm
View File

@@ -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