diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2025-06-30 12:47:22 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-06-30 12:47:22 -0400 |
| commit | 56c405de09ce267c4cfbc68a15c37b2ff51c635a (patch) | |
| tree | 47d25c237e9af824f7a57295a2d2e298b194a8e6 /home/npc_movement.asm | |
| parent | Distinguish single trainer pics section from Pokemon pics (diff) | |
| download | pokeyellow-56c405de09ce267c4cfbc68a15c37b2ff51c635a.tar.gz pokeyellow-56c405de09ce267c4cfbc68a15c37b2ff51c635a.tar.xz pokeyellow-56c405de09ce267c4cfbc68a15c37b2ff51c635a.zip | |
Replace hardware_constants.asm with hardware.inc (#511)
Diffstat (limited to 'home/npc_movement.asm')
| -rw-r--r-- | home/npc_movement.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/home/npc_movement.asm b/home/npc_movement.asm index 96804fdf..ccbd78df 100644 --- a/home/npc_movement.asm +++ b/home/npc_movement.asm @@ -32,12 +32,12 @@ RunNPCMovementScript:: push af ld a, [wNPCMovementScriptBank] ldh [hLoadedROMBank], a - ld [MBC1RomBank], a + ld [rROMB], a ld a, [wNPCMovementScriptFunctionNum] call CallFunctionInTable pop af ldh [hLoadedROMBank], a - ld [MBC1RomBank], a + ld [rROMB], a ret .NPCMovementScriptPointerTables @@ -58,9 +58,9 @@ IF DEF(_DEBUG) bit BIT_DEBUG_MODE, a ret z ldh a, [hJoyHeld] - bit BIT_B_BUTTON, a + bit B_PAD_B, a ret nz ldh a, [hJoyPressed] - bit BIT_B_BUTTON, a + bit B_PAD_B, a ENDC ret |