1 files changed, 31 insertions, 38 deletions
diff --git a/maps/RuinsOfAlphHoOhChamber.asm b/maps/RuinsOfAlphHoOhChamber.asm
index ef74f2701..9c03e2654 100644
--- a/maps/RuinsOfAlphHoOhChamber.asm
+++ b/maps/RuinsOfAlphHoOhChamber.asm
@@ -1,15 +1,13 @@
 RuinsOfAlphHoOhChamber_MapScripts:
-.SceneScripts:
-	db 2
-	scene_script .CheckWall
-	scene_script .DummyScene
+	db 2 ; scene scripts
+	scene_script .CheckWall ; SCENE_DEFAULT
+	scene_script .DummyScene ; SCENE_FINISHED
 
-.MapCallbacks:
-	db 1
+	db 1 ; callbacks
 	callback MAPCALLBACK_TILES, .HiddenDoors
 
 .CheckWall:
-	special Special_HoOhChamber
+	special HoOhChamber
 	checkevent EVENT_WALL_OPENED_IN_HO_OH_CHAMBER
 	iftrue .OpenWall
 	end
@@ -44,14 +42,14 @@ RuinsOfAlphHoOhChamber_MapScripts:
 	changeblock 4, 0, $30 ; open wall
 	reloadmappart
 	earthquake 50
-	setscene 1
+	setscene SCENE_FINISHED
 	closetext
 	end
 
 MapRuinsOfAlphHoOhChamberSignpost2Script:
 	refreshscreen
 	writebyte UNOWNPUZZLE_HO_OH
-	special Special_UnownPuzzle
+	special UnownPuzzle
 	closetext
 	iftrue .PuzzleComplete
 	end
@@ -59,8 +57,8 @@ MapRuinsOfAlphHoOhChamberSignpost2Script:
 .PuzzleComplete:
 	setevent EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS
 	setevent EVENT_SOLVED_HO_OH_PUZZLE
-	setflag ENGINE_UNLOCKED_UNOWNS_4
-	setmapscene RUINS_OF_ALPH_INNER_CHAMBER, 1
+	setflag ENGINE_UNLOCKED_UNOWNS_X_TO_Z
+	setmapscene RUINS_OF_ALPH_INNER_CHAMBER, SCENE_RUINSOFALPHINNERCHAMBER_STRANGE_PRESENCE
 	earthquake 30
 	showemote EMOTE_SHOCK, PLAYER, 15
 	changeblock 2, 2, $18 ; left hole
@@ -85,7 +83,7 @@ MapRuinsOfAlphHoOhChamberSignpost4Script:
 	opentext
 	writetext UnknownText_0x58612
 	writebyte UNOWNWORDS_HO_OH
-	special Special_DisplayUnownWords
+	special DisplayUnownWords
 	closetext
 	end
 
@@ -95,7 +93,7 @@ MapRuinsOfAlphHoOhChamberSignpost5Script:
 	opentext
 	writetext UnknownText_0x58644
 	writebyte UNOWNWORDS_HO_OH
-	special Special_DisplayUnownWords
+	special DisplayUnownWords
 	closetext
 	end
 
@@ -145,28 +143,23 @@ UnknownText_0x586aa:
 	done
 
 RuinsOfAlphHoOhChamber_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 5
-	warp_def 3, 9, 1, RUINS_OF_ALPH_OUTSIDE
-	warp_def 4, 9, 1, RUINS_OF_ALPH_OUTSIDE
-	warp_def 3, 3, 2, RUINS_OF_ALPH_INNER_CHAMBER
-	warp_def 4, 3, 3, RUINS_OF_ALPH_INNER_CHAMBER
-	warp_def 4, 0, 1, RUINS_OF_ALPH_HO_OH_ITEM_ROOM
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 6
-	bg_event 2, 3, BGEVENT_READ, MapRuinsOfAlphHoOhChamberSignpost1Script
-	bg_event 5, 3, BGEVENT_READ, MapRuinsOfAlphHoOhChamberSignpost1Script
-	bg_event 3, 2, BGEVENT_UP, MapRuinsOfAlphHoOhChamberSignpost2Script
-	bg_event 4, 2, BGEVENT_UP, MapRuinsOfAlphHoOhChamberSignpost3Script
-	bg_event 3, 0, BGEVENT_UP, MapRuinsOfAlphHoOhChamberSignpost4Script
-	bg_event 4, 0, BGEVENT_UP, MapRuinsOfAlphHoOhChamberSignpost5Script
-
-.ObjectEvents:
-	db 0
+	db 0, 0 ; filler
+
+	db 5 ; warp events
+	warp_event  3,  9, RUINS_OF_ALPH_OUTSIDE, 1
+	warp_event  4,  9, RUINS_OF_ALPH_OUTSIDE, 1
+	warp_event  3,  3, RUINS_OF_ALPH_INNER_CHAMBER, 2
+	warp_event  4,  3, RUINS_OF_ALPH_INNER_CHAMBER, 3
+	warp_event  4,  0, RUINS_OF_ALPH_HO_OH_ITEM_ROOM, 1
+
+	db 0 ; coord events
+
+	db 6 ; bg events
+	bg_event  2,  3, BGEVENT_READ, MapRuinsOfAlphHoOhChamberSignpost1Script
+	bg_event  5,  3, BGEVENT_READ, MapRuinsOfAlphHoOhChamberSignpost1Script
+	bg_event  3,  2, BGEVENT_UP, MapRuinsOfAlphHoOhChamberSignpost2Script
+	bg_event  4,  2, BGEVENT_UP, MapRuinsOfAlphHoOhChamberSignpost3Script
+	bg_event  3,  0, BGEVENT_UP, MapRuinsOfAlphHoOhChamberSignpost4Script
+	bg_event  4,  0, BGEVENT_UP, MapRuinsOfAlphHoOhChamberSignpost5Script
+
+	db 0 ; object events