ref: cc2906b68f6fae7c7b235e381ae0c60d0a069d1f
parent: 8190c3e5e70ad59b845f3ee36c513ecf240a22ba
author: yenatch <[email protected]>
date: Sat Aug 31 20:09:57 EDT 2013
consistent casing for Tileset labels wram labels were using TileSet for some reason
--- a/main.asm
+++ b/main.asm
@@ -2644,7 +2644,7 @@
Function217a: ; 217a
ld a, [hROMBank]
push af
- ld a, [TileSetBlocksBank]
+ ld a, [TilesetBlocksBank]
rst Bankswitch
call Function2198
@@ -2692,7 +2692,7 @@
add hl, hl
add hl, hl
add hl, hl
- ld a, [TileSetBlocksAddress]
+ ld a, [TilesetBlocksAddress]
add l
ld l, a
ld a, [$d1de]
@@ -3965,11 +3965,11 @@
; 2821
Function2821: ; 2821
- ld hl, TileSetAddress
+ ld hl, TilesetAddress
ld a, [hli]
ld h, [hl]
ld l, a
- ld a, [TileSetBank]
+ ld a, [TilesetBank]
ld e, a
ld a, [rSVBK]
push af
@@ -4340,7 +4340,7 @@
ld h, $0
add hl, hl
add hl, hl
- ld a, [TileSetCollisionAddress]
+ ld a, [TilesetCollisionAddress]
ld c, a
ld a, [$d1e1]
ld b, a
@@ -4356,7 +4356,7 @@
inc hl
.asm_2a5c
- ld a, [TileSetCollisionBank]
+ ld a, [TilesetCollisionBank]
call GetFarByte
ret
@@ -4944,7 +4944,7 @@
ld bc, $000f
ld a, [$d199]
call AddNTimes
- ld de, TileSetBank
+ ld de, TilesetBank
ld bc, $000f
ld a, $13
call FarCopyBytes
@@ -48657,7 +48657,7 @@
push hl
srl a
jr c, .asm_4c021
- ld hl, TileSetPalettes
+ ld hl, TilesetPalettes
add [hl]
ld l, a
ld a, [$d1e7]
@@ -48668,7 +48668,7 @@
jr .asm_4c031
.asm_4c021
- ld hl, TileSetPalettes
+ ld hl, TilesetPalettes
add [hl]
ld l, a
ld a, [$d1e7]
@@ -48700,7 +48700,7 @@
push hl
srl a
jr c, .asm_4c05b
- ld hl, TileSetPalettes
+ ld hl, TilesetPalettes
add [hl]
ld l, a
ld a, [$d1e7]
@@ -48711,7 +48711,7 @@
jr .asm_4c06b
.asm_4c05b
- ld hl, TileSetPalettes
+ ld hl, TilesetPalettes
add [hl]
ld l, a
ld a, [$d1e7]
@@ -65395,9 +65395,9 @@
; Typically in wra1, vra0
; Beginning of animation pointer array
- ld a, [TileSetAnim]
+ ld a, [TilesetAnim]
ld e, a
- ld a, [TileSetAnim + 1]
+ ld a, [TilesetAnim + 1]
ld d, a
; Play this frame.
--- a/wram.asm
+++ b/wram.asm
@@ -1176,25 +1176,25 @@
ds 2
-TileSetHeader:
-TileSetBank: ; d1d9
+TilesetHeader:
+TilesetBank: ; d1d9
ds 1
-TileSetAddress: ; d1da
+TilesetAddress: ; d1da
ds 2
-TileSetBlocksBank: ; d1dc
+TilesetBlocksBank: ; d1dc
ds 1
-TileSetBlocksAddress: ; d1dd
+TilesetBlocksAddress: ; d1dd
ds 2
-TileSetCollisionBank: ; d1df
+TilesetCollisionBank: ; d1df
ds 1
-TileSetCollisionAddress: ; d1e0
+TilesetCollisionAddress: ; d1e0
ds 2
-TileSetAnim: ; d1e2
+TilesetAnim: ; d1e2
; bank 3f
ds 2
; unused ; d1e4
ds 2
-TileSetPalettes: ; d1e6
+TilesetPalettes: ; d1e6
; bank 3f
ds 2