From c85572a5732b7376845965fc4a9efdb700cd9f5c Mon Sep 17 00:00:00 2001 From: luckytyphlosion Date: Sun, 26 Apr 2015 12:04:21 -0400 Subject: Create sram.asm --- sram.asm | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 sram.asm (limited to 'sram.asm') diff --git a/sram.asm b/sram.asm new file mode 100644 index 00000000..bbb262f6 --- /dev/null +++ b/sram.asm @@ -0,0 +1,16 @@ +SECTION "Sprite Buffers", SRAM, BANK[0] + +S_SPRITEBUFFER0:: ds SPRITEBUFFERSIZE ; a000 +S_SPRITEBUFFER1:: ds SPRITEBUFFERSIZE ; a188 +S_SPRITEBUFFER2:: ds SPRITEBUFFERSIZE ; a310 + + ds $100 + +sHallOfFame:: ds HOF_TEAM * NUM_HOF_TEAMS ; a598 + +S_SAVEDBOX1 EQU $A000 +S_SAVEDBOX2 EQU S_SAVEDBOX1 + (wBoxMonNicksEnd - W_NUMINBOX) +S_SAVEDBOX3 EQU S_SAVEDBOX2 + (wBoxMonNicksEnd - W_NUMINBOX) +S_SAVEDBOX4 EQU S_SAVEDBOX3 + (wBoxMonNicksEnd - W_NUMINBOX) +S_SAVEDBOX5 EQU S_SAVEDBOX4 + (wBoxMonNicksEnd - W_NUMINBOX) +S_SAVEDBOX6 EQU S_SAVEDBOX5 + (wBoxMonNicksEnd - W_NUMINBOX) -- cgit v1.3.1-sl0p From 8746c04d34e5eefc120ac9304e0ebe52b0bd39da Mon Sep 17 00:00:00 2001 From: luckytyphlosion Date: Sun, 26 Apr 2015 12:53:35 -0400 Subject: Added all necessary SRAM constants --- sram.asm | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) (limited to 'sram.asm') diff --git a/sram.asm b/sram.asm index bbb262f6..64fba964 100644 --- a/sram.asm +++ b/sram.asm @@ -9,8 +9,18 @@ S_SPRITEBUFFER2:: ds SPRITEBUFFERSIZE ; a310 sHallOfFame:: ds HOF_TEAM * NUM_HOF_TEAMS ; a598 S_SAVEDBOX1 EQU $A000 -S_SAVEDBOX2 EQU S_SAVEDBOX1 + (wBoxMonNicksEnd - W_NUMINBOX) -S_SAVEDBOX3 EQU S_SAVEDBOX2 + (wBoxMonNicksEnd - W_NUMINBOX) -S_SAVEDBOX4 EQU S_SAVEDBOX3 + (wBoxMonNicksEnd - W_NUMINBOX) -S_SAVEDBOX5 EQU S_SAVEDBOX4 + (wBoxMonNicksEnd - W_NUMINBOX) -S_SAVEDBOX6 EQU S_SAVEDBOX5 + (wBoxMonNicksEnd - W_NUMINBOX) +S_SAVEDBOX2 EQU S_SAVEDBOX1 + (wBoxMonNicksEnd - W_NUMINBOX) ; $A462 +S_SAVEDBOX3 EQU S_SAVEDBOX2 + (wBoxMonNicksEnd - W_NUMINBOX) ; $A8C4 +S_SAVEDBOX4 EQU S_SAVEDBOX3 + (wBoxMonNicksEnd - W_NUMINBOX) ; $AD26 +S_SAVEDBOX5 EQU S_SAVEDBOX4 + (wBoxMonNicksEnd - W_NUMINBOX) ; $B188 +S_SAVEDBOX6 EQU S_SAVEDBOX5 + (wBoxMonNicksEnd - W_NUMINBOX) ; $B5EA +S_SAVEDBOXESCHECKSUM EQU S_SAVEDBOX6 + (wBoxMonNicksEnd - W_NUMINBOX) ; $BA4C +S_SAVEDBOXESCHECKSUM2 EQU S_SAVEDBOXESCHECKSUM + 1 ; $BA4D + +S_SAVEDPLAYERNAME EQU $A598 +S_SAVEDMAINDATA EQU S_SAVEDPLAYERNAME + (wPartyCount - wPlayerName) ; $A5A3 +S_SAVEDSPRITEDATA EQU S_SAVEDMAINDATA + (W_NUMINBOX - wPokedexOwned) ; $AD2C +S_SAVEDPARTYDATA EQU S_SAVEDSPRITEDATA + (wOAMBuffer - wSpriteStateData1) ; $AF2C +S_SAVEDCURBOXDATA EQU S_SAVEDPARTYDATA + (wPokedexOwned - wPartyCount) ; $B0C0 +S_SAVEDhTilesetType EQU S_SAVEDCURBOXDATA + (wBoxMonNicksEnd - W_NUMINBOX) ; $B522 +S_SAVEDMAINDATACHECKSUM EQU S_SAVEDhTilesetType + 1 ; $B523 -- cgit v1.3.1-sl0p From b6c7544e85a8ede00ab5f059e95d7125d1c86951 Mon Sep 17 00:00:00 2001 From: luckytyphlosion Date: Sun, 26 Apr 2015 13:14:18 -0400 Subject: S_SAVEDPLAYERID constant. --- sram.asm | 1 + 1 file changed, 1 insertion(+) (limited to 'sram.asm') diff --git a/sram.asm b/sram.asm index 64fba964..a7c377e3 100644 --- a/sram.asm +++ b/sram.asm @@ -19,6 +19,7 @@ S_SAVEDBOXESCHECKSUM2 EQU S_SAVEDBOXESCHECKSUM + 1 ; $BA4D S_SAVEDPLAYERNAME EQU $A598 S_SAVEDMAINDATA EQU S_SAVEDPLAYERNAME + (wPartyCount - wPlayerName) ; $A5A3 +S_SAVEDPLAYERID EQU S_SAVEDMAINDATA + (wPlayerID - wPokedexOwned) ; $A605 S_SAVEDSPRITEDATA EQU S_SAVEDMAINDATA + (W_NUMINBOX - wPokedexOwned) ; $AD2C S_SAVEDPARTYDATA EQU S_SAVEDSPRITEDATA + (wOAMBuffer - wSpriteStateData1) ; $AF2C S_SAVEDCURBOXDATA EQU S_SAVEDPARTYDATA + (wPokedexOwned - wPartyCount) ; $B0C0 -- cgit v1.3.1-sl0p From aabb21b8814f1de30fe74e3f098c3e07bb8a2979 Mon Sep 17 00:00:00 2001 From: luckytyphlosion Date: Sun, 26 Apr 2015 15:05:01 -0400 Subject: Labels instead of constants --- sram.asm | 42 +++++++++++++++++++++++++----------------- 1 file changed, 25 insertions(+), 17 deletions(-) (limited to 'sram.asm') diff --git a/sram.asm b/sram.asm index a7c377e3..d987652e 100644 --- a/sram.asm +++ b/sram.asm @@ -8,20 +8,28 @@ S_SPRITEBUFFER2:: ds SPRITEBUFFERSIZE ; a310 sHallOfFame:: ds HOF_TEAM * NUM_HOF_TEAMS ; a598 -S_SAVEDBOX1 EQU $A000 -S_SAVEDBOX2 EQU S_SAVEDBOX1 + (wBoxMonNicksEnd - W_NUMINBOX) ; $A462 -S_SAVEDBOX3 EQU S_SAVEDBOX2 + (wBoxMonNicksEnd - W_NUMINBOX) ; $A8C4 -S_SAVEDBOX4 EQU S_SAVEDBOX3 + (wBoxMonNicksEnd - W_NUMINBOX) ; $AD26 -S_SAVEDBOX5 EQU S_SAVEDBOX4 + (wBoxMonNicksEnd - W_NUMINBOX) ; $B188 -S_SAVEDBOX6 EQU S_SAVEDBOX5 + (wBoxMonNicksEnd - W_NUMINBOX) ; $B5EA -S_SAVEDBOXESCHECKSUM EQU S_SAVEDBOX6 + (wBoxMonNicksEnd - W_NUMINBOX) ; $BA4C -S_SAVEDBOXESCHECKSUM2 EQU S_SAVEDBOXESCHECKSUM + 1 ; $BA4D - -S_SAVEDPLAYERNAME EQU $A598 -S_SAVEDMAINDATA EQU S_SAVEDPLAYERNAME + (wPartyCount - wPlayerName) ; $A5A3 -S_SAVEDPLAYERID EQU S_SAVEDMAINDATA + (wPlayerID - wPokedexOwned) ; $A605 -S_SAVEDSPRITEDATA EQU S_SAVEDMAINDATA + (W_NUMINBOX - wPokedexOwned) ; $AD2C -S_SAVEDPARTYDATA EQU S_SAVEDSPRITEDATA + (wOAMBuffer - wSpriteStateData1) ; $AF2C -S_SAVEDCURBOXDATA EQU S_SAVEDPARTYDATA + (wPokedexOwned - wPartyCount) ; $B0C0 -S_SAVEDhTilesetType EQU S_SAVEDCURBOXDATA + (wBoxMonNicksEnd - W_NUMINBOX) ; $B522 -S_SAVEDMAINDATACHECKSUM EQU S_SAVEDhTilesetType + 1 ; $B523 +SECTION "Save Data", SRAM, BANK[1] + +SECTION "Sprite State Data", SRAM1[$a598] +S_SAVEDPLAYERNAME:: ds 11 ; a598 +S_SAVEDMAINDATA:: ds wPartyCount - wPlayerName ; a5a3 +S_SAVEDSPRITEDATA:: ds W_NUMINBOX - wPokedexOwned ; ad2c +S_SAVEDPARTYDATA:: ds wOAMBuffer - wSpriteStateData1 ; af2c +S_SAVEDCURBOXDATA:: ds wPokedexOwned - wPartyCount ; b0c0 +S_SAVEDhTilesetType:: ds wBoxMonNicksEnd - W_NUMINBOX ; b522 +S_SAVEDMAINDATACHECKSUM:: ds 1 ; b523 + +S_SAVEDPLAYERID EQU S_SAVEDMAINDATA + (wPlayerID - wPokedexOwned) ; a605 + +SECTION "Saved Boxes", SRAM, BANK[2] ; pointers used for bank 3 too + +S_BOXLENGTH EQU wBoxMonNicksEnd - W_NUMINBOX ; $462 + +S_SAVEDBOX1:: ds S_BOXLENGTH ; a000 +S_SAVEDBOX2:: ds S_BOXLENGTH ; a462 +S_SAVEDBOX3:: ds S_BOXLENGTH ; a8c4 +S_SAVEDBOX4:: ds S_BOXLENGTH ; ad26 +S_SAVEDBOX5:: ds S_BOXLENGTH ; b188 +S_SAVEDBOX6:: ds S_BOXLENGTH ; b5ea +S_SAVEDBOXESCHECKSUM:: ds 1 ; ba4c +S_SAVEDBOXESCHECKSUM2:: ds 6 ; ba4d -- cgit v1.3.1-sl0p From 9c3c8c9263141658a36cf6e9d82564437ea203a6 Mon Sep 17 00:00:00 2001 From: luckytyphlosion Date: Sun, 26 Apr 2015 15:05:40 -0400 Subject: Fix typo --- sram.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sram.asm') diff --git a/sram.asm b/sram.asm index d987652e..a47c0572 100644 --- a/sram.asm +++ b/sram.asm @@ -10,7 +10,7 @@ sHallOfFame:: ds HOF_TEAM * NUM_HOF_TEAMS ; a598 SECTION "Save Data", SRAM, BANK[1] -SECTION "Sprite State Data", SRAM1[$a598] +SECTION "Save Data Start", SRAM1[$a598] S_SAVEDPLAYERNAME:: ds 11 ; a598 S_SAVEDMAINDATA:: ds wPartyCount - wPlayerName ; a5a3 S_SAVEDSPRITEDATA:: ds W_NUMINBOX - wPokedexOwned ; ad2c -- cgit v1.3.1-sl0p From 75551f100b7befe991faf139e0e99f9168506851 Mon Sep 17 00:00:00 2001 From: luckytyphlosion Date: Sun, 26 Apr 2015 15:06:58 -0400 Subject: Fix datasizes --- sram.asm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'sram.asm') diff --git a/sram.asm b/sram.asm index a47c0572..8ceebf2f 100644 --- a/sram.asm +++ b/sram.asm @@ -12,11 +12,11 @@ SECTION "Save Data", SRAM, BANK[1] SECTION "Save Data Start", SRAM1[$a598] S_SAVEDPLAYERNAME:: ds 11 ; a598 -S_SAVEDMAINDATA:: ds wPartyCount - wPlayerName ; a5a3 -S_SAVEDSPRITEDATA:: ds W_NUMINBOX - wPokedexOwned ; ad2c -S_SAVEDPARTYDATA:: ds wOAMBuffer - wSpriteStateData1 ; af2c -S_SAVEDCURBOXDATA:: ds wPokedexOwned - wPartyCount ; b0c0 -S_SAVEDhTilesetType:: ds wBoxMonNicksEnd - W_NUMINBOX ; b522 +S_SAVEDMAINDATA:: ds W_NUMINBOX - wPokedexOwned ; a5a3 +S_SAVEDSPRITEDATA:: ds wOAMBuffer - wSpriteStateData1 ; ad2c +S_SAVEDPARTYDATA:: ds wPokedexOwned - wPartyCount ; af2c +S_SAVEDCURBOXDATA:: ds wBoxMonNicksEnd - W_NUMINBOX ; b0c0 +S_SAVEDhTilesetType:: ds 1 ; b522 S_SAVEDMAINDATACHECKSUM:: ds 1 ; b523 S_SAVEDPLAYERID EQU S_SAVEDMAINDATA + (wPlayerID - wPokedexOwned) ; a605 -- cgit v1.3.1-sl0p From 22eb324fefdff68723a12c3765cfabf6b1ab7c00 Mon Sep 17 00:00:00 2001 From: luckytyphlosion Date: Sun, 26 Apr 2015 15:59:50 -0400 Subject: Remove S_SAVEDPLAYERID as a constant Expression must have a constant value. --- sram.asm | 2 -- 1 file changed, 2 deletions(-) (limited to 'sram.asm') diff --git a/sram.asm b/sram.asm index 8ceebf2f..97099019 100644 --- a/sram.asm +++ b/sram.asm @@ -19,8 +19,6 @@ S_SAVEDCURBOXDATA:: ds wBoxMonNicksEnd - W_NUMINBOX ; b0c0 S_SAVEDhTilesetType:: ds 1 ; b522 S_SAVEDMAINDATACHECKSUM:: ds 1 ; b523 -S_SAVEDPLAYERID EQU S_SAVEDMAINDATA + (wPlayerID - wPokedexOwned) ; a605 - SECTION "Saved Boxes", SRAM, BANK[2] ; pointers used for bank 3 too S_BOXLENGTH EQU wBoxMonNicksEnd - W_NUMINBOX ; $462 -- cgit v1.3.1-sl0p From b97d571e8e3de28f705b709d1446e0748678eb8c Mon Sep 17 00:00:00 2001 From: luckytyphlosion Date: Sun, 26 Apr 2015 16:01:10 -0400 Subject: Update sram.asm --- sram.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sram.asm') diff --git a/sram.asm b/sram.asm index 97099019..26255d6b 100644 --- a/sram.asm +++ b/sram.asm @@ -21,7 +21,7 @@ S_SAVEDMAINDATACHECKSUM:: ds 1 ; b523 SECTION "Saved Boxes", SRAM, BANK[2] ; pointers used for bank 3 too -S_BOXLENGTH EQU wBoxMonNicksEnd - W_NUMINBOX ; $462 +S_BOXLENGTH EQU $462 S_SAVEDBOX1:: ds S_BOXLENGTH ; a000 S_SAVEDBOX2:: ds S_BOXLENGTH ; a462 -- cgit v1.3.1-sl0p