Merge branch 'master' into the-diffening

5 files changed, 22 insertions, 51 deletions

diff --git a/data/sprites/emotes.asm b/data/sprites/emotes.asm
index 2e25e52b5..2371c4624 100644
--- a/data/sprites/emotes.asm
+++ b/data/sprites/emotes.asm
@@ -2,21 +2,20 @@ emote: MACRO
 ; graphics pointer, length, starting tile
 	dw \1
 	db \2 tiles, BANK(\1)
-	dw vTiles1 tile \3
+	dw vTiles0 tile \3
 ENDM
 
-Emotes: ; 144d
+Emotes:
 ; entries correspond to EMOTE_* constants
-	emote ShockEmote,     4, $78
-	emote QuestionEmote,  4, $78
-	emote HappyEmote,     4, $78
-	emote SadEmote,       4, $78
-	emote HeartEmote,     4, $78
-	emote BoltEmote,      4, $78
-	emote SleepEmote,     4, $78
-	emote FishEmote,      4, $78
-	emote JumpShadowGFX,  1, $7c
-	emote FishingRodGFX,  2, $7c
-	emote BoulderDustGFX, 2, $7e
-	emote GrassRustleGFX, 1, $7e
-; 14495
+	emote ShockEmote,     4, $f8
+	emote QuestionEmote,  4, $f8
+	emote HappyEmote,     4, $f8
+	emote SadEmote,       4, $f8
+	emote HeartEmote,     4, $f8
+	emote BoltEmote,      4, $f8
+	emote SleepEmote,     4, $f8
+	emote FishEmote,      4, $f8
+	emote JumpShadowGFX,  1, $fc
+	emote FishingRodGFX,  2, $fc
+	emote BoulderDustGFX, 2, $fe
+	emote GrassRustleGFX, 1, $fe
diff --git a/data/sprites/facings.asm b/data/sprites/facings.asm
index c321ca462..aebf97ff5 100644
--- a/data/sprites/facings.asm
+++ b/data/sprites/facings.asm
@@ -1,4 +1,4 @@
-Facings: ; 4049
+Facings:
 ; entries correspond to FACING_* constants
 	dw FacingStepDown0
 	dw FacingStepDown1
@@ -37,7 +37,6 @@ Facings: ; 4049
 
 NUM_FACINGS EQU (Facings.End - Facings) / 2
 
-
 ; Tables used as a reference to transform OAM data.
 
 ; Format:
@@ -52,7 +51,6 @@ FacingWeirdTree2: ; standing down
 	db  0,  8, 0, $01
 	db  8,  0, RELATIVE_ATTRIBUTES, $02
 	db  8,  8, RELATIVE_ATTRIBUTES, $03
-; 409c
 
 FacingStepDown1: ; walking down 1
 	db 4 ; #
@@ -60,7 +58,6 @@ FacingStepDown1: ; walking down 1
 	db  0,  8, 0, $81
 	db  8,  0, RELATIVE_ATTRIBUTES, $82
 	db  8,  8, RELATIVE_ATTRIBUTES, $83
-; 40ad
 
 FacingStepDown3: ; walking down 2
 	db 4 ; #
@@ -68,7 +65,6 @@ FacingStepDown3: ; walking down 2
 	db  0,  0, X_FLIP, $81
 	db  8,  8, RELATIVE_ATTRIBUTES | X_FLIP, $82
 	db  8,  0, RELATIVE_ATTRIBUTES | X_FLIP, $83
-; 40be
 
 FacingStepUp0:
 FacingStepUp2: ; standing up
@@ -77,7 +73,6 @@ FacingStepUp2: ; standing up
 	db  0,  8, 0, $05
 	db  8,  0, RELATIVE_ATTRIBUTES, $06
 	db  8,  8, RELATIVE_ATTRIBUTES, $07
-; 40cf
 
 FacingStepUp1: ; walking up 1
 	db 4 ; #
@@ -85,7 +80,6 @@ FacingStepUp1: ; walking up 1
 	db  0,  8, 0, $85
 	db  8,  0, RELATIVE_ATTRIBUTES, $86
 	db  8,  8, RELATIVE_ATTRIBUTES, $87
-; 40e0
 
 FacingStepUp3: ; walking up 2
 	db 4 ; #
@@ -93,7 +87,6 @@ FacingStepUp3: ; walking up 2
 	db  0,  0, X_FLIP, $85
 	db  8,  8, RELATIVE_ATTRIBUTES | X_FLIP, $86
 	db  8,  0, RELATIVE_ATTRIBUTES | X_FLIP, $87
-; 40f1
 
 FacingStepLeft0:
 FacingStepLeft2: ; standing left
@@ -102,7 +95,6 @@ FacingStepLeft2: ; standing left
 	db  0,  8, 0, $09
 	db  8,  0, RELATIVE_ATTRIBUTES, $0a
 	db  8,  8, RELATIVE_ATTRIBUTES, $0b
-; 4102
 
 FacingStepRight0:
 FacingStepRight2: ; standing right
@@ -111,7 +103,6 @@ FacingStepRight2: ; standing right
 	db  0,  0, X_FLIP, $09
 	db  8,  8, RELATIVE_ATTRIBUTES | X_FLIP, $0a
 	db  8,  0, RELATIVE_ATTRIBUTES | X_FLIP, $0b
-; 4113
 
 FacingStepLeft1:
 FacingStepLeft3: ; walking left
@@ -120,7 +111,6 @@ FacingStepLeft3: ; walking left
 	db  0,  8, 0, $89
 	db  8,  0, RELATIVE_ATTRIBUTES, $8a
 	db  8,  8, RELATIVE_ATTRIBUTES, $8b
-; 4124
 
 FacingStepRight1:
 FacingStepRight3: ; walking right
@@ -129,7 +119,6 @@ FacingStepRight3: ; walking right
 	db  0,  0, X_FLIP, $89
 	db  8,  8, RELATIVE_ATTRIBUTES | X_FLIP, $8a
 	db  8,  0, RELATIVE_ATTRIBUTES | X_FLIP, $8b
-; 4135
 
 FacingFishDown: ; fishing down
 	db 5 ; #
@@ -138,7 +127,6 @@ FacingFishDown: ; fishing down
 	db  8,  0, RELATIVE_ATTRIBUTES, $02
 	db  8,  8, RELATIVE_ATTRIBUTES, $03
 	db 16,  0, ABSOLUTE_TILE_ID, $fc
-; 414a
 
 FacingFishUp: ; fishing up
 	db 5 ; #
@@ -147,7 +135,6 @@ FacingFishUp: ; fishing up
 	db  8,  0, RELATIVE_ATTRIBUTES, $06
 	db  8,  8, RELATIVE_ATTRIBUTES, $07
 	db -8,  0, ABSOLUTE_TILE_ID, $fc
-; 415f
 
 FacingFishLeft: ; fishing left
 	db 5 ; #
@@ -156,7 +143,6 @@ FacingFishLeft: ; fishing left
 	db  8,  0, RELATIVE_ATTRIBUTES, $0a
 	db  8,  8, RELATIVE_ATTRIBUTES, $0b
 	db  5, -8, ABSOLUTE_TILE_ID | X_FLIP, $fd
-; 4174
 
 FacingFishRight: ; fishing right
 	db 5 ; #
@@ -165,7 +151,6 @@ FacingFishRight: ; fishing right
 	db  8,  8, RELATIVE_ATTRIBUTES | X_FLIP, $0a
 	db  8,  0, RELATIVE_ATTRIBUTES | X_FLIP, $0b
 	db  5, 16, ABSOLUTE_TILE_ID, $fd
-; 4189
 
 FacingEmote: ; emote
 	db 4 ; #
@@ -173,13 +158,11 @@ FacingEmote: ; emote
 	db  0,  8, ABSOLUTE_TILE_ID, $f9
 	db  8,  0, ABSOLUTE_TILE_ID, $fa
 	db  8,  8, ABSOLUTE_TILE_ID, $fb
-; 419a
 
 FacingShadow: ; shadow
 	db 2 ; #
 	db  0,  0, ABSOLUTE_TILE_ID, $fc
 	db  0,  8, ABSOLUTE_TILE_ID | X_FLIP, $fc
-; 41a3
 
 FacingBigDollSymmetric: ; big snorlax or lapras doll
 	db 16 ; #
@@ -199,23 +182,20 @@ FacingBigDollSymmetric: ; big snorlax or lapras doll
 	db 16, 16, X_FLIP, $05
 	db 24, 24, X_FLIP, $06
 	db 24, 16, X_FLIP, $07
-; 41e4
 
-FacingWeirdTree1: ; 41e4
+FacingWeirdTree1:
 	db 4 ; #
 	db  0,  0, 0, $04
 	db  0,  8, 0, $05
 	db  8,  0, 0, $06
 	db  8,  8, 0, $07
-; 41f5
 
-FacingWeirdTree3: ; 41f5
+FacingWeirdTree3:
 	db 4 ; #
 	db  0,  8, X_FLIP, $04
 	db  0,  0, X_FLIP, $05
 	db  8,  8, X_FLIP, $06
 	db  8,  0, X_FLIP, $07
-; 4206
 
 FacingBigDollAsymmetric: ; big doll other than snorlax or lapras
 	db 14 ; #
@@ -233,7 +213,6 @@ FacingBigDollAsymmetric: ; big doll other than snorlax or lapras
 	db 16, 16, 0, $08
 	db 24, 24, X_FLIP, $04
 	db 24, 16, 0, $0b
-; 423f
 
 FacingBoulderDust1: ; boulder dust 1
 	db 4 ; #
@@ -241,7 +220,6 @@ FacingBoulderDust1: ; boulder dust 1
 	db  0,  8, ABSOLUTE_TILE_ID, $fe
 	db  8,  0, ABSOLUTE_TILE_ID, $fe
 	db  8,  8, ABSOLUTE_TILE_ID, $fe
-; 4250
 
 FacingBoulderDust2: ; boulder dust 2
 	db 4 ; #
@@ -249,16 +227,13 @@ FacingBoulderDust2: ; boulder dust 2
 	db  0,  8, ABSOLUTE_TILE_ID, $ff
 	db  8,  0, ABSOLUTE_TILE_ID, $ff
 	db  8,  8, ABSOLUTE_TILE_ID, $ff
-; 4261
 
-FacingGrass1: ; 4261
+FacingGrass1:
 	db 2 ; #
 	db  8,  0, ABSOLUTE_TILE_ID, $fe
 	db  8,  8, ABSOLUTE_TILE_ID | X_FLIP, $fe
-; 426a
 
-FacingGrass2: ; 426a
+FacingGrass2:
 	db 2 ; #
 	db  9, -1, ABSOLUTE_TILE_ID, $fe
 	db  9,  9, ABSOLUTE_TILE_ID | X_FLIP, $fe
-; 4273
diff --git a/data/sprites/map_objects.asm b/data/sprites/map_objects.asm
index cf577869a..10afaf57b 100644
--- a/data/sprites/map_objects.asm
+++ b/data/sprites/map_objects.asm
@@ -1,4 +1,4 @@
-SpriteMovementData:: ; 4273
+SpriteMovementData::
 ; entries correspond to SPRITEMOVEDATA_* constants
 
 ; SPRITEMOVEDATA_00
@@ -304,5 +304,3 @@ SpriteMovementData:: ; 4273
 	db 0 ; flags1
 	db 0 ; flags2
 	db 0 ; palette flags
-
-; 4357
diff --git a/data/sprites/sprite_mons.asm b/data/sprites/sprite_mons.asm
index d3000e2b7..3d53804db 100644
--- a/data/sprites/sprite_mons.asm
+++ b/data/sprites/sprite_mons.asm
@@ -1,4 +1,4 @@
-SpriteMons: ; 14495
+SpriteMons:
 ; entries correspond to SPRITE_* constants past SPRITE_POKEMON
 	db UNOWN
 	db GEODUDE
@@ -35,4 +35,3 @@ SpriteMons: ; 14495
 	db GYARADOS
 	db LUGIA
 	db HO_OH
-; 144b8
diff --git a/data/sprites/sprites.asm b/data/sprites/sprites.asm
index 6a44bea42..b55593c97 100644
--- a/data/sprites/sprites.asm
+++ b/data/sprites/sprites.asm
@@ -4,7 +4,7 @@ overworld_sprite: MACRO
 	db \2 tiles, BANK(\1), \3, \4
 ENDM
 
-OverworldSprites: ; 14736
+OverworldSprites:
 ; entries correspond to SPRITE_* constants
 	overworld_sprite ChrisSpriteGFX, 12, WALKING_SPRITE, PAL_OW_RED
 	overworld_sprite ChrisBikeSpriteGFX, 12, WALKING_SPRITE, PAL_OW_RED