Replace hardware_constants.asm with hardware.inc (#511)

8 files changed, 42 insertions, 42 deletions

diff --git a/engine/movie/evolution.asm b/engine/movie/evolution.asm
index 69463bfa..4258b94d 100644
--- a/engine/movie/evolution.asm
+++ b/engine/movie/evolution.asm
@@ -145,7 +145,7 @@ Evolution_CheckForCancel:
 	call JoypadLowSensitivity
 	ldh a, [hJoy5]
 	pop bc
-	and B_BUTTON
+	and PAD_B
 	jr nz, .pressedB
 .notAllowedToCancel
 	dec c
diff --git a/engine/movie/hall_of_fame.asm b/engine/movie/hall_of_fame.asm
index 231f3369..236cf516 100644
--- a/engine/movie/hall_of_fame.asm
+++ b/engine/movie/hall_of_fame.asm
@@ -12,7 +12,7 @@ AnimateHallOfFame:
 	call FillMemory
 	call EnableLCD
 	ld hl, rLCDC
-	set rLCDC_BG_TILEMAP, [hl]
+	set B_LCDC_BG_MAP, [hl]
 	xor a
 	ld hl, wHallOfFame
 	ld bc, HOF_TEAM
@@ -88,7 +88,7 @@ AnimateHallOfFame:
 	xor a
 	ldh [hWY], a
 	ld hl, rLCDC
-	res rLCDC_BG_TILEMAP, [hl]
+	res B_LCDC_BG_MAP, [hl]
 	ret
 
 HallOfFameText:
diff --git a/engine/movie/intro.asm b/engine/movie/intro.asm
index facbfbaf..00316018 100644
--- a/engine/movie/intro.asm
+++ b/engine/movie/intro.asm
@@ -92,7 +92,7 @@ PlayIntroScene:
 ; hip
 	ld a, SFX_INTRO_HIP
 	call PlaySound
-	ld a, (FightIntroFrontMon2 - FightIntroFrontMon) / LEN_2BPP_TILE
+	ld a, (FightIntroFrontMon2 - FightIntroFrontMon) / TILE_SIZE
 	ld [wIntroNidorinoBaseTile], a
 	ld de, IntroNidorinoAnimation3
 	call AnimateIntroNidorino
@@ -124,7 +124,7 @@ PlayIntroScene:
 	call CheckForUserInterruption
 	ret c
 
-	ld a, (FightIntroFrontMon2 - FightIntroFrontMon) / LEN_2BPP_TILE
+	ld a, (FightIntroFrontMon2 - FightIntroFrontMon) / TILE_SIZE
 	ld [wIntroNidorinoBaseTile], a
 	ld de, IntroNidorinoAnimation6
 	call AnimateIntroNidorino
@@ -135,7 +135,7 @@ PlayIntroScene:
 ; lunge
 	ld a, SFX_INTRO_LUNGE
 	call PlaySound
-	ld a, (FightIntroFrontMon3 - FightIntroFrontMon) / LEN_2BPP_TILE
+	ld a, (FightIntroFrontMon3 - FightIntroFrontMon) / TILE_SIZE
 	ld [wIntroNidorinoBaseTile], a
 	ld de, IntroNidorinoAnimation7
 	jp AnimateIntroNidorino
@@ -192,7 +192,7 @@ InitIntroNidorinoOAM:
 	ld [hli], a ; X
 	ld a, d
 	ld [hli], a ; tile
-	ld a, OAM_BEHIND_BG
+	ld a, OAM_PRIO
 	ld [hli], a ; attributes
 	inc d
 	dec c
@@ -207,7 +207,7 @@ InitIntroNidorinoOAM:
 
 IntroClearScreen:
 	ld hl, vBGMap1
-	ld bc, BG_MAP_WIDTH * SCREEN_HEIGHT
+	ld bc, TILEMAP_WIDTH * SCREEN_HEIGHT
 	jr IntroClearCommon
 
 IntroClearMiddleOfScreen:
@@ -318,8 +318,8 @@ PlayShootingStar:
 	call LoadIntroGraphics
 	call EnableLCD
 	ld hl, rLCDC
-	res rLCDC_WINDOW_ENABLE, [hl]
-	set rLCDC_BG_TILEMAP, [hl]
+	res B_LCDC_WINDOW, [hl]
+	set B_LCDC_BG_MAP, [hl]
 	ld c, 64
 	call DelayFrames
 	farcall AnimateShootingStar
@@ -350,10 +350,10 @@ IntroDrawBlackBars:
 	ld c, SCREEN_WIDTH * 4
 	call IntroPlaceBlackTiles
 	ld hl, vBGMap1
-	ld c,  BG_MAP_WIDTH * 4
+	ld c,  TILEMAP_WIDTH * 4
 	call IntroPlaceBlackTiles
 	hlbgcoord 0, 14, vBGMap1
-	ld c,  BG_MAP_WIDTH * 4
+	ld c,  TILEMAP_WIDTH * 4
 	jp IntroPlaceBlackTiles
 
 LoadPresentsGraphic: ; unreferenced
diff --git a/engine/movie/oak_speech/oak_speech.asm b/engine/movie/oak_speech/oak_speech.asm
index 5c364435..02826b98 100644
--- a/engine/movie/oak_speech/oak_speech.asm
+++ b/engine/movie/oak_speech/oak_speech.asm
@@ -118,7 +118,7 @@ OakSpeech:
 	call PlaySound
 	pop af
 	ldh [hLoadedROMBank], a
-	ld [MBC1RomBank], a
+	ld [rROMB], a
 	ld c, 4
 	call DelayFrames
 	ld de, RedSprite
@@ -146,7 +146,7 @@ OakSpeech:
 	call PlaySound
 	pop af
 	ldh [hLoadedROMBank], a
-	ld [MBC1RomBank], a
+	ld [rROMB], a
 	ld c, 20
 	call DelayFrames
 	hlcoord 6, 5
diff --git a/engine/movie/oak_speech/oak_speech2.asm b/engine/movie/oak_speech/oak_speech2.asm
index 40c75f62..ceaa6838 100644
--- a/engine/movie/oak_speech/oak_speech2.asm
+++ b/engine/movie/oak_speech/oak_speech2.asm
@@ -177,7 +177,7 @@ DisplayIntroNameTextBox:
 	ld [wLastMenuItem], a
 	inc a
 	ld [wTopMenuItemX], a
-	ld [wMenuWatchedKeys], a ; A_BUTTON
+	ld [wMenuWatchedKeys], a ; PAD_A
 	inc a
 	ld [wTopMenuItemY], a
 	inc a
diff --git a/engine/movie/splash.asm b/engine/movie/splash.asm
index 6e483e99..da3fec0d 100644
--- a/engine/movie/splash.asm
+++ b/engine/movie/splash.asm
@@ -146,7 +146,7 @@ AnimateShootingStar:
 	ret
 
 SmallStarsOAM:
-	dbsprite  0,  0,  0,  0, $A2, OAM_BEHIND_BG | OAM_OBP1
+	dbsprite  0,  0,  0,  0, $A2, OAM_PRIO | OAM_PAL1
 SmallStarsOAMEnd:
 
 SmallStarsWaveCoordsPointerTable:
@@ -228,10 +228,10 @@ GameFreakLogoOAMData:
 GameFreakLogoOAMDataEnd:
 
 GameFreakShootingStarOAMData:
-	dbsprite 20,  0,  0,  0, $a0, OAM_OBP1
-	dbsprite 21,  0,  0,  0, $a0, OAM_OBP1 | OAM_HFLIP
-	dbsprite 20,  1,  0,  0, $a1, OAM_OBP1
-	dbsprite 21,  1,  0,  0, $a1, OAM_OBP1 | OAM_HFLIP
+	dbsprite 20,  0,  0,  0, $a0, OAM_PAL1
+	dbsprite 21,  0,  0,  0, $a0, OAM_PAL1 | OAM_XFLIP
+	dbsprite 20,  1,  0,  0, $a1, OAM_PAL1
+	dbsprite 21,  1,  0,  0, $a1, OAM_PAL1 | OAM_XFLIP
 GameFreakShootingStarOAMDataEnd:
 
 FallingStar:
diff --git a/engine/movie/title.asm b/engine/movie/title.asm
index bad1df92..83fb32e8 100644
--- a/engine/movie/title.asm
+++ b/engine/movie/title.asm
@@ -254,12 +254,12 @@ ENDC
 	call LoadGBPal
 	ldh a, [hJoyHeld]
 	ld b, a
-	and D_UP | SELECT | B_BUTTON
-	cp D_UP | SELECT | B_BUTTON
+	and PAD_UP | PAD_SELECT | PAD_B
+	cp PAD_UP | PAD_SELECT | PAD_B
 	jp z, .doClearSaveDialogue
 IF DEF(_DEBUG)
 	ld a, b
-	bit BIT_SELECT, a
+	bit B_PAD_SELECT, a
 	jp nz, DebugMenu
 ENDC
 	jp MainMenu
diff --git a/engine/movie/trade.asm b/engine/movie/trade.asm
index fd1c6ac1..f2ae9bb7 100644
--- a/engine/movie/trade.asm
+++ b/engine/movie/trade.asm
@@ -347,9 +347,9 @@ Trade_AnimateBallEnteringLinkCable:
 
 Trade_BallInsideLinkCableOAMBlock:
 	db $7e, 0
-	db $7e, OAM_HFLIP
-	db $7e, OAM_VFLIP
-	db $7e, OAM_HFLIP | OAM_VFLIP
+	db $7e, OAM_XFLIP
+	db $7e, OAM_YFLIP
+	db $7e, OAM_XFLIP | OAM_YFLIP
 
 Trade_ShowEnemyMon:
 	ld a, TRADE_BALL_TILT_ANIM
@@ -712,28 +712,28 @@ Trade_CircleOAMBlocks:
 	trade_circle_oam_block .OAMBlock3, 24, 24
 
 .OAMBlock0:
-	db ICON_TRADEBUBBLE << 2 + 0, OAM_OBP1
-	db ICON_TRADEBUBBLE << 2 + 1, OAM_OBP1
-	db ICON_TRADEBUBBLE << 2 + 2, OAM_OBP1
-	db ICON_TRADEBUBBLE << 2 + 3, OAM_OBP1
+	db ICON_TRADEBUBBLE << 2 + 0, OAM_PAL1
+	db ICON_TRADEBUBBLE << 2 + 1, OAM_PAL1
+	db ICON_TRADEBUBBLE << 2 + 2, OAM_PAL1
+	db ICON_TRADEBUBBLE << 2 + 3, OAM_PAL1
 
 .OAMBlock1:
-	db ICON_TRADEBUBBLE << 2 + 1, OAM_OBP1 | OAM_HFLIP
-	db ICON_TRADEBUBBLE << 2 + 0, OAM_OBP1 | OAM_HFLIP
-	db ICON_TRADEBUBBLE << 2 + 3, OAM_OBP1 | OAM_HFLIP
-	db ICON_TRADEBUBBLE << 2 + 2, OAM_OBP1 | OAM_HFLIP
+	db ICON_TRADEBUBBLE << 2 + 1, OAM_PAL1 | OAM_XFLIP
+	db ICON_TRADEBUBBLE << 2 + 0, OAM_PAL1 | OAM_XFLIP
+	db ICON_TRADEBUBBLE << 2 + 3, OAM_PAL1 | OAM_XFLIP
+	db ICON_TRADEBUBBLE << 2 + 2, OAM_PAL1 | OAM_XFLIP
 
 .OAMBlock2:
-	db ICON_TRADEBUBBLE << 2 + 2, OAM_OBP1 | OAM_VFLIP
-	db ICON_TRADEBUBBLE << 2 + 3, OAM_OBP1 | OAM_VFLIP
-	db ICON_TRADEBUBBLE << 2 + 0, OAM_OBP1 | OAM_VFLIP
-	db ICON_TRADEBUBBLE << 2 + 1, OAM_OBP1 | OAM_VFLIP
+	db ICON_TRADEBUBBLE << 2 + 2, OAM_PAL1 | OAM_YFLIP
+	db ICON_TRADEBUBBLE << 2 + 3, OAM_PAL1 | OAM_YFLIP
+	db ICON_TRADEBUBBLE << 2 + 0, OAM_PAL1 | OAM_YFLIP
+	db ICON_TRADEBUBBLE << 2 + 1, OAM_PAL1 | OAM_YFLIP
 
 .OAMBlock3:
-	db ICON_TRADEBUBBLE << 2 + 3, OAM_OBP1 | OAM_HFLIP | OAM_VFLIP
-	db ICON_TRADEBUBBLE << 2 + 2, OAM_OBP1 | OAM_HFLIP | OAM_VFLIP
-	db ICON_TRADEBUBBLE << 2 + 1, OAM_OBP1 | OAM_HFLIP | OAM_VFLIP
-	db ICON_TRADEBUBBLE << 2 + 0, OAM_OBP1 | OAM_HFLIP | OAM_VFLIP
+	db ICON_TRADEBUBBLE << 2 + 3, OAM_PAL1 | OAM_XFLIP | OAM_YFLIP
+	db ICON_TRADEBUBBLE << 2 + 2, OAM_PAL1 | OAM_XFLIP | OAM_YFLIP
+	db ICON_TRADEBUBBLE << 2 + 1, OAM_PAL1 | OAM_XFLIP | OAM_YFLIP
+	db ICON_TRADEBUBBLE << 2 + 0, OAM_PAL1 | OAM_XFLIP | OAM_YFLIP
 
 ; a = species
 Trade_LoadMonSprite: