diff options
Diffstat (limited to 'engine/save.asm')
| -rwxr-xr-x | engine/save.asm | 96 |
1 files changed, 48 insertions, 48 deletions
diff --git a/engine/save.asm b/engine/save.asm index 93b70be4..3cc7539a 100755 --- a/engine/save.asm +++ b/engine/save.asm @@ -18,7 +18,7 @@ LoadSAV: ; 735e8 (1c:75e8) set 6, [hl] ld hl, FileDataDestroyedText call PrintText - ld c, $64 + ld c, 100 call DelayFrames pop hl res 6, [hl] @@ -54,7 +54,7 @@ LoadSAVCheckSum: ; 73623 (1c:7623) .Func_73652 ; 73652 (1c:7652) ld hl, S_SAVEDPLAYERNAME - ld de, wPlayerName ; wd158 + ld de, wPlayerName ld bc, $b call CopyData ld hl, S_SAVEDMAINDATA @@ -110,11 +110,11 @@ LoadSAVCheckSum2: ; 736bd (1c:76bd) cp c jp nz, SAVBadCheckSum ld hl, S_SAVEDPARTYDATA - ld de, wPartyCount ; wPartyCount + ld de, wPartyCount ld bc, wPokedexOwned - wPartyCount call CopyData ld hl, S_SAVEDMAINDATA - ld de, wPokedexOwned ; wPokedexOwned + ld de, wPokedexOwned ld bc, wPokedexSeenEnd - wPokedexOwned call CopyData and a @@ -129,12 +129,12 @@ SAVGoodChecksum: ; 736f8 (1c:76f8) ld [MBC1SRamEnable], a ret -Func_73701: ; 0x73701 +Func_73701: ; 73701 (1c:7701) call LoadSAVCheckSum call LoadSAVCheckSum1 jp LoadSAVCheckSum2 -SaveSAV: ;$770a +SaveSAV: ; 7370a (1c:770a) callba PrintSaveScreenText ld hl,WouldYouLikeToSaveText call SaveSAVConfirm @@ -149,22 +149,22 @@ SaveSAV: ;$770a call SaveSAVConfirm and a ret nz -.save ;$772d - call SaveSAVtoSRAM ;$7848 +.save + call SaveSAVtoSRAM hlCoord 1, 13 ld bc,$0412 call ClearScreenArea ; clear area 4x12 starting at 13,1 hlCoord 1, 14 ld de,NowSavingString call PlaceString - ld c,$78 + ld c,120 call DelayFrames ld hl,GameSavedText call PrintText ld a, (SFX_02_5d - SFX_Headers_02) / 3 ;sound for saved game call PlaySoundWaitForCurrent call WaitForSoundToFinish - ld c,$1e + ld c,30 jp DelayFrames NowSavingString: @@ -292,7 +292,7 @@ SAVCheckSum: ; 73856 (1c:7856) Func_73863: ; 73863 (1c:7863) ld hl, $a000 - ld de, S_SAVEDBOXESCHECKSUM2 ; $ba4d + ld de, S_SAVEDBOXES1CHECKSUM2 ; S_SAVEDBOXES2CHECKSUM2 ld b, $6 .asm_7386b push bc @@ -308,7 +308,7 @@ Func_73863: ; 73863 (1c:7863) ret Func_7387b: ; 7387b (1c:787b) - ld hl, PointerTable_73895 ; $7895 + ld hl, PointerTable_73895 ld a, [wd5a0] and $7f cp $6 @@ -327,12 +327,12 @@ Func_7387b: ; 7387b (1c:787b) ret PointerTable_73895: ; 73895 (1c:7895) - dw S_SAVEDBOX1 - dw S_SAVEDBOX2 - dw S_SAVEDBOX3 - dw S_SAVEDBOX4 - dw S_SAVEDBOX5 - dw S_SAVEDBOX6 + dw S_SAVEDBOX1 ; S_SAVEDBOX7 + dw S_SAVEDBOX2 ; S_SAVEDBOX8 + dw S_SAVEDBOX3 ; S_SAVEDBOX9 + dw S_SAVEDBOX4 ; S_SAVEDBOX10 + dw S_SAVEDBOX5 ; S_SAVEDBOX11 + dw S_SAVEDBOX6 ; S_SAVEDBOX12 ChangeBox:: ; 738a1 (1c:78a1) ld hl, WhenYouChangeBoxText @@ -402,7 +402,7 @@ Func_7390e: ; 7390e (1c:790e) ld hl, $a000 ld bc, $1a4c call SAVCheckSum - ld [S_SAVEDBOXESCHECKSUM], a + ld [S_SAVEDBOXES1CHECKSUM], a ; S_SAVEDBOXES2CHECKSUM call Func_73863 xor a ld [MBC1SRamBankingMode], a @@ -411,21 +411,21 @@ Func_7390e: ; 7390e (1c:790e) Func_7393f: ; 7393f (1c:793f) xor a - ld [H_AUTOBGTRANSFERENABLED], a ; $ffba + ld [H_AUTOBGTRANSFERENABLED], a ld a, $3 - ld [wMenuWatchedKeys], a ; wMenuWatchedKeys + ld [wMenuWatchedKeys], a ld a, $b - ld [wMaxMenuItem], a ; wMaxMenuItem + ld [wMaxMenuItem], a ld a, $1 - ld [wTopMenuItemY], a ; wTopMenuItemY + ld [wTopMenuItemY], a ld a, $c - ld [wTopMenuItemX], a ; wTopMenuItemX + ld [wTopMenuItemX], a xor a ld [wcc37], a ld a, [wd5a0] and $7f - ld [wCurrentMenuItem], a ; wCurrentMenuItem - ld [wLastMenuItem], a ; wLastMenuItem + ld [wCurrentMenuItem], a + ld [wLastMenuItem], a ld hl, wTileMap ld b, $2 ld c, $9 @@ -438,7 +438,7 @@ Func_7393f: ; 7393f (1c:793f) call TextBoxBorder ld hl, hFlags_0xFFF6 set 2, [hl] - ld de, BoxNames ; $79d9 + ld de, BoxNames hlCoord 13, 1 call PlaceString ld hl, hFlags_0xFFF6 @@ -461,7 +461,7 @@ Func_7393f: ; 7393f (1c:793f) call PlaceString call Func_73a84 hlCoord 18, 1 - ld de, wWhichTrade ; wWhichTrade + ld de, wWhichTrade ld bc, $14 ld a, $c .asm_739c2 @@ -477,7 +477,7 @@ Func_7393f: ; 7393f (1c:793f) dec a jr nz, .asm_739c2 ld a, $1 - ld [H_AUTOBGTRANSFERENABLED], a ; $ffba + ld [H_AUTOBGTRANSFERENABLED], a ret ChooseABoxText: ; 739d4 (1c:79d4) @@ -518,22 +518,22 @@ Func_73a29: ; 73a29 (1c:7a29) ret Func_73a4b: ; 73a4b (1c:7a4b) - ld hl, S_SAVEDBOX1 + ld hl, S_SAVEDBOX1 ; S_SAVEDBOX7 call Func_73a7f - ld hl, S_SAVEDBOX2 + ld hl, S_SAVEDBOX2 ; S_SAVEDBOX8 call Func_73a7f - ld hl, S_SAVEDBOX3 + ld hl, S_SAVEDBOX3 ; S_SAVEDBOX9 call Func_73a7f - ld hl, S_SAVEDBOX4 + ld hl, S_SAVEDBOX4 ; S_SAVEDBOX10 call Func_73a7f - ld hl, S_SAVEDBOX5 + ld hl, S_SAVEDBOX5 ; S_SAVEDBOX11 call Func_73a7f - ld hl, S_SAVEDBOX6 + ld hl, S_SAVEDBOX6 ; S_SAVEDBOX12 call Func_73a7f - ld hl, S_SAVEDBOX1 + ld hl, S_SAVEDBOX1 ; S_SAVEDBOX7 ld bc, $6 * (S_SAVEDBOX2 - S_SAVEDBOX1) ; $1a4c call SAVCheckSum - ld [S_SAVEDBOXESCHECKSUM], a + ld [S_SAVEDBOXES1CHECKSUM], a ; S_SAVEDBOXES2CHECKSUM call Func_73863 ret @@ -545,7 +545,7 @@ Func_73a7f: ; 73a7f (1c:7a7f) ret Func_73a84: ; 73a84 (1c:7a84) - ld hl, wWhichTrade ; wWhichTrade + ld hl, wWhichTrade push hl ld a, SRAM_ENABLE ld [MBC1SRamEnable], a @@ -566,29 +566,29 @@ Func_73a84: ; 73a84 (1c:7a84) ld c, a ld b, $0 add hl, bc - ld a, [W_NUMINBOX] ; wda80 + ld a, [W_NUMINBOX] ld [hl], a ret Func_73ab8: ; 73ab8 (1c:7ab8) - ld a, [S_SAVEDBOX1] + ld a, [S_SAVEDBOX1] ; S_SAVEDBOX7 ld [hli], a - ld a, [S_SAVEDBOX2] + ld a, [S_SAVEDBOX2] ; S_SAVEDBOX8 ld [hli], a - ld a, [S_SAVEDBOX3] + ld a, [S_SAVEDBOX3] ; S_SAVEDBOX9 ld [hli], a - ld a, [S_SAVEDBOX4] + ld a, [S_SAVEDBOX4] ; S_SAVEDBOX10 ld [hli], a - ld a, [S_SAVEDBOX5] + ld a, [S_SAVEDBOX5] ; S_SAVEDBOX11 ld [hli], a - ld a, [S_SAVEDBOX6] + ld a, [S_SAVEDBOX6] ; S_SAVEDBOX12 ld [hli], a ret -SAVCheckRandomID: ;$7ad1 +SAVCheckRandomID: ; 73ad1 (1c:7ad1) ;checks if Sav file is the same by checking player's name 1st letter ($a598) ; and the two random numbers generated at game beginning -;(which are stored at wPlayerID) +;(which are stored at wPlayerID)s ld a,$0a ld [$0000],a ld a,$01 @@ -646,7 +646,7 @@ SaveHallOfFameTeams: ; 73b0d (1c:7b0d) LoadHallOfFameTeams: ; 73b3f (1c:7b3f) ld hl, sHallOfFame ld bc, HOF_TEAM - ld a, [wWhichTrade] ; wWhichTrade + ld a, [wWhichTrade] call AddNTimes ld de, wcc5b ld bc, HOF_TEAM |