diff options
| author | dannye <33dannye@gmail.com> | 2020-11-04 00:06:44 -0600 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2020-11-04 00:06:44 -0600 |
| commit | 5647ca687b92954dcf37a6ea6bfbc9a341c32de4 (patch) | |
| tree | dde1937a1bfdb3a835f4155e1c2eb8f1aaf86f63 /home/pikachu.asm | |
| parent | Merge pull request #55 from Deokishisu/patch-1 (diff) | |
| download | pokeyellow-5647ca687b92954dcf37a6ea6bfbc9a341c32de4.tar.gz pokeyellow-5647ca687b92954dcf37a6ea6bfbc9a341c32de4.tar.xz pokeyellow-5647ca687b92954dcf37a6ea6bfbc9a341c32de4.zip | |
Sync with pokered
Diffstat (limited to 'home/pikachu.asm')
| -rwxr-xr-x | home/pikachu.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/home/pikachu.asm b/home/pikachu.asm index 336c80b3..c276b3d4 100755 --- a/home/pikachu.asm +++ b/home/pikachu.asm @@ -55,7 +55,7 @@ SpawnPikachu:: ld a, [hl] dec a swap a - ld [hTilePlayerStandingOn], a + ldh [hTilePlayerStandingOn], a homecall SpawnPikachu_ ; 3f:46d5 ret @@ -83,7 +83,7 @@ Pikachu_IsInArray:: GetPikachuMovementScriptByte:: push hl push bc - ld a, [H_LOADEDROMBANK] + ldh a, [hLoadedROMBank] push af ld a, [wPikachuMovementScriptBank] call BankswitchCommon @@ -105,7 +105,7 @@ GetPikachuMovementScriptByte:: ret ApplyPikachuMovementData:: - ld a, [H_LOADEDROMBANK] + ldh a, [hLoadedROMBank] ld b, a push af callbs ApplyPikachuMovementData_ |