Merge pull request #263 from Rangi42/master

Syncing style with pokecrystal

8 files changed, 72 insertions, 59 deletions

diff --git a/macros/coords.asm b/macros/coords.asm
index 302260d7..94808ba5 100644
--- a/macros/coords.asm
+++ b/macros/coords.asm
@@ -1,65 +1,79 @@
-validateCoords: MACRO
-	IF \1 >= SCREEN_WIDTH
-		fail "x coord out of range"
-	ENDC
-	IF \2 >= SCREEN_HEIGHT
-		fail "y coord out of range"
+validate_coords: MACRO
+	IF _NARG >= 4
+		IF \1 >= \3
+			fail "x coord out of range"
+		ENDC
+		IF \2 >= \4
+			fail "y coord out of range"
+		ENDC
+	ELSE
+		validate_coords \1, \2, SCREEN_WIDTH, SCREEN_HEIGHT
 	ENDC
 ENDM
 
-;\1 = r
-;\2 = X
-;\3 = Y
-;\4 = which tilemap (optional)
+hlcoord EQUS "coord hl,"
+bccoord EQUS "coord bc,"
+decoord EQUS "coord de,"
+
 coord: MACRO
-	validateCoords \2, \3
+; register, x, y[, origin]
+	validate_coords \2, \3
 	IF _NARG >= 4
-		ld \1, \4 + SCREEN_WIDTH * \3 + \2
+		ld \1, (\3) * SCREEN_WIDTH + (\2) + \4
 	ELSE
-		ld \1, wTileMap + SCREEN_WIDTH * \3 + \2
+		ld \1, (\3) * SCREEN_WIDTH + (\2) + wTileMap
 	ENDC
 ENDM
 
-;\1 = X
-;\2 = Y
-;\3 = which tilemap (optional)
-aCoord: MACRO
-	validateCoords \1, \2
-	IF _NARG >= 3
-		ld a, [\3 + SCREEN_WIDTH * \2 + \1]
+hlbgcoord EQUS "bgcoord hl,"
+bcbgcoord EQUS "bgcoord bc,"
+debgcoord EQUS "bgcoord de,"
+
+bgcoord: MACRO
+; register, x, y[, origin]
+	validate_coords \2, \3, BG_MAP_WIDTH, BG_MAP_HEIGHT
+	IF _NARG >= 4
+		ld \1, (\3) * BG_MAP_WIDTH + (\2) + \4
 	ELSE
-		ld a, [wTileMap + SCREEN_WIDTH * \2 + \1]
+		ld \1, (\3) * BG_MAP_WIDTH + (\2) + vBGMap0
 	ENDC
 ENDM
 
-;\1 = X
-;\2 = Y
-;\3 = which tilemap (optional)
-Coorda: MACRO
-	validateCoords \1, \2
+hlowcoord EQUS "owcoord hl,"
+bcowcoord EQUS "owcoord bc,"
+deowcoord EQUS "owcoord de,"
+
+owcoord: MACRO
+; register, x, y, map width
+	ld \1, wOverworldMap + ((\2) + 3) + (((\3) + 3) * ((\4) + (3 * 2)))
+ENDM
+
+dwcoord: MACRO
+; x, y
+	validate_coords \1, \2
 	IF _NARG >= 3
-		ld [\3 + SCREEN_WIDTH * \2 + \1], a
+		dw (\2) * SCREEN_WIDTH + (\1) + \3
 	ELSE
-		ld [wTileMap + SCREEN_WIDTH * \2 + \1], a
+		dw (\2) * SCREEN_WIDTH + (\1) + wTileMap
 	ENDC
 ENDM
 
-;\1 = X
-;\2 = Y
-;\3 = which tilemap (optional)
-dwCoord: MACRO
-	validateCoords \1, \2
+ldcoord_a: MACRO
+; x, y[, origin]
+	validate_coords \1, \2
 	IF _NARG >= 3
-		dw \3 + SCREEN_WIDTH * \2 + \1
+		ld [(\2) * SCREEN_WIDTH + (\1) + \3], a
 	ELSE
-		dw wTileMap + SCREEN_WIDTH * \2 + \1
+		ld [(\2) * SCREEN_WIDTH + (\1) + wTileMap], a
 	ENDC
 ENDM
 
-;\1 = r
-;\2 = X
-;\3 = Y
-;\4 = map width
-overworldMapCoord: MACRO
-	ld \1, wOverworldMap + ((\2) + 3) + (((\3) + 3) * ((\4) + (3 * 2)))
+lda_coord: MACRO
+; x, y[, origin]
+	validate_coords \1, \2
+	IF _NARG >= 3
+		ld a, [(\2) * SCREEN_WIDTH + (\1) + \3]
+	ELSE
+		ld a, [(\2) * SCREEN_WIDTH + (\1) + wTileMap]
+	ENDC
 ENDM
diff --git a/macros/data.asm b/macros/data.asm
index 7a813529..16742d53 100755
--- a/macros/data.asm
+++ b/macros/data.asm
@@ -33,7 +33,7 @@ _tms3 = _tms3 | (1 << ((\1_TMNUM) - 1 - 48))
 	else
 		fail "\1 is not a TM or HM move"
 	ENDC
-	shift
+	SHIFT
 ENDR
 REPT 3 ; TM01-TM24 (24/24)
 	db _tms1 & $ff
diff --git a/macros/farcall.asm b/macros/farcall.asm
index 885f8c66..122e5207 100644
--- a/macros/farcall.asm
+++ b/macros/farcall.asm
@@ -1,37 +1,35 @@
-farcall EQUS "callba"
-
-callba: MACRO
+farcall: MACRO
 	ld b, BANK(\1)
 	ld hl, \1
 	call Bankswitch
 ENDM
 
-callab: MACRO
+callfar: MACRO
 	ld hl, \1
 	ld b, BANK(\1)
 	call Bankswitch
 ENDM
 
-jpba: MACRO
+farjp: MACRO
 	ld b, BANK(\1)
 	ld hl, \1
 	jp Bankswitch
 ENDM
 
-jpab: MACRO
+jpfar: MACRO
 	ld hl, \1
 	ld b, BANK(\1)
 	jp Bankswitch
 ENDM
 
 homecall: MACRO
-	ld a, [hLoadedROMBank]
+	ldh a, [hLoadedROMBank]
 	push af
 	ld a, BANK(\1)
-	ld [hLoadedROMBank], a
+	ldh [hLoadedROMBank], a
 	ld [MBC1RomBank], a
 	call \1
 	pop af
-	ld [hLoadedROMBank], a
+	ldh [hLoadedROMBank], a
 	ld [MBC1RomBank], a
 ENDM
diff --git a/macros/gfx.asm b/macros/gfx.asm
index 950daee1..8803dad2 100644
--- a/macros/gfx.asm
+++ b/macros/gfx.asm
@@ -1,7 +1,7 @@
 RGB: MACRO
 REPT _NARG / 3
 	dw palred (\1) + palgreen (\2) + palblue (\3)
-	shift 3
+	SHIFT 3
 ENDR
 ENDM
 
diff --git a/macros/scripts/audio.asm b/macros/scripts/audio.asm
index 8a250c63..4f4d084c 100755
--- a/macros/scripts/audio.asm
+++ b/macros/scripts/audio.asm
@@ -141,8 +141,7 @@ ENDM
 ; stored in big endian
 tempo: MACRO
 	db $ED
-	db \1 / $100
-	db \1 % $100
+	db HIGH(\1), LOW(\1)
 ENDM
 
 ; arguments: left output enable mask, right output enable mask
diff --git a/macros/scripts/events.asm b/macros/scripts/events.asm
index 9e84ec62..8087c5c2 100755
--- a/macros/scripts/events.asm
+++ b/macros/scripts/events.asm
@@ -185,7 +185,7 @@ SetEvents: MACRO
 	SetEvent \1
 	REPT _NARG - 1
 	SetEventReuseHL \2
-	shift
+	SHIFT
 	ENDR
 ENDM
 
@@ -237,7 +237,7 @@ ResetEvents: MACRO
 	ResetEvent \1
 	REPT _NARG - 1
 	ResetEventReuseHL \2
-	shift
+	SHIFT
 	ENDR
 ENDM
 
diff --git a/macros/scripts/text.asm b/macros/scripts/text.asm
index efecdd1c..261ab5f4 100755
--- a/macros/scripts/text.asm
+++ b/macros/scripts/text.asm
@@ -200,7 +200,7 @@ script_mart: MACRO
 	db _NARG ; number of items
 REPT _NARG
 	db \1 ; item id
-	shift
+	SHIFT
 ENDR
 	db -1 ; end
 ENDM
diff --git a/macros/wram.asm b/macros/wram.asm
index 62464543..41fd1dad 100644
--- a/macros/wram.asm
+++ b/macros/wram.asm
@@ -71,7 +71,8 @@ spritestatedata1: MACRO
 \1IntraAnimFrameCounter:: db
 \1AnimFrameCounter:: db
 \1FacingDirection:: db
-	ds 2
+\1YAdjusted:: db
+\1XAdjusted:: db
 \1CollisionData:: db
 	ds 3
 \1End::
@@ -87,7 +88,8 @@ spritestatedata2: MACRO
 \1MovementByte1:: db
 \1GrassPriority:: db
 \1MovementDelay:: db
-	ds 4
+\1OrigFacingDirection:: db
+	ds 3
 \1PictureID:: db
 \1ImageBaseOffset:: db
 	ds 1