Organize home and macro code

11 files changed, 26 insertions, 26 deletions

diff --git a/engine/battle/animations.asm b/engine/battle/animations.asm
index 3b0fd4ec..98d85e02 100755
--- a/engine/battle/animations.asm
+++ b/engine/battle/animations.asm
@@ -57,7 +57,7 @@ DrawFrameBlock:
 	inc hl
 	inc de
 	ld a, [hli]
-	add a, $31 ; base tile ID for battle animations
+	add $31 ; base tile ID for battle animations
 	ld [de], a ; store tile ID
 	inc de
 	ld a, [hli]
@@ -91,7 +91,7 @@ DrawFrameBlock:
 	inc hl
 	inc de
 	ld a, [hli]
-	add a, $31 ; base tile ID for battle animations
+	add $31 ; base tile ID for battle animations
 	ld [de], a ; store tile ID
 	inc de
 ; toggle horizontal and vertical flip
@@ -99,10 +99,10 @@ DrawFrameBlock:
 	and a
 	ld b, OAM_VFLIP | OAM_HFLIP
 	jr z, .storeFlags1
-	cp a, OAM_HFLIP
+	cp OAM_HFLIP
 	ld b, OAM_VFLIP
 	jr z, .storeFlags1
-	cp a, OAM_VFLIP
+	cp OAM_VFLIP
 	ld b, OAM_HFLIP
 	jr z, .storeFlags1
 	ld b, 0
diff --git a/engine/battle/core.asm b/engine/battle/core.asm
index f66f509f..4b8d342a 100755
--- a/engine/battle/core.asm
+++ b/engine/battle/core.asm
@@ -902,7 +902,7 @@ ReplaceFaintedEnemyMon:
 	ld hl, wEnemyHPBarColor
 	ld e, $30
 	call GetBattleHealthBarColor
-	setpal SHADE_BLACK, SHADE_DARK, SHADE_LIGHT, SHADE_WHITE
+	ldpal a, SHADE_BLACK, SHADE_DARK, SHADE_LIGHT, SHADE_WHITE
 	ldh [rOBP0], a
 	ldh [rOBP1], a
 	call UpdateGBCPal_OBP0
diff --git a/engine/battle/effects.asm b/engine/battle/effects.asm
index c4e81816..9e5ee19f 100644
--- a/engine/battle/effects.asm
+++ b/engine/battle/effects.asm
@@ -231,7 +231,7 @@ FreezeBurnParalyzeEffect:
 	ld b, $1a ; 0x1A/0x100 or 26/256 = 10.2%~ chance
 	jr .next1
 .asm_3f2c7
-	cp a, PARALYZE_SIDE_EFFECT1 + 1 ; 10% status effects are 04, 05, 06 so 07 will set carry for those
+	cp PARALYZE_SIDE_EFFECT1 + 1 ; 10% status effects are 04, 05, 06 so 07 will set carry for those
 	ld b, $1a ; 0x1A/0x100 or 26/256 = 10.2%~ chance
 	jr c, .next1 ; branch ahead if this is a 10% chance effect..
 	ld b, $4d ; else use 0x4D/0x100 or 77/256 = 30.1%~ chance
@@ -293,7 +293,7 @@ FreezeBurnParalyzeEffect:
 	ld b, $1a ; 0x1A/0x100 or 26/256 = 10.2%~ chance
 	jr .next2
 .asm_3f341
-	cp a, PARALYZE_SIDE_EFFECT1 + 1
+	cp PARALYZE_SIDE_EFFECT1 + 1
 	ld b, $1a
 	jr c, .next2
 	ld b, $4d
diff --git a/engine/gfx/sprite_oam.asm b/engine/gfx/sprite_oam.asm
index b62d9d4b..136e3afb 100644
--- a/engine/gfx/sprite_oam.asm
+++ b/engine/gfx/sprite_oam.asm
@@ -219,7 +219,7 @@ _IsTilePassable::
 	ld l, a ; hl now points to passable tiles
 .loop
 	ld a, [hli]
-	cp a, $ff
+	cp $ff
 	jr z, .tileNotPassable
 	cp c
 	jr nz, .loop
diff --git a/engine/items/inventory.asm b/engine/items/inventory.asm
index c2e0b2b4..86003319 100644
--- a/engine/items/inventory.asm
+++ b/engine/items/inventory.asm
@@ -36,7 +36,7 @@ AddItemToInventory_::
 	inc hl
 .loop
 	ld a, [hl]
-	cp a, $ff ; is it the end of the table?
+	cp $ff ; is it the end of the table?
 	jr nz, .notAtEndOfInventory
 .addNewItem ; add an item not yet in the inventory
 	pop hl
diff --git a/engine/menus/pokedex.asm b/engine/menus/pokedex.asm
index 874fe50f..315e4805 100755
--- a/engine/menus/pokedex.asm
+++ b/engine/menus/pokedex.asm
@@ -205,9 +205,9 @@ HandlePokedexListMenu:
 	jr z, .checkIfRightPressed
 .downPressed ; scroll down one row
 	ld a, [wDexMaxSeenMon]
-	cp a, 7
+	cp 7
 	jp c, .loop ; can't if the list is shorter than 7
-	sub a, 7
+	sub 7
 	ld b, a
 	ld a, [wListScrollOffset]
 	cp b
@@ -221,12 +221,12 @@ HandlePokedexListMenu:
 	jr z, .checkIfLeftPressed
 .rightPressed ; scroll down 7 rows
 	ld a, [wDexMaxSeenMon]
-	cp a, 7
+	cp 7
 	jp c, .loop ; can't if the list is shorter than 7
-	sub a, 6
+	sub 6
 	ld b, a
 	ld a, [wListScrollOffset]
-	add a, 7
+	add 7
 	ld [wListScrollOffset], a
 	cp b
 	jp c, .loop
@@ -240,7 +240,7 @@ HandlePokedexListMenu:
 	jr z, .buttonAPressed
 .leftPressed
 	ld a, [wListScrollOffset]
-	sub a, 7
+	sub 7
 	ld [wListScrollOffset], a
 	jp nc, .loop
 	xor a
@@ -324,7 +324,7 @@ DrawPokedexVerticalLine:
 .loop
 	ld [hl], a
 	add hl, de
-	xor a, 1 ; toggle between vertical line tile and box tile
+	xor 1 ; toggle between vertical line tile and box tile
 	dec c
 	jr nz, .loop
 	ret
@@ -459,7 +459,7 @@ ShowPokedexDataInternal:
 .waitForButtonPress
 	call JoypadLowSensitivity
 	ldh a, [hJoy5]
-	and a, A_BUTTON | B_BUTTON
+	and A_BUTTON | B_BUTTON
 	jr z, .waitForButtonPress
 	pop af
 	ldh [hTilesetType], a
diff --git a/engine/movie/intro.asm b/engine/movie/intro.asm
index 9165113f..a9774ff9 100755
--- a/engine/movie/intro.asm
+++ b/engine/movie/intro.asm
@@ -83,7 +83,7 @@ PlayShootingStar:
 	ld b, SET_PAL_GAME_FREAK_INTRO
 	call RunPaletteCommand
 	farcall LoadCopyrightAndTextBoxTiles
-	ldPal a, BLACK, DARK_GRAY, LIGHT_GRAY, WHITE
+	ldpal a, SHADE_BLACK, SHADE_DARK, SHADE_LIGHT, SHADE_WHITE
 	ldh [rBGP], a
 	call UpdateGBCPal_BGP
 	ld c, 180
diff --git a/engine/overworld/map_sprites.asm b/engine/overworld/map_sprites.asm
index e31c0bd2..ba412ab2 100755
--- a/engine/overworld/map_sprites.asm
+++ b/engine/overworld/map_sprites.asm
@@ -304,7 +304,7 @@ GetSplitMapSpriteSetID:
 	ld hl, MapSpriteSets
 	add hl, de
 	ld a, [hl] ; a = spriteSetID
-	cp a, $f0 ; does the map have 2 sprite sets?
+	cp $f0 ; does the map have 2 sprite sets?
 	ret c
 ; Chooses the correct sprite set ID depending on the player's position within
 ; the map for maps with two sprite sets.
diff --git a/engine/overworld/specific_script_flags.asm b/engine/overworld/specific_script_flags.asm
index d6f333ac..b59aa9d0 100644
--- a/engine/overworld/specific_script_flags.asm
+++ b/engine/overworld/specific_script_flags.asm
@@ -8,7 +8,7 @@ SetMapSpecificScriptFlagsOnMapReload::
 	ld a, [hli]
 	cp c
 	jr z, .in_list
-	cp a, $ff
+	cp $ff
 	jr nz, .search_loop
 	ret
 
diff --git a/engine/pikachu/pikachu_pic_animation.asm b/engine/pikachu/pikachu_pic_animation.asm
index 33a3e504..755395ba 100755
--- a/engine/pikachu/pikachu_pic_animation.asm
+++ b/engine/pikachu/pikachu_pic_animation.asm
@@ -625,7 +625,7 @@ PikaPicAnimCommand_loadgfx:
 	ld a, [wPikaPicAnimCurGraphicID]
 	call LoadPikaPicAnimGFXHeader
 	ld a, c
-	cp a, $ff
+	cp $ff
 	jr z, .compressed
 	call RequestPikaPicAnimGFX
 	jr .done
diff --git a/engine/printer/printer2.asm b/engine/printer/printer2.asm
index 180f044c..b257aff4 100755
--- a/engine/printer/printer2.asm
+++ b/engine/printer/printer2.asm
@@ -356,7 +356,7 @@ Func_ea6af:
 	ld hl, wPrinterSerialFrameDelay
 	inc [hl]
 	ld a, [hl]
-	cp a, $6
+	cp $6
 	ret c
 	xor a
 	ld [hl], a
@@ -381,17 +381,17 @@ Func_ea6d2:
 	call Func_ea742
 	ret c
 	ld a, [wPrinterHandshake]
-	cp a, $ff
+	cp $ff
 	jr nz, .asm_ea6e4
 	ld a, [wPrinterStatusFlags]
-	cp a, $ff
+	cp $ff
 	jr z, .asm_ea6fb
 .asm_ea6e4
 	ld a, [wPrinterHandshake]
-	cp a, $81
+	cp $81
 	jr nz, .asm_ea6fb
 	ld a, [wPrinterStatusFlags]
-	cp a, $0
+	cp $0
 	jr nz, .asm_ea6fb
 	ld hl, wPrinterConnectionOpen
 	set 1, [hl]