Merge branch 'master' of https://github.com/pret/pokered

9 files changed, 43 insertions, 43 deletions

diff --git a/engine/overworld/auto_movement.asm b/engine/overworld/auto_movement.asm
index 8174b273..cdc7e28a 100644
--- a/engine/overworld/auto_movement.asm
+++ b/engine/overworld/auto_movement.asm
@@ -3,13 +3,13 @@ PlayerStepOutFromDoor::
 	res BIT_EXITING_DOOR, [hl]
 	call IsPlayerStandingOnDoorTile
 	jr nc, .notStandingOnDoor
-	ld a, SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN
+	ld a, PAD_SELECT | PAD_START | PAD_CTRL_PAD
 	ld [wJoyIgnore], a
 	ld hl, wMovementFlags
 	set BIT_EXITING_DOOR, [hl]
 	ld a, $1
 	ld [wSimulatedJoypadStatesIndex], a
-	ld a, D_DOWN
+	ld a, PAD_DOWN
 	ld [wSimulatedJoypadStatesEnd], a
 	xor a
 	ld [wSpritePlayerStateData1ImageIndex], a
@@ -85,7 +85,7 @@ PalletMovementScript_OakMoveLeft:
 	call PlayMusic
 	ld hl, wStatusFlags7
 	set BIT_NO_MAP_MUSIC, [hl]
-	ld a, SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN
+	ld a, PAD_SELECT | PAD_START | PAD_CTRL_PAD
 	ld [wJoyIgnore], a
 	ret
 
@@ -142,11 +142,11 @@ RLEList_ProfOakWalkToLab:
 	db -1 ; end
 
 RLEList_PlayerWalkToLab:
-	db D_UP, 2
-	db D_RIGHT, 3
-	db D_DOWN, 5
-	db D_LEFT, 1
-	db D_DOWN, 7 ; differs from red
+	db PAD_UP, 2
+	db PAD_RIGHT, 3
+	db PAD_DOWN, 5
+	db PAD_LEFT, 1
+	db PAD_DOWN, 7 ; differs from red
 	db -1 ; end
 
 PalletMovementScript_Done:
@@ -194,9 +194,9 @@ PewterMovementScript_WalkToMuseum:
 
 RLEList_PewterMuseumPlayer:
 	db NO_INPUT, 1
-	db D_UP, 3
-	db D_LEFT, 13
-	db D_UP, 6
+	db PAD_UP, 3
+	db PAD_LEFT, 13
+	db PAD_UP, 6
 	db -1 ; end
 
 RLEList_PewterMuseumGuy:
@@ -251,11 +251,11 @@ PewterMovementScript_WalkToGym:
 
 RLEList_PewterGymPlayer:
 	db NO_INPUT, 1
-	db D_RIGHT, 2
-	db D_DOWN, 5
-	db D_LEFT, 11
-	db D_UP, 5
-	db D_LEFT, 15
+	db PAD_RIGHT, 2
+	db PAD_DOWN, 5
+	db PAD_LEFT, 11
+	db PAD_UP, 5
+	db PAD_LEFT, 15
 	db -1 ; end
 
 RLEList_PewterGymGuy:
diff --git a/engine/overworld/cut.asm b/engine/overworld/cut.asm
index 76821045..1b5b85bd 100644
--- a/engine/overworld/cut.asm
+++ b/engine/overworld/cut.asm
@@ -125,10 +125,10 @@ WriteCutOrBoulderDustAnimationOAMBlock:
 
 .OAMBlock:
 ; tile ID, attributes
-	db $fc, OAM_OBP1 | OAM_HIGH_PALS
-	db $fd, OAM_OBP1 | OAM_HIGH_PALS
-	db $fe, OAM_OBP1 | OAM_HIGH_PALS
-	db $ff, OAM_OBP1 | OAM_HIGH_PALS
+	db $fc, OAM_PAL1 | OAM_HIGH_PALS
+	db $fd, OAM_PAL1 | OAM_HIGH_PALS
+	db $fe, OAM_PAL1 | OAM_HIGH_PALS
+	db $ff, OAM_PAL1 | OAM_HIGH_PALS
 
 GetCutOrBoulderDustAnimationOffsets:
 	ld hl, wSpritePlayerStateData1YPixels
diff --git a/engine/overworld/healing_machine.asm b/engine/overworld/healing_machine.asm
index dfc6b97b..5cf312ac 100644
--- a/engine/overworld/healing_machine.asm
+++ b/engine/overworld/healing_machine.asm
@@ -65,14 +65,14 @@ PokeCenterFlashingMonitorAndHealBall:
 
 PokeCenterOAMData:
 	; heal machine monitor
-	dbsprite  6,  4,  4,  4, $7c, OAM_OBP1 | OAM_HIGH_PALS
+	dbsprite  6,  4,  4,  4, $7c, OAM_PAL1 | OAM_HIGH_PALS
 	; poke balls 1-6
-	dbsprite  6,  5,  0,  3, $7d, OAM_OBP1 | OAM_HIGH_PALS
-	dbsprite  7,  5,  0,  3, $7d, OAM_OBP1 | OAM_HIGH_PALS | OAM_HFLIP
-	dbsprite  6,  6,  0,  0, $7d, OAM_OBP1 | OAM_HIGH_PALS
-	dbsprite  7,  6,  0,  0, $7d, OAM_OBP1 | OAM_HIGH_PALS | OAM_HFLIP
-	dbsprite  6,  6,  0,  5, $7d, OAM_OBP1 | OAM_HIGH_PALS
-	dbsprite  7,  6,  0,  5, $7d, OAM_OBP1 | OAM_HIGH_PALS | OAM_HFLIP
+	dbsprite  6,  5,  0,  3, $7d, OAM_PAL1 | OAM_HIGH_PALS
+	dbsprite  7,  5,  0,  3, $7d, OAM_PAL1 | OAM_HIGH_PALS | OAM_XFLIP
+	dbsprite  6,  6,  0,  0, $7d, OAM_PAL1 | OAM_HIGH_PALS
+	dbsprite  7,  6,  0,  0, $7d, OAM_PAL1 | OAM_HIGH_PALS | OAM_XFLIP
+	dbsprite  6,  6,  0,  5, $7d, OAM_PAL1 | OAM_HIGH_PALS
+	dbsprite  7,  6,  0,  5, $7d, OAM_PAL1 | OAM_HIGH_PALS | OAM_XFLIP
 
 ; d = value to xor with palette
 FlashSprite8Times:
diff --git a/engine/overworld/ledges.asm b/engine/overworld/ledges.asm
index c08d9eaf..9f8de983 100644
--- a/engine/overworld/ledges.asm
+++ b/engine/overworld/ledges.asm
@@ -39,7 +39,7 @@ HandleLedges::
 	ldh a, [hJoyHeld]
 	and e
 	ret z
-	ld a, A_BUTTON | B_BUTTON | SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN
+	ld a, PAD_BUTTONS | PAD_CTRL_PAD
 	ld [wJoyIgnore], a
 	ld hl, wMovementFlags
 	set BIT_LEDGE_OR_FISHING, [hl]
@@ -76,5 +76,5 @@ LedgeHoppingShadowEnd:
 
 LedgeHoppingShadowOAM:
 	dbsprite  9, 11,  0,  0, $ff, 0
-	dbsprite 10, 11,  0,  0, $ff, OAM_HFLIP
+	dbsprite 10, 11,  0,  0, $ff, OAM_XFLIP
 LedgeHoppingShadowOAMEnd:
diff --git a/engine/overworld/movement.asm b/engine/overworld/movement.asm
index c05837eb..fbe8e5df 100644
--- a/engine/overworld/movement.asm
+++ b/engine/overworld/movement.asm
@@ -83,7 +83,7 @@ UpdatePlayerSprite:
 	cp c
 	ld a, 0
 	jr nz, .next2
-	ld a, OAM_BEHIND_BG
+	ld a, OAM_PRIO
 .next2
 	ld [wSpritePlayerStateData2GrassPriority], a
 	ret
@@ -520,7 +520,7 @@ CheckSpriteAvailability:
 	cp c
 	ld a, 0
 	jr nz, .notInGrass
-	ld a, OAM_BEHIND_BG
+	ld a, OAM_PRIO
 .notInGrass
 	ld [hl], a       ; x#SPRITESTATEDATA2_GRASSPRIORITY
 	and a
diff --git a/engine/overworld/pathfinding.asm b/engine/overworld/pathfinding.asm
index 58fa1da9..878ca07d 100644
--- a/engine/overworld/pathfinding.asm
+++ b/engine/overworld/pathfinding.asm
@@ -191,10 +191,10 @@ ConvertNPCMovementDirectionToJoypadMask:
 	ret
 
 NPCMovementDirectionsToJoypadMasksTable:
-	db NPC_MOVEMENT_UP, D_UP
-	db NPC_MOVEMENT_DOWN, D_DOWN
-	db NPC_MOVEMENT_LEFT, D_LEFT
-	db NPC_MOVEMENT_RIGHT, D_RIGHT
+	db NPC_MOVEMENT_UP, PAD_UP
+	db NPC_MOVEMENT_DOWN, PAD_DOWN
+	db NPC_MOVEMENT_LEFT, PAD_LEFT
+	db NPC_MOVEMENT_RIGHT, PAD_RIGHT
 	db $ff
 
 ; unreferenced
diff --git a/engine/overworld/player_animations.asm b/engine/overworld/player_animations.asm
index aed6954c..b63b12cc 100644
--- a/engine/overworld/player_animations.asm
+++ b/engine/overworld/player_animations.asm
@@ -480,7 +480,7 @@ FishingRodOAM:
 	dbsprite  9, 11,  4,  3, $fd, 0         ; down
 	dbsprite  9,  8,  4,  4, $fd, 0         ; up
 	dbsprite  8, 10,  0,  0, $fe, 0         ; left
-	dbsprite 11, 10,  0,  0, $fe, OAM_HFLIP ; right
+	dbsprite 11, 10,  0,  0, $fe, OAM_XFLIP ; right
 
 MACRO fishing_gfx
 	dw \1
diff --git a/engine/overworld/push_boulder.asm b/engine/overworld/push_boulder.asm
index 1773e818..2328b07a 100644
--- a/engine/overworld/push_boulder.asm
+++ b/engine/overworld/push_boulder.asm
@@ -28,7 +28,7 @@ TryPushingBoulder::
 	set BIT_TRIED_PUSH_BOULDER, [hl]
 	ret z ; the player must try pushing twice before the boulder will move
 	ldh a, [hJoyHeld]
-	and D_RIGHT | D_LEFT | D_UP | D_DOWN
+	and PAD_CTRL_PAD
 	ret z
 	predef CheckForCollisionWhenPushingBoulder
 	ld a, [wTileInFrontOfBoulderAndBoulderCollisionResult]
@@ -44,22 +44,22 @@ TryPushingBoulder::
 	cp SPRITE_FACING_RIGHT
 	jr z, .pushBoulderRight
 .pushBoulderDown
-	bit BIT_D_DOWN, b
+	bit B_PAD_DOWN, b
 	ret z
 	ld de, PushBoulderDownMovementData
 	jr .done
 .pushBoulderUp
-	bit BIT_D_UP, b
+	bit B_PAD_UP, b
 	ret z
 	ld de, PushBoulderUpMovementData
 	jr .done
 .pushBoulderLeft
-	bit BIT_D_LEFT, b
+	bit B_PAD_LEFT, b
 	ret z
 	ld de, PushBoulderLeftMovementData
 	jr .done
 .pushBoulderRight
-	bit BIT_D_RIGHT, b
+	bit B_PAD_RIGHT, b
 	ret z
 	ld de, PushBoulderRightMovementData
 .done
diff --git a/engine/overworld/update_map.asm b/engine/overworld/update_map.asm
index dbf28dae..d98a0941 100644
--- a/engine/overworld/update_map.asm
+++ b/engine/overworld/update_map.asm
@@ -63,7 +63,7 @@ RedrawMapView:
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	ld de, -2 * BG_MAP_WIDTH
+	ld de, -2 * TILEMAP_WIDTH
 	add hl, de
 	ld a, h
 	and $3
@@ -88,7 +88,7 @@ RedrawMapView:
 	jr nz, .calcWRAMAddrLoop
 	call CopyToRedrawRowOrColumnSrcTiles
 	pop hl
-	ld de, BG_MAP_WIDTH
+	ld de, TILEMAP_WIDTH
 	ldh a, [hRedrawMapViewRowOffset]
 	ld c, a
 .calcVRAMAddrLoop