summaryrefslogtreecommitdiff
path: root/wram.asm
diff options
context:
space:
mode:
authorPikalaxALT <PikalaxALT@gmail.com>2015-07-18 23:45:39 -0400
committerPikalaxALT <PikalaxALT@gmail.com>2015-07-18 23:45:39 -0400
commit60cd04b02300c288a01a2f78a44cb39cbe6861d1 (patch)
treeef5bb2bd660a2020864c909fb5dda73f027a9e7c /wram.asm
parente674869018ffe8f9be2351b2b569eb7300910e6a (diff)
Trainer data structure and field move functions
Trainer data in map scripts is now a macro-defined structure. Field move functions in main.asm are now nearly completely annotated, with local references. Trailing white space deleted.
Diffstat (limited to 'wram.asm')
-rw-r--r--wram.asm6
1 files changed, 4 insertions, 2 deletions
diff --git a/wram.asm b/wram.asm
index e768df504..101d12bc1 100644
--- a/wram.asm
+++ b/wram.asm
@@ -1403,9 +1403,11 @@ WalkingX:: ; d045
WalkingY:: ; d046
ds 1
WalkingTile:: ; d047
+wWinTextPointer::
ds 1
-wd048:: ds 3
+wd048:: ds 1
+wLossTextPointer:: ds 2
wd04b:: ds 2
wd04d:: ds 1
wd04e:: ds 2
@@ -2428,7 +2430,7 @@ PartySpecies:: ; dcd8
ds PARTY_LENGTH ; species of each Pokémon in party
PartyEnd:: ; dcde
ds 1 ; legacy functions don't check PartyCount
-
+
PartyMons::
PartyMon1:: party_struct PartyMon1 ; dcdf
PartyMon2:: party_struct PartyMon2 ; dd0f