pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-09-08 08:13:02 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fix a bunch of palette copying errors and wram bank conflicts.

Browse Source 
There are probably a bunch more labels with wrong banks. This takes care of the most noticeable ones.
This commit is contained in:
yenatch
2015-02-10 18:21:38 -08:00
parent c0c081d60f
commit 956b990cd2
6 changed files with 80 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
battle/anim_commands.asm
View File

@@ -1428,13 +1428,13 @@ Functioncc91a: ; cc91a
ld a, $5 ld a, $5
ld [rSVBK], a ld [rSVBK], a
ld hl, BGPals ld hl, BGPals
ld de, wd000 ld de, Unkn1Pals
ld a, [rBGP] ld a, [rBGP]
ld b, a ld b, a
ld c, $7 ld c, $7
call CopyPals call CopyPals
ld hl, OBPals ld hl, OBPals
ld de, MartPointer ld de, Unkn2Pals
ld a, [rBGP] ld a, [rBGP]
ld b, a ld b, a
ld c, $2 ld c, $2

8
battle/core.asm
View File

@@ -8449,7 +8449,7 @@ Function3f568: ; 3f568
push af push af
ld a, $6 ld a, $6
ld [rSVBK], a ld [rSVBK], a
ld hl, wd000 ld hl, w6_d000
ld bc, $400 ld bc, $400
ld a, $2 ld a, $2
call ByteFill call ByteFill
@@ -8457,7 +8457,7 @@ Function3f568: ; 3f568
push af push af
ld a, $1 ld a, $1
ld [rVBK], a ld [rVBK], a
ld de, wd000 ld de, w6_d000
ld hl, VBGMap0 ld hl, VBGMap0
ld bc, $0f40 ld bc, $0f40
call Request2bpp call Request2bpp
@@ -9329,11 +9329,11 @@ Function3fbd6: ; 3fbd6
push af push af
ld a, $6 ld a, $6
ld [rSVBK], a ld [rSVBK], a
ld hl, wd000 ld hl, w6_d000
ld bc, $400 ld bc, $400
ld a, $7f ld a, $7f
call ByteFill call ByteFill
ld de, wd000 ld de, w6_d000
ld hl, VBGMap0 ld hl, VBGMap0
lb bc, BANK(Function3fbd6), $40 lb bc, BANK(Function3fbd6), $40
call Request2bpp call Request2bpp

10
engine/color.asm
View File

@@ -406,10 +406,10 @@ Function8c8a: ; 8c8a
ld [rSVBK], a ld [rSVBK], a
ld a, [hli] ld a, [hli]
ld [Unkn1Pals], a ld [Unkn1Pals], a
ld [wd010], a ld [Unkn1Pals + 8 * 2], a
ld a, [hl] ld a, [hl]
ld [wd001], a ld [Unkn1Pals + 1], a
ld [wd011], a ld [Unkn1Pals + 8 * 2 + 1], a
pop af pop af
ld [rSVBK], a ld [rSVBK], a
call Function96a4 call Function96a4
@@ -835,7 +835,7 @@ Function977a: ; 977a
dec c dec c
jr nz, .asm_9787 jr nz, .asm_9787
ld hl, Palettes_979c ld hl, Palettes_979c
ld de, wd050 ld de, Unkn2Pals + 8 * 2
ld bc, $0010 ld bc, $0010
ld a, $5 ld a, $5
call FarCopyWRAM call FarCopyWRAM
@@ -2031,7 +2031,7 @@ Functionb1de: ; b1de
inc hl inc hl
.asm_b26d .asm_b26d
ld de, wd032 ld de, Unkn1Pals + 8 * 6 + 2
ld bc, $0004 ld bc, $0004
ld a, $5 ld a, $5
call FarCopyWRAM call FarCopyWRAM

8
home.asm
View File

@@ -218,7 +218,7 @@ Function309d:: ; 309d
ld a, 2 ld a, 2
ld [rSVBK], a ld [rSVBK], a
ld hl, TileMap ld hl, TileMap
ld de, wd000 ld de, w2_d000
ld bc, TileMapEnd - TileMap ld bc, TileMapEnd - TileMap
call CopyBytes call CopyBytes
pop af pop af
@@ -240,7 +240,7 @@ Function30bf:: ; 30bf
push af push af
ld a, 2 ld a, 2
ld [rSVBK], a ld [rSVBK], a
ld hl, wd000 ld hl, w2_d000
ld de, TileMap ld de, TileMap
ld bc, TileMapEnd - TileMap ld bc, TileMapEnd - TileMap
call CopyBytes call CopyBytes
@@ -2226,7 +2226,7 @@ Function3f7c:: ; 3f7c
; 3f88 ; 3f88
Function3f88:: ; 3f88 Function3f88:: ; 3f88
ld hl, wd000 ld hl, w6_d000
ld b, $0 ld b, $0
.asm_3f8d .asm_3f8d
push bc push bc
@@ -2247,7 +2247,7 @@ Function3f88:: ; 3f88
; 3f9f ; 3f9f
Function3f9f:: ; 3f9f Function3f9f:: ; 3f9f
ld hl, wd000 ld hl, w6_d000
.asm_3fa2 .asm_3fa2
push bc push bc
ld c, $8 ld c, $8

126
main.asm
View File

@@ -5235,16 +5235,16 @@ Function64db: ; 64db
ld a, $6 ld a, $6
ld [rSVBK], a ld [rSVBK], a
ld a, $60 ld a, $60
ld hl, wd000 ld hl, w6_d000
ld bc, $400 ld bc, $400
call ByteFill call ByteFill
ld a, $d0 ld a, w6_d000 / $100
ld [rHDMA1], a ld [rHDMA1], a
ld a, $0 ld a, w6_d000 % $100
ld [rHDMA2], a ld [rHDMA2], a
ld a, $18 ld a, ($9800 % $8000) / $100
ld [rHDMA3], a ld [rHDMA3], a
ld a, $0 ld a, ($9800 % $8000) % $100
ld [rHDMA4], a ld [rHDMA4], a
ld a, $3f ld a, $3f
ld [hDMATransfer], a ld [hDMATransfer], a
@@ -29508,7 +29508,7 @@ Function16cff: ; 16cff
ld [rSVBK], a ld [rSVBK], a
ld a, $0 ld a, $0
call GetSRAMBank call GetSRAMBank
ld de, Unkn1Pals ld de, w6_d000
ld hl, $a000 ld hl, $a000
ld a, [hROMBank] ld a, [hROMBank]
ld b, a ld b, a
@@ -57457,12 +57457,12 @@ Function4e906: ; 4e906
push af push af
ld a, $6 ld a, $6
ld [rSVBK], a ld [rSVBK], a
ld hl, wd000 ld hl, w6_d000
ld bc, $400 ld bc, $400
ld a, $7f ld a, $7f
call ByteFill call ByteFill
ld hl, VBGMap0 ld hl, VBGMap0
ld de, wd000 ld de, w6_d000
ld b, $0 ld b, $0
ld c, $40 ld c, $40
call Request2bpp call Request2bpp
@@ -60336,15 +60336,15 @@ _GetFrontpic: ; 510a5
ld a, $6 ld a, $6
ld [rSVBK], a ld [rSVBK], a
ld a, b ld a, b
ld de, wd000 + $800 ld de, w6_d000 + $800
call FarDecompress call FarDecompress
pop bc pop bc
ld hl, wd000 ld hl, w6_d000
ld de, wd000 + $800 ld de, w6_d000 + $800
call Function512ab call Function512ab
pop hl pop hl
push hl push hl
ld de, wd000 ld de, w6_d000
ld c, 7 * 7 ld c, 7 * 7
ld a, [hROMBank] ld a, [hROMBank]
ld b, a ld b, a
@@ -60387,7 +60387,7 @@ Function51103: ; 51103
ld a, $1 ld a, $1
ld [rVBK], a ld [rVBK], a
push hl push hl
ld de, wd000 ld de, w6_d000
ld c, 7 * 7 ld c, 7 * 7
ld a, [hROMBank] ld a, [hROMBank]
ld b, a ld b, a
@@ -60401,15 +60401,15 @@ Function51103: ; 51103
call GetFarWRAMByte call GetFarWRAMByte
pop hl pop hl
and $f and $f
ld de, wd000 + $800 + 5 * 5 * $10 ld de, w6_d000 + $800 + 5 * 5 * $10
ld c, 5 * 5 ld c, 5 * 5
cp 5 cp 5
jr z, .asm_5113b jr z, .asm_5113b
ld de, wd000 + $800 + 6 * 6 * $10 ld de, w6_d000 + $800 + 6 * 6 * $10
ld c, 6 * 6 ld c, 6 * 6
cp 6 cp 6
jr z, .asm_5113b jr z, .asm_5113b
ld de, wd000 + $800 + 7 * 7 * $10 ld de, w6_d000 + $800 + 7 * 7 * $10
ld c, 7 * 7 ld c, 7 * 7
.asm_5113b .asm_5113b
@@ -60418,7 +60418,7 @@ Function51103: ; 51103
call Function5114f call Function5114f
pop bc pop bc
pop hl pop hl
ld de, wd000 ld de, w6_d000
ld a, [hROMBank] ld a, [hROMBank]
ld b, a ld b, a
call Get2bpp call Get2bpp
@@ -60428,7 +60428,7 @@ Function51103: ; 51103
; 5114f ; 5114f
Function5114f: ; 5114f Function5114f: ; 5114f
ld hl, Unkn1Pals ld hl, w6_d000
swap c swap c
ld a, c ld a, c
and $f and $f
@@ -60487,14 +60487,14 @@ GetBackpic: ; 5116c
inc hl inc hl
ld a, d ld a, d
call GetFarHalfword call GetFarHalfword
ld de, wd000 ld de, w6_d000
pop af pop af
call FarDecompress call FarDecompress
ld hl, wd000 ld hl, w6_d000
ld c, 6 * 6 ld c, 6 * 6
call Function5127c call Function5127c
pop hl pop hl
ld de, wd000 ld de, w6_d000
ld a, [hROMBank] ld a, [hROMBank]
ld b, a ld b, a
call Get2bpp call Get2bpp
@@ -60593,10 +60593,10 @@ GetTrainerPic: ; 5120d
ld a, BANK(TrainerPicPointers) ld a, BANK(TrainerPicPointers)
call GetFarHalfword call GetFarHalfword
pop af pop af
ld de, wd000 ld de, w6_d000
call FarDecompress call FarDecompress
pop hl pop hl
ld de, wd000 ld de, w6_d000
ld c, 7 * 7 ld c, 7 * 7
ld a, [hROMBank] ld a, [hROMBank]
ld b, a ld b, a
@@ -60622,10 +60622,10 @@ DecompressPredef: ; 5125d
push de push de
push bc push bc
ld a, b ld a, b
ld de, wd000 ld de, w6_d000
call FarDecompress call FarDecompress
pop bc pop bc
ld de, wd000 ld de, w6_d000
pop hl pop hl
ld a, [hROMBank] ld a, [hROMBank]
ld b, a ld b, a
@@ -73058,12 +73058,12 @@ Function8c0c1: ; 8c0c1
push af push af
ld a, $5 ld a, $5
ld [rSVBK], a ld [rSVBK], a
ld hl, wd000 ld hl, Unkn1Pals
ld a, [hli] ld a, [hli]
ld e, a ld e, a
ld a, [hli] ld a, [hli]
ld d, a ld d, a
ld hl, wd008 ld hl, Unkn1Pals + 8
ld c, $6 ld c, $6
.asm_8c0d4 .asm_8c0d4
ld a, e ld a, e
@@ -73408,7 +73408,7 @@ Function8c2cf: ; 8c2cf
ld a, $6 ld a, $6
ld [rSVBK], a ld [rSVBK], a
push hl push hl
ld hl, wd000 ld hl, w6_d000
ld bc, $28 * $10 ld bc, $28 * $10
.asm_8c2dd .asm_8c2dd
ld [hl], $ff ld [hl], $ff
@@ -73418,7 +73418,7 @@ Function8c2cf: ; 8c2cf
or b or b
jr nz, .asm_8c2dd jr nz, .asm_8c2dd
pop hl pop hl
ld de, wd000 ld de, w6_d000
ld b, BANK(Function8c2cf) ; BANK(@) ld b, BANK(Function8c2cf) ; BANK(@)
ld c, $28 ld c, $28
call Request2bpp call Request2bpp
@@ -96024,15 +96024,15 @@ Functione45e8: ; e45e8
ld a, $6 ld a, $6
ld [rSVBK], a ld [rSVBK], a
ld hl, IntroLogoGFX ld hl, IntroLogoGFX
ld de, wd000 ld de, w6_d000
ld a, BANK(IntroLogoGFX) ld a, BANK(IntroLogoGFX)
call FarDecompress call FarDecompress
ld hl, VTiles0 ld hl, VTiles0
ld de, wd000 ld de, w6_d000
ld bc, $0180 ld bc, $0180
call Request2bpp call Request2bpp
ld hl, VTiles1 ld hl, VTiles1
ld de, wd000 + $800 ld de, w6_d000 + $800
ld bc, $0180 ld bc, $0180
call Request2bpp call Request2bpp
pop af pop af
@@ -100501,7 +100501,7 @@ Functionfcfec:: ; fcfec
and a and a
ret nz ret nz
xor a xor a
ld [wd000 + $c18], a ld [wdc18], a
call Functionfd044 call Functionfd044
ret nc ret nc
call Functionfd0c3 call Functionfd0c3
@@ -100521,7 +100521,7 @@ UnknownScript_0xfd00f: ; 0xfd00f
Functionfd017: ; fd017 Functionfd017: ; fd017
call Functionfd0a6 call Functionfd0a6
call Functionfd0eb call Functionfd0eb
ld a, [wd000 + $c18] ld a, [wdc18]
and a and a
jr nz, .asm_fd027 jr nz, .asm_fd027
ld hl, wdc17 ld hl, wdc17
@@ -100594,7 +100594,7 @@ Functionfd044: ; fd044
ld a, 5 ld a, 5
call RandomRange call RandomRange
inc a inc a
ld [wd000 + $c18], a ld [wdc18], a
scf scf
ret ret
; fd099 ; fd099
@@ -100678,7 +100678,7 @@ UnknownScript_0xfd10a: ; 0xfd10a
Functionfd117: ; fd117 Functionfd117: ; fd117
ld a, [wd000 + $c18] ld a, [wdc18]
and a and a
jr z, .asm_fd123 jr z, .asm_fd123
dec a dec a
@@ -108860,18 +108860,18 @@ Function104000:: ; 104000
Function104006: ; 104006 Function104006: ; 104006
ld de, AttrMap ld de, AttrMap
ld hl, $d400 ld hl, w6_d000 + $400
call Function104263 call Function104263
ld de, SpritesEnd ld de, TileMap
ld hl, Unkn1Pals ld hl, w6_d000
call Function10425f call Function10425f
ld a, $0 ld a, $0
ld [rVBK], a ld [rVBK], a
ld hl, Unkn1Pals ld hl, w6_d000
call Function10419d call Function10419d
ld a, $1 ld a, $1
ld [rVBK], a ld [rVBK], a
ld hl, $d400 ld hl, w6_d000 + $400
call Function10419d call Function10419d
ret ret
; 10402d ; 10402d
@@ -108883,11 +108883,11 @@ Function10402d:: ; 10402d
Function104033: ; 104033 Function104033: ; 104033
ld de, TileMap ld de, TileMap
ld hl, Unkn1Pals ld hl, w6_d000
call Function10425f call Function10425f
ld a, $0 ld a, $0
ld [rVBK], a ; $ff00+$4f ld [rVBK], a ; $ff00+$4f
ld hl, Unkn1Pals ld hl, w6_d000
call Function10419d call Function10419d
ret ret
; 104047 ; 104047
@@ -108918,7 +108918,7 @@ Function104067: ; 104067
ld hl, $d400 ld hl, $d400
call Function104263 call Function104263
ld de, TileMap ld de, TileMap
ld hl, Unkn1Pals ld hl, w6_d000
call Function10425f call Function10425f
call DelayFrame call DelayFrame
di di
@@ -108930,7 +108930,7 @@ Function104067: ; 104067
call Function1041ad call Function1041ad
ld a, $0 ld a, $0
ld [rVBK], a ; $ff00+$4f ld [rVBK], a ; $ff00+$4f
ld hl, Unkn1Pals ld hl, w6_d000
call Function1041ad call Function1041ad
pop af pop af
ld [rVBK], a ; $ff00+$4f ld [rVBK], a ; $ff00+$4f
@@ -108947,8 +108947,8 @@ Function1040a2: ; 1040a2
ld de, AttrMap ld de, AttrMap
ld hl, $d400 ld hl, $d400
call Function104263 call Function104263
ld de, SpritesEnd ld de, TileMap
ld hl, Unkn1Pals ld hl, w6_d000
call Function10425f call Function10425f
call DelayFrame call DelayFrame
di di
@@ -108960,7 +108960,7 @@ Function1040a2: ; 1040a2
call Function1041c1 call Function1041c1
ld a, $0 ld a, $0
ld [rVBK], a ld [rVBK], a
ld hl, Unkn1Pals ld hl, w6_d000
call Function1041c1 call Function1041c1
pop af pop af
ld [rVBK], a ld [rVBK], a
@@ -109018,7 +109018,7 @@ Function104116: ; 104116
ld hl, $d400 ld hl, $d400
call Function104263 call Function104263
ld de, TileMap ld de, TileMap
ld hl, Unkn1Pals ld hl, w6_d000
call Function10425f call Function10425f
call DelayFrame call DelayFrame
di di
@@ -109030,7 +109030,7 @@ Function104116: ; 104116
call Function1041b7 call Function1041b7
ld a, $0 ld a, $0
ld [rVBK], a ; $ff00+$4f ld [rVBK], a ; $ff00+$4f
ld hl, Unkn1Pals ld hl, w6_d000
call Function1041b7 call Function1041b7
pop af pop af
ld [rVBK], a ; $ff00+$4f ld [rVBK], a ; $ff00+$4f
@@ -109048,8 +109048,8 @@ Function10414e: ; 10414e
ld hl, $d400 ld hl, $d400
call Function104263 call Function104263
ld c, $ff ld c, $ff
ld de, SpritesEnd ld de, TileMap
ld hl, Unkn1Pals ld hl, w6_d000
call Function104265 call Function104265
ld a, $1 ld a, $1
ld [rVBK], a ld [rVBK], a
@@ -109057,7 +109057,7 @@ Function10414e: ; 10414e
call Function1041ad call Function1041ad
ld a, $0 ld a, $0
ld [rVBK], a ld [rVBK], a
ld hl, Unkn1Pals ld hl, w6_d000
call Function1041ad call Function1041ad
ret ret
; 104177 ; 104177
@@ -109292,7 +109292,7 @@ Function104284:: ; 104284
ld c, l ld c, l
ld h, d ld h, d
ld l, e ld l, e
ld de, wd000 ld de, w6_d000
call FarCopyBytes call FarCopyBytes
pop hl pop hl
pop bc pop bc
@@ -109301,7 +109301,7 @@ Function104284:: ; 104284
pop bc pop bc
ld d, h ld d, h
ld e, l ld e, l
ld hl, wd000 ld hl, w6_d000
call Function104209 call Function104209
pop af pop af
ld [rSVBK], a ld [rSVBK], a
@@ -109351,7 +109351,7 @@ Function1042d6: ; 1042d6
ld b, h ld b, h
ld h, d ld h, d
ld l, e ld l, e
ld de, wd000 ld de, w6_d000
call Functiondef call Functiondef
pop hl pop hl
pop bc pop bc
@@ -109360,7 +109360,7 @@ Function1042d6: ; 1042d6
pop bc pop bc
ld d, h ld d, h
ld e, l ld e, l
ld hl, wd000 ld hl, w6_d000
call Function104209 call Function104209
pop af pop af
ld [rSVBK], a ld [rSVBK], a
@@ -109373,22 +109373,22 @@ Function104303: ; 104303
; 104309 ; 104309
Function104309: Function104309:
ld hl, Unkn1Pals ld hl, w6_d000
ld de, TileMap ld de, TileMap
call Function10433a call Function10433a
ld hl, BGPals ld hl, w6_d000 + $80
ld de, AttrMap ld de, AttrMap
call Function10433a call Function10433a
ld a, $1 ld a, $1
ld [rVBK], a ; $ff00+$4f ld [rVBK], a ; $ff00+$4f
ld c, $8 ld c, $8
ld hl, BGPals ld hl, w6_d000 + $80
ld de, $9c00 ld de, $9c00
call Function104209 call Function104209
ld a, $0 ld a, $0
ld [rVBK], a ; $ff00+$4f ld [rVBK], a ; $ff00+$4f
ld c, $8 ld c, $8
ld hl, Unkn1Pals ld hl, w6_d000
ld de, $9c00 ld de, $9c00
call Function104209 call Function104209
ret ret
@@ -112951,7 +112951,7 @@ Function1064d8: ; 1064d8
jr asm_1064ed jr asm_1064ed
asm_1064ed asm_1064ed
ld de, Unkn1Pals ld de, w6_d000
ld b, $0 ld b, $0
ld a, [rSVBK] ld a, [rSVBK]
push af push af
@@ -121163,7 +121163,7 @@ Function1161d5: ; 1161d5
ld a, $6 ld a, $6
ld [rSVBK], a ld [rSVBK], a
ld hl, Unknown_117356 ld hl, Unknown_117356
ld de, wd000 ld de, w6_d000
ld bc, $0300 ld bc, $0300
call CopyBytes call CopyBytes
di di

4
predef/cgb.asm
View File

@@ -166,7 +166,7 @@ Function8e8b: ; 8e8b
ld hl, Palette_b309 ld hl, Palette_b309
.asm_8e93 .asm_8e93
ld de, wd038 ld de, Unkn1Pals + 8 * 7
ld bc, $0008 ld bc, $0008
ld a, $5 ld a, $5
call FarCopyWRAM call FarCopyWRAM
@@ -225,7 +225,7 @@ Function8edb: ; 8edb
ld hl, Palettes_a8ca ld hl, Palettes_a8ca
call Function9643 call Function9643
ld hl, Palette8f52 ld hl, Palette8f52
ld de, wd018 ld de, Unkn1Pals + 8 * 3
ld bc, $0018 ld bc, $0018
ld a, $5 ld a, $5
call FarCopyWRAM call FarCopyWRAM