diff options
| author | pikalaxalt <PikalaxALT@gmail.com> | 2016-06-08 00:35:33 -0400 |
|---|---|---|
| committer | pikalaxalt <PikalaxALT@gmail.com> | 2016-06-08 00:35:33 -0400 |
| commit | 5da4ad3d5c62292f062d4f7b4382e6c09b7faaea (patch) | |
| tree | 97319f45578efa0901fb1986678c16bbdeda6bcc /engine/overworld/npc_movement_2.asm | |
| parent | Is this an OAM printer? (diff) | |
| parent | Clean up main.asm (diff) | |
| download | pokeyellow-5da4ad3d5c62292f062d4f7b4382e6c09b7faaea.tar.gz pokeyellow-5da4ad3d5c62292f062d4f7b4382e6c09b7faaea.tar.xz pokeyellow-5da4ad3d5c62292f062d4f7b4382e6c09b7faaea.zip | |
Merge branch 'master' of github.com:pret/pokeyellow
Diffstat (limited to 'engine/overworld/npc_movement_2.asm')
| -rwxr-xr-x | engine/overworld/npc_movement_2.asm | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/engine/overworld/npc_movement_2.asm b/engine/overworld/npc_movement_2.asm new file mode 100755 index 00000000..c5e11aa0 --- /dev/null +++ b/engine/overworld/npc_movement_2.asm @@ -0,0 +1,24 @@ +FreezeEnemyTrainerSprite: ; eaa02 (3a:6a02) + ld a, [wCurMap] + cp POKEMONTOWER_7 + ret z ; the Rockets on Pokemon Tower 7F leave after battling, so don't freeze them + ld hl, RivalIDs + ld a, [wEngagedTrainerClass] + ld b, a +.loop + ld a, [hli] + cp $ff + jr z, .notRival + cp b + ret z ; the rival leaves after battling, so don't freeze him + jr .loop +.notRival + ld a, [wSpriteIndex] + ld [H_SPRITEINDEX], a + jp SetSpriteMovementBytesToFF + +RivalIDs: ; eaa20 (3a:6a20) + db OPP_SONY1 + db OPP_SONY2 + db OPP_SONY3 + db $ff |