No more -bash000; engine/movement.asm, SPRITEMOVEFN

audio/cries.asm

@@ -370,7 +370,7 @@ Cry_2C_branch_f3022: ; f3022
 	unknownmusic0xde $52
 	sound $4, $f1, $0796
 	sound $4, $f1, $072d
-	sound $7, $0, $0000
+	sound $7, $0, NONE
 	sound $10, $f1, $07a7
 	endchannel
 ; f3035
@@ -381,7 +381,7 @@ Cry_2C_Ch6: ; f3038
 Cry_2C_branch_f3038: ; f3038
 	callchannel Cry_2C_branch_f3022
 	loopchannel 2, Cry_2C_branch_f3038
-	sound $e, $0, $0000
+	sound $e, $0, NONE
 	sound $8, $f2, $07c2
 	endchannel
 ; f3048
@@ -398,7 +398,7 @@ Cry_27_Ch5: ; f3048
 Cry_27_Ch6: ; f305b
 	unknownmusic0xde $2a
 	sound $3, $2c, $07c7
-	sound $1, $0, $0000
+	sound $1, $0, NONE
 	sound $5, $59, $07be
 	sound $6, $b4, $07bd
 	endchannel
@@ -621,7 +621,7 @@ Cry_36_Ch6: ; f3200
 Cry_36_branch_f3202: ; f3202
 	sound $3, $f8, $0791
 	sound $3, $d8, $078d
-	sound $2, $0, $0000
+	sound $2, $0, NONE
 	sound $1, $78, $06c1
 	sound $1, $f8, $0741
 	sound $4, $e1, $0751
@@ -646,7 +646,7 @@ Cry_43_Ch5: ; f322e
 	sound $8, $ab, $0734
 	sound $4, $d6, $0716
 	sound $8, $d1, $0712
-	sound $8, $0, $0000
+	sound $8, $0, NONE
 	endchannel
 ; f3249
 
@@ -658,7 +658,7 @@ Cry_43_Ch6: ; f3249
 	sound $8, $cb, $0754
 	sound $4, $f6, $0736
 	sound $8, $f1, $0732
-	sound $8, $0, $0000
+	sound $8, $0, NONE
 	endchannel
 ; f3264
 
@@ -1213,7 +1213,7 @@ Cry_09_Ch5: ; f361f
 
 Cry_09_Ch6: ; f363c
 	unknownmusic0xde $5
-	sound $2, $8, $0000
+	sound $2, $8, NONE
 	sound $f, $a7, $06a1
 	sound $6, $86, $06a2
 	sound $a, $74, $06a1
@@ -1312,7 +1312,7 @@ Cry_11_Ch5: ; f3703
 
 Cry_11_Ch6: ; f3722
 	unknownmusic0xde $a
-	sound $4, $8, $0000
+	sound $4, $8, NONE
 	sound $6, $a7, $0741
 	sound $8, $86, $0743
 	sound $4, $76, $0741
@@ -1587,7 +1587,7 @@ Cry_0B_Ch5: ; f394b
 
 Cry_0B_Ch6: ; f3976
 	unknownmusic0xde $44
-	sound $c, $8, $0000
+	sound $c, $8, NONE
 	sound $4, $f1, $0701
 	sound $4, $e1, $0782
 	sound $4, $d1, $0741
@@ -1670,7 +1670,7 @@ Cry_0D_branch_f3a1a: ; f3a1a
 
 Cry_0D_Ch6: ; f3a39
 	unknownmusic0xde $40
-	sound $4, $8, $0000
+	sound $4, $8, NONE
 	sound $5, $f2, $0651
 	sound $9, $d1, $0661
 	sound $5, $e2, $0614
@@ -1738,7 +1738,7 @@ Cry_0A_Ch5: ; f3aba
 
 Cry_0A_Ch6: ; f3ad9
 	unknownmusic0xde $5
-	sound $3, $8, $0000
+	sound $3, $8, NONE
 	sound $8, $a7, $06a1
 	sound $6, $86, $06a3
 	sound $3, $74, $06a1

audio/engine.asm

@@ -2773,7 +2773,7 @@ LoadMusicByte:: ; e8d76
 ; e8d80
 
 FrequencyTable: ; e8d80
-	dw $0000 ; filler
+	dw NONE ; filler
 	dw $f82c
 	dw $f89d
 	dw $f907

audio/music/battletowertheme.asm

@@ -242,7 +242,7 @@ Music_BattleTowerTheme_branch_178970: ; 178970
 	note __, 1
 	note F_, 4
 	note __, 4
-	tone $0000
+	tone NONE
 	intensity $b7
 	note G_, 2
 	octave 4

audio/music/lookkimonogirl.asm

@@ -14,7 +14,7 @@ Music_LookKimonoGirl_Ch1: ; f79c2
 	notetype $6, $87
 	tone $0001
 	callchannel Music_LookKimonoGirl_branch_f7aa8
-	tone $0000
+	tone NONE
 Music_LookKimonoGirl_branch_f79d7: ; f79d7
 	notetype $c, $b2
 	callchannel Music_LookKimonoGirl_branch_f7a13

audio/music/titlescreen.asm

@@ -490,7 +490,7 @@ Music_TitleScreen_Ch2: ; eb984
 	octave 4
 	note A_, 4
 	stereopanning $ff
-	tone $0000
+	tone NONE
 	notetype $c, $b0
 	octave 3
 	note B_, 6
@@ -775,7 +775,7 @@ Music_TitleScreen_Ch3: ; ebb01
 	note __, 1
 	stereopanning $ff
 	notetype $c, $16
-	tone $0000
+	tone NONE
 	octave 4
 	note A_, 2
 	octave 5

audio/sfx.asm

@@ -151,7 +151,7 @@ Sfx_Save_Ch5: ; f09b6
 
 Sfx_Save_Ch6: ; f09d5
 	dutycycle $2
-	sound $2, $8, $0000
+	sound $2, $8, NONE
 	sound $2, $a1, $0701
 	sound $1, $91, $0601
 	sound $1, $91, $0681
@@ -2291,7 +2291,7 @@ Sfx_Sketch_Ch5: ; f12f9
 Sfx_Sketch_branch_f12fd: ; f12fd
 	sound $2, $f1, $06e0
 	sound $d, $af, $05b0
-	sound $4, $0, $0000
+	sound $4, $0, NONE
 	sound $9, $f4, $0718
 	loopchannel 3, Sfx_Sketch_branch_f12fd
 	soundinput $8
@@ -2490,15 +2490,15 @@ Sfx_Nightmare_Ch5: ; f1420
 	soundinput $34
 Sfx_Nightmare_branch_f1424: ; f1424
 	sound $3, $ba, $0631
-	sound $2, $0, $0000
+	sound $2, $0, NONE
 	sound $3, $f8, $0621
-	sound $2, $0, $0000
+	sound $2, $0, NONE
 	sound $3, $f8, $0611
-	sound $2, $0, $0000
+	sound $2, $0, NONE
 	sound $3, $e8, $0601
-	sound $2, $0, $0000
+	sound $2, $0, NONE
 	sound $3, $e8, $05f1
-	sound $2, $0, $0000
+	sound $2, $0, NONE
 	loopchannel 2, Sfx_Nightmare_branch_f1424
 	soundinput $8
 	endchannel
@@ -2540,11 +2540,11 @@ Sfx_SweetKiss2_Ch5: ; f1482
 	dutycycle $0
 	soundinput $97
 	sound $2, $f4, $0772
-	sound $4, $0, $0000
+	sound $4, $0, NONE
 	sound $2, $c4, $0772
-	sound $4, $0, $0000
+	sound $4, $0, NONE
 	sound $2, $b4, $0772
-	sound $4, $0, $0000
+	sound $4, $0, NONE
 	sound $2, $a1, $0772
 	soundinput $8
 	endchannel
@@ -2591,7 +2591,7 @@ Sfx_SludgeBomb_Ch5: ; f14d6
 	dutycycle $2
 	soundinput $c5
 	sound $3, $f8, $0581
-	sound $1, $0, $0000
+	sound $1, $0, NONE
 	soundinput $cb
 	sound $10, $f2, $05d1
 	soundinput $8
@@ -2613,9 +2613,9 @@ Sfx_Foresight_Ch5: ; f14f8
 	sound $3, $f4, $07b5
 	sound $3, $f5, $07c8
 	sound $8, $f4, $07da
-	sound $2, $0, $0000
+	sound $2, $0, NONE
 	sound $8, $c1, $07da
-	sound $2, $0, $0000
+	sound $2, $0, NONE
 	sound $8, $91, $07da
 	endchannel
 ; f1515
@@ -2811,7 +2811,7 @@ Sfx_Return_branch_f163c: ; f163c
 	sound $8, $f1, $0759
 	soundinput $57
 	sound $8, $f1, $0759
-	sound $10, $0, $0000
+	sound $10, $0, NONE
 	loopchannel 2, Sfx_Return_branch_f163c
 	soundinput $8
 	endchannel
@@ -2849,7 +2849,7 @@ Sfx_MilkDrink_branch_f1684: ; f1684
 	sound $d, $f7, $0290
 	soundinput $9e
 	sound $4, $c9, $05e1
-	sound $2, $0, $0000
+	sound $2, $0, NONE
 	loopchannel 6, Sfx_MilkDrink_branch_f1684
 	soundinput $8
 	endchannel
@@ -2864,7 +2864,7 @@ Sfx_Present_Ch5: ; f16a2
 	soundinput $d6
 Sfx_Present_branch_f16a6: ; f16a6
 	sound $2, $f1, $0740
-	sound $1, $0, $0000
+	sound $1, $0, NONE
 	loopchannel 3, Sfx_Present_branch_f16a6
 	sound $10, $f1, $0780
 	soundinput $8
@@ -2882,9 +2882,9 @@ Sfx_MorningSun_branch_f16be: ; f16be
 	sound $2, $f1, $07e0
 	sound $5, $f2, $07e7
 	loopchannel 3, Sfx_MorningSun_branch_f16be
-	sound $1, $0, $0000
+	sound $1, $0, NONE
 	sound $8, $c2, $07e7
-	sound $1, $0, $0000
+	sound $1, $0, NONE
 	sound $8, $82, $07e7
 	endchannel
 ; f16df
@@ -2913,10 +2913,10 @@ Sfx_Encore: ; f16fd
 Sfx_Encore_Ch5: ; f1703
 	dutycycle $2
 	soundinput $ce
-	sound $10, $0, $0000
+	sound $10, $0, NONE
 Sfx_Encore_branch_f170b: ; f170b
 	sound $2, $f8, $0774
-	sound $24, $0, $0000
+	sound $24, $0, NONE
 	loopchannel 2, Sfx_Encore_branch_f170b
 	soundinput $8
 	endchannel
@@ -2966,9 +2966,9 @@ Sfx_BatonPass_Ch5: ; f1752
 	soundinput $f7
 	sound $20, $f2, $0680
 	sound $1, $f1, $0760
-	sound $20, $0, $0000
+	sound $20, $0, NONE
 	sound $1, $f1, $0760
-	sound $1a, $0, $0000
+	sound $1a, $0, NONE
 	sound $1, $f1, $0760
 	soundinput $8
 	endchannel
@@ -3836,27 +3836,27 @@ Sfx_BallBounce: ; f1b63
 Sfx_BallBounce_Ch5: ; f1b69
 	dutycycle $2
 	sound $8, $e1, $0740
-	sound $17, $0, $0000
+	sound $17, $0, NONE
 	sound $8, $b1, $0740
-	sound $17, $0, $0000
+	sound $17, $0, NONE
 	sound $8, $81, $0740
-	sound $17, $0, $0000
+	sound $17, $0, NONE
 	sound $8, $51, $0740
-	sound $17, $0, $0000
+	sound $17, $0, NONE
 	endchannel
 ; f1b8c
 
 Sfx_BallBounce_Ch6: ; f1b8c
 	dutycycle $2
-	sound $2, $8, $0000
+	sound $2, $8, NONE
 	sound $8, $b1, $0741
-	sound $17, $0, $0000
+	sound $17, $0, NONE
 	sound $8, $81, $0741
-	sound $17, $0, $0000
+	sound $17, $0, NONE
 	sound $8, $51, $0741
-	sound $17, $0, $0000
+	sound $17, $0, NONE
 	sound $8, $21, $0741
-	sound $17, $0, $0000
+	sound $17, $0, NONE
 	endchannel
 ; f1bb3
 
@@ -3916,7 +3916,7 @@ Sfx_GiveTrademon: ; f1c10
 ; f1c13
 
 Sfx_GiveTrademon_Ch5: ; f1c13
-	sound $20, $0, $0000
+	sound $20, $0, NONE
 	dutycycle $1
 	soundinput $a7
 	sound $1b, $f4, $0750
@@ -3936,7 +3936,7 @@ Sfx_GetTrademon: ; f1c3e
 ; f1c41
 
 Sfx_GetTrademon_Ch5: ; f1c41
-	sound $20, $0, $0000
+	sound $20, $0, NONE
 	dutycycle $2
 	soundinput $bf
 	sound $1b, $14, $07bc
@@ -3959,7 +3959,7 @@ Sfx_TrainArrived: ; f1c6c
 
 Sfx_TrainArrived_Ch6: ; f1c75
 	tone $0008
-	sound $8, $0, $0000
+	sound $8, $0, NONE
 Sfx_TrainArrived_Ch5: ; f1c7c
 	dutycycle $2
 	sound $4, $5f, $0691
@@ -4060,7 +4060,7 @@ Sfx_SwitchPokemon_Ch5: ; f1d0f
 
 Sfx_SwitchPokemon_Ch6: ; f1d16
 	dutycycle $2
-	sound $2, $8, $0000
+	sound $2, $8, NONE
 	sound $8, $b1, $0741
 	endchannel
 ; f1d21
@@ -4093,7 +4093,7 @@ Sfx_Tally_Ch5: ; f1d43
 
 Sfx_Tally_Ch6: ; f1d4a
 	dutycycle $2
-	sound $1, $8, $0000
+	sound $1, $8, NONE
 	sound $4, $a1, $0761
 	endchannel
 ; f1d55
@@ -4107,7 +4107,7 @@ Sfx_Transaction_Ch5: ; f1d55
 
 Sfx_Transaction_Ch6: ; f1d60
 	dutycycle $2
-	sound $1, $8, $0000
+	sound $1, $8, NONE
 	sound $4, $91, $06c1
 	sound $18, $a2, $07a1
 	endchannel
@@ -4183,7 +4183,7 @@ Sfx_GotSafariBalls_Ch5: ; f1dd4
 Sfx_BootPc_Ch5: ; f1de3
 	dutycycle $2
 	sound $f, $f2, $07c0
-	sound $f, $0, $0000
+	sound $f, $0, NONE
 	sound $3, $a1, $0780
 	sound $3, $a1, $0700
 	sound $3, $a1, $0740
@@ -4200,16 +4200,16 @@ Sfx_ShutDownPc_Ch5: ; f1e0e
 	sound $4, $f0, $0600
 	sound $4, $f0, $0400
 	sound $4, $f0, $0200
-	sound $1, $0, $0000
+	sound $1, $0, NONE
 	endchannel
 ; f1e21
 
 Sfx_ChoosePcOption_Ch5: ; f1e21
 	dutycycle $2
 	sound $6, $f0, $0700
-	sound $4, $0, $0000
+	sound $4, $0, NONE
 	sound $6, $f0, $0700
-	sound $1, $0, $0000
+	sound $1, $0, NONE
 	endchannel
 ; f1e34
 
@@ -4227,11 +4227,11 @@ Sfx_EscapeRope_Ch5: ; f1e34
 
 Sfx_PushButton_Ch5: ; f1e4f
 	dutycycle $2
-	sound $4, $0, $0000
+	sound $4, $0, NONE
 	sound $2, $f1, $0680
-	sound $1, $0, $0000
+	sound $1, $0, NONE
 	sound $4, $f1, $0780
-	sound $4, $0, $0000
+	sound $4, $0, NONE
 	endchannel
 ; f1e66
 
@@ -4242,7 +4242,7 @@ Sfx_SecondPartOfItemfinder_Ch5: ; f1e66
 	soundinput $22
 	sound $2, $f1, $0500
 	soundinput $8
-	sound $1, $0, $0000
+	sound $1, $0, NONE
 	endchannel
 ; f1e7b
 
@@ -4319,18 +4319,18 @@ Sfx_Wrong_Ch5: ; f1f05
 	soundinput $5a
 	sound $4, $f0, $0500
 	soundinput $8
-	sound $4, $0, $0000
+	sound $4, $0, NONE
 	sound $f, $f0, $0500
-	sound $1, $0, $0000
+	sound $1, $0, NONE
 	endchannel
 ; f1f1c
 
 Sfx_Wrong_Ch6: ; f1f1c
 	dutycycle $3
 	sound $4, $f0, $0401
-	sound $4, $0, $0000
+	sound $4, $0, NONE
 	sound $f, $f0, $0401
-	sound $1, $0, $0000
+	sound $1, $0, NONE
 	endchannel
 ; f1f2f
 
@@ -4357,7 +4357,7 @@ Sfx_Strength_Ch8: ; f1f3a
 Sfx_Boat_Ch5: ; f1f53
 	dutycycle $2
 	sound $f, $f0, $0500
-	sound $4, $0, $0000
+	sound $4, $0, NONE
 	sound $f, $f0, $0500
 	sound $f, $f0, $0500
 	sound $f, $f0, $0500
@@ -4369,7 +4369,7 @@ Sfx_Boat_Ch5: ; f1f53
 Sfx_Boat_Ch6: ; f1f72
 	dutycycle $3
 	sound $f, $f0, $0482
-	sound $4, $0, $0000
+	sound $4, $0, NONE
 	sound $f, $f0, $0482
 	sound $f, $f0, $0482
 	sound $f, $f0, $0482
@@ -4423,7 +4423,7 @@ Sfx_Shine_Ch5: ; f1fd9
 	sound $0, $d2, $0780
 	sound $0, $d2, $07c0
 	sound $a, $e1, $07e0
-	sound $1, $0, $0000
+	sound $1, $0, NONE
 	endchannel
 ; f1ff4
 
@@ -4493,7 +4493,7 @@ Sfx_Call_Ch5: ; f2052
 	sound $4, $f7, $07a0
 	sound $4, $f7, $07a0
 	soundinput $8
-	sound $4, $0, $0000
+	sound $4, $0, NONE
 	endchannel
 ; f206f
 
@@ -5483,13 +5483,13 @@ Sfx_HangUp_Ch5: ; f26f1
 	dutycycle $2
 	sound $4, $b8, $077b
 	sound $2, $21, $077b
-	sound $10, $0, $0000
+	sound $10, $0, NONE
 Sfx_HangUp_branch_f26ff: ; f26ff
 Sfx_NoSignal_Ch5: ; f26ff
 Sfx_NoSignal_branch_f26ff: ; f26ff
 	dutycycle $2
 	sound $14, $e8, $070b
-	sound $1c, $0, $0000
+	sound $1c, $0, NONE
 	loopchannel 3, Sfx_HangUp_branch_f26ff
 	endchannel
 ; f270e
@@ -5526,8 +5526,8 @@ Sfx_Elevator_branch_f2726: ; f2726
 
 Sfx_Elevator_Ch6: ; f274b
 Sfx_Elevator_Ch7: ; f274b
-	sound $60, $0, $0000
+	sound $60, $0, NONE
-	sound $53, $0, $0000
+	sound $53, $0, NONE
 	endchannel
 ; f2754
 

audio/sfx_crystal.asm

@@ -84,7 +84,7 @@ Sfx_IntroPichu_Ch5: ; 1798ad
 	dutycycle $3
 	soundinput $4d
 	sound $1, $88, $0770
-	sound $3, $0, $0000
+	sound $3, $0, NONE
 	soundinput $17
 	sound $2, $88, $0776
 	endchannel

audio/trainer_encounters.asm

@@ -7,7 +7,7 @@ PlayTrainerEncounterMusic:: ; e900a
 	ld [MusicFade], a
 	; play nothing for one frame
 	push de
-	ld de, $0000 ; id: Music_Nothing
+	ld de, NONE ; id: Music_Nothing
 	call PlayMusic
 	call DelayFrame
 	; play new song

battle/anim_objects.asm

@@ -24,7 +24,7 @@ Functioncc9a1: ; cc9a1 (33:49a1)
 
 
 Functioncc9bd: ; cc9bd
-	ld hl, $0000
+	ld hl, NONE
 	add hl, bc
 	ld [hl], $0
 	ret

battle/core.asm

@@ -3240,7 +3240,7 @@ MonFaintedAnimation: ; 3d444
 
 
 Function3d490: ; 3d490
-	ld [hConnectionStripLength], a
+	ld [hMapObjectIndexBuffer1], a
 	ld c, a
 .asm_3d493
 	push bc
@@ -3264,7 +3264,7 @@ Function3d490: ; 3d490
 ; 3d4ae
 
 Function3d4ae: ; 3d4ae
-	ld a, [hConnectionStripLength]
+	ld a, [hMapObjectIndexBuffer1]
 	ld c, a
 	cp $8
 	jr nz, .back
@@ -3646,7 +3646,7 @@ Function3d714: ; 3d714
 	push af
 	ld a, [CurBattleMon]
 	ld [CurPartyMon], a
-	callba Functione538
+	callba CheckCurPartyMonFainted
 	pop bc
 	ld a, b
 	ld [CurPartyMon], a
@@ -9458,7 +9458,7 @@ Function3fc30: ; 3fc30
 Function3fc5b: ; 3fc5b
 	ld hl, Sprites
 	xor a
-	ld [hConnectionStripLength], a
+	ld [hMapObjectIndexBuffer1], a
 	ld b, $6
 	ld e, $a8
 .asm_3fc65
@@ -9469,10 +9469,10 @@ Function3fc5b: ; 3fc5b
 	inc hl
 	ld [hl], e
 	inc hl
-	ld a, [hConnectionStripLength]
+	ld a, [hMapObjectIndexBuffer1]
 	ld [hli], a
 	inc a
-	ld [hConnectionStripLength], a
+	ld [hMapObjectIndexBuffer1], a
 	ld a, $1
 	ld [hli], a
 	ld a, d
@@ -9480,9 +9480,9 @@ Function3fc5b: ; 3fc5b
 	ld d, a
 	dec c
 	jr nz, .asm_3fc69
-	ld a, [hConnectionStripLength]
+	ld a, [hMapObjectIndexBuffer1]
 	add $3
-	ld [hConnectionStripLength], a
+	ld [hMapObjectIndexBuffer1], a
 	ld a, e
 	add $8
 	ld e, a

battle/effect_command_pointers.asm

@@ -1,5 +1,5 @@
 
-	dw $0000 ; padding
+	dw NONE ; padding
 
 BattleCommandPointers: ; 3fd28
 	dw BattleCommand01 ; 34084

constants.asm

@@ -1,4 +1,3 @@
-
 INCLUDE "macros.asm"
 
 INCLUDE "gbhw.asm"

constants/map_constants.asm

@@ -517,8 +517,8 @@ const_value SET 1
 	const OBJECT_MAP_OBJECT_INDEX
 	const OBJECT_SPRITE_TILE
 	const OBJECT_03
-	const OBJECT_04
+	const OBJECT_FLAGS1
-	const OBJECT_FLAGS
+	const OBJECT_FLAGS2
 	const OBJECT_PALETTE
 	const OBJECT_DIRECTION_WALKING
 	const OBJECT_FACING

constants/misc_constants.asm

@@ -1,5 +1,4 @@
 NONE EQU 0
-
 PARTY_LENGTH EQU 6
 
 MAX_ITEMS     EQU 20

constants/sprite_constants.asm

@@ -217,3 +217,6 @@ const_value SET 1
 	const SPRITEMOVEFN_1F
 	const SPRITEMOVEFN_20
 	const SPRITEMOVEFN_21
+	const SPRITEMOVEFN_22
+	const SPRITEMOVEFN_23
+	const SPRITEMOVEFN_24

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

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

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

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