Labelling and separating bank01.asm (#117)

* Started labelling dumped bank 1 functions, identified movement values

* Changed all NPCs to use the new movement constants

* Updated the rest of the movement constant instances, removed the old movement_constants.asm

* Ready to deal the finishing blow to bank01.asm

* Bank 01 is no more. Other scattered changes.

* Labelled a few flags and matched a few variables with pokegold

* Finished labelling bank02.asm too while I was at it

audio/engine.asm

@@ -2221,9 +2221,10 @@ Music_Transpose:
 	ret
 
 Music_StereoPanning:
-	ld a, [wce5f]
-	bit 5, a
+	ld a, [wOptions]
+	bit STEREO_F, a
 	ret z
+	; fallthrough
 
 Music_ForceStereoPanning:
 	call SetLRTracks
@@ -2619,8 +2620,8 @@ _PlayCryHeader::
 	and a
 	jr z, .next
 
-	ld a, [wce5f]
-	bit 5, a
+	ld a, [wOptions]
+	bit STEREO_F, a
 	jr z, .next
 
 	ld hl, CHANNEL_TRACKS
@@ -2688,8 +2689,8 @@ _PlaySFX::
 	ret
 
 PlayStereoSFX::
-	ld a, [wce5f]
-	bit 5, a	; Stereo flag?
+	ld a, [wOptions]
+	bit STEREO_F, a
 	jr z, _PlaySFX
 
 	ld hl, wMusicID

constants.asm

@@ -18,6 +18,7 @@ INCLUDE "macros/battle_commands.asm"
 INCLUDE "macros/oam_anims.asm"
 INCLUDE "macros/battle_anims.asm"
 INCLUDE "macros/asserts.asm"
+INCLUDE "macros/scripts/movement.asm"
 
 INCLUDE "constants/audio_constants.asm"
 INCLUDE "constants/gfx_constants.asm"
@@ -62,7 +63,6 @@ INCLUDE "constants/wram_constants.asm"
 INCLUDE "constants/sgb_constants.asm"
 INCLUDE "constants/map_object_constants.asm"
 INCLUDE "constants/start_menu_constants.asm"
-INCLUDE "constants/movement_constants.asm"
 
 INCLUDE "constants/flypoint_constants.asm"
 INCLUDE "constants/spawnpoint_constants.asm"

constants/collision_constants.asm

@@ -27,10 +27,9 @@ DEF COLLISION_FLAG EQU $08
 
 ; old collision constants
 
-DEF OLD_COLLISION_TYPE_REGULAR EQU $00
-DEF OLD_COLLISION_TYPE_SCENERY EQU $10
-DEF OLD_COLLISION_TYPE_WATER   EQU $20
-DEF OLD_COLLISION_TYPE_WATER2  EQU $40
+DEF OLD_HI_NYBBLE_TALL_GRASS EQU $10
+DEF OLD_HI_NYBBLE_WATER   EQU $20
+DEF OLD_HI_NYBBLE_WATER_ALT  EQU $40
 
 DEF OLD_COLLISION_WALKABLE EQU $00
 DEF OLD_COLLISION_SOLID    EQU $01
@@ -56,18 +55,6 @@ DEF OLD_COLLISION_GRASS    EQU $82
 
 ; new collision constants
 
-DEF COLLISION_TYPE_REGULAR EQU $00
-DEF COLLISION_TYPE_SCENERY EQU $10
-DEF COLLISION_TYPE_WATER   EQU $20
-DEF COLLISION_TYPE_WATER2  EQU $30
-DEF COLLISION_TYPE_LAND    EQU $40
-DEF COLLISION_TYPE_LAND2   EQU $50
-DEF COLLISION_TYPE_UNK     EQU $60
-DEF COLLISION_TYPE_WARPS   EQU $70
-DEF COLLISION_TYPE_UNKN2   EQU $80
-DEF COLLISION_TYPE_SPECIAL EQU $90
-DEF COLLISION_TYPE_JUMP    EQU $A0
-
 DEF COLLISION_WALKABLE EQU $00
 DEF COLLISION_SOLID    EQU $07
 DEF COLLISION_CUT_TREE EQU $12
@@ -114,6 +101,8 @@ DEF COLLISION_PC                EQU $93
 DEF COLLISION_RADIO             EQU $94
 DEF COLLISION_SIGNPOST          EQU $95
 DEF COLLISION_STRAIGHT_SIGNPOST EQU $97
+DEF COLLISION_COUNTER_98        EQU $98
+
 
 ; jump collisions
 ; perform jump in marked direction, else
@@ -130,3 +119,14 @@ DEF COLLISION_JUMP_NW EQU $a7
 DEF NEVER_SOLID     EQU 0
 DEF SOMETIMES_SOLID EQU 1
 DEF ALWAYS_SOLID    EQU 15
+
+; collision data type nybbles
+DEF LO_NYBBLE_GRASS      EQU $07
+DEF HI_NYBBLE_TALL_GRASS EQU $10
+DEF HI_NYBBLE_WATER      EQU $20
+DEF HI_NYBBLE_WATER_ALT  EQU $30 ; HI_NYBBLE_CURRENT in final
+DEF HI_NYBBLE_WALK       EQU $40
+DEF HI_NYBBLE_WALK_ALT   EQU $50
+DEF HI_NYBBLE_WARPS      EQU $70
+DEF HI_NYBBLE_SPECIAL    EQU $90
+DEF HI_NYBBLE_LEDGES     EQU $a0

constants/map_object_constants.asm

@@ -13,7 +13,7 @@ DEF OBJECT_ACTION           rb ; 0a
 DEF OBJECT_STEP_FRAME       rb ; 0b
 DEF OBJECT_0C               rb ; 0c
 DEF OBJECT_FACING           rb ; 0d
-DEF OBJECT_TILE             rb ; 0e
+DEF OBJECT_TILE_COLLISION   rb ; 0e
 DEF OBJECT_LAST_TILE        rb ; 0f
 DEF OBJECT_MAP_X            rb ; 10
 DEF OBJECT_MAP_Y            rb ; 11
@@ -28,20 +28,119 @@ DEF OBJECT_SPRITE_Y         rb ; 19
 DEF OBJECT_SPRITE_X_OFFSET  rb ; 1a
 DEF OBJECT_SPRITE_Y_OFFSET  rb ; 1b
 DEF OBJECT_MOVEMENT_INDEX   rb ; 1c
-DEF OBJECT_1D               rb ; 1d
+DEF OBJECT_JUMPTABLE_INDEX  rb ; 1d
 DEF OBJECT_1E               rb ; 1e
-DEF OBJECT_1F               rb ; 1f
+DEF OBJECT_JUMP_HEIGHT      rb ; 1f
 DEF OBJECT_RANGE            rb ; 20
 DEF OBJECT_21               rb ; 21
                             rb_skip 6
 DEF OBJECT_LENGTH EQU _RS
 DEF NUM_OBJECT_STRUCTS EQU 10
+DEF UNKNOWN_STRUCT  EQU 0
 DEF PLAYER_STRUCT   EQU 1
 DEF FOLLOWER_STRUCT EQU 2
 
+; object_struct OBJECT_DIRECTION values
+DEF OW_DOWN  EQU DOWN  << 2
+DEF OW_UP    EQU UP    << 2
+DEF OW_LEFT  EQU LEFT  << 2
+DEF OW_RIGHT EQU RIGHT << 2
+
+; object_struct OBJECT_FLAGS1 bit flags
+	const_def
+	shift_const INVISIBLE       ; 0
+	shift_const WONT_DELETE     ; 1
+	shift_const FIXED_FACING    ; 2
+	shift_const SLIDING         ; 3
+	shift_const COLLISION_TILES ; 4
+	shift_const NOCLIP_NOT_SET  ; 5
+	shift_const COLLISION_OBJS  ; 6
+	shift_const CENTERED_OBJECT ; 7
+
+; object_struct OBJECT_FLAGS2 bit flags
+	const_def
+	shift_const LOW_PRIORITY   ; 0
+	shift_const HIGH_PRIORITY  ; 1
+	shift_const BOULDER_MOVING ; 2
+	shift_const OVERHEAD       ; 3
+	shift_const USE_OBP1       ; 4
+	shift_const FROZEN         ; 5
+	shift_const OFF_SCREEN     ; 6
+	shift_const OBJ_FLAGS2_7   ; 7
+
+; facing attribute bit flags
+	const_def
+	shift_const FACING_DONE        ; 0
+	shift_const RELATIVE_ATTRIBUTES ; 1
+
+; Minor object struct
 	rsreset
-DEF CMDQUEUE_UNK0 rb 16
-DEF CMDQUEUE_ENTRY_SIZE EQU _RS
+DEF MINOR_OBJECT_PARENT_OBJECT   rb ; 00
+DEF MINOR_OBJECT_TYPE            rb ; 01
+DEF MINOR_OBJECT_ANIM            rb ; 02
+DEF MINOR_OBJECT_SPRITE_TILE     rb ; 03
+DEF MINOR_OBJECT_X_POS           rb ; 04
+DEF MINOR_OBJECT_Y_POS           rb ; 05
+DEF MINOR_OBJECT_X_OFFSET        rb ; 06
+DEF MINOR_OBJECT_Y_OFFSET        rb ; 07
+DEF MINOR_OBJECT_08              rb ; 08
+DEF MINOR_OBJECT_ANIM_TIMER      rb ; 09
+DEF MINOR_OBJECT_JUMPTABLE_INDEX rb ; 0a
+DEF MINOR_OBJECT_TIMER           rb ; 0b
+DEF MINOR_OBJECT_FRAME           rb ; 0c
+DEF MINOR_OBJECT_VAR1            rb ; 0d
+DEF MINOR_OBJECT_VAR2            rb ; 0e
+DEF MINOR_OBJECT_VAR3            rb ; 0f
+DEF MINOR_OBJECT_LENGTH EQU _RS
+DEF NUM_MINOR_OBJECTS EQU 4
+
+; MinorObject types
+	const_def
+	const MINOR_OBJECT_TYPE_NULL         ; 0
+	const MINOR_OBJECT_TYPE_SHADOW       ; 1
+	const MINOR_OBJECT_TYPE_EMOTE        ; 2
+	const MINOR_OBJECT_TYPE_03           ; 3
+	const MINOR_OBJECT_TYPE_04           ; 4
+	const MINOR_OBJECT_TYPE_BOULDER_DUST ; 5
+DEF NUM_MINOR_OBJECT_TYPES EQU const_value
+
+; MinorObject animations
+	const_def
+	const MINOR_OBJECT_ANIM_NULL         ; 0
+	const MINOR_OBJECT_ANIM_SHADOW       ; 1
+	const MINOR_OBJECT_ANIM_EMOTE        ; 2
+	const MINOR_OBJECT_ANIM_03           ; 3
+	const MINOR_OBJECT_ANIM_BOULDER_DUST ; 4
+DEF NUM_MINOR_OBJECT_ANIMATIONS EQU const_value
+
+; MinorObjectSpriteTiles indexes
+	const_def
+	const MINOR_OBJECT_SPRITE_NULL           ; 0
+	const MINOR_OBJECT_SPRITE_EMOTE          ; 1
+	const MINOR_OBJECT_SPRITE_SHADOW         ; 2
+	const MINOR_OBJECT_SPRITE_BOULDER_DUST_1 ; 3
+	const MINOR_OBJECT_SPRITE_BOULDER_DUST_2 ; 4
+DEF NUM_MINOR_OBJECT_SPRITES EQU const_value
+
+; MinorObjectGFX indexes (see _LoadMinorObjectGFX)
+	const_def
+	const MINOR_OBJECT_GFX_NULL                 ; 0
+	const MINOR_OBJECT_GFX_SHADOW               ; 1
+	const MINOR_OBJECT_GFX_UNKNOWN_BOUNCING_ORB ; 2
+	const MINOR_OBJECT_GFX_SHOCK_EMOTE          ; 3
+	const MINOR_OBJECT_GFX_QUESTION_EMOTE       ; 4
+	const MINOR_OBJECT_GFX_HAPPY_EMOTE          ; 5
+	const MINOR_OBJECT_GFX_BOULDER_DUST         ; 6
+	const MINOR_OBJECT_GFX_GRAMPS_STAND_1       ; 7
+	const MINOR_OBJECT_GFX_GRAMPS_STAND_2       ; 8
+	const MINOR_OBJECT_GFX_GRAMPS_WALK_1        ; 9
+	const MINOR_OBJECT_GFX_GRAMPS_WALK_2        ; a
+	const MINOR_OBJECT_GFX_CLEFAIRY_STAND_1     ; b
+	const MINOR_OBJECT_GFX_CLEFAIRY_STAND_2     ; c
+	const MINOR_OBJECT_GFX_CLEFAIRY_WALK_1      ; d
+	const MINOR_OBJECT_GFX_CLEFAIRY_WALK_2      ; e
+DEF NUM_MINOR_OBJECT_GFX_ENTRIES EQU const_value
+
 
 	rsreset
 DEF MAPOBJECT_OBJECT_STRUCT_ID rb ; 0
@@ -64,6 +163,52 @@ DEF PLAYER_OBJECT EQU 0
 DEF MAPOBJECT_SCREEN_WIDTH  EQU (SCREEN_WIDTH / 2) + 2
 DEF MAPOBJECT_SCREEN_HEIGHT EQU (SCREEN_HEIGHT / 2) + 2
 
+; StepFunction_FromMovement.Pointers indexes (see engine/overworld/map_objects.asm)
+	const_def
+	const SPRITEMOVEFN_00                    ; 00
+	const SPRITEMOVEFN_RANDOM_WALK_XY        ; 01
+	const SPRITEMOVEFN_RANDOM_SPIN           ; 02
+	const SPRITEMOVEFN_RANDOM_WALK_Y         ; 03
+	const SPRITEMOVEFN_RANDOM_WALK_X         ; 04
+	const SPRITEMOVEFN_TURN_DOWN             ; 05
+	const SPRITEMOVEFN_TURN_UP               ; 06
+	const SPRITEMOVEFN_TURN_LEFT             ; 07
+	const SPRITEMOVEFN_TURN_RIGHT            ; 08
+	const_skip 7                             ; 09-0f
+	const SPRITEMOVEFN_OBEY_DPAD             ; 10
+	const SPRITEMOVEFN_INDEXED_1             ; 11
+	const SPRITEMOVEFN_INDEXED_2             ; 12
+	const SPRITEMOVEFN_FOLLOW_1              ; 13
+	const SPRITEMOVEFN_14                    ; 14
+	const SPRITEMOVEFN_15                    ; 15
+	const SPRITEMOVEFN_16                    ; 16
+	const SPRITEMOVEFN_17                    ; 17, used by debug cursor
+	const SPRITEMOVEFN_FOLLOW_2              ; 18
+	const SPRITEMOVEFN_SCRIPTED              ; 19
+	const SPRITEMOVEFN_1A                    ; 1a
+DEF NUM_SPRITEMOVEFN EQU const_value
+
+; StepTypesJumptable indexes (see engine/overworld/map_objects.asm)
+	const_def
+	const STEP_TYPE_RESET            ; 00
+	const STEP_TYPE_FROM_MOVEMENT    ; 01
+	const STEP_TYPE_NPC_WALK         ; 02
+	const STEP_TYPE_SLEEP            ; 03
+	const STEP_TYPE_STANDING         ; 04
+	const STEP_TYPE_PLAYER_WALK      ; 05
+	const STEP_TYPE_CONTINUE_WALK    ; 06
+	const STEP_TYPE_OBEY_DPAD        ; 07
+	const STEP_TYPE_INDEXED_1        ; 08
+	const STEP_TYPE_INDEXED_2        ; 09
+	const STEP_TYPE_FOLLOW           ; 0a
+	const_skip 4                     ; 0b-0e
+	const STEP_TYPE_NPC_JUMP         ; 0f
+	const STEP_TYPE_PLAYER_JUMP      ; 10
+	const STEP_TYPE_TELEPORT_FROM    ; 11
+	const STEP_TYPE_TELEPORT_TO      ; 12
+	const STEP_TYPE_13               ; 13
+DEF NUM_STEP_TYPES EQU const_value
+
 	rsreset
 DEF MAPOBJECTTEMPLATE_SPRITE           rb 1 ; 0
 DEF MAPOBJECTTEMPLATE_Y_COORD          rb 1 ; 1
@@ -79,5 +224,28 @@ DEF MAPOBJECTTEMPLATE_POINTER_HI       rb 1 ; a
 DEF MAPOBJECTTEMPLATE_EVENT_FLAG       rw 1 ; b
 DEF MAP_OBJECT_TEMPLATE_LENGTH EQU _RS
 
+DEF SPRITE_GFX_LIST_CAPACITY EQU 12 ; see wUsedSprites
+
 DEF PLAYER_OBJECT_INDEX    EQU 1
-DEF COMPANION_OBJECT_INDEX EQU 2
+DEF FOLLOWER_OBJECT_INDEX  EQU 2
+
+; ObjectActionPairPointers indexes (see engine/overworld/map_object_action.asm)
+	const_def
+	const OBJECT_ACTION_00            ; 00
+	const OBJECT_ACTION_STEP          ; 01
+	const OBJECT_ACTION_STAND         ; 02
+	const OBJECT_ACTION_SPIN          ; 03
+DEF NUM_OBJECT_ACTIONS EQU const_value
+
+
+; DoPlayerMovement.DoStep arguments (see engine/overworld/player_movement.asm)
+	const_def
+	const STEP_SLOW          ; 0
+	const STEP_WALK          ; 1
+	const STEP_BIKE          ; 2
+	const STEP_FASTEST       ; 3
+	const STEP_ICE           ; 4
+	const STEP_TURN          ; 5
+	const STEP_BACK_LEDGE    ; 6
+	const STEP_WALK_IN_PLACE ; 7
+DEF NUM_STEPS EQU const_value

constants/menu_constants.asm

@@ -111,3 +111,15 @@ DEF HMENURETURN_ASM    EQU %11111111
 	const_def 1
 	const SCROLLINGMENU_ITEMS_NORMAL
 	const SCROLLINGMENU_ITEMS_QUANTITY
+
+; Naming types (see engine/menus/naming_screen.asm)
+	const_def
+	const NAME_MON
+	const NAME_PLAYER
+	const NAME_RIVAL
+	const NAME_MOM
+	const NAME_BOX
+	const NAME_5 ; duplicate of NAME_MON
+	const NAME_6 ; duplicate of NAME_MON
+	const NAME_7 ; duplicate of NAME_MON
+DEF NUM_NAME_TYPES EQU const_value

constants/movement_constants.asm

@@ -1,53 +0,0 @@
-	const_def
-	const FACE_DOWN         ; $00
-	const FACE_UP           ; $01
-	const FACE_LEFT         ; $02
-	const FACE_RIGHT        ; $03
-	const SLOW_STEP_DOWN    ; $04
-	const SLOW_STEP_UP      ; $05
-	const SLOW_STEP_LEFT    ; $06
-	const SLOW_STEP_RIGHT   ; $07
-	const STEP_DOWN         ; $08
-	const STEP_UP           ; $09
-	const STEP_LEFT         ; $0a
-	const STEP_RIGHT        ; $0b
-	const FAST_STEP_DOWN    ; $0c
-	const FAST_STEP_UP      ; $0d
-	const FAST_STEP_LEFT    ; $0e
-	const FAST_STEP_RIGHT   ; $0f
-	const FAST_STEP_DOWN2   ; $10
-	const FAST_STEP_UP2     ; $11
-	const FAST_STEP_LEFT2   ; $12
-	const FAST_STEP_RIGHT2  ; $13
-	const SLOW_JUMP_DOWN    ; $14
-	const SLOW_JUMP_UP      ; $15
-	const SLOW_JUMP_LEFT    ; $16
-	const SLOW_JUMP_RIGHT   ; $17
-	const JUMP_DOWN         ; $18
-	const JUMP_UP           ; $19
-	const JUMP_LEFT         ; $1a
-	const JUMP_RIGHT        ; $1b
-	const FAST_JUMP_DOWN    ; $1c
-	const FAST_JUMP_UP      ; $1d
-	const FAST_JUMP_LEFT    ; $1e
-	const FAST_JUMP_RIGHT   ; $1f
-	const FAST_JUMP_DOWN2   ; $20
-	const FAST_JUMP_UP2     ; $21
-	const FAST_JUMP_LEFT2   ; $22
-	const FAST_JUMP_RIGHT2  ; $23
-	const MOVEMENT_24       ; $24
-	const MOVEMENT_25       ; $25
-	const MOVEMENT_26       ; $26
-	const MOVEMENT_27       ; $27
-	const MOVEMENT_28       ; $28
-	const MOVEMENT_29       ; $29
-	const NO_MOVEMENT       ; $2a
-	const MOVEMENT_2B       ; $2b
-	const MOVEMENT_2C       ; $2c
-	const MOVEMENT_2D       ; $2d
-	const MOVEMENT_2E       ; $2e
-	const MOVEMENT_2F       ; $2f
-	const MOVEMENT_30       ; $30
-	const MOVEMENT_31       ; $31
-	const MOVEMENT_32       ; $32
-	const MOVEMENT_33       ; $33

constants/name_constants.asm

@@ -1,2 +1,5 @@
 ; Name Lists
+DEF MON_NAME EQU 1
 DEF ITEM_NAME EQU 4
+DEF PARTY_OT_NAME EQU 5
+DEF ENEMY_OT_NAME EQU 6

constants/pokedex_constants.asm

@@ -152,6 +152,7 @@
 	const DEX_DRAGONITE     ; 95
 	const DEX_MEWTWO        ; 96
 	const DEX_MEW           ; 97
+DEF NUM_KANTO_POKEMON EQU const_value - 1
 	const DEX_HAPPA         ; 98 CHIKORITA
 	const DEX_HANAMOGURA    ; 99 BAYLEEF
 	const DEX_HANARYU       ; 9a MEGANIUM

constants/script_constants.asm

@@ -1,6 +1,7 @@
 ; object constants
-DEF PLAYER   EQU 0
-DEF FOLLOWER EQU 1
+DEF PLAYER            EQU 0
+DEF FOLLOWER          EQU 1
+DEF MAP_VIEWER_CURSOR EQU FOLLOWER
 
 DEF STRING_BUFFER_LENGTH EQU 10
 

constants/wram_constants.asm

@@ -1,15 +1,33 @@
+; wOptions
 DEF TEXT_DELAY_MASK EQU %111
 	const_def 3
-	const SGB_BORDER     ; 3
-	const NO_TEXT_SCROLL ; 4
-	const STEREO         ; 5
-	const BATTLE_SHIFT   ; 6
-	const BATTLE_SCENE   ; 7
+	shift_const SGB_BORDER     ; 3
+	shift_const NO_TEXT_SCROLL ; 4
+	shift_const STEREO         ; 5
+	shift_const BATTLE_SHIFT   ; 6
+	shift_const BATTLE_SCENE   ; 7
 
 DEF TEXT_DELAY_FAST EQU %001 ; 1
 DEF TEXT_DELAY_MED  EQU %011 ; 3
 DEF TEXT_DELAY_SLOW EQU %101 ; 5
 
+DEF START_MONEY EQU 3000
+
+; wStateFlags
+DEF SPRITE_UPDATES_DISABLED_F EQU 0
+DEF SCRIPTED_MOVEMENT_STATE_F EQU 7
+
+; wSpriteFlags::
+DEF SPRITES_SKIP_WALKING_GFX_F  EQU 6
+DEF SPRITES_SKIP_STANDING_GFX_F EQU 7
+
+; wPlayerStepFlags::
+	const_def 4
+	const PLAYERSTEP_MIDAIR_F   ; 4
+	const PLAYERSTEP_CONTINUE_F ; 5
+	const PLAYERSTEP_STOP_F     ; 6
+	const PLAYERSTEP_START_F    ; 7
+
 ; wTextboxFrame::
 	const_def
 	const FRAME_1 ; 0
@@ -22,6 +40,11 @@ DEF TEXT_DELAY_SLOW EQU %101 ; 5
 	const FRAME_8 ; 7
 DEF NUM_FRAMES EQU const_value
 
+; wTextboxFlags::
+	const_def
+	const FAST_TEXT_DELAY_F ; 0
+	const TEXT_DELAY_F      ; 1
+
 ; wMonType::
 	const_def
 	const PARTYMON   ; 0

data/maps/objects/Baadon.asm

@@ -28,9 +28,9 @@ Baadon_MapEvents::
 	bg_event  6, 14, 4
 
 	def_object_events
-	object_event 14,  8, SPRITE_SUPER_NERD, FACE_UP, 2, 2, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event  6,  9, SPRITE_YOUNGSTER, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event 10, 14, SPRITE_TWIN, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event 14,  8, SPRITE_SUPER_NERD, SPRITEMOVEFN_RANDOM_WALK_XY, 2, 2, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  6,  9, SPRITE_YOUNGSTER, SPRITEMOVEFN_RANDOM_WALK_Y, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event 10, 14, SPRITE_TWIN, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
 Baadon_Blocks::
 INCBIN "maps/Baadon.blk"

data/maps/objects/BaadonHouse1.asm

@@ -14,7 +14,7 @@ BaadonHouse1_MapEvents::
 	def_bg_events
 
 	def_object_events
-	object_event  2,  3, SPRITE_ELDER, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  2,  3, SPRITE_ELDER, SPRITEMOVEFN_TURN_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
 BaadonHouse1_Blocks::
 INCBIN "maps/BaadonHouse1.blk"

data/maps/objects/BaadonHouse2.asm

@@ -14,7 +14,7 @@ BaadonHouse2_MapEvents::
 	def_bg_events
 
 	def_object_events
-	object_event  7,  5, SPRITE_GRANNY, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  7,  5, SPRITE_GRANNY, SPRITEMOVEFN_TURN_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
 BaadonHouse2_Blocks::
 INCBIN "maps/BaadonHouse2.blk"

data/maps/objects/BaadonLeague1F.asm

@@ -15,11 +15,11 @@ BaadonLeague1F_MapEvents::
 	def_bg_events
 
 	def_object_events
-	object_event  2,  5, SPRITE_YOUNGSTER, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event  4,  7, SPRITE_LASS, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event  4,  9, SPRITE_BUG_CATCHER_BOY, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event  3,  1, SPRITE_24, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event  6,  6, SPRITE_COOLTRAINER_F, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  2,  5, SPRITE_YOUNGSTER, SPRITEMOVEFN_TURN_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  4,  7, SPRITE_LASS, SPRITEMOVEFN_TURN_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  4,  9, SPRITE_BUG_CATCHER_BOY, SPRITEMOVEFN_TURN_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  3,  1, SPRITE_24, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  6,  6, SPRITE_COOLTRAINER_F, SPRITEMOVEFN_RANDOM_WALK_Y, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0
 
 BaadonLeague1F_Blocks::
 INCBIN "maps/BaadonLeague1F.blk"

data/maps/objects/BaadonLeague2F.asm

@@ -13,11 +13,11 @@ BaadonLeague2F_MapEvents::
 	def_bg_events
 
 	def_object_events
-	object_event  4,  1, SPRITE_YOUNGSTER, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event  1,  2, SPRITE_24, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event  9,  1, SPRITE_COOLTRAINER_F, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event  9,  9, SPRITE_24, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event  2, 11, SPRITE_COOLTRAINER_F, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  4,  1, SPRITE_YOUNGSTER, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  1,  2, SPRITE_24, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  9,  1, SPRITE_COOLTRAINER_F, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  9,  9, SPRITE_24, SPRITEMOVEFN_TURN_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  2, 11, SPRITE_COOLTRAINER_F, SPRITEMOVEFN_TURN_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
 BaadonLeague2F_Blocks::
 INCBIN "maps/BaadonLeague2F.blk"

data/maps/objects/BaadonMart.asm

@@ -14,9 +14,9 @@ BaadonMart_MapEvents::
 	def_bg_events
 
 	def_object_events
-	object_event  1,  3, SPRITE_CLERK, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event 10,  5, SPRITE_YOUNGSTER, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event  4,  1, SPRITE_TEACHER, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  1,  3, SPRITE_CLERK, SPRITEMOVEFN_TURN_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event 10,  5, SPRITE_YOUNGSTER, SPRITEMOVEFN_RANDOM_WALK_X, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  4,  1, SPRITE_TEACHER, SPRITEMOVEFN_TURN_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
 BaadonMart_Blocks::
 INCBIN "maps/BaadonMart.blk"

data/maps/objects/BaadonPokecenter1F.asm

@@ -15,9 +15,9 @@ BaadonPokecenter1F_MapEvents::
 	def_bg_events
 
 	def_object_events
-	object_event 14,  6, SPRITE_FISHER, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event  2,  5, SPRITE_GENTLEMAN, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event 10,  1, SPRITE_POKEFAN_M, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event 14,  6, SPRITE_FISHER, SPRITEMOVEFN_RANDOM_SPIN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  2,  5, SPRITE_GENTLEMAN, SPRITEMOVEFN_RANDOM_WALK_Y, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event 10,  1, SPRITE_POKEFAN_M, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
 BaadonPokecenter1F_Blocks::
 INCBIN "maps/BaadonPokecenter1F.blk"

data/maps/objects/BaadonPokecenter2F.asm

@@ -13,9 +13,9 @@ BaadonPokecenter2F_MapEvents::
 	def_bg_events
 
 	def_object_events
-	object_event  5,  2, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event  9,  2, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event 14,  7, SPRITE_FISHING_GURU, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  5,  2, SPRITE_LINK_RECEPTIONIST, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  9,  2, SPRITE_LINK_RECEPTIONIST, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event 14,  7, SPRITE_FISHING_GURU, SPRITEMOVEFN_TURN_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
 BaadonPokecenter2F_Blocks::
 INCBIN "maps/BaadonPokecenter2F.blk"

data/maps/objects/BullForest.asm

@@ -26,11 +26,11 @@ BullForest_MapEvents::
 	bg_event 14, 18, 3
 
 	def_object_events
-	object_event 21,  9, SPRITE_TWIN, SLOW_STEP_DOWN, 3, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event 11, 12, SPRITE_YOUNGSTER, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event  7, 16, SPRITE_GRANNY, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event 20, 19, SPRITE_TEACHER, FACE_UP, 2, 2, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event 20, 29, SPRITE_BUG_CATCHER_BOY, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event 21,  9, SPRITE_TWIN, SPRITEMOVEFN_RANDOM_WALK_X, 3, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event 11, 12, SPRITE_YOUNGSTER, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  7, 16, SPRITE_GRANNY, SPRITEMOVEFN_RANDOM_WALK_X, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event 20, 19, SPRITE_TEACHER, SPRITEMOVEFN_RANDOM_WALK_XY, 2, 2, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event 20, 29, SPRITE_BUG_CATCHER_BOY, SPRITEMOVEFN_RANDOM_WALK_Y, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0
 
 BullForest_Blocks::
 INCBIN "maps/BullForest.blk"

data/maps/objects/BullForestRoute1House.asm

@@ -14,7 +14,7 @@ BullForestRoute1House_MapEvents::
 	def_bg_events
 
 	def_object_events
-	object_event  1,  5, SPRITE_COOLTRAINER_F, SLOW_STEP_DOWN, 1, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  1,  5, SPRITE_COOLTRAINER_F, SPRITEMOVEFN_RANDOM_WALK_X, 1, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
 BullForestRoute1House_Blocks::
 INCBIN "maps/BullForestRoute1House.blk"

data/maps/objects/BullHouse1.asm

@@ -14,7 +14,7 @@ BullHouse1_MapEvents::
 	def_bg_events
 
 	def_object_events
-	object_event  2,  3, SPRITE_KIKUKO, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  2,  3, SPRITE_KIKUKO, SPRITEMOVEFN_TURN_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
 BullHouse1_Blocks::
 INCBIN "maps/BullHouse1.blk"

data/maps/objects/BullHouse2.asm

@@ -14,7 +14,7 @@ BullHouse2_MapEvents::
 	def_bg_events
 
 	def_object_events
-	object_event  8,  4, SPRITE_GRANNY, FACE_RIGHT, 0, 1, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  8,  4, SPRITE_GRANNY, SPRITEMOVEFN_RANDOM_WALK_Y, 0, 1, -1, -1, 0, 0, 0, 0, 0, 0
 
 BullHouse2_Blocks::
 INCBIN "maps/BullHouse2.blk"

data/maps/objects/BullHouse3.asm

@@ -14,7 +14,7 @@ BullHouse3_MapEvents::
 	def_bg_events
 
 	def_object_events
-	object_event  4,  3, SPRITE_GRAMPS, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  4,  3, SPRITE_GRAMPS, SPRITEMOVEFN_TURN_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
 BullHouse3_Blocks::
 INCBIN "maps/BullHouse3.blk"

data/maps/objects/BullLeague1F.asm

@@ -15,11 +15,11 @@ BullLeague1F_MapEvents::
 	def_bg_events
 
 	def_object_events
-	object_event  2,  5, SPRITE_YOUNGSTER, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event  4,  7, SPRITE_LASS, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event  4,  9, SPRITE_BUG_CATCHER_BOY, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event  3,  1, SPRITE_24, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event  6,  6, SPRITE_COOLTRAINER_F, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  2,  5, SPRITE_YOUNGSTER, SPRITEMOVEFN_TURN_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  4,  7, SPRITE_LASS, SPRITEMOVEFN_TURN_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  4,  9, SPRITE_BUG_CATCHER_BOY, SPRITEMOVEFN_TURN_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  3,  1, SPRITE_24, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  6,  6, SPRITE_COOLTRAINER_F, SPRITEMOVEFN_RANDOM_WALK_Y, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0
 
 BullLeague1F_Blocks::
 INCBIN "maps/BullLeague1F.blk"

data/maps/objects/BullLeague2F.asm

@@ -13,11 +13,11 @@ BullLeague2F_MapEvents::
 	def_bg_events
 
 	def_object_events
-	object_event  4,  4, SPRITE_LASS, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event  3,  9, SPRITE_COOLTRAINER_F, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event  6,  9, SPRITE_COOLTRAINER_F, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event  2, 11, SPRITE_COOLTRAINER_F, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event  7, 11, SPRITE_COOLTRAINER_F, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  4,  4, SPRITE_LASS, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  3,  9, SPRITE_COOLTRAINER_F, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  6,  9, SPRITE_COOLTRAINER_F, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  2, 11, SPRITE_COOLTRAINER_F, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  7, 11, SPRITE_COOLTRAINER_F, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
 BullLeague2F_Blocks::
 INCBIN "maps/BullLeague2F.blk"

data/maps/objects/BullMart.asm

@@ -14,9 +14,9 @@ BullMart_MapEvents::
 	def_bg_events
 
 	def_object_events
-	object_event  1,  3, SPRITE_CLERK, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event 10,  5, SPRITE_FISHER, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event  4,  1, SPRITE_YOUNGSTER, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  1,  3, SPRITE_CLERK, SPRITEMOVEFN_TURN_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event 10,  5, SPRITE_FISHER, SPRITEMOVEFN_RANDOM_WALK_X, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  4,  1, SPRITE_YOUNGSTER, SPRITEMOVEFN_TURN_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
 BullMart_Blocks::
 INCBIN "maps/BullMart.blk"

data/maps/objects/BullPokecenter1F.asm

@@ -15,10 +15,10 @@ BullPokecenter1F_MapEvents::
 	def_bg_events
 
 	def_object_events
-	object_event  5,  1, SPRITE_NURSE, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event 14,  6, SPRITE_YOUNGSTER, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event  2,  5, SPRITE_24, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event 10,  1, SPRITE_GRANNY, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  5,  1, SPRITE_NURSE, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event 14,  6, SPRITE_YOUNGSTER, SPRITEMOVEFN_RANDOM_SPIN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  2,  5, SPRITE_24, SPRITEMOVEFN_RANDOM_WALK_Y, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event 10,  1, SPRITE_GRANNY, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
 BullPokecenter1F_Blocks::
 INCBIN "maps/BullPokecenter1F.blk"

data/maps/objects/BullPokecenter2F.asm

@@ -13,9 +13,9 @@ BullPokecenter2F_MapEvents::
 	def_bg_events
 
 	def_object_events
-	object_event  5,  2, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event  9,  2, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event 14,  7, SPRITE_FISHING_GURU, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  5,  2, SPRITE_LINK_RECEPTIONIST, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  9,  2, SPRITE_LINK_RECEPTIONIST, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event 14,  7, SPRITE_FISHING_GURU, SPRITEMOVEFN_TURN_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
 BullPokecenter2F_Blocks::
 INCBIN "maps/BullPokecenter2F.blk"

data/maps/objects/Fonto.asm

@@ -25,10 +25,10 @@ Fonto_MapEvents::
 	bg_event 10, 12, 5
 
 	def_object_events
-	object_event  2,  4, SPRITE_36, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event  2,  5, SPRITE_RHYDON, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event  5, 14, SPRITE_YOUNGSTER, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event 16,  8, SPRITE_TWIN, FACE_UP, 1, 1, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  2,  4, SPRITE_36, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  2,  5, SPRITE_RHYDON, SPRITEMOVEFN_TURN_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  5, 14, SPRITE_YOUNGSTER, SPRITEMOVEFN_RANDOM_WALK_X, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event 16,  8, SPRITE_TWIN, SPRITEMOVEFN_RANDOM_WALK_XY, 1, 1, -1, -1, 0, 0, 0, 0, 0, 0
 
 Fonto_Blocks::
 INCBIN "maps/Fonto.blk"

data/maps/objects/FontoHouse.asm

@@ -14,7 +14,7 @@ FontoHouse_MapEvents::
 	def_bg_events
 
 	def_object_events
-	object_event  8,  4, SPRITE_GENTLEMAN, FACE_RIGHT, 0, 1, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  8,  4, SPRITE_GENTLEMAN, SPRITEMOVEFN_RANDOM_WALK_Y, 0, 1, -1, -1, 0, 0, 0, 0, 0, 0
 
 FontoHouse_Blocks::
 INCBIN "maps/FontoHouse.blk"

data/maps/objects/FontoLab.asm

@@ -14,8 +14,8 @@ FontoLab_MapEvents::
 	def_bg_events
 
 	def_object_events
-	object_event  2,  2, SPRITE_SCIENTIST, SLOW_STEP_DOWN, 1, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event  8,  5, SPRITE_SCIENTIST, SLOW_STEP_DOWN, 1, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  2,  2, SPRITE_SCIENTIST, SPRITEMOVEFN_RANDOM_WALK_X, 1, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  8,  5, SPRITE_SCIENTIST, SPRITEMOVEFN_RANDOM_WALK_X, 1, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
 FontoLab_Blocks::
 INCBIN "maps/FontoLab.blk"

data/maps/objects/FontoMart.asm

@@ -14,9 +14,9 @@ FontoMart_MapEvents::
 	def_bg_events
 
 	def_object_events
-	object_event  1,  3, SPRITE_CLERK, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event 10,  5, SPRITE_GIRL, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event  4,  1, SPRITE_POKEFAN_M, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  1,  3, SPRITE_CLERK, SPRITEMOVEFN_TURN_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event 10,  5, SPRITE_GIRL, SPRITEMOVEFN_RANDOM_WALK_X, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  4,  1, SPRITE_POKEFAN_M, SPRITEMOVEFN_TURN_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
 FontoMart_Blocks::
 INCBIN "maps/FontoMart.blk"

data/maps/objects/FontoPokecenter1F.asm

@@ -15,10 +15,10 @@ FontoPokecenter1F_MapEvents::
 	def_bg_events
 
 	def_object_events
-	object_event  5,  1, SPRITE_NURSE, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event 14,  6, SPRITE_GENTLEMAN, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event  2,  5, SPRITE_24, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event 10,  1, SPRITE_YOUNGSTER, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  5,  1, SPRITE_NURSE, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event 14,  6, SPRITE_GENTLEMAN, SPRITEMOVEFN_RANDOM_SPIN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  2,  5, SPRITE_24, SPRITEMOVEFN_RANDOM_WALK_Y, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event 10,  1, SPRITE_YOUNGSTER, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
 FontoPokecenter1F_Blocks::
 INCBIN "maps/FontoPokecenter1F.blk"

data/maps/objects/FontoPokecenter2F.asm

@@ -13,9 +13,9 @@ FontoPokecenter2F_MapEvents::
 	def_bg_events
 
 	def_object_events
-	object_event  5,  2, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event  9,  2, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event 14,  7, SPRITE_FISHING_GURU, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  5,  2, SPRITE_LINK_RECEPTIONIST, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  9,  2, SPRITE_LINK_RECEPTIONIST, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event 14,  7, SPRITE_FISHING_GURU, SPRITEMOVEFN_TURN_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
 FontoPokecenter2F_Blocks::
 INCBIN "maps/FontoPokecenter2F.blk"

data/maps/objects/FontoRocketHouse.asm

@@ -14,10 +14,10 @@ FontoRocketHouse_MapEvents::
 	def_bg_events
 
 	def_object_events
-	object_event  5,  4, SPRITE_36, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event 10,  2, SPRITE_ROCKET_F, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event 14,  2, SPRITE_36, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event 12,  2, SPRITE_PIDGEY, SLOW_STEP_DOWN, 1, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  5,  4, SPRITE_36, SPRITEMOVEFN_TURN_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event 10,  2, SPRITE_ROCKET_F, SPRITEMOVEFN_TURN_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event 14,  2, SPRITE_36, SPRITEMOVEFN_TURN_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event 12,  2, SPRITE_PIDGEY, SPRITEMOVEFN_RANDOM_WALK_X, 1, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
 FontoRocketHouse_Blocks::
 INCBIN "maps/FontoRocketHouse.blk"

data/maps/objects/Haiteku.asm

@@ -30,11 +30,11 @@ Haiteku_MapEvents::
 	bg_event 24, 28, 8
 
 	def_object_events
-	object_event 22, 15, SPRITE_TWIN, SLOW_STEP_DOWN, 1, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event 23, 14, SPRITE_CLEFAIRY, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event 23, 24, SPRITE_SAILOR, FACE_UP, 2, 2, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event 26, 10, SPRITE_SAILOR, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event 10, 14, SPRITE_GENTLEMAN, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event 22, 15, SPRITE_TWIN, SPRITEMOVEFN_RANDOM_WALK_X, 1, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event 23, 14, SPRITE_CLEFAIRY, SPRITEMOVEFN_RANDOM_SPIN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event 23, 24, SPRITE_SAILOR, SPRITEMOVEFN_RANDOM_WALK_XY, 2, 2, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event 26, 10, SPRITE_SAILOR, SPRITEMOVEFN_RANDOM_WALK_X, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event 10, 14, SPRITE_GENTLEMAN, SPRITEMOVEFN_RANDOM_WALK_X, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
 Haiteku_Blocks::
 INCBIN "maps/Haiteku.blk"

data/maps/objects/HaitekuAquarium1F.asm

@@ -15,9 +15,9 @@ HaitekuAquarium1F_MapEvents::
 	def_bg_events
 
 	def_object_events
-	object_event 15,  5, SPRITE_RECEPTIONIST, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event 12,  2, SPRITE_YOUNGSTER, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event  4,  5, SPRITE_LASS, FACE_UP, 1, 1, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event 15,  5, SPRITE_RECEPTIONIST, SPRITEMOVEFN_TURN_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event 12,  2, SPRITE_YOUNGSTER, SPRITEMOVEFN_TURN_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  4,  5, SPRITE_LASS, SPRITEMOVEFN_RANDOM_WALK_XY, 1, 1, -1, -1, 0, 0, 0, 0, 0, 0
 
 HaitekuAquarium1F_Blocks::
 INCBIN "maps/HaitekuAquarium1F.blk"

data/maps/objects/HaitekuAquarium2F.asm

@@ -13,8 +13,8 @@ HaitekuAquarium2F_MapEvents::
 	def_bg_events
 
 	def_object_events
-	object_event  7,  6, SPRITE_POKEFAN_M, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event 10,  4, SPRITE_TEACHER, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  7,  6, SPRITE_POKEFAN_M, SPRITEMOVEFN_RANDOM_WALK_X, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event 10,  4, SPRITE_TEACHER, SPRITEMOVEFN_TURN_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
 HaitekuAquarium2F_Blocks::
 INCBIN "maps/HaitekuAquarium2F.blk"

data/maps/objects/HaitekuHouse1.asm

@@ -14,7 +14,7 @@ HaitekuHouse1_MapEvents::
 	def_bg_events
 
 	def_object_events
-	object_event  7,  3, SPRITE_FISHING_GURU, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  7,  3, SPRITE_FISHING_GURU, SPRITEMOVEFN_TURN_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
 HaitekuHouse1_Blocks::
 INCBIN "maps/HaitekuHouse1.blk"

data/maps/objects/HaitekuHouse2.asm

@@ -14,7 +14,7 @@ HaitekuHouse2_MapEvents::
 	def_bg_events
 
 	def_object_events
-	object_event  7,  3, SPRITE_SAILOR, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  7,  3, SPRITE_SAILOR, SPRITEMOVEFN_TURN_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
 HaitekuHouse2_Blocks::
 INCBIN "maps/HaitekuHouse2.blk"

data/maps/objects/HaitekuImposterOakHouse.asm

@@ -14,8 +14,8 @@ HaitekuImposterOakHouse_MapEvents::
 	def_bg_events
 
 	def_object_events
-	object_event  7,  3, SPRITE_EVIL_OKIDO, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event  1,  2, SPRITE_POKEFAN_F, SLOW_STEP_DOWN, 1, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  7,  3, SPRITE_EVIL_OKIDO, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  1,  2, SPRITE_POKEFAN_F, SPRITEMOVEFN_RANDOM_WALK_X, 1, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
 HaitekuImposterOakHouse_Blocks::
 INCBIN "maps/HaitekuImposterOakHouse.blk"

data/maps/objects/HaitekuLeague1F.asm

@@ -15,11 +15,11 @@ HaitekuLeague1F_MapEvents::
 	def_bg_events
 
 	def_object_events
-	object_event  2,  5, SPRITE_YOUNGSTER, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event  4,  7, SPRITE_LASS, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event  4,  9, SPRITE_BUG_CATCHER_BOY, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event  3,  1, SPRITE_24, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event  6,  6, SPRITE_COOLTRAINER_F, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  2,  5, SPRITE_YOUNGSTER, SPRITEMOVEFN_TURN_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  4,  7, SPRITE_LASS, SPRITEMOVEFN_TURN_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  4,  9, SPRITE_BUG_CATCHER_BOY, SPRITEMOVEFN_TURN_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  3,  1, SPRITE_24, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  6,  6, SPRITE_COOLTRAINER_F, SPRITEMOVEFN_RANDOM_WALK_Y, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0
 
 HaitekuLeague1F_Blocks::
 INCBIN "maps/HaitekuLeague1F.blk"

data/maps/objects/HaitekuLeague2F.asm

@@ -13,11 +13,11 @@ HaitekuLeague2F_MapEvents::
 	def_bg_events
 
 	def_object_events
-	object_event  4,  1, SPRITE_LASS, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event  3,  6, SPRITE_24, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event  8, 12, SPRITE_COOLTRAINER_F, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event  2, 10, SPRITE_24, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event  7,  7, SPRITE_COOLTRAINER_F, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  4,  1, SPRITE_LASS, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  3,  6, SPRITE_24, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  8, 12, SPRITE_COOLTRAINER_F, SPRITEMOVEFN_TURN_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  2, 10, SPRITE_24, SPRITEMOVEFN_TURN_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  7,  7, SPRITE_COOLTRAINER_F, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
 HaitekuLeague2F_Blocks::
 INCBIN "maps/HaitekuLeague2F.blk"

data/maps/objects/HaitekuMart.asm

@@ -14,9 +14,9 @@ HaitekuMart_MapEvents::
 	def_bg_events
 
 	def_object_events
-	object_event  1,  3, SPRITE_CLERK, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event 10,  5, SPRITE_POKEFAN_M, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event  4,  1, SPRITE_SAILOR, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  1,  3, SPRITE_CLERK, SPRITEMOVEFN_TURN_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event 10,  5, SPRITE_POKEFAN_M, SPRITEMOVEFN_RANDOM_WALK_X, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  4,  1, SPRITE_SAILOR, SPRITEMOVEFN_TURN_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
 HaitekuMart_Blocks::
 INCBIN "maps/HaitekuMart.blk"

data/maps/objects/HaitekuPokecenter1F.asm

@@ -15,10 +15,10 @@ HaitekuPokecenter1F_MapEvents::
 	def_bg_events
 
 	def_object_events
-	object_event  5,  1, SPRITE_NURSE, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event 14,  6, SPRITE_GENTLEMAN, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event  2,  5, SPRITE_FISHER, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event 10,  1, SPRITE_SAILOR, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  5,  1, SPRITE_NURSE, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event 14,  6, SPRITE_GENTLEMAN, SPRITEMOVEFN_RANDOM_SPIN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  2,  5, SPRITE_FISHER, SPRITEMOVEFN_RANDOM_WALK_Y, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event 10,  1, SPRITE_SAILOR, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
 HaitekuPokecenter1F_Blocks::
 INCBIN "maps/HaitekuPokecenter1F.blk"

data/maps/objects/HaitekuPokecenter2F.asm

@@ -13,9 +13,9 @@ HaitekuPokecenter2F_MapEvents::
 	def_bg_events
 
 	def_object_events
-	object_event  5,  2, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event  9,  2, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event 14,  7, SPRITE_FISHING_GURU, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  5,  2, SPRITE_LINK_RECEPTIONIST, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  9,  2, SPRITE_LINK_RECEPTIONIST, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event 14,  7, SPRITE_FISHING_GURU, SPRITEMOVEFN_TURN_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
 HaitekuPokecenter2F_Blocks::
 INCBIN "maps/HaitekuPokecenter2F.blk"

data/maps/objects/KantoCeladonMart1F.asm

@@ -16,7 +16,7 @@ KantoCeladonMart1F_MapEvents::
 	def_bg_events
 
 	def_object_events
-	object_event  7,  1, SPRITE_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  7,  1, SPRITE_RECEPTIONIST, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
 KantoCeladonMart1F_Blocks::
 INCBIN "maps/KantoCeladonMart1F.blk"

data/maps/objects/KantoCeladonMart2F.asm

@@ -15,8 +15,8 @@ KantoCeladonMart2F_MapEvents::
 	def_bg_events
 
 	def_object_events
-	object_event 14,  5, SPRITE_CLERK, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event  5,  5, SPRITE_LASS, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event 14,  5, SPRITE_CLERK, SPRITEMOVEFN_TURN_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  5,  5, SPRITE_LASS, SPRITEMOVEFN_RANDOM_SPIN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
 KantoCeladonMart2F_Blocks::
 INCBIN "maps/KantoCeladonMart2F.blk"

data/maps/objects/KantoCeladonMart3F.asm

@@ -15,8 +15,8 @@ KantoCeladonMart3F_MapEvents::
 	def_bg_events
 
 	def_object_events
-	object_event  6,  1, SPRITE_CLERK, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event  3,  5, SPRITE_GIRL, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  6,  1, SPRITE_CLERK, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  3,  5, SPRITE_GIRL, SPRITEMOVEFN_RANDOM_SPIN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
 KantoCeladonMart3F_Blocks::
 INCBIN "maps/KantoCeladonMart3F.blk"

data/maps/objects/KantoCeladonMart4F.asm

@@ -15,9 +15,9 @@ KantoCeladonMart4F_MapEvents::
 	def_bg_events
 
 	def_object_events
-	object_event 14,  5, SPRITE_MEDIUM, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event  8,  5, SPRITE_MEDIUM, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event  2,  5, SPRITE_MEDIUM, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event 14,  5, SPRITE_MEDIUM, SPRITEMOVEFN_TURN_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  8,  5, SPRITE_MEDIUM, SPRITEMOVEFN_TURN_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  2,  5, SPRITE_MEDIUM, SPRITEMOVEFN_TURN_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
 KantoCeladonMart4F_Blocks::
 INCBIN "maps/KantoCeladonMart4F.blk"

data/maps/objects/KantoCeladonMart5F.asm

@@ -14,9 +14,9 @@ KantoCeladonMart5F_MapEvents::
 	def_bg_events
 
 	def_object_events
-	object_event 14,  5, SPRITE_CLERK, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event  8,  3, SPRITE_RHYDON, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event  2,  5, SPRITE_PIDGEY, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event 14,  5, SPRITE_CLERK, SPRITEMOVEFN_TURN_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  8,  3, SPRITE_RHYDON, SPRITEMOVEFN_RANDOM_SPIN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  2,  5, SPRITE_PIDGEY, SPRITEMOVEFN_RANDOM_SPIN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
 KantoCeladonMart5F_Blocks::
 INCBIN "maps/KantoCeladonMart5F.blk"

data/maps/objects/KantoCeruleanHouse.asm

@@ -14,7 +14,7 @@ KantoCeruleanHouse_MapEvents::
 	def_bg_events
 
 	def_object_events
-	object_event  3,  3, SPRITE_FISHER, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  3,  3, SPRITE_FISHER, SPRITEMOVEFN_RANDOM_SPIN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
 KantoCeruleanHouse_Blocks::
 INCBIN "maps/KantoCeruleanHouse.blk"

data/maps/objects/KantoEldersHouse.asm

@@ -14,8 +14,8 @@ KantoEldersHouse_MapEvents::
 	def_bg_events
 
 	def_object_events
-	object_event  7,  3, SPRITE_GRAMPS, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event  1,  5, SPRITE_GRANNY, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  7,  3, SPRITE_GRAMPS, SPRITEMOVEFN_TURN_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  1,  5, SPRITE_GRANNY, SPRITEMOVEFN_RANDOM_SPIN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
 KantoEldersHouse_Blocks::
 INCBIN "maps/KantoEldersHouse.blk"

data/maps/objects/KantoFishingGuru.asm

@@ -14,7 +14,7 @@ KantoFishingGuru_MapEvents::
 	def_bg_events
 
 	def_object_events
-	object_event  4,  3, SPRITE_FISHING_GURU, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  4,  3, SPRITE_FISHING_GURU, SPRITEMOVEFN_TURN_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
 KantoFishingGuru_Blocks::
 INCBIN "maps/KantoFishingGuru.blk"

data/maps/objects/KantoGameCorner.asm

@@ -16,16 +16,16 @@ KantoGameCorner_MapEvents::
 	def_bg_events
 
 	def_object_events
-	object_event  3,  1, SPRITE_CLERK, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event  4,  1, SPRITE_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event  2,  6, SPRITE_POKEFAN_M, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event  2,  7, SPRITE_TWIN, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event  5,  8, SPRITE_ROCKER, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event 11,  6, SPRITE_GIRL, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event 11,  8, SPRITE_GRAMPS, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event 14,  6, SPRITE_FISHER, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event 17,  9, SPRITE_POKEFAN_M, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event 13,  2, SPRITE_ROCKER, SLOW_STEP_DOWN, 3, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  3,  1, SPRITE_CLERK, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  4,  1, SPRITE_RECEPTIONIST, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  2,  6, SPRITE_POKEFAN_M, SPRITEMOVEFN_TURN_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  2,  7, SPRITE_TWIN, SPRITEMOVEFN_RANDOM_SPIN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  5,  8, SPRITE_ROCKER, SPRITEMOVEFN_TURN_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event 11,  6, SPRITE_GIRL, SPRITEMOVEFN_TURN_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event 11,  8, SPRITE_GRAMPS, SPRITEMOVEFN_TURN_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event 14,  6, SPRITE_FISHER, SPRITEMOVEFN_TURN_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event 17,  9, SPRITE_POKEFAN_M, SPRITEMOVEFN_TURN_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event 13,  2, SPRITE_ROCKER, SPRITEMOVEFN_RANDOM_WALK_X, 3, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
 KantoGameCorner_Blocks::
 INCBIN "maps/KantoGameCorner.blk"

data/maps/objects/KantoGameCornerPrizes.asm

@@ -14,9 +14,9 @@ KantoGameCornerPrizes_MapEvents::
 	def_bg_events
 
 	def_object_events
-	object_event  2,  1, SPRITE_CLERK, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event  4,  1, SPRITE_CLERK, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event  6,  1, SPRITE_CLERK, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  2,  1, SPRITE_CLERK, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  4,  1, SPRITE_CLERK, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  6,  1, SPRITE_CLERK, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
 KantoGameCornerPrizes_Blocks::
 INCBIN "maps/KantoGameCornerPrizes.blk"

data/maps/objects/KantoGamefreakHQ1.asm

@@ -17,10 +17,10 @@ KantoGamefreakHQ1_MapEvents::
 	def_bg_events
 
 	def_object_events
-	object_event  1,  5, SPRITE_GRANNY, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event  4,  5, SPRITE_RHYDON, FACE_RIGHT, 0, 1, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event  0,  8, SPRITE_CLEFAIRY, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event  2,  7, SPRITE_PIDGEY, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  1,  5, SPRITE_GRANNY, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  4,  5, SPRITE_RHYDON, SPRITEMOVEFN_RANDOM_WALK_Y, 0, 1, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  0,  8, SPRITE_CLEFAIRY, SPRITEMOVEFN_TURN_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  2,  7, SPRITE_PIDGEY, SPRITEMOVEFN_RANDOM_SPIN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
 KantoGamefreakHQ1_Blocks::
 INCBIN "maps/KantoGamefreakHQ1.blk"

data/maps/objects/KantoGamefreakHQ2.asm

@@ -16,7 +16,7 @@ KantoGamefreakHQ2_MapEvents::
 	def_bg_events
 
 	def_object_events
-	object_event  2,  4, SPRITE_CLERK, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  2,  4, SPRITE_CLERK, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
 KantoGamefreakHQ2_Blocks::
 INCBIN "maps/KantoGamefreakHQ2.blk"

data/maps/objects/KantoGamefreakHQ3.asm

@@ -16,9 +16,9 @@ KantoGamefreakHQ3_MapEvents::
 	def_bg_events
 
 	def_object_events
-	object_event  0,  5, SPRITE_GYM_GUY, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event  0,  7, SPRITE_BURGLAR, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event  2,  7, SPRITE_FISHER, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  0,  5, SPRITE_GYM_GUY, SPRITEMOVEFN_TURN_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  0,  7, SPRITE_BURGLAR, SPRITEMOVEFN_TURN_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  2,  7, SPRITE_FISHER, SPRITEMOVEFN_TURN_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
 KantoGamefreakHQ3_Blocks::
 INCBIN "maps/KantoGamefreakHQ3.blk"

data/maps/objects/KantoGreensHouse1F.asm

@@ -15,7 +15,7 @@ KantoGreensHouse1F_MapEvents::
 	def_bg_events
 
 	def_object_events
-	object_event  5,  3, SPRITE_0F, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  5,  3, SPRITE_0F, SPRITEMOVEFN_TURN_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
 KantoGreensHouse1F_Blocks::
 INCBIN "maps/KantoGreensHouse1F.blk"

data/maps/objects/KantoHospital.asm

@@ -14,9 +14,9 @@ KantoHospital_MapEvents::
 	def_bg_events
 
 	def_object_events
-	object_event  5,  1, SPRITE_NURSE, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event 10,  6, SPRITE_ROCKER, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event 12,  6, SPRITE_GIRL, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  5,  1, SPRITE_NURSE, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event 10,  6, SPRITE_ROCKER, SPRITEMOVEFN_TURN_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event 12,  6, SPRITE_GIRL, SPRITEMOVEFN_TURN_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
 KantoHospital_Blocks::
 INCBIN "maps/KantoHospital.blk"

data/maps/objects/KantoLavenderHouse.asm

@@ -14,8 +14,8 @@ KantoLavenderHouse_MapEvents::
 	def_bg_events
 
 	def_object_events
-	object_event  7,  3, SPRITE_POKEFAN_M, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event  1,  5, SPRITE_POKEFAN_F, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  7,  3, SPRITE_POKEFAN_M, SPRITEMOVEFN_TURN_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  1,  5, SPRITE_POKEFAN_F, SPRITEMOVEFN_RANDOM_SPIN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
 KantoLavenderHouse_Blocks::
 INCBIN "maps/KantoLavenderHouse.blk"

data/maps/objects/KantoLeague1F.asm

@@ -15,11 +15,11 @@ KantoLeague1F_MapEvents::
 	def_bg_events
 
 	def_object_events
-	object_event  2,  5, SPRITE_YOUNGSTER, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event  4,  7, SPRITE_LASS, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event  4,  9, SPRITE_BUG_CATCHER_BOY, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event  3,  1, SPRITE_24, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event  6,  6, SPRITE_COOLTRAINER_F, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  2,  5, SPRITE_YOUNGSTER, SPRITEMOVEFN_TURN_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  4,  7, SPRITE_LASS, SPRITEMOVEFN_TURN_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  4,  9, SPRITE_BUG_CATCHER_BOY, SPRITEMOVEFN_TURN_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  3,  1, SPRITE_24, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  6,  6, SPRITE_COOLTRAINER_F, SPRITEMOVEFN_RANDOM_WALK_Y, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0
 
 KantoLeague1F_Blocks::
 INCBIN "maps/KantoLeague1F.blk"

data/maps/objects/KantoLeague21F.asm

@@ -15,11 +15,11 @@ KantoLeague21F_MapEvents::
 	def_bg_events
 
 	def_object_events
-	object_event  2,  5, SPRITE_YOUNGSTER, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event  4,  7, SPRITE_LASS, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event  4,  9, SPRITE_BUG_CATCHER_BOY, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event  3,  1, SPRITE_24, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event  6,  6, SPRITE_COOLTRAINER_F, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  2,  5, SPRITE_YOUNGSTER, SPRITEMOVEFN_TURN_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  4,  7, SPRITE_LASS, SPRITEMOVEFN_TURN_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  4,  9, SPRITE_BUG_CATCHER_BOY, SPRITEMOVEFN_TURN_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  3,  1, SPRITE_24, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  6,  6, SPRITE_COOLTRAINER_F, SPRITEMOVEFN_RANDOM_WALK_Y, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0
 
 KantoLeague21F_Blocks::
 INCBIN "maps/KantoLeague21F.blk"

data/maps/objects/KantoLeague22F.asm

@@ -13,11 +13,11 @@ KantoLeague22F_MapEvents::
 	def_bg_events
 
 	def_object_events
-	object_event  4,  7, SPRITE_POKEFAN_M, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event  4,  1, SPRITE_24, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event  0,  6, SPRITE_COOLTRAINER_F, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event  9,  6, SPRITE_24, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event  5,  1, SPRITE_COOLTRAINER_F, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  4,  7, SPRITE_POKEFAN_M, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  4,  1, SPRITE_24, SPRITEMOVEFN_TURN_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  0,  6, SPRITE_COOLTRAINER_F, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  9,  6, SPRITE_24, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  5,  1, SPRITE_COOLTRAINER_F, SPRITEMOVEFN_TURN_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
 KantoLeague22F_Blocks::
 INCBIN "maps/KantoLeague22F.blk"

data/maps/objects/KantoLeague2F.asm

@@ -13,11 +13,11 @@ KantoLeague2F_MapEvents::
 	def_bg_events
 
 	def_object_events
-	object_event  4,  7, SPRITE_RED, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event  4,  1, SPRITE_24, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event  0,  6, SPRITE_COOLTRAINER_F, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event  9,  6, SPRITE_24, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event  5,  1, SPRITE_COOLTRAINER_F, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  4,  7, SPRITE_RED, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  4,  1, SPRITE_24, SPRITEMOVEFN_TURN_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  0,  6, SPRITE_COOLTRAINER_F, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  9,  6, SPRITE_24, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  5,  1, SPRITE_COOLTRAINER_F, SPRITEMOVEFN_TURN_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
 KantoLeague2F_Blocks::
 INCBIN "maps/KantoLeague2F.blk"

data/maps/objects/KantoMart.asm

@@ -14,9 +14,9 @@ KantoMart_MapEvents::
 	def_bg_events
 
 	def_object_events
-	object_event  1,  3, SPRITE_CLERK, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event 10,  5, SPRITE_TWIN, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event  4,  1, SPRITE_GRAMPS, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  1,  3, SPRITE_CLERK, SPRITEMOVEFN_TURN_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event 10,  5, SPRITE_TWIN, SPRITEMOVEFN_RANDOM_WALK_X, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  4,  1, SPRITE_GRAMPS, SPRITEMOVEFN_TURN_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
 KantoMart_Blocks::
 INCBIN "maps/KantoMart.blk"

data/maps/objects/KantoOaksLab.asm

@@ -14,7 +14,7 @@ KantoOaksLab_MapEvents::
 	def_bg_events
 
 	def_object_events
-	object_event  3,  2, SPRITE_NANAMI, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  3,  2, SPRITE_NANAMI, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
 KantoOaksLab_Blocks::
 INCBIN "maps/KantoOaksLab.blk"

data/maps/objects/KantoPokecenter1F.asm

@@ -15,10 +15,10 @@ KantoPokecenter1F_MapEvents::
 	def_bg_events
 
 	def_object_events
-	object_event  5,  1, SPRITE_NURSE, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event 14,  6, SPRITE_YOUNGSTER, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event  2,  5, SPRITE_24, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event 10,  1, SPRITE_GRANNY, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  5,  1, SPRITE_NURSE, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event 14,  6, SPRITE_YOUNGSTER, SPRITEMOVEFN_RANDOM_SPIN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  2,  5, SPRITE_24, SPRITEMOVEFN_RANDOM_WALK_Y, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event 10,  1, SPRITE_GRANNY, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
 KantoPokecenter1F_Blocks::
 INCBIN "maps/KantoPokecenter1F.blk"

data/maps/objects/KantoPokecenter21F.asm

@@ -15,10 +15,10 @@ KantoPokecenter21F_MapEvents::
 	def_bg_events
 
 	def_object_events
-	object_event  5,  1, SPRITE_NURSE, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event 14,  6, SPRITE_GENTLEMAN, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event  2,  5, SPRITE_24, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event 10,  1, SPRITE_YOUNGSTER, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  5,  1, SPRITE_NURSE, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event 14,  6, SPRITE_GENTLEMAN, SPRITEMOVEFN_RANDOM_SPIN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  2,  5, SPRITE_24, SPRITEMOVEFN_RANDOM_WALK_Y, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event 10,  1, SPRITE_YOUNGSTER, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
 KantoPokecenter21F_Blocks::
 INCBIN "maps/KantoPokecenter21F.blk"

data/maps/objects/KantoPokecenter22F.asm

@@ -13,9 +13,9 @@ KantoPokecenter22F_MapEvents::
 	def_bg_events
 
 	def_object_events
-	object_event  5,  2, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event  9,  2, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event 14,  7, SPRITE_FISHING_GURU, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  5,  2, SPRITE_LINK_RECEPTIONIST, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  9,  2, SPRITE_LINK_RECEPTIONIST, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event 14,  7, SPRITE_FISHING_GURU, SPRITEMOVEFN_TURN_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
 KantoPokecenter22F_Blocks::
 INCBIN "maps/KantoPokecenter22F.blk"

data/maps/objects/KantoPokecenter2F.asm

@@ -13,9 +13,9 @@ KantoPokecenter2F_MapEvents::
 	def_bg_events
 
 	def_object_events
-	object_event  5,  2, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event  9,  2, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event 14,  7, SPRITE_FISHING_GURU, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  5,  2, SPRITE_LINK_RECEPTIONIST, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  9,  2, SPRITE_LINK_RECEPTIONIST, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event 14,  7, SPRITE_FISHING_GURU, SPRITEMOVEFN_TURN_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
 KantoPokecenter2F_Blocks::
 INCBIN "maps/KantoPokecenter2F.blk"

data/maps/objects/KantoRedsHouse.asm

@@ -14,8 +14,8 @@ KantoRedsHouse_MapEvents::
 	def_bg_events
 
 	def_object_events
-	object_event  7,  3, SPRITE_SUPER_NERD, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event  1,  5, SPRITE_TEACHER, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  7,  3, SPRITE_SUPER_NERD, SPRITEMOVEFN_TURN_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  1,  5, SPRITE_TEACHER, SPRITEMOVEFN_RANDOM_SPIN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
 KantoRedsHouse_Blocks::
 INCBIN "maps/KantoRedsHouse.blk"

data/maps/objects/KantoSchool.asm

@@ -14,11 +14,11 @@ KantoSchool_MapEvents::
 	def_bg_events
 
 	def_object_events
-	object_event  2,  5, SPRITE_YOUNGSTER, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event  4,  7, SPRITE_LASS, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event  4,  9, SPRITE_BUG_CATCHER_BOY, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event  3,  1, SPRITE_24, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event  6,  6, SPRITE_COOLTRAINER_F, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  2,  5, SPRITE_YOUNGSTER, SPRITEMOVEFN_TURN_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  4,  7, SPRITE_LASS, SPRITEMOVEFN_TURN_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  4,  9, SPRITE_BUG_CATCHER_BOY, SPRITEMOVEFN_TURN_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  3,  1, SPRITE_24, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  6,  6, SPRITE_COOLTRAINER_F, SPRITEMOVEFN_RANDOM_WALK_Y, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0
 
 KantoSchool_Blocks::
 INCBIN "maps/KantoSchool.blk"

data/maps/objects/KantoSilphCo.asm

@@ -14,8 +14,8 @@ KantoSilphCo_MapEvents::
 	def_bg_events
 
 	def_object_events
-	object_event  2,  2, SPRITE_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event 22,  1, SPRITE_OFFICER, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  2,  2, SPRITE_RECEPTIONIST, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event 22,  1, SPRITE_OFFICER, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
 KantoSilphCo_Blocks::
 INCBIN "maps/KantoSilphCo.blk"

data/maps/objects/KantoViridianHouse.asm

@@ -14,8 +14,8 @@ KantoViridianHouse_MapEvents::
 	def_bg_events
 
 	def_object_events
-	object_event  7,  3, SPRITE_BUG_CATCHER_BOY, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event  1,  5, SPRITE_TWIN, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  7,  3, SPRITE_BUG_CATCHER_BOY, SPRITEMOVEFN_TURN_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  1,  5, SPRITE_TWIN, SPRITEMOVEFN_RANDOM_SPIN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
 KantoViridianHouse_Blocks::
 INCBIN "maps/KantoViridianHouse.blk"

data/maps/objects/Newtype.asm

@@ -33,10 +33,10 @@ Newtype_MapEvents::
 	bg_event 30, 21, 5
 
 	def_object_events
-	object_event  5, 10, SPRITE_SILVER, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event 24, 26, SPRITE_FISHER, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event 24,  9, SPRITE_ROCKER, FACE_UP, 2, 1, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event  6, 30, SPRITE_GIRL, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  5, 10, SPRITE_SILVER, SPRITEMOVEFN_TURN_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event 24, 26, SPRITE_FISHER, SPRITEMOVEFN_RANDOM_WALK_Y, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event 24,  9, SPRITE_ROCKER, SPRITEMOVEFN_RANDOM_WALK_XY, 2, 1, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  6, 30, SPRITE_GIRL, SPRITEMOVEFN_RANDOM_WALK_X, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
 Newtype_Blocks::
 INCBIN "maps/Newtype.blk"

data/maps/objects/NewtypeDiner.asm

@@ -14,10 +14,10 @@ NewtypeDiner_MapEvents::
 	def_bg_events
 
 	def_object_events
-	object_event  2,  1, SPRITE_CLERK, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event  1,  3, SPRITE_GIRL, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event  5,  3, SPRITE_SAILOR, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event  5,  1, SPRITE_TEACHER, SLOW_STEP_DOWN, 1, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  2,  1, SPRITE_CLERK, SPRITEMOVEFN_RANDOM_SPIN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  1,  3, SPRITE_GIRL, SPRITEMOVEFN_TURN_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  5,  3, SPRITE_SAILOR, SPRITEMOVEFN_TURN_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  5,  1, SPRITE_TEACHER, SPRITEMOVEFN_RANDOM_WALK_X, 1, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
 NewtypeDiner_Blocks::
 INCBIN "maps/NewtypeDiner.blk"

data/maps/objects/NewtypeDojo.asm

@@ -14,11 +14,11 @@ NewtypeDojo_MapEvents::
 	def_bg_events
 
 	def_object_events
-	object_event  3,  2, SPRITE_BLACKBELT, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event  2,  6, SPRITE_BLACKBELT, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event  5,  6, SPRITE_BLACKBELT, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event  3, 10, SPRITE_BLACKBELT, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event  6, 10, SPRITE_BLACKBELT, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  3,  2, SPRITE_BLACKBELT, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  2,  6, SPRITE_BLACKBELT, SPRITEMOVEFN_TURN_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  5,  6, SPRITE_BLACKBELT, SPRITEMOVEFN_TURN_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  3, 10, SPRITE_BLACKBELT, SPRITEMOVEFN_TURN_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  6, 10, SPRITE_BLACKBELT, SPRITEMOVEFN_TURN_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
 NewtypeDojo_Blocks::
 INCBIN "maps/NewtypeDojo.blk"

data/maps/objects/NewtypeHouse1.asm

@@ -14,7 +14,7 @@ NewtypeHouse1_MapEvents::
 	def_bg_events
 
 	def_object_events
-	object_event  7,  3, SPRITE_BUG_CATCHER_BOY, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  7,  3, SPRITE_BUG_CATCHER_BOY, SPRITEMOVEFN_TURN_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
 NewtypeHouse1_Blocks::
 INCBIN "maps/NewtypeHouse1.blk"

data/maps/objects/NewtypeHouse2.asm

@@ -14,7 +14,7 @@ NewtypeHouse2_MapEvents::
 	def_bg_events
 
 	def_object_events
-	object_event  4,  3, SPRITE_GENTLEMAN, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  4,  3, SPRITE_GENTLEMAN, SPRITEMOVEFN_TURN_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
 NewtypeHouse2_Blocks::
 INCBIN "maps/NewtypeHouse2.blk"

data/maps/objects/NewtypeHouse3.asm

@@ -14,7 +14,7 @@ NewtypeHouse3_MapEvents::
 	def_bg_events
 
 	def_object_events
-	object_event  4,  3, SPRITE_GRAMPS, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  4,  3, SPRITE_GRAMPS, SPRITEMOVEFN_TURN_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
 NewtypeHouse3_Blocks::
 INCBIN "maps/NewtypeHouse3.blk"

data/maps/objects/NewtypeLeague1F.asm

@@ -15,11 +15,11 @@ NewtypeLeague1F_MapEvents::
 	def_bg_events
 
 	def_object_events
-	object_event  2,  5, SPRITE_YOUNGSTER, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event  4,  7, SPRITE_LASS, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event  4,  9, SPRITE_BUG_CATCHER_BOY, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event  3,  1, SPRITE_24, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event  6,  6, SPRITE_COOLTRAINER_F, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  2,  5, SPRITE_YOUNGSTER, SPRITEMOVEFN_TURN_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  4,  7, SPRITE_LASS, SPRITEMOVEFN_TURN_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  4,  9, SPRITE_BUG_CATCHER_BOY, SPRITEMOVEFN_TURN_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  3,  1, SPRITE_24, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  6,  6, SPRITE_COOLTRAINER_F, SPRITEMOVEFN_RANDOM_WALK_Y, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0
 
 NewtypeLeague1F_Blocks::
 INCBIN "maps/NewtypeLeague1F.blk"

data/maps/objects/NewtypeLeague2F.asm

@@ -13,11 +13,11 @@ NewtypeLeague2F_MapEvents::
 	def_bg_events
 
 	def_object_events
-	object_event  5,  5, SPRITE_YOUNGSTER, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event  0,  0, SPRITE_24, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event  9,  0, SPRITE_COOLTRAINER_F, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event  0, 11, SPRITE_24, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event  9, 11, SPRITE_COOLTRAINER_F, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  5,  5, SPRITE_YOUNGSTER, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  0,  0, SPRITE_24, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  9,  0, SPRITE_COOLTRAINER_F, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  0, 11, SPRITE_24, SPRITEMOVEFN_TURN_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  9, 11, SPRITE_COOLTRAINER_F, SPRITEMOVEFN_TURN_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
 NewtypeLeague2F_Blocks::
 INCBIN "maps/NewtypeLeague2F.blk"

data/maps/objects/NewtypeMart.asm

@@ -14,9 +14,9 @@ NewtypeMart_MapEvents::
 	def_bg_events
 
 	def_object_events
-	object_event  1,  3, SPRITE_CLERK, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event 10,  5, SPRITE_POKEFAN_F, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event  4,  1, SPRITE_POKEFAN_M, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  1,  3, SPRITE_CLERK, SPRITEMOVEFN_TURN_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event 10,  5, SPRITE_POKEFAN_F, SPRITEMOVEFN_RANDOM_WALK_X, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  4,  1, SPRITE_POKEFAN_M, SPRITEMOVEFN_TURN_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
 NewtypeMart_Blocks::
 INCBIN "maps/NewtypeMart.blk"

data/maps/objects/NewtypePokecenter1F.asm

@@ -15,10 +15,10 @@ NewtypePokecenter1F_MapEvents::
 	def_bg_events
 
 	def_object_events
-	object_event  5,  1, SPRITE_NURSE, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event 14,  6, SPRITE_GENTLEMAN, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event  2,  5, SPRITE_COOLTRAINER_F, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event 10,  1, SPRITE_LASS, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  5,  1, SPRITE_NURSE, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event 14,  6, SPRITE_GENTLEMAN, SPRITEMOVEFN_RANDOM_SPIN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  2,  5, SPRITE_COOLTRAINER_F, SPRITEMOVEFN_RANDOM_WALK_Y, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event 10,  1, SPRITE_LASS, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
 NewtypePokecenter1F_Blocks::
 INCBIN "maps/NewtypePokecenter1F.blk"

data/maps/objects/NewtypePokecenter2F.asm

@@ -13,9 +13,9 @@ NewtypePokecenter2F_MapEvents::
 	def_bg_events
 
 	def_object_events
-	object_event  5,  2, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event  9,  2, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event 14,  7, SPRITE_FISHING_GURU, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  5,  2, SPRITE_LINK_RECEPTIONIST, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  9,  2, SPRITE_LINK_RECEPTIONIST, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event 14,  7, SPRITE_FISHING_GURU, SPRITEMOVEFN_TURN_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
 NewtypePokecenter2F_Blocks::
 INCBIN "maps/NewtypePokecenter2F.blk"

data/maps/objects/NewtypeSailorHouse.asm

@@ -14,7 +14,7 @@ NewtypeSailorHouse_MapEvents::
 	def_bg_events
 
 	def_object_events
-	object_event  6,  3, SPRITE_47, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  6,  3, SPRITE_47, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
 NewtypeSailorHouse_Blocks::
 INCBIN "maps/NewtypeSailorHouse.blk"

data/maps/objects/North.asm

@@ -21,9 +21,9 @@ North_MapEvents::
 	bg_event  8, 12, 4
 
 	def_object_events
-	object_event  9,  6, SPRITE_GRANNY, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event 10,  9, SPRITE_BUG_CATCHER_BOY, SLOW_STEP_DOWN, 1, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event  9,  9, SPRITE_TWIN, SLOW_STEP_DOWN, 1, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  9,  6, SPRITE_GRANNY, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event 10,  9, SPRITE_BUG_CATCHER_BOY, SPRITEMOVEFN_RANDOM_WALK_X, 1, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  9,  9, SPRITE_TWIN, SPRITEMOVEFN_RANDOM_WALK_X, 1, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
 North_Blocks::
 INCBIN "maps/North.blk"

data/maps/objects/NorthHouse1.asm

@@ -14,7 +14,7 @@ NorthHouse1_MapEvents::
 	def_bg_events
 
 	def_object_events
-	object_event  2,  3, SPRITE_TWIN, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  2,  3, SPRITE_TWIN, SPRITEMOVEFN_TURN_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
 NorthHouse1_Blocks::
 INCBIN "maps/NorthHouse1.blk"

data/maps/objects/NorthHouse2.asm

@@ -14,7 +14,7 @@ NorthHouse2_MapEvents::
 	def_bg_events
 
 	def_object_events
-	object_event  2,  3, SPRITE_TWIN, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  2,  3, SPRITE_TWIN, SPRITEMOVEFN_TURN_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
 NorthHouse2_Blocks::
 INCBIN "maps/NorthHouse2.blk"

data/maps/objects/NorthMart.asm

@@ -14,9 +14,9 @@ NorthMart_MapEvents::
 	def_bg_events
 
 	def_object_events
-	object_event  1,  3, SPRITE_CLERK, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event 10,  5, SPRITE_GIRL, FACE_RIGHT, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event  4,  1, SPRITE_POKEFAN_M, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  1,  3, SPRITE_CLERK, SPRITEMOVEFN_TURN_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event 10,  5, SPRITE_GIRL, SPRITEMOVEFN_RANDOM_WALK_Y, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  4,  1, SPRITE_POKEFAN_M, SPRITEMOVEFN_TURN_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
 NorthMart_Blocks::
 INCBIN "maps/NorthMart.blk"

data/maps/objects/NorthPokecenter1F.asm

@@ -15,10 +15,10 @@ NorthPokecenter1F_MapEvents::
 	def_bg_events
 
 	def_object_events
-	object_event  5,  1, SPRITE_NURSE, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event 14,  6, SPRITE_GENTLEMAN, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event  2,  5, SPRITE_24, FACE_RIGHT, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event 10,  1, SPRITE_YOUNGSTER, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  5,  1, SPRITE_NURSE, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event 14,  6, SPRITE_GENTLEMAN, SPRITEMOVEFN_RANDOM_SPIN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  2,  5, SPRITE_24, SPRITEMOVEFN_RANDOM_WALK_Y, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event 10,  1, SPRITE_YOUNGSTER, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
 NorthPokecenter1F_Blocks::
 INCBIN "maps/NorthPokecenter1F.blk"

data/maps/objects/NorthPokecenter2F.asm

@@ -13,9 +13,9 @@ NorthPokecenter2F_MapEvents::
 	def_bg_events
 
 	def_object_events
-	object_event  5,  2, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event  9,  2, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event 14,  7, SPRITE_FISHING_GURU, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  5,  2, SPRITE_LINK_RECEPTIONIST, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  9,  2, SPRITE_LINK_RECEPTIONIST, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event 14,  7, SPRITE_FISHING_GURU, SPRITEMOVEFN_TURN_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
 NorthPokecenter2F_Blocks::
 INCBIN "maps/NorthPokecenter2F.blk"

data/maps/objects/OldCity.asm

@@ -40,11 +40,11 @@ OldCity_MapEvents::
 	bg_event  5, 14, 11
 
 	def_object_events
-	object_event  8, 30, SPRITE_TWIN, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event  2, 20, SPRITE_SUPER_NERD, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event 14, 26, SPRITE_BUG_CATCHER_BOY, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event 10, 21, SPRITE_BUG_CATCHER_BOY, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event 17, 19, SPRITE_POKE_BALL, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  8, 30, SPRITE_TWIN, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  2, 20, SPRITE_SUPER_NERD, SPRITEMOVEFN_RANDOM_SPIN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event 14, 26, SPRITE_BUG_CATCHER_BOY, SPRITEMOVEFN_RANDOM_WALK_X, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event 10, 21, SPRITE_BUG_CATCHER_BOY, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event 17, 19, SPRITE_POKE_BALL, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
 OldCity_Blocks::
 INCBIN "maps/OldCity.blk"

data/maps/objects/OldCityBillsHouse.asm

@@ -20,7 +20,7 @@ OldCityBillsHouse_MapEvents::
 	bg_event  1,  1, 6
 
 	def_object_events
-	object_event  5,  4, SPRITE_MASAKI, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  5,  4, SPRITE_MASAKI, SPRITEMOVEFN_TURN_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
 OldCityBillsHouse_Blocks::
 INCBIN "maps/OldCityBillsHouse.blk"

data/maps/objects/OldCityGym.asm

@@ -16,12 +16,12 @@ OldCityGym_MapEvents::
 	bg_event  6, 15, 1
 
 	def_object_events
-	object_event  4,  5, SPRITE_HAYATO, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event  8,  9, SPRITE_YOUNGSTER, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 1, 0, 0
-	object_event  8,  1, SPRITE_LASS, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 1, 0, 0
-	object_event  1,  1, SPRITE_SUPER_NERD, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 1, 0, 0
-	object_event  1,  9, SPRITE_YOUNGSTER, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 1, 0, 0
-	object_event  7, 15, SPRITE_GYM_GUY, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 1, 0, 0
+	object_event  4,  5, SPRITE_HAYATO, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  8,  9, SPRITE_YOUNGSTER, SPRITEMOVEFN_TURN_LEFT, 0, 0, -1, -1, 0, 0, 0, 1, 0, 0
+	object_event  8,  1, SPRITE_LASS, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 1, 0, 0
+	object_event  1,  1, SPRITE_SUPER_NERD, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 1, 0, 0
+	object_event  1,  9, SPRITE_YOUNGSTER, SPRITEMOVEFN_TURN_RIGHT, 0, 0, -1, -1, 0, 0, 0, 1, 0, 0
+	object_event  7, 15, SPRITE_GYM_GUY, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 1, 0, 0
 
 OldCityGym_Blocks::
 INCBIN "maps/OldCityGym.blk"

data/maps/objects/OldCityHouse.asm

@@ -18,9 +18,9 @@ OldCityHouse_MapEvents::
 	bg_event  7,  1, 4
 
 	def_object_events
-	object_event  2,  3, SPRITE_POKEFAN_M, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event  0,  6, SPRITE_LASS, FACE_RIGHT, 0, 1, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event  5,  1, SPRITE_YOUNGSTER, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  2,  3, SPRITE_POKEFAN_M, SPRITEMOVEFN_TURN_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  0,  6, SPRITE_LASS, SPRITEMOVEFN_RANDOM_WALK_Y, 0, 1, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  5,  1, SPRITE_YOUNGSTER, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
 OldCityHouse_Blocks::
 INCBIN "maps/OldCityHouse.blk"

data/maps/objects/OldCityKurtsHouse.asm

@@ -19,7 +19,7 @@ OldCityKurtsHouse_MapEvents::
 	bg_event 15,  0, 4
 
 	def_object_events
-	object_event  2,  2, SPRITE_GANTETSU, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  2,  2, SPRITE_GANTETSU, SPRITEMOVEFN_TURN_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
 OldCityKurtsHouse_Blocks::
 INCBIN "maps/OldCityKurtsHouse.blk"

data/maps/objects/OldCityMart.asm

@@ -15,9 +15,9 @@ OldCityMart_MapEvents::
 	bg_event  0,  7, 1
 
 	def_object_events
-	object_event  1,  3, SPRITE_CLERK, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event 10,  5, SPRITE_YOUNGSTER, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event  4,  1, SPRITE_24, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  1,  3, SPRITE_CLERK, SPRITEMOVEFN_TURN_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event 10,  5, SPRITE_YOUNGSTER, SPRITEMOVEFN_RANDOM_WALK_X, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  4,  1, SPRITE_24, SPRITEMOVEFN_TURN_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
 OldCityMart_Blocks::
 INCBIN "maps/OldCityMart.blk"