diff options
| author | dannye <33dannye@gmail.com> | 2023-11-21 20:56:28 -0600 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2023-11-21 20:56:28 -0600 |
| commit | 04f7f7f506a1dbb877e4678601261e8157fd0e57 (patch) | |
| tree | bfe62d3872c5f031ee40df9488910bd58b0e1b15 /home | |
| parent | Extend tools/pcm.c to allow decoding .pcm to .wav (diff) | |
| parent | Fix some map text constants (diff) | |
| download | pokeyellow-04f7f7f506a1dbb877e4678601261e8157fd0e57.tar.gz pokeyellow-04f7f7f506a1dbb877e4678601261e8157fd0e57.tar.xz pokeyellow-04f7f7f506a1dbb877e4678601261e8157fd0e57.zip | |
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'home')
| -rw-r--r-- | home/fade.asm | 18 | ||||
| -rw-r--r-- | home/hidden_objects.asm | 2 | ||||
| -rw-r--r-- | home/overworld.asm | 2 | ||||
| -rw-r--r-- | home/pathfinding.asm | 2 | ||||
| -rw-r--r-- | home/text_script.asm | 2 |
5 files changed, 13 insertions, 13 deletions
diff --git a/home/fade.asm b/home/fade.asm index f38878b1..3180db7b 100644 --- a/home/fade.asm +++ b/home/fade.asm @@ -71,12 +71,12 @@ GBFadeDecCommon: jr nz, GBFadeDecCommon ret -FadePal1:: db %11111111, %11111111, %11111111 -FadePal2:: db %11111110, %11111110, %11111000 -FadePal3:: db %11111001, %11100100, %11100100 -FadePal4:: db %11100100, %11010000, %11100000 -; rBGP rOBP0 rOBP1 -FadePal5:: db %11100100, %11010000, %11100000 -FadePal6:: db %10010000, %10000000, %10010000 -FadePal7:: db %01000000, %01000000, %01000000 -FadePal8:: db %00000000, %00000000, %00000000 +FadePal1:: dc 3,3,3,3, 3,3,3,3, 3,3,3,3 +FadePal2:: dc 3,3,3,2, 3,3,3,2, 3,3,2,0 +FadePal3:: dc 3,3,2,1, 3,2,1,0, 3,2,1,0 +FadePal4:: dc 3,2,1,0, 3,1,0,0, 3,2,0,0 +; rBGP rOBP0 rOBP1 +FadePal5:: dc 3,2,1,0, 3,1,0,0, 3,2,0,0 +FadePal6:: dc 2,1,0,0, 2,0,0,0, 2,1,0,0 +FadePal7:: dc 1,0,0,0, 1,0,0,0, 1,0,0,0 +FadePal8:: dc 0,0,0,0, 0,0,0,0, 0,0,0,0 diff --git a/home/hidden_objects.asm b/home/hidden_objects.asm index d22bd3d8..986ce38f 100644 --- a/home/hidden_objects.asm +++ b/home/hidden_objects.asm @@ -25,7 +25,7 @@ CheckForHiddenObjectOrBookshelfOrCardKeyDoor:: .hiddenObjectNotFound predef GetTileAndCoordsInFrontOfPlayer farcall PrintBookshelfText - ldh a, [hFFDB] + ldh a, [hInteractedWithBookshelf] and a jr z, .done .nothingFound diff --git a/home/overworld.asm b/home/overworld.asm index 201d5d42..a6acecd2 100644 --- a/home/overworld.asm +++ b/home/overworld.asm @@ -1629,7 +1629,7 @@ AreInputsSimulated:: ; if done simulating button presses .doneSimulating xor a - ld [wWastedByteCD3A], a + ld [wUnusedCD3A], a ld [wSimulatedJoypadStatesIndex], a ld [wSimulatedJoypadStatesEnd], a ld [wJoyIgnore], a diff --git a/home/pathfinding.asm b/home/pathfinding.asm index 53f98847..77cb5c4b 100644 --- a/home/pathfinding.asm +++ b/home/pathfinding.asm @@ -40,7 +40,7 @@ MoveSprite_:: ld [wSimulatedJoypadStatesEnd], a dec a ld [wJoyIgnore], a - ld [wWastedByteCD3A], a + ld [wUnusedCD3A], a ret ; divides [hDividend2] by [hDivisor2] and stores the quotient in [hQuotient2] diff --git a/home/text_script.asm b/home/text_script.asm index ab0cd804..a70e0f9c 100644 --- a/home/text_script.asm +++ b/home/text_script.asm @@ -201,7 +201,7 @@ DisplayPlayerBlackedOutText:: ld [wSafariSteps], a ld [wSafariSteps + 1], a EventFlagAddressA EVENT_IN_SAFARI_ZONE - ld [wcf0d], a + ld [wNextSafariZoneGateScript], a ld [wSafariZoneGateCurScript], a .didnotblackoutinsafari jp HoldTextDisplayOpen |