diff options
author | Bryan Bishop <kanzure@gmail.com> | 2012-09-10 20:34:31 -0700 |
---|---|---|
committer | Bryan Bishop <kanzure@gmail.com> | 2012-09-10 20:34:31 -0700 |
commit | 8d020f6e9f6cc3bd9bab43c3d2dfe8bfe439ffbc (patch) | |
tree | a04bcbe94d6aa5ca6a56ba960ec064d978170265 /wram.asm | |
parent | e1ff7f98def8810aa61814eddcce6b96ae0bd643 (diff) | |
parent | 3501a0be8cfda7505743051668451b17a0b5337d (diff) |
Merge pull request #27 from iimarckus/battlemusic
Battlemusic
Diffstat (limited to 'wram.asm')
-rw-r--r-- | wram.asm | 33 |
1 files changed, 33 insertions, 0 deletions
@@ -56,6 +56,30 @@ BattleMonSpclAtk: ; c646 BattleMonSpclDef: ; c648 ds 2 +SECTION "OtherTrainerClass",BSS[$d22f] + +OtherTrainerClass: ; 0xd22f +; class (Youngster, Bug Catcher, etc.) of opposing trainer +; 0 if opponent is a wild Pokémon, not a trainer + ds 1 + +Wramd230: ; 0xd230 +; XXX what is this for + ds 1 + +OtherTrainerID: ; 0xd231 +; which trainer of the class that you're fighting +; (Joey, Mikey, Albert, etc.) + ds 1 + +SECTION "Timeofday",BSS[$d269] + +TimeOfDay: ; 0xd269 +; 0 if morn +; 1 if day +; 2 if nite + ds 1 + SECTION "OtherTrainerParty",BSS[$d280] OTPartyMonHeader: ; d280 @@ -649,6 +673,15 @@ Box13Name: ; 0xdb31 Box14Name: ; 0xdb3a ds 9 +SECTION "BackupMapInfo", BSS[$dcad] + +; used on maps like second floor pokécenter, which are reused, so we know which +; map to return to +BackupMapGroup: ; 0xdcad + ds 1 +BackupMapNumber: ; 0xdcae + ds 1 + SECTION "PlayerMapInfo", BSS[$dcb4] WarpNumber: ; 0xdcb4 |