Prepare to merge

This commit is contained in:
PikalaxALT
2015-11-01 18:13:31 -05:00
parent 31c407bb3d
commit 010b450834
15 changed files with 153 additions and 130 deletions

View File

@@ -5,8 +5,8 @@ sScratch::
SECTION "SRAM Bank 0", SRAM [$a600], BANK [0]
s0_a600:: ds $11a
s0_a71a:: ds $11a
s0_a600:: ds 6 * (party_struct_length + PartyMon1 - PartyMon1Item)
s0_a71a:: ds 6 * (party_struct_length + PartyMon1 - PartyMon1Item)
s0_a834:: ds 1
s0_a835:: ds 10 * (party_struct_length + PartyMon1 - PartyMon1Item)
s0_aa0b:: ds 1