diff options
| author | yenatch <yenatch@gmail.com> | 2014-09-17 12:37:47 -0700 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2014-09-17 12:37:47 -0700 |
| commit | aa361c3bf7a302dd9a883ff869c06305f3fc0436 (patch) | |
| tree | d26d7728566569e91341ffd5f72e8396431134b3 /engine/trade.asm | |
| parent | Enumerate move constants and add unnamed animation constants. (diff) | |
| download | pokeyellow-aa361c3bf7a302dd9a883ff869c06305f3fc0436.tar.gz pokeyellow-aa361c3bf7a302dd9a883ff869c06305f3fc0436.tar.xz pokeyellow-aa361c3bf7a302dd9a883ff869c06305f3fc0436.zip | |
Use move animation constants instead of static values.
This allows new moves and animations to be added without overlap.
Diffstat (limited to 'engine/trade.asm')
| -rwxr-xr-x | engine/trade.asm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/engine/trade.asm b/engine/trade.asm index 54abdab6..199513af 100755 --- a/engine/trade.asm +++ b/engine/trade.asm @@ -203,9 +203,9 @@ Func_41245: ; 41245 (10:5245) and a jr nz, .asm_41273 call Delay50 - ld a, $ad + ld a, ANIM_AD call Func_41676 - ld a, $aa + ld a, ANIM_AA call Func_41676 ld a, [wWhichTrade] ; wWhichTrade call PlayCry @@ -242,9 +242,9 @@ Func_41298: ; 41298 (10:5298) ret Func_412d2: ; 412d2 (10:52d2) - ld a, $ab + ld a, ANIM_AB call Func_41676 - ld c, $a + ld c, 10 call DelayFrames ld a, $e4 ld [rOBP0], a ; $ff48 @@ -295,7 +295,7 @@ UnknownOAM_4132e: ; 4132e (10:532e) db $7E,$40,$7E,$60 Func_41336: ; 41336 (10:5336) - ld a, $ac + ld a, ANIM_AC call Func_41676 call Func_415c8 hlCoord 4, 10 @@ -308,7 +308,7 @@ Func_41336: ; 41336 (10:5336) ld [H_AUTOBGTRANSFERENABLED], a ; $ffba ld a, [wTrainerEngageDistance] call Func_415a4 - ld a, $ad + ld a, ANIM_AD call Func_41676 ld a, $1 ld [H_AUTOBGTRANSFERENABLED], a ; $ffba |