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