Merge branch 'master' of https://github.com/pret/pokered

45 files changed, 289 insertions, 287 deletions

diff --git a/scripts/BillsHouse.asm b/scripts/BillsHouse.asm
index cb1afbdd..8582e397 100644
--- a/scripts/BillsHouse.asm
+++ b/scripts/BillsHouse.asm
@@ -94,8 +94,8 @@ BillsHouseScript3:
 	ld a, [wStatusFlags5]
 	bit BIT_SCRIPTED_NPC_MOVEMENT, a
 	ret nz
-	ld a, HS_BILL_POKEMON
-	ld [wMissableObjectIndex], a
+	ld a, TOGGLE_BILL_POKEMON
+	ld [wToggleableObjectIndex], a
 	predef HideObject
 	call CheckPikachuFollowingPlayer
 	jr z, .asm_1e13e
@@ -153,8 +153,8 @@ BillsHouseScript5:
 	ld a, 5
 	ldh [hSpriteMapXCoord], a
 	call SetSpritePosition1
-	ld a, HS_BILL_1
-	ld [wMissableObjectIndex], a
+	ld a, TOGGLE_BILL_1
+	ld [wToggleableObjectIndex], a
 	predef ShowObject
 	ld c, 8
 	call DelayFrames
@@ -179,13 +179,13 @@ BillsHouseScript5:
 .asm_1e1c6
 	ld a, BILLSHOUSE_BILL1
 	ldh [hSpriteIndex], a
-	ld de, MovementData_1e807
+	ld de, .BillExitMachineMovement
 	call MoveSprite
 	ld a, SCRIPT_BILLSHOUSE_SCRIPT6
 	ld [wBillsHouseCurScript], a
 	ret
 
-MovementData_1e807:
+.BillExitMachineMovement:
 	db NPC_MOVEMENT_DOWN
 	db NPC_MOVEMENT_RIGHT
 	db NPC_MOVEMENT_RIGHT
diff --git a/scripts/BillsHouse_2.asm b/scripts/BillsHouse_2.asm
index f75ab204..4a897d87 100644
--- a/scripts/BillsHouse_2.asm
+++ b/scripts/BillsHouse_2.asm
@@ -39,11 +39,11 @@ BillsHousePrintBillSSTicketText::
 	ld hl, .SSTicketReceivedText
 	call PrintText
 	SetEvent EVENT_GOT_SS_TICKET
-	ld a, HS_CERULEAN_GUARD_1
-	ld [wMissableObjectIndex], a
+	ld a, TOGGLE_CERULEAN_GUARD_1
+	ld [wToggleableObjectIndex], a
 	predef ShowObject
-	ld a, HS_CERULEAN_GUARD_2
-	ld [wMissableObjectIndex], a
+	ld a, TOGGLE_CERULEAN_GUARD_2
+	ld [wToggleableObjectIndex], a
 	predef HideObject
 .got_ss_ticket
 	ld hl, .WhyDontYouGoInsteadOfMeText
diff --git a/scripts/BluesHouse.asm b/scripts/BluesHouse.asm
index 834a24e4..2d7f19dc 100644
--- a/scripts/BluesHouse.asm
+++ b/scripts/BluesHouse.asm
@@ -39,8 +39,8 @@ BluesHouseDaisySittingText:
 	lb bc, TOWN_MAP, 1
 	call GiveItem
 	jr nc, .bag_full
-	ld a, HS_TOWN_MAP
-	ld [wMissableObjectIndex], a
+	ld a, TOGGLE_TOWN_MAP
+	ld [wToggleableObjectIndex], a
 	predef HideObject
 	ld hl, GotMapText
 	call PrintText
diff --git a/scripts/CeladonMansionRoofHouse.asm b/scripts/CeladonMansionRoofHouse.asm
index e71d14d5..330efe0c 100644
--- a/scripts/CeladonMansionRoofHouse.asm
+++ b/scripts/CeladonMansionRoofHouse.asm
@@ -16,8 +16,8 @@ CeladonMansionRoofHouseEeveePokeballText:
 	lb bc, EEVEE, 25
 	call GivePokemon
 	jr nc, .party_full
-	ld a, HS_CELADON_MANSION_EEVEE_GIFT
-	ld [wMissableObjectIndex], a
+	ld a, TOGGLE_CELADON_MANSION_EEVEE_GIFT
+	ld [wToggleableObjectIndex], a
 	predef HideObject
 .party_full
 	jp TextScriptEnd
diff --git a/scripts/CeruleanCity.asm b/scripts/CeruleanCity.asm
index 0bc77b42..8f26cb43 100644
--- a/scripts/CeruleanCity.asm
+++ b/scripts/CeruleanCity.asm
@@ -8,8 +8,8 @@ CeruleanCityClearScripts:
 	xor a ; SCRIPT_CERULEANCITY_DEFAULT
 	ld [wJoyIgnore], a
 	ld [wCeruleanCityCurScript], a
-	ld a, HS_CERULEAN_RIVAL
-	ld [wMissableObjectIndex], a
+	ld a, TOGGLE_CERULEAN_RIVAL
+	ld [wToggleableObjectIndex], a
 	predef_jump HideObject
 
 CeruleanCity_ScriptPointers:
@@ -88,8 +88,8 @@ ENDC
 	call GetPointerWithinSpriteStateData2
 	ld [hl], 25
 .playerOnRightSideOfBridge
-	ld a, HS_CERULEAN_RIVAL
-	ld [wMissableObjectIndex], a
+	ld a, TOGGLE_CERULEAN_RIVAL
+	ld [wToggleableObjectIndex], a
 	predef ShowObject
 	ld de, CeruleanCityMovement1
 	ld a, CERULEANCITY_RIVAL
@@ -203,8 +203,8 @@ CeruleanCityRivalCleanupScript:
 	ld a, [wStatusFlags5]
 	bit BIT_SCRIPTED_NPC_MOVEMENT, a
 	ret nz
-	ld a, HS_CERULEAN_RIVAL
-	ld [wMissableObjectIndex], a
+	ld a, TOGGLE_CERULEAN_RIVAL
+	ld [wToggleableObjectIndex], a
 	predef HideObject
 	xor a
 	ld [wJoyIgnore], a
diff --git a/scripts/CeruleanCity_2.asm b/scripts/CeruleanCity_2.asm
index 53ace5c8..85986a7a 100644
--- a/scripts/CeruleanCity_2.asm
+++ b/scripts/CeruleanCity_2.asm
@@ -3,14 +3,14 @@ CeruleanHideRocket:
 ; one is called after you beat the Rocket that gives you TM28 DIG.
 ; the screen then fades out, he disappears, and fades back in
 	call GBFadeOutToBlack
-	ld a, HS_CERULEAN_GUARD_1
-	ld [wMissableObjectIndex], a
+	ld a, TOGGLE_CERULEAN_GUARD_1
+	ld [wToggleableObjectIndex], a
 	predef ShowObject
-	ld a, HS_CERULEAN_GUARD_2
-	ld [wMissableObjectIndex], a
+	ld a, TOGGLE_CERULEAN_GUARD_2
+	ld [wToggleableObjectIndex], a
 	predef HideObject
-	ld a, HS_CERULEAN_ROCKET
-	ld [wMissableObjectIndex], a
+	ld a, TOGGLE_CERULEAN_ROCKET
+	ld [wToggleableObjectIndex], a
 	predef HideObject
 	call GBFadeInFromBlack
 	ret
diff --git a/scripts/CeruleanMelaniesHouse.asm b/scripts/CeruleanMelaniesHouse.asm
index 1d2b817d..8b8095e0 100644
--- a/scripts/CeruleanMelaniesHouse.asm
+++ b/scripts/CeruleanMelaniesHouse.asm
@@ -44,8 +44,8 @@ CeruleanMelanieHouseMelanieText:
 	ld [wDoNotWaitForButtonPressAfterDisplayingText], a
 	ld hl, CeruleanHouse1Text_1cfd3
 	call PrintText
-	ld a, HS_CERULEAN_BULBASAUR
-	ld [wMissableObjectIndex], a
+	ld a, TOGGLE_CERULEAN_BULBASAUR
+	ld [wToggleableObjectIndex], a
 	predef HideObject
 	SetEvent EVENT_GOT_BULBASAUR_IN_CERULEAN
 .asm_1cfb3
diff --git a/scripts/ChampionsRoom.asm b/scripts/ChampionsRoom.asm
index 8db95e56..42b9e7be 100644
--- a/scripts/ChampionsRoom.asm
+++ b/scripts/ChampionsRoom.asm
@@ -110,8 +110,8 @@ ChampionsRoomOakArrivesScript:
 	ld a, CHAMPIONSROOM_OAK
 	ldh [hSpriteIndex], a
 	call MoveSprite
-	ld a, HS_CHAMPIONS_ROOM_OAK
-	ld [wMissableObjectIndex], a
+	ld a, TOGGLE_CHAMPIONS_ROOM_OAK
+	ld [wToggleableObjectIndex], a
 	predef ShowObject
 	ld a, SCRIPT_CHAMPIONSROOM_OAK_CONGRATULATES_PLAYER
 	ld [wChampionsRoomCurScript], a
@@ -187,8 +187,8 @@ ChampionsRoomOakExitsScript:
 	ld a, [wStatusFlags5]
 	bit BIT_SCRIPTED_NPC_MOVEMENT, a
 	ret nz
-	ld a, HS_CHAMPIONS_ROOM_OAK
-	ld [wMissableObjectIndex], a
+	ld a, TOGGLE_CHAMPIONS_ROOM_OAK
+	ld [wToggleableObjectIndex], a
 	predef HideObject
 	ld a, SCRIPT_CHAMPIONSROOM_PLAYER_FOLLOWS_OAK
 	ld [wChampionsRoomCurScript], a
diff --git a/scripts/Colosseum.asm b/scripts/Colosseum.asm
index 4aaa4236..1489fd2c 100644
--- a/scripts/Colosseum.asm
+++ b/scripts/Colosseum.asm
@@ -1,4 +1,5 @@
 Colosseum_Script:
+	ASSERT TRADECENTER_OPPONENT == COLOSSEUM_OPPONENT
 	jp TradeCenter_Script
 
 Colosseum_TextPointers:
diff --git a/scripts/Daycare.asm b/scripts/Daycare.asm
index f9c41edf..f7544c7f 100644
--- a/scripts/Daycare.asm
+++ b/scripts/Daycare.asm
@@ -183,7 +183,7 @@ DaycareGentlemanText:
 	ld a, [wPartyCount]
 	dec a
 	push af
-	ld bc, wPartyMon2 - wPartyMon1
+	ld bc, PARTYMON_STRUCT_LENGTH
 	push bc
 	ld hl, wPartyMon1Moves
 	call AddNTimes
@@ -200,7 +200,7 @@ DaycareGentlemanText:
 	call AddNTimes
 	ld d, h
 	ld e, l
-	ld bc, wPartyMon1MaxHP - wPartyMon1HP
+	ld bc, MON_MAXHP - MON_HP
 	add hl, bc
 	ld a, [hli]
 	ld [de], a
diff --git a/scripts/FightingDojo.asm b/scripts/FightingDojo.asm
index 04b35e82..cf822d1f 100644
--- a/scripts/FightingDojo.asm
+++ b/scripts/FightingDojo.asm
@@ -246,8 +246,8 @@ FightingDojoHitmonleePokeBallText:
 	jr nc, .done
 
 	; once Poké Ball is taken, hide sprite
-	ld a, HS_FIGHTING_DOJO_GIFT_1
-	ld [wMissableObjectIndex], a
+	ld a, TOGGLE_FIGHTING_DOJO_GIFT_1
+	ld [wToggleableObjectIndex], a
 	predef HideObject
 	SetEvents EVENT_GOT_HITMONLEE, EVENT_DEFEATED_FIGHTING_DOJO
 .done
@@ -281,8 +281,8 @@ FightingDojoHitmonchanPokeBallText:
 	SetEvents EVENT_GOT_HITMONCHAN, EVENT_DEFEATED_FIGHTING_DOJO
 
 	; once Poké Ball is taken, hide sprite
-	ld a, HS_FIGHTING_DOJO_GIFT_2
-	ld [wMissableObjectIndex], a
+	ld a, TOGGLE_FIGHTING_DOJO_GIFT_2
+	ld [wToggleableObjectIndex], a
 	predef HideObject
 .done
 	jp TextScriptEnd
diff --git a/scripts/GameCorner.asm b/scripts/GameCorner.asm
index 5aaa998c..4a4ce3ed 100644
--- a/scripts/GameCorner.asm
+++ b/scripts/GameCorner.asm
@@ -20,7 +20,7 @@ GameCornerSelectLuckySlotMachine:
 	srl a
 	srl a
 	srl a
-	ld [wLuckySlotHiddenObjectIndex], a
+	ld [wLuckySlotHiddenEventIndex], a
 	ret
 
 GameCornerSetRocketHideoutDoorTile:
@@ -111,8 +111,8 @@ GameCornerRocketExitScript:
 	ret nz
 	xor a
 	ld [wJoyIgnore], a
-	ld a, HS_GAME_CORNER_ROCKET
-	ld [wMissableObjectIndex], a
+	ld a, TOGGLE_GAME_CORNER_ROCKET
+	ld [wToggleableObjectIndex], a
 	predef HideObject
 	ld hl, wCurrentMapScriptFlags
 	set BIT_CUR_MAP_LOADED_1, [hl]
diff --git a/scripts/HallOfFame.asm b/scripts/HallOfFame.asm
index 31d56022..8e4f1275 100644
--- a/scripts/HallOfFame.asm
+++ b/scripts/HallOfFame.asm
@@ -96,8 +96,8 @@ HallOfFameOakCongratulationsScript:
 	call DisplayTextID
 	ld a, PAD_BUTTONS | PAD_CTRL_PAD
 	ld [wJoyIgnore], a
-	ld a, HS_CERULEAN_CAVE_GUY
-	ld [wMissableObjectIndex], a
+	ld a, TOGGLE_CERULEAN_CAVE_GUY
+	ld [wToggleableObjectIndex], a
 	predef HideObject
 	ld a, SCRIPT_HALLOFFAME_RESET_EVENTS_AND_SAVE
 	ld [wHallOfFameCurScript], a
diff --git a/scripts/MtMoonB2F.asm b/scripts/MtMoonB2F.asm
index 4b82ea12..7890c88e 100644
--- a/scripts/MtMoonB2F.asm
+++ b/scripts/MtMoonB2F.asm
@@ -48,9 +48,9 @@ MtMoonB2FSetScript:
 	ret
 
 MtMoonB2FScript_HideJessieJames:
-	ld a, HS_MT_MOON_B2F_JESSIE
+	ld a, TOGGLE_MT_MOON_B2F_JESSIE
 	call MtMoonB2FScript_HideObject
-	ld a, HS_MT_MOON_B2F_JAMES
+	ld a, TOGGLE_MT_MOON_B2F_JAMES
 	call MtMoonB2FScript_HideObject
 	ret
 
@@ -208,13 +208,13 @@ MtMoonB2FSuperNerdTakesOtherFossilScript:
 	ldh [hTextID], a
 	call DisplayTextID
 	CheckEvent EVENT_GOT_HELIX_FOSSIL
-	jr z, .asm_49e1d
-	ld a, HS_MT_MOON_B2F_FOSSIL_1
-	jr .asm_49e1f
-.asm_49e1d
-	ld a, HS_MT_MOON_B2F_FOSSIL_2
-.asm_49e1f
-	ld [wMissableObjectIndex], a
+	jr z, .got_helix_fossil
+	ld a, TOGGLE_MT_MOON_B2F_FOSSIL_1
+	jr .continue
+.got_helix_fossil
+	ld a, TOGGLE_MT_MOON_B2F_FOSSIL_2
+.continue
+	ld [wToggleableObjectIndex], a
 	predef HideObject
 	xor a
 	ld [wJoyIgnore], a
@@ -237,9 +237,9 @@ MtMoonB2FScript_49e15:
 	ldh [hJoyHeld], a
 	ld a, PAD_SELECT | PAD_START | PAD_CTRL_PAD
 	ld [wJoyIgnore], a
-	ld a, HS_MT_MOON_B2F_JESSIE
+	ld a, TOGGLE_MT_MOON_B2F_JESSIE
 	call MtMoonB2FScript_ShowObject
-	ld a, HS_MT_MOON_B2F_JAMES
+	ld a, TOGGLE_MT_MOON_B2F_JAMES
 	call MtMoonB2FScript_ShowObject
 	ld a, $1
 	ld [wDoNotWaitForButtonPressAfterDisplayingText], a
@@ -379,9 +379,9 @@ MtMoonB2FScript14:
 	ld a, PAD_BUTTONS | PAD_CTRL_PAD
 	ld [wJoyIgnore], a
 	call GBFadeOutToBlack
-	ld a, HS_MT_MOON_B2F_JESSIE
+	ld a, TOGGLE_MT_MOON_B2F_JESSIE
 	call MtMoonB2FScript_HideObject
-	ld a, HS_MT_MOON_B2F_JAMES
+	ld a, TOGGLE_MT_MOON_B2F_JAMES
 	call MtMoonB2FScript_HideObject
 	call UpdateSprites
 	call Delay3
@@ -402,14 +402,14 @@ MtMoonB2FScript15:
 	ret
 
 MtMoonB2FScript_ShowObject:
-	ld [wMissableObjectIndex], a
+	ld [wToggleableObjectIndex], a
 	predef ShowObject
 	call UpdateSprites
 	call Delay3
 	ret
 
 MtMoonB2FScript_HideObject:
-	ld [wMissableObjectIndex], a
+	ld [wToggleableObjectIndex], a
 	predef HideObject
 	ret
 
@@ -536,8 +536,8 @@ MtMoonB2FDomeFossilText:
 	call GiveItem
 	jp nc, MtMoonB2FYouHaveNoRoomText
 	call MtMoonB2FReceivedFossilText
-	ld a, HS_MT_MOON_B2F_FOSSIL_1
-	ld [wMissableObjectIndex], a
+	ld a, TOGGLE_MT_MOON_B2F_FOSSIL_1
+	ld [wToggleableObjectIndex], a
 	predef HideObject
 	SetEvent EVENT_GOT_DOME_FOSSIL
 	ld a, SCRIPT_MTMOONB2F_MOVE_SUPER_NERD
@@ -563,8 +563,8 @@ MtMoonB2FHelixFossilText:
 	call GiveItem
 	jp nc, MtMoonB2FYouHaveNoRoomText
 	call MtMoonB2FReceivedFossilText
-	ld a, HS_MT_MOON_B2F_FOSSIL_2
-	ld [wMissableObjectIndex], a
+	ld a, TOGGLE_MT_MOON_B2F_FOSSIL_2
+	ld [wToggleableObjectIndex], a
 	predef HideObject
 	SetEvent EVENT_GOT_HELIX_FOSSIL
 	ld a, SCRIPT_MTMOONB2F_MOVE_SUPER_NERD
diff --git a/scripts/Museum1F_2.asm b/scripts/Museum1F_2.asm
index 9a848f50..502dec5c 100644
--- a/scripts/Museum1F_2.asm
+++ b/scripts/Museum1F_2.asm
@@ -152,8 +152,8 @@ Museum1FPrintScientist2Text::
 	call GiveItem
 	jr nc, .bag_full
 	SetEvent EVENT_GOT_OLD_AMBER
-	ld a, HS_OLD_AMBER
-	ld [wMissableObjectIndex], a
+	ld a, TOGGLE_OLD_AMBER
+	ld [wToggleableObjectIndex], a
 	predef HideObject
 	ld hl, .ReceivedOldAmberText
 	jr .done
diff --git a/scripts/NameRatersHouse.asm b/scripts/NameRatersHouse.asm
index 61b10a3e..b1e3bf95 100644
--- a/scripts/NameRatersHouse.asm
+++ b/scripts/NameRatersHouse.asm
@@ -19,7 +19,7 @@ NameRatersHouseCheckMonOTScript:
 	call .check_match_loop
 	jr c, .no_match
 	ld hl, wPartyMon1OTID
-	ld bc, wPartyMon2 - wPartyMon1
+	ld bc, PARTYMON_STRUCT_LENGTH
 	ld a, [wWhichPokemon]
 	call AddNTimes
 	ld de, wPlayerID
diff --git a/scripts/OaksLab.asm b/scripts/OaksLab.asm
index c7197cb9..2fff09f6 100644
--- a/scripts/OaksLab.asm
+++ b/scripts/OaksLab.asm
@@ -14,7 +14,7 @@ OaksLab_ScriptPointers:
 	def_script_pointers
 	dw_const OaksLabDefaultScript,                   SCRIPT_OAKSLAB_DEFAULT
 	dw_const OaksLabOakEntersLabScript,              SCRIPT_OAKSLAB_OAK_ENTERS_LAB
-	dw_const OaksLabHideShowOaksScript,              SCRIPT_OAKSLAB_HIDE_SHOW_OAKS
+	dw_const OaksLabToggleOaksScript,                SCRIPT_OAKSLAB_TOGGLE_OAKS
 	dw_const OaksLabPlayerEntersLabScript,           SCRIPT_OAKSLAB_PLAYER_ENTERS_LAB
 	dw_const OaksLabFollowedOakScript,               SCRIPT_OAKSLAB_FOLLOWED_OAK
 	dw_const OaksLabOakChooseMonSpeechScript,        SCRIPT_OAKSLAB_OAK_CHOOSE_MON_SPEECH
@@ -42,8 +42,8 @@ OaksLabDefaultScript:
 	ld a, [wNPCMovementScriptFunctionNum]
 	and a
 	ret nz
-	ld a, HS_OAKS_LAB_OAK_2
-	ld [wMissableObjectIndex], a
+	ld a, TOGGLE_OAKS_LAB_OAK_2
+	ld [wToggleableObjectIndex], a
 	predef ShowObject
 	ld hl, wStatusFlags4
 	res BIT_NO_BATTLES, [hl]
@@ -58,7 +58,7 @@ OaksLabOakEntersLabScript:
 	ld de, OakEntryMovement
 	call MoveSprite
 
-	ld a, SCRIPT_OAKSLAB_HIDE_SHOW_OAKS
+	ld a, SCRIPT_OAKSLAB_TOGGLE_OAKS
 	ld [wOaksLabCurScript], a
 	ret
 
@@ -68,15 +68,15 @@ OakEntryMovement:
 	db NPC_MOVEMENT_UP
 	db -1 ; end
 
-OaksLabHideShowOaksScript:
+OaksLabToggleOaksScript:
 	ld a, [wStatusFlags5]
 	bit BIT_SCRIPTED_NPC_MOVEMENT, a
 	ret nz
-	ld a, HS_OAKS_LAB_OAK_2
-	ld [wMissableObjectIndex], a
+	ld a, TOGGLE_OAKS_LAB_OAK_2
+	ld [wToggleableObjectIndex], a
 	predef HideObject
-	ld a, HS_OAKS_LAB_OAK_1
-	ld [wMissableObjectIndex], a
+	ld a, TOGGLE_OAKS_LAB_OAK_1
+	ld [wToggleableObjectIndex], a
 	predef ShowObject
 
 	ld a, SCRIPT_OAKSLAB_PLAYER_ENTERS_LAB
@@ -219,8 +219,8 @@ OaksLabRivalTakesPokeballScript:
 	ld a, [wStatusFlags5]
 	bit BIT_SCRIPTED_NPC_MOVEMENT, a
 	jr nz, .asm_1c564
-	ld a, HS_STARTER_BALL_1
-	ld [wMissableObjectIndex], a
+	ld a, TOGGLE_STARTER_BALL_1
+	ld [wToggleableObjectIndex], a
 	predef HideObject
 	ld a, OAKSLAB_RIVAL
 	ldh [hSpriteIndex], a
@@ -441,8 +441,8 @@ OaksLabPlayerWatchRivalExitScript:
 	jr nz, .checkRivalPosition
 	ld a, PAD_SELECT | PAD_START | PAD_CTRL_PAD
 	ld [wJoyIgnore], a
-	ld a, HS_OAKS_LAB_RIVAL
-	ld [wMissableObjectIndex], a
+	ld a, TOGGLE_OAKS_LAB_RIVAL
+	ld [wToggleableObjectIndex], a
 	predef HideObject
 	call PlayDefaultMusic
 	ld a, SCRIPT_OAKSLAB_PIKACHU_ESCAPES_POKEBALL
@@ -505,8 +505,8 @@ OaksLabRivalArrivesAtOaksRequestScript:
 	call DisplayTextID
 	callfar OaksLabPikachuMovementScript
 	call OaksLabCalcRivalMovementScript
-	ld a, HS_OAKS_LAB_RIVAL
-	ld [wMissableObjectIndex], a
+	ld a, TOGGLE_OAKS_LAB_RIVAL
+	ld [wToggleableObjectIndex], a
 	predef ShowObject
 	ld a, [wNPCMovementDirections2Index]
 	ld [wSavedNPCMovementDirections2Index], a
@@ -565,11 +565,11 @@ OaksLabOakGivesPokedexScript:
 	ldh [hTextID], a
 	call DisplayTextID
 	call Delay3
-	ld a, HS_POKEDEX_1
-	ld [wMissableObjectIndex], a
+	ld a, TOGGLE_POKEDEX_1
+	ld [wToggleableObjectIndex], a
 	predef HideObject
-	ld a, HS_POKEDEX_2
-	ld [wMissableObjectIndex], a
+	ld a, TOGGLE_POKEDEX_2
+	ld [wToggleableObjectIndex], a
 	predef HideObject
 	call OaksLabRivalFaceUpOakFaceDownScript
 	ld a, TEXT_OAKSLAB_OAK_THAT_WAS_MY_DREAM
@@ -588,11 +588,11 @@ OaksLabOakGivesPokedexScript:
 	ld a, SCRIPT_VIRIDIANCITY_AFTER_POKEDEX
 	ld [wViridianCityCurScript], a
 	SetEvent EVENT_OAK_GOT_PARCEL
-	ld a, HS_LYING_OLD_MAN
-	ld [wMissableObjectIndex], a
+	ld a, TOGGLE_LYING_OLD_MAN
+	ld [wToggleableObjectIndex], a
 	predef HideObject
-	ld a, HS_OLD_MAN_2
-	ld [wMissableObjectIndex], a
+	ld a, TOGGLE_OLD_MAN_2
+	ld [wToggleableObjectIndex], a
 	predef ShowObject
 	ld a, [wSavedNPCMovementDirections2Index]
 	ld b, 0
@@ -617,14 +617,14 @@ OaksLabRivalLeavesWithPokedexScript:
 	bit BIT_SCRIPTED_NPC_MOVEMENT, a
 	ret nz
 	call PlayDefaultMusic
-	ld a, HS_OAKS_LAB_RIVAL
-	ld [wMissableObjectIndex], a
+	ld a, TOGGLE_OAKS_LAB_RIVAL
+	ld [wToggleableObjectIndex], a
 	predef HideObject
 	SetEvent EVENT_1ST_ROUTE22_RIVAL_BATTLE
 	ResetEventReuseHL EVENT_2ND_ROUTE22_RIVAL_BATTLE
 	SetEventReuseHL EVENT_ROUTE22_RIVAL_WANTS_BATTLE
-	ld a, HS_ROUTE_22_RIVAL_1
-	ld [wMissableObjectIndex], a
+	ld a, TOGGLE_ROUTE_22_RIVAL_1
+	ld [wToggleableObjectIndex], a
 	predef ShowObject
 	xor a
 	ld [wJoyIgnore], a
diff --git a/scripts/PalletTown.asm b/scripts/PalletTown.asm
index 42e3ea3e..0932ff56 100644
--- a/scripts/PalletTown.asm
+++ b/scripts/PalletTown.asm
@@ -66,8 +66,8 @@ PalletTownOakHeyWaitScript:
 	ld [hli], a ; SPRITESTATEDATA2_MAPY
 	ld a, 14
 	ld [hl], a ; SPRITESTATEDATA2_MAPX
-	ld a, HS_PALLET_TOWN_OAK
-	ld [wMissableObjectIndex], a
+	ld a, TOGGLE_PALLET_TOWN_OAK
+	ld [wToggleableObjectIndex], a
 	predef ShowObject
 	ld a, $2
 	ld [wSprite01StateData1MovementStatus], a
@@ -206,11 +206,11 @@ PalletTownDaisyScript:
 	CheckBothEventsSet EVENT_GOT_TOWN_MAP, EVENT_ENTERED_BLUES_HOUSE, 1
 	jr nz, .next
 	SetEvent EVENT_DAISY_WALKING
-	ld a, HS_DAISY_SITTING
-	ld [wMissableObjectIndex], a
+	ld a, TOGGLE_DAISY_SITTING
+	ld [wToggleableObjectIndex], a
 	predef HideObject
-	ld a, HS_DAISY_WALKING
-	ld [wMissableObjectIndex], a
+	ld a, TOGGLE_DAISY_WALKING
+	ld [wToggleableObjectIndex], a
 	predef_jump ShowObject
 .next
 	CheckEvent EVENT_GOT_POKEBALLS_FROM_OAK
diff --git a/scripts/PewterCity.asm b/scripts/PewterCity.asm
index ffe546ca..4d4cdb1a 100644
--- a/scripts/PewterCity.asm
+++ b/scripts/PewterCity.asm
@@ -95,8 +95,8 @@ PewterCityHideSuperNerd1Script:
 	ld a, [wStatusFlags5]
 	bit BIT_SCRIPTED_NPC_MOVEMENT, a
 	ret nz
-	ld a, HS_MUSEUM_GUY
-	ld [wMissableObjectIndex], a
+	ld a, TOGGLE_MUSEUM_GUY
+	ld [wToggleableObjectIndex], a
 	predef HideObject
 	ld a, SCRIPT_PEWTERCITY_RESET_SUPER_NERD1
 	ld [wPewterCityCurScript], a
@@ -106,8 +106,8 @@ PewterCityResetSuperNerd1Script:
 	ld a, PEWTERCITY_SUPER_NERD1
 	ld [wSpriteIndex], a
 	call SetSpritePosition2
-	ld a, HS_MUSEUM_GUY
-	ld [wMissableObjectIndex], a
+	ld a, TOGGLE_MUSEUM_GUY
+	ld [wToggleableObjectIndex], a
 	predef ShowObject
 	xor a
 	ld [wJoyIgnore], a
@@ -161,8 +161,8 @@ PewterCityHideYoungsterScript:
 	ld a, [wStatusFlags5]
 	bit BIT_SCRIPTED_NPC_MOVEMENT, a
 	ret nz
-	ld a, HS_GYM_GUY
-	ld [wMissableObjectIndex], a
+	ld a, TOGGLE_GYM_GUY
+	ld [wToggleableObjectIndex], a
 	predef HideObject
 	ld a, SCRIPT_PEWTERCITY_RESET_YOUNGSTER
 	ld [wPewterCityCurScript], a
@@ -172,8 +172,8 @@ PewterCityResetYoungsterScript:
 	ld a, PEWTERCITY_YOUNGSTER
 	ld [wSpriteIndex], a
 	call SetSpritePosition2
-	ld a, HS_GYM_GUY
-	ld [wMissableObjectIndex], a
+	ld a, TOGGLE_GYM_GUY
+	ld [wToggleableObjectIndex], a
 	predef ShowObject
 	xor a
 	ld [wJoyIgnore], a
diff --git a/scripts/PewterGym.asm b/scripts/PewterGym.asm
index 4cb13fa4..dcda6e16 100644
--- a/scripts/PewterGym.asm
+++ b/scripts/PewterGym.asm
@@ -67,11 +67,11 @@ PewterGymScriptReceiveTM34:
 	ld hl, wBeatGymFlags
 	set BIT_BOULDERBADGE, [hl]
 
-	ld a, HS_GYM_GUY
-	ld [wMissableObjectIndex], a
+	ld a, TOGGLE_GYM_GUY
+	ld [wToggleableObjectIndex], a
 	predef HideObject
-	ld a, HS_ROUTE_22_RIVAL_1
-	ld [wMissableObjectIndex], a
+	ld a, TOGGLE_ROUTE_22_RIVAL_1
+	ld [wToggleableObjectIndex], a
 	predef HideObject
 
 	ResetEvents EVENT_1ST_ROUTE22_RIVAL_BATTLE, EVENT_ROUTE22_RIVAL_WANTS_BATTLE
diff --git a/scripts/PokemonTower2F.asm b/scripts/PokemonTower2F.asm
index d5fbd932..871c9e4d 100644
--- a/scripts/PokemonTower2F.asm
+++ b/scripts/PokemonTower2F.asm
@@ -113,8 +113,8 @@ PokemonTower2FRivalExitsScript:
 	ld a, [wStatusFlags5]
 	bit BIT_SCRIPTED_NPC_MOVEMENT, a
 	ret nz
-	ld a, HS_POKEMON_TOWER_2F_RIVAL
-	ld [wMissableObjectIndex], a
+	ld a, TOGGLE_POKEMON_TOWER_2F_RIVAL
+	ld [wToggleableObjectIndex], a
 	predef HideObject
 	xor a
 	ld [wJoyIgnore], a
diff --git a/scripts/PokemonTower7F.asm b/scripts/PokemonTower7F.asm
index 3e30db56..bf7ad30d 100644
--- a/scripts/PokemonTower7F.asm
+++ b/scripts/PokemonTower7F.asm
@@ -57,9 +57,9 @@ PokemonTower7FScript_60d2a:
 	ldh [hJoyHeld], a
 	ld a, PAD_SELECT | PAD_START | PAD_CTRL_PAD
 	ld [wJoyIgnore], a
-	ld a, HS_POKEMON_TOWER_7F_JESSIE
+	ld a, TOGGLE_POKEMON_TOWER_7F_JESSIE
 	call PokemonTower7FScript_ShowObject
-	ld a, HS_POKEMON_TOWER_7F_JAMES
+	ld a, TOGGLE_POKEMON_TOWER_7F_JAMES
 	call PokemonTower7FScript_ShowObject
 	ld a, $1
 	ld [wDoNotWaitForButtonPressAfterDisplayingText], a
@@ -201,9 +201,9 @@ PokemonTower7FScript9:
 	ld a, PAD_BUTTONS | PAD_CTRL_PAD
 	ld [wJoyIgnore], a
 	call GBFadeOutToBlack
-	ld a, HS_POKEMON_TOWER_7F_JESSIE
+	ld a, TOGGLE_POKEMON_TOWER_7F_JESSIE
 	call PokemonTower7FScript_HideObject
-	ld a, HS_POKEMON_TOWER_7F_JAMES
+	ld a, TOGGLE_POKEMON_TOWER_7F_JAMES
 	call PokemonTower7FScript_HideObject
 	call UpdateSprites
 	call Delay3
@@ -223,22 +223,22 @@ PokemonTower7FScript10:
 	ret
 
 PokemonTower7FScript_ShowObject:
-	ld [wMissableObjectIndex], a
+	ld [wToggleableObjectIndex], a
 	predef ShowObject
 	call UpdateSprites
 	call Delay3
 	ret
 
 PokemonTower7FScript_HideObject:
-	ld [wMissableObjectIndex], a
+	ld [wToggleableObjectIndex], a
 	predef HideObject
 	ret
 
 PokemonTower7FWarpToMrFujiHouseScript:
 	ld a, PAD_BUTTONS | PAD_CTRL_PAD
 	ld [wJoyIgnore], a
-	ld a, HS_POKEMON_TOWER_7F_MR_FUJI
-	ld [wMissableObjectIndex], a
+	ld a, TOGGLE_POKEMON_TOWER_7F_MR_FUJI
+	ld [wToggleableObjectIndex], a
 	predef HideObject
 	ld a, SPRITE_FACING_UP
 	ld [wSpritePlayerStateData1FacingDirection], a
@@ -303,14 +303,14 @@ PokemonTower7FMrFujiText:
 	call PrintText
 	SetEvent EVENT_RESCUED_MR_FUJI
 	SetEvent EVENT_RESCUED_MR_FUJI_2
-	ld a, HS_MR_FUJIS_HOUSE_MR_FUJI
-	ld [wMissableObjectIndex], a
+	ld a, TOGGLE_MR_FUJIS_HOUSE_MR_FUJI
+	ld [wToggleableObjectIndex], a
 	predef ShowObject
-	ld a, HS_SAFFRON_CITY_E
-	ld [wMissableObjectIndex], a
+	ld a, TOGGLE_SAFFRON_CITY_E
+	ld [wToggleableObjectIndex], a
 	predef HideObject
-	ld a, HS_SAFFRON_CITY_F
-	ld [wMissableObjectIndex], a
+	ld a, TOGGLE_SAFFRON_CITY_F
+	ld [wToggleableObjectIndex], a
 	predef ShowObject
 	ld a, SCRIPT_POKEMONTOWER7F_WARP_TO_MR_FUJI_HOUSE
 	ld [wPokemonTower7FCurScript], a
diff --git a/scripts/RocketHideoutB1F.asm b/scripts/RocketHideoutB1F.asm
index 9354a0c7..fc107001 100644
--- a/scripts/RocketHideoutB1F.asm
+++ b/scripts/RocketHideoutB1F.asm
@@ -13,7 +13,7 @@ RocketHideoutB1FDoorCallbackScript:
 	bit BIT_CUR_MAP_LOADED_1, [hl]
 	res BIT_CUR_MAP_LOADED_1, [hl]
 	ret z
-	CheckEvent EVENT_677
+	CheckEvent EVENT_ENTERED_ROCKET_HIDEOUT
 	jr nz, .door_open
 	CheckEventReuseA EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_4
 	jr nz, .play_sound_door_open
@@ -22,7 +22,8 @@ RocketHideoutB1FDoorCallbackScript:
 .play_sound_door_open
 	ld a, SFX_GO_INSIDE
 	call PlaySound
-	CheckEventHL EVENT_677
+	; BUG: should be SetEvent to avoid the SFX playing every time you enter the map
+	CheckEventHL EVENT_ENTERED_ROCKET_HIDEOUT
 .door_open
 	ld a, $e ; Floor Block
 .set_door_block
diff --git a/scripts/RocketHideoutB4F.asm b/scripts/RocketHideoutB4F.asm
index 15a98853..118ebf89 100644
--- a/scripts/RocketHideoutB4F.asm
+++ b/scripts/RocketHideoutB4F.asm
@@ -18,9 +18,9 @@ RocketHideoutB4FSetScript:
 	ret
 
 RocketHideoutB4FScript_HideJessieJames:
-	ld a, HS_ROCKET_HIDEOUT_B4F_JAMES
+	ld a, TOGGLE_ROCKET_HIDEOUT_B4F_JAMES
 	call RocketHideoutB4FScript_HideObject
-	ld a, HS_ROCKET_HIDEOUT_B4F_JESSIE
+	ld a, TOGGLE_ROCKET_HIDEOUT_B4F_JESSIE
 	call RocketHideoutB4FScript_HideObject
 	ret
 
@@ -52,11 +52,11 @@ RocketHideoutB4FBeatGiovanniScript:
 	ldh [hTextID], a
 	call DisplayTextID
 	call GBFadeOutToBlack
-	ld a, HS_ROCKET_HIDEOUT_B4F_GIOVANNI
-	ld [wMissableObjectIndex], a
+	ld a, TOGGLE_ROCKET_HIDEOUT_B4F_GIOVANNI
+	ld [wToggleableObjectIndex], a
 	predef HideObject
-	ld a, HS_ROCKET_HIDEOUT_B4F_ITEM_4
-	ld [wMissableObjectIndex], a
+	ld a, TOGGLE_ROCKET_HIDEOUT_B4F_ITEM_4
+	ld [wToggleableObjectIndex], a
 	predef ShowObject
 	call UpdateSprites
 	call GBFadeInFromBlack
@@ -114,9 +114,9 @@ RocketHideoutB4FScript_455a5:
 	ld [wDoNotWaitForButtonPressAfterDisplayingText], a
 	ld a, PAD_BUTTONS | PAD_CTRL_PAD
 	ld [wJoyIgnore], a
-	ld a, HS_ROCKET_HIDEOUT_B4F_JAMES
+	ld a, TOGGLE_ROCKET_HIDEOUT_B4F_JAMES
 	call RocketHideoutB4FScript_ShowObject
-	ld a, HS_ROCKET_HIDEOUT_B4F_JESSIE
+	ld a, TOGGLE_ROCKET_HIDEOUT_B4F_JESSIE
 	call RocketHideoutB4FScript_ShowObject
 	ld a, SCRIPT_ROCKETHIDEOUTB4F_SCRIPT4
 	call RocketHideoutB4FSetScript
@@ -255,9 +255,9 @@ RocketHideoutB4FScript12:
 	ld a, PAD_BUTTONS | PAD_CTRL_PAD
 	ld [wJoyIgnore], a
 	call GBFadeOutToBlack
-	ld a, HS_ROCKET_HIDEOUT_B4F_JAMES
+	ld a, TOGGLE_ROCKET_HIDEOUT_B4F_JAMES
 	call RocketHideoutB4FScript_HideObject
-	ld a, HS_ROCKET_HIDEOUT_B4F_JESSIE
+	ld a, TOGGLE_ROCKET_HIDEOUT_B4F_JESSIE
 	call RocketHideoutB4FScript_HideObject
 	call UpdateSprites
 	call Delay3
@@ -277,14 +277,14 @@ RocketHideoutB4FScript13:
 	ret
 
 RocketHideoutB4FScript_ShowObject:
-	ld [wMissableObjectIndex], a
+	ld [wToggleableObjectIndex], a
 	predef ShowObject
 	call UpdateSprites
 	call Delay3
 	ret
 
 RocketHideoutB4FScript_HideObject:
-	ld [wMissableObjectIndex], a
+	ld [wToggleableObjectIndex], a
 	predef HideObject
 	ret
 
@@ -399,8 +399,8 @@ RocketHideoutB4FRocketEndBattleText:
 	text_promptbutton
 	text_asm
 	SetEvent EVENT_ROCKET_DROPPED_LIFT_KEY
-	ld a, HS_ROCKET_HIDEOUT_B4F_ITEM_5
-	ld [wMissableObjectIndex], a
+	ld a, TOGGLE_ROCKET_HIDEOUT_B4F_ITEM_5
+	ld [wToggleableObjectIndex], a
 	predef ShowObject
 	jp TextScriptEnd
 
diff --git a/scripts/Route12.asm b/scripts/Route12.asm
index ea9fc567..a6984f87 100644
--- a/scripts/Route12.asm
+++ b/scripts/Route12.asm
@@ -34,8 +34,8 @@ Route12DefaultScript:
 	ld [wCurOpponent], a
 	ld a, 30
 	ld [wCurEnemyLevel], a
-	ld a, HS_ROUTE_12_SNORLAX
-	ld [wMissableObjectIndex], a
+	ld a, TOGGLE_ROUTE_12_SNORLAX
+	ld [wToggleableObjectIndex], a
 	predef HideObject
 	ld a, SCRIPT_ROUTE12_SNORLAX_POST_BATTLE
 	ld [wRoute12CurScript], a
diff --git a/scripts/Route16.asm b/scripts/Route16.asm
index 6e3da97c..a1eb6e85 100644
--- a/scripts/Route16.asm
+++ b/scripts/Route16.asm
@@ -34,8 +34,8 @@ Route16DefaultScript:
 	ld [wCurOpponent], a
 	ld a, 30
 	ld [wCurEnemyLevel], a
-	ld a, HS_ROUTE_16_SNORLAX
-	ld [wMissableObjectIndex], a
+	ld a, TOGGLE_ROUTE_16_SNORLAX
+	ld [wToggleableObjectIndex], a
 	predef HideObject
 	call UpdateSprites
 	ld a, SCRIPT_ROUTE16_SNORLAX_POST_BATTLE
diff --git a/scripts/Route20.asm b/scripts/Route20.asm
index 5230858e..3c528b09 100644
--- a/scripts/Route20.asm
+++ b/scripts/Route20.asm
@@ -12,48 +12,48 @@ Route20_Script:
 Route20BoulderScript:
 	CheckBothEventsSet EVENT_SEAFOAM3_BOULDER1_DOWN_HOLE, EVENT_SEAFOAM3_BOULDER2_DOWN_HOLE
 	jr z, .next_boulder_check
-	ld a, HS_SEAFOAM_ISLANDS_1F_BOULDER_1
+	ld a, TOGGLE_SEAFOAM_ISLANDS_1F_BOULDER_1
 	call Route20ShowObjectScript
-	ld a, HS_SEAFOAM_ISLANDS_1F_BOULDER_2
+	ld a, TOGGLE_SEAFOAM_ISLANDS_1F_BOULDER_2
 	call Route20ShowObjectScript
-	ld hl, .MissableObjectIDs
-.hide_missable_objects
+	ld hl, .ToggleableObjectIDs
+.hide_toggleable_objects
 	ld a, [hli]
 	cp $ff
 	jr z, .next_boulder_check
 	push hl
 	call Route20HideObjectScript
 	pop hl
-	jr .hide_missable_objects
+	jr .hide_toggleable_objects
 
-.MissableObjectIDs:
-	db HS_SEAFOAM_ISLANDS_B1F_BOULDER_1
-	db HS_SEAFOAM_ISLANDS_B1F_BOULDER_2
-	db HS_SEAFOAM_ISLANDS_B2F_BOULDER_1
-	db HS_SEAFOAM_ISLANDS_B2F_BOULDER_2
-	db HS_SEAFOAM_ISLANDS_B3F_BOULDER_3
-	db HS_SEAFOAM_ISLANDS_B3F_BOULDER_4
+.ToggleableObjectIDs:
+	db TOGGLE_SEAFOAM_ISLANDS_B1F_BOULDER_1
+	db TOGGLE_SEAFOAM_ISLANDS_B1F_BOULDER_2
+	db TOGGLE_SEAFOAM_ISLANDS_B2F_BOULDER_1
+	db TOGGLE_SEAFOAM_ISLANDS_B2F_BOULDER_2
+	db TOGGLE_SEAFOAM_ISLANDS_B3F_BOULDER_3
+	db TOGGLE_SEAFOAM_ISLANDS_B3F_BOULDER_4
 	db -1 ; end
 
 .next_boulder_check
 	CheckBothEventsSet EVENT_SEAFOAM4_BOULDER1_DOWN_HOLE, EVENT_SEAFOAM4_BOULDER2_DOWN_HOLE
 	ret z
-	ld a, HS_SEAFOAM_ISLANDS_B3F_BOULDER_1
+	ld a, TOGGLE_SEAFOAM_ISLANDS_B3F_BOULDER_1
 	call Route20ShowObjectScript
-	ld a, HS_SEAFOAM_ISLANDS_B3F_BOULDER_2
+	ld a, TOGGLE_SEAFOAM_ISLANDS_B3F_BOULDER_2
 	call Route20ShowObjectScript
-	ld a, HS_SEAFOAM_ISLANDS_B4F_BOULDER_1
+	ld a, TOGGLE_SEAFOAM_ISLANDS_B4F_BOULDER_1
 	call Route20HideObjectScript
-	ld a, HS_SEAFOAM_ISLANDS_B4F_BOULDER_2
+	ld a, TOGGLE_SEAFOAM_ISLANDS_B4F_BOULDER_2
 	call Route20HideObjectScript
 	ret
 
 Route20ShowObjectScript:
-	ld [wMissableObjectIndex], a
+	ld [wToggleableObjectIndex], a
 	predef_jump ShowObject
 
 Route20HideObjectScript:
-	ld [wMissableObjectIndex], a
+	ld [wToggleableObjectIndex], a
 	predef_jump HideObject
 
 Route20_ScriptPointers:
diff --git a/scripts/Route22.asm b/scripts/Route22.asm
index 77ad1ad0..4e10f7fa 100644
--- a/scripts/Route22.asm
+++ b/scripts/Route22.asm
@@ -226,8 +226,8 @@ Route22Rival1ExitScript:
 	ret nz
 	xor a
 	ld [wJoyIgnore], a
-	ld a, HS_ROUTE_22_RIVAL_1
-	ld [wMissableObjectIndex], a
+	ld a, TOGGLE_ROUTE_22_RIVAL_1
+	ld [wToggleableObjectIndex], a
 	predef HideObject
 	call PlayDefaultMusic
 	ResetEvents EVENT_1ST_ROUTE22_RIVAL_BATTLE, EVENT_ROUTE22_RIVAL_WANTS_BATTLE
@@ -364,8 +364,8 @@ Route22Rival2ExitScript:
 	ret nz
 	xor a
 	ld [wJoyIgnore], a
-	ld a, HS_ROUTE_22_RIVAL_2
-	ld [wMissableObjectIndex], a
+	ld a, TOGGLE_ROUTE_22_RIVAL_2
+	ld [wToggleableObjectIndex], a
 	predef HideObject
 	call PlayDefaultMusic
 	ResetEvents EVENT_2ND_ROUTE22_RIVAL_BATTLE, EVENT_ROUTE22_RIVAL_WANTS_BATTLE
diff --git a/scripts/Route23.asm b/scripts/Route23.asm
index 911a2ef3..07558996 100644
--- a/scripts/Route23.asm
+++ b/scripts/Route23.asm
@@ -12,11 +12,11 @@ Route23SetVictoryRoadBoulders:
 	ret z
 	ResetEvents EVENT_VICTORY_ROAD_2_BOULDER_ON_SWITCH1, EVENT_VICTORY_ROAD_2_BOULDER_ON_SWITCH2
 	ResetEvents EVENT_VICTORY_ROAD_3_BOULDER_ON_SWITCH1, EVENT_VICTORY_ROAD_3_BOULDER_ON_SWITCH2
-	ld a, HS_VICTORY_ROAD_3F_BOULDER
-	ld [wMissableObjectIndex], a
+	ld a, TOGGLE_VICTORY_ROAD_3F_BOULDER
+	ld [wToggleableObjectIndex], a
 	predef ShowObject
-	ld a, HS_VICTORY_ROAD_2F_BOULDER
-	ld [wMissableObjectIndex], a
+	ld a, TOGGLE_VICTORY_ROAD_2F_BOULDER
+	ld [wToggleableObjectIndex], a
 	predef_jump HideObject
 
 Route23_ScriptPointers:
diff --git a/scripts/Route25.asm b/scripts/Route25.asm
index 8cb59c30..23faa396 100644
--- a/scripts/Route25.asm
+++ b/scripts/Route25.asm
@@ -5,10 +5,10 @@ Route25_Script:
 	ld a, [wRoute25CurScript]
 	call ExecuteCurMapScriptInTable
 	ld [wRoute25CurScript], a
-	call Route25ShowHideBillScript
+	call Route25ToggleBillsScript
 	ret
 
-Route25ShowHideBillScript:
+Route25ToggleBillsScript:
 	ld hl, wd492
 	res 2, [hl]
 	res 3, [hl]
@@ -25,22 +25,22 @@ Route25ShowHideBillScript:
 	CheckEventReuseHL EVENT_MET_BILL_2
 	jr nz, .met_bill
 	ResetEventReuseHL EVENT_BILL_SAID_USE_CELL_SEPARATOR
-	ld a, HS_BILL_POKEMON
-	ld [wMissableObjectIndex], a
+	ld a, TOGGLE_BILL_POKEMON
+	ld [wToggleableObjectIndex], a
 	predef ShowObject
 	jr .done
 .met_bill
 	CheckEventAfterBranchReuseHL EVENT_GOT_SS_TICKET, EVENT_MET_BILL_2
 	jr z, .done
 	SetEventReuseHL EVENT_LEFT_BILLS_HOUSE_AFTER_HELPING
-	ld a, HS_NUGGET_BRIDGE_GUY
-	ld [wMissableObjectIndex], a
+	ld a, TOGGLE_NUGGET_BRIDGE_GUY
+	ld [wToggleableObjectIndex], a
 	predef HideObject
-	ld a, HS_BILL_1
-	ld [wMissableObjectIndex], a
+	ld a, TOGGLE_BILL_1
+	ld [wToggleableObjectIndex], a
 	predef HideObject
-	ld a, HS_BILL_2
-	ld [wMissableObjectIndex], a
+	ld a, TOGGLE_BILL_2
+	ld [wToggleableObjectIndex], a
 	predef ShowObject
 .done
 	ret
diff --git a/scripts/SSAnne2F.asm b/scripts/SSAnne2F.asm
index 2d98c513..23594d48 100644
--- a/scripts/SSAnne2F.asm
+++ b/scripts/SSAnne2F.asm
@@ -31,8 +31,8 @@ SSAnne2FDefaultScript:
 	call PlayMusic
 	ld a, [wCoordIndex]
 	ldh [hSavedCoordIndex], a
-	ld a, HS_SS_ANNE_2F_RIVAL
-	ld [wMissableObjectIndex], a
+	ld a, TOGGLE_SS_ANNE_2F_RIVAL
+	ld [wToggleableObjectIndex], a
 	predef ShowObject
 	call Delay3
 	ld a, SSANNE2F_RIVAL
@@ -150,8 +150,8 @@ SSAnne2FRivalExitScript:
 	ret nz
 	xor a
 	ld [wJoyIgnore], a
-	ld a, HS_SS_ANNE_2F_RIVAL
-	ld [wMissableObjectIndex], a
+	ld a, TOGGLE_SS_ANNE_2F_RIVAL
+	ld [wToggleableObjectIndex], a
 	predef HideObject
 	call PlayDefaultMusic
 	ld a, SCRIPT_SSANNE2F_NOOP
diff --git a/scripts/SafariZoneGate.asm b/scripts/SafariZoneGate.asm
index 0e1a05bf..e4830b06 100644
--- a/scripts/SafariZoneGate.asm
+++ b/scripts/SafariZoneGate.asm
@@ -14,7 +14,7 @@ SafariZoneGate_ScriptPointers:
 	dw_const SafariZoneGatePlayerMovingDownScript,       SCRIPT_SAFARIZONEGATE_PLAYER_MOVING_DOWN
 	dw_const SafariZoneGateLeavingSafariScript,          SCRIPT_SAFARIZONEGATE_LEAVING_SAFARI
 	dw_const SafariZoneGateSetScriptAfterMoveScript,     SCRIPT_SAFARIZONEGATE_SET_SCRIPT_AFTER_MOVE
-	EXPORT SCRIPT_SAFARIZONEGATE_LEAVING_SAFARI ; used by engine/events/hidden_objects/safari_game.asm
+	EXPORT SCRIPT_SAFARIZONEGATE_LEAVING_SAFARI ; used by engine/events/hidden_events/safari_game.asm
 
 SafariZoneGateDefaultScript:
 	ld hl, .PlayerNextToSafariZoneWorker1CoordsArray
diff --git a/scripts/SeafoamIslands1F.asm b/scripts/SeafoamIslands1F.asm
index a3ec3c99..1e099f76 100644
--- a/scripts/SeafoamIslands1F.asm
+++ b/scripts/SeafoamIslands1F.asm
@@ -13,23 +13,23 @@ SeafoamIslands1F_Script:
 	cp $1
 	jr nz, .boulder2FellDownHole
 	SetEventReuseHL EVENT_SEAFOAM1_BOULDER1_DOWN_HOLE
-	ld a, HS_SEAFOAM_ISLANDS_1F_BOULDER_1
+	ld a, TOGGLE_SEAFOAM_ISLANDS_1F_BOULDER_1
 	ld [wObjectToHide], a
-	ld a, HS_SEAFOAM_ISLANDS_B1F_BOULDER_1
+	ld a, TOGGLE_SEAFOAM_ISLANDS_B1F_BOULDER_1
 	ld [wObjectToShow], a
 	jr .hideAndShowBoulderObjects
 .boulder2FellDownHole
 	SetEventAfterBranchReuseHL EVENT_SEAFOAM1_BOULDER2_DOWN_HOLE, EVENT_SEAFOAM1_BOULDER1_DOWN_HOLE
-	ld a, HS_SEAFOAM_ISLANDS_1F_BOULDER_2
+	ld a, TOGGLE_SEAFOAM_ISLANDS_1F_BOULDER_2
 	ld [wObjectToHide], a
-	ld a, HS_SEAFOAM_ISLANDS_B1F_BOULDER_2
+	ld a, TOGGLE_SEAFOAM_ISLANDS_B1F_BOULDER_2
 	ld [wObjectToShow], a
 .hideAndShowBoulderObjects
 	ld a, [wObjectToHide]
-	ld [wMissableObjectIndex], a
+	ld [wToggleableObjectIndex], a
 	predef HideObject
 	ld a, [wObjectToShow]
-	ld [wMissableObjectIndex], a
+	ld [wToggleableObjectIndex], a
 	predef_jump ShowObject
 .noBoulderWasPushed
 	ld a, SEAFOAM_ISLANDS_B1F
diff --git a/scripts/SeafoamIslandsB1F.asm b/scripts/SeafoamIslandsB1F.asm
index 0bc2ee18..7558e95b 100644
--- a/scripts/SeafoamIslandsB1F.asm
+++ b/scripts/SeafoamIslandsB1F.asm
@@ -12,23 +12,23 @@ SeafoamIslandsB1F_Script:
 	cp $1
 	jr nz, .boulder2FellDownHole
 	SetEventReuseHL EVENT_SEAFOAM2_BOULDER1_DOWN_HOLE
-	ld a, HS_SEAFOAM_ISLANDS_B1F_BOULDER_1
+	ld a, TOGGLE_SEAFOAM_ISLANDS_B1F_BOULDER_1
 	ld [wObjectToHide], a
-	ld a, HS_SEAFOAM_ISLANDS_B2F_BOULDER_1
+	ld a, TOGGLE_SEAFOAM_ISLANDS_B2F_BOULDER_1
 	ld [wObjectToShow], a
 	jr .hideAndShowBoulderObjects
 .boulder2FellDownHole
 	SetEventAfterBranchReuseHL EVENT_SEAFOAM2_BOULDER2_DOWN_HOLE, EVENT_SEAFOAM2_BOULDER1_DOWN_HOLE
-	ld a, HS_SEAFOAM_ISLANDS_B1F_BOULDER_2
+	ld a, TOGGLE_SEAFOAM_ISLANDS_B1F_BOULDER_2
 	ld [wObjectToHide], a
-	ld a, HS_SEAFOAM_ISLANDS_B2F_BOULDER_2
+	ld a, TOGGLE_SEAFOAM_ISLANDS_B2F_BOULDER_2
 	ld [wObjectToShow], a
 .hideAndShowBoulderObjects
 	ld a, [wObjectToHide]
-	ld [wMissableObjectIndex], a
+	ld [wToggleableObjectIndex], a
 	predef HideObject
 	ld a, [wObjectToShow]
-	ld [wMissableObjectIndex], a
+	ld [wToggleableObjectIndex], a
 	predef_jump ShowObject
 .noBoulderWasPushed
 	ld a, SEAFOAM_ISLANDS_B2F
diff --git a/scripts/SeafoamIslandsB2F.asm b/scripts/SeafoamIslandsB2F.asm
index 48b7979d..2cdb705e 100644
--- a/scripts/SeafoamIslandsB2F.asm
+++ b/scripts/SeafoamIslandsB2F.asm
@@ -12,23 +12,23 @@ SeafoamIslandsB2F_Script:
 	cp $1
 	jr nz, .boulder2FellDownHole
 	SetEventReuseHL EVENT_SEAFOAM3_BOULDER1_DOWN_HOLE
-	ld a, HS_SEAFOAM_ISLANDS_B2F_BOULDER_1
+	ld a, TOGGLE_SEAFOAM_ISLANDS_B2F_BOULDER_1
 	ld [wObjectToHide], a
-	ld a, HS_SEAFOAM_ISLANDS_B3F_BOULDER_3
+	ld a, TOGGLE_SEAFOAM_ISLANDS_B3F_BOULDER_3
 	ld [wObjectToShow], a
 	jr .hideAndShowBoulderObjects
 .boulder2FellDownHole
 	SetEventAfterBranchReuseHL EVENT_SEAFOAM3_BOULDER2_DOWN_HOLE, EVENT_SEAFOAM3_BOULDER1_DOWN_HOLE
-	ld a, HS_SEAFOAM_ISLANDS_B2F_BOULDER_2
+	ld a, TOGGLE_SEAFOAM_ISLANDS_B2F_BOULDER_2
 	ld [wObjectToHide], a
-	ld a, HS_SEAFOAM_ISLANDS_B3F_BOULDER_4
+	ld a, TOGGLE_SEAFOAM_ISLANDS_B3F_BOULDER_4
 	ld [wObjectToShow], a
 .hideAndShowBoulderObjects
 	ld a, [wObjectToHide]
-	ld [wMissableObjectIndex], a
+	ld [wToggleableObjectIndex], a
 	predef HideObject
 	ld a, [wObjectToShow]
-	ld [wMissableObjectIndex], a
+	ld [wToggleableObjectIndex], a
 	predef_jump ShowObject
 .noBoulderWasPushed
 	ld a, SEAFOAM_ISLANDS_B3F
diff --git a/scripts/SeafoamIslandsB3F.asm b/scripts/SeafoamIslandsB3F.asm
index 671d7719..d8e253b6 100644
--- a/scripts/SeafoamIslandsB3F.asm
+++ b/scripts/SeafoamIslandsB3F.asm
@@ -12,23 +12,23 @@ SeafoamIslandsB3F_Script:
 	cp $1
 	jr nz, .boulder2FellDownHole
 	SetEventReuseHL EVENT_SEAFOAM4_BOULDER1_DOWN_HOLE
-	ld a, HS_SEAFOAM_ISLANDS_B3F_BOULDER_1
+	ld a, TOGGLE_SEAFOAM_ISLANDS_B3F_BOULDER_1
 	ld [wObjectToHide], a
-	ld a, HS_SEAFOAM_ISLANDS_B4F_BOULDER_1
+	ld a, TOGGLE_SEAFOAM_ISLANDS_B4F_BOULDER_1
 	ld [wObjectToShow], a
 	jr .hideAndShowBoulderObjects
 .boulder2FellDownHole
 	SetEventAfterBranchReuseHL EVENT_SEAFOAM4_BOULDER2_DOWN_HOLE, EVENT_SEAFOAM4_BOULDER1_DOWN_HOLE
-	ld a, HS_SEAFOAM_ISLANDS_B3F_BOULDER_2
+	ld a, TOGGLE_SEAFOAM_ISLANDS_B3F_BOULDER_2
 	ld [wObjectToHide], a
-	ld a, HS_SEAFOAM_ISLANDS_B4F_BOULDER_2
+	ld a, TOGGLE_SEAFOAM_ISLANDS_B4F_BOULDER_2
 	ld [wObjectToShow], a
 .hideAndShowBoulderObjects
 	ld a, [wObjectToHide]
-	ld [wMissableObjectIndex], a
+	ld [wToggleableObjectIndex], a
 	predef HideObject
 	ld a, [wObjectToShow]
-	ld [wMissableObjectIndex], a
+	ld [wToggleableObjectIndex], a
 	predef ShowObject
 	jr .runCurrentMapScript
 .noBoulderWasPushed
diff --git a/scripts/SilphCo11F.asm b/scripts/SilphCo11F.asm
index 5b72e3f8..38c674f4 100644
--- a/scripts/SilphCo11F.asm
+++ b/scripts/SilphCo11F.asm
@@ -435,9 +435,9 @@ SilphCo11FScript13:
 	ld a, PAD_BUTTONS | PAD_CTRL_PAD
 	ld [wJoyIgnore], a
 	call GBFadeOutToBlack
-	ld a, HS_SILPH_CO_11F_JAMES
+	ld a, TOGGLE_SILPH_CO_11F_JAMES
 	call SilphCo11FScript_HideObject
-	ld a, HS_SILPH_CO_11F_JESSIE
+	ld a, TOGGLE_SILPH_CO_11F_JESSIE
 	call SilphCo11FScript_HideObject
 	call UpdateSprites
 	call Delay3
@@ -458,14 +458,14 @@ SilphCo11FScript14:
 	ret
 
 SilphCo11FScript_ShowObject:
-	ld [wMissableObjectIndex], a
+	ld [wToggleableObjectIndex], a
 	predef ShowObject
 	call UpdateSprites
 	call Delay3
 	ret
 
 SilphCo11FScript_HideObject:
-	ld [wMissableObjectIndex], a
+	ld [wToggleableObjectIndex], a
 	predef HideObject
 	ret
 
diff --git a/scripts/SilphCo11F_2.asm b/scripts/SilphCo11F_2.asm
index fbc5bb1b..94ea2c5b 100644
--- a/scripts/SilphCo11F_2.asm
+++ b/scripts/SilphCo11F_2.asm
@@ -1,75 +1,75 @@
 SilphCo11FTeamRocketLeavesScript::
-	ld hl, .HideMissableObjectIDs
+	ld hl, .HideToggleableObjectIDs
 .hide_loop
 	ld a, [hli]
 	cp $ff
 	jr z, .done_hiding
 	push hl
-	ld [wMissableObjectIndex], a
+	ld [wToggleableObjectIndex], a
 	predef HideObject
 	pop hl
 	jr .hide_loop
 .done_hiding
-	ld hl, .ShowMissableObjectIDs
+	ld hl, .ShowToggleableObjectIDs
 .show_loop
 	ld a, [hli]
 	cp -1
 	ret z
 	push hl
-	ld [wMissableObjectIndex], a
+	ld [wToggleableObjectIndex], a
 	predef ShowObject
 	pop hl
 	jr .show_loop
 
-.ShowMissableObjectIDs:
-	db HS_SAFFRON_CITY_8
-	db HS_SAFFRON_CITY_9
-	db HS_SAFFRON_CITY_A
-	db HS_SAFFRON_CITY_B
-	db HS_SAFFRON_CITY_C
-	db HS_SAFFRON_CITY_D
+.ShowToggleableObjectIDs:
+	db TOGGLE_SAFFRON_CITY_8
+	db TOGGLE_SAFFRON_CITY_9
+	db TOGGLE_SAFFRON_CITY_A
+	db TOGGLE_SAFFRON_CITY_B
+	db TOGGLE_SAFFRON_CITY_C
+	db TOGGLE_SAFFRON_CITY_D
 	db -1 ; end
 
-.HideMissableObjectIDs:
-	db HS_SAFFRON_CITY_1
-	db HS_SAFFRON_CITY_2
-	db HS_SAFFRON_CITY_3
-	db HS_SAFFRON_CITY_4
-	db HS_SAFFRON_CITY_5
-	db HS_SAFFRON_CITY_6
-	db HS_SAFFRON_CITY_7
-	db HS_SAFFRON_CITY_E
-	db HS_SAFFRON_CITY_F
-	db HS_SILPH_CO_2F_2
-	db HS_SILPH_CO_2F_3
-	db HS_SILPH_CO_2F_4
-	db HS_SILPH_CO_2F_5
-	db HS_SILPH_CO_3F_1
-	db HS_SILPH_CO_3F_2
-	db HS_SILPH_CO_4F_1
-	db HS_SILPH_CO_4F_2
-	db HS_SILPH_CO_4F_3
-	db HS_SILPH_CO_5F_1
-	db HS_SILPH_CO_5F_2
-	db HS_SILPH_CO_5F_3
-	db HS_SILPH_CO_5F_4
-	db HS_SILPH_CO_6F_1
-	db HS_SILPH_CO_6F_2
-	db HS_SILPH_CO_6F_3
-	db HS_SILPH_CO_7F_1
-	db HS_SILPH_CO_7F_2
-	db HS_SILPH_CO_7F_3
-	db HS_SILPH_CO_7F_4
-	db HS_SILPH_CO_8F_1
-	db HS_SILPH_CO_8F_2
-	db HS_SILPH_CO_8F_3
-	db HS_SILPH_CO_9F_1
-	db HS_SILPH_CO_9F_2
-	db HS_SILPH_CO_9F_3
-	db HS_SILPH_CO_10F_1
-	db HS_SILPH_CO_10F_2
-	db HS_SILPH_CO_11F_1
-	db HS_SILPH_CO_11F_JAMES
-	db HS_SILPH_CO_11F_2
-	db HS_SILPH_CO_11F_JESSIE
+.HideToggleableObjectIDs:
+	db TOGGLE_SAFFRON_CITY_1
+	db TOGGLE_SAFFRON_CITY_2
+	db TOGGLE_SAFFRON_CITY_3
+	db TOGGLE_SAFFRON_CITY_4
+	db TOGGLE_SAFFRON_CITY_5
+	db TOGGLE_SAFFRON_CITY_6
+	db TOGGLE_SAFFRON_CITY_7
+	db TOGGLE_SAFFRON_CITY_E
+	db TOGGLE_SAFFRON_CITY_F
+	db TOGGLE_SILPH_CO_2F_2
+	db TOGGLE_SILPH_CO_2F_3
+	db TOGGLE_SILPH_CO_2F_4
+	db TOGGLE_SILPH_CO_2F_5
+	db TOGGLE_SILPH_CO_3F_1
+	db TOGGLE_SILPH_CO_3F_2
+	db TOGGLE_SILPH_CO_4F_1
+	db TOGGLE_SILPH_CO_4F_2
+	db TOGGLE_SILPH_CO_4F_3
+	db TOGGLE_SILPH_CO_5F_1
+	db TOGGLE_SILPH_CO_5F_2
+	db TOGGLE_SILPH_CO_5F_3
+	db TOGGLE_SILPH_CO_5F_4
+	db TOGGLE_SILPH_CO_6F_1
+	db TOGGLE_SILPH_CO_6F_2
+	db TOGGLE_SILPH_CO_6F_3
+	db TOGGLE_SILPH_CO_7F_1
+	db TOGGLE_SILPH_CO_7F_2
+	db TOGGLE_SILPH_CO_7F_3
+	db TOGGLE_SILPH_CO_7F_4
+	db TOGGLE_SILPH_CO_8F_1
+	db TOGGLE_SILPH_CO_8F_2
+	db TOGGLE_SILPH_CO_8F_3
+	db TOGGLE_SILPH_CO_9F_1
+	db TOGGLE_SILPH_CO_9F_2
+	db TOGGLE_SILPH_CO_9F_3
+	db TOGGLE_SILPH_CO_10F_1
+	db TOGGLE_SILPH_CO_10F_2
+	db TOGGLE_SILPH_CO_11F_1
+	db TOGGLE_SILPH_CO_11F_JAMES
+	db TOGGLE_SILPH_CO_11F_2
+	db TOGGLE_SILPH_CO_11F_JESSIE
 	db -1 ; end
diff --git a/scripts/SilphCo1F.asm b/scripts/SilphCo1F.asm
index fbc70d77..acb506fc 100644
--- a/scripts/SilphCo1F.asm
+++ b/scripts/SilphCo1F.asm
@@ -4,8 +4,8 @@ SilphCo1F_Script:
 	ret z
 	CheckAndSetEvent EVENT_SILPH_CO_RECEPTIONIST_AT_DESK
 	ret nz
-	ld a, HS_SILPH_CO_1F_RECEPTIONIST
-	ld [wMissableObjectIndex], a
+	ld a, TOGGLE_SILPH_CO_1F_RECEPTIONIST
+	ld [wToggleableObjectIndex], a
 	predef_jump ShowObject
 
 SilphCo1F_TextPointers:
diff --git a/scripts/SilphCo7F.asm b/scripts/SilphCo7F.asm
index dd67a6a2..5e917f05 100644
--- a/scripts/SilphCo7F.asm
+++ b/scripts/SilphCo7F.asm
@@ -241,8 +241,8 @@ SilphCo7FRivalExitScript:
 	ld a, [wStatusFlags5]
 	bit BIT_SCRIPTED_NPC_MOVEMENT, a
 	ret nz
-	ld a, HS_SILPH_CO_7F_RIVAL
-	ld [wMissableObjectIndex], a
+	ld a, TOGGLE_SILPH_CO_7F_RIVAL
+	ld [wToggleableObjectIndex], a
 	predef HideObject
 	call PlayDefaultMusic
 	xor a
diff --git a/scripts/VermilionDock.asm b/scripts/VermilionDock.asm
index 3cd26619..66688c42 100644
--- a/scripts/VermilionDock.asm
+++ b/scripts/VermilionDock.asm
@@ -128,7 +128,7 @@ VermilionDock_AnimSmokePuffDriftRight:
 	ld a, [wSSAnneSmokeDriftAmount]
 	swap a
 	ld c, a
-	ld de, 4
+	ld de, OBJ_SIZE
 .drift_loop
 	inc [hl]
 	inc [hl]
diff --git a/scripts/VictoryRoad3F.asm b/scripts/VictoryRoad3F.asm
index fc148c0d..ec081642 100644
--- a/scripts/VictoryRoad3F.asm
+++ b/scripts/VictoryRoad3F.asm
@@ -47,11 +47,11 @@ VictoryRoad3FDefaultScript:
 .handle_hole
 	CheckAndSetEvent EVENT_VICTORY_ROAD_3_BOULDER_ON_SWITCH2
 	jr nz, .check_switch_hole
-	ld a, HS_VICTORY_ROAD_3F_BOULDER
-	ld [wMissableObjectIndex], a
+	ld a, TOGGLE_VICTORY_ROAD_3F_BOULDER
+	ld [wToggleableObjectIndex], a
 	predef HideObject
-	ld a, HS_VICTORY_ROAD_2F_BOULDER
-	ld [wMissableObjectIndex], a
+	ld a, TOGGLE_VICTORY_ROAD_2F_BOULDER
+	ld [wToggleableObjectIndex], a
 	predef_jump ShowObject
 
 .SwitchOrHoleCoords:
diff --git a/scripts/ViridianCity.asm b/scripts/ViridianCity.asm
index 07646f1a..8eb020f5 100644
--- a/scripts/ViridianCity.asm
+++ b/scripts/ViridianCity.asm
@@ -246,8 +246,8 @@ ViridianCityOldManMovingDownScript:
 	ld a, [wStatusFlags5]
 	bit BIT_SCRIPTED_NPC_MOVEMENT, a
 	ret nz
-	ld a, HS_OLD_MAN_2
-	ld [wMissableObjectIndex], a
+	ld a, TOGGLE_OLD_MAN_2
+	ld [wToggleableObjectIndex], a
 	predef HideObject
 	xor a
 	ld [wJoyIgnore], a
diff --git a/scripts/ViridianGym.asm b/scripts/ViridianGym.asm
index 6f195037..c2b8c362 100644
--- a/scripts/ViridianGym.asm
+++ b/scripts/ViridianGym.asm
@@ -161,8 +161,8 @@ ViridianGymReceiveTM27:
 	; deactivate gym trainers
 	SetEventRange EVENT_BEAT_VIRIDIAN_GYM_TRAINER_0, EVENT_BEAT_VIRIDIAN_GYM_TRAINER_7
 
-	ld a, HS_ROUTE_22_RIVAL_2
-	ld [wMissableObjectIndex], a
+	ld a, TOGGLE_ROUTE_22_RIVAL_2
+	ld [wToggleableObjectIndex], a
 	predef ShowObject
 	SetEvents EVENT_2ND_ROUTE22_RIVAL_BATTLE, EVENT_ROUTE22_RIVAL_WANTS_BATTLE
 	jp ViridianGymResetScripts
@@ -219,8 +219,8 @@ ViridianGymGiovanniText:
 	ld hl, .PostBattleAdviceText
 	call PrintText
 	call GBFadeOutToBlack
-	ld a, HS_VIRIDIAN_GYM_GIOVANNI
-	ld [wMissableObjectIndex], a
+	ld a, TOGGLE_VIRIDIAN_GYM_GIOVANNI
+	ld [wToggleableObjectIndex], a
 	predef HideObject
 	call UpdateSprites
 	call Delay3
diff --git a/scripts/ViridianMart.asm b/scripts/ViridianMart.asm
index f118b475..7dddd434 100644
--- a/scripts/ViridianMart.asm
+++ b/scripts/ViridianMart.asm
@@ -66,11 +66,11 @@ ViridianMartScript2:
 	ret z
 	CheckAndSetEventReuseHL EVENT_SPAWNED_OLD_MAN_1
 	ret nz
-	ld a, HS_OLD_MAN_2
-	ld [wMissableObjectIndex], a
+	ld a, TOGGLE_OLD_MAN_2
+	ld [wToggleableObjectIndex], a
 	predef HideObject
-	ld a, HS_OLD_MAN_1
-	ld [wMissableObjectIndex], a
+	ld a, TOGGLE_OLD_MAN_1
+	ld [wToggleableObjectIndex], a
 	predef ShowObject
 	ret