diff --git a/src/cutscene.asm b/src/cutscene.asm index 469e688..8920288 100644 --- a/src/cutscene.asm +++ b/src/cutscene.asm @@ -383,6 +383,14 @@ _InitMainFork: d_entry table, MoveAvatarRun, _MoveAvatarRun d_entry table, MoveAvatarSwim, _MoveAvatarSwim d_entry table, MoveAvatarWalk, _MoveAvatarWalk + d_entry table, MoveNpcAlexSwim, _MoveNpcAlexSwim + d_entry table, MoveNpcAlexWalk, _MoveNpcAlexWalk + d_entry table, MoveNpcBrunoWalk, _MoveNpcBrunoWalk + d_entry table, MoveNpcGrontaWalk, _MoveNpcGrontaWalk + d_entry table, MoveNpcMarieWalk, _MoveNpcMarieWalk + d_entry table, MoveNpcNinaWalk, _MoveNpcNinaWalk + d_entry table, MoveNpcNoraWalk, _MoveNpcNoraWalk + d_entry table, MoveNpcOrcWalk, _MoveNpcOrcWalk d_entry table, PlayMusic, _PlayMusic d_entry table, PlaySfxSample, _PlaySfxSample d_entry table, RepeatFunc, _RepeatFunc @@ -408,17 +416,9 @@ _InitMainFork: d_entry table, SetDeviceAnim, _SetDeviceAnim d_entry table, SetScrollFlags, _SetScrollFlags d_entry table, ShakeRoom, _ShakeRoom - d_entry table, SwimNpcAlex, _SwimNpcAlex d_entry table, WaitFrames, _WaitFrames d_entry table, WaitUntilC, _WaitUntilC d_entry table, WaitUntilZ, _WaitUntilZ - d_entry table, WalkNpcAlex, _WalkNpcAlex - d_entry table, WalkNpcBruno, _WalkNpcBruno - d_entry table, WalkNpcGronta, _WalkNpcGronta - d_entry table, WalkNpcMarie, _WalkNpcMarie - d_entry table, WalkNpcNora, _WalkNpcNora - d_entry table, WalkNpcOrc, _WalkNpcOrc - d_entry table, WalkNpcToddler, _WalkNpcToddler D_END .ENDREPEAT _BranchIfC: @@ -755,56 +755,56 @@ _StartMoveAvatar: _MoveNpcReachedGoal: ldy #4 ; param: byte offset jmp FuncA_Cutscene_AdvanceForkAndExecute -_SwimNpcAlex: +_MoveNpcAlexSwim: jsr _StartMoveNpc ; returns X, Z, and N beq _MoveNpcReachedGoal jsr FuncA_Cutscene_AnimateNpcAlexSwimming ; preserves X jsr FuncA_Cutscene_FaceAvatarTowardsActor clc ; cutscene should continue rts -_WalkNpcAlex: +_MoveNpcAlexWalk: jsr _StartMoveNpc ; returns X, Z, and N beq _MoveNpcReachedGoal jsr FuncA_Cutscene_AnimateNpcAlexWalking ; preserves X jsr FuncA_Cutscene_FaceAvatarTowardsActor clc ; cutscene should continue rts -_WalkNpcBruno: +_MoveNpcBrunoWalk: jsr _StartMoveNpc ; returns X, Z, and N beq _MoveNpcReachedGoal jsr FuncA_Cutscene_AnimateNpcBrunoWalking ; preserves X jsr FuncA_Cutscene_FaceAvatarTowardsActor clc ; cutscene should continue rts -_WalkNpcGronta: +_MoveNpcGrontaWalk: jsr _StartMoveNpc ; returns X, Z, and N beq _MoveNpcReachedGoal jsr FuncA_Cutscene_AnimateNpcGrontaWalking clc ; cutscene should continue rts -_WalkNpcMarie: +_MoveNpcMarieWalk: jsr _StartMoveNpc ; returns X, Z, and N beq _MoveNpcReachedGoal jsr FuncA_Cutscene_AnimateNpcMarieWalking ; preserves X jsr FuncA_Cutscene_FaceAvatarTowardsActor clc ; cutscene should continue rts -_WalkNpcNora: +_MoveNpcNinaWalk: jsr _StartMoveNpc ; returns X, Z, and N beq _MoveNpcReachedGoal - jsr FuncA_Cutscene_AnimateNpcNoraWalking + jsr FuncA_Cutscene_AnimateNpcToddlerWalking clc ; cutscene should continue rts -_WalkNpcOrc: +_MoveNpcNoraWalk: jsr _StartMoveNpc ; returns X, Z, and N beq _MoveNpcReachedGoal - jsr FuncA_Cutscene_AnimateNpcOrcWalking + jsr FuncA_Cutscene_AnimateNpcNoraWalking clc ; cutscene should continue rts -_WalkNpcToddler: +_MoveNpcOrcWalk: jsr _StartMoveNpc ; returns X, Z, and N beq _MoveNpcReachedGoal - jsr FuncA_Cutscene_AnimateNpcToddlerWalking + jsr FuncA_Cutscene_AnimateNpcOrcWalking clc ; cutscene should continue rts _StartMoveNpc: diff --git a/src/cutscene.inc b/src/cutscene.inc index 31f9e0c..34b5f50 100644 --- a/src/cutscene.inc +++ b/src/cutscene.inc @@ -119,6 +119,17 @@ kMaxForks = 4 MoveAvatarRun ; args: goal X-position (2 bytes) MoveAvatarSwim ; args: goal X-position (2 bytes) MoveAvatarWalk ; args: goal X-position (2 bytes) + ;; Causes the specified actor to swim/walk to the specified room pixel + ;; X-position. Suspends the current cutscene fork until the actor reaches + ;; the goal position. + MoveNpcAlexSwim ; args: actor index, goal X-position (2 bytes) + MoveNpcAlexWalk ; args: actor index, goal X-position (2 bytes) + MoveNpcBrunoWalk ; args: actor index, goal X-position (2 bytes) + MoveNpcGrontaWalk ; args: actor index, goal X-position (2 bytes) + MoveNpcMarieWalk ; args: actor index, goal X-position (2 bytes) + MoveNpcNinaWalk ; args: actor index, goal X-position (2 bytes) + MoveNpcNoraWalk ; args: actor index, goal X-position (2 bytes) + MoveNpcOrcWalk ; args: actor index, goal X-position (2 bytes) ;; Queues up the specified music/SFX to play next, then the current ;; cutscene fork immediately continues on to the next action. PlayMusic ; args: eMusic value @@ -166,10 +177,6 @@ kMaxForks = 4 ;; Shakes the room by the specified amount, then the current cutscene fork ;; immediately continues on to the next action. ShakeRoom ; args: num shake frames - ;; Causes the specified actor to swim to the specified room pixel - ;; X-position. Suspends the current cutscene fork until the actor reaches - ;; the goal position. - SwimNpcAlex ; args: actor index, goal X-position (2 bytes) ;; Suspends the current cutscene fork for the specified number of frames. WaitFrames ; args: number of frames ;; Calls the specified function. If the function clears C/Z, then the @@ -178,16 +185,6 @@ kMaxForks = 4 ;; cutscene fork immediately continues on to the next action. WaitUntilC ; args: func ptr (2 bytes); func must return C WaitUntilZ ; args: func ptr (2 bytes); func must return Z - ;; Causes the specified actor to walk to the specified room pixel - ;; X-position. Suspends the current cutscene fork until the actor reaches - ;; the goal position. - WalkNpcAlex ; args: actor index, goal X-position (2 bytes) - WalkNpcBruno ; args: actor index, goal X-position (2 bytes) - WalkNpcGronta ; args: actor index, goal X-position (2 bytes) - WalkNpcMarie ; args: actor index, goal X-position (2 bytes) - WalkNpcNora ; args: actor index, goal X-position (2 bytes) - WalkNpcOrc ; args: actor index, goal X-position (2 bytes) - WalkNpcToddler ; args: actor index, goal X-position (2 bytes) NUM_VALUES .ENDENUM @@ -238,12 +235,51 @@ kMaxForks = 4 .word GOALX .ENDMACRO -;;; TODO: rename this to act_MoveAvatarWalk -.MACRO act_WalkAvatar GOALX +.MACRO act_MoveAvatarWalk GOALX .byte eAction::MoveAvatarWalk .word GOALX .ENDMACRO +.MACRO act_MoveNpcAlexSwim INDEX, GOALX + .byte eAction::MoveNpcAlexSwim, INDEX + .word GOALX +.ENDMACRO + +.MACRO act_MoveNpcAlexWalk INDEX, GOALX + .byte eAction::MoveNpcAlexWalk, INDEX + .word GOALX +.ENDMACRO + +.MACRO act_MoveNpcBrunoWalk INDEX, GOALX + .byte eAction::MoveNpcBrunoWalk, INDEX + .word GOALX +.ENDMACRO + +.MACRO act_MoveNpcGrontaWalk INDEX, GOALX + .byte eAction::MoveNpcGrontaWalk, INDEX + .word GOALX +.ENDMACRO + +.MACRO act_MoveNpcMarieWalk INDEX, GOALX + .byte eAction::MoveNpcMarieWalk, INDEX + .word GOALX +.ENDMACRO + +.MACRO act_MoveNpcNinaWalk INDEX, GOALX + .byte eAction::MoveNpcNinaWalk, INDEX + .word GOALX +.ENDMACRO + +.MACRO act_MoveNpcNoraWalk INDEX, GOALX + .byte eAction::MoveNpcNoraWalk, INDEX + .word GOALX +.ENDMACRO + +.MACRO act_MoveNpcOrcWalk INDEX, GOALX + .byte eAction::MoveNpcOrcWalk, INDEX + .word GOALX +.ENDMACRO + .MACRO act_PlayMusic EMUSIC .byte eAction::PlayMusic .byte EMUSIC @@ -356,11 +392,6 @@ kMaxForks = 4 .byte eAction::ShakeRoom, FRAMES .ENDMACRO -.MACRO act_SwimNpcAlex INDEX, GOALX - .byte eAction::SwimNpcAlex, INDEX - .word GOALX -.ENDMACRO - .MACRO act_WaitFrames FRAMES .byte eAction::WaitFrames, FRAMES .ENDMACRO @@ -375,39 +406,4 @@ kMaxForks = 4 .addr FUNC .ENDMACRO -.MACRO act_WalkNpcAlex INDEX, GOALX - .byte eAction::WalkNpcAlex, INDEX - .word GOALX -.ENDMACRO - -.MACRO act_WalkNpcBruno INDEX, GOALX - .byte eAction::WalkNpcBruno, INDEX - .word GOALX -.ENDMACRO - -.MACRO act_WalkNpcGronta INDEX, GOALX - .byte eAction::WalkNpcGronta, INDEX - .word GOALX -.ENDMACRO - -.MACRO act_WalkNpcMarie INDEX, GOALX - .byte eAction::WalkNpcMarie, INDEX - .word GOALX -.ENDMACRO - -.MACRO act_WalkNpcNora INDEX, GOALX - .byte eAction::WalkNpcNora, INDEX - .word GOALX -.ENDMACRO - -.MACRO act_WalkNpcOrc INDEX, GOALX - .byte eAction::WalkNpcOrc, INDEX - .word GOALX -.ENDMACRO - -.MACRO act_WalkNpcToddler INDEX, GOALX - .byte eAction::WalkNpcToddler, INDEX - .word GOALX -.ENDMACRO - ;;;=========================================================================;;; diff --git a/src/rooms/city_center.asm b/src/rooms/city_center.asm index ae6fb5a..b678b2c 100644 --- a/src/rooms/city_center.asm +++ b/src/rooms/city_center.asm @@ -746,7 +746,7 @@ _WriteRegLock: act_SetActorState1 kAlexActorIndex, eNpcChild::AlexStanding act_WaitFrames 30 ;; Make Alex walk over to talk to Gronta. - act_WalkNpcAlex kAlexActorIndex, $0346 + act_MoveNpcAlexWalk kAlexActorIndex, $0346 act_SetActorState1 kAlexActorIndex, eNpcChild::AlexStanding act_RunDialog eDialog::CityCenterBreakerCity1 act_SetActorState1 kGrontaActorIndex, eNpcOrc::GrontaStanding @@ -770,10 +770,10 @@ _WriteRegLock: ;; Make Gronta mutter to herself, then walk offscreen. act_SetActorFlags kAlexActorIndex, 0 act_RunDialog eDialog::CityCenterBreakerCity2 - act_WalkNpcGronta kGrontaActorIndex, $0418 + act_MoveNpcGrontaWalk kGrontaActorIndex, $0418 act_WaitFrames 90 ;; Make Alex walk to the edge of the roof. - act_WalkNpcAlex kAlexActorIndex, $0322 + act_MoveNpcAlexWalk kAlexActorIndex, $0322 act_SetActorState1 kAlexActorIndex, eNpcChild::AlexStanding act_WaitFrames 6 act_SetActorState1 kAlexActorIndex, eNpcChild::AlexKneeling diff --git a/src/rooms/core_boss.asm b/src/rooms/core_boss.asm index f033475..2a7c41a 100644 --- a/src/rooms/core_boss.asm +++ b/src/rooms/core_boss.asm @@ -1964,12 +1964,12 @@ _Blaster: act_SetActorState2 kGrontaActorIndex, $ff act_BranchIfZ _GetHorzScreen, _LeftSide_sCutscene _RightSide_sCutscene: - act_WalkAvatar $0168 + act_MoveAvatarWalk $0168 act_SetAvatarFlags kPaletteObjAvatarNormal | bObj::FlipH act_ForkStart 0, _IntroDialog_sCutscene _LeftSide_sCutscene: act_SetActorFlags kGrontaActorIndex, bObj::FlipH - act_WalkAvatar $00b8 + act_MoveAvatarWalk $00b8 act_SetAvatarFlags kPaletteObjAvatarNormal _IntroDialog_sCutscene: act_SetAvatarPose eAvatar::Standing @@ -2138,7 +2138,7 @@ _TurnOnFinalTerminal: ;; down, as though searching for an exit. act_ForkStart 1, _ShakeBig_sCutscene act_WaitFrames 30 - act_WalkAvatar $0100 + act_MoveAvatarWalk $0100 act_SetAvatarPose eAvatar::Standing act_WaitFrames 30 act_SetAvatarPose eAvatar::Kneeling diff --git a/src/rooms/core_lock.asm b/src/rooms/core_lock.asm index 5b30170..f63fd22 100644 --- a/src/rooms/core_lock.asm +++ b/src/rooms/core_lock.asm @@ -379,7 +379,7 @@ _Passages_sPassage_arr: act_SetActorVelY kGrontaActorIndex, 0 ;; Make Gronta run through the eastern passage. act_WaitFrames 20 - act_WalkNpcGronta kGrontaActorIndex, $0118 + act_MoveNpcGrontaWalk kGrontaActorIndex, $0118 act_WaitFrames 90 act_JumpToMain Main_Breaker_FadeBackToBreakerRoom _RaiseLift3: diff --git a/src/rooms/factory_elevator.asm b/src/rooms/factory_elevator.asm index 065e771..fa83802 100644 --- a/src/rooms/factory_elevator.asm +++ b/src/rooms/factory_elevator.asm @@ -642,7 +642,7 @@ _WriteL: act_SetAvatarVelX 0 act_SetAvatarPose eAvatar::Standing act_RunDialog eDialog::FactoryElevatorBrunoWait - act_WalkAvatar $00ba + act_MoveAvatarWalk $00ba act_SetAvatarFlags kPaletteObjAvatarNormal | 0 act_SetAvatarPose eAvatar::Standing act_WaitFrames 30 diff --git a/src/rooms/factory_vault.asm b/src/rooms/factory_vault.asm index f2aa2ce..07b1c24 100644 --- a/src/rooms/factory_vault.asm +++ b/src/rooms/factory_vault.asm @@ -182,7 +182,7 @@ _Passages_sPassage_arr: ;; Anna steps out of the way to the left. act_ForkStart 1, _WalkAvatar_sCutscene ;; Alex walks over to the big tank and kneels down for a closer look. - act_WalkNpcAlex kAlexActorIndex, $007a + act_MoveNpcAlexWalk kAlexActorIndex, $007a act_SetActorState1 kAlexActorIndex, eNpcChild::AlexStanding act_WaitFrames 45 act_SetActorState1 kAlexActorIndex, eNpcChild::AlexKneeling @@ -190,7 +190,7 @@ _Passages_sPassage_arr: ;; Alex reads off the label on the tank. act_RunDialog eDialog::FactoryVaultAlex2 ;; Alex walk over and looks at the tank from the right side. - act_WalkNpcAlex kAlexActorIndex, $009c + act_MoveNpcAlexWalk kAlexActorIndex, $009c act_SetActorState1 kAlexActorIndex, eNpcChild::AlexStanding act_WaitFrames 10 act_SetActorFlags kAlexActorIndex, bObj::FlipH @@ -198,7 +198,7 @@ _Passages_sPassage_arr: act_SetActorState1 kAlexActorIndex, eNpcChild::AlexLooking act_WaitFrames 90 ;; Alex walk over and looks at the tank from the left side. - act_WalkNpcAlex kAlexActorIndex, $006c + act_MoveNpcAlexWalk kAlexActorIndex, $006c act_SetActorState1 kAlexActorIndex, eNpcChild::AlexStanding act_WaitFrames 10 act_SetActorFlags kAlexActorIndex, 0 @@ -208,14 +208,14 @@ _Passages_sPassage_arr: ;; Alex thinks out loud for a bit. act_RunDialog eDialog::FactoryVaultAlex3 ;; Alex walks back to where he was standing before and talks to Anna again. - act_WalkNpcAlex kAlexActorIndex, $0060 + act_MoveNpcAlexWalk kAlexActorIndex, $0060 act_SetActorState1 kAlexActorIndex, eNpcChild::AlexStanding act_SetActorState2 kAlexActorIndex, 0 act_CallFunc _SetFlag act_RunDialog eDialog::FactoryVaultAlex1 act_ContinueExploring _WalkAvatar_sCutscene: - act_WalkAvatar $0050 | kTalkRightAvatarOffset + act_MoveAvatarWalk $0050 | kTalkRightAvatarOffset act_SetAvatarPose eAvatar::Standing act_SetAvatarFlags kPaletteObjAvatarNormal | 0 act_ForkStop $ff diff --git a/src/rooms/mermaid_hut1.asm b/src/rooms/mermaid_hut1.asm index 6cf3f54..1c4d911 100644 --- a/src/rooms/mermaid_hut1.asm +++ b/src/rooms/mermaid_hut1.asm @@ -247,7 +247,7 @@ _Alex: .PROC DataA_Cutscene_MermaidHut1AlexPetition_sCutscene act_RunDialog eDialog::MermaidHut1AlexPetition ;; Make Alex walk to the edge of the platform. - act_WalkNpcAlex kAlexActorIndex, $00a0 + act_MoveNpcAlexWalk kAlexActorIndex, $00a0 act_SetActorState1 kAlexActorIndex, eNpcChild::AlexStanding act_ForkStart 1, _MoveAvatarSwim_sCutscene act_WaitFrames 6 @@ -263,7 +263,7 @@ _Alex: act_SetActorVelY kAlexActorIndex, 0 act_SetActorPosY kAlexActorIndex, $00c4 ;; Make Alex swim to the door and exit the room. - act_SwimNpcAlex kAlexActorIndex, $0077 + act_MoveNpcAlexSwim kAlexActorIndex, $0077 act_SetActorState1 kAlexActorIndex, eNpcChild::AlexSwimDoor act_WaitFrames 15 act_CallFunc _RemoveAlex diff --git a/src/rooms/mermaid_spring.asm b/src/rooms/mermaid_spring.asm index 089c487..fff7a29 100644 --- a/src/rooms/mermaid_spring.asm +++ b/src/rooms/mermaid_spring.asm @@ -480,7 +480,7 @@ _RaindropVelY_u8_arr: .EXPORT DataA_Cutscene_MermaidSpringFixConsole_sCutscene .PROC DataA_Cutscene_MermaidSpringFixConsole_sCutscene act_ForkStart 1, _WalkAvatar_sCutscene - act_WalkNpcAlex kAlexActorIndex, $00ba + act_MoveNpcAlexWalk kAlexActorIndex, $00ba act_SetActorState1 kAlexActorIndex, eNpcChild::AlexStanding act_WaitFrames 45 act_SetActorState1 kAlexActorIndex, eNpcChild::AlexKneeling @@ -498,13 +498,13 @@ _RaindropVelY_u8_arr: act_WaitFrames 70 act_SetActorState1 kAlexActorIndex, eNpcChild::AlexStanding act_WaitFrames 45 - act_WalkNpcAlex kAlexActorIndex, $00b0 + act_MoveNpcAlexWalk kAlexActorIndex, $00b0 act_SetActorState1 kAlexActorIndex, eNpcChild::AlexStanding act_SetActorState2 kAlexActorIndex, 0 act_RunDialog eDialog::MermaidSpringAlex act_ContinueExploring _WalkAvatar_sCutscene: - act_WalkAvatar $00a0 | kTalkRightAvatarOffset + act_MoveAvatarWalk $00a0 | kTalkRightAvatarOffset act_SetAvatarPose eAvatar::Standing act_SetAvatarFlags kPaletteObjAvatarNormal act_ForkStop $ff diff --git a/src/rooms/mermaid_village.asm b/src/rooms/mermaid_village.asm index f03c2be..2503582 100644 --- a/src/rooms/mermaid_village.asm +++ b/src/rooms/mermaid_village.asm @@ -418,7 +418,7 @@ _Corra: .EXPORT DataA_Cutscene_MermaidVillageAlexLeave_sCutscene .PROC DataA_Cutscene_MermaidVillageAlexLeave_sCutscene - act_SwimNpcAlex kAlexActorIndex, $01f8 + act_MoveNpcAlexSwim kAlexActorIndex, $01f8 act_CallFunc _RemoveAlex act_ContinueExploring _RemoveAlex: diff --git a/src/rooms/prison_cell.asm b/src/rooms/prison_cell.asm index bcb7416..b7b7359 100644 --- a/src/rooms/prison_cell.asm +++ b/src/rooms/prison_cell.asm @@ -812,7 +812,7 @@ _ParticleAngle_u8_arr: act_WaitUntilZ _OpenGate ;; Animate the orc walking in. act_SetActorPosX kOrc1ActorIndex, $0118 - act_WalkNpcOrc kOrc1ActorIndex, $00f8 + act_MoveNpcOrcWalk kOrc1ActorIndex, $00f8 act_SetActorState1 kOrc1ActorIndex, eNpcOrc::GruntStanding act_WaitFrames 30 ;; Animate Anna getting thrown into the cell. @@ -837,7 +837,7 @@ _ParticleAngle_u8_arr: act_SetAvatarPose eAvatar::Sleeping ;; Animate the orc walking out. act_WaitFrames 30 - act_WalkNpcOrc kOrc1ActorIndex, $0118 + act_MoveNpcOrcWalk kOrc1ActorIndex, $0118 ;; Animate the prison gate closing. act_WaitUntilZ _CloseGate ;; Animate Anna standing back up. diff --git a/src/rooms/prison_upper.asm b/src/rooms/prison_upper.asm index f6ab32e..7db0b21 100644 --- a/src/rooms/prison_upper.asm +++ b/src/rooms/prison_upper.asm @@ -494,17 +494,17 @@ _FreeAlex: act_WaitFrames 90 act_SetActorFlags kBrunoActorIndex, bObj::Pri ;; Make a second orc run into the room and deliver a message to the first. - act_WalkNpcOrc kOrc2ActorIndex, $01b6 + act_MoveNpcOrcWalk kOrc2ActorIndex, $01b6 act_SetActorState1 kOrc2ActorIndex, eNpcOrc::GruntThrowing1 act_RunDialog eDialog::PrisonUpperBreakerTemple1 ;; Make the two orcs exit the room. act_ForkStart 1, _Orc2Exit_sCutscene - act_WalkNpcOrc kOrc1ActorIndex, $01ac + act_MoveNpcOrcWalk kOrc1ActorIndex, $01ac act_SetActorPosY kOrc1ActorIndex, $00b0 - act_WalkNpcOrc kOrc1ActorIndex, $01e8 + act_MoveNpcOrcWalk kOrc1ActorIndex, $01e8 act_WaitFrames 60 ;; Make Bruno call out after the guards. - act_WalkNpcBruno kBrunoActorIndex, $0179 + act_MoveNpcBrunoWalk kBrunoActorIndex, $0179 act_SetActorState1 kBrunoActorIndex, eNpcChild::BrunoStanding act_RunDialog eDialog::PrisonUpperBreakerTemple2 act_WaitFrames 60 @@ -512,7 +512,7 @@ _FreeAlex: _Orc2Exit_sCutscene: act_SetActorState1 kOrc2ActorIndex, eNpcOrc::GruntStanding act_WaitFrames 20 - act_WalkNpcOrc kOrc2ActorIndex, $01e8 + act_MoveNpcOrcWalk kOrc2ActorIndex, $01e8 act_ForkStop $ff .ENDPROC @@ -520,7 +520,7 @@ _Orc2Exit_sCutscene: .PROC DataA_Cutscene_PrisonUpperLoosenBrick_sCutscene act_ForkStart 1, _WalkAvatar_sCutscene ;; Animate Marie walking over to the eastern edge of her cell. - act_WalkNpcMarie kMarieActorIndex, kMarieJumpPositionX + act_MoveNpcMarieWalk kMarieActorIndex, kMarieJumpPositionX act_SetActorState1 kMarieActorIndex, eNpcChild::MarieStanding act_WaitFrames 60 ;; Animate Marie jumping up to push the brick. @@ -535,14 +535,14 @@ _Orc2Exit_sCutscene: act_SetActorPosY kMarieActorIndex, $00b8 act_WaitFrames 60 ;; Animate Marie walking back to her starting place. - act_WalkNpcMarie kMarieActorIndex, kMarieCellPositionX + act_MoveNpcMarieWalk kMarieActorIndex, kMarieCellPositionX act_SetActorState1 kMarieActorIndex, eNpcChild::MarieStanding act_SetActorState2 kMarieActorIndex, 0 act_RunDialog eDialog::PrisonUpperMarie act_SetScrollFlags 0 ; unlock scrolling from the previous dialog act_ContinueExploring _WalkAvatar_sCutscene: - act_WalkAvatar $0180 | kTalkRightAvatarOffset + act_MoveAvatarWalk $0180 | kTalkRightAvatarOffset act_SetAvatarPose eAvatar::Standing act_SetAvatarFlags kPaletteObjAvatarNormal act_ForkStop $ff @@ -579,7 +579,7 @@ _ApplyMarieGravity: act_SetActorState1 kAlexActorIndex, eNpcChild::AlexStanding act_WaitFrames 15 ;; Make Alex walk out of the prison cell. - act_WalkNpcAlex kAlexActorIndex, kAlexFreePositionX + act_MoveNpcAlexWalk kAlexActorIndex, kAlexFreePositionX act_SetActorState1 kAlexActorIndex, eNpcChild::AlexStanding act_SetActorState2 kAlexActorIndex, $00 act_ContinueExploring @@ -604,7 +604,7 @@ _OpenGate: ;; have Nina move to watch what's happening). act_ForkStart 1, _Scroll_sCutscene act_ForkStart 2, _NinaWait_sCutscene - act_WalkNpcAlex kAlexActorIndex, kFreeKidsOffscreenPositionX + act_MoveNpcAlexWalk kAlexActorIndex, kFreeKidsOffscreenPositionX ;; Have Alex pick the locks offscreen. While he does so, Nina leads Nora ;; out of the cell. act_WaitFrames 30 @@ -618,14 +618,14 @@ _OpenGate: act_WaitFrames 10 act_ForkStart 2, _NinaEscape_sCutscene act_WaitFrames 31 - act_WalkNpcNora kNoraActorIndex, kFreeKidsOffscreenPositionX + act_MoveNpcNoraWalk kNoraActorIndex, kFreeKidsOffscreenPositionX act_WaitFrames 90 ;; Make Alex walk back onscreen to report on his scouting. - act_WalkNpcAlex kAlexActorIndex, $00d8 + act_MoveNpcAlexWalk kAlexActorIndex, $00d8 act_SetActorState1 kAlexActorIndex, eNpcChild::AlexStanding act_RunDialog eDialog::PrisonUpperAlexLast ;; Make Alex walk back offscreen (and lead the kids out offscreen). - act_WalkNpcAlex kAlexActorIndex, kFreeKidsOffscreenPositionX + act_MoveNpcAlexWalk kAlexActorIndex, kFreeKidsOffscreenPositionX act_CallFunc _RemoveKids act_SetScrollFlags 0 act_ContinueExploring @@ -635,10 +635,10 @@ _Scroll_sCutscene: act_ForkStop $ff _NinaWait_sCutscene: act_WaitFrames 10 - act_WalkNpcToddler kNinaActorIndex, $00f8 + act_MoveNpcNinaWalk kNinaActorIndex, $00f8 act_ForkStop $ff _NinaEscape_sCutscene: - act_WalkNpcToddler kNinaActorIndex, kFreeKidsOffscreenPositionX + act_MoveNpcNinaWalk kNinaActorIndex, kFreeKidsOffscreenPositionX act_ForkStop $ff _RemoveKids: ;; Remove talk devices. diff --git a/src/rooms/sewer_pool.asm b/src/rooms/sewer_pool.asm index a8d0aee..2368612 100644 --- a/src/rooms/sewer_pool.asm +++ b/src/rooms/sewer_pool.asm @@ -147,7 +147,7 @@ _Passages_sPassage_arr: act_SetCutsceneFlags bCutscene::TickAllActors act_SetAvatarState 0 act_SetAvatarVelX 0 - act_WalkAvatar $0116 + act_MoveAvatarWalk $0116 act_SetAvatarFlags kPaletteObjAvatarNormal | bObj::FlipH | bObj::Pri act_SetAvatarPose eAvatar::Kneeling act_WaitFrames 20 diff --git a/src/rooms/temple_entry.asm b/src/rooms/temple_entry.asm index 887137c..7b9115d 100644 --- a/src/rooms/temple_entry.asm +++ b/src/rooms/temple_entry.asm @@ -378,7 +378,7 @@ _MoveColumn: act_SetAvatarVelX 0 act_SetAvatarPose eAvatar::Standing act_RunDialog eDialog::TempleEntryCorraWait - act_WalkAvatar $00e6 + act_MoveAvatarWalk $00e6 act_SetAvatarFlags kPaletteObjAvatarNormal | bObj::FlipH act_SetAvatarPose eAvatar::Standing act_WaitFrames 30 diff --git a/src/rooms/temple_nave.asm b/src/rooms/temple_nave.asm index c39adea..9333546 100644 --- a/src/rooms/temple_nave.asm +++ b/src/rooms/temple_nave.asm @@ -665,7 +665,7 @@ _MoveToBottomRight: act_WaitFrames 90 ;; Make Alex talk more, then walk over to his boosting position. act_RunDialog eDialog::TempleNaveAlexBoost1 - act_WalkNpcAlex kAlexActorIndex, kAlexBoostingPositionX + act_MoveNpcAlexWalk kAlexActorIndex, kAlexBoostingPositionX ;; Animate Alex turning around, crouching down, and raising his arms to ;; give Anna a boost. act_SetActorFlags kAlexActorIndex, 0 diff --git a/src/rooms/town_house4.asm b/src/rooms/town_house4.asm index 7faa202..210d6a8 100644 --- a/src/rooms/town_house4.asm +++ b/src/rooms/town_house4.asm @@ -195,7 +195,7 @@ _Devices_sDevice_arr: .EXPORT DataA_Cutscene_TownHouse4BreakerLava_sCutscene .PROC DataA_Cutscene_TownHouse4BreakerLava_sCutscene act_WaitFrames 30 - act_WalkNpcOrc kThurgActorIndex, $0060 + act_MoveNpcOrcWalk kThurgActorIndex, $0060 act_SetActorState1 kThurgActorIndex, eNpcOrc::GruntStanding act_RunDialog eDialog::TownHouse4BreakerLava1 act_SetActorState1 kThurgActorIndex, eNpcOrc::GruntThrowing1 @@ -217,14 +217,14 @@ _Devices_sDevice_arr: act_WaitFrames 70 act_SetActorFlags kThurgActorIndex, 0 act_WaitFrames 30 - act_WalkNpcOrc kThurgActorIndex, $0070 + act_MoveNpcOrcWalk kThurgActorIndex, $0070 act_SetActorState1 kThurgActorIndex, eNpcOrc::GruntStanding act_WaitFrames 30 act_RunDialog eDialog::TownHouse4BreakerLava3 - act_WalkNpcOrc kThurgActorIndex, $0088 + act_MoveNpcOrcWalk kThurgActorIndex, $0088 act_CallFunc _RemoveThurg act_WaitFrames 30 - act_WalkNpcOrc kHobokActorIndex, $0050 + act_MoveNpcOrcWalk kHobokActorIndex, $0050 act_SetActorState1 kHobokActorIndex, eNpcOrc::GruntStanding act_WaitFrames 60 act_JumpToMain Main_Breaker_FadeBackToBreakerRoom diff --git a/src/rooms/town_outdoors.asm b/src/rooms/town_outdoors.asm index bb750fd..cef0946 100644 --- a/src/rooms/town_outdoors.asm +++ b/src/rooms/town_outdoors.asm @@ -497,7 +497,7 @@ _SetFace: .EXPORT DataA_Cutscene_TownOutdoorsOrcAttack_sCutscene .PROC DataA_Cutscene_TownOutdoorsOrcAttack_sCutscene act_CallFunc _RemoveDevicesAndTownsfolk - act_WalkNpcAlex kAlexActorIndex, kAlexPickupPositionX + act_MoveNpcAlexWalk kAlexActorIndex, kAlexPickupPositionX ;; Animate Alex bending down, picking something up, then turning around and ;; showing it to Anna. act_SetActorState1 kAlexActorIndex, eNpcChild::AlexKneeling @@ -585,9 +585,9 @@ _InitOrcs: act_SetAvatarPose eAvatar::Sleeping act_WaitFrames 30 act_CallFunc _InitThurgAndGrunt - act_WalkNpcOrc kThurgActorIndex, kOrc1InitPosX + act_MoveNpcOrcWalk kThurgActorIndex, kOrc1InitPosX act_SetActorState1 kThurgActorIndex, eNpcOrc::GruntStanding - act_WalkNpcOrc kOrc3ActorIndex, kOrc2InitPosX + act_MoveNpcOrcWalk kOrc3ActorIndex, kOrc2InitPosX act_SetActorState1 kOrc3ActorIndex, eNpcOrc::GruntStanding act_WaitFrames 60 act_RunDialog eDialog::TownOutdoorsGronta