diff options
| author | Bryan Bishop <kanzure@gmail.com> | 2013-09-09 19:51:29 -0700 |
|---|---|---|
| committer | Bryan Bishop <kanzure@gmail.com> | 2013-09-09 19:51:29 -0700 |
| commit | 0d6efda9bb3aa99cc9d28b9b9e7edaae121b7d75 (patch) | |
| tree | e804b9ed15832481d632904f42355743d9232515 /wram.asm | |
| parent | 6d7043c0c65161ad8ee97fa66b94beba86761d25 (diff) | |
| parent | 84a9b3907b9db08ee38e873554d8a6b4ac1b72b4 (diff) | |
Merge pull request #198 from yenatch/split-predefs-specials-stds
decouple home/ from engine/
Diffstat (limited to 'wram.asm')
| -rw-r--r-- | wram.asm | 15 |
1 files changed, 10 insertions, 5 deletions
@@ -477,7 +477,10 @@ BattleMonType1: ; c64a BattleMonType2: ; c64b ds 1 - ds 23 + ds 10 + +OTName: ; c656 + ds 13 CurOTMon: ; c663 ds 1 @@ -585,6 +588,7 @@ PlayerPerishCount: ; c677 ds 1 PlayerFuryCutterCount: ; c678 ds 1 +PlayerProtectCount: ; c679 ds 1 EnemyRolloutCount: ; c67a @@ -600,6 +604,7 @@ EnemyPerishCount: ; c67f ds 1 EnemyFuryCutterCount: ; c680 ds 1 +EnemyProtectCount: ; c681 ds 1 PlayerDamageTaken: ; c682 @@ -2023,12 +2028,12 @@ PartyMon6Nickname: ; de78 PartyMonNicknamesEnd SECTION "Pokedex",WRAMX[$de99],BANK[1] -PokedexSeen: ; de99 - ds 32 -EndPokedexSeen: -PokedexCaught: ; deb9 +PokedexCaught: ; de99 ds 32 EndPokedexCaught: +PokedexSeen: ; deb9 + ds 32 +EndPokedexSeen: UnownDex: ; ded9 ds 26 UnlockedUnowns: ; def3 |