From b3d38369742cb8d06a88a6a4ba92e14f97038407 Mon Sep 17 00:00:00 2001 From: luckytyphlosion Date: Sun, 26 Apr 2015 11:54:26 -0400 Subject: SRAM Constants Adding SRAM Constants to replace direct addresses with labels. --- wram.asm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/wram.asm b/wram.asm index 91b864d9..03e99401 100755 --- a/wram.asm +++ b/wram.asm @@ -2302,3 +2302,9 @@ 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) -- cgit v1.2.3 From 5f61d0008924304030b87d56f14d790afcf5a055 Mon Sep 17 00:00:00 2001 From: luckytyphlosion Date: Sun, 26 Apr 2015 11:56:15 -0400 Subject: Replaced Box Direct Addresses with Labels. --- engine/save.asm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/engine/save.asm b/engine/save.asm index d3127f04..36af698d 100755 --- a/engine/save.asm +++ b/engine/save.asm @@ -327,12 +327,12 @@ Func_7387b: ; 7387b (1c:787b) ret PointerTable_73895: ; 73895 (1c:7895) - dw $A000 - dw $A462 - dw $A8C4 - dw $AD26 - dw $B188 - dw $B5EA + dw S_SAVEDBOX1 + dw S_SAVEDBOX2 + dw S_SAVEDBOX3 + dw S_SAVEDBOX4 + dw S_SAVEDBOX5 + dw S_SAVEDBOX6 ChangeBox:: ; 738a1 (1c:78a1) ld hl, WhenYouChangeBoxText -- cgit v1.2.3 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 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.2.3 From 7742766a29f02ca32e2fc2655c5282313d95f1f3 Mon Sep 17 00:00:00 2001 From: luckytyphlosion Date: Sun, 26 Apr 2015 12:05:25 -0400 Subject: Split SRAM stuff. --- wram.asm | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/wram.asm b/wram.asm index 03e99401..818fed54 100755 --- a/wram.asm +++ b/wram.asm @@ -2292,19 +2292,4 @@ wStack:: ; dfff ds -$100 -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) +INCLUDE "sram.asm" -- cgit v1.2.3 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(-) 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.2.3 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(+) 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.2.3 From 55b5d3e3af5b56f18481a5cd933c662116327af4 Mon Sep 17 00:00:00 2001 From: luckytyphlosion Date: Sun, 26 Apr 2015 13:15:12 -0400 Subject: Replaced all direct addresses with labels. --- engine/save.asm | 104 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 52 insertions(+), 52 deletions(-) diff --git a/engine/save.asm b/engine/save.asm index 36af698d..eddfbb51 100755 --- a/engine/save.asm +++ b/engine/save.asm @@ -37,39 +37,39 @@ LoadSAVCheckSum: ; 73623 (1c:7623) ld a, $1 ld [MBC1SRamBankingMode], a ld [MBC1SRamBank], a - ld hl, $a598 ; hero name located in SRAM + ld hl, S_SAVEDPLAYERNAME ; hero name located in SRAM ld bc, $f8b ; but here checks the full SAV call SAVCheckSum ld c, a - ld a, [$b523] ; SAV's checksum + ld a, [S_SAVEDMAINDATACHECKSUM] ; SAV's checksum cp c jp z, .Func_73652 - ld hl, $a598 + ld hl, S_SAVEDPLAYERNAME ld bc, $f8b call SAVCheckSum ld c, a - ld a, [$b523] ; SAV's checksum + ld a, [S_SAVEDMAINDATACHECKSUM] ; SAV's checksum cp c jp nz, SAVBadCheckSum .Func_73652 ; 73652 (1c:7652) - ld hl, $a598 + ld hl, S_SAVEDPLAYERNAME ld de, wPlayerName ; wd158 ld bc, $b call CopyData - ld hl, $a5a3 + ld hl, S_SAVEDMAINDATA ld de, wPokedexOwned ld bc, $789 call CopyData ld hl, W_CURMAPTILESET set 7, [hl] - ld hl, $ad2c + ld hl, S_SAVEDSPRITEDATA ld de, wSpriteStateData1 ld bc, $200 call CopyData - ld a, [$b522] + ld a, [S_SAVEDhTilesetType] ld [hTilesetType], a - ld hl, $b0c0 + ld hl, S_SAVEDCURBOXDATA ld de, W_NUMINBOX ld bc, wBoxMonNicksEnd - W_NUMINBOX call CopyData @@ -82,14 +82,14 @@ LoadSAVCheckSum1: ; 73690 (1c:7690) ld a, $1 ld [MBC1SRamBankingMode], a ld [MBC1SRamBank], a - ld hl, $a598 ; hero name located in SRAM + ld hl, S_SAVEDPLAYERNAME ; hero name located in SRAM ld bc, $f8b ; but here checks the full SAV call SAVCheckSum ld c, a - ld a, [$b523] ; SAV's checksum + ld a, [S_SAVEDMAINDATACHECKSUM] ; SAV's checksum cp c jr nz, SAVBadCheckSum - ld hl, $b0c0 + ld hl, S_SAVEDCURBOXDATA ld de, W_NUMINBOX ld bc, wBoxMonNicksEnd - W_NUMINBOX call CopyData @@ -102,18 +102,18 @@ LoadSAVCheckSum2: ; 736bd (1c:76bd) ld a, $1 ld [MBC1SRamBankingMode], a ld [MBC1SRamBank], a - ld hl, $a598 ; hero name located in SRAM + ld hl, S_SAVEDPLAYERNAME ; hero name located in SRAM ld bc, $f8b ; but here checks the full SAV call SAVCheckSum ld c, a - ld a, [$b523] ; SAV's checksum + ld a, [S_SAVEDMAINDATACHECKSUM] ; SAV's checksum cp c jp nz, SAVBadCheckSum - ld hl, $af2c + ld hl, S_SAVEDPARTYDATA ld de, wPartyCount ; wPartyCount - ld bc, $194 + ld bc, wPokedexOwned - wPartyCount call CopyData - ld hl, $a5a3 + ld hl, S_SAVEDMAINDATA ld de, wPokedexOwned ; wPokedexOwned ld bc, wPokedexSeenEnd - wPokedexOwned call CopyData @@ -199,27 +199,27 @@ SaveSAVtoSRAM0: ; 7378c (1c:778c) ld [MBC1SRamBankingMode], a ld [MBC1SRamBank], a ld hl, wPlayerName - ld de, $a598 + ld de, S_SAVEDPLAYERNAME ld bc, $b call CopyData ld hl, wPokedexOwned - ld de, $a5a3 + ld de, S_SAVEDMAINDATA ld bc, W_NUMINBOX - wPokedexOwned call CopyData ld hl, wSpriteStateData1 - ld de, $ad2c + ld de, S_SAVEDSPRITEDATA ld bc, $200 call CopyData ld hl, W_NUMINBOX - ld de, $b0c0 + ld de, S_SAVEDCURBOXDATA ld bc, wBoxMonNicksEnd - W_NUMINBOX call CopyData ld a, [hTilesetType] - ld [$b522], a - ld hl, $a598 + ld [S_SAVEDhTilesetType], a + ld hl, S_SAVEDPLAYERNAME ld bc, $f8b call SAVCheckSum - ld [$b523], a + ld [S_SAVEDMAINDATACHECKSUM], a xor a ld [MBC1SRamBankingMode], a ld [MBC1SRamEnable], a @@ -233,13 +233,13 @@ SaveSAVtoSRAM1: ; 737e2 (1c:77e2) ld [MBC1SRamBankingMode], a ld [MBC1SRamBank], a ld hl, W_NUMINBOX - ld de, $b0c0 + ld de, S_SAVEDCURBOXDATA ld bc, wBoxMonNicksEnd - W_NUMINBOX call CopyData - ld hl, $a598 + ld hl, S_SAVEDPLAYERNAME ld bc, $f8b call SAVCheckSum - ld [$b523], a + ld [S_SAVEDMAINDATACHECKSUM], a xor a ld [MBC1SRamBankingMode], a ld [MBC1SRamEnable], a @@ -252,17 +252,17 @@ SaveSAVtoSRAM2: ; 7380f (1c:780f) ld [MBC1SRamBankingMode], a ld [MBC1SRamBank], a ld hl, wPartyCount - ld de, $af2c + ld de, S_SAVEDPARTYDATA ld bc, wPokedexOwned - wPartyCount call CopyData ld hl, wPokedexOwned ; pokédex only - ld de, $a5a3 + ld de, S_SAVEDMAINDATA ld bc, wPokedexSeenEnd - wPokedexOwned call CopyData - ld hl, $a598 + ld hl, S_SAVEDPLAYERNAME ld bc, $f8b call SAVCheckSum - ld [$b523], a + ld [S_SAVEDMAINDATACHECKSUM], a xor a ld [MBC1SRamBankingMode], a ld [MBC1SRamEnable], a @@ -292,7 +292,7 @@ SAVCheckSum: ; 73856 (1c:7856) Func_73863: ; 73863 (1c:7863) ld hl, $a000 - ld de, $ba4d + ld de, S_SAVEDBOXESCHECKSUM2 ; $ba4d ld b, $6 .asm_7386b push bc @@ -402,7 +402,7 @@ Func_7390e: ; 7390e (1c:790e) ld hl, $a000 ld bc, $1a4c call SAVCheckSum - ld [$ba4c], a + ld [S_SAVEDBOXESCHECKSUM], a call Func_73863 xor a ld [MBC1SRamBankingMode], a @@ -518,22 +518,22 @@ Func_73a29: ; 73a29 (1c:7a29) ret Func_73a4b: ; 73a4b (1c:7a4b) - ld hl, $a000 + ld hl, S_SAVEDBOX1 call Func_73a7f - ld hl, $a462 + ld hl, S_SAVEDBOX2 call Func_73a7f - ld hl, $a8c4 + ld hl, S_SAVEDBOX3 call Func_73a7f - ld hl, $ad26 + ld hl, S_SAVEDBOX4 call Func_73a7f - ld hl, $b188 + ld hl, S_SAVEDBOX5 call Func_73a7f - ld hl, $b5ea + ld hl, S_SAVEDBOX6 call Func_73a7f - ld hl, $a000 - ld bc, $1a4c + ld hl, S_SAVEDBOX1 + ld bc, $6 * (S_SAVEDBOX2 - S_SAVEDBOX1) ; $1a4c call SAVCheckSum - ld [$ba4c], a + ld [S_SAVEDBOXESCHECKSUM], a call Func_73863 ret @@ -571,17 +571,17 @@ Func_73a84: ; 73a84 (1c:7a84) ret Func_73ab8: ; 73ab8 (1c:7ab8) - ld a, [$a000] + ld a, [S_SAVEDBOX1] ld [hli], a - ld a, [$a462] + ld a, [S_SAVEDBOX2] ld [hli], a - ld a, [$a8c4] + ld a, [S_SAVEDBOX3] ld [hli], a - ld a, [$ad26] + ld a, [S_SAVEDBOX4] ld [hli], a - ld a, [$b188] + ld a, [S_SAVEDBOX5] ld [hli], a - ld a, [$b5ea] + ld a, [S_SAVEDBOX6] ld [hli], a ret @@ -594,17 +594,17 @@ SAVCheckRandomID: ;$7ad1 ld a,$01 ld [MBC1SRamBankingMode],a ld [MBC1SRamBank],a - ld a,[$a598] + ld a,[S_SAVEDPLAYERNAME] and a jr z,.next - ld hl,$a598 + ld hl,S_SAVEDPLAYERNAME ld bc,$0f8b call SAVCheckSum ld c,a - ld a,[$b523] + ld a,[S_SAVEDMAINDATACHECKSUM] cp c jr nz,.next - ld hl,$a605 + ld hl,S_SAVEDPLAYERID ld a,[hli] ld h,[hl] ld l,a -- cgit v1.2.3 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(-) 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.2.3 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(-) 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.2.3 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(-) 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.2.3 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(-) 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.2.3 From 3f70c5fc1b496232bbcbc4b71082c3c07d6367f3 Mon Sep 17 00:00:00 2001 From: luckytyphlosion Date: Sun, 26 Apr 2015 16:00:50 -0400 Subject: Update save.asm --- engine/save.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/engine/save.asm b/engine/save.asm index eddfbb51..93b70be4 100755 --- a/engine/save.asm +++ b/engine/save.asm @@ -604,7 +604,7 @@ SAVCheckRandomID: ;$7ad1 ld a,[S_SAVEDMAINDATACHECKSUM] cp c jr nz,.next - ld hl,S_SAVEDPLAYERID + ld hl,S_SAVEDMAINDATA + 98 ; player ID ld a,[hli] ld h,[hl] ld l,a -- cgit v1.2.3 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(-) 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.2.3