diff options
| author | PikalaxALT <PikalaxALT@gmail.com> | 2015-12-15 10:55:56 -0500 |
|---|---|---|
| committer | PikalaxALT <PikalaxALT@gmail.com> | 2015-12-15 10:55:56 -0500 |
| commit | bb2aba7da172f8ede8c3eb6f3602f62eff4d55be (patch) | |
| tree | fad111d96257f01b40f56c58e2355fcbd7885d6f /engine | |
| parent | 6e257bc7cdab3249cc8fbdf4c808f0ebc442022e (diff) | |
No more ItemFragment
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/events.asm | 4 | ||||
| -rw-r--r-- | engine/movement.asm | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/engine/events.asm b/engine/events.asm index d78a0a333..02381bbc3 100644 --- a/engine/events.asm +++ b/engine/events.asm @@ -641,7 +641,7 @@ TryObjectEvent: ; 969b5 .pointers dbw PERSONTYPE_SCRIPT, .script - dbw PERSONTYPE_ITEMFRAGMENT, .itemfragment + dbw PERSONTYPE_ITEMBALL, .itemball dbw PERSONTYPE_TRAINER, .trainer ; the remaining four are dummy events dbw PERSONTYPE_3, .three @@ -662,7 +662,7 @@ TryObjectEvent: ; 969b5 ret ; 96a12 -.itemfragment ; 96a12 +.itemball ; 96a12 ld hl, MAPOBJECT_SCRIPT_POINTER add hl, bc ld a, [hli] diff --git a/engine/movement.asm b/engine/movement.asm index 86a2eb6fb..8de9c2590 100644 --- a/engine/movement.asm +++ b/engine/movement.asm @@ -88,7 +88,7 @@ MovementPointers: ; 5075 dw Movement_56 ; 56 dw Movement_rock_smash ; 57 dw Movement_return_dig ; 58 - dw Movement_59 ; 59 + dw Movement_run_before_fall ; 59 ; 5129 @@ -113,7 +113,7 @@ Movement_skyfall: ; 5137 ret ; 513e -Movement_59: ; 513e +Movement_run_before_fall: ; 513e ld hl, OBJECT_STEP_TYPE add hl, bc ld [hl], STEP_TYPE_19 |