diff options
| author | dannye <33dannye@gmail.com> | 2024-09-29 10:50:46 -0500 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2024-09-29 10:50:46 -0500 |
| commit | 716f8608c13fbee20b8fb71118e0691344098591 (patch) | |
| tree | a69f3805e6e8e372a8fe9c064aa77d76efbed3a3 /home | |
| parent | Identify more bit flags (#119) (diff) | |
| download | pokeyellow-716f8608c13fbee20b8fb71118e0691344098591.tar.gz pokeyellow-716f8608c13fbee20b8fb71118e0691344098591.tar.xz pokeyellow-716f8608c13fbee20b8fb71118e0691344098591.zip | |
Rename off-by-one wram labels
Diffstat (limited to 'home')
| -rw-r--r-- | home/map_objects.asm | 14 | ||||
| -rw-r--r-- | home/overworld.asm | 18 | ||||
| -rw-r--r-- | home/play_time.asm | 4 |
3 files changed, 18 insertions, 18 deletions
diff --git a/home/map_objects.asm b/home/map_objects.asm index 2359c7ca..c959f2db 100644 --- a/home/map_objects.asm +++ b/home/map_objects.asm @@ -71,11 +71,11 @@ IsItemInBag:: ret IsSurfingPikachuInParty:: -; set bit 6 of wd472 if true +; set bit 6 of wd471 if true ; also calls Func_3467, which is a bankswitch to IsStarterPikachuInOurParty - ld a, [wd472] + ld a, [wd471] and $3f - ld [wd472], a + ld [wd471], a ld hl, wPartyMon1 ld c, PARTY_LENGTH ld b, SURF @@ -99,9 +99,9 @@ IsSurfingPikachuInParty:: cp b jr nz, .noSurf .hasSurf - ld a, [wd472] + ld a, [wd471] set 6, a - ld [wd472], a + ld [wd471], a .noSurf pop hl .notPikachu @@ -119,9 +119,9 @@ Func_3467:: pop bc pop hl ret nc - ld a, [wd472] + ld a, [wd471] set 7, a - ld [wd472], a + ld [wd471], a ret DisplayPokedex:: diff --git a/home/overworld.asm b/home/overworld.asm index 2b32eb16..a661ec04 100644 --- a/home/overworld.asm +++ b/home/overworld.asm @@ -93,7 +93,7 @@ OverworldLoopLessDelay:: and a jp z, OverworldLoop ; jump if a hidden object or bookshelf was found, but not if a card key door was found xor a - ld [wd436], a ; new yellow address + ld [wd435], a ; new yellow address call IsSpriteOrSignInFrontOfPlayer call Func_0ffe ldh a, [hTextID] @@ -127,7 +127,7 @@ OverworldLoopLessDelay:: ld hl, wMiscFlags res BIT_TURNING, [hl] xor a - ld [wd435], a + ld [wd434], a ld a, 1 ld [wCheckFor180DegreeTurn], a ld a, [wPlayerMovingDirection] ; the direction that was pressed last time @@ -186,7 +186,7 @@ OverworldLoopLessDelay:: cp b jr z, .noDirectionChange ld a, $8 - ld [wd435], a + ld [wd434], a ; unlike in red/blue, yellow does not have the 180 degrees odd code ld hl, wMiscFlags set BIT_TURNING, [hl] @@ -239,7 +239,7 @@ OverworldLoopLessDelay:: ld hl, wMiscFlags res BIT_TURNING, [hl] xor a - ld [wd435], a + ld [wd434], a call DoBikeSpeedup call AdvancePlayerSprite ld a, [wWalkCounter] @@ -1169,7 +1169,7 @@ IsSpriteInFrontOfPlayer2:: cp $f jr nz, .dontwritetowd436 ld a, $FF - ld [wd436], a + ld [wd435], a .dontwritetowd436 scf ret @@ -1245,7 +1245,7 @@ CollisionCheckOnLand:: ldh a, [hJoyHeld] and $2 jr nz, .asm_0a5c - ld hl, wd435 + ld hl, wd434 ld a, [hl] and a jr z, .asm_0a5c @@ -1746,13 +1746,13 @@ RunMapScript:: LoadWalkingPlayerSpriteGraphics:: ; new sprite copy stuff xor a - ld [wd473], a + ld [wd472], a ld b, BANK(RedSprite) ld de, RedSprite jr LoadPlayerSpriteGraphicsCommon LoadSurfingPlayerSpriteGraphics2:: - ld a, [wd473] + ld a, [wd472] and a jr z, .asm_0d75 dec a @@ -1760,7 +1760,7 @@ LoadSurfingPlayerSpriteGraphics2:: dec a jr z, .asm_0d7c .asm_0d75 - ld a, [wd472] + ld a, [wd471] bit 6, a jr z, LoadSurfingPlayerSpriteGraphics .asm_0d7c diff --git a/home/play_time.asm b/home/play_time.asm index b7f4b4c5..fe243610 100644 --- a/home/play_time.asm +++ b/home/play_time.asm @@ -1,6 +1,6 @@ TrackPlayTime:: call CountDownIgnoreInputBitReset - ld hl, wd47a + ld hl, wd479 bit 0, [hl] jr nz, .maxIGT ld a, [wStatusFlags6] @@ -35,7 +35,7 @@ TrackPlayTime:: ld [wPlayTimeHours], a cp $ff ret nz - ld hl, wd47a + ld hl, wd479 set 0, [hl] .maxIGT ld a, 59 |