diff options
| author | JimB16 <f1@jimb.de> | 2015-10-07 20:38:24 +0200 |
|---|---|---|
| committer | JimB16 <f1@jimb.de> | 2015-10-07 20:38:24 +0200 |
| commit | 975efb28aec9faf9409cbf85fc636ac2e4219138 (patch) | |
| tree | c8c4ae91e4e6defecaf95af5f32c3f7e6a1073a7 /wram.asm | |
| parent | 0001c688d35d006d178ac892b1adef887a8b0796 (diff) | |
| parent | 7176eff7aafda5378305a593c459d158ac27601f (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'wram.asm')
| -rw-r--r-- | wram.asm | 140 |
1 files changed, 1 insertions, 139 deletions
@@ -129,8 +129,6 @@ channel_struct: MACRO ds 1 ; c132 ENDM - - SECTION "CHR0", VRAM [$8000], BANK [0] VTiles0:: SECTION "CHR1", VRAM [$8800], BANK [0] @@ -2730,140 +2728,4 @@ SECTION "WRAM 6", WRAMX, BANK [6] w6_d000:: ds $600 w6_d600:: ds $600 - -SECTION "Scratch", SRAM, BANK [0] - -sScratch:: - - -SECTION "SRAM Bank 0", SRAM [$a600], BANK [0] - -s0_a600:: ds $11a -s0_a71a:: ds $11a -s0_a834:: ds $1d7 -s0_aa0b:: ds $1d7 - -s0_abe2:: ds 1 -s0_abe3:: ds 1 -s0_abe4:: ds 1 -s0_abe5:: ds 1 -s0_abe6:: ds 10 -s0_abf0:: ds 10 -s0_abfa:: ds 2 - ds 1 -s0_abfd:: ds 1 -s0_abfe:: ds 12 -sMysteryGiftTrainer:: ds (1 + 1 + NUM_MOVES) * PARTY_LENGTH + 1 - ds 1 -s0_abe4End:: - - ds $30 - -s0_ac60:: ds 8 -s0_ac68:: ds 1 -s0_ac69:: ds 1 -s0_ac6a:: ds 1 - - ds $b200 - $ac6b - -sBackupOptions:: ds OptionsEnd - Options - -s0_b208:: ds 1 - -sBackupGameData:: -sBackupPlayerData:: ds wPlayerDataEnd - wPlayerData -sBackupMapData:: ds wMapDataEnd - wMapData -sBackupPokemonData:: ds wPokemonDataEnd - wPokemonData -sBackupGameDataEnd:: - -; bd83 - ds $18a -; bf0d - -sBackupChecksum:: ds 2 -s0_bf0f:: ds 1 -sStackTop:: ds 2 - - -SECTION "SRAM Bank 1", SRAM, BANK [1] - -sOptions:: ds OptionsEnd - Options - -s1_a008:: ds 1 - -sGameData:: -sPlayerData:: ds wPlayerDataEnd - wPlayerData -sMapData:: ds wMapDataEnd - wMapData -sPokemonData:: ds wPokemonDataEnd - wPokemonData -sGameDataEnd:: - -; ab83 - ds $18a -; ad0d - -sChecksum:: ds 2 -s1_ad0f:: ds 1 - -; ad10 - box sBox -; b160 - - ds $100 - -sLinkBattleStats:: ; b260 -sLinkBattleWins:: ds 2 -sLinkBattleLosses:: ds 2 -sLinkBattleDraws:: ds 2 - ds $5a -sLinkBattleStatsEnd:: - -sHallOfFame:: ; b2c0 - ds HOF_LENGTH * NUM_HOF_TEAMS -sHallOfFameEnd:: - -s1_be3c:: ds 1 - -sCrystalData:: - ds wCrystalDataEnd - wCrystalData -s1_be44:: ds 1 -s1_be45:: ds 1 - -; data of the BattleTower must be in SRAM because you can save and leave between battles -sBattleTower:: ; be46 -sNrOfBeatenBattleTowerTrainers:: -sbe46:: ds 1 -sbe47:: ds 1 -; The 7 trainers of the BattleTower are saved here, so nobody appears more than once -sBTTrainers:: ; sbe48 - ds 7 -sbe4f:: ds 1 -sbe50:: ds 1 -; Pkmn of previous trainer -sBTPkmnOfTrainers:: ; 0xbe51 -sBTPkmnPrevTrainer1:: - ds 1 -sBTPkmnPrevTrainer2:: ds 1 -sBTPkmnPrevTrainer3:: ds 1 -; Pkmn of preprevious trainer -sBTPkmnPrevPrevTrainer1:: ds 1 -sBTPkmnPrevPrevTrainer2:: ds 1 -sBTPkmnPrevPrevTrainer3:: ds 1 - - -SECTION "Boxes 1-7", SRAM, BANK [2] - box sBox1 - box sBox2 - box sBox3 - box sBox4 - box sBox5 - box sBox6 - box sBox7 - -SECTION "Boxes 8-14", SRAM, BANK [3] - box sBox8 - box sBox9 - box sBox10 - box sBox11 - box sBox12 - box sBox13 - box sBox14 +INCLUDE "sram.asm" |