Fix DMG intro and big mode bug.

This commit is contained in:
Randy Thiemann 2023-11-23 13:46:49 +01:00
parent 6dcef748d6
commit 08b2f07024
7 changed files with 2159 additions and 2133 deletions

Binary file not shown.

File diff suppressed because it is too large Load Diff

Binary file not shown.

File diff suppressed because it is too large Load Diff

View File

@ -799,6 +799,9 @@ GBCBigGameplayProcess::
ret ret
.black .black
ld a, [wBGMode]
cp a, BG_MODE_DARK
jr z, .white
ld a, OCPSF_AUTOINC | (7*8)+(3*2) ld a, OCPSF_AUTOINC | (7*8)+(3*2)
ldh [rOCPS], a ldh [rOCPS], a
ld bc, BLACK_F_C ld bc, BLACK_F_C
@ -809,6 +812,17 @@ GBCBigGameplayProcess::
ldh [rOCPD], a ldh [rOCPD], a
ret ret
.white
ld a, OCPSF_AUTOINC | (7*8)+(3*2)
ldh [rOCPS], a
ld bc, WHITE_F_C
wait_vram
ld a, c
ldh [rOCPD], a
ld a, b
ldh [rOCPD], a
ret
; Copies the shadow tile maps to VRAM using HDMA. The attributes are copied using instant mode ; Copies the shadow tile maps to VRAM using HDMA. The attributes are copied using instant mode
; The tile data is done using hblank mode. ; The tile data is done using hblank mode.

View File

@ -71,7 +71,9 @@ DoDMGEffect:
; Yeet the logo ; Yeet the logo
ld c, 10 ld c, 10
.loop0 .loop0
push bc
call GetInput call GetInput
pop bc
ldh a, [hStartState] ldh a, [hStartState]
ld hl, hAState ld hl, hAState
or a, [hl] or a, [hl]
@ -88,7 +90,9 @@ DoDMGEffect:
ld c, 45 ld c, 45
.loop1 .loop1
push bc
call GetInput call GetInput
pop bc
ldh a, [hStartState] ldh a, [hStartState]
ld hl, hAState ld hl, hAState
or a, [hl] or a, [hl]
@ -111,7 +115,9 @@ DoDMGEffect:
ld c, 20 ld c, 20
.loop2 .loop2
push bc
call GetInput call GetInput
pop bc
ldh a, [hStartState] ldh a, [hStartState]
ld hl, hAState ld hl, hAState
or a, [hl] or a, [hl]
@ -129,7 +135,9 @@ DoDMGEffect:
ld c, 20 ld c, 20
.loop3 .loop3
push bc
call GetInput call GetInput
pop bc
ldh a, [hStartState] ldh a, [hStartState]
ld hl, hAState ld hl, hAState
or a, [hl] or a, [hl]
@ -147,7 +155,9 @@ DoDMGEffect:
ld c, 20 ld c, 20
.loop4 .loop4
push bc
call GetInput call GetInput
pop bc
ldh a, [hStartState] ldh a, [hStartState]
ld hl, hAState ld hl, hAState
or a, [hl] or a, [hl]

View File

@ -909,8 +909,6 @@ SwitchToGameplayBigB:
jr z, .ungraded jr z, .ungraded
cp a, SCURVE_MYCO cp a, SCURVE_MYCO
jr z, .ungraded jr z, .ungraded
cp a, SCURVE_TGM3 ; TODO: Remove when this one has grades.
jr z, .ungraded
.graded .graded
ld de, sBigGameplayTileMap ld de, sBigGameplayTileMap