diff options
Diffstat (limited to 'sram.asm')
| -rw-r--r-- | sram.asm | 143 |
1 files changed, 66 insertions, 77 deletions
@@ -1,11 +1,10 @@ SECTION "Scratch", SRAM -sScratch:: ds $600 ; a000 +sScratch:: ds $600 SECTION "SRAM Bank 0", SRAM -; a600 sPartyMail:: sPartyMon1Mail:: mailmsg sPartyMon1Mail sPartyMon2Mail:: mailmsg sPartyMon2Mail @@ -14,7 +13,6 @@ sPartyMon4Mail:: mailmsg sPartyMon4Mail sPartyMon5Mail:: mailmsg sPartyMon5Mail sPartyMon6Mail:: mailmsg sPartyMon6Mail -; a71a sPartyMailBackup:: sPartyMon1MailBackup:: mailmsg sPartyMon1MailBackup sPartyMon2MailBackup:: mailmsg sPartyMon2MailBackup @@ -23,7 +21,6 @@ sPartyMon4MailBackup:: mailmsg sPartyMon4MailBackup sPartyMon5MailBackup:: mailmsg sPartyMon5MailBackup sPartyMon6MailBackup:: mailmsg sPartyMon6MailBackup -; a834 sMailboxCount:: db sMailbox:: sMailbox1:: mailmsg sMailbox1 @@ -37,7 +34,6 @@ sMailbox8:: mailmsg sMailbox8 sMailbox9:: mailmsg sMailbox9 sMailbox10:: mailmsg sMailbox10 -; aa0b sMailboxCountBackup:: db sMailboxBackup:: sMailbox1Backup:: mailmsg sMailbox1Backup @@ -51,7 +47,6 @@ sMailbox8Backup:: mailmsg sMailbox8Backup sMailbox9Backup:: mailmsg sMailbox9Backup sMailbox10Backup:: mailmsg sMailbox10Backup -; abe2 sMysteryGiftItem:: db sMysteryGiftUnlocked:: db sBackupMysteryGiftItem:: db @@ -65,7 +60,7 @@ sMysteryGiftTimerStartDay:: db sMysteryGiftTrainerHouseFlag:: db sMysteryGiftPartnerName:: ds NAME_LENGTH s0_ac09:: ds 1 -sMysteryGiftTrainer:: ds (1 + 1 + NUM_MOVES) * PARTY_LENGTH + 2 ; ac0a +sMysteryGiftTrainer:: ds (1 + 1 + NUM_MOVES) * PARTY_LENGTH + 2 sBackupMysteryGiftItemEnd:: ds $30 @@ -81,15 +76,13 @@ sBackupOptions:: ds wOptionsEnd - wOptions sBackupCheckValue1:: db ; loaded with SAVE_CHECK_VALUE_1, used to check save corruption -sBackupGameData:: ; b209 +sBackupGameData:: sBackupPlayerData:: ds wPlayerDataEnd - wPlayerData sBackupCurMapData:: ds wCurMapDataEnd - wCurMapData sBackupPokemonData:: ds wPokemonDataEnd - wPokemonData sBackupGameDataEnd:: -; bd83 ds $18a -; bf0d sBackupChecksum:: dw @@ -104,15 +97,13 @@ sOptions:: ds wOptionsEnd - wOptions sCheckValue1:: db ; loaded with SAVE_CHECK_VALUE_1, used to check save corruption -sGameData:: ; a009 +sGameData:: sPlayerData:: ds wPlayerDataEnd - wPlayerData sCurMapData:: ds wCurMapDataEnd - wCurMapData sPokemonData:: ds wPokemonDataEnd - wPokemonData sGameDataEnd:: -; ab83 ds $18a -; ad0d sChecksum:: dw @@ -121,9 +112,7 @@ sCheckValue2:: db ; loaded with SAVE_CHECK_VALUE_2, used to check save corruptio SECTION "Active Box", SRAM -; ad10 sBox:: box sBox -; b160 ds $100 @@ -131,9 +120,9 @@ sBox:: box sBox SECTION "Link Battle Data", SRAM sLinkBattleStats:: -sLinkBattleWins:: dw ; b260 -sLinkBattleLosses:: dw ; b262 -sLinkBattleDraws:: dw ; b264 +sLinkBattleWins:: dw +sLinkBattleLosses:: dw +sLinkBattleDraws:: dw sLinkBattleRecord:: sLinkBattleRecord1:: link_battle_record sLinkBattleRecord1 @@ -146,7 +135,7 @@ sLinkBattleStatsEnd:: SECTION "SRAM Hall of Fame", SRAM -sHallOfFame:: ; b2c0 +sHallOfFame:: sHallOfFame01:: hall_of_fame sHallOfFame01 sHallOfFame02:: hall_of_fame sHallOfFame02 sHallOfFame03:: hall_of_fame sHallOfFame03 @@ -182,11 +171,11 @@ sHallOfFameEnd:: SECTION "SRAM Crystal Data", SRAM -sMobileEventIndex:: db ; be3c +sMobileEventIndex:: db sCrystalData:: ds wCrystalDataEnd - wCrystalData -sMobileEventIndexBackup:: db ; be44 +sMobileEventIndexBackup:: db SECTION "SRAM Battle Tower", SRAM @@ -197,7 +186,7 @@ sBattleTowerChallengeState:: ; 2: battle tower db -sBattleTower:: ; be46 +sBattleTower:: sNrOfBeatenBattleTowerTrainers:: db sBTChoiceOfLevelGroup:: db ; Battle Tower trainers are saved here, so nobody appears more than once @@ -206,7 +195,7 @@ sBattleTowerSaveFileFlags:: db sBattleTowerReward:: db ; team of previous trainer -sBTMonOfTrainers:: ; be51 +sBTMonOfTrainers:: sBTMonPrevTrainer1:: db sBTMonPrevTrainer2:: db sBTMonPrevTrainer3:: db @@ -242,34 +231,34 @@ SECTION "SRAM Mobile 1", SRAM ds $7 -s4_a007:: ; struct size $30 ; a007 +s4_a007:: ; struct size $30 ds $c -s4_a013:: ds 36 ; a013 +s4_a013:: ds 36 -s4_a037:: ds 4 ; a037 +s4_a037:: ds 4 -s4_a03b:: ds 37 * 40 ; a03b +s4_a03b:: ds 37 * 40 -s4_a603:: ds 8 ; a603 +s4_a603:: ds 8 -s4_a60b:: db ; a60b -s4_a60c:: db ; a60c -s4_a60d:: db ; a60d +s4_a60b:: db +s4_a60c:: db +s4_a60d:: db -s4_a60e:: dw ; a60e +s4_a60e:: dw ds $1f0 -sMobileBattleTimer:: ds 3 ; a800 +sMobileBattleTimer:: ds 3 SECTION "SRAM Mobile 2", SRAM ds 1 ; former location for sMobileEventIndex, moved to 1:BE3C in English -sTrainerRankings:: ; a001 +sTrainerRankings:: sTrainerRankingGameTimeHOF:: ds 4 sTrainerRankingStepCountHOF:: ds 4 sTrainerRankingHealingsHOF:: ds 4 @@ -313,108 +302,108 @@ sTrainerRankingLongestMagikarp:: ds 2 sTrainerRankingShortestMagikarp:: ds 2 sTrainerRankingBugContestScore:: ds 2 sTrainerRankingsChecksum:: ds 2 -sTrainerRankingsEnd:: ; a083 +sTrainerRankingsEnd:: ds 1 ; Former location for sMobileEventIndexBackup, moved to 1:BE44 in English -sTrainerRankingsBackup:: ds sTrainerRankingsEnd - sTrainerRankings ; a084 +sTrainerRankingsBackup:: ds sTrainerRankingsEnd - sTrainerRankings ds $6fa -s5_a800:: db ; a800 +s5_a800:: db ds $24 -s5_a825:: db ; a825 -s5_a826:: db ; a826 +s5_a825:: db +s5_a826:: db ds $6d -s5_a894:: ds NAME_LENGTH_JAPANESE ; a894 +s5_a894:: ds NAME_LENGTH_JAPANESE ds $1 -s5_a89b:: ds 1 ; a89b -s5_a89c:: ds 22 ; a89c -s5_a8b2:: ds 150 ; a8b2 +s5_a89b:: ds 1 +s5_a89c:: ds 22 +s5_a8b2:: ds 150 -s5_a948:: ds 246 ; a948 +s5_a948:: ds 246 ds $3 -s5_aa41:: ds 4 ; aa41 +s5_aa41:: ds 4 ds $2 -s5_aa47:: db ; aa47 -s5_aa48:: db ; aa48 +s5_aa47:: db +s5_aa48:: db ds $1 -s5_aa4a:: db ; aa4a +s5_aa4a:: db -sMobileLoginPassword:: ds MOBILE_LOGIN_PASSWORD_LENGTH ; aa4b +sMobileLoginPassword:: ds MOBILE_LOGIN_PASSWORD_LENGTH ds $1 -s5_aa5d:: ds MOBILE_LOGIN_PASSWORD_LENGTH ; aa5d +s5_aa5d:: ds MOBILE_LOGIN_PASSWORD_LENGTH ds $4 -s5_aa72:: db ; aa72 -s5_aa73:: ds 12 ; aa73 -s5_aa7f:: ds 12 ; aa7f +s5_aa72:: db +s5_aa73:: ds 12 +s5_aa7f:: ds 12 -s5_aa8b:: db ; aa8b -s5_aa8c:: db ; aa8c -s5_aa8d:: db ; aa8d -s5_aa8e:: ds 7 * $cc ; aa8e +s5_aa8b:: db +s5_aa8c:: db +s5_aa8d:: db +s5_aa8e:: ds 7 * $cc ds $1 -s5_b023:: ds 105 ; b023 -s5_b08c:: ds 4 ; b08c -s5_b090:: db ; b090 -s5_b091:: db ; b091 -s5_b092:: ds 31 ; b092 +s5_b023:: ds 105 +s5_b08c:: ds 4 +s5_b090:: db +s5_b091:: db +s5_b092:: ds 31 ds $100 -s5_b1b1:: db ; b1b1 -s5_b1b2:: db ; b1b2 -s5_b1b3:: db ; b1b3 -s5_b1b4:: db ; b1b4 +s5_b1b1:: db +s5_b1b2:: db +s5_b1b3:: db +s5_b1b4:: db ds $1e -s5_b1d3:: ; b1d3 +s5_b1d3:: ds $120 -s5_b2f3:: db ; b2f3 -s5_b2f4:: ds 4 ; b2f4 +s5_b2f3:: db +s5_b2f4:: ds 4 ds $1 -s5_b2f9:: db ; b2f9 -s5_b2fa:: db ; b2fa -s5_b2fb:: db ; b2fb +s5_b2f9:: db +s5_b2fa:: db +s5_b2fb:: db ds $b49 -s5_be45:: db ; be45 -s5_be46:: db ; be46 +s5_be45:: db +s5_be46:: db ds $1b8 -s5_bfff:: db ; bfff +s5_bfff:: db SECTION "SRAM Mobile 3", SRAM -s6_a000:: ; a000 +s6_a000:: SECTION "SRAM Mobile 4", SRAM -s7_a000:: ; a000 +s7_a000:: |