summaryrefslogtreecommitdiff
path: root/wram.asm
diff options
context:
space:
mode:
authoryenatch <yenatch@gmail.com>2015-03-14 19:29:24 -0400
committeryenatch <yenatch@gmail.com>2015-03-14 19:29:24 -0400
commit52add272c6bca00d2ea827ef7fa4611a4bc41b47 (patch)
tree372b48eaa23e644930b77c0155f159c5d60e74c9 /wram.asm
parentec76703936ae690411a29c4f6ff11eef41ebdfd3 (diff)
parent0996a964bdb597b9cd0c087fde5926980eac900a (diff)
Merge pull request #88 from YamaArashi/master
commented trade amim functions
Diffstat (limited to 'wram.asm')
-rwxr-xr-xwram.asm17
1 files changed, 14 insertions, 3 deletions
diff --git a/wram.asm b/wram.asm
index 9ffbc8b8..a08aae74 100755
--- a/wram.asm
+++ b/wram.asm
@@ -658,9 +658,17 @@ wTradedEnemyMonOTID:: ; cd59
wcd5b:: ds 1
wcd5c:: ds 1
-wcd5d:: ds 1
-wcd5e:: ds 1
-wcd5f:: ds 1
+
+wMonPartySpriteSpecies:: ; cd5d
+ ds 1
+
+wLeftGBMonSpecies:: ; cd5e
+; in the trade animation, the mon that leaves the left gameboy
+ ds 1
+
+wRightGBMonSpecies:: ; cd5f
+; in the trade animation, the mon that leaves the right gameboy
+ ds 1
wFlags_0xcd60:: ; cd60
; bit 0: is player engaged by trainer (to avoid being engaged by multiple trainers simultaneously)
@@ -1114,6 +1122,9 @@ W_NUMFBTILES:: ; d089
; number of tiles in current battle animation frame block
ds 1
+wTradedMonMovingRight:: ; d08a
+; $01 if mon is moving from left gameboy to right gameboy; $00 if vice versa
+
wd08a:: ds 1
wTownMapSpriteBlinkingCounter:: ; d08b