Use more constants in scripts

11 files changed, 59 insertions, 55 deletions

diff --git a/engine/events/daycare.asm b/engine/events/daycare.asm
index 6395a40fb..ed6e16e87 100755
--- a/engine/events/daycare.asm
+++ b/engine/events/daycare.asm
@@ -465,14 +465,14 @@ Special_DayCareManOutside: ; 16936
 
 .Load0:
 	call PrintText
-	xor a
+	xor a ; FALSE
 	ld [ScriptVar], a
 	ret
 
 .PartyFull:
 	ld hl, .PartyFullText
 	call PrintText
-	ld a, $1
+	ld a, TRUE
 	ld [ScriptVar], a
 	ret
 ; 16993
diff --git a/engine/events/fruit_trees.asm b/engine/events/fruit_trees.asm
index d0b0bac15..768bedb0b 100644
--- a/engine/events/fruit_trees.asm
+++ b/engine/events/fruit_trees.asm
@@ -2,7 +2,7 @@ FruitTreeScript:: ; 44000
 	callasm GetCurTreeFruit
 	opentext
 	copybytetovar CurFruit
-	itemtotext $0, $0
+	itemtotext USE_SCRIPT_VAR, MEM_BUFFER_0
 	writetext FruitBearingTreeText
 	buttonsound
 	callasm TryResetFruitTrees
diff --git a/engine/events/happiness_egg.asm b/engine/events/happiness_egg.asm
index a4ae8b7e6..df58c7143 100755
--- a/engine/events/happiness_egg.asm
+++ b/engine/events/happiness_egg.asm
@@ -21,7 +21,7 @@ CheckFirstMonIsEgg: ; 71ac
 	ld a, [PartySpecies]
 	ld [wd265], a
 	cp EGG
-	ld a, $1
+	ld a, 1
 	jr z, .egg
 	xor a
 
diff --git a/engine/events/heal_machine_anim.asm b/engine/events/heal_machine_anim.asm
index dac46d2e2..0f20d76b6 100755
--- a/engine/events/heal_machine_anim.asm
+++ b/engine/events/heal_machine_anim.asm
@@ -47,6 +47,7 @@ HealMachineAnim: ; 12324
 ; 12365
 
 .Pointers: ; 12365
+; entries correspond to HEALMACHINE_* constants
 	dw .Pokecenter
 	dw .ElmLab
 	dw .HallOfFame
diff --git a/engine/events/kurt.asm b/engine/events/kurt.asm
index 9bc06a613..3cabfd6f1 100644
--- a/engine/events/kurt.asm
+++ b/engine/events/kurt.asm
@@ -76,7 +76,7 @@ Kurt_SelectApricorn: ; 88055
 	jr nz, .done
 
 .nope
-	xor a
+	xor a ; FALSE
 
 .done
 	ld c, a
diff --git a/engine/events/magikarp.asm b/engine/events/magikarp.asm
index 68e8baad7..336d27e79 100644
--- a/engine/events/magikarp.asm
+++ b/engine/events/magikarp.asm
@@ -52,22 +52,22 @@ Special_CheckMagikarpLength: ; fbb32
 	ld hl, PartyMonOT
 	call SkipNames
 	call CopyBytes
-	ld a, 3
+	ld a, MAGIKARPLENGTH_BEAT_RECORD
 	ld [ScriptVar], a
 	ret
 
 .not_long_enough
-	ld a, 2
+	ld a, MAGIKARPLENGTH_TOO_SHORT
 	ld [ScriptVar], a
 	ret
 
 .declined
-	ld a, 1
+	ld a, MAGIKARPLENGTH_REFUSED
 	ld [ScriptVar], a
 	ret
 
 .not_magikarp
-	xor a
+	xor a ; MAGIKARPLENGTH_NOT_MAGIKARP
 	ld [ScriptVar], a
 	ret
 ; fbba9
diff --git a/engine/events/misc_scripts_2.asm b/engine/events/misc_scripts_2.asm
index c4c51d5e6..29416a9e5 100644
--- a/engine/events/misc_scripts_2.asm
+++ b/engine/events/misc_scripts_2.asm
@@ -13,7 +13,7 @@ RepelWoreOffScript:: ; 0x13619
 HiddenItemScript:: ; 0x13625
 	opentext
 	copybytetovar EngineBuffer3
-	itemtotext 0, 0
+	itemtotext USE_SCRIPT_VAR, MEM_BUFFER_0
 	writetext .found_text
 	giveitem ITEM_FROM_MEM
 	iffalse .bag_full
diff --git a/engine/events/move_tutor.asm b/engine/events/move_tutor.asm
index a15ecaf93..802b9ef21 100644
--- a/engine/events/move_tutor.asm
+++ b/engine/events/move_tutor.asm
@@ -22,7 +22,7 @@ Special_MoveTutor: ; 4925b
 .enter_loop
 	call CheckCanLearnMoveTutorMove
 	jr nc, .loop
-	xor a
+	xor a ; FALSE
 	ld [ScriptVar], a
 	jr .quit
 
@@ -35,10 +35,11 @@ Special_MoveTutor: ; 4925b
 
 .GetMoveTutorMove: ; 492a5
 	ld a, [ScriptVar]
-	cp 1
+	cp MOVETUTOR_FLAMETHROWER
 	jr z, .flamethrower
-	cp 2
+	cp MOVETUTOR_THUNDERBOLT
 	jr z, .thunderbolt
+	; MOVETUTOR_ICE_BEAM
 	ld a, ICE_BEAM
 	ret
 
diff --git a/engine/events/special.asm b/engine/events/special.asm
index 939db4a25..9bd83f068 100755
--- a/engine/events/special.asm
+++ b/engine/events/special.asm
@@ -1,3 +1,5 @@
+MANIA_OT_ID EQU 00518
+
 SpecialGiveShuckle: ; 7305
 
 ; Adding to the party.
@@ -32,9 +34,9 @@ SpecialGiveShuckle: ; 7305
 ; OT ID.
 	ld hl, PartyMon1ID
 	call AddNTimes
-	ld a, $2
+	ld a, HIGH(MANIA_OT_ID)
 	ld [hli], a
-	ld [hl], $6
+	ld [hl], LOW(MANIA_OT_ID)
 
 ; Nickname.
 	ld a, [PartyCount]
@@ -54,8 +56,7 @@ SpecialGiveShuckle: ; 7305
 
 ; Engine flag for this event.
 	ld hl, wDailyFlags
-	set 5, [hl]
-; setflag ENGINE_SHUCKLE_GIVEN
+	set 5, [hl] ; ENGINE_SHUCKLE_GIVEN
 	ld a, 1
 	ld [ScriptVar], a
 	ret
@@ -85,10 +86,10 @@ SpecialReturnShuckle: ; 737e
 
 ; OT ID
 	ld a, [hli]
-	cp HIGH(00518)
+	cp HIGH(MANIA_OT_ID)
 	jr nz, .DontReturn
 	ld a, [hl]
-	cp LOW(00518)
+	cp LOW(MANIA_OT_ID)
 	jr nz, .DontReturn
 
 ; OT
@@ -115,28 +116,28 @@ SpecialReturnShuckle: ; 737e
 	call AddNTimes
 	ld a, [hl]
 	cp 150
-	ld a, $3
+	ld a, SHUCKIE_HAPPY
 	jr nc, .HappyToStayWithYou
 	xor a ; take from pc
 	ld [wPokemonWithdrawDepositParameter], a
 	callfar RemoveMonFromPartyOrBox
-	ld a, $2
+	ld a, SHUCKIE_RETURNED
 .HappyToStayWithYou:
 	ld [ScriptVar], a
 	ret
 
 .refused
-	ld a, $1
+	ld a, SHUCKIE_REFUSED
 	ld [ScriptVar], a
 	ret
 
 .DontReturn:
-	xor a
+	xor a ; SHUCKIE_WRONG_MON
 	ld [ScriptVar], a
 	ret
 
 .fainted
-	ld a, $4
+	ld a, SHUCKIE_FAINTED
 	ld [ScriptVar], a
 	ret
 
diff --git a/engine/events/std_scripts.asm b/engine/events/std_scripts.asm
index da2d38138..708165046 100644
--- a/engine/events/std_scripts.asm
+++ b/engine/events/std_scripts.asm
@@ -113,7 +113,7 @@ PokecenterNurseScript:
 	pause 10
 	special HealParty
 	playmusic MUSIC_NONE
-	writebyte 0 ; Machine is at a Pokemon Center
+	writebyte HEALMACHINE_POKECENTER
 	special HealMachineAnim
 	pause 30
 	special RestartMapMusic
@@ -251,25 +251,25 @@ DayToTextScript:
 	if_equal THURSDAY, .Thursday
 	if_equal FRIDAY, .Friday
 	if_equal SATURDAY, .Saturday
-	stringtotext .SundayText, 0
+	stringtotext .SundayText, MEM_BUFFER_0
 	end
 .Monday:
-	stringtotext .MondayText, 0
+	stringtotext .MondayText, MEM_BUFFER_0
 	end
 .Tuesday:
-	stringtotext .TuesdayText, 0
+	stringtotext .TuesdayText, MEM_BUFFER_0
 	end
 .Wednesday:
-	stringtotext .WednesdayText, 0
+	stringtotext .WednesdayText, MEM_BUFFER_0
 	end
 .Thursday:
-	stringtotext .ThursdayText, 0
+	stringtotext .ThursdayText, MEM_BUFFER_0
 	end
 .Friday:
-	stringtotext .FridayText, 0
+	stringtotext .FridayText, MEM_BUFFER_0
 	end
 .Saturday:
-	stringtotext .SaturdayText, 0
+	stringtotext .SaturdayText, MEM_BUFFER_0
 	end
 .SundayText:
 	db "SUNDAY@"
@@ -298,7 +298,7 @@ RadioTowerRocketsScript:
 	clearevent EVENT_USED_THE_CARD_KEY_IN_THE_RADIO_TOWER
 	setevent EVENT_MAHOGANY_TOWN_POKEFAN_M_BLOCKS_EAST
 	specialphonecall SPECIALCALL_WEIRDBROADCAST
-	setmapscene MAHOGANY_TOWN, $1
+	setmapscene MAHOGANY_TOWN, 1
 	end
 
 BugContestResultsWarpScript:
@@ -307,7 +307,7 @@ BugContestResultsWarpScript:
 	setevent EVENT_ROUTE_36_NATIONAL_PARK_GATE_OFFICER_CONTEST_DAY
 	clearevent EVENT_ROUTE_36_NATIONAL_PARK_GATE_OFFICER_NOT_CONTEST_DAY
 	setevent EVENT_WARPED_FROM_ROUTE_35_NATIONAL_PARK_GATE
-	warp ROUTE_36_NATIONAL_PARK_GATE, $0, $4
+	warp ROUTE_36_NATIONAL_PARK_GATE, 0, 4
 	applymovement PLAYER, Movement_ContestResults_WalkAfterWarp
 
 BugContestResultsScript:
@@ -321,7 +321,7 @@ BugContestResultsScript:
 	farwritetext ContestResults_ReadyToJudgeText
 	waitbutton
 	special BugContestJudging
-	RAM2MEM $0
+	vartomem MEM_BUFFER_0
 	if_equal 1, BugContestResults_FirstPlace
 	if_equal 2, BugContestResults_SecondPlace
 	if_equal 3, BugContestResults_ThirdPlace
@@ -349,14 +349,15 @@ BugContestResults_FinishUp
 	special ContestReturnMons
 BugContestResults_DidNotLeaveMons
 	special CheckPartyFullAfterContest
-	if_equal $0, BugContestResults_CleanUp
-	if_equal $2, BugContestResults_CleanUp
+	if_equal BUGCONTEST_CAUGHT_MON, BugContestResults_CleanUp
+	if_equal BUGCONTEST_NO_CATCH, BugContestResults_CleanUp
+	; BUGCONTEST_BOXED_MON
 	farwritetext ContestResults_PartyFullText
 	waitbutton
 BugContestResults_CleanUp
 	closetext
-	setscene $0
-	setmapscene ROUTE_35_NATIONAL_PARK_GATE, $0
+	setscene 0
+	setmapscene ROUTE_35_NATIONAL_PARK_GATE, 0
 	setevent EVENT_BUG_CATCHING_CONTESTANT_1A
 	setevent EVENT_BUG_CATCHING_CONTESTANT_2A
 	setevent EVENT_BUG_CATCHING_CONTESTANT_3A
@@ -384,7 +385,7 @@ BugContestResults_CleanUp
 
 BugContestResults_FirstPlace ; 0xbc31e
 	setevent EVENT_GAVE_KURT_APRICORNS
-	itemtotext SUN_STONE, $1
+	itemtotext SUN_STONE, MEM_BUFFER_1
 	farwritetext ContestResults_PlayerWonAPrizeText
 	waitbutton
 	verbosegiveitem SUN_STONE
@@ -393,7 +394,7 @@ BugContestResults_FirstPlace ; 0xbc31e
 ; 0xbc332
 
 BugContestResults_SecondPlace ; 0xbc332
-	itemtotext EVERSTONE, $1
+	itemtotext EVERSTONE, MEM_BUFFER_1
 	farwritetext ContestResults_PlayerWonAPrizeText
 	waitbutton
 	verbosegiveitem EVERSTONE
@@ -402,7 +403,7 @@ BugContestResults_SecondPlace ; 0xbc332
 ; 0xbc343
 
 BugContestResults_ThirdPlace ; 0xbc343
-	itemtotext GOLD_BERRY, $1
+	itemtotext GOLD_BERRY, MEM_BUFFER_1
 	farwritetext ContestResults_PlayerWonAPrizeText
 	waitbutton
 	verbosegiveitem GOLD_BERRY
@@ -1759,7 +1760,7 @@ RematchGiftFScript:
 	end
 
 GymStatue1Script:
-	mapnametotext $0
+	mapnametotext MEM_BUFFER_0
 	opentext
 	farwritetext GymStatue_CityGymText
 	waitbutton
@@ -1767,7 +1768,7 @@ GymStatue1Script:
 	end
 
 GymStatue2Script:
-	mapnametotext $0
+	mapnametotext MEM_BUFFER_0
 	opentext
 	farwritetext GymStatue_CityGymText
 	buttonsound
@@ -1813,18 +1814,18 @@ CoinVendor_IntroScript: ; 0xbcde0
 	loadmenudata .MenuDataHeader
 	verticalmenu
 	closewindow
-	if_equal $1, .Buy50
-	if_equal $2, .Buy500
+	if_equal 1, .Buy50
+	if_equal 2, .Buy500
 	jump .Cancel
 ; 0xbcdf7
 
 .Buy50: ; 0xbcdf7
 	checkcoins MAX_COINS - 50
-	if_equal $0, .CoinCaseFull
-	checkmoney $0, 1000
-	if_equal $2, .NotEnoughMoney
+	if_equal HAVE_MORE, .CoinCaseFull
+	checkmoney YOUR_MONEY, 1000
+	if_equal HAVE_LESS, .NotEnoughMoney
 	givecoins 50
-	takemoney $0, 1000
+	takemoney YOUR_MONEY, 1000
 	waitsfx
 	playsound SFX_TRANSACTION
 	farwritetext CoinVendor_Buy50CoinsText
@@ -1834,11 +1835,11 @@ CoinVendor_IntroScript: ; 0xbcde0
 
 .Buy500: ; 0xbce1b
 	checkcoins MAX_COINS - 500
-	if_equal $0, .CoinCaseFull
-	checkmoney $0, 10000
-	if_equal $2, .NotEnoughMoney
+	if_equal HAVE_MORE, .CoinCaseFull
+	checkmoney YOUR_MONEY, 10000
+	if_equal HAVE_LESS, .NotEnoughMoney
 	givecoins 500
-	takemoney $0, 10000
+	takemoney YOUR_MONEY, 10000
 	waitsfx
 	playsound SFX_TRANSACTION
 	farwritetext CoinVendor_Buy500CoinsText
diff --git a/engine/events/whiteout.asm b/engine/events/whiteout.asm
index a9d6f900e..14a7066f1 100755
--- a/engine/events/whiteout.asm
+++ b/engine/events/whiteout.asm
@@ -4,7 +4,7 @@ Script_BattleWhiteout:: ; 0x124c1
 ; 0x124c8
 
 Script_OverworldWhiteout:: ; 0x124c8
-	refreshscreen $0
+	refreshscreen
 	callasm OverworldBGMap
 
 Script_Whiteout: ; 0x124ce