summaryrefslogtreecommitdiff
path: root/home/npc_movement.asm
diff options
context:
space:
mode:
Diffstat (limited to 'home/npc_movement.asm')
-rw-r--r--home/npc_movement.asm10
1 files changed, 3 insertions, 7 deletions
diff --git a/home/npc_movement.asm b/home/npc_movement.asm
index a3367f9a..40942bf3 100644
--- a/home/npc_movement.asm
+++ b/home/npc_movement.asm
@@ -31,13 +31,11 @@ RunNPCMovementScript::
ldh a, [hLoadedROMBank]
push af
ld a, [wNPCMovementScriptBank]
- ldh [hLoadedROMBank], a
- ld [MBC1RomBank], a
+ call BankswitchCommon
ld a, [wNPCMovementScriptFunctionNum]
call CallFunctionInTable
pop af
- ldh [hLoadedROMBank], a
- ld [MBC1RomBank], a
+ call BankswitchCommon
ret
.NPCMovementScriptPointerTables
@@ -52,13 +50,11 @@ EndNPCMovementScript::
DebugPressedOrHeldB::
IF DEF(_DEBUG)
- ld a, [wd732]
- bit 1, a
- ret z
ldh a, [hJoyHeld]
bit BIT_B_BUTTON, a
ret nz
ldh a, [hJoyPressed]
bit BIT_B_BUTTON, a
+ ret
ENDC
ret