summaryrefslogtreecommitdiff
path: root/engine
diff options
context:
space:
mode:
Diffstat (limited to 'engine')
-rw-r--r--engine/events.asm2
-rw-r--r--engine/events_2.asm10
-rw-r--r--engine/map_objects.asm90
-rw-r--r--engine/movement.asm600
-rw-r--r--engine/scripting.asm18
5 files changed, 360 insertions, 360 deletions
diff --git a/engine/events.asm b/engine/events.asm
index 961a7f517..e60f08b9a 100644
--- a/engine/events.asm
+++ b/engine/events.asm
@@ -606,7 +606,7 @@ TryObjectEvent: ; 969b5
.IsObject
call PlayTalkObject
- ld a, [hConnectedMapWidth]
+ ld a, [hMapObjectIndexBuffer2]
call GetObjectStruct
ld hl, OBJECT_MAP_OBJECT_INDEX
add hl, bc
diff --git a/engine/events_2.asm b/engine/events_2.asm
index 966fa7d20..42bae51fc 100644
--- a/engine/events_2.asm
+++ b/engine/events_2.asm
@@ -352,7 +352,7 @@ Function97e08:: ; 97e08
ld hl, wd6de
xor a
.asm_97e0c
- ld [hConnectionStripLength], a
+ ld [hMapObjectIndexBuffer1], a
ld a, [hl]
and a
jr z, .asm_97e19
@@ -365,7 +365,7 @@ Function97e08:: ; 97e08
.asm_97e19
ld de, $0006
add hl, de
- ld a, [hConnectionStripLength]
+ ld a, [hMapObjectIndexBuffer1]
inc a
cp $4
jr nz, .asm_97e0c
@@ -441,14 +441,14 @@ Function97e5c:: ; 97e5c
; 97e72
Function97e72: ; 97e72
- ld hl, $0000
+ ld hl, NONE
add hl, bc
ld [hl], 0
ret
; 97e79
Function97e79: ; 97e79
- ld hl, $0000
+ ld hl, NONE
add hl, bc
ld a, [hl]
cp 5
@@ -620,7 +620,7 @@ Function97f42: ; 97f42
.asm_97f47
push af
- ld hl, $0000
+ ld hl, NONE
add hl, de
ld a, [hl]
and a
diff --git a/engine/map_objects.asm b/engine/map_objects.asm
index d73ebd142..270ad7114 100644
--- a/engine/map_objects.asm
+++ b/engine/map_objects.asm
@@ -78,7 +78,7 @@ Function437b: ; 437b
; 4386
Function4386: ; 4386
- ld hl, OBJECT_FLAGS
+ ld hl, OBJECT_FLAGS2
add hl, bc
res 6, [hl]
ld a, [XCoord]
@@ -104,7 +104,7 @@ Function4386: ; 4386
jr .yes
.ok
- ld hl, OBJECT_FLAGS
+ ld hl, OBJECT_FLAGS2
add hl, bc
set 6, [hl]
ld a, [XCoord]
@@ -133,7 +133,7 @@ Function4386: ; 4386
ret
.ok2
- ld hl, OBJECT_04
+ ld hl, OBJECT_FLAGS1
add hl, bc
bit 1, [hl]
jr nz, .yes2
@@ -142,7 +142,7 @@ Function4386: ; 4386
ret
.yes2
- ld hl, OBJECT_FLAGS
+ ld hl, OBJECT_FLAGS2
add hl, bc
set 6, [hl]
and a
@@ -155,7 +155,7 @@ Function43f3: ; 43f3
ld a, [hl]
and a
jr z, .zero
- ld hl, OBJECT_FLAGS
+ ld hl, OBJECT_FLAGS2
add hl, bc
bit 5, [hl]
jr nz, .not_bit5
@@ -165,7 +165,7 @@ Function43f3: ; 43f3
.zero
call Function47bc
- ld hl, OBJECT_FLAGS
+ ld hl, OBJECT_FLAGS2
add hl, bc
bit 5, [hl]
jr nz, .not_bit5
@@ -190,12 +190,12 @@ Function43f3: ; 43f3
; 4427
Function4427: ; 4427
- ld hl, OBJECT_04
+ ld hl, OBJECT_FLAGS1
add hl, bc
bit 0, [hl]
jr nz, Function44a3
- ld hl, OBJECT_FLAGS
+ ld hl, OBJECT_FLAGS2
add hl, bc
bit 6, [hl]
jr nz, Function44a3
@@ -208,7 +208,7 @@ Function4427: ; 4427
; 4440
Function4440: ; 4440
- ld hl, OBJECT_04
+ ld hl, OBJECT_FLAGS1
add hl, bc
bit 0, [hl]
jr nz, Function44a3
@@ -300,7 +300,7 @@ Function44b5: ; 44b5
; 44c1
Function44c1: ; 44c1
- ld hl, OBJECT_04
+ ld hl, OBJECT_FLAGS1
add hl, bc
bit 3, [hl]
jp nz, Function44aa
@@ -324,7 +324,7 @@ Function44c1: ; 44c1
; 44e4
Function44e4: ; 44e4
- ld hl, OBJECT_04
+ ld hl, OBJECT_FLAGS1
add hl, bc
bit 3, [hl]
jp nz, Function44aa
@@ -348,7 +348,7 @@ Function44e4: ; 44e4
; 4508
Function4508: ; 4508
- ld hl, OBJECT_04
+ ld hl, OBJECT_FLAGS1
add hl, bc
bit 3, [hl]
jp nz, Function44aa
@@ -603,7 +603,7 @@ Function462a: ; 462a
; 463f
Function463f: ; 463f
- ld hl, OBJECT_FLAGS
+ ld hl, OBJECT_FLAGS2
add hl, bc
bit 3, [hl]
jr z, .ok
@@ -632,13 +632,13 @@ Function4661: ; 4661
jr c, .reset
.set
- ld hl, OBJECT_FLAGS
+ ld hl, OBJECT_FLAGS2
add hl, bc
set 3, [hl]
ret
.reset
- ld hl, OBJECT_FLAGS
+ ld hl, OBJECT_FLAGS2
add hl, bc
res 3, [hl]
ret
@@ -670,7 +670,7 @@ Function4690: ; 4690
ld hl, OBJECT_DIRECTION_WALKING
add hl, bc
ld [hl], a
- ld hl, OBJECT_04
+ ld hl, OBJECT_FLAGS1
add hl, bc
bit 2, [hl]
jr nz, .ok
@@ -1098,7 +1098,7 @@ Function48b3: ; 48b3
ld a, [hl]
call CheckPitTile
jr z, .on_pit
- ld hl, OBJECT_FLAGS
+ ld hl, OBJECT_FLAGS2
add hl, bc
bit 2, [hl]
res 2, [hl]
@@ -1192,7 +1192,7 @@ Function48ff: ; 48ff
and %00001100
or d
pop bc
- jp Function5412
+ jp NormalStep
.standing
pop bc
@@ -1499,7 +1499,7 @@ Function4af0: ; 4af0
add hl, bc
ld [hl], 2
ld hl, wd4cf
- ld a, [hConnectionStripLength]
+ ld a, [hMapObjectIndexBuffer1]
cp [hl]
jr z, .ok
ld hl, OBJECT_09
@@ -1604,7 +1604,7 @@ Function4b8d: ; 4b8d
ret nz
call Function4600
call Function46a6
- ld hl, OBJECT_FLAGS
+ ld hl, OBJECT_FLAGS2
add hl, bc
res 3, [hl]
call IncrementObjectStructField28
@@ -1648,7 +1648,7 @@ Function4bd2: ; 4bd2
dec [hl]
ret nz
call Function4600
- ld hl, OBJECT_FLAGS
+ ld hl, OBJECT_FLAGS2
add hl, bc
res 3, [hl]
ld hl, wd150
@@ -1723,7 +1723,7 @@ Function4c42: ; 4c42
ld hl, OBJECT_STEP_DURATION
add hl, bc
ld [hl], $10
- ld hl, OBJECT_FLAGS
+ ld hl, OBJECT_FLAGS2
add hl, bc
res 3, [hl]
call IncrementObjectStructField28
@@ -2198,7 +2198,7 @@ Function4ecd: ; 4ecd
ld b, a
callba CopyDECoordsToMapObject
pop bc
- ld hl, OBJECT_FLAGS
+ ld hl, OBJECT_FLAGS2
add hl, bc
res 2, [hl]
call Function4600
@@ -2508,7 +2508,7 @@ Function54b8: ; 54b8
ret z
ld a, [wd4cd]
ld d, a
- ld a, [hConnectionStripLength]
+ ld a, [hMapObjectIndexBuffer1]
cp d
ret nz
ld a, e
@@ -2651,7 +2651,7 @@ Function5565: ; 5565
Function5579: ; 5579
push bc
- ld a, [hConnectionStripLength]
+ ld a, [hMapObjectIndexBuffer1]
ld c, a
call Function5582
pop bc
@@ -2663,7 +2663,7 @@ Function5582: ; 5582
ld a, NUM_OBJECT_STRUCTS
.loop
push af
- ld hl, OBJECT_04
+ ld hl, OBJECT_FLAGS1
add hl, de
bit 7, [hl]
jr z, .next
@@ -2712,7 +2712,7 @@ Function55b9: ; 55b9
ld [hli], a
ld a, [de]
ld [hli], a
- ld a, [hConnectionStripLength]
+ ld a, [hMapObjectIndexBuffer1]
ld [hli], a
push hl
ld hl, OBJECT_MAP_X
@@ -2737,7 +2737,7 @@ Function55e0:: ; 55e0
ld bc, ObjectStructs
xor a
.loop
- ld [hConnectionStripLength], a
+ ld [hMapObjectIndexBuffer1], a
call GetObjectSprite
jr z, .ok
call Function565c
@@ -2747,7 +2747,7 @@ Function55e0:: ; 55e0
add hl, bc
ld b, h
ld c, l
- ld a, [hConnectionStripLength]
+ ld a, [hMapObjectIndexBuffer1]
inc a
cp NUM_OBJECT_STRUCTS
jr nz, .loop
@@ -2801,13 +2801,13 @@ Function5645: ; 5645
xor a
ld bc, ObjectStructs
.loop
- ld [hConnectionStripLength], a
+ ld [hMapObjectIndexBuffer1], a
call Function5680
ld hl, OBJECT_STRUCT_LENGTH
add hl, bc
ld b, h
ld c, l
- ld a, [hConnectionStripLength]
+ ld a, [hMapObjectIndexBuffer1]
inc a
cp NUM_OBJECT_STRUCTS
jr nz, .loop
@@ -3032,7 +3032,7 @@ Function5781: ; 5781
ld bc, ObjectStructs
xor a
.loop
- ld [hConnectionStripLength], a
+ ld [hMapObjectIndexBuffer1], a
call GetObjectSprite
jr z, .next
call Function437b
@@ -3042,7 +3042,7 @@ Function5781: ; 5781
add hl, bc
ld b, h
ld c, l
- ld a, [hConnectionStripLength]
+ ld a, [hMapObjectIndexBuffer1]
inc a
cp NUM_OBJECT_STRUCTS
jr nz, .loop
@@ -3102,7 +3102,7 @@ Function57e2: ; 57e2
ld a, d
and $80
ret z
- ld bc, $0000 ; debug?
+ ld bc, NONE ; debug?
ld hl, OBJECT_FACING
add hl, bc
ld a, [hl]
@@ -3137,7 +3137,7 @@ Function5803:: ; 5803
Function5815: ; 5815
call Function18de
ret c
- ld a, [hConnectedMapWidth]
+ ld a, [hMapObjectIndexBuffer2]
ld [wd4cd], a
ret
; 581f
@@ -3166,7 +3166,7 @@ Function582c: ; 582c
ld hl, OBJECT_09
add hl, bc
ld [hl], 0
- ld a, [hConnectedMapWidth]
+ ld a, [hMapObjectIndexBuffer2]
ld [wd4ce], a
ret
; 5847
@@ -3189,7 +3189,7 @@ SetFlagsForMovement_1:: ; 585c
push bc
call Function587a
pop bc
- ld hl, OBJECT_FLAGS
+ ld hl, OBJECT_FLAGS2
add hl, bc
res 5, [hl]
xor a
@@ -3199,7 +3199,7 @@ SetFlagsForMovement_1:: ; 585c
Function586e: ; 586e
call Function18de
ret c
- ld hl, OBJECT_FLAGS
+ ld hl, OBJECT_FLAGS2
add hl, bc
set 5, [hl]
xor a
@@ -3213,7 +3213,7 @@ Function587a: ; 587a
push af
call GetObjectSprite
jr z, .next
- ld hl, OBJECT_FLAGS
+ ld hl, OBJECT_FLAGS2
add hl, bc
set 5, [hl]
@@ -3245,7 +3245,7 @@ _SetFlagsForMovement_2:: ; 5897
cp -1
ret z
call GetObjectStruct
- ld hl, OBJECT_FLAGS
+ ld hl, OBJECT_FLAGS2
add hl, bc
res 5, [hl]
ret
@@ -3259,7 +3259,7 @@ Function58b9:: ; 58b9
push af
call GetObjectSprite
jr z, .next
- ld hl, OBJECT_FLAGS
+ ld hl, OBJECT_FLAGS2
add hl, bc
res 5, [hl]
@@ -3279,7 +3279,7 @@ Function58b9:: ; 58b9
Function58d8: ; 58d8
call Function18de
ret c
- ld hl, OBJECT_FLAGS
+ ld hl, OBJECT_FLAGS2
add hl, bc
res 5, [hl]
ret
@@ -3357,7 +3357,7 @@ Function593a: ; 593a
ret nc
ld l, a
ld h, $c4
- ld de, OBJECT_04
+ ld de, OBJECT_FLAGS1
ld a, b
ld c, $a0
.loop
@@ -3447,7 +3447,7 @@ Function59a4: ; 59a4
; Define the sprite priority.
ld e, $10
- ld hl, OBJECT_FLAGS
+ ld hl, OBJECT_FLAGS2
add hl, bc
bit 0, [hl]
jr nz, .add
@@ -3517,7 +3517,7 @@ Function5a0d: ; 5a0d
or %00001000
.skip1
- ld hl, OBJECT_FLAGS
+ ld hl, OBJECT_FLAGS2
add hl, bc
ld e, [hl]
bit 7, e
diff --git a/engine/movement.asm b/engine/movement.asm
index d3c570cf5..8a4f09c5e 100644
--- a/engine/movement.asm
+++ b/engine/movement.asm
@@ -1,120 +1,120 @@
MovementPointers: ; 5075
- dw Movement_turn_head_down
- dw Movement_turn_head_up
- dw Movement_turn_head_left
- dw Movement_turn_head_right
- dw Movement_half_step_down
- dw Movement_half_step_up
- dw Movement_half_step_left
- dw Movement_half_step_right
- dw Movement_slow_step_down
- dw Movement_slow_step_up
- dw Movement_slow_step_left
- dw Movement_slow_step_right
- dw Movement_step_down
- dw Movement_step_up
- dw Movement_step_left
- dw Movement_step_right
- dw Movement_big_step_down
- dw Movement_big_step_up
- dw Movement_big_step_left
- dw Movement_big_step_right
- dw Movement_slow_slide_step_down
- dw Movement_slow_slide_step_up
- dw Movement_slow_slide_step_left
- dw Movement_slow_slide_step_right
- dw Movement_slide_step_down
- dw Movement_slide_step_up
- dw Movement_slide_step_left
- dw Movement_slide_step_right
- dw Movement_fast_slide_step_down
- dw Movement_fast_slide_step_up
- dw Movement_fast_slide_step_left
- dw Movement_fast_slide_step_right
- dw Movement_turn_away_down
- dw Movement_turn_away_up
- dw Movement_turn_away_left
- dw Movement_turn_away_right
- dw Movement_turn_in_down
- dw Movement_turn_in_up
- dw Movement_turn_in_left
- dw Movement_turn_in_right
- dw Movement_turn_waterfall_down
- dw Movement_turn_waterfall_up
- dw Movement_turn_waterfall_left
- dw Movement_turn_waterfall_right
- dw Movement_slow_jump_step_down
- dw Movement_slow_jump_step_up
- dw Movement_slow_jump_step_left
- dw Movement_slow_jump_step_right
- dw Movement_jump_step_down
- dw Movement_jump_step_up
- dw Movement_jump_step_left
- dw Movement_jump_step_right
- dw Movement_fast_jump_step_down
- dw Movement_fast_jump_step_up
- dw Movement_fast_jump_step_left
- dw Movement_fast_jump_step_right
- dw Function5293
- dw Function529c
- dw Movement_remove_fixed_facing
- dw Movement_fix_facing
- dw Function52b7
- dw Movement_hide_person
- dw Movement_show_person
- dw Function5226
- dw Function522a
- dw Function522e
- dw Function5232
- dw Function5236
- dw Function523a
- dw Movement_accelerate_last
- dw Movement_step_sleep
- dw Movement_step_end
- dw Function51db
- dw Movement_remove_person
- dw Function51b8
- dw Function5210
- dw Movement_teleport_from
- dw Movement_teleport_to
- dw Movement_skyfall
- dw Movement_step_wait5
- dw Function525f
- dw Function5189
- dw Function51ab
- dw Movement_hide_emote
- dw Movement_show_emote
- dw Movement_step_shake
- dw Function5279
- dw Function5196
- dw Function516a
- dw Function513e
+ dw Movement_turn_head_down ; 00
+ dw Movement_turn_head_up ; 01
+ dw Movement_turn_head_left ; 02
+ dw Movement_turn_head_right ; 03
+ dw Movement_half_step_down ; 04
+ dw Movement_half_step_up ; 05
+ dw Movement_half_step_left ; 06
+ dw Movement_half_step_right ; 07
+ dw Movement_slow_step_down ; 08
+ dw Movement_slow_step_up ; 09
+ dw Movement_slow_step_left ; 0a
+ dw Movement_slow_step_right ; 0b
+ dw Movement_step_down ; 0c
+ dw Movement_step_up ; 0d
+ dw Movement_step_left ; 0e
+ dw Movement_step_right ; 0f
+ dw Movement_big_step_down ; 10
+ dw Movement_big_step_up ; 11
+ dw Movement_big_step_left ; 12
+ dw Movement_big_step_right ; 13
+ dw Movement_slow_slide_step_down ; 14
+ dw Movement_slow_slide_step_up ; 15
+ dw Movement_slow_slide_step_left ; 16
+ dw Movement_slow_slide_step_right ; 17
+ dw Movement_slide_step_down ; 18
+ dw Movement_slide_step_up ; 19
+ dw Movement_slide_step_left ; 1a
+ dw Movement_slide_step_right ; 1b
+ dw Movement_fast_slide_step_down ; 1c
+ dw Movement_fast_slide_step_up ; 1d
+ dw Movement_fast_slide_step_left ; 1e
+ dw Movement_fast_slide_step_right ; 1f
+ dw Movement_turn_away_down ; 20
+ dw Movement_turn_away_up ; 21
+ dw Movement_turn_away_left ; 22
+ dw Movement_turn_away_right ; 23
+ dw Movement_turn_in_down ; 24
+ dw Movement_turn_in_up ; 25
+ dw Movement_turn_in_left ; 26
+ dw Movement_turn_in_right ; 27
+ dw Movement_turn_waterfall_down ; 28
+ dw Movement_turn_waterfall_up ; 29
+ dw Movement_turn_waterfall_left ; 2a
+ dw Movement_turn_waterfall_right ; 2b
+ dw Movement_slow_jump_step_down ; 2c
+ dw Movement_slow_jump_step_up ; 2d
+ dw Movement_slow_jump_step_left ; 2e
+ dw Movement_slow_jump_step_right ; 2f
+ dw Movement_jump_step_down ; 30
+ dw Movement_jump_step_up ; 31
+ dw Movement_jump_step_left ; 32
+ dw Movement_jump_step_right ; 33
+ dw Movement_fast_jump_step_down ; 34
+ dw Movement_fast_jump_step_up ; 35
+ dw Movement_fast_jump_step_left ; 36
+ dw Movement_fast_jump_step_right ; 37
+ dw Movement_38 ; 38
+ dw Movement_39 ; 39
+ dw Movement_remove_fixed_facing ; 3a
+ dw Movement_fix_facing ; 3b
+ dw Movement_3c ; 3c
+ dw Movement_hide_person ; 3d
+ dw Movement_show_person ; 3e
+ dw Movement_3f ; 3f
+ dw Movement_40 ; 40
+ dw Movement_41 ; 41
+ dw Movement_42 ; 42
+ dw Movement_43 ; 43
+ dw Movement_44 ; 44
+ dw Movement_accelerate_last ; 45
+ dw Movement_step_sleep ; 46
+ dw Movement_step_end ; 47
+ dw Movement_48 ; 48
+ dw Movement_remove_person ; 49
+ dw Movement_4a ; 4a
+ dw Movement_4b ; 4b
+ dw Movement_teleport_from ; 4c
+ dw Movement_teleport_to ; 4d
+ dw Movement_skyfall ; 4e
+ dw Movement_step_wait5 ; 4f
+ dw Movement_50 ; 50
+ dw Movement_51 ; 51
+ dw Movement_52 ; 52
+ dw Movement_hide_emote ; 53
+ dw Movement_show_emote ; 54
+ dw Movement_step_shake ; 55
+ dw Movement_56 ; 56
+ dw Movement_57 ; 57
+ dw Movement_58 ; 58
+ dw Movement_59 ; 59
; 5129
Movement_teleport_from: ; 5129
- ld hl, $0009
+ ld hl, OBJECT_09
add hl, bc
ld [hl], $c
ret
; 5130
Movement_teleport_to: ; 5130
- ld hl, $0009
+ ld hl, OBJECT_09
add hl, bc
ld [hl], $d
ret
; 5137
Movement_skyfall: ; 5137
- ld hl, $0009
+ ld hl, OBJECT_09
add hl, bc
ld [hl], $e
ret
; 513e
-Function513e: ; 513e
- ld hl, $0009
+Movement_59: ; 513e
+ ld hl, OBJECT_09
add hl, bc
ld [hl], $19
ret
@@ -124,81 +124,81 @@ Movement_step_wait5: ; 5145
call GetSpriteDirection
rlca
rlca
- ld hl, $000c
+ ld hl, OBJECT_12
add hl, bc
ld [hl], a
- ld hl, $000b
+ ld hl, OBJECT_11
add hl, bc
ld [hl], $4
call GetMovementByte
- ld hl, $000a
+ ld hl, OBJECT_STEP_DURATION
add hl, bc
ld [hl], a
- ld hl, $0009
+ ld hl, OBJECT_09
add hl, bc
ld [hl], $3
- ld hl, $0007
+ ld hl, OBJECT_DIRECTION_WALKING
add hl, bc
ld [hl], $ff
ret
; 516a
-Function516a: ; 516a
+Movement_58: ; 516a
call GetSpriteDirection
rlca
rlca
- ld hl, $000c
+ ld hl, OBJECT_12
add hl, bc
ld [hl], a
call GetMovementByte
- ld hl, $000a
+ ld hl, OBJECT_STEP_DURATION
add hl, bc
ld [hl], a
- ld hl, $0007
+ ld hl, OBJECT_DIRECTION_WALKING
add hl, bc
ld [hl], $ff
- ld hl, $0009
+ ld hl, OBJECT_09
add hl, bc
ld [hl], $12
ret
; 5189
-Function5189: ; 5189
- ld hl, $000b
+Movement_51: ; 5189
+ ld hl, OBJECT_11
add hl, bc
ld [hl], $6
- ld hl, $0009
+ ld hl, OBJECT_09
add hl, bc
ld [hl], $10
ret
; 5196
-Function5196: ; 5196
+Movement_57: ; 5196
call GetMovementByte
- ld hl, $000a
+ ld hl, OBJECT_STEP_DURATION
add hl, bc
ld [hl], a
- ld hl, $000b
+ ld hl, OBJECT_11
add hl, bc
ld [hl], $1
- ld hl, $0009
+ ld hl, OBJECT_09
add hl, bc
ld [hl], $11
ret
; 51ab
-Function51ab: ; 51ab
- ld hl, $000b
+Movement_52: ; 51ab
+ ld hl, OBJECT_11
add hl, bc
ld [hl], $6
- ld hl, $0009
+ ld hl, OBJECT_09
add hl, bc
ld [hl], $1
ret
; 51b8
-Function51b8: ; 51b8
- ld hl, $001b
+Movement_4a: ; 51b8
+ ld hl, OBJECT_27
add hl, bc
ld [hl], $0
jp Function5065
@@ -206,33 +206,33 @@ Function51b8: ; 51b8
Movement_step_end: ; 51c1
call Function4769
- ld hl, $0003
+ ld hl, OBJECT_03
add hl, bc
ld [hl], a
- ld hl, $001b
+ ld hl, OBJECT_27
add hl, bc
ld [hl], $0
ld hl, VramState
res 7, [hl]
- ld hl, $0009
+ ld hl, OBJECT_09
add hl, bc
ld [hl], $1
ret
; 51db
-Function51db: ; 51db
+Movement_48: ; 51db
call Function4769
- ld hl, $0003
+ ld hl, OBJECT_03
add hl, bc
ld [hl], a
- ld hl, $001b
+ ld hl, OBJECT_27
add hl, bc
ld [hl], $0
call GetMovementByte
- ld hl, $000a
+ ld hl, OBJECT_STEP_DURATION
add hl, bc
ld [hl], a
- ld hl, $0009
+ ld hl, OBJECT_09
add hl, bc
ld [hl], $3
ld hl, VramState
@@ -243,7 +243,7 @@ Function51db: ; 51db
Movement_remove_person: ; 51fd
call Function4357
ld hl, wd4cd
- ld a, [hConnectionStripLength]
+ ld a, [hMapObjectIndexBuffer1]
cp [hl]
jr nz, .asm_520a
ld [hl], $ff
@@ -254,11 +254,11 @@ Movement_remove_person: ; 51fd
ret
; 5210
-Function5210: ; 5210
- ld hl, $000b
+Movement_4b: ; 5210
+ ld hl, OBJECT_11
add hl, bc
ld [hl], $1
- ld hl, $0009
+ ld hl, OBJECT_09
add hl, bc
ld [hl], $4
ld hl, VramState
@@ -270,27 +270,27 @@ Movement_show_person: ; 5222
ld a, $1
jr Function5247
-Function5226: ; 5226
+Movement_3f: ; 5226
ld a, $2
jr Function5247
-Function522a: ; 522a
+Movement_40: ; 522a
ld a, $3
jr Function5247
-Function522e: ; 522e
+Movement_41: ; 522e
ld a, $4
jr Function5247
-Function5232: ; 5232
+Movement_42: ; 5232
ld a, $5
jr Function5247
-Function5236: ; 5236
+Movement_43: ; 5236
ld a, $6
jr Function5247
-Function523a: ; 523a
+Movement_44: ; 523a
ld a, $7
jr Function5247
@@ -306,92 +306,92 @@ Movement_step_sleep: ; 5242
jr Function5247
Function5247: ; 5247
- ld hl, $000a
+ ld hl, OBJECT_STEP_DURATION
add hl, bc
ld [hl], a
- ld hl, $0009
+ ld hl, OBJECT_09
add hl, bc
ld [hl], $3
- ld hl, $000b
+ ld hl, OBJECT_11
add hl, bc
ld [hl], $1
- ld hl, $0007
+ ld hl, OBJECT_DIRECTION_WALKING
add hl, bc
ld [hl], $ff
ret
; 525f
-Function525f: ; 525f
+Movement_50: ; 525f
ld a, $1
- ld hl, $000a
+ ld hl, OBJECT_STEP_DURATION
add hl, bc
ld [hl], a
- ld hl, $0009
+ ld hl, OBJECT_09
add hl, bc
ld [hl], $b
- ld hl, $000b
+ ld hl, OBJECT_11
add hl, bc
ld [hl], $3
- ld hl, $0007
+ ld hl, OBJECT_DIRECTION_WALKING
add hl, bc
ld [hl], $ff
ret
; 5279
-Function5279: ; 5279
+Movement_56: ; 5279
ld a, $18
- ld hl, $000a
+ ld hl, OBJECT_STEP_DURATION
add hl, bc
ld [hl], a
- ld hl, $0009
+ ld hl, OBJECT_09
add hl, bc
ld [hl], $3
- ld hl, $000b
+ ld hl, OBJECT_11
add hl, bc
ld [hl], $b
- ld hl, $0007
+ ld hl, OBJECT_DIRECTION_WALKING
add hl, bc
ld [hl], $ff
ret
; 5293
-Function5293: ; 5293
- ld hl, $0004
+Movement_38: ; 5293
+ ld hl, OBJECT_FLAGS1
add hl, bc
res 3, [hl]
jp Function5065
; 529c
-Function529c: ; 529c
- ld hl, $0004
+Movement_39: ; 529c
+ ld hl, OBJECT_FLAGS1
add hl, bc
set 3, [hl]
jp Function5065
; 52a5
Movement_remove_fixed_facing: ; 52a5
- ld hl, $0004
+ ld hl, OBJECT_FLAGS1
add hl, bc
res 2, [hl]
jp Function5065
; 52ae
Movement_fix_facing: ; 52ae
- ld hl, $0004
+ ld hl, OBJECT_FLAGS1
add hl, bc
set 2, [hl]
jp Function5065
; 52b7
-Function52b7: ; 52b7
- ld hl, $0004
+Movement_3c: ; 52b7
+ ld hl, OBJECT_FLAGS1
add hl, bc
res 0, [hl]
jp Function5065
; 52c0
Movement_hide_person: ; 52c0
- ld hl, $0004
+ ld hl, OBJECT_FLAGS1
add hl, bc
set 0, [hl]
jp Function5065
@@ -417,311 +417,311 @@ Movement_step_shake: ; 52d5
; 52de
Movement_turn_head_down: ; 52de
- ld a, $0
- jr Function52ee
+ ld a, OW_DOWN
+ jr TurnHead
Movement_turn_head_up: ; 52e2
- ld a, $4
- jr Function52ee
+ ld a, OW_UP
+ jr TurnHead
Movement_turn_head_left: ; 52e6
- ld a, $8
- jr Function52ee
+ ld a, OW_LEFT
+ jr TurnHead
Movement_turn_head_right: ; 52ea
- ld a, $c
- jr Function52ee
+ ld a, OW_RIGHT
+ jr TurnHead
-Function52ee: ; 52ee
- ld hl, $0008
+TurnHead: ; 52ee
+ ld hl, OBJECT_FACING
add hl, bc
ld [hl], a
- ld hl, $000b
+ ld hl, OBJECT_11
add hl, bc
ld [hl], $1
- ld hl, $0007
+ ld hl, OBJECT_DIRECTION_WALKING
add hl, bc
ld [hl], $ff
ret
; 5300
Movement_slow_step_down: ; 5300
- ld a, $0
- jp Function5412
+ ld a, STEP_SLOW << 2 | DOWN
+ jp NormalStep
; 5305
Movement_slow_step_up: ; 5305
- ld a, $1
- jp Function5412
+ ld a, STEP_SLOW << 2 | UP
+ jp NormalStep
; 530a
Movement_slow_step_left: ; 530a
- ld a, $2
- jp Function5412
+ ld a, STEP_SLOW << 2 | LEFT
+ jp NormalStep
; 530f
Movement_slow_step_right: ; 530f
- ld a, $3
- jp Function5412
+ ld a, STEP_SLOW << 2 | RIGHT
+ jp NormalStep
; 5314
Movement_step_down: ; 5314
- ld a, $4
- jp Function5412
+ ld a, STEP_WALK << 2 | DOWN
+ jp NormalStep
; 5319
Movement_step_up: ; 5319
- ld a, $5
- jp Function5412
+ ld a, STEP_WALK << 2 | UP
+ jp NormalStep
; 531e
Movement_step_left: ; 531e
- ld a, $6
- jp Function5412
+ ld a, STEP_WALK << 2 | LEFT
+ jp NormalStep
; 5323
Movement_step_right: ; 5323
- ld a, $7
- jp Function5412
+ ld a, STEP_WALK << 2 | RIGHT
+ jp NormalStep
; 5328
Movement_big_step_down: ; 5328
- ld a, $8
- jp Function5412
+ ld a, STEP_BIKE << 2 | DOWN
+ jp NormalStep
; 532d
Movement_big_step_up: ; 532d
- ld a, $9
- jp Function5412
+ ld a, STEP_BIKE << 2 | UP
+ jp NormalStep
; 5332
Movement_big_step_left: ; 5332
- ld a, $a
- jp Function5412
+ ld a, STEP_BIKE << 2 | LEFT
+ jp NormalStep
; 5337
Movement_big_step_right: ; 5337
- ld a, $b
- jp Function5412
+ ld a, STEP_BIKE << 2 | RIGHT
+ jp NormalStep
; 533c
Movement_turn_away_down: ; 533c
- ld a, $0
- jp Function5446
+ ld a, STEP_SLOW << 2 | DOWN
+ jp TurningStep
; 5341
Movement_turn_away_up: ; 5341
- ld a, $1
- jp Function5446
+ ld a, STEP_SLOW << 2 | UP
+ jp TurningStep
; 5346
Movement_turn_away_left: ; 5346
- ld a, $2
- jp Function5446
+ ld a, STEP_SLOW << 2 | LEFT
+ jp TurningStep
; 534b
Movement_turn_away_right: ; 534b
- ld a, $3
- jp Function5446
+ ld a, STEP_SLOW << 2 | RIGHT
+ jp TurningStep
; 5350
Movement_turn_in_down: ; 5350
- ld a, $4
- jp Function5446
+ ld a, STEP_WALK << 2 | DOWN
+ jp TurningStep
; 5355
Movement_turn_in_up: ; 5355
- ld a, $5
- jp Function5446
+ ld a, STEP_WALK << 2 | UP
+ jp TurningStep
; 535a
Movement_turn_in_left: ; 535a
- ld a, $6
- jp Function5446
+ ld a, STEP_WALK << 2 | LEFT
+ jp TurningStep
; 535f
Movement_turn_in_right: ; 535f
- ld a, $7
- jp Function5446
+ ld a, STEP_WALK << 2 | RIGHT
+ jp TurningStep
; 5364
Movement_turn_waterfall_down: ; 5364
- ld a, $8
- jp Function5446
+ ld a, STEP_BIKE << 2 | DOWN
+ jp TurningStep
; 5369
Movement_turn_waterfall_up: ; 5369
- ld a, $9
- jp Function5446
+ ld a, STEP_BIKE << 2 | UP
+ jp TurningStep
; 536e
Movement_turn_waterfall_left: ; 536e
- ld a, $a
- jp Function5446
+ ld a, STEP_BIKE << 2 | LEFT
+ jp TurningStep
; 5373
Movement_turn_waterfall_right: ; 5373
- ld a, $b
- jp Function5446
+ ld a, STEP_BIKE << 2 | RIGHT
+ jp TurningStep
; 5378
Movement_slow_slide_step_down: ; 5378
- ld a, $0
- jp Function5468
+ ld a, STEP_SLOW << 2 | DOWN
+ jp SlideStep
; 537d
Movement_slow_slide_step_up: ; 537d
- ld a, $1
- jp Function5468
+ ld a, STEP_SLOW << 2 | UP
+ jp SlideStep
; 5382
Movement_slow_slide_step_left: ; 5382
- ld a, $2
- jp Function5468
+ ld a, STEP_SLOW << 2 | LEFT
+ jp SlideStep
; 5387
Movement_slow_slide_step_right: ; 5387
- ld a, $3
- jp Function5468
+ ld a, STEP_SLOW << 2 | RIGHT
+ jp SlideStep
; 538c
Movement_slide_step_down: ; 538c
- ld a, $4
- jp Function5468
+ ld a, STEP_WALK << 2 | DOWN
+ jp SlideStep
; 5391
Movement_slide_step_up: ; 5391
- ld a, $5
- jp Function5468
+ ld a, STEP_WALK << 2 | UP
+ jp SlideStep
; 5396
Movement_slide_step_left: ; 5396
- ld a, $6
- jp Function5468
+ ld a, STEP_WALK << 2 | LEFT
+ jp SlideStep
; 539b
Movement_slide_step_right: ; 539b
- ld a, $7
- jp Function5468
+ ld a, STEP_WALK << 2 | RIGHT
+ jp SlideStep
; 53a0
Movement_fast_slide_step_down: ; 53a0
- ld a, $8
- jp Function5468
+ ld a, STEP_BIKE << 2 | DOWN
+ jp SlideStep
; 53a5
Movement_fast_slide_step_up: ; 53a5
- ld a, $9
- jp Function5468
+ ld a, STEP_BIKE << 2 | UP
+ jp SlideStep
; 53aa
Movement_fast_slide_step_left: ; 53aa
- ld a, $a
- jp Function5468
+ ld a, STEP_BIKE << 2 | LEFT
+ jp SlideStep
; 53af
Movement_fast_slide_step_right: ; 53af
- ld a, $b
- jp Function5468
+ ld a, STEP_BIKE << 2 | RIGHT
+ jp SlideStep
; 53b4
Movement_slow_jump_step_down: ; 53b4
- ld a, $0
- jp Function548a
+ ld a, STEP_SLOW << 2 | DOWN
+ jp JumpStep
; 53b9
Movement_slow_jump_step_up: ; 53b9
- ld a, $1
- jp Function548a
+ ld a, STEP_SLOW << 2 | UP
+ jp JumpStep
; 53be
Movement_slow_jump_step_left: ; 53be
- ld a, $2
- jp Function548a
+ ld a, STEP_SLOW << 2 | LEFT
+ jp JumpStep
; 53c3
Movement_slow_jump_step_right: ; 53c3
- ld a, $3
- jp Function548a
+ ld a, STEP_SLOW << 2 | RIGHT
+ jp JumpStep
; 53c8
Movement_jump_step_down: ; 53c8
- ld a, $4
- jp Function548a
+ ld a, STEP_WALK << 2 | DOWN
+ jp JumpStep
; 53cd
Movement_jump_step_up: ; 53cd
- ld a, $5
- jp Function548a
+ ld a, STEP_WALK << 2 | UP
+ jp JumpStep
; 53d2
Movement_jump_step_left: ; 53d2
- ld a, $6
- jp Function548a
+ ld a, STEP_WALK << 2 | LEFT
+ jp JumpStep
; 53d7
Movement_jump_step_right: ; 53d7
- ld a, $7
- jp Function548a
+ ld a, STEP_WALK << 2 | RIGHT
+ jp JumpStep
; 53dc
Movement_fast_jump_step_down: ; 53dc
- ld a, $8
- jp Function548a
+ ld a, STEP_BIKE << 2 | DOWN
+ jp JumpStep
; 53e1
Movement_fast_jump_step_up: ; 53e1
- ld a, $9
- jp Function548a
+ ld a, STEP_BIKE << 2 | UP
+ jp JumpStep
; 53e6
Movement_fast_jump_step_left: ; 53e6
- ld a, $a
- jp Function548a
+ ld a, STEP_BIKE << 2 | LEFT
+ jp JumpStep
; 53eb
Movement_fast_jump_step_right: ; 53eb
- ld a, $b
- jp Function548a
+ ld a, STEP_BIKE << 2 | RIGHT
+ jp JumpStep
; 53f0
Movement_half_step_down: ; 53f0
- ld a, $0
- jr Function5400
+ ld a, OW_DOWN
+ jr HalfStep
Movement_half_step_up: ; 53f4
- ld a, $4
- jr Function5400
+ ld a, OW_UP
+ jr HalfStep
Movement_half_step_left: ; 53f8
- ld a, $8
- jr Function5400
+ ld a, OW_LEFT
+ jr HalfStep
Movement_half_step_right: ; 53fc
- ld a, $c
- jr Function5400
+ ld a, OW_RIGHT
+ jr HalfStep
-Function5400: ; 5400
- ld hl, $001d
+HalfStep: ; 5400
+ ld hl, OBJECT_29
add hl, bc
ld [hl], a
- ld hl, $000b
+ ld hl, OBJECT_11
add hl, bc
ld [hl], $2
- ld hl, $0009
+ ld hl, OBJECT_09
add hl, bc
ld [hl], $a
ret
; 5412
-Function5412: ; 5412
+NormalStep: ; 5412
call Function4690
call Function463f
- ld hl, $000b
+ ld hl, OBJECT_11
add hl, bc
ld [hl], $2
ld hl, OBJECT_STANDING_TILE
@@ -738,91 +738,91 @@ Function5412: ; 5412
.asm_5430
ld hl, wd4cf
- ld a, [hConnectionStripLength]
+ ld a, [hMapObjectIndexBuffer1]
cp [hl]
jr z, .asm_543f
- ld hl, $0009
+ ld hl, OBJECT_09
add hl, bc
ld [hl], $2
ret
.asm_543f
- ld hl, $0009
+ ld hl, OBJECT_09
add hl, bc
ld [hl], $6
ret
; 5446
-Function5446: ; 5446
+TurningStep: ; 5446
call Function4690
call Function463f
- ld hl, $000b
+ ld hl, OBJECT_11
add hl, bc
ld [hl], $4
ld hl, wd4cf
- ld a, [hConnectionStripLength]
+ ld a, [hMapObjectIndexBuffer1]
cp [hl]
jr z, .asm_5461
- ld hl, $0009
+ ld hl, OBJECT_09
add hl, bc
ld [hl], $2
ret
.asm_5461
- ld hl, $0009
+ ld hl, OBJECT_09
add hl, bc
ld [hl], $6
ret
; 5468
-Function5468: ; 5468
+SlideStep: ; 5468
call Function4690
call Function463f
- ld hl, $000b
+ ld hl, OBJECT_11
add hl, bc
ld [hl], $1
ld hl, wd4cf
- ld a, [hConnectionStripLength]
+ ld a, [hMapObjectIndexBuffer1]
cp [hl]
jr z, .asm_5483
- ld hl, $0009
+ ld hl, OBJECT_09
add hl, bc
ld [hl], $2
ret
.asm_5483
- ld hl, $0009
+ ld hl, OBJECT_09
add hl, bc
ld [hl], $6
ret
; 548a
-Function548a: ; 548a
+JumpStep: ; 548a
call Function4690
- ld hl, $001f
+ ld hl, OBJECT_31
add hl, bc
ld [hl], $0
- ld hl, $0005
+ ld hl, OBJECT_FLAGS2
add hl, bc
res 3, [hl]
- ld hl, $000b
+ ld hl, OBJECT_11
add hl, bc
ld [hl], $2
call Function5529
ld hl, wd4cf
- ld a, [hConnectionStripLength]
+ ld a, [hMapObjectIndexBuffer1]
cp [hl]
jr z, .asm_54b1
- ld hl, $0009
+ ld hl, OBJECT_09
add hl, bc
ld [hl], $8
ret
.asm_54b1
- ld hl, $0009
+ ld hl, OBJECT_09
add hl, bc
ld [hl], $9
ret
diff --git a/engine/scripting.asm b/engine/scripting.asm
index 2dadafee1..3aef651aa 100644
--- a/engine/scripting.asm
+++ b/engine/scripting.asm
@@ -1200,7 +1200,7 @@ ApplyPersonFacing: ; 0x9728b
call Function1836
pop bc
jr c, .not_visible ; 0x9729c $1b
- ld hl, OBJECT_04
+ ld hl, OBJECT_FLAGS1
add hl, bc
bit 2, [hl]
jr nz, .not_visible ; 0x972a4 $13
@@ -1258,7 +1258,7 @@ Script_appear: ; 0x972dd
call GetScriptByte
call GetScriptPerson
call _CopyObjectStruct
- ld a, [hConnectionStripLength]
+ ld a, [hMapObjectIndexBuffer1]
ld b, 0 ; clear
call ApplyEventActionAppearDisappear
ret
@@ -1276,7 +1276,7 @@ Script_disappear: ; 0x972ee
ld a, [hLastTalked]
.ok
call DeleteObjectStruct
- ld a, [hConnectionStripLength]
+ ld a, [hMapObjectIndexBuffer1]
ld b, 1 ; set
call ApplyEventActionAppearDisappear
callba RefreshMapAppearDisappear
@@ -1390,7 +1390,7 @@ Script_loademote: ; 0x97384
ld a, [ScriptVar]
.not_var_emote
ld c, a
- callba Function1442f
+ callba LoadEmote
ret
; 0x97396
@@ -1446,7 +1446,7 @@ Script_earthquake: ; 0x973c7
call CopyBytes
call GetScriptByte
ld [wd003], a
- and $3f
+ and (1 << 6) - 1
ld [wd005], a
ld b, BANK(.script)
ld de, .script
@@ -2428,10 +2428,10 @@ Script_checkmoney: ; 0x97843
call GetMoneyAccount
call LoadMoneyAmountToMem
- callba CheckMoney
+ callba CompareMoney
; 0x9784f
-CheckMoneyAction: ; 0x9784f
+CompareMoneyAction: ; 0x9784f
jr c, .two
jr z, .one
ld a, 0
@@ -2497,12 +2497,12 @@ Script_checkcoins: ; 0x97895
call LoadCoinAmountToMem
callba CheckCoins
- jr CheckMoneyAction
+ jr CompareMoneyAction
; 978a0
LoadCoinAmountToMem: ; 978a0
call GetScriptByte
- ld [$ffc4], a
+ ld [hMoneyTemp + 1], a
call GetScriptByte
ld [hMoneyTemp], a
ld bc, hMoneyTemp
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-13 02:01:26 +0000