diff --git a/src/boss.asm b/src/boss.asm index 5d918ff3..3474084a 100644 --- a/src/boss.asm +++ b/src/boss.asm @@ -412,8 +412,11 @@ _DisableConsoles: ldx #kMaxDevices - 1 @loop: lda Ram_DeviceType_eDevice_arr, x - cmp #eDevice::Console + cmp #eDevice::ConsoleFloor + beq @disable + cmp #eDevice::ConsoleCeiling bne @continue + @disable: lda #eDevice::Placeholder sta Ram_DeviceType_eDevice_arr, x @continue: diff --git a/src/device.asm b/src/device.asm index 5378c56d..281a0e50 100644 --- a/src/device.asm +++ b/src/device.asm @@ -26,7 +26,8 @@ .IMPORT FuncA_Objects_DrawDeviceBreakerDone .IMPORT FuncA_Objects_DrawDeviceBreakerReady .IMPORT FuncA_Objects_DrawDeviceBreakerRising -.IMPORT FuncA_Objects_DrawDeviceConsole +.IMPORT FuncA_Objects_DrawDeviceConsoleCeiling +.IMPORT FuncA_Objects_DrawDeviceConsoleFloor .IMPORT FuncA_Objects_DrawDeviceFakeConsole .IMPORT FuncA_Objects_DrawDeviceFlower .IMPORT FuncA_Objects_DrawDeviceLeverCeiling @@ -171,32 +172,33 @@ _Continue: D_TABLE_LO table, _JumpTable_ptr_0_arr D_TABLE_HI table, _JumpTable_ptr_1_arr D_TABLE .enum, eDevice - d_entry table, None, Func_Noop - d_entry table, Boiler, Func_Noop - d_entry table, BreakerDone, FuncA_Objects_DrawDeviceBreakerDone - d_entry table, BreakerRising, FuncA_Objects_DrawDeviceBreakerRising - d_entry table, Door1Locked, FuncA_Objects_DrawDeviceLockedDoor - d_entry table, FlowerInert, FuncA_Objects_DrawDeviceFlower - d_entry table, Mousehole, Func_Noop - d_entry table, Placeholder, Func_Noop - d_entry table, Teleporter, FuncA_Objects_DrawDeviceTeleporter - d_entry table, BreakerReady, FuncA_Objects_DrawDeviceBreakerReady - d_entry table, Console, FuncA_Objects_DrawDeviceConsole - d_entry table, Door1Open, Func_Noop - d_entry table, Door1Unlocked, FuncA_Objects_DrawDeviceUnlockedDoor - d_entry table, Door2Open, Func_Noop - d_entry table, Door3Open, Func_Noop - d_entry table, FakeConsole, FuncA_Objects_DrawDeviceFakeConsole - d_entry table, Flower, FuncA_Objects_DrawDeviceFlower - d_entry table, LeverCeiling, FuncA_Objects_DrawDeviceLeverCeiling - d_entry table, LeverFloor, FuncA_Objects_DrawDeviceLeverFloor - d_entry table, Paper, FuncA_Objects_DrawDevicePaper - d_entry table, ScreenGreen, FuncA_Objects_DrawDeviceScreenGreen - d_entry table, ScreenRed, FuncA_Objects_DrawDeviceScreenRed - d_entry table, Sign, Func_Noop - d_entry table, TalkLeft, Func_Noop - d_entry table, TalkRight, Func_Noop - d_entry table, Upgrade, FuncA_Objects_DrawDeviceUpgrade + d_entry table, None, Func_Noop + d_entry table, Boiler, Func_Noop + d_entry table, BreakerDone, FuncA_Objects_DrawDeviceBreakerDone + d_entry table, BreakerRising, FuncA_Objects_DrawDeviceBreakerRising + d_entry table, Door1Locked, FuncA_Objects_DrawDeviceLockedDoor + d_entry table, FlowerInert, FuncA_Objects_DrawDeviceFlower + d_entry table, Mousehole, Func_Noop + d_entry table, Placeholder, Func_Noop + d_entry table, Teleporter, FuncA_Objects_DrawDeviceTeleporter + d_entry table, BreakerReady, FuncA_Objects_DrawDeviceBreakerReady + d_entry table, ConsoleCeiling, FuncA_Objects_DrawDeviceConsoleCeiling + d_entry table, ConsoleFloor, FuncA_Objects_DrawDeviceConsoleFloor + d_entry table, Door1Open, Func_Noop + d_entry table, Door1Unlocked, FuncA_Objects_DrawDeviceUnlockedDoor + d_entry table, Door2Open, Func_Noop + d_entry table, Door3Open, Func_Noop + d_entry table, FakeConsole, FuncA_Objects_DrawDeviceFakeConsole + d_entry table, Flower, FuncA_Objects_DrawDeviceFlower + d_entry table, LeverCeiling, FuncA_Objects_DrawDeviceLeverCeiling + d_entry table, LeverFloor, FuncA_Objects_DrawDeviceLeverFloor + d_entry table, Paper, FuncA_Objects_DrawDevicePaper + d_entry table, ScreenGreen, FuncA_Objects_DrawDeviceScreenGreen + d_entry table, ScreenRed, FuncA_Objects_DrawDeviceScreenRed + d_entry table, Sign, Func_Noop + d_entry table, TalkLeft, Func_Noop + d_entry table, TalkRight, Func_Noop + d_entry table, Upgrade, FuncA_Objects_DrawDeviceUpgrade D_END .ENDREPEAT .ENDPROC diff --git a/src/device.inc b/src/device.inc index d4ae2a94..f3b30236 100644 --- a/src/device.inc +++ b/src/device.inc @@ -26,34 +26,35 @@ kMaxDevices = 16 .ENUM eDevice ;; Non-interactive device types; these generally act as temporary ;; placeholders for interactive devices. - None ; empty slot - Boiler ; boiler tank that can be hit by a fireblast - BreakerDone ; circuit breaker, after being activated - BreakerRising ; circuit breaker, rising out of the ground - Door1Locked ; leads to another Door1*; can't be entered until unlocked - FlowerInert ; a flower that can't be picked - Mousehole ; used by rodent baddies - Placeholder ; invisible and does nothing - Teleporter ; invisible spawn point for teleport field machines + None ; empty slot + Boiler ; boiler tank that can be hit by a fireblast + BreakerDone ; circuit breaker, after being activated + BreakerRising ; circuit breaker, rising out of the ground + Door1Locked ; leads to another Door1*; can't be entered until unlocked + FlowerInert ; a flower that can't be picked + Mousehole ; used by rodent baddies + Placeholder ; invisible and does nothing + Teleporter ; invisible spawn point for teleport field machines ;; Interactive device types. The player can interact with these by ;; pressing the B button while standing in front of them. - BreakerReady ; circuit breaker, ready to be activated - Console ; operates a machine - Door1Open ; leads to another Door1*; is never locked - Door1Unlocked ; leads to another Door1*; can be locked by room scripts - Door2Open ; leads to another Door2*; is never locked - Door3Open ; leads to another Door3*; is never locked - FakeConsole ; opens a console-looking window with an error message + BreakerReady ; circuit breaker, ready to be activated + ConsoleCeiling ; operates a machine + ConsoleFloor ; operates a machine + Door1Open ; leads to another Door1*; is never locked + Door1Unlocked ; leads to another Door1*; can be locked by room scripts + Door2Open ; leads to another Door2*; is never locked + Door3Open ; leads to another Door3*; is never locked + FakeConsole ; opens a console-looking window with an error message Flower LeverCeiling LeverFloor - Paper ; collects the paper, and initiates dialogue for it - ScreenGreen ; initiates dialogue with the avatar's back to the camera - ScreenRed ; initiates dialogue with the avatar's back to the camera - Sign ; initiates dialogue with the avatar's back to the camera - TalkLeft ; initiates dialogue with the avatar facing to the left - TalkRight ; initiates dialogue with the avatar facing to the right - Upgrade + Paper ; collects the paper, and initiates dialogue for it + ScreenGreen ; initiates dialogue with the avatar's back to the camera + ScreenRed ; initiates dialogue with the avatar's back to the camera + Sign ; initiates dialogue with the avatar's back to the camera + TalkLeft ; initiates dialogue with the avatar facing to the left + TalkRight ; initiates dialogue with the avatar facing to the right + Upgrade ; collects the upgrade NUM_VALUES .ENDENUM @@ -87,13 +88,12 @@ kFirstInteractiveDeviceType = eDevice::BreakerReady ;; The "target" for this device, whose meaning depends on the device type: ;; * For boilers, this is the bBoiler value. ;; * For breakers, this is the eFlag::Breaker* value. - ;; * For (real) consoles, this is the machine index (i.e. the index into - ;; the current room's sRoom::Machines_sMachine_arr_ptr). + ;; * For (real) consoles, this is the machine index. ;; * For doors, this is the eRoom value for the destination room. ;; * For fake consoles, this is the eFake value. ;; * For flowers, this is the eFlag::Flower* value. ;; * For levers, this is the byte offset into Zp_RoomState for the - ;; lever's state value (0 or 1). + ;; lever's state value. ;; * For mouseholes, this is the bMousehole value. ;; * For papers, this is the eFlag::Paper* value. ;; * For screen/sign/talk devices, this is the eDialog value. diff --git a/src/devices/console.asm b/src/devices/console.asm index 84e2916c..660f88dc 100644 --- a/src/devices/console.asm +++ b/src/devices/console.asm @@ -23,6 +23,7 @@ .INCLUDE "../oam.inc" .IMPORT FuncA_Objects_Draw1x1Shape +.IMPORT FuncA_Objects_MoveShapeDownByA .IMPORT FuncA_Objects_MoveShapeRightHalfTile .IMPORT FuncA_Objects_SetShapePosToDeviceTopLeft .IMPORT Ram_DeviceAnim_u8_arr @@ -46,43 +47,55 @@ kPaletteObjScreen = 1 .SEGMENT "PRGA_Objects" +;;; Draws a ceiling console device. +;;; @param X The device index. +;;; @preserve X +.EXPORT FuncA_Objects_DrawDeviceConsoleCeiling +.PROC FuncA_Objects_DrawDeviceConsoleCeiling + ldy #5 ; param: vertical offset + bne FuncA_Objects_DrawDeviceConsole ; unconditional; preserves X +.ENDPROC + +;;; Draws a floor console device. +;;; @param X The device index. +;;; @preserve X +.EXPORT FuncA_Objects_DrawDeviceConsoleFloor +.PROC FuncA_Objects_DrawDeviceConsoleFloor + ldy #0 ; param: vertical offset + fall FuncA_Objects_DrawDeviceConsole ; preserves X +.ENDPROC + ;;; Draws a console device. ;;; @param X The device index. +;;; @param Y The vertical offset for the object to draw. ;;; @preserve X -.EXPORT FuncA_Objects_DrawDeviceConsole .PROC FuncA_Objects_DrawDeviceConsole - ;; The the device is animating, blink the console screen quickly. + jsr FuncA_Objects_SetShapePosForDeviceScreenWithOffset ; preserves X + ;; If the device is animating, blink the console screen quickly. lda Ram_DeviceAnim_u8_arr, x and #$04 - bne FuncA_Objects_DrawDeviceConsoleBlank ; preserves X + bne _Blank ;; Check the machine's status. ldy Ram_DeviceTarget_byte_arr, x ; machine index lda Ram_MachineStatus_eMachine_arr, y cmp #eMachine::Error - bne FuncA_Objects_DrawDeviceConsoleOk ; preserves X - fall FuncA_Objects_DrawDeviceConsoleErr ; preserves X -.ENDPROC - -;;; Draws a console device for a machine with an error. -;;; @param X The device index. -;;; @preserve X -.PROC FuncA_Objects_DrawDeviceConsoleErr + bne _Ok +_Error: ;; Blink the console screen slowly. lda Zp_FrameCounter_u8 and #$08 - beq FuncA_Objects_DrawDeviceConsoleBlank ; preserves X + beq _Blank ;; Draw the error screen. - jsr FuncA_Objects_SetShapePosToDeviceTopLeft ; preserves X - jsr FuncA_Objects_MoveShapeRightHalfTile ; preserves X ldy #kPaletteObjConsoleErr ; param: object flags lda #kTileIdObjConsoleErr ; param: tile ID + .assert kTileIdObjConsoleErr > 0, error + bne _Draw ; unconditional +_Ok: + ldy #kPaletteObjConsoleOk ; param: object flags + lda #kTileIdObjConsoleOk ; param: tile ID +_Draw: jmp FuncA_Objects_Draw1x1Shape ; preserves X -.ENDPROC - -;;; Draws a console device whose screen is currently blank. -;;; @param X The device index. -;;; @preserve X -.PROC FuncA_Objects_DrawDeviceConsoleBlank +_Blank: rts .ENDPROC @@ -91,13 +104,6 @@ kPaletteObjScreen = 1 ;;; @preserve X .EXPORT FuncA_Objects_DrawDeviceFakeConsole .PROC FuncA_Objects_DrawDeviceFakeConsole - fall FuncA_Objects_DrawDeviceConsoleOk ; preserves X -.ENDPROC - -;;; Draws a console device for a machine that doesn't have an error. -;;; @param X The device index. -;;; @preserve X -.PROC FuncA_Objects_DrawDeviceConsoleOk fall FuncA_Objects_DrawDeviceScreenGreen ; preserves X .ENDPROC @@ -106,7 +112,7 @@ kPaletteObjScreen = 1 ;;; @preserve X .EXPORT FuncA_Objects_DrawDeviceScreenGreen .PROC FuncA_Objects_DrawDeviceScreenGreen - ldy #kPaletteObjConsoleOk ; param: object flags + lda #kPaletteObjConsoleOk ; param: object flags .assert kPaletteObjConsoleOk <> 0, error bne FuncA_Objects_DrawDeviceScreen ; unconditional, preserves X .ENDPROC @@ -116,19 +122,42 @@ kPaletteObjScreen = 1 ;;; @preserve X .EXPORT FuncA_Objects_DrawDeviceScreenRed .PROC FuncA_Objects_DrawDeviceScreenRed - ldy #kPaletteObjScreen ; param: object flags + lda #kPaletteObjScreen ; param: object flags fall FuncA_Objects_DrawDeviceScreen .ENDPROC ;;; Draws a screen device. ;;; @param X The device index. -;;; @param Y The bObj value for the object flags. +;;; @param A The bObj value for the object flags. ;;; @preserve X .PROC FuncA_Objects_DrawDeviceScreen - jsr FuncA_Objects_SetShapePosToDeviceTopLeft ; preserves X and Y - jsr FuncA_Objects_MoveShapeRightHalfTile ; preserves X and Y + pha ; object flags + jsr FuncA_Objects_SetShapePosForDeviceScreenNormal ; preserves X + pla ; object flags + tay ; param: object flags lda #kTileIdObjScreen ; param: tile ID jmp FuncA_Objects_Draw1x1Shape ; preserves X .ENDPROC +;;; Sets the shape position for drawing a console or screen device with no +;;; vertical offset. +;;; @param X The device index. +;;; @preserve X +.PROC FuncA_Objects_SetShapePosForDeviceScreenNormal + ldy #0 ; param: vertical offset + fall FuncA_Objects_SetShapePosForDeviceScreenWithOffset +.ENDPROC + +;;; Sets the shape position for drawing a console or screen device with the +;;; given vertical offset. +;;; @param X The device index. +;;; @param Y The vertical offset for the object to draw. +;;; @preserve X +.PROC FuncA_Objects_SetShapePosForDeviceScreenWithOffset + jsr FuncA_Objects_SetShapePosToDeviceTopLeft ; preserves X and Y + tya ; param: vertical offset + jsr FuncA_Objects_MoveShapeDownByA ; preserves X + jmp FuncA_Objects_MoveShapeRightHalfTile ; preserves X +.ENDPROC + ;;;=========================================================================;;; diff --git a/src/explore.asm b/src/explore.asm index 1fbea69e..e80c6e9d 100644 --- a/src/explore.asm +++ b/src/explore.asm @@ -318,32 +318,33 @@ _CheckForActivateDevice: D_TABLE_LO table, _JumpTable_ptr_0_arr D_TABLE_HI table, _JumpTable_ptr_1_arr D_TABLE .enum, eDevice - d_entry table, None, _ContinueExploring - d_entry table, Boiler, _ContinueExploring - d_entry table, BreakerDone, _ContinueExploring - d_entry table, BreakerRising, _ContinueExploring - d_entry table, Door1Locked, _ContinueExploring - d_entry table, FlowerInert, _ContinueExploring - d_entry table, Mousehole, _ContinueExploring - d_entry table, Placeholder, _ContinueExploring - d_entry table, Teleporter, _ContinueExploring - d_entry table, BreakerReady, _DeviceBreaker - d_entry table, Console, _DeviceConsole - d_entry table, Door1Open, _DeviceDoor - d_entry table, Door1Unlocked, _DeviceDoor - d_entry table, Door2Open, _DeviceDoor - d_entry table, Door3Open, _DeviceDoor - d_entry table, FakeConsole, _DeviceFakeConsole - d_entry table, Flower, _DeviceFlower - d_entry table, LeverCeiling, _DeviceLever - d_entry table, LeverFloor, _DeviceLever - d_entry table, Paper, _DevicePaper - d_entry table, ScreenGreen, _DeviceDialog - d_entry table, ScreenRed, _DeviceDialog - d_entry table, Sign, _DeviceDialog - d_entry table, TalkLeft, _DeviceDialog - d_entry table, TalkRight, _DeviceDialog - d_entry table, Upgrade, _DeviceUpgrade + d_entry table, None, _ContinueExploring + d_entry table, Boiler, _ContinueExploring + d_entry table, BreakerDone, _ContinueExploring + d_entry table, BreakerRising, _ContinueExploring + d_entry table, Door1Locked, _ContinueExploring + d_entry table, FlowerInert, _ContinueExploring + d_entry table, Mousehole, _ContinueExploring + d_entry table, Placeholder, _ContinueExploring + d_entry table, Teleporter, _ContinueExploring + d_entry table, BreakerReady, _DeviceBreaker + d_entry table, ConsoleCeiling, _DeviceConsole + d_entry table, ConsoleFloor, _DeviceConsole + d_entry table, Door1Open, _DeviceDoor + d_entry table, Door1Unlocked, _DeviceDoor + d_entry table, Door2Open, _DeviceDoor + d_entry table, Door3Open, _DeviceDoor + d_entry table, FakeConsole, _DeviceFakeConsole + d_entry table, Flower, _DeviceFlower + d_entry table, LeverCeiling, _DeviceLever + d_entry table, LeverFloor, _DeviceLever + d_entry table, Paper, _DevicePaper + d_entry table, ScreenGreen, _DeviceDialog + d_entry table, ScreenRed, _DeviceDialog + d_entry table, Sign, _DeviceDialog + d_entry table, TalkLeft, _DeviceDialog + d_entry table, TalkRight, _DeviceDialog + d_entry table, Upgrade, _DeviceUpgrade D_END .ENDREPEAT _DeviceBreaker: diff --git a/src/rooms/boss_city.asm b/src/rooms/boss_city.asm index 3daa7bc8..751cfdcd 100644 --- a/src/rooms/boss_city.asm +++ b/src/rooms/boss_city.asm @@ -516,19 +516,19 @@ _Devices_sDevice_arr: d_byte Target_byte, sState::LeverRight_u8 D_END D_STRUCT sDevice - d_byte Type_eDevice, eDevice::Console + d_byte Type_eDevice, eDevice::ConsoleFloor d_byte BlockRow_u8, 12 d_byte BlockCol_u8, 1 d_byte Target_byte, kAmmoRackMachineIndex D_END D_STRUCT sDevice - d_byte Type_eDevice, eDevice::Console + d_byte Type_eDevice, eDevice::ConsoleFloor d_byte BlockRow_u8, 10 d_byte BlockCol_u8, 13 d_byte Target_byte, kReloaderMachineIndex D_END D_STRUCT sDevice - d_byte Type_eDevice, eDevice::Console + d_byte Type_eDevice, eDevice::ConsoleFloor d_byte BlockRow_u8, 12 d_byte BlockCol_u8, 13 d_byte Target_byte, kLauncherMachineIndex diff --git a/src/rooms/boss_crypt.asm b/src/rooms/boss_crypt.asm index f455041d..ef8325b9 100644 --- a/src/rooms/boss_crypt.asm +++ b/src/rooms/boss_crypt.asm @@ -379,7 +379,7 @@ _Devices_sDevice_arr: d_byte Target_byte, eFlag::BreakerCrypt D_END D_STRUCT sDevice - d_byte Type_eDevice, eDevice::Console + d_byte Type_eDevice, eDevice::ConsoleFloor d_byte BlockRow_u8, 11 d_byte BlockCol_u8, 13 d_byte Target_byte, kWinchMachineIndex diff --git a/src/rooms/boss_garden.asm b/src/rooms/boss_garden.asm index e9c9c44b..efa70dc3 100644 --- a/src/rooms/boss_garden.asm +++ b/src/rooms/boss_garden.asm @@ -354,7 +354,7 @@ _Devices_sDevice_arr: d_byte Target_byte, sState::LeverRight_u8 D_END D_STRUCT sDevice - d_byte Type_eDevice, eDevice::Console + d_byte Type_eDevice, eDevice::ConsoleFloor d_byte BlockRow_u8, 10 d_byte BlockCol_u8, 12 d_byte Target_byte, kCannonMachineIndex diff --git a/src/rooms/boss_lava.asm b/src/rooms/boss_lava.asm index 11c101fb..f542f0bd 100644 --- a/src/rooms/boss_lava.asm +++ b/src/rooms/boss_lava.asm @@ -460,13 +460,13 @@ _Devices_sDevice_arr: d_byte Target_byte, sState::LeverRight_u8 D_END D_STRUCT sDevice - d_byte Type_eDevice, eDevice::Console + d_byte Type_eDevice, eDevice::ConsoleFloor d_byte BlockRow_u8, 10 d_byte BlockCol_u8, 1 d_byte Target_byte, kBlasterMachineIndex D_END D_STRUCT sDevice - d_byte Type_eDevice, eDevice::Console + d_byte Type_eDevice, eDevice::ConsoleFloor d_byte BlockRow_u8, 10 d_byte BlockCol_u8, 14 d_byte Target_byte, kBoilerMachineIndex diff --git a/src/rooms/boss_mine.asm b/src/rooms/boss_mine.asm index f5542036..7381ccb3 100644 --- a/src/rooms/boss_mine.asm +++ b/src/rooms/boss_mine.asm @@ -446,13 +446,13 @@ _Devices_sDevice_arr: d_byte Target_byte, sState::LeverRight_u8 D_END D_STRUCT sDevice - d_byte Type_eDevice, eDevice::Console + d_byte Type_eDevice, eDevice::ConsoleFloor d_byte BlockRow_u8, 10 d_byte BlockCol_u8, 12 d_byte Target_byte, kTrolleyMachineIndex D_END D_STRUCT sDevice - d_byte Type_eDevice, eDevice::Console + d_byte Type_eDevice, eDevice::ConsoleFloor d_byte BlockRow_u8, 10 d_byte BlockCol_u8, 13 d_byte Target_byte, kCraneMachineIndex diff --git a/src/rooms/boss_shadow.asm b/src/rooms/boss_shadow.asm index 1fcd10f8..2432f419 100644 --- a/src/rooms/boss_shadow.asm +++ b/src/rooms/boss_shadow.asm @@ -285,13 +285,13 @@ _Devices_sDevice_arr: d_byte Target_byte, eFlag::BreakerShadow D_END D_STRUCT sDevice - d_byte Type_eDevice, eDevice::Console + d_byte Type_eDevice, eDevice::ConsoleFloor d_byte BlockRow_u8, 10 d_byte BlockCol_u8, 3 d_byte Target_byte, kEmitterYMachineIndex D_END D_STRUCT sDevice - d_byte Type_eDevice, eDevice::Console + d_byte Type_eDevice, eDevice::ConsoleFloor d_byte BlockRow_u8, 10 d_byte BlockCol_u8, 12 d_byte Target_byte, kEmitterXMachineIndex diff --git a/src/rooms/boss_temple.asm b/src/rooms/boss_temple.asm index fd298207..21a16f25 100644 --- a/src/rooms/boss_temple.asm +++ b/src/rooms/boss_temple.asm @@ -406,7 +406,7 @@ _Devices_sDevice_arr: d_byte Target_byte, eFlag::BreakerTemple D_END D_STRUCT sDevice - d_byte Type_eDevice, eDevice::Console + d_byte Type_eDevice, eDevice::ConsoleFloor d_byte BlockRow_u8, 12 d_byte BlockCol_u8, 3 d_byte Target_byte, kMinigunMachineIndex diff --git a/src/rooms/city_building3.asm b/src/rooms/city_building3.asm index 6e73998e..bc0fbf71 100644 --- a/src/rooms/city_building3.asm +++ b/src/rooms/city_building3.asm @@ -319,19 +319,19 @@ _Devices_sDevice_arr: d_byte Target_byte, sState::LeverRight_u8 D_END D_STRUCT sDevice - d_byte Type_eDevice, eDevice::Console + d_byte Type_eDevice, eDevice::ConsoleFloor d_byte BlockRow_u8, 12 d_byte BlockCol_u8, 4 d_byte Target_byte, kAmmoRackMachineIndex D_END D_STRUCT sDevice - d_byte Type_eDevice, eDevice::Console + d_byte Type_eDevice, eDevice::ConsoleFloor d_byte BlockRow_u8, 12 d_byte BlockCol_u8, 7 d_byte Target_byte, kReloaderMachineIndex D_END D_STRUCT sDevice - d_byte Type_eDevice, eDevice::Console + d_byte Type_eDevice, eDevice::ConsoleFloor d_byte BlockRow_u8, 12 d_byte BlockCol_u8, 13 d_byte Target_byte, kLauncherMachineIndex diff --git a/src/rooms/city_center.asm b/src/rooms/city_center.asm index 8867fad0..16cd801c 100644 --- a/src/rooms/city_center.asm +++ b/src/rooms/city_center.asm @@ -297,25 +297,25 @@ _Devices_sDevice_arr: d_byte Target_byte, eRoom::CityBuilding6 D_END D_STRUCT sDevice - d_byte Type_eDevice, eDevice::Console + d_byte Type_eDevice, eDevice::ConsoleFloor d_byte BlockRow_u8, 8 d_byte BlockCol_u8, 11 d_byte Target_byte, kSemaphore1MachineIndex D_END D_STRUCT sDevice - d_byte Type_eDevice, eDevice::Console + d_byte Type_eDevice, eDevice::ConsoleFloor d_byte BlockRow_u8, 8 d_byte BlockCol_u8, 25 d_byte Target_byte, kSemaphore2MachineIndex D_END D_STRUCT sDevice - d_byte Type_eDevice, eDevice::Console + d_byte Type_eDevice, eDevice::ConsoleFloor d_byte BlockRow_u8, 8 d_byte BlockCol_u8, 42 d_byte Target_byte, kSemaphore3MachineIndex D_END D_STRUCT sDevice - d_byte Type_eDevice, eDevice::Console + d_byte Type_eDevice, eDevice::ConsoleFloor d_byte BlockRow_u8, 8 d_byte BlockCol_u8, 57 d_byte Target_byte, kSemaphore4MachineIndex diff --git a/src/rooms/city_outskirts.asm b/src/rooms/city_outskirts.asm index 46cf8c38..f334e41b 100644 --- a/src/rooms/city_outskirts.asm +++ b/src/rooms/city_outskirts.asm @@ -201,7 +201,7 @@ _Devices_sDevice_arr: d_byte Target_byte, eDialog::CityOutskirtsAlex1 D_END D_STRUCT sDevice - d_byte Type_eDevice, eDevice::Console + d_byte Type_eDevice, eDevice::ConsoleFloor d_byte BlockRow_u8, 4 d_byte BlockCol_u8, 23 d_byte Target_byte, kLauncherMachineIndex diff --git a/src/rooms/city_sinkhole.asm b/src/rooms/city_sinkhole.asm index 8df2cb1d..13f4a2eb 100644 --- a/src/rooms/city_sinkhole.asm +++ b/src/rooms/city_sinkhole.asm @@ -131,7 +131,7 @@ _Devices_sDevice_arr: d_byte Target_byte, eRoom::BossCity D_END D_STRUCT sDevice - d_byte Type_eDevice, eDevice::Console + d_byte Type_eDevice, eDevice::ConsoleFloor d_byte BlockRow_u8, 10 d_byte BlockCol_u8, 2 d_byte Target_byte, kLiftMachineIndex diff --git a/src/rooms/core_boss.asm b/src/rooms/core_boss.asm index c3de24e9..c5cd58fd 100644 --- a/src/rooms/core_boss.asm +++ b/src/rooms/core_boss.asm @@ -491,28 +491,28 @@ _Actors_sActor_arr: _Devices_sDevice_arr: : .assert * - :- = kWinchConsoleDeviceIndex * .sizeof(sDevice), error D_STRUCT sDevice - d_byte Type_eDevice, eDevice::Console + d_byte Type_eDevice, eDevice::ConsoleFloor d_byte BlockRow_u8, 6 d_byte BlockCol_u8, 2 d_byte Target_byte, kWinchMachineIndex D_END .assert * - :- = kBlasterConsoleDeviceIndex * .sizeof(sDevice), error D_STRUCT sDevice - d_byte Type_eDevice, eDevice::Console + d_byte Type_eDevice, eDevice::ConsoleFloor d_byte BlockRow_u8, 6 d_byte BlockCol_u8, 31 d_byte Target_byte, kBlasterMachineIndex D_END .assert * - :- = kLaserConsoleDeviceIndex * .sizeof(sDevice), error D_STRUCT sDevice - d_byte Type_eDevice, eDevice::Console + d_byte Type_eDevice, eDevice::ConsoleFloor d_byte BlockRow_u8, 20 d_byte BlockCol_u8, 6 d_byte Target_byte, kLaserMachineIndex D_END .assert * - :- = kCannonConsoleDeviceIndex * .sizeof(sDevice), error D_STRUCT sDevice - d_byte Type_eDevice, eDevice::Console + d_byte Type_eDevice, eDevice::ConsoleFloor d_byte BlockRow_u8, 20 d_byte BlockCol_u8, 28 d_byte Target_byte, kCannonMachineIndex diff --git a/src/rooms/core_elevator.asm b/src/rooms/core_elevator.asm index a4e09a1a..9436f247 100644 --- a/src/rooms/core_elevator.asm +++ b/src/rooms/core_elevator.asm @@ -140,7 +140,7 @@ _Platforms_sPlatform_arr: .byte ePlatform::None _Devices_sDevice_arr: : D_STRUCT sDevice - d_byte Type_eDevice, eDevice::Console + d_byte Type_eDevice, eDevice::ConsoleFloor d_byte BlockRow_u8, 5 d_byte BlockCol_u8, 12 d_byte Target_byte, kJetMachineIndex diff --git a/src/rooms/core_lock.asm b/src/rooms/core_lock.asm index cd193062..8f60f135 100644 --- a/src/rooms/core_lock.asm +++ b/src/rooms/core_lock.asm @@ -215,19 +215,19 @@ _Actors_sActor_arr: .byte eActor::None _Devices_sDevice_arr: : D_STRUCT sDevice - d_byte Type_eDevice, eDevice::Console + d_byte Type_eDevice, eDevice::ConsoleFloor d_byte BlockRow_u8, 10 d_byte BlockCol_u8, 4 d_byte Target_byte, kLift1MachineIndex D_END D_STRUCT sDevice - d_byte Type_eDevice, eDevice::Console + d_byte Type_eDevice, eDevice::ConsoleFloor d_byte BlockRow_u8, 8 d_byte BlockCol_u8, 7 d_byte Target_byte, kLift2MachineIndex D_END D_STRUCT sDevice - d_byte Type_eDevice, eDevice::Console + d_byte Type_eDevice, eDevice::ConsoleFloor d_byte BlockRow_u8, 6 d_byte BlockCol_u8, 10 d_byte Target_byte, kLift3MachineIndex diff --git a/src/rooms/crypt_flower.asm b/src/rooms/crypt_flower.asm index 32a1e6ab..36d4b066 100644 --- a/src/rooms/crypt_flower.asm +++ b/src/rooms/crypt_flower.asm @@ -212,7 +212,7 @@ _Devices_sDevice_arr: d_byte Target_byte, eFlag::FlowerCrypt D_END D_STRUCT sDevice - d_byte Type_eDevice, eDevice::Console + d_byte Type_eDevice, eDevice::ConsoleFloor d_byte BlockRow_u8, 4 d_byte BlockCol_u8, 4 d_byte Target_byte, kWinchMachineIndex diff --git a/src/rooms/crypt_gallery.asm b/src/rooms/crypt_gallery.asm index c91d0e82..6bc4705b 100644 --- a/src/rooms/crypt_gallery.asm +++ b/src/rooms/crypt_gallery.asm @@ -218,13 +218,13 @@ _Actors_sActor_arr: .byte eActor::None _Devices_sDevice_arr: : D_STRUCT sDevice - d_byte Type_eDevice, eDevice::Console + d_byte Type_eDevice, eDevice::ConsoleFloor d_byte BlockRow_u8, 10 d_byte BlockCol_u8, 9 d_byte Target_byte, kWinchMachineIndex D_END D_STRUCT sDevice - d_byte Type_eDevice, eDevice::Console + d_byte Type_eDevice, eDevice::ConsoleFloor d_byte BlockRow_u8, 10 d_byte BlockCol_u8, 25 d_byte Target_byte, kWinchMachineIndex diff --git a/src/rooms/crypt_north.asm b/src/rooms/crypt_north.asm index e65b0bad..fd5d13dd 100644 --- a/src/rooms/crypt_north.asm +++ b/src/rooms/crypt_north.asm @@ -205,13 +205,13 @@ _Platforms_sPlatform_arr: .byte ePlatform::None _Devices_sDevice_arr: : D_STRUCT sDevice - d_byte Type_eDevice, eDevice::Console + d_byte Type_eDevice, eDevice::ConsoleFloor d_byte BlockRow_u8, 6 d_byte BlockCol_u8, 4 d_byte Target_byte, kWinchMachineIndex D_END D_STRUCT sDevice - d_byte Type_eDevice, eDevice::Console + d_byte Type_eDevice, eDevice::ConsoleFloor d_byte BlockRow_u8, 20 d_byte BlockCol_u8, 8 d_byte Target_byte, kLiftMachineIndex diff --git a/src/rooms/crypt_south.asm b/src/rooms/crypt_south.asm index d215c9a9..24787fe4 100644 --- a/src/rooms/crypt_south.asm +++ b/src/rooms/crypt_south.asm @@ -254,14 +254,14 @@ _Actors_sActor_arr: .byte eActor::None _Devices_sDevice_arr: : D_STRUCT sDevice - d_byte Type_eDevice, eDevice::Console + d_byte Type_eDevice, eDevice::ConsoleFloor d_byte BlockRow_u8, 10 d_byte BlockCol_u8, 9 d_byte Target_byte, kWinchMachineIndex D_END .assert * - :- = kLowerConsoleDeviceIndex * .sizeof(sDevice), error D_STRUCT sDevice - d_byte Type_eDevice, eDevice::Console + d_byte Type_eDevice, eDevice::ConsoleFloor d_byte BlockRow_u8, 20 d_byte BlockCol_u8, 9 d_byte Target_byte, kWinchMachineIndex diff --git a/src/rooms/crypt_tomb.asm b/src/rooms/crypt_tomb.asm index 44391662..be90f0a5 100644 --- a/src/rooms/crypt_tomb.asm +++ b/src/rooms/crypt_tomb.asm @@ -251,7 +251,7 @@ _Actors_sActor_arr: .byte eActor::None _Devices_sDevice_arr: : D_STRUCT sDevice - d_byte Type_eDevice, eDevice::Console + d_byte Type_eDevice, eDevice::ConsoleFloor d_byte BlockRow_u8, 7 d_byte BlockCol_u8, 9 d_byte Target_byte, kWinchMachineIndex @@ -278,7 +278,7 @@ _Devices_sDevice_arr: d_byte Target_byte, eRoom::BossCrypt D_END D_STRUCT sDevice - d_byte Type_eDevice, eDevice::Console + d_byte Type_eDevice, eDevice::ConsoleFloor d_byte BlockRow_u8, 16 d_byte BlockCol_u8, 11 d_byte Target_byte, kWinchMachineIndex diff --git a/src/rooms/crypt_west.asm b/src/rooms/crypt_west.asm index d91be0eb..b8e36b76 100644 --- a/src/rooms/crypt_west.asm +++ b/src/rooms/crypt_west.asm @@ -209,13 +209,13 @@ _Actors_sActor_arr: .byte eActor::None _Devices_sDevice_arr: : D_STRUCT sDevice - d_byte Type_eDevice, eDevice::Console + d_byte Type_eDevice, eDevice::ConsoleFloor d_byte BlockRow_u8, 3 d_byte BlockCol_u8, 3 d_byte Target_byte, kWinchMachineIndex D_END D_STRUCT sDevice - d_byte Type_eDevice, eDevice::Console + d_byte Type_eDevice, eDevice::ConsoleFloor d_byte BlockRow_u8, 21 d_byte BlockCol_u8, 5 d_byte Target_byte, kWinchMachineIndex diff --git a/src/rooms/factory_access.asm b/src/rooms/factory_access.asm index 8496e86e..0c02ede3 100644 --- a/src/rooms/factory_access.asm +++ b/src/rooms/factory_access.asm @@ -162,7 +162,7 @@ _Actors_sActor_arr: .byte eActor::None _Devices_sDevice_arr: : D_STRUCT sDevice - d_byte Type_eDevice, eDevice::Console + d_byte Type_eDevice, eDevice::ConsoleFloor d_byte BlockRow_u8, 5 d_byte BlockCol_u8, 9 d_byte Target_byte, kRotorMachineIndex diff --git a/src/rooms/factory_elevator.asm b/src/rooms/factory_elevator.asm index 0e47f551..2e8bb7f0 100644 --- a/src/rooms/factory_elevator.asm +++ b/src/rooms/factory_elevator.asm @@ -231,7 +231,7 @@ _Actors_sActor_arr: .byte eActor::None _Devices_sDevice_arr: : D_STRUCT sDevice - d_byte Type_eDevice, eDevice::Console + d_byte Type_eDevice, eDevice::ConsoleFloor d_byte BlockRow_u8, 8 d_byte BlockCol_u8, 4 d_byte Target_byte, kUpperJetMachineIndex @@ -244,7 +244,7 @@ _Devices_sDevice_arr: d_byte Target_byte, sElevatorState::UpperJetLowerLever_u8 D_END D_STRUCT sDevice - d_byte Type_eDevice, eDevice::Console + d_byte Type_eDevice, eDevice::ConsoleFloor d_byte BlockRow_u8, 16 d_byte BlockCol_u8, 11 d_byte Target_byte, kLowerJetMachineIndex diff --git a/src/rooms/factory_flower.asm b/src/rooms/factory_flower.asm index b1c1fd23..395cf6c9 100644 --- a/src/rooms/factory_flower.asm +++ b/src/rooms/factory_flower.asm @@ -252,13 +252,13 @@ _Devices_sDevice_arr: d_byte Target_byte, eFlag::FlowerFactory D_END D_STRUCT sDevice - d_byte Type_eDevice, eDevice::Console + d_byte Type_eDevice, eDevice::ConsoleFloor d_byte BlockRow_u8, 16 d_byte BlockCol_u8, 15 d_byte Target_byte, kUpperRotorMachineIndex D_END D_STRUCT sDevice - d_byte Type_eDevice, eDevice::Console + d_byte Type_eDevice, eDevice::ConsoleFloor d_byte BlockRow_u8, 18 d_byte BlockCol_u8, 10 d_byte Target_byte, kLowerRotorMachineIndex diff --git a/src/rooms/factory_lock.asm b/src/rooms/factory_lock.asm index 37fcdd36..e3f561e5 100644 --- a/src/rooms/factory_lock.asm +++ b/src/rooms/factory_lock.asm @@ -137,13 +137,13 @@ _Actors_sActor_arr: .byte eActor::None _Devices_sDevice_arr: : D_STRUCT sDevice - d_byte Type_eDevice, eDevice::Console + d_byte Type_eDevice, eDevice::ConsoleFloor d_byte BlockRow_u8, 11 d_byte BlockCol_u8, 4 d_byte Target_byte, kLiftMachineIndex D_END D_STRUCT sDevice - d_byte Type_eDevice, eDevice::Console + d_byte Type_eDevice, eDevice::ConsoleFloor d_byte BlockRow_u8, 11 d_byte BlockCol_u8, 15 d_byte Target_byte, kLiftMachineIndex diff --git a/src/rooms/factory_upper.asm b/src/rooms/factory_upper.asm index b3014364..a2f82587 100644 --- a/src/rooms/factory_upper.asm +++ b/src/rooms/factory_upper.asm @@ -195,7 +195,7 @@ _Actors_sActor_arr: .byte eActor::None _Devices_sDevice_arr: : D_STRUCT sDevice - d_byte Type_eDevice, eDevice::Console + d_byte Type_eDevice, eDevice::ConsoleFloor d_byte BlockRow_u8, 15 d_byte BlockCol_u8, 14 d_byte Target_byte, kRotorMachineIndex diff --git a/src/rooms/factory_west.asm b/src/rooms/factory_west.asm index fbdb2bb3..4e367fd7 100644 --- a/src/rooms/factory_west.asm +++ b/src/rooms/factory_west.asm @@ -158,7 +158,7 @@ _Actors_sActor_arr: .byte eActor::None _Devices_sDevice_arr: : D_STRUCT sDevice - d_byte Type_eDevice, eDevice::Console + d_byte Type_eDevice, eDevice::ConsoleFloor d_byte BlockRow_u8, 20 d_byte BlockCol_u8, 13 d_byte Target_byte, kCraneMachineIndex diff --git a/src/rooms/garden_crossroad.asm b/src/rooms/garden_crossroad.asm index af7c6a47..db32bdc2 100644 --- a/src/rooms/garden_crossroad.asm +++ b/src/rooms/garden_crossroad.asm @@ -169,7 +169,7 @@ _Actors_sActor_arr: .byte eActor::None _Devices_sDevice_arr: : D_STRUCT sDevice - d_byte Type_eDevice, eDevice::Console + d_byte Type_eDevice, eDevice::ConsoleFloor d_byte BlockRow_u8, 15 d_byte BlockCol_u8, 2 d_byte Target_byte, kLiftMachineIndex diff --git a/src/rooms/garden_east.asm b/src/rooms/garden_east.asm index 1a343146..410a348d 100644 --- a/src/rooms/garden_east.asm +++ b/src/rooms/garden_east.asm @@ -277,7 +277,7 @@ _Devices_sDevice_arr: d_byte Target_byte, eDialog::GardenEastCorra D_END D_STRUCT sDevice - d_byte Type_eDevice, eDevice::Console + d_byte Type_eDevice, eDevice::ConsoleFloor d_byte BlockRow_u8, 7 d_byte BlockCol_u8, 13 d_byte Target_byte, kBridgeMachineIndex @@ -290,7 +290,7 @@ _Devices_sDevice_arr: d_byte Target_byte, sState::LeverBridge_u8 D_END D_STRUCT sDevice - d_byte Type_eDevice, eDevice::Console + d_byte Type_eDevice, eDevice::ConsoleFloor d_byte BlockRow_u8, 20 d_byte BlockCol_u8, 21 d_byte Target_byte, kCannonMachineIndex diff --git a/src/rooms/garden_hallway.asm b/src/rooms/garden_hallway.asm index d6c5e739..cdb531f9 100644 --- a/src/rooms/garden_hallway.asm +++ b/src/rooms/garden_hallway.asm @@ -187,7 +187,7 @@ _Actors_sActor_arr: .byte eActor::None _Devices_sDevice_arr: : D_STRUCT sDevice - d_byte Type_eDevice, eDevice::Console + d_byte Type_eDevice, eDevice::ConsoleFloor d_byte BlockRow_u8, 4 d_byte BlockCol_u8, 29 d_byte Target_byte, kLiftMachineIndex diff --git a/src/rooms/garden_shaft.asm b/src/rooms/garden_shaft.asm index 47dfdb43..c0fcfd8f 100644 --- a/src/rooms/garden_shaft.asm +++ b/src/rooms/garden_shaft.asm @@ -202,13 +202,13 @@ _Devices_sDevice_arr: d_byte Target_byte, sState::Lever_u8_arr + kUpperBridgeMachineIndex D_END D_STRUCT sDevice - d_byte Type_eDevice, eDevice::Console + d_byte Type_eDevice, eDevice::ConsoleFloor d_byte BlockRow_u8, 11 d_byte BlockCol_u8, 3 d_byte Target_byte, kUpperBridgeMachineIndex D_END D_STRUCT sDevice - d_byte Type_eDevice, eDevice::Console + d_byte Type_eDevice, eDevice::ConsoleFloor d_byte BlockRow_u8, 21 d_byte BlockCol_u8, 8 d_byte Target_byte, kLowerBridgeMachineIndex diff --git a/src/rooms/garden_tower.asm b/src/rooms/garden_tower.asm index e16740d4..0c717f8c 100644 --- a/src/rooms/garden_tower.asm +++ b/src/rooms/garden_tower.asm @@ -317,7 +317,7 @@ _Devices_sDevice_arr: d_byte Target_byte, sState::LeverRight_u8 D_END D_STRUCT sDevice - d_byte Type_eDevice, eDevice::Console + d_byte Type_eDevice, eDevice::ConsoleFloor d_byte BlockRow_u8, 12 d_byte BlockCol_u8, 2 d_byte Target_byte, kCannonMachineIndex diff --git a/src/rooms/lava_cavern.asm b/src/rooms/lava_cavern.asm index fa3aa9ee..3c88e30c 100644 --- a/src/rooms/lava_cavern.asm +++ b/src/rooms/lava_cavern.asm @@ -216,7 +216,7 @@ _Devices_sDevice_arr: d_byte Target_byte, eRoom::BossLava D_END D_STRUCT sDevice - d_byte Type_eDevice, eDevice::Console + d_byte Type_eDevice, eDevice::ConsoleFloor d_byte BlockRow_u8, 3 d_byte BlockCol_u8, 13 d_byte Target_byte, kBoilerMachineIndex diff --git a/src/rooms/lava_center.asm b/src/rooms/lava_center.asm index e7b82603..424f0398 100644 --- a/src/rooms/lava_center.asm +++ b/src/rooms/lava_center.asm @@ -310,7 +310,7 @@ _Actors_sActor_arr: .byte eActor::None _Devices_sDevice_arr: : D_STRUCT sDevice - d_byte Type_eDevice, eDevice::Console + d_byte Type_eDevice, eDevice::ConsoleFloor d_byte BlockRow_u8, 4 d_byte BlockCol_u8, 7 d_byte Target_byte, kBlasterMachineIndex diff --git a/src/rooms/lava_east.asm b/src/rooms/lava_east.asm index 42360fde..68e5af29 100644 --- a/src/rooms/lava_east.asm +++ b/src/rooms/lava_east.asm @@ -359,19 +359,19 @@ _Actors_sActor_arr: .byte eActor::None _Devices_sDevice_arr: : D_STRUCT sDevice - d_byte Type_eDevice, eDevice::Console + d_byte Type_eDevice, eDevice::ConsoleFloor d_byte BlockRow_u8, 15 d_byte BlockCol_u8, 10 d_byte Target_byte, kUpperBoilerMachineIndex D_END D_STRUCT sDevice - d_byte Type_eDevice, eDevice::Console + d_byte Type_eDevice, eDevice::ConsoleFloor d_byte BlockRow_u8, 10 d_byte BlockCol_u8, 16 d_byte Target_byte, kBlasterMachineIndex D_END D_STRUCT sDevice - d_byte Type_eDevice, eDevice::Console + d_byte Type_eDevice, eDevice::ConsoleFloor d_byte BlockRow_u8, 19 d_byte BlockCol_u8, 30 d_byte Target_byte, kLowerBoilerMachineIndex diff --git a/src/rooms/lava_flower.asm b/src/rooms/lava_flower.asm index 35e86169..2dd19071 100644 --- a/src/rooms/lava_flower.asm +++ b/src/rooms/lava_flower.asm @@ -215,7 +215,7 @@ _Devices_sDevice_arr: d_byte Target_byte, sState::Lever_u8 D_END D_STRUCT sDevice - d_byte Type_eDevice, eDevice::Console + d_byte Type_eDevice, eDevice::ConsoleFloor d_byte BlockRow_u8, 4 d_byte BlockCol_u8, 13 d_byte Target_byte, kBoilerMachineIndex diff --git a/src/rooms/lava_station.asm b/src/rooms/lava_station.asm index 3940becf..4057501d 100644 --- a/src/rooms/lava_station.asm +++ b/src/rooms/lava_station.asm @@ -166,7 +166,7 @@ _Actors_sActor_arr: .byte eActor::None _Devices_sDevice_arr: : D_STRUCT sDevice - d_byte Type_eDevice, eDevice::Console + d_byte Type_eDevice, eDevice::ConsoleFloor d_byte BlockRow_u8, 11 d_byte BlockCol_u8, 23 d_byte Target_byte, kBoilerMachineIndex diff --git a/src/rooms/lava_teleport.asm b/src/rooms/lava_teleport.asm index 95fd2001..95d5204e 100644 --- a/src/rooms/lava_teleport.asm +++ b/src/rooms/lava_teleport.asm @@ -147,7 +147,7 @@ _Devices_sDevice_arr: d_byte Target_byte, eRoom::ShadowTeleport D_END D_STRUCT sDevice - d_byte Type_eDevice, eDevice::Console + d_byte Type_eDevice, eDevice::ConsoleFloor d_byte BlockRow_u8, 10 d_byte BlockCol_u8, 13 d_byte Target_byte, kFieldMachineIndex diff --git a/src/rooms/lava_vent.asm b/src/rooms/lava_vent.asm index 288cfbd7..bf8e9ce5 100644 --- a/src/rooms/lava_vent.asm +++ b/src/rooms/lava_vent.asm @@ -141,7 +141,7 @@ _Actors_sActor_arr: .byte eActor::None _Devices_sDevice_arr: : D_STRUCT sDevice - d_byte Type_eDevice, eDevice::Console + d_byte Type_eDevice, eDevice::ConsoleFloor d_byte BlockRow_u8, 20 d_byte BlockCol_u8, 10 d_byte Target_byte, kLiftMachineIndex diff --git a/src/rooms/lava_west.asm b/src/rooms/lava_west.asm index e0774812..e4967f18 100644 --- a/src/rooms/lava_west.asm +++ b/src/rooms/lava_west.asm @@ -266,7 +266,7 @@ _Devices_sDevice_arr: d_byte Target_byte, sState::Lever_u8 D_END D_STRUCT sDevice - d_byte Type_eDevice, eDevice::Console + d_byte Type_eDevice, eDevice::ConsoleFloor d_byte BlockRow_u8, 10 d_byte BlockCol_u8, 24 d_byte Target_byte, kBoilerMachineIndex diff --git a/src/rooms/mermaid_elevator.asm b/src/rooms/mermaid_elevator.asm index 2118a5ce..79b21b58 100644 --- a/src/rooms/mermaid_elevator.asm +++ b/src/rooms/mermaid_elevator.asm @@ -169,7 +169,7 @@ _Platforms_sPlatform_arr: .byte ePlatform::None _Devices_sDevice_arr: : D_STRUCT sDevice - d_byte Type_eDevice, eDevice::Console + d_byte Type_eDevice, eDevice::ConsoleFloor d_byte BlockRow_u8, 16 d_byte BlockCol_u8, 15 d_byte Target_byte, kJetMachineIndex diff --git a/src/rooms/mermaid_hut6.asm b/src/rooms/mermaid_hut6.asm index 831ad769..2051ea61 100644 --- a/src/rooms/mermaid_hut6.asm +++ b/src/rooms/mermaid_hut6.asm @@ -143,13 +143,13 @@ _Platforms_sPlatform_arr: .byte ePlatform::None _Devices_sDevice_arr: : D_STRUCT sDevice - d_byte Type_eDevice, eDevice::Console + d_byte Type_eDevice, eDevice::ConsoleFloor d_byte BlockRow_u8, 11 d_byte BlockCol_u8, 5 d_byte Target_byte, 0 ; TODO: use constant D_END D_STRUCT sDevice - d_byte Type_eDevice, eDevice::Console + d_byte Type_eDevice, eDevice::ConsoleFloor d_byte BlockRow_u8, 11 d_byte BlockCol_u8, 7 d_byte Target_byte, 1 ; TODO: use constant diff --git a/src/rooms/mermaid_spring.asm b/src/rooms/mermaid_spring.asm index 8ff8bf4f..0bf90c4c 100644 --- a/src/rooms/mermaid_spring.asm +++ b/src/rooms/mermaid_spring.asm @@ -230,7 +230,7 @@ _Devices_sDevice_arr: D_END .assert * - :- = kConsoleDeviceIndex * .sizeof(sDevice), error D_STRUCT sDevice - d_byte Type_eDevice, eDevice::Console + d_byte Type_eDevice, eDevice::ConsoleFloor d_byte BlockRow_u8, 6 d_byte BlockCol_u8, 12 d_byte Target_byte, kPumpMachineIndex @@ -513,7 +513,7 @@ _DropMonitorPlatform: jmp Func_MovePlatformTopTowardPointY ; returns Z _FixConsole: ;; TODO: play a sound for the console turning on - lda #eDevice::Console + lda #eDevice::ConsoleFloor sta Ram_DeviceType_eDevice_arr + kConsoleDeviceIndex ldx #eFlag::MermaidSpringConsoleFixed ; param: flag jmp Func_SetFlag diff --git a/src/rooms/mine_collapse.asm b/src/rooms/mine_collapse.asm index 9ec5bc27..e8928942 100644 --- a/src/rooms/mine_collapse.asm +++ b/src/rooms/mine_collapse.asm @@ -183,13 +183,13 @@ _Platforms_sPlatform_arr: .byte ePlatform::None _Devices_sDevice_arr: : D_STRUCT sDevice - d_byte Type_eDevice, eDevice::Console + d_byte Type_eDevice, eDevice::ConsoleFloor d_byte BlockRow_u8, 11 d_byte BlockCol_u8, 12 d_byte Target_byte, kTrolleyMachineIndex D_END D_STRUCT sDevice - d_byte Type_eDevice, eDevice::Console + d_byte Type_eDevice, eDevice::ConsoleFloor d_byte BlockRow_u8, 11 d_byte BlockCol_u8, 13 d_byte Target_byte, kCraneMachineIndex diff --git a/src/rooms/mine_east.asm b/src/rooms/mine_east.asm index 76699105..bdfe2ff3 100644 --- a/src/rooms/mine_east.asm +++ b/src/rooms/mine_east.asm @@ -236,13 +236,13 @@ _Actors_sActor_arr: .byte eActor::None _Devices_sDevice_arr: : D_STRUCT sDevice - d_byte Type_eDevice, eDevice::Console + d_byte Type_eDevice, eDevice::ConsoleFloor d_byte BlockRow_u8, 18 d_byte BlockCol_u8, 7 d_byte Target_byte, kHoistMachineIndex D_END D_STRUCT sDevice - d_byte Type_eDevice, eDevice::Console + d_byte Type_eDevice, eDevice::ConsoleFloor d_byte BlockRow_u8, 20 d_byte BlockCol_u8, 13 d_byte Target_byte, kLiftMachineIndex diff --git a/src/rooms/mine_flower.asm b/src/rooms/mine_flower.asm index 3d77e7bf..da444352 100644 --- a/src/rooms/mine_flower.asm +++ b/src/rooms/mine_flower.asm @@ -251,13 +251,13 @@ _Devices_sDevice_arr: d_byte Target_byte, eFlag::FlowerMine D_END D_STRUCT sDevice - d_byte Type_eDevice, eDevice::Console + d_byte Type_eDevice, eDevice::ConsoleFloor d_byte BlockRow_u8, 12 d_byte BlockCol_u8, 5 d_byte Target_byte, kHoistWestMachineIndex D_END D_STRUCT sDevice - d_byte Type_eDevice, eDevice::Console + d_byte Type_eDevice, eDevice::ConsoleFloor d_byte BlockRow_u8, 12 d_byte BlockCol_u8, 12 d_byte Target_byte, kHoistEastMachineIndex diff --git a/src/rooms/mine_north.asm b/src/rooms/mine_north.asm index 3bcdd47f..7e5fca20 100644 --- a/src/rooms/mine_north.asm +++ b/src/rooms/mine_north.asm @@ -230,7 +230,7 @@ _Devices_sDevice_arr: d_byte Target_byte, sState::LeverLower_u8 D_END D_STRUCT sDevice - d_byte Type_eDevice, eDevice::Console + d_byte Type_eDevice, eDevice::ConsoleFloor d_byte BlockRow_u8, 19 d_byte BlockCol_u8, 12 d_byte Target_byte, kConveyorMachineIndex diff --git a/src/rooms/mine_pit.asm b/src/rooms/mine_pit.asm index 19fa113d..0b3b5788 100644 --- a/src/rooms/mine_pit.asm +++ b/src/rooms/mine_pit.asm @@ -220,13 +220,13 @@ _Devices_sDevice_arr: d_byte Target_byte, kUpgradeFlag D_END D_STRUCT sDevice - d_byte Type_eDevice, eDevice::Console + d_byte Type_eDevice, eDevice::ConsoleFloor d_byte BlockRow_u8, 9 d_byte BlockCol_u8, 2 d_byte Target_byte, kHoistWestMachineIndex D_END D_STRUCT sDevice - d_byte Type_eDevice, eDevice::Console + d_byte Type_eDevice, eDevice::ConsoleFloor d_byte BlockRow_u8, 10 d_byte BlockCol_u8, 13 d_byte Target_byte, kHoistEastMachineIndex diff --git a/src/rooms/mine_south.asm b/src/rooms/mine_south.asm index d127241e..bf4a8d1d 100644 --- a/src/rooms/mine_south.asm +++ b/src/rooms/mine_south.asm @@ -243,13 +243,13 @@ _Actors_sActor_arr: .byte eActor::None _Devices_sDevice_arr: : D_STRUCT sDevice - d_byte Type_eDevice, eDevice::Console + d_byte Type_eDevice, eDevice::ConsoleFloor d_byte BlockRow_u8, 13 d_byte BlockCol_u8, 24 d_byte Target_byte, kTrolleyMachineIndex D_END D_STRUCT sDevice - d_byte Type_eDevice, eDevice::Console + d_byte Type_eDevice, eDevice::ConsoleFloor d_byte BlockRow_u8, 18 d_byte BlockCol_u8, 31 d_byte Target_byte, kHoistMachineIndex diff --git a/src/rooms/mine_west.asm b/src/rooms/mine_west.asm index 1e107c51..bb80f319 100644 --- a/src/rooms/mine_west.asm +++ b/src/rooms/mine_west.asm @@ -229,7 +229,7 @@ _Actors_sActor_arr: .byte eActor::None _Devices_sDevice_arr: : D_STRUCT sDevice - d_byte Type_eDevice, eDevice::Console + d_byte Type_eDevice, eDevice::ConsoleFloor d_byte BlockRow_u8, 18 d_byte BlockCol_u8, 4 d_byte Target_byte, kCraneMachineIndex diff --git a/src/rooms/prison_cell.asm b/src/rooms/prison_cell.asm index 1b882524..34fcf0c3 100644 --- a/src/rooms/prison_cell.asm +++ b/src/rooms/prison_cell.asm @@ -381,14 +381,14 @@ _Devices_sDevice_arr: d_byte Target_byte, eFlag::PaperJerome36 D_END D_STRUCT sDevice - d_byte Type_eDevice, eDevice::Console + d_byte Type_eDevice, eDevice::ConsoleFloor d_byte BlockRow_u8, 4 d_byte BlockCol_u8, 3 d_byte Target_byte, kLiftMachineIndex D_END .assert * - :- = kLauncherConsoleDeviceIndex * .sizeof(sDevice), error D_STRUCT sDevice - d_byte Type_eDevice, eDevice::Console + d_byte Type_eDevice, eDevice::ConsoleFloor d_byte BlockRow_u8, 13 d_byte BlockCol_u8, 30 d_byte Target_byte, kLauncherMachineIndex diff --git a/src/rooms/prison_east.asm b/src/rooms/prison_east.asm index b17eb1ef..512a3a83 100644 --- a/src/rooms/prison_east.asm +++ b/src/rooms/prison_east.asm @@ -247,7 +247,7 @@ _Devices_sDevice_arr: D_END .assert * - :- = kConsoleDeviceIndex * .sizeof(sDevice), error D_STRUCT sDevice - d_byte Type_eDevice, eDevice::Console + d_byte Type_eDevice, eDevice::ConsoleFloor d_byte BlockRow_u8, 15 d_byte BlockCol_u8, 18 d_byte Target_byte, kLiftMachineIndex @@ -338,7 +338,7 @@ _ConsoleDelay: dec Zp_RoomState + sState::ConsoleDelay_u8 bne @done ;; TODO: play a sound for the console turning on - lda #eDevice::Console + lda #eDevice::ConsoleFloor sta Ram_DeviceType_eDevice_arr + kConsoleDeviceIndex lda #kConsoleAnimCountdown sta Ram_DeviceAnim_u8_arr + kConsoleDeviceIndex @@ -408,7 +408,7 @@ _OrcIsTrapped: @doneOrc: ;; If the console is disabled, enable it. lda Ram_DeviceType_eDevice_arr + kConsoleDeviceIndex - cmp #eDevice::Console + cmp #eDevice::ConsoleFloor beq _Return ; console is already enabled lda Zp_RoomState + sState::ConsoleDelay_u8 bne _Return ; console is already about to be enabled diff --git a/src/rooms/prison_escape.asm b/src/rooms/prison_escape.asm index ffa7ad0b..eb2cc288 100644 --- a/src/rooms/prison_escape.asm +++ b/src/rooms/prison_escape.asm @@ -170,7 +170,7 @@ _Devices_sDevice_arr: d_byte Target_byte, eFlag::PaperManual2 D_END D_STRUCT sDevice - d_byte Type_eDevice, eDevice::Console + d_byte Type_eDevice, eDevice::ConsoleFloor d_byte BlockRow_u8, 20 d_byte BlockCol_u8, 16 d_byte Target_byte, kTrolleyMachineIndex diff --git a/src/rooms/sewer_basin.asm b/src/rooms/sewer_basin.asm index ce5e6b59..10d4e878 100644 --- a/src/rooms/sewer_basin.asm +++ b/src/rooms/sewer_basin.asm @@ -223,7 +223,7 @@ _Devices_sDevice_arr: d_byte Target_byte, kUpgradeFlag D_END D_STRUCT sDevice - d_byte Type_eDevice, eDevice::Console + d_byte Type_eDevice, eDevice::ConsoleFloor d_byte BlockRow_u8, 5 d_byte BlockCol_u8, 26 d_byte Target_byte, kMultiplexerMachineIndex diff --git a/src/rooms/sewer_flower.asm b/src/rooms/sewer_flower.asm index 5092ffd5..826e220d 100644 --- a/src/rooms/sewer_flower.asm +++ b/src/rooms/sewer_flower.asm @@ -164,7 +164,7 @@ _Devices_sDevice_arr: d_byte Target_byte, eFlag::FlowerSewer D_END D_STRUCT sDevice - d_byte Type_eDevice, eDevice::Console + d_byte Type_eDevice, eDevice::ConsoleFloor d_byte BlockRow_u8, 6 d_byte BlockCol_u8, 10 d_byte Target_byte, kPumpMachineIndex diff --git a/src/rooms/sewer_pool.asm b/src/rooms/sewer_pool.asm index 034e2e0a..2fc56f33 100644 --- a/src/rooms/sewer_pool.asm +++ b/src/rooms/sewer_pool.asm @@ -195,7 +195,7 @@ _Actors_sActor_arr: .byte eActor::None _Devices_sDevice_arr: : D_STRUCT sDevice - d_byte Type_eDevice, eDevice::Console + d_byte Type_eDevice, eDevice::ConsoleFloor d_byte BlockRow_u8, 5 d_byte BlockCol_u8, 29 d_byte Target_byte, kMultiplexerMachineIndex diff --git a/src/rooms/sewer_south.asm b/src/rooms/sewer_south.asm index 12f0a69c..c4e48786 100644 --- a/src/rooms/sewer_south.asm +++ b/src/rooms/sewer_south.asm @@ -189,7 +189,7 @@ _Actors_sActor_arr: .byte eActor::None _Devices_sDevice_arr: : D_STRUCT sDevice - d_byte Type_eDevice, eDevice::Console + d_byte Type_eDevice, eDevice::ConsoleFloor d_byte BlockRow_u8, 10 d_byte BlockCol_u8, 31 d_byte Target_byte, kMultiplexerMachineIndex diff --git a/src/rooms/sewer_trap.asm b/src/rooms/sewer_trap.asm index c41b1e30..5ec129ba 100644 --- a/src/rooms/sewer_trap.asm +++ b/src/rooms/sewer_trap.asm @@ -164,7 +164,7 @@ _Actors_sActor_arr: .byte eActor::None _Devices_sDevice_arr: : D_STRUCT sDevice - d_byte Type_eDevice, eDevice::Console + d_byte Type_eDevice, eDevice::ConsoleFloor d_byte BlockRow_u8, 11 d_byte BlockCol_u8, 15 d_byte Target_byte, kLiftMachineIndex diff --git a/src/rooms/sewer_west.asm b/src/rooms/sewer_west.asm index d6f8dbb5..9f19b038 100644 --- a/src/rooms/sewer_west.asm +++ b/src/rooms/sewer_west.asm @@ -157,7 +157,7 @@ _Actors_sActor_arr: .byte eActor::None _Devices_sDevice_arr: : D_STRUCT sDevice - d_byte Type_eDevice, eDevice::Console + d_byte Type_eDevice, eDevice::ConsoleFloor d_byte BlockRow_u8, 20 d_byte BlockCol_u8, 13 d_byte Target_byte, kMultiplexerMachineIndex diff --git a/src/rooms/shadow_drill.asm b/src/rooms/shadow_drill.asm index e1b63a29..3efacd3d 100644 --- a/src/rooms/shadow_drill.asm +++ b/src/rooms/shadow_drill.asm @@ -194,13 +194,13 @@ _Actors_sActor_arr: .byte eActor::None _Devices_sDevice_arr: : D_STRUCT sDevice - d_byte Type_eDevice, eDevice::Console ; TODO: ConsoleCeiling + d_byte Type_eDevice, eDevice::ConsoleCeiling d_byte BlockRow_u8, 4 d_byte BlockCol_u8, 3 d_byte Target_byte, kLaserMachineIndex D_END D_STRUCT sDevice - d_byte Type_eDevice, eDevice::Console ; TODO: ConsoleCeiling + d_byte Type_eDevice, eDevice::ConsoleCeiling d_byte BlockRow_u8, 17 d_byte BlockCol_u8, 12 d_byte Target_byte, kLaserMachineIndex diff --git a/src/rooms/shadow_entry.asm b/src/rooms/shadow_entry.asm index 8a646360..5a6cd7ab 100644 --- a/src/rooms/shadow_entry.asm +++ b/src/rooms/shadow_entry.asm @@ -164,7 +164,7 @@ _Actors_sActor_arr: .byte eActor::None _Devices_sDevice_arr: : D_STRUCT sDevice - d_byte Type_eDevice, eDevice::Console + d_byte Type_eDevice, eDevice::ConsoleFloor d_byte BlockRow_u8, 19 d_byte BlockCol_u8, 3 d_byte Target_byte, kLiftMachineIndex diff --git a/src/rooms/shadow_flower.asm b/src/rooms/shadow_flower.asm index b50e8669..b58abb71 100644 --- a/src/rooms/shadow_flower.asm +++ b/src/rooms/shadow_flower.asm @@ -181,7 +181,7 @@ _Devices_sDevice_arr: d_byte Target_byte, eFlag::FlowerShadow D_END D_STRUCT sDevice - d_byte Type_eDevice, eDevice::Console + d_byte Type_eDevice, eDevice::ConsoleFloor d_byte BlockRow_u8, 4 d_byte BlockCol_u8, 2 d_byte Target_byte, kLaserMachineIndex diff --git a/src/rooms/shadow_hall.asm b/src/rooms/shadow_hall.asm index 1e4ac0aa..dd7c8038 100644 --- a/src/rooms/shadow_hall.asm +++ b/src/rooms/shadow_hall.asm @@ -217,13 +217,13 @@ _Platforms_sPlatform_arr: .byte ePlatform::None _Devices_sDevice_arr: : D_STRUCT sDevice - d_byte Type_eDevice, eDevice::Console + d_byte Type_eDevice, eDevice::ConsoleFloor d_byte BlockRow_u8, 8 d_byte BlockCol_u8, 6 d_byte Target_byte, kMinigunMachineIndex D_END D_STRUCT sDevice - d_byte Type_eDevice, eDevice::Console + d_byte Type_eDevice, eDevice::ConsoleFloor d_byte BlockRow_u8, 3 d_byte BlockCol_u8, 20 d_byte Target_byte, kMinigunMachineIndex diff --git a/src/rooms/shadow_heart.asm b/src/rooms/shadow_heart.asm index 9a6f0f0e..7dcd6c9d 100644 --- a/src/rooms/shadow_heart.asm +++ b/src/rooms/shadow_heart.asm @@ -261,13 +261,13 @@ _Actors_sActor_arr: .byte eActor::None _Devices_sDevice_arr: : D_STRUCT sDevice - d_byte Type_eDevice, eDevice::Console + d_byte Type_eDevice, eDevice::ConsoleFloor d_byte BlockRow_u8, 10 d_byte BlockCol_u8, 4 d_byte Target_byte, kEmitterYMachineIndex D_END D_STRUCT sDevice - d_byte Type_eDevice, eDevice::Console + d_byte Type_eDevice, eDevice::ConsoleFloor d_byte BlockRow_u8, 10 d_byte BlockCol_u8, 13 d_byte Target_byte, kEmitterXMachineIndex diff --git a/src/rooms/shadow_teleport.asm b/src/rooms/shadow_teleport.asm index de0aadb2..8c13e5cb 100644 --- a/src/rooms/shadow_teleport.asm +++ b/src/rooms/shadow_teleport.asm @@ -148,7 +148,7 @@ _Devices_sDevice_arr: d_byte Target_byte, eRoom::LavaTeleport D_END D_STRUCT sDevice - d_byte Type_eDevice, eDevice::Console + d_byte Type_eDevice, eDevice::ConsoleFloor d_byte BlockRow_u8, 10 d_byte BlockCol_u8, 13 d_byte Target_byte, kFieldMachineIndex diff --git a/src/rooms/shadow_trap.asm b/src/rooms/shadow_trap.asm index 9c3fee9c..980b2cf7 100644 --- a/src/rooms/shadow_trap.asm +++ b/src/rooms/shadow_trap.asm @@ -244,7 +244,7 @@ _Platforms_sPlatform_arr: .byte ePlatform::None _Devices_sDevice_arr: : D_STRUCT sDevice - d_byte Type_eDevice, eDevice::Console + d_byte Type_eDevice, eDevice::ConsoleFloor d_byte BlockRow_u8, 10 d_byte BlockCol_u8, 9 d_byte Target_byte, kLaserMachineIndex diff --git a/src/rooms/temple_altar.asm b/src/rooms/temple_altar.asm index 620bd51e..cdbecce2 100644 --- a/src/rooms/temple_altar.asm +++ b/src/rooms/temple_altar.asm @@ -283,7 +283,7 @@ _Devices_sDevice_arr: d_byte Target_byte, eDialog::TempleAltarPlaque D_END D_STRUCT sDevice - d_byte Type_eDevice, eDevice::Console + d_byte Type_eDevice, eDevice::ConsoleFloor d_byte BlockRow_u8, 7 d_byte BlockCol_u8, 2 d_byte Target_byte, kUpperMinigunMachineIndex @@ -303,7 +303,7 @@ _Devices_sDevice_arr: d_byte Target_byte, sState::LeverRight_u8 D_END D_STRUCT sDevice - d_byte Type_eDevice, eDevice::Console + d_byte Type_eDevice, eDevice::ConsoleFloor d_byte BlockRow_u8, 20 d_byte BlockCol_u8, 15 d_byte Target_byte, kLowerMinigunMachineIndex diff --git a/src/rooms/temple_foyer.asm b/src/rooms/temple_foyer.asm index 39ab013d..3191968a 100644 --- a/src/rooms/temple_foyer.asm +++ b/src/rooms/temple_foyer.asm @@ -196,7 +196,7 @@ _Devices_sDevice_arr: d_byte Target_byte, kUpgradeFlag D_END D_STRUCT sDevice - d_byte Type_eDevice, eDevice::Console + d_byte Type_eDevice, eDevice::ConsoleFloor d_byte BlockRow_u8, 16 d_byte BlockCol_u8, 26 d_byte Target_byte, kCarriageMachineIndex diff --git a/src/rooms/temple_nave.asm b/src/rooms/temple_nave.asm index 0d387428..9d658ba0 100644 --- a/src/rooms/temple_nave.asm +++ b/src/rooms/temple_nave.asm @@ -371,13 +371,13 @@ _Devices_sDevice_arr: d_byte Target_byte, eDialog::TempleNaveAlexBoost2 D_END D_STRUCT sDevice - d_byte Type_eDevice, eDevice::Console + d_byte Type_eDevice, eDevice::ConsoleFloor d_byte BlockRow_u8, 21 d_byte BlockCol_u8, 14 d_byte Target_byte, kUpperCarriageMachineIndex D_END D_STRUCT sDevice - d_byte Type_eDevice, eDevice::Console + d_byte Type_eDevice, eDevice::ConsoleFloor d_byte BlockRow_u8, 21 d_byte BlockCol_u8, 20 d_byte Target_byte, kLowerCarriageMachineIndex diff --git a/src/spawn.asm b/src/spawn.asm index 040bb02d..3b45954a 100644 --- a/src/spawn.asm +++ b/src/spawn.asm @@ -420,32 +420,33 @@ _CheckForShallowWater: rts _DeviceOffset_u8_arr: D_ARRAY .enum, eDevice - d_byte None, $08 - d_byte Boiler, $08 - d_byte BreakerDone, kBreakerAvatarOffset - d_byte BreakerRising, kBreakerAvatarOffset - d_byte Door1Locked, kDoorAvatarOffset - d_byte FlowerInert, $08 - d_byte Mousehole, $08 - d_byte Placeholder, $08 - d_byte Teleporter, $08 - d_byte BreakerReady, kBreakerAvatarOffset - d_byte Console, kConsoleAvatarOffset - d_byte Door1Open, kDoorAvatarOffset - d_byte Door1Unlocked, kDoorAvatarOffset - d_byte Door2Open, kDoorAvatarOffset - d_byte Door3Open, kDoorAvatarOffset - d_byte FakeConsole, kConsoleAvatarOffset - d_byte Flower, $08 - d_byte LeverCeiling, $06 - d_byte LeverFloor, $06 - d_byte Paper, kReadingAvatarOffset - d_byte ScreenGreen, kConsoleAvatarOffset - d_byte ScreenRed, kConsoleAvatarOffset - d_byte Sign, kReadingAvatarOffset - d_byte TalkLeft, $0b - d_byte TalkRight, $05 - d_byte Upgrade, $08 + d_byte None, $08 + d_byte Boiler, $08 + d_byte BreakerDone, kBreakerAvatarOffset + d_byte BreakerRising, kBreakerAvatarOffset + d_byte Door1Locked, kDoorAvatarOffset + d_byte FlowerInert, $08 + d_byte Mousehole, $08 + d_byte Placeholder, $08 + d_byte Teleporter, $08 + d_byte BreakerReady, kBreakerAvatarOffset + d_byte ConsoleCeiling, kConsoleAvatarOffset + d_byte ConsoleFloor, kConsoleAvatarOffset + d_byte Door1Open, kDoorAvatarOffset + d_byte Door1Unlocked, kDoorAvatarOffset + d_byte Door2Open, kDoorAvatarOffset + d_byte Door3Open, kDoorAvatarOffset + d_byte FakeConsole, kConsoleAvatarOffset + d_byte Flower, $08 + d_byte LeverCeiling, $06 + d_byte LeverFloor, $06 + d_byte Paper, kReadingAvatarOffset + d_byte ScreenGreen, kConsoleAvatarOffset + d_byte ScreenRed, kConsoleAvatarOffset + d_byte Sign, kReadingAvatarOffset + d_byte TalkLeft, $0b + d_byte TalkRight, $05 + d_byte Upgrade, $08 D_END .ENDPROC