diff options
| author | PikalaxALT <PikalaxALT@gmail.com> | 2015-07-18 15:46:38 -0400 |
|---|---|---|
| committer | PikalaxALT <PikalaxALT@gmail.com> | 2015-07-18 16:00:53 -0400 |
| commit | e674869018ffe8f9be2351b2b569eb7300910e6a (patch) | |
| tree | 77c5dae1a972a4bd03e448f0514341fe5ce927b7 /engine/scripting.asm | |
| parent | 0fcef5fc087dc30817410d7692d53e2c382828d5 (diff) | |
Updated signpost items and person_event flags
Diffstat (limited to 'engine/scripting.asm')
| -rw-r--r-- | engine/scripting.asm | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/engine/scripting.asm b/engine/scripting.asm index ea620e6f8..4e99d5927 100644 --- a/engine/scripting.asm +++ b/engine/scripting.asm @@ -1253,10 +1253,10 @@ Script_appear: ; 0x972dd call GetScriptByte call GetScriptPerson - call Function1956 + call _CopyObjectStruct ld a, [$ffaf] - ld b, $0 - call Function9730b + ld b, 0 ; clear + call ApplyEventActionAppearDisappear ret ; 0x972ee @@ -1267,35 +1267,35 @@ Script_disappear: ; 0x972ee call GetScriptByte call GetScriptPerson - cp $fe - jr nz, .asm_972fa ; 0x972f6 $2 + cp -2 + jr nz, .skip ; 0x972f6 $2 ld a, [$ffe0] -.asm_972fa - call Function199f +.skip + call DeleteObjectStruct ld a, [$ffaf] - ld b, $1 - call Function9730b - callba Function5920 + ld b, 1 ; set + call ApplyEventActionAppearDisappear + callba RefreshMapAppearDisappear ret ; 0x9730b -Function9730b: ; 0x9730b +ApplyEventActionAppearDisappear: ; 0x9730b push bc call GetMapObject - ld hl, $000c + ld hl, MAPOBJECT_EVENT_FLAG add hl, bc pop bc ld e, [hl] inc hl ld d, [hl] - ld a, $ff + ld a, -1 cp e - jr nz, .asm_97321 ; 0x9731a $5 + jr nz, .okay ; 0x9731a $5 cp d - jr nz, .asm_97321 ; 0x9731d $2 + jr nz, .okay ; 0x9731d $2 xor a ret -.asm_97321 +.okay call EventFlagAction ret ; 0x97325 |