diff options
Diffstat (limited to 'engine/pikachu')
| -rw-r--r-- | engine/pikachu/pikachu_emotions.asm | 6 | ||||
| -rw-r--r-- | engine/pikachu/pikachu_follow.asm | 14 |
2 files changed, 10 insertions, 10 deletions
diff --git a/engine/pikachu/pikachu_emotions.asm b/engine/pikachu/pikachu_emotions.asm index de6230a6..a29fd781 100644 --- a/engine/pikachu/pikachu_emotions.asm +++ b/engine/pikachu/pikachu_emotions.asm @@ -1,5 +1,5 @@ IsPlayerTalkingToPikachu:: - ld a, [wd436] + ld a, [wd435] and a ret z ldh a, [hSpriteIndex] @@ -8,7 +8,7 @@ IsPlayerTalkingToPikachu:: call InitializePikachuTextID xor a ldh [hSpriteIndex], a - ld [wd436], a + ld [wd435], a ret InitializePikachuTextID:: @@ -343,7 +343,7 @@ MapSpecificPikachuExpression: ldpikaemotion a, PikachuEmotion22 jr c, .play_emotion .notInLavenderTower - ld a, [wd49c] + ld a, [wd49b] and a jr z, .mood_based_emotion dec a diff --git a/engine/pikachu/pikachu_follow.asm b/engine/pikachu/pikachu_follow.asm index a33da505..14331682 100644 --- a/engine/pikachu/pikachu_follow.asm +++ b/engine/pikachu/pikachu_follow.asm @@ -140,7 +140,7 @@ CalculatePikachuPlacementCoords:: inc hl ld [hl], $fe push hl - ld hl, wd472 + ld hl, wd471 set 5, [hl] pop hl ret @@ -614,15 +614,15 @@ Func_fc862: add hl, bc ld [hl], $6 xor a + ld [wd431], a ld [wd432], a - ld [wd433], a ld hl, wSpritePikachuStateData2WalkAnimationCounter - wSpritePikachuStateData1 add hl, bc ld [hl], $11 asm_fc87f: - ld a, [wd432] + ld a, [wd431] ld e, a - ld a, [wd433] + ld a, [wd432] ld d, a call Func_fc82e jr c, Func_fc8c7 @@ -648,11 +648,11 @@ asm_fc87f: adc 0 ld h, a ld a, [hli] - ld [wd432], a + ld [wd431], a add e ld e, a ld a, [hl] - ld [wd433], a + ld [wd432], a add d ld d, a ld hl, wSpritePikachuStateData1YPixels - wSpritePikachuStateData1 @@ -1278,7 +1278,7 @@ Func_fcc23: ld a, [wPikachuOverworldStateFlags] bit 7, a jr nz, .asm_fcc40 - ld a, [wd472] + ld a, [wd471] bit 7, a jr z, .asm_fcc40 ld a, [wWalkBikeSurfState] |