diff options
| author | yenatch <yenatch@gmail.com> | 2016-04-18 08:01:12 -0400 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2016-04-18 08:01:12 -0400 |
| commit | 7aef59841489ea449b9a34d424c681a4b48b88ab (patch) | |
| tree | 72d46f1cc076564f62b11f5379960cd745a7fc9a /sram.asm | |
| parent | c5fb2c947ffcdd0ddd80319a24a6acbe828d9598 (diff) | |
| parent | 5d94fb22ed0e4c9edfca506b80f50ef71fd78664 (diff) | |
Merge pull request #338 from PikalaxALT/master
Battle anims, HP Bar anim
Diffstat (limited to 'sram.asm')
| -rw-r--r-- | sram.asm | 14 |
1 files changed, 9 insertions, 5 deletions
@@ -69,7 +69,7 @@ sMysteryGiftTimerStartDay:: ds 1 sMysteryGiftTrainerHouseFlag:: ds 1 sMysteryGiftPartnerName:: ds NAME_LENGTH s0_ac09:: ds 1 -sMysteryGiftTrainer:: ds (1 + 1 + NUM_MOVES) * PARTY_LENGTH + 2 +sMysteryGiftTrainer:: ds (1 + 1 + NUM_MOVES) * PARTY_LENGTH + 2 ; ac0a sBackupMysteryGiftItemEnd:: ds $30 @@ -81,7 +81,7 @@ sLuckyIDNumber:: ds 2 SECTION "Backup Save", SRAM [$b200], BANK [0] sBackupOptions:: ds OptionsEnd - Options -s0_b208:: ds 1 +s0_b208:: ds 1 ; loaded with 99, used to check save corruption sBackupGameData:: sBackupPlayerData:: ds wPlayerDataEnd - wPlayerData @@ -94,11 +94,11 @@ sBackupGameDataEnd:: ; bf0d sBackupChecksum:: ds 2 -s0_bf0f:: ds 1 +s0_bf0f:: ds 1 ; loaded with 0x7f, used to check save corruption sStackTop:: ds 2 -SECTION "SRAM Bank 1", SRAM, BANK [1] +SECTION "Save", SRAM, BANK [1] sOptions:: ds OptionsEnd - Options @@ -117,11 +117,13 @@ sGameDataEnd:: sChecksum:: ds 2 s1_ad0f:: ds 1 ; loaded with 0x7f, used to check save corruption +SECTION "Active Box", SRAM, BANK [1] ; ad10 box sBox ; b160 ds $f4 +SECTION "Link Battle Data", SRAM, BANK [1] sLinkBattleResults:: ds $c sLinkBattleStats:: ; b260 @@ -143,6 +145,7 @@ sLinkBattleRecord4:: link_battle_record sLinkBattleRecord4 sLinkBattleRecord5:: link_battle_record sLinkBattleRecord5 sLinkBattleStatsEnd:: +SECTION "SRAM Hall of Fame", SRAM, BANK [1] sHallOfFame:: ; b2c0 ; temporary until I can find a way to macrofy it hall_of_fame sHallOfFame01 @@ -190,6 +193,7 @@ sHallOfFame:: ; b2c0 ; endr sHallOfFameEnd:: +SECTION "SRAM Crystal Data", SRAM, BANK [1] sMobileEventIndex:: ds 1 ; be3c sCrystalData:: @@ -208,7 +212,7 @@ sBTChoiceOfLevelGroup:: ds 1 ; The 7 trainers of the BattleTower are saved here, so nobody appears more than once sBTTrainers:: ; sbe48 ds 7 -sbe4f:: ds 1 +s1_be4f:: ds 1 sBattleTowerReward:: ds 1 ; Pkmn of previous trainer sBTPkmnOfTrainers:: ; 0xbe51 |