Relabel WRAM labels and interaction routines

ElectroDeoxys · Jun 5, 2024 · bd1c8d8 · bd1c8d8
1 parent cca33c0
commit bd1c8d8
Show file tree

Hide file tree

Showing 12 changed files with 77 additions and 79 deletions.
diff --git a/src/constants/object_constants.asm b/src/constants/object_constants.asm
@@ -144,7 +144,7 @@ DEF INTERACTION_DOWN  EQU (1 << INTERACTION_DOWN_F)  ; $80
 	const OBJ_INTERACTION_PRINCE_FROGGY       ; $3e
 	const OBJ_INTERACTION_HAND                ; $3f
 	const OBJ_INTERACTION_WATER_TELEPORTING   ; $40
-	const OBJ_INTERACTION_41                  ; $41
+	const OBJ_INTERACTION_SCOWLER                  ; $41
 	const OBJ_INTERACTION_INK                 ; $42
 	const OBJ_INTERACTION_43                  ; $43
 	const OBJ_INTERACTION_JAMANO              ; $44
@@ -157,7 +157,7 @@ DEF INTERACTION_DOWN  EQU (1 << INTERACTION_DOWN_F)  ; $80
 	const OBJ_INTERACTION_MAGICAL_SPIRAL      ; $4b
 	const OBJ_INTERACTION_BOTTOM_STING        ; $4c
 	const OBJ_INTERACTION_SHOOT               ; $4d
-	const OBJ_INTERACTION_4E                  ; $4e
+	const OBJ_INTERACTION_GK_TORTOISE                  ; $4e
 	const OBJ_INTERACTION_4F                  ; $4f
 	const OBJ_INTERACTION_50                  ; $50
 	const OBJ_INTERACTION_51                  ; $51

diff --git a/src/data/object_data.asm b/src/data/object_data.asm
@@ -115,7 +115,7 @@ SmallOctohonData:          object_data OAM_18a895, $0, OBJ_INTERACTION_06,
 BigOctohonData:            object_data OAM_18a895, $1, OBJ_INTERACTION_06,                          -9, BigOctohonFunc,            $0
 SparkHorizontalData:       object_data OAM_18ab04, $2, OBJ_INTERACTION_FULL_STING,                 -11, SparkFunc,                 OBJFLAG_PRIORITY
 SparkVerticalData:         object_data OAM_18ab04, $0, OBJ_INTERACTION_FULL_STING,                 -11, SparkFunc,                 OBJFLAG_PRIORITY
-ScowlerData:               object_data OAM_194895, $0, OBJ_INTERACTION_41             | HEAVY_OBJ, -32, ScowlerFunc,               $0
+ScowlerData:               object_data OAM_194895, $0, OBJ_INTERACTION_SCOWLER             | HEAVY_OBJ, -32, ScowlerFunc,               $0
 FloatingRingSpawnerData:   object_data OAM_194895, $4, OBJ_INTERACTION_0B,                           0, FloatingRingSpawnerFunc,   $0
 FireData:                  object_data OAM_18aba0, $4, OBJ_INTERACTION_FIRE,                       -24, FireFunc,                  $0
 JamanoData:                object_data OAM_19501c, $6, OBJ_INTERACTION_JAMANO,                     -10, JamanoFunc,                $0
@@ -127,7 +127,7 @@ Turtle2Data:               object_data OAM_195699, $c, OBJ_INTERACTION_TURTLE,
 WolfenbossData:            object_data OAM_195e06, $d, OBJ_INTERACTION_0B             | HEAVY_OBJ,   0, WolfenbossFunc,            $0
 WolfenbossPlatformData:    object_data OAM_195e06, $a, OBJ_INTERACTION_SOLID,                       -1, WolfenbossPlatformFunc,    $0
 ShootData:                 object_data OAM_196583, $0, OBJ_INTERACTION_0B             | HEAVY_OBJ, -32, ShootFunc,                 $0
-GKTortoiseData:            object_data OAM_196583, $1, OBJ_INTERACTION_4E             | HEAVY_OBJ, -20, GKTortoiseFunc,            $0
+GKTortoiseData:            object_data OAM_196583, $1, OBJ_INTERACTION_GK_TORTOISE             | HEAVY_OBJ, -20, GKTortoiseFunc,            $0
 ShootGoalCounterData:      object_data OAM_196583, $a, OBJ_INTERACTION_0B,                         -32, ShootGoalCounterFunc,      $0
 WarioGoalCounterData:      object_data OAM_196583, $b, OBJ_INTERACTION_0B,                         -32, WarioGoalCounterFunc,      $0
 GKTortoisePlatformData:    object_data OAM_196583, $5, OBJ_INTERACTION_31,                         -10, GKTortoisePlatformFunc,    $0

diff --git a/src/engine/bank2.asm b/src/engine/bank2.asm
@@ -98,7 +98,7 @@ Func_8eac:
 	ret
 
 ; hl = Wario's position
-GetNextInternalRoomID:
+GetNextLevelRoomID:
 	ld a, [hli] ; hi y
 	and a
 	jr z, .skip_multiplication
@@ -111,12 +111,12 @@ GetNextInternalRoomID:
 	dec b
 	jr nz, .loop_multiplication
 	; a = XPosHi + 10 * YPosHi
-	ld [wInternalRoomID], a
+	ld [wLevelRoomID], a
 	ret
 .skip_multiplication
 	inc hl
 	ld a, [hl] ; hi x
-	ld [wInternalRoomID], a
+	ld [wLevelRoomID], a
 	ret
 
 Func_8ed9: