kanzure merge

hg-commit-id: 666ca4b94d7a
This commit is contained in:
KuroiIeWa5Da 2012-01-20 23:41:53 -06:00
commit e7dfe391f1
2 changed files with 608 additions and 595 deletions

1192
common.asm

File diff suppressed because it is too large Load diff

View file

@ -448,17 +448,6 @@ W_PLAYERCOINS EQU $D5A4 ; two bytes
W_PLAYERCOINS1 EQU $D5A4
W_PLAYERCOINS2 EQU $D5A5
W_HASTOWNMAP EQU $D5F3
W_HASOAKSPARCEL EQU $D60D
W_LAPRAS EQU $D72E
W_ARTICUNO EQU $D782
W_ZAPDOS EQU $D7D4
W_VERMILIONSNORLAX EQU $D7D8
W_CELADONSNORLAX EQU $D7E0
W_MOLTRES EQU $D7EE
W_SSANNE EQU $D803
W_MEWTWO EQU $D85F
W_OAKSLABCURSCRIPT EQU $D5F0
W_RIVALSTARTER EQU $D715