Merge pull request #277 from Rangi42/master

Miscellaneous constant and label updates

8 files changed, 54 insertions, 54 deletions

diff --git a/engine/battle/core.asm b/engine/battle/core.asm
index c1eecc73..b5c37f1e 100755
--- a/engine/battle/core.asm
+++ b/engine/battle/core.asm
@@ -6104,8 +6104,8 @@ LoadEnemyMonData:
 	ld a, [wIsInBattle]
 	cp $2 ; is it a trainer battle?
 ; fixed DVs for trainer mon
-	ld a, $98
-	ld b, $88
+	ld a, ATKDEFDV_TRAINER
+	ld b, SPDSPCDV_TRAINER
 	jr z, .storeDVs
 ; random DVs for wild mon
 	call BattleRandom
diff --git a/engine/events/hidden_objects/pokecenter_pc.asm b/engine/events/hidden_objects/pokecenter_pc.asm
index 9ae7d41c..f20f40ed 100644
--- a/engine/events/hidden_objects/pokecenter_pc.asm
+++ b/engine/events/hidden_objects/pokecenter_pc.asm
@@ -3,7 +3,7 @@ OpenPokemonCenterPC:
 	cp SPRITE_FACING_UP
 	ret nz
 	call EnableAutoTextBoxDrawing
-	ld a, $1
+	ld a, TRUE
 	ld [wAutoTextBoxDrawingControl], a
 	tx_pre_jump PokemonCenterPCText
 
diff --git a/engine/events/oaks_aide.asm b/engine/events/oaks_aide.asm
index dd4e5fd7..f1801f5c 100755
--- a/engine/events/oaks_aide.asm
+++ b/engine/events/oaks_aide.asm
@@ -25,22 +25,22 @@ OaksAideScript:
 	jr nc, .bagFull
 	ld hl, OaksAideGotItemText
 	call PrintText
-	ld a, $1
+	ld a, OAKS_AIDE_GOT_ITEM
 	jr .done
 .bagFull
 	ld hl, OaksAideNoRoomText
 	call PrintText
-	xor a
+	xor a ; OAKS_AIDE_BAG_FULL
 	jr .done
 .notEnoughOwnedMons
 	ld hl, OaksAideUhOhText
 	call PrintText
-	ld a, $80
+	ld a, OAKS_AIDE_NOT_ENOUGH_MONS
 	jr .done
 .choseNo
 	ld hl, OaksAideComeBackText
 	call PrintText
-	ld a, $ff
+	ld a, OAKS_AIDE_REFUSED
 .done
 	ldh [hOaksAideResult], a
 	ret
diff --git a/engine/menus/main_menu.asm b/engine/menus/main_menu.asm
index 3da894f6..3ecd99b1 100755
--- a/engine/menus/main_menu.asm
+++ b/engine/menus/main_menu.asm
@@ -222,9 +222,9 @@ LinkMenu:
 	ld a, START_TRANSFER_INTERNAL_CLOCK
 	ldh [rSC], a
 .skipStartingTransfer
-	ld b, $7f
-	ld c, $7f
-	ld d, $ec
+	ld b, " "
+	ld c, " "
+	ld d, "▷"
 	ld a, [wLinkMenuSelectionSendBuffer]
 	and (B_BUTTON << 2) ; was B button pressed?
 	jr nz, .updateCursorPosition
@@ -670,7 +670,7 @@ SetCursorPositionsFromOptions:
 	ld e, a
 	ld d, 0
 	add hl, de
-	ld [hl], $ec ; unfilled right arrow menu cursor
+	ld [hl], "▷"
 	ret
 
 ; table that indicates how the 3 text speed options affect frame delays
diff --git a/engine/overworld/auto_movement.asm b/engine/overworld/auto_movement.asm
index 9a717641..31f7d7b9 100755
--- a/engine/overworld/auto_movement.asm
+++ b/engine/overworld/auto_movement.asm
@@ -128,21 +128,21 @@ PalletMovementScript_WalkToLab:
 	ret
 
 RLEList_ProfOakWalkToLab:
-	db NPC_MOVEMENT_DOWN, $05
-	db NPC_MOVEMENT_LEFT, $01
-	db NPC_MOVEMENT_DOWN, $05
-	db NPC_MOVEMENT_RIGHT, $03
-	db NPC_MOVEMENT_UP, $01
-	db $E0, $01 ; stand still
-	db $FF
+	db NPC_MOVEMENT_DOWN, 5
+	db NPC_MOVEMENT_LEFT, 1
+	db NPC_MOVEMENT_DOWN, 5
+	db NPC_MOVEMENT_RIGHT, 3
+	db NPC_MOVEMENT_UP, 1
+	db NPC_CHANGE_FACING, 1
+	db -1 ; end
 
 RLEList_PlayerWalkToLab:
-	db D_UP, $02
-	db D_RIGHT, $03
-	db D_DOWN, $05
-	db D_LEFT, $01
-	db D_DOWN, $06
-	db $FF
+	db D_UP, 2
+	db D_RIGHT, 3
+	db D_DOWN, 5
+	db D_LEFT, 1
+	db D_DOWN, 6
+	db -1 ; end
 
 PalletMovementScript_Done:
 	ld a, [wSimulatedJoypadStatesIndex]
@@ -190,18 +190,18 @@ PewterMovementScript_WalkToMuseum:
 	ret
 
 RLEList_PewterMuseumPlayer:
-	db 0, $01
-	db D_UP, $03
-	db D_LEFT, $0D
-	db D_UP, $06
-	db $FF
+	db NO_INPUT, 1
+	db D_UP, 3
+	db D_LEFT, 13
+	db D_UP, 6
+	db -1 ; end
 
 RLEList_PewterMuseumGuy:
-	db NPC_MOVEMENT_UP, $06
-	db NPC_MOVEMENT_LEFT, $0D
-	db NPC_MOVEMENT_UP, $03
-	db NPC_MOVEMENT_LEFT, $01
-	db $FF
+	db NPC_MOVEMENT_UP, 6
+	db NPC_MOVEMENT_LEFT, 13
+	db NPC_MOVEMENT_UP, 3
+	db NPC_MOVEMENT_LEFT, 1
+	db -1 ; end
 
 PewterMovementScript_Done:
 	ld a, [wSimulatedJoypadStatesIndex]
@@ -249,22 +249,22 @@ PewterMovementScript_WalkToGym:
 	ret
 
 RLEList_PewterGymPlayer:
-	db 0, $01
-	db D_RIGHT, $02
-	db D_DOWN, $05
-	db D_LEFT, $0B
-	db D_UP, $05
-	db D_LEFT, $0F
-	db $FF
+	db NO_INPUT, 1
+	db D_RIGHT, 2
+	db D_DOWN, 5
+	db D_LEFT, 11
+	db D_UP, 5
+	db D_LEFT, 15
+	db -1 ; end
 
 RLEList_PewterGymGuy:
-	db NPC_MOVEMENT_DOWN, $02
-	db NPC_MOVEMENT_LEFT, $0F
-	db NPC_MOVEMENT_UP, $05
-	db NPC_MOVEMENT_LEFT, $0B
-	db NPC_MOVEMENT_DOWN, $05
-	db NPC_MOVEMENT_RIGHT, $03
-	db $FF
+	db NPC_MOVEMENT_DOWN, 2
+	db NPC_MOVEMENT_LEFT, 15
+	db NPC_MOVEMENT_UP, 5
+	db NPC_MOVEMENT_LEFT, 11
+	db NPC_MOVEMENT_DOWN, 5
+	db NPC_MOVEMENT_RIGHT, 3
+	db -1 ; end
 
 FreezeEnemyTrainerSprite::
 	ld a, [wCurMap]
@@ -275,7 +275,7 @@ FreezeEnemyTrainerSprite::
 	ld b, a
 .loop
 	ld a, [hli]
-	cp $ff
+	cp -1
 	jr z, .notRival
 	cp b
 	ret z ; the rival leaves after battling, so don't freeze him
@@ -289,4 +289,4 @@ RivalIDs:
 	db OPP_SONY1
 	db OPP_SONY2
 	db OPP_SONY3
-	db $ff
+	db -1 ; end
diff --git a/engine/overworld/movement.asm b/engine/overworld/movement.asm
index 58481613..61bcf02f 100644
--- a/engine/overworld/movement.asm
+++ b/engine/overworld/movement.asm
@@ -169,7 +169,7 @@ UpdateNPCSprite:
 	pop hl
 	ld de, wNPCMovementDirections
 	call LoadDEPlusA ; a = [wNPCMovementDirections + movement byte 1]
-	cp $e0
+	cp NPC_CHANGE_FACING
 	jp z, ChangeFacingDirection
 	cp STAY
 	jr nz, .next
diff --git a/engine/pokemon/add_mon.asm b/engine/pokemon/add_mon.asm
index 0c72ff5b..d7e7eab1 100644
--- a/engine/pokemon/add_mon.asm
+++ b/engine/pokemon/add_mon.asm
@@ -75,8 +75,8 @@ _AddPartyMon::
 	push hl
 	ld a, [wMonDataLocation]
 	and $f
-	ld a, $98     ; set enemy trainer mon IVs to fixed average values
-	ld b, $88
+	ld a, ATKDEFDV_TRAINER  ; set enemy trainer mon IVs to fixed average values
+	ld b, SPDSPCDV_TRAINER
 	jr nz, .next4
 
 ; If the mon is being added to the player's party, update the pokedex.
diff --git a/engine/slots/slot_machine.asm b/engine/slots/slot_machine.asm
index 9af17a81..fe137632 100755
--- a/engine/slots/slot_machine.asm
+++ b/engine/slots/slot_machine.asm
@@ -1,6 +1,6 @@
 PromptUserToPlaySlots:
 	call SaveScreenTilesToBuffer2
-	ld a, BANK(DisplayTextIDInit)
+	ld a, BANK(DisplayTextIDInit) ; TRUE
 	ld [wAutoTextBoxDrawingControl], a
 	ld b, a
 	ld hl, DisplayTextIDInit