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

10 files changed, 45 insertions, 45 deletions

diff --git a/engine/movie/credits.asm b/engine/movie/credits.asm
index 22006e6a..f7e13aab 100644
--- a/engine/movie/credits.asm
+++ b/engine/movie/credits.asm
@@ -65,7 +65,7 @@ DisplayCreditsMon:
 	xor a
 	ldh [hAutoBGTransferEnabled], a
 	ld hl, rLCDC
-	set rLCDC_BG_TILEMAP, [hl]
+	set B_LCDC_BG_MAP, [hl]
 	call SaveScreenTilesToBuffer2
 	call FillMiddleOfScreenWithWhite
 	call GetNextCreditsMon
@@ -80,7 +80,7 @@ DisplayCreditsMon:
 	ldh [rBGP], a
 	call UpdateCGBPal_BGP
 	ld hl, rLCDC
-	res rLCDC_BG_TILEMAP, [hl]
+	res B_LCDC_BG_MAP, [hl]
 	ld a, 1
 	ldh [hAutoBGTransferEnabled], a
 	ld b, 0
diff --git a/engine/movie/evolution.asm b/engine/movie/evolution.asm
index 99f14322..9d24c0d5 100644
--- a/engine/movie/evolution.asm
+++ b/engine/movie/evolution.asm
@@ -141,7 +141,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 defe5502..025d6a03 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
@@ -87,7 +87,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 33a3a134..f018d860 100644
--- a/engine/movie/intro.asm
+++ b/engine/movie/intro.asm
@@ -35,7 +35,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
@@ -50,7 +50,7 @@ InitIntroNidorinoOAM:
 
 IntroClearScreen:
 	ld hl, vBGMap1
-	ld bc, BG_MAP_WIDTH * SCREEN_HEIGHT
+	ld bc, TILEMAP_WIDTH * SCREEN_HEIGHT
 	jr IntroClearCommon
 
 IntroClearMiddleOfScreen:
@@ -116,8 +116,8 @@ PlayShootingStar:
 
 	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
@@ -142,10 +142,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/intro_yellow.asm b/engine/movie/intro_yellow.asm
index 4e8282bc..47203580 100644
--- a/engine/movie/intro_yellow.asm
+++ b/engine/movie/intro_yellow.asm
@@ -15,7 +15,7 @@ PlayIntroScene:
 	jr nz, .go_to_title_screen
 	call JoypadLowSensitivity
 	ldh a, [hJoyPressed]
-	and A_BUTTON | B_BUTTON | START
+	and PAD_A | PAD_B | PAD_START
 	jr nz, .go_to_title_screen
 	call Func_f98fc
 	ld a, $0
diff --git a/engine/movie/oak_speech/clear_save.asm b/engine/movie/oak_speech/clear_save.asm
index 2dd5f4a7..4df2faa4 100644
--- a/engine/movie/oak_speech/clear_save.asm
+++ b/engine/movie/oak_speech/clear_save.asm
@@ -5,7 +5,7 @@ DoClearSaveDialogue:
 	call LoadTextBoxTilePatterns
 	ld hl, ClearSaveDataText
 	call PrintText
-	ld a, B_BUTTON
+	ld a, PAD_B
 	ld [wJoyIgnore], a
 	hlcoord 14, 7
 	lb bc, 8, 15
diff --git a/engine/movie/oak_speech/oak_speech2.asm b/engine/movie/oak_speech/oak_speech2.asm
index 39dcf001..300b5590 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 6d9b9be9..5b837591 100644
--- a/engine/movie/splash.asm
+++ b/engine/movie/splash.asm
@@ -158,7 +158,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:
@@ -248,10 +248,10 @@ GameFreakLogoOAMData:
 GameFreakLogoOAMDataEnd:
 
 GameFreakShootingStarOAMData:
-	dbsprite 20,  0,  0,  0, $a0, OAM_OBP1 | OAM_HIGH_PALS
-	dbsprite 21,  0,  0,  0, $a0, OAM_OBP1 | OAM_HIGH_PALS | OAM_HFLIP
-	dbsprite 20,  1,  0,  0, $a1, OAM_OBP1 | OAM_HIGH_PALS
-	dbsprite 21,  1,  0,  0, $a1, OAM_OBP1 | OAM_HIGH_PALS | OAM_HFLIP
+	dbsprite 20,  0,  0,  0, $a0, OAM_PAL1 | OAM_HIGH_PALS
+	dbsprite 21,  0,  0,  0, $a0, OAM_PAL1 | OAM_HIGH_PALS | OAM_XFLIP
+	dbsprite 20,  1,  0,  0, $a1, OAM_PAL1 | OAM_HIGH_PALS
+	dbsprite 21,  1,  0,  0, $a1, OAM_PAL1 | OAM_HIGH_PALS | OAM_XFLIP
 GameFreakShootingStarOAMDataEnd:
 
 FallingStar:
diff --git a/engine/movie/title.asm b/engine/movie/title.asm
index ec7a2aa3..7a4637ec 100644
--- a/engine/movie/title.asm
+++ b/engine/movie/title.asm
@@ -165,12 +165,12 @@ DisplayTitleScreen:
 	call DelayFrame
 	call JoypadLowSensitivity
 	ldh a, [hJoyHeld]
-	cp D_UP | SELECT | B_BUTTON
+	cp PAD_UP | PAD_SELECT | PAD_B
 	jr z, .go_to_main_menu
 IF DEF(_DEBUG)
-	and A_BUTTON | SELECT | START
+	and PAD_A | PAD_SELECT | PAD_START
 ELSE
-	and A_BUTTON | START
+	and PAD_A | PAD_START
 ENDC
 	jr nz, .go_to_main_menu
 	call DoTitleScreenFunction
@@ -194,12 +194,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 z, MainMenu
 	callfar DebugMenu
 	jp hl
diff --git a/engine/movie/trade.asm b/engine/movie/trade.asm
index dfbe643f..2cb51d98 100644
--- a/engine/movie/trade.asm
+++ b/engine/movie/trade.asm
@@ -150,7 +150,7 @@ Trade_Delay80:
 
 Trade_ClearTileMap:
 	hlcoord 0, 0
-	ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
+	ld bc, SCREEN_AREA
 	ld a, " "
 	jp FillMemory
 
@@ -350,9 +350,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
@@ -716,28 +716,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: