Rooba
/
pokecrystal
mirror of https://github.com/pret/pokecrystal.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert sPlayerID

This commit is contained in:
PikalaxALT 2015-10-13 17:40:18 -04:00
parent 12f9dca7a5
commit d338a092c5
3 changed files with 27 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engine/save.asm
View File

@ -225,7 +225,7 @@ SaveTheGame_yesorno: ; 14baf
Function14bcb: ; 14bcb Function14bcb: ; 14bcb
ld a, BANK(sPlayerData) ld a, BANK(sPlayerData)
call GetSRAMBank call GetSRAMBank
ld hl, sPlayerID ld hl, sPlayerData + (PlayerID - wPlayerData)
ld a, [hli] ld a, [hli]
ld c, [hl] ld c, [hl]
ld b, a ld b, a

1
sram.asm
View File

@ -58,7 +58,6 @@ sOptions:: ds OptionsEnd - Options
s1_a008:: ds 1 s1_a008:: ds 1
sGameData:: sGameData::
sPlayerID::
sPlayerData:: ds wPlayerDataEnd - wPlayerData sPlayerData:: ds wPlayerDataEnd - wPlayerData
sMapData:: ds wMapDataEnd - wMapData sMapData:: ds wMapDataEnd - wMapData
sPokemonData:: ds wPokemonDataEnd - wPokemonData sPokemonData:: ds wPokemonDataEnd - wPokemonData

52
tilesets/animations.asm
View File

@ -99,7 +99,7 @@ Tileset01Anim: ; 0xfc0a3
TilesetAnimfc0d7: ; 0xfc0d7 TilesetAnimfc0d7: ; 0xfc0d7
dwtile $03, VTiles2, WriteTileToBuffer dwtile $03, VTiles2, WriteTileToBuffer
dw AttrMapEnd, ScrollTileRightLeft dw wcf41, ScrollTileRightLeft
dwtile $03, VTiles2, WriteTileFromBuffer dwtile $03, VTiles2, WriteTileFromBuffer
dw NULL, WaitTileAnimation dw NULL, WaitTileAnimation
dw NULL, WaitTileAnimation dw NULL, WaitTileAnimation
@ -113,7 +113,7 @@ TilesetAnimfc0d7: ; 0xfc0d7
TilesetAnimfc103: ; 0xfc103 TilesetAnimfc103: ; 0xfc103
dwtile $14, VTiles2, WriteTileToBuffer dwtile $14, VTiles2, WriteTileToBuffer
dw AttrMapEnd, ScrollTileRightLeft dw wcf41, ScrollTileRightLeft
dwtile $14, VTiles2, WriteTileFromBuffer dwtile $14, VTiles2, WriteTileFromBuffer
dw NULL, WaitTileAnimation dw NULL, WaitTileAnimation
dw NULL, WaitTileAnimation dw NULL, WaitTileAnimation
@ -153,32 +153,32 @@ Tileset15Anim: ; 0xfc15f
TilesetAnimfc17f: ; 0xfc17f TilesetAnimfc17f: ; 0xfc17f
dwtile $53, VTiles2, WriteTileToBuffer dwtile $53, VTiles2, WriteTileToBuffer
dw AttrMapEnd, ScrollTileDown dw wcf41, ScrollTileDown
dw AttrMapEnd, ScrollTileDown dw wcf41, ScrollTileDown
dwtile $53, VTiles2, WriteTileFromBuffer dwtile $53, VTiles2, WriteTileFromBuffer
dwtile $03, VTiles2, WriteTileToBuffer dwtile $03, VTiles2, WriteTileToBuffer
dw AttrMapEnd, ScrollTileRightLeft dw wcf41, ScrollTileRightLeft
dwtile $03, VTiles2, WriteTileFromBuffer dwtile $03, VTiles2, WriteTileFromBuffer
dwtile $53, VTiles2, WriteTileToBuffer dwtile $53, VTiles2, WriteTileToBuffer
dw AttrMapEnd, ScrollTileDown dw wcf41, ScrollTileDown
dw AttrMapEnd, ScrollTileDown dw wcf41, ScrollTileDown
dwtile $53, VTiles2, WriteTileFromBuffer dwtile $53, VTiles2, WriteTileFromBuffer
dw NULL, DoneTileAnimation dw NULL, DoneTileAnimation
; 0xfc1af ; 0xfc1af
TilesetAnimfc1af: ; 0xfc1af TilesetAnimfc1af: ; 0xfc1af
dwtile $54, VTiles2, WriteTileToBuffer dwtile $54, VTiles2, WriteTileToBuffer
dw AttrMapEnd, ScrollTileDown dw wcf41, ScrollTileDown
dw AttrMapEnd, ScrollTileDown dw wcf41, ScrollTileDown
dwtile $54, VTiles2, WriteTileFromBuffer dwtile $54, VTiles2, WriteTileFromBuffer
dw NULL, WaitTileAnimation dw NULL, WaitTileAnimation
dwtile $03, VTiles2, WriteTileToBuffer dwtile $03, VTiles2, WriteTileToBuffer
dw AttrMapEnd, ScrollTileRightLeft dw wcf41, ScrollTileRightLeft
dwtile $03, VTiles2, WriteTileFromBuffer dwtile $03, VTiles2, WriteTileFromBuffer
dw NULL, WaitTileAnimation dw NULL, WaitTileAnimation
dwtile $54, VTiles2, WriteTileToBuffer dwtile $54, VTiles2, WriteTileToBuffer
dw AttrMapEnd, ScrollTileDown dw wcf41, ScrollTileDown
dw AttrMapEnd, ScrollTileDown dw wcf41, ScrollTileDown
dwtile $54, VTiles2, WriteTileFromBuffer dwtile $54, VTiles2, WriteTileFromBuffer
dw NULL, DoneTileAnimation dw NULL, DoneTileAnimation
; 0xfc1e7 ; 0xfc1e7
@ -187,7 +187,7 @@ Tileset24Anim: ; 0xfc1e7
Tileset30Anim: ; 0xfc1e7 Tileset30Anim: ; 0xfc1e7
dwtile $14, VTiles2, WriteTileToBuffer dwtile $14, VTiles2, WriteTileToBuffer
dw NULL, FlickeringCaveEntrancePalette dw NULL, FlickeringCaveEntrancePalette
dw AttrMapEnd, ScrollTileRightLeft dw wcf41, ScrollTileRightLeft
dw NULL, FlickeringCaveEntrancePalette dw NULL, FlickeringCaveEntrancePalette
dwtile $14, VTiles2, WriteTileFromBuffer dwtile $14, VTiles2, WriteTileFromBuffer
dw NULL, FlickeringCaveEntrancePalette dw NULL, FlickeringCaveEntrancePalette
@ -195,11 +195,11 @@ Tileset30Anim: ; 0xfc1e7
dw NULL, FlickeringCaveEntrancePalette dw NULL, FlickeringCaveEntrancePalette
dwtile $40, VTiles2, WriteTileToBuffer dwtile $40, VTiles2, WriteTileToBuffer
dw NULL, FlickeringCaveEntrancePalette dw NULL, FlickeringCaveEntrancePalette
dw AttrMapEnd, ScrollTileDown dw wcf41, ScrollTileDown
dw NULL, FlickeringCaveEntrancePalette dw NULL, FlickeringCaveEntrancePalette
dw AttrMapEnd, ScrollTileDown dw wcf41, ScrollTileDown
dw NULL, FlickeringCaveEntrancePalette dw NULL, FlickeringCaveEntrancePalette
dw AttrMapEnd, ScrollTileDown dw wcf41, ScrollTileDown
dw NULL, FlickeringCaveEntrancePalette dw NULL, FlickeringCaveEntrancePalette
dwtile $40, VTiles2, WriteTileFromBuffer dwtile $40, VTiles2, WriteTileFromBuffer
dw NULL, FlickeringCaveEntrancePalette dw NULL, FlickeringCaveEntrancePalette
@ -209,7 +209,7 @@ Tileset30Anim: ; 0xfc1e7
Tileset29Anim: ; 0xfc233 Tileset29Anim: ; 0xfc233
dwtile $35, VTiles2, WriteTileToBuffer dwtile $35, VTiles2, WriteTileToBuffer
dw NULL, FlickeringCaveEntrancePalette dw NULL, FlickeringCaveEntrancePalette
dw AttrMapEnd, ScrollTileRightLeft dw wcf41, ScrollTileRightLeft
dw NULL, FlickeringCaveEntrancePalette dw NULL, FlickeringCaveEntrancePalette
dwtile $35, VTiles2, WriteTileFromBuffer dwtile $35, VTiles2, WriteTileFromBuffer
dw NULL, FlickeringCaveEntrancePalette dw NULL, FlickeringCaveEntrancePalette
@ -217,11 +217,11 @@ Tileset29Anim: ; 0xfc233
dw NULL, FlickeringCaveEntrancePalette dw NULL, FlickeringCaveEntrancePalette
dwtile $31, VTiles2, WriteTileToBuffer dwtile $31, VTiles2, WriteTileToBuffer
dw NULL, FlickeringCaveEntrancePalette dw NULL, FlickeringCaveEntrancePalette
dw AttrMapEnd, ScrollTileDown dw wcf41, ScrollTileDown
dw NULL, FlickeringCaveEntrancePalette dw NULL, FlickeringCaveEntrancePalette
dw AttrMapEnd, ScrollTileDown dw wcf41, ScrollTileDown
dw NULL, FlickeringCaveEntrancePalette dw NULL, FlickeringCaveEntrancePalette
dw AttrMapEnd, ScrollTileDown dw wcf41, ScrollTileDown
dw NULL, FlickeringCaveEntrancePalette dw NULL, FlickeringCaveEntrancePalette
dwtile $31, VTiles2, WriteTileFromBuffer dwtile $31, VTiles2, WriteTileFromBuffer
dw NULL, FlickeringCaveEntrancePalette dw NULL, FlickeringCaveEntrancePalette
@ -249,7 +249,7 @@ Tileset23Anim: ; 0xfc27f
TilesetAnimfc2bf: ; 0xfc2bf TilesetAnimfc2bf: ; 0xfc2bf
dwtile $4f, VTiles2, WriteTileToBuffer dwtile $4f, VTiles2, WriteTileToBuffer
dw AttrMapEnd, ScrollTileRightLeft dw wcf41, ScrollTileRightLeft
dwtile $4f, VTiles2, WriteTileFromBuffer dwtile $4f, VTiles2, WriteTileFromBuffer
dw NULL, WaitTileAnimation dw NULL, WaitTileAnimation
dw NULL, WaitTileAnimation dw NULL, WaitTileAnimation
@ -860,14 +860,14 @@ AnimateWhirlpoolTile: ; fc678
WriteTileFromBuffer: ; fc696 WriteTileFromBuffer: ; fc696
; Write tiledata at AttrMapEnd to de. ; Write tiledata at wcf41 to de.
; AttrMapEnd is loaded to sp for WriteTile. ; wcf41 is loaded to sp for WriteTile.
ld hl, [sp+0] ld hl, [sp+0]
ld b, h ld b, h
ld c, l ld c, l
ld hl, AttrMapEnd ld hl, wcf41
ld sp, hl ld sp, hl
ld h, d ld h, d
@ -877,7 +877,7 @@ WriteTileFromBuffer: ; fc696
WriteTileToBuffer: ; fc6a2 WriteTileToBuffer: ; fc6a2
; Write tiledata de to AttrMapEnd. ; Write tiledata de to wcf41.
; de is loaded to sp for WriteTile. ; de is loaded to sp for WriteTile.
ld hl, [sp+0] ld hl, [sp+0]
@ -888,7 +888,7 @@ WriteTileToBuffer: ; fc6a2
ld l, e ld l, e
ld sp, hl ld sp, hl
ld hl, AttrMapEnd ld hl, wcf41
; fallthrough ; fallthrough