From 2770cfc354b883f0e3f7e632374051ed9b5e936a Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 4 Oct 2015 14:14:51 -0400 Subject: soft reset --- sram.asm | 136 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 136 insertions(+) create mode 100644 sram.asm (limited to 'sram.asm') diff --git a/sram.asm b/sram.asm new file mode 100644 index 000000000..ce62cc240 --- /dev/null +++ b/sram.asm @@ -0,0 +1,136 @@ +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 + +sMysteryGiftItem:: 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 +sMysteryGiftTrainerHouseFlag:: 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 -- cgit v1.2.3 From d42330ed8b591db79c43ef680edc5965d6a7b14b Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 10 Oct 2015 17:03:04 -0400 Subject: Annotation of PrintNum arguments in bc, and radio functions --- sram.asm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'sram.asm') diff --git a/sram.asm b/sram.asm index ce62cc240..1201925d9 100644 --- a/sram.asm +++ b/sram.asm @@ -27,9 +27,8 @@ s0_abe4End:: ds $30 s0_ac60:: ds 8 -s0_ac68:: ds 1 -s0_ac69:: ds 1 -s0_ac6a:: ds 1 +sLuckyNumberDay:: ds 1 +sLuckyIDNumber:: ds 2 ds $b200 - $ac6b -- cgit v1.2.3 From 12f9dca7a59afa64388ae3aebc6e04c383992da9 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 13 Oct 2015 14:29:34 -0400 Subject: Final descriptive label in tilesets/animations.asm --- sram.asm | 1 + 1 file changed, 1 insertion(+) (limited to 'sram.asm') diff --git a/sram.asm b/sram.asm index 1201925d9..6903f10e3 100644 --- a/sram.asm +++ b/sram.asm @@ -58,6 +58,7 @@ sOptions:: ds OptionsEnd - Options s1_a008:: ds 1 sGameData:: +sPlayerID:: sPlayerData:: ds wPlayerDataEnd - wPlayerData sMapData:: ds wMapDataEnd - wMapData sPokemonData:: ds wPokemonDataEnd - wPokemonData -- cgit v1.2.3 From d338a092c5a54d73e3e0a186569cc3b84e61c4ae Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 13 Oct 2015 17:40:18 -0400 Subject: Revert sPlayerID --- sram.asm | 1 - 1 file changed, 1 deletion(-) (limited to 'sram.asm') diff --git a/sram.asm b/sram.asm index 6903f10e3..1201925d9 100644 --- a/sram.asm +++ b/sram.asm @@ -58,7 +58,6 @@ sOptions:: ds OptionsEnd - Options s1_a008:: ds 1 sGameData:: -sPlayerID:: sPlayerData:: ds wPlayerDataEnd - wPlayerData sMapData:: ds wMapDataEnd - wMapData sPokemonData:: ds wPokemonDataEnd - wPokemonData -- cgit v1.2.3 From da7849d800d37156360845fa17e361d2521dce29 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 17 Oct 2015 12:58:26 -0400 Subject: Restructured functions in main.asm to resemble the home functions they clone --- sram.asm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'sram.asm') diff --git a/sram.asm b/sram.asm index 1201925d9..25d40e9b5 100644 --- a/sram.asm +++ b/sram.asm @@ -1,5 +1,5 @@ SECTION "Scratch", SRAM, BANK [0] - +SRAM_Begin:: sScratch:: @@ -49,6 +49,8 @@ sBackupGameDataEnd:: sBackupChecksum:: ds 2 s0_bf0f:: ds 1 sStackTop:: ds 2 + ds $ee +SRAM_End:: SECTION "SRAM Bank 1", SRAM, BANK [1] -- cgit v1.2.3 From f53d65c536096213b6826765f81a0f436c88fe72 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 17 Oct 2015 17:18:52 -0400 Subject: Battle intro animation function --- sram.asm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'sram.asm') diff --git a/sram.asm b/sram.asm index 25d40e9b5..fb7f841d5 100644 --- a/sram.asm +++ b/sram.asm @@ -7,8 +7,10 @@ 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_a834:: ds 1 +s0_a835:: ds 10 * (PartyMon1StatsEnd - PartyMon1Item) +s0_aa0b:: ds 1 +s0_aa0c:: ds 10 * (PartyMon1StatsEnd - PartyMon1Item) sMysteryGiftItem:: ds 1 s0_abe3:: ds 1 -- cgit v1.2.3 From 119d6b411922eb7b375691b81fc97c9b334f4167 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 24 Oct 2015 10:34:19 -0400 Subject: About time I got to these functions --- sram.asm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'sram.asm') diff --git a/sram.asm b/sram.asm index fb7f841d5..280f2402d 100644 --- a/sram.asm +++ b/sram.asm @@ -8,9 +8,9 @@ SECTION "SRAM Bank 0", SRAM [$a600], BANK [0] s0_a600:: ds $11a s0_a71a:: ds $11a s0_a834:: ds 1 -s0_a835:: ds 10 * (PartyMon1StatsEnd - PartyMon1Item) +s0_a835:: ds 10 * (party_struct_length + PartyMon1 - PartyMon1Item) s0_aa0b:: ds 1 -s0_aa0c:: ds 10 * (PartyMon1StatsEnd - PartyMon1Item) +s0_aa0c:: ds 10 * (party_struct_length + PartyMon1 - PartyMon1Item) sMysteryGiftItem:: ds 1 s0_abe3:: ds 1 @@ -18,7 +18,8 @@ s0_abe4:: ds 1 s0_abe5:: ds 1 s0_abe6:: ds 10 s0_abf0:: ds 10 -s0_abfa:: ds 2 +sMysteryGiftTimer:: ds 1 +sMysteryGiftTimerStartDay:: ds 1 ds 1 sMysteryGiftTrainerHouseFlag:: ds 1 s0_abfe:: ds 12 -- cgit v1.2.3