aboutsummaryrefslogtreecommitdiffstats
path: root/engine/overworld
diff options
context:
space:
mode:
authorpikalaxalt <PikalaxALT@gmail.com>2016-05-21 22:54:46 -0400
committerpikalaxalt <PikalaxALT@gmail.com>2016-05-21 22:54:46 -0400
commitf3f117cbf3be12adfaa0c3195266dfa9f6f8734b (patch)
treed9eb707742b4a8b64b42b1c3f424f3ca2e232a78 /engine/overworld
parentSome work on disassembling npc movement scripts (aka informed copy/paste from... (diff)
downloadpokeyellow-f3f117cbf3be12adfaa0c3195266dfa9f6f8734b.tar.gz
pokeyellow-f3f117cbf3be12adfaa0c3195266dfa9f6f8734b.tar.xz
pokeyellow-f3f117cbf3be12adfaa0c3195266dfa9f6f8734b.zip
Oh wait, there's predef_const declarations. Huh.
Diffstat (limited to 'engine/overworld')
-rwxr-xr-xengine/overworld/npc_movement.asm8
1 files changed, 2 insertions, 6 deletions
diff --git a/engine/overworld/npc_movement.asm b/engine/overworld/npc_movement.asm
index 5c86d94f..d7f2b1cd 100755
--- a/engine/overworld/npc_movement.asm
+++ b/engine/overworld/npc_movement.asm
@@ -96,9 +96,7 @@ PalletMovementScript_PlayerMoveLeft: ; 1a597 (6:6597)
ld a, [wNumStepsToTake]
ld [wSimulatedJoypadStatesIndex], a
ld [hNPCMovementDirections2Index], a
- ; predef ConvertNPCMovementDirectionsToJoypadMasks
- ld a, $23
- call Predef
+ predef ConvertNPCMovementDirectionsToJoypadMasks
call StartSimulatingJoypadStates
ld a, $2
ld [wNPCMovementScriptFunctionNum], a
@@ -157,9 +155,7 @@ PalletMovementScript_Done: ; 1a606 (6:6606)
ret nz
ld a, $0
ld [wMissableObjectIndex], a
- ; predef HideObject
- ld a, $11
- call Predef
+ predef HideObject
ld hl, wd730
res 7, [hl]
ld hl, wd72e