Dump and label Field Select screen's border animations.

2 files changed, 26 insertions, 15 deletions

diff --git a/data/oam_frames.asm b/data/oam_frames.asm
index 5ba0aab..0d56c95 100755
--- a/data/oam_frames.asm
+++ b/data/oam_frames.asm
@@ -157,9 +157,9 @@ OAMDataPointers: ; 0x4000
 	dw SendHighScoresAnimation4OAM

 	dw SendHighScoresAnimation5OAM

 	dw SendHighScoresAnimation6OAM

-	dw FieldSelectRedStageBorderOAM

-	dw FieldSelectBlueStageBorderOAM

-	dw OAMData_a0

+	dw FieldSelectGreyBorderOAM

+	dw FieldSelectWhiteBorderOAM

+	dw FieldSelectBlackBorderOAM

 	dw OAMData_a1

 	dw OAMData_a2

 	dw OAMData_a3

@@ -1470,7 +1470,7 @@ SendHighScoresAnimation6OAM: ; 0x4e17
 	db $10, $08, $94, $04

 	db $80 ; terminator

 

-FieldSelectRedStageBorderOAM: ; 0x4e28

+FieldSelectGreyBorderOAM: ; 0x4e28

 	db $36, $1c, $71, $40

 	db $26, $24, $72, $60

 	db $2e, $24, $72, $60

@@ -1511,7 +1511,7 @@ FieldSelectRedStageBorderOAM: ; 0x4e28
 	db $e2, $e8, $70, $00

 	db $80 ; terminator

 

-FieldSelectBlueStageBorderOAM: ; 0x4ec1

+FieldSelectWhiteBorderOAM: ; 0x4ec1

 	db $36, $1c, $74, $40

 	db $26, $24, $75, $60

 	db $2e, $24, $75, $60

@@ -1552,7 +1552,7 @@ FieldSelectBlueStageBorderOAM: ; 0x4ec1
 	db $e2, $e8, $73, $00

 	db $80 ; terminator

 

-OAMData_a0: ; 0x4f5a

+FieldSelectBlackBorderOAM: ; 0x4f5a

 	db $36, $1c, $77, $40

 	db $26, $24, $78, $60

 	db $2e, $24, $78, $60

diff --git a/main.asm b/main.asm
index f951a62..c0cd2a0 100755
--- a/main.asm
+++ b/main.asm
@@ -5714,7 +5714,7 @@ FieldSelectGfx_GameBoyColor: ; 0xd730
 
 ChooseFieldToPlay: ; 0xd74e
 	call MoveFieldSelectCursor
-	ld hl, Data_d83d
+	ld hl, FieldSelectBorderAnimationData
 	call AnimateBlinkingFieldSelectBorder
 	ld a, [hNewlyPressedButtons]
 	and (A_BUTTON | B_BUTTON)
@@ -5734,7 +5734,7 @@ ExitFieldSelectScreen: ; 0xd774
 	ld a, [wd8f6]  ; this holds the button that was pressed (A or B)
 	bit BIT_A_BUTTON, a
 	jr z, .didntPressA
-	ld hl, Data_d846
+	ld hl, FieldSelectConfirmationAnimationData
 	call AnimateBlinkingFieldSelectBorder
 	ld a, [wFieldSelectBlinkingBorderTimer]
 	dec a
@@ -5818,7 +5818,7 @@ AnimateBlinkingFieldSelectBorder: ; 0xd7fb
 	sla a
 	ld c, a
 	ld b, $0
-	ld hl, Data_d84f
+	ld hl, FieldSelectBorderOAMPixelOffsetData
 	add hl, bc
 	ld a, [hli]
 	ld c, a
@@ -5858,14 +5858,25 @@ AnimateBlinkingFieldSelectBorder: ; 0xd7fb
 	pop hl
 	ret
 
-Data_d83d:
-	dr $d83d, $d846
+FieldSelectBorderAnimationData:
+; [OAM id][duration]
+	db $9e, $08
+	db $9f, $08
+	db $9e, $08
+	db $a0, $08
+	db $00  ; terminator
 
-Data_d846:
-	dr $d846, $d84f
+FieldSelectConfirmationAnimationData:
+; [OAM id][duration]
+	db $9F, $03
+	db $A0, $03
+	db $9F, $03
+	db $A0, $03
+	db $00  ; terminator
 
-Data_d84f:
-	dr $d84f, $d853
+FieldSelectBorderOAMPixelOffsetData:
+	dw $2A42
+	dw $7242
 
 HandlePinballGame: ; 0xd853
 	ld a, [wScreenState]