From 079260dbd64b6d090e05b409ded30a95bf33a9e9 Mon Sep 17 00:00:00 2001 From: theo3 Date: Sat, 25 Dec 2021 21:28:44 -0800 Subject: [PATCH 1/4] name asm funcs --- asm/bird.s | 8 +++---- asm/chuchuBoss.s | 4 ++-- asm/code_080011C4.s | 4 +++- asm/code_08003FC4.s | 12 ++++++---- asm/code_080043E8.s | 2 +- asm/code_080732D0.s | 24 +++++++++---------- asm/code_08078778.s | 6 ++--- asm/crenalBeanSprout.s | 2 +- asm/crow.s | 4 ++-- asm/cuccoAggr.s | 2 +- asm/eyegore.s | 6 ++--- asm/ezloCap.s | 4 ++-- asm/flyingPot.s | 2 +- asm/flyingSkull.s | 2 +- asm/gleerok.s | 4 ++-- asm/itemForSale.s | 2 +- asm/ladderUp.s | 4 ++-- asm/lavaPlatform.s | 2 +- asm/lilypadLarge.s | 4 ++-- asm/macroPlayer.s | 8 +++---- asm/minecart.s | 2 +- .../castorWildsStatue/sub_080676E0.inc | 2 +- asm/non_matching/cucco/sub_0806E564.inc | 2 +- asm/non_matching/cuccoChick/sub_0806E7B0.inc | 2 +- .../mountainMinish/sub_08067EF0.inc | 2 +- asm/non_matching/player/sub_08070DC4.inc | 2 +- asm/non_matching/player/sub_08072D54.inc | 2 +- .../playerItem13/sub_080AD040.inc | 2 +- asm/non_matching/postman/sub_0806076C.inc | 2 +- asm/object1F.s | 2 +- asm/object30.s | 2 +- asm/object4B.s | 2 +- asm/object53.s | 2 +- asm/object67.s | 2 +- asm/object97.s | 6 ++--- asm/objectB3.s | 4 ++-- asm/objectOnSpinyBeetle.s | 2 +- asm/stalfos.s | 8 +++---- asm/takkuri.s | 6 ++--- asm/wizzrobeFire.s | 2 +- asm/wizzrobeIce.s | 2 +- asm/wizzrobeWind.s | 2 +- include/asm.h | 2 +- include/entity.h | 2 +- include/functions.h | 2 +- src/enemy/acroBandits.c | 8 +++---- src/enemy/beetle.c | 6 ++--- src/enemy/chuchu.c | 16 ++++++------- src/enemy/cuccoChickAggr.c | 6 ++--- src/enemy/fireballGuy.c | 2 +- src/enemy/helmasaur.c | 2 +- src/enemy/lakitu.c | 2 +- src/enemy/mazaalBracelet.c | 2 +- src/enemy/mazaalHead.c | 2 +- src/enemy/miniFireballGuy.c | 2 +- src/enemy/peahat.c | 4 ++-- src/enemy/puffstool.c | 10 ++++---- src/enemy/rollobite.c | 2 +- src/enemy/rope.c | 2 +- src/enemy/sluggula.c | 2 +- src/enemy/spikedBeetle.c | 2 +- src/enemy/spinyChuchu.c | 8 +++---- src/enemy/tektite.c | 2 +- src/enemy/tektiteGolden.c | 2 +- src/enemy/vaatiArm.c | 2 +- src/enemy/vaatiTransfigured.c | 4 ++-- src/enemy/vaatiWrath.c | 2 +- src/enemy/waterDrop.c | 2 +- src/npc/cuccoChick.c | 2 +- src/npc/melari.c | 2 +- src/npc/npc5.c | 2 +- src/npc/postman.c | 4 ++-- src/npc/townMinish.c | 4 ++-- src/npc/zelda.c | 4 ++-- src/object/bird.c | 4 ++-- src/object/itemOnGround.c | 8 +++---- src/object/jarPortal.c | 4 ++-- src/object/object49.c | 2 +- src/object/object6A.c | 14 +++++------ src/object/pot.c | 2 +- src/player.c | 22 ++++++++--------- src/playerItem/playerItem12.c | 2 +- src/playerItem/playerItemBow.c | 2 +- src/projectile/arrowProjectile.c | 2 +- src/projectile/boneProjectile.c | 4 ++-- src/projectile/gleerokProjectile.c | 4 ++-- src/projectile/mandiblesProjectile.c | 2 +- src/projectile/octorokBossProjectile.c | 4 ++-- src/projectile/rockProjectile.c | 2 +- src/projectile/stalfosProjectile.c | 2 +- src/projectile/v1FireProjectile.c | 2 +- src/projectile/v2Projectile.c | 4 ++-- src/script.c | 12 +++++----- 93 files changed, 193 insertions(+), 187 deletions(-) diff --git a/asm/bird.s b/asm/bird.s index 765e06da..a0db6e49 100644 --- a/asm/bird.s +++ b/asm/bird.s @@ -225,7 +225,7 @@ _0809D3A8: movs r2, #0 ldrsh r1, [r0, r2] adds r0, r5, #0 - bl sub_08003FC4 + bl GravityUpdate adds r0, r5, #0 bl UpdateAnimationSingleFrame ldr r4, [r5, #0x54] @@ -298,7 +298,7 @@ _0809D448: bl CopyPosition _0809D454: adds r0, r5, #0 - bl sub_080040A8 + bl CheckOnScreen cmp r0, #0 bne _0809D488 ldrb r0, [r5, #0xc] @@ -528,11 +528,11 @@ _0809D62E: movs r0, #0 ldrsh r1, [r7, r0] adds r0, r5, #0 - bl sub_08003FC4 + bl GravityUpdate adds r0, r5, #0 bl UpdateAnimationSingleFrame adds r0, r5, #0 - bl sub_080040A8 + bl CheckOnScreen cmp r0, #0 bne _0809D652 bl DeleteThisEntity diff --git a/asm/chuchuBoss.s b/asm/chuchuBoss.s index 332527a1..d3f20d5a 100644 --- a/asm/chuchuBoss.s +++ b/asm/chuchuBoss.s @@ -1028,7 +1028,7 @@ sub_0802647C: @ 0x0802647C adds r4, r0, #0 movs r1, #0x80 lsls r1, r1, #7 - bl sub_08003FC4 + bl GravityUpdate cmp r0, #0 bne _080264A6 movs r0, #0x10 @@ -1551,7 +1551,7 @@ sub_0802686C: @ 0x0802686C adds r4, r0, #0 movs r1, #0x80 lsls r1, r1, #7 - bl sub_08003FC4 + bl GravityUpdate adds r5, r0, #0 cmp r5, #0 beq _08026888 diff --git a/asm/code_080011C4.s b/asm/code_080011C4.s index a08f6287..45532f9d 100644 --- a/asm/code_080011C4.s +++ b/asm/code_080011C4.s @@ -109,7 +109,7 @@ sub_08001242: @ 0x08001242 pop {r0} _08001282: ldr r1, _08001364 @ =0x00001800 - bl sub_08003FC4 + bl GravityUpdate pop {pc} .align 2, 0 _0800128C: @@ -126,6 +126,8 @@ sub_08001290: @ 0x08001290 _0800129C: bx lr + @ r0: Entity* + @ r1: Function* array non_word_aligned_thumb_func_start EnemyFunctionHandler EnemyFunctionHandler: @ 0x0800129E mov r3, lr diff --git a/asm/code_08003FC4.s b/asm/code_08003FC4.s index 4e033a93..9b66ce10 100644 --- a/asm/code_08003FC4.s +++ b/asm/code_08003FC4.s @@ -5,8 +5,12 @@ .text - thumb_func_start sub_08003FC4 -sub_08003FC4: @ 0x08003FC4 + thumb_func_start GravityUpdate +GravityUpdate: @ 0x08003FC4 + @ r0 = Entity* + @ r1 = Gravity strength + @ returns z pos + adds r3, r0, #0 ldr r0, [r3, #0x34] ldr r2, [r3, #0x20] @@ -141,8 +145,8 @@ sub_080040A2: @ 0x080040A2 lsrs r1, r1, #2 bhs _080040D0 - thumb_func_start sub_080040A8 -sub_080040A8: @ 0x080040A8 + thumb_func_start CheckOnScreen +CheckOnScreen: @ 0x080040A8 ldr r1, _08004368 @ =gRoomControls movs r2, #0x2e ldrsh r2, [r0, r2] diff --git a/asm/code_080043E8.s b/asm/code_080043E8.s index 8cbadc90..4a962130 100644 --- a/asm/code_080043E8.s +++ b/asm/code_080043E8.s @@ -102,7 +102,7 @@ _0800449A: thumb_func_start sub_0800449C sub_0800449C: @ 0x0800449C push {r1, lr} - bl sub_080040A8 + bl CheckOnScreen cmp r0, #0 pop {r0} beq _080044AC diff --git a/asm/code_080732D0.s b/asm/code_080732D0.s index 36957a76..ad91468f 100644 --- a/asm/code_080732D0.s +++ b/asm/code_080732D0.s @@ -272,7 +272,7 @@ sub_080734D4: @ 0x080734D4 push {r4, lr} adds r4, r0, #0 ldr r1, _080734FC @ =0xFFFFF000 - bl sub_08003FC4 + bl GravityUpdate ldr r0, [r4, #0x20] cmp r0, #0 bgt _080734EE @@ -307,7 +307,7 @@ sub_08073504: @ 0x08073504 lsls r1, r1, #4 _08073516: adds r0, r4, #0 - bl sub_08003FC4 + bl GravityUpdate ldr r0, [r4, #0x20] cmp r0, #0 bge _08073576 @@ -737,7 +737,7 @@ _0807382A: movs r1, #0x80 lsls r1, r1, #2 adds r0, r4, #0 - bl sub_08003FC4 + bl GravityUpdate b _0807387A .align 2, 0 _08073854: .4byte gScreenTransition @@ -818,7 +818,7 @@ _080738EC: _080738F0: ldr r1, _08073900 @ =0xFFFFE800 adds r0, r4, #0 - bl sub_08003FC4 + bl GravityUpdate adds r0, r4, #0 bl UpdateAnimationSingleFrame pop {r4, pc} @@ -1029,7 +1029,7 @@ _08073A48: _08073A7E: adds r0, r4, #0 adds r1, r2, #0 - bl sub_08003FC4 + bl GravityUpdate cmp r0, #0 bne _08073A90 adds r0, r4, #0 @@ -1206,7 +1206,7 @@ _08073BD0: movs r1, #0x80 lsls r1, r1, #7 adds r0, r4, #0 - bl sub_08003FC4 + bl GravityUpdate movs r0, #0x36 ldrsh r1, [r4, r0] movs r0, #8 @@ -1500,7 +1500,7 @@ _08073E10: movs r1, #0x80 lsls r1, r1, #6 adds r0, r4, #0 - bl sub_08003FC4 + bl GravityUpdate adds r1, r0, #0 cmp r1, #0 bne _08073E32 @@ -1737,7 +1737,7 @@ _08073FF8: movs r1, #0x80 lsls r1, r1, #6 adds r0, r4, #0 - bl sub_08003FC4 + bl GravityUpdate ldr r0, [r4, #0x20] cmp r0, #0 bne _08074016 @@ -1796,7 +1796,7 @@ sub_08074060: @ 0x08074060 adds r4, r0, #0 movs r1, #0x80 lsls r1, r1, #6 - bl sub_08003FC4 + bl GravityUpdate cmp r0, #0 bne _080740D0 ldr r0, _080740C4 @ =gPlayerHitbox @@ -1966,7 +1966,7 @@ _080741B0: movs r1, #0x80 lsls r1, r1, #6 adds r0, r4, #0 - bl sub_08003FC4 + bl GravityUpdate cmp r0, #0 bne _080741C2 bl sub_0807921C @@ -3517,7 +3517,7 @@ _08074D20: movs r1, #0x80 lsls r1, r1, #6 adds r0, r5, #0 - bl sub_08003FC4 + bl GravityUpdate adds r0, r5, #0 bl UpdateAnimationSingleFrame pop {r4, r5, r6, pc} @@ -4009,7 +4009,7 @@ sub_0807508C: @ 0x0807508C movs r1, #0x80 lsls r1, r1, #6 adds r0, r4, #0 - bl sub_08003FC4 + bl GravityUpdate cmp r0, #0 beq _080750AA adds r0, r4, #0 diff --git a/asm/code_08078778.s b/asm/code_08078778.s index 36074a2e..973db1ec 100644 --- a/asm/code_08078778.s +++ b/asm/code_08078778.s @@ -5581,13 +5581,13 @@ sub_0807B21C: @ 0x0807B21C movs r1, #0x80 lsls r1, r1, #3 adds r0, r4, #0 - bl sub_08003FC4 + bl GravityUpdate b _0807B240 _0807B236: movs r1, #0x80 lsls r1, r1, #4 adds r0, r4, #0 - bl sub_08003FC4 + bl GravityUpdate _0807B240: ldr r1, [r4, #0x20] ldr r0, _0807B260 @ =0xFFFF8000 @@ -5659,7 +5659,7 @@ sub_0807B2B8: @ 0x0807B2B8 push {r4, lr} adds r4, r0, #0 ldr r1, _0807B2F0 @ =0xFFFFE000 - bl sub_08003FC4 + bl GravityUpdate adds r0, r4, #0 bl UpdateAnimationSingleFrame ldrb r0, [r4, #0xe] diff --git a/asm/crenalBeanSprout.s b/asm/crenalBeanSprout.s index 10d49ea1..1085ea32 100644 --- a/asm/crenalBeanSprout.s +++ b/asm/crenalBeanSprout.s @@ -648,7 +648,7 @@ _0809681C: movs r1, #0x80 lsls r1, r1, #7 adds r0, r4, #0 - bl sub_08003FC4 + bl GravityUpdate cmp r0, #0 bne _08096830 adds r0, r4, #0 diff --git a/asm/crow.s b/asm/crow.s index d736150b..58f659f5 100644 --- a/asm/crow.s +++ b/asm/crow.s @@ -280,7 +280,7 @@ sub_080329E8: @ 0x080329E8 sub_080329F0: @ 0x080329F0 push {r4, lr} adds r4, r0, #0 - bl sub_080040A8 + bl CheckOnScreen cmp r0, #0 bne _08032A3A movs r0, #4 @@ -326,7 +326,7 @@ _08032A46: sub_08032A48: @ 0x08032A48 push {r4, r5, lr} adds r4, r0, #0 - bl sub_080040A8 + bl CheckOnScreen adds r5, r0, #0 cmp r5, #0 bne _08032AAE diff --git a/asm/cuccoAggr.s b/asm/cuccoAggr.s index c8046759..612b0979 100644 --- a/asm/cuccoAggr.s +++ b/asm/cuccoAggr.s @@ -312,7 +312,7 @@ sub_08038EE0: @ 0x08038EE0 movs r1, #0xe0 lsls r1, r1, #5 adds r0, r4, #0 - bl sub_08003FC4 + bl GravityUpdate cmp r0, #0 bne _08038F1C ldrb r0, [r4, #0xe] diff --git a/asm/eyegore.s b/asm/eyegore.s index a49491c7..14833af2 100644 --- a/asm/eyegore.s +++ b/asm/eyegore.s @@ -161,7 +161,7 @@ sub_08030B34: @ 0x08030B34 movs r1, #0xe0 lsls r1, r1, #5 adds r0, r4, #0 - bl sub_08003FC4 + bl GravityUpdate b _08030B70 _08030B52: adds r0, r4, #0 @@ -425,7 +425,7 @@ _08030D44: movs r1, #0xe0 lsls r1, r1, #5 adds r0, r4, #0 - bl sub_08003FC4 + bl GravityUpdate cmp r0, #0 bne _08030D66 adds r0, r4, #0 @@ -506,7 +506,7 @@ _08030DDE: movs r1, #0xe0 lsls r1, r1, #5 adds r0, r4, #0 - bl sub_08003FC4 + bl GravityUpdate cmp r0, #0 bne _08030E1C adds r0, r4, #0 diff --git a/asm/ezloCap.s b/asm/ezloCap.s index cb68080e..99afe54f 100644 --- a/asm/ezloCap.s +++ b/asm/ezloCap.s @@ -551,7 +551,7 @@ _08082D0C: movs r1, #0x80 lsls r1, r1, #6 adds r0, r5, #0 - bl sub_08003FC4 + bl GravityUpdate adds r0, r5, #0 bl UpdateAnimationSingleFrame _08082D1C: @@ -709,7 +709,7 @@ sub_08082E14: @ 0x08082E14 movs r1, #0xc0 lsls r1, r1, #5 adds r0, r4, #0 - bl sub_08003FC4 + bl GravityUpdate ldrb r0, [r4, #0xd] cmp r0, #0 beq _08082E38 diff --git a/asm/flyingPot.s b/asm/flyingPot.s index 75e3a8b5..1dfba1a3 100644 --- a/asm/flyingPot.s +++ b/asm/flyingPot.s @@ -501,7 +501,7 @@ _080373F2: movs r1, #0x80 lsls r1, r1, #6 adds r0, r4, #0 - bl sub_08003FC4 + bl GravityUpdate cmp r0, #0 bne _08037406 adds r0, r4, #0 diff --git a/asm/flyingSkull.s b/asm/flyingSkull.s index d0ae76c4..c3aee745 100644 --- a/asm/flyingSkull.s +++ b/asm/flyingSkull.s @@ -694,7 +694,7 @@ _0803A0CA: movs r1, #0x80 lsls r1, r1, #6 adds r0, r4, #0 - bl sub_08003FC4 + bl GravityUpdate cmp r0, #0 bne _0803A0DE adds r0, r4, #0 diff --git a/asm/gleerok.s b/asm/gleerok.s index 6cf5f3a5..32779e12 100644 --- a/asm/gleerok.s +++ b/asm/gleerok.s @@ -1294,7 +1294,7 @@ _0802D95E: movs r1, #0xc0 lsls r1, r1, #5 adds r0, r4, #0 - bl sub_08003FC4 + bl GravityUpdate adds r2, r0, #0 cmp r2, #0 beq _0802D970 @@ -1526,7 +1526,7 @@ _0802DB20: movs r1, #0xc0 lsls r1, r1, #5 adds r0, r4, #0 - bl sub_08003FC4 + bl GravityUpdate ldr r0, [r4, #0x20] cmp r0, #0 bgt _0802DB7E diff --git a/asm/itemForSale.s b/asm/itemForSale.s index 8b5a7c02..156e200d 100644 --- a/asm/itemForSale.s +++ b/asm/itemForSale.s @@ -19,7 +19,7 @@ ItemForSale: @ 0x08081814 adds r0, r4, #0 bl _call_via_r1 adds r0, r4, #0 - bl sub_080040A8 + bl CheckOnScreen cmp r0, #0 beq _08081838 adds r0, r4, #0 diff --git a/asm/ladderUp.s b/asm/ladderUp.s index 785c3f3b..1eaecf27 100644 --- a/asm/ladderUp.s +++ b/asm/ladderUp.s @@ -83,7 +83,7 @@ _0808D4D8: movs r1, #0x80 lsls r1, r1, #5 adds r0, r7, #0 - bl sub_08003FC4 + bl GravityUpdate cmp r0, #0 beq _0808D4E8 b _0808D642 @@ -340,7 +340,7 @@ _0808DBE8: movs r1, #0x80 lsls r1, r1, #5 adds r0, r7, #0 - bl sub_08003FC4 + bl GravityUpdate cmp r0, #0 beq _0808DBF8 b _0808DD72 diff --git a/asm/lavaPlatform.s b/asm/lavaPlatform.s index a973a799..e4199773 100644 --- a/asm/lavaPlatform.s +++ b/asm/lavaPlatform.s @@ -87,7 +87,7 @@ sub_080922E4: @ 0x080922E4 adds r4, r0, #0 movs r1, #0x90 lsls r1, r1, #6 - bl sub_08003FC4 + bl GravityUpdate adds r2, r0, #0 cmp r2, #0 bne _08092322 diff --git a/asm/lilypadLarge.s b/asm/lilypadLarge.s index 4d2e643d..a9158fe8 100644 --- a/asm/lilypadLarge.s +++ b/asm/lilypadLarge.s @@ -850,7 +850,7 @@ sub_08085B40: @ 0x08085B40 movs r1, #0x80 lsls r1, r1, #6 adds r0, r5, #0 - bl sub_08003FC4 + bl GravityUpdate cmp r0, #0 beq _08085BE8 ldr r1, [r5, #0x78] @@ -930,7 +930,7 @@ _08085BE8: movs r1, #0x80 lsls r1, r1, #6 adds r0, r4, #0 - bl sub_08003FC4 + bl GravityUpdate cmp r0, #0 bne _08085C58 adds r0, r4, #0 diff --git a/asm/macroPlayer.s b/asm/macroPlayer.s index 26025e39..d5df62c2 100644 --- a/asm/macroPlayer.s +++ b/asm/macroPlayer.s @@ -262,7 +262,7 @@ sub_0808CCBC: @ 0x0808CCBC movs r1, #0x80 lsls r1, r1, #5 adds r0, r4, #0 - bl sub_08003FC4 + bl GravityUpdate cmp r0, #0 bne _0808CCFA ldrb r0, [r4, #0xc] @@ -300,7 +300,7 @@ sub_0808CD00: @ 0x0808CD00 movs r1, #0x80 lsls r1, r1, #6 adds r0, r4, #0 - bl sub_08003FC4 + bl GravityUpdate cmp r0, #0 beq _0808CD24 adds r0, r4, #0 @@ -335,7 +335,7 @@ sub_0808CD44: @ 0x0808CD44 movs r1, #0x80 lsls r1, r1, #6 adds r0, r4, #0 - bl sub_08003FC4 + bl GravityUpdate cmp r0, #0 beq _0808CD68 adds r0, r4, #0 @@ -368,7 +368,7 @@ sub_0808CD88: @ 0x0808CD88 movs r1, #0xc0 lsls r1, r1, #5 adds r0, r4, #0 - bl sub_08003FC4 + bl GravityUpdate cmp r0, #0 beq _0808CDB8 adds r0, r4, #0 diff --git a/asm/minecart.s b/asm/minecart.s index 9192a4e1..3ed01b8f 100644 --- a/asm/minecart.s +++ b/asm/minecart.s @@ -233,7 +233,7 @@ _08091DA0: movs r1, #0x80 lsls r1, r1, #6 adds r0, r4, #0 - bl sub_08003FC4 + bl GravityUpdate cmp r0, #0 bne _08091DD8 ldrb r1, [r4, #0xb] diff --git a/asm/non_matching/castorWildsStatue/sub_080676E0.inc b/asm/non_matching/castorWildsStatue/sub_080676E0.inc index dbf35d08..862de60f 100644 --- a/asm/non_matching/castorWildsStatue/sub_080676E0.inc +++ b/asm/non_matching/castorWildsStatue/sub_080676E0.inc @@ -49,7 +49,7 @@ _08067734: movs r1, #0xc0 lsls r1, r1, #5 adds r0, r3, #0 - bl sub_08003FC4 + bl GravityUpdate cmp r0, #0 beq _08067748 _08067742: diff --git a/asm/non_matching/cucco/sub_0806E564.inc b/asm/non_matching/cucco/sub_0806E564.inc index 81b21c45..69dbcecf 100644 --- a/asm/non_matching/cucco/sub_0806E564.inc +++ b/asm/non_matching/cucco/sub_0806E564.inc @@ -36,7 +36,7 @@ _0806E5AA: movs r1, #0xa0 lsls r1, r1, #6 adds r0, r4, #0 - bl sub_08003FC4 + bl GravityUpdate cmp r0, #0 bne _0806E5D4 ldrb r0, [r4, #0xe] diff --git a/asm/non_matching/cuccoChick/sub_0806E7B0.inc b/asm/non_matching/cuccoChick/sub_0806E7B0.inc index 25c8580e..5044ade9 100644 --- a/asm/non_matching/cuccoChick/sub_0806E7B0.inc +++ b/asm/non_matching/cuccoChick/sub_0806E7B0.inc @@ -35,7 +35,7 @@ _0806E7F2: movs r1, #0xc0 lsls r1, r1, #6 adds r0, r4, #0 - bl sub_08003FC4 + bl GravityUpdate cmp r0, #0 bne _0806E81C ldrb r0, [r4, #0xe] diff --git a/asm/non_matching/mountainMinish/sub_08067EF0.inc b/asm/non_matching/mountainMinish/sub_08067EF0.inc index 6dc123ef..5efe7adb 100644 --- a/asm/non_matching/mountainMinish/sub_08067EF0.inc +++ b/asm/non_matching/mountainMinish/sub_08067EF0.inc @@ -161,7 +161,7 @@ _0806802C: ands r0, r2 strb r0, [r6] adds r0, r5, #0 - bl sub_080040A8 + bl CheckOnScreen cmp r0, #0 bne _08068068 ldr r4, _08068064 @ =gUnk_0811137A diff --git a/asm/non_matching/player/sub_08070DC4.inc b/asm/non_matching/player/sub_08070DC4.inc index c7142c97..5f9b8e7e 100644 --- a/asm/non_matching/player/sub_08070DC4.inc +++ b/asm/non_matching/player/sub_08070DC4.inc @@ -12,7 +12,7 @@ movs r1, #0x80 lsls r1, r1, #6 adds r0, r4, #0 - bl sub_08003FC4 + bl GravityUpdate cmp r0, #0 bne _08070E76 ldr r6, _08070E18 @ =gPlayerState diff --git a/asm/non_matching/player/sub_08072D54.inc b/asm/non_matching/player/sub_08072D54.inc index 6ade7257..74485d74 100644 --- a/asm/non_matching/player/sub_08072D54.inc +++ b/asm/non_matching/player/sub_08072D54.inc @@ -151,7 +151,7 @@ _08072E80: movs r1, #0x80 lsls r1, r1, #6 adds r0, r4, #0 - bl sub_08003FC4 + bl GravityUpdate cmp r0, #0 bne _08072F10 ldrb r1, [r4, #0x10] diff --git a/asm/non_matching/playerItem13/sub_080AD040.inc b/asm/non_matching/playerItem13/sub_080AD040.inc index 33fff72b..01a96f6c 100644 --- a/asm/non_matching/playerItem13/sub_080AD040.inc +++ b/asm/non_matching/playerItem13/sub_080AD040.inc @@ -71,7 +71,7 @@ _080AD0C8: movs r1, #0x80 lsls r1, r1, #6 adds r0, r4, #0 - bl sub_08003FC4 + bl GravityUpdate cmp r0, #0 beq _080AD0D8 b _080AD202 diff --git a/asm/non_matching/postman/sub_0806076C.inc b/asm/non_matching/postman/sub_0806076C.inc index 086d9be1..d82f1b9f 100644 --- a/asm/non_matching/postman/sub_0806076C.inc +++ b/asm/non_matching/postman/sub_0806076C.inc @@ -148,7 +148,7 @@ _08060864: strh r0, [r7, #0x32] adds r0, r7, #0 str r2, [sp] - bl sub_080040A8 + bl CheckOnScreen cmp r0, #0 beq _080608B8 ldr r0, [sp, #4] diff --git a/asm/object1F.s b/asm/object1F.s index 315749f8..9f65249f 100644 --- a/asm/object1F.s +++ b/asm/object1F.s @@ -139,7 +139,7 @@ _08087788: movs r1, #0xa0 lsls r1, r1, #6 adds r0, r4, #0 - bl sub_08003FC4 + bl GravityUpdate _08087798: cmp r0, #0 bne _080877A0 diff --git a/asm/object30.s b/asm/object30.s index 084b0cfc..8ad2185f 100644 --- a/asm/object30.s +++ b/asm/object30.s @@ -127,7 +127,7 @@ _0808A924: _0808A926: ldr r1, [r4, #0x70] adds r0, r4, #0 - bl sub_08003FC4 + bl GravityUpdate b _0808A962 _0808A930: ldr r2, _0808A964 @ =gUnk_08121194 diff --git a/asm/object4B.s b/asm/object4B.s index 80b99e0e..b66012b4 100644 --- a/asm/object4B.s +++ b/asm/object4B.s @@ -141,7 +141,7 @@ sub_0808F858: @ 0x0808F858 movs r1, #0x80 lsls r1, r1, #6 adds r0, r4, #0 - bl sub_08003FC4 + bl GravityUpdate cmp r0, #0 bne _0808F88A adds r0, r4, #0 diff --git a/asm/object53.s b/asm/object53.s index 9be70782..cb6da18f 100644 --- a/asm/object53.s +++ b/asm/object53.s @@ -95,7 +95,7 @@ _080911AA: movs r1, #0x80 lsls r1, r1, #6 adds r0, r4, #0 - bl sub_08003FC4 + bl GravityUpdate cmp r0, #0 bne _080911E8 ldrb r1, [r4, #0xb] diff --git a/asm/object67.s b/asm/object67.s index aa5a10de..fe69518b 100644 --- a/asm/object67.s +++ b/asm/object67.s @@ -341,7 +341,7 @@ _080943A8: movs r1, #0x80 lsls r1, r1, #7 adds r0, r4, #0 - bl sub_08003FC4 + bl GravityUpdate cmp r0, #0 bne _08094420 ldrb r0, [r4, #0xb] diff --git a/asm/object97.s b/asm/object97.s index 380c921b..cc0b3c10 100644 --- a/asm/object97.s +++ b/asm/object97.s @@ -197,7 +197,7 @@ sub_0809DB14: @ 0x0809DB14 adds r4, r0, #0 bl sub_0809E1F0 adds r0, r4, #0 - bl sub_080040A8 + bl CheckOnScreen adds r5, r0, #0 cmp r5, #0 bne _0809DB36 @@ -586,7 +586,7 @@ sub_0809DDE4: @ 0x0809DDE4 adds r0, r4, #0 bl sub_0809E210 adds r0, r4, #0 - bl sub_080040A8 + bl CheckOnScreen adds r5, r0, #0 cmp r5, #0 bne _0809DE2A @@ -814,7 +814,7 @@ _0809DFD6: sub_0809DFE0: @ 0x0809DFE0 push {r4, lr} adds r4, r0, #0 - bl sub_080040A8 + bl CheckOnScreen cmp r0, #0 bne _0809E028 ldr r1, [r4, #0x54] diff --git a/asm/objectB3.s b/asm/objectB3.s index bb58c920..4111e371 100644 --- a/asm/objectB3.s +++ b/asm/objectB3.s @@ -92,7 +92,7 @@ sub_080A0AC4: @ 0x080A0AC4 sub_080A0AD0: @ 0x080A0AD0 push {lr} movs r1, #0x80 - bl sub_08003FC4 + bl GravityUpdate pop {pc} .align 2, 0 @@ -131,7 +131,7 @@ sub_080A0AF0: @ 0x080A0AF0 _080A0B1C: adds r0, r4, #0 movs r1, #0x80 - bl sub_08003FC4 + bl GravityUpdate pop {r4, pc} .align 2, 0 diff --git a/asm/objectOnSpinyBeetle.s b/asm/objectOnSpinyBeetle.s index 76679025..bcf85560 100644 --- a/asm/objectOnSpinyBeetle.s +++ b/asm/objectOnSpinyBeetle.s @@ -517,7 +517,7 @@ _080988FA: movs r1, #0x80 lsls r1, r1, #6 adds r0, r4, #0 - bl sub_08003FC4 + bl GravityUpdate cmp r0, #0 bne _0809890E adds r0, r4, #0 diff --git a/asm/stalfos.s b/asm/stalfos.s index fa469360..8dfd95a9 100644 --- a/asm/stalfos.s +++ b/asm/stalfos.s @@ -353,7 +353,7 @@ sub_08039530: @ 0x08039530 adds r4, r0, #0 movs r1, #0xc0 lsls r1, r1, #5 - bl sub_08003FC4 + bl GravityUpdate cmp r0, #0 bne _08039568 adds r0, r4, #0 @@ -442,7 +442,7 @@ sub_080395D8: @ 0x080395D8 movs r1, #0xc0 lsls r1, r1, #5 adds r0, r4, #0 - bl sub_08003FC4 + bl GravityUpdate cmp r0, #0 bne _08039602 adds r0, r4, #0 @@ -464,7 +464,7 @@ sub_08039604: @ 0x08039604 movs r1, #0xc0 lsls r1, r1, #5 adds r0, r4, #0 - bl sub_08003FC4 + bl GravityUpdate ldr r0, [r4, #0x20] cmp r0, #0 bge _08039624 @@ -563,7 +563,7 @@ sub_080396BC: @ 0x080396BC adds r4, r0, #0 movs r1, #0xc0 lsls r1, r1, #5 - bl sub_08003FC4 + bl GravityUpdate cmp r0, #0 bne _080396E2 adds r1, r4, #0 diff --git a/asm/takkuri.s b/asm/takkuri.s index 57dbaf0e..c8b490ae 100644 --- a/asm/takkuri.s +++ b/asm/takkuri.s @@ -226,7 +226,7 @@ sub_0803BD08: @ 0x0803BD08 cmp r0, #0 beq _0803BD2C adds r0, r4, #0 - bl sub_080040A8 + bl CheckOnScreen cmp r0, #0 bne _0803BD80 strb r0, [r4, #0xf] @@ -290,7 +290,7 @@ sub_0803BD88: @ 0x0803BD88 sub_0803BD90: @ 0x0803BD90 push {r4, lr} adds r4, r0, #0 - bl sub_080040A8 + bl CheckOnScreen cmp r0, #0 bne _0803BDC8 movs r0, #4 @@ -415,7 +415,7 @@ _0803BE78: .4byte gRoomControls sub_0803BE7C: @ 0x0803BE7C push {r4, r5, lr} adds r4, r0, #0 - bl sub_080040A8 + bl CheckOnScreen adds r5, r0, #0 cmp r5, #0 bne _0803BEE6 diff --git a/asm/wizzrobeFire.s b/asm/wizzrobeFire.s index ffe3a72f..7433c82d 100644 --- a/asm/wizzrobeFire.s +++ b/asm/wizzrobeFire.s @@ -242,7 +242,7 @@ _0802FCDE: cmp r0, #0 beq _0802FDCA adds r0, r4, #0 - bl sub_080040A8 + bl CheckOnScreen cmp r0, #0 beq _0802FDCA adds r0, r4, #0 diff --git a/asm/wizzrobeIce.s b/asm/wizzrobeIce.s index ae171a3f..4ac417bd 100644 --- a/asm/wizzrobeIce.s +++ b/asm/wizzrobeIce.s @@ -269,7 +269,7 @@ _0802FFB6: cmp r0, #0 beq _080300A2 adds r0, r4, #0 - bl sub_080040A8 + bl CheckOnScreen cmp r0, #0 beq _080300A2 adds r0, r4, #0 diff --git a/asm/wizzrobeWind.s b/asm/wizzrobeWind.s index ed1ca987..2fef5564 100644 --- a/asm/wizzrobeWind.s +++ b/asm/wizzrobeWind.s @@ -294,7 +294,7 @@ _0802F6B6: cmp r0, #0 beq _0802F7A2 adds r0, r4, #0 - bl sub_080040A8 + bl CheckOnScreen cmp r0, #0 beq _0802F7A2 adds r0, r4, #0 diff --git a/include/asm.h b/include/asm.h index cd151320..99ad082a 100644 --- a/include/asm.h +++ b/include/asm.h @@ -12,7 +12,7 @@ extern void sub_08001242(struct Entity_*); extern void sub_08001290(struct Entity_*, u32); extern void sub_08001324(struct Entity_*); extern u32 sub_08002632(struct Entity_*); -extern u32 sub_08003FC4(struct Entity_*, u32); +extern u32 GravityUpdate(struct Entity_*, u32); extern u32 sub_080043E8(struct Entity_*); extern void sub_08004484(struct Entity_*, struct Entity_*); extern u32 sub_080045D4(s16, s16, u32, u32); diff --git a/include/entity.h b/include/entity.h index 43c3b721..8a895838 100644 --- a/include/entity.h +++ b/include/entity.h @@ -61,7 +61,7 @@ typedef struct Entity_ { /*0x16*/ u8 field_0x16; /*0x17*/ u8 field_0x17; /*0x18*/ struct { - /* */ u32 draw : 2; // 1-2 + /* */ u32 draw : 2; // 0 = no draw, 1 = draw clip, 3 = force draw /* */ u32 ss2 : 1; // 4 /* */ u32 ss3 : 1; // 8 /* */ u32 shadow : 2; //0x10-0x20 diff --git a/include/functions.h b/include/functions.h index 7c875323..23e0a7cc 100644 --- a/include/functions.h +++ b/include/functions.h @@ -161,7 +161,7 @@ extern void sub_0802F45C(Entity*); extern u32 sub_0800419C(Entity*, Entity*, u32, u32); extern void sub_08004542(Entity*); extern void sub_08077B20(); -extern bool32 sub_080040A8(Entity*); +extern bool32 CheckOnScreen(Entity*); extern u32 sub_08017850(Entity*); extern void sub_080809D4(void); extern void sub_08080CB4(Entity*); diff --git a/src/enemy/acroBandits.c b/src/enemy/acroBandits.c index e43a8f39..865791d5 100644 --- a/src/enemy/acroBandits.c +++ b/src/enemy/acroBandits.c @@ -108,7 +108,7 @@ void sub_080318DC(Entity* this) { void sub_08031A60(Entity* this) { if (this->iframes > 0) - sub_08003FC4(this, 0x1800); + GravityUpdate(this, 0x1800); sub_08001324(this); } @@ -351,7 +351,7 @@ void sub_08031EE8(Entity* this) { } void sub_08031F54(Entity* this) { - sub_08003FC4(this, gUnk_080CE5F0[this->type2]); + GravityUpdate(this, gUnk_080CE5F0[this->type2]); if (this->type2 * -0xe <= this->z.HALF.HI) { this->action = 3; this->actionDelay = 20; @@ -426,7 +426,7 @@ void sub_08032008(Entity* this) { } void sub_08032148(Entity* this) { - if (sub_08003FC4(this, 0x2000)) + if (GravityUpdate(this, 0x2000)) return; sub_08032290(this); @@ -481,7 +481,7 @@ void sub_08032204(Entity* this) { } void sub_08032248(Entity* this) { - if (sub_08003FC4(this, 0x1800) == 0) { + if (GravityUpdate(this, 0x1800) == 0) { if (this->frame & 0x80) { ((Entity*)this->field_0x7c.WORD)->actionDelay--; diff --git a/src/enemy/beetle.c b/src/enemy/beetle.c index 205e149e..b6988f6c 100644 --- a/src/enemy/beetle.c +++ b/src/enemy/beetle.c @@ -133,7 +133,7 @@ void sub_08021984(Entity* this) { EnqueueSFX(0x12d); } - if (sub_08003FC4(this, 0x1800) == 0) { + if (GravityUpdate(this, 0x1800) == 0) { this->action = 2; this->actionDelay = 16; this->field_0xf = 1; @@ -200,7 +200,7 @@ void sub_08021AD8(Entity* this) { EnqueueSFX(0x7c); } sub_080AEFE0(this); - if (!sub_08003FC4(this, 0x1800)) + if (!GravityUpdate(this, 0x1800)) this->frameDuration = 1; } @@ -259,7 +259,7 @@ void sub_08021C58(Entity* this) { GetNextFrame(this); if (this->frame & 1) { sub_080AEFE0(this); - if (sub_08003FC4(this, 0x1800) == 0) + if (GravityUpdate(this, 0x1800) == 0) this->frameDuration = 1; } diff --git a/src/enemy/chuchu.c b/src/enemy/chuchu.c index f14b400c..eb77023e 100644 --- a/src/enemy/chuchu.c +++ b/src/enemy/chuchu.c @@ -134,7 +134,7 @@ void sub_0801EFD8(Entity* this) { sub_0801FB68(this); InitializeAnimation(this, 8); } - sub_08003FC4(this, 0x1800); + GravityUpdate(this, 0x1800); GetNextFrame(this); } } @@ -146,7 +146,7 @@ void sub_0801F02C(Entity* this) { } void sub_0801F048(Entity* this) { - sub_08003FC4(this, 0x1800); + GravityUpdate(this, 0x1800); GetNextFrame(this); if (this->type == 0) { sub_0804A7D4(this); @@ -218,7 +218,7 @@ void sub_0801F1B0(Entity* this) { EnqueueSFX(299); } sub_080AEFE0(this); - if (sub_08003FC4(this, 0x4000) == 0) + if (GravityUpdate(this, 0x4000) == 0) GetNextFrame(this); } else { GetNextFrame(this); @@ -278,7 +278,7 @@ void sub_0801F2CC(Entity* this) { } void sub_0801F2F8(Entity* this) { - sub_08003FC4(this, 0x1800); + GravityUpdate(this, 0x1800); GetNextFrame(this); if (this->frame & 0x80) { sub_0801F340(this); @@ -409,7 +409,7 @@ void sub_0801F584(Entity* this) { EnqueueSFX(299); } sub_080AEFE0(this); - if (sub_08003FC4(this, 0x4000) == 0) + if (GravityUpdate(this, 0x4000) == 0) GetNextFrame(this); } else { @@ -471,7 +471,7 @@ void sub_0801F6CC(Entity* this) { } void sub_0801F6F8(Entity* this) { - sub_08003FC4(this, 0x1800); + GravityUpdate(this, 0x1800); GetNextFrame(this); if (this->frame & 0x80) { this->action = 4; @@ -586,7 +586,7 @@ void sub_0801F940(Entity* this) { EnqueueSFX(299); } sub_080AEFE0(this); - if (sub_08003FC4(this, 0x4000) == 0) + if (GravityUpdate(this, 0x4000) == 0) GetNextFrame(this); } else { GetNextFrame(this); @@ -646,7 +646,7 @@ void sub_0801FA78(Entity* this) { } void sub_0801FAAC(Entity* this) { - sub_08003FC4(this, 0x1800); + GravityUpdate(this, 0x1800); GetNextFrame(this); if (this->frame & 0x80) { sub_0801FB14(this); diff --git a/src/enemy/cuccoChickAggr.c b/src/enemy/cuccoChickAggr.c index abb416f2..46b7c58b 100644 --- a/src/enemy/cuccoChickAggr.c +++ b/src/enemy/cuccoChickAggr.c @@ -52,7 +52,7 @@ void sub_08022988(Entity* this) { } ProcessMovement(this); - if (sub_08003FC4(this, 0x2000) == 0) { + if (GravityUpdate(this, 0x2000) == 0) { if (--this->actionDelay == 0) { sub_08022A88(this); } else { @@ -64,7 +64,7 @@ void sub_08022988(Entity* this) { } void sub_080229F8(Entity* this) { - if (sub_08003FC4(this, 0x2800) == 0) { + if (GravityUpdate(this, 0x2800) == 0) { if (--this->actionDelay == 0) { this->action = 4; this->actionDelay = 6; @@ -88,7 +88,7 @@ void sub_08022A40(Entity* this) { } ProcessMovement(this); - if (sub_08003FC4(this, 0x2000) == 0) { + if (GravityUpdate(this, 0x2000) == 0) { if (--this->actionDelay == 0) { sub_08022A88(this); } else { diff --git a/src/enemy/fireballGuy.c b/src/enemy/fireballGuy.c index afcc4ac7..ebeaaf1f 100644 --- a/src/enemy/fireballGuy.c +++ b/src/enemy/fireballGuy.c @@ -49,7 +49,7 @@ void sub_080453E8(Entity* this) { void sub_08045430(Entity* this) { sub_080AEFE0(this); GetNextFrame(this); - if (sub_08003FC4(this, 0x1800) == 0) + if (GravityUpdate(this, 0x1800) == 0) sub_08045524(this); } diff --git a/src/enemy/helmasaur.c b/src/enemy/helmasaur.c index 594c8800..494b577b 100644 --- a/src/enemy/helmasaur.c +++ b/src/enemy/helmasaur.c @@ -227,7 +227,7 @@ void sub_0802BEEC(Entity* this) { this->direction = this->animationState << 3; InitializeAnimation(this, this->animationState + 4); } - } else if (!sub_08003FC4(this, 0x1c00)) { + } else if (!GravityUpdate(this, 0x1c00)) { this->action = 8; this->actionDelay = 30; this->speed = 0x120; diff --git a/src/enemy/lakitu.c b/src/enemy/lakitu.c index 85d80ee3..9179a7a5 100644 --- a/src/enemy/lakitu.c +++ b/src/enemy/lakitu.c @@ -224,7 +224,7 @@ void Lakitu_LightningDelay(Entity* this) { } void Lakitu_Cloudless(Entity* this) { - if (sub_08003FC4(this, 0x1800) == 0 && this->animIndex <= 19) { + if (GravityUpdate(this, 0x1800) == 0 && this->animIndex <= 19) { InitAnimationForceUpdate(this, this->animationState + 20); this->spritePriority.b1 = 0; diff --git a/src/enemy/mazaalBracelet.c b/src/enemy/mazaalBracelet.c index d0db11ed..2adfed33 100644 --- a/src/enemy/mazaalBracelet.c +++ b/src/enemy/mazaalBracelet.c @@ -927,7 +927,7 @@ void sub_0803B100(Entity* this) { void sub_0803B144(Entity* this) { UpdateAnimationSingleFrame(this->child); - if (sub_08003FC4(this, 0x2000) == 0) { + if (GravityUpdate(this, 0x2000) == 0) { this->action = 0x2a; InitializeAnimation(this, 0x16); sub_0803B8E8(this, 0x14); diff --git a/src/enemy/mazaalHead.c b/src/enemy/mazaalHead.c index a96e4f84..553d5053 100644 --- a/src/enemy/mazaalHead.c +++ b/src/enemy/mazaalHead.c @@ -315,7 +315,7 @@ void sub_080342C8(Entity* this) { this->spriteOffsetX = gUnk_080CECEC[this->actionDelay >> 1 & 7]; } else { this->spriteOffsetX = 0; - if (sub_08003FC4(this, 0x2000) == 0) { + if (GravityUpdate(this, 0x2000) == 0) { this->action = 0xc; this->field_0x7c.HALF.HI = 0x708; this->field_0x7c.BYTES.byte1 = 0; diff --git a/src/enemy/miniFireballGuy.c b/src/enemy/miniFireballGuy.c index cca05ed4..0cde6285 100644 --- a/src/enemy/miniFireballGuy.c +++ b/src/enemy/miniFireballGuy.c @@ -43,7 +43,7 @@ void sub_08045618(Entity* this) { void sub_08045654(Entity* this) { sub_080AEFE0(this); GetNextFrame(this); - if (sub_08003FC4(this, 0x1800) == 0) { + if (GravityUpdate(this, 0x1800) == 0) { sub_08045678(this); } } diff --git a/src/enemy/peahat.c b/src/enemy/peahat.c index 5d8ba2d5..804ccba6 100644 --- a/src/enemy/peahat.c +++ b/src/enemy/peahat.c @@ -238,7 +238,7 @@ void Peahat_Stunned(Entity* this) { GetNextFrame(this); break; case PeahatAnimation_SlicedPropeller: - sub_08003FC4(this, 0x1c00); + GravityUpdate(this, 0x1c00); if (this->z.HALF.HI == 0) { this->action = 7; this->actionDelay = 150; @@ -316,7 +316,7 @@ void Peahat_Takeoff(Entity* this) { } else if (this->frame & 1) { sub_0800442E(this); } else { - sub_08003FC4(this, 0x1c00); + GravityUpdate(this, 0x1c00); ProcessMovement(this); } } diff --git a/src/enemy/puffstool.c b/src/enemy/puffstool.c index 6240bcd2..2641033f 100644 --- a/src/enemy/puffstool.c +++ b/src/enemy/puffstool.c @@ -104,7 +104,7 @@ void sub_0802511C(Entity* this) { } void sub_0802514C(Entity* this) { - sub_08003FC4(this, 0x2000); + GravityUpdate(this, 0x2000); if (sub_0806F520(this)) { gUnk_080CBFEC[this->subAction](this); } else { @@ -209,7 +209,7 @@ void sub_0802538C(Entity* this) { if (this->frame == 0) { GetNextFrame(this); } else { - sub_08003FC4(this, 0x2000); + GravityUpdate(this, 0x2000); if (this->zVelocity < 0x2000) { this->action = 4; InitializeAnimation(this, 2); @@ -220,7 +220,7 @@ void sub_0802538C(Entity* this) { void sub_080253D4(Entity* this) { GetNextFrame(this); - if (!sub_08003FC4(this, 0x2000)) { + if (!GravityUpdate(this, 0x2000)) { if (this->field_0xf == 0) { this->action = 5; InitializeAnimation(this, 3); @@ -256,7 +256,7 @@ void sub_0802544C(Entity* this) { } void sub_0802547C(Entity* this) { - sub_08003FC4(this, 0x2000); + GravityUpdate(this, 0x2000); GetNextFrame(this); if ((this->actionDelay & 7) == 0) { sub_08025BD4(this); @@ -268,7 +268,7 @@ void sub_0802547C(Entity* this) { } void sub_080254B4(Entity* this) { - sub_08003FC4(this, 0x2000); + GravityUpdate(this, 0x2000); if (this->frame & 0x80) { if (this->z.HALF.HI == 0) { if (this->cutsceneBeh.HWORD == 0) { diff --git a/src/enemy/rollobite.c b/src/enemy/rollobite.c index 5fb77dab..0a7dc34c 100644 --- a/src/enemy/rollobite.c +++ b/src/enemy/rollobite.c @@ -206,7 +206,7 @@ void Rollobite_Unroll(Entity* this) { } void Rollobite_LinedUp(Entity* this) { - if (sub_08003FC4(this, 0x1c00) == 0) { + if (GravityUpdate(this, 0x1c00) == 0) { this->action = 7; this->spritePriority.b0 = 7; } diff --git a/src/enemy/rope.c b/src/enemy/rope.c index d001888d..e555d60b 100644 --- a/src/enemy/rope.c +++ b/src/enemy/rope.c @@ -83,7 +83,7 @@ void sub_08031480(Entity* this) { SoundReq(SFX_12D); } } else { - if (sub_08003FC4(this, 0x1800) == 0) { + if (GravityUpdate(this, 0x1800) == 0) { this->action = 2; this->field_0xf = 0xf; this->spriteSettings.draw = 1; diff --git a/src/enemy/sluggula.c b/src/enemy/sluggula.c index 5d307fc4..57a6b416 100644 --- a/src/enemy/sluggula.c +++ b/src/enemy/sluggula.c @@ -117,7 +117,7 @@ void sub_08023CE0(Entity* this) { EnqueueSFX(0x12d); InitializeAnimation(this, 4); } - } else if (!sub_08003FC4(this, 0x1800)) { + } else if (!GravityUpdate(this, 0x1800)) { this->action = 3; this->spriteSettings.draw = 1; EnqueueSFX(0x84); diff --git a/src/enemy/spikedBeetle.c b/src/enemy/spikedBeetle.c index 903908c4..ec281989 100644 --- a/src/enemy/spikedBeetle.c +++ b/src/enemy/spikedBeetle.c @@ -173,7 +173,7 @@ void sub_0802B8E0(Entity* this) { } void sub_0802B948(Entity* this) { - if (!sub_08003FC4(this, 0x1800)) { + if (!GravityUpdate(this, 0x1800)) { this->action = 1; this->actionDelay = 1; } diff --git a/src/enemy/spinyChuchu.c b/src/enemy/spinyChuchu.c index 69664d39..7d5ea60b 100644 --- a/src/enemy/spinyChuchu.c +++ b/src/enemy/spinyChuchu.c @@ -86,7 +86,7 @@ void sub_080225A0(Entity* this) { } void sub_080225BC(Entity* this) { - sub_08003FC4(this, 0x1800); + GravityUpdate(this, 0x1800); if (this->frame & 1) { sub_0804A7D4(this); } else { @@ -125,7 +125,7 @@ void sub_08022654(Entity* this) { InitializeAnimation(this, 0); /* fallthrough */ case 1: - if (sub_08003FC4(this, 0x1800)) + if (GravityUpdate(this, 0x1800)) return; this->subAction = 2; @@ -204,7 +204,7 @@ void sub_080227AC(Entity* this) { } void sub_0802281C(Entity* this) { - sub_08003FC4(this, 0x1800); + GravityUpdate(this, 0x1800); GetNextFrame(this); if (this->frame & 0x80) { this->action = 2; @@ -218,7 +218,7 @@ void sub_08022854(Entity* this) { GetNextFrame(this); if (this->frame & 1) { sub_080AEFE0(this); - if (sub_08003FC4(this, 0x1800) == 0) { + if (GravityUpdate(this, 0x1800) == 0) { this->action = 7; this->hitType = 0x5c; InitializeAnimation(this, 5); diff --git a/src/enemy/tektite.c b/src/enemy/tektite.c index ac123367..07709ae9 100644 --- a/src/enemy/tektite.c +++ b/src/enemy/tektite.c @@ -56,7 +56,7 @@ void nullsub_16(Entity* this) { void sub_0802F1F0(Entity* this) { sub_08001242(this); if (this->z.HALF.HI != 0) { - sub_08003FC4(this, this->field_0x80.HWORD); + GravityUpdate(this, this->field_0x80.HWORD); } } diff --git a/src/enemy/tektiteGolden.c b/src/enemy/tektiteGolden.c index ba3b5d58..2fc3bfb0 100644 --- a/src/enemy/tektiteGolden.c +++ b/src/enemy/tektiteGolden.c @@ -55,7 +55,7 @@ void sub_08037F58(Entity* this) { void sub_08037F84(Entity* this) { sub_08001242(this); if (this->z.HALF.HI != 0) { - sub_08003FC4(this, 0x3000); + GravityUpdate(this, 0x3000); } } diff --git a/src/enemy/vaatiArm.c b/src/enemy/vaatiArm.c index 8a5dd737..7882441e 100644 --- a/src/enemy/vaatiArm.c +++ b/src/enemy/vaatiArm.c @@ -972,7 +972,7 @@ void sub_08043520(Entity* this) { Entity* entity; entity = ((VaatiArm_HeapStruct*)this->myHeap)->entities[4]; - sub_08003FC4(entity, 0x1a00); + GravityUpdate(entity, 0x1a00); if ((entity->zVelocity < 0) && (-6 < entity->z.HALF.HI)) { entity->z.HALF.HI = -6; this->subAction = 3; diff --git a/src/enemy/vaatiTransfigured.c b/src/enemy/vaatiTransfigured.c index 232d95a5..c9198d08 100644 --- a/src/enemy/vaatiTransfigured.c +++ b/src/enemy/vaatiTransfigured.c @@ -313,7 +313,7 @@ void VaatiTransfiguredType0Action3(Entity* this) { } break; } - if (sub_08003FC4(this, 0x2800) == 0) { + if (GravityUpdate(this, 0x2800) == 0) { this->field_0x80.HALF.LO = 5; this->actionDelay = 0x10; COLLISION_ON(this); @@ -379,7 +379,7 @@ void VaatiTransfiguredType0Action4(Entity* this) { } break; case 1: - if (sub_08003FC4(this, 0x2800) != 0) + if (GravityUpdate(this, 0x2800) != 0) break; this->field_0x80.HALF.LO += 1; switch (this->cutsceneBeh.HALF.LO) { diff --git a/src/enemy/vaatiWrath.c b/src/enemy/vaatiWrath.c index 25fb3dba..d216ba7f 100644 --- a/src/enemy/vaatiWrath.c +++ b/src/enemy/vaatiWrath.c @@ -470,7 +470,7 @@ void VaatiWrathType0ActionB(Entity* this) { UpdateAnimationSingleFrame(this); GetNextFrame(((VaatiWrathHeapStruct*)this->myHeap)->type1); GetNextFrame(((VaatiWrathHeapStruct*)this->myHeap)->type2); - if (sub_08003FC4(this, 0x2000) == 0) { + if (GravityUpdate(this, 0x2000) == 0) { this->subAction = 1; this->actionDelay = 0xf0; this->health = 8; diff --git a/src/enemy/waterDrop.c b/src/enemy/waterDrop.c index 32390db3..fc63d632 100644 --- a/src/enemy/waterDrop.c +++ b/src/enemy/waterDrop.c @@ -34,7 +34,7 @@ void sub_0802A250(Entity* this) { } void sub_0802A2B4(Entity* this) { - if (!sub_08003FC4(this, 0x2800)) { + if (!GravityUpdate(this, 0x2800)) { this->action = 2; this->spritePriority.b0 = 7; EnqueueSFX(0x84); diff --git a/src/npc/cuccoChick.c b/src/npc/cuccoChick.c index 11aab009..10a51b9f 100644 --- a/src/npc/cuccoChick.c +++ b/src/npc/cuccoChick.c @@ -74,7 +74,7 @@ void CuccoChick_Fusion(Entity* this) { this->spriteSettings.draw = 1; this->frameIndex = 1; } else { - if (sub_08003FC4(this, 0x3000) == 0) { + if (GravityUpdate(this, 0x3000) == 0) { this->zVelocity = 0x10000; } } diff --git a/src/npc/melari.c b/src/npc/melari.c index 757bc43e..f2d408b2 100644 --- a/src/npc/melari.c +++ b/src/npc/melari.c @@ -79,7 +79,7 @@ void sub_08068780(Entity* this) { if (this->frame & 0x40) { this->frame &= 0xbf; - if (sub_080040A8(this) == 0) { + if (CheckOnScreen(this) == 0) { SoundReq(gUnk_0811153E[(s32)Random() % 3]); } else { EnqueueSFX(gUnk_08111538[(s32)Random() % 3]); diff --git a/src/npc/npc5.c b/src/npc/npc5.c index a86189ef..97d3c819 100644 --- a/src/npc/npc5.c +++ b/src/npc/npc5.c @@ -265,7 +265,7 @@ void sub_08060DFC(Entity* this) { sub_0806F69C(this); sub_08060E94(this); - uVar1 = sub_08003FC4(this, 0x2000); + uVar1 = GravityUpdate(this, 0x2000); if (uVar1 == 0) { this->action = 7; this->collisionLayer = 1; diff --git a/src/npc/postman.c b/src/npc/postman.c index 3014e4b8..9e643e8e 100644 --- a/src/npc/postman.c +++ b/src/npc/postman.c @@ -96,7 +96,7 @@ void sub_080604DC(Entity* this) { int iVar2; Entity* ent; - if (this->spriteSettings.draw == 1 && sub_080040A8(this)) { + if (this->spriteSettings.draw == 1 && CheckOnScreen(this)) { if ((this->frame & 1) != 0) { this->frame &= 0xfe; ent = CreateFx(this, 17, 0x40); @@ -163,7 +163,7 @@ void sub_08060528(Entity* this) { this->field_0x6a.HWORD -= 1; } } - sub_08003FC4(this, 0x1800); + GravityUpdate(this, 0x1800); if (((this->field_0x6c.HALF.HI != 0) && (this->zVelocity == 0)) && this->z.WORD == 0) { this->field_0x6c.HALF.HI = 0; sub_080606C0(this); diff --git a/src/npc/townMinish.c b/src/npc/townMinish.c index dc8e0531..3d89d6f4 100644 --- a/src/npc/townMinish.c +++ b/src/npc/townMinish.c @@ -174,7 +174,7 @@ void sub_0806AEA8(Entity* this) { int old = this->field_0x82.HWORD; this->field_0x82.HWORD &= ~0x20; if (old & 0x20) { - sub_08003FC4(this, 0x4000); + GravityUpdate(this, 0x4000); } HandleEntity0x82Actions(this); this->field_0x82.HWORD = old; @@ -226,7 +226,7 @@ void sub_0806AF70(Entity* this, ScriptExecutionContext* context) { } void sub_0806AF78(Entity* this, ScriptExecutionContext* context) { - sub_08003FC4(this, 0x1800); + GravityUpdate(this, 0x1800); if (0 <= this->z.WORD && this->zVelocity < 1) { this->z.WORD = 0; sub_0806AF70(this, context); diff --git a/src/npc/zelda.c b/src/npc/zelda.c index 781c2c80..4cb5a1ae 100644 --- a/src/npc/zelda.c +++ b/src/npc/zelda.c @@ -137,7 +137,7 @@ void sub_08066E80(Entity* this, ScriptExecutionContext* context) { break; case 2: sub_0806F62C(this, 0x100, 0x80); - sub_08003FC4(this, 0x2000); + GravityUpdate(this, 0x2000); if (!(this->frame & 1)) { UpdateAnimationSingleFrame(this); } @@ -148,7 +148,7 @@ void sub_08066E80(Entity* this, ScriptExecutionContext* context) { case 3: sub_0806F62C(this, 0x100, 0x80); UpdateAnimationSingleFrame(this); - if (sub_08003FC4(this, 0x2000) == 0) { + if (GravityUpdate(this, 0x2000) == 0) { context->unk_18++; InitAnimationForceUpdate(this, 0x1E); } diff --git a/src/object/bird.c b/src/object/bird.c index b7774df4..9a131075 100644 --- a/src/object/bird.c +++ b/src/object/bird.c @@ -44,12 +44,12 @@ void sub_0809CF54(Entity* this) { void sub_0809CFEC(Entity* this) { sub_0806F69C(this); - sub_08003FC4(this, *(s16*)&this->field_0x68.HWORD); + GravityUpdate(this, *(s16*)&this->field_0x68.HWORD); if (this->actionDelay != 0) { if (--this->actionDelay == 0) { this->field_0xf = 0; } - } else if (sub_080040A8(this) == 0) { + } else if (CheckOnScreen(this) == 0) { DeleteThisEntity(); } UpdateAnimationSingleFrame(this); diff --git a/src/object/itemOnGround.c b/src/object/itemOnGround.c index 2c025c77..78d8c881 100644 --- a/src/object/itemOnGround.c +++ b/src/object/itemOnGround.c @@ -216,7 +216,7 @@ void sub_080811EC(Entity* this) { sub_0806F69C(this); } - sub_08003FC4(this, 0x2800); + GravityUpdate(this, 0x2800); if (this->zVelocity <= 0) { this->action = 2; COLLISION_ON(this); @@ -302,7 +302,7 @@ void sub_0808136C(Entity* this) { this->y.WORD = other->y.WORD; this->spriteOrientation.flipY = other->spriteOrientation.flipY; this->spriteRendering.b3 = other->spriteRendering.b3; - sub_08003FC4(this, 0x2800); + GravityUpdate(this, 0x2800); } else { sub_08081404(this, 1); } @@ -410,14 +410,14 @@ void sub_0808153C(Entity* this) { return; if (this->field_0x68.HALF.LO == 0) { - if (!sub_08003FC4(this, 0x1000) && !sub_0800442E(this)) { + if (!GravityUpdate(this, 0x1000) && !sub_0800442E(this)) { this->field_0x68.HALF.LO = 1; this->zVelocity = 0x1E000; sub_0808148C(this->type); UpdateSpriteForCollisionLayer(this); } } else { - if (!sub_08003FC4(this, 0x2800)) { + if (!GravityUpdate(this, 0x2800)) { this->field_0x68.HALF.LO = 2; sub_0808148C(this->type); } diff --git a/src/object/jarPortal.c b/src/object/jarPortal.c index d84c12b6..8adb45e7 100644 --- a/src/object/jarPortal.c +++ b/src/object/jarPortal.c @@ -57,7 +57,7 @@ void sub_0808BF14(Entity* this) { } void sub_0808BF58(Entity* this) { - sub_08003FC4(this, 0x2000); + GravityUpdate(this, 0x2000); switch (this->subAction) { case 0: if (this->zVelocity <= 98303) { @@ -125,7 +125,7 @@ void sub_0808C01C(Entity* this, u32 r1) { } void sub_0808C0AC(Entity* this) { - sub_08003FC4(this, 0x2000); + GravityUpdate(this, 0x2000); switch (this->subAction) { case 0: if (this->zVelocity <= 98303) { diff --git a/src/object/object49.c b/src/object/object49.c index 125c6440..4b4be720 100644 --- a/src/object/object49.c +++ b/src/object/object49.c @@ -53,7 +53,7 @@ void sub_0808F0D0(Entity* this) { void sub_0808F14C(Entity* this) { sub_0808F2B0(this); - if (sub_08003FC4(this, 0x2000) == 0) { + if (GravityUpdate(this, 0x2000) == 0) { this->action++; SoundReq(SFX_WATER_SPLASH); } diff --git a/src/object/object6A.c b/src/object/object6A.c index baeccd92..d0063f60 100644 --- a/src/object/object6A.c +++ b/src/object/object6A.c @@ -104,7 +104,7 @@ Object6ATypeAction sub_08096290; extern void sub_08080CB4(Entity*); extern u32 sub_080002B8(Entity*); -extern u32 sub_080040A8(Entity*); +extern u32 CheckOnScreen(Entity*); extern void sub_08078850(Entity*, u32, u32, u8*); void sub_08095754(Object6AEntity*); @@ -355,7 +355,7 @@ void sub_08094E30(Object6AEntity* this) { case 3: super->z.WORD -= super->zVelocity; super->zVelocity -= 0x2000; - if (!sub_080040A8(super)) { + if (!CheckOnScreen(super)) { DeleteThisEntity(); } break; @@ -695,7 +695,7 @@ void sub_080954DC(Object6AEntity* this) { break; } this->off += 4; - if (super->subAction != 0 && !sub_080040A8(super)) + if (super->subAction != 0 && !CheckOnScreen(super)) DeleteThisEntity(); if (super->direction & 0x80) super->spriteSettings.flipX = 0; @@ -1090,9 +1090,9 @@ void sub_08095DBC(Object6AEntity* this) { super->zVelocity = 0x40000; super->speed = 0xC000; } - sub_08003FC4(super, super->speed); + GravityUpdate(super, super->speed); GetNextFrame(super); - if (!sub_080040A8(super)) + if (!CheckOnScreen(super)) DeleteThisEntity(); } } @@ -1241,7 +1241,7 @@ void sub_08096168(Object6AEntity* this) { } GetNextFrame(super); sub_0806F62C(super, super->speed, super->direction); - if (!sub_080040A8(super)) + if (!CheckOnScreen(super)) DeleteThisEntity(); } @@ -1301,7 +1301,7 @@ void sub_0809629C(Object6AEntity* this, u32 type) { } ExecuteScriptForEntity(super, 0); HandleEntity0x82Actions(super); - sub_08003FC4(super, 0x1000); + GravityUpdate(super, 0x1000); tmp = super->type; super->type = type; sub_08080CB4(super); diff --git a/src/object/pot.c b/src/object/pot.c index dd645021..d7a7ae96 100644 --- a/src/object/pot.c +++ b/src/object/pot.c @@ -256,7 +256,7 @@ void sub_08082824(Entity* this) { this->spriteSettings.flipY = 1; } - if (sub_08003FC4(this, 0x2000) == 0) { + if (GravityUpdate(this, 0x2000) == 0) { sub_08082850(this, NULL); } } diff --git a/src/player.c b/src/player.c index 455f018c..ead93d25 100644 --- a/src/player.c +++ b/src/player.c @@ -401,7 +401,7 @@ static NONMATCH("asm/non_matching/player/sub_08070DC4.inc", void PlayerBounceUpd sub_08079E08(); UpdateFloorType(); - if (sub_08078EFC() || sub_08003FC4(this, 0x2000)) + if (sub_08078EFC() || GravityUpdate(this, 0x2000)) return; gPlayerState.jumpStatus = 0; @@ -615,7 +615,7 @@ static void sub_08071130(Entity* this) { sub_0806F69C(this); - if (sub_08003FC4(this, 0x2000)) + if (GravityUpdate(this, 0x2000)) return; gPlayerState.jumpStatus = 0; @@ -880,7 +880,7 @@ static ASM_FUNC("asm/non_matching/player/PortalShrinkUpdate.inc", void PortalShr static void PortalEnterUpdate(Entity* this) { if (this->actionDelay == 0) { - if (sub_08003FC4(this, 0x2000)) + if (GravityUpdate(this, 0x2000)) return; this->spriteSettings.draw = FALSE; @@ -976,7 +976,7 @@ static void PlayerTalkEzloInit(Entity* this) { return; } - if (!sub_08003FC4(this, 0x2000)) + if (!GravityUpdate(this, 0x2000)) gPlayerState.jumpStatus = 0; } @@ -1142,7 +1142,7 @@ static void PlayerMinishDieInit(Entity* this) { if (gPlayerState.flags & (0x10 | 0x100)) return; - if (sub_08003FC4(this, 0x2000)) { + if (GravityUpdate(this, 0x2000)) { if (gPlayerState.flags & PL_NO_CAP) gPlayerState.animation = 0x420; else @@ -1287,7 +1287,7 @@ static void sub_08071E04(Entity* this) { static void sub_08071E74(Entity* this) { u32 temp; - sub_08003FC4(this, 0x2000); + GravityUpdate(this, 0x2000); sub_08079E08(); temp = this->actionDelay--; if (temp == 0) @@ -1353,7 +1353,7 @@ static void PlayerFrozenInit(Entity* this) { } static void PlayerFrozenUpdate(Entity* this) { - if (sub_08003FC4(this, 0x2000) == 0) { + if (GravityUpdate(this, 0x2000) == 0) { UpdateSpriteForCollisionLayer(this); gPlayerState.jumpStatus = 0; if (gPlayerState.field_0x14 == 0) { @@ -1457,7 +1457,7 @@ static void sub_08072168(Entity* this) { UpdateAnimationSingleFrame(this); i = (u16)sub_0806F854(this, 0, -12) ? 0x4000 : 0x2000; - sub_08003FC4(this, i); + GravityUpdate(this, i); if (gPlayerState.field_0x3a) { sub_0806F69C(this); } else { @@ -1553,7 +1553,7 @@ static void sub_08072354(Entity* this) { sub_0806F854(this, 0, -12); UpdateAnimationSingleFrame(this); sub_08079744(this); - if (sub_08003FC4(this, 0x2000)) + if (GravityUpdate(this, 0x2000)) return; this->spritePriority.b1 = 0; @@ -1929,7 +1929,7 @@ static void sub_08072B5C(Entity* this) { static void sub_08072C48(Entity* this) { UpdateAnimationSingleFrame(this); sub_0806F69C(this); - if (sub_08003FC4(this, 0x2000)) + if (GravityUpdate(this, 0x2000)) return; sub_08008790(this, 7); @@ -2054,7 +2054,7 @@ static NONMATCH("asm/non_matching/player/sub_08072D54.inc", void sub_08072D54(En } this->actionDelay = bVar1; - if (!sub_08003FC4(this, 0x2000)) { + if (!GravityUpdate(this, 0x2000)) { COLLISION_ON(this); if (this->collisionLayer == 1) { sub_0800455E(this); diff --git a/src/playerItem/playerItem12.c b/src/playerItem/playerItem12.c index 3f750765..855fcef8 100644 --- a/src/playerItem/playerItem12.c +++ b/src/playerItem/playerItem12.c @@ -25,7 +25,7 @@ void sub_0807037C(Entity* this) { void sub_08070398(Entity* this) { GetNextFrame(this); sub_0806F69C(this); - if (sub_08003FC4(this, 0x2000) == 0) { + if (GravityUpdate(this, 0x2000) == 0) { DeleteThisEntity(); } } diff --git a/src/playerItem/playerItemBow.c b/src/playerItem/playerItemBow.c index f9739d9b..c1295acd 100644 --- a/src/playerItem/playerItemBow.c +++ b/src/playerItem/playerItemBow.c @@ -28,7 +28,7 @@ void sub_08019410(Entity* this) { void sub_08019444(Entity* this) { GetNextFrame(this); sub_0806F69C(this); - if (sub_08003FC4(this, 0x2000) == 0) { + if (GravityUpdate(this, 0x2000) == 0) { DeleteThisEntity(); } } diff --git a/src/projectile/arrowProjectile.c b/src/projectile/arrowProjectile.c index 03994e21..845a839b 100644 --- a/src/projectile/arrowProjectile.c +++ b/src/projectile/arrowProjectile.c @@ -90,7 +90,7 @@ void ArrowProjectile_Action3(Entity* this) { } void ArrowProjectile_Action4(Entity* this) { - if (sub_08003FC4(this, 0x2800) == 0) { + if (GravityUpdate(this, 0x2800) == 0) { CreateDust(this); DeleteThisEntity(); } else { diff --git a/src/projectile/boneProjectile.c b/src/projectile/boneProjectile.c index 1bececa0..d778558d 100644 --- a/src/projectile/boneProjectile.c +++ b/src/projectile/boneProjectile.c @@ -55,7 +55,7 @@ void BoneProjectile_Action1(Entity* this) { void BoneProjectile_Action2(Entity* this) { GetNextFrame(this); sub_080AF090(this); - if (sub_08003FC4(this, 0x1800) == 0) { + if (GravityUpdate(this, 0x1800) == 0) { this->action = 3; COLLISION_OFF(this); this->speed = 0xe0; @@ -75,7 +75,7 @@ void BoneProjectile_Action3(Entity* this) { void BoneProjectile_Action4(Entity* this) { GetNextFrame(this); sub_0806F69C(this); - if (sub_08003FC4(this, 0x1800) == 0) { + if (GravityUpdate(this, 0x1800) == 0) { DeleteEntity(this); } } diff --git a/src/projectile/gleerokProjectile.c b/src/projectile/gleerokProjectile.c index f4d71406..6a25ec3e 100644 --- a/src/projectile/gleerokProjectile.c +++ b/src/projectile/gleerokProjectile.c @@ -89,7 +89,7 @@ void GleerokProjectile_Init(Entity* this) { void GleerokProjectile_Action1(Entity* this) { if (this->type == 3) { - if (sub_08003FC4(this, 0x1800) == 0) { + if (GravityUpdate(this, 0x1800) == 0) { sub_08008790(this, 7); CreateFx(this, FX_ROCK, 0); DeleteThisEntity(); @@ -101,7 +101,7 @@ void GleerokProjectile_Action1(Entity* this) { this->field_0xf = 0x1e; sub_08004596(this, GetFacingDirection(this, &gPlayerEntity)); } - if (sub_08003FC4(this, 0) == 0) { + if (GravityUpdate(this, 0) == 0) { this->action = 2; sub_080A90D8(this); if (this->type == 2) { diff --git a/src/projectile/mandiblesProjectile.c b/src/projectile/mandiblesProjectile.c index 79fcb38b..43551110 100644 --- a/src/projectile/mandiblesProjectile.c +++ b/src/projectile/mandiblesProjectile.c @@ -198,7 +198,7 @@ void MandiblesProjectile_Action4(Entity* this) { } } } else { - if (sub_080040A8(this) == 0) { + if (CheckOnScreen(this) == 0) { DeleteThisEntity(); } } diff --git a/src/projectile/octorokBossProjectile.c b/src/projectile/octorokBossProjectile.c index 70315175..d04903b5 100644 --- a/src/projectile/octorokBossProjectile.c +++ b/src/projectile/octorokBossProjectile.c @@ -154,7 +154,7 @@ void OctorokBossProjectile_Action1(Entity* this) { OctorokBossProjectile_Action2(this); } GetNextFrame(this); - if (sub_08003FC4(this, 0x1800) != 0) { + if (GravityUpdate(this, 0x1800) != 0) { sub_080AE58C(this, this->direction >> 3, 0); if (this->collisions == 0) { sub_0806F62C(this, (s32)this->speed, (u32)this->direction); @@ -189,7 +189,7 @@ void OctorokBossProjectile_Action1(Entity* this) { DeleteThisEntity(); break; case 3: - if (sub_08003FC4(this, 0x1800) != 0) { + if (GravityUpdate(this, 0x1800) != 0) { return; } CreateFx(this, FX_ROCK, 0); diff --git a/src/projectile/rockProjectile.c b/src/projectile/rockProjectile.c index 02fea8ba..5ad1b0ef 100644 --- a/src/projectile/rockProjectile.c +++ b/src/projectile/rockProjectile.c @@ -56,7 +56,7 @@ void RockProjectile_Action1(Entity* this) { void RockProjectile_Action2(Entity* this) { sub_0806F69C(this); GetNextFrame(this); - if (sub_08003FC4(this, 0x1800) == 0) { + if (GravityUpdate(this, 0x1800) == 0) { DeleteEntity(this); } } diff --git a/src/projectile/stalfosProjectile.c b/src/projectile/stalfosProjectile.c index 0f3bfec5..92868e26 100644 --- a/src/projectile/stalfosProjectile.c +++ b/src/projectile/stalfosProjectile.c @@ -120,7 +120,7 @@ void StalfosProjectile_Action3(Entity* this) { if (this->zVelocity < 0) { this->spriteSettings.flipY = 1; } - if (sub_08003FC4(this, 0x2000) == 0) { + if (GravityUpdate(this, 0x2000) == 0) { sub_080A9BA8(this); } } diff --git a/src/projectile/v1FireProjectile.c b/src/projectile/v1FireProjectile.c index 4384766d..6c7efb5e 100644 --- a/src/projectile/v1FireProjectile.c +++ b/src/projectile/v1FireProjectile.c @@ -76,7 +76,7 @@ void V1FireProjectile_Init(Entity* this) { void V1FireProjectile_Action1(Entity* this) { GetNextFrame(this); sub_0806F69C(this); - if (sub_08003FC4(this, 0) == 0) { + if (GravityUpdate(this, 0) == 0) { this->action = 2; this->actionDelay = 0xf; InitializeAnimation(this, 0x54); diff --git a/src/projectile/v2Projectile.c b/src/projectile/v2Projectile.c index e0213f6f..b3574211 100644 --- a/src/projectile/v2Projectile.c +++ b/src/projectile/v2Projectile.c @@ -96,7 +96,7 @@ void sub_080ABD70(Entity* this) { ASM_FUNC("asm/non_matching/v2Projectile/sub_080ABE04.inc", void sub_080ABE04(Entity* this)) void sub_080ABE88(Entity* this) { - if (sub_08003FC4(this, 0x1800) == 0) { + if (GravityUpdate(this, 0x1800) == 0) { CreateFx(this, FX_ROCK, 0); DeleteThisEntity(); } @@ -118,7 +118,7 @@ void sub_080ABEA8(Entity* this) { } void sub_080ABF04(Entity* this) { - if (sub_080040A8(this) == 0) { + if (CheckOnScreen(this) == 0) { DeleteThisEntity(); } sub_0806F69C(this); diff --git a/src/script.c b/src/script.c index a05c3629..2a28188e 100644 --- a/src/script.c +++ b/src/script.c @@ -391,7 +391,7 @@ void HandleEntity0x82Actions(Entity* entity) { } break; case 1 << 5: - sub_08003FC4(entity, 0x2000); + GravityUpdate(entity, 0x2000); break; } } @@ -1440,9 +1440,9 @@ void ScriptCommand_0807EF3C(Entity* entity, ScriptExecutionContext* context) { context->unk_18 = 1; entity->zVelocity = ((s16)context->scriptInstructionPointer[1]) << 8; context->x.HALF.LO = context->scriptInstructionPointer[2] << 8; - sub_08003FC4(entity, (u16)context->x.HALF.LO); + GravityUpdate(entity, (u16)context->x.HALF.LO); } else { - if (!sub_08003FC4(entity, (u16)context->x.HALF.LO)) + if (!GravityUpdate(entity, (u16)context->x.HALF.LO)) return; } gActiveScriptInfo.commandSize = 0; @@ -1952,14 +1952,14 @@ void sub_0807F854(Entity* entity, ScriptExecutionContext* context) { } void sub_0807F8BC(Entity* entity, ScriptExecutionContext* context) { - if (sub_080040A8(entity)) + if (CheckOnScreen(entity)) context->condition = 1; else context->condition = 0; } void sub_0807F8D0(Entity* entity, ScriptExecutionContext* context) { - sub_08003FC4(entity, context->intVariable); + GravityUpdate(entity, context->intVariable); gActiveScriptInfo.flags |= 1; } @@ -2129,7 +2129,7 @@ void sub_0807FBCC(Entity* entity, ScriptExecutionContext* context) { void sub_0807FBD4(Entity* entity, ScriptExecutionContext* context) { sub_0806F62C(entity, entity->speed, entity->direction); - if (sub_080040A8(entity)) + if (CheckOnScreen(entity)) gActiveScriptInfo.commandSize = 0; } From 24750a6bb59eebab95a9ef0a020ba612cac908e1 Mon Sep 17 00:00:00 2001 From: theo3 Date: Mon, 27 Dec 2021 17:14:52 -0800 Subject: [PATCH 2/4] finish player.c --- asm/ballChainSoldier.s | 2 +- asm/chuchuBoss.s | 8 +- asm/code_080043E8.s | 4 +- asm/code_0800857C.s | 2 +- asm/code_0801967C.s | 12 +- asm/code_080732D0.s | 4332 ----------------- asm/code_08078778.s | 18 +- asm/crenalBeanSprout.s | 2 +- asm/enemy4D.s | 2 +- asm/enemy50.s | 4 +- asm/enemy62.s | 2 +- asm/ghini.s | 6 +- asm/gleerok.s | 6 +- asm/gyorgBossObject.s | 14 +- asm/gyorgFemale.s | 4 +- asm/hittableLever.s | 2 +- asm/ladderUp.s | 4 +- asm/lilypadLarge.s | 2 +- asm/macroBook.s | 12 +- asm/non_matching/pesto/sub_08024E4C.inc | 2 +- asm/non_matching/player/PlayerNormal.inc | 12 +- asm/non_matching/player/sub_08070DC4.inc | 4 +- asm/non_matching/player/sub_08073584.inc | 280 ++ asm/non_matching/player/sub_080740D8.inc | 123 + asm/non_matching/player/sub_08074678.inc | 146 + asm/non_matching/player/sub_080751E8.inc | 84 + .../playerItemSword/sub_080A7A84.inc | 4 +- asm/non_matching/sub_0804BF38.inc | 2 +- asm/object10.s | 16 +- asm/pressurePlate.s | 4 +- asm/stairsInteract.s | 129 - data/data_0811B9E0.s | 69 - data/data_0811BE38.s | 84 +- include/asm.h | 6 +- include/functions.h | 2 +- include/player.h | 24 +- include/room.h | 2 +- linker.ld | 6 +- src/code_0808091C.c | 2 +- src/collision.c | 35 +- src/enemy/beetle.c | 2 +- src/enemy/gibdo.c | 8 +- src/enemy/helmasaur.c | 2 +- src/enemy/lakituCloud.c | 4 +- src/enemy/mazaalBracelet.c | 14 +- src/enemy/mazaalHead.c | 2 +- src/enemy/mazaalMacro.c | 2 +- src/enemy/moldworm.c | 8 +- src/enemy/octorokBoss.c | 6 +- src/enemy/pesto.c | 10 +- src/enemy/rupeeLike.c | 2 +- src/enemy/vaatiRebornEnemy.c | 2 +- src/enemy/vaatiTransfigured.c | 8 +- src/enemy/vaatiWrath.c | 4 +- src/enemy/wisp.c | 2 +- src/enemyUtils.c | 3 +- src/interrupts.c | 30 +- src/item.c | 4 + src/item/itemBoomerang.c | 4 +- src/item/itemLantern.c | 18 +- src/item/itemOcarina.c | 10 +- src/item/itemPegasusBoots.c | 2 +- src/item/itemSword.c | 10 +- src/manager/manager15.c | 4 +- src/manager/manager1A.c | 2 +- src/manager/manager34.c | 6 +- src/manager/managerA.c | 2 +- src/manager/managerC.c | 2 +- src/npc/carlov.c | 2 +- src/npc/castorWildsStatue.c | 2 +- src/npc/rem.c | 2 +- src/npc/zelda.c | 2 +- src/object/bakerOven.c | 4 +- src/object/bigVortex.c | 2 +- src/object/book.c | 4 +- src/object/button.c | 20 +- src/object/itemOnGround.c | 1 - src/object/jarPortal.c | 2 +- src/object/minecart.c | 23 +- src/object/object6A.c | 2 +- src/object/object86.c | 2 +- src/overworld.c | 6 +- src/player.c | 1700 ++++++- src/projectile/lakituCloudProjectile.c | 4 +- src/projectile/v1DarkMagicProjectile.c | 4 +- src/projectile/v2Projectile.c | 4 +- src/roomInit.c | 4 +- src/script.c | 6 +- src/sub_0807B820.c | 2 +- 89 files changed, 2566 insertions(+), 4879 deletions(-) delete mode 100644 asm/code_080732D0.s create mode 100644 asm/non_matching/player/sub_08073584.inc create mode 100644 asm/non_matching/player/sub_080740D8.inc create mode 100644 asm/non_matching/player/sub_08074678.inc create mode 100644 asm/non_matching/player/sub_080751E8.inc delete mode 100644 asm/stairsInteract.s delete mode 100644 data/data_0811B9E0.s diff --git a/asm/ballChainSoldier.s b/asm/ballChainSoldier.s index 0f897b81..9cec92cf 100644 --- a/asm/ballChainSoldier.s +++ b/asm/ballChainSoldier.s @@ -356,7 +356,7 @@ _0803E7A0: strb r0, [r2, #0xe] movs r0, #8 movs r1, #0 - bl sub_08080964 + bl InitScreenShake _0803E7B0: pop {pc} .align 2, 0 diff --git a/asm/chuchuBoss.s b/asm/chuchuBoss.s index d3f20d5a..b2b3b1d9 100644 --- a/asm/chuchuBoss.s +++ b/asm/chuchuBoss.s @@ -1033,7 +1033,7 @@ sub_0802647C: @ 0x0802647C bne _080264A6 movs r0, #0x10 movs r1, #0 - bl sub_08080964 + bl InitScreenShake ldr r0, _080264A8 @ =0x000001A1 bl SoundReq adds r0, r4, #0 @@ -1561,7 +1561,7 @@ sub_0802686C: @ 0x0802686C _08026888: movs r0, #0x10 movs r1, #0 - bl sub_08080964 + bl InitScreenShake movs r0, #5 strb r0, [r4, #0xd] adds r0, r4, #0 @@ -1852,7 +1852,7 @@ _08026A7C: strh r0, [r1] movs r0, #0x20 movs r1, #0 - bl sub_08080964 + bl InitScreenShake ldr r0, _08026B24 @ =0x0000010B bl SoundReq adds r0, r6, #0 @@ -2126,7 +2126,7 @@ _08026A98: strh r0, [r1] movs r0, #0x20 movs r1, #0 - bl sub_08080964 + bl InitScreenShake ldr r0, _08026B24 @ =0x0000010B bl SoundReq adds r0, r6, #0 diff --git a/asm/code_080043E8.s b/asm/code_080043E8.s index 4a962130..817ddf9a 100644 --- a/asm/code_080043E8.s +++ b/asm/code_080043E8.s @@ -99,8 +99,8 @@ EnqueueSFX: @ 0x08004488 _0800449A: bx lr - thumb_func_start sub_0800449C -sub_0800449C: @ 0x0800449C + thumb_func_start SoundReqClipped +SoundReqClipped: @ 0x0800449C push {r1, lr} bl CheckOnScreen cmp r0, #0 diff --git a/asm/code_0800857C.s b/asm/code_0800857C.s index c4a611b9..cd443b88 100644 --- a/asm/code_0800857C.s +++ b/asm/code_0800857C.s @@ -464,7 +464,7 @@ _0800890C: .byte 0x00, 0xFA, 0x06, 0x00, 0x13, 0x12, 0x12, 0x10, 0x10, 0x11, 0x11, 0x13 _0800891C: push {r0} - bl sub_08078F60 + bl ResetPlayerVelocity pop {r0} _08008924: pop {pc} diff --git a/asm/code_0801967C.s b/asm/code_0801967C.s index 69ea4740..27351a84 100644 --- a/asm/code_0801967C.s +++ b/asm/code_0801967C.s @@ -1260,7 +1260,7 @@ _08019FDA: ands r7, r0 movs r4, #0 movs r6, #0 - ldr r5, _0801A088 @ =gUnk_03004040 + ldr r5, _0801A088 @ =gPlayerClones mov sb, r5 _08019FEC: mov r1, sb @@ -1340,7 +1340,7 @@ _0801A02A: _0801A07C: .4byte gPlayerState _0801A080: .4byte 0x0000FFFF _0801A084: .4byte 0x00000FFF -_0801A088: .4byte gUnk_03004040 +_0801A088: .4byte gPlayerClones _0801A08C: .4byte gPlayerEntity _0801A090: .4byte gRoomControls _0801A094: @@ -1465,7 +1465,7 @@ _0801A166: b _0801A2A4 _0801A174: movs r4, #0 - ldr r5, _0801A194 @ =gUnk_03004040 + ldr r5, _0801A194 @ =gPlayerClones _0801A178: ldr r0, [r5] movs r1, #0 @@ -1481,7 +1481,7 @@ _0801A186: b _0801A2A4 .align 2, 0 _0801A190: .4byte gPlayerState -_0801A194: .4byte gUnk_03004040 +_0801A194: .4byte gPlayerClones _0801A198: subs r7, #0x40 _0801A19A: @@ -1499,7 +1499,7 @@ _0801A1A6: cmp r0, #9 ble _0801A2A4 movs r4, #0 - ldr r5, _0801A1D0 @ =gUnk_03004040 + ldr r5, _0801A1D0 @ =gPlayerClones _0801A1B6: ldr r0, [r5] movs r1, #6 @@ -1513,7 +1513,7 @@ _0801A1B6: b _0801A2A4 .align 2, 0 _0801A1CC: .4byte gPlayerState -_0801A1D0: .4byte gUnk_03004040 +_0801A1D0: .4byte gPlayerClones _0801A1D4: movs r0, #2 ands r0, r1 diff --git a/asm/code_080732D0.s b/asm/code_080732D0.s deleted file mode 100644 index ad91468f..00000000 --- a/asm/code_080732D0.s +++ /dev/null @@ -1,4332 +0,0 @@ - .include "asm/macros.inc" - - .include "constants/constants.inc" - - .syntax unified - - .text - - thumb_func_start sub_080732D0 -sub_080732D0: @ 0x080732D0 - push {r4, lr} - adds r4, r0, #0 - bl UpdateAnimationSingleFrame - adds r0, r4, #0 - bl sub_080002B8 - cmp r0, #0x28 - beq _080732EE - movs r0, #0 - strb r0, [r4, #0x15] - adds r0, r4, #0 - bl sub_0806F69C - b _08073328 -_080732EE: - ldrb r0, [r4, #0xd] - adds r0, #1 - movs r1, #0 - strb r0, [r4, #0xd] - strh r1, [r4, #0x30] - adds r0, r4, #0 - movs r1, #0x70 - movs r2, #1 - movs r3, #0 - bl CreateObjectWithParent - ldr r0, _08073318 @ =gPlayerState - adds r0, #0x39 - ldrb r0, [r0] - cmp r0, #7 - bne _08073320 - ldr r0, _0807331C @ =0x00000187 - bl SoundReq - b _08073328 - .align 2, 0 -_08073318: .4byte gPlayerState -_0807331C: .4byte 0x00000187 -_08073320: - movs r0, #0xc4 - lsls r0, r0, #1 - bl SoundReq -_08073328: - pop {r4, pc} - .align 2, 0 - - thumb_func_start sub_0807332C -sub_0807332C: @ 0x0807332C - push {r4, lr} - adds r4, r0, #0 - bl UpdateAnimationSingleFrame - ldr r0, _08073344 @ =gPlayerState - adds r0, #0x39 - ldrb r0, [r0] - cmp r0, #7 - bne _08073348 - movs r0, #0 - b _0807334A - .align 2, 0 -_08073344: .4byte gPlayerState -_08073348: - movs r0, #0x1c -_0807334A: - strb r0, [r4, #0x15] - ldrh r1, [r4, #0x2e] - movs r0, #0xf - ands r0, r1 - cmp r0, #0xf - beq _08073386 - ldr r0, _08073368 @ =gPlayerState - adds r0, #0x39 - ldrb r0, [r0] - cmp r0, #7 - bne _0807336C - movs r0, #2 - strb r0, [r4, #0x14] - movs r0, #4 - b _0807337C - .align 2, 0 -_08073368: .4byte gPlayerState -_0807336C: - movs r0, #6 - strb r0, [r4, #0x14] - ldrb r0, [r4, #0x15] - cmp r0, #0x18 - bls _0807337E - subs r0, #1 - movs r1, #0x1f - ands r0, r1 -_0807337C: - strb r0, [r4, #0x15] -_0807337E: - adds r0, r4, #0 - bl sub_0806F69C - b _080733B6 -_08073386: - ldr r0, _0807339C @ =gPlayerState - adds r0, #0x38 - ldrb r0, [r0] - cmp r0, #0 - beq _080733A4 - ldr r0, _080733A0 @ =gRoomControls - str r4, [r0, #0x30] - bl sub_080791BC - b _080733B6 - .align 2, 0 -_0807339C: .4byte gPlayerState -_080733A0: .4byte gRoomControls -_080733A4: - ldr r0, _080733B8 @ =gMain - movs r1, #3 - strb r1, [r0, #4] - movs r1, #1 - strb r1, [r0, #0xb] - movs r0, #5 - movs r1, #8 - bl DoFade -_080733B6: - pop {r4, pc} - .align 2, 0 -_080733B8: .4byte gMain - - thumb_func_start sub_080733BC -sub_080733BC: @ 0x080733BC - push {r4, lr} - adds r4, r0, #0 - bl UpdateAnimationSingleFrame - ldrh r1, [r4, #0x2e] - movs r0, #0xf - ands r0, r1 - cmp r0, #8 - bne _080733FC - movs r0, #0x10 - strb r0, [r4, #0x15] - movs r0, #4 - strb r0, [r4, #0x14] - ldr r0, [r4, #0x54] - cmp r0, #0 - beq _080733FC - bl DeleteEntity - movs r0, #0 - str r0, [r4, #0x54] - adds r0, r4, #0 - adds r0, #0x38 - ldrb r0, [r0] - cmp r0, #1 - bne _080733F6 - adds r0, r4, #0 - bl sub_0807AABC - b _080733FC -_080733F6: - adds r0, r4, #0 - bl sub_0807AA80 -_080733FC: - adds r0, r4, #0 - bl sub_0806F69C - adds r0, r4, #0 - adds r0, #0x7e - ldrh r1, [r0] - movs r2, #0x32 - ldrsh r0, [r4, r2] - cmp r1, r0 - bne _08073418 - ldr r0, _0807341C @ =gRoomControls - str r4, [r0, #0x30] - bl sub_0807921C -_08073418: - pop {r4, pc} - .align 2, 0 -_0807341C: .4byte gRoomControls - - thumb_func_start PlayerParachute -PlayerParachute: @ 0x08073420 - push {r4, lr} - adds r4, r0, #0 - bl sub_08078EFC - cmp r0, #0 - bne _0807345E - bl UpdateFloorType - ldrb r2, [r4, #0x1b] - movs r1, #0x3f - adds r0, r1, #0 - ands r0, r2 - movs r2, #0x40 - orrs r0, r2 - strb r0, [r4, #0x1b] - ldrb r0, [r4, #0x19] - ands r1, r0 - orrs r1, r2 - strb r1, [r4, #0x19] - ldr r0, _08073460 @ =gPlayerState - adds r0, #0xa8 - movs r1, #8 - strb r1, [r0] - ldr r1, _08073464 @ =gUnk_0811BC08 - ldrb r0, [r4, #0xd] - lsls r0, r0, #2 - adds r0, r0, r1 - ldr r1, [r0] - adds r0, r4, #0 - bl _call_via_r1 -_0807345E: - pop {r4, pc} - .align 2, 0 -_08073460: .4byte gPlayerState -_08073464: .4byte gUnk_0811BC08 - - thumb_func_start sub_08073468 -sub_08073468: @ 0x08073468 - push {r4, r5, lr} - adds r4, r0, #0 - ldr r5, _080734CC @ =gPlayerState - movs r1, #0 - movs r0, #0xe0 - lsls r0, r0, #3 - strh r0, [r5, #8] - strb r1, [r5, #2] - ldr r0, _080734D0 @ =0xFFFF0000 - str r0, [r4, #0x20] - ldrb r0, [r4, #0xd] - adds r0, #1 - strb r0, [r4, #0xd] - movs r0, #0xf0 - lsls r0, r0, #1 - str r0, [r4, #0x7c] - ldrb r0, [r4, #0x14] - lsls r0, r0, #2 - strb r0, [r4, #0x15] - ldr r1, [r5, #0x30] - movs r2, #0x80 - lsls r2, r2, #0x11 - adds r0, r1, #0 - ands r0, r2 - cmp r0, #0 - bne _080734AC - orrs r1, r2 - str r1, [r5, #0x30] - adds r0, r4, #0 - movs r1, #0x61 - movs r2, #0 - movs r3, #0 - bl CreateObjectWithParent -_080734AC: - bl ResetPlayer - ldr r0, [r4, #0x20] - cmp r0, #0 - bgt _080734C0 - adds r0, r5, #0 - adds r0, #0x38 - ldrb r0, [r0] - cmp r0, #1 - bne _080734C8 -_080734C0: - ldrb r1, [r4, #0x10] - movs r0, #0x7f - ands r0, r1 - strb r0, [r4, #0x10] -_080734C8: - pop {r4, r5, pc} - .align 2, 0 -_080734CC: .4byte gPlayerState -_080734D0: .4byte 0xFFFF0000 - - thumb_func_start sub_080734D4 -sub_080734D4: @ 0x080734D4 - push {r4, lr} - adds r4, r0, #0 - ldr r1, _080734FC @ =0xFFFFF000 - bl GravityUpdate - ldr r0, [r4, #0x20] - cmp r0, #0 - bgt _080734EE - ldr r0, _08073500 @ =gPlayerState - adds r0, #0x38 - ldrb r0, [r0] - cmp r0, #1 - bne _080734FA -_080734EE: - movs r0, #0x92 - lsls r0, r0, #0xb - str r0, [r4, #0x20] - ldrb r0, [r4, #0xd] - adds r0, #1 - strb r0, [r4, #0xd] -_080734FA: - pop {r4, pc} - .align 2, 0 -_080734FC: .4byte 0xFFFFF000 -_08073500: .4byte gPlayerState - - thumb_func_start sub_08073504 -sub_08073504: @ 0x08073504 - push {r4, lr} - adds r4, r0, #0 - ldr r0, [r4, #0x20] - movs r1, #0x80 - lsls r1, r1, #7 - cmp r0, #0 - bge _08073516 - movs r1, #0x80 - lsls r1, r1, #4 -_08073516: - adds r0, r4, #0 - bl GravityUpdate - ldr r0, [r4, #0x20] - cmp r0, #0 - bge _08073576 - movs r0, #0x36 - ldrsh r1, [r4, r0] - movs r0, #0x20 - rsbs r0, r0, #0 - cmp r1, r0 - ble _08073576 - ldrb r0, [r4, #0xd] - adds r0, #1 - movs r2, #0 - strb r0, [r4, #0xd] - adds r1, r4, #0 - adds r1, #0x80 - ldrb r0, [r4, #0x15] - lsls r0, r0, #8 - str r0, [r1] - adds r0, r4, #0 - adds r0, #0x87 - strb r2, [r0] - subs r0, #1 - strb r2, [r0] - ldr r0, _08073580 @ =gPlayerState - movs r1, #0xe1 - lsls r1, r1, #3 - strh r1, [r0, #8] - adds r0, #0x38 - ldrb r0, [r0] - cmp r0, #1 - bne _08073576 - ldrb r1, [r4, #0x10] - movs r0, #0x7f - ands r0, r1 - strb r0, [r4, #0x10] - movs r0, #6 - strb r0, [r4, #0xd] - movs r0, #0x10 - strh r0, [r4, #0x24] - movs r0, #0x1e - strb r0, [r4, #0xe] - movs r0, #0xa9 - lsls r0, r0, #1 - bl SoundReq -_08073576: - adds r0, r4, #0 - bl UpdateAnimationSingleFrame - pop {r4, pc} - .align 2, 0 -_08073580: .4byte gPlayerState - - thumb_func_start sub_08073584 -sub_08073584: @ 0x08073584 - push {r4, r5, r6, lr} - adds r4, r0, #0 - ldr r2, _080735DC @ =gPlayerState - adds r0, r2, #0 - adds r0, #0x92 - ldrh r1, [r0] - movs r5, #0x80 - adds r0, r5, #0 - ands r0, r1 - adds r6, r2, #0 - cmp r0, #0 - bne _080735C0 - adds r0, r4, #0 - adds r0, #0x3d - ldrb r0, [r0] - lsls r0, r0, #0x18 - asrs r0, r0, #0x18 - cmp r0, #0 - bgt _080735C0 - adds r0, r6, #0 - adds r0, #0x3c - ldrb r0, [r0] - cmp r0, #0 - bne _080735C0 - ldr r0, [r6, #0x30] - movs r1, #0x80 - lsls r1, r1, #0x11 - ands r0, r1 - cmp r0, #0 - bne _080735E0 -_080735C0: - ldrb r0, [r6, #2] - movs r1, #0x40 - orrs r1, r0 - strb r1, [r6, #2] - bl sub_0807921C - adds r0, r4, #0 - bl sub_08073904 - movs r0, #0xe6 - lsls r0, r0, #3 - strh r0, [r6, #8] - b _08073794 - .align 2, 0 -_080735DC: .4byte gPlayerState -_080735E0: - ldr r0, _0807360C @ =gUnk_0200AF00 - adds r0, #0x2f - movs r1, #1 - strb r1, [r0] - movs r0, #0 - bl sub_0807A2F8 - cmp r0, #0 - beq _08073610 - ldrb r0, [r4, #0xd] - adds r0, #1 - strb r0, [r4, #0xd] - ldrb r1, [r4, #0x14] - movs r0, #6 - ands r0, r1 - lsls r0, r0, #2 - strb r0, [r4, #0x15] - ldrb r1, [r4, #0x10] - movs r0, #0x7f - ands r0, r1 - strb r0, [r4, #0x10] - b _08073794 - .align 2, 0 -_0807360C: .4byte gUnk_0200AF00 -_08073610: - ldr r0, _08073620 @ =gArea - ldrb r0, [r0, #1] - cmp r0, #0x10 - bne _08073624 - movs r0, #0x80 - lsls r0, r0, #1 - strh r0, [r4, #0x24] - b _08073626 - .align 2, 0 -_08073620: .4byte gArea -_08073624: - strh r5, [r4, #0x24] -_08073626: - ldr r3, _08073650 @ =gPlayerState - ldrb r1, [r3, #0xd] - movs r0, #0x80 - ands r0, r1 - adds r2, r4, #0 - adds r2, #0x80 - cmp r0, #0 - bne _0807365A - ldrb r0, [r4, #0x15] - cmp r0, r1 - beq _0807365A - ldrb r1, [r3, #0xd] - subs r0, r0, r1 - movs r1, #0x1f - ands r0, r1 - cmp r0, #0xf - bgt _08073654 - ldr r0, [r2] - subs r0, #0x20 - b _08073658 - .align 2, 0 -_08073650: .4byte gPlayerState -_08073654: - ldr r0, [r2] - adds r0, #0x20 -_08073658: - str r0, [r2] -_0807365A: - ldr r0, [r2] - lsrs r0, r0, #8 - movs r1, #0x1f - ands r0, r1 - strb r0, [r4, #0x15] - bl sub_08079E08 - ldrb r2, [r4, #0x14] - lsls r3, r2, #2 - ldrb r1, [r4, #0x15] - cmp r2, #0 - bne _0807367C - adds r3, #8 - movs r0, #0x1f - ands r3, r0 - adds r1, #8 - ands r1, r0 -_0807367C: - subs r0, r3, #7 - cmp r0, r1 - bls _08073686 - subs r3, r2, #2 - b _0807368E -_08073686: - adds r0, r3, #7 - cmp r0, r1 - bhs _08073694 - adds r3, r2, #2 -_0807368E: - movs r0, #7 - ands r3, r0 - b _08073696 -_08073694: - adds r3, r2, #0 -_08073696: - movs r0, #0x87 - adds r0, r0, r4 - mov ip, r0 - ldrb r1, [r4, #0x14] - cmp r3, r1 - beq _080736A8 - movs r0, #0x14 - mov r2, ip - strb r0, [r2] -_080736A8: - strb r3, [r4, #0x14] - movs r5, #0 - ldr r1, _080736E4 @ =gPlayerState - ldrb r2, [r1, #0xd] - lsrs r3, r2, #2 - mov r6, ip - ldrb r0, [r6] - adds r6, r1, #0 - cmp r0, #0 - beq _080736CA - movs r0, #0x80 - ands r0, r2 - cmp r0, #0 - bne _08073736 - ldrb r0, [r4, #0x14] - cmp r0, r3 - beq _08073736 -_080736CA: - movs r0, #0x80 - ands r0, r2 - cmp r0, #0 - bne _080736FA - ldrb r2, [r4, #0x14] - cmp r2, r3 - beq _080736FA - movs r0, #4 - eors r0, r3 - cmp r2, r0 - bne _080736E8 - movs r5, #2 - b _080736FA - .align 2, 0 -_080736E4: .4byte gPlayerState -_080736E8: - movs r0, #6 - ands r0, r3 - adds r0, #2 - movs r1, #7 - ands r0, r1 - movs r5, #3 - cmp r2, r0 - bne _080736FA - movs r5, #1 -_080736FA: - ldr r1, _0807371C @ =gUnk_0811BC28 - lsls r0, r5, #1 - adds r0, r0, r1 - ldrh r0, [r0] - ldrh r1, [r6, #8] - cmp r0, r1 - bne _0807372C - ldr r0, _08073720 @ =gArea - ldrb r0, [r0, #1] - cmp r0, #0x10 - bne _08073724 - adds r0, r4, #0 - movs r1, #2 - bl sub_080042BA - b _0807372E - .align 2, 0 -_0807371C: .4byte gUnk_0811BC28 -_08073720: .4byte gArea -_08073724: - adds r0, r4, #0 - bl UpdateAnimationSingleFrame - b _0807372E -_0807372C: - strh r0, [r6, #8] -_0807372E: - adds r0, r4, #0 - adds r0, #0x86 - strb r5, [r0] - b _08073762 -_08073736: - mov r2, ip - ldrb r0, [r2] - subs r0, #1 - strb r0, [r2] - ldr r1, _0807375C @ =gUnk_0811BC30 - adds r0, r4, #0 - adds r0, #0x86 - ldrb r0, [r0] - lsls r0, r0, #1 - adds r0, r0, r1 - ldrh r0, [r0] - ldrh r1, [r6, #8] - cmp r0, r1 - bne _08073760 - adds r0, r4, #0 - bl UpdateAnimationSingleFrame - b _08073762 - .align 2, 0 -_0807375C: .4byte gUnk_0811BC30 -_08073760: - strh r0, [r6, #8] -_08073762: - ldr r0, [r4, #0x7c] - subs r1, r0, #1 - str r1, [r4, #0x7c] - movs r0, #1 - rsbs r0, r0, #0 - cmp r1, r0 - bne _08073784 - ldr r2, _08073780 @ =gPlayerState - ldrb r1, [r2, #2] - movs r0, #0x40 - orrs r0, r1 - strb r0, [r2, #2] - bl sub_0807921C - b _08073794 - .align 2, 0 -_08073780: .4byte gPlayerState -_08073784: - adds r0, r1, #0 - movs r1, #0x14 - bl __divsi3 - ldr r2, _08073798 @ =0x0000FFF8 - adds r1, r2, #0 - subs r1, r1, r0 - strh r1, [r4, #0x36] -_08073794: - pop {r4, r5, r6, pc} - .align 2, 0 -_08073798: .4byte 0x0000FFF8 - - thumb_func_start sub_0807379C -sub_0807379C: @ 0x0807379C - push {lr} - adds r2, r0, #0 - ldrh r3, [r2, #0x36] - movs r0, #0x36 - ldrsh r1, [r2, r0] - movs r0, #0x20 - rsbs r0, r0, #0 - cmp r1, r0 - ble _080737B4 - subs r0, r3, #1 - strh r0, [r2, #0x36] - b _080737BA -_080737B4: - ldrb r0, [r2, #0xd] - adds r0, #1 - strb r0, [r2, #0xd] -_080737BA: - pop {pc} - - thumb_func_start sub_080737BC -sub_080737BC: @ 0x080737BC - push {r4, lr} - adds r4, r0, #0 - bl UpdateAnimationSingleFrame - adds r0, r4, #0 - bl sub_0806F69C - ldr r0, [r4, #0x34] - movs r1, #0x98 - lsls r1, r1, #7 - adds r0, r0, r1 - str r0, [r4, #0x34] - ldrb r1, [r4, #0x15] - movs r0, #8 - ands r0, r1 - cmp r0, #0 - beq _080737E2 - ldrh r1, [r4, #0x2e] - b _080737E4 -_080737E2: - ldrh r1, [r4, #0x32] -_080737E4: - movs r0, #0xf - ands r0, r1 - cmp r0, #8 - bne _08073804 - adds r0, r4, #0 - bl sub_080002D0 - cmp r0, #0 - bne _08073804 - ldr r2, _08073808 @ =gPlayerState - ldrb r1, [r2, #2] - movs r0, #0x40 - orrs r0, r1 - strb r0, [r2, #2] - bl sub_0807921C -_08073804: - pop {r4, pc} - .align 2, 0 -_08073808: .4byte gPlayerState - - thumb_func_start sub_0807380C -sub_0807380C: @ 0x0807380C - push {r4, lr} - adds r4, r0, #0 - ldr r0, _08073854 @ =gScreenTransition - ldr r0, [r0] - movs r1, #3 - ands r0, r1 - cmp r0, #0 - bne _0807382A - ldrb r0, [r4, #0x14] - adds r0, #2 - movs r1, #6 - ands r0, r1 - strb r0, [r4, #0x14] - lsls r0, r0, #2 - strb r0, [r4, #0x15] -_0807382A: - ldr r2, _08073858 @ =gPlayerState - ldr r1, _0807385C @ =gUnk_0811BC38 - ldrb r0, [r4, #0x14] - lsrs r0, r0, #1 - lsls r0, r0, #1 - adds r0, r0, r1 - ldrh r0, [r0] - strh r0, [r2, #8] - movs r0, #0x36 - ldrsh r1, [r4, r0] - movs r0, #0x10 - rsbs r0, r0, #0 - cmp r1, r0 - bge _08073860 - movs r1, #0x80 - lsls r1, r1, #2 - adds r0, r4, #0 - bl GravityUpdate - b _0807387A - .align 2, 0 -_08073854: .4byte gScreenTransition -_08073858: .4byte gPlayerState -_0807385C: .4byte gUnk_0811BC38 -_08073860: - ldrb r0, [r4, #0xe] - subs r0, #1 - strb r0, [r4, #0xe] - lsls r0, r0, #0x18 - cmp r0, #0 - bne _0807387A - movs r0, #7 - strb r0, [r4, #0xd] - movs r0, #0x3c - strb r0, [r4, #0xe] - movs r0, #0x80 - lsls r0, r0, #0xa - str r0, [r4, #0x20] -_0807387A: - adds r0, r4, #0 - bl UpdateAnimationSingleFrame - pop {r4, pc} - .align 2, 0 - - thumb_func_start sub_08073884 -sub_08073884: @ 0x08073884 - push {r4, lr} - adds r4, r0, #0 - ldr r0, _080738DC @ =gScreenTransition - ldr r0, [r0] - movs r1, #1 - ands r0, r1 - cmp r0, #0 - bne _080738A2 - ldrb r0, [r4, #0x14] - adds r0, #2 - movs r1, #6 - ands r0, r1 - strb r0, [r4, #0x14] - lsls r0, r0, #2 - strb r0, [r4, #0x15] -_080738A2: - ldr r2, _080738E0 @ =gPlayerState - ldr r1, _080738E4 @ =gUnk_0811BC40 - ldrb r0, [r4, #0x14] - lsrs r0, r0, #1 - lsls r0, r0, #1 - adds r0, r0, r1 - ldrh r0, [r0] - strh r0, [r2, #8] - ldrb r0, [r4, #0xe] - subs r0, #1 - strb r0, [r4, #0xe] - lsls r0, r0, #0x18 - cmp r0, #0 - bne _080738F0 - adds r1, r2, #0 - adds r1, #0x39 - ldrb r0, [r1] - cmp r0, #0xff - beq _080738EC - adds r1, r0, #0 - lsls r0, r1, #2 - adds r0, r0, r1 - lsls r0, r0, #2 - ldr r1, _080738E8 @ =gUnk_0813AD88 - adds r0, r0, r1 - bl DoExitTransition - b _080738F0 - .align 2, 0 -_080738DC: .4byte gScreenTransition -_080738E0: .4byte gPlayerState -_080738E4: .4byte gUnk_0811BC40 -_080738E8: .4byte gUnk_0813AD88 -_080738EC: - bl InitParachuteRoom -_080738F0: - ldr r1, _08073900 @ =0xFFFFE800 - adds r0, r4, #0 - bl GravityUpdate - adds r0, r4, #0 - bl UpdateAnimationSingleFrame - pop {r4, pc} - .align 2, 0 -_08073900: .4byte 0xFFFFE800 - - thumb_func_start sub_08073904 -sub_08073904: @ 0x08073904 - push {lr} - ldr r3, _0807391C @ =gUnk_0811BC48 - ldr r1, _08073920 @ =gPlayerState - ldrb r2, [r1, #2] - movs r1, #7 - ands r1, r2 - lsls r1, r1, #2 - adds r1, r1, r3 - ldr r1, [r1] - bl _call_via_r1 - pop {pc} - .align 2, 0 -_0807391C: .4byte gUnk_0811BC48 -_08073920: .4byte gPlayerState - - thumb_func_start sub_08073924 -sub_08073924: @ 0x08073924 - push {r4, lr} - adds r4, r0, #0 - ldr r2, _08073964 @ =gPlayerState - ldr r0, [r2, #0x30] - movs r1, #0x80 - lsls r1, r1, #0xb - ands r0, r1 - cmp r0, #0 - bne _08073962 - movs r1, #0x36 - ldrsh r0, [r4, r1] - movs r1, #0x80 - lsls r1, r1, #8 - ands r0, r1 - cmp r0, #0 - beq _08073962 - ldrb r0, [r2, #0xa] - cmp r0, #0 - bne _08073962 - movs r0, #0x40 - strb r0, [r2, #2] - movs r0, #0xff - strb r0, [r2, #0xd] - movs r0, #1 - rsbs r0, r0, #0 - strb r0, [r4, #0x15] - bl sub_08077B20 - adds r0, r4, #0 - bl sub_08073968 -_08073962: - pop {r4, pc} - .align 2, 0 -_08073964: .4byte gPlayerState - - thumb_func_start sub_08073968 -sub_08073968: @ 0x08073968 - push {r4, r5, lr} - adds r5, r0, #0 - ldr r4, _08073998 @ =gPlayerState - ldrb r1, [r4, #2] - movs r0, #0xc0 - ands r0, r1 - cmp r0, #0 - bne _0807397C - ldrb r0, [r4, #0xd] - strb r0, [r5, #0x15] -_0807397C: - bl sub_08078F24 - ldrb r1, [r4, #5] - ldrb r0, [r4, #0xb] - orrs r0, r1 - cmp r0, #0 - bne _080739D4 - ldr r1, [r4, #0x30] - movs r0, #8 - ands r0, r1 - cmp r0, #0 - beq _080739A0 - ldr r0, _0807399C @ =0x0000041C - b _080739BA - .align 2, 0 -_08073998: .4byte gPlayerState -_0807399C: .4byte 0x0000041C -_080739A0: - movs r0, #0x80 - ands r0, r1 - cmp r0, #0 - bne _080739BC - movs r0, #0x80 - lsls r0, r0, #0x13 - ands r1, r0 - cmp r1, #0 - beq _080739B8 - movs r0, #0x81 - lsls r0, r0, #4 - b _080739BA -_080739B8: - ldr r0, _080739E4 @ =0x0000080C -_080739BA: - strh r0, [r4, #8] -_080739BC: - ldr r0, _080739E8 @ =gPlayerState - ldrb r1, [r0, #2] - movs r0, #0xc0 - ands r0, r1 - cmp r0, #0 - bne _080739CE - adds r0, r5, #0 - bl sub_0806F948 -_080739CE: - movs r0, #0x7c - bl SoundReq -_080739D4: - ldr r2, _080739E8 @ =gPlayerState - ldrb r1, [r2, #2] - movs r0, #0xf8 - ands r0, r1 - movs r1, #2 - orrs r0, r1 - strb r0, [r2, #2] - pop {r4, r5, pc} - .align 2, 0 -_080739E4: .4byte 0x0000080C -_080739E8: .4byte gPlayerState - - thumb_func_start sub_080739EC -sub_080739EC: @ 0x080739EC - push {r4, r5, lr} - adds r4, r0, #0 - ldr r1, _08073A14 @ =gPlayerState - ldrb r2, [r1, #2] - movs r0, #0xc0 - ands r0, r2 - adds r5, r1, #0 - cmp r0, #0 - beq _08073A18 - ldrb r0, [r4, #0x15] - strb r0, [r5, #0xd] - movs r0, #0x80 - ands r0, r2 - cmp r0, #0 - beq _08073A0E - movs r0, #0 - strh r0, [r4, #0x2a] -_08073A0E: - movs r2, #0x80 - lsls r2, r2, #6 - b _08073A48 - .align 2, 0 -_08073A14: .4byte gPlayerState -_08073A18: - movs r2, #0xc - rsbs r2, r2, #0 - adds r0, r4, #0 - movs r1, #0 - bl sub_0806F854 - lsls r0, r0, #0x10 - cmp r0, #0 - beq _08073A38 - ldrb r1, [r5, #2] - movs r0, #8 - orrs r0, r1 - strb r0, [r5, #2] - movs r2, #0x80 - lsls r2, r2, #7 - b _08073A48 -_08073A38: - movs r2, #0x80 - lsls r2, r2, #6 - ldrb r1, [r5, #2] - movs r0, #0x10 - ands r0, r1 - cmp r0, #0 - beq _08073A48 - lsrs r2, r2, #1 -_08073A48: - ldrb r1, [r5, #2] - movs r0, #0xc0 - ands r0, r1 - cmp r0, #0 - bne _08073A7E - movs r0, #0x20 - ands r0, r1 - cmp r0, #0 - beq _08073A7E - ldr r0, [r4, #0x20] - cmp r0, #0 - bne _08073A7E - movs r0, #0xa0 - lsls r0, r0, #0xa - str r0, [r4, #0x20] - movs r0, #0xa - strb r0, [r4, #0xe] - movs r0, #0xff - strb r0, [r4, #0x15] - adds r0, r1, #2 - strb r0, [r5, #2] - movs r0, #0xba - lsls r0, r0, #1 - strh r0, [r5, #8] - bl sub_08078F60 - b _08073A90 -_08073A7E: - adds r0, r4, #0 - adds r1, r2, #0 - bl GravityUpdate - cmp r0, #0 - bne _08073A90 - adds r0, r4, #0 - bl sub_08073AD4 -_08073A90: - pop {r4, r5, pc} - .align 2, 0 - - thumb_func_start sub_08073A94 -sub_08073A94: @ 0x08073A94 - push {r4, lr} - adds r4, r0, #0 - adds r0, #0x5a - ldrb r1, [r0] - movs r0, #0x80 - ands r0, r1 - cmp r0, #0 - bne _08073AAE - adds r0, r4, #0 - adds r0, #0x42 - ldrb r0, [r0] - cmp r0, #0 - beq _08073AB4 -_08073AAE: - adds r0, r4, #0 - bl sub_08073B60 -_08073AB4: - ldr r0, _08073ACC @ =gPlayerEntity - ldr r0, [r0, #0x34] - cmp r0, #0 - beq _08073AC8 - ldr r1, _08073AD0 @ =gPlayerState - movs r0, #0 - strb r0, [r1, #2] - adds r0, r4, #0 - bl sub_08073924 -_08073AC8: - pop {r4, pc} - .align 2, 0 -_08073ACC: .4byte gPlayerEntity -_08073AD0: .4byte gPlayerState - - thumb_func_start sub_08073AD4 -sub_08073AD4: @ 0x08073AD4 - push {r4, r5, r6, lr} - adds r4, r0, #0 - adds r0, #0x38 - ldrb r1, [r0] - movs r0, #2 - ands r0, r1 - cmp r0, #0 - bne _08073AFA - ldrb r2, [r4, #0x1b] - movs r1, #0x3f - adds r0, r1, #0 - ands r0, r2 - movs r2, #0x80 - orrs r0, r2 - strb r0, [r4, #0x1b] - ldrb r0, [r4, #0x19] - ands r1, r0 - orrs r1, r2 - strb r1, [r4, #0x19] -_08073AFA: - ldr r6, _08073B48 @ =gPlayerState - ldrb r5, [r6, #2] - movs r0, #0xc1 - rsbs r0, r0, #0 - ands r5, r0 - ldrb r0, [r4, #0xc] - cmp r0, #0xa - beq _08073B32 - bl sub_0807A2B8 - movs r0, #0 - strb r0, [r6, #2] - bl UpdateFloorType - ldrb r0, [r6, #0xc] - cmp r0, #0 - bne _08073B5C - adds r0, r6, #0 - adds r0, #0x26 - ldrb r0, [r0] - cmp r0, #0 - bne _08073B5C - ldrb r0, [r6, #4] - cmp r0, #0 - beq _08073B32 - adds r0, r4, #0 - bl sub_08073B60 -_08073B32: - ldr r2, _08073B48 @ =gPlayerState - adds r0, r5, #1 - strb r0, [r2, #2] - ldr r0, [r2, #0x30] - movs r1, #8 - ands r0, r1 - cmp r0, #0 - beq _08073B50 - ldr r0, _08073B4C @ =0x00000424 - b _08073B54 - .align 2, 0 -_08073B48: .4byte gPlayerState -_08073B4C: .4byte 0x00000424 -_08073B50: - movs r0, #0x82 - lsls r0, r0, #4 -_08073B54: - strh r0, [r2, #8] - movs r0, #0x7d - bl SoundReq -_08073B5C: - pop {r4, r5, r6, pc} - .align 2, 0 - - thumb_func_start sub_08073B60 -sub_08073B60: @ 0x08073B60 - push {r4, r5, lr} - adds r5, r0, #0 - ldr r4, _08073B88 @ =gPlayerState - movs r0, #0 - strb r0, [r4, #0x1b] - strb r0, [r4, #4] - strb r0, [r4, #2] - bl sub_08079938 - adds r0, r5, #0 - bl sub_080085B0 - ldr r0, [r4, #0x30] - movs r1, #0x20 - ands r0, r1 - cmp r0, #0 - bne _08073B86 - bl sub_080791BC -_08073B86: - pop {r4, r5, pc} - .align 2, 0 -_08073B88: .4byte gPlayerState - - thumb_func_start sub_08073B8C -sub_08073B8C: @ 0x08073B8C - push {r4, r5, lr} - adds r4, r0, #0 - ldr r5, _08073BCC @ =gPlayerState - ldrb r0, [r5, #4] - cmp r0, #0 - beq _08073C04 - movs r2, #0xc - rsbs r2, r2, #0 - adds r0, r4, #0 - movs r1, #0 - bl sub_0806F854 - adds r0, r4, #0 - adds r0, #0x5a - ldrb r1, [r0] - movs r0, #1 - ands r0, r1 - cmp r0, #0 - bne _08073BB8 - adds r0, r4, #0 - bl UpdateAnimationSingleFrame -_08073BB8: - ldrb r1, [r4, #0x10] - movs r0, #0x7f - ands r0, r1 - strb r0, [r4, #0x10] - ldrb r0, [r4, #0xe] - cmp r0, #0 - beq _08073BD0 - subs r0, #1 - strb r0, [r4, #0xe] - b _08073C28 - .align 2, 0 -_08073BCC: .4byte gPlayerState -_08073BD0: - movs r1, #0x80 - lsls r1, r1, #7 - adds r0, r4, #0 - bl GravityUpdate - movs r0, #0x36 - ldrsh r1, [r4, r0] - movs r0, #8 - rsbs r0, r0, #0 - cmp r1, r0 - blt _08073C28 - ldrb r0, [r5, #0x14] - cmp r0, #0 - bne _08073C0C - bl sub_0807A2B8 - cmp r0, #0 - bne _08073BFC - bl sub_08079D48 - cmp r0, #0 - bne _08073C0C -_08073BFC: - ldrb r0, [r4, #0x10] - movs r1, #0x80 - orrs r0, r1 - strb r0, [r4, #0x10] -_08073C04: - adds r0, r4, #0 - bl sub_08073B60 - b _08073C28 -_08073C0C: - ldr r1, _08073C2C @ =gPlayerState - ldrb r0, [r1, #2] - adds r0, #1 - strb r0, [r1, #2] - movs r0, #0xf - strb r0, [r4, #0xe] - movs r0, #0x10 - movs r1, #0 - bl sub_08080964 - movs r0, #0xa6 - lsls r0, r0, #1 - bl SoundReq -_08073C28: - pop {r4, r5, pc} - .align 2, 0 -_08073C2C: .4byte gPlayerState - - thumb_func_start sub_08073C30 -sub_08073C30: @ 0x08073C30 - push {lr} - adds r2, r0, #0 - ldr r0, _08073C54 @ =gPlayerState - ldrb r0, [r0, #4] - cmp r0, #0 - beq _08073C4A - ldrb r0, [r2, #0xe] - subs r0, #1 - strb r0, [r2, #0xe] - lsls r0, r0, #0x18 - lsrs r0, r0, #0x18 - cmp r0, #0xff - bne _08073C58 -_08073C4A: - adds r0, r2, #0 - bl sub_08073B60 - b _08073C66 - .align 2, 0 -_08073C54: .4byte gPlayerState -_08073C58: - ldrb r0, [r2, #0x10] - movs r1, #0x80 - orrs r0, r1 - strb r0, [r2, #0x10] - adds r0, r2, #0 - bl UpdateAnimationSingleFrame -_08073C66: - pop {pc} - - thumb_func_start PlayerMinish -PlayerMinish: @ 0x08073C68 - push {lr} - ldr r2, _08073C7C @ =gUnk_0811BC60 - ldrb r1, [r0, #0xd] - lsls r1, r1, #2 - adds r1, r1, r2 - ldr r1, [r1] - bl _call_via_r1 - pop {pc} - .align 2, 0 -_08073C7C: .4byte gUnk_0811BC60 - - thumb_func_start sub_08073C80 -sub_08073C80: @ 0x08073C80 - push {r4, r5, r6, r7, lr} - adds r4, r0, #0 - ldr r2, _08073D00 @ =gPlayerState - ldr r0, [r2, #0x30] - movs r1, #0x80 - orrs r0, r1 - str r0, [r2, #0x30] - movs r5, #0 - ldr r0, _08073D04 @ =0x00000C18 - strh r0, [r2, #8] - ldrb r0, [r4, #0x18] - movs r1, #3 - orrs r0, r1 - strb r0, [r4, #0x18] - adds r2, r4, #0 - adds r2, #0x29 - ldrb r1, [r2] - movs r0, #0x39 - rsbs r0, r0, #0 - ands r0, r1 - movs r1, #0x18 - orrs r0, r1 - strb r0, [r2] - ldrb r1, [r4, #0x18] - movs r0, #0x31 - rsbs r0, r0, #0 - ands r0, r1 - strb r0, [r4, #0x18] - ldrb r1, [r4, #0x19] - movs r7, #4 - rsbs r7, r7, #0 - adds r0, r7, #0 - ands r0, r1 - strb r0, [r4, #0x19] - ldr r0, _08073D08 @ =gUnk_0811BC80 - str r0, [r4, #0x48] - strb r5, [r4, #0xe] - movs r6, #2 - strb r6, [r4, #0xf] - adds r0, r4, #0 - adds r0, #0x42 - strb r5, [r0] - movs r0, #1 - strb r0, [r4, #0xd] - adds r0, r4, #0 - movs r1, #1 - movs r2, #2 - bl LoadSwapGFX - ldr r0, _08073D0C @ =gRoomControls - str r4, [r0, #0x30] - bl sub_080809D4 - ldr r1, _08073D10 @ =gScreenTransition - ldrb r0, [r1, #0xf] - cmp r0, #9 - bne _08073D14 - strb r5, [r1, #0xf] - ldrb r1, [r4, #0x18] - adds r0, r7, #0 - ands r0, r1 - strb r0, [r4, #0x18] - strb r6, [r4, #0xd] - b _08073D1E - .align 2, 0 -_08073D00: .4byte gPlayerState -_08073D04: .4byte 0x00000C18 -_08073D08: .4byte gUnk_0811BC80 -_08073D0C: .4byte gRoomControls -_08073D10: .4byte gScreenTransition -_08073D14: - movs r0, #4 - movs r1, #0 - movs r2, #0 - bl CreateObject -_08073D1E: - pop {r4, r5, r6, r7, pc} - - thumb_func_start sub_08073D20 -sub_08073D20: @ 0x08073D20 - push {r4, r5, r6, r7, lr} - mov r7, r8 - push {r7} - adds r4, r0, #0 - ldr r5, _08073D70 @ =gPlayerState - movs r0, #0xa8 - adds r0, r0, r5 - mov r8, r0 - movs r0, #0 - mov r1, r8 - strb r0, [r1] - adds r2, r4, #0 - adds r2, #0x29 - ldrb r1, [r2] - subs r0, #0x39 - ands r0, r1 - movs r1, #0x18 - orrs r0, r1 - strb r0, [r2] - adds r1, r4, #0 - adds r1, #0x40 - movs r0, #1 - strb r0, [r1] - bl sub_08078F60 - adds r7, r5, #0 - adds r7, #0x26 - ldrb r0, [r7] - cmp r0, #0 - bne _08073D60 - movs r0, #0xc0 - strh r0, [r4, #0x24] -_08073D60: - bl sub_08079B24 - cmp r0, #0 - bne _08073D74 - adds r0, r4, #0 - bl sub_08079708 - b _08073EFC - .align 2, 0 -_08073D70: .4byte gPlayerState -_08073D74: - bl sub_08078EFC - adds r6, r0, #0 - cmp r6, #0 - beq _08073D80 - b _08073EFC -_08073D80: - adds r0, r4, #0 - bl sub_08073904 - bl UpdateFloorType - ldrb r0, [r5, #2] - cmp r0, #0 - beq _08073D96 - movs r0, #0x14 - mov r1, r8 - strb r0, [r1] -_08073D96: - ldrb r0, [r5, #0x12] - subs r0, #0x18 - lsls r0, r0, #0x18 - lsrs r0, r0, #0x18 - cmp r0, #1 - bls _08073DB0 - strb r6, [r7] - adds r2, r4, #0 - adds r2, #0x3c - ldrb r1, [r2] - movs r0, #0xfb - ands r0, r1 - strb r0, [r2] -_08073DB0: - bl sub_08078EFC - cmp r0, #0 - beq _08073DBA - b _08073EFC -_08073DBA: - ldrb r0, [r4, #0xd] - cmp r0, #2 - bne _08073DC2 - b _08073EFC -_08073DC2: - ldr r0, [r5, #0x30] - movs r1, #0x40 - ands r0, r1 - cmp r0, #0 - bne _08073E10 - adds r0, r4, #0 - bl sub_080085B0 - bl sub_080792D8 - ldrb r0, [r5, #0xa] - cmp r0, #0 - bne _08073DE6 - bl sub_08079550 - cmp r0, #0 - beq _08073DE6 - b _08073EFC -_08073DE6: - adds r0, r4, #0 - adds r0, #0x42 - ldrb r0, [r0] - cmp r0, #0 - beq _08073DFA - adds r0, r4, #0 - adds r0, #0x3e - ldrb r0, [r0] - strb r0, [r4, #0x15] - b _08073EFC -_08073DFA: - bl sub_080782C0 - cmp r0, #0 - beq _08073E08 - bl sub_08078EFC - b _08073EFC -_08073E08: - ldrb r0, [r4, #0x10] - movs r1, #0x80 - orrs r0, r1 - strb r0, [r4, #0x10] -_08073E10: - bl sub_08019840 - cmp r0, #0 - bne _08073EFC - adds r0, r4, #0 - bl sub_08077698 - movs r1, #0x80 - lsls r1, r1, #6 - adds r0, r4, #0 - bl GravityUpdate - adds r1, r0, #0 - cmp r1, #0 - bne _08073E32 - ldr r0, _08073E74 @ =gPlayerState - strb r1, [r0, #2] -_08073E32: - ldr r2, _08073E74 @ =gPlayerState - ldrb r1, [r2, #7] - movs r3, #0x80 - adds r0, r3, #0 - ands r0, r1 - cmp r0, #0 - bne _08073EFC - ldrb r0, [r2, #0xa] - cmp r0, #0 - bne _08073EFC - adds r0, r4, #0 - adds r0, #0x3d - movs r1, #0 - ldrsb r1, [r0, r1] - adds r6, r0, #0 - cmp r1, #8 - bgt _08073E90 - adds r0, r2, #0 - adds r0, #0x26 - ldrb r0, [r0] - cmp r0, #0 - beq _08073E78 - adds r1, r2, #0 - adds r1, #0xa8 - movs r0, #7 - strb r0, [r1] - adds r0, r4, #0 - bl sub_0807ACCC - bl sub_08079E08 - b _08073E90 - .align 2, 0 -_08073E74: .4byte gPlayerState -_08073E78: - ldrb r1, [r2, #0xd] - strb r1, [r4, #0x15] - adds r0, r3, #0 - ands r0, r1 - cmp r0, #0 - bne _08073E90 - adds r1, r2, #0 - adds r1, #0xa8 - movs r0, #1 - strb r0, [r1] - bl sub_08079E08 -_08073E90: - ldr r5, _08073EF0 @ =gPlayerState - ldrb r0, [r5, #0xb] - cmp r0, #0 - bne _08073E9E - adds r0, r4, #0 - bl sub_0806F948 -_08073E9E: - adds r0, r4, #0 - bl UpdateAnimationSingleFrame - adds r0, r4, #0 - bl sub_0807B068 - movs r0, #0x10 - bl sub_080793E4 - cmp r0, #0 - beq _08073EDC - movs r0, #0x14 - strb r0, [r6] - adds r1, r4, #0 - adds r1, #0x42 - movs r0, #4 - strb r0, [r1] - ldrb r0, [r4, #0x14] - lsls r0, r0, #2 - movs r1, #0x10 - eors r0, r1 - adds r1, r4, #0 - adds r1, #0x3e - strb r0, [r1] - movs r0, #2 - rsbs r0, r0, #0 - bl ModHealth - movs r0, #0x7a - bl SoundReq -_08073EDC: - ldr r0, [r5, #0x30] - movs r1, #0x40 - ands r0, r1 - cmp r0, #0 - bne _08073EF4 - adds r0, r4, #0 - bl sub_08008AC6 - b _08073EFC - .align 2, 0 -_08073EF0: .4byte gPlayerState -_08073EF4: - adds r1, r5, #0 - adds r1, #0xa8 - movs r0, #0xd - strb r0, [r1] -_08073EFC: - pop {r3} - mov r8, r3 - pop {r4, r5, r6, r7, pc} - .align 2, 0 - - thumb_func_start sub_08073F04 -sub_08073F04: @ 0x08073F04 - push {lr} - adds r3, r0, #0 - adds r3, #0x29 - ldrb r2, [r3] - movs r1, #0x39 - rsbs r1, r1, #0 - ands r1, r2 - movs r2, #0x10 - orrs r1, r2 - strb r1, [r3] - ldrb r2, [r0, #0x18] - movs r1, #4 - rsbs r1, r1, #0 - ands r1, r2 - strb r1, [r0, #0x18] - ldrb r1, [r0, #0xd] - adds r1, #1 - strb r1, [r0, #0xd] - movs r1, #0xa0 - lsls r1, r1, #0xa - str r1, [r0, #0x20] - movs r1, #0x80 - lsls r1, r1, #1 - strh r1, [r0, #0x24] - ldr r2, _08073F48 @ =gPlayerState - ldr r0, [r2, #0x30] - movs r1, #0x81 - rsbs r1, r1, #0 - ands r0, r1 - str r0, [r2, #0x30] - bl ResetPlayer - pop {pc} - .align 2, 0 -_08073F48: .4byte gPlayerState - - thumb_func_start sub_08073F4C -sub_08073F4C: @ 0x08073F4C - push {r4, r5, lr} - adds r4, r0, #0 - ldr r0, _08073F84 @ =gArea - ldrh r3, [r0, #0x12] - ldrh r5, [r0, #0x14] - movs r0, #0x2e - ldrsh r2, [r4, r0] - cmp r2, r3 - bne _08073F66 - movs r1, #0x32 - ldrsh r0, [r4, r1] - cmp r0, r5 - beq _08073F88 -_08073F66: - movs r0, #0x32 - ldrsh r1, [r4, r0] - adds r0, r2, #0 - adds r2, r3, #0 - adds r3, r5, #0 - bl sub_080045D4 - strb r0, [r4, #0x15] - movs r0, #0x80 - lsls r0, r0, #1 - strh r0, [r4, #0x24] - adds r0, r4, #0 - bl sub_0806F69C - b _08073FC6 - .align 2, 0 -_08073F84: .4byte gArea -_08073F88: - ldrb r1, [r4, #0x10] - movs r0, #0x7f - ands r0, r1 - strb r0, [r4, #0x10] - movs r0, #0x1e - strb r0, [r4, #0xe] - ldrb r0, [r4, #0xd] - adds r0, #1 - strb r0, [r4, #0xd] - ldrb r1, [r4, #0x18] - movs r0, #0x41 - rsbs r0, r0, #0 - ands r0, r1 - strb r0, [r4, #0x18] - adds r0, r4, #0 - adds r0, #0x80 - movs r1, #0x90 - lsls r1, r1, #3 - str r1, [r0] - adds r0, #4 - str r1, [r0] - ldrb r0, [r4, #0x19] - movs r1, #3 - orrs r0, r1 - strb r0, [r4, #0x19] - adds r0, r4, #0 - bl sub_08074018 - ldr r1, _08073FC8 @ =gPlayerState - ldr r0, _08073FCC @ =0x0000073C - strh r0, [r1, #8] -_08073FC6: - pop {r4, r5, pc} - .align 2, 0 -_08073FC8: .4byte gPlayerState -_08073FCC: .4byte 0x0000073C - - thumb_func_start sub_08073FD0 -sub_08073FD0: @ 0x08073FD0 - push {r4, lr} - adds r4, r0, #0 - ldrb r0, [r4, #0xe] - cmp r0, #0 - beq _08073FF8 - subs r0, #1 - strb r0, [r4, #0xe] - lsls r0, r0, #0x18 - cmp r0, #0 - bne _08074016 - ldrb r1, [r4, #0x18] - lsls r0, r1, #0x1e - cmp r0, #0 - bne _08073FF8 - movs r0, #3 - orrs r0, r1 - strb r0, [r4, #0x18] - movs r0, #0x7c - bl SoundReq -_08073FF8: - movs r1, #0x80 - lsls r1, r1, #6 - adds r0, r4, #0 - bl GravityUpdate - ldr r0, [r4, #0x20] - cmp r0, #0 - bne _08074016 - ldrb r0, [r4, #0xd] - adds r0, #1 - strb r0, [r4, #0xd] - movs r0, #0xb8 - lsls r0, r0, #1 - bl SoundReq -_08074016: - pop {r4, pc} - - thumb_func_start sub_08074018 -sub_08074018: @ 0x08074018 - push {r4, lr} - adds r4, r0, #0 - adds r1, r4, #0 - adds r1, #0x80 - ldr r0, [r1] - movs r3, #0x80 - lsls r3, r3, #1 - cmp r0, r3 - bls _0807402E - subs r0, #0x20 - str r0, [r1] -_0807402E: - adds r0, r4, #0 - adds r0, #0x84 - ldr r1, [r0] - adds r2, r0, #0 - cmp r1, r3 - bls _08074042 - adds r0, r1, #0 - subs r0, #0x20 - str r0, [r2] - b _08074048 -_08074042: - ldrb r0, [r4, #0xd] - adds r0, #1 - strb r0, [r4, #0xd] -_08074048: - adds r0, r4, #0 - adds r0, #0x80 - ldr r1, [r0] - ldr r2, [r2] - adds r0, r4, #0 - movs r3, #0 - bl sub_0805EC9C - adds r0, r4, #0 - bl UpdateAnimationSingleFrame - pop {r4, pc} - - thumb_func_start sub_08074060 -sub_08074060: @ 0x08074060 - push {r4, lr} - adds r4, r0, #0 - movs r1, #0x80 - lsls r1, r1, #6 - bl GravityUpdate - cmp r0, #0 - bne _080740D0 - ldr r0, _080740C4 @ =gPlayerHitbox - str r0, [r4, #0x48] - movs r3, #0x10 - movs r0, #0x10 - strb r0, [r4, #0x15] - movs r0, #4 - strb r0, [r4, #0x14] - movs r2, #0 - adds r0, #0xfc - strh r0, [r4, #0x24] - movs r0, #0x29 - adds r0, r0, r4 - mov ip, r0 - ldrb r1, [r0] - movs r0, #0x39 - rsbs r0, r0, #0 - ands r0, r1 - movs r1, #8 - orrs r0, r1 - mov r1, ip - strb r0, [r1] - ldrb r1, [r4, #0x18] - movs r0, #0x31 - rsbs r0, r0, #0 - ands r0, r1 - orrs r0, r3 - strb r0, [r4, #0x18] - strb r2, [r4, #0xf] - ldrb r0, [r4, #0xd] - adds r0, #1 - strb r0, [r4, #0xd] - movs r0, #0x80 - lsls r0, r0, #0xa - str r0, [r4, #0x20] - ldr r1, _080740C8 @ =gPlayerState - ldr r0, _080740CC @ =0x0000080C - strh r0, [r1, #8] - adds r0, r4, #0 - bl sub_0805EC60 - b _080740D6 - .align 2, 0 -_080740C4: .4byte gPlayerHitbox -_080740C8: .4byte gPlayerState -_080740CC: .4byte 0x0000080C -_080740D0: - adds r0, r4, #0 - bl UpdateAnimationSingleFrame -_080740D6: - pop {r4, pc} - - thumb_func_start sub_080740D8 -sub_080740D8: @ 0x080740D8 - push {r4, r5, r6, lr} - adds r4, r0, #0 - bl UpdateAnimationSingleFrame - ldrb r0, [r4, #0xf] - cmp r0, #0 - bne _080740EA - ldrb r0, [r4, #0x15] - b _080740F0 -_080740EA: - ldrb r1, [r4, #0x15] - movs r0, #0x10 - eors r0, r1 -_080740F0: - cmp r0, #8 - beq _08074128 - cmp r0, #8 - bhi _080740FE - cmp r0, #0 - beq _08074168 - b _0807418C -_080740FE: - cmp r0, #0x10 - beq _08074148 - cmp r0, #0x18 - bne _0807418C - movs r0, #0x2e - ldrsh r1, [r4, r0] - ldr r2, [r4, #0x48] - ldrb r0, [r2, #2] - subs r1, r1, r0 - movs r0, #0 - ldrsb r0, [r2, r0] - adds r1, r1, r0 - ldr r3, _08074124 @ =gRoomControls - ldrh r0, [r3, #6] - subs r6, r1, r0 - movs r1, #0x32 - ldrsh r0, [r4, r1] - b _08074182 - .align 2, 0 -_08074124: .4byte gRoomControls -_08074128: - ldr r2, [r4, #0x48] - movs r1, #0x2e - ldrsh r0, [r4, r1] - ldrb r1, [r2, #2] - adds r0, r0, r1 - movs r1, #0 - ldrsb r1, [r2, r1] - adds r0, r0, r1 - ldr r3, _08074144 @ =gRoomControls - ldrh r1, [r3, #6] - subs r6, r0, r1 - movs r1, #0x32 - ldrsh r0, [r4, r1] - b _08074182 - .align 2, 0 -_08074144: .4byte gRoomControls -_08074148: - movs r0, #0x2e - ldrsh r1, [r4, r0] - ldr r2, [r4, #0x48] - movs r0, #0 - ldrsb r0, [r2, r0] - adds r1, r1, r0 - ldr r3, _08074164 @ =gRoomControls - ldrh r0, [r3, #6] - subs r6, r1, r0 - movs r1, #0x32 - ldrsh r0, [r4, r1] - ldrb r1, [r2, #5] - adds r0, r0, r1 - b _08074182 - .align 2, 0 -_08074164: .4byte gRoomControls -_08074168: - movs r0, #0x2e - ldrsh r1, [r4, r0] - ldr r2, [r4, #0x48] - movs r0, #0 - ldrsb r0, [r2, r0] - adds r1, r1, r0 - ldr r3, _080741A4 @ =gRoomControls - ldrh r0, [r3, #6] - subs r6, r1, r0 - movs r1, #0x32 - ldrsh r0, [r4, r1] - ldrb r1, [r2, #5] - subs r0, r0, r1 -_08074182: - movs r1, #1 - ldrsb r1, [r2, r1] - adds r0, r0, r1 - ldrh r1, [r3, #8] - subs r5, r0, r1 -_0807418C: - ldr r2, _080741A8 @ =gUnk_080082DC - adds r0, r6, #0 - adds r1, r5, #0 - bl sub_080086B4 - cmp r0, #0 - beq _080741AC - adds r0, r4, #0 - bl sub_0806F69C - b _080741B0 - .align 2, 0 -_080741A4: .4byte gRoomControls -_080741A8: .4byte gUnk_080082DC -_080741AC: - movs r0, #1 - strb r0, [r4, #0xf] -_080741B0: - movs r1, #0x80 - lsls r1, r1, #6 - adds r0, r4, #0 - bl GravityUpdate - cmp r0, #0 - bne _080741C2 - bl sub_0807921C -_080741C2: - pop {r4, r5, r6, pc} - - thumb_func_start sub_080741C4 -sub_080741C4: @ 0x080741C4 - push {lr} - ldr r0, _080741F0 @ =gPlayerState - ldrb r1, [r0, #2] - adds r2, r0, #0 - cmp r1, #0 - beq _080741D8 - movs r0, #7 - ands r0, r1 - cmp r0, #3 - bne _080741E0 -_080741D8: - ldr r0, _080741F4 @ =gPlayerEntity - ldr r0, [r0, #0x34] - cmp r0, #0 - beq _080741F8 -_080741E0: - movs r1, #0 - strb r1, [r2, #0x11] - adds r0, r2, #0 - adds r0, #0x37 - strb r1, [r0] - movs r0, #1 - b _080741FA - .align 2, 0 -_080741F0: .4byte gPlayerState -_080741F4: .4byte gPlayerEntity -_080741F8: - movs r0, #0 -_080741FA: - pop {pc} - - thumb_func_start nullsub_112 -nullsub_112: @ 0x080741FC - bx lr - .align 2, 0 - - thumb_func_start sub_08074200 -sub_08074200: @ 0x08074200 - push {r4, lr} - adds r4, r0, #0 - bl sub_080741C4 - cmp r0, #0 - bne _08074226 - adds r0, r4, #0 - bl sub_08079C30 - cmp r0, #0 - beq _08074226 - ldrb r0, [r4, #0xc] - cmp r0, #3 - beq _08074226 - bl ResetPlayer - ldr r1, _08074228 @ =gPlayerState - movs r0, #3 - strb r0, [r1, #0xc] -_08074226: - pop {r4, pc} - .align 2, 0 -_08074228: .4byte gPlayerState - - thumb_func_start sub_0807422C -sub_0807422C: @ 0x0807422C - push {lr} - movs r1, #8 - movs r2, #0x18 - bl sub_08074244 - pop {pc} - - thumb_func_start sub_08074238 -sub_08074238: @ 0x08074238 - push {lr} - movs r1, #0 - movs r2, #0x10 - bl sub_08074244 - pop {pc} - - thumb_func_start sub_08074244 -sub_08074244: @ 0x08074244 - push {r4, r5, r6, r7, lr} - adds r4, r0, #0 - adds r6, r1, #0 - adds r7, r2, #0 - ldr r5, _0807428C @ =gPlayerState - ldrb r0, [r5, #0x12] - subs r0, #0x28 - lsls r0, r0, #0x18 - lsrs r0, r0, #0x18 - cmp r0, #1 - bls _08074278 - adds r1, r4, #0 - adds r1, #0x38 - movs r0, #3 - strb r0, [r1] - ldrb r2, [r4, #0x1b] - movs r1, #0x3f - adds r0, r1, #0 - ands r0, r2 - movs r2, #0x40 - orrs r0, r2 - strb r0, [r4, #0x1b] - ldrb r0, [r4, #0x19] - ands r1, r0 - orrs r1, r2 - strb r1, [r4, #0x19] -_08074278: - bl sub_080741C4 - cmp r0, #0 - bne _080742A6 - ldrb r0, [r5, #0x1e] - cmp r0, #0 - bne _08074290 - ldrb r0, [r5, #0xd] - b _08074294 - .align 2, 0 -_0807428C: .4byte gPlayerState -_08074290: - ldrb r0, [r4, #0x14] - lsls r0, r0, #2 -_08074294: - cmp r6, r0 - bne _0807429C - cmp r7, r0 - beq _080742A6 -_0807429C: - ldr r1, _080742A8 @ =gPlayerState - adds r1, #0x80 - ldrh r0, [r1] - subs r0, #0x50 - strh r0, [r1] -_080742A6: - pop {r4, r5, r6, r7, pc} - .align 2, 0 -_080742A8: .4byte gPlayerState - - thumb_func_start sub_080742AC -sub_080742AC: @ 0x080742AC - push {lr} - adds r2, r0, #0 - ldr r0, _080742E0 @ =gPlayerState - adds r1, r0, #0 - adds r1, #0x26 - ldrb r0, [r1] - cmp r0, #0 - beq _080742C0 - movs r0, #0 - strb r0, [r1] -_080742C0: - adds r3, r2, #0 - adds r3, #0x29 - ldrb r1, [r3] - movs r0, #8 - rsbs r0, r0, #0 - ands r0, r1 - movs r1, #4 - orrs r0, r1 - strb r0, [r3] - adds r2, #0x3c - ldrb r1, [r2] - movs r0, #0xfb - ands r0, r1 - strb r0, [r2] - pop {pc} - .align 2, 0 -_080742E0: .4byte gPlayerState - - thumb_func_start sub_080742E4 -sub_080742E4: @ 0x080742E4 - push {r4, lr} - adds r4, r0, #0 - bl sub_080741C4 - cmp r0, #0 - bne _0807430E - ldr r2, _08074310 @ =gPlayerState - ldr r0, [r2, #0x30] - movs r1, #0x80 - ands r0, r1 - cmp r0, #0 - bne _0807430E - ldrb r0, [r2, #0x11] - cmp r0, #0xf - bne _0807430E - adds r0, r4, #0 - movs r1, #0xe - movs r2, #0 - movs r3, #0 - bl CreateObjectWithParent -_0807430E: - pop {r4, pc} - .align 2, 0 -_08074310: .4byte gPlayerState - - thumb_func_start sub_08074314 -sub_08074314: @ 0x08074314 - push {lr} - adds r2, r0, #0 - ldrh r1, [r2, #0x32] - movs r0, #0xf - ands r0, r1 - cmp r0, #0xd - bgt _08074330 - movs r0, #0xcc - lsls r0, r0, #7 - strh r0, [r2, #0x2a] - adds r0, r2, #0 - bl sub_080743A4 - b _08074336 -_08074330: - adds r0, r2, #0 - bl sub_0807A298 -_08074336: - pop {pc} - - thumb_func_start sub_08074338 -sub_08074338: @ 0x08074338 - push {lr} - adds r2, r0, #0 - ldrh r1, [r2, #0x32] - movs r0, #0xf - ands r0, r1 - cmp r0, #1 - ble _08074354 - movs r0, #0xcc - lsls r0, r0, #7 - strh r0, [r2, #0x2a] - adds r0, r2, #0 - bl sub_080743A4 - b _0807435A -_08074354: - adds r0, r2, #0 - bl sub_0807A298 -_0807435A: - pop {pc} - - thumb_func_start sub_0807435C -sub_0807435C: @ 0x0807435C - push {lr} - adds r2, r0, #0 - ldrh r1, [r2, #0x2e] - movs r0, #0xf - ands r0, r1 - cmp r0, #0xb - bgt _08074376 - movs r0, #0x66 - strh r0, [r2, #0x2a] - adds r0, r2, #0 - bl sub_080743A4 - b _0807437C -_08074376: - adds r0, r2, #0 - bl sub_0807A298 -_0807437C: - pop {pc} - .align 2, 0 - - thumb_func_start sub_08074380 -sub_08074380: @ 0x08074380 - push {lr} - adds r2, r0, #0 - ldrh r1, [r2, #0x2e] - movs r0, #0xf - ands r0, r1 - cmp r0, #4 - ble _0807439A - movs r0, #0x66 - strh r0, [r2, #0x2a] - adds r0, r2, #0 - bl sub_080743A4 - b _080743A0 -_0807439A: - adds r0, r2, #0 - bl sub_0807A298 -_080743A0: - pop {pc} - .align 2, 0 - - thumb_func_start sub_080743A4 -sub_080743A4: @ 0x080743A4 - push {lr} - ldr r3, _080743D0 @ =gPlayerState - ldr r1, [r3, #0x30] - movs r2, #0x40 - orrs r1, r2 - str r1, [r3, #0x30] - movs r3, #0 - movs r1, #0x80 - strb r1, [r0, #0xb] - ldrb r2, [r0, #0x18] - subs r1, #0x84 - ands r1, r2 - strb r1, [r0, #0x18] - ldrb r2, [r0, #0x10] - movs r1, #0x7f - ands r1, r2 - strb r1, [r0, #0x10] - adds r0, #0x42 - strb r3, [r0] - bl ResetPlayer - pop {pc} - .align 2, 0 -_080743D0: .4byte gPlayerState - - thumb_func_start sub_080743D4 -sub_080743D4: @ 0x080743D4 - push {r4, r5, lr} - adds r5, r0, #0 - bl sub_080741C4 - cmp r0, #0 - bne _08074416 - adds r0, r5, #0 - bl sub_08079C30 - cmp r0, #0 - beq _08074416 - adds r0, r5, #0 - bl sub_0807AABC - adds r0, r5, #0 - bl sub_08074808 - movs r0, #0x24 - ldrsh r4, [r5, r0] - movs r0, #0xc0 - lsls r0, r0, #2 - strh r0, [r5, #0x24] - movs r0, #0x10 - strb r0, [r5, #0x15] - ldr r2, _08074418 @ =gPlayerState - ldrb r1, [r2, #0xa] - movs r0, #0x80 - orrs r0, r1 - strb r0, [r2, #0xa] - adds r0, r5, #0 - bl sub_0806F69C - strh r4, [r5, #0x24] -_08074416: - pop {r4, r5, pc} - .align 2, 0 -_08074418: .4byte gPlayerState - - thumb_func_start sub_0807441C -sub_0807441C: @ 0x0807441C - push {r4, r5, r6, r7, lr} - adds r7, r0, #0 - ldr r0, _08074440 @ =gPlayerState - adds r0, #0xa0 - ldrb r0, [r0] - cmp r0, #4 - bne _08074502 - ldr r6, _08074444 @ =gSave - adds r4, r6, #0 - adds r4, #0xb4 - ldrb r0, [r4] - bl ItemIsSword - cmp r0, #0 - beq _08074448 - ldrb r0, [r4] - b _0807444E - .align 2, 0 -_08074440: .4byte gPlayerState -_08074444: .4byte gSave -_08074448: - adds r0, r6, #0 - adds r0, #0xb5 - ldrb r0, [r0] -_0807444E: - subs r0, #1 - cmp r0, #5 - bhi _0807448A - lsls r0, r0, #2 - ldr r1, _08074460 @ =_08074464 - adds r0, r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_08074460: .4byte _08074464 -_08074464: @ jump table - .4byte _0807447C @ case 0 - .4byte _0807447C @ case 1 - .4byte _08074480 @ case 2 - .4byte _08074484 @ case 3 - .4byte _0807448A @ case 4 - .4byte _08074488 @ case 5 -_0807447C: - movs r5, #0 - b _0807448A -_08074480: - movs r5, #1 - b _0807448A -_08074484: - movs r5, #2 - b _0807448A -_08074488: - movs r5, #3 -_0807448A: - movs r4, #0 - cmp r4, r5 - bhs _080744A6 - ldr r1, _08074494 @ =gUnk_03004040 - b _080744A0 - .align 2, 0 -_08074494: .4byte gUnk_03004040 -_08074498: - adds r1, #4 - adds r4, #1 - cmp r4, r5 - bhs _080744A6 -_080744A0: - ldr r0, [r1] - cmp r0, #0 - bne _08074498 -_080744A6: - cmp r5, r4 - bls _080744D4 - adds r0, r7, #0 - movs r1, #0x10 - adds r2, r4, #0 - movs r3, #0 - bl CreateObjectWithParent - adds r3, r0, #0 - ldr r1, _080744D0 @ =gUnk_03004040 - lsls r0, r4, #2 - adds r0, r0, r1 - str r3, [r0] - cmp r3, #0 - beq _08074502 - adds r0, r7, #0 - adds r1, r3, #0 - bl CopyPosition - b _08074502 - .align 2, 0 -_080744D0: .4byte gUnk_03004040 -_080744D4: - ldr r2, _08074504 @ =gPlayerState - ldrb r1, [r2, #0x1b] - movs r0, #0x80 - orrs r0, r1 - strb r0, [r2, #0x1b] - ldr r0, [r2, #0x30] - movs r1, #0x80 - lsls r1, r1, #0xf - orrs r0, r1 - str r0, [r2, #0x30] - ldr r0, [r7, #0x2c] - ldr r2, _08074508 @ =0xFFF00000 - ands r0, r2 - movs r1, #0x80 - lsls r1, r1, #0xc - orrs r0, r1 - str r0, [r7, #0x2c] - ldr r0, [r7, #0x30] - ands r0, r2 - orrs r0, r1 - str r0, [r7, #0x30] - bl sub_08077AEC -_08074502: - pop {r4, r5, r6, r7, pc} - .align 2, 0 -_08074504: .4byte gPlayerState -_08074508: .4byte 0xFFF00000 - - thumb_func_start sub_0807450C -sub_0807450C: @ 0x0807450C - push {r4, r5, r6, r7, lr} - adds r6, r0, #0 - bl sub_080741C4 - cmp r0, #0 - bne _0807457A - ldr r7, _0807457C @ =gPlayerState - ldrb r0, [r7, #0x14] - cmp r0, #0 - bne _0807457A - adds r4, r6, #0 - adds r4, #0x3d - movs r0, #0 - ldrsb r0, [r4, r0] - cmp r0, #0 - bne _08074568 - movs r0, #2 - rsbs r0, r0, #0 - bl ModHealth - movs r0, #0x7a - bl SoundReq - movs r0, #0x18 - strb r0, [r4] - adds r1, r6, #0 - adds r1, #0x42 - movs r0, #4 - strb r0, [r1] - movs r0, #0x2e - ldrsh r2, [r6, r0] - ldr r5, _08074580 @ =0x0000FFF0 - adds r0, r2, #0 - ands r0, r5 - movs r4, #8 - orrs r0, r4 - movs r1, #0x32 - ldrsh r3, [r6, r1] - adds r1, r3, #0 - ands r1, r5 - orrs r1, r4 - bl sub_080045D4 - adds r1, r6, #0 - adds r1, #0x3e - strb r0, [r1] -_08074568: - ldr r0, [r7, #0x30] - movs r1, #0x80 - ands r0, r1 - cmp r0, #0 - bne _0807457A - adds r0, r6, #0 - movs r1, #7 - bl sub_08008790 -_0807457A: - pop {r4, r5, r6, r7, pc} - .align 2, 0 -_0807457C: .4byte gPlayerState -_08074580: .4byte 0x0000FFF0 - - thumb_func_start sub_08074584 -sub_08074584: @ 0x08074584 - push {r4, lr} - adds r4, r0, #0 - bl sub_080741C4 - cmp r0, #0 - bne _080745AC - ldr r0, _080745B0 @ =gPlayerState - adds r0, #0x35 - ldrb r1, [r0] - movs r0, #0x80 - ands r0, r1 - cmp r0, #0 - beq _080745A8 - adds r0, r4, #0 - adds r0, #0x42 - ldrb r0, [r0] - cmp r0, #0 - beq _080745AC -_080745A8: - bl sub_08078F60 -_080745AC: - pop {r4, pc} - .align 2, 0 -_080745B0: .4byte gPlayerState - - thumb_func_start sub_080745B4 -sub_080745B4: @ 0x080745B4 - push {r4, r5, lr} - adds r4, r0, #0 - bl sub_080741C4 - cmp r0, #0 - bne _08074636 - ldr r0, _080745E4 @ =gPlayerState - mov ip, r0 - ldr r3, [r0, #0x30] - movs r0, #0x80 - ands r3, r0 - cmp r3, #0 - beq _080745E8 - adds r2, r4, #0 - adds r2, #0x29 - ldrb r1, [r2] - subs r0, #0xb9 - ands r0, r1 - strb r0, [r2] - adds r0, r4, #0 - bl sub_0807479C - b _08074636 - .align 2, 0 -_080745E4: .4byte gPlayerState -_080745E8: - mov r5, ip - adds r5, #0x26 - ldrb r0, [r5] - cmp r0, #0 - beq _08074618 - ldrb r1, [r4, #0x10] - movs r0, #0x80 - orrs r0, r1 - strb r0, [r4, #0x10] - adds r2, r4, #0 - adds r2, #0x3c - ldrb r1, [r2] - movs r0, #0xfb - ands r0, r1 - strb r0, [r2] - subs r2, #0x13 - ldrb r1, [r2] - movs r0, #8 - rsbs r0, r0, #0 - ands r0, r1 - movs r1, #4 - orrs r0, r1 - strb r0, [r2] - strb r3, [r5] -_08074618: - mov r0, ip - adds r0, #0x92 - ldrh r1, [r0] - movs r0, #0xf0 - lsls r0, r0, #4 - ands r0, r1 - cmp r0, #0 - bne _08074630 - mov r1, ip - ldrb r0, [r1, #0x11] - cmp r0, #1 - bne _08074636 -_08074630: - movs r0, #0x83 - bl SoundReq -_08074636: - pop {r4, r5, pc} - - thumb_func_start sub_08074638 -sub_08074638: @ 0x08074638 - push {r4, r5, lr} - adds r4, r0, #0 - ldr r0, _08074674 @ =gPlayerState - adds r5, r0, #0 - adds r5, #0x26 - ldrb r0, [r5] - cmp r0, #0 - beq _08074670 - ldrb r1, [r4, #0x10] - movs r0, #0x80 - movs r3, #0 - orrs r0, r1 - strb r0, [r4, #0x10] - adds r2, r4, #0 - adds r2, #0x3c - ldrb r1, [r2] - movs r0, #0xfb - ands r0, r1 - strb r0, [r2] - subs r2, #0x13 - ldrb r1, [r2] - movs r0, #8 - rsbs r0, r0, #0 - ands r0, r1 - movs r1, #4 - orrs r0, r1 - strb r0, [r2] - strb r3, [r5] -_08074670: - pop {r4, r5, pc} - .align 2, 0 -_08074674: .4byte gPlayerState - - thumb_func_start sub_08074678 -sub_08074678: @ 0x08074678 - push {r4, lr} - adds r4, r0, #0 - bl sub_080741C4 - cmp r0, #0 - beq _08074690 - ldr r0, _0807468C @ =gPlayerState - movs r1, #0 - strb r1, [r0, #0x11] - b _080746CE - .align 2, 0 -_0807468C: .4byte gPlayerState -_08074690: - adds r0, r4, #0 - adds r0, #0x45 - ldrb r0, [r0] - cmp r0, #0 - beq _0807476C - adds r0, r4, #0 - bl sub_08079C30 - adds r1, r0, #0 - cmp r1, #0 - bne _080746B0 - ldr r0, _080746AC @ =gPlayerState - strb r1, [r0, #0x11] - b _080746CE - .align 2, 0 -_080746AC: .4byte gPlayerState -_080746B0: - ldr r3, _080746D4 @ =gPlayerState - ldr r1, [r3, #0x30] - movs r0, #0x80 - ands r1, r0 - cmp r1, #0 - bne _0807476C - ldrb r2, [r3, #0x1e] - cmp r2, #0 - beq _080746D8 - movs r0, #0x40 - ands r0, r2 - cmp r0, #0 - beq _080746DC - strb r1, [r3, #0x11] - adds r0, r3, #0 -_080746CE: - adds r0, #0x37 - strb r1, [r0] - b _08074792 - .align 2, 0 -_080746D4: .4byte gPlayerState -_080746D8: - bl sub_08077B20 -_080746DC: - ldr r1, _08074700 @ =gPlayerState - adds r0, r1, #0 - adds r0, #0x37 - ldrb r0, [r0] - cmp r0, #1 - bne _08074704 - adds r0, r4, #0 - movs r1, #0x70 - movs r2, #0 - movs r3, #0 - bl CreateObjectWithParent - adds r0, r4, #0 - movs r1, #0x52 - movs r2, #0 - bl CreateFx - b _08074714 - .align 2, 0 -_08074700: .4byte gPlayerState -_08074704: - adds r0, r1, #0 - adds r0, #0x92 - ldrh r1, [r0] - movs r0, #0xf0 - lsls r0, r0, #4 - ands r0, r1 - cmp r0, #0 - beq _08074720 -_08074714: - ldr r0, _0807471C @ =0x00000161 - bl SoundReq - b _08074732 - .align 2, 0 -_0807471C: .4byte 0x00000161 -_08074720: - ldr r0, _08074760 @ =gScreenTransition - ldr r0, [r0] - movs r1, #0xf - ands r0, r1 - cmp r0, #0 - bne _08074732 - ldr r0, _08074764 @ =0x00000161 - bl SoundReq -_08074732: - ldr r2, _08074768 @ =gPlayerState - adds r1, r2, #0 - adds r1, #0x80 - ldrh r0, [r1] - subs r0, #0xf0 - strh r0, [r1] - adds r1, #0x28 - movs r0, #0x1b - strb r0, [r1] - adds r0, r2, #0 - adds r0, #0x37 - ldrb r0, [r0] - lsls r3, r0, #0x18 - lsrs r0, r3, #0x18 - cmp r0, #0xef - bhi _0807476C - subs r1, #0x69 - lsrs r0, r3, #0x1d - adds r0, #4 - ldrb r2, [r1] - adds r0, r0, r2 - strb r0, [r1] - b _08074792 - .align 2, 0 -_08074760: .4byte gScreenTransition -_08074764: .4byte 0x00000161 -_08074768: .4byte gPlayerState -_0807476C: - ldr r2, _08074794 @ =gPlayerState - ldr r0, [r2, #0x30] - ldr r1, _08074798 @ =0xFFFBFFFF - ands r0, r1 - str r0, [r2, #0x30] - adds r0, r4, #0 - movs r1, #0x52 - movs r2, #0 - bl CreateFx - adds r1, r4, #0 - adds r1, #0x3d - movs r0, #0x20 - strb r0, [r1] - subs r0, #0x24 - bl ModHealth - bl RespawnPlayer -_08074792: - pop {r4, pc} - .align 2, 0 -_08074794: .4byte gPlayerState -_08074798: .4byte 0xFFFBFFFF - - thumb_func_start sub_0807479C -sub_0807479C: @ 0x0807479C - push {r4, lr} - adds r4, r0, #0 - bl sub_080741C4 - adds r2, r0, #0 - cmp r2, #0 - bne _08074804 - ldr r1, _080747C0 @ =gPlayerState - ldrb r0, [r1, #0x14] - adds r3, r1, #0 - cmp r0, #0 - bne _080747C4 - adds r1, #0x3f - ldrb r0, [r1] - adds r0, #2 - strb r0, [r1] - b _080747E6 - .align 2, 0 -_080747C0: .4byte gPlayerState -_080747C4: - adds r0, r3, #0 - adds r0, #0x26 - strb r2, [r0] - adds r2, r4, #0 - adds r2, #0x29 - ldrb r1, [r2] - movs r0, #8 - rsbs r0, r0, #0 - ands r0, r1 - movs r1, #4 - orrs r0, r1 - strb r0, [r2] - adds r2, #0x13 - ldrb r1, [r2] - movs r0, #0xfb - ands r0, r1 - strb r0, [r2] -_080747E6: - adds r0, r3, #0 - adds r0, #0x26 - ldrb r1, [r0] - movs r0, #0xf - ands r0, r1 - cmp r0, #0 - bne _080747FE - adds r0, r4, #0 - bl sub_08079C30 - cmp r0, #0 - beq _08074804 -_080747FE: - adds r0, r4, #0 - bl sub_08074808 -_08074804: - pop {r4, pc} - .align 2, 0 - - thumb_func_start sub_08074808 -sub_08074808: @ 0x08074808 - push {r4, r5, r6, r7, lr} - adds r6, r0, #0 - bl sub_08077AEC - movs r0, #0x46 - bl GetInventoryValue - adds r3, r0, #0 - cmp r3, #1 - bne _080748B8 - ldr r1, _08074838 @ =gPlayerState - adds r2, r1, #0 - adds r2, #0x26 - ldrb r0, [r2] - cmp r0, #0 - bne _0807486C - ldr r0, [r1, #0x30] - movs r1, #0x80 - lsls r1, r1, #9 - ands r0, r1 - cmp r0, #0 - beq _0807483C - strb r3, [r2] - b _08074840 - .align 2, 0 -_08074838: .4byte gPlayerState -_0807483C: - movs r0, #8 - strb r0, [r2] -_08074840: - movs r1, #0 - movs r0, #0 - strh r0, [r6, #0x24] - ldr r0, _080748AC @ =gPlayerState - adds r2, r0, #0 - adds r2, #0x89 - strb r1, [r2] - ldr r0, [r0, #0x30] - movs r1, #0x80 - ands r0, r1 - cmp r0, #0 - bne _08074862 - adds r0, r6, #0 - movs r1, #0xb - movs r2, #0 - bl CreateFx -_08074862: - ldr r0, _080748B0 @ =0x000001A5 - bl SoundReq - bl ResetPlayer -_0807486C: - ldr r5, _080748AC @ =gPlayerState - adds r4, r5, #0 - adds r4, #0x26 - ldrb r1, [r4] - movs r7, #0xf - adds r0, r7, #0 - ands r0, r1 - cmp r0, #1 - beq _0807488A - adds r0, r6, #0 - bl sub_08079744 - ldrb r0, [r4] - subs r0, #1 - strb r0, [r4] -_0807488A: - ldr r0, [r5, #0x30] - ldr r1, _080748B4 @ =0xFFFFF3FF - ands r0, r1 - str r0, [r5, #0x30] - movs r1, #0x80 - lsls r1, r1, #7 - ands r0, r1 - cmp r0, #0 - beq _080748BE - adds r1, r6, #0 - adds r1, #0x7a - ldrh r0, [r1] - cmp r0, #0xe - bhi _080748BE - strh r7, [r1] - b _080748BE - .align 2, 0 -_080748AC: .4byte gPlayerState -_080748B0: .4byte 0x000001A5 -_080748B4: .4byte 0xFFFFF3FF -_080748B8: - ldr r1, _080748C0 @ =gPlayerState - movs r0, #0x14 - strb r0, [r1, #0xc] -_080748BE: - pop {r4, r5, r6, r7, pc} - .align 2, 0 -_080748C0: .4byte gPlayerState - - thumb_func_start sub_080748C4 -sub_080748C4: @ 0x080748C4 - ldr r1, _080748D0 @ =gPlayerState - adds r1, #0x3f - ldrb r0, [r1] - subs r0, #2 - strb r0, [r1] - bx lr - .align 2, 0 -_080748D0: .4byte gPlayerState - - thumb_func_start sub_080748D4 -sub_080748D4: @ 0x080748D4 - push {lr} - bl sub_080741C4 - pop {pc} - - thumb_func_start sub_080748DC -sub_080748DC: @ 0x080748DC - push {r4, lr} - adds r4, r0, #0 - bl sub_080741C4 - cmp r0, #0 - bne _08074910 - adds r0, r4, #0 - adds r0, #0x38 - ldrb r0, [r0] - cmp r0, #1 - beq _0807490A - ldrh r0, [r4, #0x32] - adds r0, #0xc - strh r0, [r4, #0x32] - ldr r0, _08074914 @ =gPlayerState - ldr r0, [r0, #0x30] - movs r1, #0x80 - ands r0, r1 - cmp r0, #0 - bne _0807490A - ldrh r0, [r4, #0x36] - subs r0, #0xc - strh r0, [r4, #0x36] -_0807490A: - adds r0, r4, #0 - bl sub_0807AABC -_08074910: - pop {r4, pc} - .align 2, 0 -_08074914: .4byte gPlayerState - - thumb_func_start sub_08074918 -sub_08074918: @ 0x08074918 - push {r4, lr} - adds r4, r0, #0 - bl sub_080741C4 - cmp r0, #0 - bne _08074934 - adds r0, r4, #0 - bl sub_08079C30 - cmp r0, #0 - beq _08074934 - ldr r1, _08074938 @ =gPlayerState - movs r0, #0x11 - strb r0, [r1, #0xc] -_08074934: - pop {r4, pc} - .align 2, 0 -_08074938: .4byte gPlayerState - - thumb_func_start sub_0807493C -sub_0807493C: @ 0x0807493C - push {r4, lr} - adds r4, r0, #0 - movs r0, #0x44 - bl GetInventoryValue - cmp r0, #1 - bne _08074952 - adds r0, r4, #0 - bl sub_0807496C - b _08074966 -_08074952: - ldrh r1, [r4, #0x32] - movs r0, #0x10 - rsbs r0, r0, #0 - ands r0, r1 - movs r1, #0xf - movs r2, #0 - orrs r0, r1 - strh r0, [r4, #0x32] - ldr r0, _08074968 @ =gPlayerState - strb r2, [r0, #0x12] -_08074966: - pop {r4, pc} - .align 2, 0 -_08074968: .4byte gPlayerState - - thumb_func_start sub_0807496C -sub_0807496C: @ 0x0807496C - push {r4, lr} - adds r4, r0, #0 - bl sub_080741C4 - adds r3, r0, #0 - cmp r3, #0 - bne _080749A2 - ldr r0, _080749A4 @ =gPlayerState - strb r3, [r0, #2] - ldrb r2, [r4, #0x19] - movs r1, #0x3f - adds r0, r1, #0 - ands r0, r2 - movs r2, #0x40 - orrs r0, r2 - strb r0, [r4, #0x19] - ldrb r0, [r4, #0x1b] - ands r1, r0 - orrs r1, r2 - strb r1, [r4, #0x1b] - strb r3, [r4, #0x14] - adds r1, r4, #0 - adds r1, #0x38 - movs r0, #3 - strb r0, [r1] - bl ResetPlayer -_080749A2: - pop {r4, pc} - .align 2, 0 -_080749A4: .4byte gPlayerState - - thumb_func_start sub_080749A8 -sub_080749A8: @ 0x080749A8 - push {r4, lr} - adds r4, r0, #0 - movs r0, #0x44 - bl GetInventoryValue - cmp r0, #1 - bne _080749BE - adds r0, r4, #0 - bl sub_080749D4 - b _080749CE -_080749BE: - ldrh r1, [r4, #0x32] - movs r0, #0x10 - rsbs r0, r0, #0 - ands r0, r1 - movs r1, #0 - strh r0, [r4, #0x32] - ldr r0, _080749D0 @ =gPlayerState - strb r1, [r0, #0x12] -_080749CE: - pop {r4, pc} - .align 2, 0 -_080749D0: .4byte gPlayerState - - thumb_func_start sub_080749D4 -sub_080749D4: @ 0x080749D4 - push {r4, r5, lr} - adds r4, r0, #0 - bl sub_080741C4 - adds r3, r0, #0 - cmp r3, #0 - bne _08074A40 - ldrb r2, [r4, #0x19] - movs r1, #0x3f - adds r0, r1, #0 - ands r0, r2 - movs r2, #0x40 - orrs r0, r2 - strb r0, [r4, #0x19] - ldrb r0, [r4, #0x1b] - ands r1, r0 - orrs r1, r2 - strb r1, [r4, #0x1b] - strb r3, [r4, #0x14] - adds r1, r4, #0 - adds r1, #0x38 - movs r0, #3 - strb r0, [r1] - ldr r5, _08074A2C @ =gPlayerState - adds r0, r5, #0 - adds r0, #0x26 - strb r3, [r0] - adds r2, r4, #0 - adds r2, #0x3c - ldrb r1, [r2] - movs r0, #0xfb - ands r0, r1 - strb r0, [r2] - ldrh r1, [r4, #0x32] - movs r0, #0xf - ands r0, r1 - cmp r0, #7 - bgt _08074A34 - ldr r0, _08074A30 @ =0x000002D3 - strh r0, [r5, #8] - movs r0, #0x10 - strb r0, [r4, #0x15] - b _08074A3C - .align 2, 0 -_08074A2C: .4byte gPlayerState -_08074A30: .4byte 0x000002D3 -_08074A34: - movs r1, #0 - ldr r0, _08074A44 @ =0x000002D6 - strh r0, [r5, #8] - strb r1, [r4, #0x15] -_08074A3C: - bl ResetPlayer -_08074A40: - pop {r4, r5, pc} - .align 2, 0 -_08074A44: .4byte 0x000002D6 - - thumb_func_start sub_08074A48 -sub_08074A48: @ 0x08074A48 - push {r4, r5, lr} - adds r4, r0, #0 - ldr r5, _08074A90 @ =gPlayerState - adds r0, r5, #0 - adds r0, #0x26 - ldrb r1, [r0] - movs r0, #0x80 - ands r0, r1 - cmp r0, #0 - beq _08074A86 - ldr r0, _08074A94 @ =gPlayerEntity - movs r1, #0 - movs r2, #0x54 - movs r3, #0 - bl CreateObjectWithParent - adds r1, r0, #0 - cmp r1, #0 - beq _08074A86 - movs r0, #1 - strb r0, [r1, #0xe] - adds r0, r1, #0 - bl UpdateSpriteForCollisionLayer - ldrh r1, [r5, #0x22] - adds r0, r4, #0 - adds r0, #0x38 - ldrb r2, [r0] - movs r0, #0x39 - bl sub_08000152 -_08074A86: - adds r0, r4, #0 - bl sub_0807479C - pop {r4, r5, pc} - .align 2, 0 -_08074A90: .4byte gPlayerState -_08074A94: .4byte gPlayerEntity - - thumb_func_start nullsub_504 -nullsub_504: @ 0x08074A98 - bx lr - .align 2, 0 - - thumb_func_start sub_08074A9C -sub_08074A9C: @ 0x08074A9C - push {r4, lr} - adds r4, r0, #0 - bl sub_080741C4 - cmp r0, #0 - bne _08074AF0 - ldr r2, _08074AE0 @ =gPlayerState - adds r0, r2, #0 - adds r0, #0x80 - ldrh r1, [r0] - subs r1, #0x80 - strh r1, [r0] - ldrb r0, [r2, #0x11] - cmp r0, #1 - beq _08074ACA - adds r0, r2, #0 - adds r0, #0x92 - ldrh r1, [r0] - movs r0, #0xf0 - lsls r0, r0, #4 - ands r0, r1 - cmp r0, #0 - beq _08074AF0 -_08074ACA: - ldrb r0, [r2, #0x12] - cmp r0, #0x25 - bne _08074AE4 - adds r0, r4, #0 - movs r1, #0x21 - movs r2, #1 - movs r3, #0 - bl CreateObjectWithParent - b _08074AF0 - .align 2, 0 -_08074AE0: .4byte gPlayerState -_08074AE4: - adds r0, r4, #0 - movs r1, #0x21 - movs r2, #1 - movs r3, #1 - bl CreateObjectWithParent -_08074AF0: - pop {r4, pc} - .align 2, 0 - - thumb_func_start sub_08074AF4 -sub_08074AF4: @ 0x08074AF4 - push {lr} - adds r3, r0, #0 - ldr r1, _08074B04 @ =gPlayerState - ldrb r0, [r1, #0x1e] - cmp r0, #0 - bne _08074B08 - ldrb r2, [r1, #0xd] - b _08074B0C - .align 2, 0 -_08074B04: .4byte gPlayerState -_08074B08: - ldrb r0, [r3, #0x14] - lsls r2, r0, #2 -_08074B0C: - adds r0, r3, #0 - adds r1, r2, #0 - bl sub_08074244 - pop {pc} - .align 2, 0 - - thumb_func_start sub_08074B18 -sub_08074B18: @ 0x08074B18 - push {r4, r5, lr} - adds r5, r0, #0 - ldr r4, _08074B40 @ =gPlayerState - ldrb r0, [r4, #0x14] - cmp r0, #0 - bne _08074B48 - bl sub_080741C4 - cmp r0, #0 - bne _08074B48 - ldr r0, [r4, #0x30] - movs r1, #0x80 - ands r0, r1 - cmp r0, #0 - beq _08074B44 - adds r0, r5, #0 - bl sub_08074200 - b _08074B48 - .align 2, 0 -_08074B40: .4byte gPlayerState -_08074B44: - movs r0, #0x1a - strb r0, [r4, #0xc] -_08074B48: - pop {r4, r5, pc} - .align 2, 0 - - thumb_func_start sub_08074B4C -sub_08074B4C: @ 0x08074B4C - push {r4, lr} - adds r4, r0, #0 - bl sub_080741C4 - cmp r0, #0 - bne _08074B6E - ldr r0, _08074B70 @ =gPlayerState - ldr r1, [r0, #0x30] - movs r0, #0x80 - ands r1, r0 - cmp r1, #0 - bne _08074B6E - strb r1, [r4, #0x14] - strb r1, [r4, #0x15] - adds r0, r4, #0 - bl sub_08074BF8 -_08074B6E: - pop {r4, pc} - .align 2, 0 -_08074B70: .4byte gPlayerState - - thumb_func_start sub_08074B74 -sub_08074B74: @ 0x08074B74 - push {r4, lr} - adds r4, r0, #0 - bl sub_080741C4 - cmp r0, #0 - bne _08074B9A - ldr r0, _08074B9C @ =gPlayerState - ldr r0, [r0, #0x30] - movs r1, #0x80 - ands r0, r1 - cmp r0, #0 - bne _08074B9A - movs r0, #4 - strb r0, [r4, #0x14] - movs r0, #0x10 - strb r0, [r4, #0x15] - adds r0, r4, #0 - bl sub_08074BF8 -_08074B9A: - pop {r4, pc} - .align 2, 0 -_08074B9C: .4byte gPlayerState - - thumb_func_start sub_08074BA0 -sub_08074BA0: @ 0x08074BA0 - push {r4, lr} - adds r4, r0, #0 - bl sub_080741C4 - cmp r0, #0 - bne _08074BC6 - ldr r0, _08074BC8 @ =gPlayerState - ldr r0, [r0, #0x30] - movs r1, #0x80 - ands r0, r1 - cmp r0, #0 - bne _08074BC6 - movs r0, #6 - strb r0, [r4, #0x14] - movs r0, #0x18 - strb r0, [r4, #0x15] - adds r0, r4, #0 - bl sub_08074BF8 -_08074BC6: - pop {r4, pc} - .align 2, 0 -_08074BC8: .4byte gPlayerState - - thumb_func_start sub_08074BCC -sub_08074BCC: @ 0x08074BCC - push {r4, lr} - adds r4, r0, #0 - bl sub_080741C4 - cmp r0, #0 - bne _08074BF2 - ldr r0, _08074BF4 @ =gPlayerState - ldr r0, [r0, #0x30] - movs r1, #0x80 - ands r0, r1 - cmp r0, #0 - bne _08074BF2 - movs r0, #2 - strb r0, [r4, #0x14] - movs r0, #8 - strb r0, [r4, #0x15] - adds r0, r4, #0 - bl sub_08074BF8 -_08074BF2: - pop {r4, pc} - .align 2, 0 -_08074BF4: .4byte gPlayerState - - thumb_func_start sub_08074BF8 -sub_08074BF8: @ 0x08074BF8 - push {r4, lr} - adds r4, r0, #0 - bl ResetPlayer - adds r2, r4, #0 - adds r2, #0x29 - ldrb r1, [r2] - movs r0, #0x39 - rsbs r0, r0, #0 - ands r0, r1 - strb r0, [r2] - movs r0, #0xa0 - lsls r0, r0, #1 - strh r0, [r4, #0x24] - ldr r1, _08074C40 @ =gPlayerState - ldr r0, [r1, #0x30] - movs r2, #0x80 - lsls r2, r2, #0x12 - orrs r0, r2 - str r0, [r1, #0x30] - ldrb r2, [r1, #0xa] - movs r0, #0x80 - orrs r2, r0 - strb r2, [r1, #0xa] - ldrb r2, [r1, #0x1a] - orrs r0, r2 - strb r0, [r1, #0x1a] - adds r1, #0x27 - ldrb r0, [r1] - adds r0, #1 - strb r0, [r1] - adds r0, r4, #0 - bl sub_0806F69C - pop {r4, pc} - .align 2, 0 -_08074C40: .4byte gPlayerState - - thumb_func_start sub_08074C44 -sub_08074C44: @ 0x08074C44 - push {r4, lr} - adds r4, r0, #0 - bl sub_08078EFC - cmp r0, #0 - bne _08074C60 - ldr r0, _08074C64 @ =gUnk_0811BC88 - ldrb r1, [r4, #0xd] - lsls r1, r1, #2 - adds r1, r1, r0 - ldr r1, [r1] - adds r0, r4, #0 - bl _call_via_r1 -_08074C60: - pop {r4, pc} - .align 2, 0 -_08074C64: .4byte gUnk_0811BC88 - - thumb_func_start sub_08074C68 -sub_08074C68: @ 0x08074C68 - push {r4, r5, r6, lr} - adds r4, r0, #0 - adds r6, r4, #0 - adds r6, #0x68 - movs r2, #0 - strb r2, [r6] - ldr r5, _08074CA0 @ =gPlayerState - adds r0, r5, #0 - adds r0, #0x38 - ldrb r3, [r0] - cmp r3, #1 - beq _08074CA8 - adds r0, r4, #0 - adds r0, #0x84 - ldr r1, [r0] - ldr r0, _08074CA4 @ =gPlayerScriptExecutionContext - cmp r1, r0 - bne _08074CF2 - movs r0, #1 - strb r0, [r4, #0xd] - adds r0, r4, #0 - bl sub_0807DD64 - adds r0, r4, #0 - bl sub_08074CF8 - b _08074CF2 - .align 2, 0 -_08074CA0: .4byte gPlayerState -_08074CA4: .4byte gPlayerScriptExecutionContext -_08074CA8: - ldrb r1, [r4, #0x18] - movs r0, #4 - rsbs r0, r0, #0 - ands r0, r1 - movs r1, #1 - orrs r0, r1 - strb r0, [r4, #0x18] - strb r2, [r4, #0x14] - adds r2, r4, #0 - adds r2, #0x29 - ldrb r1, [r2] - movs r0, #0x39 - rsbs r0, r0, #0 - ands r0, r1 - strb r0, [r2] - movs r0, #2 - strb r0, [r4, #0xd] - strb r3, [r6] - adds r0, r4, #0 - bl sub_0807DD64 - adds r0, r5, #0 - adds r0, #0x39 - ldrb r0, [r0] - cmp r0, #0 - bne _08074CE4 - ldr r0, _08074CE0 @ =0x0000073A - b _08074CE6 - .align 2, 0 -_08074CE0: .4byte 0x0000073A -_08074CE4: - ldr r0, _08074CF4 @ =0x00000736 -_08074CE6: - strh r0, [r5, #8] - movs r1, #0x80 - lsls r1, r1, #1 - movs r0, #5 - bl DoFade -_08074CF2: - pop {r4, r5, r6, pc} - .align 2, 0 -_08074CF4: .4byte 0x00000736 - - thumb_func_start sub_08074CF8 -sub_08074CF8: @ 0x08074CF8 - push {r4, r5, r6, lr} - adds r5, r0, #0 - ldrb r6, [r5, #0x14] - adds r4, r5, #0 - adds r4, #0x84 - ldr r1, [r4] - bl ExecuteScript - ldr r1, [r4] - adds r0, r5, #0 - bl sub_08074D34 - adds r0, r5, #0 - adds r0, #0x82 - ldrh r1, [r0] - movs r0, #1 - ands r0, r1 - cmp r0, #0 - beq _08074D20 - strb r6, [r5, #0x14] -_08074D20: - movs r1, #0x80 - lsls r1, r1, #6 - adds r0, r5, #0 - bl GravityUpdate - adds r0, r5, #0 - bl UpdateAnimationSingleFrame - pop {r4, r5, r6, pc} - .align 2, 0 - - thumb_func_start sub_08074D34 -sub_08074D34: @ 0x08074D34 - push {r4, r5, r6, r7, lr} - mov r7, r8 - push {r7} - adds r4, r0, #0 - adds r6, r1, #0 - ldr r0, [r6, #8] - cmp r0, #0 - bne _08074D46 - b _08074EF8 -_08074D46: - movs r7, #0x80 - lsls r7, r7, #1 - adds r5, r4, #0 - adds r5, #0x82 -_08074D4E: - ldr r1, [r6, #8] - mvns r0, r1 - adds r2, r0, #1 - ands r2, r1 - eors r1, r2 - str r1, [r6, #8] - cmp r2, r7 - bne _08074D60 - b _08074E82 -_08074D60: - cmp r2, r7 - bhi _08074D90 - cmp r2, #8 - beq _08074E2C - cmp r2, #8 - bhi _08074D7C - cmp r2, #2 - beq _08074E08 - cmp r2, #2 - bls _08074D76 - b _08074EF0 -_08074D76: - cmp r2, #1 - beq _08074DEC - b _08074EF0 -_08074D7C: - cmp r2, #0x20 - beq _08074E62 - cmp r2, #0x20 - bhi _08074D8A - cmp r2, #0x10 - beq _08074E54 - b _08074EF0 -_08074D8A: - cmp r2, #0x80 - beq _08074E70 - b _08074EF0 -_08074D90: - movs r0, #0x80 - lsls r0, r0, #7 - cmp r2, r0 - bne _08074D9A - b _08074EAE -_08074D9A: - cmp r2, r0 - bhi _08074DBE - movs r0, #0x80 - lsls r0, r0, #5 - cmp r2, r0 - beq _08074E96 - cmp r2, r0 - bhi _08074DB4 - movs r0, #0x80 - lsls r0, r0, #2 - cmp r2, r0 - beq _08074E90 - b _08074EF0 -_08074DB4: - movs r0, #0x80 - lsls r0, r0, #6 - cmp r2, r0 - beq _08074EA8 - b _08074EF0 -_08074DBE: - movs r0, #0x80 - lsls r0, r0, #0xa - cmp r2, r0 - bne _08074DC8 - b _08074EBE -_08074DC8: - cmp r2, r0 - bhi _08074DD6 - movs r0, #0x80 - lsls r0, r0, #8 - cmp r2, r0 - beq _08074EB4 - b _08074EF0 -_08074DD6: - movs r0, #0x80 - lsls r0, r0, #0xd - cmp r2, r0 - bne _08074DE0 - b _08074ED8 -_08074DE0: - movs r0, #0x80 - lsls r0, r0, #0xe - cmp r2, r0 - bne _08074DEA - b _08074EE4 -_08074DEA: - b _08074EF0 -_08074DEC: - ldr r2, _08074E00 @ =gPlayerState - ldr r0, [r2, #0x30] - movs r1, #8 - ands r0, r1 - cmp r0, #0 - beq _08074E04 - movs r0, #0x80 - lsls r0, r0, #3 - strh r0, [r2, #8] - b _08074EF0 - .align 2, 0 -_08074E00: .4byte gPlayerState -_08074E04: - strh r7, [r2, #8] - b _08074EF0 -_08074E08: - ldr r2, _08074E1C @ =gPlayerState - ldr r0, [r2, #0x30] - movs r1, #8 - ands r0, r1 - cmp r0, #0 - beq _08074E24 - ldr r0, _08074E20 @ =0x00000404 - strh r0, [r2, #8] - b _08074EF0 - .align 2, 0 -_08074E1C: .4byte gPlayerState -_08074E20: .4byte 0x00000404 -_08074E24: - movs r0, #0x82 - lsls r0, r0, #1 - strh r0, [r2, #8] - b _08074EF0 -_08074E2C: - ldr r1, _08074E3C @ =gPlayerState - ldr r0, [r1, #0x30] - ands r0, r2 - cmp r0, #0 - beq _08074E44 - ldr r0, _08074E40 @ =0x0000041C - b _08074E46 - .align 2, 0 -_08074E3C: .4byte gPlayerState -_08074E40: .4byte 0x0000041C -_08074E44: - ldr r0, _08074E50 @ =0x0000080C -_08074E46: - strh r0, [r1, #8] - movs r0, #0xc0 - lsls r0, r0, #9 - str r0, [r4, #0x20] - b _08074EF0 - .align 2, 0 -_08074E50: .4byte 0x0000080C -_08074E54: - adds r0, r4, #0 - movs r1, #8 - movs r2, #0x18 - rsbs r2, r2, #0 - bl CreateSpeechBubbleExclamationMark - b _08074EF0 -_08074E62: - adds r0, r4, #0 - movs r1, #8 - movs r2, #0x18 - rsbs r2, r2, #0 - bl CreateSpeechBubbleQuestionMark - b _08074EF0 -_08074E70: - ldrb r0, [r4, #0x18] - movs r2, #4 - rsbs r2, r2, #0 - adds r1, r2, #0 - ands r0, r1 - movs r1, #1 - orrs r0, r1 - strb r0, [r4, #0x18] - b _08074EF0 -_08074E82: - ldrb r0, [r4, #0x18] - movs r3, #4 - rsbs r3, r3, #0 - adds r1, r3, #0 - ands r0, r1 - strb r0, [r4, #0x18] - b _08074EF0 -_08074E90: - movs r0, #0 - strh r0, [r5] - b _08074EF0 -_08074E96: - ldrh r0, [r5] - ldr r2, _08074EA4 @ =0x0000FFFE - adds r1, r2, #0 - ands r0, r1 - strh r0, [r5] - b _08074EF0 - .align 2, 0 -_08074EA4: .4byte 0x0000FFFE -_08074EA8: - ldrh r0, [r5] - movs r1, #1 - b _08074EB8 -_08074EAE: - ldrh r0, [r5] - movs r1, #8 - b _08074EB8 -_08074EB4: - ldrh r0, [r5] - movs r1, #4 -_08074EB8: - orrs r0, r1 - strh r0, [r5] - b _08074EF0 -_08074EBE: - ldrb r2, [r4, #0x18] - lsls r0, r2, #0x19 - lsrs r0, r0, #0x1f - movs r1, #1 - eors r0, r1 - lsls r0, r0, #6 - movs r3, #0x41 - rsbs r3, r3, #0 - adds r1, r3, #0 - ands r2, r1 - orrs r2, r0 - strb r2, [r4, #0x18] - b _08074EF0 -_08074ED8: - movs r1, #2 - strb r1, [r4, #0xd] - adds r0, r4, #0 - adds r0, #0x68 - strb r1, [r0] - b _08074EF0 -_08074EE4: - movs r0, #0 - movs r1, #3 - strb r1, [r4, #0xd] - adds r1, r4, #0 - adds r1, #0x68 - strb r0, [r1] -_08074EF0: - ldr r0, [r6, #8] - cmp r0, #0 - beq _08074EF8 - b _08074D4E -_08074EF8: - pop {r3} - mov r8, r3 - pop {r4, r5, r6, r7, pc} - .align 2, 0 - - thumb_func_start sub_08074F00 -sub_08074F00: @ 0x08074F00 - push {lr} - ldr r2, _08074F18 @ =gUnk_0811BC98 - adds r1, r0, #0 - adds r1, #0x68 - ldrb r1, [r1] - lsls r1, r1, #2 - adds r1, r1, r2 - ldr r1, [r1] - bl _call_via_r1 - pop {pc} - .align 2, 0 -_08074F18: .4byte gUnk_0811BC98 - - thumb_func_start sub_08074F1C -sub_08074F1C: @ 0x08074F1C - adds r2, r0, #0 - adds r2, #0x68 - movs r3, #0 - movs r1, #1 - strb r1, [r2] - strb r3, [r0, #0x14] - bx lr - .align 2, 0 - - thumb_func_start sub_08074F2C -sub_08074F2C: @ 0x08074F2C - push {r4, r5, lr} - adds r4, r0, #0 - adds r5, r4, #0 - adds r5, #0x84 - ldr r1, [r5] - bl ExecuteScript - ldr r1, [r5] - adds r0, r4, #0 - bl sub_08074D34 - pop {r4, r5, pc} - - thumb_func_start sub_08074F44 -sub_08074F44: @ 0x08074F44 - push {lr} - adds r0, #0x68 - ldrb r1, [r0] - adds r1, #1 - strb r1, [r0] - ldr r0, _08074F74 @ =gPlayerEntity - ldr r0, [r0, #0x6c] - cmp r0, #0 - beq _08074F5A - bl DeleteEntity -_08074F5A: - ldr r2, _08074F78 @ =gPlayerState - adds r0, r2, #0 - adds r0, #0x39 - ldrb r0, [r0] - cmp r0, #0 - bne _08074F80 - ldr r0, _08074F7C @ =0x0000073B - strh r0, [r2, #8] - ldr r0, [r2, #0x30] - movs r1, #8 - orrs r0, r1 - str r0, [r2, #0x30] - b _08074F84 - .align 2, 0 -_08074F74: .4byte gPlayerEntity -_08074F78: .4byte gPlayerState -_08074F7C: .4byte 0x0000073B -_08074F80: - ldr r0, _08074F88 @ =0x00000737 - strh r0, [r2, #8] -_08074F84: - pop {pc} - .align 2, 0 -_08074F88: .4byte 0x00000737 - - thumb_func_start sub_08074F8C -sub_08074F8C: @ 0x08074F8C - push {r4, lr} - adds r4, r0, #0 - bl UpdateAnimationSingleFrame - adds r3, r4, #0 - adds r3, #0x5a - ldrb r0, [r3] - cmp r0, #1 - bne _08074FAC - movs r0, #0 - strb r0, [r3] - ldr r2, _08074FDC @ =gActiveScriptInfo - ldr r0, [r2] - movs r1, #4 - orrs r0, r1 - str r0, [r2] -_08074FAC: - ldrb r1, [r3] - movs r0, #0x80 - ands r0, r1 - cmp r0, #0 - beq _08074FEA - adds r1, r4, #0 - adds r1, #0x68 - ldrb r0, [r1] - adds r0, #1 - strb r0, [r1] - movs r0, #8 - strb r0, [r4, #0xe] - movs r0, #4 - strb r0, [r4, #0x14] - ldr r1, _08074FE0 @ =gPlayerState - adds r0, r1, #0 - adds r0, #0x39 - ldrb r0, [r0] - cmp r0, #0 - bne _08074FE4 - movs r0, #0x80 - lsls r0, r0, #3 - b _08074FE8 - .align 2, 0 -_08074FDC: .4byte gActiveScriptInfo -_08074FE0: .4byte gPlayerState -_08074FE4: - movs r0, #0x80 - lsls r0, r0, #1 -_08074FE8: - strh r0, [r1, #8] -_08074FEA: - pop {r4, pc} - - thumb_func_start sub_08074FEC -sub_08074FEC: @ 0x08074FEC - push {r4, lr} - adds r4, r0, #0 - bl UpdateAnimationSingleFrame - ldrb r0, [r4, #0xe] - subs r0, #1 - strb r0, [r4, #0xe] - lsls r0, r0, #0x18 - cmp r0, #0 - bne _08075016 - adds r1, r4, #0 - adds r1, #0x68 - ldrb r0, [r1] - adds r0, #1 - strb r0, [r1] - movs r0, #4 - strb r0, [r4, #0xe] - ldr r0, _08075018 @ =gPlayerState - adds r0, #0x3a - ldrb r0, [r0] - strb r0, [r4, #0x14] -_08075016: - pop {r4, pc} - .align 2, 0 -_08075018: .4byte gPlayerState - - thumb_func_start sub_0807501C -sub_0807501C: @ 0x0807501C - push {lr} - adds r2, r0, #0 - ldrb r0, [r2, #0xe] - subs r0, #1 - strb r0, [r2, #0xe] - lsls r0, r0, #0x18 - cmp r0, #0 - bne _08075086 - ldr r1, _08075044 @ =gPlayerState - adds r0, r1, #0 - adds r0, #0x3a - ldrb r0, [r0] - strb r0, [r2, #0x14] - adds r0, r1, #0 - adds r0, #0x39 - ldrb r0, [r0] - cmp r0, #0 - bne _0807504C - ldr r0, _08075048 @ =0x0000041C - b _0807504E - .align 2, 0 -_08075044: .4byte gPlayerState -_08075048: .4byte 0x0000041C -_0807504C: - ldr r0, _08075088 @ =0x0000080C -_0807504E: - strh r0, [r1, #8] - adds r3, r2, #0 - adds r3, #0x29 - ldrb r1, [r3] - movs r0, #0x39 - rsbs r0, r0, #0 - ands r0, r1 - movs r1, #8 - orrs r0, r1 - strb r0, [r3] - ldrb r0, [r2, #0x14] - lsls r0, r0, #2 - strb r0, [r2, #0x15] - movs r0, #0xc8 - strh r0, [r2, #0x24] - movs r0, #0x80 - lsls r0, r0, #0xa - str r0, [r2, #0x20] - movs r0, #8 - strb r0, [r2, #0xe] - adds r1, r2, #0 - adds r1, #0x68 - ldrb r0, [r1] - adds r0, #1 - strb r0, [r1] - movs r0, #0x7c - bl SoundReq -_08075086: - pop {pc} - .align 2, 0 -_08075088: .4byte 0x0000080C - - thumb_func_start sub_0807508C -sub_0807508C: @ 0x0807508C - push {r4, lr} - adds r4, r0, #0 - bl UpdateAnimationSingleFrame - movs r1, #0x80 - lsls r1, r1, #6 - adds r0, r4, #0 - bl GravityUpdate - cmp r0, #0 - beq _080750AA - adds r0, r4, #0 - bl sub_0806F69C - b _080750F2 -_080750AA: - ldr r2, _080750BC @ =gPlayerState - adds r0, r2, #0 - adds r0, #0x39 - ldrb r0, [r0] - cmp r0, #0 - bne _080750C0 - movs r0, #0x80 - lsls r0, r0, #3 - b _080750CE - .align 2, 0 -_080750BC: .4byte gPlayerState -_080750C0: - ldr r0, [r2, #0x30] - movs r1, #9 - rsbs r1, r1, #0 - ands r0, r1 - str r0, [r2, #0x30] - movs r0, #0x80 - lsls r0, r0, #1 -_080750CE: - strh r0, [r2, #8] - ldrb r0, [r4, #0xe] - subs r0, #1 - strb r0, [r4, #0xe] - lsls r0, r0, #0x18 - lsrs r1, r0, #0x18 - cmp r1, #0 - bne _080750F2 - movs r0, #4 - strb r0, [r4, #0x14] - movs r0, #1 - strb r0, [r4, #0xd] - adds r0, r4, #0 - adds r0, #0x68 - strb r1, [r0] - movs r0, #0x7d - bl SoundReq -_080750F2: - pop {r4, pc} - - thumb_func_start sub_080750F4 -sub_080750F4: @ 0x080750F4 - push {lr} - ldr r2, _0807510C @ =gUnk_0811BCB4 - adds r1, r0, #0 - adds r1, #0x68 - ldrb r1, [r1] - lsls r1, r1, #2 - adds r1, r1, r2 - ldr r1, [r1] - bl _call_via_r1 - pop {pc} - .align 2, 0 -_0807510C: .4byte gUnk_0811BCB4 - - thumb_func_start sub_08075110 -sub_08075110: @ 0x08075110 - adds r2, r0, #0 - adds r2, #0x68 - ldrb r1, [r2] - adds r1, #1 - movs r3, #0 - strb r1, [r2] - ldrb r1, [r0, #0x14] - strb r1, [r0, #0xf] - strb r3, [r0, #0x14] - ldr r2, _08075134 @ =gPlayerState - ldr r0, _08075138 @ =0x00000734 - strh r0, [r2, #8] - ldr r0, [r2, #0x30] - movs r1, #9 - rsbs r1, r1, #0 - ands r0, r1 - str r0, [r2, #0x30] - bx lr - .align 2, 0 -_08075134: .4byte gPlayerState -_08075138: .4byte 0x00000734 - - thumb_func_start sub_0807513C -sub_0807513C: @ 0x0807513C - push {r4, r5, lr} - adds r5, r0, #0 - bl UpdateAnimationSingleFrame - adds r4, r5, #0 - adds r4, #0x5a - ldrb r0, [r4] - cmp r0, #1 - bne _08075158 - movs r0, #0 - strb r0, [r4] - movs r0, #0x7c - bl SoundReq -_08075158: - ldrb r0, [r4] - cmp r0, #2 - bne _0807516E - movs r0, #0 - strb r0, [r4] - ldr r0, _08075188 @ =0x0000014B - bl SoundReq - movs r0, #0x7a - bl SoundReq -_0807516E: - ldrb r1, [r4] - movs r0, #0x80 - ands r0, r1 - cmp r0, #0 - beq _08075186 - adds r0, r5, #0 - adds r0, #0x68 - ldrb r1, [r0] - adds r1, #1 - strb r1, [r0] - movs r0, #0x3c - strb r0, [r5, #0xe] -_08075186: - pop {r4, r5, pc} - .align 2, 0 -_08075188: .4byte 0x0000014B - - thumb_func_start sub_0807518C -sub_0807518C: @ 0x0807518C - push {lr} - adds r1, r0, #0 - ldrb r0, [r1, #0xe] - subs r0, #1 - strb r0, [r1, #0xe] - lsls r0, r0, #0x18 - cmp r0, #0 - bne _080751AA - adds r1, #0x68 - ldrb r0, [r1] - adds r0, #1 - strb r0, [r1] - ldr r1, _080751AC @ =gPlayerState - ldr r0, _080751B0 @ =0x000003C9 - strh r0, [r1, #8] -_080751AA: - pop {pc} - .align 2, 0 -_080751AC: .4byte gPlayerState -_080751B0: .4byte 0x000003C9 - - thumb_func_start sub_080751B4 -sub_080751B4: @ 0x080751B4 - push {r4, lr} - adds r4, r0, #0 - bl UpdateAnimationSingleFrame - adds r0, r4, #0 - adds r0, #0x5a - ldrb r1, [r0] - movs r0, #0x80 - ands r0, r1 - cmp r0, #0 - beq _080751E2 - movs r1, #0 - movs r0, #4 - strb r0, [r4, #0x14] - movs r0, #1 - strb r0, [r4, #0xd] - adds r0, r4, #0 - adds r0, #0x68 - strb r1, [r0] - ldr r1, _080751E4 @ =gPlayerState - movs r0, #0x80 - lsls r0, r0, #1 - strh r0, [r1, #8] -_080751E2: - pop {r4, pc} - .align 2, 0 -_080751E4: .4byte gPlayerState - - thumb_func_start sub_080751E8 -sub_080751E8: @ 0x080751E8 - push {r4, r5, r6, r7, lr} - adds r7, r0, #0 - adds r5, r1, #0 - adds r6, r2, #0 - ldr r4, _08075230 @ =gPlayerScriptExecutionContext - adds r0, r4, #0 - movs r1, #0x24 - bl MemClear - str r6, [r4] - ldr r0, _08075234 @ =gPlayerEntity - adds r0, #0x84 - str r4, [r0] - ldr r2, _08075238 @ =gPlayerState - movs r1, #0 - movs r0, #0x1c - strb r0, [r2, #0xc] - adds r0, r2, #0 - adds r0, #0x38 - movs r4, #1 - strb r4, [r0] - adds r3, r2, #0 - adds r3, #0x39 - strb r1, [r3] - adds r0, #2 - strb r5, [r0] - ldr r0, [r2, #0x30] - movs r1, #8 - orrs r0, r1 - str r0, [r2, #0x30] - cmp r7, #0 - bne _08075240 - strb r7, [r3] - ldr r6, _0807523C @ =script_08009ECC - b _08075244 - .align 2, 0 -_08075230: .4byte gPlayerScriptExecutionContext -_08075234: .4byte gPlayerEntity -_08075238: .4byte gPlayerState -_0807523C: .4byte script_08009ECC -_08075240: - strb r4, [r3] - ldr r6, _08075290 @ =script_08009EF0 -_08075244: - ldr r0, _08075294 @ =gPlayerState - adds r0, #0x39 - ldrb r0, [r0] - movs r1, #0 - cmp r0, #0 - bne _08075252 - movs r1, #2 -_08075252: - movs r0, #0x5b - movs r2, #0 - bl CreateObject - adds r4, r0, #0 - cmp r4, #0 - beq _08075270 - ldr r0, _08075298 @ =gPlayerEntity - adds r1, r4, #0 - bl CopyPosition - adds r0, r4, #0 - adds r1, r6, #0 - bl StartCutscene -_08075270: - ldr r4, _08075298 @ =gPlayerEntity - movs r1, #0xe - rsbs r1, r1, #0 - movs r2, #0x1c - rsbs r2, r2, #0 - adds r0, r4, #0 - bl CreateSpeechBubbleSleep - str r0, [r4, #0x6c] - cmp r0, #0 - beq _0807528C - movs r1, #3 - bl SetDefaultPriority -_0807528C: - pop {r4, r5, r6, r7, pc} - .align 2, 0 -_08075290: .4byte script_08009EF0 -_08075294: .4byte gPlayerState -_08075298: .4byte gPlayerEntity - - thumb_func_start sub_0807529C -sub_0807529C: @ 0x0807529C - push {lr} - movs r2, #0x20 - rsbs r2, r2, #0 - movs r1, #8 - bl CreateSpeechBubbleQuestionMark - pop {pc} - .align 2, 0 - - thumb_func_start sub_080752AC -sub_080752AC: @ 0x080752AC - push {r4, r5, lr} - adds r5, r0, #0 - adds r4, r1, #0 - bl sub_0806F69C - ldrb r0, [r4, #0x18] - cmp r0, #0 - bne _080752D0 - adds r0, r5, #0 - bl sub_080002B8 - cmp r0, #0x29 - beq _080752DC - movs r0, #1 - strb r0, [r4, #0x18] - movs r0, #6 - strb r0, [r4, #0x19] - b _080752DC -_080752D0: - ldrb r0, [r4, #0x19] - subs r0, #1 - strb r0, [r4, #0x19] - lsls r0, r0, #0x18 - cmp r0, #0 - beq _080752E2 -_080752DC: - ldr r1, _080752E4 @ =gActiveScriptInfo - movs r0, #0 - strb r0, [r1, #6] -_080752E2: - pop {r4, r5, pc} - .align 2, 0 -_080752E4: .4byte gActiveScriptInfo - - thumb_func_start sub_080752E8 -sub_080752E8: @ 0x080752E8 - push {lr} - ldr r3, _080752FC @ =gItemFunctions - ldrb r2, [r0, #1] - lsls r2, r2, #2 - adds r2, r2, r3 - ldr r2, [r2] - bl _call_via_r2 - pop {pc} - .align 2, 0 -_080752FC: .4byte gItemFunctions diff --git a/asm/code_08078778.s b/asm/code_08078778.s index 973db1ec..61f876d3 100644 --- a/asm/code_08078778.s +++ b/asm/code_08078778.s @@ -862,8 +862,8 @@ sub_08078EE4: @ 0x08078EE4 _08078EF4: .4byte gPlayerEntity _08078EF8: .4byte gPlayerState - thumb_func_start sub_08078EFC -sub_08078EFC: @ 0x08078EFC + thumb_func_start RunQueuedAction +RunQueuedAction: @ 0x08078EFC push {lr} ldr r3, _08078F18 @ =gPlayerState ldrb r2, [r3, #0xc] @@ -894,7 +894,7 @@ sub_08078F24: @ 0x08078F24 ands r0, r3 cmp r0, #0 beq _08078F3C - bl sub_08078F60 + bl ResetPlayerVelocity b _08078F5A .align 2, 0 _08078F38: .4byte gPlayerState @@ -919,8 +919,8 @@ _08078F5A: .align 2, 0 _08078F5C: .4byte gSineTable - thumb_func_start sub_08078F60 -sub_08078F60: @ 0x08078F60 + thumb_func_start ResetPlayerVelocity +ResetPlayerVelocity: @ 0x08078F60 ldr r0, _08078F70 @ =gPlayerState adds r1, r0, #0 adds r1, #0x8c @@ -3282,7 +3282,7 @@ _0807A104: thumb_func_start sub_0807A108 sub_0807A108: @ 0x0807A108 push {lr} - ldr r1, _0807A148 @ =gUnk_03004040 + ldr r1, _0807A148 @ =gPlayerClones movs r0, #0 str r0, [r1] str r0, [r1, #4] @@ -3315,7 +3315,7 @@ _0807A130: _0807A144: pop {pc} .align 2, 0 -_0807A148: .4byte gUnk_03004040 +_0807A148: .4byte gPlayerClones _0807A14C: .4byte gPlayerState _0807A150: .4byte 0xFFBFFFFF _0807A154: .4byte gPlayerEntity @@ -3483,8 +3483,8 @@ _0807A28C: .4byte gPlayerEntity _0807A290: .4byte gPlayerState _0807A294: .4byte gUnk_08007CAC - thumb_func_start sub_0807A298 -sub_0807A298: @ 0x0807A298 + thumb_func_start EnablePlayerDraw +EnablePlayerDraw: @ 0x0807A298 movs r1, #0 strb r1, [r0, #0xb] ldrb r1, [r0, #0x18] diff --git a/asm/crenalBeanSprout.s b/asm/crenalBeanSprout.s index 1085ea32..19ed952e 100644 --- a/asm/crenalBeanSprout.s +++ b/asm/crenalBeanSprout.s @@ -535,7 +535,7 @@ sub_08096740: @ 0x08096740 adds r4, r0, #0 movs r0, #0x10 movs r1, #0 - bl sub_08080964 + bl InitScreenShake movs r1, #0 movs r0, #1 strb r0, [r4, #0xc] diff --git a/asm/enemy4D.s b/asm/enemy4D.s index 669274fd..f7b116a9 100644 --- a/asm/enemy4D.s +++ b/asm/enemy4D.s @@ -284,7 +284,7 @@ _0803EDC0: strb r0, [r2, #0xe] movs r0, #8 movs r1, #0 - bl sub_08080964 + bl InitScreenShake _0803EDD0: pop {pc} .align 2, 0 diff --git a/asm/enemy50.s b/asm/enemy50.s index cdab7151..d43aaafe 100644 --- a/asm/enemy50.s +++ b/asm/enemy50.s @@ -854,7 +854,7 @@ sub_08041134: @ 0x08041134 movs r0, #0x25 strb r0, [r1] movs r5, #0 - ldr r0, _08041168 @ =gUnk_03004040 + ldr r0, _08041168 @ =gPlayerClones ldr r0, [r0] cmp r0, #0 beq _08041150 @@ -872,7 +872,7 @@ _08041150: strh r0, [r1] pop {r4, r5, pc} .align 2, 0 -_08041168: .4byte gUnk_03004040 +_08041168: .4byte gPlayerClones _0804116C: .4byte gUnk_080D0E18 thumb_func_start sub_08041170 diff --git a/asm/enemy62.s b/asm/enemy62.s index d9e780b5..17c90185 100644 --- a/asm/enemy62.s +++ b/asm/enemy62.s @@ -105,7 +105,7 @@ _08048E48: bl SoundReq movs r0, #0x28 movs r1, #0 - bl sub_08080964 + bl InitScreenShake _08048E5C: adds r2, r5, #0 adds r2, #0x3d diff --git a/asm/ghini.s b/asm/ghini.s index 2a43603a..5ffffb3e 100644 --- a/asm/ghini.s +++ b/asm/ghini.s @@ -851,7 +851,7 @@ sub_0803F630: @ 0x0803F630 movs r0, #0x25 strb r0, [r1] movs r5, #0 - ldr r0, _0803F664 @ =gUnk_03004040 + ldr r0, _0803F664 @ =gPlayerClones ldr r0, [r0] cmp r0, #0 beq _0803F64C @@ -869,7 +869,7 @@ _0803F64C: strh r0, [r1] pop {r4, r5, pc} .align 2, 0 -_0803F664: .4byte gUnk_03004040 +_0803F664: .4byte gPlayerClones _0803F668: .4byte gUnk_080D0980 thumb_func_start sub_0803F66C @@ -937,7 +937,7 @@ sub_0803F6C0: @ 0x0803F6C0 bl ModHealth adds r0, r4, #0 movs r1, #0x7a - bl sub_0800449C + bl SoundReqClipped pop {r4, pc} .align 2, 0 _0803F6E8: .4byte gPlayerEntity diff --git a/asm/gleerok.s b/asm/gleerok.s index 32779e12..2ba8ead0 100644 --- a/asm/gleerok.s +++ b/asm/gleerok.s @@ -900,7 +900,7 @@ sub_0802D6F0: @ 0x0802D6F0 str r0, [r2, #0x7c] movs r0, #0x96 movs r1, #0 - bl sub_08080964 + bl InitScreenShake _0802D712: pop {pc} @@ -2496,7 +2496,7 @@ _0802E23A: movs r0, #0xf0 strh r0, [r7] movs r1, #0 - bl sub_08080964 + bl InitScreenShake b _0802E2E4 .align 2, 0 _0802E280: .4byte gPlayerEntity @@ -2545,7 +2545,7 @@ _0802E29E: strh r0, [r1] movs r0, #0x1e movs r1, #0 - bl sub_08080964 + bl InitScreenShake _0802E2E4: movs r0, #5 strb r0, [r5, #0xb] diff --git a/asm/gyorgBossObject.s b/asm/gyorgBossObject.s index bf2efd4e..99359f15 100644 --- a/asm/gyorgBossObject.s +++ b/asm/gyorgBossObject.s @@ -399,7 +399,7 @@ sub_080A189C: @ 0x080A189C bl SoundReq movs r0, #0x96 movs r1, #1 - bl sub_08080964 + bl InitScreenShake _080A18E6: ldr r2, _080A1904 @ =gPlayerState ldr r1, _080A1908 @ =gRoomControls @@ -521,7 +521,7 @@ sub_080A1990: @ 0x080A1990 bl SoundReq movs r0, #0x96 movs r1, #1 - bl sub_08080964 + bl InitScreenShake _080A19D6: ldr r2, _080A19F4 @ =gPlayerState ldr r1, _080A19F8 @ =gRoomControls @@ -640,7 +640,7 @@ sub_080A1A80: @ 0x080A1A80 bl SoundReq movs r0, #0x96 movs r1, #1 - bl sub_08080964 + bl InitScreenShake _080A1AC0: ldr r2, _080A1AE0 @ =gPlayerState ldr r1, _080A1AE4 @ =gRoomControls @@ -728,7 +728,7 @@ sub_080A1B4C: @ 0x080A1B4C beq _080A1B80 movs r0, #0x2d movs r1, #1 - bl sub_08080964 + bl InitScreenShake movs r0, #0x94 lsls r0, r0, #1 bl SoundReq @@ -860,7 +860,7 @@ _080A1C76: movs r0, #0xb4 lsls r0, r0, #2 movs r1, #2 - bl sub_08080964 + bl InitScreenShake b _080A1C9A _080A1C8A: movs r0, #0x94 @@ -868,7 +868,7 @@ _080A1C8A: bl SoundReq movs r0, #0x4b movs r1, #1 - bl sub_08080964 + bl InitScreenShake _080A1C9A: pop {r4, pc} @@ -1418,7 +1418,7 @@ _080A20A4: bne _080A20B4 movs r0, #0x1e movs r1, #0 - bl sub_08080964 + bl InitScreenShake b _080A20B4 _080A20B2: strb r0, [r4] diff --git a/asm/gyorgFemale.s b/asm/gyorgFemale.s index 3d90df67..2b113b5c 100644 --- a/asm/gyorgFemale.s +++ b/asm/gyorgFemale.s @@ -813,7 +813,7 @@ _08046498: beq _0804650E movs r0, #8 movs r1, #0 - bl sub_08080964 + bl InitScreenShake adds r1, r4, #0 adds r1, #0x82 ldrb r0, [r1] @@ -965,7 +965,7 @@ _080466D0: beq _08046746 movs r0, #8 movs r1, #0 - bl sub_08080964 + bl InitScreenShake adds r1, r4, #0 adds r1, #0x82 ldrb r0, [r1] diff --git a/asm/hittableLever.s b/asm/hittableLever.s index f3cb73c2..0efb82fb 100644 --- a/asm/hittableLever.s +++ b/asm/hittableLever.s @@ -121,7 +121,7 @@ _0808A7C2: _0808A7C8: ldr r1, _0808A7D4 @ =0x00000117 adds r0, r5, #0 - bl sub_0800449C + bl SoundReqClipped _0808A7D0: pop {r4, r5, pc} .align 2, 0 diff --git a/asm/ladderUp.s b/asm/ladderUp.s index 1eaecf27..cd53a0b7 100644 --- a/asm/ladderUp.s +++ b/asm/ladderUp.s @@ -101,7 +101,7 @@ _0808D4E8: _0808D4FE: movs r0, #0x1e movs r1, #0 - bl sub_08080964 + bl InitScreenShake ldr r0, _0808D514 @ =0x0000010B bl SoundReq movs r0, #2 @@ -358,7 +358,7 @@ _0808DBF8: _0808DC0E: movs r0, #0x1e movs r1, #0 - bl sub_08080964 + bl InitScreenShake ldr r0, _0808DC28 @ =0x0000010B bl SoundReq movs r0, #2 diff --git a/asm/lilypadLarge.s b/asm/lilypadLarge.s index a9158fe8..045a9be9 100644 --- a/asm/lilypadLarge.s +++ b/asm/lilypadLarge.s @@ -1380,7 +1380,7 @@ sub_08085F48: @ 0x08085F48 ldrb r0, [r5, #0x12] cmp r0, #0x17 bne _08085F6A - bl sub_08078F60 + bl ResetPlayerVelocity movs r0, #0x19 strb r0, [r5, #0x12] _08085F6A: diff --git a/asm/macroBook.s b/asm/macroBook.s index 3b3396a4..2e6a0704 100644 --- a/asm/macroBook.s +++ b/asm/macroBook.s @@ -132,7 +132,7 @@ _0809A85C: beq _0809A87C subs r0, #1 strb r0, [r4, #0xe] - ldr r0, _0809A878 @ =gUnk_03004040 + ldr r0, _0809A878 @ =gPlayerClones ldr r1, [r0] cmp r1, #0 bne _0809A8A0 @@ -142,7 +142,7 @@ _0809A870: strb r1, [r4, #0xe] b _0809A8A0 .align 2, 0 -_0809A878: .4byte gUnk_03004040 +_0809A878: .4byte gPlayerClones _0809A87C: adds r0, r4, #0 adds r0, #0x5a @@ -241,7 +241,7 @@ _0809A92A: adds r0, r4, #0 movs r2, #1 bl sub_0809AA9C - ldr r0, _0809A954 @ =gUnk_03004040 + ldr r0, _0809A954 @ =gPlayerClones ldr r1, [r0] cmp r1, #0 beq _0809A94E @@ -252,7 +252,7 @@ _0809A94E: pop {r4, pc} .align 2, 0 _0809A950: .4byte gPlayerEntity -_0809A954: .4byte gUnk_03004040 +_0809A954: .4byte gPlayerClones thumb_func_start sub_0809A958 sub_0809A958: @ 0x0809A958 @@ -408,7 +408,7 @@ _0809AA5C: adds r1, r4, #0 movs r2, #1 bl sub_0809AA9C - ldr r0, _0809AA98 @ =gUnk_03004040 + ldr r0, _0809AA98 @ =gPlayerClones ldr r4, [r0] cmp r4, #0 beq _0809AA8E @@ -422,7 +422,7 @@ _0809AA8E: pop {r4, r5, r6, r7, pc} .align 2, 0 _0809AA94: .4byte gPlayerEntity -_0809AA98: .4byte gUnk_03004040 +_0809AA98: .4byte gPlayerClones thumb_func_start sub_0809AA9C sub_0809AA9C: @ 0x0809AA9C diff --git a/asm/non_matching/pesto/sub_08024E4C.inc b/asm/non_matching/pesto/sub_08024E4C.inc index affeab56..b3d6d0e9 100644 --- a/asm/non_matching/pesto/sub_08024E4C.inc +++ b/asm/non_matching/pesto/sub_08024E4C.inc @@ -123,7 +123,7 @@ _08024ECC: bl ModHealth adds r0, r6, #0 movs r1, #0x7a - bl sub_0800449C + bl SoundReqClipped _08024F46: pop {r4, r5, r6, r7, pc} .align 2, 0 diff --git a/asm/non_matching/player/PlayerNormal.inc b/asm/non_matching/player/PlayerNormal.inc index 17b2e5e8..514075d5 100644 --- a/asm/non_matching/player/PlayerNormal.inc +++ b/asm/non_matching/player/PlayerNormal.inc @@ -99,7 +99,7 @@ _08070852: adds r0, r5, #0 adds r0, #0x40 strb r4, [r0] - bl sub_08078EFC + bl RunQueuedAction cmp r0, #0 beq _08070868 b _08070BE4 @@ -156,7 +156,7 @@ _080708AC: bne _080708C4 bl UpdateFloorType _080708C4: - bl sub_08078EFC + bl RunQueuedAction cmp r0, #0 beq _080708CE b _08070BE4 @@ -195,7 +195,7 @@ _08070902: b _08070BE4 _0807090C: bl UpdateFloorType - bl sub_08078EFC + bl RunQueuedAction b _08070BE4 .align 2, 0 _08070918: .4byte gPlayerState @@ -296,7 +296,7 @@ _080709D8: _080709FC: adds r0, r5, #0 bl sub_08077698 - bl sub_08078EFC + bl RunQueuedAction cmp r0, #0 beq _08070A0C b _08070BE4 @@ -321,7 +321,7 @@ _08070A26: _08070A32: adds r0, r5, #0 bl sub_08073904 - bl sub_08078EFC + bl RunQueuedAction cmp r0, #0 beq _08070A42 b _08070BE4 @@ -432,7 +432,7 @@ _08070B00: _08070B0E: cmp r0, #1 bne _08070B18 - bl sub_08078F60 + bl ResetPlayerVelocity b _08070B1E _08070B18: adds r0, r5, #0 diff --git a/asm/non_matching/player/sub_08070DC4.inc b/asm/non_matching/player/sub_08070DC4.inc index 5f9b8e7e..8d544d6b 100644 --- a/asm/non_matching/player/sub_08070DC4.inc +++ b/asm/non_matching/player/sub_08070DC4.inc @@ -6,7 +6,7 @@ bl sub_080085B0 bl sub_08079E08 bl UpdateFloorType - bl sub_08078EFC + bl RunQueuedAction cmp r0, #0 bne _08070E76 movs r1, #0x80 @@ -17,7 +17,7 @@ bne _08070E76 ldr r6, _08070E18 @ =gPlayerState strb r0, [r6, #2] - bl sub_08078EFC + bl RunQueuedAction adds r5, r0, #0 cmp r5, #0 bne _08070E76 diff --git a/asm/non_matching/player/sub_08073584.inc b/asm/non_matching/player/sub_08073584.inc new file mode 100644 index 00000000..43ee516b --- /dev/null +++ b/asm/non_matching/player/sub_08073584.inc @@ -0,0 +1,280 @@ + .syntax unified + push {r4, r5, r6, lr} + adds r4, r0, #0 + ldr r2, _080735DC @ =gPlayerState + adds r0, r2, #0 + adds r0, #0x92 + ldrh r1, [r0] + movs r5, #0x80 + adds r0, r5, #0 + ands r0, r1 + adds r6, r2, #0 + cmp r0, #0 + bne _080735C0 + adds r0, r4, #0 + adds r0, #0x3d + ldrb r0, [r0] + lsls r0, r0, #0x18 + asrs r0, r0, #0x18 + cmp r0, #0 + bgt _080735C0 + adds r0, r6, #0 + adds r0, #0x3c + ldrb r0, [r0] + cmp r0, #0 + bne _080735C0 + ldr r0, [r6, #0x30] + movs r1, #0x80 + lsls r1, r1, #0x11 + ands r0, r1 + cmp r0, #0 + bne _080735E0 +_080735C0: + ldrb r0, [r6, #2] + movs r1, #0x40 + orrs r1, r0 + strb r1, [r6, #2] + bl sub_0807921C + adds r0, r4, #0 + bl sub_08073904 + movs r0, #0xe6 + lsls r0, r0, #3 + strh r0, [r6, #8] + b _08073794 + .align 2, 0 +_080735DC: .4byte gPlayerState +_080735E0: + ldr r0, _0807360C @ =gUnk_0200AF00 + adds r0, #0x2f + movs r1, #1 + strb r1, [r0] + movs r0, #0 + bl sub_0807A2F8 + cmp r0, #0 + beq _08073610 + ldrb r0, [r4, #0xd] + adds r0, #1 + strb r0, [r4, #0xd] + ldrb r1, [r4, #0x14] + movs r0, #6 + ands r0, r1 + lsls r0, r0, #2 + strb r0, [r4, #0x15] + ldrb r1, [r4, #0x10] + movs r0, #0x7f + ands r0, r1 + strb r0, [r4, #0x10] + b _08073794 + .align 2, 0 +_0807360C: .4byte gUnk_0200AF00 +_08073610: + ldr r0, _08073620 @ =gArea + ldrb r0, [r0, #1] + cmp r0, #0x10 + bne _08073624 + movs r0, #0x80 + lsls r0, r0, #1 + strh r0, [r4, #0x24] + b _08073626 + .align 2, 0 +_08073620: .4byte gArea +_08073624: + strh r5, [r4, #0x24] +_08073626: + ldr r3, _08073650 @ =gPlayerState + ldrb r1, [r3, #0xd] + movs r0, #0x80 + ands r0, r1 + adds r2, r4, #0 + adds r2, #0x80 + cmp r0, #0 + bne _0807365A + ldrb r0, [r4, #0x15] + cmp r0, r1 + beq _0807365A + ldrb r1, [r3, #0xd] + subs r0, r0, r1 + movs r1, #0x1f + ands r0, r1 + cmp r0, #0xf + bgt _08073654 + ldr r0, [r2] + subs r0, #0x20 + b _08073658 + .align 2, 0 +_08073650: .4byte gPlayerState +_08073654: + ldr r0, [r2] + adds r0, #0x20 +_08073658: + str r0, [r2] +_0807365A: + ldr r0, [r2] + lsrs r0, r0, #8 + movs r1, #0x1f + ands r0, r1 + strb r0, [r4, #0x15] + bl sub_08079E08 + ldrb r2, [r4, #0x14] + lsls r3, r2, #2 + ldrb r1, [r4, #0x15] + cmp r2, #0 + bne _0807367C + adds r3, #8 + movs r0, #0x1f + ands r3, r0 + adds r1, #8 + ands r1, r0 +_0807367C: + subs r0, r3, #7 + cmp r0, r1 + bls _08073686 + subs r3, r2, #2 + b _0807368E +_08073686: + adds r0, r3, #7 + cmp r0, r1 + bhs _08073694 + adds r3, r2, #2 +_0807368E: + movs r0, #7 + ands r3, r0 + b _08073696 +_08073694: + adds r3, r2, #0 +_08073696: + movs r0, #0x87 + adds r0, r0, r4 + mov ip, r0 + ldrb r1, [r4, #0x14] + cmp r3, r1 + beq _080736A8 + movs r0, #0x14 + mov r2, ip + strb r0, [r2] +_080736A8: + strb r3, [r4, #0x14] + movs r5, #0 + ldr r1, _080736E4 @ =gPlayerState + ldrb r2, [r1, #0xd] + lsrs r3, r2, #2 + mov r6, ip + ldrb r0, [r6] + adds r6, r1, #0 + cmp r0, #0 + beq _080736CA + movs r0, #0x80 + ands r0, r2 + cmp r0, #0 + bne _08073736 + ldrb r0, [r4, #0x14] + cmp r0, r3 + beq _08073736 +_080736CA: + movs r0, #0x80 + ands r0, r2 + cmp r0, #0 + bne _080736FA + ldrb r2, [r4, #0x14] + cmp r2, r3 + beq _080736FA + movs r0, #4 + eors r0, r3 + cmp r2, r0 + bne _080736E8 + movs r5, #2 + b _080736FA + .align 2, 0 +_080736E4: .4byte gPlayerState +_080736E8: + movs r0, #6 + ands r0, r3 + adds r0, #2 + movs r1, #7 + ands r0, r1 + movs r5, #3 + cmp r2, r0 + bne _080736FA + movs r5, #1 +_080736FA: + ldr r1, _0807371C @ =gUnk_0811BC28 + lsls r0, r5, #1 + adds r0, r0, r1 + ldrh r0, [r0] + ldrh r1, [r6, #8] + cmp r0, r1 + bne _0807372C + ldr r0, _08073720 @ =gArea + ldrb r0, [r0, #1] + cmp r0, #0x10 + bne _08073724 + adds r0, r4, #0 + movs r1, #2 + bl sub_080042BA + b _0807372E + .align 2, 0 +_0807371C: .4byte gUnk_0811BC28 +_08073720: .4byte gArea +_08073724: + adds r0, r4, #0 + bl UpdateAnimationSingleFrame + b _0807372E +_0807372C: + strh r0, [r6, #8] +_0807372E: + adds r0, r4, #0 + adds r0, #0x86 + strb r5, [r0] + b _08073762 +_08073736: + mov r2, ip + ldrb r0, [r2] + subs r0, #1 + strb r0, [r2] + ldr r1, _0807375C @ =gUnk_0811BC30 + adds r0, r4, #0 + adds r0, #0x86 + ldrb r0, [r0] + lsls r0, r0, #1 + adds r0, r0, r1 + ldrh r0, [r0] + ldrh r1, [r6, #8] + cmp r0, r1 + bne _08073760 + adds r0, r4, #0 + bl UpdateAnimationSingleFrame + b _08073762 + .align 2, 0 +_0807375C: .4byte gUnk_0811BC30 +_08073760: + strh r0, [r6, #8] +_08073762: + ldr r0, [r4, #0x7c] + subs r1, r0, #1 + str r1, [r4, #0x7c] + movs r0, #1 + rsbs r0, r0, #0 + cmp r1, r0 + bne _08073784 + ldr r2, _08073780 @ =gPlayerState + ldrb r1, [r2, #2] + movs r0, #0x40 + orrs r0, r1 + strb r0, [r2, #2] + bl sub_0807921C + b _08073794 + .align 2, 0 +_08073780: .4byte gPlayerState +_08073784: + adds r0, r1, #0 + movs r1, #0x14 + bl __divsi3 + ldr r2, _08073798 @ =0x0000FFF8 + adds r1, r2, #0 + subs r1, r1, r0 + strh r1, [r4, #0x36] +_08073794: + pop {r4, r5, r6, pc} + .align 2, 0 +_08073798: .4byte 0x0000FFF8 + .syntax divided diff --git a/asm/non_matching/player/sub_080740D8.inc b/asm/non_matching/player/sub_080740D8.inc new file mode 100644 index 00000000..f24b687f --- /dev/null +++ b/asm/non_matching/player/sub_080740D8.inc @@ -0,0 +1,123 @@ + .syntax unified + push {r4, r5, r6, lr} + adds r4, r0, #0 + bl UpdateAnimationSingleFrame + ldrb r0, [r4, #0xf] + cmp r0, #0 + bne _080740EA + ldrb r0, [r4, #0x15] + b _080740F0 +_080740EA: + ldrb r1, [r4, #0x15] + movs r0, #0x10 + eors r0, r1 +_080740F0: + cmp r0, #8 + beq _08074128 + cmp r0, #8 + bhi _080740FE + cmp r0, #0 + beq _08074168 + b _0807418C +_080740FE: + cmp r0, #0x10 + beq _08074148 + cmp r0, #0x18 + bne _0807418C + movs r0, #0x2e + ldrsh r1, [r4, r0] + ldr r2, [r4, #0x48] + ldrb r0, [r2, #2] + subs r1, r1, r0 + movs r0, #0 + ldrsb r0, [r2, r0] + adds r1, r1, r0 + ldr r3, _08074124 @ =gRoomControls + ldrh r0, [r3, #6] + subs r6, r1, r0 + movs r1, #0x32 + ldrsh r0, [r4, r1] + b _08074182 + .align 2, 0 +_08074124: .4byte gRoomControls +_08074128: + ldr r2, [r4, #0x48] + movs r1, #0x2e + ldrsh r0, [r4, r1] + ldrb r1, [r2, #2] + adds r0, r0, r1 + movs r1, #0 + ldrsb r1, [r2, r1] + adds r0, r0, r1 + ldr r3, _08074144 @ =gRoomControls + ldrh r1, [r3, #6] + subs r6, r0, r1 + movs r1, #0x32 + ldrsh r0, [r4, r1] + b _08074182 + .align 2, 0 +_08074144: .4byte gRoomControls +_08074148: + movs r0, #0x2e + ldrsh r1, [r4, r0] + ldr r2, [r4, #0x48] + movs r0, #0 + ldrsb r0, [r2, r0] + adds r1, r1, r0 + ldr r3, _08074164 @ =gRoomControls + ldrh r0, [r3, #6] + subs r6, r1, r0 + movs r1, #0x32 + ldrsh r0, [r4, r1] + ldrb r1, [r2, #5] + adds r0, r0, r1 + b _08074182 + .align 2, 0 +_08074164: .4byte gRoomControls +_08074168: + movs r0, #0x2e + ldrsh r1, [r4, r0] + ldr r2, [r4, #0x48] + movs r0, #0 + ldrsb r0, [r2, r0] + adds r1, r1, r0 + ldr r3, _080741A4 @ =gRoomControls + ldrh r0, [r3, #6] + subs r6, r1, r0 + movs r1, #0x32 + ldrsh r0, [r4, r1] + ldrb r1, [r2, #5] + subs r0, r0, r1 +_08074182: + movs r1, #1 + ldrsb r1, [r2, r1] + adds r0, r0, r1 + ldrh r1, [r3, #8] + subs r5, r0, r1 +_0807418C: + ldr r2, _080741A8 @ =gUnk_080082DC + adds r0, r6, #0 + adds r1, r5, #0 + bl sub_080086B4 + cmp r0, #0 + beq _080741AC + adds r0, r4, #0 + bl sub_0806F69C + b _080741B0 + .align 2, 0 +_080741A4: .4byte gRoomControls +_080741A8: .4byte gUnk_080082DC +_080741AC: + movs r0, #1 + strb r0, [r4, #0xf] +_080741B0: + movs r1, #0x80 + lsls r1, r1, #6 + adds r0, r4, #0 + bl GravityUpdate + cmp r0, #0 + bne _080741C2 + bl sub_0807921C +_080741C2: + pop {r4, r5, r6, pc} + .syntax divided diff --git a/asm/non_matching/player/sub_08074678.inc b/asm/non_matching/player/sub_08074678.inc new file mode 100644 index 00000000..3a3206b0 --- /dev/null +++ b/asm/non_matching/player/sub_08074678.inc @@ -0,0 +1,146 @@ + .syntax unified + push {r4, lr} + adds r4, r0, #0 + bl sub_080741C4 + cmp r0, #0 + beq _08074690 + ldr r0, _0807468C @ =gPlayerState + movs r1, #0 + strb r1, [r0, #0x11] + b _080746CE + .align 2, 0 +_0807468C: .4byte gPlayerState +_08074690: + adds r0, r4, #0 + adds r0, #0x45 + ldrb r0, [r0] + cmp r0, #0 + beq _0807476C + adds r0, r4, #0 + bl sub_08079C30 + adds r1, r0, #0 + cmp r1, #0 + bne _080746B0 + ldr r0, _080746AC @ =gPlayerState + strb r1, [r0, #0x11] + b _080746CE + .align 2, 0 +_080746AC: .4byte gPlayerState +_080746B0: + ldr r3, _080746D4 @ =gPlayerState + ldr r1, [r3, #0x30] + movs r0, #0x80 + ands r1, r0 + cmp r1, #0 + bne _0807476C + ldrb r2, [r3, #0x1e] + cmp r2, #0 + beq _080746D8 + movs r0, #0x40 + ands r0, r2 + cmp r0, #0 + beq _080746DC + strb r1, [r3, #0x11] + adds r0, r3, #0 +_080746CE: + adds r0, #0x37 + strb r1, [r0] + b _08074792 + .align 2, 0 +_080746D4: .4byte gPlayerState +_080746D8: + bl sub_08077B20 +_080746DC: + ldr r1, _08074700 @ =gPlayerState + adds r0, r1, #0 + adds r0, #0x37 + ldrb r0, [r0] + cmp r0, #1 + bne _08074704 + adds r0, r4, #0 + movs r1, #0x70 + movs r2, #0 + movs r3, #0 + bl CreateObjectWithParent + adds r0, r4, #0 + movs r1, #0x52 + movs r2, #0 + bl CreateFx + b _08074714 + .align 2, 0 +_08074700: .4byte gPlayerState +_08074704: + adds r0, r1, #0 + adds r0, #0x92 + ldrh r1, [r0] + movs r0, #0xf0 + lsls r0, r0, #4 + ands r0, r1 + cmp r0, #0 + beq _08074720 +_08074714: + ldr r0, _0807471C @ =0x00000161 + bl SoundReq + b _08074732 + .align 2, 0 +_0807471C: .4byte 0x00000161 +_08074720: + ldr r0, _08074760 @ =gScreenTransition + ldr r0, [r0] + movs r1, #0xf + ands r0, r1 + cmp r0, #0 + bne _08074732 + ldr r0, _08074764 @ =0x00000161 + bl SoundReq +_08074732: + ldr r2, _08074768 @ =gPlayerState + adds r1, r2, #0 + adds r1, #0x80 + ldrh r0, [r1] + subs r0, #0xf0 + strh r0, [r1] + adds r1, #0x28 + movs r0, #0x1b + strb r0, [r1] + adds r0, r2, #0 + adds r0, #0x37 + ldrb r0, [r0] + lsls r3, r0, #0x18 + lsrs r0, r3, #0x18 + cmp r0, #0xef + bhi _0807476C + subs r1, #0x69 + lsrs r0, r3, #0x1d + adds r0, #4 + ldrb r2, [r1] + adds r0, r0, r2 + strb r0, [r1] + b _08074792 + .align 2, 0 +_08074760: .4byte gScreenTransition +_08074764: .4byte 0x00000161 +_08074768: .4byte gPlayerState +_0807476C: + ldr r2, _08074794 @ =gPlayerState + ldr r0, [r2, #0x30] + ldr r1, _08074798 @ =0xFFFBFFFF + ands r0, r1 + str r0, [r2, #0x30] + adds r0, r4, #0 + movs r1, #0x52 + movs r2, #0 + bl CreateFx + adds r1, r4, #0 + adds r1, #0x3d + movs r0, #0x20 + strb r0, [r1] + subs r0, #0x24 + bl ModHealth + bl RespawnPlayer +_08074792: + pop {r4, pc} + .align 2, 0 +_08074794: .4byte gPlayerState +_08074798: .4byte 0xFFFBFFFF + .syntax divided diff --git a/asm/non_matching/player/sub_080751E8.inc b/asm/non_matching/player/sub_080751E8.inc new file mode 100644 index 00000000..6140893a --- /dev/null +++ b/asm/non_matching/player/sub_080751E8.inc @@ -0,0 +1,84 @@ + .syntax unified + push {r4, r5, r6, r7, lr} + adds r7, r0, #0 + adds r5, r1, #0 + adds r6, r2, #0 + ldr r4, _08075230 @ =gPlayerScriptExecutionContext + adds r0, r4, #0 + movs r1, #0x24 + bl MemClear + str r6, [r4] + ldr r0, _08075234 @ =gPlayerEntity + adds r0, #0x84 + str r4, [r0] + ldr r2, _08075238 @ =gPlayerState + movs r1, #0 + movs r0, #0x1c + strb r0, [r2, #0xc] + adds r0, r2, #0 + adds r0, #0x38 + movs r4, #1 + strb r4, [r0] + adds r3, r2, #0 + adds r3, #0x39 + strb r1, [r3] + adds r0, #2 + strb r5, [r0] + ldr r0, [r2, #0x30] + movs r1, #8 + orrs r0, r1 + str r0, [r2, #0x30] + cmp r7, #0 + bne _08075240 + strb r7, [r3] + ldr r6, _0807523C @ =script_08009ECC + b _08075244 + .align 2, 0 +_08075230: .4byte gPlayerScriptExecutionContext +_08075234: .4byte gPlayerEntity +_08075238: .4byte gPlayerState +_0807523C: .4byte script_08009ECC +_08075240: + strb r4, [r3] + ldr r6, _08075290 @ =script_08009EF0 +_08075244: + ldr r0, _08075294 @ =gPlayerState + adds r0, #0x39 + ldrb r0, [r0] + movs r1, #0 + cmp r0, #0 + bne _08075252 + movs r1, #2 +_08075252: + movs r0, #0x5b + movs r2, #0 + bl CreateObject + adds r4, r0, #0 + cmp r4, #0 + beq _08075270 + ldr r0, _08075298 @ =gPlayerEntity + adds r1, r4, #0 + bl CopyPosition + adds r0, r4, #0 + adds r1, r6, #0 + bl StartCutscene +_08075270: + ldr r4, _08075298 @ =gPlayerEntity + movs r1, #0xe + rsbs r1, r1, #0 + movs r2, #0x1c + rsbs r2, r2, #0 + adds r0, r4, #0 + bl CreateSpeechBubbleSleep + str r0, [r4, #0x6c] + cmp r0, #0 + beq _0807528C + movs r1, #3 + bl SetDefaultPriority +_0807528C: + pop {r4, r5, r6, r7, pc} + .align 2, 0 +_08075290: .4byte script_08009EF0 +_08075294: .4byte gPlayerState +_08075298: .4byte gPlayerEntity + .syntax divided diff --git a/asm/non_matching/playerItemSword/sub_080A7A84.inc b/asm/non_matching/playerItemSword/sub_080A7A84.inc index b9593ac8..319ab249 100644 --- a/asm/non_matching/playerItemSword/sub_080A7A84.inc +++ b/asm/non_matching/playerItemSword/sub_080A7A84.inc @@ -88,7 +88,7 @@ _080A7AEC: bne _080A7B4C ldr r0, _080A7B44 @ =gPlayerEntity ldr r1, _080A7B48 @ =0x00000119 - bl sub_0800449C + bl SoundReqClipped b _080A7B54 .align 2, 0 _080A7B44: .4byte gPlayerEntity @@ -96,7 +96,7 @@ _080A7B48: .4byte 0x00000119 _080A7B4C: ldr r0, _080A7B90 @ =gPlayerEntity movs r1, #0x74 - bl sub_0800449C + bl SoundReqClipped _080A7B54: movs r0, #0xf movs r1, #0x1a diff --git a/asm/non_matching/sub_0804BF38.inc b/asm/non_matching/sub_0804BF38.inc index 76232201..0072ac3b 100644 --- a/asm/non_matching/sub_0804BF38.inc +++ b/asm/non_matching/sub_0804BF38.inc @@ -96,7 +96,7 @@ _0804BFE0: _0804BFE8: ldrh r0, [r4, #0xa] ldrh r1, [r4, #0xc] - bl sub_08080964 + bl InitScreenShake ldrh r0, [r4, #0xe] bl SoundReq pop {r3, r4, r5} diff --git a/asm/object10.s b/asm/object10.s index b1aad4e8..33333b8e 100644 --- a/asm/object10.s +++ b/asm/object10.s @@ -142,7 +142,7 @@ sub_080848C8: @ 0x080848C8 lsls r0, r1, #0x10 cmp r0, #0 beq _0808493C - ldr r0, _0808498C @ =gUnk_03004040 + ldr r0, _0808498C @ =gPlayerClones ldrb r1, [r4, #0xa] lsls r1, r1, #2 adds r1, r1, r0 @@ -182,7 +182,7 @@ _0808496A: _08084980: .4byte gPlayerState _08084984: .4byte gUnk_08120574 _08084988: .4byte gPlayerEntity -_0808498C: .4byte gUnk_03004040 +_0808498C: .4byte gPlayerClones _08084990: .4byte 0x00000315 _08084994: cmp r0, #4 @@ -195,7 +195,7 @@ _08084994: adds r2, #0x38 ldrb r2, [r2] bl sub_08000152 - ldr r1, _080849C0 @ =gUnk_03004040 + ldr r1, _080849C0 @ =gPlayerClones ldrb r0, [r4, #0xa] lsls r0, r0, #2 adds r0, r0, r1 @@ -205,7 +205,7 @@ _08084994: b _080849D6 .align 2, 0 _080849BC: .4byte 0x00000315 -_080849C0: .4byte gUnk_03004040 +_080849C0: .4byte gPlayerClones _080849C4: ldrb r2, [r4, #0x18] lsls r1, r2, #0x1e @@ -246,7 +246,7 @@ _080849F6: beq _08084A04 b _08084AF8 _08084A04: - ldr r0, _08084A40 @ =gUnk_03004040 + ldr r0, _08084A40 @ =gPlayerClones ldrb r1, [r4, #0xa] lsls r1, r1, #2 adds r1, r1, r0 @@ -276,7 +276,7 @@ _08084A04: b _08084AF8 .align 2, 0 _08084A3C: .4byte gPlayerState -_08084A40: .4byte gUnk_03004040 +_08084A40: .4byte gPlayerClones _08084A44: .4byte gPlayerEntity _08084A48: adds r0, r4, #0 @@ -585,7 +585,7 @@ _08084CA8: .4byte gPlayerState sub_08084CAC: @ 0x08084CAC push {r4, r5, r6, r7, lr} adds r5, r0, #0 - ldr r6, _08084D18 @ =gUnk_03004040 + ldr r6, _08084D18 @ =gPlayerClones ldrb r0, [r5, #0xa] lsls r0, r0, #2 adds r0, r0, r6 @@ -636,7 +636,7 @@ sub_08084CAC: @ 0x08084CAC orrs r0, r1 b _08084D30 .align 2, 0 -_08084D18: .4byte gUnk_03004040 +_08084D18: .4byte gPlayerClones _08084D1C: .4byte gUnk_080B4468 _08084D20: .4byte gRoomControls _08084D24: diff --git a/asm/pressurePlate.s b/asm/pressurePlate.s index a001c65a..37a2339d 100644 --- a/asm/pressurePlate.s +++ b/asm/pressurePlate.s @@ -250,7 +250,7 @@ _080889CA: ands r0, r1 cmp r0, #0 beq _08088A3A - ldr r6, _08088A4C @ =gUnk_03004040 + ldr r6, _08088A4C @ =gPlayerClones ldr r1, [r6] adds r0, r4, #0 bl sub_080177A0 @@ -305,4 +305,4 @@ _08088A3A: _08088A40: .4byte gPlayerEntity _08088A44: .4byte gUnk_08120BEC _08088A48: .4byte gPlayerState -_08088A4C: .4byte gUnk_03004040 +_08088A4C: .4byte gPlayerClones diff --git a/asm/stairsInteract.s b/asm/stairsInteract.s deleted file mode 100644 index 025c0ec3..00000000 --- a/asm/stairsInteract.s +++ /dev/null @@ -1,129 +0,0 @@ - .include "asm/macros.inc" - - .include "constants/constants.inc" - - .syntax unified - - .text - - thumb_func_start sub_080731D8 -sub_080731D8: @ 0x080731D8 - push {r4, r5, r6, r7, lr} - adds r4, r0, #0 - ldrb r1, [r4, #0x10] - movs r0, #0x7f - ands r0, r1 - movs r2, #0 - strb r0, [r4, #0x10] - movs r1, #0 - movs r0, #0x40 - strh r0, [r4, #0x24] - strb r1, [r4, #0x14] - ldrh r1, [r4, #0x2e] - movs r5, #0x10 - rsbs r5, r5, #0 - adds r0, r5, #0 - ands r0, r1 - movs r7, #8 - orrs r0, r7 - strh r0, [r4, #0x2e] - strh r2, [r4, #0x2c] - ldr r6, _08073214 @ =gPlayerState - adds r0, r6, #0 - adds r0, #0x38 - ldrb r0, [r0] - cmp r0, #0 - bne _08073218 - movs r0, #1 - strb r0, [r4, #0xd] - b _0807329A - .align 2, 0 -_08073214: .4byte gPlayerState -_08073218: - ldrb r0, [r4, #0x18] - movs r1, #3 - orrs r0, r1 - strb r0, [r4, #0x18] - movs r0, #3 - strb r0, [r4, #0xd] - ldrh r0, [r4, #0x32] - adds r1, r4, #0 - adds r1, #0x7e - strh r0, [r1] - ldrh r0, [r4, #0x32] - subs r0, #0x10 - strh r0, [r4, #0x32] - adds r0, r4, #0 - movs r1, #0x70 - movs r2, #1 - movs r3, #0 - bl CreateObjectWithParent - str r0, [r4, #0x54] - adds r0, r6, #0 - adds r0, #0x39 - ldrb r0, [r0] - cmp r0, #7 - bne _08073270 - ldrh r1, [r4, #0x32] - adds r0, r5, #0 - ands r0, r1 - adds r0, #8 - strh r0, [r4, #0x32] - ldrh r1, [r4, #0x2e] - adds r0, r5, #0 - ands r0, r1 - strh r0, [r4, #0x2e] - strb r7, [r4, #0x15] - movs r0, #2 - strb r0, [r4, #0x14] - ldr r0, _0807326C @ =0x00000187 - bl SoundReq - b _08073294 - .align 2, 0 -_0807326C: .4byte 0x00000187 -_08073270: - ldrh r1, [r4, #0x32] - adds r0, r5, #0 - ands r0, r1 - adds r0, #2 - strh r0, [r4, #0x32] - ldrh r1, [r4, #0x2e] - adds r0, r5, #0 - ands r0, r1 - adds r0, #0xf - strh r0, [r4, #0x2e] - movs r0, #0x18 - strb r0, [r4, #0x15] - movs r0, #6 - strb r0, [r4, #0x14] - movs r0, #0xc4 - lsls r0, r0, #1 - bl SoundReq -_08073294: - adds r0, r4, #0 - bl sub_08066DE4 -_0807329A: - ldr r2, _080732AC @ =gPlayerState - ldr r0, [r2, #0x30] - movs r1, #8 - ands r0, r1 - cmp r0, #0 - beq _080732B4 - ldr r0, _080732B0 @ =0x00000404 - b _080732B8 - .align 2, 0 -_080732AC: .4byte gPlayerState -_080732B0: .4byte 0x00000404 -_080732B4: - movs r0, #0x82 - lsls r0, r0, #1 -_080732B8: - strh r0, [r2, #8] - ldr r1, _080732CC @ =gRoomControls - movs r0, #0 - str r0, [r1, #0x30] - bl sub_0807A108 - bl ResetPlayer - pop {r4, r5, r6, r7, pc} - .align 2, 0 -_080732CC: .4byte gRoomControls diff --git a/data/data_0811B9E0.s b/data/data_0811B9E0.s deleted file mode 100644 index fed89541..00000000 --- a/data/data_0811B9E0.s +++ /dev/null @@ -1,69 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - .align 2 - -gUnk_0811BC08:: @ 0811BC08 - .4byte sub_08073468 - .4byte sub_080734D4 - .4byte sub_08073504 - .4byte sub_08073584 - .4byte sub_0807379C - .4byte sub_080737BC - .4byte sub_0807380C - .4byte sub_08073884 - -gUnk_0811BC28:: @ 0811BC28 - .incbin "data_0811B9E0/gUnk_0811BC28.bin" - -gUnk_0811BC30:: @ 0811BC30 - .incbin "data_0811B9E0/gUnk_0811BC30.bin" - -gUnk_0811BC38:: @ 0811BC38 - .incbin "data_0811B9E0/gUnk_0811BC38.bin" - -gUnk_0811BC40:: @ 0811BC40 - .incbin "data_0811B9E0/gUnk_0811BC40.bin" - -gUnk_0811BC48:: @ 0811BC48 - .4byte sub_08073924 - .4byte sub_08073968 - .4byte sub_080739EC - .4byte sub_08073A94 - .4byte sub_08073B8C - .4byte sub_08073C30 - -gUnk_0811BC60:: @ 0811BC60 - .4byte sub_08073C80 - .4byte sub_08073D20 - .4byte sub_08073F04 - .4byte sub_08073F4C - .4byte sub_08073FD0 - .4byte sub_08074018 - .4byte sub_08074060 - .4byte sub_080740D8 - -gUnk_0811BC80:: @ 0811BC80 - .incbin "data_0811B9E0/gUnk_0811BC80.bin" - -gUnk_0811BC88:: @ 0811BC88 - .4byte sub_08074C68 - .4byte sub_08074CF8 - .4byte sub_08074F00 - .4byte sub_080750F4 - -gUnk_0811BC98:: @ 0811BC98 - .4byte sub_08074F1C - .4byte sub_08074F2C - .4byte sub_08074F44 - .4byte sub_08074F8C - .4byte sub_08074FEC - .4byte sub_0807501C - .4byte sub_0807508C - -gUnk_0811BCB4:: @ 0811BCB4 - .4byte sub_08075110 - .4byte sub_0807513C - .4byte sub_0807518C - .4byte sub_080751B4 diff --git a/data/data_0811BE38.s b/data/data_0811BE38.s index 2dc78e95..5a8aebd2 100644 --- a/data/data_0811BE38.s +++ b/data/data_0811BE38.s @@ -90,52 +90,52 @@ gUnk_0811C118:: @ 0811C118 .incbin "data_0811BE38/gUnk_0811C118.bin" gUnk_0811C120:: @ 0811C120 - .4byte nullsub_112 - .4byte sub_08074200 + .4byte SurfaceAction_DoNothing + .4byte SurfaceAction_Pit .4byte 00000000 .4byte 00000000 - .4byte sub_0807422C - .4byte sub_08074238 - .4byte sub_080742AC - .4byte sub_080742E4 - .4byte sub_08074314 - .4byte sub_08074338 - .4byte sub_0807435C - .4byte sub_08074380 - .4byte sub_08074638 - .4byte sub_08074B4C - .4byte sub_08074B74 - .4byte sub_08074BA0 - .4byte sub_08074BCC - .4byte sub_08074678 - .4byte nullsub_112 - .4byte nullsub_112 - .4byte sub_080743D4 - .4byte sub_0807441C - .4byte sub_0807450C - .4byte sub_08074584 - .4byte sub_080745B4 - .4byte sub_0807479C - .4byte sub_080748C4 - .4byte sub_080748DC - .4byte sub_08074918 + .4byte SurfaceAction_SlopeGndGndVertical + .4byte SurfaceAction_SlopeGndGndHorizontal + .4byte SurfaceAction_6 + .4byte SurfaceAction_7 + .4byte SurfaceAction_MinishDoorFront + .4byte SurfaceAction_MinishDoorBack + .4byte SurfaceAction_A + .4byte SurfaceAction_B + .4byte SurfaceAction_SlopeGndWater + .4byte SurfaceAction_D + .4byte SurfaceAction_E + .4byte SurfaceAction_F + .4byte SurfaceAction_10 + .4byte SurfaceAction_Swamp + .4byte SurfaceAction_DoNothing + .4byte SurfaceAction_DoNothing + .4byte SurfaceAction_14 + .4byte SurfaceAction_CloneTile + .4byte SurfaceAction_16 + .4byte SurfaceAction_Ice + .4byte SurfaceAction_ShallowWater + .4byte SurfaceAction_Water + .4byte SurfaceAction_Button + .4byte SurfaceAction_1B + .4byte SurfaceAction_1C .4byte 00000000 - .4byte sub_0807496C + .4byte SurfaceAction_Ladder .4byte 00000000 - .4byte sub_08074A48 - .4byte sub_0807450C - .4byte nullsub_504 - .4byte sub_080742AC - .4byte sub_080742AC - .4byte sub_08074A9C - .4byte sub_08074AF4 - .4byte sub_08074B18 - .4byte sub_0807422C - .4byte sub_08074238 - .4byte sub_080749D4 - .4byte sub_0807493C - .4byte sub_080749A8 - .4byte sub_08074A9C + .4byte SurfaceAction_20 + .4byte SurfaceAction_16 + .4byte SurfaceAction_22 + .4byte SurfaceAction_6 + .4byte SurfaceAction_6 + .4byte SurfaceAction_Dust + .4byte SurfaceAction_26 + .4byte SurfaceAction_Hole + .4byte SurfaceAction_SlopeGndGndVertical + .4byte SurfaceAction_SlopeGndGndHorizontal + .4byte SurfaceAction_AutoLadder + .4byte SurfaceAction_ClimbWall + .4byte SurfaceAction_2C + .4byte SurfaceAction_Dust gUnk_0811C1D8:: @ 0811C1D8 .4byte gUnk_0811C240 diff --git a/include/asm.h b/include/asm.h index 99ad082a..360c0fb1 100644 --- a/include/asm.h +++ b/include/asm.h @@ -6,8 +6,9 @@ struct Entity_; extern u32 Random(void); -extern void sub_08000152(u32); +extern void sub_08000152(u32, u32, u32); extern void SetTile(u32 index, u32 position, u32 layer); +extern u32 sub_080002D0(struct Entity_*); extern void sub_08001242(struct Entity_*); extern void sub_08001290(struct Entity_*, u32); extern void sub_08001324(struct Entity_*); @@ -15,11 +16,12 @@ extern u32 sub_08002632(struct Entity_*); extern u32 GravityUpdate(struct Entity_*, u32); extern u32 sub_080043E8(struct Entity_*); extern void sub_08004484(struct Entity_*, struct Entity_*); -extern u32 sub_080045D4(s16, s16, u32, u32); +extern u32 sub_080045D4(u32, u32, u32, u32); extern u32 sub_080045DA(s32, s32); extern void sub_08004596(struct Entity_*, u32); extern u32 sub_080045B4(struct Entity_*, u32, u32); extern u32 EntityInRectRadius(struct Entity_*, struct Entity_*, u32, u32); extern void UpdateAnimationVariableFrames(struct Entity_*, u32); +extern u32 sub_080086B4(u32, u32, u8*); #endif // ASM_H diff --git a/include/functions.h b/include/functions.h index 23e0a7cc..536b36ed 100644 --- a/include/functions.h +++ b/include/functions.h @@ -145,7 +145,7 @@ extern bool32 LoadSwapGFX(Entity*, u16, u32); extern u32 sub_08016A30(Entity*); extern void sub_08077728(); extern void sub_0807AEE4(); -extern u32 sub_08078EFC(); +extern u32 RunQueuedAction(); extern void sub_0807921C(); extern void UpdateFloorType(); extern void sub_08079938(); diff --git a/include/player.h b/include/player.h index 943d7f5e..f664b6f3 100644 --- a/include/player.h +++ b/include/player.h @@ -34,7 +34,7 @@ enum PlayerActions { PLAYER_INHOLE, PLAYER_08072C9C, PLAYER_08074C44, - PLAYER_08072F34, + PLAYER_CLIMB, PLAYER_USEENTRANCE, PLAYER_PARACHUTE, }; @@ -99,12 +99,23 @@ enum PlayerFlags { PL_DROWNING = (1 << 2), PL_NO_CAP = (1 << 3), PL_USE_PORTAL = (1 << 5), + PL_HIDDEN = (1 << 6), PL_MINISH = (1 << 7), + PL_FALLING = (1 << 9), PL_BURNING = (1 << 10), + PL_FROZEN = (1 << 11), + PL_DRUGGED = (1 << 14), PL_ROLLING = (1 << 18), + PL_TRAPPED = (1 << 19), PL_IN_HOLE = (1 << 20), + PL_RELEASED = (1 << 21), + PL_CLONING = (1 << 22), PL_USE_LANTERN = (1 << 23), + PL_PARACHUTE = (1 << 24), + PL_MINECART = (1 << 26), + PL_SWORD_THRUST = (1 << 27), PL_USE_OCARINA = (1 << 28), + PL_CLIMBING = (1 << 29), }; enum SurfaceType { @@ -125,7 +136,7 @@ enum SurfaceType { SURFACE_E, SURFACE_F, SURFACE_10, - SURFACE_11, + SURFACE_SWAMP, SURFACE_DOOR, SURFACE_DOOR_13, SURFACE_14, @@ -137,9 +148,9 @@ enum SurfaceType { SURFACE_BUTTON, SURFACE_1B, SURFACE_1C, - SURFACE_1D, + SURFACE_1D, // nulled SURFACE_LADDER, - SURFACE_1F, + SURFACE_1F, // nulled SURFACE_20, SURFACE_21, SURFACE_22, @@ -165,7 +176,7 @@ typedef struct { /*0x08*/ u16 animation; /*0x0a*/ u8 field_0xa; /*0x0b*/ u8 keepFacing; - /*0x0c*/ u8 playerAction; + /*0x0c*/ u8 queued_action; /*0x0d*/ u8 field_0xd; /*0x0e*/ u8 field_0xe; /*0x0f*/ u8 hurtBlinkSpeed; @@ -188,7 +199,8 @@ typedef struct { /*0x2c*/ Entity* item; /*0x30*/ u32 flags; /*0x34*/ u8 field_0x34[2]; - /*0x36*/ s16 field_0x36; + /*0x36*/ u8 field_0x36; + /*0x37*/ u8 field_0x37; /*0x38*/ u8 field_0x38; /*0x39*/ u8 field_0x39; /*0x3a*/ u8 field_0x3a; diff --git a/include/room.h b/include/room.h index 8a837b91..64729622 100644 --- a/include/room.h +++ b/include/room.h @@ -173,7 +173,7 @@ typedef enum { } TileEntityType; extern void SetTileType(u32, u32, u32); -extern void sub_08080964(u32 time, u32 magnitude); // shake screen +extern void InitScreenShake(u32 time, u32 magnitude); extern void* GetCurrentRoomProperty(u32); extern void LoadRoomTileEntities(); diff --git a/linker.ld b/linker.ld index 6e10500c..225731fc 100644 --- a/linker.ld +++ b/linker.ld @@ -225,7 +225,7 @@ SECTIONS { . = 0x00004010; gUnk_03004010 = .; . = 0x00004020; gUnk_03004020 = .; . = 0x00004030; gUnk_03004030 = .; - . = 0x00004040; gUnk_03004040 = .; + . = 0x00004040; gPlayerClones = .; . = 0x0000404C; SoundMainRAM_Buffer = .; . = 0x0000404D; gUnk_0300404D = .; . = 0x000043D0; gSoundInfo = .; @@ -657,8 +657,7 @@ SECTIONS { src/playerItem/playerItemPacciCane.o(.text); asm/code_0807059C.o(.text); src/player.o(.text); - asm/stairsInteract.o(.text); - asm/code_080732D0.o(.text); + src/item.o(.text); src/item/itemDebug.o(.text); src/item/itemSword.o(.text); src/item/itemLantern.o(.text); @@ -1382,7 +1381,6 @@ SECTIONS { data/const/playerItem/playerItem12.o(.rodata); data/const/playerItem/playerItemPacciCane.o(.rodata); src/player.o(.rodata); - data/data_0811B9E0.o(.rodata); src/item.o(.rodata); data/const/item/itemSword.o(.rodata); data/const/item/itemLantern.o(.rodata); diff --git a/src/code_0808091C.c b/src/code_0808091C.c index ab3ceb11..2b4dceb0 100644 --- a/src/code_0808091C.c +++ b/src/code_0808091C.c @@ -55,7 +55,7 @@ u32* GetLayerByIndex(u32 param_1) { } } -void sub_08080964(u32 time, u32 magnitude) { +void InitScreenShake(u32 time, u32 magnitude) { gRoomControls.screenShakeTime = time; gRoomControls.screenShakeMagnitude = magnitude & 7; } diff --git a/src/collision.c b/src/collision.c index 3dac2783..1c22f7d6 100644 --- a/src/collision.c +++ b/src/collision.c @@ -7,6 +7,7 @@ #include "functions.h" #include "enemy.h" #include "effects.h" +#include "object.h" extern u8 gCollidableCount; extern u8 gUnk_080B3740[]; @@ -30,7 +31,7 @@ extern ColSettings gCollisionMtx[173 * 34]; extern void gDoCollision(void); u32 sub_08081420(Entity*); -extern void sub_0800449C(Entity*, u32); +extern void SoundReqClipped(Entity*, u32); s32 sub_08018308(Entity*, Entity*, u32, ColSettings*); void sub_08079D84(void); void sub_080180BC(Entity*, Entity*); @@ -232,7 +233,7 @@ s32 sub_08017874(Entity* a, Entity* b) { if (newDmg <= 0) newDmg = 1; v5 = ModHealth(-newDmg); - sub_0800449C(a, 122); + SoundReqClipped(a, 122); } else { v6 = b->damage; if (b->kind == 8) { @@ -248,9 +249,9 @@ s32 sub_08017874(Entity* a, Entity* b) { v5 = a->health - v6; if (a->kind == 3) { if ((a->field_0x6c.HALF.HI & 1) != 0) - sub_0800449C(a, 295); + SoundReqClipped(a, 295); else - sub_0800449C(a, 254); + SoundReqClipped(a, 254); } } if (v5 <= 0) { @@ -389,11 +390,11 @@ s32 sub_08017B58(Entity* org, Entity* tgt, u32 direction, ColSettings* settings) } s32 sub_08017BBC(Entity* org, Entity* tgt, u32 direction, ColSettings* settings) { - if ((gPlayerState.flags & (0x1 | 0x80 | 0x400 | 0x1000)) == 0) { - Entity* e = CreateObject(66, 1, 0); + if ((gPlayerState.flags & (PL_BUSY | PL_MINISH | PL_BURNING | 0x1000)) == 0) { + Entity* e = CreateObject(OBJECT_42, 1, 0); if (e != NULL) { e->child = org; - gPlayerState.flags |= 0x400; + gPlayerState.flags |= PL_BURNING; org->animationState = (direction ^ 0x10) >> 2; } } @@ -408,12 +409,12 @@ s32 sub_08017BBC(Entity* org, Entity* tgt, u32 direction, ColSettings* settings) } s32 sub_08017C40(Entity* org, Entity* tgt, u32 direction, ColSettings* settings) { - if ((gPlayerState.flags & (0x1 | 0x80 | 0x800 | 0x1000)) == 0 && gPlayerState.playerAction == 0) { + if ((gPlayerState.flags & (PL_BUSY | PL_MINISH | PL_FROZEN | 0x1000)) == 0 && gPlayerState.queued_action == 0) { if (org->action == 1 || org->action == 24) { tgt->damage = 4; org->health = sub_08017874(org, tgt); - gPlayerState.flags = 0x800; - gPlayerState.playerAction = 13; + gPlayerState.flags = PL_FROZEN; + gPlayerState.queued_action = PLAYER_FROZEN; } } org->knockbackDuration = 12; @@ -533,7 +534,7 @@ s32 sub_08017F40(Entity* org, Entity* tgt, u32 direction, ColSettings* settings) if (org == &gPlayerEntity) { if (sub_08079F8C() && #ifdef EU - (gPlayerState.flags & 0x81) == 0 && + (gPlayerState.flags & (PL_MINISH | PL_BUSY)) == 0 && #else (gPlayerState.flags & PL_MINISH) == 0 && #endif @@ -622,18 +623,18 @@ s32 sub_080180E8(Entity* org, Entity* tgt, u32 direction, ColSettings* settings) s32 sub_08018168(Entity* org, Entity* tgt, u32 direction, ColSettings* settings) { if (tgt->field_0x43 == 0) { if (org == &gPlayerEntity) { - if (((sub_08079F8C() != 0) && + if (sub_08079F8C() && #ifdef EU - ((gPlayerState.flags & 0x81) == 0)) && + (gPlayerState.flags & (PL_MINISH | PL_BUSY)) == 0 && #else - ((gPlayerState.flags & 0x40080) == 0)) && + (gPlayerState.flags & (PL_MINISH | PL_ROLLING)) == 0 && #endif - (gPlayerState.swimState == 0)) { + gPlayerState.swimState == 0) { gPlayerState.field_0x1a[0] |= 0x80; gPlayerState.field_0xa |= 0x80; gPlayerState.flags |= 0x100; gPlayerState.jumpStatus = 0; - gPlayerEntity.flags &= ~0x80; + COLLISION_OFF(&gPlayerEntity); gPlayerEntity.spriteRendering.b3 = tgt->spriteRendering.b3; gPlayerEntity.spriteOrientation.flipY = tgt->spriteOrientation.flipY; gPlayerEntity.iframes = 0xff; @@ -749,7 +750,7 @@ s32 sub_08018308(Entity* org, Entity* tgt, u32 direction, ColSettings* settings) } } else if (org->id == 3) { if (settings->_9) { - sub_0800449C(tgt, 254); + SoundReqClipped(tgt, 254); } } else if (org->id == 5) { gPlayerEntity.iframes = 0x80; diff --git a/src/enemy/beetle.c b/src/enemy/beetle.c index b6988f6c..de27657c 100644 --- a/src/enemy/beetle.c +++ b/src/enemy/beetle.c @@ -213,7 +213,7 @@ void sub_08021AD8(Entity* this) { } void sub_08021B64(Entity* this) { - if (gPlayerState.flags & 4) { + if (gPlayerState.flags & PL_DROWNING) { this->action = 3; this->z.WORD = 0; InitializeAnimation(this, 2); diff --git a/src/enemy/gibdo.c b/src/enemy/gibdo.c index 912f0f61..7102f85d 100644 --- a/src/enemy/gibdo.c +++ b/src/enemy/gibdo.c @@ -21,7 +21,7 @@ void sub_08037A14(); extern void sub_0804A4E4(Entity*, Entity*); extern Entity* sub_08049DF4(u32); u32 sub_0804A044(Entity*, Entity*, u32); -extern void sub_0800449C(Entity*, u32); +extern void SoundReqClipped(Entity*, u32); extern void (*const gGibdo[6])(Entity*); extern void (*const gUnk_080CF2AC[9])(Entity*); @@ -347,8 +347,8 @@ void sub_08037A58(Entity* this) { } void sub_08037ACC(Entity* this) { - gPlayerState.flags &= 0xFFFFFEFF; - gPlayerEntity.flags |= 0x80; + gPlayerState.flags &= ~0x100; + COLLISION_ON(&gPlayerEntity); gPlayerEntity.iframes = 0x1e; gPlayerEntity.knockbackDirection = DirectionFromAnimationState(this->animationState); gPlayerEntity.knockbackDuration = 4; @@ -359,7 +359,7 @@ void sub_08037B10(Entity* this) { u32 h; gPlayerEntity.iframes = 0xc; h = ModHealth(-8); - sub_0800449C(&gPlayerEntity, 0x7a); + SoundReqClipped(&gPlayerEntity, 0x7a); if (h == 0) { sub_08037A58(this); this->field_0x76.HALF.LO = 0xf0; diff --git a/src/enemy/helmasaur.c b/src/enemy/helmasaur.c index 494b577b..9539b36d 100644 --- a/src/enemy/helmasaur.c +++ b/src/enemy/helmasaur.c @@ -186,7 +186,7 @@ void sub_0802BE18(Entity* this) { void sub_0802BE48(Entity* this) { if (!sub_080AEFE0(this)) { sub_0802C218(this); - sub_08080964(8, 0); + InitScreenShake(8, 0); } else { GetNextFrame(this); sub_0802C1CC(this); diff --git a/src/enemy/lakituCloud.c b/src/enemy/lakituCloud.c index f391c5ee..bb9e6b76 100644 --- a/src/enemy/lakituCloud.c +++ b/src/enemy/lakituCloud.c @@ -11,7 +11,7 @@ extern void (*const gUnk_080D0418[6])(Entity*); extern void (*const gUnk_080D0430[3])(Entity*); extern void (*const gUnk_080D043C[3])(Entity*); -extern void sub_0800449C(Entity*, u32); +extern void SoundReqClipped(Entity*, u32); extern void sub_0803CE14(Entity*); extern void sub_0803CE3C(Entity*); extern void sub_08079D84(void); @@ -56,7 +56,7 @@ void sub_0803CD40(Entity* this) { ModHealth(-2); - sub_0800449C(&gPlayerEntity, 122); + SoundReqClipped(&gPlayerEntity, 122); sub_08079D84(); sub_0803CE3C(this); diff --git a/src/enemy/mazaalBracelet.c b/src/enemy/mazaalBracelet.c index 2adfed33..584dd185 100644 --- a/src/enemy/mazaalBracelet.c +++ b/src/enemy/mazaalBracelet.c @@ -20,7 +20,7 @@ void sub_0803B798(void); void sub_0803BA8C(Entity*, u32); void sub_0803B724(Entity*); -extern void sub_0800449C(Entity*, u32); +extern void SoundReqClipped(Entity*, u32); void sub_0803A170(Entity*); void sub_0803A188(Entity*); @@ -434,7 +434,7 @@ void sub_0803A740(Entity* this) { this->actionDelay = 10; this->parent->field_0x7c.BYTES.byte1 |= 0x40; sub_0803B8E8(this, 0x13); - sub_08080964(10, 0); + InitScreenShake(10, 0); SoundReq(SFX_158); } } @@ -713,7 +713,7 @@ void sub_0803ACC0(Entity* this) { this->z.HALF.HI = 0; this->actionDelay = 0xc; this->subAction = 3; - sub_08080964(8, 0); + InitScreenShake(8, 0); SoundReq(SFX_158); sub_0803B804(this); } @@ -735,7 +735,7 @@ void sub_0803ACC0(Entity* this) { this->z.HALF.HI = 0; this->action = 0x1a; this->actionDelay = 0x3c; - sub_08080964(0x1e, 0); + InitScreenShake(0x1e, 0); SoundReq(SFX_158); sub_0803B804(this); return; @@ -859,7 +859,7 @@ void sub_0803AFE0(Entity* this) { this->actionDelay = 0xf0; *(u8*)&this->cutsceneBeh = 3; this->z.HALF.HI = 0; - sub_08080964(0xa0, 0); + InitScreenShake(0xa0, 0); SoundReq(SFX_158); } } @@ -931,7 +931,7 @@ void sub_0803B144(Entity* this) { this->action = 0x2a; InitializeAnimation(this, 0x16); sub_0803B8E8(this, 0x14); - sub_08080964(8, 0); + InitScreenShake(8, 0); } } @@ -1238,7 +1238,7 @@ void sub_0803B798(void) { void sub_0803B804(Entity* this) { gPlayerEntity.iframes = 30; ModHealth(-4); - sub_0800449C(&gPlayerEntity, 0x7a); + SoundReqClipped(&gPlayerEntity, 0x7a); } void sub_0803B824(Entity* this) { diff --git a/src/enemy/mazaalHead.c b/src/enemy/mazaalHead.c index 553d5053..2b59e960 100644 --- a/src/enemy/mazaalHead.c +++ b/src/enemy/mazaalHead.c @@ -320,7 +320,7 @@ void sub_080342C8(Entity* this) { this->field_0x7c.HALF.HI = 0x708; this->field_0x7c.BYTES.byte1 = 0; this->field_0x80.HALF.HI = 0; - sub_08080964(0x1e, 0); + InitScreenShake(0x1e, 0); SoundReq(SFX_1A1); } } diff --git a/src/enemy/mazaalMacro.c b/src/enemy/mazaalMacro.c index ed28d6c8..64a25711 100644 --- a/src/enemy/mazaalMacro.c +++ b/src/enemy/mazaalMacro.c @@ -195,7 +195,7 @@ void sub_08034F70(Entity* this) { void sub_08034FA0(Entity* this) { if (0 < this->iframes) { this->child->iframes = this->iframes; - sub_08080964(0xc, 1); + InitScreenShake(0xc, 1); } switch (this->type2) { case 0: diff --git a/src/enemy/moldworm.c b/src/enemy/moldworm.c index 9ffd49fa..3a0425ef 100644 --- a/src/enemy/moldworm.c +++ b/src/enemy/moldworm.c @@ -1,7 +1,7 @@ #include "enemy.h" #include "functions.h" -extern void sub_0800449C(Entity*, u32); +extern void SoundReqClipped(Entity*, u32); extern bool32 sub_08023A38(u32); extern void sub_08023990(Entity*, u32, u32); extern void sub_08023A88(Entity*, u32); @@ -263,7 +263,7 @@ void sub_0802351C(Entity* this) { if (this->field_0x7c.BYTES.byte3 == 0) { if (this->type2 == 0) { gPlayerEntity.animationState = this->animationState & 7; - gPlayerState.flags |= 0x80000; + gPlayerState.flags |= PL_TRAPPED; PositionRelative(this, &gPlayerEntity, 0, gUnk_080CBC90[this->animationState & 7] << 0x10); gPlayerEntity.spriteOffsetY = -gUnk_080CBC90[this->animationState & 7]; } @@ -398,14 +398,14 @@ void sub_08023894(Entity* this) { this->parent->field_0x7c.BYTES.byte3 = 1; InitializeAnimation(this, this->animationState); if (this->parent->type2 == 0) { - gPlayerState.flags |= 0x200000; + gPlayerState.flags |= PL_RELEASED; gPlayerEntity.x.HALF.HI = this->x.HALF.HI; gPlayerEntity.y.HALF.HI = this->y.HALF.HI; gPlayerEntity.direction = DirectionRoundUp(GetFacingDirection(*(Entity**)&this->field_0x74, this)); gPlayerEntity.animationState = gPlayerEntity.direction >> 2; gPlayerEntity.iframes = 12; ModHealth(-0x10); - sub_0800449C(&gPlayerEntity, 0x7a); + SoundReqClipped(&gPlayerEntity, 0x7a); } } } diff --git a/src/enemy/octorokBoss.c b/src/enemy/octorokBoss.c index 23dca6d4..fb16b706 100644 --- a/src/enemy/octorokBoss.c +++ b/src/enemy/octorokBoss.c @@ -811,7 +811,7 @@ void OctorokBoss_Action1_ChargeAttack(Entity* this) { this->knockbackDirection = this->direction ^ 0x10; GET_HELPER(this)->fallingStonesTimer += 0x3c; OctorokBoss_SetAttackTimer(this); - sub_08080964(0x3c, 0); + InitScreenShake(0x3c, 0); SoundReq(SFX_158); SoundReq(SFX_14C); } @@ -946,7 +946,7 @@ void OctorokBoss_ExecuteAttackVacuum(Entity* this) { } } } else { - gPlayerState.flags &= 0xfffff7ff; + gPlayerState.flags &= ~PL_FROZEN; } } } @@ -1077,7 +1077,7 @@ void OctorokBoss_Burning_SubAction1(Entity* this) { this->field_0x46 = 0x200; this->knockbackDirection = this->direction ^ 0x10; GET_HELPER(this)->fallingStonesTimer += 0x1e; - sub_08080964(0x1e, 0); + InitScreenShake(0x1e, 0); SoundReq(SFX_158); SoundReq(SFX_14C); } diff --git a/src/enemy/pesto.c b/src/enemy/pesto.c index 54f43381..fc987dd7 100644 --- a/src/enemy/pesto.c +++ b/src/enemy/pesto.c @@ -5,7 +5,7 @@ #include "save.h" extern u32 sub_080002E0(u16, u32); -extern void sub_0800449C(Entity*, u32); +extern void SoundReqClipped(Entity*, u32); extern u32 sub_08049F1C(Entity*, Entity*, u32); extern u32 PlayerInRange(Entity*, u32, u32); extern void sub_080AEFB4(Entity*); @@ -809,7 +809,7 @@ NONMATCH("asm/non_matching/pesto/sub_08024E4C.inc", void sub_08024E4C(Entity* th ResetPlayer(); gPlayerState.flags |= 0x100; gPlayerState.field_0xa |= 0x80; - gPlayerState.playerAction = 0xe; + gPlayerState.queued_action = PLAYER_0807204C; gPlayerState.field_0x38 = 0x14; gPlayerState.field_0x39 = 1; *(u8*)&gPlayerState.field_0x3a = 0; @@ -821,7 +821,7 @@ NONMATCH("asm/non_matching/pesto/sub_08024E4C.inc", void sub_08024E4C(Entity* th this->field_0x86.HALF.HI++; player->iframes = 8; ModHealth(-2); - sub_0800449C(player, 0x7a); + SoundReqClipped(player, 0x7a); } } } @@ -830,10 +830,10 @@ END_NONMATCH void sub_08024F50(Entity* this) { gPlayerState.field_0xa = 0; - gPlayerState.flags &= 0xfffffeff; + gPlayerState.flags &= ~0x100; CopyPosition(this, &gPlayerEntity); gPlayerEntity.action = 1; - gPlayerEntity.flags |= 0x80; + COLLISION_ON(&gPlayerEntity); gPlayerEntity.iframes = -0x3c; gPlayerEntity.direction = gPlayerEntity.animationState << 2; gPlayerEntity.speed = 0; diff --git a/src/enemy/rupeeLike.c b/src/enemy/rupeeLike.c index 926648bf..ee274ac7 100644 --- a/src/enemy/rupeeLike.c +++ b/src/enemy/rupeeLike.c @@ -233,7 +233,7 @@ void sub_080296C8(Entity* this) { void sub_080296D8(Entity* this) { gPlayerState.jumpStatus = 0x41; - gPlayerState.flags &= 0xffffffef; + gPlayerState.flags &= ~0x10; gPlayerEntity.flags |= 0x80; gPlayerEntity.zVelocity = 0x18000; gPlayerEntity.iframes = 0xa6; diff --git a/src/enemy/vaatiRebornEnemy.c b/src/enemy/vaatiRebornEnemy.c index c8f97752..f3ccf3bb 100644 --- a/src/enemy/vaatiRebornEnemy.c +++ b/src/enemy/vaatiRebornEnemy.c @@ -662,7 +662,7 @@ void VaatiRebornEnemyType1PreAction(Entity* this) { } if (0 < this->iframes) { SoundReq(0x127); - sub_08080964(0xc, 1); + InitScreenShake(0xc, 1); if (this->actionDelay == 0) this->actionDelay = 0x48; } diff --git a/src/enemy/vaatiTransfigured.c b/src/enemy/vaatiTransfigured.c index c9198d08..8c80bbbd 100644 --- a/src/enemy/vaatiTransfigured.c +++ b/src/enemy/vaatiTransfigured.c @@ -266,7 +266,7 @@ void VaatiTransfiguredType0Action3(Entity* this) { this->actionDelay = 0xc0; COLLISION_ON(this); SoundReq(SFX_14C); - sub_08080964(0x14, 4); + InitScreenShake(0x14, 4); break; case 1: if (--this->actionDelay == 0) { @@ -321,7 +321,7 @@ void VaatiTransfiguredType0Action3(Entity* this) { this->field_0x86.HALF.LO = 0; sub_080408EC(this); SoundReq(SFX_14C); - sub_08080964(0x1e, 4); + InitScreenShake(0x1e, 4); } else { if (this->field_0xf != 0) { if (--this->field_0xf == 0) { @@ -399,7 +399,7 @@ void VaatiTransfiguredType0Action4(Entity* this) { this->field_0xf = 1; } SoundReq(SFX_14C); - sub_08080964(0x1e, 4); + InitScreenShake(0x1e, 4); break; case 2: if (--this->actionDelay == 0) { @@ -1069,7 +1069,7 @@ void sub_080409B0(Entity* this) { } } else { if (((this->bitfield & 0x80) != 0) && (0 < this->iframes)) { - sub_08080964(0xc, 1); + InitScreenShake(0xc, 1); SoundReq(SFX_BOSS_HIT); } if ((this->bitfield == 0x8a) && (gPlayerState.field_0xa0[0] == 5)) { diff --git a/src/enemy/vaatiWrath.c b/src/enemy/vaatiWrath.c index d216ba7f..eef8e73e 100644 --- a/src/enemy/vaatiWrath.c +++ b/src/enemy/vaatiWrath.c @@ -475,7 +475,7 @@ void VaatiWrathType0ActionB(Entity* this) { this->actionDelay = 0xf0; this->health = 8; this->hitType = 0x38; - sub_08080964(0x14, 0); + InitScreenShake(0x14, 0); InitAnimationForceUpdate(this, 6); InitializeAnimation(((VaatiWrathHeapStruct*)this->myHeap)->type2, 0x16); } @@ -709,7 +709,7 @@ void sub_08041E78(Entity* this) { fx->x.HALF.HI += *temp++; fx->y.HALF.HI += *temp; fx->spritePriority.b0 = 3; - sub_08080964(4, 0); + InitScreenShake(4, 0); } } } diff --git a/src/enemy/wisp.c b/src/enemy/wisp.c index 111e4f04..6b399d2d 100644 --- a/src/enemy/wisp.c +++ b/src/enemy/wisp.c @@ -32,7 +32,7 @@ void sub_08033564(Entity* this) { this->spriteSettings.draw = FALSE; COLLISION_OFF(this); this->field_0x7c.HALF.LO = 0x27c; - gPlayerState.flags |= 0x4000; + gPlayerState.flags |= PL_DRUGGED; gSave.stats.effect = this->type + 1; gSave.stats.effectTimer = 600; if (this->type == 0) { diff --git a/src/enemyUtils.c b/src/enemyUtils.c index 6d8acd97..956ba639 100644 --- a/src/enemyUtils.c +++ b/src/enemyUtils.c @@ -1,6 +1,7 @@ #include "entity.h" #include "definitions.h" #include "functions.h" +#include "object.h" extern EnemyDefinition gEnemyDefinitions[]; @@ -46,7 +47,7 @@ bool32 EnemyInit(Entity* this) { if ((this->field_0x6c.HALF.HI & 0x20) != 0) { u32 uVar4 = gUnk_080D3E74[this->id >> 3] >> ((this->id & 7) << 1) & 3; if (uVar4 != 0) { - Entity* object = CreateObject(0xa9, uVar4 - 1, 0); + Entity* object = CreateObject(OBJECT_A9, uVar4 - 1, 0); if (object != NULL) { object->actionDelay = this->flags; object->field_0xf = this->spriteSettings.draw; diff --git a/src/interrupts.c b/src/interrupts.c index 0e42d94d..c2855c46 100644 --- a/src/interrupts.c +++ b/src/interrupts.c @@ -21,7 +21,7 @@ extern u16* gUnk_0200B650; extern u8 gUpdateVisibleTiles; extern u8 gUnk_03003DF0[]; extern u8 gUnk_03003BE0; -extern Entity* gUnk_03004040[3]; +extern Entity* gPlayerClones[3]; extern u16 gUnk_080B2CD8[]; extern u32 gUnk_03000FBC; @@ -181,16 +181,16 @@ void WaitForNextFrame(void) { void PlayerUpdate(Entity* this) { if (gSave.stats.effect != 0) - gPlayerState.flags |= 0x4000; + gPlayerState.flags |= PL_DRUGGED; else - gPlayerState.flags &= ~0x4000; + gPlayerState.flags &= ~PL_DRUGGED; if (CheckDontUpdate(this) == 0) { - if ((gPlayerState.flags & 0x80000) != 0) { + if (gPlayerState.flags & PL_TRAPPED) { sub_08077B20(); - if ((gPlayerState.flags & 0x200000) != 0) { - gPlayerState.playerAction = PLAYER_ROLL; - gPlayerState.flags &= ~0x80000; + if (gPlayerState.flags & PL_RELEASED) { + gPlayerState.queued_action = PLAYER_ROLL; + gPlayerState.flags &= ~PL_TRAPPED; gPlayerState.hurtBlinkSpeed = 240; COLLISION_ON(this); } else { @@ -223,10 +223,10 @@ void HandlePlayerLife(Entity* this) { if ((gPlayerEntity.bitfield & 0x80) && (gPlayerEntity.iframes > 0)) SoundReq(SFX_86); - gPlayerState.flags &= ~(0x2000000 | 0x200); + gPlayerState.flags &= ~(0x2000000 | PL_FALLING); if (gPlayerState.flags & PL_BURNING) ResetPlayer(); - if ((gPlayerState.flags & 0x400000) && !gPlayerState.field_0xa0[0]) + if ((gPlayerState.flags & PL_CLONING) && !gPlayerState.field_0xa0[0]) sub_0807A108(); if (sub_08079B24() == 0) sub_08079708(this); @@ -300,7 +300,7 @@ void sub_080171F0(void) { gPlayerState.flags &= ~2; sub_080028E0(&gPlayerEntity); - if (gPlayerState.flags & 0x400000) + if (gPlayerState.flags & PL_CLONING) gUnk_0200AF00.filler25[10] = 1; sub_08078180(); @@ -315,13 +315,13 @@ void sub_080171F0(void) { gPlayerState.field_0x3f = 0; sub_0807B0C8(); - if (gPlayerState.flags & 0x400000) - gUnk_03004040[0]->spriteOffsetY = gUnk_03004040[1]->spriteOffsetY = gUnk_03004040[2]->spriteOffsetY = 0; + if (gPlayerState.flags & PL_CLONING) + gPlayerClones[0]->spriteOffsetY = gPlayerClones[1]->spriteOffsetY = gPlayerClones[2]->spriteOffsetY = 0; - if (gPlayerEntity.action == PLAYER_08072F34) - gPlayerState.flags |= 0x20000000; + if (gPlayerEntity.action == PLAYER_CLIMB) + gPlayerState.flags |= PL_CLIMBING; else - gPlayerState.flags &= ~0x20000000; + gPlayerState.flags &= ~PL_CLIMBING; sub_0807A8D8(&gPlayerEntity); if (gPlayerState.jumpStatus & 0xc0) diff --git a/src/item.c b/src/item.c index 8ba2e848..a88ae226 100644 --- a/src/item.c +++ b/src/item.c @@ -10,3 +10,7 @@ void (*const gItemFunctions[])(ItemBehavior*, u32) = { ItemPegasusBoots, ItemDebug, ItemOcarina, ItemDebug, ItemDebug, ItemDebug, ItemTryPickupObject, ItemJarEmpty, ItemJarEmpty, ItemJarEmpty, ItemJarEmpty, }; + +void sub_080752E8(ItemBehavior* behavior, u32 arg1) { + gItemFunctions[behavior->behaviorID](behavior, arg1); +} diff --git a/src/item/itemBoomerang.c b/src/item/itemBoomerang.c index b443d6fb..a5505136 100644 --- a/src/item/itemBoomerang.c +++ b/src/item/itemBoomerang.c @@ -3,7 +3,7 @@ extern void (*const gUnk_0811BD78[])(ItemBehavior*, u32); -extern void sub_08078F60(void); +extern void ResetPlayerVelocity(void); void ItemBoomerang(ItemBehavior* this, u32 arg1) { gUnk_0811BD78[this->stateID](this, arg1); @@ -24,7 +24,7 @@ void sub_08075D2C(ItemBehavior* this, u32 arg1) { void sub_08075D88(ItemBehavior* this, u32 arg1) { if ((gPlayerState.field_0x3[1] & 0x80) == 0) { if (((this->behaviorID == 0xc) && ((gPlayerState.field_0xa & 0x80) != 0)) && ((this->field_0x5[9] & 2) != 0)) { - sub_08078F60(); + ResetPlayerVelocity(); return; } UpdateItemAnim(this); diff --git a/src/item/itemLantern.c b/src/item/itemLantern.c index 2903b2de..88245ad8 100644 --- a/src/item/itemLantern.c +++ b/src/item/itemLantern.c @@ -1,6 +1,7 @@ #include "item.h" #include "functions.h" #include "audio.h" +#include "object.h" extern void (*const gUnk_0811BD68[])(ItemBehavior*, u32); @@ -20,22 +21,21 @@ void sub_08075A0C(ItemBehavior* this, u32 arg1) { u32 itemSlot; s8* tmp; itemSlot = IsItemEquipped(this->behaviorID); - if (gPlayerState.heldObject != 0 || gPlayerState.playerAction == 0x18 || gPlayerState.jumpStatus != 0 || + if (gPlayerState.heldObject != 0 || gPlayerState.queued_action == PLAYER_ROLL || gPlayerState.jumpStatus != 0 || gPlayerState.item != NULL || (gPlayerState.flags & PL_MINISH) != 0) { ForceEquipItem(0xf, itemSlot); - gPlayerState.flags &= 0xff7fffff; + gPlayerState.flags &= ~PL_USE_LANTERN; ForceEquipItem(0xf, itemSlot); sub_08077E78(this, arg1); } else { - this->field_0x5[4] |= 0x80; sub_08077D38(this, arg1); sub_08077BD4(this); sub_0806F948(&gPlayerEntity); this->behaviorID = 0x10; - ForceEquipItem(0x10, itemSlot); + ForceEquipItem(ITEM_LANTERN_ON, itemSlot); tmp = &gUnk_08126EEC[gPlayerEntity.animationState & 6]; - object = CreateObjectWithParent(&gPlayerEntity, 0x45, 1, 0); + object = CreateObjectWithParent(&gPlayerEntity, OBJECT_45, 1, 0); if (object != NULL) { object->spriteVramOffset = gPlayerEntity.spriteVramOffset; object->x.HALF.HI = tmp[0] + object->x.HALF.HI; @@ -54,7 +54,7 @@ void sub_08075ADC(ItemBehavior* this, u32 arg1) { sub_08079D48() == 0) { this->field_0xf = 0; this->stateID += 1; - gPlayerState.flags |= 0x800000; + gPlayerState.flags |= PL_USE_LANTERN; bVar1 = 8 >> arg1; gPlayerState.field_0x3[1] = gPlayerState.field_0x3[1] & ~((bVar1 << 4) | bVar1); bVar1 = ~bVar1; @@ -77,11 +77,11 @@ void sub_08075B54(ItemBehavior* this, u32 arg1) { itemSlot = IsItemEquipped(this->behaviorID); if (!(((sub_08077F10(this) == 0) && (itemSlot < 2)) || (gPlayerState.jumpStatus != 0))) { ForceEquipItem(0xf, itemSlot); - gPlayerState.flags &= 0xff7fffff; + gPlayerState.flags &= ~PL_USE_LANTERN; sub_08077E78(this, arg1); SoundReq(SFX_ITEM_LANTERN_OFF); } else { - if (((gPlayerState.playerAction != 0x18) && (gPlayerEntity.frameIndex < 0x37)) && + if (((gPlayerState.queued_action != PLAYER_ROLL) && (gPlayerEntity.frameIndex < 0x37)) && ((u16)gPlayerEntity.spriteIndex == 6)) { tmp = &gUnk_08126EEC[gPlayerEntity.animationState & 6]; @@ -91,7 +91,7 @@ void sub_08075B54(ItemBehavior* this, u32 arg1) { this->field_0xf = 0xf; this->stateID += 1; gPlayerEntity.field_0x7a.HWORD = 2; - object = CreateObjectWithParent(&gPlayerEntity, 0x45, 1, 0); + object = CreateObjectWithParent(&gPlayerEntity, OBJECT_45, 1, 0); if (object != NULL) { object->spriteVramOffset = gPlayerEntity.spriteVramOffset; object->x.HALF.HI = tmp[0] + object->x.HALF.HI; diff --git a/src/item/itemOcarina.c b/src/item/itemOcarina.c index 7b705446..1f418627 100644 --- a/src/item/itemOcarina.c +++ b/src/item/itemOcarina.c @@ -4,7 +4,7 @@ extern void (*const gOcarinaStates[4])(ItemBehavior*, u32); -extern void sub_08078F60(void); +extern void ResetPlayerVelocity(void); extern void SetPlayerEventPriority(void); extern void CreateBird(void); @@ -16,7 +16,7 @@ void ItemOcarina(ItemBehavior* this, u32 arg1) { } void OcarinaUse(ItemBehavior* this, u32 arg1) { - if (gPlayerState.playerAction == 0x18) { + if (gPlayerState.queued_action == PLAYER_ROLL) { sub_08077E78(this, arg1); } else { this->field_0x5[4] |= 0xf; @@ -24,12 +24,12 @@ void OcarinaUse(ItemBehavior* this, u32 arg1) { gPlayerEntity.spriteSettings.flipX = 0; gPlayerEntity.flags &= 0x7f; gPlayerEntity.field_0x7a.HWORD = 2; - gPlayerState.flags |= 0x10000000; + gPlayerState.flags |= PL_USE_OCARINA; gPlayerState.field_0x27[0] = -1; gUnk_02034490[0] = 1; gPlayerState.field_0xa = (8 >> arg1) | gPlayerState.field_0xa; gPlayerState.keepFacing = (8 >> arg1) | gPlayerState.keepFacing; - sub_08078F60(); + ResetPlayerVelocity(); sub_08077D38(this, arg1); SoundReq(SFX_216); SetPlayerEventPriority(); @@ -41,7 +41,7 @@ NONMATCH("asm/non_matching/ocarina/OcarinaUpdate.inc", void OcarinaUpdate(ItemBe UpdateItemAnim(this); if ((this->field_0x5[9] & 0x80) != 0) { gPlayerEntity.flags |= 0x80; - gPlayerState.flags &= 0xefffffff; + gPlayerState.flags &= ~PL_USE_OCARINA; gPlayerState.field_0x27[0] = 0; gUnk_02034490[0] = 0; CreateBird(); diff --git a/src/item/itemPegasusBoots.c b/src/item/itemPegasusBoots.c index a12e31f3..e60d820c 100644 --- a/src/item/itemPegasusBoots.c +++ b/src/item/itemPegasusBoots.c @@ -24,7 +24,7 @@ void ItemPegasusBoots(ItemBehavior* this, u32 arg1) { SoundReq(SFX_PLY_LAND); } if (((gPlayerState.flags & PL_MINISH) == 0) && ((this->field_0x5[2] & 7) == 0)) { - if (gPlayerState.floor_type == SURFACE_11) { + if (gPlayerState.floor_type == SURFACE_SWAMP) { if (gPlayerEntity.spriteOffsetY == 0) { CreateFx(&gPlayerEntity, FX_GREEN_SPLASH, 0); } diff --git a/src/item/itemSword.c b/src/item/itemSword.c index 45441f72..37a91ef4 100644 --- a/src/item/itemSword.c +++ b/src/item/itemSword.c @@ -72,9 +72,9 @@ void sub_0807564C(ItemBehavior* this, u32 arg1) { void sub_08075694(ItemBehavior* this, u32 arg1) { this->field_0x5[2] = 1; - if ((gPlayerState.flags & 0x8000000) != 0) { - gPlayerState.flags &= 0xf7ffffff; - gPlayerState.flags &= 0xfffbffff; + if (gPlayerState.flags & PL_SWORD_THRUST) { + gPlayerState.flags &= ~PL_SWORD_THRUST; + gPlayerState.flags &= ~PL_ROLLING; sub_08077DF4(this, 300); } else { gPlayerState.field_0xab = 1; @@ -86,7 +86,7 @@ void sub_08075694(ItemBehavior* this, u32 arg1) { gPlayerEntity.hurtType = 0x1e; gPlayerState.field_0x1a[1] |= 0x40; gPlayerState.field_0x1a[1] &= 0xdf; - if ((gPlayerState.field_0xa0[0] == 0x04) && ((gPlayerState.flags & 0x400000) == 0)) { + if ((gPlayerState.field_0xa0[0] == 0x04) && ((gPlayerState.flags & PL_CLONING) == 0)) { gPlayerState.field_0xa0[0] = 0x01; sub_0807A108(); } @@ -124,7 +124,7 @@ void sub_080759B8(ItemBehavior* this, u32 arg1) { if ((gPlayerState.flags & PL_MINISH) == 0) { gPlayerEntity.hurtType = 0; } - gPlayerState.flags &= 0xf7ffffff; + gPlayerState.flags &= ~PL_SWORD_THRUST; gPlayerState.field_0x1a[1] = 0; gPlayerState.item = NULL; sub_08077E78(this, arg1); diff --git a/src/manager/manager15.c b/src/manager/manager15.c index b73beba0..8dc10a8f 100644 --- a/src/manager/manager15.c +++ b/src/manager/manager15.c @@ -315,8 +315,8 @@ void sub_0805A76C(Manager15* this) { } void sub_0805A7E4(Manager15* this) { - if (gPlayerState.playerAction != PLAYER_WARP) { - gPlayerState.playerAction = PLAYER_WARP; + if (gPlayerState.queued_action != PLAYER_WARP) { + gPlayerState.queued_action = PLAYER_WARP; gPlayerState.field_0x38 = 0; gPlayerState.field_0x39 = 0; } diff --git a/src/manager/manager1A.c b/src/manager/manager1A.c index dc09ea5f..b188ef08 100644 --- a/src/manager/manager1A.c +++ b/src/manager/manager1A.c @@ -137,7 +137,7 @@ void sub_0805B168(Manager1A* this) { u32 sub_0805B1CC(Manager1A* this) { u32 re = 0; if (CheckPlayerProximity(this->unk_20, this->unk_22, this->unk_24, this->unk_26)) { - if ((gPlayerState.flags & 0x4) && (gPlayerState.flags & 0x1)) { + if ((gPlayerState.flags & PL_DROWNING) && (gPlayerState.flags & PL_BUSY)) { gPlayerState.flags |= 0x8000; } else if (gPlayerState.flags & 0x8000) { re = 1; diff --git a/src/manager/manager34.c b/src/manager/manager34.c index 6ca4773c..a3f83418 100644 --- a/src/manager/manager34.c +++ b/src/manager/manager34.c @@ -39,11 +39,11 @@ void sub_0805DBF0(Manager34* this) { sub_0805DC70(); } else { if (this->field_0x20 == 0x78) { - sub_08080964(0x78, 2); + InitScreenShake(0x78, 2); } else if (this->field_0x20 == 0xd2) { - sub_08080964(0x5a, 1); + InitScreenShake(0x5a, 1); } else if (this->field_0x20 == 0x12c) { - sub_08080964(0x5a, 0); + InitScreenShake(0x5a, 0); } if (this->field_0x20 < 0x78) { diff --git a/src/manager/managerA.c b/src/manager/managerA.c index fbaf30ff..1d68eadc 100644 --- a/src/manager/managerA.c +++ b/src/manager/managerA.c @@ -117,7 +117,7 @@ static u32 PlayerStateValid(ManagerA* this) { static void sub_08058514(ManagerA* this) { switch (this->manager.unk_0d) { case 1: - if (gPlayerState.flags & (PL_BUSY | PL_DROWNING | PL_USE_PORTAL | 0x1210)) + if (gPlayerState.flags & (PL_BUSY | PL_DROWNING | PL_USE_PORTAL | PL_FALLING | 0x1010)) return; if (gPlayerEntity.z.HALF.HI != 0) return; diff --git a/src/manager/managerC.c b/src/manager/managerC.c index 2583ce98..1dae3225 100644 --- a/src/manager/managerC.c +++ b/src/manager/managerC.c @@ -156,7 +156,7 @@ void sub_08058A04(ManagerC* this) { s32 tmp2 = gPlayerEntity.y.HALF.HI - gRoomControls.roomOriginY; if ((this->unk_20 - 0x118 < 0xDu) && CheckGlobalFlag(LV1TARU_OPEN) && (tmp - 0x6d < 0x17u) && (tmp2 - 0x45 < 0x17u) && (gPlayerEntity.z.HALF.HI == 0)) { - gPlayerState.playerAction = 3; + gPlayerState.queued_action = PLAYER_FALL; gPlayerState.field_0x38 = 0; gPlayerEntity.x.HALF.HI = gRoomControls.roomOriginX + 0x78; gPlayerEntity.y.HALF.HI = gRoomControls.roomOriginY + 0x50; diff --git a/src/npc/carlov.c b/src/npc/carlov.c index dd25013a..83402406 100644 --- a/src/npc/carlov.c +++ b/src/npc/carlov.c @@ -15,7 +15,7 @@ void Carlov(Entity* this) { if ((this->frame & 0x10) != 0) { this->frame = this->frame & 0xef; EnqueueSFX(0x104); - sub_08080964(0x10, 0); + InitScreenShake(0x10, 0); } if ((this->frame & 0x20) != 0) { this->frame = this->frame & 0xdf; diff --git a/src/npc/castorWildsStatue.c b/src/npc/castorWildsStatue.c index 884a4289..b621b86f 100644 --- a/src/npc/castorWildsStatue.c +++ b/src/npc/castorWildsStatue.c @@ -97,7 +97,7 @@ void sub_08067534(Entity* this) { } } EnqueueSFX(0x14c); - sub_08080964(0x28, 4); + InitScreenShake(0x28, 4); } void sub_0806757C(Entity* this) { diff --git a/src/npc/rem.c b/src/npc/rem.c index d3ab32d0..cef24033 100644 --- a/src/npc/rem.c +++ b/src/npc/rem.c @@ -131,7 +131,7 @@ void sub_0806A550(Entity* this) { } else { if (this->frame == 1) { this->frame = 0; - sub_08080964(8, 2); + InitScreenShake(8, 2); gActiveScriptInfo.unk_00 |= 0x100; SoundReq(SFX_CHEST_OPEN); } diff --git a/src/npc/zelda.c b/src/npc/zelda.c index 4cb5a1ae..4631a31e 100644 --- a/src/npc/zelda.c +++ b/src/npc/zelda.c @@ -85,7 +85,7 @@ void sub_08066D94(Entity* this) { DeleteThisEntity(); } -void sub_08066DE4(Entity* this) { +void SetZeldaFollowTarget(Entity* this) { Entity* pEVar1; pEVar1 = DeepFindEntityByID(7, 0x2E); diff --git a/src/object/bakerOven.c b/src/object/bakerOven.c index ffe11cd9..c7f21f7c 100644 --- a/src/object/bakerOven.c +++ b/src/object/bakerOven.c @@ -1,6 +1,6 @@ #include "object.h" -extern void sub_0800449C(Entity*, u32); +extern void SoundReqClipped(Entity*, u32); extern u32 sub_0806FC80(Entity*, Entity*, s32); extern void sub_0809CDF0(Entity*); @@ -61,7 +61,7 @@ void sub_0809CD0C(Entity* this) { sub_0806FC80(this, &gPlayerEntity, 4)) { this->field_0xf++; ModHealth(-2); - sub_0800449C(&gPlayerEntity, 0x7a); + SoundReqClipped(&gPlayerEntity, 0x7a); gPlayerEntity.iframes = 16; gPlayerEntity.knockbackDirection = 16; gPlayerEntity.knockbackDuration = 12; diff --git a/src/object/bigVortex.c b/src/object/bigVortex.c index 5e7f87eb..9118cb67 100644 --- a/src/object/bigVortex.c +++ b/src/object/bigVortex.c @@ -67,7 +67,7 @@ void sub_08098DC4(Entity* this) { sub_08004542(&gPlayerEntity); gPlayerEntity.collisionLayer = 1; ResolveEntityOnTop(this, &gPlayerEntity); - gPlayerState.playerAction = 0x1f; + gPlayerState.queued_action = PLAYER_PARACHUTE; gPlayerState.field_0x34[4] = 1; gPlayerState.field_0x34[5] = this->type2; this->action = 4; diff --git a/src/object/book.c b/src/object/book.c index 9a99b928..25faf3ab 100644 --- a/src/object/book.c +++ b/src/object/book.c @@ -92,8 +92,8 @@ void sub_0809B4A8(Entity* this) { this->direction = 16; gPlayerState.pushedObject = 0x9e; - gPlayerState.playerAction = 5; - gPlayerState.flags |= 1; + gPlayerState.queued_action = PLAYER_PUSH; + gPlayerState.flags |= PL_BUSY; gPlayerEntity.x.HALF.LO = 0; gPlayerEntity.y.HALF.LO = 0; diff --git a/src/object/button.c b/src/object/button.c index 76b48da8..1db2cafb 100644 --- a/src/object/button.c +++ b/src/object/button.c @@ -138,7 +138,7 @@ u32 sub_08081D28(Entity* this) { } extern u32 sub_080002E0(u32, u32); -extern Entity* gUnk_03004040[3]; +extern Entity* gPlayerClones[3]; u32 sub_08081E0C(Entity*); Entity* sub_08081D74(Entity* this) { @@ -152,13 +152,13 @@ Entity* sub_08081D74(Entity* this) { ent = &gPlayerEntity; } } else { - if (gPlayerState.flags & 0x400000) { - if (EntityInRectRadius(this, gUnk_03004040[0], 5, 6)) { - ent = gUnk_03004040[0]; - } else if (EntityInRectRadius(this, gUnk_03004040[1], 5, 6)) { - ent = gUnk_03004040[1]; - } else if (EntityInRectRadius(this, gUnk_03004040[2], 5, 6)) { - ent = gUnk_03004040[2]; + if (gPlayerState.flags & PL_CLONING) { + if (EntityInRectRadius(this, gPlayerClones[0], 5, 6)) { + ent = gPlayerClones[0]; + } else if (EntityInRectRadius(this, gPlayerClones[1], 5, 6)) { + ent = gPlayerClones[1]; + } else if (EntityInRectRadius(this, gPlayerClones[2], 5, 6)) { + ent = gPlayerClones[2]; } } } @@ -272,8 +272,8 @@ void sub_08081FF8(Entity* this) { direction = GetFacingDirection(this->child, this); sub_080044AE(this->child, 0x200, direction); for (i = 0; i < 3; i++) { - if (gUnk_03004040[i]) { - sub_080044AE(gUnk_03004040[i], 0x200, direction); + if (gPlayerClones[i]) { + sub_080044AE(gPlayerClones[i], 0x200, direction); } } } diff --git a/src/object/itemOnGround.c b/src/object/itemOnGround.c index 78d8c881..c062d75b 100644 --- a/src/object/itemOnGround.c +++ b/src/object/itemOnGround.c @@ -17,7 +17,6 @@ void sub_080813BC(Entity*); void sub_080810FC(Entity*); bool32 CheckShouldPlayItemGetCutscene(Entity*); -extern u32 sub_080002D0(Entity*); extern u32 sub_080177A0(Entity*, Entity*); extern void GiveItem(u32, u32); diff --git a/src/object/jarPortal.c b/src/object/jarPortal.c index 8adb45e7..89142cbc 100644 --- a/src/object/jarPortal.c +++ b/src/object/jarPortal.c @@ -108,7 +108,7 @@ void sub_0808C01C(Entity* this, u32 r1) { type = 2; gArea.curPortalType = type; if (r1 == 1) { - if (((gPlayerState.flags & 0x20) != 0) && (gPlayerState.jumpStatus == 0)) { + if ((gPlayerState.flags & PL_USE_PORTAL) && (gPlayerState.jumpStatus == 0)) { gArea.field_0x18 = 2; } else { if (sub_08057810() != 0) { diff --git a/src/object/minecart.c b/src/object/minecart.c index 8f5e9360..619e1a7b 100644 --- a/src/object/minecart.c +++ b/src/object/minecart.c @@ -55,7 +55,6 @@ void sub_080916EC(Entity* this) { } void sub_080917DC(Entity* this) { - if ((this->bitfield & 0x7f) == 0x1d) { this->zVelocity = 0x2a000; this->action = 7; @@ -63,8 +62,8 @@ void sub_080917DC(Entity* this) { SoundReq(SFX_13B); } else { if (sub_0800445C(this) != 0) { - if (((gPlayerState.flags & 0x40080) == 0) && (gPlayerState.field_0x1c == 0) && - (gPlayerState.heldObject == 0) && (gPlayerState.jumpStatus == 0)) { + if (!((gPlayerState.flags & (PL_MINISH | PL_ROLLING)) || gPlayerState.field_0x1c || + gPlayerState.heldObject || gPlayerState.jumpStatus)) { this->actionDelay++; } else { this->actionDelay = 0; @@ -73,13 +72,13 @@ void sub_080917DC(Entity* this) { this->actionDelay = 0; } if (this->type2 == 0) { - if (8 < this->actionDelay) { - this->action = this->action + 1; + if (this->actionDelay > 8) { + this->action++; gPlayerState.jumpStatus = 0x81; - gPlayerState.flags |= 0x4000000; + gPlayerState.flags |= PL_MINECART; gPlayerEntity.zVelocity = 0x20000; gPlayerEntity.speed = 0x100; - gPlayerEntity.flags &= 0x7f; + gPlayerEntity.flags &= ~PL_MINISH; ResetPlayer(); sub_0807A108(); SoundReq(SFX_PLY_JUMP); @@ -95,11 +94,11 @@ void sub_080918A4(Entity* this) { gPlayerEntity.x.HALF.HI = this->x.HALF.HI; gPlayerEntity.y.HALF.HI = this->y.HALF.HI; if (gPlayerEntity.z.HALF.HI > -0x10) { - if ((s32)gPlayerEntity.zVelocity > -1) { + if (gPlayerEntity.zVelocity >= 0) { return; } gPlayerEntity.animationState = this->animationState << 1; - gPlayerState.flags = (gPlayerState.flags ^ 0x4000000) | 0x1000; + gPlayerState.flags = (gPlayerState.flags ^ PL_MINECART) | 0x1000; this->action++; this->field_0xf = 1; this->flags |= ENT_20; @@ -158,7 +157,7 @@ void sub_080919AC(Entity* this) { gUnk_081223C8[this->animationState * 2 + 1]); iVar2 = sub_08007DD6(uVar3, gUnk_081223D8[this->animationState]); if (iVar2 == 0) { - this->direction = this->direction ^ 0x10; + this->direction = DirectionTurnAround(this->direction); this->animationState = this->animationState ^ 2; } else { switch (uVar3) { @@ -171,12 +170,12 @@ void sub_080919AC(Entity* this) { this->action = 6; sub_08017744(this); gPlayerState.jumpStatus = 0x41; - gPlayerState.flags = (gPlayerState.flags ^ 0x1000) | 0x4000000; + gPlayerState.flags = (gPlayerState.flags ^ 0x1000) | PL_MINECART; gPlayerEntity.zVelocity = 0x20000; gPlayerEntity.speed = 0x200; gPlayerEntity.animationState = this->animationState << 1; gPlayerEntity.direction = this->direction; - gPlayerEntity.flags |= 0x80; + gPlayerEntity.flags |= PL_MINISH; sub_08004168(this); InitAnimationForceUpdate(this, this->animationState + 0xc); SoundReq(SFX_PLY_VO4); diff --git a/src/object/object6A.c b/src/object/object6A.c index d0063f60..11dcfc48 100644 --- a/src/object/object6A.c +++ b/src/object/object6A.c @@ -398,7 +398,7 @@ void sub_08094FA8(Object6AEntity* this) { super->interactType = 0; super->action = 2; sub_080788E0(super); - gPlayerState.playerAction = 12; + gPlayerState.queued_action = PLAYER_EMPTYBOTTLE; gPlayerState.field_0x38 = 54; #ifndef EU SetPlayerControl(2); diff --git a/src/object/object86.c b/src/object/object86.c index b5c9e60b..62d30b6b 100644 --- a/src/object/object86.c +++ b/src/object/object86.c @@ -69,7 +69,7 @@ void nullsub_534(Entity* this) { void sub_08099ECC(Entity* this) { this->subAction = 1; CopyPosition(this, &gPlayerEntity); - gPlayerState.playerAction = 3; + gPlayerState.queued_action = PLAYER_FALL; gPlayerState.field_0x34[4] = 0; gPlayerState.flags |= 0x8000; } diff --git a/src/overworld.c b/src/overworld.c index 997ce29d..ff90afc8 100644 --- a/src/overworld.c +++ b/src/overworld.c @@ -351,7 +351,7 @@ void InitializePlayer(void) { pl = &gPlayerEntity; gRoomControls.cameraTarget = pl; - gPlayerState.playerAction = sPlayerSpawnStates[gScreenTransition.player_status.spawn_type]; + gPlayerState.queued_action = sPlayerSpawnStates[gScreenTransition.player_status.spawn_type]; if (!CheckGlobalFlag(EZERO_1ST)) { gPlayerState.flags |= PL_NO_CAP; } @@ -607,7 +607,7 @@ static u32 StairsAreValid(void) { for (i = sStairTypes; i[0] != 0; i += 2) { if (tgt == i[0]) { - gPlayerState.playerAction = 30; + gPlayerState.queued_action = PLAYER_USEENTRANCE; gPlayerState.field_0x38 = 0; gPlayerState.field_0x39 = i[1]; if (!gScreenTransition.player_status.spawn_type) @@ -666,7 +666,7 @@ u32 sub_08052B24(void) { gUnk_0200AF00.filler0[1]) return 0; - if ((gPlayerState.flags & 0x118) || (gPlayerState.framestate_last > tmp) || gPlayerState.item || + if ((gPlayerState.flags & (PL_NO_CAP | 0x110)) || (gPlayerState.framestate_last > tmp) || gPlayerState.item || gPlayerEntity.field_0x7a.HWORD) return 0; diff --git a/src/player.c b/src/player.c index ead93d25..0ead68bc 100644 --- a/src/player.c +++ b/src/player.c @@ -15,11 +15,10 @@ #include "hitbox.h" #include "overworld.h" #include "screen.h" +#include "main.h" typedef void(EntityAction)(Entity*); -static EntityAction* const sPlayerActions[]; - static EntityAction PlayerInit; static EntityAction PlayerNormal; static EntityAction PlayerInit; @@ -29,7 +28,7 @@ static EntityAction PlayerPush; static EntityAction PlayerBounce; static EntityAction sub_08070E9C; static EntityAction PlayerItemGet; -EntityAction PlayerMinish; +static EntityAction PlayerMinish; static EntityAction PlayerMinishDie; static EntityAction sub_08071DB8; static EntityAction PlayerEmptyBottle; @@ -48,10 +47,10 @@ static EntityAction PlayerRoll; static EntityAction sub_080728AC; static EntityAction PlayerInHole; static EntityAction sub_08072C9C; -EntityAction sub_08074C44; -static EntityAction sub_08072F34; +static EntityAction sub_08074C44; +static EntityAction PlayerClimb; static EntityAction PlayerUseEntrance; -EntityAction PlayerParachute; +static EntityAction PlayerParachute; // PLAYER_FALL static EntityAction PlayerFallInit; @@ -163,28 +162,86 @@ static EntityAction sub_08072CFC; static EntityAction sub_08072D54; static EntityAction sub_08072F14; -// PLAYER_08072F34 +// PLAYER_CLIMB static EntityAction sub_08072F94; static EntityAction sub_08073094; // PLAYER_USEENTRANCE -EntityAction sub_080731D8; -EntityAction sub_080732D0; -EntityAction sub_0807332C; -EntityAction sub_080733BC; +static EntityAction sub_080731D8; +static EntityAction sub_080732D0; +static EntityAction sub_0807332C; +static EntityAction sub_080733BC; + +// PLAYER_PARACHUTE +static EntityAction sub_08073468; +static EntityAction sub_080734D4; +static EntityAction sub_08073504; +static EntityAction sub_08073584; +static EntityAction sub_0807379C; +static EntityAction sub_080737BC; +static EntityAction sub_0807380C; +static EntityAction sub_08073884; + +// sub_08073904... ? +static EntityAction sub_08073924; +static EntityAction sub_08073968; +static EntityAction sub_080739EC; +static EntityAction sub_08073A94; +static EntityAction sub_08073B8C; +static EntityAction sub_08073C30; + +// PLAYER_MINISH +static EntityAction sub_08073C80; +static EntityAction sub_08073D20; +static EntityAction sub_08073F04; +static EntityAction sub_08073F4C; +static EntityAction sub_08073FD0; +static EntityAction sub_08074018; +static EntityAction sub_08074060; +static EntityAction sub_080740D8; + +// PLAYER_08074C44 +static EntityAction sub_08074C68; +static EntityAction sub_08074CF8; +static EntityAction sub_08074F00; +static EntityAction sub_080750F4; +// ... +static EntityAction sub_08074F1C; +static EntityAction sub_08074F2C; +static EntityAction sub_08074F44; +static EntityAction sub_08074F8C; +static EntityAction sub_08074FEC; +static EntityAction sub_0807501C; +static EntityAction sub_0807508C; +// ... +static EntityAction sub_08075110; +static EntityAction sub_0807513C; +static EntityAction sub_0807518C; +static EntityAction sub_080751B4; static void sub_080717F8(Entity*); static void ResetPlayerPriority(); static void sub_080728AC(Entity*); static void BreakOut(); +static void sub_08073AD4(); +static void sub_08073B60(Entity*); +static void sub_08074244(Entity*, u32, u32); +static void hide(Entity*); +static void sub_08074BF8(Entity*); +static void sub_08074D34(Entity*, ScriptExecutionContext*); + +// exports +void SurfaceAction_Water(Entity*); +void SurfaceAction_Ladder(Entity*); +void SurfaceAction_AutoLadder(Entity*); extern void RespawnPlayer(); extern void sub_080797EC(); extern void sub_08079E08(); -extern void sub_08078F60(); +extern void ResetPlayerVelocity(); extern void sub_08077698(); extern void sub_08079258(); -extern void sub_0807A298(); +extern void EnablePlayerDraw(); extern u32 sub_08079B24(); extern void sub_08079708(); extern void sub_080792D8(); @@ -208,8 +265,25 @@ extern u32 sub_08007DD6(); extern u32 GetSurfaceCalcType(); extern void sub_08074808(); extern void sub_08073904(Entity*); +extern void SetZeldaFollowTarget(Entity*); +extern u32 ItemIsSword(u32); +extern u32 sub_0807A2B8(); +extern u32 sub_08079550(u32); +extern u32 sub_080782C0(); +extern u32 sub_080793E4(u32); +extern void sub_08008AC6(Entity*); +extern u32 sub_08079C30(Entity*); +extern void sub_08077AEC(); extern ScreenTransitionData gUnk_0813AB58; +extern ScreenTransitionData gUnk_0813AD88[]; +extern u8 gUnk_080082DC[]; + +extern u16 script_08009ECC; +extern u16 script_08009EF0; + +extern Entity* gPlayerClones[]; +extern ScriptExecutionContext gPlayerScriptExecutionContext; void DoPlayerAction(Entity* this) { static void (*const sPlayerActions[])(Entity*) = { @@ -242,7 +316,7 @@ void DoPlayerAction(Entity* this) { [PLAYER_INHOLE] = PlayerInHole, [PLAYER_08072C9C] = sub_08072C9C, [PLAYER_08074C44] = sub_08074C44, - [PLAYER_08072F34] = sub_08072F34, + [PLAYER_CLIMB] = PlayerClimb, [PLAYER_USEENTRANCE] = PlayerUseEntrance, [PLAYER_PARACHUTE] = PlayerParachute, }; @@ -278,7 +352,7 @@ static void PlayerInit(Entity* this) { sub_0807A108(); sub_0807AEE4(); - if (sub_08078EFC() == 0) { + if (RunQueuedAction() == 0) { sub_0807921C(); UpdateFloorType(); if (gPlayerState.swimState != 0) { @@ -329,9 +403,9 @@ static void PlayerFallInit(Entity* this) { gPlayerState.jumpStatus = 0; - if ((gPlayerState.flags & PL_MINISH) != 0) + if (gPlayerState.flags & PL_MINISH) gPlayerState.animation = 0x1ba; - else if ((gPlayerState.flags & 8) != 0) + else if (gPlayerState.flags & PL_NO_CAP) gPlayerState.animation = 0x458; else gPlayerState.animation = 0x1b8; @@ -382,7 +456,7 @@ static void PlayerBounceInit(Entity* this) { if ((gPlayerState.flags & PL_MINISH) == 0) { this->zVelocity = 0x20000; gPlayerState.animation = 0x114; - sub_08080964(16, 0); + InitScreenShake(16, 0); } else { gPlayerState.animation = 0xc18; this->zVelocity = 0x18000; @@ -391,7 +465,7 @@ static void PlayerBounceInit(Entity* this) { gPlayerState.jumpStatus = 0x80; SoundReq(SFX_14C); ResetPlayer(); - sub_08078F60(); + ResetPlayerVelocity(); } // minor regalloc @@ -401,12 +475,12 @@ static NONMATCH("asm/non_matching/player/sub_08070DC4.inc", void PlayerBounceUpd sub_08079E08(); UpdateFloorType(); - if (sub_08078EFC() || GravityUpdate(this, 0x2000)) + if (RunQueuedAction() || GravityUpdate(this, 0x2000)) return; gPlayerState.jumpStatus = 0; - if (sub_08078EFC() || sub_08079D48()) + if (RunQueuedAction() || sub_08079D48()) return; if (gPlayerState.swimState != 0) { @@ -451,7 +525,7 @@ static void sub_08070E9C(Entity* this) { sub_08070f24, }; - if (sub_08078EFC() != 0) { + if (RunQueuedAction() != 0) { MessageClose(); } else { gPlayerState.field_0x27[0] = 4; @@ -531,7 +605,7 @@ static void PlayerItemGetInit(Entity* this) { this->subAction = 1; ResetPlayer(); - sub_08078F60(); + ResetPlayerVelocity(); } static void PlayerItemGetUpdate(Entity* this) { @@ -543,7 +617,7 @@ static void PlayerItemGetUpdate(Entity* this) { static void sub_08071038(Entity* this) { UpdateAnimationSingleFrame(this); - if (sub_08078EFC() || (gMessage.doTextBox & 0x7f)) + if (RunQueuedAction() || (gMessage.doTextBox & 0x7f)) return; if (this->frame & 0x80) { @@ -572,9 +646,9 @@ static void PlayerJumpInit(Entity* this) { this->subAction++; gPlayerState.flags |= PL_BUSY; - gPlayerState.flags &= ~(PL_BURNING | 0x800); + gPlayerState.flags &= ~(PL_BURNING | PL_FROZEN); - gPlayerState.playerAction = 0; + gPlayerState.queued_action = 0; if ((gPlayerState.heldObject | gPlayerState.field_0x1a[1]) == 0) { if ((gPlayerState.flags & PL_MINISH) == 0) { @@ -602,8 +676,7 @@ static void PlayerJumpInit(Entity* this) { } static void sub_08071130(Entity* this) { - - if (sub_08078EFC(this)) + if (RunQueuedAction(this)) return; if (gPlayerState.field_0x1a[1] == 0) { @@ -631,7 +704,7 @@ static void sub_08071130(Entity* this) { UpdateFloorType(); - if (sub_08078EFC()) + if (RunQueuedAction()) return; if ((sub_08079D48() == 0) || (gPlayerState.swimState != 0)) { @@ -652,7 +725,7 @@ static void sub_08071130(Entity* this) { } this->subAction++; - sub_08078F60(); + ResetPlayerVelocity(); this->knockbackDuration = 0; SoundReq(SFX_PLY_LAND); } @@ -940,7 +1013,7 @@ static void PlayerTalkEzlo(Entity* this) { sub_08071A4C, }; - if (sub_08078EFC()) { + if (RunQueuedAction()) { MessageClose(); ResetPlayerPriority(); } else { @@ -1111,7 +1184,7 @@ static void PlayerPushUpdate(Entity* this) { static void sub_08071B60(Entity* this) { gPlayerState.pushedObject = 2; - gPlayerState.flags &= ~0x1; + gPlayerState.flags &= ~PL_BUSY; this->type = 0; this->knockbackDuration = 0; sub_080728AC(this); @@ -1150,11 +1223,11 @@ static void PlayerMinishDieInit(Entity* this) { return; } - gPlayerState.playerAction = 0; + gPlayerState.queued_action = 0; if (gPlayerState.flags & PL_MINISH) { if (gPlayerState.floor_type == SURFACE_MINISH_DOOR_FRONT || gPlayerState.floor_type == SURFACE_MINISH_DOOR_BACK || gPlayerState.floor_type == SURFACE_A) { - sub_0807A298(this); + EnablePlayerDraw(this); RespawnPlayer(); this->action = 10; } @@ -1164,7 +1237,7 @@ static void PlayerMinishDieInit(Entity* this) { } gPlayerState.animation = temp; - gPlayerState.flags &= ~(0x1000000 | 0x200000 | 0x40000 | 0x800 | 0x400 | 0x100 | PL_BUSY); + gPlayerState.flags &= ~(PL_PARACHUTE | PL_RELEASED | PL_ROLLING | PL_FROZEN | PL_BURNING | 0x100 | PL_BUSY); this->subAction = 1; this->animationState = IdleSouth; this->spritePriority.b1 = 1; @@ -1181,7 +1254,7 @@ static void sub_08071CAC(Entity* this) { if (this->frame & 0x80) { u32 temp; if ((gPlayerState.flags & PL_MINISH) == 0) - temp = (gPlayerState.flags & 8) ? 0x45a : 0x2bd; + temp = (gPlayerState.flags & PL_NO_CAP) ? 0x45a : 0x2bd; else temp = 0xc1b; gPlayerState.animation = temp; @@ -1262,7 +1335,7 @@ static void sub_08071E04(Entity* this) { UpdateFloorType(); if (gPlayerState.floor_type == SURFACE_PIT) { gPlayerState.field_0x11 = 7; - gPlayerState.flags |= 0x200; + gPlayerState.flags |= PL_FALLING; sub_080791BC(); return; } @@ -1366,7 +1439,7 @@ static void PlayerFrozenUpdate(Entity* this) { if (sub_08079B24() == 0) { sub_08079708(this); } else { - if (gPlayerState.flags & 0x800) { + if (gPlayerState.flags & PL_FROZEN) { if (sub_0807953C() != 0) { this->actionDelay -= 3; this->spriteOffsetX = 2; @@ -1386,7 +1459,7 @@ static void BreakOut(Entity* this) { this->knockbackDuration = 0; COLLISION_ON(this); this->spriteOffsetX = 0; - gPlayerState.flags &= ~(0x800 | PL_BUSY); + gPlayerState.flags &= ~(PL_FROZEN | PL_BUSY); CreateFx(this, FX_ICE, 0); sub_080791BC(); } @@ -1429,7 +1502,7 @@ static void sub_080720DC(Entity* this) { sub_08072168, }; - if (sub_08078EFC() == 0) + if (RunQueuedAction() == 0) gUnk_0811BB60[this->subAction](this); } @@ -1686,7 +1759,7 @@ static void PlayerRoll(Entity* this) { static void PlayerRollInit(Entity* this) { u32 temp; - if ((gPlayerState.flags & 0x200000) == 0) { + if ((gPlayerState.flags & PL_RELEASED) == 0) { sub_0806F948(&gPlayerEntity); this->direction = Direction8FromAnimationState(this->animationState); } @@ -1715,11 +1788,13 @@ static void PlayerRollInit(Entity* this) { } static void PlayerRollUpdate(Entity* this) { - if (((gPlayerState.flags & (PL_ROLLING | 0x80000)) != PL_ROLLING) || - (!(gPlayerState.flags & 0x200000) && (this->iframes != 0) && (this->bitfield & 0x80))) { + if (((gPlayerState.flags & (PL_ROLLING | PL_TRAPPED)) != PL_ROLLING) || + ((gPlayerState.flags & PL_RELEASED) == 0 && (this->iframes != 0) && (this->bitfield & 0x80))) { gPlayerState.flags &= ~PL_ROLLING; - if (!sub_08078EFC()) - sub_080728AC(this); + if (RunQueuedAction()) + return; + + sub_080728AC(this); return; } @@ -1731,12 +1806,12 @@ static void PlayerRollUpdate(Entity* this) { if ((gPlayerState.flags & 2) == 0) { UpdateFloorType(); } - if (sub_08078EFC()) { + if (RunQueuedAction()) { gPlayerState.flags &= ~PL_ROLLING; return; } - if ((gPlayerState.flags & 0x80000) != 0) { + if (gPlayerState.flags & PL_TRAPPED) { gPlayerState.flags &= ~PL_ROLLING; return; } @@ -1745,7 +1820,7 @@ static void PlayerRollUpdate(Entity* this) { return; } - if (gPlayerState.flags & (0x200 | 0x40 | 0x10)) { + if (gPlayerState.flags & (PL_FALLING | PL_HIDDEN | 0x10)) { gPlayerState.flags &= ~PL_ROLLING; sub_080728AC(this); return; @@ -1778,14 +1853,14 @@ static void PlayerRollUpdate(Entity* this) { // dont take damage this->hurtType = 0; } - if ((this->frame & 0x40) != 0) { + if (this->frame & 0x40) { sub_08077698(this); } - if (((this->frame & 0x80) != 0) || (gPlayerState.field_0x3[1] != 0)) { + if ((this->frame & 0x80) || (gPlayerState.field_0x3[1] != 0)) { sub_080791D0(); } - if ((this->frame & 0x80) != 0) { - gPlayerState.flags &= ~(0x200000 | PL_ROLLING); + if (this->frame & 0x80) { + gPlayerState.flags &= ~(PL_RELEASED | PL_ROLLING); } UpdateAnimationSingleFrame(this); } @@ -1795,17 +1870,17 @@ static void sub_080728AC(Entity* this) { if (gPlayerState.flags & PL_MINISH) sub_0807B068(this); else - sub_08078F60(); + ResetPlayerVelocity(); if (gPlayerState.swimState != 0) this->speed = 0; - if ((gPlayerState.flags & 0x40) == 0) + if ((gPlayerState.flags & PL_HIDDEN) == 0) gPlayerEntity.spriteSettings.draw = 3; if ((gPlayerState.flags & PL_MINISH) == 0) gPlayerEntity.spritePriority.b1 = 1; if ((gRoomControls.unk6 & 4) == 0) { - if (gPlayerState.flags & 0x40) + if (gPlayerState.flags & PL_HIDDEN) COLLISION_ON(this); sub_080791D0(); } @@ -2092,20 +2167,20 @@ static void sub_08072F14(Entity* this) { } } -static void sub_08072F34(Entity* this) { - static EntityAction* const gUnk_0811BBE4[] = { +static void PlayerClimb(Entity* this) { + static EntityAction* const sPlayerClimbStates[] = { sub_08072F94, sub_08073094, }; - if (!sub_08078EFC()) { + if (!RunQueuedAction()) { gPlayerState.framestate = PL_STATE_CLIMB; gPlayerState.floor_type = GetSurfaceCalcType(this, 0, 0); - gUnk_0811BBE4[this->subAction](this); + sPlayerClimbStates[this->subAction](this); if (this->knockbackDuration != 0) { sub_080792D8(); if (this->knockbackDuration == 0) { - this->action = 0x1d; + this->action = PLAYER_CLIMB; this->subAction = 0; this->y.HALF.LO = 0; gPlayerState.animation = 0x2cf; @@ -2183,16 +2258,16 @@ static void sub_08073094(Entity* this) { UpdateFloorType(); } - if (sub_08078EFC() == 0) { + if (RunQueuedAction() == 0) { switch (gPlayerState.floor_type) { case SURFACE_AUTO_LADDER: case SURFACE_2C: this->knockbackDuration = 0; - gPlayerState.flags |= 0x20000000; + gPlayerState.flags |= PL_CLIMBING; UpdateAnimationSingleFrame(this); - if ((this->frame & 0x40) != 0) { + if (this->frame & 0x40) { UpdateFloorType(); - if (!sub_08078EFC()) { + if (!RunQueuedAction()) { this->subAction--; } } @@ -2207,9 +2282,9 @@ static void sub_08073094(Entity* this) { case SURFACE_LADDER: case SURFACE_CLIMB_WALL: UpdateAnimationSingleFrame(this); - if ((this->frame & 0x40) != 0) { + if (this->frame & 0x40) { UpdateFloorType(); - if (!sub_08078EFC()) { + if (!RunQueuedAction()) { this->subAction--; } } @@ -2231,3 +2306,1496 @@ static void PlayerUseEntrance(Entity* this) { RequestPriorityDuration(NULL, 8); sPlayerUseEntranceStates[this->subAction](this); } + +static void sub_080731D8(Entity* this) { + COLLISION_OFF(this); + this->speed = 0x40; + this->animationState = IdleNorth; + this->x.HALF.HI = (this->x.HALF.HI & ~0xF) | 8; + this->x.HALF.LO = 0; + if (gPlayerState.field_0x38 == 0) { + this->subAction = 1; + } else { + this->spriteSettings.draw = 3; + this->subAction = 3; + this->field_0x7c.HALF.HI = this->y.HALF.HI; + this->y.HALF.HI -= 16; + this->child = CreateObjectWithParent(this, OBJECT_70, 1, 0); + if (gPlayerState.field_0x39 == 7) { + this->y.HALF.HI = (this->y.HALF.HI & ~0xF) + 8; + this->x.HALF.HI &= ~0xF; + this->direction = DirectionEast; + this->animationState = IdleEast; + SoundReq(SFX_STAIRS_ASCEND); + } else { + this->y.HALF.HI = (this->y.HALF.HI & ~0xF) + 2; + this->x.HALF.HI = (this->x.HALF.HI & ~0xF) + 15; + this->direction = DirectionWest; + this->animationState = IdleWest; + SoundReq(SFX_STAIRS_DESCEND); + } + SetZeldaFollowTarget(this); + } + if (gPlayerState.flags & PL_NO_CAP) { + gPlayerState.animation = 1028; + } else { + gPlayerState.animation = 260; + } + gRoomControls.cameraTarget = NULL; + sub_0807A108(); + ResetPlayer(); +} + +static void sub_080732D0(Entity* this) { + UpdateAnimationSingleFrame(this); + if (sub_080002B8(this) != 40) { + this->direction = DirectionNorth; + sub_0806F69C(this); + } else { + this->subAction++; + this->y.HALF.LO = 0; + CreateObjectWithParent(this, OBJECT_70, 1, 0); + if (gPlayerState.field_0x39 == 7) { + SoundReq(SFX_STAIRS_ASCEND); + } else { + SoundReq(SFX_STAIRS_DESCEND); + } + } +} + +static void sub_0807332C(Entity* this) { + UpdateAnimationSingleFrame(this); + if (gPlayerState.field_0x39 == 7) { + this->direction = IdleNorth; + } else { + this->direction = 28; + } + if ((this->x.HALF.HI & 0xF) != 0xF) { + if (gPlayerState.field_0x39 == 7) { + this->animationState = IdleEast; + this->direction = 4; + } else { + this->animationState = 6; + if (this->direction <= DirectionWest) { + sub_0806F69C(this); + return; + } + this->direction = (this->direction - 1) & 0x1F; + } + sub_0806F69C(this); + return; + } + if (gPlayerState.field_0x38 != 0) { + gRoomControls.cameraTarget = this; + sub_080791BC(); + } else { + gMain.transition = 3; + *(&gMain.pauseInterval + 1) = 1; + DoFade(5, 8); + } +} + +static void sub_080733BC(Entity* this) { + UpdateAnimationSingleFrame(this); + if ((this->x.HALF.HI & 0xF) == 8) { + Entity* c; + this->direction = DirectionSouth; + this->animationState = IdleSouth; + c = this->child; + if (c != NULL) { + DeleteEntity(c); + this->child = NULL; + if (this->collisionLayer == 1) { + sub_0807AABC(this); + } else { + sub_0807AA80(this); + } + } + } + sub_0806F69C(this); + if (this->field_0x7c.HALF_U.HI == this->y.HALF.HI) { + gRoomControls.cameraTarget = this; + sub_0807921C(); + } +} + +static void PlayerParachute(Entity* this) { + static EntityAction* const sPlayerParachuteStates[] = { + sub_08073468, sub_080734D4, sub_08073504, sub_08073584, sub_0807379C, sub_080737BC, sub_0807380C, sub_08073884, + }; + + if (!RunQueuedAction()) { + UpdateFloorType(); + this->spriteOrientation.flipY = 1; + this->spriteRendering.b3 = 1; + gPlayerState.framestate = PL_STATE_PARACHUTE; + sPlayerParachuteStates[this->subAction](this); + } +} + +static void sub_08073468(Entity* this) { + gPlayerState.animation = 1792; + gPlayerState.jumpStatus = 0; + this->zVelocity = -0x10000; + this->subAction++; + this->field_0x7c.WORD = 480; + this->direction = Direction8FromAnimationState(this->animationState); + if ((gPlayerState.flags & PL_PARACHUTE) == 0) { + gPlayerState.flags |= PL_PARACHUTE; + CreateObjectWithParent(this, OBJECT_61, 0, 0); + } + ResetPlayer(); + if (this->zVelocity > 0 || gPlayerState.field_0x38 == 1) + COLLISION_OFF(this); +} + +static void sub_080734D4(Entity* this) { + GravityUpdate(this, -0x1000); + if (this->zVelocity > 0 || gPlayerState.field_0x38 == 1) { + this->zVelocity = 0x49000; + this->subAction++; + } +} + +static void sub_08073504(Entity* this) { + GravityUpdate(this, this->zVelocity < 0 ? 0x800 : 0x4000); + if (this->zVelocity < 0 && this->z.HALF.HI > -32) { + this->subAction++; + *((u32*)&this->field_0x80.HWORD) = this->direction << 8; + this->field_0x86.HALF.HI = 0; + this->field_0x86.HALF.LO = 0; + gPlayerState.animation = 1800; + if (gPlayerState.field_0x38 == 1) { + COLLISION_OFF(this); + this->subAction = 6; + this->speed = 16; + this->actionDelay = 30; + SoundReq(SFX_NEAR_PORTAL); + } + } + UpdateAnimationSingleFrame(this); +} + +static const u16 gUnk_0811BC28[] = { + 0x0708, + 0x071C, + 0x0718, + 0x0714, +}; + +static const u16 gUnk_0811BC30[] = { + 0x0708, + 0x0728, + 0x0724, + 0x0720, +}; + +static NONMATCH("asm/non_matching/player/sub_08073584.inc", void sub_08073584(Entity* this)) { + u32 state, dir, tmp, tmp2, idx; + + if ((gPlayerState.field_0x90.HALF.HI & 0x80) || this->iframes > 0 || gPlayerState.field_0x3c[0] || + (gPlayerState.flags & PL_PARACHUTE) == 0) { + gPlayerState.jumpStatus |= 0x40; + sub_0807921C(); + sub_08073904(this); + gPlayerState.animation = 1840; + return; + } + gUnk_0200AF00.filler25[10] = 1; + if (sub_0807A2F8(0)) { + this->subAction++; + this->direction = 4 * (this->animationState & 6); + COLLISION_OFF(this); + return; + } + if (gArea.locationIndex == 16) + this->speed = 256; + else + this->speed = 128; + if ((gPlayerState.field_0xd & 0x80) == 0) { + if (this->direction != gPlayerState.field_0xd) { + if (((this->direction - gPlayerState.field_0xd) & 0x1F) <= 0xF) + *(u32*)&this->field_0x80 -= 32; + else + *(u32*)&this->field_0x80 += 32; + } + } + this->direction = (*(u32*)&this->field_0x80 >> 8) & 0x1F; + sub_08079E08(); + state = 4 * this->animationState; + dir = this->direction; + if (this->animationState == 0) { + state = (state + 8) & 0x1F; + dir = (dir + 8) & 0x1F; + } + if (state - 7 > dir) { + tmp = (this->animationState - 2) & 7; + } else if (state + 7 < dir) { + tmp = (this->animationState + 2) & 7; + } else { + tmp = this->animationState; + } + if (tmp != this->animationState) { + this->field_0x86.HALF.HI = 20; + } + this->animationState = tmp; + idx = 0; + tmp2 = gPlayerState.field_0xd >> 2; + if (!this->field_0x86.HALF.HI || ((gPlayerState.field_0xd & 0x80) == 0 && this->animationState != tmp2)) { + if ((gPlayerState.field_0xd & 0x80) == 0) { + if (this->animationState != tmp2) { + if (this->animationState == (tmp2 ^ 4)) { + idx = 2; + } else { + if (this->animationState == (((tmp2 & 6) + 2) & 7)) { + idx = 1; + } else { + idx = 3; + } + } + } + } + if (gUnk_0811BC28[idx] == gPlayerState.animation) { + if (gArea.locationIndex == 16) + sub_080042BA(this, 2); + else + UpdateAnimationSingleFrame(this); + } else { + gPlayerState.animation = gUnk_0811BC28[idx]; + } + this->field_0x86.HALF.LO = idx; + } else { + + this->field_0x86.HALF.HI--; + if (gUnk_0811BC30[this->field_0x86.HALF.LO] == gPlayerState.animation) + UpdateAnimationSingleFrame(this); + else + gPlayerState.animation = gUnk_0811BC30[this->field_0x86.HALF.LO]; + } + if (--this->field_0x7c.WORD == -1) { + gPlayerState.jumpStatus |= 0x40; + sub_0807921C(); + } else { + u32 di = (this->field_0x7c.WORD / 20); + this->z.HALF.HI = -8 - di; + } +} +END_NONMATCH + +static void sub_0807379C(Entity* this) { + if (this->z.HALF.HI > -32) { + this->z.HALF.HI--; + } else { + this->subAction++; + } +} + +static void sub_080737BC(Entity* this) { + u16 pos; + u32 tmp; + + UpdateAnimationSingleFrame(this); + sub_0806F69C(this); + this->z.WORD += 0x4C00; + if (DirectionIsHorizontal(this->direction)) + pos = this->x.HALF.HI; + else + pos = this->y.HALF.HI; + tmp = 0xf; + tmp &= pos; + if (tmp == 8 && !sub_080002D0(this)) { + gPlayerState.jumpStatus |= 0x40; + sub_0807921C(); + } +} + +static void sub_0807380C(Entity* this) { + static const u16 sAnims[] = { + 0x0708, + 0x071C, + 0x0718, + 0x0714, + }; + + if ((gScreenTransition.frameCount & 3) == 0) { + u32 tmp = (this->animationState + 2) & 6; + this->animationState = tmp; + this->direction = 4 * tmp; + } + gPlayerState.animation = sAnims[this->animationState >> 1]; + if (this->z.HALF.HI < -16) { + GravityUpdate(this, 0x200); + } else { + if (--this->actionDelay == 0) { + this->subAction = 7; + this->actionDelay = 60; + this->zVelocity = 0x20000; + } + } + UpdateAnimationSingleFrame(this); +} + +void sub_08073884(Entity* this) { + static const u16 sAnims[] = { + 0x0708, + 0x071C, + 0x0718, + 0x0714, + }; + + if ((gScreenTransition.frameCount & 1) == 0) { + u32 tmp = (this->animationState + 2) & 6; + this->animationState = tmp; + this->direction = 4 * tmp; + } + gPlayerState.animation = sAnims[this->animationState >> 1]; + if (--this->actionDelay == 0) { + if (gPlayerState.field_0x39 != 0xff) + DoExitTransition(&gUnk_0813AD88[gPlayerState.field_0x39]); + else + InitParachuteRoom(); + } + GravityUpdate(this, -0x1800); + UpdateAnimationSingleFrame(this); +} + +void sub_08073904(Entity* this) { + static EntityAction* const sStates[] = { + sub_08073924, sub_08073968, sub_080739EC, sub_08073A94, sub_08073B8C, sub_08073C30, + }; + + sStates[gPlayerState.jumpStatus & 7](this); +} + +void sub_08073924(Entity* this) { + if ((gPlayerState.flags & PL_ROLLING) == 0 && (this->z.HALF.HI & 0x8000) && !gPlayerState.field_0xa) { + gPlayerState.jumpStatus = 0x40; + gPlayerState.field_0xd = 0xff; + this->direction = 0xff; + sub_08077B20(); + sub_08073968(this); + } +} + +static void sub_08073968(Entity* this) { + if ((gPlayerState.jumpStatus & 0xC0) == 0) { + this->direction = gPlayerState.field_0xd; + } + sub_08078F24(); + if ((gPlayerState.heldObject | gPlayerState.keepFacing) == 0) { + if (gPlayerState.flags & PL_NO_CAP) { + gPlayerState.animation = 1052; + } else { + if ((gPlayerState.flags & PL_MINISH) == 0) { + if (gPlayerState.flags & PL_MINECART) { + gPlayerState.animation = 2064; + } else { + gPlayerState.animation = 2060; + } + } + } + if ((gPlayerState.jumpStatus & 0xC0) == 0) { + sub_0806F948(this); + } + SoundReq(SFX_PLY_JUMP); + } + gPlayerState.jumpStatus = (gPlayerState.jumpStatus & ~7) | 2; +} + +static void sub_080739EC(Entity* this) { + u32 v; + + if ((gPlayerState.jumpStatus & 0xC0) != 0) { + gPlayerState.field_0xd = this->direction; + if (gPlayerState.jumpStatus & 0x80) + this->collisions = 0; + v = 0x2000; + } else { + if ((u16)sub_0806F854(this, 0, -12)) { + gPlayerState.jumpStatus |= 8; + v = 0x4000; + } else { + v = 0x2000; + if (gPlayerState.jumpStatus & 0x10) + v /= 2; + } + } + if ((gPlayerState.jumpStatus & 0xC0) == 0) { + if ((gPlayerState.jumpStatus & 0x20) && this->zVelocity == 0) { + this->zVelocity = 0x28000; + this->actionDelay = 10; + this->direction = 0xff; + gPlayerState.jumpStatus += 2; + gPlayerState.animation = 372; + ResetPlayerVelocity(); + return; + } + } + if (!GravityUpdate(this, v)) + sub_08073AD4(this); +} + +void sub_08073A94(Entity* this) { + if ((this->frame & 0x80) || this->knockbackDuration != 0) { + sub_08073B60(this); + } + if (gPlayerEntity.z.WORD != 0) { + gPlayerState.jumpStatus = 0; + sub_08073924(this); + } +} + +static void sub_08073AD4(Entity* this) { + u32 tmp; + + if ((this->collisionLayer & 2) == 0) { + this->spriteOrientation.flipY = 2; + this->spriteRendering.b3 = 2; + } + tmp = (gPlayerState.jumpStatus & ~0xC0); + if (this->action != PLAYER_MINISHDIE) { + sub_0807A2B8(); + gPlayerState.jumpStatus = 0; + UpdateFloorType(); + if (gPlayerState.queued_action != 0 || gPlayerState.swimState != 0) { + return; + } + if (gPlayerState.field_0x3[1]) + sub_08073B60(this); + } + gPlayerState.jumpStatus = tmp + 1; + if (gPlayerState.flags & PL_NO_CAP) + gPlayerState.animation = 1060; + else + gPlayerState.animation = 2080; + SoundReq(SFX_PLY_LAND); +} + +static void sub_08073B60(Entity* this) { + gPlayerState.field_0x1a[1] = 0; + gPlayerState.field_0x3[1] = 0; + gPlayerState.jumpStatus = 0; + sub_08079938(); + sub_080085B0(this); + if ((gPlayerState.flags & PL_USE_PORTAL) == 0) { + sub_080791BC(); + } +} + +void sub_08073B8C(Entity* this) { + if (!gPlayerState.field_0x3[1]) { + sub_08073B60(this); + return; + } + sub_0806F854(this, 0, -12); + if ((this->frame & 1) == 0) + UpdateAnimationSingleFrame(this); + COLLISION_OFF(this); + if (this->actionDelay != 0) { + --this->actionDelay; + return; + } + GravityUpdate(this, 0x4000); + if (this->z.HALF.HI >= -8) { + if (!gPlayerState.field_0x14 && (sub_0807A2B8() || !sub_08079D48())) { + COLLISION_ON(this); + sub_08073B60(this); + return; + } + gPlayerState.jumpStatus++; + this->actionDelay = 15; + InitScreenShake(0x10, 0); + SoundReq(SFX_14C); + } +} + +void sub_08073C30(Entity* this) { + if (!gPlayerState.field_0x3[1] || --this->actionDelay == 0xFF) { + sub_08073B60(this); + } else { + COLLISION_ON(this); + UpdateAnimationSingleFrame(this); + } +} + +static void PlayerMinish(Entity* this) { + static EntityAction* const sPlayerMinishStates[] = { + sub_08073C80, sub_08073D20, sub_08073F04, sub_08073F4C, sub_08073FD0, sub_08074018, sub_08074060, sub_080740D8, + }; + sPlayerMinishStates[this->subAction](this); +} + +extern Hitbox gUnk_0811BC80; + +static void sub_08073C80(Entity* this) { + static const Hitbox sMinishHitbox = { 0, -1, { 3, 2, 2, 3 }, 2, 2 }; + + gPlayerState.flags |= PL_MINISH; + gPlayerState.animation = 3096; + this->spriteSettings.draw = 3; + this->spritePriority.b1 = 3; + this->spriteSettings.shadow = 0; + this->spriteRendering.b0 = 0; + this->hitbox = (Hitbox*)&sMinishHitbox; + this->actionDelay = 0; + this->field_0xf = 2; + this->knockbackDuration = 0; + this->subAction = 1; + LoadSwapGFX(this, 1, 2); + gRoomControls.cameraTarget = this; + sub_080809D4(); + if (gScreenTransition.player_status.spawn_type == PL_SPAWN_9) { + gScreenTransition.player_status.spawn_type = PL_SPAWN_DEFAULT; + this->spriteSettings.draw = 0; + this->subAction = 2; + } else { + CreateObject(MINISH_EMOTICON, 0, 0); + } +} + +static void sub_08073D20(Entity* this) { + gPlayerState.framestate = PL_STATE_IDLE; + this->spritePriority.b1 = 3; + this->hurtType = 1; + ResetPlayerVelocity(); + if (!gPlayerState.swimState) + this->speed = 0xC0; + if (!sub_08079B24()) { + sub_08079708(this); + return; + } + if (!RunQueuedAction()) { + sub_08073904(this); + UpdateFloorType(); + if (gPlayerState.jumpStatus) + gPlayerState.framestate = PL_STATE_CAPE; + if (gPlayerState.floor_type != SURFACE_SHALLOW_WATER && gPlayerState.floor_type != SURFACE_WATER) { + gPlayerState.swimState = 0; + this->field_0x3c &= 0xFBu; + } + if (!RunQueuedAction() && this->subAction != 2) { + if ((gPlayerState.flags & PL_HIDDEN) == 0) { + sub_080085B0(this); + sub_080792D8(); + if (!gPlayerState.field_0xa && sub_08079550(gPlayerState.field_0xa)) + return; + if (this->knockbackDuration) { + this->direction = this->knockbackDirection; + return; + } + if (sub_080782C0()) { + RunQueuedAction(); + return; + } + COLLISION_ON(this); + } + if (!sub_08019840()) { + sub_08077698(this); + if (!GravityUpdate(this, 0x2000)) + gPlayerState.jumpStatus = 0; + if ((gPlayerState.field_0x7 & 0x80) == 0 && !gPlayerState.field_0xa) { + if (this->iframes <= 8) { + if (gPlayerState.swimState) { + gPlayerState.framestate = PL_STATE_SWIM; + sub_0807ACCC(this); + sub_08079E08(); + } else { + this->direction = gPlayerState.field_0xd; + if ((gPlayerState.field_0xd & 0x80) == 0) { + gPlayerState.framestate = PL_STATE_WALK; + sub_08079E08(1); + } + } + } + if (!gPlayerState.keepFacing) + sub_0806F948(this); + UpdateAnimationSingleFrame(this); + sub_0807B068(this); + if (sub_080793E4(16)) { + this->iframes = 20; + this->knockbackDuration = 4; + this->knockbackDirection = + DirectionTurnAround(Direction8FromAnimationState(this->animationState)); + ModHealth(-2); + SoundReq(SFX_PLY_VO6); + } + if ((gPlayerState.flags & PL_HIDDEN) == 0) + sub_08008AC6(this); + else + gPlayerState.framestate = PL_STATE_D; + } + } + } + } +} + +static void sub_08073F04(Entity* this) { + this->spritePriority.b1 = 2; + this->spriteSettings.draw = 0; + this->subAction++; + this->zVelocity = 0x28000; + this->speed = 0x100; + gPlayerState.flags &= ~PL_MINISH; + ResetPlayer(); +} + +static void sub_08073F4C(Entity* this) { + u32 x = gArea.curPortalX; + u32 y = gArea.curPortalY; + if (this->x.HALF.HI != x || this->y.HALF.HI != y) { + this->direction = sub_080045D4(this->x.HALF.HI, this->y.HALF.HI, gArea.curPortalX, gArea.curPortalY); + this->speed = 0x100; + sub_0806F69C(this); + } else { + COLLISION_OFF(this); + this->actionDelay = 30; + this->subAction++; + this->spriteSettings.flipX = 0; + *(u32*)&this->field_0x80.HWORD = 1152; + *(u32*)&this->cutsceneBeh.HWORD = 1152; + this->spriteRendering.b0 = 3; + sub_08074018(this); + gPlayerState.animation = 1852; + } +} + +static void sub_08073FD0(Entity* this) { + if (this->actionDelay != 0) { + if (--this->actionDelay != 0) { + return; + } + if (this->spriteSettings.draw == 0) { + this->spriteSettings.draw = 3; + SoundReq(SFX_PLY_JUMP); + } + } + GravityUpdate(this, 0x2000); + if (this->zVelocity == 0) { + this->subAction++; + SoundReq(SFX_PLY_GROW); + } +} + +static void sub_08074018(Entity* this) { + if (*(u32*)&this->field_0x80 > 0x100) + *(u32*)&this->field_0x80 -= 32; + if (*(u32*)&this->cutsceneBeh > 0x100) + *(u32*)&this->cutsceneBeh -= 32; + else + this->subAction++; + sub_0805EC9C(this, *(u32*)&this->field_0x80, *(u32*)&this->cutsceneBeh, 0); + UpdateAnimationSingleFrame(this); +} + +static void sub_08074060(Entity* this) { + if (!GravityUpdate(this, 0x2000)) { + this->hitbox = (Hitbox*)&gPlayerHitbox; + this->direction = DirectionSouth; + this->animationState = IdleSouth; + this->speed = 0x100; + this->spritePriority.b1 = 1; + this->spriteSettings.shadow = 1; + this->field_0xf = 0; + this->subAction++; + this->zVelocity = 0x20000; + gPlayerState.animation = 2060; + sub_0805EC60(this); + } else { + UpdateAnimationSingleFrame(this); + } +} + +static NONMATCH("asm/non_matching/player/sub_080740D8.inc", void sub_080740D8(Entity* this)) { + int v1; // r5 + int v2; // r6 + unsigned int v4; // r0 + Hitbox* v5; // r2 + int v6; // r0 + + UpdateAnimationSingleFrame(this); + if (!this->field_0xf) + v4 = this->direction; + else + v4 = this->direction ^ 0x10; + switch (v4) { + case 24: + v5 = this->hitbox; + v2 = this->x.HALF.HI - v5->unk2[0] + v5->offset_x - gRoomControls.roomOriginX; + v6 = this->y.HALF.HI; + v1 = v6 + v5->offset_y - gRoomControls.roomOriginY; + break; + case 8: + v5 = this->hitbox; + v2 = this->x.HALF.HI + v5->unk2[0] + v5->offset_x - gRoomControls.roomOriginX; + v6 = this->y.HALF.HI; + v1 = v6 + v5->offset_y - gRoomControls.roomOriginY; + break; + case 16: + v5 = this->hitbox; + v2 = this->x.HALF.HI + v5->offset_x - gRoomControls.roomOriginX; + v6 = this->y.HALF.HI + v5->unk2[3]; + v1 = v6 + v5->offset_y - gRoomControls.roomOriginY; + break; + case 0: + v5 = this->hitbox; + v2 = this->x.HALF.HI + v5->unk2[0] + v5->offset_x - gRoomControls.roomOriginX; + v6 = this->y.HALF.HI; + v1 = v6 + v5->offset_y - gRoomControls.roomOriginY; + break; + } + + if (sub_080086B4(v2, v1, gUnk_080082DC)) + sub_0806F69C(this); + else + this->field_0xf = 1; + if (!GravityUpdate(this, 0x2000)) + sub_0807921C(); +} +END_NONMATCH + +u32 sub_080741C4() { + if ((gPlayerState.jumpStatus && (gPlayerState.jumpStatus & 7) != 3) || gPlayerEntity.z.WORD != 0) { + gPlayerState.field_0x11 = 0; + gPlayerState.field_0x37 = 0; + return 1; + } + return 0; +} + +void SurfaceAction_DoNothing(Entity* this) { +} + +void SurfaceAction_Pit(Entity* this) { + if (!sub_080741C4() && sub_08079C30(this)) { + if (this->action != PLAYER_FALL) { + ResetPlayer(); + gPlayerState.queued_action = PLAYER_FALL; + } + } +} + +void SurfaceAction_SlopeGndGndVertical(Entity* this) { + sub_08074244(this, 8, 0x18); +} + +void SurfaceAction_SlopeGndGndHorizontal(Entity* this) { + sub_08074244(this, 0, 0x10); +} + +static void sub_08074244(Entity* this, u32 a1, u32 a2) { + if (gPlayerState.floor_type != SURFACE_LIGHT_GRADE && gPlayerState.floor_type != SURFACE_29) { + this->collisionLayer = 3; + this->spriteOrientation.flipY = 1; + this->spriteRendering.b3 = 1; + } + if (!sub_080741C4()) { + u32 tmp; + if (gPlayerState.dash_state == 0) { + tmp = gPlayerState.field_0xd; + } else { + tmp = 4 * this->animationState; + } + if (a1 != tmp || a2 != tmp) { + gPlayerState.field_0x80 -= 80; + } + } +} + +void SurfaceAction_6(Entity* this) { + if (gPlayerState.swimState != 0) { + gPlayerState.swimState = 0; + } + this->spritePriority.b0 = 4; + this->field_0x3c &= ~4; +} + +void SurfaceAction_7(Entity* this) { + if (!sub_080741C4() && (gPlayerState.flags & PL_MINISH) == 0 && gPlayerState.field_0x11 == 15) { + CreateObjectWithParent(this, OBJECT_E, 0, 0); + } +} + +void SurfaceAction_MinishDoorFront(Entity* this) { + if ((this->y.HALF.HI & 0xF) <= 0xD) { + this->collisions = 0x6600; + hide(this); + } else { + EnablePlayerDraw(this); + } +} + +void SurfaceAction_MinishDoorBack(Entity* this) { + if ((this->y.HALF.HI & 0xF) > 1) { + this->collisions = 0x6600; + hide(this); + } else { + EnablePlayerDraw(this); + } +} + +void SurfaceAction_A(Entity* this) { + if ((this->x.HALF.HI & 0xF) < 12) { + this->collisions = 0x66; + hide(this); + } else { + EnablePlayerDraw(this); + } +} + +void SurfaceAction_B(Entity* this) { + if ((this->x.HALF.HI & 0xF) > 4) { + this->collisions = 0x66; + hide(this); + } else { + EnablePlayerDraw(this); + } +} + +static void hide(Entity* this) { + gPlayerState.flags |= PL_HIDDEN; + this->type2 = 0x80; + this->spriteSettings.draw = 0; + COLLISION_OFF(this); + this->knockbackDuration = 0; + ResetPlayer(); +} + +void SurfaceAction_14(Entity* this) { + if (!sub_080741C4()) { + if (sub_08079C30(this)) { + u32 spd; + sub_0807AABC(this); + sub_08074808(this); + spd = this->speed; + this->speed = 0x300; + this->direction = 16; + gPlayerState.field_0xa |= 0x80; + sub_0806F69C(this); + this->speed = spd; + } + } +} + +void SurfaceAction_CloneTile(Entity* this) { + if (gPlayerState.field_0xa0[0] == 4) { + u32 item, n, i; + if (ItemIsSword(gSave.stats.itemOnA)) { + item = gSave.stats.itemOnA; + } else { + item = gSave.stats.itemOnB; + } + switch (item) { + case 1: + case 2: + n = 0; + break; + case 3: + n = 1; + break; + case 4: + n = 2; + break; + case 6: + n = 3; + break; + default: + break; + } + for (i = 0; i < n; ++i) { + if (gPlayerClones[i] == 0) + break; + } + if (n > i) { + Entity* e = CreateObjectWithParent(this, 0x10, i, 0); + gPlayerClones[i] = e; + if (e != NULL) { + CopyPosition(this, e); + } + } else { + gPlayerState.field_0x1a[1] |= 0x80; + gPlayerState.flags |= PL_CLONING; + this->x.WORD = (this->x.WORD & ~0xFFFFF) | 0x80000; + this->y.WORD = (this->y.WORD & ~0xFFFFF) | 0x80000; + sub_08077AEC(); + } + } +} + +void SurfaceAction_16(Entity* this) { + if (!sub_080741C4() && !gPlayerState.field_0x14) { + if (this->iframes == 0) { + ModHealth(-2); + SoundReq(SFX_PLY_VO6); + this->iframes = 24; + this->knockbackDuration = 4; + this->knockbackDirection = sub_080045D4((this->x.HALF.HI & 0xFFF0) | 8, (this->y.HALF.HI & 0xFFF0) | 8, + this->x.HALF.HI, this->y.HALF.HI); + } + if ((gPlayerState.flags & PL_MINISH) == 0) + sub_08008790(this, 7); + } +} + +void SurfaceAction_Ice(Entity* this) { + if (!sub_080741C4() && ((gPlayerState.field_0x34[1] & 0x80) == 0 || this->knockbackDuration != 0)) { + ResetPlayerVelocity(); + } +} + +void SurfaceAction_ShallowWater(Entity* this) { + if (!sub_080741C4()) { + if (gPlayerState.flags & PL_MINISH) { + this->spritePriority.b1 = 0; + SurfaceAction_Water(this); + } else { + if (gPlayerState.swimState) { + COLLISION_ON(this); + this->field_0x3c &= ~4; + this->spritePriority.b0 = 4; + gPlayerState.swimState = 0; + } + if ((gPlayerState.field_0x90.HALF.HI & 0xF00) || gPlayerState.field_0x11 == 1) + SoundReq(SFX_WATER_WALK); + } + } +} + +void SurfaceAction_SlopeGndWater(Entity* this) { + if (gPlayerState.swimState) { + COLLISION_ON(this); + this->field_0x3c &= ~4; + this->spritePriority.b0 = 4; + gPlayerState.swimState = 0; + } +} + +ASM_FUNC("asm/non_matching/player/sub_08074678.inc", void SurfaceAction_Swamp(Entity* this)); + +void SurfaceAction_Water(Entity* this) { + if (!sub_080741C4()) { + if (gPlayerState.field_0x14 == 0) { + gPlayerState.field_0x3f += 2; + } else { + gPlayerState.swimState = 0; + this->spritePriority.b0 = 4; + this->field_0x3c &= ~4; + } + if ((gPlayerState.swimState & 0xF) || sub_08079C30(this)) { + sub_08074808(this); + } + } +} + +void sub_08074808(Entity* this) { + sub_08077AEC(this); + if (GetInventoryValue(ITEM_FLIPPERS) == 1) { + if (!gPlayerState.swimState) { + if ((gPlayerState.flags & 0x10000) != 0) + gPlayerState.swimState = 1; + else + gPlayerState.swimState = 8; + this->speed = 0; + gPlayerState.field_0x82[7] = 0; + if ((gPlayerState.flags & PL_MINISH) == 0) + CreateFx(this, FX_WATER_SPLASH, 0); + SoundReq(SFX_1A5); + ResetPlayer(); + } + if ((gPlayerState.swimState & 0xF) != 1) { + sub_08079744(this); + --gPlayerState.swimState; + } + gPlayerState.flags &= ~(PL_BURNING | PL_FROZEN); + if ((gPlayerState.flags & PL_DRUGGED) != 0 && this->field_0x7a.HWORD <= 0xEu) + this->field_0x7a.HWORD = 15; + } else { + gPlayerState.queued_action = PLAYER_DROWN; + } +} + +void SurfaceAction_Button(Entity* this) { + gPlayerState.field_0x3f -= 2; +} + +void sub_080748D4() { + sub_080741C4(); +} + +void SurfaceAction_1B(Entity* this) { + if (!sub_080741C4()) { + if (this->collisionLayer != 1) { + this->y.HALF.HI += 12; + if ((gPlayerState.flags & PL_MINISH) == 0) + this->z.HALF.HI -= 12; + } + sub_0807AABC(this); + } +} + +void SurfaceAction_1C(Entity* this) { + if (!sub_080741C4()) { + if (sub_08079C30(this)) { + gPlayerState.queued_action = PLAYER_LAVA; + } + } +} + +void SurfaceAction_ClimbWall(Entity* this) { + if (GetInventoryValue(ITEM_GRIP_RING) == 1) { + SurfaceAction_Ladder(this); + } else { + this->y.HALF.HI = (this->y.HALF.HI & 0xFFF0) | 0xF; + gPlayerState.floor_type = SURFACE_NORMAL; + } +} + +void SurfaceAction_Ladder(Entity* this) { + if (!sub_080741C4()) { + gPlayerState.jumpStatus = 0; + this->spriteRendering.b3 = 1; + this->spriteOrientation.flipY = 1; + this->animationState = IdleNorth; + this->collisionLayer = 3; + ResetPlayer(); + } +} + +void SurfaceAction_2C(Entity* this) { + if (GetInventoryValue(68) == 1) { + SurfaceAction_AutoLadder(this); + } else { + this->y.HALF.HI &= 0xFFF0; + gPlayerState.floor_type = SURFACE_NORMAL; + } +} + +void SurfaceAction_AutoLadder(Entity* this) { + if (!sub_080741C4()) { + this->spriteRendering.b3 = 1; + this->spriteOrientation.flipY = 1; + this->animationState = IdleNorth; + this->collisionLayer = 3; + gPlayerState.swimState = 0; + this->field_0x3c &= ~4; + if ((this->y.HALF.HI & 0xF) <= 7) { + gPlayerState.animation = 723; + this->direction = DirectionSouth; + } else { + gPlayerState.animation = 726; + this->direction = DirectionNorth; + } + ResetPlayer(); + } +} + +void SurfaceAction_20(Entity* this) { + if (gPlayerState.swimState & 0x80) { + Entity* e = CreateObjectWithParent(&gPlayerEntity, GROUND_ITEM, ITEM_RUPEE1, 0); + if (e != NULL) { + e->actionDelay = 1; + UpdateSpriteForCollisionLayer(e); + sub_08000152(57, gPlayerState.field_0x22[0], this->collisionLayer); + } + } + SurfaceAction_Water(this); +} + +void SurfaceAction_22(Entity* this) { +} + +void SurfaceAction_Dust(Entity* this) { + if (!sub_080741C4()) { + gPlayerState.field_0x80 -= 128; + if (gPlayerState.field_0x11 == 1 || (gPlayerState.field_0x90.HALF.HI & 0xF00) != 0) { + if (gPlayerState.floor_type == SURFACE_DUST) + CreateObjectWithParent(this, OBJECT_21, 1, 0); + else + CreateObjectWithParent(this, OBJECT_21, 1, 1); + } + } +} + +void SurfaceAction_26(Entity* this) { + u32 v1; + + if (gPlayerState.dash_state == 0) + v1 = gPlayerState.field_0xd; + else + v1 = 4 * this->animationState; + sub_08074244(this, v1, v1); +} + +void SurfaceAction_Hole(Entity* this) { + if (!gPlayerState.field_0x14 && !sub_080741C4()) { + if (gPlayerState.flags & PL_MINISH) + SurfaceAction_Pit(this); + else + gPlayerState.queued_action = PLAYER_INHOLE; + } +} + +void SurfaceAction_D(Entity* this) { + if (!sub_080741C4() && (gPlayerState.flags & PL_MINISH) == 0) { + this->animationState = IdleNorth; + this->direction = DirectionNorth; + sub_08074BF8(this); + } +} + +void SurfaceAction_E(Entity* this) { + if (!sub_080741C4() && (gPlayerState.flags & PL_MINISH) == 0) { + this->animationState = IdleSouth; + this->direction = DirectionSouth; + sub_08074BF8(this); + } +} + +void SurfaceAction_F(Entity* this) { + if (!sub_080741C4() && (gPlayerState.flags & PL_MINISH) == 0) { + this->animationState = IdleWest; + this->direction = DirectionWest; + sub_08074BF8(this); + } +} + +void SurfaceAction_10(Entity* this) { + if (!sub_080741C4() && (gPlayerState.flags & PL_MINISH) == 0) { + this->animationState = IdleEast; + this->direction = DirectionEast; + sub_08074BF8(this); + } +} + +static void sub_08074BF8(Entity* this) { + ResetPlayer(); + this->spritePriority.b1 = 0; + this->speed = 320; + gPlayerState.flags |= 0x2000000; + gPlayerState.field_0xa |= 0x80; + gPlayerState.field_0x1a[0] |= 0x80; + gPlayerState.field_0x27[0]++; + sub_0806F69C(this); +} + +static void sub_08074C44(Entity* this) { + static EntityAction* const gUnk_0811BC88[] = { + sub_08074C68, + sub_08074CF8, + sub_08074F00, + sub_080750F4, + }; + + if (!RunQueuedAction()) + gUnk_0811BC88[this->subAction](this); +} + +static void sub_08074C68(Entity* this) { + this->field_0x68.HALF.LO = 0; + if (gPlayerState.field_0x38 != 1) { + if (*(ScriptExecutionContext**)&this->cutsceneBeh.HWORD == &gPlayerScriptExecutionContext) { + this->subAction = 1; + sub_0807DD64(this); + sub_08074CF8(this); + } + } else { + this->spriteSettings.draw = 1; + this->animationState = 0; + this->spritePriority.b1 = 0; + this->subAction = 2; + this->field_0x68.HALF.LO = 1; + sub_0807DD64(this); + if (!gPlayerState.field_0x39) + gPlayerState.animation = 1850; + else + gPlayerState.animation = 1846; + DoFade(5, 0x100); + } +} + +static void sub_08074CF8(Entity* this) { + u32 v3; + + v3 = this->animationState; + ExecuteScript(this, *(ScriptExecutionContext**)&this->cutsceneBeh.HWORD); + sub_08074D34(this, *(ScriptExecutionContext**)&this->cutsceneBeh.HWORD); + if ((this->field_0x82.HWORD & 1) != 0) + this->animationState = v3; + GravityUpdate(this, 0x2000); + UpdateAnimationSingleFrame(this); +} + +void sub_08074D34(Entity* this, ScriptExecutionContext* ctx) { + while (ctx->postScriptActions) { + u32 bit = (~ctx->postScriptActions + 1) & ctx->postScriptActions; + ctx->postScriptActions ^= bit; + switch (bit) { + case 0x1: + if (gPlayerState.flags & PL_NO_CAP) + gPlayerState.animation = 0x400; + else + gPlayerState.animation = 0x100; + break; + case 0x2: + if (gPlayerState.flags & PL_NO_CAP) + gPlayerState.animation = 1028; + else + gPlayerState.animation = 260; + break; + case 0x4: + break; + case 0x8: + if (gPlayerState.flags & PL_NO_CAP) + gPlayerState.animation = 1052; + else + gPlayerState.animation = 2060; + this->zVelocity = 0x18000; + break; + case 0x10: + CreateSpeechBubbleExclamationMark(this, 8, -24); + break; + case 0x20: + CreateSpeechBubbleQuestionMark(this, 8, -24); + break; + case 0x80: + this->spriteSettings.draw = 1; + break; + case 0x100: + this->spriteSettings.draw = 0; + break; + case 0x200: + this->field_0x82.HWORD = 0; + break; + case 0x1000: + this->field_0x82.HWORD &= ~1; + break; + case 0x2000: + this->field_0x82.HWORD |= 1; + break; + case 0x4000: + this->field_0x82.HWORD |= 8; + break; + case 0x8000: + this->field_0x82.HWORD |= 4; + break; + case 0x20000: + this->spriteSettings.flipX ^= 1; + break; + case 0x100000: + this->subAction = 2; + this->field_0x68.HALF.LO = 2; + break; + case 0x200000: + this->subAction = 3; + this->field_0x68.HALF.LO = 0; + break; + } + } +} + +static void sub_08074F00(Entity* this) { + static EntityAction* const gUnk_0811BC98[] = { + sub_08074F1C, sub_08074F2C, sub_08074F44, sub_08074F8C, sub_08074FEC, sub_0807501C, sub_0807508C, + }; + + gUnk_0811BC98[this->field_0x68.HALF.LO](this); +} + +void sub_08074F1C(Entity* this) { + this->field_0x68.HALF.LO = 1; + this->animationState = IdleNorth; +} + +void sub_08074F2C(Entity* this) { + ExecuteScript(this, *(ScriptExecutionContext**)&this->cutsceneBeh.HWORD); + sub_08074D34(this, *(ScriptExecutionContext**)&this->cutsceneBeh.HWORD); +} + +void sub_08074F44(Entity* this) { + typedef struct { + u8 fill[0x6c]; + Entity* e; + } fixme; + + this->field_0x68.HALF.LO++; + if (((fixme*)&gPlayerEntity)->e) + DeleteEntity(((fixme*)&gPlayerEntity)->e); + if (!gPlayerState.field_0x39) { + gPlayerState.animation = 1851; + gPlayerState.flags |= PL_NO_CAP; + } else { + gPlayerState.animation = 1847; + } +} + +void sub_08074F8C(Entity* this) { + UpdateAnimationSingleFrame(this); + if (this->frame == 1) { + this->frame = 0; + gActiveScriptInfo.unk_00 |= 4; + } + if (this->frame & 0x80) { + this->field_0x68.HALF.LO++; + this->actionDelay = 8; + this->animationState = IdleSouth; + if (!gPlayerState.field_0x39) { + gPlayerState.animation = 1024; + } else { + gPlayerState.animation = 256; + } + } +} + +void sub_08074FEC(Entity* this) { + UpdateAnimationSingleFrame(this); + if (--this->actionDelay == 0) { + this->field_0x68.HALF.LO++; + this->actionDelay = 4; + this->animationState = gPlayerState.field_0x3a; + } +} + +void sub_0807501C(Entity* this) { + if (--this->actionDelay == 0) { + this->animationState = gPlayerState.field_0x3a; + if (!gPlayerState.field_0x39) { + gPlayerState.animation = 1052; + } else { + gPlayerState.animation = 2060; + } + this->spritePriority.b1 = 1; + this->direction = Direction8FromAnimationState(this->animationState); + this->speed = 200; + this->zVelocity = 0x20000; + this->actionDelay = 8; + this->field_0x68.HALF.LO++; + SoundReq(SFX_PLY_JUMP); + } +} + +void sub_0807508C(Entity* this) { + UpdateAnimationSingleFrame(this); + if (GravityUpdate(this, 0x2000)) { + sub_0806F69C(this); + } else { + if (!gPlayerState.field_0x39) { + gPlayerState.animation = 1024; + } else { + gPlayerState.flags &= ~PL_NO_CAP; + gPlayerState.animation = 256; + } + if (--this->actionDelay == 0) { + this->animationState = IdleSouth; + this->subAction = 1; + this->field_0x68.HALF.LO = 0; + SoundReq(SFX_PLY_LAND); + } + } +} + +void sub_080750F4(Entity* this) { + static EntityAction* const gUnk_0811BCB4[] = { + sub_08075110, + sub_0807513C, + sub_0807518C, + sub_080751B4, + }; + gUnk_0811BCB4[this->field_0x68.HALF.LO](this); +} + +void sub_08075110(Entity* this) { + this->field_0x68.HALF.LO++; + this->field_0xf = this->animationState; + this->animationState = 0; + gPlayerState.animation = 1844; + gPlayerState.flags &= ~PL_NO_CAP; +} + +void sub_0807513C(Entity* this) { + UpdateAnimationSingleFrame(this); + if (this->frame == 1) { + this->frame = 0; + SoundReq(SFX_PLY_JUMP); + } + if (this->frame == 2) { + this->frame = 0; + SoundReq(SFX_14B); + SoundReq(SFX_PLY_VO6); + } + if (this->frame & 0x80) { + this->field_0x68.HALF.LO++; + this->actionDelay = 60; + } +} + +void sub_0807518C(Entity* this) { + if (--this->actionDelay == 0) { + this->field_0x68.HALF.LO++; + gPlayerState.animation = 969; + } +} + +void sub_080751B4(Entity* this) { + UpdateAnimationSingleFrame(this); + if (this->frame & 0x80) { + this->animationState = IdleSouth; + this->subAction = 1; + this->field_0x68.HALF.LO = 0; + gPlayerState.animation = 256; + } +} + +// regalloc +NONMATCH("asm/non_matching/player/sub_080751E8.inc", void sub_080751E8(u32 a1, u32 a2, void* script)) { + void* tmp; + Entity* e; + Entity* e2; + + typedef struct { + u8 filler[0x84]; + ScriptExecutionContext* ctx; + } fixme; + + MemClear(&gPlayerScriptExecutionContext, sizeof(ScriptExecutionContext)); + gPlayerScriptExecutionContext.scriptInstructionPointer = script; + ((fixme*)&gPlayerEntity)->ctx = &gPlayerScriptExecutionContext; + gPlayerState.queued_action = PLAYER_08074C44; + gPlayerState.field_0x38 = 1; + gPlayerState.field_0x39 = 0; + gPlayerState.field_0x3a = a2; + gPlayerState.flags |= 8; + if (!a1) { + gPlayerState.field_0x39 = 0; + tmp = &script_08009ECC; + } else { + gPlayerState.field_0x39 = 1; + tmp = &script_08009EF0; + } + e = CreateObject(0x5B, !gPlayerState.field_0x39 ? 2 : 0, 0); + if (e != NULL) { + CopyPosition(&gPlayerEntity, e); + StartCutscene(e, tmp); + } + e2 = CreateSpeechBubbleSleep(&gPlayerEntity, -14, -28); + *(Entity**)&gPlayerEntity.field_0x6c.HWORD = e2; + if (e2 != NULL) { + SetDefaultPriority(e2, 3); + } +} +END_NONMATCH + +void sub_0807529C(Entity* this) { + CreateSpeechBubbleQuestionMark(this, 8, -32); +} + +void sub_080752AC(Entity* this, ScriptExecutionContext* ctx) { + sub_0806F69C(this); + if (!ctx->unk_18) { + if (sub_080002B8(this) != 41) { + ctx->unk_18 = 1; + ctx->unk_19 = 6; + } + } else if (--ctx->unk_19 == 0) { + return; + } + gActiveScriptInfo.commandSize = 0; +} diff --git a/src/projectile/lakituCloudProjectile.c b/src/projectile/lakituCloudProjectile.c index 39c6f65f..9fff58bd 100644 --- a/src/projectile/lakituCloudProjectile.c +++ b/src/projectile/lakituCloudProjectile.c @@ -4,7 +4,7 @@ #include "player.h" #include "effects.h" -extern void sub_0800449C(Entity*, u32); +extern void SoundReqClipped(Entity*, u32); extern void sub_08079D84(void); extern void (*const LakituCloudProjectile_Functions[])(Entity*); @@ -44,7 +44,7 @@ void LakituCloudProjectile_SubAction2(Entity* this) { if (sub_0806F3E4(this) != 0) { if (this->hitType == 0xa6) { ModHealth(-2); - sub_0800449C(&gPlayerEntity, 0x7a); + SoundReqClipped(&gPlayerEntity, 0x7a); sub_08079D84(); } CreateFx(this, FX_DEATH, 0); diff --git a/src/projectile/v1DarkMagicProjectile.c b/src/projectile/v1DarkMagicProjectile.c index 76097b4d..2cbc6dd2 100644 --- a/src/projectile/v1DarkMagicProjectile.c +++ b/src/projectile/v1DarkMagicProjectile.c @@ -6,7 +6,7 @@ #include "functions.h" #include "asm.h" -extern void sub_0800449C(Entity*, u32); +extern void SoundReqClipped(Entity*, u32); extern void (*const V1DarkMagicProjectile_Functions[])(Entity*); extern void (*const V1DarkMagicProjectile_Actions[])(Entity*); @@ -173,7 +173,7 @@ void sub_080AAF74(Entity* this) { this->actionDelay = 0x1e; gPlayerEntity.iframes = 8; ModHealth(-4); - sub_0800449C(&gPlayerEntity, 0x7a); + SoundReqClipped(&gPlayerEntity, 0x7a); if (gPlayerEntity.health == 0) { this->health = 0; } diff --git a/src/projectile/v2Projectile.c b/src/projectile/v2Projectile.c index b3574211..0ed8e9cf 100644 --- a/src/projectile/v2Projectile.c +++ b/src/projectile/v2Projectile.c @@ -12,7 +12,7 @@ extern void (*const gUnk_0812A7F8[])(Entity*); extern void (*const gUnk_0812A800[])(Entity*); extern void (*const gUnk_0812A808[])(Entity*); -extern void sub_0800449C(Entity*, u32); +extern void SoundReqClipped(Entity*, u32); extern void sub_08079D84(void); extern s32 sub_080AF090(Entity*); @@ -43,7 +43,7 @@ void nullsub_542(Entity* this) { void sub_080ABC90(Entity* this) { if (sub_0806F3E4(this) != 0) { ModHealth(-2); - sub_0800449C(&gPlayerEntity, 0x7a); + SoundReqClipped(&gPlayerEntity, 0x7a); sub_08079D84(); CreateFx(this, FX_DEATH, 0); DeleteThisEntity(); diff --git a/src/roomInit.c b/src/roomInit.c index e553a20f..fc0a2ff2 100644 --- a/src/roomInit.c +++ b/src/roomInit.c @@ -1010,7 +1010,7 @@ void sub_0804BF38(u32 arg0, struct_0804BF38* arg1) } } - sub_08080964(gUnk_080D8E50[iVar3].shakeTime, gUnk_080D8E50[iVar3].shakeMag); + InitScreenShake(gUnk_080D8E50[iVar3].shakeTime, gUnk_080D8E50[iVar3].shakeMag); SoundReq(gUnk_080D8E50[iVar2].sfx); } #else @@ -4819,7 +4819,7 @@ void sub_StateChange_HouseInteriors2_LinksHouseBedroom(void) { gArea.musicIndex = gArea.pMusicIndex; SoundReq(SONG_PLAY_VOL_RESET | BGM_MINISH_CAP); } - if ((gPlayerState.flags & 8) == 0) { + if ((gPlayerState.flags & PL_NO_CAP) == 0) { LoadRoomEntityList(&gUnk_080F31D8); } } diff --git a/src/script.c b/src/script.c index 2a28188e..c771df3e 100644 --- a/src/script.c +++ b/src/script.c @@ -223,7 +223,7 @@ void StartPlayerScript(u16* script) { gPlayerScriptExecutionContext.scriptInstructionPointer = script; player = &gPlayerEntity; *(ScriptExecutionContext**)&player->cutsceneBeh = &gPlayerScriptExecutionContext; - gPlayerState.playerAction = 0x1c; + gPlayerState.queued_action = PLAYER_08074C44; gPlayerState.field_0x3a = 0; gPlayerState.field_0x39 = 0; gPlayerState.field_0x38 = 0; @@ -1072,7 +1072,7 @@ void ScriptCommand_0807E888(Entity* entity, ScriptExecutionContext* context) { void ScriptCommand_SetPlayerAction(Entity* entity, ScriptExecutionContext* context) { u32 tmp = GetNextScriptCommandWordAfterCommandMetadata(context->scriptInstructionPointer); - gPlayerState.playerAction = tmp; + gPlayerState.queued_action = tmp; gPlayerState.field_0x38 = tmp >> 8; gPlayerState.field_0x39 = tmp >> 0x10; gPlayerState.field_0x3a = tmp >> 0x18; @@ -1527,7 +1527,7 @@ void ScriptCommand_0807F0B4(Entity* entity, ScriptExecutionContext* context) { } void ScriptCommand_0807F0C8(Entity* entity, ScriptExecutionContext* context) { - sub_08080964(context->scriptInstructionPointer[1], context->scriptInstructionPointer[2]); + InitScreenShake(context->scriptInstructionPointer[1], context->scriptInstructionPointer[2]); } extern u8 gUnk_0811E750[]; diff --git a/src/sub_0807B820.c b/src/sub_0807B820.c index 7d2441c3..6d3f516b 100644 --- a/src/sub_0807B820.c +++ b/src/sub_0807B820.c @@ -5,7 +5,7 @@ extern void sub_0807B778(u32, u32); void sub_0807B7D8(u32 param_1, u32 param_2, u32 param_3) { if (param_1 == 53) { - sub_08000152(53); + sub_08000152(53, param_2, param_3); sub_0807B778(param_2, param_3); sub_0807B778(param_2 + 1, param_3); sub_0807B778(param_2 - 1, param_3); From dc8bcb32e0db99420b35b4254c5218711bc1e3a0 Mon Sep 17 00:00:00 2001 From: theo3 Date: Mon, 27 Dec 2021 18:19:47 -0800 Subject: [PATCH 3/4] dungeon stuff --- asm/code_08018500.s | 4 +-- asm/code_08049D30.s | 4 +-- asm/code_08077B98.s | 8 ++--- include/player.h | 3 +- include/room.h | 16 ++++----- src/code_08077B98.c | 4 +-- src/collision.c | 4 +-- src/enemy/octorokBoss.c | 4 +-- src/enemy/vaatiTransfigured.c | 2 +- src/item/itemSword.c | 3 +- src/manager/manager17.c | 3 +- src/manager/manager24.c | 4 +-- src/manager/managerF.c | 14 ++++---- src/npc/npc4E.c | 4 +-- src/npc/picolyteBottle.c | 3 +- src/npc/postman.c | 2 +- src/object/houseDoorExterior.c | 2 +- src/object/minishSizedEntrance.c | 2 +- src/object/object6A.c | 60 ++++++++++++++++---------------- src/object/warpPoint.c | 2 +- src/overworld.c | 48 ++++++++++++------------- src/player.c | 10 +++--- src/playerItem/playerItem10.c | 5 +-- src/projectile/removableDust.c | 3 +- src/room.c | 2 +- src/roomInit.c | 4 +-- 26 files changed, 114 insertions(+), 106 deletions(-) diff --git a/asm/code_08018500.s b/asm/code_08018500.s index b12aa134..0e2026d7 100644 --- a/asm/code_08018500.s +++ b/asm/code_08018500.s @@ -160,8 +160,8 @@ _08018620: _08018624: .4byte gUnk_02033AB8 _08018628: .4byte gUnk_080B3D20 - thumb_func_start sub_0801862C -sub_0801862C: @ 0x0801862C + thumb_func_start GenerateAreaHint +GenerateAreaHint: @ 0x0801862C push {r4, r5, lr} ldr r1, _0801864C @ =gPlayerState movs r2, #0 diff --git a/asm/code_08049D30.s b/asm/code_08049D30.s index 95661e64..77b661aa 100644 --- a/asm/code_08049D30.s +++ b/asm/code_08049D30.s @@ -6,8 +6,8 @@ .text - thumb_func_start sub_08049D30 -sub_08049D30: @ 0x08049D30 + thumb_func_start UpdateRoomTracker +UpdateRoomTracker: @ 0x08049D30 push {r4, r5, r6, lr} ldr r1, _08049D58 @ =gUnk_020354B0 ldr r0, _08049D5C @ =gUnk_02024050 diff --git a/asm/code_08077B98.s b/asm/code_08077B98.s index 8f480ce5..6143589a 100644 --- a/asm/code_08077B98.s +++ b/asm/code_08077B98.s @@ -221,8 +221,8 @@ _0807815C: pop {pc} .align 2, 0 - thumb_func_start sub_08078160 -sub_08078160: @ 0x08078160 + thumb_func_start ForceSetPlayerState +ForceSetPlayerState: @ 0x08078160 push {lr} ldr r1, _08078178 @ =gPlayerState adds r1, #0xa8 @@ -558,7 +558,7 @@ _08078418: bl CreateEzloHint _08078420: movs r0, #0x13 - bl sub_08078160 + bl ForceSetPlayerState b _080784C4 .align 2, 0 _08078428: .4byte 0x00000B65 @@ -599,7 +599,7 @@ _08078484: movs r0, #7 strb r0, [r4, #0xc] movs r0, #0x13 - bl sub_08078160 + bl ForceSetPlayerState _0807848E: adds r1, r6, #0 adds r1, #0x39 diff --git a/include/player.h b/include/player.h index f664b6f3..7d29812c 100644 --- a/include/player.h +++ b/include/player.h @@ -216,7 +216,8 @@ typedef struct { /*0x8b*/ u8 controlMode; /*0x8c*/ u16 vel_x; /*0x8e*/ u16 vel_y; - /*0x90*/ union SplitWord field_0x90; + /*0x90*/ u16 field_0x90; + /*0x92*/ u16 field_0x92; /*0x94*/ u32 field_0x94; /*0x98*/ u16 field_0x98; /*0x9a*/ u16 field_0x9a; diff --git a/include/room.h b/include/room.h index 64729622..5e603926 100644 --- a/include/room.h +++ b/include/room.h @@ -101,14 +101,14 @@ typedef struct { Coords start_pos; u8 layer; u8 field_0x15; - u8 field_0x16; - u8 field_0x17; - s16 field_0x18; - s16 field_0x1a; - s16 field_0x1c; - s16 field_0x1e; - s16 field_0x20; - s16 field_0x22; + u8 dungeon_area; + u8 dungeon_room; + s16 dungeon_x; + s16 dungeon_y; + s16 dungeon_map_x; + s16 dungeon_map_y; + s16 overworld_map_x; + s16 overworld_map_y; u8 field_0x24[0x8]; } PlayerWorldStatus; static_assert(sizeof(PlayerWorldStatus) == 0x20); diff --git a/src/code_08077B98.c b/src/code_08077B98.c index ca1863f7..fddfcace 100644 --- a/src/code_08077B98.c +++ b/src/code_08077B98.c @@ -195,11 +195,11 @@ u32 sub_08077EC8(ItemBehavior* beh) { } bool32 sub_08077EFC(ItemBehavior* arg0) { - return sub_08077F24(arg0, (u16)gPlayerState.field_0x90.HALF.LO); + return sub_08077F24(arg0, (u16)gPlayerState.field_0x90); } bool32 sub_08077F10(ItemBehavior* arg0) { - return sub_08077F24(arg0, (u16)gPlayerState.field_0x90.HALF.HI); + return sub_08077F24(arg0, (u16)gPlayerState.field_0x92); } ASM_FUNC("asm/non_matching/sub_08077F24.inc", bool32 sub_08077F24(ItemBehavior* beh, u32 arg1)) diff --git a/src/collision.c b/src/collision.c index 1c22f7d6..43ffe8d8 100644 --- a/src/collision.c +++ b/src/collision.c @@ -60,7 +60,7 @@ void CollisionMain(void) { if (gPriorityHandler.sys_priority <= gPriorityHandler.ent_priority) prio = gPriorityHandler.ent_priority; - // if any min priority is set, dont do collision + // if any priority is set, dont do collision if (prio) return; @@ -303,7 +303,7 @@ void sub_080179EC(Entity* a1, Entity* a2) { Entity* sub_08017A90(Entity* a1, Entity* parent) { Entity* e; - e = (Entity*)CreateObject(153, 0, 0); + e = (Entity*)CreateObject(OBJECT_99, 0, 0); if (e != NULL) { e->animationState = (a1->direction >> 3) & 3; e->spriteOffsetX = a1->x.HALF.HI - parent->x.HALF.HI; diff --git a/src/enemy/octorokBoss.c b/src/enemy/octorokBoss.c index fb16b706..0730b642 100644 --- a/src/enemy/octorokBoss.c +++ b/src/enemy/octorokBoss.c @@ -343,9 +343,9 @@ void OctorokBoss_Hit_SubAction6(Entity* this) { if (GET_TIMER(this) == 0) { if ((gScreenTransition.frameCount & 0xfU) == 0) { // Explosion in the center - CreateFx(this, 0x48, 0); + CreateFx(this, FX_GIANT_EXPLOSION3, 0); // Explosion at the front right leg - CreateFx(GET_HELPER(this)->legObjects[0], 0x48, 0); + CreateFx(GET_HELPER(this)->legObjects[0], FX_GIANT_EXPLOSION3, 0); } if (++this->field_0x82.HALF.LO == 0x79) { GET_HELPER(this)->mouthObject->health = 1; diff --git a/src/enemy/vaatiTransfigured.c b/src/enemy/vaatiTransfigured.c index 8c80bbbd..bd462e33 100644 --- a/src/enemy/vaatiTransfigured.c +++ b/src/enemy/vaatiTransfigured.c @@ -341,7 +341,7 @@ void VaatiTransfiguredType0Action3(Entity* this) { this->field_0x86.HALF.LO = 0; sub_080408EC(this); } else { - if (((this->actionDelay & 1) != 0) && (pEVar3 = CreateObject(0x9b, 1, 0xff), pEVar3 != NULL)) { + if (((this->actionDelay & 1) != 0) && (pEVar3 = CreateObject(OBJECT_9B, 1, 0xff), pEVar3 != NULL)) { pEVar3->parent = this; CopyPosition(this, pEVar3); pEVar3->x.HALF.HI += (Random() & 0xf) - 7; diff --git a/src/item/itemSword.c b/src/item/itemSword.c index 37a91ef4..4b9f1605 100644 --- a/src/item/itemSword.c +++ b/src/item/itemSword.c @@ -1,6 +1,7 @@ #include "item.h" #include "functions.h" #include "audio.h" +#include "object.h" extern void (*const gUnk_0811BD44[])(ItemBehavior*, u32); @@ -36,7 +37,7 @@ void sub_08075580(ItemBehavior* this, u32 arg1) { this->field_0x5[2] = 0x50; } sub_08077DF4(this, 0x168); - CreateObject(0x43, 0, 0); + CreateObject(OBJECT_43, 0, 0); return; } sub_080759B8(this, arg1); diff --git a/src/manager/manager17.c b/src/manager/manager17.c index d19440b0..139c4c2f 100644 --- a/src/manager/manager17.c +++ b/src/manager/manager17.c @@ -1,6 +1,7 @@ #include "manager.h" #include "flags.h" #include "room.h" +#include "object.h" typedef struct { Manager manager; @@ -32,7 +33,7 @@ void sub_0805AD60(Manager17* manager) { void sub_0805AD80(Manager17* manager) { if (CheckFlags(manager->field_0x3e) != 0) { - Entity* object = CreateObject(0, manager->manager.unk_0a, manager->manager.unk_0b); + Entity* object = CreateObject(GROUND_ITEM, manager->manager.unk_0a, manager->manager.unk_0b); if (object != NULL) { object->actionDelay = manager->field_0x35; object->collisionLayer = manager->field_0x36; diff --git a/src/manager/manager24.c b/src/manager/manager24.c index 7b3f2d19..532fdfd0 100644 --- a/src/manager/manager24.c +++ b/src/manager/manager24.c @@ -178,7 +178,7 @@ void sub_0805C294(u32 pos, u32 layer) { SetTileType(0xd7, pos + 0x41, layer); if (layer == 1) { if (CheckIsInteriorWithEnemies() != 0) { - object = CreateObject(0x4f, 0xe, 2); + object = CreateObject(ARCHWAY, 0xe, 2); if (object != NULL) { object->x.HALF.HI = ((pos & 0x3f) << 4) + 8 + gRoomControls.roomOriginX; object->y.HALF.HI = ((pos & 0xfc0) >> 2) + 0x20 + gRoomControls.roomOriginY; @@ -199,7 +199,7 @@ void sub_0805C294(u32 pos, u32 layer) { if (CheckIsDungeon() == 0) { return; } - object = CreateObject(0x4f, sub_0805C608(), 8); + object = CreateObject(ARCHWAY, sub_0805C608(), 8); if (object == NULL) { return; } diff --git a/src/manager/managerF.c b/src/manager/managerF.c index cc7b7692..70c810ac 100644 --- a/src/manager/managerF.c +++ b/src/manager/managerF.c @@ -10,6 +10,8 @@ #include "script.h" #include "utils.h" #include "tiles.h" +#include "object.h" +#include "item.h" void sub_08058ECC(ManagerF*); @@ -125,7 +127,7 @@ void sub_08058F44(u32 unk0, u32 unk1, u32 unk2) { void sub_08058F84(u32 unk0, u32 unk1) { Entity* tmp; - tmp = CreateObject(0x21, 0, 0); + tmp = CreateObject(OBJECT_21, 0, 0); if (!tmp) return; tmp->x.HALF.HI = gRoomControls.roomOriginX + unk0; @@ -177,7 +179,7 @@ void sub_08058FB0(ManagerF* this) { void sub_08059064(ManagerF* this) { Entity* tmp; - tmp = CreateObject(0, 0x53, 0); + tmp = CreateObject(GROUND_ITEM, ITEM_SMALL_KEY, 0); if (!tmp) return; tmp->actionDelay = 2; @@ -324,9 +326,9 @@ void sub_080592EC(ManagerF* this) { void sub_0805930C(ManagerF* this) { Entity* tmp; #ifdef EU - tmp = CreateObject(0xF, 0x43, 0x0); + tmp = CreateObject(SPECIAL_FX, FX_BIG_EXPLOSION2, 0x0); #else - tmp = CreateObject(0xF, 0x43, 0x40); + tmp = CreateObject(SPECIAL_FX, FX_BIG_EXPLOSION2, 0x40); #endif if (!tmp) return; @@ -361,7 +363,7 @@ void sub_0805938C(ManagerF* this) { u32 sub_080593CC(ManagerF* this) { if (!(gPlayerState.flags & PL_MINISH) && gPlayerState.swimState != 0 && gPlayerEntity.animationState == 0 && - (gPlayerState.field_0x90.HALF.LO & 0xF00) == 0x400) { + (gPlayerState.field_0x90 & 0xF00) == 0x400) { return sub_0806FCB8(&gPlayerEntity, this->unk_38, this->unk_3a + 0xC, 6); } return 0; @@ -374,7 +376,7 @@ void sub_08059424(ManagerF* this) { } if (!CheckFlags(this->unk_3c)) return; - tmp = CreateObject(0xF, 0x35, 0); + tmp = CreateObject(SPECIAL_FX, FX_BIG_EXPLOSION, 0); if (!tmp) return; tmp->collisionLayer = 2; diff --git a/src/npc/npc4E.c b/src/npc/npc4E.c index 84d18da1..0f79c152 100644 --- a/src/npc/npc4E.c +++ b/src/npc/npc4E.c @@ -206,8 +206,8 @@ void sub_0806DCA0() { } void sub_0806DCC0() { - gScreenTransition.player_status.field_0x20 = 0x7c8; - gScreenTransition.player_status.field_0x22 = 0xf8; + gScreenTransition.player_status.overworld_map_x = 0x7c8; + gScreenTransition.player_status.overworld_map_y = 0xf8; } void NPC4E_Fusion(Entity* this) { diff --git a/src/npc/picolyteBottle.c b/src/npc/picolyteBottle.c index 25d56034..fa39f1b9 100644 --- a/src/npc/picolyteBottle.c +++ b/src/npc/picolyteBottle.c @@ -3,6 +3,7 @@ #include "structures.h" #include "functions.h" #include "textbox.h" +#include "object.h" extern ScreenTransitionData gUnk_0813AD4C; @@ -60,7 +61,7 @@ void sub_0806DFB4(Entity* this) { } else { if (this->actionDelay != 0) { this->actionDelay = 0; - obj = CreateObject(0x35, 2, this->field_0xf); + obj = CreateObject(OBJECT_35, 2, this->field_0xf); if (obj != NULL) { obj->parent = this; this->child = obj; diff --git a/src/npc/postman.c b/src/npc/postman.c index 9e643e8e..d8cdb5aa 100644 --- a/src/npc/postman.c +++ b/src/npc/postman.c @@ -99,7 +99,7 @@ void sub_080604DC(Entity* this) { if (this->spriteSettings.draw == 1 && CheckOnScreen(this)) { if ((this->frame & 1) != 0) { this->frame &= 0xfe; - ent = CreateFx(this, 17, 0x40); + ent = CreateFx(this, FX_DASH, 0x40); if (ent != NULL) { ent->y.HALF.HI++; SetDefaultPriority(ent, 3); diff --git a/src/object/houseDoorExterior.c b/src/object/houseDoorExterior.c index 79b8425c..137b19a5 100644 --- a/src/object/houseDoorExterior.c +++ b/src/object/houseDoorExterior.c @@ -168,7 +168,7 @@ void sub_0808692C(Entity* this) { static u8 sub_08086954(Entity* this) { if (sub_0800445C(this)) { if (sub_0806ED9C(this, 6, 20) >= 0 && gPlayerEntity.animationState == 0 && - (u16)gPlayerState.field_0x90.HALF.LO == 0x400 && gPlayerState.jumpStatus == 0) { + (u16)gPlayerState.field_0x90 == 0x400 && gPlayerState.jumpStatus == 0) { this->actionDelay--; } } else { diff --git a/src/object/minishSizedEntrance.c b/src/object/minishSizedEntrance.c index a92a887c..5b891dd0 100644 --- a/src/object/minishSizedEntrance.c +++ b/src/object/minishSizedEntrance.c @@ -30,7 +30,7 @@ void sub_08090F00(Entity* this) { } } if ((gPlayerState.flags & PL_MINISH) && EntityInRectRadius(this, &gPlayerEntity, 4, 4) && - (gPlayerEntity.z.HALF.HI == 0) && (((u16)gPlayerState.field_0x90.HALF.LO) & gUnk_0812225C[this->type2])) { + (gPlayerEntity.z.HALF.HI == 0) && (((u16)gPlayerState.field_0x90) & gUnk_0812225C[this->type2])) { DoExitTransition(GetCurrentRoomProperty(this->actionDelay)); } } diff --git a/src/object/object6A.c b/src/object/object6A.c index 11dcfc48..c1b065a8 100644 --- a/src/object/object6A.c +++ b/src/object/object6A.c @@ -152,7 +152,7 @@ void sub_08094A90(Object6AEntity* this) { } void sub_08094AE8(Entity* this, ScriptExecutionContext* ctx) { - Object6AEntity* e = (Object6AEntity*)CreateObject(0x6A, 1, 0); + Object6AEntity* e = (Object6AEntity*)CreateObject(OBJECT_6A, 1, 0); if (e != NULL) { e->ctx = StartCutscene(&e->base, (void*)ctx->intVariable); } @@ -182,7 +182,7 @@ void sub_08094B80(Object6AEntity* this) { } void sub_08094B94(Object6AEntity* this) { - Entity* e = CreateObject(0x6A, 0x22, 0); + Entity* e = CreateObject(OBJECT_6A, 0x22, 0); if (e != NULL) { CopyPosition(&gPlayerEntity, e); e->z.HALF.HI = -48; @@ -194,7 +194,7 @@ void sub_08094B94(Object6AEntity* this) { } void sub_08094BE0(Entity* this) { - Entity* e = FindEntity(6, 0x6A, 6, 0x22, 0); + Entity* e = FindEntity(6, OBJECT_6A, 6, 0x22, 0); if (e != NULL) { CopyPosition(&gPlayerEntity, e); e->z.HALF.HI = -12; @@ -382,7 +382,7 @@ void sub_08094E30(Object6AEntity* this) { } void sub_08094F98(Object6AEntity* this) { - CreateObject(0x6A, 5, 0); + CreateObject(OBJECT_6A, 5, 0); } void sub_08094FA8(Object6AEntity* this) { @@ -531,7 +531,7 @@ void sub_080951C4(Object6AEntity* this) { void sub_08095244(Object6AEntity* this) { if (super->type == 0) { - Entity* e = CreateObject(0x6A, 0xA, 0); + Entity* e = CreateObject(OBJECT_6A, 0xA, 0); if (e != NULL) { e->parent = super; PositionRelative(super, e, 0x100000, -0x100000); @@ -575,7 +575,7 @@ void sub_08095288(Object6AEntity* this) { } void sub_08095330(Object6AEntity* this) { - Entity* e = CreateObject(0x6A, 0xB, 0); + Entity* e = CreateObject(OBJECT_6A, 0xB, 0); if (e != NULL) { super->child = e; e->child = super; @@ -622,7 +622,7 @@ void sub_080953A4(Object6AEntity* this) { } void sub_08095420(Object6AEntity* this, ScriptExecutionContext* ctx) { - Entity* e = CreateObject(0x6A, 0xC, 0); + Entity* e = CreateObject(OBJECT_6A, 0xC, 0); if (e != NULL) { PositionRelative(super, e, 0, -0x100000); ((Object6AEntity*)e)->ctx = StartCutscene(e, (u16*)ctx->intVariable); @@ -633,12 +633,12 @@ void nullsub_527(Object6AEntity* this) { } void sub_0809545C(Object6AEntity* this, ScriptExecutionContext* ctx) { - Entity* p = CreateObject(0x6A, 0xD, 0); + Entity* p = CreateObject(OBJECT_6A, 0xD, 0); Entity* e; if (p != NULL) { PositionRelative(super, p, 0, -0x100000); ((Object6AEntity*)p)->ctx = StartCutscene(p, (u16*)ctx->intVariable); - e = CreateObject(0x6A, 2, 0); + e = CreateObject(OBJECT_6A, 2, 0); if (e != NULL) { CopyPosition(p, e); e->parent = p; @@ -647,7 +647,7 @@ void sub_0809545C(Object6AEntity* this, ScriptExecutionContext* ctx) { } void sub_080954AC(Object6AEntity* this) { - Entity* e = CreateObject(0x6A, 0x1A, 0); + Entity* e = CreateObject(OBJECT_6A, 0x1A, 0); if (e != NULL) { CopyPosition(super, e); ((Object6AEntity*)e)->ctx = StartCutscene(e, &script_08015B14); @@ -759,7 +759,7 @@ void sub_080956B4(Object6AEntity* this) { } void sub_08095754(Object6AEntity* this) { - Entity* e = CreateObject(0x6A, 0xF, super->type2); + Entity* e = CreateObject(OBJECT_6A, 0xF, super->type2); if (e != NULL) { e->parent = super; CopyPosition(super, e); @@ -779,7 +779,7 @@ void sub_0809577C(Object6AEntity* this) { } void sub_080957B4(Object6AEntity* this) { - Entity* e = CreateObject(0x6A, 0x10, 0); + Entity* e = CreateObject(OBJECT_6A, 0x10, 0); if (e != NULL) { e->parent = super; CopyPosition(super, e); @@ -799,7 +799,7 @@ void sub_080957DC(Object6AEntity* this) { } void sub_08095810(Object6AEntity* this) { - Entity* e = CreateObject(0x6A, 0x11, 0); + Entity* e = CreateObject(OBJECT_6A, 0x11, 0); if (e != NULL) { e->parent = super; CopyPosition(super, e); @@ -860,7 +860,7 @@ void sub_08095954(Object6AEntity* this) { s8 x, y; } s8XY; - Entity* e = CreateObject(0x6A, 0x14, 0); + Entity* e = CreateObject(OBJECT_6A, 0x14, 0); if (e != NULL) { u32 tmp, x, y; e->parent = super; @@ -891,7 +891,7 @@ void sub_080959CC(Object6AEntity* this) { } void sub_08095A1C(Object6AEntity* this, ScriptExecutionContext* ctx) { - Entity* e = CreateObject(0x6A, 0x16, 0); + Entity* e = CreateObject(OBJECT_6A, 0x16, 0); if (e != NULL) { e->x.HALF.HI = gRoomControls.roomOriginX + 232; e->y.HALF.HI = gRoomControls.roomOriginY + 312; @@ -902,7 +902,7 @@ void sub_08095A1C(Object6AEntity* this, ScriptExecutionContext* ctx) { } void sub_08095A68(Object6AEntity* this) { - Entity* e = FindEntity(6, 0x6A, 6, 0x16, 0); + Entity* e = FindEntity(6, OBJECT_6A, 6, 0x16, 0); if (e != NULL) { e->action = 0xFF; } @@ -974,7 +974,7 @@ void sub_08095B48(Object6AEntity* this) { } void sub_08095BE0(Object6AEntity* this, u32 val) { - Entity* e = CreateObject(0x6A, 0x18, val); + Entity* e = CreateObject(OBJECT_6A, 0x18, val); if (e != NULL) { e->parent = super; CopyPosition(super, e); @@ -997,7 +997,7 @@ void sub_08095C00(Object6AEntity* this) { } void sub_08095C48(Object6AEntity* this) { - Entity* e = CreateObject(0x6A, 0x19, 0); + Entity* e = CreateObject(OBJECT_6A, 0x19, 0); if (e != NULL) { super->child = e; e->parent = super; @@ -1022,7 +1022,7 @@ void sub_08095C68(Object6AEntity* this) { } void sub_08095CB0(Object6AEntity* this) { - Entity* e = CreateObject(0x6A, 0x1B, 0); + Entity* e = CreateObject(OBJECT_6A, 0x1B, 0); if (e != NULL) { super->child = e; e->parent = super; @@ -1052,7 +1052,7 @@ void sub_08095D30(Object6AEntity* this, u32 a2) { } void sub_08095D54(Object6AEntity* this, ScriptExecutionContext* ctx) { - Entity* e = CreateObject(0x6A, 0x1C, 0); + Entity* e = CreateObject(OBJECT_6A, 0x1C, 0); if (e != NULL) { CopyPosition(&gPlayerEntity, e); e->collisionLayer = 2; @@ -1061,7 +1061,7 @@ void sub_08095D54(Object6AEntity* this, ScriptExecutionContext* ctx) { } void sub_08095D8C(Object6AEntity* this, ScriptExecutionContext* ctx) { - Entity* e = CreateObject(0x6A, 0x1D, 0); + Entity* e = CreateObject(OBJECT_6A, 0x1D, 0); if (e != NULL) { CopyPosition(super, e); ((Object6AEntity*)e)->ctx = StartCutscene(e, (u16*)ctx->intVariable); @@ -1098,7 +1098,7 @@ void sub_08095DBC(Object6AEntity* this) { } void sub_08095E7C(Object6AEntity* this, ScriptExecutionContext* ctx) { - Entity* e = CreateObject(0x6A, 0x1E, 0); + Entity* e = CreateObject(OBJECT_6A, 0x1E, 0); if (e != NULL) { CopyPosition(super, e); ((Object6AEntity*)e)->ctx = StartCutscene(e, (u16*)ctx->intVariable); @@ -1107,7 +1107,7 @@ void sub_08095E7C(Object6AEntity* this, ScriptExecutionContext* ctx) { NONMATCH("asm/non_matching/object6A/sub_08095EAC.inc", void sub_08095EAC(Object6AEntity* this, ScriptExecutionContext* ctx)) { - Entity* e = CreateObject(0x6A, 0x1E, 1); + Entity* e = CreateObject(OBJECT_6A, 0x1E, 1); s32 x, y; if (e != NULL) { @@ -1186,7 +1186,7 @@ void sub_08096028(Object6AEntity* this) { type2 = 4; if (!CheckLocalFlagByBank(768, 122)) type2 = 3; - CreateObject(0x6A, 0x1F, type2); + CreateObject(OBJECT_6A, 0x1F, type2); } void sub_08096058(Object6AEntity* this) { @@ -1214,7 +1214,7 @@ void sub_08096084(Object6AEntity* this) { } void sub_080960C4(Object6AEntity* this, ScriptExecutionContext* ctx) { - Entity* e = CreateObject(0x6A, 0x23, 0x49); + Entity* e = CreateObject(OBJECT_6A, 0x23, 0x49); if (e != NULL) { e->parent = super; CopyPosition(super, e); @@ -1222,7 +1222,7 @@ void sub_080960C4(Object6AEntity* this, ScriptExecutionContext* ctx) { ResolveEntityBelow(super, e); ((Object6AEntity*)e)->ctx = StartCutscene(e, (u16*)ctx->intVariable); } - e = CreateObject(0x6A, 0x24, 0x4A); + e = CreateObject(OBJECT_6A, 0x24, 0x4A); if (e != NULL) { e->parent = super; CopyPosition(super, e); @@ -1248,7 +1248,7 @@ void sub_08096168(Object6AEntity* this) { void sub_080961B0(Object6AEntity* this) { int i; for (i = 0; i < 8; ++i) { - Entity* e = CreateObject(0x6A, 0x25, 0); + Entity* e = CreateObject(OBJECT_6A, 0x25, 0); if (e != NULL) { CopyPosition(super, e); e->direction = 32 * i; @@ -1264,21 +1264,21 @@ void sub_080961F4(Object6AEntity* this) { void sub_08096208(Object6AEntity* this, u32 x) { s8* p = &gUnk_08122B2E[x * 2]; - Entity* e = CreateObject(0x6A, 0x26, 0); + Entity* e = CreateObject(OBJECT_6A, 0x26, 0); if (e != NULL) { PositionRelative(super, e, p[0] << 16, p[1] << 16); } } void sub_0809623C(Object6AEntity* this) { - Entity* e = CreateObject(0x6A, 0x27, 0); + Entity* e = CreateObject(OBJECT_6A, 0x27, 0); if (e != NULL) { PositionRelative(super, e, 0, -0x100000); } } void sub_08096260(Object6AEntity* this) { - Entity* e = CreateObject(0x6A, 0x28, 0); + Entity* e = CreateObject(OBJECT_6A, 0x28, 0); if (e != NULL) { PositionRelative(super, e, 0, -0x100000); } diff --git a/src/object/warpPoint.c b/src/object/warpPoint.c index df5a9ba2..bd5fc8cf 100644 --- a/src/object/warpPoint.c +++ b/src/object/warpPoint.c @@ -224,7 +224,7 @@ void sub_0808B830(Entity* this) { this->action = 3; this->actionDelay = 0; this->spriteSettings.draw = 1; - tmp = CreateObject(0x34, 0, 0); + tmp = CreateObject(WARP_POINT, 0, 0); if (tmp) { tmp->field_0x70.BYTES.byte0 = 1; tmp->parent = this; diff --git a/src/overworld.c b/src/overworld.c index ff90afc8..fdd22b3e 100644 --- a/src/overworld.c +++ b/src/overworld.c @@ -41,11 +41,11 @@ void CleanUpGFXSlots(); void sub_080ADE24(); void sub_0801C370(u32); void sub_0801AE44(u32); -void sub_0801862C(void); -void sub_08078160(u32); +void GenerateAreaHint(void); +void ForceSetPlayerState(u32); void SetPlayerEventPriority(void); RoomResInfo* GetCurrentRoomInfo(void); -void sub_08049D30(void); +void UpdateRoomTracker(void); void InitScriptData(void); void sub_08054524(void); void sub_080186D4(void); @@ -673,8 +673,8 @@ u32 sub_08052B24(void) { if ((gPlayerEntity.z.HALF.HI & 0x8000) && !gPlayerState.field_0xa) return 0; - sub_0801862C(); - sub_08078160(19); + GenerateAreaHint(); + ForceSetPlayerState(PL_STATE_TALKEZLO); SetPlayerEventPriority(); return 1; } @@ -728,25 +728,25 @@ void sub_08052C3C(void) { void sub_08052C5C(void) { if (!CheckIsInteriorNoEnemies()) { if (CheckIsOverworld()) { - gScreenTransition.player_status.field_0x20 = gPlayerEntity.x.HALF_U.HI; - gScreenTransition.player_status.field_0x22 = gPlayerEntity.y.HALF_U.HI; + gScreenTransition.player_status.overworld_map_x = gPlayerEntity.x.HALF_U.HI; + gScreenTransition.player_status.overworld_map_y = gPlayerEntity.y.HALF_U.HI; } else if (CheckIsDungeon()) { - gScreenTransition.player_status.field_0x1c = gPlayerEntity.x.HALF.HI; - gScreenTransition.player_status.field_0x1e = gPlayerEntity.y.HALF.HI; + gScreenTransition.player_status.dungeon_map_x = gPlayerEntity.x.HALF.HI; + gScreenTransition.player_status.dungeon_map_y = gPlayerEntity.y.HALF.HI; } } } void sub_08052CA4(u32 area, u32 room, u32 x, u32 y) { RoomHeader* hdr = gAreaRoomHeaders[area] + room; - gScreenTransition.player_status.field_0x20 = hdr->map_x + x; - gScreenTransition.player_status.field_0x22 = hdr->map_y + y; + gScreenTransition.player_status.overworld_map_x = hdr->map_x + x; + gScreenTransition.player_status.overworld_map_y = hdr->map_y + y; } void sub_08052CD0(u32 area, u32 room, u32 x, u32 y) { RoomHeader* hdr = gAreaRoomHeaders[area] + room; - gScreenTransition.player_status.field_0x1c = hdr->map_x + x; - gScreenTransition.player_status.field_0x1e = hdr->map_y + y; + gScreenTransition.player_status.dungeon_map_x = hdr->map_x + x; + gScreenTransition.player_status.dungeon_map_y = hdr->map_y + y; } void sub_08052CFC(void) { @@ -817,7 +817,7 @@ void sub_08052EA0(void) { gRoomVars.unk_10[3] = gRoomVars.unk_10[0]; gRoomVars.lightLevel = 256; gArea.locationIndex = gAreaMetadata[gRoomControls.areaID].location; - sub_08049D30(); + UpdateRoomTracker(); InitScriptData(); sub_08054524(); sub_080186D4(); @@ -979,10 +979,10 @@ void sub_080531F8(void) { if (sub_08053144()) { MemCopy(&gScreenTransition.player_status, &gSave.saved_status, sizeof gScreenTransition.player_status); if (CheckIsDungeon()) { - gScreenTransition.player_status.field_0x16 = gRoomControls.areaID; - gScreenTransition.player_status.field_0x17 = gRoomControls.roomID; - gScreenTransition.player_status.field_0x18 = gPlayerEntity.x.HALF.HI; - gScreenTransition.player_status.field_0x1a = gPlayerEntity.y.HALF.HI; + gScreenTransition.player_status.dungeon_area = gRoomControls.areaID; + gScreenTransition.player_status.dungeon_room = gRoomControls.roomID; + gScreenTransition.player_status.dungeon_x = gPlayerEntity.x.HALF.HI; + gScreenTransition.player_status.dungeon_y = gPlayerEntity.y.HALF.HI; } } } @@ -1022,13 +1022,13 @@ static void sub_080532E4(void) { RoomHeader* r_hdr = gAreaRoomHeaders[AREA_FORTRESS_OF_WINDS] + 33; - gScreenTransition.player_status.field_0x16 = AREA_FORTRESS_OF_WINDS; - gScreenTransition.player_status.field_0x17 = 33; + gScreenTransition.player_status.dungeon_area = AREA_FORTRESS_OF_WINDS; + gScreenTransition.player_status.dungeon_room = 33; - gScreenTransition.player_status.field_0x18 = r_hdr->map_x + r_hdr->pixel_width / 2; - gScreenTransition.player_status.field_0x1c = gScreenTransition.player_status.field_0x18; - gScreenTransition.player_status.field_0x1a = r_hdr->map_y + r_hdr->pixel_height + 0xa0; - gScreenTransition.player_status.field_0x1e = gScreenTransition.player_status.field_0x1a; + gScreenTransition.player_status.dungeon_x = r_hdr->map_x + r_hdr->pixel_width / 2; + gScreenTransition.player_status.dungeon_map_x = gScreenTransition.player_status.dungeon_x; + gScreenTransition.player_status.dungeon_y = r_hdr->map_y + r_hdr->pixel_height + 0xa0; + gScreenTransition.player_status.dungeon_map_y = gScreenTransition.player_status.dungeon_y; } void sub_08053320(void) { diff --git a/src/player.c b/src/player.c index 0ead68bc..3cde33dd 100644 --- a/src/player.c +++ b/src/player.c @@ -2493,7 +2493,7 @@ static const u16 gUnk_0811BC30[] = { static NONMATCH("asm/non_matching/player/sub_08073584.inc", void sub_08073584(Entity* this)) { u32 state, dir, tmp, tmp2, idx; - if ((gPlayerState.field_0x90.HALF.HI & 0x80) || this->iframes > 0 || gPlayerState.field_0x3c[0] || + if ((gPlayerState.field_0x92 & 0x80) || this->iframes > 0 || gPlayerState.field_0x3c[0] || (gPlayerState.flags & PL_PARACHUTE) == 0) { gPlayerState.jumpStatus |= 0x40; sub_0807921C(); @@ -2871,7 +2871,7 @@ static void sub_08073D20(Entity* this) { gPlayerState.framestate = PL_STATE_CAPE; if (gPlayerState.floor_type != SURFACE_SHALLOW_WATER && gPlayerState.floor_type != SURFACE_WATER) { gPlayerState.swimState = 0; - this->field_0x3c &= 0xFBu; + this->field_0x3c &= ~4; } if (!RunQueuedAction() && this->subAction != 2) { if ((gPlayerState.flags & PL_HIDDEN) == 0) { @@ -3254,7 +3254,7 @@ void SurfaceAction_ShallowWater(Entity* this) { this->spritePriority.b0 = 4; gPlayerState.swimState = 0; } - if ((gPlayerState.field_0x90.HALF.HI & 0xF00) || gPlayerState.field_0x11 == 1) + if ((gPlayerState.field_0x92 & 0xF00) || gPlayerState.field_0x11 == 1) SoundReq(SFX_WATER_WALK); } } @@ -3406,7 +3406,7 @@ void SurfaceAction_22(Entity* this) { void SurfaceAction_Dust(Entity* this) { if (!sub_080741C4()) { gPlayerState.field_0x80 -= 128; - if (gPlayerState.field_0x11 == 1 || (gPlayerState.field_0x90.HALF.HI & 0xF00) != 0) { + if (gPlayerState.field_0x11 == 1 || (gPlayerState.field_0x92 & 0xF00) != 0) { if (gPlayerState.floor_type == SURFACE_DUST) CreateObjectWithParent(this, OBJECT_21, 1, 0); else @@ -3770,7 +3770,7 @@ NONMATCH("asm/non_matching/player/sub_080751E8.inc", void sub_080751E8(u32 a1, u gPlayerState.field_0x39 = 1; tmp = &script_08009EF0; } - e = CreateObject(0x5B, !gPlayerState.field_0x39 ? 2 : 0, 0); + e = CreateObject(OBJECT_5B, !gPlayerState.field_0x39 ? 2 : 0, 0); if (e != NULL) { CopyPosition(&gPlayerEntity, e); StartCutscene(e, tmp); diff --git a/src/playerItem/playerItem10.c b/src/playerItem/playerItem10.c index 02ff1fb6..b0a495bb 100644 --- a/src/playerItem/playerItem10.c +++ b/src/playerItem/playerItem10.c @@ -2,6 +2,7 @@ #include "player.h" #include "functions.h" #include "asm.h" +#include "object.h" extern void (*const gUnk_0812AA80[])(Entity*); @@ -115,7 +116,7 @@ void sub_080ACC78(Entity* this) { } o = sub_08008782(this, 0xe, puVar8[*(u32*)&this->field_0x74], puVar8[*(u32*)&this->field_0x74 + 1]); if (o != NULL) { - child = CreateObject(0x11, o->type, o->type2); + child = CreateObject(OBJECT_11, o->type, o->type2); if (child != NULL) { child->actionDelay = o->actionDelay; child->x.HALF.HI = puVar8[*(u32*)&this->field_0x74] + this->x.HALF.HI; @@ -136,7 +137,7 @@ void sub_080ACC78(Entity* this) { } else { this->field_0x70.WORD = gUnk_0812AABC[this->type]; } - child = CreateObject(0x17, 0, 0); + child = CreateObject(OBJECT_17, 0, 0); if (child == NULL) { return; } diff --git a/src/projectile/removableDust.c b/src/projectile/removableDust.c index f6bc3346..5fbf3c76 100644 --- a/src/projectile/removableDust.c +++ b/src/projectile/removableDust.c @@ -4,6 +4,7 @@ #include "functions.h" #include "flags.h" #include "utils.h" +#include "object.h" extern u32 sub_080002C8(u16, u8); extern Entity* LoadRoomEntity(EntityData*); @@ -50,7 +51,7 @@ void sub_080AA464(Entity* this) { if (this->type == 0) { sub_080AA544(this); } - entity = CreateObject(0x21, 3, 0); + entity = CreateObject(OBJECT_21, 3, 0); if (entity != NULL) { CopyPosition(this, entity); } diff --git a/src/room.c b/src/room.c index f685c833..629e05e6 100644 --- a/src/room.c +++ b/src/room.c @@ -366,7 +366,7 @@ static void LoadDestructibleTile(TileEntity* tile) { void sub_0804B388(u32 a1, u32 a2) { Entity* e; SetTileType(a2 == 1 ? 38 : 52, a1, a2); - e = CreateObject(0xF, 2, 0); + e = CreateObject(SPECIAL_FX, 2, 0); if (e != NULL) { e->collisionLayer = a2; sub_0806F704(e, a1); diff --git a/src/roomInit.c b/src/roomInit.c index fc0a2ff2..80ff8a1c 100644 --- a/src/roomInit.c +++ b/src/roomInit.c @@ -4901,8 +4901,8 @@ void sub_StateChange_HouseInteriors4_Mayor(void) { if (!GetInventoryValue(ITEM_FLIPPERS) && CheckGlobalFlag(MIZUKAKI_START) && !GetInventoryValue(ITEM_QST_BOOK3)) { LoadRoomEntityList(&gUnk_080F3A48); } - gScreenTransition.player_status.field_0x20 = 0xf28; - gScreenTransition.player_status.field_0x22 = 0x82d; + gScreenTransition.player_status.overworld_map_x = 0xf28; + gScreenTransition.player_status.overworld_map_y = 0x82d; } extern u32 Enemies_LakeHylia_Main; From c4f2efe13278c5aeb094be914513d19f5ddbce2b Mon Sep 17 00:00:00 2001 From: theo3 Date: Mon, 27 Dec 2021 21:26:32 -0800 Subject: [PATCH 4/4] label script functions --- asm/macros/scripts.inc | 56 ++-- .../script_CastorWildsStatueLeft.inc | 6 +- .../script_CastorWildsStatueMiddle.inc | 6 +- .../script_CastorWildsStatueRight.inc | 8 +- .../castorWilds/script_GreatFairyRupees.inc | 6 +- .../castorWilds/script_MalonAtRanch.inc | 8 +- data/scripts/castorWilds/script_Object69.inc | 2 +- .../script_Object69DarknutFight.inc | 8 +- data/scripts/cloudTops/script_EzloTalkPoW.inc | 6 +- .../cloudTops/script_GregalHealthy.inc | 14 +- data/scripts/cloudTops/script_GregalSick.inc | 20 +- .../cloudTops/script_Npc4EFirstCloud.inc | 6 +- .../cloudTops/script_Npc4EKinstoneFused.inc | 2 +- .../script_Object69GreatWhirlwindRevealed.inc | 4 +- .../script_Object6AMysteriousCloud.inc | 2 +- .../cloudTops/script_PlayerAtSiroc.inc | 2 +- data/scripts/cloudTops/script_Siroc.inc | 10 +- .../cloudTops/script_WindTribespeople1.inc | 10 +- .../cloudTops/script_WindTribespeople2.inc | 8 +- .../cloudTops/script_WindTribespeople3.inc | 10 +- .../cloudTops/script_WindTribespeople4.inc | 8 +- .../cloudTops/script_WindTribespeople5.inc | 8 +- .../cloudTops/script_WindTribespeople6.inc | 10 +- .../cloudTops/script_WindTribespeople7.inc | 8 +- ...indTribespeopleGreatWhirlwindRevealed1.inc | 8 +- ...indTribespeopleGreatWhirlwindRevealed2.inc | 8 +- data/scripts/cutscene/ezlo/script_EzloCap.inc | 126 +++---- .../ezlo/script_Npc4EEzloCutscene.inc | 30 +- .../script_Object6ALeftBullyingOctorok.inc | 12 +- .../script_Object6ARightBullyingOctorok.inc | 12 +- .../ezlo/script_PlayerAtFirstLookAtEzlo.inc | 4 +- .../ezlo/script_PlayerDefeatedOctoroks.inc | 2 +- .../ezlo/script_PlayerEzloBeingBullied.inc | 2 +- .../cutscene/intro/script_HouseDoorIntro.inc | 2 +- .../intro/script_IntroCameraTarget.inc | 2 +- .../intro/script_Npc4EOutsideLinksHouse.inc | 8 +- .../cutscene/intro/script_Object69Intro.inc | 4 +- .../cutscene/intro/script_PlayerIntro.inc | 4 +- .../cutscene/intro/script_SmithIntro.inc | 20 +- .../cutscene/intro/script_SmithIntro2.inc | 20 +- .../cutscene/intro/script_ZeldaIntro.inc | 4 +- .../intro/script_ZeldaLeaveLinksHouse.inc | 4 +- .../intro/script_ZeldaOutsideLinksHouse.inc | 30 +- .../intro/script_ZeldaTalkToSmith.inc | 20 +- .../introAssembly/script_GuardAtAssembly.inc | 12 +- .../script_KingDaltusAtAssembly.inc | 32 +- .../script_MinisterPothoAtAssembly.inc | 6 +- .../script_Npc4EIntroAssembly.inc | 10 +- .../introAssembly/script_PlayerEnters.inc | 4 +- .../introAssembly/script_PlayerGetSword.inc | 6 +- .../script_PlayerWakingUpInHyruleCastle.inc | 8 +- .../introAssembly/script_SmithAtAssembly.inc | 16 +- .../introBusinessScrub/script_080157AC.inc | 20 +- .../introBusinessScrub/script_08015B14.inc | 2 +- .../introBusinessScrub/script_08015B34.inc | 6 +- .../script_BusinessScrubIntro.inc | 8 +- .../script_PlayerAtIntroBusinessScrub4.inc | 4 +- .../script_PlayerIntroBusinessScrub1.inc | 2 +- .../script_PlayerIntroBusinessScrub2.inc | 2 +- .../script_PlayerIntroBusinessScrub3.inc | 2 +- .../script_ZeldaIntroBusinessScrub.inc | 24 +- .../introCeremony/script_08011890.inc | 2 +- .../introCeremony/script_GuardBottomRight.inc | 20 +- .../script_GuardCarryingChest.inc | 32 +- .../introCeremony/script_GuardEntryLeft.inc | 10 +- .../introCeremony/script_GuardEntryRight.inc | 10 +- .../introCeremony/script_GuardTopLeft.inc | 28 +- .../introCeremony/script_GuardTopRight.inc | 28 +- .../script_KingDaltusIntroCeremony.inc | 6 +- .../script_MinisterPothoIntroCastle.inc | 12 +- .../introCeremony/script_Npc4EMonsters.inc | 6 +- .../script_Npc4EVaatiAttacking.inc | 2 +- .../script_Object6ASwordInChest.inc | 2 +- .../script_PlayerAtIntroCeremony.inc | 2 +- .../introCeremony/script_PlayerFainting.inc | 6 +- .../script_PlayerIntroCastle.inc | 2 +- .../script_PlayerProtectingZelda.inc | 2 +- .../introCeremony/script_VaatiDarkMagic.inc | 2 +- .../script_VaatiIntroCeremony.inc | 32 +- .../introCeremony/script_ZeldaIntroCastle.inc | 8 +- .../cutscene/introTown/script_BeedleIntro.inc | 12 +- .../cutscene/introTown/script_GuardIntro.inc | 8 +- .../cutscene/introTown/script_KidIntro1.inc | 6 +- .../cutscene/introTown/script_KidIntro2.inc | 6 +- .../introTown/script_Npc4EIntroCastle.inc | 8 +- .../introTown/script_Npc4EIntroTown.inc | 32 +- .../introTown/script_Object69IntroTown.inc | 12 +- .../cutscene/introTown/script_PercyIntro.inc | 8 +- .../cutscene/introTown/script_PinaIntro.inc | 12 +- .../introTown/script_PlayerIntro1.inc | 2 +- .../introTown/script_PlayerIntro2.inc | 2 +- .../introTown/script_PlayerIntro3.inc | 2 +- .../introTown/script_PlayerIntro4.inc | 2 +- .../introTown/script_PlayerIntro5.inc | 4 +- .../introTown/script_PlayerIntroTown.inc | 4 +- .../introTown/script_TownsperonIntro.inc | 6 +- .../script_WindtribespeopleIntro.inc | 8 +- .../introTown/script_ZeldaIntroTown.inc | 32 +- .../script_HurdyGurdyManFirstKinstone.inc | 58 ++-- .../kinstones/script_KidKinstone1.inc | 14 +- .../kinstones/script_KidKinstone2.inc | 16 +- .../kinstones/script_KidKinstone3.inc | 14 +- .../kinstones/script_Npc4EFirstKinstone.inc | 10 +- .../script_PlayerAtFirstKinstone.inc | 4 +- ...pt_PlayerAtHurdyGurdyManFirstKinstone1.inc | 2 +- ...pt_PlayerAtHurdyGurdyManFirstKinstone2.inc | 2 +- ...pt_PlayerAtHurdyGurdyManFirstKinstone3.inc | 2 +- ...pt_PlayerAtHurdyGurdyManFirstKinstone4.inc | 2 +- .../minishVillage/script_ForestMinish5.inc | 4 +- .../minishVillage/script_ForestMinish6.inc | 6 +- .../minishVillage/script_ForestMinish7.inc | 4 +- .../minishVillage/script_ForestMinish8.inc | 4 +- .../minishVillage/script_ForestMinish9.inc | 4 +- .../script_Object69VillageIntro.inc | 14 +- .../script_EzloCapExplainingOriginStory.inc | 8 +- .../originStory/script_MinishEzlo.inc | 14 +- .../script_Object69CameraTarget.inc | 2 +- .../script_Object69MinishVaati.inc | 2 +- .../script_Object69VaatiAppears.inc | 34 +- .../originStory/script_Object6ADarkMagic.inc | 2 +- .../originStory/script_Object6AMinishCap.inc | 4 +- .../script_PlayerAtVaatisAppearance.inc | 2 +- .../script_PlayerDefeatedMoblins.inc | 2 +- .../script_PlayerSeenOriginStory.inc | 2 +- .../script_PlayerStoneWallsAppear.inc | 10 +- .../script_PlayerTryToFollowVaati.inc | 2 +- .../cutscene/originStory/script_Vaati.inc | 18 +- .../originStory/script_VaatiAppearsAgain.inc | 10 +- .../cutscene/outro/script_EzloCapOutro.inc | 12 +- .../cutscene/outro/script_EzloZeldaMagic.inc | 2 +- .../outro/script_GuardStoneOutro1.inc | 10 +- .../outro/script_GuardStoneOutro2.inc | 10 +- .../outro/script_GuardStoneOutro3.inc | 10 +- .../cutscene/outro/script_MaidStoneOutro1.inc | 8 +- .../cutscene/outro/script_MaidStoneOutro2.inc | 8 +- .../outro/script_MinishEzloGoodbye.inc | 22 +- .../cutscene/outro/script_MinishEzloOutro.inc | 18 +- .../outro/script_Npc4EDHCEntrance.inc | 2 +- .../cutscene/outro/script_Npc4EDHCThrone.inc | 2 +- .../outro/script_Npc4EFixedEverything.inc | 8 +- .../script_Npc4EHyruleCastleEntrance.inc | 2 +- .../outro/script_Npc4EHyruleCastleThrone.inc | 2 +- .../outro/script_Npc4EMinishPortalClosing.inc | 10 +- .../outro/script_Npc4EMinishWoods.inc | 2 +- .../cutscene/outro/script_Npc4EMtCrenel.inc | 2 +- .../cutscene/outro/script_Npc4EOutro.inc | 6 +- .../outro/script_Npc4ESanctuaryEntrance.inc | 2 +- .../outro/script_Npc4EUnfreezeCastleStaff.inc | 6 +- .../outro/script_Object6AEzloDismounting.inc | 2 +- .../outro/script_Object6AEzloFinalMagic.inc | 2 +- .../outro/script_Object6AMinishCapOutro.inc | 8 +- .../outro/script_Object6AOctorok1.inc | 4 +- .../outro/script_Object6AOctorok2.inc | 4 +- .../outro/script_Object6AOctorok3.inc | 4 +- .../outro/script_Object6AOctorok4.inc | 4 +- .../outro/script_Object6ATektite1.inc | 4 +- .../outro/script_Object6ATektite2.inc | 4 +- .../outro/script_Object6ATektite3.inc | 4 +- .../outro/script_Object6ATektite4.inc | 4 +- .../outro/script_Object6ATheLittleHat.inc | 2 +- .../outro/script_Object6AZeldaMagic.inc | 2 +- .../cutscene/outro/script_PlayerAtEzlo.inc | 2 +- .../cutscene/outro/script_PlayerAtOutro.inc | 8 +- .../outro/script_PlayerGetGreenCap.inc | 16 +- .../outro/script_PlayerSayGoodbye.inc | 4 +- .../cutscene/outro/script_ZeldaGoodbye.inc | 4 +- .../cutscene/outro/script_ZeldaOutro.inc | 12 +- .../cutscene/reveal/script_08013494.inc | 2 +- .../cutscene/reveal/script_FakeKingDaltus.inc | 4 +- .../reveal/script_Object3EPictureBackRoom.inc | 20 +- .../reveal/script_PlayerAtPicture.inc | 2 +- .../reveal/script_PlayerDistanceFromVaati.inc | 2 +- .../reveal/script_PlayerFaintAgain.inc | 6 +- .../reveal/script_PlayerMoveToPicture.inc | 2 +- .../cutscene/reveal/script_VaatiSanctuary.inc | 6 +- .../takeover/script_GuardTakeover.inc | 10 +- .../takeover/script_KingDaltusTakeover.inc | 2 +- .../takeover/script_MinisterPothoTakeover.inc | 2 +- .../takeover/script_Object69Takeover.inc | 16 +- .../script_Object69TakeoverCutscene.inc | 8 +- .../takeover/script_PlayerAtTakeover.inc | 12 +- .../takeover/script_VaatiTakeover.inc | 6 +- data/scripts/dhc/script_GuardCellLeft.inc | 8 +- data/scripts/dhc/script_GuardCellRight.inc | 8 +- data/scripts/dhc/script_GuardStone1.inc | 20 +- data/scripts/dhc/script_GuardStone2.inc | 34 +- data/scripts/dhc/script_KingDaltusStone.inc | 26 +- .../dhc/script_MinishterPothoStone.inc | 20 +- data/scripts/dhc/script_MinisterPothoCell.inc | 8 +- .../dhc/script_Npc4EAfterDefeatingV2.inc | 20 +- .../dhc/script_Npc4ECastleCollapsing.inc | 6 +- data/scripts/dhc/script_Npc4EV3Defeated.inc | 6 +- ...script_Object69BallAndChainSoldierRoom.inc | 10 +- .../dhc/script_Object69CastleEscape.inc | 8 +- .../dhc/script_Object69DarkNutsRoom.inc | 8 +- .../dhc/script_Object69KeatonsRoom.inc | 8 +- .../dhc/script_Object69KillDarkNut.inc | 6 +- .../scripts/dhc/script_Object69V1Defeated.inc | 4 +- .../scripts/dhc/script_Object69V2Defeated.inc | 6 +- data/scripts/dhc/script_Object69V2Intro.inc | 8 +- .../dhc/script_Object69VaatiWithZelda.inc | 18 +- .../script_Object6AV3DefeatedMinishCap.inc | 6 +- .../script_Object6AV3DefeatedMinishCap2.inc | 2 +- .../dhc/script_PlayerAfterDefeatingV2.inc | 4 +- data/scripts/dhc/script_PlayerAtDarkNut1.inc | 8 +- data/scripts/dhc/script_PlayerAtDarkNut2.inc | 8 +- data/scripts/dhc/script_PlayerAtDarkNut3.inc | 8 +- .../dhc/script_PlayerCastleCollapsing.inc | 2 +- .../scripts/dhc/script_PlayerCastleEscape.inc | 2 +- .../scripts/dhc/script_PlayerRescuedZelda.inc | 2 +- data/scripts/dhc/script_PlayerStonesFall.inc | 6 +- data/scripts/dhc/script_Vaati1Intro.inc | 16 +- data/scripts/dhc/script_VaatiWithZelda.inc | 8 +- .../dhc/script_ZeldaAfterDefeatingV2.inc | 26 +- data/scripts/dhc/script_ZeldaCastleEscape.inc | 4 +- data/scripts/dhc/script_ZeldaStoneDHC.inc | 2 +- .../fow/script_MazaalMacroDefeated.inc | 6 +- data/scripts/fow/script_Object89Mazaal.inc | 6 +- data/scripts/fow/script_PlayerAtMazaal.inc | 2 +- .../fow/script_PlayerDefeatedMazaal.inc | 10 +- data/scripts/graveyard/script_DampeInside.inc | 6 +- data/scripts/graveyard/script_DampeOuside.inc | 6 +- .../graveyard/script_GhostBrothers.inc | 8 +- data/scripts/graveyard/script_Gina.inc | 14 +- .../graveyard/script_GraveyardHouseDoor.inc | 6 +- .../graveyard/script_GreatFairyArrows.inc | 12 +- data/scripts/graveyard/script_KingGustav.inc | 18 +- .../script_Object69CrowStealingKey.inc | 10 +- .../graveyard/script_Object69GetKeyBack.inc | 8 +- .../graveyard/script_Object97FirstCrow.inc | 4 +- .../graveyard/script_Object97SecondCrow.inc | 4 +- .../script_PlayerAtGraveyardHouseDoor.inc | 4 +- .../graveyard/script_PlayerAtKingGustav.inc | 2 +- .../graveyard/script_PlayerGetKeyStolen.inc | 6 +- .../hyruleCastle/script_CastleMaid.inc | 2 +- .../hyruleCastle/script_GuardAtEntry.inc | 10 +- .../hyruleCastle/script_KingDaltus.inc | 2 +- .../hyruleCastle/script_MinisterPotho.inc | 8 +- .../script_Object69SanctuaryEntrance.inc | 8 +- .../hyruleCastle/script_SmithAtCastle.inc | 8 +- .../hyruleCastle/script_StoneZelda.inc | 6 +- .../hyruleCastleGarden/script_GardGarden5.inc | 2 +- .../hyruleCastleGarden/script_GuardEntry1.inc | 8 +- .../hyruleCastleGarden/script_GuardEntry2.inc | 8 +- .../hyruleCastleGarden/script_GuardEntry3.inc | 16 +- .../script_GuardGarden1.inc | 2 +- .../script_GuardGarden2.inc | 2 +- .../script_GuardGarden3.inc | 8 +- .../script_GuardGarden4.inc | 2 +- .../script_GuardGarden6.inc | 2 +- .../script_GuardGarden7.inc | 6 +- .../script_GuardGarden8.inc | 4 +- data/scripts/hyruleTown/script_Anju.inc | 20 +- data/scripts/hyruleTown/script_AnjuInside.inc | 8 +- data/scripts/hyruleTown/script_Beedle.inc | 22 +- data/scripts/hyruleTown/script_Brocco.inc | 12 +- data/scripts/hyruleTown/script_CafeGuy.inc | 28 +- data/scripts/hyruleTown/script_Carlov.inc | 16 +- data/scripts/hyruleTown/script_Carlov2.inc | 48 +-- .../scripts/hyruleTown/script_CarlovChest.inc | 4 +- data/scripts/hyruleTown/script_CarlovGame.inc | 42 +-- data/scripts/hyruleTown/script_CarlovWon.inc | 4 +- data/scripts/hyruleTown/script_Carpenter.inc | 10 +- data/scripts/hyruleTown/script_CatPerson.inc | 8 +- .../script_CatPersonTalkingToDogPerson.inc | 10 +- data/scripts/hyruleTown/script_Din.inc | 26 +- data/scripts/hyruleTown/script_Din2.inc | 18 +- data/scripts/hyruleTown/script_DinAlone.inc | 10 +- data/scripts/hyruleTown/script_DinMovedIn.inc | 10 +- .../hyruleTown/script_DogPersonInCatHouse.inc | 12 +- data/scripts/hyruleTown/script_DrLeft.inc | 14 +- data/scripts/hyruleTown/script_DrLeftDoor.inc | 6 +- data/scripts/hyruleTown/script_Emma.inc | 6 +- .../hyruleTown/script_EmmaNotEnoughRupees.inc | 4 +- data/scripts/hyruleTown/script_Farore.inc | 26 +- data/scripts/hyruleTown/script_Farore2.inc | 18 +- .../scripts/hyruleTown/script_FaroreAlone.inc | 10 +- .../hyruleTown/script_FaroreMovedIn.inc | 10 +- .../hyruleTown/script_FirstHouseDoor.inc | 8 +- .../hyruleTown/script_ForestMinish11.inc | 4 +- data/scripts/hyruleTown/script_Ghost.inc | 8 +- data/scripts/hyruleTown/script_GormanCats.inc | 10 +- .../hyruleTown/script_GormanFirstHouse.inc | 8 +- .../hyruleTown/script_GormanSecondHouse.inc | 10 +- .../hyruleTown/script_GoronMerchant.inc | 18 +- data/scripts/hyruleTown/script_GuardEast.inc | 8 +- .../hyruleTown/script_GuardLibrary.inc | 8 +- data/scripts/hyruleTown/script_GuardNorth.inc | 8 +- .../hyruleTown/script_GuardPatrolling.inc | 2 +- data/scripts/hyruleTown/script_GuardWest.inc | 30 +- .../hyruleTown/script_HurdyGurdyMan.inc | 12 +- data/scripts/hyruleTown/script_InnDoor.inc | 8 +- data/scripts/hyruleTown/script_Kid1.inc | 12 +- data/scripts/hyruleTown/script_Kid2.inc | 6 +- data/scripts/hyruleTown/script_Kid3.inc | 2 +- data/scripts/hyruleTown/script_Kid5.inc | 6 +- data/scripts/hyruleTown/script_Kid6.inc | 2 +- data/scripts/hyruleTown/script_Kid7.inc | 6 +- data/scripts/hyruleTown/script_KidInn.inc | 2 +- data/scripts/hyruleTown/script_Librari.inc | 20 +- .../hyruleTown/script_LibrariLater.inc | 16 +- .../hyruleTown/script_LibrarianLeft.inc | 16 +- .../script_LibrarianLeftWithQuest.inc | 26 +- .../hyruleTown/script_LibrarianRight.inc | 16 +- .../hyruleTown/script_LibraryVisitor.inc | 6 +- data/scripts/hyruleTown/script_MaidTown.inc | 2 +- .../hyruleTown/script_MalonHyruleTown.inc | 14 +- data/scripts/hyruleTown/script_Mama.inc | 14 +- data/scripts/hyruleTown/script_Marcy.inc | 10 +- data/scripts/hyruleTown/script_Mayor.inc | 20 +- .../scripts/hyruleTown/script_MutohInMill.inc | 10 +- data/scripts/hyruleTown/script_Nayru.inc | 26 +- data/scripts/hyruleTown/script_Nayru2.inc | 18 +- data/scripts/hyruleTown/script_NayruAlone.inc | 10 +- .../hyruleTown/script_NayruMovedIn.inc | 10 +- .../script_Object69SimonsSimulation.inc | 10 +- .../hyruleTown/script_Object6ACarlov.inc | 8 +- .../hyruleTown/script_Object6ACarlov2.inc | 16 +- ...cript_Object6APreventPlayerLeaveCarlov.inc | 6 +- .../hyruleTown/script_OldLadyCatHouse1.inc | 2 +- .../hyruleTown/script_OldLadyCatHouse2.inc | 8 +- data/scripts/hyruleTown/script_Phonograph.inc | 4 +- .../hyruleTown/script_PhonographDoor.inc | 8 +- data/scripts/hyruleTown/script_Pina.inc | 12 +- data/scripts/hyruleTown/script_Pita.inc | 10 +- .../script_PlayerActivatedTrapCard.inc | 6 +- .../hyruleTown/script_PlayerAtDrLeftDoor.inc | 4 +- .../hyruleTown/script_PlayerAtInnDoor.inc | 4 +- .../scripts/hyruleTown/script_PlayerAtRem.inc | 2 +- .../hyruleTown/script_PlayerCannotEnter.inc | 4 +- .../hyruleTown/script_PlayerSleepingInn.inc | 8 +- .../hyruleTown/script_PlayerStepOnTrap.inc | 2 +- .../script_PlayerWakingUpAtSimons.inc | 2 +- data/scripts/hyruleTown/script_Postman.inc | 6 +- data/scripts/hyruleTown/script_Rem.inc | 12 +- .../hyruleTown/script_RemFallingAsleep.inc | 36 +- .../hyruleTown/script_RemTownMinish.inc | 12 +- data/scripts/hyruleTown/script_Simon.inc | 18 +- data/scripts/hyruleTown/script_SimonsDoor.inc | 8 +- .../hyruleTown/script_SittingPerson.inc | 8 +- .../hyruleTown/script_SmallTownMinish.inc | 12 +- data/scripts/hyruleTown/script_Stamp.inc | 8 +- data/scripts/hyruleTown/script_Stockwell.inc | 36 +- .../hyruleTown/script_StockwellBuy.inc | 10 +- .../hyruleTown/script_StockwellDogFood.inc | 14 +- data/scripts/hyruleTown/script_Sturgeon.inc | 12 +- .../script_SturgeonAllBooksCollected.inc | 20 +- data/scripts/hyruleTown/script_Teachers.inc | 10 +- .../scripts/hyruleTown/script_TownMinish1.inc | 6 +- .../scripts/hyruleTown/script_TownMinish2.inc | 6 +- .../scripts/hyruleTown/script_TownMinish3.inc | 6 +- .../scripts/hyruleTown/script_TownMinish4.inc | 10 +- .../scripts/hyruleTown/script_TownMinish5.inc | 10 +- .../scripts/hyruleTown/script_TownMinish6.inc | 16 +- .../hyruleTown/script_Townsperson1.inc | 6 +- .../script_TownspersonInDogHouse.inc | 8 +- data/scripts/hyruleTown/script_Wheaton.inc | 12 +- .../script_WindTribespeopleVisitor.inc | 12 +- .../script_BombMinishKinstone.inc | 4 +- .../kinstoneFusion/script_CarlovKinstone.inc | 2 +- .../script_GhostBrotherKinstone.inc | 6 +- .../script_GormanFirstAppearance.inc | 6 +- .../kinstoneFusion/script_Goron1Kinstone2.inc | 18 +- .../kinstoneFusion/script_Goron1Kinstone3.inc | 12 +- .../kinstoneFusion/script_Goron1Kinstone4.inc | 12 +- .../kinstoneFusion/script_Goron1Kinstone5.inc | 12 +- .../kinstoneFusion/script_Goron1Kinstone6.inc | 12 +- .../kinstoneFusion/script_Goron2Kinstone2.inc | 14 +- .../kinstoneFusion/script_Goron2Kinstone3.inc | 18 +- .../kinstoneFusion/script_Goron2Kinstone4.inc | 22 +- .../kinstoneFusion/script_Goron2Kinstone5.inc | 18 +- .../kinstoneFusion/script_Goron2Kinstone6.inc | 22 +- .../kinstoneFusion/script_Goron3Kinstone3.inc | 8 +- .../kinstoneFusion/script_Goron4Kinstone4.inc | 12 +- .../kinstoneFusion/script_Goron5Kinstone5.inc | 8 +- .../script_Goron6Kindstone6.inc | 12 +- .../kinstoneFusion/script_GoronKinstone.inc | 14 +- .../script_GoronMerchantArriving.inc | 4 +- .../kinstoneFusion/script_MutohKinstone.inc | 4 +- .../script_ObjectB3KinstoneSpark.inc | 4 +- ...script_ObjectB3KinstoneSparkFromBottom.inc | 4 +- .../script_ObjectB3KinstoneSparkGoron.inc | 4 +- ...ipt_ObjectB3KinstoneSparkGoronMerchang.inc | 4 +- .../kinstoneFusion/script_StampKinstone.inc | 4 +- .../lakeHylia/script_EzloTalkOcarina.inc | 8 +- .../lakeHylia/script_ForestMinish3.inc | 4 +- .../lakeHylia/script_KingGustafHologram.inc | 20 +- .../lakeHylia/script_Object69AfterToD.inc | 6 +- .../scripts/lakeHylia/script_ShopwellsDog.inc | 2 +- .../scripts/lonLonRanch/scriptMalonInside.inc | 14 +- .../lonLonRanch/script_GoronPunching.inc | 16 +- .../lonLonRanch/script_MalonLostKey.inc | 14 +- .../lonLonRanch/script_PlayerGiveKey.inc | 2 +- .../lonLonRanch/script_TalonGotKey.inc | 10 +- .../lonLonRanch/script_TalonInside.inc | 8 +- .../lonLonRanch/script_TalonInside2.inc | 8 +- .../lonLonRanch/script_TalonLostKey.inc | 6 +- data/scripts/minishWoods/script_08012C98.inc | 8 +- data/scripts/minishWoods/script_08012D18.inc | 8 +- .../scripts/minishWoods/script_BombMinish.inc | 32 +- .../minishWoods/script_EzloTalkDWS.inc | 6 +- .../script_EzloTalkMinishPortal.inc | 8 +- data/scripts/minishWoods/script_Festari.inc | 22 +- .../minishWoods/script_ForestMinish10.inc | 16 +- .../minishWoods/script_ForestMinish4.inc | 4 +- data/scripts/minishWoods/script_Gentari.inc | 46 +-- .../minishWoods/script_Object69PotionBlue.inc | 4 +- .../minishWoods/script_Object69PotionRed.inc | 6 +- .../minishWoods/script_PlayerAtBombMinish.inc | 4 +- .../minishWoods/script_PlayerAtFestari.inc | 2 +- .../minishWoods/script_PlayerAtGentari.inc | 4 +- .../script_PlayerAtMadderpillar.inc | 8 +- data/scripts/minishWoods/script_Syrup.inc | 14 +- data/scripts/mtCrenel/script_CrenelHermit.inc | 8 +- data/scripts/mtCrenel/script_EzloTalkCoF.inc | 6 +- .../mtCrenel/script_GreatFairyBombs.inc | 8 +- data/scripts/mtCrenel/script_Melari.inc | 26 +- data/scripts/mtCrenel/script_MelariInRoom.inc | 10 +- .../mtCrenel/script_MountainMinish1.inc | 4 +- .../mtCrenel/script_MountainMinish2.inc | 6 +- .../mtCrenel/script_MountainMinish3.inc | 12 +- .../mtCrenel/script_MountainMinish4.inc | 12 +- .../mtCrenel/script_MountainMinish5.inc | 26 +- .../mtCrenel/script_Object6ABrokenSword.inc | 2 +- .../mtCrenel/script_PlayerAtMelari.inc | 2 +- .../script_PlayerAtMountainMinishExit.inc | 4 +- .../mtCrenel/script_PlayerGetWhiteSword.inc | 6 +- .../script_PlayerPlaceBrokenSword.inc | 2 +- .../script_CarpenterOutsideTown.inc | 10 +- .../script_GuardNorthHyruleField.inc | 8 +- .../script_MutohOutsideTown.inc | 10 +- .../script_Object69FixBridge.inc | 6 +- data/scripts/npc/script_BladeBrothers.inc | 30 +- data/scripts/npc/script_Farmer.inc | 16 +- data/scripts/npc/script_ForestMinish12.inc | 2 +- data/scripts/npc/script_ForestMinish13.inc | 6 +- data/scripts/npc/script_ForestMinish14.inc | 8 +- data/scripts/npc/script_ForestMinish15.inc | 8 +- data/scripts/npc/script_ForestMinish18.inc | 24 +- data/scripts/npc/script_ForestMinish19.inc | 24 +- data/scripts/npc/script_ForestMinish20.inc | 24 +- data/scripts/npc/script_ForestMinish21.inc | 6 +- data/scripts/npc/script_MysteriousWall.inc | 4 +- .../npc/script_PlayerAtBladeBrothers.inc | 2 +- .../scripts/npc/script_PlayerAtGreatFairy.inc | 4 +- data/scripts/npc/script_TingleSiblings.inc | 28 +- data/scripts/npc/script_Windcrest.inc | 10 +- data/scripts/sanctuary/script_08013F94.inc | 8 +- .../script_NPC4EPreventPlayerLeave.inc | 8 +- .../script_Npc4EFinalSwordRumble.inc | 6 +- .../script_Npc4ELookAtPictureAgain.inc | 4 +- .../sanctuary/script_Npc4EPedestal.inc | 8 +- .../script_Npc4EPreventPlayerLeaving.inc | 8 +- .../sanctuary/script_Npc4ESanctuaryIntro.inc | 14 +- .../sanctuary/script_Npc4ESecondSanctuary.inc | 10 +- .../sanctuary/script_Npc4ESpawnTextBoard.inc | 6 +- .../sanctuary/script_Npc4EThirdSanctuary.inc | 10 +- .../sanctuary/script_Object6AEarthElement.inc | 4 +- .../script_Object6AEarthElementFloating.inc | 4 +- .../sanctuary/script_Object6AFireElement.inc | 4 +- .../script_Object6AFireElementFloating.inc | 4 +- .../sanctuary/script_Object6ASword2.inc | 6 +- .../sanctuary/script_Object6ASword3.inc | 6 +- .../sanctuary/script_Object6ASwordChange1.inc | 2 +- .../script_Object6ASwordCharge10.inc | 6 +- .../sanctuary/script_Object6ASwordCharge2.inc | 2 +- .../sanctuary/script_Object6ASwordCharge3.inc | 2 +- .../sanctuary/script_Object6ASwordCharge4.inc | 2 +- .../sanctuary/script_Object6ASwordCharge5.inc | 12 +- .../sanctuary/script_Object6ASwordCharge6.inc | 12 +- .../sanctuary/script_Object6ASwordCharge8.inc | 12 +- .../sanctuary/script_Object6ASwordCharge9.inc | 6 +- .../script_Object6ASwordInPedestal.inc | 6 +- .../sanctuary/script_Object6ATextBoard.inc | 14 +- .../sanctuary/script_Object6AWaterElement.inc | 4 +- .../script_Object6AWaterElementFloating.inc | 4 +- .../sanctuary/script_Object6AWindElement.inc | 4 +- .../script_Object6AWindElementFloating.inc | 4 +- .../sanctuary/script_Objet6ASwordCharge7.inc | 12 +- .../sanctuary/script_PlayerAtPedestal.inc | 4 +- .../script_PlayerAtSanctuaryEntrance.inc | 2 +- .../sanctuary/script_PlayerGetElement.inc | 4 +- .../script_PlayerPickUpFinalSword.inc | 4 +- .../sanctuary/script_PlayerPickUpSword.inc | 4 +- .../sanctuary/script_PlayerSanctuary.inc | 4 +- .../sanctuary/script_PlayerSanctuaryIntro.inc | 2 +- .../script_PlayerTextBoardAppears.inc | 2 +- .../southHyruleField/script_ForestMinish2.inc | 4 +- .../script_Object69LinksHouseBed.inc | 14 +- .../script_PlayerWakeAfterRest.inc | 2 +- .../script_SmithAtLinksHouse.inc | 14 +- data/scripts/unused/script_0800B828.inc | 22 +- data/scripts/unused/script_0800D84C.inc | 4 +- data/scripts/unused/script_0800FB2C.inc | 2 +- data/scripts/unused/script_08012B24.inc | 4 +- data/scripts/unused/script_08012B50.inc | 4 +- data/scripts/unused/script_08012B7C.inc | 4 +- data/scripts/unused/script_08012C68.inc | 4 +- data/scripts/unused/script_080155F4.inc | 2 +- data/scripts/unused/script_08015A7C.inc | 4 +- data/scripts/unused/script_08015AA0.inc | 4 +- data/scripts/unused/script_08015F80.inc | 2 +- data/scripts/unused/script_08016384.inc | 14 +- data/scripts/unused/script_08016482.inc | 40 +-- data/scripts/unused/script_080165A4.inc | 2 +- data/scripts/veilFalls/script_BigGoron3.inc | 4 +- .../veilFalls/script_BigGoronMirrorShield.inc | 2 +- .../scripts/veilFalls/script_BigGoronTalk.inc | 2 +- .../veilFalls/script_NPC4ESourceOfTheFlow.inc | 4 +- .../script_NPC4ESouurceOfTheFlowOpening.inc | 4 +- .../script_Object3ELeftStoneOpening.inc | 2 +- .../script_Object3ERightStoneOpening.inc | 2 +- .../veilFalls/script_Object6AMirrorShield.inc | 2 +- .../veilFalls/script_Object6AVeilFallsTop.inc | 2 +- .../westernWood/script_ForestMinish1.inc | 4 +- .../scripts/westernWood/script_MoblinLady.inc | 8 +- .../script_MoblinLadyDisguised.inc | 20 +- .../westernWood/script_PercyInside.inc | 8 +- .../westernWood/script_PercyOutside.inc | 8 +- data/scripts/windRuins/script_EzloTalkFoW.inc | 6 +- .../windRuins/script_Npc4EReceiveOcarina.inc | 6 +- .../script_Npc4EWindRuinsTextBoard.inc | 4 +- .../windRuins/script_PlayerAtTextboard.inc | 2 +- src/player.c | 2 +- src/script.c | 316 +++++++++--------- 525 files changed, 2621 insertions(+), 2625 deletions(-) diff --git a/asm/macros/scripts.inc b/asm/macros/scripts.inc index 1c6bc83d..145b24d1 100644 --- a/asm/macros/scripts.inc +++ b/asm/macros/scripts.inc @@ -171,7 +171,7 @@ .2byte 0x0418 .endm -.macro _0807E30C +.macro FacePlayerAndCheckDist .2byte 0x0419 .endm @@ -180,7 +180,7 @@ .2byte \amount .endm -.macro _0807E3BC s:req +.macro HasShells s:req .2byte 0x081b .2byte \s .endm @@ -209,17 +209,17 @@ .2byte \s .endm -.macro _0807E4CC w:req +.macro VariableBitSet w:req .2byte 0x0c20 .4byte \w .endm -.macro _0807E4EC w:req +.macro VariableOnlyBitSet w:req .2byte 0x0c21 .4byte \w .endm -.macro _0807E514 w:req +.macro VariableEqual w:req .2byte 0x0c22 .4byte \w .endm @@ -229,7 +229,7 @@ .4byte \w .endm -.macro _0807E564 +.macro CheckPlayerMinish .2byte 0x0424 .endm @@ -312,7 +312,7 @@ .2byte 0x0434 .endm -.macro WaitForPlayerAction0x17 +.macro WaitForPlayerEnterRoom .2byte 0x0435 .endm @@ -324,7 +324,7 @@ .2byte 0x0437 .endm -.macro _0807E778 s:req +.macro SetFadeTime s:req .2byte 0x0838 .2byte \s .endm @@ -334,7 +334,7 @@ .4byte \w .endm -.macro _0807E79C +.macro FadeInvert .2byte 0x043a .endm @@ -378,15 +378,15 @@ .2byte 0x0442 .endm -.macro _0807E864 +.macro SetPlayerIdle .2byte 0x0443 .endm -.macro _0807E878 +.macro EnablePlayerControl .2byte 0x0444 .endm -.macro _0807E888 +.macro DisablePlayerControl .2byte 0x0445 .endm @@ -400,7 +400,7 @@ .4byte \script .endm -.macro _0807E8D4 s:req +.macro SetPlayerAnimation s:req .2byte 0x0848 .2byte \s .endm @@ -421,7 +421,7 @@ .2byte 0x044c .endm -.macro _0807E908 s:req +.macro SetAction s:req .2byte 0x084d .2byte \s .endm @@ -431,16 +431,16 @@ .4byte \value .endm -.macro _0807E924 +.macro SetVariableToFrame .2byte 0x044f .endm -.macro _0807E930 s:req +.macro SetAnimation s:req .2byte 0x0850 .2byte \s .endm -.macro _0807E944 +.macro TriggerInteract .2byte 0x0451 .endm @@ -509,7 +509,7 @@ .2byte 0x045e .endm -.macro _0807EB28 s:req +.macro EzloMessage s:req .2byte 0x085f .2byte \s .endm @@ -518,7 +518,7 @@ .2byte 0x0460 .endm -.macro _0807EB44 s:req +.macro SetAnimationState s:req .2byte 0x0861 .2byte \s .endm @@ -529,11 +529,11 @@ .2byte \b .endm -.macro _0807EB74 +.macro FacePlayer .2byte 0x0463 .endm -.macro _0807EB8C +.macro FaceAwayFromPlayer .2byte 0x0464 .endm @@ -552,7 +552,7 @@ .2byte \speed .endm -.macro SetEntity0x20 value:req +.macro SetEntityVelocity value:req .2byte 0x0c68 .4byte \value .endm @@ -577,27 +577,27 @@ .2byte 0x046c .endm -.macro _0807EC1C s:req +.macro WalkForward s:req .2byte 0x086d .2byte \s .endm -.macro _0807EC64 s:req +.macro WalkNorth s:req .2byte 0x086e .2byte \s .endm -.macro _0807EC94 s:req +.macro WalkEast s:req .2byte 0x086f .2byte \s .endm -.macro _0807ECC4 s:req +.macro WalkSouth s:req .2byte 0x0870 .2byte \s .endm -.macro _0807ECF4 s:req +.macro WalkWest s:req .2byte 0x0871 .2byte \s .endm @@ -695,7 +695,7 @@ .2byte \s .endm -.macro _0807F050 s:req +.macro GiveKinstone s:req .2byte 0x0883 .2byte \s .endm diff --git a/data/scripts/castorWilds/script_CastorWildsStatueLeft.inc b/data/scripts/castorWilds/script_CastorWildsStatueLeft.inc index b8055c03..ffb45054 100644 --- a/data/scripts/castorWilds/script_CastorWildsStatueLeft.inc +++ b/data/scripts/castorWilds/script_CastorWildsStatueLeft.inc @@ -4,15 +4,15 @@ SCRIPT_START script_CastorWildsStatueLeft CheckKinstoneFused 0x0006 JumpIf script_0800B302 _0807EA88 0x0006 - _0807EB44 0x0002 + SetAnimationState 0x0002 EndBlock script_0800B268: _0807EA4C _0807E9F0 - _0807E864 + SetPlayerIdle CheckKinstoneFused 0x0006 JumpIf script_0800B2E2 Call sub_0807DF50 - _0807E878 + EnablePlayerControl Jump script_0800B268 .2byte 0x0000 diff --git a/data/scripts/castorWilds/script_CastorWildsStatueMiddle.inc b/data/scripts/castorWilds/script_CastorWildsStatueMiddle.inc index 19b2defb..ef5548f6 100644 --- a/data/scripts/castorWilds/script_CastorWildsStatueMiddle.inc +++ b/data/scripts/castorWilds/script_CastorWildsStatueMiddle.inc @@ -4,15 +4,15 @@ SCRIPT_START script_CastorWildsStatueMiddle CheckKinstoneFused 0x0007 JumpIf script_0800B302 _0807EA88 0x0007 - _0807EB44 0x0002 + SetAnimationState 0x0002 EndBlock script_0800B298: _0807EA4C _0807E9F0 - _0807E864 + SetPlayerIdle CheckKinstoneFused 0x0007 JumpIf script_0800B2E2 Call sub_0807DF50 - _0807E878 + EnablePlayerControl Jump script_0800B298 .2byte 0x0000 diff --git a/data/scripts/castorWilds/script_CastorWildsStatueRight.inc b/data/scripts/castorWilds/script_CastorWildsStatueRight.inc index e5553e6f..3c9c3c4f 100644 --- a/data/scripts/castorWilds/script_CastorWildsStatueRight.inc +++ b/data/scripts/castorWilds/script_CastorWildsStatueRight.inc @@ -4,20 +4,20 @@ SCRIPT_START script_CastorWildsStatueRight CheckKinstoneFused 0x0008 JumpIf script_0800B302 _0807EA88 0x0008 - _0807EB44 0x0002 + SetAnimationState 0x0002 EndBlock script_0800B2C8: _0807EA4C _0807E9F0 - _0807E864 + SetPlayerIdle CheckKinstoneFused 0x0008 JumpIf script_0800B2E2 Call sub_0807DF50 - _0807E878 + EnablePlayerControl Jump script_0800B2C8 script_0800B2E2: DoPostScriptAction 0x0013 - _0807EB44 0x0004 + SetAnimationState 0x0004 _0807E9DC Call sub_080676E0 Call sub_08067534 diff --git a/data/scripts/castorWilds/script_GreatFairyRupees.inc b/data/scripts/castorWilds/script_GreatFairyRupees.inc index 2385d474..9ab8427f 100644 --- a/data/scripts/castorWilds/script_GreatFairyRupees.inc +++ b/data/scripts/castorWilds/script_GreatFairyRupees.inc @@ -9,8 +9,8 @@ script_0800B6D4: CheckPlayerInRegion 0x0078, 0x00b8, 0x1060 JumpIfNot script_0800B6D4 Call sub_08079184 - _0807E864 - Call sub_0807F9A4 + SetPlayerIdle + Call WaitForPlayerNormal StartPlayerScript script_PlayerAtGreatFairy WaitForSyncFlagAndClear 0x00000004 SetRoomFlag 0x0000 @@ -19,7 +19,7 @@ script_0800B6D4: JumpIf script_0800B7A2 MessageNoOverlap 0x057b WaitUntilTextboxCloses - CallWithArg sub_0807F970, 0x0000057d + CallWithArg CheckMessageEqual, 0x0000057d JumpIf script_0800B6A6 WaitUntilTextboxCloses SetLocalFlag 0x009f diff --git a/data/scripts/castorWilds/script_MalonAtRanch.inc b/data/scripts/castorWilds/script_MalonAtRanch.inc index 640be984..91a5b4b2 100644 --- a/data/scripts/castorWilds/script_MalonAtRanch.inc +++ b/data/scripts/castorWilds/script_MalonAtRanch.inc @@ -8,10 +8,10 @@ SCRIPT_START script_MalonAtRanch script_0800B5FA: CheckEntityInteractType JumpIfNot script_0800B5FA - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer MessageNoOverlap 0x2009 WaitUntilTextboxCloses - _0807E878 - _0807EB44 0x0004 + EnablePlayerControl + SetAnimationState 0x0004 Jump script_0800B5FA diff --git a/data/scripts/castorWilds/script_Object69.inc b/data/scripts/castorWilds/script_Object69.inc index 0bb907d2..399f5c77 100644 --- a/data/scripts/castorWilds/script_Object69.inc +++ b/data/scripts/castorWilds/script_Object69.inc @@ -30,7 +30,7 @@ script_0800B216: Wait 0x000c CameraTargetPlayer Wait 0x0008 - _0807E878 + EnablePlayerControl .ifdef JP CheckLocalFlag 0x001e .else diff --git a/data/scripts/castorWilds/script_Object69DarknutFight.inc b/data/scripts/castorWilds/script_Object69DarknutFight.inc index c62e659d..cfa00564 100644 --- a/data/scripts/castorWilds/script_Object69DarknutFight.inc +++ b/data/scripts/castorWilds/script_Object69DarknutFight.inc @@ -3,9 +3,9 @@ SCRIPT_START script_Object69DarknutFight BeginBlock Call sub_0807DF28 SetLocalFlag 0x0039 - _0807E864 + SetPlayerIdle EndBlock - WaitForPlayerAction0x17 + WaitForPlayerEnterRoom StartPlayerScript script_PlayerAtDarknutFight Wait 0x0018 SetSyncFlag 0x00000002 @@ -13,8 +13,8 @@ SCRIPT_START script_Object69DarknutFight SetRoomFlag 0x0000 Wait 0x0010 PlayBgm BGM_FIGHT_THEME - _0807EB28 0x2701 - _0807E878 + EzloMessage 0x2701 + EnablePlayerControl Call sub_0807DF50 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/cloudTops/script_EzloTalkPoW.inc b/data/scripts/cloudTops/script_EzloTalkPoW.inc index bba202e7..a8980ffa 100644 --- a/data/scripts/cloudTops/script_EzloTalkPoW.inc +++ b/data/scripts/cloudTops/script_EzloTalkPoW.inc @@ -1,12 +1,12 @@ @ Ezlo talk after getting wind element SCRIPT_START script_EzloTalkPoW - _0807E864 + SetPlayerIdle Call sub_0807DF28 - _0807EB28 0x1c05 + EzloMessage 0x1c05 WaitUntilTextboxCloses SetLocalFlagByBank 0x0100, 0x0005 Call sub_0807DF50 - _0807E878 + EnablePlayerControl DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/cloudTops/script_GregalHealthy.inc b/data/scripts/cloudTops/script_GregalHealthy.inc index 646b5d39..8f96aa4f 100644 --- a/data/scripts/cloudTops/script_GregalHealthy.inc +++ b/data/scripts/cloudTops/script_GregalHealthy.inc @@ -3,14 +3,14 @@ SCRIPT_START script_GregalHealthy BeginBlock Call sub_0806CD58 DoPostScriptAction 0x000a - _0807EB44 0x0004 - _0807E930 0x0006 + SetAnimationState 0x0004 + SetAnimation 0x0006 EndBlock script_08014C42: CheckEntityInteractType JumpIfNot script_08014C42 - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer script_08014C4C: Call sub_0806CCD0 JumpIfNot script_08014C4C @@ -30,7 +30,7 @@ script_08014C7C: WaitUntilTextboxCloses script_08014C82: Wait 0x000f - _0807E878 - _0807EB44 0x0004 - _0807E930 0x0006 + EnablePlayerControl + SetAnimationState 0x0004 + SetAnimation 0x0006 Jump script_08014C42 diff --git a/data/scripts/cloudTops/script_GregalSick.inc b/data/scripts/cloudTops/script_GregalSick.inc index dac29473..038c7f29 100644 --- a/data/scripts/cloudTops/script_GregalSick.inc +++ b/data/scripts/cloudTops/script_GregalSick.inc @@ -2,7 +2,7 @@ SCRIPT_START script_GregalSick BeginBlock DoPostScriptAction 0x000a - _0807E930 0x0000 + SetAnimation 0x0000 EndBlock CheckLocalFlag 0x0063 JumpIf script_08014BE8 @@ -14,21 +14,21 @@ script_08014B48: CheckEntityInteractType JumpIfNot script_08014B48 EndBlock - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer MessageNoOverlap 0x2f01 WaitUntilTextboxCloses Wait 0x000f - _0807E878 + EnablePlayerControl Jump script_08014B48 script_08014B70: EndBlock - _0807E864 + SetPlayerIdle Call sub_0807DF28 SetSyncFlag 0x00000001 DoPostScriptAction 0x0004 WaitForSyncFlagAndClear 0x00000002 - _0807E930 0x0010 + SetAnimation 0x0010 Call sub_0806CCF8 Wait 0x0014 Call sub_0806CD04 @@ -46,14 +46,14 @@ script_08014B70: SetSyncFlag 0x00000001 WaitForSyncFlagAndClear 0x00000002 Call sub_0807DF50 - _0807E878 + EnablePlayerControl script_08014BE8: - _0807E930 0x0010 + SetAnimation 0x0010 Call sub_0806CD4C script_08014BF2: CheckEntityInteractType JumpIfNot script_08014BF2 - _0807E864 + SetPlayerIdle CheckLocalFlag 0x0065 JumpIf script_08014C1C SetLocalFlag 0x0065 @@ -68,5 +68,5 @@ script_08014C1C: WaitUntilTextboxCloses script_08014C22: Wait 0x000f - _0807E878 + EnablePlayerControl Jump script_08014BF2 diff --git a/data/scripts/cloudTops/script_Npc4EFirstCloud.inc b/data/scripts/cloudTops/script_Npc4EFirstCloud.inc index 14cce552..bec3df8e 100644 --- a/data/scripts/cloudTops/script_Npc4EFirstCloud.inc +++ b/data/scripts/cloudTops/script_Npc4EFirstCloud.inc @@ -2,7 +2,7 @@ @ Reponsible for Kinstone cutscenes SCRIPT_START script_Npc4EFirstCloud BeginBlock - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x000b DoPostScriptAction 0x0008 Call sub_0806DAAC @@ -16,10 +16,10 @@ script_0800D636: Call sub_0806DAAC JumpIf script_0800D650 Call sub_0807DF50 - _0807E878 + EnablePlayerControl Jump script_0800D636 script_0800D650: - _0807E864 + SetPlayerIdle Call sub_0807DF28 Call sub_0807FBC4 Call sub_0807FBA0 diff --git a/data/scripts/cloudTops/script_Npc4EKinstoneFused.inc b/data/scripts/cloudTops/script_Npc4EKinstoneFused.inc index 91d9eae4..8f86a3a7 100644 --- a/data/scripts/cloudTops/script_Npc4EKinstoneFused.inc +++ b/data/scripts/cloudTops/script_Npc4EKinstoneFused.inc @@ -4,7 +4,7 @@ SCRIPT_START script_Npc4EKinstoneFused _0807F0B4 0x0004 CameraTargetPlayer Call sub_0807FBCC - _0807E878 + EnablePlayerControl Call sub_0807DF50 script_0800D6AE: DoPostScriptAction 0x0006 diff --git a/data/scripts/cloudTops/script_Object69GreatWhirlwindRevealed.inc b/data/scripts/cloudTops/script_Object69GreatWhirlwindRevealed.inc index c2d465d4..8053cca1 100644 --- a/data/scripts/cloudTops/script_Object69GreatWhirlwindRevealed.inc +++ b/data/scripts/cloudTops/script_Object69GreatWhirlwindRevealed.inc @@ -1,7 +1,7 @@ @ Cloud Tops OBJECT_69 great whirlwind revealed SCRIPT_START script_Object69GreatWhirlwindRevealed BeginBlock - Call sub_0807F360 + Call SetPriorityHighest SetEntitySpeed 0x0700 _0807F0B4 0x0007 CameraTargetEntity @@ -17,7 +17,7 @@ SCRIPT_START script_Object69GreatWhirlwindRevealed _0807F0B4 0x0004 CameraTargetPlayer Call sub_0807FBCC - _0807E878 + EnablePlayerControl Call sub_0807DF50 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/cloudTops/script_Object6AMysteriousCloud.inc b/data/scripts/cloudTops/script_Object6AMysteriousCloud.inc index f2c812eb..686d63dd 100644 --- a/data/scripts/cloudTops/script_Object6AMysteriousCloud.inc +++ b/data/scripts/cloudTops/script_Object6AMysteriousCloud.inc @@ -3,7 +3,7 @@ SCRIPT_START script_Object6AMysteriousCloud BeginBlock DoPostScriptAction 0x0007 DoPostScriptAction 0x0011 - Call sub_0807F158 + Call SetCollisionLayer1 Call sub_0807F738 EndBlock SCRIPT_END diff --git a/data/scripts/cloudTops/script_PlayerAtSiroc.inc b/data/scripts/cloudTops/script_PlayerAtSiroc.inc index 5dd59161..ceeed89f 100644 --- a/data/scripts/cloudTops/script_PlayerAtSiroc.inc +++ b/data/scripts/cloudTops/script_PlayerAtSiroc.inc @@ -4,7 +4,7 @@ SCRIPT_START script_PlayerAtSiroc SetEntitySpeed 0x0100 EndBlock _0807EDD4 0x0078, 0x0040 - _0807EB44 0x0000 + SetAnimationState 0x0000 DoPostScriptAction 0x0000 SetSyncFlag 0x00000001 Call sub_080791BC diff --git a/data/scripts/cloudTops/script_Siroc.inc b/data/scripts/cloudTops/script_Siroc.inc index 679d1966..94c1d72c 100644 --- a/data/scripts/cloudTops/script_Siroc.inc +++ b/data/scripts/cloudTops/script_Siroc.inc @@ -5,13 +5,13 @@ SCRIPT_START script_Siroc DoPostScriptAction 0x000a EndBlock script_08014AD2: - _0807E30C + FacePlayerAndCheckDist JumpIfNot script_08014AD2 - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer StartPlayerScript script_PlayerAtSiroc WaitForSyncFlagAndClear 0x00000001 - _0807EB74 + FacePlayer CheckLocalFlag 0x0064 JumpIf script_08014AFE SetLocalFlag 0x0064 @@ -22,6 +22,6 @@ script_08014AFE: script_08014B02: WaitUntilTextboxCloses Wait 0x000f - _0807E878 + EnablePlayerControl Jump script_08014AD2 .2byte 0x0000 diff --git a/data/scripts/cloudTops/script_WindTribespeople1.inc b/data/scripts/cloudTops/script_WindTribespeople1.inc index 987d6b13..94a6feb5 100644 --- a/data/scripts/cloudTops/script_WindTribespeople1.inc +++ b/data/scripts/cloudTops/script_WindTribespeople1.inc @@ -5,17 +5,17 @@ SCRIPT_START script_WindTribespeople1 DoPostScriptAction 0x000a CheckGlobalFlag 0x0058 JumpIf script_08014976 - _0807EB44 0x0004 + SetAnimationState 0x0004 SetEntityPositionRelative 0x0078, 0x0128 script_08014976: EndBlock script_08014978: - _0807E30C + FacePlayerAndCheckDist JumpIfNot script_08014978 - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer Call sub_0806C90C WaitUntilTextboxCloses Wait 0x000f - _0807E878 + EnablePlayerControl Jump script_08014978 diff --git a/data/scripts/cloudTops/script_WindTribespeople2.inc b/data/scripts/cloudTops/script_WindTribespeople2.inc index 6cf49d01..f8fa2804 100644 --- a/data/scripts/cloudTops/script_WindTribespeople2.inc +++ b/data/scripts/cloudTops/script_WindTribespeople2.inc @@ -7,14 +7,14 @@ SCRIPT_START script_WindTribespeople2 JumpIfNot script_080149C6 EndBlock script_080149AA: - _0807E30C + FacePlayerAndCheckDist JumpIfNot script_080149AA - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer Call sub_0806C90C WaitUntilTextboxCloses Wait 0x000f - _0807E878 + EnablePlayerControl Jump script_080149AA script_080149C6: DoPostScriptAction 0x0006 diff --git a/data/scripts/cloudTops/script_WindTribespeople3.inc b/data/scripts/cloudTops/script_WindTribespeople3.inc index 01977684..84c60935 100644 --- a/data/scripts/cloudTops/script_WindTribespeople3.inc +++ b/data/scripts/cloudTops/script_WindTribespeople3.inc @@ -6,10 +6,10 @@ SCRIPT_START script_WindTribespeople3 DoPostScriptAction 0x000a EndBlock script_080149DE: - _0807E30C + FacePlayerAndCheckDist JumpIfNot script_080149DE - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer Call sub_0806C90C WaitUntilTextboxCloses CheckLocalFlag 0x0064 @@ -21,10 +21,10 @@ script_080149DE: DoPostScriptAction 0x0001 _0807EDD4 0x0068, 0x00f8 PlaySound SFX_SECRET - _0807EB74 + FacePlayer DoPostScriptAction 0x0000 DoPostScriptAction 0x000a script_08014A20: - _0807E878 + EnablePlayerControl Jump script_080149DE .2byte 0x0000 diff --git a/data/scripts/cloudTops/script_WindTribespeople4.inc b/data/scripts/cloudTops/script_WindTribespeople4.inc index 31e036e3..ba6fb854 100644 --- a/data/scripts/cloudTops/script_WindTribespeople4.inc +++ b/data/scripts/cloudTops/script_WindTribespeople4.inc @@ -5,13 +5,13 @@ SCRIPT_START script_WindTribespeople4 DoPostScriptAction 0x000a EndBlock script_08014A36: - _0807E30C + FacePlayerAndCheckDist JumpIfNot script_08014A36 - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer Call sub_0806C90C WaitUntilTextboxCloses Wait 0x000f - _0807E878 + EnablePlayerControl Jump script_08014A36 .2byte 0x0000 diff --git a/data/scripts/cloudTops/script_WindTribespeople5.inc b/data/scripts/cloudTops/script_WindTribespeople5.inc index cf3a995e..698f9bb2 100644 --- a/data/scripts/cloudTops/script_WindTribespeople5.inc +++ b/data/scripts/cloudTops/script_WindTribespeople5.inc @@ -5,13 +5,13 @@ SCRIPT_START script_WindTribespeople5 DoPostScriptAction 0x000a EndBlock script_08014A62: - _0807E30C + FacePlayerAndCheckDist JumpIfNot script_08014A62 - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer Call sub_0806C90C WaitUntilTextboxCloses Wait 0x000f - _0807E878 + EnablePlayerControl Jump script_08014A62 .2byte 0x0000 diff --git a/data/scripts/cloudTops/script_WindTribespeople6.inc b/data/scripts/cloudTops/script_WindTribespeople6.inc index fea83201..0633f743 100644 --- a/data/scripts/cloudTops/script_WindTribespeople6.inc +++ b/data/scripts/cloudTops/script_WindTribespeople6.inc @@ -4,7 +4,7 @@ SCRIPT_START script_WindTribespeople6 DoPostScriptAction 0x000a EndBlock WaitForSyncFlagAndClear 0x00000001 - _0807EB74 + FacePlayer DoPostScriptAction 0x0004 SetSyncFlag 0x00000002 WaitForSyncFlagAndClear 0x00000001 @@ -12,12 +12,12 @@ SCRIPT_START script_WindTribespeople6 WaitUntilTextboxCloses SetSyncFlag 0x00000002 script_08014AAC: - _0807E30C + FacePlayerAndCheckDist JumpIfNot script_08014AAC - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer MessageNoOverlap 0x2f0a WaitUntilTextboxCloses - _0807E878 + EnablePlayerControl Jump script_08014AAC .2byte 0x0000 diff --git a/data/scripts/cloudTops/script_WindTribespeople7.inc b/data/scripts/cloudTops/script_WindTribespeople7.inc index a4c71788..72962d45 100644 --- a/data/scripts/cloudTops/script_WindTribespeople7.inc +++ b/data/scripts/cloudTops/script_WindTribespeople7.inc @@ -12,14 +12,14 @@ script_08014CAE: BeginBlock CheckGlobalFlag 0x0024 JumpIf script_08014CD4 - _0807E30C + FacePlayerAndCheckDist JumpIfNot script_08014CAE EndBlock - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer Call sub_0806C90C WaitUntilTextboxCloses - _0807E878 + EnablePlayerControl Jump script_08014CAE script_08014CD4: DoPostScriptAction 0x0006 diff --git a/data/scripts/cloudTops/script_WindTribespeopleGreatWhirlwindRevealed1.inc b/data/scripts/cloudTops/script_WindTribespeopleGreatWhirlwindRevealed1.inc index 0561a0fb..c5d77432 100644 --- a/data/scripts/cloudTops/script_WindTribespeopleGreatWhirlwindRevealed1.inc +++ b/data/scripts/cloudTops/script_WindTribespeopleGreatWhirlwindRevealed1.inc @@ -1,10 +1,10 @@ @ Cloud Tops WindTribespeople great whirlwind revealed 2 SCRIPT_START script_WindTribespeopleGreatWhirlwindRevealed1 BeginBlock - Call sub_0807F360 + Call SetPriorityHighest DoPostScriptAction 0x000b SetEntitySpeed 0x0200 - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 EndBlock WaitForSyncFlagAndClear 0x00000008 @@ -13,14 +13,14 @@ SCRIPT_START script_WindTribespeopleGreatWhirlwindRevealed1 PlaySound SFX_123 CallWithArg sub_0807F464, 0x000001e0 _0807EDD4 0x01e0, 0x01d8 - _0807EB44 0x0002 + SetAnimationState 0x0002 DoPostScriptAction 0x0000 SetSyncFlag 0x00000010 PlaySound SFX_PLY_JUMP _0807EF3C 0x0180, 0x0030 PlaySound SFX_PLY_JUMP _0807EF3C 0x0180, 0x0030 - _0807EB44 0x0002 + SetAnimationState 0x0002 DoPostScriptAction 0x0001 WaitForSyncFlagAndClear 0x00000008 Jump script_0800D80C diff --git a/data/scripts/cloudTops/script_WindTribespeopleGreatWhirlwindRevealed2.inc b/data/scripts/cloudTops/script_WindTribespeopleGreatWhirlwindRevealed2.inc index 53f64c9b..1bdc67f5 100644 --- a/data/scripts/cloudTops/script_WindTribespeopleGreatWhirlwindRevealed2.inc +++ b/data/scripts/cloudTops/script_WindTribespeopleGreatWhirlwindRevealed2.inc @@ -1,7 +1,7 @@ @ Cloud Tops WindTribespeople great whirlwind revealed SCRIPT_START script_WindTribespeopleGreatWhirlwindRevealed2 BeginBlock - Call sub_0807F360 + Call SetPriorityHighest DoPostScriptAction 0x000b SetEntityPositionRelative 0x0268, 0x01d8 SetEntitySpeed 0x0100 @@ -15,11 +15,11 @@ script_0800D80C: _0807EEF4 0x0000, 0xffe0 DoPostScriptAction 0x000e Call sub_0806CA5C - SetEntity0x20 0x00040000 + SetEntityVelocity 0x00040000 PlaySound SFX_F5 script_0800D82A: - CallWithArg sub_0807F8D0, 0xffffe000 - Call sub_0807F8BC + CallWithArg DoGravity, 0xffffe000 + Call CheckEntityOnScreen JumpIf script_0800D82A SetSyncFlag 0x00000004 DoPostScriptAction 0x0006 diff --git a/data/scripts/cutscene/ezlo/script_EzloCap.inc b/data/scripts/cutscene/ezlo/script_EzloCap.inc index 29b94ee9..f13702bc 100644 --- a/data/scripts/cutscene/ezlo/script_EzloCap.inc +++ b/data/scripts/cutscene/ezlo/script_EzloCap.inc @@ -4,20 +4,20 @@ SCRIPT_START script_EzloCap SetEntitySpeed 0x0040 DoPostScriptAction 0x0007 EndBlock - _0807E930 0x0020 + SetAnimation 0x0020 WaitForSyncFlagAndClear 0x00000004 - _0807E930 0x0022 + SetAnimation 0x0022 Call sub_0807F3C8 MessageFromTargetPos 0x1102, 0x000c WaitUntilTextboxCloses - _0807E930 0x0020 + SetAnimation 0x0020 SetSyncFlag 0x00000008 WaitForSyncFlagAndClear 0x00000004 - _0807E930 0x0021 + SetAnimation 0x0021 Call sub_0807F3C8 MessageFromTargetPos 0x1103, 0x000c WaitUntilTextboxCloses - _0807E930 0x0020 + SetAnimation 0x0020 SetSyncFlag 0x00000008 WaitForSyncFlagAndClear 0x00000004 DoPostScriptAction 0x0004 @@ -25,32 +25,32 @@ SCRIPT_START script_EzloCap SetSyncFlag 0x00000008 WaitForSyncFlagAndClear 0x00000004 DoPostScriptAction 0x0011 - _0807E930 0x001c + SetAnimation 0x001c MessageFromTargetPos 0x1105, 0x000c WaitUntilTextboxCloses - _0807E930 0x0020 + SetAnimation 0x0020 SetSyncFlag 0x00000008 WaitForSyncFlagAndClear 0x00000004 - _0807E930 0x0022 + SetAnimation 0x0022 Call sub_0807F3C8 MessageFromTargetPos 0x1106, 0x000c WaitUntilTextboxCloses - _0807E930 0x001c + SetAnimation 0x001c Call sub_0806D96C MessageFromTargetPos 0x1107, 0x000c WaitUntilTextboxCloses - _0807E930 0x0020 + SetAnimation 0x0020 SetSyncFlag 0x00000008 WaitForSyncFlagAndClear 0x00000004 - _0807E930 0x0021 + SetAnimation 0x0021 Call sub_0807F3C8 MessageFromTargetPos 0x1108, 0x000c WaitUntilTextboxCloses - _0807E930 0x001c + SetAnimation 0x001c Call sub_0806D96C MessageFromTargetPos 0x1109, 0x000c WaitUntilTextboxCloses - _0807E930 0x0020 + SetAnimation 0x0020 DoPostScriptAction 0x000a _0807E9D4 SetSyncFlag 0x00000008 @@ -62,16 +62,16 @@ script_080127F2: CheckEntityInteractType JumpIfNot script_080127F2 EndBlock - _0807E864 + SetPlayerIdle Call sub_0806D944 - _0807E930 0x0010 + SetAnimation 0x0010 MessageFromTargetPos 0x1114, 0x000c WaitUntilTextboxCloses - _0807E930 0x0020 - _0807E878 + SetAnimation 0x0020 + EnablePlayerControl Jump script_080127F2 script_08012824: - _0807E864 + SetPlayerIdle _0807E9DC CallWithArg sub_0807F5B0, 0x0000003c Call sub_080791D0 @@ -82,39 +82,39 @@ script_08012824: SetSyncFlag 0x00000008 WaitForSyncFlagAndClear 0x00000004 Call sub_0806D944 - _0807E930 0x0010 + SetAnimation 0x0010 MessageFromTargetPos 0x110a, 0x000c WaitUntilTextboxCloses - _0807E930 0x001f + SetAnimation 0x001f SetSyncFlag 0x00000008 WaitForSyncFlagAndClear 0x00000004 - _0807E930 0x0010 + SetAnimation 0x0010 MessageFromTargetPos 0x110b, 0x000c WaitUntilTextboxCloses - _0807E930 0x001f + SetAnimation 0x001f SetSyncFlag 0x00000008 WaitForSyncFlagAndClear 0x00000004 DoPostScriptAction 0x0004 Wait 0x003c - _0807E930 0x0010 + SetAnimation 0x0010 MessageFromTargetPos 0x110c, 0x000c WaitUntilTextboxCloses - _0807E930 0x001f + SetAnimation 0x001f SetSyncFlag 0x00000008 WaitForSyncFlagAndClear 0x00000004 - _0807E930 0x0010 + SetAnimation 0x0010 MessageFromTargetPos 0x110d, 0x000c WaitUntilTextboxCloses - _0807E930 0x001f + SetAnimation 0x001f SetSyncFlag 0x00000008 WaitForSyncFlagAndClear 0x00000004 - _0807E930 0x0010 + SetAnimation 0x0010 MessageFromTargetPos 0x110e, 0x000c WaitUntilTextboxCloses - _0807E930 0x0018 + SetAnimation 0x0018 SetEntitySpeed 0x0080 Call sub_0806D908 - _0807EC1C 0x0010 + WalkForward 0x0010 DoPostScriptAction 0x000a _0807E9D4 SetSyncFlag 0x00000008 @@ -129,30 +129,30 @@ script_08012904: JumpIfNot script_0801293A Jump script_08012904 script_08012920: - _0807E864 - _0807E930 0x0010 + SetPlayerIdle + SetAnimation 0x0010 EndBlock MessageFromTargetPos 0x1115, 0x000c WaitUntilTextboxCloses - _0807E930 0x0018 - _0807E878 + SetAnimation 0x0018 + EnablePlayerControl Jump script_08012904 script_0801293A: EndBlock - _0807E864 - Call sub_0807F9A4 + SetPlayerIdle + Call WaitForPlayerNormal Call sub_0807DF28 - _0807EB8C + FaceAwayFromPlayer Call sub_0806D944 - _0807E930 0x0010 + SetAnimation 0x0010 MessageFromTargetPos 0x110f, 0x000c - _0807E930 0x0018 + SetAnimation 0x0018 SetEntitySpeed 0x0080 Call sub_0806D908 - _0807EC1C 0x0050 + WalkForward 0x0050 WaitUntilTextboxCloses Call sub_0807DF50 - _0807E878 + EnablePlayerControl SetSyncFlag 0x00000008 WaitForSyncFlagAndClear 0x00000004 script_08012984: @@ -165,31 +165,31 @@ script_08012984: JumpIfNot script_080129BA Jump script_08012984 script_080129A0: - _0807E864 - _0807E930 0x0010 + SetPlayerIdle + SetAnimation 0x0010 EndBlock MessageFromTargetPos 0x1115, 0x000c WaitUntilTextboxCloses - _0807E930 0x0018 - _0807E878 + SetAnimation 0x0018 + EnablePlayerControl Jump script_08012984 script_080129BA: EndBlock - _0807E864 - Call sub_0807F9A4 + SetPlayerIdle + Call WaitForPlayerNormal Call sub_0807DF28 - _0807EB8C + FaceAwayFromPlayer Call sub_0806D944 - _0807E930 0x0010 + SetAnimation 0x0010 MessageFromTargetPos 0x1110, 0x000c - _0807E930 0x0018 + SetAnimation 0x0018 SetEntitySpeed 0x0080 Call sub_0806D908 - _0807EC1C 0x0050 - _0807E930 0x0018 + WalkForward 0x0050 + SetAnimation 0x0018 WaitUntilTextboxCloses Call sub_0807DF50 - _0807E878 + EnablePlayerControl SetSyncFlag 0x00000008 WaitForSyncFlagAndClear 0x00000004 script_08012A08: @@ -202,32 +202,32 @@ script_08012A08: JumpIfNot script_08012A3E Jump script_08012A08 script_08012A24: - _0807E864 - _0807E930 0x0010 + SetPlayerIdle + SetAnimation 0x0010 EndBlock MessageFromTargetPos 0x1115, 0x000c WaitUntilTextboxCloses - _0807E930 0x0018 - _0807E878 + SetAnimation 0x0018 + EnablePlayerControl Jump script_08012A08 script_08012A3E: EndBlock - _0807E864 - Call sub_0807F9A4 + SetPlayerIdle + Call WaitForPlayerNormal Call sub_0807DF28 StopBgm DoPostScriptAction 0x000b - _0807EB8C + FaceAwayFromPlayer Call sub_0806D944 - _0807E930 0x0010 + SetAnimation 0x0010 MessageFromTargetPos 0x1111, 0x000c - _0807E930 0x0018 + SetAnimation 0x0018 SetEntitySpeed 0x0080 Call sub_0806D8A0 script_08012A74: _0807EE30 JumpIfNot script_08012A74 - _0807E930 0x001f + SetAnimation 0x001f WaitUntilTextboxCloses StartPlayerScript script_PlayerGetEzloCap Call sub_0806D9A4 @@ -236,7 +236,7 @@ script_08012A74: PlayBgm BGM_EZLO_THEME BeginBlock _0807E8E4_2 - _0807EB28 0x1112 + EzloMessage 0x1112 EndBlock WaitUntilTextboxCloses SetSyncFlag 0x00000008 diff --git a/data/scripts/cutscene/ezlo/script_Npc4EEzloCutscene.inc b/data/scripts/cutscene/ezlo/script_Npc4EEzloCutscene.inc index f059f75b..f9350061 100644 --- a/data/scripts/cutscene/ezlo/script_Npc4EEzloCutscene.inc +++ b/data/scripts/cutscene/ezlo/script_Npc4EEzloCutscene.inc @@ -7,14 +7,14 @@ script_0801248A: CheckPlayerInRegion 0x0208, 0x02c8, 0x4020 JumpIfNot script_0801248A StopBgm - _0807E864 - Call sub_0807F9A4 + SetPlayerIdle + Call WaitForPlayerNormal Call sub_0807DF28 StartPlayerScript script_PlayerAtFirstLookAtEzlo MessageFromTargetPos 0x1101, 0x0007 WaitUntilTextboxCloses CameraTargetPlayer - _0807E778 0x0004 + SetFadeTime 0x0004 _0807E80C 0x00000000 WaitForFadeFinish _0807E858 0x0000 @@ -23,7 +23,7 @@ script_0801248A: Call DeleteAllEnemies SetEntityPositionRelative 0x0388, 0x0168 Call sub_0807F844 - _0807E778 0x0004 + SetFadeTime 0x0004 _0807E800 0x00000000 WaitForFadeFinish PlayBgm BGM_EZLO_THEME @@ -38,24 +38,24 @@ script_0801248A: SetSyncFlag 0x00000004 WaitForSyncFlagAndClear 0x00000008 StopBgm - _0807E778 0x0004 + SetFadeTime 0x0004 _0807E80C 0x00000000 WaitForFadeFinish MoveEntityToPlayer Call sub_0807F844 CameraTargetPlayer SetFadeMask 0xffffffff - _0807E778 0x0004 + SetFadeTime 0x0004 _0807E800 0x00000000 WaitForFadeFinish Call sub_0807DF50 - _0807E878 + EnablePlayerControl PlayBGM script_08012566: CheckPlayerInRegion 0x03a0, 0x01a0, 0x1020 JumpIfNot script_08012566 - _0807E864 - Call sub_0807F9A4 + SetPlayerIdle + Call WaitForPlayerNormal Call sub_0807DF28 Call sub_0806DC7C StopBgm @@ -83,12 +83,12 @@ script_08012566: StopBgm PlayBgm BGM_FIGHT_THEME2 Call sub_0807DF50 - _0807E878 + EnablePlayerControl SetSyncFlag 0x00000050 LoadRoomEntityList gUnk_080F51D0 WaitForSyncFlagAndClear 0x00000008 - _0807E864 - Call sub_0807FA40 + SetPlayerIdle + Call WaitForPlayerNormalOrTalkEzlo Call sub_0807DF28 PlaySound SFX_SECRET StopBgm @@ -116,7 +116,7 @@ script_08012566: _0807F0B4 0x0004 CameraTargetPlayer Call sub_0807DF50 - _0807E878 + EnablePlayerControl SetSyncFlag 0x00000004 WaitForSyncFlagAndClear 0x00000008 SetSyncFlag 0x00000004 @@ -128,8 +128,8 @@ script_08012566: PlayBGM Call sub_08054570 SetGlobalFlag 0x0014 - CallWithArg sub_0807F6F8, 0x00000008 + CallWithArg ResetPlayerFlag, 0x00000008 Call sub_0807DF50 - _0807E878 + EnablePlayerControl DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/cutscene/ezlo/script_Object6ALeftBullyingOctorok.inc b/data/scripts/cutscene/ezlo/script_Object6ALeftBullyingOctorok.inc index 4528f6df..3a0fb547 100644 --- a/data/scripts/cutscene/ezlo/script_Object6ALeftBullyingOctorok.inc +++ b/data/scripts/cutscene/ezlo/script_Object6ALeftBullyingOctorok.inc @@ -1,20 +1,20 @@ @ First look at Ezlo OBJECT_6A left octorok SCRIPT_START script_Object6ALeftBullyingOctorok BeginBlock - _0807EB44 0x0002 + SetAnimationState 0x0002 DoPostScriptAction 0x0007 - _0807E930 0x0001 + SetAnimation 0x0001 EndBlock WaitForSyncFlagAndClear 0x00000040 - _0807E930 0x0005 + SetAnimation 0x0005 Wait 0x001e SetSyncFlag 0x00000080 - _0807E930 0x0001 + SetAnimation 0x0001 WaitForSyncFlagAndClear 0x00000040 - _0807E930 0x0005 + SetAnimation 0x0005 Wait 0x001e SetSyncFlag 0x00000080 - _0807E930 0x0001 + SetAnimation 0x0001 WaitForSyncFlagAndClear 0x00000040 Wait 0x0001 DoPostScriptAction 0x0006 diff --git a/data/scripts/cutscene/ezlo/script_Object6ARightBullyingOctorok.inc b/data/scripts/cutscene/ezlo/script_Object6ARightBullyingOctorok.inc index 8051b6b5..c64fa666 100644 --- a/data/scripts/cutscene/ezlo/script_Object6ARightBullyingOctorok.inc +++ b/data/scripts/cutscene/ezlo/script_Object6ARightBullyingOctorok.inc @@ -1,20 +1,20 @@ @ First look at Ezlo OBJECT_6A right octorok SCRIPT_START script_Object6ARightBullyingOctorok BeginBlock - _0807EB44 0x0006 + SetAnimationState 0x0006 DoPostScriptAction 0x0007 - _0807E930 0x0003 + SetAnimation 0x0003 EndBlock WaitForSyncFlagAndClear 0x00000010 - _0807E930 0x0007 + SetAnimation 0x0007 Wait 0x001e SetSyncFlag 0x00000020 - _0807E930 0x0003 + SetAnimation 0x0003 WaitForSyncFlagAndClear 0x00000010 - _0807E930 0x0007 + SetAnimation 0x0007 Wait 0x001e SetSyncFlag 0x00000020 - _0807E930 0x0003 + SetAnimation 0x0003 WaitForSyncFlagAndClear 0x00000010 Wait 0x0001 DoPostScriptAction 0x0006 diff --git a/data/scripts/cutscene/ezlo/script_PlayerAtFirstLookAtEzlo.inc b/data/scripts/cutscene/ezlo/script_PlayerAtFirstLookAtEzlo.inc index 1330fd87..f2dc81c9 100644 --- a/data/scripts/cutscene/ezlo/script_PlayerAtFirstLookAtEzlo.inc +++ b/data/scripts/cutscene/ezlo/script_PlayerAtFirstLookAtEzlo.inc @@ -2,9 +2,9 @@ SCRIPT_START script_PlayerAtFirstLookAtEzlo EndBlock script_08012AB2: - _0807EB44 0x0002 + SetAnimationState 0x0002 Wait 0x000a - _0807EB44 0x0006 + SetAnimationState 0x0006 Wait 0x000a Jump script_08012AB2 .2byte 0x0000 diff --git a/data/scripts/cutscene/ezlo/script_PlayerDefeatedOctoroks.inc b/data/scripts/cutscene/ezlo/script_PlayerDefeatedOctoroks.inc index f53814e1..017b7111 100644 --- a/data/scripts/cutscene/ezlo/script_PlayerDefeatedOctoroks.inc +++ b/data/scripts/cutscene/ezlo/script_PlayerDefeatedOctoroks.inc @@ -5,7 +5,7 @@ SCRIPT_START script_PlayerDefeatedOctoroks EndBlock DoPostScriptAction 0x0001 _0807EDD4 0x0388, 0x0180 - _0807EB44 0x0000 + SetAnimationState 0x0000 DoPostScriptAction 0x0000 SetSyncFlag 0x00000001 Call sub_080791BC diff --git a/data/scripts/cutscene/ezlo/script_PlayerEzloBeingBullied.inc b/data/scripts/cutscene/ezlo/script_PlayerEzloBeingBullied.inc index edf2a936..1082a4b1 100644 --- a/data/scripts/cutscene/ezlo/script_PlayerEzloBeingBullied.inc +++ b/data/scripts/cutscene/ezlo/script_PlayerEzloBeingBullied.inc @@ -3,7 +3,7 @@ SCRIPT_START script_PlayerEzloBeingBullied BeginBlock SetEntitySpeed 0x0080 EndBlock - _0807EB44 0x0000 + SetAnimationState 0x0000 DoPostScriptAction 0x0000 DoPostScriptAction 0x0004 Wait 0x003c diff --git a/data/scripts/cutscene/intro/script_HouseDoorIntro.inc b/data/scripts/cutscene/intro/script_HouseDoorIntro.inc index 45d64e58..089a2992 100644 --- a/data/scripts/cutscene/intro/script_HouseDoorIntro.inc +++ b/data/scripts/cutscene/intro/script_HouseDoorIntro.inc @@ -11,7 +11,7 @@ SCRIPT_START script_HouseDoorIntro PlaySound SFX_F1 DoPostScriptAction 0x0007 Wait 0x005a - _0807E778 0x0004 + SetFadeTime 0x0004 @ Circle transition _0807E80C 0x00000000 WaitForFadeFinish @ Wait for end of transition diff --git a/data/scripts/cutscene/intro/script_IntroCameraTarget.inc b/data/scripts/cutscene/intro/script_IntroCameraTarget.inc index 1df4f5a3..764464ad 100644 --- a/data/scripts/cutscene/intro/script_IntroCameraTarget.inc +++ b/data/scripts/cutscene/intro/script_IntroCameraTarget.inc @@ -5,7 +5,7 @@ SCRIPT_START script_IntroCameraTarget SetEntitySpeed 0x0080 Wait 0x0078 PlayBgm BGM_MINISH_CAP - _0807E778 0x0002 + SetFadeTime 0x0002 @ Fade in DoFade4 WaitForFadeFinish @ TODO wait for fade to be finished diff --git a/data/scripts/cutscene/intro/script_Npc4EOutsideLinksHouse.inc b/data/scripts/cutscene/intro/script_Npc4EOutsideLinksHouse.inc index 4fe5b4ae..9acf2548 100644 --- a/data/scripts/cutscene/intro/script_Npc4EOutsideLinksHouse.inc +++ b/data/scripts/cutscene/intro/script_Npc4EOutsideLinksHouse.inc @@ -3,11 +3,11 @@ SCRIPT_START script_Npc4EOutsideLinksHouse BeginBlock SetEntityPositionRelative 0x0238, 0x01a8 Call sub_0807F844 - Call sub_0807F348 - _0807E864 + Call SetPriorityMessage + SetPlayerIdle Call sub_0807DF28 EndBlock - _0807E778 0x0010 + SetFadeTime 0x0010 DoFade6 WaitForFadeFinish SetSyncFlag 0x00000001 @@ -15,7 +15,7 @@ SCRIPT_START script_Npc4EOutsideLinksHouse _0807F0B4 0x0004 CameraTargetPlayer Call sub_0807DF50 - _0807E878 + EnablePlayerControl DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/cutscene/intro/script_Object69Intro.inc b/data/scripts/cutscene/intro/script_Object69Intro.inc index 059bb9f7..1e643580 100644 --- a/data/scripts/cutscene/intro/script_Object69Intro.inc +++ b/data/scripts/cutscene/intro/script_Object69Intro.inc @@ -2,7 +2,7 @@ SCRIPT_START script_Object69Intro BeginBlock Call sub_0807DF28 - _0807E864 + SetPlayerIdle SetSyncFlag 0x00000000 EndBlock WaitForFadeFinish @@ -11,6 +11,6 @@ SCRIPT_START script_Object69Intro WaitForSyncFlagAndClear 0x00000001 SetGlobalFlag 0x001c Call sub_0807DF50 - _0807E878 + EnablePlayerControl Call sub_0807921C SCRIPT_END diff --git a/data/scripts/cutscene/intro/script_PlayerIntro.inc b/data/scripts/cutscene/intro/script_PlayerIntro.inc index e89495c8..5f06f18e 100644 --- a/data/scripts/cutscene/intro/script_PlayerIntro.inc +++ b/data/scripts/cutscene/intro/script_PlayerIntro.inc @@ -2,7 +2,7 @@ SCRIPT_START script_PlayerIntro BeginBlock Call sub_0807DF28 - _0807E864 + SetPlayerIdle SetLocalFlag 0x0046 EndBlock WaitForFadeFinish @@ -18,7 +18,7 @@ SCRIPT_START script_PlayerIntro Wait 0x001e @ Give control to the player? Call sub_08053250 - _0807E878 + EnablePlayerControl Call sub_0807DF50 Call sub_080791D0 SCRIPT_END diff --git a/data/scripts/cutscene/intro/script_SmithIntro.inc b/data/scripts/cutscene/intro/script_SmithIntro.inc index d26a3683..ae998135 100644 --- a/data/scripts/cutscene/intro/script_SmithIntro.inc +++ b/data/scripts/cutscene/intro/script_SmithIntro.inc @@ -1,37 +1,37 @@ @ Intro Smith 1 SCRIPT_START script_SmithIntro BeginBlock - Call sub_0807F348 + Call SetPriorityMessage SetEntitySpeed 0x0040 - _0807EB44 0x0004 - _0807E930 0x000c - _0807E908 0x0003 + SetAnimationState 0x0004 + SetAnimation 0x000c + SetAction 0x0003 EndBlock Wait 0x001e CameraTargetEntity - _0807E778 0x0004 + SetFadeTime 0x0004 _0807E800 0x00000000 WaitForFadeFinish WaitForSyncFlagAndClear 0x00000008 DoPostScriptAction 0x0004 Wait 0x001e - _0807E930 0x000b + SetAnimation 0x000b Wait 0x001e MessageFromTarget 0x1002 WaitUntilTextboxCloses DoPostScriptAction 0x0000 SetSyncFlag 0x00000004 WaitForSyncFlagAndClear 0x00000008 - _0807E908 0x0001 - _0807EB44 0x0004 + SetAction 0x0001 + SetAnimationState 0x0004 _0807EDD4 0x00b8, 0x005c - _0807EB44 0x0006 + SetAnimationState 0x0006 DoPostScriptAction 0x0001 MessageFromTarget 0x1004 WaitUntilTextboxCloses DoPostScriptAction 0x0000 Wait 0x001e - _0807E778 0x0002 + SetFadeTime 0x0002 DoFade5 WaitForFadeFinish Call sub_08053634 diff --git a/data/scripts/cutscene/intro/script_SmithIntro2.inc b/data/scripts/cutscene/intro/script_SmithIntro2.inc index fff723fa..b9760692 100644 --- a/data/scripts/cutscene/intro/script_SmithIntro2.inc +++ b/data/scripts/cutscene/intro/script_SmithIntro2.inc @@ -1,21 +1,21 @@ @ Intro Smith 2 SCRIPT_START script_SmithIntro2 BeginBlock - _0807EB44 0x0006 + SetAnimationState 0x0006 SetEntitySpeed 0x0080 _0807E9D4 - Call sub_0807F348 + Call SetPriorityMessage EndBlock CheckGlobalFlag 0x0013 JumpIf script_08009C4C - _0807E888 + DisablePlayerControl Wait 0x000a - _0807E864 + SetPlayerIdle StartPlayerScript script_PlayerMoveToSmith Call sub_0807DF28 WaitForSyncFlagAndClear 0x00000008 _0807EDD4 0x0080, 0x005c - _0807EB44 0x0006 + SetAnimationState 0x0006 DoPostScriptAction 0x0000 Wait 0x000f DoPostScriptAction 0x0001 @@ -25,7 +25,7 @@ SCRIPT_START script_SmithIntro2 DoPostScriptAction 0x0000 SetSyncFlag 0x00000004 WaitForSyncFlagAndClear 0x00000008 - _0807EB8C + FaceAwayFromPlayer DoPostScriptAction 0x0001 MessageFromTargetPos 0x100b, 0x0000 WaitUntilTextboxCloses @@ -36,7 +36,7 @@ SCRIPT_START script_SmithIntro2 Wait 0x000f DoPostScriptAction 0x000d _0807EDD4 0x0084, 0x005c - _0807EB44 0x0006 + SetAnimationState 0x0006 DoPostScriptAction 0x000c DoPostScriptAction 0x0000 SetSyncFlag 0x00000002 @@ -57,10 +57,10 @@ script_08009C4C: script_08009C50: CheckEntityInteractType JumpIfNot script_08009C50 - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer MessageNoOverlap 0x100e - _0807E878 + EnablePlayerControl Jump script_08009C50 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/cutscene/intro/script_ZeldaIntro.inc b/data/scripts/cutscene/intro/script_ZeldaIntro.inc index 6f2c28ec..f9dd8999 100644 --- a/data/scripts/cutscene/intro/script_ZeldaIntro.inc +++ b/data/scripts/cutscene/intro/script_ZeldaIntro.inc @@ -1,9 +1,9 @@ @ Intro Zelda at Smith SCRIPT_START script_ZeldaIntro BeginBlock - Call sub_0807F348 + Call SetPriorityMessage SetEntitySpeed 0x00c0 - _0807EB44 0x0002 + SetAnimationState 0x0002 DoPostScriptAction 0x0008 EndBlock WaitForSyncFlagAndClear 0x00000004 diff --git a/data/scripts/cutscene/intro/script_ZeldaLeaveLinksHouse.inc b/data/scripts/cutscene/intro/script_ZeldaLeaveLinksHouse.inc index 7386e1cf..164293e8 100644 --- a/data/scripts/cutscene/intro/script_ZeldaLeaveLinksHouse.inc +++ b/data/scripts/cutscene/intro/script_ZeldaLeaveLinksHouse.inc @@ -2,7 +2,7 @@ SCRIPT_START script_ZeldaLeaveLinksHouse BeginBlock SetEntitySpeed 0x0100 - _0807EB44 0x0006 + SetAnimationState 0x0006 EndBlock _0807EDD4 0x0078, 0x0060 _0807EDD4 0x0078, 0x007c @@ -11,7 +11,7 @@ SCRIPT_START script_ZeldaLeaveLinksHouse Wait 0x0008 _0807EDD4 0x0078, 0x0098 DoPostScriptAction 0x0008 - _0807E778 0x0010 + SetFadeTime 0x0010 DoFade5 WaitForFadeFinish Call sub_08053634 diff --git a/data/scripts/cutscene/intro/script_ZeldaOutsideLinksHouse.inc b/data/scripts/cutscene/intro/script_ZeldaOutsideLinksHouse.inc index 9a200b2f..dfd487d0 100644 --- a/data/scripts/cutscene/intro/script_ZeldaOutsideLinksHouse.inc +++ b/data/scripts/cutscene/intro/script_ZeldaOutsideLinksHouse.inc @@ -6,12 +6,12 @@ SCRIPT_START script_ZeldaOutsideLinksHouse Call sub_08066D04 Call sub_08066D14 SetEntityPositionRelative 0x01e8, 0x0180 - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 EndBlock WaitForSyncFlagAndClear 0x00000001 Call sub_08066E08 - _0807E864 + SetPlayerIdle MessageFromTargetPos 0x1010, 0x000c WaitUntilTextboxCloses SetSyncFlag 0x00000002 @@ -22,41 +22,41 @@ script_08014D1E: CheckPlayerInRegion 0x01d8, 0x0160, 0x3050 JumpIfNot script_08014D1E EndBlock - _0807E864 - Call sub_0807F9A4 + SetPlayerIdle + Call WaitForPlayerNormal Call sub_0807DF28 MessageNoOverlap 0x1012 WaitUntilTextboxCloses - _0807EC64 0x0040 - _0807EB44 0x0004 + WalkNorth 0x0040 + SetAnimationState 0x0004 Call sub_08066E08 SetEntityPositionRelative 0x01f8, 0x00c8 Call sub_0807DF50 - _0807E878 + EnablePlayerControl script_08014D60: @ Between trees CallWithArg sub_0807F6B4, 0x000000e8 JumpIf script_08014D60 - _0807E864 + SetPlayerIdle Call sub_0807DF28 MessageNoOverlap 0x1013 WaitUntilTextboxCloses - _0807EC64 0x0040 - _0807EB44 0x0004 + WalkNorth 0x0040 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 SetEntityPositionRelative 0x01e8, 0x0028 Call sub_0807DF50 - _0807E878 + EnablePlayerControl script_08014D96: @ Before hyrule town entry CheckPlayerInRegion 0x01f8, 0x0028, 0x2040 JumpIfNot script_08014D96 - _0807E864 - Call sub_0807F9A4 + SetPlayerIdle + Call WaitForPlayerNormal Call sub_0807DF28 MessageNoOverlap 0x1014 WaitUntilTextboxCloses - _0807EC64 0x0018 + WalkNorth 0x0018 .ifdef JP SetLocalFlag 0x006b .else @@ -71,6 +71,6 @@ script_08014D96: .endif .endif Call sub_0807DF50 - _0807E878 + EnablePlayerControl DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/cutscene/intro/script_ZeldaTalkToSmith.inc b/data/scripts/cutscene/intro/script_ZeldaTalkToSmith.inc index 282bbec0..31780509 100644 --- a/data/scripts/cutscene/intro/script_ZeldaTalkToSmith.inc +++ b/data/scripts/cutscene/intro/script_ZeldaTalkToSmith.inc @@ -1,28 +1,28 @@ @ Intro Zelda at Smith 2 SCRIPT_START script_ZeldaTalkToSmith BeginBlock - _0807EB44 0x0002 + SetAnimationState 0x0002 SetEntitySpeed 0x0100 - Call sub_0807F348 + Call SetPriorityMessage EndBlock WaitForSyncFlagAndClear 0x00000004 DoPostScriptAction 0x0004 - _0807EB74 + FacePlayer WaitForSyncFlagAndClear 0x00000004 - _0807EB74 + FacePlayer WaitForSyncFlagAndClear 0x00000004 - _0807EB74 - _0807EB8C + FacePlayer + FaceAwayFromPlayer DoPostScriptAction 0x0001 MessageFromTargetPos 0x100a, 0x0000 WaitUntilTextboxCloses DoPostScriptAction 0x0000 SetSyncFlag 0x00000008 WaitForSyncFlagAndClear 0x00000004 - _0807EB8C + FaceAwayFromPlayer DoPostScriptAction 0x0001 - _0807EB8C - _0807EB44 0x0002 + FaceAwayFromPlayer + SetAnimationState 0x0002 MessageFromTargetPos 0x100d, 0x0000 WaitUntilTextboxCloses DoPostScriptAction 0x0000 @@ -35,7 +35,7 @@ SCRIPT_START script_ZeldaTalkToSmith SetGlobalFlag 0x0013 Call sub_0807DF50 Call sub_080791D0 - _0807E878 + EnablePlayerControl EndBlock SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/cutscene/introAssembly/script_GuardAtAssembly.inc b/data/scripts/cutscene/introAssembly/script_GuardAtAssembly.inc index 804be255..1c324e64 100644 --- a/data/scripts/cutscene/introAssembly/script_GuardAtAssembly.inc +++ b/data/scripts/cutscene/introAssembly/script_GuardAtAssembly.inc @@ -1,19 +1,19 @@ @ Intro Assembly Guard SCRIPT_START script_GuardAtAssembly BeginBlock - _0807EB44 0x0000 - _0807E930 0x0000 + SetAnimationState 0x0000 + SetAnimation 0x0000 EndBlock WaitForSyncFlag 0x00000010 PlaySound SFX_11C - _0807E930 0x0001 + SetAnimation 0x0001 Wait 0x0010 PlaySound SFX_11C - _0807EB44 0x0004 - _0807E930 0x0006 + SetAnimationState 0x0004 + SetAnimation 0x0006 Wait 0x0010 DoPostScriptAction 0x000f SetEntitySpeed 0x0200 - _0807ECC4 0x1c20 + WalkSouth 0x1c20 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/cutscene/introAssembly/script_KingDaltusAtAssembly.inc b/data/scripts/cutscene/introAssembly/script_KingDaltusAtAssembly.inc index 5ea4ba26..fe73a920 100644 --- a/data/scripts/cutscene/introAssembly/script_KingDaltusAtAssembly.inc +++ b/data/scripts/cutscene/introAssembly/script_KingDaltusAtAssembly.inc @@ -1,57 +1,57 @@ @ Intro Assembly King Daltus SCRIPT_START script_KingDaltusAtAssembly BeginBlock - Call sub_0807F348 + Call SetPriorityMessage SetEntitySpeed 0x0100 - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 _0807E9D4 DoPostScriptAction 0x000a EndBlock WaitForSyncFlagAndClear 0x00000080 - _0807EB44 0x0004 - _0807ECC4 0x0008 - _0807E930 0x0004 + SetAnimationState 0x0004 + WalkSouth 0x0008 + SetAnimation 0x0004 MessageFromTargetPos 0x1050, 0x000e WaitUntilTextboxCloses DoPostScriptAction 0x0000 SetSyncFlag 0x00000100 WaitForSyncFlagAndClear 0x00000080 - _0807E930 0x0004 + SetAnimation 0x0004 MessageFromTargetPos 0x1052, 0x000e WaitUntilTextboxCloses DoPostScriptAction 0x0000 SetSyncFlag 0x00000100 WaitForSyncFlagAndClear 0x00000080 - _0807EB44 0x0006 - _0807E930 0x0005 + SetAnimationState 0x0006 + SetAnimation 0x0005 MessageFromTargetPos 0x1054, 0x000e WaitUntilTextboxCloses DoPostScriptAction 0x0000 SetSyncFlag 0x00000100 WaitForSyncFlagAndClear 0x00000080 - _0807EB44 0x0004 + SetAnimationState 0x0004 SetSyncFlag 0x00000100 WaitForSyncFlagAndClear 0x00000080 - _0807E930 0x0004 + SetAnimation 0x0004 MessageFromTargetPos 0x1056, 0x000e WaitUntilTextboxCloses DoPostScriptAction 0x0000 SetSyncFlag 0x00000100 WaitForSyncFlagAndClear 0x00000080 - _0807E930 0x0004 + SetAnimation 0x0004 MessageFromTargetPos 0x1057, 0x000e WaitUntilTextboxCloses DoPostScriptAction 0x0000 SetSyncFlag 0x00000100 WaitForSyncFlagAndClear 0x00000080 - _0807E930 0x0004 + SetAnimation 0x0004 MessageFromTargetPos 0x1058, 0x000e WaitUntilTextboxCloses DoPostScriptAction 0x0000 SetSyncFlag 0x00000100 WaitForSyncFlagAndClear 0x00000080 - _0807E930 0x0004 + SetAnimation 0x0004 MessageFromTargetPos 0x105c, 0x000e WaitUntilTextboxCloses DoPostScriptAction 0x0000 @@ -59,10 +59,10 @@ SCRIPT_START script_KingDaltusAtAssembly script_0800917C: CheckEntityInteractType JumpIfNot script_0800917C - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer Call sub_0806673C WaitUntilTextboxCloses Wait 0x000f - _0807E878 + EnablePlayerControl Jump script_0800917C diff --git a/data/scripts/cutscene/introAssembly/script_MinisterPothoAtAssembly.inc b/data/scripts/cutscene/introAssembly/script_MinisterPothoAtAssembly.inc index fe1106ed..1ea38210 100644 --- a/data/scripts/cutscene/introAssembly/script_MinisterPothoAtAssembly.inc +++ b/data/scripts/cutscene/introAssembly/script_MinisterPothoAtAssembly.inc @@ -1,16 +1,16 @@ @ Intro Assembly Minister Potho SCRIPT_START script_MinisterPothoAtAssembly BeginBlock - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 EndBlock WaitForSyncFlagAndClear 0x00000004 PlaySound SFX_PLY_JUMP _0807EF3C 0x0180, 0x0030 - _0807EB44 0x0002 + SetAnimationState 0x0002 SetSyncFlag 0x00000008 WaitForSyncFlagAndClear 0x00000004 - _0807EB44 0x0004 + SetAnimationState 0x0004 SetSyncFlag 0x00000008 BeginBlock _0807E9D4 diff --git a/data/scripts/cutscene/introAssembly/script_Npc4EIntroAssembly.inc b/data/scripts/cutscene/introAssembly/script_Npc4EIntroAssembly.inc index e871a204..ca9a741d 100644 --- a/data/scripts/cutscene/introAssembly/script_Npc4EIntroAssembly.inc +++ b/data/scripts/cutscene/introAssembly/script_Npc4EIntroAssembly.inc @@ -6,12 +6,12 @@ SCRIPT_START script_Npc4EIntroAssembly script_08008E12: CheckPlayerInRegion 0x00d8, 0x0098, 0x4020 JumpIfNot script_08008E12 - _0807E864 - Call sub_0807F9A4 + SetPlayerIdle + Call WaitForPlayerNormal Call sub_0807DF28 _0807F0B4 0x0001 CameraTargetEntity - WaitForPlayerAction0x17 + WaitForPlayerEnterRoom Wait 0x003c StartPlayerScript script_PlayerEnters WaitForSyncFlagAndClear 0x00000020 @@ -62,7 +62,7 @@ script_08008E12: GivePlayerItem 0x0047 WaitPlayerGetItem SetIntVariable 0x00000003 - Call sub_0807F420 + Call LoadMenu _0807E8E4_0 SetSyncFlag 0x00000080 WaitForSyncFlagAndClear 0x00000100 @@ -71,7 +71,7 @@ script_08008E12: SetGlobalFlag 0x0015 Call sub_0806DCC0 Call sub_0807DF50 - _0807E878 + EnablePlayerControl DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/cutscene/introAssembly/script_PlayerEnters.inc b/data/scripts/cutscene/introAssembly/script_PlayerEnters.inc index c2b49497..b5bf75ce 100644 --- a/data/scripts/cutscene/introAssembly/script_PlayerEnters.inc +++ b/data/scripts/cutscene/introAssembly/script_PlayerEnters.inc @@ -5,13 +5,13 @@ SCRIPT_START script_PlayerEnters EndBlock DoPostScriptAction 0x0001 _0807EDD4 0x00b8, 0x0090 - _0807EB44 0x0006 + SetAnimationState 0x0006 DoPostScriptAction 0x0000 SetSyncFlag 0x00000020 WaitForSyncFlagAndClear 0x00000040 DoPostScriptAction 0x0001 _0807EDD4 0x0088, 0x0078 - _0807EB44 0x0000 + SetAnimationState 0x0000 DoPostScriptAction 0x0000 Wait 0x000f SetSyncFlag 0x00000020 diff --git a/data/scripts/cutscene/introAssembly/script_PlayerGetSword.inc b/data/scripts/cutscene/introAssembly/script_PlayerGetSword.inc index af4e4dd7..e2fd2766 100644 --- a/data/scripts/cutscene/introAssembly/script_PlayerGetSword.inc +++ b/data/scripts/cutscene/introAssembly/script_PlayerGetSword.inc @@ -1,10 +1,10 @@ @ Intro Assembly Player gets Sword SCRIPT_START script_PlayerGetSword _0807F078 0x0001, 0x0001 - CallWithArg sub_0807F918, 0x00000001 + CallWithArg PutItemAnySlot, 0x00000001 PlaySound SFX_109 - CallWithArg sub_0807F238, 0x0000045f - Call sub_0807F304 + CallWithArg SetPlayerAnimation2, 0x0000045f + Call WaitForPlayerFrameHiBit MessageFromTargetPos 0x0501, 0x000e WaitUntilTextboxCloses SetSyncFlag 0x00000020 diff --git a/data/scripts/cutscene/introAssembly/script_PlayerWakingUpInHyruleCastle.inc b/data/scripts/cutscene/introAssembly/script_PlayerWakingUpInHyruleCastle.inc index 931c03f4..862275c2 100644 --- a/data/scripts/cutscene/introAssembly/script_PlayerWakingUpInHyruleCastle.inc +++ b/data/scripts/cutscene/introAssembly/script_PlayerWakingUpInHyruleCastle.inc @@ -2,7 +2,7 @@ SCRIPT_START script_PlayerWakingUpInHyruleCastle BeginBlock Call sub_0807DF28 - _0807E864 + SetPlayerIdle .ifdef JP SetLocalFlag 0x009e .else @@ -18,16 +18,16 @@ SCRIPT_START script_PlayerWakingUpInHyruleCastle .endif EndBlock Wait 0x003c - _0807E778 0x0004 + SetFadeTime 0x0004 DoFade4 WaitForFadeFinish script_08009EA4: - Call sub_0807F0D8 + Call CheckAnyKeyPressed JumpIfNot script_08009EA4 DoPostScriptAction 0x0014 Wait 0x000a Call sub_08053250 - _0807E878 + EnablePlayerControl Call sub_0807DF50 Call sub_080791D0 SCRIPT_END diff --git a/data/scripts/cutscene/introAssembly/script_SmithAtAssembly.inc b/data/scripts/cutscene/introAssembly/script_SmithAtAssembly.inc index 56c32d55..63184c10 100644 --- a/data/scripts/cutscene/introAssembly/script_SmithAtAssembly.inc +++ b/data/scripts/cutscene/introAssembly/script_SmithAtAssembly.inc @@ -1,19 +1,19 @@ @ Intro Assembly Smith SCRIPT_START script_SmithAtAssembly BeginBlock - Call sub_0807F348 - _0807EB44 0x0006 + Call SetPriorityMessage + SetAnimationState 0x0006 DoPostScriptAction 0x0000 EndBlock WaitForSyncFlagAndClear 0x00000001 - _0807EB74 + FacePlayer DoPostScriptAction 0x0001 MessageFromTargetPos 0x105b, 0x0000 WaitUntilTextboxCloses DoPostScriptAction 0x0000 SetSyncFlag 0x00000002 WaitForSyncFlagAndClear 0x00000001 - _0807EB44 0x0006 + SetAnimationState 0x0006 DoPostScriptAction 0x0000 SetSyncFlag 0x00000002 WaitForSyncFlagAndClear 0x00000001 @@ -27,21 +27,21 @@ SCRIPT_START script_SmithAtAssembly WaitForSyncFlagAndClear 0x00000001 DoPostScriptAction 0x0004 Wait 0x003c - _0807EB74 - _0807EB8C + FacePlayer + FaceAwayFromPlayer DoPostScriptAction 0x0001 MessageFromTargetPos 0x1055, 0x0000 WaitUntilTextboxCloses DoPostScriptAction 0x0000 SetSyncFlag 0x00000002 WaitForSyncFlagAndClear 0x00000001 - _0807EB74 + FacePlayer SetSyncFlag 0x00000002 WaitForSyncFlagAndClear 0x00000001 SetEntitySpeed 0x0080 DoPostScriptAction 0x0001 _0807EDD4 0x0098, 0x0078 - _0807EB74 + FacePlayer DoPostScriptAction 0x0000 DoPostScriptAction 0x0001 MessageFromTargetPos 0x1059, 0x0000 diff --git a/data/scripts/cutscene/introBusinessScrub/script_080157AC.inc b/data/scripts/cutscene/introBusinessScrub/script_080157AC.inc index 6771b682..2a9be68c 100644 --- a/data/scripts/cutscene/introBusinessScrub/script_080157AC.inc +++ b/data/scripts/cutscene/introBusinessScrub/script_080157AC.inc @@ -2,20 +2,20 @@ SCRIPT_START script_080157AC CheckPlayerInRegion 0x01f8, 0x0310, 0x2020 JumpIfNot script_080157AC - _0807E864 - Call sub_0807F9A4 + SetPlayerIdle + Call WaitForPlayerNormal Call sub_0807DF28 SetSyncFlag 0x00000001 WaitForSyncFlagAndClear 0x00000002 Call sub_0807DF50 - _0807E878 + EnablePlayerControl script_080157DA: CheckPlayerInRegion 0x0250, 0x0230, 0x3040 JumpIfNot script_080157DA - _0807E864 - Call sub_0807F9A4 + SetPlayerIdle + Call WaitForPlayerNormal Call sub_0807DF28 - Call sub_0807F3F8 + Call CreatePlayerExclamationMark Wait 0x003c SetSyncFlag 0x00000001 WaitForSyncFlagAndClear 0x00000002 @@ -23,7 +23,7 @@ script_080157DA: _0807F0B4 0x0001 SetEntityPositionRelative 0x0248, 0x0218 CameraTargetEntity - Call sub_0807F5C0 + Call WaitForCameraTouchRoomBorder WaitForSyncFlagAndClear 0x00000010 SetSyncFlag 0x00000008 WaitForSyncFlagAndClear 0x00000020 @@ -38,7 +38,7 @@ script_080157DA: SetSyncFlag 0x00000001 WaitForSyncFlagAndClear 0x00000002 Call sub_0807DF50 - _0807E878 + EnablePlayerControl Call sub_08066F94 SetSyncFlag 0x00000008 script_08015880: @@ -48,7 +48,7 @@ script_08015888: WaitUntilTextboxCloses ComparePlayerAction 0x001c JumpIf script_08015888 - _0807E864 + SetPlayerIdle Call sub_0807DF28 _0807F0B4 0x0002 SetEntityPositionRelative 0x0248, 0x0208 @@ -79,7 +79,7 @@ script_08015888: .endif Call sub_08066FB8 Call sub_0807DF50 - _0807E878 + EnablePlayerControl _0807F0B4 0x0004 CameraTargetPlayer DoPostScriptAction 0x0006 diff --git a/data/scripts/cutscene/introBusinessScrub/script_08015B14.inc b/data/scripts/cutscene/introBusinessScrub/script_08015B14.inc index 0ec77806..f56416aa 100644 --- a/data/scripts/cutscene/introBusinessScrub/script_08015B14.inc +++ b/data/scripts/cutscene/introBusinessScrub/script_08015B14.inc @@ -1,7 +1,7 @@ @ OBJECT_6A in sub_080954AC ? businessScrubPrologue? SCRIPT_START script_08015B14 BeginBlock - _0807E930 0x0018 + SetAnimation 0x0018 SetEntitySpeed 0x0300 EndBlock _0807EDD4 0x0248, 0x0218 diff --git a/data/scripts/cutscene/introBusinessScrub/script_08015B34.inc b/data/scripts/cutscene/introBusinessScrub/script_08015B34.inc index d93ccb08..f58c6a2e 100644 --- a/data/scripts/cutscene/introBusinessScrub/script_08015B34.inc +++ b/data/scripts/cutscene/introBusinessScrub/script_08015B34.inc @@ -20,15 +20,15 @@ SCRIPT_START script_08015B34 CallWithArg sub_0807F6B4, 0x00000318 JumpIfNot script_08015B34 EndBlock - _0807E864 - Call sub_0807F9A4 + SetPlayerIdle + Call WaitForPlayerNormal Call sub_0807DF28 MessageFromTargetPos 0x2506, 0x0002 WaitUntilTextboxCloses StartPlayerScript script_PlayerAtIntroBusinessScrub4 WaitForSyncFlagAndClear 0x00000004 Call sub_0807DF50 - _0807E878 + EnablePlayerControl Jump script_08015B34 script_08015B7E: DoPostScriptAction 0x0006 diff --git a/data/scripts/cutscene/introBusinessScrub/script_BusinessScrubIntro.inc b/data/scripts/cutscene/introBusinessScrub/script_BusinessScrubIntro.inc index 52ceeee2..e81470fa 100644 --- a/data/scripts/cutscene/introBusinessScrub/script_BusinessScrubIntro.inc +++ b/data/scripts/cutscene/introBusinessScrub/script_BusinessScrubIntro.inc @@ -3,15 +3,15 @@ SCRIPT_START script_BusinessScrubIntro BeginBlock DoPostScriptAction 0x0007 DoPostScriptAction 0x000a - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 EndBlock WaitForSyncFlagAndClear 0x00000008 - _0807E908 0x0007 + SetAction 0x0007 WaitForSyncFlagAndClear 0x00000008 - _0807E908 0x0006 + SetAction 0x0006 SetRoomFlag 0x0000 - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 WaitForSyncFlagAndClear 0x00000008 Wait 0x003c diff --git a/data/scripts/cutscene/introBusinessScrub/script_PlayerAtIntroBusinessScrub4.inc b/data/scripts/cutscene/introBusinessScrub/script_PlayerAtIntroBusinessScrub4.inc index 02806a81..605ee80e 100644 --- a/data/scripts/cutscene/introBusinessScrub/script_PlayerAtIntroBusinessScrub4.inc +++ b/data/scripts/cutscene/introBusinessScrub/script_PlayerAtIntroBusinessScrub4.inc @@ -2,8 +2,8 @@ SCRIPT_START script_PlayerAtIntroBusinessScrub4 SetEntitySpeed 0x0100 DoPostScriptAction 0x0001 - _0807EC64 0x0010 - _0807EB44 0x0000 + WalkNorth 0x0010 + SetAnimationState 0x0000 DoPostScriptAction 0x0000 SetSyncFlag 0x00000004 Call sub_080791BC diff --git a/data/scripts/cutscene/introBusinessScrub/script_PlayerIntroBusinessScrub1.inc b/data/scripts/cutscene/introBusinessScrub/script_PlayerIntroBusinessScrub1.inc index a83e7979..36e3e08b 100644 --- a/data/scripts/cutscene/introBusinessScrub/script_PlayerIntroBusinessScrub1.inc +++ b/data/scripts/cutscene/introBusinessScrub/script_PlayerIntroBusinessScrub1.inc @@ -2,7 +2,7 @@ SCRIPT_START script_PlayerIntroBusinessScrub1 SetEntitySpeed 0x0100 _0807EDD4 0x0218, 0x0238 - _0807EB44 0x0002 + SetAnimationState 0x0002 DoPostScriptAction 0x0000 SetSyncFlag 0x00000010 Call sub_080791BC diff --git a/data/scripts/cutscene/introBusinessScrub/script_PlayerIntroBusinessScrub2.inc b/data/scripts/cutscene/introBusinessScrub/script_PlayerIntroBusinessScrub2.inc index ca673adf..d5c30e2a 100644 --- a/data/scripts/cutscene/introBusinessScrub/script_PlayerIntroBusinessScrub2.inc +++ b/data/scripts/cutscene/introBusinessScrub/script_PlayerIntroBusinessScrub2.inc @@ -2,7 +2,7 @@ SCRIPT_START script_PlayerIntroBusinessScrub2 SetEntitySpeed 0x0100 _0807EDD4 0x0238, 0x0228 - _0807EB44 0x0002 + SetAnimationState 0x0002 DoPostScriptAction 0x0000 SetSyncFlag 0x00000010 Call sub_080791BC diff --git a/data/scripts/cutscene/introBusinessScrub/script_PlayerIntroBusinessScrub3.inc b/data/scripts/cutscene/introBusinessScrub/script_PlayerIntroBusinessScrub3.inc index d9bb7e36..deea175d 100644 --- a/data/scripts/cutscene/introBusinessScrub/script_PlayerIntroBusinessScrub3.inc +++ b/data/scripts/cutscene/introBusinessScrub/script_PlayerIntroBusinessScrub3.inc @@ -2,7 +2,7 @@ SCRIPT_START script_PlayerIntroBusinessScrub3 SetEntitySpeed 0x0100 _0807EDD4 0x0248, 0x0208 - _0807EB44 0x0000 + SetAnimationState 0x0000 DoPostScriptAction 0x0000 SetSyncFlag 0x00000010 Call sub_080791BC diff --git a/data/scripts/cutscene/introBusinessScrub/script_ZeldaIntroBusinessScrub.inc b/data/scripts/cutscene/introBusinessScrub/script_ZeldaIntroBusinessScrub.inc index 1d91c7f0..ae7c5633 100644 --- a/data/scripts/cutscene/introBusinessScrub/script_ZeldaIntroBusinessScrub.inc +++ b/data/scripts/cutscene/introBusinessScrub/script_ZeldaIntroBusinessScrub.inc @@ -12,39 +12,39 @@ SCRIPT_START script_ZeldaIntroBusinessScrub MoveEntityToPlayer EndBlock DoPostScriptAction 0x0007 - _0807EB74 + FacePlayer _0807EDD4 0x01f8, 0x02f8 - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 MessageFromTargetPos 0x1011, 0x0002 WaitUntilTextboxCloses _0807EDD4 0x01f8, 0x0268 SetEntityPositionRelative 0x0248, 0x0218 - _0807EB44 0x0006 + SetAnimationState 0x0006 DoPostScriptAction 0x0000 SetSyncFlag 0x00000002 WaitForSyncFlagAndClear 0x00000001 - _0807EB44 0x0000 + SetAnimationState 0x0000 DoPostScriptAction 0x0000 SetSyncFlag 0x00000002 WaitForSyncFlagAndClear 0x00000001 Call sub_0807F3C8 PlaySound SFX_VO_ZELDA3 SetEntitySpeed 0x0200 - _0807ECC4 0x0008 - _0807E930 0x0040 - Call sub_0807F2D4 - _0807EB44 0x0006 + WalkSouth 0x0008 + SetAnimation 0x0040 + Call WaitForFrameHiBit + SetAnimationState 0x0006 DoPostScriptAction 0x0000 SetSyncFlag 0x00000002 WaitForSyncFlagAndClear 0x00000001 - _0807EB44 0x0006 + SetAnimationState 0x0006 DoPostScriptAction 0x0000 SetSyncFlag 0x00000002 WaitForSyncFlagAndClear 0x00000001 SetEntitySpeed 0x0100 _0807EDD4 0x0238, 0x0238 - _0807EB44 0x0000 + SetAnimationState 0x0000 DoPostScriptAction 0x0000 DoPostScriptAction 0x000a _0807E9D4 @@ -52,7 +52,7 @@ SCRIPT_START script_ZeldaIntroBusinessScrub script_08015A32: EndBlock BeginBlock - _0807EB74 + FacePlayer CheckRoomFlag 0x0000 JumpIf script_08015A54 CheckEntityInteractType @@ -64,7 +64,7 @@ script_08015A32: script_08015A54: EndBlock DoPostScriptAction 0x000b - _0807EB44 0x0000 + SetAnimationState 0x0000 DoPostScriptAction 0x0000 WaitForSyncFlagAndClear 0x00000001 Call sub_08066D4C diff --git a/data/scripts/cutscene/introCeremony/script_08011890.inc b/data/scripts/cutscene/introCeremony/script_08011890.inc index 9ccc9bc5..b6f22f79 100644 --- a/data/scripts/cutscene/introCeremony/script_08011890.inc +++ b/data/scripts/cutscene/introCeremony/script_08011890.inc @@ -1,7 +1,7 @@ @ Something during Intro Ceremony? Called via script_VaatiIntroCeremony SCRIPT_START script_08011890 BeginBlock - _0807E930 0x0000 + SetAnimation 0x0000 SetEntitySpeed 0x0200 Call nullsub_527 Call sub_08094B80 diff --git a/data/scripts/cutscene/introCeremony/script_GuardBottomRight.inc b/data/scripts/cutscene/introCeremony/script_GuardBottomRight.inc index 59b81dea..826ad37f 100644 --- a/data/scripts/cutscene/introCeremony/script_GuardBottomRight.inc +++ b/data/scripts/cutscene/introCeremony/script_GuardBottomRight.inc @@ -3,33 +3,33 @@ SCRIPT_START script_GuardBottomRight ClearSyncFlag 0x00002000 SetSyncFlag 0x00004000 WaitForSyncFlagAndClear 0x00002000 - _0807E930 0x0005 - _0807EB44 0x0002 - _0807EC94 0x0010 - _0807EB44 0x0004 - _0807E930 0x0002 + SetAnimation 0x0005 + SetAnimationState 0x0002 + WalkEast 0x0010 + SetAnimationState 0x0004 + SetAnimation 0x0002 SetSyncFlag 0x00004000 WaitForSyncFlagAndClear 0x00002000 DoPostScriptAction 0x0004 Wait 0x003c - _0807E930 0x0012 + SetAnimation 0x0012 PlaySound SFX_EM_MOBLIN_SPEAR Wait 0x003c - _0807E930 0x0014 + SetAnimation 0x0014 SetEntitySpeed 0x0100 _0807EDD4 0x0200, 0x0098 _0807EDD4 0x0200, 0x00c8 - _0807E930 0x0013 + SetAnimation 0x0013 SetSyncFlag 0x00004000 WaitForSyncFlagAndClear 0x00002000 DoPostScriptAction 0x0010 Wait 0x000a DoPostScriptAction 0x0010 Call sub_0807F3C8 - _0807E930 0x0014 + SetAnimation 0x0014 SetEntitySpeed 0x0400 SetEntityDirection 0x0002 - _0807EC1C 0x003c + WalkForward 0x003c SetSyncFlag 0x00004000 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/cutscene/introCeremony/script_GuardCarryingChest.inc b/data/scripts/cutscene/introCeremony/script_GuardCarryingChest.inc index 33d049b7..a2cdf5ff 100644 --- a/data/scripts/cutscene/introCeremony/script_GuardCarryingChest.inc +++ b/data/scripts/cutscene/introCeremony/script_GuardCarryingChest.inc @@ -5,17 +5,17 @@ SCRIPT_START script_GuardCarryingChest DoPostScriptAction 0x0008 SetEntitySpeed 0x0100 Call sub_08095244 - Call sub_0807F338 + Call DeleteHitbox EndBlock WaitForSyncFlag 0x0002a800 DoPostScriptAction 0x0007 - _0807E930 0x0006 - _0807ECC4 0x0010 + SetAnimation 0x0006 + WalkSouth 0x0010 Wait 0x003c - _0807ECC4 0x0010 + WalkSouth 0x0010 Wait 0x003c - _0807ECC4 0x0010 - _0807E930 0x0002 + WalkSouth 0x0010 + SetAnimation 0x0002 Call sub_08064050 JumpTable script_08011312, script_GuardBottomRight, script_GuardTopLeft, script_GuardTopRight @ Guard bottom left: @@ -23,33 +23,33 @@ script_08011312: ClearSyncFlag 0x00000800 SetSyncFlag 0x00001000 WaitForSyncFlagAndClear 0x00000800 - _0807E930 0x0007 - _0807EB44 0x0006 - _0807ECF4 0x0010 - _0807EB44 0x0004 - _0807E930 0x0002 + SetAnimation 0x0007 + SetAnimationState 0x0006 + WalkWest 0x0010 + SetAnimationState 0x0004 + SetAnimation 0x0002 SetSyncFlag 0x00001000 WaitForSyncFlagAndClear 0x00000800 DoPostScriptAction 0x0004 Wait 0x003c - _0807E930 0x0012 + SetAnimation 0x0012 PlaySound SFX_EM_MOBLIN_SPEAR Wait 0x003c - _0807E930 0x0014 + SetAnimation 0x0014 SetEntitySpeed 0x0100 _0807EDD4 0x01f0, 0x0098 _0807EDD4 0x01f0, 0x00c8 - _0807E930 0x0013 + SetAnimation 0x0013 SetSyncFlag 0x00001000 WaitForSyncFlagAndClear 0x00000800 DoPostScriptAction 0x0010 Wait 0x000a DoPostScriptAction 0x0010 Call sub_0807F3C8 - _0807E930 0x0014 + SetAnimation 0x0014 SetEntitySpeed 0x0400 SetEntityDirection 0x001e - _0807EC1C 0x003c + WalkForward 0x003c SetSyncFlag 0x00001000 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/cutscene/introCeremony/script_GuardEntryLeft.inc b/data/scripts/cutscene/introCeremony/script_GuardEntryLeft.inc index c826ed27..297a4f5c 100644 --- a/data/scripts/cutscene/introCeremony/script_GuardEntryLeft.inc +++ b/data/scripts/cutscene/introCeremony/script_GuardEntryLeft.inc @@ -2,14 +2,14 @@ SCRIPT_START script_GuardEntryLeft BeginBlock SetEntitySpeed 0x0100 - _0807EB44 0x0002 - _0807E930 0x0001 + SetAnimationState 0x0002 + SetAnimation 0x0001 EndBlock WaitForSyncFlagAndClear 0x00080000 - _0807E930 0x0005 + SetAnimation 0x0005 PlaySound SFX_11C - _0807ECF4 0x0010 - _0807E930 0x0001 + WalkWest 0x0010 + SetAnimation 0x0001 SetSyncFlag 0x00100000 WaitForSyncFlagAndClear 0x00080000 DoPostScriptAction 0x0006 diff --git a/data/scripts/cutscene/introCeremony/script_GuardEntryRight.inc b/data/scripts/cutscene/introCeremony/script_GuardEntryRight.inc index 3a132ca8..20ab6b1b 100644 --- a/data/scripts/cutscene/introCeremony/script_GuardEntryRight.inc +++ b/data/scripts/cutscene/introCeremony/script_GuardEntryRight.inc @@ -2,14 +2,14 @@ SCRIPT_START script_GuardEntryRight BeginBlock SetEntitySpeed 0x0100 - _0807EB44 0x0006 - _0807E930 0x0003 + SetAnimationState 0x0006 + SetAnimation 0x0003 EndBlock WaitForSyncFlagAndClear 0x00200000 - _0807E930 0x0007 + SetAnimation 0x0007 PlaySound SFX_11C - _0807EC94 0x0010 - _0807E930 0x0003 + WalkEast 0x0010 + SetAnimation 0x0003 SetSyncFlag 0x00400000 WaitForSyncFlagAndClear 0x00200000 DoPostScriptAction 0x0006 diff --git a/data/scripts/cutscene/introCeremony/script_GuardTopLeft.inc b/data/scripts/cutscene/introCeremony/script_GuardTopLeft.inc index d8dd17d9..b92edbd5 100644 --- a/data/scripts/cutscene/introCeremony/script_GuardTopLeft.inc +++ b/data/scripts/cutscene/introCeremony/script_GuardTopLeft.inc @@ -3,42 +3,42 @@ SCRIPT_START script_GuardTopLeft ClearSyncFlag 0x00008000 SetSyncFlag 0x00010000 WaitForSyncFlagAndClear 0x00008000 - _0807E930 0x0007 - _0807EB44 0x0006 - _0807ECF4 0x0020 - _0807EB44 0x0004 - _0807E930 0x0006 - _0807ECC4 0x0010 - _0807E930 0x0002 + SetAnimation 0x0007 + SetAnimationState 0x0006 + WalkWest 0x0020 + SetAnimationState 0x0004 + SetAnimation 0x0006 + WalkSouth 0x0010 + SetAnimation 0x0002 SetSyncFlag 0x00010000 WaitForSyncFlagAndClear 0x00008000 DoPostScriptAction 0x0004 Wait 0x003c - _0807E930 0x0012 + SetAnimation 0x0012 PlaySound SFX_EM_MOBLIN_SPEAR SetSyncFlag 0x00010000 WaitForSyncFlagAndClear 0x00008000 - _0807E930 0x0014 + SetAnimation 0x0014 SetEntitySpeed 0x0100 _0807EDD4 0x01e8, 0x0098 SetEntitySpeed 0x0040 _0807EEF4 0x0000, 0x0010 - _0807E930 0x0013 + SetAnimation 0x0013 SetSyncFlag 0x00010000 WaitForSyncFlagAndClear 0x00008000 DoPostScriptAction 0x000d - _0807E930 0x0014 + SetAnimation 0x0014 SetEntitySpeed 0x0020 _0807EEF4 0x0000, 0xfff0 - _0807E930 0x0013 + SetAnimation 0x0013 DoPostScriptAction 0x0010 SetSyncFlag 0x00010000 WaitForSyncFlagAndClear 0x00008000 Call sub_0807F3C8 - _0807E930 0x0014 + SetAnimation 0x0014 SetEntitySpeed 0x0400 SetEntityDirection 0x001e - _0807EC1C 0x003c + WalkForward 0x003c SetSyncFlag 0x00010000 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/cutscene/introCeremony/script_GuardTopRight.inc b/data/scripts/cutscene/introCeremony/script_GuardTopRight.inc index 1a5b8eb3..5a29854c 100644 --- a/data/scripts/cutscene/introCeremony/script_GuardTopRight.inc +++ b/data/scripts/cutscene/introCeremony/script_GuardTopRight.inc @@ -3,42 +3,42 @@ SCRIPT_START script_GuardTopRight ClearSyncFlag 0x00020000 SetSyncFlag 0x00040000 WaitForSyncFlagAndClear 0x00020000 - _0807E930 0x0005 - _0807EB44 0x0002 - _0807EC94 0x0020 - _0807EB44 0x0004 - _0807E930 0x0006 - _0807ECC4 0x0010 - _0807E930 0x0002 + SetAnimation 0x0005 + SetAnimationState 0x0002 + WalkEast 0x0020 + SetAnimationState 0x0004 + SetAnimation 0x0006 + WalkSouth 0x0010 + SetAnimation 0x0002 SetSyncFlag 0x00040000 WaitForSyncFlagAndClear 0x00020000 DoPostScriptAction 0x0004 Wait 0x003c - _0807E930 0x0012 + SetAnimation 0x0012 PlaySound SFX_EM_MOBLIN_SPEAR SetSyncFlag 0x00040000 WaitForSyncFlagAndClear 0x00020000 - _0807E930 0x0014 + SetAnimation 0x0014 SetEntitySpeed 0x0100 _0807EDD4 0x0208, 0x0098 SetEntitySpeed 0x0040 _0807EEF4 0x0000, 0x0010 - _0807E930 0x0013 + SetAnimation 0x0013 SetSyncFlag 0x00040000 WaitForSyncFlagAndClear 0x00020000 DoPostScriptAction 0x000d - _0807E930 0x0014 + SetAnimation 0x0014 SetEntitySpeed 0x0020 _0807EEF4 0x0000, 0xfff0 - _0807E930 0x0013 + SetAnimation 0x0013 DoPostScriptAction 0x0010 SetSyncFlag 0x00040000 WaitForSyncFlagAndClear 0x00020000 Call sub_0807F3C8 - _0807E930 0x0014 + SetAnimation 0x0014 SetEntitySpeed 0x0400 SetEntityDirection 0x0002 - _0807EC1C 0x003c + WalkForward 0x003c SetSyncFlag 0x00040000 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/cutscene/introCeremony/script_KingDaltusIntroCeremony.inc b/data/scripts/cutscene/introCeremony/script_KingDaltusIntroCeremony.inc index cab32512..afefc1f7 100644 --- a/data/scripts/cutscene/introCeremony/script_KingDaltusIntroCeremony.inc +++ b/data/scripts/cutscene/introCeremony/script_KingDaltusIntroCeremony.inc @@ -2,10 +2,10 @@ SCRIPT_START script_KingDaltusIntroCeremony BeginBlock DoPostScriptAction 0x0008 - _0807EB44 0x0004 + SetAnimationState 0x0004 SetEntitySpeed 0x0100 EndBlock - Call sub_0807F338 + Call DeleteHitbox WaitForSyncFlagAndClear 0x00000040 DoPostScriptAction 0x0007 DoPostScriptAction 0x0001 @@ -20,7 +20,7 @@ SCRIPT_START script_KingDaltusIntroCeremony Call sub_0807F3C8 SetEntitySpeed 0x0400 SetEntityDirection 0x0008 - _0807EC1C 0x003c + WalkForward 0x003c SetSyncFlag 0x00000080 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/cutscene/introCeremony/script_MinisterPothoIntroCastle.inc b/data/scripts/cutscene/introCeremony/script_MinisterPothoIntroCastle.inc index 0af3031f..3cf08be1 100644 --- a/data/scripts/cutscene/introCeremony/script_MinisterPothoIntroCastle.inc +++ b/data/scripts/cutscene/introCeremony/script_MinisterPothoIntroCastle.inc @@ -1,7 +1,7 @@ @ Intro Hyrule Castle Minister Potho SCRIPT_START script_MinisterPothoIntroCastle BeginBlock - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 .ifdef JP .ifndef DEMO_JP @@ -22,18 +22,18 @@ script_08011134: DoPostScriptAction 0x000b WaitForSyncFlagAndClear 0x00000004 SetEntityPositionRelative 0x01b8, 0x0058 - _0807EB44 0x0004 + SetAnimationState 0x0004 SetSyncFlag 0x00000008 WaitForSyncFlagAndClear 0x00000004 - _0807EB44 0x0006 + SetAnimationState 0x0006 SetSyncFlag 0x00000008 WaitForSyncFlagAndClear 0x00000004 - _0807EB44 0x0004 + SetAnimationState 0x0004 SetSyncFlag 0x00000008 WaitForSyncFlagAndClear 0x00000004 SetEntitySpeed 0x0100 DoPostScriptAction 0x0001 - _0807ECC4 0x0010 + WalkSouth 0x0010 DoPostScriptAction 0x0000 SetSyncFlag 0x00000008 WaitForSyncFlagAndClear 0x00000004 @@ -43,7 +43,7 @@ script_08011134: Call sub_0807F3C8 SetEntitySpeed 0x0400 SetEntityDirection 0x001c - _0807EC1C 0x003c + WalkForward 0x003c SetSyncFlag 0x00000008 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/cutscene/introCeremony/script_Npc4EMonsters.inc b/data/scripts/cutscene/introCeremony/script_Npc4EMonsters.inc index f64d4428..4385bb7b 100644 --- a/data/scripts/cutscene/introCeremony/script_Npc4EMonsters.inc +++ b/data/scripts/cutscene/introCeremony/script_Npc4EMonsters.inc @@ -13,7 +13,7 @@ SCRIPT_START script_Npc4EMonsters PlaySound SFX_12C SetSyncFlag 0x00800000 WaitForSyncFlagAndClear 0x01000000 - _0807E778 0x0004 + SetFadeTime 0x0004 DoFade7 WaitForFadeFinish Wait 0x003c @@ -22,14 +22,14 @@ SCRIPT_START script_Npc4EMonsters LoadRoomEntityList gUnk_080F0770 SetSyncFlag 0x00000010 WaitForSyncFlagAndClear 0x00000020 - _0807E778 0x0002 + SetFadeTime 0x0002 DoFade6 WaitForFadeFinish CallWithArg DeleteManager36, 0x00000002 _0807F0C8 0x0000, 0x0000 Call sub_0806DC3C Call sub_080791BC - CallWithArg sub_0807F244, 0x0000000d + CallWithArg EquipItem, 0x0000000d CallWithArg sub_0807F29C, gUnk_080049F6 _0807F0B4 0x0001 SetEntityPositionRelative 0x01f8, 0x0068 diff --git a/data/scripts/cutscene/introCeremony/script_Npc4EVaatiAttacking.inc b/data/scripts/cutscene/introCeremony/script_Npc4EVaatiAttacking.inc index 69a6d693..54bd0c43 100644 --- a/data/scripts/cutscene/introCeremony/script_Npc4EVaatiAttacking.inc +++ b/data/scripts/cutscene/introCeremony/script_Npc4EVaatiAttacking.inc @@ -9,7 +9,7 @@ SCRIPT_START script_Npc4EVaatiAttacking WaitUntilTextboxCloses Call sub_0806DC3C Call sub_080791BC - CallWithArg sub_0807F244, 0x0000000d + CallWithArg EquipItem, 0x0000000d CallWithArg sub_0807F29C, gUnk_080049F6 Wait 0x001e SetSyncFlag 0x00000100 diff --git a/data/scripts/cutscene/introCeremony/script_Object6ASwordInChest.inc b/data/scripts/cutscene/introCeremony/script_Object6ASwordInChest.inc index 3b4b91f2..2932134e 100644 --- a/data/scripts/cutscene/introCeremony/script_Object6ASwordInChest.inc +++ b/data/scripts/cutscene/introCeremony/script_Object6ASwordInChest.inc @@ -12,7 +12,7 @@ SCRIPT_START script_Object6ASwordInChest Wait 0x003c SetSyncFlag 0x01000000 WaitForSyncFlagAndClear 0x00800000 - _0807E930 0x0002 + SetAnimation 0x0002 SetSyncFlag 0x01000000 WaitForSyncFlagAndClear 0x00800000 DoPostScriptAction 0x0006 diff --git a/data/scripts/cutscene/introCeremony/script_PlayerAtIntroCeremony.inc b/data/scripts/cutscene/introCeremony/script_PlayerAtIntroCeremony.inc index 0d800ec9..33d0784c 100644 --- a/data/scripts/cutscene/introCeremony/script_PlayerAtIntroCeremony.inc +++ b/data/scripts/cutscene/introCeremony/script_PlayerAtIntroCeremony.inc @@ -1,7 +1,7 @@ @ Intro Ceremony Player SCRIPT_START script_PlayerAtIntroCeremony SetEntityPositionRelative 0x01a8, 0x0058 - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 SetSyncFlag 0x00000400 ClearSyncFlag 0x00000002 diff --git a/data/scripts/cutscene/introCeremony/script_PlayerFainting.inc b/data/scripts/cutscene/introCeremony/script_PlayerFainting.inc index 386826af..880c2d9e 100644 --- a/data/scripts/cutscene/introCeremony/script_PlayerFainting.inc +++ b/data/scripts/cutscene/introCeremony/script_PlayerFainting.inc @@ -1,17 +1,17 @@ @ Intro Ceremony Player fainting SCRIPT_START script_PlayerFainting PlaySound SFX_PLY_VO6 - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x000d PlaySound SFX_86 Call sub_0807F36C SetEntitySpeed 0x0400 - _0807ECF4 0x0008 + WalkWest 0x0008 BeginBlock Call sub_0807F1E8 DoPostScriptAction 0x0011 EndBlock - Call sub_0807F2D4 + Call WaitForFrameHiBit WaitForSyncFlag 0x80000000 Call sub_080791BC SCRIPT_END diff --git a/data/scripts/cutscene/introCeremony/script_PlayerIntroCastle.inc b/data/scripts/cutscene/introCeremony/script_PlayerIntroCastle.inc index f3d1557d..78be94a1 100644 --- a/data/scripts/cutscene/introCeremony/script_PlayerIntroCastle.inc +++ b/data/scripts/cutscene/introCeremony/script_PlayerIntroCastle.inc @@ -4,7 +4,7 @@ SCRIPT_START script_PlayerIntroCastle SetEntitySpeed 0x0080 EndBlock _0807EDD4 0x01e8, 0x0050 - _0807EB44 0x0000 + SetAnimationState 0x0000 DoPostScriptAction 0x0000 SetSyncFlag 0x00000400 Call sub_080791BC diff --git a/data/scripts/cutscene/introCeremony/script_PlayerProtectingZelda.inc b/data/scripts/cutscene/introCeremony/script_PlayerProtectingZelda.inc index e0c26443..dc4e414f 100644 --- a/data/scripts/cutscene/introCeremony/script_PlayerProtectingZelda.inc +++ b/data/scripts/cutscene/introCeremony/script_PlayerProtectingZelda.inc @@ -6,7 +6,7 @@ SCRIPT_START script_PlayerProtectingZelda SetEntitySpeed 0x0200 DoPostScriptAction 0x0001 _0807EDD4 0x01d8, 0x0068 - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 SetSyncFlag 0x00000400 Call sub_080791BC diff --git a/data/scripts/cutscene/introCeremony/script_VaatiDarkMagic.inc b/data/scripts/cutscene/introCeremony/script_VaatiDarkMagic.inc index c00eb537..24b9f903 100644 --- a/data/scripts/cutscene/introCeremony/script_VaatiDarkMagic.inc +++ b/data/scripts/cutscene/introCeremony/script_VaatiDarkMagic.inc @@ -1,7 +1,7 @@ @ Intro Ceremony Vaati Dark magic? SCRIPT_START script_VaatiDarkMagic BeginBlock - _0807E930 0x0000 + SetAnimation 0x0000 SetEntitySpeed 0x0200 Call nullsub_527 Call sub_08094B80 diff --git a/data/scripts/cutscene/introCeremony/script_VaatiIntroCeremony.inc b/data/scripts/cutscene/introCeremony/script_VaatiIntroCeremony.inc index 2557a4c2..13d6fa8c 100644 --- a/data/scripts/cutscene/introCeremony/script_VaatiIntroCeremony.inc +++ b/data/scripts/cutscene/introCeremony/script_VaatiIntroCeremony.inc @@ -1,37 +1,37 @@ @ Intro Ceremony Vaati SCRIPT_START script_VaatiIntroCeremony BeginBlock - _0807EB44 0x0000 + SetAnimationState 0x0000 SetEntitySpeed 0x0100 EndBlock - Call sub_0807F338 + Call DeleteHitbox WaitForSyncFlagAndClear 0x00000100 DoPostScriptAction 0x0001 _0807EDD4 0x01f8, 0x00d0 DoPostScriptAction 0x0000 SetSyncFlag 0x00000200 WaitForSyncFlagAndClear 0x00000100 - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x001c - Call sub_0807F2D4 - _0807EB44 0x0004 + Call WaitForFrameHiBit + SetAnimationState 0x0004 DoPostScriptAction 0x0000 SetSyncFlag 0x00000200 WaitForSyncFlagAndClear 0x00000100 - _0807EB44 0x0000 + SetAnimationState 0x0000 DoPostScriptAction 0x001c - Call sub_0807F2D4 - _0807EB44 0x0000 + Call WaitForFrameHiBit + SetAnimationState 0x0000 DoPostScriptAction 0x0000 SetSyncFlag 0x00000200 WaitForSyncFlagAndClear 0x00000100 - _0807EB44 0x0000 + SetAnimationState 0x0000 DoPostScriptAction 0x001a - Call sub_0807F2D4 + Call WaitForFrameHiBit DoPostScriptAction 0x0000 SetSyncFlag 0x00000200 WaitForSyncFlagAndClear 0x00000100 - _0807EB44 0x0000 + SetAnimationState 0x0000 DoPostScriptAction 0x0014 PlaySound SFX_CHARGING_UP CallWithArg sub_08095420, script_08011890 @@ -45,7 +45,7 @@ SCRIPT_START script_VaatiIntroCeremony SetEntitySpeed 0x0080 DoPostScriptAction 0x0001 _0807EDD4 0x01d8, 0x00a8 - _0807EB44 0x0000 + SetAnimationState 0x0000 DoPostScriptAction 0x0000 SetSyncFlag 0x00000200 WaitForSyncFlagAndClear 0x00000100 @@ -65,14 +65,14 @@ SCRIPT_START script_VaatiIntroCeremony SetEntitySpeed 0x0100 DoPostScriptAction 0x0001 _0807EDD4 0x01f8, 0x0098 - _0807EB44 0x0000 + SetAnimationState 0x0000 DoPostScriptAction 0x0000 DoPostScriptAction 0x0004 Wait 0x005a - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x001c - Call sub_0807F2D4 - _0807EB44 0x0004 + Call WaitForFrameHiBit + SetAnimationState 0x0004 DoPostScriptAction 0x0000 Wait 0x001e SetSyncFlag 0x00000200 diff --git a/data/scripts/cutscene/introCeremony/script_ZeldaIntroCastle.inc b/data/scripts/cutscene/introCeremony/script_ZeldaIntroCastle.inc index b0554ed0..cfe741b1 100644 --- a/data/scripts/cutscene/introCeremony/script_ZeldaIntroCastle.inc +++ b/data/scripts/cutscene/introCeremony/script_ZeldaIntroCastle.inc @@ -5,20 +5,20 @@ SCRIPT_START script_ZeldaIntroCastle SetEntitySpeed 0x0100 Call sub_08066D04 EndBlock - Call sub_0807F338 + Call DeleteHitbox WaitForSyncFlagAndClear 0x00000010 Call sub_08066D14 JumpIf script_080111F6 MoveEntityToPlayer script_080111F6: - Call sub_0807F8BC + Call CheckEntityOnScreen JumpIf script_08011206 SetEntityPositionRelative 0x01f8, 0x00b8 script_08011206: DoPostScriptAction 0x0007 DoPostScriptAction 0x0001 _0807EDD4 0x01f8, 0x0050 - _0807EB74 + FacePlayer DoPostScriptAction 0x0000 SetSyncFlag 0x00000020 WaitForSyncFlagAndClear 0x00000010 @@ -48,7 +48,7 @@ script_08011206: Call sub_08066E20 Wait 0x0014 DoPostScriptAction 0x0010 - Call sub_0807F2D4 + Call WaitForFrameHiBit PlaySound SFX_1CA SetSyncFlag 0x00000020 WaitForSyncFlagAndClear 0x00000010 diff --git a/data/scripts/cutscene/introTown/script_BeedleIntro.inc b/data/scripts/cutscene/introTown/script_BeedleIntro.inc index e0e1359b..743a6c56 100644 --- a/data/scripts/cutscene/introTown/script_BeedleIntro.inc +++ b/data/scripts/cutscene/introTown/script_BeedleIntro.inc @@ -1,20 +1,20 @@ @ Intro Hyrule Town Beedle SCRIPT_START script_BeedleIntro BeginBlock - _0807EB44 0x0004 - _0807E930 0x0000 + SetAnimationState 0x0004 + SetAnimation 0x0000 _0807E9D4 DoPostScriptAction 0x000a - Call sub_0807F348 + Call SetPriorityMessage EndBlock script_0800F604: CheckEntityInteractType JumpIfNot script_0800F604 - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer CallWithArg sub_0807F3D8, 0x00000008 MessageNoOverlap 0x2511 WaitUntilTextboxCloses Wait 0x000f - _0807E878 + EnablePlayerControl Jump script_0800F604 diff --git a/data/scripts/cutscene/introTown/script_GuardIntro.inc b/data/scripts/cutscene/introTown/script_GuardIntro.inc index 9424bff8..e35ab50f 100644 --- a/data/scripts/cutscene/introTown/script_GuardIntro.inc +++ b/data/scripts/cutscene/introTown/script_GuardIntro.inc @@ -1,7 +1,7 @@ @ Intro Hyrule Town Guard SCRIPT_START script_GuardIntro BeginBlock - _0807EB44 0x0006 + SetAnimationState 0x0006 _0807E9D4 DoPostScriptAction 0x000a CallWithArg sub_0807F3D8, 0x00000008 @@ -9,11 +9,11 @@ SCRIPT_START script_GuardIntro script_0800F5C8: CheckEntityInteractType JumpIfNot script_0800F5C8 - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer CallWithArg sub_0807F3D8, 0x00000008 Call sub_08064428 WaitUntilTextboxCloses - _0807E878 + EnablePlayerControl Jump script_0800F5C8 .2byte 0x0000 diff --git a/data/scripts/cutscene/introTown/script_KidIntro1.inc b/data/scripts/cutscene/introTown/script_KidIntro1.inc index c705c186..e3ccdb3a 100644 --- a/data/scripts/cutscene/introTown/script_KidIntro1.inc +++ b/data/scripts/cutscene/introTown/script_KidIntro1.inc @@ -8,11 +8,11 @@ SCRIPT_START script_KidIntro1 script_0800F592: CheckEntityInteractType JumpIfNot script_0800F592 - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer Call sub_0806265C WaitUntilTextboxCloses - _0807E878 + EnablePlayerControl DoPostScriptAction 0x0001 Jump script_0800F592 .2byte 0x0000 diff --git a/data/scripts/cutscene/introTown/script_KidIntro2.inc b/data/scripts/cutscene/introTown/script_KidIntro2.inc index 008ef2e8..dfc9c3ce 100644 --- a/data/scripts/cutscene/introTown/script_KidIntro2.inc +++ b/data/scripts/cutscene/introTown/script_KidIntro2.inc @@ -23,11 +23,11 @@ script_0800F6F4: JumpIf script_0800F718 CheckEntityInteractType JumpIfNot script_0800F6F4 - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer Call sub_0806265C WaitUntilTextboxCloses - _0807E878 + EnablePlayerControl DoPostScriptAction 0x0001 Jump script_0800F6F4 script_0800F718: diff --git a/data/scripts/cutscene/introTown/script_Npc4EIntroCastle.inc b/data/scripts/cutscene/introTown/script_Npc4EIntroCastle.inc index ea3471c4..722006a3 100644 --- a/data/scripts/cutscene/introTown/script_Npc4EIntroCastle.inc +++ b/data/scripts/cutscene/introTown/script_Npc4EIntroCastle.inc @@ -1,7 +1,7 @@ @ Intro Hyrule Castle NPC4E SCRIPT_START script_Npc4EIntroCastle - _0807E864 - Call sub_0807F9A4 + SetPlayerIdle + Call WaitForPlayerNormal Call sub_0807DF28 StartPlayerScript script_PlayerIntroCastle WaitForSyncFlagAndClear 0x00000400 @@ -17,7 +17,7 @@ SCRIPT_START script_Npc4EIntroCastle MessageFromTargetPos 0x1038, 0x000c WaitUntilTextboxCloses StopBgm - _0807E778 0x0004 + SetFadeTime 0x0004 DoFade5 WaitForFadeFinish Call sub_08064180 @@ -38,7 +38,7 @@ SCRIPT_START script_Npc4EIntroCastle CameraTargetEntity Wait 0x000a _0807F0B4 0x0001 - _0807E778 0x0001 + SetFadeTime 0x0001 DoFade4 SetSyncFlag 0x0002a800 WaitForSyncFlagAndClear 0x00055000 diff --git a/data/scripts/cutscene/introTown/script_Npc4EIntroTown.inc b/data/scripts/cutscene/introTown/script_Npc4EIntroTown.inc index 67df44fd..409387ac 100644 --- a/data/scripts/cutscene/introTown/script_Npc4EIntroTown.inc +++ b/data/scripts/cutscene/introTown/script_Npc4EIntroTown.inc @@ -14,23 +14,23 @@ SCRIPT_START script_Npc4EIntroTown .endif .endif JumpIf script_0800FA4C - _0807E864 + SetPlayerIdle Call sub_0807DF28 SetEntityPositionRelative 0x00c8, 0x0148 Call sub_0807F844 - _0807E778 0x0002 + SetFadeTime 0x0002 DoFade6 WaitForFadeFinish StartPlayerScript script_PlayerIntro1 SetSyncFlag 0x00000002 _0807F0B4 0x0001 SetEntityPositionRelative 0x00c8, 0x0218 - Call sub_0807F5C0 + Call WaitForCameraTouchRoomBorder Wait 0x0064 @ Camera reaches center of town square _0807F0B4 0x0002 SetEntityPositionRelative 0x00c8, 0x0368 - Call sub_0807F5C0 + Call WaitForCameraTouchRoomBorder WaitForSyncFlagAndClear 0x00000001 WaitForSyncFlagAndClear 0x00000004 @ First message from Zelda @@ -42,10 +42,10 @@ SCRIPT_START script_Npc4EIntroTown _0807F0B4 0x0004 CameraTargetPlayer Call sub_0807DF50 - _0807E878 + EnablePlayerControl SetSyncFlag 0x00000010 WaitForSyncFlagAndClear 0x00000004 - _0807E864 + SetPlayerIdle Call sub_0807DF28 StartPlayerScript script_PlayerIntro2 WaitForSyncFlagAndClear 0x00000001 @@ -56,9 +56,9 @@ SCRIPT_START script_Npc4EIntroTown SetSyncFlag 0x00000002 WaitForSyncFlagAndClear 0x00000004 Call sub_0807DF50 - _0807E878 + EnablePlayerControl WaitForSyncFlagAndClear 0x00000004 - _0807E864 + SetPlayerIdle Call sub_0807DF28 StartPlayerScript script_PlayerIntro3 WaitForSyncFlagAndClear 0x00000001 @@ -69,9 +69,9 @@ SCRIPT_START script_Npc4EIntroTown SetSyncFlag 0x00000002 WaitForSyncFlagAndClear 0x00000004 Call sub_0807DF50 - _0807E878 + EnablePlayerControl WaitForSyncFlagAndClear 0x00000004 - _0807E864 + SetPlayerIdle Call sub_0807DF28 StartPlayerScript script_PlayerIntro4 WaitForSyncFlagAndClear 0x00000001 @@ -82,16 +82,16 @@ SCRIPT_START script_Npc4EIntroTown SetSyncFlag 0x00000002 WaitForSyncFlagAndClear 0x00000004 Call sub_0807DF50 - _0807E878 + EnablePlayerControl @ Wait for Link at Pina WaitForSyncFlagAndClear 0x00000004 - _0807E864 + SetPlayerIdle Call sub_0807DF28 Call sub_08063C5C PlaySound SFX_CUCCO_MINIGAME_BELL Wait 0x001e _0807E8E4_0 - Call sub_0807F3F8 + Call CreatePlayerExclamationMark Wait 0x003c MessageFromTargetPos 0x1021, 0x000e WaitUntilTextboxCloses @@ -152,7 +152,7 @@ SCRIPT_START script_Npc4EIntroTown Call sub_08094E0C Wait 0x001e _0807E8E4_1 - Call sub_0807F3F8 + Call CreatePlayerExclamationMark Wait 0x003c MessageFromTargetPos 0x102b, 0x0000 WaitUntilTextboxCloses @@ -161,7 +161,7 @@ SCRIPT_START script_Npc4EIntroTown WaitPlayerGetItem Call sub_0806DC3C Call sub_080791BC - CallWithArg sub_0807F244, 0x0000000d + CallWithArg EquipItem, 0x0000000d SetIntVariable 0x000000ff Call sub_0807F5B0 CallWithArg sub_0807F29C, gUnk_080049D6 @@ -192,7 +192,7 @@ SCRIPT_START script_Npc4EIntroTown .endif .endif Call sub_0807DF50 - _0807E878 + EnablePlayerControl script_0800FA4C: DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/cutscene/introTown/script_Object69IntroTown.inc b/data/scripts/cutscene/introTown/script_Object69IntroTown.inc index ff9f8d27..a2710b62 100644 --- a/data/scripts/cutscene/introTown/script_Object69IntroTown.inc +++ b/data/scripts/cutscene/introTown/script_Object69IntroTown.inc @@ -33,24 +33,24 @@ script_0800FD1A: .endif .endif JumpIf script_0800FD5C - _0807E864 - Call sub_0807F9A4 + SetPlayerIdle + Call WaitForPlayerNormal MessageFromTargetPos 0x2506, 0x0000 WaitUntilTextboxCloses StartPlayerScript script_PlayerIntroTown WaitForSyncFlagAndClear 0x00000008 - _0807E878 + EnablePlayerControl Jump script_0800FD1A script_0800FD50: CheckPlayerInRegion 0x00c8, 0x03c0, 0x1040 JumpIfNot script_0800FD50 script_0800FD5C: - _0807E864 - Call sub_0807F9A4 + SetPlayerIdle + Call WaitForPlayerNormal MessageFromTargetPos 0x106c, 0x0000 WaitUntilTextboxCloses StartPlayerScript script_PlayerIntroTown WaitForSyncFlagAndClear 0x00000008 - _0807E878 + EnablePlayerControl Jump script_0800FD50 .2byte 0x0000 diff --git a/data/scripts/cutscene/introTown/script_PercyIntro.inc b/data/scripts/cutscene/introTown/script_PercyIntro.inc index a8fda42a..5904f8a8 100644 --- a/data/scripts/cutscene/introTown/script_PercyIntro.inc +++ b/data/scripts/cutscene/introTown/script_PercyIntro.inc @@ -1,7 +1,7 @@ @ Intro Hyrule Town Percy SCRIPT_START script_PercyIntro BeginBlock - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 DoPostScriptAction 0x000a _0807E9D4 @@ -9,13 +9,13 @@ SCRIPT_START script_PercyIntro script_0800F662: CheckEntityInteractType JumpIfNot script_0800F662 - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer DoPostScriptAction 0x0001 Call sub_0806B4F0 WaitUntilTextboxCloses Wait 0x000f - _0807E878 + EnablePlayerControl DoPostScriptAction 0x0000 Jump script_0800F662 .2byte 0x0000 diff --git a/data/scripts/cutscene/introTown/script_PinaIntro.inc b/data/scripts/cutscene/introTown/script_PinaIntro.inc index bfe9dcf9..bc9ec670 100644 --- a/data/scripts/cutscene/introTown/script_PinaIntro.inc +++ b/data/scripts/cutscene/introTown/script_PinaIntro.inc @@ -1,17 +1,17 @@ @ Intro Hyrule Town Pina SCRIPT_START script_PinaIntro BeginBlock - _0807EB44 0x0004 - _0807E930 0x0000 + SetAnimationState 0x0004 + SetAnimation 0x0000 _0807E9D4 DoPostScriptAction 0x000a - Call sub_0807F348 + Call SetPriorityMessage EndBlock script_0800F6A0: CheckEntityInteractType JumpIfNot script_0800F6A0 - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer CallWithArg sub_0807F3D8, 0x00000004 .ifdef JP CheckLocalFlag 0x00ca @@ -34,7 +34,7 @@ script_0800F6C4: script_0800F6C8: WaitUntilTextboxCloses Wait 0x000f - _0807E878 + EnablePlayerControl CallWithArg sub_0807F3D8, 0x00000000 Jump script_0800F6A0 .2byte 0x0000 diff --git a/data/scripts/cutscene/introTown/script_PlayerIntro1.inc b/data/scripts/cutscene/introTown/script_PlayerIntro1.inc index 4732932e..d5a09109 100644 --- a/data/scripts/cutscene/introTown/script_PlayerIntro1.inc +++ b/data/scripts/cutscene/introTown/script_PlayerIntro1.inc @@ -4,7 +4,7 @@ SCRIPT_START script_PlayerIntro1 SetEntitySpeed 0x0100 EndBlock SetEntityPositionRelative 0x00d8, 0x0398 - _0807EB44 0x0006 + SetAnimationState 0x0006 DoPostScriptAction 0x0000 SetSyncFlag 0x00000001 Call sub_080791BC diff --git a/data/scripts/cutscene/introTown/script_PlayerIntro2.inc b/data/scripts/cutscene/introTown/script_PlayerIntro2.inc index 94540b8a..986893df 100644 --- a/data/scripts/cutscene/introTown/script_PlayerIntro2.inc +++ b/data/scripts/cutscene/introTown/script_PlayerIntro2.inc @@ -4,7 +4,7 @@ SCRIPT_START script_PlayerIntro2 SetEntitySpeed 0x0100 EndBlock _0807EDD4 0x00a0, 0x0278 - _0807EB44 0x0000 + SetAnimationState 0x0000 DoPostScriptAction 0x0000 SetSyncFlag 0x00000001 Call sub_080791BC diff --git a/data/scripts/cutscene/introTown/script_PlayerIntro3.inc b/data/scripts/cutscene/introTown/script_PlayerIntro3.inc index 4f48ea8c..d2eda272 100644 --- a/data/scripts/cutscene/introTown/script_PlayerIntro3.inc +++ b/data/scripts/cutscene/introTown/script_PlayerIntro3.inc @@ -4,7 +4,7 @@ SCRIPT_START script_PlayerIntro3 SetEntitySpeed 0x0100 EndBlock _0807EDD4 0x0078, 0x01c0 - _0807EB44 0x0000 + SetAnimationState 0x0000 DoPostScriptAction 0x0000 SetSyncFlag 0x00000001 Call sub_080791BC diff --git a/data/scripts/cutscene/introTown/script_PlayerIntro4.inc b/data/scripts/cutscene/introTown/script_PlayerIntro4.inc index 9d304aea..33307f8c 100644 --- a/data/scripts/cutscene/introTown/script_PlayerIntro4.inc +++ b/data/scripts/cutscene/introTown/script_PlayerIntro4.inc @@ -4,7 +4,7 @@ SCRIPT_START script_PlayerIntro4 SetEntitySpeed 0x0100 EndBlock _0807EDD4 0x0108, 0x01c8 - _0807EB44 0x0002 + SetAnimationState 0x0002 DoPostScriptAction 0x0000 SetSyncFlag 0x00000001 Call sub_080791BC diff --git a/data/scripts/cutscene/introTown/script_PlayerIntro5.inc b/data/scripts/cutscene/introTown/script_PlayerIntro5.inc index ce887cd2..e90538d7 100644 --- a/data/scripts/cutscene/introTown/script_PlayerIntro5.inc +++ b/data/scripts/cutscene/introTown/script_PlayerIntro5.inc @@ -3,7 +3,7 @@ SCRIPT_START script_PlayerIntro5 BeginBlock SetEntitySpeed 0x0100 EndBlock - Call sub_0807F584 + Call ReadPlayerAnimationState JumpTable script_0800FB06, script_0800FB10, script_0800FB06, script_0800FAFC script_0800FAFC: CallWithArg sub_0807F4F8, 0x0000027c @@ -11,7 +11,7 @@ script_0800FB06: CallWithArg sub_0807F464, 0x000000e8 script_0800FB10: _0807EDD4 0x00e8, 0x0270 - _0807EB44 0x0000 + SetAnimationState 0x0000 DoPostScriptAction 0x0000 SetSyncFlag 0x00000001 Call sub_080791BC diff --git a/data/scripts/cutscene/introTown/script_PlayerIntroTown.inc b/data/scripts/cutscene/introTown/script_PlayerIntroTown.inc index a15642df..453e2bbe 100644 --- a/data/scripts/cutscene/introTown/script_PlayerIntroTown.inc +++ b/data/scripts/cutscene/introTown/script_PlayerIntroTown.inc @@ -1,8 +1,8 @@ @ Hyrule Town Intro Player SCRIPT_START script_PlayerIntroTown SetEntitySpeed 0x0080 - _0807EC64 0x0020 - _0807EB44 0x0000 + WalkNorth 0x0020 + SetAnimationState 0x0000 DoPostScriptAction 0x0000 SetSyncFlag 0x00000008 Call sub_080791BC diff --git a/data/scripts/cutscene/introTown/script_TownsperonIntro.inc b/data/scripts/cutscene/introTown/script_TownsperonIntro.inc index 27ae1e54..7db70671 100644 --- a/data/scripts/cutscene/introTown/script_TownsperonIntro.inc +++ b/data/scripts/cutscene/introTown/script_TownsperonIntro.inc @@ -8,11 +8,11 @@ SCRIPT_START script_TownsperonIntro script_0800F564: CheckEntityInteractType JumpIfNot script_0800F564 - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer Call sub_08061FE4 Call sub_08061FF4 WaitUntilTextboxCloses - _0807E878 + EnablePlayerControl Jump script_0800F564 .2byte 0x0000 diff --git a/data/scripts/cutscene/introTown/script_WindtribespeopleIntro.inc b/data/scripts/cutscene/introTown/script_WindtribespeopleIntro.inc index 14a141fe..20a998f3 100644 --- a/data/scripts/cutscene/introTown/script_WindtribespeopleIntro.inc +++ b/data/scripts/cutscene/introTown/script_WindtribespeopleIntro.inc @@ -6,12 +6,12 @@ SCRIPT_START script_WindtribespeopleIntro DoPostScriptAction 0x0001 EndBlock script_0800F636: - _0807E30C + FacePlayerAndCheckDist JumpIfNot script_0800F636 - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer Call sub_0806C90C WaitUntilTextboxCloses - _0807E878 + EnablePlayerControl Jump script_0800F636 .2byte 0x0000 diff --git a/data/scripts/cutscene/introTown/script_ZeldaIntroTown.inc b/data/scripts/cutscene/introTown/script_ZeldaIntroTown.inc index 6cda5954..a9d511f9 100644 --- a/data/scripts/cutscene/introTown/script_ZeldaIntroTown.inc +++ b/data/scripts/cutscene/introTown/script_ZeldaIntroTown.inc @@ -13,25 +13,25 @@ SCRIPT_START script_ZeldaIntroTown script_0800FB6C: DoPostScriptAction 0x0007 SetEntityPositionRelative 0x00b8, 0x0398 - _0807EB44 0x0002 + SetAnimationState 0x0002 DoPostScriptAction 0x0000 SetSyncFlag 0x00000004 WaitForSyncFlagAndClear 0x00000002 SetEntitySpeed 0x0200 _0807EDD4 0x00b8, 0x0318 SetEntityPositionRelative 0x00a0, 0x0260 - _0807EB44 0x0000 + SetAnimationState 0x0000 DoPostScriptAction 0x0001 SetSyncFlag 0x00000004 DoPostScriptAction 0x000a _0807E9D4 script_0800FBAE: - _0807E30C + FacePlayerAndCheckDist JumpIfNot script_0800FBAE DoPostScriptAction 0x000b SetSyncFlag 0x00000004 WaitForSyncFlagAndClear 0x00000002 - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 SetSyncFlag 0x00000004 WaitForSyncFlagAndClear 0x00000002 @@ -40,41 +40,41 @@ script_0800FBAE: _0807EDD4 0x0070, 0x0268 _0807EDD4 0x0070, 0x0208 SetEntityPositionRelative 0x0078, 0x01a8 - _0807EB44 0x0000 + SetAnimationState 0x0000 DoPostScriptAction 0x0001 SetSyncFlag 0x00000004 DoPostScriptAction 0x000a script_0800FC06: - _0807E30C + FacePlayerAndCheckDist JumpIfNot script_0800FC06 DoPostScriptAction 0x000b SetSyncFlag 0x00000004 WaitForSyncFlagAndClear 0x00000002 - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 SetSyncFlag 0x00000004 WaitForSyncFlagAndClear 0x00000002 SetEntitySpeed 0x0200 _0807EDD4 0x00f8, 0x01a8 SetEntityPositionRelative 0x0118, 0x01c8 - _0807EB44 0x0002 + SetAnimationState 0x0002 DoPostScriptAction 0x0001 SetSyncFlag 0x00000004 DoPostScriptAction 0x000a script_0800FC52: - _0807E30C + FacePlayerAndCheckDist JumpIfNot script_0800FC52 DoPostScriptAction 0x000b SetSyncFlag 0x00000004 WaitForSyncFlagAndClear 0x00000002 - _0807EB44 0x0006 + SetAnimationState 0x0006 DoPostScriptAction 0x0000 SetSyncFlag 0x00000004 WaitForSyncFlagAndClear 0x00000002 SetEntitySpeed 0x0200 _0807EDD4 0x0118, 0x0260 SetEntityPositionRelative 0x00f8, 0x0270 - _0807EB44 0x0000 + SetAnimationState 0x0000 DoPostScriptAction 0x0001 SetSyncFlag 0x00000004 DoPostScriptAction 0x000a @@ -83,22 +83,22 @@ script_0800FC9E: CheckEntityInteractType JumpIfNot script_0800FC9E DoPostScriptAction 0x000b - _0807EB44 0x0000 + SetAnimationState 0x0000 DoPostScriptAction 0x0000 SetSyncFlag 0x00000004 DoPostScriptAction 0x0004 WaitForSyncFlagAndClear 0x00000002 DoPostScriptAction 0x000d SetEntitySpeed 0x0040 - _0807EC94 0x0020 - _0807EB44 0x0000 + WalkEast 0x0020 + SetAnimationState 0x0000 DoPostScriptAction 0x0000 SetSyncFlag 0x00000004 WaitForSyncFlagAndClear 0x00000002 DoPostScriptAction 0x000c SetEntitySpeed 0x0040 - _0807ECF4 0x0020 - _0807EB44 0x0006 + WalkWest 0x0020 + SetAnimationState 0x0006 DoPostScriptAction 0x0000 SetSyncFlag 0x00000004 WaitForSyncFlagAndClear 0x00000002 diff --git a/data/scripts/cutscene/kinstones/script_HurdyGurdyManFirstKinstone.inc b/data/scripts/cutscene/kinstones/script_HurdyGurdyManFirstKinstone.inc index 2f96db73..b09e0dbf 100644 --- a/data/scripts/cutscene/kinstones/script_HurdyGurdyManFirstKinstone.inc +++ b/data/scripts/cutscene/kinstones/script_HurdyGurdyManFirstKinstone.inc @@ -5,15 +5,15 @@ SCRIPT_START script_HurdyGurdyManFirstKinstone DoPostScriptAction 0x0008 DoPostScriptAction 0x000a EndBlock - Call sub_0807F348 - _0807EB44 0x0002 + Call SetPriorityMessage + SetAnimationState 0x0002 WaitForSyncFlagAndClear 0x00000002 DoPostScriptAction 0x0007 _0807EDD4 0x01b8, 0x0328 SetSyncFlag 0x00000040 _0807EDD4 0x01f8, 0x0328 - _0807EB44 0x0004 - _0807E930 0x0008 + SetAnimationState 0x0004 + SetAnimation 0x0008 _0807E8E4_0 SetSyncFlag 0x00000040 WaitForSyncFlagAndClear 0x00000002 @@ -27,65 +27,65 @@ script_0800F1E6: CallWithArg sub_0807F680, 0x000001c0 JumpIf script_0800F22A EndBlock - _0807E864 - Call sub_0807F9A4 - _0807EB74 - _0807E930 0x0008 + SetPlayerIdle + Call WaitForPlayerNormal + FacePlayer + SetAnimation 0x0008 DoPostScriptAction 0x0004 Wait 0x003c MessageFromTargetPos 0x1206, 0x000c WaitUntilTextboxCloses StartPlayerScript script_PlayerAtHurdyGurdyManFirstKinstone1 WaitForSyncFlagAndClear 0x00000400 - _0807E878 + EnablePlayerControl Jump script_0800F1E6 script_0800F22A: CallWithArg sub_0807F680, 0x00000230 JumpIfNot script_0800F26A EndBlock - _0807E864 - Call sub_0807F9A4 - _0807EB74 - _0807E930 0x0008 + SetPlayerIdle + Call WaitForPlayerNormal + FacePlayer + SetAnimation 0x0008 DoPostScriptAction 0x0004 Wait 0x003c MessageFromTargetPos 0x1206, 0x000c WaitUntilTextboxCloses StartPlayerScript script_PlayerAtHurdyGurdyManFirstKinstone2 WaitForSyncFlagAndClear 0x00000400 - _0807E878 + EnablePlayerControl Jump script_0800F1E6 script_0800F26A: CallWithArg sub_0807F6B4, 0x00000310 JumpIf script_0800F2AA EndBlock - _0807E864 - Call sub_0807F9A4 - _0807EB74 - _0807E930 0x0008 + SetPlayerIdle + Call WaitForPlayerNormal + FacePlayer + SetAnimation 0x0008 DoPostScriptAction 0x0004 Wait 0x003c MessageFromTargetPos 0x1206, 0x000c WaitUntilTextboxCloses StartPlayerScript script_PlayerAtHurdyGurdyManFirstKinstone3 WaitForSyncFlagAndClear 0x00000400 - _0807E878 + EnablePlayerControl Jump script_0800F1E6 script_0800F2AA: CallWithArg sub_0807F6B4, 0x00000340 JumpIfNot script_0800F2EA EndBlock - _0807E864 - Call sub_0807F9A4 - _0807EB74 - _0807E930 0x0008 + SetPlayerIdle + Call WaitForPlayerNormal + FacePlayer + SetAnimation 0x0008 DoPostScriptAction 0x0004 Wait 0x003c MessageFromTargetPos 0x1206, 0x000c WaitUntilTextboxCloses StartPlayerScript script_PlayerAtHurdyGurdyManFirstKinstone4 WaitForSyncFlagAndClear 0x00000400 - _0807E878 + EnablePlayerControl Jump script_0800F1E6 script_0800F2EA: EndBlock @@ -95,19 +95,19 @@ script_0800F2EA: CheckEntityInteractType JumpIfNot script_0800F2EA EndBlock - _0807E864 - _0807EB74 - _0807E930 0x0008 + SetPlayerIdle + FacePlayer + SetAnimation 0x0008 MessageFromTargetPos 0x1208, 0x000c WaitUntilTextboxCloses - _0807E878 + EnablePlayerControl Jump script_0800F1E6 script_0800F314: EndBlock SetSyncFlag 0x00000040 WaitForSyncFlagAndClear 0x00000002 SetEntitySpeed 0x0100 - _0807EB44 0x0002 + SetAnimationState 0x0002 _0807EEF4 0x00c0, 0x0000 SetSyncFlag 0x00000040 DoPostScriptAction 0x0006 diff --git a/data/scripts/cutscene/kinstones/script_KidKinstone1.inc b/data/scripts/cutscene/kinstones/script_KidKinstone1.inc index 21c9883d..c4eae773 100644 --- a/data/scripts/cutscene/kinstones/script_KidKinstone1.inc +++ b/data/scripts/cutscene/kinstones/script_KidKinstone1.inc @@ -2,19 +2,19 @@ SCRIPT_START script_KidKinstone1 BeginBlock _0807E9D4 - _0807EB44 0x0002 + SetAnimationState 0x0002 DoPostScriptAction 0x0001 DoPostScriptAction 0x0008 SetEntitySpeed 0x0080 DoPostScriptAction 0x000b EndBlock - Call sub_0807F348 + Call SetPriorityMessage WaitForSyncFlagAndClear 0x00000004 DoPostScriptAction 0x0007 _0807EDD4 0x01f8, 0x0318 _0807EDD4 0x0208, 0x0318 _0807EDD4 0x0208, 0x0338 - _0807EB44 0x0006 + SetAnimationState 0x0006 DoPostScriptAction 0x0000 DoPostScriptAction 0x000a SetSyncFlag 0x00000080 @@ -24,11 +24,11 @@ script_0800F3EA: CheckEntityInteractType JumpIfNot script_0800F402 EndBlock - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer MessageNoOverlap 0x1237 WaitUntilTextboxCloses - _0807E878 + EnablePlayerControl script_0800F402: CheckSyncFlagAndClear 0x00000004 JumpIfNot script_0800F3EA @@ -36,7 +36,7 @@ script_0800F402: DoPostScriptAction 0x000b Wait 0x0010 SetEntitySpeed 0x0100 - _0807EC64 0x0010 + WalkNorth 0x0010 _0807EDD4 0x0288, 0x0328 SetSyncFlag 0x00000080 DoPostScriptAction 0x0006 diff --git a/data/scripts/cutscene/kinstones/script_KidKinstone2.inc b/data/scripts/cutscene/kinstones/script_KidKinstone2.inc index d3cdd400..16f69917 100644 --- a/data/scripts/cutscene/kinstones/script_KidKinstone2.inc +++ b/data/scripts/cutscene/kinstones/script_KidKinstone2.inc @@ -2,18 +2,18 @@ SCRIPT_START script_KidKinstone2 BeginBlock _0807E9D4 - _0807EB44 0x0002 + SetAnimationState 0x0002 DoPostScriptAction 0x0001 DoPostScriptAction 0x0008 SetEntitySpeed 0x0080 DoPostScriptAction 0x000b EndBlock - Call sub_0807F348 + Call SetPriorityMessage WaitForSyncFlagAndClear 0x00000008 DoPostScriptAction 0x0007 _0807EDD4 0x01d8, 0x0328 _0807EDD4 0x01f8, 0x0348 - _0807EB44 0x0000 + SetAnimationState 0x0000 DoPostScriptAction 0x0000 DoPostScriptAction 0x000a SetSyncFlag 0x00000100 @@ -23,11 +23,11 @@ script_0800F478: CheckEntityInteractType JumpIfNot script_0800F490 EndBlock - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer MessageNoOverlap 0x1238 WaitUntilTextboxCloses - _0807E878 + EnablePlayerControl script_0800F490: CheckSyncFlagAndClear 0x00000008 JumpIfNot script_0800F478 @@ -35,8 +35,8 @@ script_0800F490: DoPostScriptAction 0x000b Wait 0x0018 SetEntitySpeed 0x0100 - _0807EC94 0x0010 - _0807EC64 0x0020 + WalkEast 0x0010 + WalkNorth 0x0020 _0807EDD4 0x0288, 0x0328 SetSyncFlag 0x00000100 DoPostScriptAction 0x0006 diff --git a/data/scripts/cutscene/kinstones/script_KidKinstone3.inc b/data/scripts/cutscene/kinstones/script_KidKinstone3.inc index 1039e878..04145775 100644 --- a/data/scripts/cutscene/kinstones/script_KidKinstone3.inc +++ b/data/scripts/cutscene/kinstones/script_KidKinstone3.inc @@ -2,18 +2,18 @@ SCRIPT_START script_KidKinstone3 BeginBlock _0807E9D4 - _0807EB44 0x0002 + SetAnimationState 0x0002 DoPostScriptAction 0x0001 DoPostScriptAction 0x0008 SetEntitySpeed 0x0080 DoPostScriptAction 0x000b EndBlock - Call sub_0807F348 + Call SetPriorityMessage WaitForSyncFlagAndClear 0x00000010 DoPostScriptAction 0x0007 _0807EDD4 0x01c8, 0x0328 _0807EDD4 0x01e8, 0x0338 - _0807EB44 0x0002 + SetAnimationState 0x0002 DoPostScriptAction 0x0000 DoPostScriptAction 0x000a SetSyncFlag 0x00000200 @@ -23,11 +23,11 @@ script_0800F50C: CheckEntityInteractType JumpIfNot script_0800F524 EndBlock - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer MessageNoOverlap 0x1239 WaitUntilTextboxCloses - _0807E878 + EnablePlayerControl script_0800F524: CheckSyncFlagAndClear 0x00000010 JumpIfNot script_0800F50C @@ -35,7 +35,7 @@ script_0800F524: DoPostScriptAction 0x000b Wait 0x0028 SetEntitySpeed 0x0100 - _0807EC64 0x0010 + WalkNorth 0x0010 _0807EDD4 0x0288, 0x0328 SetSyncFlag 0x00000200 DoPostScriptAction 0x0006 diff --git a/data/scripts/cutscene/kinstones/script_Npc4EFirstKinstone.inc b/data/scripts/cutscene/kinstones/script_Npc4EFirstKinstone.inc index 80a76584..b3afd418 100644 --- a/data/scripts/cutscene/kinstones/script_Npc4EFirstKinstone.inc +++ b/data/scripts/cutscene/kinstones/script_Npc4EFirstKinstone.inc @@ -7,8 +7,8 @@ SCRIPT_START script_Npc4EFirstKinstone script_0800F09A: CheckPlayerInRegion 0x01f8, 0x0338, 0x1030 JumpIfNot script_0800F09A - _0807E864 - Call sub_0807F9A4 + SetPlayerIdle + Call WaitForPlayerNormal Call sub_0807DF28 LoadRoomEntityList gUnk_080EE8AC StartPlayerScript script_PlayerAtFirstKinstone @@ -30,19 +30,19 @@ script_0800F09A: WaitUntilTextboxCloses SetSyncFlag 0x00000002 Call sub_0807DF50 - _0807E878 + EnablePlayerControl WaitForSyncFlagAndClear 0x00000040 script_0800F11A: CheckKinstoneFused 0x0032 JumpIfNot script_0800F11A - _0807E864 + SetPlayerIdle Call sub_0807DF28 SetSyncFlag 0x0000001e Wait 0x003c _0807E8E4_1 WaitForSyncFlagAndClear 0x000003c0 Call sub_0807DF50 - _0807E878 + EnablePlayerControl DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/cutscene/kinstones/script_PlayerAtFirstKinstone.inc b/data/scripts/cutscene/kinstones/script_PlayerAtFirstKinstone.inc index d039a201..58479b51 100644 --- a/data/scripts/cutscene/kinstones/script_PlayerAtFirstKinstone.inc +++ b/data/scripts/cutscene/kinstones/script_PlayerAtFirstKinstone.inc @@ -4,12 +4,12 @@ SCRIPT_START script_PlayerAtFirstKinstone SetEntitySpeed 0x0080 EndBlock DoPostScriptAction 0x0000 - _0807EB44 0x0006 + SetAnimationState 0x0006 DoPostScriptAction 0x0004 Wait 0x003c DoPostScriptAction 0x0001 _0807EDD4 0x01f8, 0x0338 - _0807EB44 0x0006 + SetAnimationState 0x0006 DoPostScriptAction 0x0000 SetSyncFlag 0x00000001 Call sub_080791BC diff --git a/data/scripts/cutscene/kinstones/script_PlayerAtHurdyGurdyManFirstKinstone1.inc b/data/scripts/cutscene/kinstones/script_PlayerAtHurdyGurdyManFirstKinstone1.inc index 941d969d..7d7223dc 100644 --- a/data/scripts/cutscene/kinstones/script_PlayerAtHurdyGurdyManFirstKinstone1.inc +++ b/data/scripts/cutscene/kinstones/script_PlayerAtHurdyGurdyManFirstKinstone1.inc @@ -1,7 +1,7 @@ @ Player at Hyrule Town Kinstone cutscene HurdyGurdyMan SCRIPT_START script_PlayerAtHurdyGurdyManFirstKinstone1 SetEntitySpeed 0x0100 - _0807EC94 0x0008 + WalkEast 0x0008 SetSyncFlag 0x00000400 Call sub_080791BC SCRIPT_END diff --git a/data/scripts/cutscene/kinstones/script_PlayerAtHurdyGurdyManFirstKinstone2.inc b/data/scripts/cutscene/kinstones/script_PlayerAtHurdyGurdyManFirstKinstone2.inc index 8bcc7ac1..86076092 100644 --- a/data/scripts/cutscene/kinstones/script_PlayerAtHurdyGurdyManFirstKinstone2.inc +++ b/data/scripts/cutscene/kinstones/script_PlayerAtHurdyGurdyManFirstKinstone2.inc @@ -1,7 +1,7 @@ @ Player at Hyrule Town Kinstone cutscene HurdyGurdyMan 2 SCRIPT_START script_PlayerAtHurdyGurdyManFirstKinstone2 SetEntitySpeed 0x0100 - _0807ECF4 0x0008 + WalkWest 0x0008 SetSyncFlag 0x00000400 Call sub_080791BC SCRIPT_END diff --git a/data/scripts/cutscene/kinstones/script_PlayerAtHurdyGurdyManFirstKinstone3.inc b/data/scripts/cutscene/kinstones/script_PlayerAtHurdyGurdyManFirstKinstone3.inc index a86cda57..c64ab60a 100644 --- a/data/scripts/cutscene/kinstones/script_PlayerAtHurdyGurdyManFirstKinstone3.inc +++ b/data/scripts/cutscene/kinstones/script_PlayerAtHurdyGurdyManFirstKinstone3.inc @@ -1,7 +1,7 @@ @ Player at Hyrule Town Kinstone cutscene HurdyGurdyMan 3 SCRIPT_START script_PlayerAtHurdyGurdyManFirstKinstone3 SetEntitySpeed 0x0100 - _0807ECC4 0x0008 + WalkSouth 0x0008 SetSyncFlag 0x00000400 Call sub_080791BC SCRIPT_END diff --git a/data/scripts/cutscene/kinstones/script_PlayerAtHurdyGurdyManFirstKinstone4.inc b/data/scripts/cutscene/kinstones/script_PlayerAtHurdyGurdyManFirstKinstone4.inc index 01316111..5b436fa5 100644 --- a/data/scripts/cutscene/kinstones/script_PlayerAtHurdyGurdyManFirstKinstone4.inc +++ b/data/scripts/cutscene/kinstones/script_PlayerAtHurdyGurdyManFirstKinstone4.inc @@ -1,7 +1,7 @@ @ Player at Hyrule Town Kinstone cutscene HurdyGurdyMan 4 SCRIPT_START script_PlayerAtHurdyGurdyManFirstKinstone4 SetEntitySpeed 0x0100 - _0807EC64 0x0008 + WalkNorth 0x0008 SetSyncFlag 0x00000400 Call sub_080791BC SCRIPT_END diff --git a/data/scripts/cutscene/minishVillage/script_ForestMinish5.inc b/data/scripts/cutscene/minishVillage/script_ForestMinish5.inc index c1d7b3bb..f0e29084 100644 --- a/data/scripts/cutscene/minishVillage/script_ForestMinish5.inc +++ b/data/scripts/cutscene/minishVillage/script_ForestMinish5.inc @@ -5,12 +5,12 @@ SCRIPT_START script_ForestMinish5 DoPostScriptAction 0x0008 SetEntitySpeed 0x0100 DoPostScriptAction 0x000f - Call sub_0807F338 + Call DeleteHitbox EndBlock WaitForSyncFlagAndClear 0x00000200 DoPostScriptAction 0x0007 _0807EDD4 0x0208, 0x0308 - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 SetSyncFlag 0x00000400 WaitForSyncFlagAndClear 0x00000200 diff --git a/data/scripts/cutscene/minishVillage/script_ForestMinish6.inc b/data/scripts/cutscene/minishVillage/script_ForestMinish6.inc index 06076fd2..ea9e43fd 100644 --- a/data/scripts/cutscene/minishVillage/script_ForestMinish6.inc +++ b/data/scripts/cutscene/minishVillage/script_ForestMinish6.inc @@ -5,14 +5,14 @@ SCRIPT_START script_ForestMinish6 DoPostScriptAction 0x0008 SetEntitySpeed 0x0100 DoPostScriptAction 0x000f - Call sub_0807F338 + Call DeleteHitbox EndBlock WaitForSyncFlagAndClear 0x00000800 DoPostScriptAction 0x0007 - _0807EB44 0x0002 + SetAnimationState 0x0002 DoPostScriptAction 0x0001 _0807EDD4 0x01a8, 0x0330 - _0807EB44 0x0002 + SetAnimationState 0x0002 DoPostScriptAction 0x0000 SetSyncFlag 0x00001000 WaitForSyncFlagAndClear 0x00000800 diff --git a/data/scripts/cutscene/minishVillage/script_ForestMinish7.inc b/data/scripts/cutscene/minishVillage/script_ForestMinish7.inc index 4e862a77..db6366f1 100644 --- a/data/scripts/cutscene/minishVillage/script_ForestMinish7.inc +++ b/data/scripts/cutscene/minishVillage/script_ForestMinish7.inc @@ -5,12 +5,12 @@ SCRIPT_START script_ForestMinish7 DoPostScriptAction 0x0008 SetEntitySpeed 0x0100 DoPostScriptAction 0x000f - Call sub_0807F338 + Call DeleteHitbox EndBlock WaitForSyncFlagAndClear 0x00002000 DoPostScriptAction 0x0007 _0807EDD4 0x0258, 0x0330 - _0807EB44 0x0006 + SetAnimationState 0x0006 DoPostScriptAction 0x0000 SetSyncFlag 0x00004000 WaitForSyncFlagAndClear 0x00002000 diff --git a/data/scripts/cutscene/minishVillage/script_ForestMinish8.inc b/data/scripts/cutscene/minishVillage/script_ForestMinish8.inc index 945415dc..302f4367 100644 --- a/data/scripts/cutscene/minishVillage/script_ForestMinish8.inc +++ b/data/scripts/cutscene/minishVillage/script_ForestMinish8.inc @@ -5,12 +5,12 @@ SCRIPT_START script_ForestMinish8 DoPostScriptAction 0x0000 SetEntitySpeed 0x0100 DoPostScriptAction 0x000f - Call sub_0807F338 + Call DeleteHitbox EndBlock WaitForSyncFlagAndClear 0x00008000 DoPostScriptAction 0x0007 _0807EDD4 0x01b8, 0x0320 - _0807EB44 0x0002 + SetAnimationState 0x0002 DoPostScriptAction 0x0000 SetSyncFlag 0x00010000 WaitForSyncFlagAndClear 0x00008000 diff --git a/data/scripts/cutscene/minishVillage/script_ForestMinish9.inc b/data/scripts/cutscene/minishVillage/script_ForestMinish9.inc index 4b350a06..38805f14 100644 --- a/data/scripts/cutscene/minishVillage/script_ForestMinish9.inc +++ b/data/scripts/cutscene/minishVillage/script_ForestMinish9.inc @@ -5,12 +5,12 @@ SCRIPT_START script_ForestMinish9 DoPostScriptAction 0x0008 SetEntitySpeed 0x0100 DoPostScriptAction 0x000f - Call sub_0807F338 + Call DeleteHitbox EndBlock WaitForSyncFlagAndClear 0x00020000 DoPostScriptAction 0x0007 _0807EDD4 0x0268, 0x0338 - _0807EB44 0x0006 + SetAnimationState 0x0006 DoPostScriptAction 0x0000 SetSyncFlag 0x00040000 WaitForSyncFlagAndClear 0x00020000 diff --git a/data/scripts/cutscene/minishVillage/script_Object69VillageIntro.inc b/data/scripts/cutscene/minishVillage/script_Object69VillageIntro.inc index 6419dba0..045da40d 100644 --- a/data/scripts/cutscene/minishVillage/script_Object69VillageIntro.inc +++ b/data/scripts/cutscene/minishVillage/script_Object69VillageIntro.inc @@ -1,19 +1,19 @@ @ Minish Village OBJECT_69 Intro Cutscene? SCRIPT_START script_Object69VillageIntro BeginBlock - _0807EB44 0x0004 + SetAnimationState 0x0004 SetEntitySpeed 0x0300 EndBlock script_0800C928: CheckPlayerInRegion 0x0208, 0x0360, 0x2040 JumpIfNot script_0800C928 - _0807E864 - Call sub_0807F9A4 + SetPlayerIdle + Call WaitForPlayerNormal Call sub_0807DF28 StartPlayerScript script_PlayerAtVillageIntro WaitForSyncFlagAndClear 0x00000002 Wait 0x003c - _0807EB28 0x1125 + EzloMessage 0x1125 WaitUntilTextboxCloses SetSyncFlag 0x00000800 _0807E8E4_3 @@ -41,7 +41,7 @@ script_0800C928: WaitForSyncFlagAndClear 0x00000400 _0807E8E4_0 MessageFromTarget 0x1126 - Call sub_0807F40C + Call CreatePlayerQuestionMark WaitUntilTextboxCloses SetSyncFlag 0x00000200 SetSyncFlag 0x00000800 @@ -74,10 +74,10 @@ script_0800C928: WaitForSyncFlagAndClear 0x00010000 WaitForSyncFlagAndClear 0x00040000 _0807E8E4_0 - _0807EB28 0x1129 + EzloMessage 0x1129 WaitUntilTextboxCloses SetLocalFlag 0x008d Call sub_0807DF50 - _0807E878 + EnablePlayerControl DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/cutscene/originStory/script_EzloCapExplainingOriginStory.inc b/data/scripts/cutscene/originStory/script_EzloCapExplainingOriginStory.inc index 5931fc5e..d0c52080 100644 --- a/data/scripts/cutscene/originStory/script_EzloCapExplainingOriginStory.inc +++ b/data/scripts/cutscene/originStory/script_EzloCapExplainingOriginStory.inc @@ -4,18 +4,18 @@ SCRIPT_START script_EzloCapExplainingOriginStory SetEntitySpeed 0x0080 DoPostScriptAction 0x0007 EndBlock - _0807E930 0x001f + SetAnimation 0x001f Call sub_0806D944 WaitForSyncFlagAndClear 0x00000008 - _0807E930 0x0010 + SetAnimation 0x0010 MessageFromTargetPos 0x1314, 0x000c WaitUntilTextboxCloses - _0807E930 0x0018 + SetAnimation 0x0018 Call sub_0806D8A0 script_080153C2: _0807EE30 JumpIfNot script_080153C2 - _0807E930 0x001f + SetAnimation 0x001f StartPlayerScript script_PlayerReceivedExposition Call sub_0806D9A4 DoPostScriptAction 0x0008 diff --git a/data/scripts/cutscene/originStory/script_MinishEzlo.inc b/data/scripts/cutscene/originStory/script_MinishEzlo.inc index bd1ee7c1..5acc0d71 100644 --- a/data/scripts/cutscene/originStory/script_MinishEzlo.inc +++ b/data/scripts/cutscene/originStory/script_MinishEzlo.inc @@ -3,24 +3,24 @@ SCRIPT_START script_MinishEzlo BeginBlock SetEntitySpeed 0x0080 DoPostScriptAction 0x0007 - _0807EB44 0x0000 - Call sub_0807F338 + SetAnimationState 0x0000 + Call DeleteHitbox EndBlock CallWithArg sub_0806AF60, 0x00000000 WaitForSyncFlagAndClear 0x00008000 CallWithArg sub_0806AF60, 0x00000004 _0807EDD4 0x0078, 0x00b8 - _0807EB44 0x0000 + SetAnimationState 0x0000 CallWithArg sub_0806AF60, 0x00000000 SetSyncFlag 0x00010000 WaitForSyncFlagAndClear 0x00008000 DoPostScriptAction 0x000d - _0807EB44 0x0000 + SetAnimationState 0x0000 CallWithArg sub_0806AF60, 0x00000004 _0807EDD4 0x0078, 0x00c8 SetSyncFlag 0x00010000 WaitForSyncFlagAndClear 0x00008000 - _0807EB44 0x0000 + SetAnimationState 0x0000 CallWithArg sub_0806AF60, 0x00000000 DoPostScriptAction 0x0010 Wait 0x0028 @@ -33,8 +33,8 @@ SCRIPT_START script_MinishEzlo DoPostScriptAction 0x0010 SetSyncFlag 0x00010000 WaitForSyncFlagAndClear 0x00008000 - _0807E930 0x000d - Call sub_0807F2D4 + SetAnimation 0x000d + Call WaitForFrameHiBit SetSyncFlag 0x00010000 Wait 0x003c DoPostScriptAction 0x0005 diff --git a/data/scripts/cutscene/originStory/script_Object69CameraTarget.inc b/data/scripts/cutscene/originStory/script_Object69CameraTarget.inc index c505a57d..b6217240 100644 --- a/data/scripts/cutscene/originStory/script_Object69CameraTarget.inc +++ b/data/scripts/cutscene/originStory/script_Object69CameraTarget.inc @@ -19,7 +19,7 @@ SCRIPT_START script_Object69CameraTarget SetSyncFlag 0x00000800 WaitForSyncFlagAndClear 0x00001000 StopBgm - _0807E778 0x0004 + SetFadeTime 0x0004 DoFade5 WaitForFadeFinish SetRoomFlag 0x0001 diff --git a/data/scripts/cutscene/originStory/script_Object69MinishVaati.inc b/data/scripts/cutscene/originStory/script_Object69MinishVaati.inc index 2ad51bff..8f2e5cee 100644 --- a/data/scripts/cutscene/originStory/script_Object69MinishVaati.inc +++ b/data/scripts/cutscene/originStory/script_Object69MinishVaati.inc @@ -6,7 +6,7 @@ SCRIPT_START script_Object69MinishVaati CameraTargetEntity EndBlock PlayBgm BGM_EZLO_STORY - _0807E778 0x0004 + SetFadeTime 0x0004 DoFade4 WaitForFadeFinish Wait 0x003c diff --git a/data/scripts/cutscene/originStory/script_Object69VaatiAppears.inc b/data/scripts/cutscene/originStory/script_Object69VaatiAppears.inc index b1f37aad..411aae34 100644 --- a/data/scripts/cutscene/originStory/script_Object69VaatiAppears.inc +++ b/data/scripts/cutscene/originStory/script_Object69VaatiAppears.inc @@ -7,8 +7,8 @@ SCRIPT_START script_Object69VaatiAppears script_08014FCC: CheckPlayerInRegion 0x01f8, 0x00a0, 0x2040 JumpIfNot script_08014FCC - _0807E864 - Call sub_0807F9A4 + SetPlayerIdle + Call WaitForPlayerNormal Call sub_0807DF28 StopBgm _0807F0B4 0x0001 @@ -17,24 +17,24 @@ script_08014FCC: WaitForSyncFlagAndClear 0x00000001 MessageFromTargetPos 0x1301, 0x0002 WaitUntilTextboxCloses - Call sub_0807F3F8 + Call CreatePlayerExclamationMark Wait 0x003c SetSyncFlag 0x00000002 WaitForSyncFlagAndClear 0x00000004 SetSyncFlag 0x00000002 WaitForSyncFlagAndClear 0x00000004 PlayBgm BGM_VAATI_THEME - _0807EB28 0x1302 + EzloMessage 0x1302 WaitUntilTextboxCloses MessageFromTargetPos 0x1303, 0x0002 WaitUntilTextboxCloses - _0807EB28 0x1304 + EzloMessage 0x1304 WaitUntilTextboxCloses MessageFromTargetPos 0x1305, 0x0002 WaitUntilTextboxCloses SetSyncFlag 0x00000002 WaitForSyncFlagAndClear 0x00000004 - _0807EB28 0x1306 + EzloMessage 0x1306 WaitUntilTextboxCloses StopBgm StartPlayerScript script_PlayerTryToFollowVaati @@ -71,13 +71,13 @@ script_08014FCC: LoadRoomEntityList gUnk_080F7FC0 PlayBgm BGM_FIGHT_THEME Call sub_0807DF50 - _0807E878 + EnablePlayerControl script_08015104: CheckRoomFlag 0x0000 JumpIfNot script_08015104 @ Defeated Moblins - _0807E864 - Call sub_0807F9A4 + SetPlayerIdle + Call WaitForPlayerNormal Call sub_0807DF28 StopBgm StartPlayerScript script_PlayerDefeatedMoblins @@ -120,35 +120,35 @@ script_08015104: .endif .endif .endif - _0807EB28 0x130c + EzloMessage 0x130c WaitUntilTextboxCloses @ Ezlo cutscene starts CameraTargetPlayer - _0807E778 0x0004 + SetFadeTime 0x0004 _0807E80C 0x00000000 WaitForFadeFinish Call sub_08053B3C BeginBlock - _0807E864 - CallWithArg sub_0807F6E8, 0x00000008 + SetPlayerIdle + CallWithArg SetPlayerFlag, 0x00000008 MoveEntityToPlayer _0807F0B4 0x0004 CameraTargetEntity - _0807E778 0x0100 + SetFadeTime 0x0100 DoFade4 _0807E80C 0x00000000 EndBlock StartPlayerScript script_PlayerSeenOriginStory WaitForSyncFlagAndClear 0x00000001 LoadRoomEntityList gUnk_080F7CB0 - _0807E778 0x0004 + SetFadeTime 0x0004 _0807E800 0x00000000 WaitForFadeFinish SetSyncFlag 0x00000008 WaitForSyncFlagAndClear 0x00000010 BeginBlock _0807E8E4_2 - _0807EB28 0x1315 + EzloMessage 0x1315 EndBlock WaitUntilTextboxCloses _0807F0B4 0x0004 @@ -156,6 +156,6 @@ script_08015104: Call sub_08054570 PlayBGM Call sub_0807DF50 - _0807E878 + EnablePlayerControl DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/cutscene/originStory/script_Object6ADarkMagic.inc b/data/scripts/cutscene/originStory/script_Object6ADarkMagic.inc index 8b914690..786b7314 100644 --- a/data/scripts/cutscene/originStory/script_Object6ADarkMagic.inc +++ b/data/scripts/cutscene/originStory/script_Object6ADarkMagic.inc @@ -1,7 +1,7 @@ @ Ezlo Cutscene OBJECT_6A dark magic SCRIPT_START script_Object6ADarkMagic BeginBlock - _0807E930 0x0000 + SetAnimation 0x0000 SetEntitySpeed 0x0200 Call sub_08094B80 EndBlock diff --git a/data/scripts/cutscene/originStory/script_Object6AMinishCap.inc b/data/scripts/cutscene/originStory/script_Object6AMinishCap.inc index 93cafa90..75e76a5b 100644 --- a/data/scripts/cutscene/originStory/script_Object6AMinishCap.inc +++ b/data/scripts/cutscene/originStory/script_Object6AMinishCap.inc @@ -16,8 +16,8 @@ SCRIPT_START script_Object6AMinishCap Wait 0x003c SetSyncFlag 0x00000100 WaitForSyncFlagAndClear 0x00000080 - _0807E930 0x0001 - Call sub_0807F2D4 + SetAnimation 0x0001 + Call WaitForFrameHiBit DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/cutscene/originStory/script_PlayerAtVaatisAppearance.inc b/data/scripts/cutscene/originStory/script_PlayerAtVaatisAppearance.inc index 39c0de0c..429a13fd 100644 --- a/data/scripts/cutscene/originStory/script_PlayerAtVaatisAppearance.inc +++ b/data/scripts/cutscene/originStory/script_PlayerAtVaatisAppearance.inc @@ -5,7 +5,7 @@ SCRIPT_START script_PlayerAtVaatisAppearance EndBlock DoPostScriptAction 0x0001 _0807EDD4 0x01f8, 0x00b8 - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 SetSyncFlag 0x00000001 Call sub_080791BC diff --git a/data/scripts/cutscene/originStory/script_PlayerDefeatedMoblins.inc b/data/scripts/cutscene/originStory/script_PlayerDefeatedMoblins.inc index 76d0f7dc..253e6517 100644 --- a/data/scripts/cutscene/originStory/script_PlayerDefeatedMoblins.inc +++ b/data/scripts/cutscene/originStory/script_PlayerDefeatedMoblins.inc @@ -5,7 +5,7 @@ SCRIPT_START script_PlayerDefeatedMoblins EndBlock DoPostScriptAction 0x0001 _0807EDD4 0x01f8, 0x0148 - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 SetSyncFlag 0x00000001 Call sub_080791BC diff --git a/data/scripts/cutscene/originStory/script_PlayerSeenOriginStory.inc b/data/scripts/cutscene/originStory/script_PlayerSeenOriginStory.inc index 0445fe14..1418123b 100644 --- a/data/scripts/cutscene/originStory/script_PlayerSeenOriginStory.inc +++ b/data/scripts/cutscene/originStory/script_PlayerSeenOriginStory.inc @@ -4,7 +4,7 @@ SCRIPT_START script_PlayerSeenOriginStory SetEntitySpeed 0x0100 SetEntityPositionRelative 0x0208, 0x0148 EndBlock - _0807EB44 0x0006 + SetAnimationState 0x0006 DoPostScriptAction 0x0000 SetSyncFlag 0x00000001 Call sub_080791BC diff --git a/data/scripts/cutscene/originStory/script_PlayerStoneWallsAppear.inc b/data/scripts/cutscene/originStory/script_PlayerStoneWallsAppear.inc index 4f30a21d..26d0e170 100644 --- a/data/scripts/cutscene/originStory/script_PlayerStoneWallsAppear.inc +++ b/data/scripts/cutscene/originStory/script_PlayerStoneWallsAppear.inc @@ -1,14 +1,14 @@ @ Player Outside Castle when stones appear before Moblin Fight SCRIPT_START script_PlayerStoneWallsAppear - _0807EB44 0x0002 + SetAnimationState 0x0002 Wait 0x000a - _0807EB44 0x0006 + SetAnimationState 0x0006 Wait 0x000a - _0807EB44 0x0002 + SetAnimationState 0x0002 Wait 0x000a - _0807EB44 0x0006 + SetAnimationState 0x0006 Wait 0x000a - _0807EB44 0x0004 + SetAnimationState 0x0004 SetSyncFlag 0x00000001 Call sub_080791BC SCRIPT_END diff --git a/data/scripts/cutscene/originStory/script_PlayerTryToFollowVaati.inc b/data/scripts/cutscene/originStory/script_PlayerTryToFollowVaati.inc index 50664ad7..f6eb5063 100644 --- a/data/scripts/cutscene/originStory/script_PlayerTryToFollowVaati.inc +++ b/data/scripts/cutscene/originStory/script_PlayerTryToFollowVaati.inc @@ -5,7 +5,7 @@ SCRIPT_START script_PlayerTryToFollowVaati EndBlock DoPostScriptAction 0x0001 _0807EDD4 0x01f8, 0x0148 - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 SetSyncFlag 0x00000001 Call sub_080791BC diff --git a/data/scripts/cutscene/originStory/script_Vaati.inc b/data/scripts/cutscene/originStory/script_Vaati.inc index fd727120..3a48e430 100644 --- a/data/scripts/cutscene/originStory/script_Vaati.inc +++ b/data/scripts/cutscene/originStory/script_Vaati.inc @@ -3,17 +3,17 @@ SCRIPT_START script_Vaati BeginBlock DoPostScriptAction 0x0007 DoPostScriptAction 0x000b - _0807EB44 0x0000 + SetAnimationState 0x0000 DoPostScriptAction 0x0017 - Call sub_0807F180 + Call SetCollisionLayer2 EndBlock WaitForSyncFlagAndClear 0x00000800 - _0807EB44 0x0002 + SetAnimationState 0x0002 DoPostScriptAction 0x0017 Wait 0x000a - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0017 - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x001b SetSyncFlag 0x00001000 WaitForSyncFlagAndClear 0x00000800 @@ -23,19 +23,19 @@ SCRIPT_START script_Vaati SetSyncFlag 0x00001000 WaitForSyncFlagAndClear 0x00000800 DoPostScriptAction 0x0018 - Call sub_0807F2D4 - _0807EB44 0x0004 + Call WaitForFrameHiBit + SetAnimationState 0x0004 DoPostScriptAction 0x0000 SetSyncFlag 0x00001000 WaitForSyncFlagAndClear 0x00000800 - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0014 CallWithArg sub_0809545C, script_Object6ADarkMagic PlaySound SFX_1C4 Wait 0x0078 DoPostScriptAction 0x0016 WaitForSyncFlagAndClear 0x00020000 - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 SetSyncFlag 0x00001000 WaitForSyncFlagAndClear 0x00000800 diff --git a/data/scripts/cutscene/originStory/script_VaatiAppearsAgain.inc b/data/scripts/cutscene/originStory/script_VaatiAppearsAgain.inc index 26990404..8e9cce5d 100644 --- a/data/scripts/cutscene/originStory/script_VaatiAppearsAgain.inc +++ b/data/scripts/cutscene/originStory/script_VaatiAppearsAgain.inc @@ -2,9 +2,9 @@ SCRIPT_START script_VaatiAppearsAgain BeginBlock DoPostScriptAction 0x0008 - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 - Call sub_0807F354 + Call SetPriorityPlayerEvent EndBlock WaitForSyncFlagAndClear 0x00000002 Call sub_08066C94 @@ -14,9 +14,9 @@ SCRIPT_START script_VaatiAppearsAgain SetSyncFlag 0x00000004 WaitForSyncFlagAndClear 0x00000002 Wait 0x0014 - _0807EB44 0x0000 + SetAnimationState 0x0000 DoPostScriptAction 0x001c - Call sub_0807F2D4 + Call WaitForFrameHiBit DoPostScriptAction 0x0000 SetSyncFlag 0x00000004 WaitForSyncFlagAndClear 0x00000002 @@ -25,7 +25,7 @@ SCRIPT_START script_VaatiAppearsAgain SetEntitySpeed 0x0200 DoPostScriptAction 0x000d DoPostScriptAction 0x0000 - _0807ECC4 0x0030 + WalkSouth 0x0030 SetSyncFlag 0x00000004 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/cutscene/outro/script_EzloCapOutro.inc b/data/scripts/cutscene/outro/script_EzloCapOutro.inc index a923e5cc..e2b67e76 100644 --- a/data/scripts/cutscene/outro/script_EzloCapOutro.inc +++ b/data/scripts/cutscene/outro/script_EzloCapOutro.inc @@ -2,16 +2,16 @@ SCRIPT_START script_EzloCapOutro BeginBlock SetEntitySpeed 0x0080 - SetEntity0x20 0x00000000 + SetEntityVelocity 0x00000000 DoPostScriptAction 0x0008 - _0807EB44 0x0000 + SetAnimationState 0x0000 Call sub_0807F714 MoveEntityToPlayer - CallWithArg sub_0807F98C, 0xfff00000 + CallWithArg SetEntityHeight, 0xfff00000 EndBlock - _0807E930 0x0023 + SetAnimation 0x0023 WaitForSyncFlagAndClear 0x00000010 - CallWithArg sub_0807F6E8, 0x00000008 + CallWithArg SetPlayerFlag, 0x00000008 DoPostScriptAction 0x0007 PlaySound SFX_SPARKLES ClearSyncFlag 0x00000800 @@ -22,7 +22,7 @@ SCRIPT_START script_EzloCapOutro SetSyncFlag 0x00000800 PlaySound SFX_143 _0807EF3C 0x0000, 0x0020 - _0807E930 0x001f + SetAnimation 0x001f SetSyncFlag 0x00000200 WaitForSyncFlagAndClear 0x00000010 Wait 0x0078 diff --git a/data/scripts/cutscene/outro/script_EzloZeldaMagic.inc b/data/scripts/cutscene/outro/script_EzloZeldaMagic.inc index e7707cc8..59336b95 100644 --- a/data/scripts/cutscene/outro/script_EzloZeldaMagic.inc +++ b/data/scripts/cutscene/outro/script_EzloZeldaMagic.inc @@ -3,7 +3,7 @@ SCRIPT_START script_EzloZeldaMagic BeginBlock DoPostScriptAction 0x0007 DoPostScriptAction 0x000b - CallWithArg sub_0807F994, 0x0000fff8 + CallWithArg SetSpriteOffset, 0x0000fff8 EndBlock WaitForSyncFlag 0x00000020 DoPostScriptAction 0x0006 diff --git a/data/scripts/cutscene/outro/script_GuardStoneOutro1.inc b/data/scripts/cutscene/outro/script_GuardStoneOutro1.inc index bdfb1c15..fbd46660 100644 --- a/data/scripts/cutscene/outro/script_GuardStoneOutro1.inc +++ b/data/scripts/cutscene/outro/script_GuardStoneOutro1.inc @@ -2,17 +2,17 @@ SCRIPT_START script_GuardStoneOutro1 BeginBlock DoPostScriptAction 0x0007 - _0807EB44 0x0004 - _0807E930 0x0010 + SetAnimationState 0x0004 + SetAnimation 0x0010 EndBlock WaitForSyncFlag 0x00000001 - _0807E930 0x0002 + SetAnimation 0x0002 WaitForSyncFlagAndClear 0x00000002 DoPostScriptAction 0x0004 Wait 0x003c script_0800A80C: - _0807E930 0x0001 + SetAnimation 0x0001 Wait 0x001e - _0807E930 0x0003 + SetAnimation 0x0003 Wait 0x001e Jump script_0800A80C diff --git a/data/scripts/cutscene/outro/script_GuardStoneOutro2.inc b/data/scripts/cutscene/outro/script_GuardStoneOutro2.inc index 59f06757..02015418 100644 --- a/data/scripts/cutscene/outro/script_GuardStoneOutro2.inc +++ b/data/scripts/cutscene/outro/script_GuardStoneOutro2.inc @@ -2,17 +2,17 @@ SCRIPT_START script_GuardStoneOutro2 BeginBlock DoPostScriptAction 0x0007 - _0807EB44 0x0004 - _0807E930 0x0010 + SetAnimationState 0x0004 + SetAnimation 0x0010 EndBlock WaitForSyncFlag 0x00000001 - _0807E930 0x0002 + SetAnimation 0x0002 WaitForSyncFlagAndClear 0x00000004 DoPostScriptAction 0x0004 Wait 0x003c script_0800A848: - _0807E930 0x0001 + SetAnimation 0x0001 Wait 0x0014 - _0807E930 0x0003 + SetAnimation 0x0003 Wait 0x0014 Jump script_0800A848 diff --git a/data/scripts/cutscene/outro/script_GuardStoneOutro3.inc b/data/scripts/cutscene/outro/script_GuardStoneOutro3.inc index f7d9c800..e65ac209 100644 --- a/data/scripts/cutscene/outro/script_GuardStoneOutro3.inc +++ b/data/scripts/cutscene/outro/script_GuardStoneOutro3.inc @@ -2,17 +2,17 @@ SCRIPT_START script_GuardStoneOutro3 BeginBlock DoPostScriptAction 0x0007 - _0807EB44 0x0004 - _0807E930 0x0010 + SetAnimationState 0x0004 + SetAnimation 0x0010 EndBlock WaitForSyncFlag 0x00000001 - _0807E930 0x0002 + SetAnimation 0x0002 WaitForSyncFlagAndClear 0x00000008 DoPostScriptAction 0x0004 Wait 0x003c script_0800A884: - _0807E930 0x0001 + SetAnimation 0x0001 Wait 0x000a - _0807E930 0x0003 + SetAnimation 0x0003 Wait 0x000a Jump script_0800A884 diff --git a/data/scripts/cutscene/outro/script_MaidStoneOutro1.inc b/data/scripts/cutscene/outro/script_MaidStoneOutro1.inc index 46f28809..74ac7962 100644 --- a/data/scripts/cutscene/outro/script_MaidStoneOutro1.inc +++ b/data/scripts/cutscene/outro/script_MaidStoneOutro1.inc @@ -2,8 +2,8 @@ SCRIPT_START script_MaidStoneOutro1 BeginBlock DoPostScriptAction 0x0007 - _0807EB44 0x0004 - _0807E930 0x0008 + SetAnimationState 0x0004 + SetAnimation 0x0008 EndBlock WaitForSyncFlag 0x00000001 DoPostScriptAction 0x0000 @@ -11,8 +11,8 @@ SCRIPT_START script_MaidStoneOutro1 DoPostScriptAction 0x0004 Wait 0x003c script_0800A8C0: - _0807EB44 0x0002 + SetAnimationState 0x0002 Wait 0x0019 - _0807EB44 0x0006 + SetAnimationState 0x0006 Wait 0x0019 Jump script_0800A8C0 diff --git a/data/scripts/cutscene/outro/script_MaidStoneOutro2.inc b/data/scripts/cutscene/outro/script_MaidStoneOutro2.inc index f25c8c27..c4143c26 100644 --- a/data/scripts/cutscene/outro/script_MaidStoneOutro2.inc +++ b/data/scripts/cutscene/outro/script_MaidStoneOutro2.inc @@ -2,8 +2,8 @@ SCRIPT_START script_MaidStoneOutro2 BeginBlock DoPostScriptAction 0x0007 - _0807EB44 0x0004 - _0807E930 0x0008 + SetAnimationState 0x0004 + SetAnimation 0x0008 EndBlock WaitForSyncFlag 0x00000001 DoPostScriptAction 0x0000 @@ -11,8 +11,8 @@ SCRIPT_START script_MaidStoneOutro2 DoPostScriptAction 0x0004 Wait 0x003c script_0800A8FC: - _0807EB44 0x0002 + SetAnimationState 0x0002 Wait 0x000f - _0807EB44 0x0006 + SetAnimationState 0x0006 Wait 0x000f Jump script_0800A8FC diff --git a/data/scripts/cutscene/outro/script_MinishEzloGoodbye.inc b/data/scripts/cutscene/outro/script_MinishEzloGoodbye.inc index 83ef8867..ba35737d 100644 --- a/data/scripts/cutscene/outro/script_MinishEzloGoodbye.inc +++ b/data/scripts/cutscene/outro/script_MinishEzloGoodbye.inc @@ -4,38 +4,38 @@ SCRIPT_START script_MinishEzloGoodbye SetEntitySpeed 0x0080 DoPostScriptAction 0x0007 DoPostScriptAction 0x000b - _0807EB44 0x0004 + SetAnimationState 0x0004 CallWithArg sub_0807F3D8, 0x00000000 EndBlock WaitForSyncFlagAndClear 0x00000002 DoPostScriptAction 0x0004 Wait 0x001e - _0807EB44 0x0002 + SetAnimationState 0x0002 CallWithArg sub_0807F3D8, 0x00000000 Wait 0x0006 - _0807EB44 0x0000 + SetAnimationState 0x0000 CallWithArg sub_0807F3D8, 0x00000000 SetSyncFlag 0x00000004 WaitForSyncFlagAndClear 0x00000002 - _0807EB44 0x0002 + SetAnimationState 0x0002 CallWithArg sub_0807F3D8, 0x00000000 Wait 0x0014 - _0807EB44 0x0004 + SetAnimationState 0x0004 CallWithArg sub_0807F3D8, 0x00000000 SetSyncFlag 0x00000004 WaitForSyncFlagAndClear 0x00000002 - _0807E930 0x000c - Call sub_0807F2D4 + SetAnimation 0x000c + Call WaitForFrameHiBit Call sub_08094B94 SetSyncFlag 0x00000004 WaitForSyncFlagAndClear 0x00000002 - _0807E930 0x000f - Call sub_0807F2D4 + SetAnimation 0x000f + Call WaitForFrameHiBit SetSyncFlag 0x00000004 WaitForSyncFlagAndClear 0x00000002 CallWithArg sub_080960C4, script_Object6AEzloFinalMagic - _0807E930 0x0012 - Call sub_0807F2D4 + SetAnimation 0x0012 + Call WaitForFrameHiBit Wait 0x001e SetSyncFlag 0x00000020 StopBgm diff --git a/data/scripts/cutscene/outro/script_MinishEzloOutro.inc b/data/scripts/cutscene/outro/script_MinishEzloOutro.inc index 55f29440..b82f4618 100644 --- a/data/scripts/cutscene/outro/script_MinishEzloOutro.inc +++ b/data/scripts/cutscene/outro/script_MinishEzloOutro.inc @@ -4,26 +4,26 @@ SCRIPT_START script_MinishEzloOutro DoPostScriptAction 0x0008 SetEntitySpeed 0x0080 DoPostScriptAction 0x000b - _0807EB44 0x0004 + SetAnimationState 0x0004 CallWithArg sub_0807F3D8, 0x00000000 EndBlock WaitForSyncFlagAndClear 0x00000002 - _0807E930 0x000e + SetAnimation 0x000e DoPostScriptAction 0x0007 - Call sub_0807F2D4 + Call WaitForFrameHiBit DoPostScriptAction 0x0004 SetSyncFlag 0x00000040 WaitForSyncFlagAndClear 0x00000002 - _0807E930 0x000c - Call sub_0807F2D4 + SetAnimation 0x000c + Call WaitForFrameHiBit SetSyncFlag 0x00000040 WaitForSyncFlagAndClear 0x00000002 - _0807E930 0x000f - Call sub_0807F2D4 + SetAnimation 0x000f + Call WaitForFrameHiBit SetSyncFlag 0x00000040 WaitForSyncFlagAndClear 0x00000002 - _0807E930 0x000c - Call sub_0807F2D4 + SetAnimation 0x000c + Call WaitForFrameHiBit SetSyncFlag 0x00000040 WaitForSyncFlagAndClear 0x00000002 CallWithArg sub_080960C4, script_EzloZeldaMagic diff --git a/data/scripts/cutscene/outro/script_Npc4EDHCEntrance.inc b/data/scripts/cutscene/outro/script_Npc4EDHCEntrance.inc index 3f04796f..0b71e502 100644 --- a/data/scripts/cutscene/outro/script_Npc4EDHCEntrance.inc +++ b/data/scripts/cutscene/outro/script_Npc4EDHCEntrance.inc @@ -1,7 +1,7 @@ @ Outro NPC4E Fix DHC Entrance SCRIPT_START script_Npc4EDHCEntrance BeginBlock - _0807E864 + SetPlayerIdle Call sub_0807DF28 SetEntityPositionRelative 0x0198, 0x01c8 Call sub_0807F844 diff --git a/data/scripts/cutscene/outro/script_Npc4EDHCThrone.inc b/data/scripts/cutscene/outro/script_Npc4EDHCThrone.inc index 4349136f..793d59c2 100644 --- a/data/scripts/cutscene/outro/script_Npc4EDHCThrone.inc +++ b/data/scripts/cutscene/outro/script_Npc4EDHCThrone.inc @@ -1,7 +1,7 @@ @ Outro NPC4E Fix DHC Throne SCRIPT_START script_Npc4EDHCThrone BeginBlock - _0807E864 + SetPlayerIdle Call sub_0807DF28 SetEntityPositionRelative 0x0088, 0x0068 Call sub_0807F844 diff --git a/data/scripts/cutscene/outro/script_Npc4EFixedEverything.inc b/data/scripts/cutscene/outro/script_Npc4EFixedEverything.inc index f92b36db..e1e7e5fb 100644 --- a/data/scripts/cutscene/outro/script_Npc4EFixedEverything.inc +++ b/data/scripts/cutscene/outro/script_Npc4EFixedEverything.inc @@ -1,19 +1,19 @@ @ Outro NPC4E Fixed everything SCRIPT_START script_Npc4EFixedEverything BeginBlock - _0807E864 + SetPlayerIdle Call sub_0807DF28 SetEntityPositionRelative 0x0088, 0x0148 Call sub_0807F844 _0807E8E4_3 - CallWithArg sub_0807F6E8, 0x00000008 - CallWithArg sub_0807F75C, 0x00a80088 + CallWithArg SetPlayerFlag, 0x00000008 + CallWithArg SetPlayerPos, 0x00a80088 PlaySound SFX_APPARATE EndBlock Wait 0x0078 _0807F0B4 0x0001 SetEntityPositionRelative 0x0088, 0x0078 - Call sub_0807F5C0 + Call WaitForCameraTouchRoomBorder MessageFromTargetPos 0x1664, 0x0000 WaitUntilTextboxCloses MessageFromTargetPos 0x165e, 0x000e diff --git a/data/scripts/cutscene/outro/script_Npc4EHyruleCastleEntrance.inc b/data/scripts/cutscene/outro/script_Npc4EHyruleCastleEntrance.inc index 97e8bc47..e974cfe8 100644 --- a/data/scripts/cutscene/outro/script_Npc4EHyruleCastleEntrance.inc +++ b/data/scripts/cutscene/outro/script_Npc4EHyruleCastleEntrance.inc @@ -1,7 +1,7 @@ @ Outro NPC4E Fix Hyrule Castle Entrance SCRIPT_START script_Npc4EHyruleCastleEntrance BeginBlock - _0807E864 + SetPlayerIdle Call sub_0807DF28 SetEntityPositionRelative 0x00d8, 0x01c8 Call sub_0807F844 diff --git a/data/scripts/cutscene/outro/script_Npc4EHyruleCastleThrone.inc b/data/scripts/cutscene/outro/script_Npc4EHyruleCastleThrone.inc index 890d3814..9509aee2 100644 --- a/data/scripts/cutscene/outro/script_Npc4EHyruleCastleThrone.inc +++ b/data/scripts/cutscene/outro/script_Npc4EHyruleCastleThrone.inc @@ -1,7 +1,7 @@ @ Outro NPC4E Fix Hyrule Castle Throne SCRIPT_START script_Npc4EHyruleCastleThrone BeginBlock - _0807E864 + SetPlayerIdle Call sub_0807DF28 SetEntityPositionRelative 0x0088, 0x0070 Call sub_0807F844 diff --git a/data/scripts/cutscene/outro/script_Npc4EMinishPortalClosing.inc b/data/scripts/cutscene/outro/script_Npc4EMinishPortalClosing.inc index 06f842dd..75cd30d5 100644 --- a/data/scripts/cutscene/outro/script_Npc4EMinishPortalClosing.inc +++ b/data/scripts/cutscene/outro/script_Npc4EMinishPortalClosing.inc @@ -7,7 +7,7 @@ SCRIPT_START script_Npc4EMinishPortalClosing SetSyncFlag 0x00000040 WaitForSyncFlagAndClear 0x00000080 OffsetEntityPosition 0x0000, 0xffe0 - Call sub_0807F5C0 + Call WaitForCameraTouchRoomBorder Wait 0x003c CallWithArg DeleteManager36, 0x00000001 _0807F0C8 0x0000, 0x0000 @@ -28,7 +28,7 @@ SCRIPT_START script_Npc4EMinishPortalClosing SetSyncFlag 0x00000002 WaitForSyncFlagAndClear 0x00000004 OffsetEntityPosition 0x0000, 0x0020 - Call sub_0807F5C0 + Call WaitForCameraTouchRoomBorder WaitForSyncFlagAndClear 0x00000010 StartPlayerScript script_PlayerGetGreenCap WaitForSyncFlagAndClear 0x00000001 @@ -38,7 +38,7 @@ SCRIPT_START script_Npc4EMinishPortalClosing MessageFromTargetPos 0x1663, 0x000e WaitUntilTextboxCloses OffsetEntityPosition 0x0000, 0xffe0 - Call sub_0807F5C0 + Call WaitForCameraTouchRoomBorder SetSyncFlag 0x00000002 WaitForSyncFlagAndClear 0x00000004 SetSyncFlag 0x00000002 @@ -53,7 +53,7 @@ SCRIPT_START script_Npc4EMinishPortalClosing Wait 0x0078 Call sub_0808D280 Wait 0x0078 - _0807E778 0x0004 + SetFadeTime 0x0004 DoFade5 WaitForFadeFinish Call sub_0807FB94 @ Roll Credits @@ -65,6 +65,6 @@ SCRIPT_START script_Npc4EMinishPortalClosing DoFade4 WaitForFadeFinish Call sub_0807DF50 - _0807E878 + EnablePlayerControl DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/cutscene/outro/script_Npc4EMinishWoods.inc b/data/scripts/cutscene/outro/script_Npc4EMinishWoods.inc index 83c7004d..1e34a26f 100644 --- a/data/scripts/cutscene/outro/script_Npc4EMinishWoods.inc +++ b/data/scripts/cutscene/outro/script_Npc4EMinishWoods.inc @@ -1,7 +1,7 @@ @ Outro NPC4E Minish Woods SCRIPT_START script_Npc4EMinishWoods BeginBlock - _0807E864 + SetPlayerIdle Call sub_0807DF28 SetEntityPositionRelative 0x0378, 0x0178 Call sub_0807F844 diff --git a/data/scripts/cutscene/outro/script_Npc4EMtCrenel.inc b/data/scripts/cutscene/outro/script_Npc4EMtCrenel.inc index 22d244b2..91889416 100644 --- a/data/scripts/cutscene/outro/script_Npc4EMtCrenel.inc +++ b/data/scripts/cutscene/outro/script_Npc4EMtCrenel.inc @@ -1,7 +1,7 @@ @ Outro NPC4E Mt. Crenel SCRIPT_START script_Npc4EMtCrenel BeginBlock - _0807E864 + SetPlayerIdle Call sub_0807DF28 SetEntityPositionRelative 0x0128, 0x0058 Call sub_0807F844 diff --git a/data/scripts/cutscene/outro/script_Npc4EOutro.inc b/data/scripts/cutscene/outro/script_Npc4EOutro.inc index 844ac95f..9dfe61d8 100644 --- a/data/scripts/cutscene/outro/script_Npc4EOutro.inc +++ b/data/scripts/cutscene/outro/script_Npc4EOutro.inc @@ -1,12 +1,12 @@ @ Outro NPC4E SCRIPT_START script_Npc4EOutro BeginBlock - _0807E864 + SetPlayerIdle Call sub_0807DF28 SetEntityPositionRelative 0x0088, 0x0080 Call sub_0807F844 _0807E8E4_3 - CallWithArg sub_0807F75C, 0x00a80088 + CallWithArg SetPlayerPos, 0x00a80088 EndBlock Wait 0x003c StartPlayerScript script_PlayerAtOutro @@ -26,7 +26,7 @@ SCRIPT_START script_Npc4EOutro SetSyncFlag 0x00000002 WaitForSyncFlagAndClear 0x00000040 SetSyncFlag 0x00000004 - Call sub_0807F3F8 + Call CreatePlayerExclamationMark WaitForSyncFlagAndClear 0x00000080 MessageFromTargetPos 0x165a, 0x000e WaitUntilTextboxCloses diff --git a/data/scripts/cutscene/outro/script_Npc4ESanctuaryEntrance.inc b/data/scripts/cutscene/outro/script_Npc4ESanctuaryEntrance.inc index a9f2a329..2b2e2bb6 100644 --- a/data/scripts/cutscene/outro/script_Npc4ESanctuaryEntrance.inc +++ b/data/scripts/cutscene/outro/script_Npc4ESanctuaryEntrance.inc @@ -1,7 +1,7 @@ @ Outro NPC4E DHC Fix Sanctuary entrance SCRIPT_START script_Npc4ESanctuaryEntrance BeginBlock - _0807E864 + SetPlayerIdle Call sub_0807DF28 SetEntityPositionRelative 0x0088, 0x0148 Call sub_0807F844 diff --git a/data/scripts/cutscene/outro/script_Npc4EUnfreezeCastleStaff.inc b/data/scripts/cutscene/outro/script_Npc4EUnfreezeCastleStaff.inc index 9cbea7ad..0430d9ce 100644 --- a/data/scripts/cutscene/outro/script_Npc4EUnfreezeCastleStaff.inc +++ b/data/scripts/cutscene/outro/script_Npc4EUnfreezeCastleStaff.inc @@ -1,19 +1,19 @@ @ Outro NPC4E Unfreeze castle staff SCRIPT_START script_Npc4EUnfreezeCastleStaff BeginBlock - _0807E864 + SetPlayerIdle Call sub_0807DF28 SetEntityPositionRelative 0x00f8, 0x01b8 Call sub_0807F844 EndBlock Wait 0x003c PlaySound SFX_EVAPORATE - _0807E778 0x0004 + SetFadeTime 0x0004 DoFade7 WaitForFadeFinish SetSyncFlag 0x00000001 PlaySound SFX_APPARATE - _0807E778 0x0002 + SetFadeTime 0x0002 DoFade6 WaitForFadeFinish Wait 0x001e diff --git a/data/scripts/cutscene/outro/script_Object6AEzloDismounting.inc b/data/scripts/cutscene/outro/script_Object6AEzloDismounting.inc index e97a4de3..322badb2 100644 --- a/data/scripts/cutscene/outro/script_Object6AEzloDismounting.inc +++ b/data/scripts/cutscene/outro/script_Object6AEzloDismounting.inc @@ -3,7 +3,7 @@ SCRIPT_START script_Object6AEzloDismounting BeginBlock DoPostScriptAction 0x0007 DoPostScriptAction 0x000b - CallWithArg sub_0807F994, 0x0000fff8 + CallWithArg SetSpriteOffset, 0x0000fff8 EndBlock WaitForSyncFlag 0x00000800 DoPostScriptAction 0x0006 diff --git a/data/scripts/cutscene/outro/script_Object6AEzloFinalMagic.inc b/data/scripts/cutscene/outro/script_Object6AEzloFinalMagic.inc index 93468e3d..1ec52e42 100644 --- a/data/scripts/cutscene/outro/script_Object6AEzloFinalMagic.inc +++ b/data/scripts/cutscene/outro/script_Object6AEzloFinalMagic.inc @@ -3,7 +3,7 @@ SCRIPT_START script_Object6AEzloFinalMagic BeginBlock DoPostScriptAction 0x0007 DoPostScriptAction 0x000b - CallWithArg sub_0807F994, 0x0000fff8 + CallWithArg SetSpriteOffset, 0x0000fff8 PlaySound SFX_SPARKLES EndBlock WaitForSyncFlag 0x00000020 diff --git a/data/scripts/cutscene/outro/script_Object6AMinishCapOutro.inc b/data/scripts/cutscene/outro/script_Object6AMinishCapOutro.inc index 3b5704d0..b9e0c5ff 100644 --- a/data/scripts/cutscene/outro/script_Object6AMinishCapOutro.inc +++ b/data/scripts/cutscene/outro/script_Object6AMinishCapOutro.inc @@ -4,21 +4,21 @@ SCRIPT_START script_Object6AMinishCapOutro SetEntitySpeed 0x0080 DoPostScriptAction 0x0007 DoPostScriptAction 0x000b - _0807E930 0x0005 - Call sub_0807F348 + SetAnimation 0x0005 + Call SetPriorityMessage EndBlock WaitForSyncFlagAndClear 0x00000008 PlaySound SFX_SPARKLES ClearSyncFlag 0x00000800 CallWithArg sub_080960C4, script_Object6AEzloDismounting - _0807E930 0x0002 + SetAnimation 0x0002 Call sub_08094B0C _0807EDD4 0x0068, 0x0088 Call sub_08094B80 SetSyncFlag 0x00000100 WaitForSyncFlagAndClear 0x00000008 Call sub_08094B3C - _0807E930 0x0004 + SetAnimation 0x0004 SetSyncFlag 0x00000800 PlaySound SFX_143 SetSyncFlag 0x00000100 diff --git a/data/scripts/cutscene/outro/script_Object6AOctorok1.inc b/data/scripts/cutscene/outro/script_Object6AOctorok1.inc index 71af9ff5..4ee080a3 100644 --- a/data/scripts/cutscene/outro/script_Object6AOctorok1.inc +++ b/data/scripts/cutscene/outro/script_Object6AOctorok1.inc @@ -1,9 +1,9 @@ @ Outro OBJECT_6A Octorok 1 SCRIPT_START script_Object6AOctorok1 BeginBlock - _0807EB44 0x0002 + SetAnimationState 0x0002 DoPostScriptAction 0x0007 - _0807E930 0x0001 + SetAnimation 0x0001 EndBlock WaitForSyncFlagAndClear 0x00000001 Call CreateDust diff --git a/data/scripts/cutscene/outro/script_Object6AOctorok2.inc b/data/scripts/cutscene/outro/script_Object6AOctorok2.inc index 1a823f2d..83c0bd16 100644 --- a/data/scripts/cutscene/outro/script_Object6AOctorok2.inc +++ b/data/scripts/cutscene/outro/script_Object6AOctorok2.inc @@ -1,9 +1,9 @@ @ Outro OBJECT_6A Octorok 2 SCRIPT_START script_Object6AOctorok2 BeginBlock - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0007 - _0807E930 0x0002 + SetAnimation 0x0002 EndBlock WaitForSyncFlagAndClear 0x00000002 Call CreateDust diff --git a/data/scripts/cutscene/outro/script_Object6AOctorok3.inc b/data/scripts/cutscene/outro/script_Object6AOctorok3.inc index 9e970232..abacdb6f 100644 --- a/data/scripts/cutscene/outro/script_Object6AOctorok3.inc +++ b/data/scripts/cutscene/outro/script_Object6AOctorok3.inc @@ -1,9 +1,9 @@ @ Outro OBJECT_6A Octorok 3 SCRIPT_START script_Object6AOctorok3 BeginBlock - _0807EB44 0x0000 + SetAnimationState 0x0000 DoPostScriptAction 0x0007 - _0807E930 0x0000 + SetAnimation 0x0000 EndBlock WaitForSyncFlagAndClear 0x00000004 Call CreateDust diff --git a/data/scripts/cutscene/outro/script_Object6AOctorok4.inc b/data/scripts/cutscene/outro/script_Object6AOctorok4.inc index ce4e0e15..f52e72f8 100644 --- a/data/scripts/cutscene/outro/script_Object6AOctorok4.inc +++ b/data/scripts/cutscene/outro/script_Object6AOctorok4.inc @@ -1,9 +1,9 @@ @ Outro OBJECT_6A Octorok 4 SCRIPT_START script_Object6AOctorok4 BeginBlock - _0807EB44 0x0006 + SetAnimationState 0x0006 DoPostScriptAction 0x0007 - _0807E930 0x0003 + SetAnimation 0x0003 EndBlock WaitForSyncFlagAndClear 0x00000008 Call CreateDust diff --git a/data/scripts/cutscene/outro/script_Object6ATektite1.inc b/data/scripts/cutscene/outro/script_Object6ATektite1.inc index a8599488..9a83a445 100644 --- a/data/scripts/cutscene/outro/script_Object6ATektite1.inc +++ b/data/scripts/cutscene/outro/script_Object6ATektite1.inc @@ -1,9 +1,9 @@ @ Outro OBJECT_6A Tektite 1 SCRIPT_START script_Object6ATektite1 BeginBlock - _0807EB44 0x0002 + SetAnimationState 0x0002 DoPostScriptAction 0x0007 - _0807E930 0x0000 + SetAnimation 0x0000 EndBlock WaitForSyncFlagAndClear 0x00000001 Call CreateDust diff --git a/data/scripts/cutscene/outro/script_Object6ATektite2.inc b/data/scripts/cutscene/outro/script_Object6ATektite2.inc index 3f666062..417ac068 100644 --- a/data/scripts/cutscene/outro/script_Object6ATektite2.inc +++ b/data/scripts/cutscene/outro/script_Object6ATektite2.inc @@ -1,9 +1,9 @@ @ Outro OBJECT_6A Tektite 2 SCRIPT_START script_Object6ATektite2 BeginBlock - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0007 - _0807E930 0x0000 + SetAnimation 0x0000 EndBlock WaitForSyncFlagAndClear 0x00000002 Call CreateDust diff --git a/data/scripts/cutscene/outro/script_Object6ATektite3.inc b/data/scripts/cutscene/outro/script_Object6ATektite3.inc index c088f9cf..6f877941 100644 --- a/data/scripts/cutscene/outro/script_Object6ATektite3.inc +++ b/data/scripts/cutscene/outro/script_Object6ATektite3.inc @@ -1,9 +1,9 @@ @ Outro OBJECT_6A Tektite 3 SCRIPT_START script_Object6ATektite3 BeginBlock - _0807EB44 0x0000 + SetAnimationState 0x0000 DoPostScriptAction 0x0007 - _0807E930 0x0000 + SetAnimation 0x0000 EndBlock WaitForSyncFlagAndClear 0x00000004 Call CreateDust diff --git a/data/scripts/cutscene/outro/script_Object6ATektite4.inc b/data/scripts/cutscene/outro/script_Object6ATektite4.inc index 68f9a905..94669abf 100644 --- a/data/scripts/cutscene/outro/script_Object6ATektite4.inc +++ b/data/scripts/cutscene/outro/script_Object6ATektite4.inc @@ -1,9 +1,9 @@ @ Outro OBJECT_6A Tektite 4 SCRIPT_START script_Object6ATektite4 BeginBlock - _0807EB44 0x0006 + SetAnimationState 0x0006 DoPostScriptAction 0x0007 - _0807E930 0x0000 + SetAnimation 0x0000 EndBlock WaitForSyncFlagAndClear 0x00000008 Call CreateDust diff --git a/data/scripts/cutscene/outro/script_Object6ATheLittleHat.inc b/data/scripts/cutscene/outro/script_Object6ATheLittleHat.inc index da1e3fab..248601ee 100644 --- a/data/scripts/cutscene/outro/script_Object6ATheLittleHat.inc +++ b/data/scripts/cutscene/outro/script_Object6ATheLittleHat.inc @@ -4,7 +4,7 @@ SCRIPT_START script_Object6ATheLittleHat SetEntitySpeed 0x0080 DoPostScriptAction 0x0007 DoPostScriptAction 0x000b - _0807E930 0x0000 + SetAnimation 0x0000 EndBlock WaitForSyncFlagAndClear 0x00000008 Call sub_08094B80 diff --git a/data/scripts/cutscene/outro/script_Object6AZeldaMagic.inc b/data/scripts/cutscene/outro/script_Object6AZeldaMagic.inc index b4456a55..612c3676 100644 --- a/data/scripts/cutscene/outro/script_Object6AZeldaMagic.inc +++ b/data/scripts/cutscene/outro/script_Object6AZeldaMagic.inc @@ -3,7 +3,7 @@ SCRIPT_START script_Object6AZeldaMagic BeginBlock DoPostScriptAction 0x0007 DoPostScriptAction 0x000b - CallWithArg sub_0807F994, 0x0000fff8 + CallWithArg SetSpriteOffset, 0x0000fff8 EndBlock WaitForSyncFlag 0x00001000 DoPostScriptAction 0x0006 diff --git a/data/scripts/cutscene/outro/script_PlayerAtEzlo.inc b/data/scripts/cutscene/outro/script_PlayerAtEzlo.inc index c04735bc..8c2918ff 100644 --- a/data/scripts/cutscene/outro/script_PlayerAtEzlo.inc +++ b/data/scripts/cutscene/outro/script_PlayerAtEzlo.inc @@ -4,7 +4,7 @@ SCRIPT_START script_PlayerAtEzlo SetEntitySpeed 0x0100 EndBlock _0807EDD4 0x0088, 0x0080 - _0807EB44 0x0000 + SetAnimationState 0x0000 DoPostScriptAction 0x0000 SetSyncFlag 0x00000001 Call sub_080791BC diff --git a/data/scripts/cutscene/outro/script_PlayerAtOutro.inc b/data/scripts/cutscene/outro/script_PlayerAtOutro.inc index 3aef29f7..fc956c5a 100644 --- a/data/scripts/cutscene/outro/script_PlayerAtOutro.inc +++ b/data/scripts/cutscene/outro/script_PlayerAtOutro.inc @@ -1,13 +1,13 @@ @ Player at Outro SCRIPT_START script_PlayerAtOutro EndBlock - _0807EB44 0x0002 + SetAnimationState 0x0002 Wait 0x000a - _0807EB44 0x0006 + SetAnimationState 0x0006 Wait 0x000a - _0807EB44 0x0002 + SetAnimationState 0x0002 Wait 0x000a - _0807EB44 0x0006 + SetAnimationState 0x0006 Wait 0x000a SetSyncFlag 0x00000001 Call sub_080791BC diff --git a/data/scripts/cutscene/outro/script_PlayerGetGreenCap.inc b/data/scripts/cutscene/outro/script_PlayerGetGreenCap.inc index 9b99fff7..96af6e03 100644 --- a/data/scripts/cutscene/outro/script_PlayerGetGreenCap.inc +++ b/data/scripts/cutscene/outro/script_PlayerGetGreenCap.inc @@ -2,24 +2,24 @@ SCRIPT_START script_PlayerGetGreenCap BeginBlock Call sub_08094BE0 - CallWithArg sub_0807F238, 0x0000045b + CallWithArg SetPlayerAnimation2, 0x0000045b PlaySound SFX_109 EndBlock - Call sub_0807F304 + Call WaitForPlayerFrameHiBit Wait 0x005a SetSyncFlag 0x00000008 BeginBlock - CallWithArg sub_0807F6F8, 0x00000008 - CallWithArg sub_0807F238, 0x000008e4 + CallWithArg ResetPlayerFlag, 0x00000008 + CallWithArg SetPlayerAnimation2, 0x000008e4 EndBlock - Call sub_0807F304 - _0807EB44 0x0004 + Call WaitForPlayerFrameHiBit + SetAnimationState 0x0004 DoPostScriptAction 0x0000 Wait 0x003c - _0807EB44 0x0002 + SetAnimationState 0x0002 DoPostScriptAction 0x0000 Wait 0x0004 - _0807EB44 0x0000 + SetAnimationState 0x0000 DoPostScriptAction 0x0000 SetSyncFlag 0x00000001 Call sub_080791BC diff --git a/data/scripts/cutscene/outro/script_PlayerSayGoodbye.inc b/data/scripts/cutscene/outro/script_PlayerSayGoodbye.inc index a209c670..b10a0ba5 100644 --- a/data/scripts/cutscene/outro/script_PlayerSayGoodbye.inc +++ b/data/scripts/cutscene/outro/script_PlayerSayGoodbye.inc @@ -3,8 +3,8 @@ SCRIPT_START script_PlayerSayGoodbye BeginBlock SetEntitySpeed 0x0080 EndBlock - _0807EC64 0x0020 - _0807EB44 0x0000 + WalkNorth 0x0020 + SetAnimationState 0x0000 DoPostScriptAction 0x0000 SetSyncFlag 0x00000001 Call sub_080791BC diff --git a/data/scripts/cutscene/outro/script_ZeldaGoodbye.inc b/data/scripts/cutscene/outro/script_ZeldaGoodbye.inc index 470bddb0..3fb8ff81 100644 --- a/data/scripts/cutscene/outro/script_ZeldaGoodbye.inc +++ b/data/scripts/cutscene/outro/script_ZeldaGoodbye.inc @@ -4,11 +4,11 @@ SCRIPT_START script_ZeldaGoodbye SetEntitySpeed 0x0080 DoPostScriptAction 0x0007 DoPostScriptAction 0x000b - _0807EB44 0x0002 + SetAnimationState 0x0002 DoPostScriptAction 0x0000 EndBlock WaitForSyncFlagAndClear 0x00000040 - _0807EB44 0x0000 + SetAnimationState 0x0000 DoPostScriptAction 0x0000 SetSyncFlag 0x00000080 WaitForSyncFlagAndClear 0x80000000 diff --git a/data/scripts/cutscene/outro/script_ZeldaOutro.inc b/data/scripts/cutscene/outro/script_ZeldaOutro.inc index d639a25a..92bbcf27 100644 --- a/data/scripts/cutscene/outro/script_ZeldaOutro.inc +++ b/data/scripts/cutscene/outro/script_ZeldaOutro.inc @@ -4,21 +4,21 @@ SCRIPT_START script_ZeldaOutro SetEntitySpeed 0x0100 DoPostScriptAction 0x0007 DoPostScriptAction 0x000b - _0807EB44 0x0002 + SetAnimationState 0x0002 DoPostScriptAction 0x0000 EndBlock WaitForSyncFlagAndClear 0x00000004 BeginBlock DoPostScriptAction 0x0004 - Call sub_0807F3F8 + Call CreatePlayerExclamationMark EndBlock Wait 0x003c - _0807EC94 0x0010 - _0807EB44 0x0002 + WalkEast 0x0010 + SetAnimationState 0x0002 DoPostScriptAction 0x0000 SetSyncFlag 0x00000080 WaitForSyncFlagAndClear 0x00000004 - _0807EB44 0x0000 + SetAnimationState 0x0000 DoPostScriptAction 0x0000 SetSyncFlag 0x00000080 WaitForSyncFlagAndClear 0x00000004 @@ -26,7 +26,7 @@ SCRIPT_START script_ZeldaOutro Wait 0x003c SetSyncFlag 0x00000080 WaitForSyncFlagAndClear 0x00000004 - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 PlaySound SFX_SPARKLES CallWithArg sub_080960C4, script_Object6AZeldaMagic diff --git a/data/scripts/cutscene/reveal/script_08013494.inc b/data/scripts/cutscene/reveal/script_08013494.inc index fb3b1606..9eb632de 100644 --- a/data/scripts/cutscene/reveal/script_08013494.inc +++ b/data/scripts/cutscene/reveal/script_08013494.inc @@ -1,7 +1,7 @@ @ Something during Sanctuary Vaati cutscene? Called from script_VaatiSanctuary SCRIPT_START script_08013494 BeginBlock - _0807E930 0x0000 + SetAnimation 0x0000 SetEntitySpeed 0x0200 Call nullsub_527 Call sub_08094B80 diff --git a/data/scripts/cutscene/reveal/script_FakeKingDaltus.inc b/data/scripts/cutscene/reveal/script_FakeKingDaltus.inc index 4f9e3683..82f50ec8 100644 --- a/data/scripts/cutscene/reveal/script_FakeKingDaltus.inc +++ b/data/scripts/cutscene/reveal/script_FakeKingDaltus.inc @@ -1,10 +1,10 @@ @ Sanctuary King Daltus SCRIPT_START script_FakeKingDaltus BeginBlock - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0007 DoPostScriptAction 0x000b - Call sub_0807F338 + Call DeleteHitbox EndBlock WaitForSyncFlagAndClear 0x00000008 Call sub_08061F94 diff --git a/data/scripts/cutscene/reveal/script_Object3EPictureBackRoom.inc b/data/scripts/cutscene/reveal/script_Object3EPictureBackRoom.inc index 9d81e3fb..a0dc7eb6 100644 --- a/data/scripts/cutscene/reveal/script_Object3EPictureBackRoom.inc +++ b/data/scripts/cutscene/reveal/script_Object3EPictureBackRoom.inc @@ -2,16 +2,16 @@ SCRIPT_START script_Object3EPictureBackRoom CheckPlayerInRegion 0x0098, 0x0038, 0x2060 JumpIfNot script_Object3EPictureBackRoom - _0807E864 - Call sub_0807F9A4 + SetPlayerIdle + Call WaitForPlayerNormal Call sub_0807DF28 StartPlayerScript script_PlayerAtPicture WaitForSyncFlagAndClear 0x00000002 - _0807EB28 0x1601 + EzloMessage 0x1601 WaitUntilTextboxCloses StartPlayerScript script_PlayerMoveToPicture WaitForSyncFlagAndClear 0x00000002 - _0807E778 0x0004 + SetFadeTime 0x0004 DoFade5 WaitForFadeFinish LoadRoomEntityList gUnk_080F5680 @@ -22,7 +22,7 @@ SCRIPT_START script_Object3EPictureBackRoom Call sub_0807F844 CameraTargetEntity Call sub_080536B8 - _0807E864 + SetPlayerIdle Call sub_0807DF28 WaitForFadeFinish MessageFromTargetPos 0x1602, 0x000c @@ -44,29 +44,29 @@ SCRIPT_START script_Object3EPictureBackRoom SetSyncFlag 0x00000020 WaitForSyncFlagAndClear 0x00000040 SetFadeMask 0xffff7fff - _0807E778 0x0004 + SetFadeTime 0x0004 DoFade5 WaitForFadeFinish StopBgm _0807E858 0x0000 Wait 0x003c CameraTargetPlayer - Call sub_0807F5C0 + Call WaitForCameraTouchRoomBorder MessageFromTargetPos 0x1604, 0x0007 WaitUntilTextboxCloses SetFadeMask 0xffffffff - _0807E778 0x0004 + SetFadeTime 0x0004 DoFade4 WaitForFadeFinish SetSyncFlag 0x00000004 WaitForSyncFlagAndClear 0x00000002 - _0807EB28 0x1605 + EzloMessage 0x1605 WaitUntilTextboxCloses SetLocalFlag 0x0078 PlayBgm BGM_CASTLE_COLLAPSE SetGlobalFlag 0x005d Call sub_0807DF50 - _0807E878 + EnablePlayerControl DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/cutscene/reveal/script_PlayerAtPicture.inc b/data/scripts/cutscene/reveal/script_PlayerAtPicture.inc index 69a76452..f7760051 100644 --- a/data/scripts/cutscene/reveal/script_PlayerAtPicture.inc +++ b/data/scripts/cutscene/reveal/script_PlayerAtPicture.inc @@ -5,7 +5,7 @@ SCRIPT_START script_PlayerAtPicture EndBlock DoPostScriptAction 0x0001 _0807EDD4 0x0098, 0x0058 - _0807EB44 0x0000 + SetAnimationState 0x0000 DoPostScriptAction 0x0000 SetSyncFlag 0x00000002 Call sub_080791BC diff --git a/data/scripts/cutscene/reveal/script_PlayerDistanceFromVaati.inc b/data/scripts/cutscene/reveal/script_PlayerDistanceFromVaati.inc index ed636572..c44f1f6c 100644 --- a/data/scripts/cutscene/reveal/script_PlayerDistanceFromVaati.inc +++ b/data/scripts/cutscene/reveal/script_PlayerDistanceFromVaati.inc @@ -5,7 +5,7 @@ SCRIPT_START script_PlayerDistanceFromVaati DoPostScriptAction 0x000d EndBlock DoPostScriptAction 0x0001 - _0807ECC4 0x0020 + WalkSouth 0x0020 DoPostScriptAction 0x0000 DoPostScriptAction 0x000c SetSyncFlag 0x00000002 diff --git a/data/scripts/cutscene/reveal/script_PlayerFaintAgain.inc b/data/scripts/cutscene/reveal/script_PlayerFaintAgain.inc index 91f9285d..b40b2b9e 100644 --- a/data/scripts/cutscene/reveal/script_PlayerFaintAgain.inc +++ b/data/scripts/cutscene/reveal/script_PlayerFaintAgain.inc @@ -1,13 +1,13 @@ @ Sanctuary Player faint from Vaati attack SCRIPT_START script_PlayerFaintAgain Call sub_0807F1C4 - Call sub_0807F2D4 + Call WaitForFrameHiBit Call sub_0807F1E8 - Call sub_0807F2D4 + Call WaitForFrameHiBit SetSyncFlag 0x00000002 WaitForSyncFlagAndClear 0x00000004 PlaySound SFX_PLY_JUMP - _0807EB44 0x0004 + SetAnimationState 0x0004 Call sub_0807F210 _0807EF3C 0x0200, 0x0020 DoPostScriptAction 0x0000 diff --git a/data/scripts/cutscene/reveal/script_PlayerMoveToPicture.inc b/data/scripts/cutscene/reveal/script_PlayerMoveToPicture.inc index 76237d60..b2af1dd9 100644 --- a/data/scripts/cutscene/reveal/script_PlayerMoveToPicture.inc +++ b/data/scripts/cutscene/reveal/script_PlayerMoveToPicture.inc @@ -4,7 +4,7 @@ SCRIPT_START script_PlayerMoveToPicture SetEntitySpeed 0x0080 EndBlock DoPostScriptAction 0x0001 - _0807EC64 0x0020 + WalkNorth 0x0020 DoPostScriptAction 0x0000 SetSyncFlag 0x00000002 Call sub_080791BC diff --git a/data/scripts/cutscene/reveal/script_VaatiSanctuary.inc b/data/scripts/cutscene/reveal/script_VaatiSanctuary.inc index ca88188c..7619f004 100644 --- a/data/scripts/cutscene/reveal/script_VaatiSanctuary.inc +++ b/data/scripts/cutscene/reveal/script_VaatiSanctuary.inc @@ -1,10 +1,10 @@ @ Sanctuary Vaati SCRIPT_START script_VaatiSanctuary BeginBlock - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0008 DoPostScriptAction 0x000b - Call sub_0807F338 + Call DeleteHitbox EndBlock WaitForSyncFlagAndClear 0x00000020 SetEntityPositionRelative 0x0098, 0x0048 @@ -22,7 +22,7 @@ SCRIPT_START script_VaatiSanctuary WaitForSyncFlagAndClear 0x00000080 SetSyncFlag 0x00000040 WaitForSyncFlagAndClear 0x00000020 - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 SetSyncFlag 0x00000040 WaitForSyncFlagAndClear 0x00000020 diff --git a/data/scripts/cutscene/takeover/script_GuardTakeover.inc b/data/scripts/cutscene/takeover/script_GuardTakeover.inc index 42af6737..edb5e826 100644 --- a/data/scripts/cutscene/takeover/script_GuardTakeover.inc +++ b/data/scripts/cutscene/takeover/script_GuardTakeover.inc @@ -2,13 +2,13 @@ SCRIPT_START script_GuardTakeover BeginBlock SetEntitySpeed 0x0080 - _0807EB44 0x0000 - _0807E930 0x0000 + SetAnimationState 0x0000 + SetAnimation 0x0000 EndBlock WaitForSyncFlag 0x00000040 - _0807E930 0x0004 - _0807EC64 0x00c0 - _0807E930 0x0000 + SetAnimation 0x0004 + WalkNorth 0x00c0 + SetAnimation 0x0000 Wait 0x003c SetSyncFlag 0x00000080 WaitForSyncFlag 0x00000200 diff --git a/data/scripts/cutscene/takeover/script_KingDaltusTakeover.inc b/data/scripts/cutscene/takeover/script_KingDaltusTakeover.inc index f4263027..3f76d704 100644 --- a/data/scripts/cutscene/takeover/script_KingDaltusTakeover.inc +++ b/data/scripts/cutscene/takeover/script_KingDaltusTakeover.inc @@ -1,7 +1,7 @@ @ Western Wood Cutscene King Daltus SCRIPT_START script_KingDaltusTakeover BeginBlock - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 EndBlock WaitForSyncFlagAndClear 0x00000004 diff --git a/data/scripts/cutscene/takeover/script_MinisterPothoTakeover.inc b/data/scripts/cutscene/takeover/script_MinisterPothoTakeover.inc index c3f81281..83d69479 100644 --- a/data/scripts/cutscene/takeover/script_MinisterPothoTakeover.inc +++ b/data/scripts/cutscene/takeover/script_MinisterPothoTakeover.inc @@ -1,7 +1,7 @@ @ Western Wood Cutscene Minister Potho SCRIPT_START script_MinisterPothoTakeover BeginBlock - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 EndBlock WaitForSyncFlagAndClear 0x00000001 diff --git a/data/scripts/cutscene/takeover/script_Object69Takeover.inc b/data/scripts/cutscene/takeover/script_Object69Takeover.inc index d8ff3cae..773a0fef 100644 --- a/data/scripts/cutscene/takeover/script_Object69Takeover.inc +++ b/data/scripts/cutscene/takeover/script_Object69Takeover.inc @@ -6,31 +6,31 @@ SCRIPT_START script_Object69Takeover script_08015BF0: CheckPlayerInRegion 0x0160, 0x0020, 0x3040 JumpIfNot script_08015BF0 - _0807E864 - Call sub_0807F9A4 + SetPlayerIdle + Call WaitForPlayerNormal Call sub_0807DF28 Call sub_0807FBC4 StartPlayerScript script_PlayerAtTakeover WaitForSyncFlagAndClear 0x00000100 CameraTargetPlayer - _0807E778 0x0004 + SetFadeTime 0x0004 _0807E80C 0x00000000 WaitForFadeFinish StopBgm Call sub_08053BE8 BeginBlock - _0807E864 + SetPlayerIdle Call sub_0807FBC4 CameraTargetPlayer - _0807E778 0x0100 + SetFadeTime 0x0100 DoFade4 _0807E80C 0x00000000 EndBlock - _0807E778 0x0004 + SetFadeTime 0x0004 _0807E800 0x00000000 WaitForFadeFinish PlayBGM - _0807EB28 0x131f + EzloMessage 0x131f WaitUntilTextboxCloses .ifdef JP SetLocalFlag 0x009b @@ -47,7 +47,7 @@ script_08015BF0: .endif Call sub_0807FBCC Call sub_0807DF50 - _0807E878 + EnablePlayerControl DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/cutscene/takeover/script_Object69TakeoverCutscene.inc b/data/scripts/cutscene/takeover/script_Object69TakeoverCutscene.inc index 10feed63..dea65804 100644 --- a/data/scripts/cutscene/takeover/script_Object69TakeoverCutscene.inc +++ b/data/scripts/cutscene/takeover/script_Object69TakeoverCutscene.inc @@ -5,7 +5,7 @@ SCRIPT_START script_Object69TakeoverCutscene SetEntityPositionRelative 0x0088, 0x0068 CameraTargetEntity EndBlock - _0807E778 0x0004 + SetFadeTime 0x0004 DoFade4 WaitForFadeFinish Wait 0x003c @@ -38,14 +38,14 @@ SCRIPT_START script_Object69TakeoverCutscene WaitForSyncFlagAndClear 0x00000008 SetSyncFlag 0x00000010 WaitForSyncFlagAndClear 0x00000020 - _0807E778 0x0004 + SetFadeTime 0x0004 DoFade5 WaitForFadeFinish SetSyncFlag 0x00000010 LoadRoomEntityList gUnk_080FCE30 StopBgm Wait 0x0078 - _0807E778 0x0004 + SetFadeTime 0x0004 DoFade4 WaitForFadeFinish PlayBgm BGM_DIGGING_CAVE @@ -59,7 +59,7 @@ SCRIPT_START script_Object69TakeoverCutscene Wait 0x003c SetSyncFlag 0x00000004 WaitForSyncFlagAndClear 0x00000008 - _0807E778 0x0004 + SetFadeTime 0x0004 DoFade5 WaitForFadeFinish StopBgm diff --git a/data/scripts/cutscene/takeover/script_PlayerAtTakeover.inc b/data/scripts/cutscene/takeover/script_PlayerAtTakeover.inc index 551025aa..034b3197 100644 --- a/data/scripts/cutscene/takeover/script_PlayerAtTakeover.inc +++ b/data/scripts/cutscene/takeover/script_PlayerAtTakeover.inc @@ -5,15 +5,15 @@ SCRIPT_START script_PlayerAtTakeover EndBlock DoPostScriptAction 0x0001 _0807EDD4 0x0168, 0x0058 - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 - CallWithArg sub_0807F238, 0x000003c5 - Call sub_0807F304 + CallWithArg SetPlayerAnimation2, 0x000003c5 + Call WaitForPlayerFrameHiBit MessageFromTargetPos 0x1318, 0x000c WaitUntilTextboxCloses - CallWithArg sub_0807F238, 0x000003c9 - Call sub_0807F304 - _0807EB44 0x0004 + CallWithArg SetPlayerAnimation2, 0x000003c9 + Call WaitForPlayerFrameHiBit + SetAnimationState 0x0004 DoPostScriptAction 0x0000 SetSyncFlag 0x00000100 Call sub_080791BC diff --git a/data/scripts/cutscene/takeover/script_VaatiTakeover.inc b/data/scripts/cutscene/takeover/script_VaatiTakeover.inc index 14796d93..efd31a2b 100644 --- a/data/scripts/cutscene/takeover/script_VaatiTakeover.inc +++ b/data/scripts/cutscene/takeover/script_VaatiTakeover.inc @@ -2,7 +2,7 @@ SCRIPT_START script_VaatiTakeover BeginBlock DoPostScriptAction 0x0008 - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 DoPostScriptAction 0x001d EndBlock @@ -12,9 +12,9 @@ SCRIPT_START script_VaatiTakeover DoPostScriptAction 0x0007 DoPostScriptAction 0x001e Wait 0x0014 - _0807EB44 0x0000 + SetAnimationState 0x0000 DoPostScriptAction 0x001c - Call sub_0807F2D4 + Call WaitForFrameHiBit DoPostScriptAction 0x0000 SetSyncFlag 0x00000020 WaitForSyncFlagAndClear 0x00000010 diff --git a/data/scripts/dhc/script_GuardCellLeft.inc b/data/scripts/dhc/script_GuardCellLeft.inc index a44c7ed5..58efe5f0 100644 --- a/data/scripts/dhc/script_GuardCellLeft.inc +++ b/data/scripts/dhc/script_GuardCellLeft.inc @@ -1,7 +1,7 @@ @ DHC left Guard at King cell SCRIPT_START script_GuardCellLeft BeginBlock - _0807EB44 0x0002 + SetAnimationState 0x0002 CallWithArg sub_0807F3D8, 0x00000000 DoPostScriptAction 0x000a _0807E9D4 @@ -9,10 +9,10 @@ SCRIPT_START script_GuardCellLeft script_0800E44C: CheckEntityInteractType JumpIfNot script_0800E44C - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer CallWithArg sub_0807F3D8, 0x00000000 MessageNoOverlap 0x2405 WaitUntilTextboxCloses - _0807E878 + EnablePlayerControl Jump script_0800E44C diff --git a/data/scripts/dhc/script_GuardCellRight.inc b/data/scripts/dhc/script_GuardCellRight.inc index 9f85273b..83ddbacf 100644 --- a/data/scripts/dhc/script_GuardCellRight.inc +++ b/data/scripts/dhc/script_GuardCellRight.inc @@ -1,7 +1,7 @@ @ DHC right Guard at King cell SCRIPT_START script_GuardCellRight BeginBlock - _0807EB44 0x0004 + SetAnimationState 0x0004 CallWithArg sub_0807F3D8, 0x00000000 DoPostScriptAction 0x000a _0807E9D4 @@ -9,12 +9,12 @@ SCRIPT_START script_GuardCellRight script_0800E484: CheckEntityInteractType JumpIfNot script_0800E484 - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer CallWithArg sub_0807F3D8, 0x00000000 MessageNoOverlap 0x2407 WaitUntilTextboxCloses - _0807E878 + EnablePlayerControl Jump script_0800E484 diff --git a/data/scripts/dhc/script_GuardStone1.inc b/data/scripts/dhc/script_GuardStone1.inc index 506abd38..ae42371d 100644 --- a/data/scripts/dhc/script_GuardStone1.inc +++ b/data/scripts/dhc/script_GuardStone1.inc @@ -1,21 +1,21 @@ @ DHC Guard stone SCRIPT_START script_GuardStone1 BeginBlock - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x000a CheckLocalFlag 0x0094 JumpIf script_0800E1D0 - _0807E930 0x0010 + SetAnimation 0x0010 CallWithArg sub_0807F8E8, 0x00000001 EndBlock script_0800E176: CheckRoomFlag 0x0001 JumpIfNot script_0800E176 - _0807E864 + SetPlayerIdle Wait 0x001e DoPostScriptAction 0x0010 PlaySound SFX_1C9 - _0807E930 0x0015 + SetAnimation 0x0015 Wait 0x003c PlaySound SFX_1CA DoPostScriptAction 0x0010 @@ -25,8 +25,8 @@ script_0800E176: DoPostScriptAction 0x0004 Wait 0x001e DoPostScriptAction 0x0000 - _0807EB8C - _0807EB74 + FaceAwayFromPlayer + FacePlayer CallWithArg sub_0807F3D8, 0x00000000 Wait 0x000a MessageNoOverlap 0x2401 @@ -35,15 +35,15 @@ script_0800E176: script_0800E1D0: CallWithArg sub_0807F3D8, 0x00000000 _0807E9D4 - _0807E878 + EnablePlayerControl EndBlock script_0800E1E0: CheckEntityInteractType JumpIfNot script_0800E1E0 - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer CallWithArg sub_0807F3D8, 0x00000000 MessageNoOverlap 0x2401 WaitUntilTextboxCloses - _0807E878 + EnablePlayerControl Jump script_0800E1E0 diff --git a/data/scripts/dhc/script_GuardStone2.inc b/data/scripts/dhc/script_GuardStone2.inc index d7e613af..71483148 100644 --- a/data/scripts/dhc/script_GuardStone2.inc +++ b/data/scripts/dhc/script_GuardStone2.inc @@ -2,30 +2,30 @@ SCRIPT_START script_GuardStone2 BeginBlock SetEntitySpeed 0x0100 - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x000a CheckLocalFlag 0x0073 JumpIfNot script_0800E232 _0807E9D4 SetEntityPositionRelative 0x0070, 0x0168 - _0807EB44 0x0002 + SetAnimationState 0x0002 CallWithArg sub_0807F3D8, 0x00000000 EndBlock Jump script_0800E32E script_0800E232: CheckLocalFlag 0x0095 JumpIf script_0800E29A - _0807E930 0x0010 + SetAnimation 0x0010 CallWithArg sub_0807F8E8, 0x00000002 EndBlock script_0800E24A: CheckRoomFlag 0x0002 JumpIfNot script_0800E24A - _0807E864 + SetPlayerIdle Wait 0x001e DoPostScriptAction 0x0010 PlaySound SFX_1C9 - _0807E930 0x0015 + SetAnimation 0x0015 Wait 0x003c PlaySound SFX_1CA DoPostScriptAction 0x0010 @@ -35,15 +35,15 @@ script_0800E24A: DoPostScriptAction 0x0004 Wait 0x001e DoPostScriptAction 0x0000 - _0807EB8C - _0807EB74 + FaceAwayFromPlayer + FacePlayer CallWithArg sub_0807F3D8, 0x00000000 SetLocalFlag 0x0095 script_0800E29A: DoPostScriptAction 0x0000 CallWithArg sub_0807F3D8, 0x00000000 _0807E9D4 - _0807E878 + EnablePlayerControl EndBlock script_0800E2AE: EndBlock @@ -59,33 +59,33 @@ script_0800E2AE: _0807E9DC SetLocalFlag 0x0073 EndBlock - _0807EB44 0x0000 + SetAnimationState 0x0000 CallWithArg sub_0807F3D8, 0x00000004 _0807EDD4 0x0088, 0x0168 - _0807EB44 0x0006 + SetAnimationState 0x0006 CallWithArg sub_0807F3D8, 0x00000004 _0807EDD4 0x0070, 0x0168 - _0807EB74 + FacePlayer CallWithArg sub_0807F3D8, 0x00000000 _0807E9D4 Jump script_0800E32E script_0800E312: - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer CallWithArg sub_0807F3D8, 0x00000000 EndBlock MessageNoOverlap 0x2404 WaitUntilTextboxCloses - _0807E878 + EnablePlayerControl Jump script_0800E2AE script_0800E32E: CheckEntityInteractType JumpIfNot script_0800E32E - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer CallWithArg sub_0807F3D8, 0x00000000 MessageNoOverlap 0x2403 WaitUntilTextboxCloses - _0807E878 + EnablePlayerControl Jump script_0800E32E .2byte 0x0000 diff --git a/data/scripts/dhc/script_KingDaltusStone.inc b/data/scripts/dhc/script_KingDaltusStone.inc index ee83a886..23e38f64 100644 --- a/data/scripts/dhc/script_KingDaltusStone.inc +++ b/data/scripts/dhc/script_KingDaltusStone.inc @@ -1,23 +1,23 @@ @ DHC King Daltus stone SCRIPT_START script_KingDaltusStone BeginBlock - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x000a CheckLocalFlag 0x0071 JumpIf script_0800E3E8 CheckLocalFlag 0x0096 JumpIf script_0800E3BE - _0807E930 0x000c + SetAnimation 0x000c CallWithArg sub_0807F8E8, 0x00000000 EndBlock script_0800E37A: CheckRoomFlag 0x0000 JumpIfNot script_0800E37A - _0807E864 + SetPlayerIdle Wait 0x001e DoPostScriptAction 0x0010 PlaySound SFX_1C9 - _0807E930 0x000d + SetAnimation 0x000d Wait 0x003c PlaySound SFX_1CA DoPostScriptAction 0x0010 @@ -27,36 +27,36 @@ script_0800E37A: DoPostScriptAction 0x0004 Wait 0x001e DoPostScriptAction 0x0000 - _0807EB74 + FacePlayer SetLocalFlag 0x0096 script_0800E3BE: DoPostScriptAction 0x0000 _0807E9D4 - _0807E878 + EnablePlayerControl EndBlock script_0800E3C8: CheckEntityInteractType JumpIfNot script_0800E3C8 - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer MessageNoOverlap 0x240c WaitUntilTextboxCloses Wait 0x000f GivePlayerItem 0x0053 WaitPlayerGetItem SetLocalFlag 0x0071 - _0807E878 + EnablePlayerControl script_0800E3E8: _0807E9D4 - _0807E878 + EnablePlayerControl EndBlock script_0800E3EE: CheckEntityInteractType JumpIfNot script_0800E3EE - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer MessageNoOverlap 0x240d WaitUntilTextboxCloses Wait 0x000f - _0807E878 + EnablePlayerControl Jump script_0800E3EE diff --git a/data/scripts/dhc/script_MinishterPothoStone.inc b/data/scripts/dhc/script_MinishterPothoStone.inc index b01fa4fa..caf8f250 100644 --- a/data/scripts/dhc/script_MinishterPothoStone.inc +++ b/data/scripts/dhc/script_MinishterPothoStone.inc @@ -1,21 +1,21 @@ @ DHC Minister Potho stone SCRIPT_START script_MinishterPothoStone BeginBlock - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x000a CheckLocalFlag 0x0093 JumpIf script_0800E12E - _0807E930 0x0008 + SetAnimation 0x0008 CallWithArg sub_0807F8E8, 0x00000000 EndBlock script_0800E0DE: CheckRoomFlag 0x0000 JumpIfNot script_0800E0DE - _0807E864 + SetPlayerIdle Wait 0x001e DoPostScriptAction 0x0010 PlaySound SFX_1C9 - _0807E930 0x0009 + SetAnimation 0x0009 Wait 0x003c PlaySound SFX_1CA DoPostScriptAction 0x0010 @@ -25,24 +25,24 @@ script_0800E0DE: DoPostScriptAction 0x0004 Wait 0x001e DoPostScriptAction 0x0000 - _0807EB8C - _0807EB74 + FaceAwayFromPlayer + FacePlayer Wait 0x000a MessageNoOverlap 0x2402 WaitUntilTextboxCloses SetLocalFlag 0x0093 script_0800E12E: Call sub_080668F0 - _0807E878 + EnablePlayerControl EndBlock script_0800E138: CheckEntityInteractType JumpIfNot script_0800E138 - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer MessageNoOverlap 0x2402 WaitUntilTextboxCloses Wait 0x000f - _0807E878 + EnablePlayerControl Jump script_0800E138 .2byte 0x0000 diff --git a/data/scripts/dhc/script_MinisterPothoCell.inc b/data/scripts/dhc/script_MinisterPothoCell.inc index 92639487..bbb05921 100644 --- a/data/scripts/dhc/script_MinisterPothoCell.inc +++ b/data/scripts/dhc/script_MinisterPothoCell.inc @@ -1,17 +1,17 @@ @ DHC Minister Potho in King cell SCRIPT_START script_MinisterPothoCell BeginBlock - _0807EB44 0x0002 + SetAnimationState 0x0002 DoPostScriptAction 0x000a Call sub_080668F0 EndBlock script_0800E41A: CheckEntityInteractType JumpIfNot script_0800E41A - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer MessageNoOverlap 0x2406 WaitUntilTextboxCloses Wait 0x000f - _0807E878 + EnablePlayerControl Jump script_0800E41A diff --git a/data/scripts/dhc/script_Npc4EAfterDefeatingV2.inc b/data/scripts/dhc/script_Npc4EAfterDefeatingV2.inc index 7862193e..67c2d035 100644 --- a/data/scripts/dhc/script_Npc4EAfterDefeatingV2.inc +++ b/data/scripts/dhc/script_Npc4EAfterDefeatingV2.inc @@ -5,28 +5,28 @@ SCRIPT_START script_Npc4EAfterDefeatingV2 script_0800DB7C: CallWithArg sub_0807F6B4, 0x000000a0 JumpIf script_0800DB7C - _0807E864 - Call sub_0807F9A4 + SetPlayerIdle + Call WaitForPlayerNormal Call sub_0807DF28 _0807F0B4 0x0001 SetEntityPositionRelative 0x0078, 0x0078 CameraTargetEntity - Call sub_0807F5C0 - _0807EB28 0x1648 + Call WaitForCameraTouchRoomBorder + EzloMessage 0x1648 WaitUntilTextboxCloses Call sub_0804D7EC SetSyncFlag 0x00000001 WaitForSyncFlagAndClear 0x00000002 Call sub_0807DF50 - _0807E878 + EnablePlayerControl script_0800DBCA: CheckRoomFlag 0x0000 JumpIfNot script_0800DBCA - _0807E864 - Call sub_0807F9A4 + SetPlayerIdle + Call WaitForPlayerNormal Call sub_0807DF28 Call sub_0804D810 - Call sub_0807F3F8 + Call CreatePlayerExclamationMark Wait 0x003c StartPlayerScript script_PlayerRescuedZelda WaitForSyncFlagAndClear 0x00000004 @@ -37,9 +37,9 @@ script_0800DBCA: WaitForSyncFlagAndClear 0x00000006 MessageFromTargetPos 0x1643, 0x0002 WaitUntilTextboxCloses - _0807EB28 0x1645 + EzloMessage 0x1645 WaitUntilTextboxCloses - Call sub_0807F3F8 + Call CreatePlayerExclamationMark SetSyncFlag 0x00000001 StopBgm Call sub_08094F98 diff --git a/data/scripts/dhc/script_Npc4ECastleCollapsing.inc b/data/scripts/dhc/script_Npc4ECastleCollapsing.inc index 901ce247..1f2ae59d 100644 --- a/data/scripts/dhc/script_Npc4ECastleCollapsing.inc +++ b/data/scripts/dhc/script_Npc4ECastleCollapsing.inc @@ -4,12 +4,12 @@ SCRIPT_START script_Npc4ECastleCollapsing PlayBgm BGM_CASTLE_COLLAPSE StartPlayerScript script_PlayerStonesFall WaitForSyncFlagAndClear 0x00000006 - _0807EB28 0x1646 + EzloMessage 0x1646 WaitUntilTextboxCloses SetSyncFlag 0x00000001 StartPlayerScript script_PlayerCastleCollapsing CameraTargetPlayer - _0807E778 0x0004 + SetFadeTime 0x0004 _0807E80C 0x00000000 WaitForFadeFinish CallWithArg DeleteManager36, 0x00000001 @@ -17,6 +17,6 @@ SCRIPT_START script_Npc4ECastleCollapsing SetLocalFlag 0x0079 CallWithArg sub_0806DA1C, 0x00000002 Call sub_0807DF50 - _0807E878 + EnablePlayerControl DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/dhc/script_Npc4EV3Defeated.inc b/data/scripts/dhc/script_Npc4EV3Defeated.inc index c2f60ee1..09f214d5 100644 --- a/data/scripts/dhc/script_Npc4EV3Defeated.inc +++ b/data/scripts/dhc/script_Npc4EV3Defeated.inc @@ -5,7 +5,7 @@ script_0800A0FE: CheckGlobalFlag 0x0051 JumpIfNot script_0800A0FE BeginBlock - _0807E864 + SetPlayerIdle Call sub_0807DF28 StopBgm .ifndef EU @@ -14,10 +14,10 @@ script_0800A0FE: SetEntityPositionRelative 0x00b0, 0x0058 Call sub_0807F844 _0807E8E4_3 - CallWithArg sub_0807F75C, 0x00d00060 + CallWithArg SetPlayerPos, 0x00d00060 CallWithArg sub_08094AE8, script_Object6AV3DefeatedMinishCap PlaySound SFX_APPARATE - _0807E778 0x0002 + SetFadeTime 0x0002 DoFade6 EndBlock WaitForFadeFinish diff --git a/data/scripts/dhc/script_Object69BallAndChainSoldierRoom.inc b/data/scripts/dhc/script_Object69BallAndChainSoldierRoom.inc index b583efe7..4bdf7ea5 100644 --- a/data/scripts/dhc/script_Object69BallAndChainSoldierRoom.inc +++ b/data/scripts/dhc/script_Object69BallAndChainSoldierRoom.inc @@ -1,7 +1,7 @@ @ DHC OBJECT_69 Towards Vaati in room with Ball&Chain soldier SCRIPT_START script_Object69BallAndChainSoldierRoom BeginBlock - Call sub_0807F354 + Call SetPriorityPlayerEvent EndBlock CheckLocalFlag 0x007c JumpIf script_0800E4FA @@ -17,7 +17,7 @@ script_0800E4B6: .endif JumpIfNot script_0800E4B6 BeginBlock - _0807E864 + SetPlayerIdle .ifdef JP .ifndef DEMO_JP Call SetPlayerEventPriority @@ -28,7 +28,7 @@ script_0800E4B6: .endif .endif EndBlock - Call sub_0807F3F8 + Call CreatePlayerExclamationMark Wait 0x003c MessageFromTarget 0x160c WaitUntilTextboxCloses @@ -36,7 +36,7 @@ script_0800E4B6: MessageFromTarget 0x160d WaitUntilTextboxCloses Wait 0x001e - _0807EB28 0x160e + EzloMessage 0x160e Wait 0x003c WaitUntilTextboxCloses BeginBlock @@ -52,7 +52,7 @@ script_0800E4B6: .endif .endif script_0800E4FA: - _0807E878 + EnablePlayerControl DoPostScriptAction 0x0006 EndBlock SCRIPT_END diff --git a/data/scripts/dhc/script_Object69CastleEscape.inc b/data/scripts/dhc/script_Object69CastleEscape.inc index ffd72119..f75e5bc4 100644 --- a/data/scripts/dhc/script_Object69CastleEscape.inc +++ b/data/scripts/dhc/script_Object69CastleEscape.inc @@ -1,15 +1,15 @@ @ DHC OBJECT_69 trying to escape the collapsing castle SCRIPT_START script_Object69CastleEscape - _0807E864 - Call sub_0807F9A4 + SetPlayerIdle + Call WaitForPlayerNormal Call sub_0807DF28 StartPlayerScript script_PlayerCastleEscape WaitForSyncFlagAndClear 0x00000001 WaitForSyncFlagAndClear 0x00000002 - _0807EB28 0x1647 + EzloMessage 0x1647 WaitUntilTextboxCloses SetLocalFlag 0x007a Call sub_0807DF50 - _0807E878 + EnablePlayerControl DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/dhc/script_Object69DarkNutsRoom.inc b/data/scripts/dhc/script_Object69DarkNutsRoom.inc index 44712e30..c2f30cae 100644 --- a/data/scripts/dhc/script_Object69DarkNutsRoom.inc +++ b/data/scripts/dhc/script_Object69DarkNutsRoom.inc @@ -7,17 +7,17 @@ SCRIPT_START script_Object69DarkNutsRoom script_0800E550: CheckPlayerInRegion 0x00a8, 0x00c0, 0x0880 JumpIfNot script_0800E550 - _0807E864 + SetPlayerIdle Wait 0x001e - Call sub_0807F3F8 + Call CreatePlayerExclamationMark Wait 0x003c PlaySound SFX_105 Wait 0x001e - _0807EB28 0x1622 + EzloMessage 0x1622 Call sub_08053494 SetLocalFlag 0x007e script_0800E582: - _0807E878 + EnablePlayerControl DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/dhc/script_Object69KeatonsRoom.inc b/data/scripts/dhc/script_Object69KeatonsRoom.inc index ef855c7e..902cf230 100644 --- a/data/scripts/dhc/script_Object69KeatonsRoom.inc +++ b/data/scripts/dhc/script_Object69KeatonsRoom.inc @@ -7,15 +7,15 @@ SCRIPT_START script_Object69KeatonsRoom script_0800E510: CheckPlayerInRegion 0x00a8, 0x0178, 0x1080 JumpIfNot script_0800E510 - _0807E864 + SetPlayerIdle Wait 0x001e - Call sub_0807F3F8 + Call CreatePlayerExclamationMark Wait 0x003c PlaySound SFX_105 Wait 0x001e - _0807EB28 0x1617 + EzloMessage 0x1617 SetLocalFlag 0x007d script_0800E53C: - _0807E878 + EnablePlayerControl DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/dhc/script_Object69KillDarkNut.inc b/data/scripts/dhc/script_Object69KillDarkNut.inc index 24b83cb0..23a85ddd 100644 --- a/data/scripts/dhc/script_Object69KillDarkNut.inc +++ b/data/scripts/dhc/script_Object69KillDarkNut.inc @@ -4,12 +4,12 @@ SCRIPT_START script_Object69KillDarkNut script_0800E5D8: CheckLocalFlag 0x0086 JumpIfNot script_0800E5D8 - _0807E864 + SetPlayerIdle Wait 0x003c SetIntVariable 0x00000905 - Call sub_0807F420 + Call LoadMenu SetRoomFlag 0x0001 Wait 0x001e - _0807E878 + EnablePlayerControl SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/dhc/script_Object69V1Defeated.inc b/data/scripts/dhc/script_Object69V1Defeated.inc index 5acee128..0fe8da38 100644 --- a/data/scripts/dhc/script_Object69V1Defeated.inc +++ b/data/scripts/dhc/script_Object69V1Defeated.inc @@ -5,11 +5,11 @@ script_0800DFB6: CheckRoomFlag 0x0001 JumpIfNot script_0800DFB6 StopBgm - _0807E864 + SetPlayerIdle Call sub_0807DF28 PlaySound SFX_EVAPORATE CallWithArg sub_0806DA1C, 0x00000004 Call sub_0807DF50 - _0807E878 + EnablePlayerControl DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/dhc/script_Object69V2Defeated.inc b/data/scripts/dhc/script_Object69V2Defeated.inc index 9d356a54..ddd5df46 100644 --- a/data/scripts/dhc/script_Object69V2Defeated.inc +++ b/data/scripts/dhc/script_Object69V2Defeated.inc @@ -2,12 +2,12 @@ SCRIPT_START script_Object69V2Defeated BeginBlock Call sub_0807DF28 - _0807E864 + SetPlayerIdle EndBlock StopBgm StopBgm Wait 0x0078 - _0807EB28 0x1638 + EzloMessage 0x1638 WaitUntilTextboxCloses SetRoomFlag 0x0000 Wait 0x001e @@ -15,7 +15,7 @@ SCRIPT_START script_Object69V2Defeated StartPlayerScript script_PlayerV2Defeated WaitForSyncFlagAndClear 0x00000002 Call sub_0807DF50 - _0807E878 + EnablePlayerControl DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/dhc/script_Object69V2Intro.inc b/data/scripts/dhc/script_Object69V2Intro.inc index a485ffb9..1e779703 100644 --- a/data/scripts/dhc/script_Object69V2Intro.inc +++ b/data/scripts/dhc/script_Object69V2Intro.inc @@ -2,7 +2,7 @@ SCRIPT_START script_Object69V2Intro BeginBlock Call sub_0807DF28 - _0807E864 + SetPlayerIdle EndBlock StopBgm MessageFromTargetPos 0x1632, 0x0002 @@ -13,12 +13,12 @@ script_0800DFFE: JumpIfNot script_0800DFFE PlayBgm BGM_VAATI_TRANSFIGURED Call sub_0807DF50 - _0807E878 + EnablePlayerControl script_0800E012: @ Defeated CheckRoomFlag 0x0002 JumpIfNot script_0800E012 - _0807E864 + SetPlayerIdle Call sub_0807DF28 SetLocalFlag 0x007b MessageFromTargetPos 0x1639, 0x000c @@ -27,7 +27,7 @@ script_0800E012: PlaySound SFX_EVAPORATE CallWithArg sub_0806DA1C, 0x00000005 Call sub_0807DF50 - _0807E878 + EnablePlayerControl DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/dhc/script_Object69VaatiWithZelda.inc b/data/scripts/dhc/script_Object69VaatiWithZelda.inc index e66a3b15..930fbcf2 100644 --- a/data/scripts/dhc/script_Object69VaatiWithZelda.inc +++ b/data/scripts/dhc/script_Object69VaatiWithZelda.inc @@ -5,16 +5,16 @@ SCRIPT_START script_Object69VaatiWithZelda script_0800DA64: CheckPlayerInRegion 0x0078, 0x0148, 0x4040 JumpIfNot script_0800DA64 - _0807E864 - Call sub_0807F9A4 + SetPlayerIdle + Call WaitForPlayerNormal Call sub_0807DF28 _0807E8E4_0 - Call sub_0807F3F8 + Call CreatePlayerExclamationMark Wait 0x003c _0807F0B4 0x0004 SetEntityPositionRelative 0x0078, 0x0080 CameraTargetEntity - Call sub_0807F5C0 + Call WaitForCameraTouchRoomBorder SetSyncFlag 0x00000001 WaitForSyncFlagAndClear 0x00000002 MessageFromTargetPos 0x162d, 0x0002 @@ -24,24 +24,24 @@ script_0800DA64: MessageFromTargetPos 0x162e, 0x0002 WaitUntilTextboxCloses _0807E8E4_0 - CallWithArg sub_0807F75C, 0x00780138 + CallWithArg SetPlayerPos, 0x00780138 _0807F0B4 0x0004 CameraTargetPlayer - Call sub_0807F5C0 + Call WaitForCameraTouchRoomBorder SetRoomFlag 0x0000 - Call sub_0807F40C + Call CreatePlayerQuestionMark Wait 0x001e _0807E8E4_1 Wait 0x000a _0807E8E4_3 Wait 0x000a _0807E8E4_2 - Call sub_0807F3F8 + Call CreatePlayerExclamationMark Wait 0x003c SetRoomFlag 0x0001 SetLocalFlag 0x0077 Call sub_0807DF50 - _0807E878 + EnablePlayerControl DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/dhc/script_Object6AV3DefeatedMinishCap.inc b/data/scripts/dhc/script_Object6AV3DefeatedMinishCap.inc index 77dc7aaa..384e441c 100644 --- a/data/scripts/dhc/script_Object6AV3DefeatedMinishCap.inc +++ b/data/scripts/dhc/script_Object6AV3DefeatedMinishCap.inc @@ -4,15 +4,15 @@ SCRIPT_START script_Object6AV3DefeatedMinishCap SetEntitySpeed 0x0080 DoPostScriptAction 0x0007 DoPostScriptAction 0x000b - _0807E930 0x0002 + SetAnimation 0x0002 SetEntityPositionRelative 0x00b0, 0x0080 - CallWithArg sub_0807F98C, 0xff800000 + CallWithArg SetEntityHeight, 0xff800000 CallWithArg sub_080960C4, script_Object6AV3DefeatedMinishCap2 EndBlock PlaySound SFX_SPARKLES _0807EF3C 0xff80, 0x0000 PlaySound SFX_143 - _0807E930 0x0004 + SetAnimation 0x0004 SetSyncFlag 0x00000002 Wait 0x003c SetSyncFlag 0x00000004 diff --git a/data/scripts/dhc/script_Object6AV3DefeatedMinishCap2.inc b/data/scripts/dhc/script_Object6AV3DefeatedMinishCap2.inc index 093a1833..200517d3 100644 --- a/data/scripts/dhc/script_Object6AV3DefeatedMinishCap2.inc +++ b/data/scripts/dhc/script_Object6AV3DefeatedMinishCap2.inc @@ -3,7 +3,7 @@ SCRIPT_START script_Object6AV3DefeatedMinishCap2 BeginBlock DoPostScriptAction 0x0007 DoPostScriptAction 0x000b - CallWithArg sub_0807F994, 0x0000fff8 + CallWithArg SetSpriteOffset, 0x0000fff8 EndBlock WaitForSyncFlag 0x00000002 DoPostScriptAction 0x0006 diff --git a/data/scripts/dhc/script_PlayerAfterDefeatingV2.inc b/data/scripts/dhc/script_PlayerAfterDefeatingV2.inc index 8c72e4c3..ee4b78c3 100644 --- a/data/scripts/dhc/script_PlayerAfterDefeatingV2.inc +++ b/data/scripts/dhc/script_PlayerAfterDefeatingV2.inc @@ -3,10 +3,10 @@ SCRIPT_START script_PlayerAfterDefeatingV2 BeginBlock SetEntitySpeed 0x0100 EndBlock - _0807EB44 0x0000 + SetAnimationState 0x0000 DoPostScriptAction 0x000d DoPostScriptAction 0x0000 - _0807ECC4 0x0010 + WalkSouth 0x0010 DoPostScriptAction 0x000c SetSyncFlag 0x00000004 Call sub_080791BC diff --git a/data/scripts/dhc/script_PlayerAtDarkNut1.inc b/data/scripts/dhc/script_PlayerAtDarkNut1.inc index fd697e62..e37bcc9a 100644 --- a/data/scripts/dhc/script_PlayerAtDarkNut1.inc +++ b/data/scripts/dhc/script_PlayerAtDarkNut1.inc @@ -3,13 +3,13 @@ SCRIPT_START script_PlayerAtDarkNut1 BeginBlock SetEntitySpeed 0x0140 SetEntityDirection 0x0000 - _0807E864 - Call sub_0807F354 + SetPlayerIdle + Call SetPriorityPlayerEvent EndBlock - WaitForPlayerAction0x17 + WaitForPlayerEnterRoom _0807E8E4_0 DoPostScriptAction 0x0001 Call sub_080752AC - _0807E878 + EnablePlayerControl Call sub_080791D0 SCRIPT_END diff --git a/data/scripts/dhc/script_PlayerAtDarkNut2.inc b/data/scripts/dhc/script_PlayerAtDarkNut2.inc index 274f6746..60ee6ace 100644 --- a/data/scripts/dhc/script_PlayerAtDarkNut2.inc +++ b/data/scripts/dhc/script_PlayerAtDarkNut2.inc @@ -3,13 +3,13 @@ SCRIPT_START script_PlayerAtDarkNut2 BeginBlock SetEntitySpeed 0x0140 SetEntityDirection 0x0008 - _0807E864 - Call sub_0807F354 + SetPlayerIdle + Call SetPriorityPlayerEvent EndBlock - WaitForPlayerAction0x17 + WaitForPlayerEnterRoom _0807E8E4_1 DoPostScriptAction 0x0001 Call sub_080752AC - _0807E878 + EnablePlayerControl Call sub_080791D0 SCRIPT_END diff --git a/data/scripts/dhc/script_PlayerAtDarkNut3.inc b/data/scripts/dhc/script_PlayerAtDarkNut3.inc index 8cd1c2c9..b092a4c7 100644 --- a/data/scripts/dhc/script_PlayerAtDarkNut3.inc +++ b/data/scripts/dhc/script_PlayerAtDarkNut3.inc @@ -3,13 +3,13 @@ SCRIPT_START script_PlayerAtDarkNut3 BeginBlock SetEntitySpeed 0x0140 SetEntityDirection 0x0010 - _0807E864 - Call sub_0807F354 + SetPlayerIdle + Call SetPriorityPlayerEvent EndBlock - WaitForPlayerAction0x17 + WaitForPlayerEnterRoom _0807E8E4_2 DoPostScriptAction 0x0001 Call sub_080752AC - _0807E878 + EnablePlayerControl Call sub_080791D0 SCRIPT_END diff --git a/data/scripts/dhc/script_PlayerCastleCollapsing.inc b/data/scripts/dhc/script_PlayerCastleCollapsing.inc index dff8b0a0..509a5e68 100644 --- a/data/scripts/dhc/script_PlayerCastleCollapsing.inc +++ b/data/scripts/dhc/script_PlayerCastleCollapsing.inc @@ -3,7 +3,7 @@ SCRIPT_START script_PlayerCastleCollapsing BeginBlock SetEntitySpeed 0x0100 EndBlock - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 _0807EEF4 0x0000, 0x0080 SetSyncFlag 0x00000004 diff --git a/data/scripts/dhc/script_PlayerCastleEscape.inc b/data/scripts/dhc/script_PlayerCastleEscape.inc index 997799ad..5f57f7d8 100644 --- a/data/scripts/dhc/script_PlayerCastleEscape.inc +++ b/data/scripts/dhc/script_PlayerCastleEscape.inc @@ -4,7 +4,7 @@ SCRIPT_START script_PlayerCastleEscape SetEntitySpeed 0x0100 EndBlock _0807EDD4 0x0198, 0x01c8 - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 SetSyncFlag 0x00000001 Call sub_080791BC diff --git a/data/scripts/dhc/script_PlayerRescuedZelda.inc b/data/scripts/dhc/script_PlayerRescuedZelda.inc index 23a6112c..66d6d108 100644 --- a/data/scripts/dhc/script_PlayerRescuedZelda.inc +++ b/data/scripts/dhc/script_PlayerRescuedZelda.inc @@ -5,7 +5,7 @@ SCRIPT_START script_PlayerRescuedZelda EndBlock CallWithArg sub_0807F4F8, 0x000000a0 _0807EDD4 0x0078, 0x00a0 - _0807EB44 0x0000 + SetAnimationState 0x0000 DoPostScriptAction 0x0000 SetSyncFlag 0x00000004 Call sub_080791BC diff --git a/data/scripts/dhc/script_PlayerStonesFall.inc b/data/scripts/dhc/script_PlayerStonesFall.inc index 5f9e57d1..12ba8a9d 100644 --- a/data/scripts/dhc/script_PlayerStonesFall.inc +++ b/data/scripts/dhc/script_PlayerStonesFall.inc @@ -1,10 +1,10 @@ @ Player after turning Zelda when stones fall SCRIPT_START script_PlayerStonesFall EndBlock - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 - CallWithArg sub_0807F238, 0x000003c5 - Call sub_0807F304 + CallWithArg SetPlayerAnimation2, 0x000003c5 + Call WaitForPlayerFrameHiBit SetSyncFlag 0x00000004 Call sub_080791BC SCRIPT_END diff --git a/data/scripts/dhc/script_Vaati1Intro.inc b/data/scripts/dhc/script_Vaati1Intro.inc index cbf2d189..3255d880 100644 --- a/data/scripts/dhc/script_Vaati1Intro.inc +++ b/data/scripts/dhc/script_Vaati1Intro.inc @@ -2,21 +2,21 @@ SCRIPT_START script_Vaati1Intro BeginBlock DoPostScriptAction 0x0008 - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 EndBlock - _0807E864 - Call sub_0807F9A4 + SetPlayerIdle + Call WaitForPlayerNormal Call sub_0807DF28 StopBgm _0807E8E4_2 Wait 0x005a - Call sub_0807F3F8 + Call CreatePlayerExclamationMark Wait 0x003c _0807E8E4_0 _0807F0B4 0x0001 CameraTargetEntity - Call sub_0807F5C0 + Call WaitForCameraTouchRoomBorder Call sub_08066C94 Wait 0x00e9 DoPostScriptAction 0x0007 @@ -25,15 +25,15 @@ SCRIPT_START script_Vaati1Intro PlayBgm BGM_VAATI_REBORN DoPostScriptAction 0x0019 PlaySound SFX_198 - Call sub_0807F2D4 + Call WaitForFrameHiBit SetRoomFlag 0x0000 DoPostScriptAction 0x0008 Wait 0x0080 _0807F0B4 0x0004 CameraTargetPlayer - Call sub_0807F5C0 + Call WaitForCameraTouchRoomBorder SetLocalFlag 0x0078 Call sub_0807DF50 - _0807E878 + EnablePlayerControl DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/dhc/script_VaatiWithZelda.inc b/data/scripts/dhc/script_VaatiWithZelda.inc index 252052f3..1464b9a8 100644 --- a/data/scripts/dhc/script_VaatiWithZelda.inc +++ b/data/scripts/dhc/script_VaatiWithZelda.inc @@ -2,21 +2,21 @@ SCRIPT_START script_VaatiWithZelda BeginBlock DoPostScriptAction 0x0007 - _0807EB44 0x0000 + SetAnimationState 0x0000 DoPostScriptAction 0x0014 EndBlock WaitForSyncFlagAndClear 0x00000001 Wait 0x003c DoPostScriptAction 0x0004 Wait 0x003c - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x001c - Call sub_0807F2D4 + Call WaitForFrameHiBit DoPostScriptAction 0x0000 Wait 0x003c SetSyncFlag 0x00000002 WaitForSyncFlagAndClear 0x00000001 - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0014 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/dhc/script_ZeldaAfterDefeatingV2.inc b/data/scripts/dhc/script_ZeldaAfterDefeatingV2.inc index c52b1a81..8c2d1161 100644 --- a/data/scripts/dhc/script_ZeldaAfterDefeatingV2.inc +++ b/data/scripts/dhc/script_ZeldaAfterDefeatingV2.inc @@ -18,48 +18,48 @@ script_0800DCD0: StopBgm Call sub_08066E50 PlaySound SFX_1C9 - Call sub_0807F2D4 + Call WaitForFrameHiBit PlaySound SFX_1CA Wait 0x003c DoPostScriptAction 0x0004 PlayBgm BGM_SAVING_ZELDA Wait 0x0078 - _0807EB44 0x0002 + SetAnimationState 0x0002 DoPostScriptAction 0x0000 Wait 0x000a - _0807EB44 0x0006 + SetAnimationState 0x0006 Wait 0x000a - _0807EB44 0x0002 + SetAnimationState 0x0002 Wait 0x000a - _0807EB44 0x0006 + SetAnimationState 0x0006 Wait 0x000a - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 Wait 0x003c SetSyncFlag 0x00000002 WaitForSyncFlagAndClear 0x00000001 SetEntitySpeed 0x0100 _0807EEF4 0x0000, 0x0008 - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 Wait 0x001e Call sub_08066E80 - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 SetSyncFlag 0x00000002 WaitForSyncFlagAndClear 0x00000001 DoPostScriptAction 0x0004 Wait 0x003c - _0807EB44 0x0002 + SetAnimationState 0x0002 DoPostScriptAction 0x0000 Wait 0x000a - _0807EB44 0x0006 + SetAnimationState 0x0006 Wait 0x000a - _0807EB44 0x0002 + SetAnimationState 0x0002 Wait 0x000a - _0807EB44 0x0006 + SetAnimationState 0x0006 Wait 0x000a - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 SetSyncFlag 0x00000002 WaitForSyncFlagAndClear 0x00000001 diff --git a/data/scripts/dhc/script_ZeldaCastleEscape.inc b/data/scripts/dhc/script_ZeldaCastleEscape.inc index 83fd2afd..f8150ad9 100644 --- a/data/scripts/dhc/script_ZeldaCastleEscape.inc +++ b/data/scripts/dhc/script_ZeldaCastleEscape.inc @@ -1,7 +1,7 @@ @ DHC Zelda trying to escape the collapsing castle SCRIPT_START script_ZeldaCastleEscape BeginBlock - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 SetEntitySpeed 0x0100 DoPostScriptAction 0x000b @@ -13,7 +13,7 @@ SCRIPT_START script_ZeldaCastleEscape DoPostScriptAction 0x0007 EndBlock _0807EDD4 0x0198, 0x01a8 - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 SetSyncFlag 0x00000002 Call sub_08066D4C diff --git a/data/scripts/dhc/script_ZeldaStoneDHC.inc b/data/scripts/dhc/script_ZeldaStoneDHC.inc index 04ab862d..ae2bc504 100644 --- a/data/scripts/dhc/script_ZeldaStoneDHC.inc +++ b/data/scripts/dhc/script_ZeldaStoneDHC.inc @@ -2,7 +2,7 @@ SCRIPT_START script_ZeldaStoneDHC BeginBlock DoPostScriptAction 0x0007 - _0807EB44 0x0000 + SetAnimationState 0x0000 DoPostScriptAction 0x0014 EndBlock Wait 0x003c diff --git a/data/scripts/fow/script_MazaalMacroDefeated.inc b/data/scripts/fow/script_MazaalMacroDefeated.inc index 624a5513..694d5d25 100644 --- a/data/scripts/fow/script_MazaalMacroDefeated.inc +++ b/data/scripts/fow/script_MazaalMacroDefeated.inc @@ -1,12 +1,12 @@ @ Mazaal Macro when defeated SCRIPT_START script_MazaalMacroDefeated BeginBlock - _0807E864 + SetPlayerIdle EndBlock Wait 0x0078 - _0807E908 0x0004 + SetAction 0x0004 StartPlayerScript script_PlayerDefeatedMazaal WaitForSyncFlagAndClear 0x00000002 Wait 0x000c - _0807E908 0x0005 + SetAction 0x0005 SCRIPT_END diff --git a/data/scripts/fow/script_Object89Mazaal.inc b/data/scripts/fow/script_Object89Mazaal.inc index b5c522c0..75e0eb0b 100644 --- a/data/scripts/fow/script_Object89Mazaal.inc +++ b/data/scripts/fow/script_Object89Mazaal.inc @@ -2,11 +2,11 @@ SCRIPT_START script_Object89Mazaal BeginBlock EndBlock - _0807E888 + DisablePlayerControl Wait 0x0018 - _0807E864 + SetPlayerIdle StartPlayerScript script_PlayerAtMazaal WaitForSyncFlagAndClear 0x00000001 - _0807E908 0x0002 + SetAction 0x0002 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/fow/script_PlayerAtMazaal.inc b/data/scripts/fow/script_PlayerAtMazaal.inc index 75086071..d71de158 100644 --- a/data/scripts/fow/script_PlayerAtMazaal.inc +++ b/data/scripts/fow/script_PlayerAtMazaal.inc @@ -1,7 +1,7 @@ @ Player entering Mazaal SCRIPT_START script_PlayerAtMazaal BeginBlock - _0807EB44 0x0000 + SetAnimationState 0x0000 SetEntitySpeed 0x0140 EndBlock _0807EDD4 0x00b8, 0x0094 diff --git a/data/scripts/fow/script_PlayerDefeatedMazaal.inc b/data/scripts/fow/script_PlayerDefeatedMazaal.inc index 0f6d278a..89fb8ba8 100644 --- a/data/scripts/fow/script_PlayerDefeatedMazaal.inc +++ b/data/scripts/fow/script_PlayerDefeatedMazaal.inc @@ -4,15 +4,15 @@ SCRIPT_START script_PlayerDefeatedMazaal SetEntitySpeed 0x0140 EndBlock Wait 0x003c - _0807EB44 0x0004 + SetAnimationState 0x0004 Wait 0x000f - _0807EB44 0x0002 + SetAnimationState 0x0002 Wait 0x0012 - _0807EB44 0x0006 + SetAnimationState 0x0006 Wait 0x000c - _0807EB44 0x0000 + SetAnimationState 0x0000 Wait 0x0015 - _0807EB44 0x0004 + SetAnimationState 0x0004 Wait 0x0008 SetSyncFlag 0x00000002 _0807EDD4 0x0088, 0x0158 diff --git a/data/scripts/graveyard/script_DampeInside.inc b/data/scripts/graveyard/script_DampeInside.inc index 4f7b7f6f..c722ae55 100644 --- a/data/scripts/graveyard/script_DampeInside.inc +++ b/data/scripts/graveyard/script_DampeInside.inc @@ -2,8 +2,8 @@ SCRIPT_START script_DampeInside CheckEntityInteractType JumpIfNot script_080095DE - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer DoPostScriptAction 0x0001 Call sub_0806BE84 WaitUntilTextboxCloses @@ -15,6 +15,6 @@ SCRIPT_START script_DampeInside WaitUntilTextboxCloses _0807F078 0x003c, 0x0001 script_08009622: - _0807E878 + EnablePlayerControl DoPostScriptAction 0x0000 Jump script_080095DE diff --git a/data/scripts/graveyard/script_DampeOuside.inc b/data/scripts/graveyard/script_DampeOuside.inc index fd0d90a2..653e1ee5 100644 --- a/data/scripts/graveyard/script_DampeOuside.inc +++ b/data/scripts/graveyard/script_DampeOuside.inc @@ -20,8 +20,8 @@ script_08009646: script_08009660: CheckEntityInteractType JumpIfNot script_08009660 - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer DoPostScriptAction 0x0001 Call sub_0806BEC8 WaitUntilTextboxCloses @@ -31,6 +31,6 @@ script_08009660: _0807F078 0x003c, 0x0002 Call sub_0806BEFC script_0800968E: - _0807E878 + EnablePlayerControl DoPostScriptAction 0x0000 Jump script_08009660 diff --git a/data/scripts/graveyard/script_GhostBrothers.inc b/data/scripts/graveyard/script_GhostBrothers.inc index 4f734e51..b9fed2f1 100644 --- a/data/scripts/graveyard/script_GhostBrothers.inc +++ b/data/scripts/graveyard/script_GhostBrothers.inc @@ -2,7 +2,7 @@ SCRIPT_START script_GhostBrothers BeginBlock Call sub_08065D00 - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 DoPostScriptAction 0x000a DoPostScriptAction 0x0007 @@ -10,11 +10,11 @@ SCRIPT_START script_GhostBrothers script_0800975A: CheckEntityInteractType JumpIfNot script_0800975A - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer DoPostScriptAction 0x0000 Call sub_08065F64 WaitUntilTextboxCloses - _0807E878 + EnablePlayerControl Jump script_0800975A .2byte 0x0000 diff --git a/data/scripts/graveyard/script_Gina.inc b/data/scripts/graveyard/script_Gina.inc index 2f0422c7..bb427371 100644 --- a/data/scripts/graveyard/script_Gina.inc +++ b/data/scripts/graveyard/script_Gina.inc @@ -1,7 +1,7 @@ @ Graveyard Gina SCRIPT_START script_Gina BeginBlock - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 DoPostScriptAction 0x000a EndBlock @@ -10,19 +10,19 @@ SCRIPT_START script_Gina script_0800B934: CheckEntityInteractType JumpIfNot script_0800B934 - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer MessageFromTarget 0x3f19 WaitUntilTextboxCloses SetLocalFlag 0x005f - _0807E878 + EnablePlayerControl Jump script_0800B934 script_0800B94E: CheckEntityInteractType JumpIfNot script_0800B94E - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer MessageFromTarget 0x3f1a WaitUntilTextboxCloses - _0807E878 + EnablePlayerControl Jump script_0800B94E diff --git a/data/scripts/graveyard/script_GraveyardHouseDoor.inc b/data/scripts/graveyard/script_GraveyardHouseDoor.inc index 631a1c19..c310b55e 100644 --- a/data/scripts/graveyard/script_GraveyardHouseDoor.inc +++ b/data/scripts/graveyard/script_GraveyardHouseDoor.inc @@ -9,8 +9,8 @@ SCRIPT_START script_GraveyardHouseDoor script_080096AC: CheckPlayerInRegion 0x0188, 0x01c0, 0x1020 JumpIfNot script_080096AC - _0807E864 - Call sub_0807F9A4 + SetPlayerIdle + Call WaitForPlayerNormal Call sub_0807DF28 StartPlayerScript script_PlayerAtGraveyardHouseDoor WaitForSyncFlagAndClear 0x00000001 @@ -24,7 +24,7 @@ script_080096EC: CheckGlobalFlag 0x0020 JumpIfNot script_080096EC Call sub_0807DF50 - _0807E878 + EnablePlayerControl script_080096FC: Call sub_0808692C SCRIPT_END diff --git a/data/scripts/graveyard/script_GreatFairyArrows.inc b/data/scripts/graveyard/script_GreatFairyArrows.inc index e43be1bd..9979e761 100644 --- a/data/scripts/graveyard/script_GreatFairyArrows.inc +++ b/data/scripts/graveyard/script_GreatFairyArrows.inc @@ -6,8 +6,8 @@ script_0800B618: CheckPlayerInRegion 0x0078, 0x00b8, 0x1060 JumpIfNot script_0800B618 Call sub_08079184 - _0807E864 - Call sub_0807F9A4 + SetPlayerIdle + Call WaitForPlayerNormal StartPlayerScript script_PlayerAtGreatFairy WaitForSyncFlagAndClear 0x00000004 SetRoomFlag 0x0000 @@ -20,7 +20,7 @@ script_0800B618: JumpIfNot script_0800B684 Wait 0x000f MessageNoOverlap 0x0584 - CallWithArg sub_0807F970, 0x0000058b + CallWithArg CheckMessageEqual, 0x0000058b JumpIf script_0800B68E CallWithArg sub_08087424, 0x00000000 Wait 0x00b4 @@ -35,12 +35,12 @@ script_0800B68E: GivePlayerItem 0x0066 script_0800B698: WaitPlayerGetItem - _0807EB8C + FaceAwayFromPlayer Wait 0x001e MessageNoOverlap 0x057f WaitUntilTextboxCloses script_0800B6A6: - _0807E778 0x0004 + SetFadeTime 0x0004 DoFade7 WaitForFadeFinish Call sub_080873FC @@ -49,5 +49,5 @@ script_0800B6A6: CameraTargetPlayer Wait 0x001e Call sub_0807DF50 - _0807E878 + EnablePlayerControl SCRIPT_END diff --git a/data/scripts/graveyard/script_KingGustav.inc b/data/scripts/graveyard/script_KingGustav.inc index f1b2e0fc..fc690dc8 100644 --- a/data/scripts/graveyard/script_KingGustav.inc +++ b/data/scripts/graveyard/script_KingGustav.inc @@ -2,34 +2,34 @@ SCRIPT_START script_KingGustav BeginBlock DoPostScriptAction 0x0008 - Call sub_0807F180 + Call SetCollisionLayer2 EndBlock script_0800D962: CheckPlayerInRegion 0x0118, 0x0038, 0x3050 JumpIfNot script_0800D962 - _0807E864 - Call sub_0807F9A4 + SetPlayerIdle + Call WaitForPlayerNormal Call sub_0807DF28 StartPlayerScript script_PlayerAtKingGustav WaitForSyncFlagAndClear 0x00000001 Wait 0x003c - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 DoPostScriptAction 0x0007 PlaySound SFX_ELEMENT_FLOAT - SetEntity0x20 0xffff8000 + SetEntityVelocity 0xffff8000 MessageNoOverlap 0x1701 WaitUntilTextboxCloses SetSyncFlag 0x00000004 WaitForSyncFlagAndClear 0x00000002 MessageNoOverlap 0x1702 WaitUntilTextboxCloses - SetEntity0x20 0x00010000 + SetEntityVelocity 0x00010000 SetSyncFlag 0x00000004 WaitForSyncFlagAndClear 0x00000002 - _0807F050 0x006d + GiveKinstone 0x006d WaitPlayerGetItem - _0807EB28 0x1703 + EzloMessage 0x1703 WaitUntilTextboxCloses Wait 0x003c SetLocalFlag 0x0032 @@ -37,7 +37,7 @@ script_0800D962: SetIntVariable 0x00000001 Call sub_0806DA1C Call sub_0807DF50 - _0807E878 + EnablePlayerControl DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/graveyard/script_Object69CrowStealingKey.inc b/data/scripts/graveyard/script_Object69CrowStealingKey.inc index 9c0bf816..47cf61f9 100644 --- a/data/scripts/graveyard/script_Object69CrowStealingKey.inc +++ b/data/scripts/graveyard/script_Object69CrowStealingKey.inc @@ -1,10 +1,10 @@ @ Graveyard OBJECT_69 Crow stealing key cutscene SCRIPT_START script_Object69CrowStealingKey - _0807E864 - Call sub_0807F9A4 + SetPlayerIdle + Call WaitForPlayerNormal Call sub_0807DF28 PlaySound SFX_1F3 - Call sub_0807F40C + Call CreatePlayerQuestionMark _0807E8E4_1 Wait 0x000a _0807E8E4_3 @@ -21,9 +21,9 @@ SCRIPT_START script_Object69CrowStealingKey SetGlobalFlag 0x0020 _0807E8E4_3 Wait 0x001e - _0807EB28 0x2809 + EzloMessage 0x2809 WaitUntilTextboxCloses Call sub_0807DF50 - _0807E878 + EnablePlayerControl DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/graveyard/script_Object69GetKeyBack.inc b/data/scripts/graveyard/script_Object69GetKeyBack.inc index 7c9b1a25..b6e1073b 100644 --- a/data/scripts/graveyard/script_Object69GetKeyBack.inc +++ b/data/scripts/graveyard/script_Object69GetKeyBack.inc @@ -35,13 +35,13 @@ script_080098E0: .endif .endif .endif - _0807E864 - Call sub_0807F9A4 + SetPlayerIdle + Call WaitForPlayerNormal Call sub_0807DF28 - _0807EB28 0x280a + EzloMessage 0x280a WaitUntilTextboxCloses Call sub_0807DF50 - _0807E878 + EnablePlayerControl script_08009910: DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/graveyard/script_Object97FirstCrow.inc b/data/scripts/graveyard/script_Object97FirstCrow.inc index 4c5e2c80..0c997c0f 100644 --- a/data/scripts/graveyard/script_Object97FirstCrow.inc +++ b/data/scripts/graveyard/script_Object97FirstCrow.inc @@ -1,10 +1,10 @@ @ Graveyard OBJECT_97 Crow stealing the key? first crow that makes link loose the key SCRIPT_START script_Object97FirstCrow BeginBlock - _0807E930 0x0003 + SetAnimation 0x0003 DoPostScriptAction 0x0007 SetEntitySpeed 0x0300 - Call sub_0807F348 + Call SetPriorityMessage EndBlock WaitForSyncFlagAndClear 0x00000002 PlaySound SFX_123 diff --git a/data/scripts/graveyard/script_Object97SecondCrow.inc b/data/scripts/graveyard/script_Object97SecondCrow.inc index 131fe158..169a3ff5 100644 --- a/data/scripts/graveyard/script_Object97SecondCrow.inc +++ b/data/scripts/graveyard/script_Object97SecondCrow.inc @@ -1,10 +1,10 @@ @ Graveyard OBJECT_97 Crow stealing the key? Second crow that picks up the key SCRIPT_START script_Object97SecondCrow BeginBlock - _0807E930 0x0003 + SetAnimation 0x0003 DoPostScriptAction 0x0007 SetEntitySpeed 0x0300 - Call sub_0807F348 + Call SetPriorityMessage EndBlock WaitForSyncFlagAndClear 0x00000008 Call sub_0809E0A0 diff --git a/data/scripts/graveyard/script_PlayerAtGraveyardHouseDoor.inc b/data/scripts/graveyard/script_PlayerAtGraveyardHouseDoor.inc index 5d193069..cbb2b2d3 100644 --- a/data/scripts/graveyard/script_PlayerAtGraveyardHouseDoor.inc +++ b/data/scripts/graveyard/script_PlayerAtGraveyardHouseDoor.inc @@ -3,7 +3,7 @@ SCRIPT_START script_PlayerAtGraveyardHouseDoor SetEntitySpeed 0x0080 DoPostScriptAction 0x0001 _0807EDD4 0x01a0, 0x01b0 - _0807EB44 0x0000 + SetAnimationState 0x0000 DoPostScriptAction 0x0000 Wait 0x000a DoPostScriptAction 0x0004 @@ -11,6 +11,6 @@ SCRIPT_START script_PlayerAtGraveyardHouseDoor SetSyncFlag 0x00000001 DoPostScriptAction 0x000d SetEntitySpeed 0x0100 - _0807ECC4 0x0010 + WalkSouth 0x0010 Call sub_080791BC SCRIPT_END diff --git a/data/scripts/graveyard/script_PlayerAtKingGustav.inc b/data/scripts/graveyard/script_PlayerAtKingGustav.inc index d1214171..d2f7d3bd 100644 --- a/data/scripts/graveyard/script_PlayerAtKingGustav.inc +++ b/data/scripts/graveyard/script_PlayerAtKingGustav.inc @@ -5,7 +5,7 @@ SCRIPT_START script_PlayerAtKingGustav EndBlock DoPostScriptAction 0x0001 _0807EDD4 0x0118, 0x0060 - _0807EB44 0x0000 + SetAnimationState 0x0000 DoPostScriptAction 0x0000 SetSyncFlag 0x00000001 Call sub_080791BC diff --git a/data/scripts/graveyard/script_PlayerGetKeyStolen.inc b/data/scripts/graveyard/script_PlayerGetKeyStolen.inc index c805299a..6133e319 100644 --- a/data/scripts/graveyard/script_PlayerGetKeyStolen.inc +++ b/data/scripts/graveyard/script_PlayerGetKeyStolen.inc @@ -1,17 +1,17 @@ @ Player when crow steals key SCRIPT_START script_PlayerGetKeyStolen PlaySound SFX_PLY_VO6 - _0807EB44 0x0004 + SetAnimationState 0x0004 PlaySound SFX_86 Call sub_0807F36C SetEntitySpeed 0x0400 - _0807ECF4 0x0004 + WalkWest 0x0004 Call sub_0807F1E8 Wait 0x001e SetSyncFlag 0x00000040 WaitForSyncFlagAndClear 0x00000020 PlaySound SFX_PLY_JUMP - _0807EB44 0x0004 + SetAnimationState 0x0004 Call sub_0807F210 _0807EF3C 0x0200, 0x0020 DoPostScriptAction 0x0000 diff --git a/data/scripts/hyruleCastle/script_CastleMaid.inc b/data/scripts/hyruleCastle/script_CastleMaid.inc index 8e3726ba..90f05aed 100644 --- a/data/scripts/hyruleCastle/script_CastleMaid.inc +++ b/data/scripts/hyruleCastle/script_CastleMaid.inc @@ -2,7 +2,7 @@ SCRIPT_START script_CastleMaid BeginBlock _0807E9D4 - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 DoPostScriptAction 0x000a CallWithArg sub_08064644, sub_0806464C diff --git a/data/scripts/hyruleCastle/script_GuardAtEntry.inc b/data/scripts/hyruleCastle/script_GuardAtEntry.inc index 9fa561fc..a7161461 100644 --- a/data/scripts/hyruleCastle/script_GuardAtEntry.inc +++ b/data/scripts/hyruleCastle/script_GuardAtEntry.inc @@ -3,18 +3,18 @@ SCRIPT_START script_GuardAtEntry BeginBlock _0807E9D4 DoPostScriptAction 0x000a - _0807EB44 0x0004 + SetAnimationState 0x0004 CallWithArg sub_0807F3D8, 0x00000000 EndBlock script_08008DD8: CheckEntityInteractType JumpIfNot script_08008DD8 - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer CallWithArg sub_0807F3D8, 0x00000000 Call sub_080643D8 WaitUntilTextboxCloses - _0807E878 - _0807EB44 0x0004 + EnablePlayerControl + SetAnimationState 0x0004 CallWithArg sub_0807F3D8, 0x00000000 Jump script_08008DD8 diff --git a/data/scripts/hyruleCastle/script_KingDaltus.inc b/data/scripts/hyruleCastle/script_KingDaltus.inc index 9c47505b..09965292 100644 --- a/data/scripts/hyruleCastle/script_KingDaltus.inc +++ b/data/scripts/hyruleCastle/script_KingDaltus.inc @@ -1,7 +1,7 @@ @ Hyrule Castle King Daltus SCRIPT_START script_KingDaltus BeginBlock - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 Call sub_0806672C DoPostScriptAction 0x000a diff --git a/data/scripts/hyruleCastle/script_MinisterPotho.inc b/data/scripts/hyruleCastle/script_MinisterPotho.inc index 7cea778c..6bd64932 100644 --- a/data/scripts/hyruleCastle/script_MinisterPotho.inc +++ b/data/scripts/hyruleCastle/script_MinisterPotho.inc @@ -1,7 +1,7 @@ @ Hyrule Castle Minister Potho SCRIPT_START script_MinisterPotho BeginBlock - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 script_0800927E: Call sub_080668F0 @@ -10,11 +10,11 @@ script_0800927E: script_0800928A: CheckEntityInteractType JumpIfNot script_0800928A - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer Call sub_08066904 WaitUntilTextboxCloses Wait 0x000f - _0807E878 + EnablePlayerControl Jump script_0800928A .2byte 0x0000 diff --git a/data/scripts/hyruleCastle/script_Object69SanctuaryEntrance.inc b/data/scripts/hyruleCastle/script_Object69SanctuaryEntrance.inc index 9f2a3cd7..fa317824 100644 --- a/data/scripts/hyruleCastle/script_Object69SanctuaryEntrance.inc +++ b/data/scripts/hyruleCastle/script_Object69SanctuaryEntrance.inc @@ -2,12 +2,12 @@ SCRIPT_START script_Object69SanctuaryEntrance CheckPlayerInRegion 0x0088, 0x0048, 0x3030 JumpIfNot script_Object69SanctuaryEntrance - _0807E864 - Call sub_0807F9A4 + SetPlayerIdle + Call WaitForPlayerNormal Call sub_0807DF28 StartPlayerScript script_PlayerAtSanctuaryEntrance WaitForSyncFlagAndClear 0x00000001 - _0807EB28 0x132d + EzloMessage 0x132d WaitUntilTextboxCloses .ifdef JP SetLocalFlag 0x0015 @@ -23,7 +23,7 @@ SCRIPT_START script_Object69SanctuaryEntrance .endif .endif Call sub_0807DF50 - _0807E878 + EnablePlayerControl DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/hyruleCastle/script_SmithAtCastle.inc b/data/scripts/hyruleCastle/script_SmithAtCastle.inc index 5aa10b08..2e354751 100644 --- a/data/scripts/hyruleCastle/script_SmithAtCastle.inc +++ b/data/scripts/hyruleCastle/script_SmithAtCastle.inc @@ -1,7 +1,7 @@ @ Hyrule Castle Smith SCRIPT_START script_SmithAtCastle BeginBlock - _0807EB44 0x0006 + SetAnimationState 0x0006 DoPostScriptAction 0x0000 script_080092B2: _0807E9D4 @@ -10,10 +10,10 @@ script_080092B2: script_080092BA: CheckEntityInteractType JumpIfNot script_080092BA - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer MessageNoOverlap 0x105e WaitUntilTextboxCloses Wait 0x000f - _0807E878 + EnablePlayerControl Jump script_080092BA diff --git a/data/scripts/hyruleCastle/script_StoneZelda.inc b/data/scripts/hyruleCastle/script_StoneZelda.inc index 7c9cacd8..d17e0023 100644 --- a/data/scripts/hyruleCastle/script_StoneZelda.inc +++ b/data/scripts/hyruleCastle/script_StoneZelda.inc @@ -8,10 +8,10 @@ SCRIPT_START script_StoneZelda script_08009300: CheckEntityInteractType JumpIfNot script_08009300 - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer MessageNoOverlap 0x1071 WaitUntilTextboxCloses - _0807E878 + EnablePlayerControl Jump script_08009300 .2byte 0x0000 diff --git a/data/scripts/hyruleCastleGarden/script_GardGarden5.inc b/data/scripts/hyruleCastleGarden/script_GardGarden5.inc index 4d280b98..e12c1665 100644 --- a/data/scripts/hyruleCastleGarden/script_GardGarden5.inc +++ b/data/scripts/hyruleCastleGarden/script_GardGarden5.inc @@ -1,6 +1,6 @@ @ Guard in Castle garden? SCRIPT_START script_GardGarden5 BeginBlock - _0807EB44 0x0002 + SetAnimationState 0x0002 Jump script_080119F6 .2byte 0x0000 diff --git a/data/scripts/hyruleCastleGarden/script_GuardEntry1.inc b/data/scripts/hyruleCastleGarden/script_GuardEntry1.inc index 36724e50..3a6d1e8d 100644 --- a/data/scripts/hyruleCastleGarden/script_GuardEntry1.inc +++ b/data/scripts/hyruleCastleGarden/script_GuardEntry1.inc @@ -1,7 +1,7 @@ @ Intro Hyrule Castle Entrance Guard SCRIPT_START script_GuardEntry1 BeginBlock - _0807EB44 0x0006 + SetAnimationState 0x0006 script_080119F6: _0807E9D4 DoPostScriptAction 0x000a @@ -10,11 +10,11 @@ script_080119F6: script_08011A08: CheckEntityInteractType JumpIfNot script_08011A08 - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer CallWithArg sub_0807F3D8, 0x00000000 Call sub_08064428 WaitUntilTextboxCloses - _0807E878 + EnablePlayerControl Jump script_08011A08 .2byte 0x0000 diff --git a/data/scripts/hyruleCastleGarden/script_GuardEntry2.inc b/data/scripts/hyruleCastleGarden/script_GuardEntry2.inc index 061b8cb7..53bfb506 100644 --- a/data/scripts/hyruleCastleGarden/script_GuardEntry2.inc +++ b/data/scripts/hyruleCastleGarden/script_GuardEntry2.inc @@ -1,7 +1,7 @@ @ Hyrule Castle Guard guarding entry to castle SCRIPT_START script_GuardEntry2 BeginBlock - _0807EB44 0x0004 + SetAnimationState 0x0004 _0807E9D4 DoPostScriptAction 0x000a CallWithArg sub_0807F3D8, 0x00000000 @@ -9,10 +9,10 @@ SCRIPT_START script_GuardEntry2 script_08011A44: CheckEntityInteractType JumpIfNot script_08011A44 - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer CallWithArg sub_0807F3D8, 0x00000000 MessageFromTarget 0x1320 WaitUntilTextboxCloses - _0807E878 + EnablePlayerControl Jump script_08011A44 diff --git a/data/scripts/hyruleCastleGarden/script_GuardEntry3.inc b/data/scripts/hyruleCastleGarden/script_GuardEntry3.inc index c1b2985d..af4c3020 100644 --- a/data/scripts/hyruleCastleGarden/script_GuardEntry3.inc +++ b/data/scripts/hyruleCastleGarden/script_GuardEntry3.inc @@ -1,7 +1,7 @@ @ Hyrule Castle Guard guarding entry to garden SCRIPT_START script_GuardEntry3 BeginBlock - _0807EB44 0x0002 + SetAnimationState 0x0002 _0807E9D4 DoPostScriptAction 0x000a CallWithArg sub_0807F3D8, 0x00000000 @@ -9,18 +9,18 @@ SCRIPT_START script_GuardEntry3 script_08011A7C: CheckEntityInteractType JumpIfNot script_08011A7C - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer CallWithArg sub_0807F3D8, 0x00000000 CallWithArg sub_080644B4, 0x00000006 JumpIf script_08011AFA MessageFromTarget 0x1320 WaitUntilTextboxCloses - _0807E878 + EnablePlayerControl Jump script_08011A7C .2byte 0x0000 BeginBlock - _0807EB44 0x0004 + SetAnimationState 0x0004 _0807E9D4 DoPostScriptAction 0x000a CallWithArg sub_0807F3D8, 0x00000000 @@ -28,11 +28,11 @@ script_08011A7C: script_08011AC4: CheckEntityInteractType JumpIfNot script_08011AC4 - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer CallWithArg sub_0807F3D8, 0x00000000 MessageFromTarget 0x1322 WaitUntilTextboxCloses - _0807E878 + EnablePlayerControl Jump script_08011AC4 diff --git a/data/scripts/hyruleCastleGarden/script_GuardGarden1.inc b/data/scripts/hyruleCastleGarden/script_GuardGarden1.inc index ac2385f2..f623a1c7 100644 --- a/data/scripts/hyruleCastleGarden/script_GuardGarden1.inc +++ b/data/scripts/hyruleCastleGarden/script_GuardGarden1.inc @@ -1,6 +1,6 @@ @ Guard in Castle garden? SCRIPT_START script_GuardGarden1 BeginBlock - _0807EB44 0x0002 + SetAnimationState 0x0002 Jump script_0801196A .2byte 0x0000 diff --git a/data/scripts/hyruleCastleGarden/script_GuardGarden2.inc b/data/scripts/hyruleCastleGarden/script_GuardGarden2.inc index 72a8627b..fb2c48b0 100644 --- a/data/scripts/hyruleCastleGarden/script_GuardGarden2.inc +++ b/data/scripts/hyruleCastleGarden/script_GuardGarden2.inc @@ -1,6 +1,6 @@ @ Guard in Castle garden? SCRIPT_START script_GuardGarden2 BeginBlock - _0807EB44 0x0006 + SetAnimationState 0x0006 Jump script_0801196A .2byte 0x0000 diff --git a/data/scripts/hyruleCastleGarden/script_GuardGarden3.inc b/data/scripts/hyruleCastleGarden/script_GuardGarden3.inc index c59e34cc..7f7dc3a1 100644 --- a/data/scripts/hyruleCastleGarden/script_GuardGarden3.inc +++ b/data/scripts/hyruleCastleGarden/script_GuardGarden3.inc @@ -1,7 +1,7 @@ @ Intro Hyrule Castle Garden Guard SCRIPT_START script_GuardGarden3 BeginBlock - _0807EB44 0x0004 + SetAnimationState 0x0004 script_0801196A: _0807E9D4 DoPostScriptAction 0x000a @@ -10,8 +10,8 @@ script_0801196A: script_0801197C: CheckEntityInteractType JumpIfNot script_0801197C - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer CallWithArg sub_0807F3D8, 0x00000000 CheckGlobalFlag 0x0015 JumpIf script_080119A0 @@ -22,5 +22,5 @@ script_080119A0: script_080119A4: WaitUntilTextboxCloses Wait 0x000f - _0807E878 + EnablePlayerControl Jump script_0801197C diff --git a/data/scripts/hyruleCastleGarden/script_GuardGarden4.inc b/data/scripts/hyruleCastleGarden/script_GuardGarden4.inc index ce7e7680..92b48937 100644 --- a/data/scripts/hyruleCastleGarden/script_GuardGarden4.inc +++ b/data/scripts/hyruleCastleGarden/script_GuardGarden4.inc @@ -2,7 +2,7 @@ SCRIPT_START script_GuardGarden4 BeginBlock _0807E9D4 - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x000a CallWithArg sub_0807F3D8, 0x0000000c EndBlock diff --git a/data/scripts/hyruleCastleGarden/script_GuardGarden6.inc b/data/scripts/hyruleCastleGarden/script_GuardGarden6.inc index 244345f9..a9947ae2 100644 --- a/data/scripts/hyruleCastleGarden/script_GuardGarden6.inc +++ b/data/scripts/hyruleCastleGarden/script_GuardGarden6.inc @@ -1,6 +1,6 @@ @ Guard in Castle garden? SCRIPT_START script_GuardGarden6 BeginBlock - _0807EB44 0x0004 + SetAnimationState 0x0004 Jump script_080119F6 .2byte 0x0000 diff --git a/data/scripts/hyruleCastleGarden/script_GuardGarden7.inc b/data/scripts/hyruleCastleGarden/script_GuardGarden7.inc index 0dd6ee73..66a5123a 100644 --- a/data/scripts/hyruleCastleGarden/script_GuardGarden7.inc +++ b/data/scripts/hyruleCastleGarden/script_GuardGarden7.inc @@ -2,8 +2,8 @@ SCRIPT_START script_GuardGarden7 CheckRoomFlag 0x000f JumpIfNot script_GuardGarden7 - _0807E864 - Call sub_0807F9A4 + SetPlayerIdle + Call WaitForPlayerNormal Call sub_0807DF28 script_08011AFA: MessageFromTargetPos 0x1321, 0x0007 @@ -22,7 +22,7 @@ script_08011AFA: .endif .endif CallWithArg sub_0806DA1C, 0x00000003 - _0807E878 + EnablePlayerControl Call sub_0807DF50 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/hyruleCastleGarden/script_GuardGarden8.inc b/data/scripts/hyruleCastleGarden/script_GuardGarden8.inc index beff4e16..67ecb871 100644 --- a/data/scripts/hyruleCastleGarden/script_GuardGarden8.inc +++ b/data/scripts/hyruleCastleGarden/script_GuardGarden8.inc @@ -1,10 +1,10 @@ @ Hyrule Castle Guard kicking Link out of garden SCRIPT_START script_GuardGarden8 - _0807E864 + SetPlayerIdle Call sub_0807DF28 MessageFromTargetPos 0x1320, 0x000c WaitUntilTextboxCloses - _0807E878 + EnablePlayerControl Call sub_0807DF50 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/hyruleTown/script_Anju.inc b/data/scripts/hyruleTown/script_Anju.inc index 827726c2..96b1b07b 100644 --- a/data/scripts/hyruleTown/script_Anju.inc +++ b/data/scripts/hyruleTown/script_Anju.inc @@ -8,8 +8,8 @@ SCRIPT_START script_Anju script_0801015A: CheckEntityInteractType JumpIfNot script_0801015A - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer CheckRoomFlag 0x0001 JumpIf script_0801019E MessageFromTargetPos 0x3001, 0x0000 @@ -18,7 +18,7 @@ script_0801015A: JumpIfNot script_080101A6 Call sub_080A1608 WaitUntilTextboxCloses - _0807E878 + EnablePlayerControl CallWithArg sub_080A1550, script_080101AC JumpIfNot script_0801015A PlayBgm BGM_CUCCO_MINIGAME @@ -28,7 +28,7 @@ script_0801019E: Call sub_080A1608 WaitUntilTextboxCloses script_080101A6: - _0807E878 + EnablePlayerControl Jump script_0801015A script_080101AC: BeginBlock @@ -36,19 +36,19 @@ script_080101AC: Call sub_080A1648 EndBlock Call sub_080A1270 - _0807E864 + SetPlayerIdle Call sub_0807DF28 MessageFromTargetPos 0x3004, 0x0007 WaitUntilTextboxCloses StopBgm - _0807E778 0x0004 + SetFadeTime 0x0004 DoFade5 WaitForFadeFinish - CallWithArg sub_0807F75C, 0x03400378 + CallWithArg SetPlayerPos, 0x03400378 Call sub_080791BC Call sub_0807FB74 _0807E8E4_1 - Call sub_0807F168 + Call SetPlayerCollisionLayer1 Call sub_080A1388 Call sub_0806EC38 BeginBlock @@ -56,7 +56,7 @@ script_080101AC: Call sub_0807F844 CameraTargetPlayer EndBlock - _0807E778 0x0004 + SetFadeTime 0x0004 DoFade4 WaitForFadeFinish PlayBGM @@ -70,7 +70,7 @@ script_080101AC: Call sub_080A14A8 script_08010240: Call sub_0807DF50 - _0807E878 + EnablePlayerControl CallWithArg sub_0807F5B0, 0x00000000 ClearRoomFlag 0x0001 Call sub_080A169C diff --git a/data/scripts/hyruleTown/script_AnjuInside.inc b/data/scripts/hyruleTown/script_AnjuInside.inc index 7494a7a3..6253c544 100644 --- a/data/scripts/hyruleTown/script_AnjuInside.inc +++ b/data/scripts/hyruleTown/script_AnjuInside.inc @@ -2,16 +2,16 @@ SCRIPT_START script_AnjuInside BeginBlock _0807E9D4 - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 DoPostScriptAction 0x000a EndBlock script_08010132: CheckEntityInteractType JumpIfNot script_08010132 - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer MessageFromTarget 0x4f22 WaitUntilTextboxCloses - _0807E878 + EnablePlayerControl Jump script_08010132 diff --git a/data/scripts/hyruleTown/script_Beedle.inc b/data/scripts/hyruleTown/script_Beedle.inc index 38c53a6c..e265823a 100644 --- a/data/scripts/hyruleTown/script_Beedle.inc +++ b/data/scripts/hyruleTown/script_Beedle.inc @@ -1,17 +1,17 @@ @ Hyrule Town Beedle SCRIPT_START script_Beedle BeginBlock - _0807EB44 0x0004 - _0807E930 0x0000 + SetAnimationState 0x0004 + SetAnimation 0x0000 DoPostScriptAction 0x000a - Call sub_0807F348 + Call SetPriorityMessage EndBlock script_08010502: CheckEntityInteractType JumpIfNot script_08010502 - _0807E864 + SetPlayerIdle Call sub_0807DF28 - _0807EB74 + FacePlayer CallWithArg sub_0807F3D8, 0x00000008 CheckRoomFlag 0x000e JumpIf script_0801052E @@ -69,22 +69,22 @@ script_080105DC: script_080105E0: WaitUntilTextboxCloses Call sub_0807DF50 - _0807E878 + EnablePlayerControl Jump script_08010502 .2byte 0x0000 BeginBlock _0807E9D4 DoPostScriptAction 0x000a - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 EndBlock script_08010602: CheckEntityInteractType JumpIfNot script_08010602 - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer MessageFromTarget 0x0a01 WaitUntilTextboxCloses - _0807E878 - _0807EB44 0x0004 + EnablePlayerControl + SetAnimationState 0x0004 Jump script_08010602 diff --git a/data/scripts/hyruleTown/script_Brocco.inc b/data/scripts/hyruleTown/script_Brocco.inc index 58b41e24..f01bc951 100644 --- a/data/scripts/hyruleTown/script_Brocco.inc +++ b/data/scripts/hyruleTown/script_Brocco.inc @@ -1,21 +1,21 @@ @ (Intro) Hyrule Town Brocco SCRIPT_START script_Brocco BeginBlock - _0807EB44 0x0004 - _0807E930 0x0000 + SetAnimationState 0x0004 + SetAnimation 0x0000 Call sub_080636F4 DoPostScriptAction 0x000a - Call sub_0807F348 + Call SetPriorityMessage EndBlock script_08010470: CheckEntityInteractType JumpIfNot script_08010470 - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer CallWithArg sub_0807F3D8, 0x00000004 Call sub_080636D8 WaitUntilTextboxCloses Wait 0x000f - _0807E878 + EnablePlayerControl CallWithArg sub_0807F3D8, 0x00000000 Jump script_08010470 diff --git a/data/scripts/hyruleTown/script_CafeGuy.inc b/data/scripts/hyruleTown/script_CafeGuy.inc index 32473eb5..751e6e01 100644 --- a/data/scripts/hyruleTown/script_CafeGuy.inc +++ b/data/scripts/hyruleTown/script_CafeGuy.inc @@ -5,28 +5,28 @@ SCRIPT_START script_CafeGuy CallWithArg sub_08061FB8, 0x00000001 SetEntitySpeed 0x0040 DoPostScriptAction 0x000a - _0807EB44 0x0004 - _0807E930 0x0002 + SetAnimationState 0x0004 + SetAnimation 0x0002 EndBlock script_0800ECAC: - _0807EB44 0x0006 - _0807E930 0x0007 + SetAnimationState 0x0006 + SetAnimation 0x0007 _0807EDD4 0x0028, 0x0050 Wait 0x001e - _0807EB44 0x0004 - _0807E930 0x0002 + SetAnimationState 0x0004 + SetAnimation 0x0002 Wait 0x001e - _0807EB44 0x0002 - _0807E930 0x0001 + SetAnimationState 0x0002 + SetAnimation 0x0001 Wait 0x001e - _0807EB44 0x0002 - _0807E930 0x0005 + SetAnimationState 0x0002 + SetAnimation 0x0005 _0807EDD4 0x0048, 0x0050 Wait 0x001e - _0807EB44 0x0004 - _0807E930 0x0002 + SetAnimationState 0x0004 + SetAnimation 0x0002 Wait 0x001e - _0807EB44 0x0006 - _0807E930 0x0003 + SetAnimationState 0x0006 + SetAnimation 0x0003 Wait 0x001e Jump script_0800ECAC diff --git a/data/scripts/hyruleTown/script_Carlov.inc b/data/scripts/hyruleTown/script_Carlov.inc index ac6a116b..8a925f4d 100644 --- a/data/scripts/hyruleTown/script_Carlov.inc +++ b/data/scripts/hyruleTown/script_Carlov.inc @@ -2,17 +2,17 @@ SCRIPT_START script_Carlov BeginBlock _0807E9D4 - _0807EB44 0x0000 + SetAnimationState 0x0000 SetEntitySpeed 0x01c0 DoPostScriptAction 0x000a EndBlock script_08014462: - _0807E30C + FacePlayerAndCheckDist JumpIfNot script_08014462 - _0807E864 - _0807E930 0x0008 + SetPlayerIdle + SetAnimation 0x0008 Wait 0x0020 - _0807E930 0x0002 + SetAnimation 0x0002 MessageFromTarget 0x4202 MessageFromTarget 0x4203 WaitUntilTextboxCloses @@ -54,11 +54,11 @@ script_080144C8: Call sub_0807DF38 Jump script_080144FC script_080144F0: - _0807E930 0x0009 + SetAnimation 0x0009 Wait 0x003c - _0807E930 0x0002 + SetAnimation 0x0002 script_080144FC: - _0807E878 + EnablePlayerControl CheckRoomFlag 0x0000 JumpIfNot script_08014462 .ifdef USA diff --git a/data/scripts/hyruleTown/script_Carlov2.inc b/data/scripts/hyruleTown/script_Carlov2.inc index 89c39d57..dcb9aa02 100644 --- a/data/scripts/hyruleTown/script_Carlov2.inc +++ b/data/scripts/hyruleTown/script_Carlov2.inc @@ -2,12 +2,12 @@ SCRIPT_START script_Carlov2 BeginBlock _0807E9D4 - _0807EB44 0x0004 + SetAnimationState 0x0004 SetEntityDirection 0x0000 DoPostScriptAction 0x000a EndBlock script_0801463A: - _0807E30C + FacePlayerAndCheckDist .ifdef EU JumpIf script_080146E2 .else @@ -20,21 +20,21 @@ script_0801463A: JumpIfNot script_0801463A CheckRoomFlag 0x0009 JumpIfNot script_0801463A - _0807E864 - _0807EB28 0x431f + SetPlayerIdle + EzloMessage 0x431f WaitUntilTextboxCloses script_0801469A: StartPlayerScript script_PlayerAtCarlov Wait 0x0010 SetSyncFlag 0x00000002 WaitForSyncFlagAndClear 0x00000001 - _0807E878 + EnablePlayerControl Jump script_0801463A script_080146E2: - _0807E864 - _0807E930 0x0008 + SetPlayerIdle + SetAnimation 0x0008 Wait 0x0020 - _0807E930 0x0002 + SetAnimation 0x0002 CheckGlobalFlag 0x0059 JumpIf script_0801472E_2 CheckRoomFlag 0x0009 @@ -60,8 +60,8 @@ script_0801472E_2: JumpIfNot script_0801463A CheckLocalFlag 0x005e JumpIf script_080146A0 - _0807E864 - _0807EB8C + SetPlayerIdle + FaceAwayFromPlayer MessageFromTargetPos 0x432b, 0x000c Jump script_080147CE script_08014672: @@ -75,22 +75,22 @@ script_08014672: .endif .endif JumpIfNot script_0801463A - _0807E864 - _0807EB28 0x431f + SetPlayerIdle + EzloMessage 0x431f WaitUntilTextboxCloses StartPlayerScript script_PlayerAtCarlov Wait 0x0010 SetSyncFlag 0x00000002 WaitForSyncFlagAndClear 0x00000001 - _0807E878 + EnablePlayerControl Jump script_0801463A script_080146A0: - _0807E864 - _0807E930 0x0008 + SetPlayerIdle + SetAnimation 0x0008 Wait 0x0010 - _0807EB8C + FaceAwayFromPlayer Wait 0x0010 - _0807E930 0x0002 + SetAnimation 0x0002 CheckGlobalFlag 0x0059 JumpIfNot script_080146C6 MessageFromTargetPos 0x432f, 0x000c @@ -125,7 +125,7 @@ script_0801474A: .endif MessageFromTargetPos 0x4305, 0x000c WaitUntilTextboxCloses - _0807E3BC 0x0001 + HasShells 0x0001 JumpIfNot script_080147C4 MessageFromTargetPos 0x4306, 0x000c Jump script_0801473C @@ -149,7 +149,7 @@ script_0801473C: CheckTextboxResult JumpIfNot script_08014770 WaitUntilTextboxCloses - _0807E3BC 0x0001 + HasShells 0x0001 JumpIfNot script_080147C4 SetRoomFlag 0x0001 Wait 0x0014 @@ -186,14 +186,14 @@ script_0801478A: SetSyncFlag 0x00000008 Jump script_080147CE script_080147A4: - _0807E930 0x0009 + SetAnimation 0x0009 Wait 0x003c - _0807E930 0x0002 + SetAnimation 0x0002 Jump script_0801478A script_080147B4: - _0807E930 0x000a + SetAnimation 0x000a Wait 0x008c - _0807E930 0x0002 + SetAnimation 0x0002 Jump script_0801478A script_080147C4: .ifdef EU @@ -209,6 +209,6 @@ script_080147CE: .else Wait 0x0004 .endif - _0807E878 + EnablePlayerControl Jump script_0801463A .align 2, 0 diff --git a/data/scripts/hyruleTown/script_CarlovChest.inc b/data/scripts/hyruleTown/script_CarlovChest.inc index 88a59859..00c7e8a0 100644 --- a/data/scripts/hyruleTown/script_CarlovChest.inc +++ b/data/scripts/hyruleTown/script_CarlovChest.inc @@ -11,13 +11,13 @@ script_080148F4: WaitUntilTextboxCloses CheckTextboxResult JumpIfNot script_08014938 - _0807E864 + SetPlayerIdle SetSyncFlag 0x00000001 WaitForSyncFlagAndClear 0x00000002 Call sub_0806E1E0 WaitUntilTextboxCloses Wait 0x0018 - _0807E878 + EnablePlayerControl Jump script_080148F4 script_08014932: WaitUntilTextboxCloses diff --git a/data/scripts/hyruleTown/script_CarlovGame.inc b/data/scripts/hyruleTown/script_CarlovGame.inc index f22343fa..a43af767 100644 --- a/data/scripts/hyruleTown/script_CarlovGame.inc +++ b/data/scripts/hyruleTown/script_CarlovGame.inc @@ -2,40 +2,40 @@ SCRIPT_START script_CarlovGame BeginBlock _0807E9D4 - _0807EB44 0x0000 + SetAnimationState 0x0000 DoPostScriptAction 0x000a EndBlock - _0807E864 + SetPlayerIdle Call sub_0807DF38 Wait 0x0010 CheckLocalFlag 0x0093 JumpIf script_080148B6 MessageFromTargetPos 0x4215, 0x000c - _0807E878 + EnablePlayerControl script_0801482E: CheckSyncFlagAndClear 0x00000001 JumpIf script_08014862 CheckSyncFlagAndClear 0x00000004 JumpIf script_08014878 - _0807E30C + FacePlayerAndCheckDist JumpIfNot script_0801482E - _0807E864 - _0807E930 0x0008 + SetPlayerIdle + SetAnimation 0x0008 Wait 0x0020 - _0807E930 0x0002 + SetAnimation 0x0002 MessageFromTargetPos 0x4215, 0x000c - _0807E878 + EnablePlayerControl Jump script_0801482E script_08014862: - _0807E930 0x0008 + SetAnimation 0x0008 Wait 0x0020 - _0807E930 0x0002 + SetAnimation 0x0002 SetSyncFlag 0x00000002 Jump script_0801482E script_08014878: - _0807E930 0x0009 + SetAnimation 0x0009 Wait 0x003c - _0807E930 0x0002 + SetAnimation 0x0002 SetSyncFlag 0x00000008 Jump script_0801482E script_0801488E: @@ -43,26 +43,26 @@ script_0801488E: JumpIf script_080148C2 CheckSyncFlagAndClear 0x00000004 JumpIf script_080148D8 - _0807E30C + FacePlayerAndCheckDist JumpIfNot script_0801488E - _0807E864 - _0807E930 0x0008 + SetPlayerIdle + SetAnimation 0x0008 Wait 0x0020 - _0807E930 0x0002 + SetAnimation 0x0002 script_080148B6: MessageFromTargetPos 0x4216, 0x000c - _0807E878 + EnablePlayerControl Jump script_0801488E script_080148C2: - _0807E930 0x0008 + SetAnimation 0x0008 Wait 0x0020 - _0807E930 0x0002 + SetAnimation 0x0002 SetSyncFlag 0x00000002 Jump script_0801488E script_080148D8: - _0807E930 0x0009 + SetAnimation 0x0009 Wait 0x003c - _0807E930 0x0002 + SetAnimation 0x0002 SetSyncFlag 0x00000008 Jump script_0801488E .2byte 0x0000 diff --git a/data/scripts/hyruleTown/script_CarlovWon.inc b/data/scripts/hyruleTown/script_CarlovWon.inc index b8c535ca..4a65f5ea 100644 --- a/data/scripts/hyruleTown/script_CarlovWon.inc +++ b/data/scripts/hyruleTown/script_CarlovWon.inc @@ -2,11 +2,11 @@ SCRIPT_START script_CarlovWon BeginBlock _0807E9D4 - _0807EB44 0x0000 + SetAnimationState 0x0000 SetEntitySpeed 0x01c0 DoPostScriptAction 0x000a EndBlock - _0807E864 + SetPlayerIdle Call sub_0807DF28 Call sub_0806E20C WaitUntilTextboxCloses diff --git a/data/scripts/hyruleTown/script_Carpenter.inc b/data/scripts/hyruleTown/script_Carpenter.inc index 2ea50d73..9a29615b 100644 --- a/data/scripts/hyruleTown/script_Carpenter.inc +++ b/data/scripts/hyruleTown/script_Carpenter.inc @@ -1,7 +1,7 @@ @ Hyrule Town carpeter next to post SCRIPT_START script_Carpenter BeginBlock - _0807EB44 0x0004 + SetAnimationState 0x0004 CallWithArg sub_080672B0, 0x00000000 DoPostScriptAction 0x000a Call sub_08067314 @@ -9,12 +9,12 @@ SCRIPT_START script_Carpenter script_08010AB4: CheckEntityInteractType JumpIfNot script_08010AB4 - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer CallWithArg sub_080672B0, 0x00000004 Call sub_08067304 WaitUntilTextboxCloses - _0807E878 - _0807EB44 0x0004 + EnablePlayerControl + SetAnimationState 0x0004 CallWithArg sub_080672B0, 0x00000000 Jump script_08010AB4 diff --git a/data/scripts/hyruleTown/script_CatPerson.inc b/data/scripts/hyruleTown/script_CatPerson.inc index 18c982e8..73cfba96 100644 --- a/data/scripts/hyruleTown/script_CatPerson.inc +++ b/data/scripts/hyruleTown/script_CatPerson.inc @@ -3,17 +3,17 @@ SCRIPT_START script_CatPerson BeginBlock Call sub_08061E70 DoPostScriptAction 0x000a - _0807EB44 0x0004 + SetAnimationState 0x0004 Call sub_08061FD8 EndBlock script_0800EC6C: CheckEntityInteractType JumpIfNot script_0800EC6C - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer Call sub_08061FD8 Call sub_08062048 WaitUntilTextboxCloses - _0807E878 + EnablePlayerControl Jump script_0800EC6C .2byte 0x0000 diff --git a/data/scripts/hyruleTown/script_CatPersonTalkingToDogPerson.inc b/data/scripts/hyruleTown/script_CatPersonTalkingToDogPerson.inc index 4b8a69e0..f81c9e64 100644 --- a/data/scripts/hyruleTown/script_CatPersonTalkingToDogPerson.inc +++ b/data/scripts/hyruleTown/script_CatPersonTalkingToDogPerson.inc @@ -3,18 +3,18 @@ SCRIPT_START script_CatPersonTalkingToDogPerson BeginBlock Call sub_08061E70 DoPostScriptAction 0x000a - _0807EB44 0x0002 + SetAnimationState 0x0002 Call sub_08061FD8 EndBlock script_0800EC2C: CheckEntityInteractType JumpIfNot script_0800EC2C - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer Call sub_08061FD8 Call sub_08062048 WaitUntilTextboxCloses - _0807E878 - _0807EB44 0x0002 + EnablePlayerControl + SetAnimationState 0x0002 Call sub_08061FD8 Jump script_0800EC2C diff --git a/data/scripts/hyruleTown/script_Din.inc b/data/scripts/hyruleTown/script_Din.inc index b78e1802..4b0c3e8c 100644 --- a/data/scripts/hyruleTown/script_Din.inc +++ b/data/scripts/hyruleTown/script_Din.inc @@ -2,7 +2,7 @@ SCRIPT_START script_Din BeginBlock Call sub_08064828 - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0001 DoPostScriptAction 0x000a CheckGlobalFlag 0x0047 @@ -14,13 +14,13 @@ script_08011C9A: CheckEntityInteractType JumpIfNot script_08011C9A EndBlock - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer DoPostScriptAction 0x0000 MessageNoOverlap 0x4515 WaitUntilTextboxCloses - _0807E878 - _0807EB44 0x0004 + EnablePlayerControl + SetAnimationState 0x0004 DoPostScriptAction 0x0001 Jump script_08011C9A script_08011CC2: @@ -33,29 +33,29 @@ script_08011CC2: CheckEntityInteractType JumpIfNot script_08011CC2 EndBlock - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer DoPostScriptAction 0x0000 MessageNoOverlap 0x3105 WaitUntilTextboxCloses CheckTextboxResult JumpIf script_08011D0E - _0807E878 - _0807EB44 0x0004 + EnablePlayerControl + SetAnimationState 0x0004 DoPostScriptAction 0x0001 Jump script_08011CC2 script_08011D00: CheckEntityInteractType JumpIfNot script_08011D00 - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer DoPostScriptAction 0x0000 script_08011D0E: MessageNoOverlap 0x3108 WaitUntilTextboxCloses SetGlobalFlag 0x002b - _0807E878 - _0807EB44 0x0004 + EnablePlayerControl + SetAnimationState 0x0004 DoPostScriptAction 0x0001 Jump script_08011D00 .2byte 0x0000 diff --git a/data/scripts/hyruleTown/script_Din2.inc b/data/scripts/hyruleTown/script_Din2.inc index 31c5c728..95f9d5d8 100644 --- a/data/scripts/hyruleTown/script_Din2.inc +++ b/data/scripts/hyruleTown/script_Din2.inc @@ -2,7 +2,7 @@ SCRIPT_START script_Din2 BeginBlock Call sub_08064828 - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0001 DoPostScriptAction 0x000a EndBlock @@ -16,8 +16,8 @@ script_08011E96: CheckEntityInteractType JumpIfNot script_08011E96 EndBlock - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer DoPostScriptAction 0x0000 CheckGlobalFlag 0x0048 JumpIf script_08011ECC @@ -30,21 +30,21 @@ script_08011ECC: CheckTextboxResult JumpIf script_08011EF4 script_08011ED8: - _0807E878 - _0807EB44 0x0004 + EnablePlayerControl + SetAnimationState 0x0004 DoPostScriptAction 0x0001 Jump script_08011E96 script_08011EE6: CheckEntityInteractType JumpIfNot script_08011EE6 - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer DoPostScriptAction 0x0000 script_08011EF4: MessageNoOverlap 0x3114 WaitUntilTextboxCloses SetGlobalFlag 0x002e - _0807E878 - _0807EB44 0x0004 + EnablePlayerControl + SetAnimationState 0x0004 DoPostScriptAction 0x0001 Jump script_08011EE6 diff --git a/data/scripts/hyruleTown/script_DinAlone.inc b/data/scripts/hyruleTown/script_DinAlone.inc index 0a722830..60ae00b5 100644 --- a/data/scripts/hyruleTown/script_DinAlone.inc +++ b/data/scripts/hyruleTown/script_DinAlone.inc @@ -2,19 +2,19 @@ SCRIPT_START script_DinAlone BeginBlock Call sub_08064828 - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0001 DoPostScriptAction 0x000a EndBlock script_080121DE: CheckEntityInteractType JumpIfNot script_080121DE - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer DoPostScriptAction 0x0000 MessageNoOverlap 0x4527 WaitUntilTextboxCloses - _0807E878 - _0807EB44 0x0004 + EnablePlayerControl + SetAnimationState 0x0004 DoPostScriptAction 0x0001 Jump script_080121DE diff --git a/data/scripts/hyruleTown/script_DinMovedIn.inc b/data/scripts/hyruleTown/script_DinMovedIn.inc index c0ee74ba..16ba4b27 100644 --- a/data/scripts/hyruleTown/script_DinMovedIn.inc +++ b/data/scripts/hyruleTown/script_DinMovedIn.inc @@ -2,15 +2,15 @@ SCRIPT_START script_DinMovedIn BeginBlock Call sub_08064828 - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0001 DoPostScriptAction 0x000a EndBlock script_0801203A: CheckEntityInteractType JumpIfNot script_0801203A - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer DoPostScriptAction 0x0000 CheckLocalFlag 0x0094 JumpIf script_0801205E @@ -51,8 +51,8 @@ script_0801209A: MessageNoOverlap 0x3127 script_0801209E: WaitUntilTextboxCloses - _0807E878 - _0807EB44 0x0004 + EnablePlayerControl + SetAnimationState 0x0004 DoPostScriptAction 0x0001 Jump script_0801203A .align 2, 0 diff --git a/data/scripts/hyruleTown/script_DogPersonInCatHouse.inc b/data/scripts/hyruleTown/script_DogPersonInCatHouse.inc index a26f16c7..2cc56734 100644 --- a/data/scripts/hyruleTown/script_DogPersonInCatHouse.inc +++ b/data/scripts/hyruleTown/script_DogPersonInCatHouse.inc @@ -3,25 +3,25 @@ SCRIPT_START script_DogPersonInCatHouse BeginBlock Call sub_08061E70 DoPostScriptAction 0x000a - _0807EB44 0x0006 + SetAnimationState 0x0006 Call sub_08061FD8 EndBlock script_0800EB7C: CheckEntityInteractType JumpIfNot script_0800EB7C - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer Call sub_08061FD8 Call sub_08062048 WaitUntilTextboxCloses - _0807E878 - _0807EB44 0x0006 + EnablePlayerControl + SetAnimationState 0x0006 Call sub_08061FD8 Jump script_0800EB7C BeginBlock Call sub_08061E70 DoPostScriptAction 0x000a - _0807EB44 0x0002 + SetAnimationState 0x0002 Call sub_08061FD8 EndBlock Jump script_0800EBF4 diff --git a/data/scripts/hyruleTown/script_DrLeft.inc b/data/scripts/hyruleTown/script_DrLeft.inc index ae71d84b..ad325fa1 100644 --- a/data/scripts/hyruleTown/script_DrLeft.inc +++ b/data/scripts/hyruleTown/script_DrLeft.inc @@ -4,24 +4,24 @@ SCRIPT_START script_DrLeft _0807E9D4 Call sub_0806C09C DoPostScriptAction 0x000a - _0807E930 0x0000 - _0807EB44 0x0004 + SetAnimation 0x0000 + SetAnimationState 0x0004 EndBlock script_0800EABC: CheckEntityInteractType JumpIfNot script_0800EABC BeginBlock - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer CallWithArg sub_0806C028, 0x00000004 EndBlock script_0800EAD4: Call sub_0806C00C JumpIfNot script_0800EAD4 - _0807E930 0x0008 + SetAnimation 0x0008 Call sub_0806C038 WaitUntilTextboxCloses Wait 0x000f - _0807E878 - _0807E930 0x0000 + EnablePlayerControl + SetAnimation 0x0000 Jump script_0800EABC diff --git a/data/scripts/hyruleTown/script_DrLeftDoor.inc b/data/scripts/hyruleTown/script_DrLeftDoor.inc index 9e92d307..73a86b68 100644 --- a/data/scripts/hyruleTown/script_DrLeftDoor.inc +++ b/data/scripts/hyruleTown/script_DrLeftDoor.inc @@ -8,7 +8,7 @@ SCRIPT_START script_DrLeftDoor script_0800EF50: Call sub_080869A4 JumpIfNot script_0800EF50 - _0807E864 + SetPlayerIdle CheckLocalFlagByBank 0x0200, 0x006d JumpIf script_0800EF82 MessageFromTarget 0x4d01 @@ -16,14 +16,14 @@ script_0800EF50: StartPlayerScript script_PlayerAtDrLeftDoor WaitForSyncFlagAndClear 0x00000001 Wait 0x000f - _0807E878 + EnablePlayerControl Jump script_0800EF50 script_0800EF82: SetGlobalFlag 0x001f MessageFromTarget 0x4d02 WaitUntilTextboxCloses Wait 0x000f - _0807E878 + EnablePlayerControl script_0800EF92: Call sub_0808692C SCRIPT_END diff --git a/data/scripts/hyruleTown/script_Emma.inc b/data/scripts/hyruleTown/script_Emma.inc index 8e842540..5f058f79 100644 --- a/data/scripts/hyruleTown/script_Emma.inc +++ b/data/scripts/hyruleTown/script_Emma.inc @@ -3,13 +3,13 @@ SCRIPT_START script_Emma BeginBlock _0807E9D4 DoPostScriptAction 0x000a - _0807EB44 0x0000 + SetAnimationState 0x0000 EndBlock script_0800E832: CheckEntityInteractType JumpIfNot script_0800E832 - _0807E864 - _0807EB44 0x0004 + SetPlayerIdle + SetAnimationState 0x0004 BeginBlock MessageFromTarget 0x4501 CallWithArg sub_0807F854, 0x00010032 diff --git a/data/scripts/hyruleTown/script_EmmaNotEnoughRupees.inc b/data/scripts/hyruleTown/script_EmmaNotEnoughRupees.inc index c3a59c92..45bece10 100644 --- a/data/scripts/hyruleTown/script_EmmaNotEnoughRupees.inc +++ b/data/scripts/hyruleTown/script_EmmaNotEnoughRupees.inc @@ -6,6 +6,6 @@ script_0800E910: @ Rent no room MessageFromTarget 0x4509 script_0800E914: WaitUntilTextboxCloses - _0807E878 - _0807EB44 0x0000 + EnablePlayerControl + SetAnimationState 0x0000 Jump script_0800E832 diff --git a/data/scripts/hyruleTown/script_Farore.inc b/data/scripts/hyruleTown/script_Farore.inc index 23de485b..013522a1 100644 --- a/data/scripts/hyruleTown/script_Farore.inc +++ b/data/scripts/hyruleTown/script_Farore.inc @@ -2,7 +2,7 @@ SCRIPT_START script_Farore BeginBlock Call sub_08064A28 - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0001 DoPostScriptAction 0x000a CheckGlobalFlag 0x0047 @@ -14,13 +14,13 @@ script_08011DF2: CheckEntityInteractType JumpIfNot script_08011DF2 EndBlock - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer DoPostScriptAction 0x0000 MessageNoOverlap 0x4514 WaitUntilTextboxCloses - _0807E878 - _0807EB44 0x0004 + EnablePlayerControl + SetAnimationState 0x0004 DoPostScriptAction 0x0001 Jump script_08011DF2 script_08011E1A: @@ -33,29 +33,29 @@ script_08011E1A: CheckEntityInteractType JumpIfNot script_08011E1A EndBlock - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer DoPostScriptAction 0x0000 MessageNoOverlap 0x3104 WaitUntilTextboxCloses CheckTextboxResult JumpIf script_08011E66 - _0807E878 - _0807EB44 0x0004 + EnablePlayerControl + SetAnimationState 0x0004 DoPostScriptAction 0x0001 Jump script_08011E1A script_08011E58: CheckEntityInteractType JumpIfNot script_08011E58 - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer DoPostScriptAction 0x0000 script_08011E66: MessageNoOverlap 0x3107 WaitUntilTextboxCloses SetGlobalFlag 0x002d - _0807E878 - _0807EB44 0x0004 + EnablePlayerControl + SetAnimationState 0x0004 DoPostScriptAction 0x0001 Jump script_08011E58 .2byte 0x0000 diff --git a/data/scripts/hyruleTown/script_Farore2.inc b/data/scripts/hyruleTown/script_Farore2.inc index 7920be1f..568120b7 100644 --- a/data/scripts/hyruleTown/script_Farore2.inc +++ b/data/scripts/hyruleTown/script_Farore2.inc @@ -2,7 +2,7 @@ SCRIPT_START script_Farore2 BeginBlock Call sub_08064A28 - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0001 DoPostScriptAction 0x000a EndBlock @@ -16,8 +16,8 @@ script_08011FAE: CheckEntityInteractType JumpIfNot script_08011FAE EndBlock - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer DoPostScriptAction 0x0000 CheckGlobalFlag 0x0048 JumpIf script_08011FE4 @@ -30,22 +30,22 @@ script_08011FE4: CheckTextboxResult JumpIf script_0801200C script_08011FF0: - _0807E878 - _0807EB44 0x0004 + EnablePlayerControl + SetAnimationState 0x0004 DoPostScriptAction 0x0001 Jump script_08011FAE script_08011FFE: CheckEntityInteractType JumpIfNot script_08011FFE - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer DoPostScriptAction 0x0000 script_0801200C: MessageNoOverlap 0x3113 WaitUntilTextboxCloses SetGlobalFlag 0x0030 - _0807E878 - _0807EB44 0x0004 + EnablePlayerControl + SetAnimationState 0x0004 DoPostScriptAction 0x0001 Jump script_08011FFE diff --git a/data/scripts/hyruleTown/script_FaroreAlone.inc b/data/scripts/hyruleTown/script_FaroreAlone.inc index 294915d9..4bfaf3df 100644 --- a/data/scripts/hyruleTown/script_FaroreAlone.inc +++ b/data/scripts/hyruleTown/script_FaroreAlone.inc @@ -2,19 +2,19 @@ SCRIPT_START script_FaroreAlone BeginBlock Call sub_08064A28 - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0001 DoPostScriptAction 0x000a EndBlock script_0801224E: CheckEntityInteractType JumpIfNot script_0801224E - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer DoPostScriptAction 0x0000 MessageNoOverlap 0x4526 WaitUntilTextboxCloses - _0807E878 - _0807EB44 0x0004 + EnablePlayerControl + SetAnimationState 0x0004 DoPostScriptAction 0x0001 Jump script_0801224E diff --git a/data/scripts/hyruleTown/script_FaroreMovedIn.inc b/data/scripts/hyruleTown/script_FaroreMovedIn.inc index 474b8dea..370126a4 100644 --- a/data/scripts/hyruleTown/script_FaroreMovedIn.inc +++ b/data/scripts/hyruleTown/script_FaroreMovedIn.inc @@ -2,15 +2,15 @@ SCRIPT_START script_FaroreMovedIn BeginBlock Call sub_08064A28 - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0001 DoPostScriptAction 0x000a EndBlock script_08012152: CheckEntityInteractType JumpIfNot script_08012152 - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer DoPostScriptAction 0x0000 CheckLocalFlag 0x0096 JumpIf script_08012176 @@ -51,8 +51,8 @@ script_080121B2: MessageNoOverlap 0x3121 script_080121B6: WaitUntilTextboxCloses - _0807E878 - _0807EB44 0x0004 + EnablePlayerControl + SetAnimationState 0x0004 DoPostScriptAction 0x0001 Jump script_08012152 .align 2, 0 diff --git a/data/scripts/hyruleTown/script_FirstHouseDoor.inc b/data/scripts/hyruleTown/script_FirstHouseDoor.inc index 56501984..63b89955 100644 --- a/data/scripts/hyruleTown/script_FirstHouseDoor.inc +++ b/data/scripts/hyruleTown/script_FirstHouseDoor.inc @@ -8,18 +8,18 @@ SCRIPT_START script_FirstHouseDoor script_0801091C: Call sub_080869A4 JumpIfNot script_0801091C - _0807E864 - Call sub_0807F9A4 + SetPlayerIdle + Call WaitForPlayerNormal Call sub_0807DF28 CheckRoomFlag 0x0001 JumpIf script_08010942 - _0807EB28 0x0b62 + EzloMessage 0x0b62 WaitUntilTextboxCloses script_08010942: StartPlayerScript script_PlayerAtInnDoor WaitForSyncFlagAndClear 0x00000001 Call sub_0807DF50 - _0807E878 + EnablePlayerControl Jump script_0801091C Call sub_0808692C SCRIPT_END diff --git a/data/scripts/hyruleTown/script_ForestMinish11.inc b/data/scripts/hyruleTown/script_ForestMinish11.inc index 7cbb90db..9d5214c7 100644 --- a/data/scripts/hyruleTown/script_ForestMinish11.inc +++ b/data/scripts/hyruleTown/script_ForestMinish11.inc @@ -13,9 +13,9 @@ script_0800E6BE: Jump script_0800E6BE script_0800E6D2: EndBlock - _0807E864 + SetPlayerIdle Call sub_0806025C WaitUntilTextboxCloses Wait 0x000f - _0807E878 + EnablePlayerControl Jump script_0800E6BE diff --git a/data/scripts/hyruleTown/script_Ghost.inc b/data/scripts/hyruleTown/script_Ghost.inc index d8e0119a..99fc400e 100644 --- a/data/scripts/hyruleTown/script_Ghost.inc +++ b/data/scripts/hyruleTown/script_Ghost.inc @@ -4,16 +4,16 @@ SCRIPT_START script_Ghost DoPostScriptAction 0x0007 _0807E9D4 DoPostScriptAction 0x000a - _0807EB44 0x0006 + SetAnimationState 0x0006 DoPostScriptAction 0x0000 EndBlock script_0801027A: CheckEntityInteractType JumpIfNot script_0801027A - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer Call sub_08065F64 WaitUntilTextboxCloses - _0807E878 + EnablePlayerControl Jump script_0801027A .align 2 diff --git a/data/scripts/hyruleTown/script_GormanCats.inc b/data/scripts/hyruleTown/script_GormanCats.inc index c8d96d9e..cad4d713 100644 --- a/data/scripts/hyruleTown/script_GormanCats.inc +++ b/data/scripts/hyruleTown/script_GormanCats.inc @@ -1,7 +1,7 @@ @ Gorman at third house SCRIPT_START script_GormanCats BeginBlock - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 DoPostScriptAction 0x000a _0807E9D4 @@ -21,16 +21,16 @@ script_0800FE66: Jump script_0800FE5A script_0800FE7E: EndBlock - _0807EB44 0x0002 + SetAnimationState 0x0002 DoPostScriptAction 0x0000 Wait 0x001e - _0807EB44 0x0006 + SetAnimationState 0x0006 DoPostScriptAction 0x0000 Wait 0x001e - _0807EB44 0x0002 + SetAnimationState 0x0002 DoPostScriptAction 0x0000 Wait 0x001e - _0807EB44 0x0006 + SetAnimationState 0x0006 DoPostScriptAction 0x0000 Wait 0x003c Call sub_08069A84 diff --git a/data/scripts/hyruleTown/script_GormanFirstHouse.inc b/data/scripts/hyruleTown/script_GormanFirstHouse.inc index 013e6afe..26447047 100644 --- a/data/scripts/hyruleTown/script_GormanFirstHouse.inc +++ b/data/scripts/hyruleTown/script_GormanFirstHouse.inc @@ -2,7 +2,7 @@ @ and at second house when ready to sell SCRIPT_START script_GormanFirstHouse BeginBlock - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 DoPostScriptAction 0x000a _0807E9D4 @@ -10,10 +10,10 @@ SCRIPT_START script_GormanFirstHouse script_0800FDB2: CheckEntityInteractType JumpIfNot script_0800FDB2 - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer Call sub_08069888 WaitUntilTextboxCloses - _0807E878 + EnablePlayerControl Jump script_0800FDB2 .2byte 0x0000 diff --git a/data/scripts/hyruleTown/script_GormanSecondHouse.inc b/data/scripts/hyruleTown/script_GormanSecondHouse.inc index f75d0452..f223d84c 100644 --- a/data/scripts/hyruleTown/script_GormanSecondHouse.inc +++ b/data/scripts/hyruleTown/script_GormanSecondHouse.inc @@ -1,7 +1,7 @@ @ Hyrule Town Gorman at second house SCRIPT_START script_GormanSecondHouse BeginBlock - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 DoPostScriptAction 0x000a _0807E9D4 @@ -21,16 +21,16 @@ script_0800FDEE: Jump script_0800FDE2 script_0800FE06: EndBlock - _0807EB44 0x0002 + SetAnimationState 0x0002 DoPostScriptAction 0x0000 Wait 0x001e - _0807EB44 0x0006 + SetAnimationState 0x0006 DoPostScriptAction 0x0000 Wait 0x001e - _0807EB44 0x0002 + SetAnimationState 0x0002 DoPostScriptAction 0x0000 Wait 0x001e - _0807EB44 0x0006 + SetAnimationState 0x0006 DoPostScriptAction 0x0000 Wait 0x003c Call sub_08069A3C diff --git a/data/scripts/hyruleTown/script_GoronMerchant.inc b/data/scripts/hyruleTown/script_GoronMerchant.inc index 66d1a451..8d32cbd0 100644 --- a/data/scripts/hyruleTown/script_GoronMerchant.inc +++ b/data/scripts/hyruleTown/script_GoronMerchant.inc @@ -1,12 +1,12 @@ @ Hyrule Town Goron Merchant SCRIPT_START script_GoronMerchant BeginBlock - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 DoPostScriptAction 0x000a DoPostScriptAction 0x0007 _0807E9D4 - Call sub_0807F348 + Call SetPriorityMessage Call sub_08069684 EndBlock script_080107F2: @@ -25,9 +25,9 @@ script_08010804: CheckEntityInteractType JumpIfNot script_08010804 EndBlock - _0807E864 + SetPlayerIdle Call sub_0807DF28 - _0807EB74 + FacePlayer CheckGlobalFlag 0x0042 JumpIfNot script_08010858 CheckGlobalFlag 0x0043 @@ -46,9 +46,9 @@ script_08010858: Jump script_080108BA script_08010860: EndBlock - _0807E864 + SetPlayerIdle Call sub_0807DF38 - _0807EB74 + FacePlayer Call sub_08069660 WaitUntilTextboxCloses CheckTextboxResult @@ -57,7 +57,7 @@ script_08010860: JumpIfNot script_080108B2 WaitPlayerGetItem WaitUntilTextboxCloses - _0807EB8C + FaceAwayFromPlayer CheckGlobalFlag 0x0042 JumpIfNot script_080108AA CheckGlobalFlag 0x0043 @@ -81,7 +81,7 @@ script_080108B2: script_080108BA: WaitUntilTextboxCloses Call sub_0807DF50 - _0807E878 - _0807EB44 0x0004 + EnablePlayerControl + SetAnimationState 0x0004 DoPostScriptAction 0x0000 Jump script_08010804 diff --git a/data/scripts/hyruleTown/script_GuardEast.inc b/data/scripts/hyruleTown/script_GuardEast.inc index 9bf0316a..cf3f5d2e 100644 --- a/data/scripts/hyruleTown/script_GuardEast.inc +++ b/data/scripts/hyruleTown/script_GuardEast.inc @@ -3,7 +3,7 @@ SCRIPT_START script_GuardEast BeginBlock CheckInventory1 0x0012 JumpIf script_0800FF6A - _0807EB44 0x0006 + SetAnimationState 0x0006 _0807E9D4 CallWithArg sub_0807F3D8, 0x00000008 EndBlock @@ -15,13 +15,13 @@ script_0800FF34: CheckEntityInteractType JumpIfNot script_0800FF34 EndBlock - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer CallWithArg sub_0807F3D8, 0x00000008 Call sub_08064428 WaitUntilTextboxCloses Wait 0x000f - _0807E878 + EnablePlayerControl Jump script_0800FF34 script_0800FF6A: DoPostScriptAction 0x0008 diff --git a/data/scripts/hyruleTown/script_GuardLibrary.inc b/data/scripts/hyruleTown/script_GuardLibrary.inc index 7944844b..870c90b5 100644 --- a/data/scripts/hyruleTown/script_GuardLibrary.inc +++ b/data/scripts/hyruleTown/script_GuardLibrary.inc @@ -2,16 +2,16 @@ SCRIPT_START script_GuardLibrary BeginBlock _0807E9D4 - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x000a CallWithArg sub_0807F3D8, 0x00000000 EndBlock script_08010410: CheckEntityInteractType JumpIfNot script_08010410 - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer Call sub_08064428 WaitUntilTextboxCloses - _0807E878 + EnablePlayerControl Jump script_08010410 diff --git a/data/scripts/hyruleTown/script_GuardNorth.inc b/data/scripts/hyruleTown/script_GuardNorth.inc index 81e2d9af..603439eb 100644 --- a/data/scripts/hyruleTown/script_GuardNorth.inc +++ b/data/scripts/hyruleTown/script_GuardNorth.inc @@ -3,7 +3,7 @@ SCRIPT_START script_GuardNorth BeginBlock CheckInventory1 0x0012 JumpIf script_0800FF0E - _0807EB44 0x0006 + SetAnimationState 0x0006 _0807E9D4 CallWithArg sub_0807F3D8, 0x00000008 EndBlock @@ -15,13 +15,13 @@ script_0800FED8: CheckEntityInteractType JumpIfNot script_0800FED8 EndBlock - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer CallWithArg sub_0807F3D8, 0x00000008 Call sub_08064428 WaitUntilTextboxCloses Wait 0x000f - _0807E878 + EnablePlayerControl Jump script_0800FED8 script_0800FF0E: DoPostScriptAction 0x0008 diff --git a/data/scripts/hyruleTown/script_GuardPatrolling.inc b/data/scripts/hyruleTown/script_GuardPatrolling.inc index df0a7b81..891de121 100644 --- a/data/scripts/hyruleTown/script_GuardPatrolling.inc +++ b/data/scripts/hyruleTown/script_GuardPatrolling.inc @@ -2,7 +2,7 @@ SCRIPT_START script_GuardPatrolling BeginBlock _0807E9D4 - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x000a CallWithArg sub_0807F3D8, 0x00000004 EndBlock diff --git a/data/scripts/hyruleTown/script_GuardWest.inc b/data/scripts/hyruleTown/script_GuardWest.inc index 3792ad68..a8538ddd 100644 --- a/data/scripts/hyruleTown/script_GuardWest.inc +++ b/data/scripts/hyruleTown/script_GuardWest.inc @@ -1,7 +1,7 @@ @ Hyrule Town Guard west SCRIPT_START script_GuardWest BeginBlock - _0807EB44 0x0002 + SetAnimationState 0x0002 _0807E9D4 CallWithArg sub_0807F3D8, 0x00000008 Call sub_080644A4 @@ -73,8 +73,8 @@ script_0800FFCC: .endif .endif .endif - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer CallWithArg sub_0807F3D8, 0x00000008 CheckInventory1 0x0048 JumpIf script_0800FFF8 @@ -105,19 +105,19 @@ script_0801000A: Jump script_08010060 script_08010014: EndBlock - _0807E888 - Call sub_0807F594 - _0807E864 - _0807EB74 + DisablePlayerControl + Call WaitForPlayerIdle + SetPlayerIdle + FacePlayer CallWithArg sub_0807F3D8, 0x00000008 PlaySound SFX_TASK_COMPLETE MessageNoOverlap 0x340a WaitUntilTextboxCloses - _0807EB44 0x0004 + SetAnimationState 0x0004 CallWithArg sub_0807F3D8, 0x0000000c SetEntitySpeed 0x0100 _0807EDD4 0x0018, 0x0108 - _0807EB44 0x0002 + SetAnimationState 0x0002 CallWithArg sub_0807F3D8, 0x00000008 .ifdef JP SetLocalFlag 0x00cb @@ -135,26 +135,26 @@ script_08010014: script_08010060: Call sub_080644A4 CallWithArg sub_0807F5B0, 0x0000000a - _0807E878 + EnablePlayerControl Jump script_0800FF92 .2byte 0x0000 BeginBlock _0807E9D4 DoPostScriptAction 0x000a - _0807EB44 0x0004 + SetAnimationState 0x0004 CallWithArg sub_080672B0, 0x00000000 EndBlock script_08010090: CheckEntityInteractType JumpIfNot script_08010090 - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer CallWithArg sub_080672B0, 0x00000004 MessageFromTarget 0x0a01 WaitUntilTextboxCloses Wait 0x000f - _0807E878 - _0807EB44 0x0004 + EnablePlayerControl + SetAnimationState 0x0004 CallWithArg sub_080672B0, 0x00000000 Jump script_08010090 DoPostScriptAction 0x0006 diff --git a/data/scripts/hyruleTown/script_HurdyGurdyMan.inc b/data/scripts/hyruleTown/script_HurdyGurdyMan.inc index 0c01f429..7daf6e2c 100644 --- a/data/scripts/hyruleTown/script_HurdyGurdyMan.inc +++ b/data/scripts/hyruleTown/script_HurdyGurdyMan.inc @@ -2,19 +2,19 @@ SCRIPT_START script_HurdyGurdyMan BeginBlock DoPostScriptAction 0x000a - _0807EB44 0x0004 - _0807E930 0x0008 + SetAnimationState 0x0004 + SetAnimation 0x0008 Call sub_0806E440 EndBlock script_08010BCA: CheckEntityInteractType JumpIfNot script_08010BCA - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer DoPostScriptAction 0x0000 Call sub_0806E418 WaitUntilTextboxCloses - _0807E878 - _0807E930 0x0008 + EnablePlayerControl + SetAnimation 0x0008 Jump script_08010BCA .2byte 0x0000 diff --git a/data/scripts/hyruleTown/script_InnDoor.inc b/data/scripts/hyruleTown/script_InnDoor.inc index 931ee30e..ea001419 100644 --- a/data/scripts/hyruleTown/script_InnDoor.inc +++ b/data/scripts/hyruleTown/script_InnDoor.inc @@ -2,16 +2,16 @@ SCRIPT_START script_InnDoor CheckPlayerInRegion2 0x0808 JumpIfNot script_InnDoor - _0807E864 - Call sub_0807F9A4 + SetPlayerIdle + Call WaitForPlayerNormal Call sub_0807DF28 StartPlayerScript script_PlayerAtInnDoor WaitForSyncFlagAndClear 0x00000001 CheckRoomFlag 0x0001 JumpIf script_08010900 - _0807EB28 0x0b63 + EzloMessage 0x0b63 WaitUntilTextboxCloses script_08010900: Call sub_0807DF50 - _0807E878 + EnablePlayerControl Jump script_InnDoor diff --git a/data/scripts/hyruleTown/script_Kid1.inc b/data/scripts/hyruleTown/script_Kid1.inc index dffebca2..732289b5 100644 --- a/data/scripts/hyruleTown/script_Kid1.inc +++ b/data/scripts/hyruleTown/script_Kid1.inc @@ -10,18 +10,18 @@ script_080102A6: JumpIfNot script_080102A6 CheckRoomFlag 0x0009 JumpIfNot script_080102CC - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer Call sub_0806265C WaitUntilTextboxCloses - _0807E878 + EnablePlayerControl Call sub_08062500 Jump script_080102A6 script_080102CC: - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer Call sub_0806265C WaitUntilTextboxCloses - _0807E878 + EnablePlayerControl Jump script_080102A6 .2byte 0x0000 diff --git a/data/scripts/hyruleTown/script_Kid2.inc b/data/scripts/hyruleTown/script_Kid2.inc index c5dc472e..65a9125b 100644 --- a/data/scripts/hyruleTown/script_Kid2.inc +++ b/data/scripts/hyruleTown/script_Kid2.inc @@ -8,10 +8,10 @@ SCRIPT_START script_Kid2 script_080102F2: CheckEntityInteractType JumpIfNot script_080102F2 - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer Call sub_0806265C WaitUntilTextboxCloses - _0807E878 + EnablePlayerControl Jump script_080102F2 .2byte 0x0000 diff --git a/data/scripts/hyruleTown/script_Kid3.inc b/data/scripts/hyruleTown/script_Kid3.inc index 5147a331..99f6a116 100644 --- a/data/scripts/hyruleTown/script_Kid3.inc +++ b/data/scripts/hyruleTown/script_Kid3.inc @@ -7,7 +7,7 @@ script_08010314: EndBlock Call sub_08062698 Call sub_080626AC - CallWithArg sub_0807F0EC, 0x00000009 + CallWithArg GetRandomInt, 0x00000009 JumpTable script_08010340, script_0801034A, script_08010354, script_0801035E, script_08010368, script_08010372, script_0801037C, script_08010386, script_08010390 script_08010340: _0807EE04 0x0358, 0x0078 diff --git a/data/scripts/hyruleTown/script_Kid5.inc b/data/scripts/hyruleTown/script_Kid5.inc index 84453c61..4465b197 100644 --- a/data/scripts/hyruleTown/script_Kid5.inc +++ b/data/scripts/hyruleTown/script_Kid5.inc @@ -1,7 +1,7 @@ @ Hyrule Town Kid in school SCRIPT_START script_Kid5 BeginBlock - _0807E930 0x0008 + SetAnimation 0x0008 script_08010622: Call sub_08062A48 DoPostScriptAction 0x000a @@ -9,8 +9,8 @@ script_08010622: script_0801062E: CheckEntityInteractType JumpIfNot script_0801062E - _0807E864 + SetPlayerIdle Call sub_0806265C WaitUntilTextboxCloses - _0807E878 + EnablePlayerControl Jump script_0801062E diff --git a/data/scripts/hyruleTown/script_Kid6.inc b/data/scripts/hyruleTown/script_Kid6.inc index 58553883..c4c6e86d 100644 --- a/data/scripts/hyruleTown/script_Kid6.inc +++ b/data/scripts/hyruleTown/script_Kid6.inc @@ -1,6 +1,6 @@ @ Hyrule Town Kid in school 2? SCRIPT_START script_Kid6 BeginBlock - _0807E930 0x0009 + SetAnimation 0x0009 Jump script_08010622 .2byte 0x0000 diff --git a/data/scripts/hyruleTown/script_Kid7.inc b/data/scripts/hyruleTown/script_Kid7.inc index 599ee869..1d2fd690 100644 --- a/data/scripts/hyruleTown/script_Kid7.inc +++ b/data/scripts/hyruleTown/script_Kid7.inc @@ -1,14 +1,14 @@ @ Hyrule Town Kid in school 3? SCRIPT_START script_Kid7 BeginBlock - _0807E930 0x000b + SetAnimation 0x000b Jump script_08010622 .2byte 0x0000 BeginBlock - _0807E930 0x000c + SetAnimation 0x000c Jump script_08010622 .2byte 0x0000 BeginBlock - _0807E930 0x000d + SetAnimation 0x000d Jump script_08010622 .2byte 0x0000 diff --git a/data/scripts/hyruleTown/script_KidInn.inc b/data/scripts/hyruleTown/script_KidInn.inc index f3de7eb9..43a709a2 100644 --- a/data/scripts/hyruleTown/script_KidInn.inc +++ b/data/scripts/hyruleTown/script_KidInn.inc @@ -8,7 +8,7 @@ script_0800D5AC: EndBlock Call sub_08062698 Call sub_080626AC - CallWithArg sub_0807F0EC, 0x00000004 + CallWithArg GetRandomInt, 0x00000004 JumpTable script_0800D5CE, script_0800D5D8, script_0800D5E2, script_0800D5EC script_0800D5CE: _0807EE04 0x0038, 0x0098 diff --git a/data/scripts/hyruleTown/script_Librari.inc b/data/scripts/hyruleTown/script_Librari.inc index 8aa1476a..759b102e 100644 --- a/data/scripts/hyruleTown/script_Librari.inc +++ b/data/scripts/hyruleTown/script_Librari.inc @@ -2,16 +2,16 @@ SCRIPT_START script_Librari BeginBlock DoPostScriptAction 0x000a - _0807EB44 0x0004 - _0807E930 0x0000 + SetAnimationState 0x0004 + SetAnimation 0x0000 EndBlock script_0800E974: CheckEntityInteractType JumpIfNot script_0800E974 - _0807E864 - _0807E930 0x0008 - Call sub_0807F2D4 - _0807E930 0x0009 + SetPlayerIdle + SetAnimation 0x0008 + Call WaitForFrameHiBit + SetAnimation 0x0009 Call sub_0806B260 JumpIfNot script_0800E9E4 WaitUntilTextboxCloses @@ -21,11 +21,11 @@ script_0800E974: DoPostScriptAction 0x000a MessageFromTarget 0x4a24 WaitUntilTextboxCloses - _0807E930 0x000a + SetAnimation 0x000a Wait 0x0014 MessageFromTarget 0x4a25 WaitUntilTextboxCloses - _0807E930 0x0000 + SetAnimation 0x0000 StartPlayerScript script_PlayerActivatedTrapCard WaitForSyncFlagAndClear 0x00000001 SetLocalFlag 0x0074 @@ -37,6 +37,6 @@ script_0800E974: script_0800E9E4: WaitUntilTextboxCloses Wait 0x000f - _0807E878 - _0807E930 0x0000 + EnablePlayerControl + SetAnimation 0x0000 Jump script_0800E974 diff --git a/data/scripts/hyruleTown/script_LibrariLater.inc b/data/scripts/hyruleTown/script_LibrariLater.inc index cca9ae05..cc4fda75 100644 --- a/data/scripts/hyruleTown/script_LibrariLater.inc +++ b/data/scripts/hyruleTown/script_LibrariLater.inc @@ -2,16 +2,16 @@ SCRIPT_START script_LibrariLater BeginBlock DoPostScriptAction 0x000a - _0807EB44 0x0004 - _0807E930 0x0000 + SetAnimationState 0x0004 + SetAnimation 0x0000 EndBlock script_08012440: CheckEntityInteractType JumpIfNot script_08012440 - _0807E864 - _0807E930 0x0008 - Call sub_0807F2D4 - _0807E930 0x0009 + SetPlayerIdle + SetAnimation 0x0008 + Call WaitForFrameHiBit + SetAnimation 0x0009 Call sub_0806B2B4 WaitUntilTextboxCloses CheckLocalFlag 0x00b3 @@ -27,8 +27,8 @@ script_08012440: .endif .endif script_08012474: - _0807E878 - _0807E930 0x0000 + EnablePlayerControl + SetAnimation 0x0000 Jump script_08012440 .align 2, 0 diff --git a/data/scripts/hyruleTown/script_LibrarianLeft.inc b/data/scripts/hyruleTown/script_LibrarianLeft.inc index 89861977..2cda1ba0 100644 --- a/data/scripts/hyruleTown/script_LibrarianLeft.inc +++ b/data/scripts/hyruleTown/script_LibrarianLeft.inc @@ -2,17 +2,17 @@ SCRIPT_START script_LibrarianLeft BeginBlock _0807E9D4 - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x000a - _0807E930 0x0000 + SetAnimation 0x0000 EndBlock script_08008BA2: - _0807E944 - _0807E864 - _0807E930 0x0004 - Call sub_0807F2D4 + TriggerInteract + SetPlayerIdle + SetAnimation 0x0004 + Call WaitForFrameHiBit MessageFromTarget 0x4912 WaitUntilTextboxCloses - _0807E930 0x0008 - _0807E878 + SetAnimation 0x0008 + EnablePlayerControl Jump script_08008BA2 diff --git a/data/scripts/hyruleTown/script_LibrarianLeftWithQuest.inc b/data/scripts/hyruleTown/script_LibrarianLeftWithQuest.inc index 888e490f..6fbcd584 100644 --- a/data/scripts/hyruleTown/script_LibrarianLeftWithQuest.inc +++ b/data/scripts/hyruleTown/script_LibrarianLeftWithQuest.inc @@ -2,27 +2,27 @@ SCRIPT_START script_LibrarianLeftWithQuest BeginBlock _0807E9D4 - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x000a - _0807E930 0x0000 + SetAnimation 0x0000 .ifdef EU SetGlobalFlag 0x0061 .endif EndBlock script_08008BD2: - _0807E944 - _0807E864 + TriggerInteract + SetPlayerIdle .ifndef EU SetGlobalFlag 0x0061 .endif - _0807E930 0x0004 - Call sub_0807F2D4 + SetAnimation 0x0004 + Call WaitForFrameHiBit WaitUntilTextboxCloses Call sub_0806BA34 JumpIfNot script_08008C54 WaitUntilTextboxCloses CallWithArg sub_0806BB1C, 0x00000000 - Call sub_0807F2D4 + Call WaitForFrameHiBit CallWithArg sub_0806BB1C, 0x00000001 Call sub_0806BB7C JumpIfNot script_08008C5C @@ -33,17 +33,17 @@ script_08008BD2: WaitForSyncFlag 0x00000004 Wait 0x000f PlaySound SFX_SECRET - _0807E930 0x0004 - Call sub_0807F2D4 + SetAnimation 0x0004 + Call WaitForFrameHiBit MessageNoOverlap 0x4913 WaitUntilTextboxCloses - _0807E930 0x0008 - Call sub_0807F2D4 + SetAnimation 0x0008 + Call WaitForFrameHiBit Jump script_08008C5C script_08008C54: - _0807E930 0x0008 + SetAnimation 0x0008 Wait 0x000f script_08008C5C: WaitUntilTextboxCloses - _0807E878 + EnablePlayerControl Jump script_08008BD2 diff --git a/data/scripts/hyruleTown/script_LibrarianRight.inc b/data/scripts/hyruleTown/script_LibrarianRight.inc index b5af0dfc..df64ef65 100644 --- a/data/scripts/hyruleTown/script_LibrarianRight.inc +++ b/data/scripts/hyruleTown/script_LibrarianRight.inc @@ -2,18 +2,18 @@ SCRIPT_START script_LibrarianRight BeginBlock _0807E9D4 - _0807EB44 0x0004 - _0807E930 0x0000 + SetAnimationState 0x0004 + SetAnimation 0x0000 DoPostScriptAction 0x000a EndBlock script_08008B6E: - _0807E944 - _0807E864 - _0807E930 0x0004 - Call sub_0807F2D4 + TriggerInteract + SetPlayerIdle + SetAnimation 0x0004 + Call WaitForFrameHiBit Call sub_0806BBB0 WaitUntilTextboxCloses - _0807E930 0x0008 - _0807E878 + SetAnimation 0x0008 + EnablePlayerControl Jump script_08008B6E .2byte 0x0000 diff --git a/data/scripts/hyruleTown/script_LibraryVisitor.inc b/data/scripts/hyruleTown/script_LibraryVisitor.inc index 1a5015fe..1d0d7132 100644 --- a/data/scripts/hyruleTown/script_LibraryVisitor.inc +++ b/data/scripts/hyruleTown/script_LibraryVisitor.inc @@ -8,11 +8,11 @@ SCRIPT_START script_LibraryVisitor script_08008DA0: CheckEntityInteractType JumpIfNot script_08008DA0 - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer Call sub_08061FD8 Call sub_08062048 WaitUntilTextboxCloses - _0807E878 + EnablePlayerControl Jump script_08008DA0 .2byte 0x0000 diff --git a/data/scripts/hyruleTown/script_MaidTown.inc b/data/scripts/hyruleTown/script_MaidTown.inc index c75426d4..bc708306 100644 --- a/data/scripts/hyruleTown/script_MaidTown.inc +++ b/data/scripts/hyruleTown/script_MaidTown.inc @@ -2,7 +2,7 @@ SCRIPT_START script_MaidTown BeginBlock _0807E9D4 - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 DoPostScriptAction 0x000a SetIntVariable sub_08064688 diff --git a/data/scripts/hyruleTown/script_MalonHyruleTown.inc b/data/scripts/hyruleTown/script_MalonHyruleTown.inc index 6e1f2b13..f9607b9c 100644 --- a/data/scripts/hyruleTown/script_MalonHyruleTown.inc +++ b/data/scripts/hyruleTown/script_MalonHyruleTown.inc @@ -3,16 +3,16 @@ SCRIPT_START script_MalonHyruleTown BeginBlock DoPostScriptAction 0x000a DoPostScriptAction 0x0007 - _0807EB44 0x0004 - _0807E930 0x000e + SetAnimationState 0x0004 + SetAnimation 0x000e EndBlock Call sub_08065914 script_08014F4A: CheckEntityInteractType JumpIfNot script_08014F4A - _0807E864 + SetPlayerIdle Call sub_0807DF28 - _0807EB74 + FacePlayer DoPostScriptAction 0x0000 BeginBlock MessageNoOverlap 0x3b0b @@ -38,7 +38,7 @@ script_08014FA2: script_08014FA6: WaitUntilTextboxCloses Call sub_0807DF50 - _0807E878 - _0807EB44 0x0004 - _0807E930 0x000e + EnablePlayerControl + SetAnimationState 0x0004 + SetAnimation 0x000e Jump script_08014F4A diff --git a/data/scripts/hyruleTown/script_Mama.inc b/data/scripts/hyruleTown/script_Mama.inc index c7a31761..c286a0d2 100644 --- a/data/scripts/hyruleTown/script_Mama.inc +++ b/data/scripts/hyruleTown/script_Mama.inc @@ -3,21 +3,21 @@ SCRIPT_START script_Mama BeginBlock Call sub_0806C4F8 DoPostScriptAction 0x000a - _0807EB44 0x0000 + SetAnimationState 0x0000 EndBlock script_0800E932: CheckEntityInteractType JumpIfNot script_0800E932 - _0807E864 - _0807EB44 0x0004 - _0807E930 0x0004 + SetPlayerIdle + SetAnimationState 0x0004 + SetAnimation 0x0004 script_0800E942: Call sub_0806C4A8 JumpIfNot script_0800E942 Call sub_0806C4DC WaitUntilTextboxCloses - _0807E878 - _0807EB44 0x0000 - _0807E930 0x0000 + EnablePlayerControl + SetAnimationState 0x0000 + SetAnimation 0x0000 Jump script_0800E932 .2byte 0x0000 diff --git a/data/scripts/hyruleTown/script_Marcy.inc b/data/scripts/hyruleTown/script_Marcy.inc index f54f82fd..24c437a9 100644 --- a/data/scripts/hyruleTown/script_Marcy.inc +++ b/data/scripts/hyruleTown/script_Marcy.inc @@ -4,13 +4,13 @@ SCRIPT_START script_Marcy DoPostScriptAction 0x0007 _0807E9D4 DoPostScriptAction 0x000a - _0807E930 0x0000 + SetAnimation 0x0000 EndBlock script_08010746: CheckEntityInteractType JumpIfNot script_08010746 - _0807E864 - _0807E930 0x0004 + SetPlayerIdle + SetAnimation 0x0004 BeginBlock Call sub_08062D18 JumpIfNot script_08010786 @@ -29,6 +29,6 @@ script_08010778: script_08010786: EndBlock WaitUntilTextboxCloses - _0807E878 - _0807E930 0x0008 + EnablePlayerControl + SetAnimation 0x0008 Jump script_08010746 diff --git a/data/scripts/hyruleTown/script_Mayor.inc b/data/scripts/hyruleTown/script_Mayor.inc index 53885de4..83a6c6a5 100644 --- a/data/scripts/hyruleTown/script_Mayor.inc +++ b/data/scripts/hyruleTown/script_Mayor.inc @@ -3,21 +3,21 @@ SCRIPT_START script_Mayor BeginBlock Call sub_0806CE5C DoPostScriptAction 0x000a - _0807EB44 0x0004 - _0807E930 0x0008 + SetAnimationState 0x0004 + SetAnimation 0x0008 EndBlock script_0800EA6A: CheckEntityInteractType JumpIfNot script_0800EA6A - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer CallWithArg sub_0807F3D8, 0x00000004 - Call sub_0807F2D4 - _0807E930 0x0009 + Call WaitForFrameHiBit + SetAnimation 0x0009 Call sub_0806CE80 WaitUntilTextboxCloses - _0807E878 - _0807E930 0x000a - Call sub_0807F2D4 - _0807E930 0x0008 + EnablePlayerControl + SetAnimation 0x000a + Call WaitForFrameHiBit + SetAnimation 0x0008 Jump script_0800EA6A diff --git a/data/scripts/hyruleTown/script_MutohInMill.inc b/data/scripts/hyruleTown/script_MutohInMill.inc index fdefdeb9..ee10eeba 100644 --- a/data/scripts/hyruleTown/script_MutohInMill.inc +++ b/data/scripts/hyruleTown/script_MutohInMill.inc @@ -3,19 +3,19 @@ SCRIPT_START script_MutohInMill BeginBlock Call sub_08067100 DoPostScriptAction 0x000a - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 EndBlock script_0800954E: CheckEntityInteractType JumpIfNot script_0800954E - _0807E864 + SetPlayerIdle DoPostScriptAction 0x0001 - _0807EB74 + FacePlayer Call sub_080670E4 WaitUntilTextboxCloses - _0807E878 - _0807EB44 0x0004 + EnablePlayerControl + SetAnimationState 0x0004 DoPostScriptAction 0x0000 Jump script_0800954E .2byte 0x0000 diff --git a/data/scripts/hyruleTown/script_Nayru.inc b/data/scripts/hyruleTown/script_Nayru.inc index 2815c9c5..571e2bef 100644 --- a/data/scripts/hyruleTown/script_Nayru.inc +++ b/data/scripts/hyruleTown/script_Nayru.inc @@ -2,7 +2,7 @@ SCRIPT_START script_Nayru BeginBlock Call sub_08064928 - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0001 DoPostScriptAction 0x000a CheckGlobalFlag 0x0047 @@ -14,13 +14,13 @@ script_08011D46: CheckEntityInteractType JumpIfNot script_08011D46 EndBlock - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer DoPostScriptAction 0x0000 MessageNoOverlap 0x4513 WaitUntilTextboxCloses - _0807E878 - _0807EB44 0x0004 + EnablePlayerControl + SetAnimationState 0x0004 DoPostScriptAction 0x0001 Jump script_08011D46 script_08011D6E: @@ -33,29 +33,29 @@ script_08011D6E: CheckEntityInteractType JumpIfNot script_08011D6E EndBlock - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer DoPostScriptAction 0x0000 MessageNoOverlap 0x3103 WaitUntilTextboxCloses CheckTextboxResult JumpIf script_08011DBA - _0807E878 - _0807EB44 0x0004 + EnablePlayerControl + SetAnimationState 0x0004 DoPostScriptAction 0x0001 Jump script_08011D6E script_08011DAC: CheckEntityInteractType JumpIfNot script_08011DAC - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer DoPostScriptAction 0x0000 script_08011DBA: MessageNoOverlap 0x3106 WaitUntilTextboxCloses SetGlobalFlag 0x002c - _0807E878 - _0807EB44 0x0004 + EnablePlayerControl + SetAnimationState 0x0004 DoPostScriptAction 0x0001 Jump script_08011DAC .2byte 0x0000 diff --git a/data/scripts/hyruleTown/script_Nayru2.inc b/data/scripts/hyruleTown/script_Nayru2.inc index c4ab770d..dadf8cb8 100644 --- a/data/scripts/hyruleTown/script_Nayru2.inc +++ b/data/scripts/hyruleTown/script_Nayru2.inc @@ -2,7 +2,7 @@ SCRIPT_START script_Nayru2 BeginBlock Call sub_08064928 - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0001 DoPostScriptAction 0x000a EndBlock @@ -16,8 +16,8 @@ script_08011F22: CheckEntityInteractType JumpIfNot script_08011F22 EndBlock - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer DoPostScriptAction 0x0000 CheckGlobalFlag 0x0048 JumpIf script_08011F58 @@ -30,21 +30,21 @@ script_08011F58: CheckTextboxResult JumpIf script_08011F80 script_08011F64: - _0807E878 - _0807EB44 0x0004 + EnablePlayerControl + SetAnimationState 0x0004 DoPostScriptAction 0x0001 Jump script_08011F22 script_08011F72: CheckEntityInteractType JumpIfNot script_08011F72 - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer DoPostScriptAction 0x0000 script_08011F80: MessageNoOverlap 0x3112 WaitUntilTextboxCloses SetGlobalFlag 0x002f - _0807E878 - _0807EB44 0x0004 + EnablePlayerControl + SetAnimationState 0x0004 DoPostScriptAction 0x0001 Jump script_08011F72 diff --git a/data/scripts/hyruleTown/script_NayruAlone.inc b/data/scripts/hyruleTown/script_NayruAlone.inc index 7436a2c2..c1e75c7d 100644 --- a/data/scripts/hyruleTown/script_NayruAlone.inc +++ b/data/scripts/hyruleTown/script_NayruAlone.inc @@ -2,19 +2,19 @@ SCRIPT_START script_NayruAlone BeginBlock Call sub_08064928 - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0001 DoPostScriptAction 0x000a EndBlock script_08012216: CheckEntityInteractType JumpIfNot script_08012216 - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer DoPostScriptAction 0x0000 MessageNoOverlap 0x4525 WaitUntilTextboxCloses - _0807E878 - _0807EB44 0x0004 + EnablePlayerControl + SetAnimationState 0x0004 DoPostScriptAction 0x0001 Jump script_08012216 diff --git a/data/scripts/hyruleTown/script_NayruMovedIn.inc b/data/scripts/hyruleTown/script_NayruMovedIn.inc index dbef277e..ab975772 100644 --- a/data/scripts/hyruleTown/script_NayruMovedIn.inc +++ b/data/scripts/hyruleTown/script_NayruMovedIn.inc @@ -2,15 +2,15 @@ SCRIPT_START script_NayruMovedIn BeginBlock Call sub_08064928 - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0001 DoPostScriptAction 0x000a EndBlock script_080120C6: CheckEntityInteractType JumpIfNot script_080120C6 - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer DoPostScriptAction 0x0000 CheckLocalFlag 0x0095 JumpIf script_080120EA @@ -51,8 +51,8 @@ script_08012126: MessageNoOverlap 0x311b script_0801212A: WaitUntilTextboxCloses - _0807E878 - _0807EB44 0x0004 + EnablePlayerControl + SetAnimationState 0x0004 DoPostScriptAction 0x0001 Jump script_080120C6 .align 2, 0 diff --git a/data/scripts/hyruleTown/script_Object69SimonsSimulation.inc b/data/scripts/hyruleTown/script_Object69SimonsSimulation.inc index 00761031..0a1a958a 100644 --- a/data/scripts/hyruleTown/script_Object69SimonsSimulation.inc +++ b/data/scripts/hyruleTown/script_Object69SimonsSimulation.inc @@ -1,30 +1,30 @@ @ Simons Simulation OBJECT_69 SCRIPT_START script_Object69SimonsSimulation BeginBlock - _0807E888 + DisablePlayerControl EndBlock CallWithArg sub_0806C2A0, 0x00000001 WaitForFadeFinish Wait 0x003c - _0807E878 + EnablePlayerControl SetRoomFlag 0x0000 PlayBgm BGM_FIGHT_THEME2 script_08011C04: CheckRoomFlag 0x0064 JumpIfNot script_08011C04 StopBgm - _0807E864 + SetPlayerIdle Wait 0x003c CameraTargetEntity Wait 0x003c Call Simon_CreateChest Wait 0x003c CameraTargetPlayer - _0807E878 + EnablePlayerControl script_08011C28: CheckLocalFlag 0x0001 JumpIfNot script_08011C28 - _0807E888 + DisablePlayerControl WaitPlayerGetItem Wait 0x001e CallWithArg sub_0806C2A0, 0x00000000 diff --git a/data/scripts/hyruleTown/script_Object6ACarlov.inc b/data/scripts/hyruleTown/script_Object6ACarlov.inc index b4987e83..6ba8d7a9 100644 --- a/data/scripts/hyruleTown/script_Object6ACarlov.inc +++ b/data/scripts/hyruleTown/script_Object6ACarlov.inc @@ -8,22 +8,22 @@ SCRIPT_START script_Object6ACarlov script_080145C2: CheckRoomFlag 0x0005 JumpIfNot script_080145C2 - _0807E864 + SetPlayerIdle ClearRoomFlag 0x0005 .ifdef EU Wait 0x0018 _0807E8E4_1 - _0807EB44 0x0006 + SetAnimationState 0x0006 .else Wait 0x000c - _0807EB8C + FaceAwayFromPlayer .endif MessageFromTargetPos 0x432e, 0x000c WaitUntilTextboxCloses .ifdef EU Wait 0x0018 .endif - _0807E878 + EnablePlayerControl Jump script_080145C2 script_080145E4: EndBlock diff --git a/data/scripts/hyruleTown/script_Object6ACarlov2.inc b/data/scripts/hyruleTown/script_Object6ACarlov2.inc index a10f0656..37ed8f5f 100644 --- a/data/scripts/hyruleTown/script_Object6ACarlov2.inc +++ b/data/scripts/hyruleTown/script_Object6ACarlov2.inc @@ -2,7 +2,7 @@ SCRIPT_START script_Object6ACarlov2 BeginBlock DoPostScriptAction 0x0008 - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 EndBlock script_080145F8: @@ -13,19 +13,19 @@ script_080145F8: JumpIfNot script_080145F8 CheckRoomFlag 0x0009 JumpIf script_08014632 - _0807E864 + SetPlayerIdle Wait 0x0018 _0807E8E4_3 - _0807EB44 0x0002 + SetAnimationState 0x0002 MessageFromTargetPos 0x432b, 0x000c WaitUntilTextboxCloses Wait 0x0018 - _0807E878 + EnablePlayerControl Jump script_080145F8 script_08014632: CheckRoomFlag 0x0000 JumpIfNot script_08014632 - _0807E864 + SetPlayerIdle Call sub_0807DF28 script_08014642: CheckRoomFlag 0x0009 @@ -33,12 +33,12 @@ script_08014642: SetSyncFlag 0x00000004 WaitForSyncFlagAndClear 0x00000008 Call sub_0807DF50 - _0807E878 + EnablePlayerControl Jump script_080145F8 .else CheckRoomFlag 0x0000 JumpIfNot script_080145F8 - _0807E864 + SetPlayerIdle Call sub_0807DF28 script_08014608: CheckRoomFlag 0x0004 @@ -46,7 +46,7 @@ script_08014608: SetSyncFlag 0x00000004 WaitForSyncFlagAndClear 0x00000008 Call sub_0807DF50 - _0807E878 + EnablePlayerControl Jump script_080145F8 .endif .align 2, 0 diff --git a/data/scripts/hyruleTown/script_Object6APreventPlayerLeaveCarlov.inc b/data/scripts/hyruleTown/script_Object6APreventPlayerLeaveCarlov.inc index ad162bf7..853106e8 100644 --- a/data/scripts/hyruleTown/script_Object6APreventPlayerLeaveCarlov.inc +++ b/data/scripts/hyruleTown/script_Object6APreventPlayerLeaveCarlov.inc @@ -7,14 +7,14 @@ script_0801454C: JumpIfNot script_0801454C CheckRoomFlag 0x0000 JumpIfNot script_0801454C - _0807E864 - _0807EB28 0x4217 + SetPlayerIdle + EzloMessage 0x4217 WaitUntilTextboxCloses StartPlayerScript script_PlayerWhenLeavingCarlovAlreadyPaid Wait 0x0010 SetSyncFlag 0x00000001 WaitForSyncFlagAndClear 0x00000002 - _0807E878 + EnablePlayerControl Jump script_0801454C SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/hyruleTown/script_OldLadyCatHouse1.inc b/data/scripts/hyruleTown/script_OldLadyCatHouse1.inc index cfd7bef0..c5905a83 100644 --- a/data/scripts/hyruleTown/script_OldLadyCatHouse1.inc +++ b/data/scripts/hyruleTown/script_OldLadyCatHouse1.inc @@ -3,7 +3,7 @@ SCRIPT_START script_OldLadyCatHouse1 BeginBlock Call sub_08061E70 DoPostScriptAction 0x000a - _0807EB44 0x0004 + SetAnimationState 0x0004 Call sub_08061FD8 EndBlock Jump script_0800EBF4 diff --git a/data/scripts/hyruleTown/script_OldLadyCatHouse2.inc b/data/scripts/hyruleTown/script_OldLadyCatHouse2.inc index a2b33563..edaf3a11 100644 --- a/data/scripts/hyruleTown/script_OldLadyCatHouse2.inc +++ b/data/scripts/hyruleTown/script_OldLadyCatHouse2.inc @@ -3,18 +3,18 @@ SCRIPT_START script_OldLadyCatHouse2 BeginBlock Call sub_08061E70 DoPostScriptAction 0x000a - _0807EB44 0x0006 + SetAnimationState 0x0006 Call sub_08061FD8 EndBlock @ Common end code for Townspersons? script_0800EBF4: CheckEntityInteractType JumpIfNot script_0800EBF4 - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer Call sub_08061FD8 Call sub_08062048 WaitUntilTextboxCloses - _0807E878 + EnablePlayerControl Jump script_0800EBF4 .2byte 0x0000 diff --git a/data/scripts/hyruleTown/script_Phonograph.inc b/data/scripts/hyruleTown/script_Phonograph.inc index b4cae722..9dae4972 100644 --- a/data/scripts/hyruleTown/script_Phonograph.inc +++ b/data/scripts/hyruleTown/script_Phonograph.inc @@ -6,7 +6,7 @@ SCRIPT_START script_Phonograph script_0800BA46: CheckEntityInteractType JumpIfNot script_0800BA46 - _0807E864 + SetPlayerIdle Call sub_0807DF28 MessageFromTarget 0x3301 WaitUntilTextboxCloses @@ -17,5 +17,5 @@ script_0800BA46: PlayBGM script_0800BA6C: Call sub_0807DF50 - _0807E878 + EnablePlayerControl Jump script_0800BA46 diff --git a/data/scripts/hyruleTown/script_PhonographDoor.inc b/data/scripts/hyruleTown/script_PhonographDoor.inc index f5de6c5e..163dfdae 100644 --- a/data/scripts/hyruleTown/script_PhonographDoor.inc +++ b/data/scripts/hyruleTown/script_PhonographDoor.inc @@ -19,18 +19,18 @@ SCRIPT_START script_PhonographDoor CheckPlayerInRegion2 0x0808 JumpIfNot script_PhonographDoor EndBlock - _0807E864 - Call sub_0807F9A4 + SetPlayerIdle + Call WaitForPlayerNormal Call sub_0807DF28 StartPlayerScript script_PlayerCannotEnter WaitForSyncFlagAndClear 0x00000001 CheckRoomFlag 0x0001 JumpIf script_080109DE - _0807EB28 0x0b64 + EzloMessage 0x0b64 WaitUntilTextboxCloses script_080109DE: Call sub_0807DF50 - _0807E878 + EnablePlayerControl Jump script_PhonographDoor script_080109EA: DoPostScriptAction 0x0006 diff --git a/data/scripts/hyruleTown/script_Pina.inc b/data/scripts/hyruleTown/script_Pina.inc index 2218ed8d..866ef334 100644 --- a/data/scripts/hyruleTown/script_Pina.inc +++ b/data/scripts/hyruleTown/script_Pina.inc @@ -1,21 +1,21 @@ @ Hyrule Town Pina SCRIPT_START script_Pina BeginBlock - _0807EB44 0x0004 - _0807E930 0x0000 + SetAnimationState 0x0004 + SetAnimation 0x0000 Call sub_08063CAC DoPostScriptAction 0x000a - Call sub_0807F348 + Call SetPriorityMessage EndBlock script_080104BC: CheckEntityInteractType JumpIfNot script_080104BC - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer CallWithArg sub_0807F3D8, 0x00000004 Call sub_08063C90 WaitUntilTextboxCloses Wait 0x000f - _0807E878 + EnablePlayerControl CallWithArg sub_0807F3D8, 0x00000000 Jump script_080104BC diff --git a/data/scripts/hyruleTown/script_Pita.inc b/data/scripts/hyruleTown/script_Pita.inc index eaa60fe9..5732755d 100644 --- a/data/scripts/hyruleTown/script_Pita.inc +++ b/data/scripts/hyruleTown/script_Pita.inc @@ -3,15 +3,15 @@ SCRIPT_START script_Pita BeginBlock _0807E9D4 DoPostScriptAction 0x000a - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 EndBlock script_080106BE: CheckEntityInteractType JumpIfNot script_080106BE - _0807E864 - _0807EB74 - Call sub_0807F2D4 + SetPlayerIdle + FacePlayer + Call WaitForFrameHiBit DoPostScriptAction 0x0000 HasRoomItemForSale JumpIf script_080106E0 @@ -39,7 +39,7 @@ script_08010724: WaitPlayerGetItem script_08010726: WaitUntilTextboxCloses - _0807E878 + EnablePlayerControl DoPostScriptAction 0x0001 Jump script_080106BE .2byte 0x0000 diff --git a/data/scripts/hyruleTown/script_PlayerActivatedTrapCard.inc b/data/scripts/hyruleTown/script_PlayerActivatedTrapCard.inc index 32ceacb2..da2b3e4f 100644 --- a/data/scripts/hyruleTown/script_PlayerActivatedTrapCard.inc +++ b/data/scripts/hyruleTown/script_PlayerActivatedTrapCard.inc @@ -1,12 +1,12 @@ @ Player at Library fall through trap SCRIPT_START script_PlayerActivatedTrapCard - _0807EB44 0x0006 + SetAnimationState 0x0006 DoPostScriptAction 0x0000 Wait 0x0014 - _0807EB44 0x0002 + SetAnimationState 0x0002 DoPostScriptAction 0x0000 Wait 0x0014 - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 DoPostScriptAction 0x0005 Wait 0x003c diff --git a/data/scripts/hyruleTown/script_PlayerAtDrLeftDoor.inc b/data/scripts/hyruleTown/script_PlayerAtDrLeftDoor.inc index 985483a2..bcc539a8 100644 --- a/data/scripts/hyruleTown/script_PlayerAtDrLeftDoor.inc +++ b/data/scripts/hyruleTown/script_PlayerAtDrLeftDoor.inc @@ -3,9 +3,9 @@ SCRIPT_START script_PlayerAtDrLeftDoor BeginBlock SetEntitySpeed 0x0100 EndBlock - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0001 - _0807ECC4 0x0008 + WalkSouth 0x0008 SetSyncFlag 0x00000001 Call sub_080791BC SCRIPT_END diff --git a/data/scripts/hyruleTown/script_PlayerAtInnDoor.inc b/data/scripts/hyruleTown/script_PlayerAtInnDoor.inc index d74971cd..25411c1b 100644 --- a/data/scripts/hyruleTown/script_PlayerAtInnDoor.inc +++ b/data/scripts/hyruleTown/script_PlayerAtInnDoor.inc @@ -3,8 +3,8 @@ SCRIPT_START script_PlayerAtInnDoor BeginBlock SetEntitySpeed 0x0100 EndBlock - _0807ECC4 0x0010 - _0807EB44 0x0004 + WalkSouth 0x0010 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 SetSyncFlag 0x00000001 Call sub_080791BC diff --git a/data/scripts/hyruleTown/script_PlayerAtRem.inc b/data/scripts/hyruleTown/script_PlayerAtRem.inc index 14ab94ad..3dab6b77 100644 --- a/data/scripts/hyruleTown/script_PlayerAtRem.inc +++ b/data/scripts/hyruleTown/script_PlayerAtRem.inc @@ -1,7 +1,7 @@ @ Player at Rem SCRIPT_START script_PlayerAtRem BeginBlock - _0807EB44 0x0006 + SetAnimationState 0x0006 SetEntitySpeed 0x0140 EndBlock _0807EDD4 0x00a8, 0x0060 diff --git a/data/scripts/hyruleTown/script_PlayerCannotEnter.inc b/data/scripts/hyruleTown/script_PlayerCannotEnter.inc index 9ae17985..e7ef3883 100644 --- a/data/scripts/hyruleTown/script_PlayerCannotEnter.inc +++ b/data/scripts/hyruleTown/script_PlayerCannotEnter.inc @@ -3,8 +3,8 @@ SCRIPT_START script_PlayerCannotEnter BeginBlock SetEntitySpeed 0x0100 EndBlock - _0807EC94 0x0010 - _0807EB44 0x0002 + WalkEast 0x0010 + SetAnimationState 0x0002 DoPostScriptAction 0x0000 SetSyncFlag 0x00000001 Call sub_080791BC diff --git a/data/scripts/hyruleTown/script_PlayerSleepingInn.inc b/data/scripts/hyruleTown/script_PlayerSleepingInn.inc index eb09df0a..53d68d84 100644 --- a/data/scripts/hyruleTown/script_PlayerSleepingInn.inc +++ b/data/scripts/hyruleTown/script_PlayerSleepingInn.inc @@ -2,18 +2,18 @@ SCRIPT_START script_PlayerSleepingInn BeginBlock Call sub_0807DF28 - _0807E864 + SetPlayerIdle ModHealth 0x00a0 EndBlock Wait 0x003c - _0807E778 0x0004 + SetFadeTime 0x0004 DoFade4 WaitForFadeFinish script_08010A78: - Call sub_0807F0D8 + Call CheckAnyKeyPressed JumpIfNot script_08010A78 DoPostScriptAction 0x0014 - _0807E878 + EnablePlayerControl Call sub_0807DF50 Call sub_080791D0 SCRIPT_END diff --git a/data/scripts/hyruleTown/script_PlayerStepOnTrap.inc b/data/scripts/hyruleTown/script_PlayerStepOnTrap.inc index 1666a56b..261a7afb 100644 --- a/data/scripts/hyruleTown/script_PlayerStepOnTrap.inc +++ b/data/scripts/hyruleTown/script_PlayerStepOnTrap.inc @@ -1,7 +1,7 @@ @ Player at Librari move on trap SCRIPT_START script_PlayerStepOnTrap BeginBlock - _0807EB44 0x0004 + SetAnimationState 0x0004 SetEntitySpeed 0x0100 EndBlock DoPostScriptAction 0x0001 diff --git a/data/scripts/hyruleTown/script_PlayerWakingUpAtSimons.inc b/data/scripts/hyruleTown/script_PlayerWakingUpAtSimons.inc index 748c70ef..8f68ac3c 100644 --- a/data/scripts/hyruleTown/script_PlayerWakingUpAtSimons.inc +++ b/data/scripts/hyruleTown/script_PlayerWakingUpAtSimons.inc @@ -1,7 +1,7 @@ @ Player waking up after Simons Simulation SCRIPT_START script_PlayerWakingUpAtSimons BeginBlock - _0807E864 + SetPlayerIdle EndBlock Wait 0x003c CallWithArg sub_0806C2A0, 0x00000001 diff --git a/data/scripts/hyruleTown/script_Postman.inc b/data/scripts/hyruleTown/script_Postman.inc index 01b75b3f..5f12cb8d 100644 --- a/data/scripts/hyruleTown/script_Postman.inc +++ b/data/scripts/hyruleTown/script_Postman.inc @@ -3,10 +3,10 @@ SCRIPT_START script_Postman BeginBlock CheckInventory1 0x0067 JumpIfNot script_08010B62 - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 SetEntitySpeed 0x0180 - CallWithArg sub_0807F348 + CallWithArg SetPriorityMessage Call sub_0806075C EndBlock WaitUntilTextboxCloses @@ -20,7 +20,7 @@ script_08010B1C: script_08010B22: EndBlock BeginBlock - _0807E564 + CheckPlayerMinish JumpIf script_08010B3A CallWithArg sub_080608E4, 0x00000000 JumpIf script_08010B44 diff --git a/data/scripts/hyruleTown/script_Rem.inc b/data/scripts/hyruleTown/script_Rem.inc index 85487b0e..7fb0f0c8 100644 --- a/data/scripts/hyruleTown/script_Rem.inc +++ b/data/scripts/hyruleTown/script_Rem.inc @@ -2,8 +2,8 @@ SCRIPT_START script_Rem BeginBlock CallWithArg sub_0806A93C, 0x12345678 - _0807EB44 0x0004 - _0807E930 0x0002 + SetAnimationState 0x0004 + SetAnimation 0x0002 CheckInventory1 0x0015 JumpIf script_080130B6 CheckLocalFlag 0x0060 @@ -20,17 +20,17 @@ script_08012F48: script_08012F50: Call sub_0806A96C JumpIfNot script_08012F50 - _0807E864 + SetPlayerIdle MessageNoOverlap 0x4401 WaitUntilTextboxCloses SetLocalFlag 0x0061 - _0807E878 - _0807E908 0x0001 + EnablePlayerControl + SetAction 0x0001 script_08012F6C: Call sub_0806A96C JumpIfNot script_08012F6C MessageNoOverlap 0x4402 WaitUntilTextboxCloses - _0807E908 0x0001 + SetAction 0x0001 Jump script_08012F6C SCRIPT_END diff --git a/data/scripts/hyruleTown/script_RemFallingAsleep.inc b/data/scripts/hyruleTown/script_RemFallingAsleep.inc index b685fd1f..996ea20f 100644 --- a/data/scripts/hyruleTown/script_RemFallingAsleep.inc +++ b/data/scripts/hyruleTown/script_RemFallingAsleep.inc @@ -3,24 +3,24 @@ SCRIPT_START script_RemFallingAsleep BeginBlock CheckLocalFlag 0x0060 JumpIf script_08012FD2 - _0807E864 + SetPlayerIdle Call sub_0807DF28 StartPlayerScript script_PlayerAtRem SetLocalFlag 0x0060 ClearLocalFlag 0x0061 EndBlock WaitForSyncFlagAndClear 0x00000004 - _0807E908 0x0004 + SetAction 0x0004 Call sub_0806A958 CallWithArg sub_0807F93C, 0x0000f2f4 Call sub_0807DF50 - _0807E878 + EnablePlayerControl SetLocalFlag 0x0062 Jump script_08012FFA script_08012FD2: BeginBlock - _0807E930 0x000d - _0807E908 0x0005 + SetAnimation 0x000d + SetAction 0x0005 SetLocalFlag 0x0062 CallWithArg sub_0807F93C, 0x0000f2f4 Call sub_0806AA10 @@ -28,14 +28,14 @@ script_08012FD2: CheckInventory1 0x0038 JumpIf script_08013006 script_08012FFA: - _0807E944 + TriggerInteract MessageNoOverlap 0x4403 WaitUntilTextboxCloses Jump script_08012FFA script_08013006: - _0807E944 + TriggerInteract BeginBlock - _0807E864 + SetPlayerIdle Call sub_0807DF28 EndBlock PlaySound SFX_TASK_COMPLETE @@ -44,7 +44,7 @@ script_08013006: Wait 0x001e _0807E8E4_0 Call sub_0806AB9C - _0807E930 0x000b + SetAnimation 0x000b Wait 0x003c DoPostScriptAction 0x0004 Wait 0x003c @@ -57,31 +57,31 @@ script_08013006: WaitUntilTextboxCloses Wait 0x001e Call sub_0806A9E8 - _0807E930 0x000f + SetAnimation 0x000f Wait 0x00f0 MessageNoOverlap 0x4405 WaitUntilTextboxCloses SetSyncFlag 0x00000200 GivePlayerItem 0x0015 WaitPlayerGetItem - _0807EB8C + FaceAwayFromPlayer MessageNoOverlap 0x4406 WaitUntilTextboxCloses - _0807E908 0x0001 + SetAction 0x0001 Call sub_0807DF50 - _0807E878 + EnablePlayerControl script_0801308A: Call sub_0806A96C JumpIfNot script_0801308A MessageNoOverlap 0x4407 WaitUntilTextboxCloses - _0807E908 0x0001 + SetAction 0x0001 script_0801309E: Call sub_0806A96C JumpIfNot script_0801309E MessageNoOverlap 0x440d WaitUntilTextboxCloses - _0807E908 0x0001 + SetAction 0x0001 Jump script_0801308A script_080130B6: CheckLocalFlag 0x0062 @@ -92,9 +92,9 @@ script_080130C4: script_080130C6: Call sub_0806A96C JumpIfNot script_080130C6 - _0807E864 + SetPlayerIdle Call sub_0806AA18 WaitUntilTextboxCloses - _0807E878 - _0807E908 0x0001 + EnablePlayerControl + SetAction 0x0001 Jump script_080130C6 diff --git a/data/scripts/hyruleTown/script_RemTownMinish.inc b/data/scripts/hyruleTown/script_RemTownMinish.inc index d7f649b8..fb5e9ec6 100644 --- a/data/scripts/hyruleTown/script_RemTownMinish.inc +++ b/data/scripts/hyruleTown/script_RemTownMinish.inc @@ -4,7 +4,7 @@ SCRIPT_START script_RemTownMinish _0807E9D4 DoPostScriptAction 0x000a DoPostScriptAction 0x0012 - Call sub_0807F348 + Call SetPriorityMessage EndBlock script_08013128: EndBlock @@ -14,9 +14,9 @@ script_08013128: Call sub_0806AEE4 Jump script_08013128 script_0801313C: - _0807E864 + SetPlayerIdle EndBlock - _0807EB74 + FacePlayer Call sub_0806AED8 CallWithArg sub_0806AA50, 0x00000000 WaitUntilTextboxCloses @@ -25,10 +25,10 @@ script_0801313C: CallWithArg sub_0806AA50, 0x00000002 WaitUntilTextboxCloses JumpIf script_08013176 - _0807E878 + EnablePlayerControl Jump script_08013128 script_08013176: SetIntVariable 0x00000403 - Call sub_0807F420 - _0807E878 + Call LoadMenu + EnablePlayerControl Jump script_08013128 diff --git a/data/scripts/hyruleTown/script_Simon.inc b/data/scripts/hyruleTown/script_Simon.inc index 4eb0c09c..44bd59b5 100644 --- a/data/scripts/hyruleTown/script_Simon.inc +++ b/data/scripts/hyruleTown/script_Simon.inc @@ -3,34 +3,34 @@ SCRIPT_START script_Simon BeginBlock _0807E9D4 DoPostScriptAction 0x000a - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 EndBlock CheckGlobalFlag 0x0050 JumpIfNot script_08011B84 WaitForSyncFlagAndClear 0x00000004 - _0807EB44 0x0006 + SetAnimationState 0x0006 DoPostScriptAction 0x0004 Wait 0x003c - _0807EB8C + FaceAwayFromPlayer MessageNoOverlap 0x3d07 WaitUntilTextboxCloses - _0807EB44 0x0004 + SetAnimationState 0x0004 ClearGlobalFlag 0x0050 Call sub_0807DF50 - _0807E878 + EnablePlayerControl script_08011B84: CheckEntityInteractType JumpIfNot script_08011B84 - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer MessageNoOverlap 0x3d01 WaitUntilTextboxCloses CheckTextboxResult JumpIf script_08011BA4 script_08011B9A: - _0807E878 - _0807EB44 0x0004 + EnablePlayerControl + SetAnimationState 0x0004 Jump script_08011B84 script_08011BA4: HasRupees 0x000a diff --git a/data/scripts/hyruleTown/script_SimonsDoor.inc b/data/scripts/hyruleTown/script_SimonsDoor.inc index af0ab35f..4e9b8ba0 100644 --- a/data/scripts/hyruleTown/script_SimonsDoor.inc +++ b/data/scripts/hyruleTown/script_SimonsDoor.inc @@ -2,18 +2,18 @@ SCRIPT_START script_SimonsDoor CheckPlayerInRegion2 0x0808 JumpIfNot script_SimonsDoor - _0807E864 - Call sub_0807F9A4 + SetPlayerIdle + Call WaitForPlayerNormal Call sub_0807DF28 StartPlayerScript script_PlayerCannotEnter WaitForSyncFlagAndClear 0x00000001 CheckRoomFlag 0x0001 JumpIf script_08010994 - _0807EB28 0x0b63 + EzloMessage 0x0b63 WaitUntilTextboxCloses script_08010994: Call sub_0807DF50 - _0807E878 + EnablePlayerControl Jump script_SimonsDoor diff --git a/data/scripts/hyruleTown/script_SittingPerson.inc b/data/scripts/hyruleTown/script_SittingPerson.inc index de9aafde..0dc70fbc 100644 --- a/data/scripts/hyruleTown/script_SittingPerson.inc +++ b/data/scripts/hyruleTown/script_SittingPerson.inc @@ -10,16 +10,16 @@ SCRIPT_START script_SittingPerson script_0800ED20: CheckEntityInteractType JumpIfNot script_0800ED20 - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer CallWithArg sub_08063850, 0x00000000 Call sub_08063944 WaitUntilTextboxCloses JumpIfNot script_0800ED46 - _0807F050 0x0070 + GiveKinstone 0x0070 WaitPlayerGetItem script_0800ED46: - _0807E878 + EnablePlayerControl Call sub_08063874 CallWithArg sub_08063850, 0x00000000 Jump script_0800ED20 diff --git a/data/scripts/hyruleTown/script_SmallTownMinish.inc b/data/scripts/hyruleTown/script_SmallTownMinish.inc index 7438f1cd..d97d0801 100644 --- a/data/scripts/hyruleTown/script_SmallTownMinish.inc +++ b/data/scripts/hyruleTown/script_SmallTownMinish.inc @@ -1,10 +1,10 @@ @ Hyrule Town SmallTownMinish SCRIPT_START script_SmallTownMinish BeginBlock - _0807E564 + CheckPlayerMinish JumpIfNot script_08010BAC Call sub_0807F924 - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 DoPostScriptAction 0x0007 DoPostScriptAction 0x000a @@ -12,16 +12,16 @@ SCRIPT_START script_SmallTownMinish script_08010B88: EndBlock BeginBlock - _0807E564 + CheckPlayerMinish JumpIfNot script_08010BAC CheckEntityInteractType JumpIfNot script_08010B88 EndBlock - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer Call sub_0806E2DC WaitUntilTextboxCloses - _0807E878 + EnablePlayerControl Jump script_08010B88 script_08010BAC: DoPostScriptAction 0x0006 diff --git a/data/scripts/hyruleTown/script_Stamp.inc b/data/scripts/hyruleTown/script_Stamp.inc index c26672bc..c478adeb 100644 --- a/data/scripts/hyruleTown/script_Stamp.inc +++ b/data/scripts/hyruleTown/script_Stamp.inc @@ -4,18 +4,18 @@ SCRIPT_START script_Stamp DoPostScriptAction 0x0007 _0807E9D4 DoPostScriptAction 0x000a - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 EndBlock script_080107AA: CheckEntityInteractType JumpIfNot script_080107AA - _0807E864 - Call sub_0807F2D4 + SetPlayerIdle + Call WaitForFrameHiBit DoPostScriptAction 0x0001 Call sub_08062CBC WaitUntilTextboxCloses - _0807E878 + EnablePlayerControl DoPostScriptAction 0x0000 Jump script_080107AA .2byte 0x0000 diff --git a/data/scripts/hyruleTown/script_Stockwell.inc b/data/scripts/hyruleTown/script_Stockwell.inc index c079da2b..b59499cf 100644 --- a/data/scripts/hyruleTown/script_Stockwell.inc +++ b/data/scripts/hyruleTown/script_Stockwell.inc @@ -9,56 +9,56 @@ SCRIPT_START script_Stockwell script_080142C4: EndBlock BeginBlock - _0807E564 + CheckPlayerMinish JumpIfNot script_080142C4 CheckPlayerInRegion 0x0098, 0x0058, 0x1818 JumpIfNot script_080142C4 EndBlock - _0807E864 + SetPlayerIdle SetLocalFlag 0x0053 Wait 0x0014 - _0807E908 0x0004 + SetAction 0x0004 Call sub_080654DC Wait 0x001e - _0807E930 0x0001 + SetAnimation 0x0001 Wait 0x000a - _0807E930 0x0003 + SetAnimation 0x0003 Wait 0x000a - _0807E930 0x0001 + SetAnimation 0x0001 Wait 0x000a - _0807E930 0x0003 + SetAnimation 0x0003 Wait 0x000a - _0807E930 0x0002 + SetAnimation 0x0002 Wait 0x001e MessageNoOverlap 0x2c12 WaitUntilTextboxCloses Wait 0x0014 - _0807E930 0x0004 - _0807E878 - _0807E908 0x0001 + SetAnimation 0x0004 + EnablePlayerControl + SetAction 0x0001 script_08014330: EndBlock BeginBlock - _0807E564 + CheckPlayerMinish JumpIf script_08014330 EntityHasHeight JumpIf script_08014330 CheckPlayerInRegion 0x00c0, 0x0068, 0x1010 JumpIfNot script_08014330 EndBlock - _0807E864 + SetPlayerIdle SetLocalFlag 0x0054 Wait 0x005a - _0807E908 0x0004 + SetAction 0x0004 Call sub_080654EC Wait 0x001e - _0807E930 0x0001 + SetAnimation 0x0001 Wait 0x001e MessageNoOverlap 0x2c13 WaitUntilTextboxCloses Wait 0x0014 - _0807E930 0x0004 - _0807E908 0x0001 - _0807E878 + SetAnimation 0x0004 + SetAction 0x0001 + EnablePlayerControl script_08014382: SCRIPT_END diff --git a/data/scripts/hyruleTown/script_StockwellBuy.inc b/data/scripts/hyruleTown/script_StockwellBuy.inc index 66e1b75f..436ae4dd 100644 --- a/data/scripts/hyruleTown/script_StockwellBuy.inc +++ b/data/scripts/hyruleTown/script_StockwellBuy.inc @@ -1,7 +1,7 @@ @ Hyrule Town Stockwell do you want to buy? SCRIPT_START script_StockwellBuy EndBlock - _0807E864 + SetPlayerIdle WaitUntilTextboxCloses CheckTextboxResult JumpIfNot script_080143AC @@ -10,14 +10,14 @@ SCRIPT_START script_StockwellBuy JumpIfNot script_080143AC Wait 0x003c WaitUntilTextboxCloses - _0807EB8C + FaceAwayFromPlayer Wait 0x001e MessageNoOverlapVar script_080143AC: WaitUntilTextboxCloses Wait 0x001e - _0807E930 0x0004 - _0807E908 0x0001 - _0807E878 + SetAnimation 0x0004 + SetAction 0x0001 + EnablePlayerControl SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/hyruleTown/script_StockwellDogFood.inc b/data/scripts/hyruleTown/script_StockwellDogFood.inc index ea0f8908..90b56fc7 100644 --- a/data/scripts/hyruleTown/script_StockwellDogFood.inc +++ b/data/scripts/hyruleTown/script_StockwellDogFood.inc @@ -1,10 +1,10 @@ @ Stockwell pick up dog food SCRIPT_START script_StockwellDogFood EndBlock - _0807E864 + SetPlayerIdle Call sub_0807DF28 Call sub_080654FC - _0807E930 0x0001 + SetAnimation 0x0001 Call sub_080654EC Wait 0x003c MessageNoOverlap 0x2c16 @@ -27,16 +27,16 @@ script_080143FA: MessageNoOverlap 0x2c19 WaitUntilTextboxCloses SetIntVariable 0x00000303 - Call sub_0807F420 + Call LoadMenu .ifndef EU Wait 0x001e - _0807EB8C + FaceAwayFromPlayer MessageNoOverlap 0x2c22 WaitUntilTextboxCloses .endif script_0801443E: - _0807E930 0x0004 - _0807E908 0x0001 + SetAnimation 0x0004 + SetAction 0x0001 Call sub_0807DF50 - _0807E878 + EnablePlayerControl SCRIPT_END diff --git a/data/scripts/hyruleTown/script_Sturgeon.inc b/data/scripts/hyruleTown/script_Sturgeon.inc index 69be9796..db91eb49 100644 --- a/data/scripts/hyruleTown/script_Sturgeon.inc +++ b/data/scripts/hyruleTown/script_Sturgeon.inc @@ -4,16 +4,16 @@ SCRIPT_START script_Sturgeon Call sub_08064CC0 DoPostScriptAction 0x000a DoPostScriptAction 0x0007 - _0807EB44 0x0002 - _0807E930 0x0000 + SetAnimationState 0x0002 + SetAnimation 0x0000 EndBlock script_0800ED76: - _0807E944 - _0807E864 - _0807EB74 + TriggerInteract + SetPlayerIdle + FacePlayer Call sub_08064CD8 WaitUntilTextboxCloses Wait 0x000f - _0807E878 + EnablePlayerControl Jump script_0800ED76 .2byte 0x0000 diff --git a/data/scripts/hyruleTown/script_SturgeonAllBooksCollected.inc b/data/scripts/hyruleTown/script_SturgeonAllBooksCollected.inc index a0742182..ac3c3aab 100644 --- a/data/scripts/hyruleTown/script_SturgeonAllBooksCollected.inc +++ b/data/scripts/hyruleTown/script_SturgeonAllBooksCollected.inc @@ -3,8 +3,8 @@ SCRIPT_START script_SturgeonAllBooksCollected BeginBlock SetEntityPositionRelative 0x0068, 0x0018 DoPostScriptAction 0x000f - _0807EB44 0x0004 - _0807E930 0x0004 + SetAnimationState 0x0004 + SetAnimation 0x0004 SetEntitySpeed 0x0300 PlaySound SFX_STAIRS EndBlock @@ -16,34 +16,34 @@ SCRIPT_START script_SturgeonAllBooksCollected _0807EDD4 0x0068, 0x0078 Call sub_08064D10 Wait 0x000f - _0807EB44 0x0002 + SetAnimationState 0x0002 Wait 0x000f Call sub_08064D08 _0807EDD4 0x0098, 0x0078 Call sub_08064D10 Wait 0x000f - _0807EB44 0x0004 + SetAnimationState 0x0004 PlaySound SFX_PLY_LIFT Wait 0x000f - _0807EB44 0x0002 + SetAnimationState 0x0002 _0807EDD4 0x00ac, 0x0078 Wait 0x000f - _0807EB44 0x0004 + SetAnimationState 0x0004 PlaySound SFX_PLY_LIFT Wait 0x000f - _0807EB44 0x0002 + SetAnimationState 0x0002 _0807EDD4 0x00c0, 0x0078 Wait 0x000f - _0807EB44 0x0004 + SetAnimationState 0x0004 PlaySound SFX_PLY_LIFT Wait 0x000f - _0807EB44 0x0006 + SetAnimationState 0x0006 Wait 0x001e Call sub_08064D08 _0807EDD4 0x0068, 0x0078 Call sub_08064D10 Wait 0x000f - _0807EB44 0x0000 + SetAnimationState 0x0000 Wait 0x000f Call sub_08064D08 _0807EDD4 0x0068, 0x0018 diff --git a/data/scripts/hyruleTown/script_Teachers.inc b/data/scripts/hyruleTown/script_Teachers.inc index 5a9dfd9f..b7898239 100644 --- a/data/scripts/hyruleTown/script_Teachers.inc +++ b/data/scripts/hyruleTown/script_Teachers.inc @@ -3,16 +3,16 @@ SCRIPT_START script_Teachers BeginBlock Call sub_0806C674 DoPostScriptAction 0x000a - _0807EB44 0x0004 + SetAnimationState 0x0004 EndBlock script_0800E806: CheckEntityInteractType JumpIfNot script_0800E806 - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer Call sub_0806C70C WaitUntilTextboxCloses - _0807E878 - _0807EB44 0x0004 + EnablePlayerControl + SetAnimationState 0x0004 Jump script_0800E806 .2byte 0x0000 diff --git a/data/scripts/hyruleTown/script_TownMinish1.inc b/data/scripts/hyruleTown/script_TownMinish1.inc index 48a4ba7c..10db1da0 100644 --- a/data/scripts/hyruleTown/script_TownMinish1.inc +++ b/data/scripts/hyruleTown/script_TownMinish1.inc @@ -13,18 +13,18 @@ script_0800E6F4: Jump script_0800E6F4 script_0800E708: EndBlock - _0807E864 + SetPlayerIdle Call sub_0806AFE8 JumpIf script_0800E722 WaitUntilTextboxCloses Wait 0x000f - _0807E878 + EnablePlayerControl Jump script_0800E6F4 script_0800E722: WaitUntilTextboxCloses GivePlayerItem 0x0057 WaitPlayerGetItem WaitUntilTextboxCloses - _0807E878 + EnablePlayerControl Jump script_0800E6F4 .2byte 0x0000 diff --git a/data/scripts/hyruleTown/script_TownMinish2.inc b/data/scripts/hyruleTown/script_TownMinish2.inc index 14f1a7ea..30167de3 100644 --- a/data/scripts/hyruleTown/script_TownMinish2.inc +++ b/data/scripts/hyruleTown/script_TownMinish2.inc @@ -7,10 +7,10 @@ SCRIPT_START script_TownMinish2 script_0800E73E: CheckEntityInteractType JumpIfNot script_0800E73E - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer CallWithArg sub_0806AF60, 0x00000000 Call sub_0806AFE8 WaitUntilTextboxCloses - _0807E878 + EnablePlayerControl Jump script_0800E73E diff --git a/data/scripts/hyruleTown/script_TownMinish3.inc b/data/scripts/hyruleTown/script_TownMinish3.inc index 468a7163..072ace66 100644 --- a/data/scripts/hyruleTown/script_TownMinish3.inc +++ b/data/scripts/hyruleTown/script_TownMinish3.inc @@ -24,15 +24,15 @@ script_0800E788: Jump script_0800E788 script_0800E7A4: EndBlock - _0807E864 + SetPlayerIdle Call sub_0806AFE8 WaitUntilTextboxCloses Wait 0x000f - _0807E878 + EnablePlayerControl Jump script_0800E788 script_0800E7BA: DoPostScriptAction 0x000f - _0807EB44 0x0002 + SetAnimationState 0x0002 CallWithArg sub_0806AF60, 0x00000004 Call sub_0806AF70 _0807EE04 0x0188, 0x0058 diff --git a/data/scripts/hyruleTown/script_TownMinish4.inc b/data/scripts/hyruleTown/script_TownMinish4.inc index e28d7805..79c063e0 100644 --- a/data/scripts/hyruleTown/script_TownMinish4.inc +++ b/data/scripts/hyruleTown/script_TownMinish4.inc @@ -14,7 +14,7 @@ script_0800ED98: Jump script_0800ED98 script_0800EDB6: EndBlock - _0807E864 + SetPlayerIdle Call sub_0807DF28 CheckLocalFlag 0x00ae JumpIf script_0800EE3E @@ -29,16 +29,16 @@ script_0800EDB6: MessageFromTarget 0x4c09 WaitUntilTextboxCloses SetIntVariable 0x00000503 - Call sub_0807F420 + Call LoadMenu SetSyncFlag 0x00000040 Call sub_0807DF50 - _0807E878 + EnablePlayerControl SetLocalFlag 0x00ae Jump script_0800ED98 script_0800EE12: EndBlock WaitForSyncFlagAndClear 0x00000002 - _0807EB44 0x0002 + SetAnimationState 0x0002 CallWithArg sub_0806AF60, 0x00000008 WaitForSyncFlagAndClear 0x00000004 Call sub_0806AED8 @@ -48,5 +48,5 @@ script_0800EE3E: MessageFromTarget 0x4c16 WaitUntilTextboxCloses Call sub_0807DF50 - _0807E878 + EnablePlayerControl Jump script_0800ED98 diff --git a/data/scripts/hyruleTown/script_TownMinish5.inc b/data/scripts/hyruleTown/script_TownMinish5.inc index e389bbcc..b69a9b3b 100644 --- a/data/scripts/hyruleTown/script_TownMinish5.inc +++ b/data/scripts/hyruleTown/script_TownMinish5.inc @@ -14,7 +14,7 @@ script_0800EE58: Jump script_0800EE58 script_0800EE76: EndBlock - _0807E864 + SetPlayerIdle Call sub_0807DF28 CheckLocalFlag 0x00ae JumpIf script_0800EEFE @@ -29,16 +29,16 @@ script_0800EE76: MessageFromTarget 0x4c09 WaitUntilTextboxCloses SetIntVariable 0x00000503 - Call sub_0807F420 + Call LoadMenu SetSyncFlag 0x00000008 Call sub_0807DF50 - _0807E878 + EnablePlayerControl SetLocalFlag 0x00ae Jump script_0800EE58 script_0800EED2: EndBlock WaitForSyncFlagAndClear 0x00000010 - _0807EB44 0x0006 + SetAnimationState 0x0006 CallWithArg sub_0806AF60, 0x00000008 WaitForSyncFlagAndClear 0x00000020 Call sub_0806AED8 @@ -48,7 +48,7 @@ script_0800EEFE: MessageFromTarget 0x4c15 WaitUntilTextboxCloses Call sub_0807DF50 - _0807E878 + EnablePlayerControl Jump script_0800EE58 MessageFromTarget 0x4c07 WaitUntilTextboxCloses diff --git a/data/scripts/hyruleTown/script_TownMinish6.inc b/data/scripts/hyruleTown/script_TownMinish6.inc index 40da66be..c02ceb81 100644 --- a/data/scripts/hyruleTown/script_TownMinish6.inc +++ b/data/scripts/hyruleTown/script_TownMinish6.inc @@ -9,30 +9,30 @@ SCRIPT_START script_TownMinish6 EndBlock Jump script_0800EFFE script_0800EFDA: - _0807EB44 0x0006 + SetAnimationState 0x0006 CallWithArg sub_0806AF60, 0x00000008 Wait 0x0004 - _0807EB44 0x0004 + SetAnimationState 0x0004 CallWithArg sub_0806AF60, 0x00000008 Wait 0x0004 script_0800EFFE: - _0807EB44 0x0002 + SetAnimationState 0x0002 CallWithArg sub_0806AF60, 0x00000008 Wait 0x0004 - _0807EB44 0x0002 + SetAnimationState 0x0002 CallWithArg sub_0806AF60, 0x00000004 _0807EDD4 0x0088, 0x0040 DoPostScriptAction 0x000a - _0807EB44 0x0002 + SetAnimationState 0x0002 CallWithArg sub_0806AF60, 0x00000008 Wait 0x0004 - _0807EB44 0x0004 + SetAnimationState 0x0004 CallWithArg sub_0806AF60, 0x00000008 Wait 0x0004 - _0807EB44 0x0006 + SetAnimationState 0x0006 CallWithArg sub_0806AF60, 0x00000008 Wait 0x0004 - _0807EB44 0x0006 + SetAnimationState 0x0006 CallWithArg sub_0806AF60, 0x00000004 _0807EDD4 0x0068, 0x0040 DoPostScriptAction 0x000a diff --git a/data/scripts/hyruleTown/script_Townsperson1.inc b/data/scripts/hyruleTown/script_Townsperson1.inc index a3e3fa02..259d47b4 100644 --- a/data/scripts/hyruleTown/script_Townsperson1.inc +++ b/data/scripts/hyruleTown/script_Townsperson1.inc @@ -8,11 +8,11 @@ SCRIPT_START script_Townsperson1 script_080100DC: CheckEntityInteractType JumpIfNot script_080100DC - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer Call sub_08061FE4 Call sub_08062048 WaitUntilTextboxCloses - _0807E878 + EnablePlayerControl Jump script_080100DC .2byte 0x0000 diff --git a/data/scripts/hyruleTown/script_TownspersonInDogHouse.inc b/data/scripts/hyruleTown/script_TownspersonInDogHouse.inc index b9db7e3c..7be84de5 100644 --- a/data/scripts/hyruleTown/script_TownspersonInDogHouse.inc +++ b/data/scripts/hyruleTown/script_TownspersonInDogHouse.inc @@ -3,17 +3,17 @@ SCRIPT_START script_TownspersonInDogHouse BeginBlock Call sub_08061E70 DoPostScriptAction 0x000a - _0807EB44 0x0004 + SetAnimationState 0x0004 Call sub_08061FD8 EndBlock script_0800EB44: CheckEntityInteractType JumpIfNot script_0800EB44 - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer Call sub_08061FD8 Call sub_08062048 WaitUntilTextboxCloses - _0807E878 + EnablePlayerControl Jump script_0800EB44 .2byte 0x0000 diff --git a/data/scripts/hyruleTown/script_Wheaton.inc b/data/scripts/hyruleTown/script_Wheaton.inc index 277fcf4d..0eb0c98d 100644 --- a/data/scripts/hyruleTown/script_Wheaton.inc +++ b/data/scripts/hyruleTown/script_Wheaton.inc @@ -3,19 +3,19 @@ SCRIPT_START script_Wheaton BeginBlock _0807E9D4 DoPostScriptAction 0x000a - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 EndBlock script_08010686: CheckEntityInteractType JumpIfNot script_08010686 - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer HasRoomItemForSale - Call sub_0807F77C + Call GetConditionSet MessageFromTargetTable 0x3c08, 0x3c09 WaitUntilTextboxCloses - _0807E878 - _0807EB44 0x0004 + EnablePlayerControl + SetAnimationState 0x0004 Jump script_08010686 .2byte 0x0000 diff --git a/data/scripts/hyruleTown/script_WindTribespeopleVisitor.inc b/data/scripts/hyruleTown/script_WindTribespeopleVisitor.inc index c9cc110b..ce39d48f 100644 --- a/data/scripts/hyruleTown/script_WindTribespeopleVisitor.inc +++ b/data/scripts/hyruleTown/script_WindTribespeopleVisitor.inc @@ -3,17 +3,17 @@ SCRIPT_START script_WindTribespeopleVisitor BeginBlock Call sub_0806C870 DoPostScriptAction 0x000a - _0807EB44 0x0004 - _0807E930 0x0000 + SetAnimationState 0x0004 + SetAnimation 0x0000 EndBlock script_0800EB0E: - _0807E30C + FacePlayerAndCheckDist JumpIfNot script_0800EB0E - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer Call sub_0806C90C WaitUntilTextboxCloses Wait 0x000f - _0807E878 + EnablePlayerControl Jump script_0800EB0E .2byte 0x0000 diff --git a/data/scripts/kinstoneFusion/script_BombMinishKinstone.inc b/data/scripts/kinstoneFusion/script_BombMinishKinstone.inc index b72d6684..1094d83a 100644 --- a/data/scripts/kinstoneFusion/script_BombMinishKinstone.inc +++ b/data/scripts/kinstoneFusion/script_BombMinishKinstone.inc @@ -1,9 +1,9 @@ @ Bomb Forest Minish during Kinstone cutscene SCRIPT_START script_BombMinishKinstone BeginBlock - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 - Call sub_0807F348 + Call SetPriorityMessage EndBlock script_0800BB42: CheckRoomFlag 0x00ff diff --git a/data/scripts/kinstoneFusion/script_CarlovKinstone.inc b/data/scripts/kinstoneFusion/script_CarlovKinstone.inc index 93101d5e..a808530c 100644 --- a/data/scripts/kinstoneFusion/script_CarlovKinstone.inc +++ b/data/scripts/kinstoneFusion/script_CarlovKinstone.inc @@ -1,7 +1,7 @@ @ Kinstone Cutscene for Carlov SCRIPT_START script_CarlovKinstone BeginBlock - _0807E930 0x0000 + SetAnimation 0x0000 EndBlock script_0800BBE4: CheckRoomFlag 0x00ff diff --git a/data/scripts/kinstoneFusion/script_GhostBrotherKinstone.inc b/data/scripts/kinstoneFusion/script_GhostBrotherKinstone.inc index ffa2b0be..edff4065 100644 --- a/data/scripts/kinstoneFusion/script_GhostBrotherKinstone.inc +++ b/data/scripts/kinstoneFusion/script_GhostBrotherKinstone.inc @@ -2,7 +2,7 @@ SCRIPT_START script_GhostBrotherKinstone BeginBlock DoPostScriptAction 0x0007 - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 EndBlock script_0800BC18: @@ -13,8 +13,8 @@ script_0800BC18: MessageNoOverlap 0x0e07 WaitUntilTextboxCloses BeginBlock - _0807EB44 0x0000 - _0807E930 0x0004 + SetAnimationState 0x0000 + SetAnimation 0x0004 EndBlock Wait 0x003c Call sub_08065CCC diff --git a/data/scripts/kinstoneFusion/script_GormanFirstAppearance.inc b/data/scripts/kinstoneFusion/script_GormanFirstAppearance.inc index ea1e2150..091c269b 100644 --- a/data/scripts/kinstoneFusion/script_GormanFirstAppearance.inc +++ b/data/scripts/kinstoneFusion/script_GormanFirstAppearance.inc @@ -1,10 +1,10 @@ @ Hyrule Town Gorman during Kinstone cutscene for first empty house SCRIPT_START script_GormanFirstAppearance BeginBlock - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 SetEntitySpeed 0x0040 - Call sub_0807F348 + Call SetPriorityMessage EndBlock script_0800BA8E: CheckRoomFlag 0x00ff @@ -13,7 +13,7 @@ script_0800BA8E: Wait 0x001e DoPostScriptAction 0x0004 Wait 0x003c - _0807EB44 0x0006 + SetAnimationState 0x0006 Wait 0x001e _0807EDD4 0x02f0, 0x0350 Wait 0x001e diff --git a/data/scripts/kinstoneFusion/script_Goron1Kinstone2.inc b/data/scripts/kinstoneFusion/script_Goron1Kinstone2.inc index 2262d29c..19b4002a 100644 --- a/data/scripts/kinstoneFusion/script_Goron1Kinstone2.inc +++ b/data/scripts/kinstoneFusion/script_Goron1Kinstone2.inc @@ -1,17 +1,17 @@ @ 1st Goron during Kinstone cutscene for 2nd Goron SCRIPT_START script_Goron1Kinstone2 BeginBlock - _0807EB44 0x0004 - _0807E930 0x0008 - Call sub_0807F348 + SetAnimationState 0x0004 + SetAnimation 0x0008 + Call SetPriorityMessage EndBlock WaitForFadeFinish Wait 0x00f0 - _0807E930 0x0000 + SetAnimation 0x0000 Wait 0x003c MessageNoOverlap 0x0e0a WaitUntilTextboxCloses - _0807E930 0x0008 + SetAnimation 0x0008 Wait 0x003c SetSyncFlag 0x00000001 script_0800BD1C: @@ -19,7 +19,7 @@ script_0800BD1C: JumpIfNot script_0800BD1C SetSyncFlag 0x00000002 WaitForSyncFlagAndClear 0x00000004 - _0807E930 0x0000 + SetAnimation 0x0000 DoPostScriptAction 0x0004 Wait 0x003c MessageNoOverlap 0x0e0c @@ -27,11 +27,11 @@ script_0800BD1C: SetSyncFlag 0x00000002 WaitForSyncFlagAndClear 0x00000004 DoPostScriptAction 0x000f - _0807E930 0x0008 + SetAnimation 0x0008 Wait 0x0168 - _0807E930 0x0000 + SetAnimation 0x0000 Wait 0x003c - _0807EB44 0x0002 + SetAnimationState 0x0002 WaitForSyncFlagAndClear 0x00000004 SetEntitySpeed 0x0080 _0807EEF4 0x0000, 0xffe0 diff --git a/data/scripts/kinstoneFusion/script_Goron1Kinstone3.inc b/data/scripts/kinstoneFusion/script_Goron1Kinstone3.inc index 145f5a99..743de7f4 100644 --- a/data/scripts/kinstoneFusion/script_Goron1Kinstone3.inc +++ b/data/scripts/kinstoneFusion/script_Goron1Kinstone3.inc @@ -1,18 +1,18 @@ @ 1st Goron during 3rd Goron Kinstone cutscene SCRIPT_START script_Goron1Kinstone3 BeginBlock - _0807EB44 0x0004 - _0807E930 0x0008 - Call sub_0807F348 + SetAnimationState 0x0004 + SetAnimation 0x0008 + Call SetPriorityMessage EndBlock WaitForFadeFinish Wait 0x00f0 - _0807E930 0x0000 - _0807EB44 0x0002 + SetAnimation 0x0000 + SetAnimationState 0x0002 Wait 0x003c MessageNoOverlap 0x0e0d WaitUntilTextboxCloses - _0807E930 0x0008 + SetAnimation 0x0008 Wait 0x003c Jump script_0800BE88 .2byte 0x0000 diff --git a/data/scripts/kinstoneFusion/script_Goron1Kinstone4.inc b/data/scripts/kinstoneFusion/script_Goron1Kinstone4.inc index 0756ea9e..08f4eb7f 100644 --- a/data/scripts/kinstoneFusion/script_Goron1Kinstone4.inc +++ b/data/scripts/kinstoneFusion/script_Goron1Kinstone4.inc @@ -1,18 +1,18 @@ @ 1st Goron during 4th Goron cutscene SCRIPT_START script_Goron1Kinstone4 BeginBlock - _0807EB44 0x0004 - _0807E930 0x0008 - Call sub_0807F348 + SetAnimationState 0x0004 + SetAnimation 0x0008 + Call SetPriorityMessage EndBlock WaitForFadeFinish Wait 0x00f0 - _0807E930 0x0000 - _0807EB44 0x0002 + SetAnimation 0x0000 + SetAnimationState 0x0002 Wait 0x003c MessageNoOverlap 0x0e10 WaitUntilTextboxCloses - _0807E930 0x0008 + SetAnimation 0x0008 Wait 0x003c Jump script_0800BFA4 .2byte 0x0000 diff --git a/data/scripts/kinstoneFusion/script_Goron1Kinstone5.inc b/data/scripts/kinstoneFusion/script_Goron1Kinstone5.inc index d1561411..9fbadfcc 100644 --- a/data/scripts/kinstoneFusion/script_Goron1Kinstone5.inc +++ b/data/scripts/kinstoneFusion/script_Goron1Kinstone5.inc @@ -1,18 +1,18 @@ @ 1st Goron during 5th Goron cutscene SCRIPT_START script_Goron1Kinstone5 BeginBlock - _0807EB44 0x0004 - _0807E930 0x0008 - Call sub_0807F348 + SetAnimationState 0x0004 + SetAnimation 0x0008 + Call SetPriorityMessage EndBlock WaitForFadeFinish Wait 0x00f0 - _0807E930 0x0000 - _0807EB44 0x0002 + SetAnimation 0x0000 + SetAnimationState 0x0002 Wait 0x003c MessageNoOverlap 0x0e13 WaitUntilTextboxCloses - _0807E930 0x0008 + SetAnimation 0x0008 Wait 0x003c Jump script_0800C11C .2byte 0x0000 diff --git a/data/scripts/kinstoneFusion/script_Goron1Kinstone6.inc b/data/scripts/kinstoneFusion/script_Goron1Kinstone6.inc index 6d2ee65f..ef803f64 100644 --- a/data/scripts/kinstoneFusion/script_Goron1Kinstone6.inc +++ b/data/scripts/kinstoneFusion/script_Goron1Kinstone6.inc @@ -1,18 +1,18 @@ @ 1st Goron in 6th Goron cutscene SCRIPT_START script_Goron1Kinstone6 BeginBlock - _0807EB44 0x0004 - _0807E930 0x0008 - Call sub_0807F348 + SetAnimationState 0x0004 + SetAnimation 0x0008 + Call SetPriorityMessage EndBlock WaitForFadeFinish Wait 0x00f0 - _0807E930 0x0000 - _0807EB44 0x0002 + SetAnimation 0x0000 + SetAnimationState 0x0002 Wait 0x003c MessageNoOverlap 0x0e16 WaitUntilTextboxCloses - _0807E930 0x0008 + SetAnimation 0x0008 Wait 0x003c Jump script_0800C244 .2byte 0x0000 diff --git a/data/scripts/kinstoneFusion/script_Goron2Kinstone2.inc b/data/scripts/kinstoneFusion/script_Goron2Kinstone2.inc index 5aeac45c..4d2762d7 100644 --- a/data/scripts/kinstoneFusion/script_Goron2Kinstone2.inc +++ b/data/scripts/kinstoneFusion/script_Goron2Kinstone2.inc @@ -1,11 +1,11 @@ @ 2nd Goron during Kinstone cutscene for 2nd Goron SCRIPT_START script_Goron2Kinstone2 BeginBlock - _0807EB44 0x0000 - _0807E930 0x0000 + SetAnimationState 0x0000 + SetAnimation 0x0000 DoPostScriptAction 0x0008 SetEntitySpeed 0x0080 - Call sub_0807F348 + Call SetPriorityMessage EndBlock WaitForSyncFlagAndClear 0x00000002 DoPostScriptAction 0x0007 @@ -20,15 +20,15 @@ SCRIPT_START script_Goron2Kinstone2 Wait 0x000f SetSyncFlag 0x00000004 DoPostScriptAction 0x000f - _0807E930 0x0008 + SetAnimation 0x0008 Wait 0x00b4 CallWithArg sub_0804BF38, 0x00000000 Wait 0x00b4 CallWithArg sub_0804BF38, 0x00000003 - _0807EB44 0x0004 - _0807E930 0x0000 + SetAnimationState 0x0004 + SetAnimation 0x0000 Wait 0x003c - _0807EB44 0x0006 + SetAnimationState 0x0006 SetSyncFlag 0x00000004 SetEntitySpeed 0x0080 _0807EEF4 0x0000, 0xffe0 diff --git a/data/scripts/kinstoneFusion/script_Goron2Kinstone3.inc b/data/scripts/kinstoneFusion/script_Goron2Kinstone3.inc index 99a41fc4..c78e43ba 100644 --- a/data/scripts/kinstoneFusion/script_Goron2Kinstone3.inc +++ b/data/scripts/kinstoneFusion/script_Goron2Kinstone3.inc @@ -1,27 +1,27 @@ @ 2nd Goron during 3rd Goron cutscene SCRIPT_START script_Goron2Kinstone3 BeginBlock - _0807EB44 0x0004 - _0807E930 0x0008 - Call sub_0807F348 + SetAnimationState 0x0004 + SetAnimation 0x0008 + Call SetPriorityMessage EndBlock WaitForFadeFinish Wait 0x00f0 - _0807E930 0x0000 - _0807EB44 0x0006 + SetAnimation 0x0000 + SetAnimationState 0x0006 Wait 0x003c WaitUntilTextboxCloses - _0807E930 0x0008 + SetAnimation 0x0008 Wait 0x003c SetSyncFlag 0x00000001 script_0800BE88: - _0807EB44 0x0004 + SetAnimationState 0x0004 script_0800BE8C: CheckRoomFlag 0x00ff JumpIfNot script_0800BE8C SetSyncFlag 0x00000002 Call sub_08054F64 - _0807E930 0x0000 + SetAnimation 0x0000 DoPostScriptAction 0x0004 Wait 0x003c MessageNoOverlap 0x0e0f @@ -29,6 +29,6 @@ script_0800BE8C: SetSyncFlag 0x00000002 Call sub_08054F64 DoPostScriptAction 0x000f - _0807E930 0x0008 + SetAnimation 0x0008 Wait 0x00f0 SCRIPT_END diff --git a/data/scripts/kinstoneFusion/script_Goron2Kinstone4.inc b/data/scripts/kinstoneFusion/script_Goron2Kinstone4.inc index c8305e1f..6809441e 100644 --- a/data/scripts/kinstoneFusion/script_Goron2Kinstone4.inc +++ b/data/scripts/kinstoneFusion/script_Goron2Kinstone4.inc @@ -1,27 +1,27 @@ @ 2nd and 3rd Goron during 4th Goron cutscene SCRIPT_START script_Goron2Kinstone4 BeginBlock - _0807EB44 0x0004 - _0807E930 0x0008 - Call sub_0807F348 + SetAnimationState 0x0004 + SetAnimation 0x0008 + Call SetPriorityMessage EndBlock WaitForFadeFinish Wait 0x00f0 - _0807E930 0x0000 - _0807EB44 0x0006 + SetAnimation 0x0000 + SetAnimationState 0x0006 Wait 0x003c WaitUntilTextboxCloses - _0807E930 0x0008 + SetAnimation 0x0008 Wait 0x003c SetSyncFlag 0x00000001 script_0800BFA4: - _0807EB44 0x0004 + SetAnimationState 0x0004 script_0800BFA8: CheckRoomFlag 0x00ff JumpIfNot script_0800BFA8 SetSyncFlag 0x00000002 Call sub_08054F64 - _0807E930 0x0000 + SetAnimation 0x0000 DoPostScriptAction 0x0004 Wait 0x003c MessageNoOverlap 0x0e12 @@ -29,10 +29,10 @@ script_0800BFA8: SetSyncFlag 0x00000002 Call sub_08054F64 DoPostScriptAction 0x000f - _0807E930 0x0008 + SetAnimation 0x0008 Wait 0x0168 - _0807EB44 0x0004 - _0807E930 0x0000 + SetAnimationState 0x0004 + SetAnimation 0x0000 Wait 0x003c Call sub_08054F64 SetEntitySpeed 0x0080 diff --git a/data/scripts/kinstoneFusion/script_Goron2Kinstone5.inc b/data/scripts/kinstoneFusion/script_Goron2Kinstone5.inc index c82afd3a..829f8f8c 100644 --- a/data/scripts/kinstoneFusion/script_Goron2Kinstone5.inc +++ b/data/scripts/kinstoneFusion/script_Goron2Kinstone5.inc @@ -1,27 +1,27 @@ @ 2nd, 3rd and 4th Goron during 5th Goron cutscene SCRIPT_START script_Goron2Kinstone5 BeginBlock - _0807EB44 0x0004 - _0807E930 0x0008 - Call sub_0807F348 + SetAnimationState 0x0004 + SetAnimation 0x0008 + Call SetPriorityMessage EndBlock WaitForFadeFinish Wait 0x00f0 - _0807E930 0x0000 - _0807EB44 0x0006 + SetAnimation 0x0000 + SetAnimationState 0x0006 Wait 0x003c WaitUntilTextboxCloses - _0807E930 0x0008 + SetAnimation 0x0008 Wait 0x003c SetSyncFlag 0x00000001 script_0800C11C: - _0807EB44 0x0004 + SetAnimationState 0x0004 script_0800C120: CheckRoomFlag 0x00ff JumpIfNot script_0800C120 SetSyncFlag 0x00000002 Call sub_08054F64 - _0807E930 0x0000 + SetAnimation 0x0000 DoPostScriptAction 0x0004 Wait 0x003c MessageNoOverlap 0x0e15 @@ -29,6 +29,6 @@ script_0800C120: SetSyncFlag 0x00000002 Call sub_08054F64 DoPostScriptAction 0x000f - _0807E930 0x0008 + SetAnimation 0x0008 Wait 0x00f0 SCRIPT_END diff --git a/data/scripts/kinstoneFusion/script_Goron2Kinstone6.inc b/data/scripts/kinstoneFusion/script_Goron2Kinstone6.inc index 87a5b960..88e1cb91 100644 --- a/data/scripts/kinstoneFusion/script_Goron2Kinstone6.inc +++ b/data/scripts/kinstoneFusion/script_Goron2Kinstone6.inc @@ -1,27 +1,27 @@ @ 2nd to 5th Goron in 6th Goron cutscene SCRIPT_START script_Goron2Kinstone6 BeginBlock - _0807EB44 0x0004 - _0807E930 0x0008 - Call sub_0807F348 + SetAnimationState 0x0004 + SetAnimation 0x0008 + Call SetPriorityMessage EndBlock WaitForFadeFinish Wait 0x00f0 - _0807E930 0x0000 - _0807EB44 0x0006 + SetAnimation 0x0000 + SetAnimationState 0x0006 Wait 0x003c WaitUntilTextboxCloses - _0807E930 0x0008 + SetAnimation 0x0008 Wait 0x003c SetSyncFlag 0x00000001 script_0800C244: - _0807EB44 0x0004 + SetAnimationState 0x0004 script_0800C248: CheckRoomFlag 0x00ff JumpIfNot script_0800C248 SetSyncFlag 0x00000002 Call sub_08054F64 - _0807E930 0x0000 + SetAnimation 0x0000 DoPostScriptAction 0x0004 Wait 0x003c MessageNoOverlap 0x0e18 @@ -29,10 +29,10 @@ script_0800C248: SetSyncFlag 0x00000002 Call sub_08054F64 DoPostScriptAction 0x000f - _0807E930 0x0008 + SetAnimation 0x0008 Wait 0x0168 - _0807EB44 0x0004 - _0807E930 0x0000 + SetAnimationState 0x0004 + SetAnimation 0x0000 Wait 0x003c Call sub_08054F64 SetEntitySpeed 0x0080 diff --git a/data/scripts/kinstoneFusion/script_Goron3Kinstone3.inc b/data/scripts/kinstoneFusion/script_Goron3Kinstone3.inc index fc4e637f..14b13031 100644 --- a/data/scripts/kinstoneFusion/script_Goron3Kinstone3.inc +++ b/data/scripts/kinstoneFusion/script_Goron3Kinstone3.inc @@ -1,11 +1,11 @@ @ 3rd Goron during 3rd Goron cutscene SCRIPT_START script_Goron3Kinstone3 BeginBlock - _0807EB44 0x0000 - _0807E930 0x0000 + SetAnimationState 0x0000 + SetAnimation 0x0000 DoPostScriptAction 0x0008 SetEntitySpeed 0x0080 - Call sub_0807F348 + Call SetPriorityMessage EndBlock WaitForSyncFlagAndClear 0x00000002 DoPostScriptAction 0x0007 @@ -20,7 +20,7 @@ SCRIPT_START script_Goron3Kinstone3 Wait 0x000f SetSyncFlag 0x0000000c DoPostScriptAction 0x000f - _0807E930 0x0008 + SetAnimation 0x0008 Wait 0x00f0 Call sub_08054968 SCRIPT_END diff --git a/data/scripts/kinstoneFusion/script_Goron4Kinstone4.inc b/data/scripts/kinstoneFusion/script_Goron4Kinstone4.inc index 9d81f728..940147da 100644 --- a/data/scripts/kinstoneFusion/script_Goron4Kinstone4.inc +++ b/data/scripts/kinstoneFusion/script_Goron4Kinstone4.inc @@ -1,11 +1,11 @@ @ 4th Goron during 4th Goron cutscene SCRIPT_START script_Goron4Kinstone4 BeginBlock - _0807EB44 0x0000 - _0807E930 0x0000 + SetAnimationState 0x0000 + SetAnimation 0x0000 DoPostScriptAction 0x0008 SetEntitySpeed 0x0080 - Call sub_0807F348 + Call SetPriorityMessage EndBlock WaitForSyncFlagAndClear 0x00000002 DoPostScriptAction 0x0007 @@ -22,13 +22,13 @@ SCRIPT_START script_Goron4Kinstone4 Wait 0x000f SetSyncFlag 0x0000001c DoPostScriptAction 0x000f - _0807E930 0x0008 + SetAnimation 0x0008 Wait 0x00b4 CallWithArg sub_0804BF38, 0x00000001 Wait 0x00b4 CallWithArg sub_0804BF38, 0x00000004 - _0807EB44 0x0004 - _0807E930 0x0000 + SetAnimationState 0x0004 + SetAnimation 0x0000 Wait 0x003c SetSyncFlag 0x0000001c SetEntitySpeed 0x0080 diff --git a/data/scripts/kinstoneFusion/script_Goron5Kinstone5.inc b/data/scripts/kinstoneFusion/script_Goron5Kinstone5.inc index 7f86fcd3..2a561509 100644 --- a/data/scripts/kinstoneFusion/script_Goron5Kinstone5.inc +++ b/data/scripts/kinstoneFusion/script_Goron5Kinstone5.inc @@ -1,11 +1,11 @@ @ 5th Goron during 5th Goron cutscene SCRIPT_START script_Goron5Kinstone5 BeginBlock - _0807EB44 0x0000 - _0807E930 0x0000 + SetAnimationState 0x0000 + SetAnimation 0x0000 DoPostScriptAction 0x0008 SetEntitySpeed 0x0080 - Call sub_0807F348 + Call SetPriorityMessage EndBlock WaitForSyncFlagAndClear 0x00000002 DoPostScriptAction 0x0007 @@ -22,7 +22,7 @@ SCRIPT_START script_Goron5Kinstone5 Wait 0x000f SetSyncFlag 0x0000003c DoPostScriptAction 0x000f - _0807E930 0x0008 + SetAnimation 0x0008 Wait 0x00f0 Call sub_08054968 SCRIPT_END diff --git a/data/scripts/kinstoneFusion/script_Goron6Kindstone6.inc b/data/scripts/kinstoneFusion/script_Goron6Kindstone6.inc index 54967407..db5c8677 100644 --- a/data/scripts/kinstoneFusion/script_Goron6Kindstone6.inc +++ b/data/scripts/kinstoneFusion/script_Goron6Kindstone6.inc @@ -1,11 +1,11 @@ @ 6th Goron in 6th Goron cutscene SCRIPT_START script_Goron6Kindstone6 BeginBlock - _0807EB44 0x0000 - _0807E930 0x0000 + SetAnimationState 0x0000 + SetAnimation 0x0000 DoPostScriptAction 0x0008 SetEntitySpeed 0x0080 - Call sub_0807F348 + Call SetPriorityMessage EndBlock WaitForSyncFlagAndClear 0x00000002 DoPostScriptAction 0x0007 @@ -22,13 +22,13 @@ SCRIPT_START script_Goron6Kindstone6 Wait 0x000f SetSyncFlag 0x0000007c DoPostScriptAction 0x000f - _0807E930 0x0008 + SetAnimation 0x0008 Wait 0x00b4 CallWithArg sub_0804BF38, 0x00000002 Wait 0x00b4 CallWithArg sub_0804BF38, 0x00000005 - _0807EB44 0x0004 - _0807E930 0x0000 + SetAnimationState 0x0004 + SetAnimation 0x0000 Wait 0x003c SetSyncFlag 0x0000007c SetEntitySpeed 0x0080 diff --git a/data/scripts/kinstoneFusion/script_GoronKinstone.inc b/data/scripts/kinstoneFusion/script_GoronKinstone.inc index 3c4e7716..88fd97d3 100644 --- a/data/scripts/kinstoneFusion/script_GoronKinstone.inc +++ b/data/scripts/kinstoneFusion/script_GoronKinstone.inc @@ -1,25 +1,25 @@ @ Goron in fusing kinstone cutscene SCRIPT_START script_GoronKinstone BeginBlock - _0807EB44 0x0004 - _0807E930 0x0008 + SetAnimationState 0x0004 + SetAnimation 0x0008 Call sub_08054EB8 EndBlock script_0800BC62: CheckRoomFlag 0x00ff JumpIfNot script_0800BC62 - _0807E930 0x0000 + SetAnimation 0x0000 Wait 0x001e DoPostScriptAction 0x0004 Wait 0x003c MessageNoOverlap 0x0e08 WaitUntilTextboxCloses DoPostScriptAction 0x000f - _0807E930 0x0008 + SetAnimation 0x0008 Wait 0x00f0 Call sub_08054EFC - _0807EB44 0x0000 - _0807E930 0x0000 + SetAnimationState 0x0000 + SetAnimation 0x0000 SetEntitySpeed 0x0040 DoPostScriptAction 0x000d CallWithArg sub_0807F4F8, 0x00000378 @@ -28,7 +28,7 @@ script_0800BC62: Wait 0x003c MessageNoOverlap 0x0e09 WaitUntilTextboxCloses - Call sub_0807F158 + Call SetCollisionLayer1 CallWithArg sub_0807F4F8, 0x0000035c Wait 0x001e PlaySound SFX_STAIRS_DESCEND diff --git a/data/scripts/kinstoneFusion/script_GoronMerchantArriving.inc b/data/scripts/kinstoneFusion/script_GoronMerchantArriving.inc index 7787515f..2e4588c5 100644 --- a/data/scripts/kinstoneFusion/script_GoronMerchantArriving.inc +++ b/data/scripts/kinstoneFusion/script_GoronMerchantArriving.inc @@ -1,10 +1,10 @@ @ Goron Merchant in arriving Kinstone cutscene SCRIPT_START script_GoronMerchantArriving BeginBlock - _0807EB44 0x0006 + SetAnimationState 0x0006 DoPostScriptAction 0x0000 SetEntitySpeed 0x0040 - Call sub_0807F348 + Call SetPriorityMessage EndBlock script_0800BB7A: CheckRoomFlag 0x00ff diff --git a/data/scripts/kinstoneFusion/script_MutohKinstone.inc b/data/scripts/kinstoneFusion/script_MutohKinstone.inc index ecc3f65b..c6a48c7f 100644 --- a/data/scripts/kinstoneFusion/script_MutohKinstone.inc +++ b/data/scripts/kinstoneFusion/script_MutohKinstone.inc @@ -1,9 +1,9 @@ @ Hyrule Town Mutoh in Kinstone cutscene SCRIPT_START script_MutohKinstone BeginBlock - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 - Call sub_0807F348 + Call SetPriorityMessage EndBlock script_0800BADE: CheckRoomFlag 0x00ff diff --git a/data/scripts/kinstoneFusion/script_ObjectB3KinstoneSpark.inc b/data/scripts/kinstoneFusion/script_ObjectB3KinstoneSpark.inc index bc194636..a227cebc 100644 --- a/data/scripts/kinstoneFusion/script_ObjectB3KinstoneSpark.inc +++ b/data/scripts/kinstoneFusion/script_ObjectB3KinstoneSpark.inc @@ -2,7 +2,7 @@ SCRIPT_START script_ObjectB3KinstoneSpark BeginBlock SetEntitySpeed 0x0180 - _0807E930 0x0004 + SetAnimation 0x0004 Call sub_080A0B28 EndBlock Wait 0x000a @@ -13,7 +13,7 @@ script_0800C47A: JumpIfNot script_0800C47A Wait 0x003c SetRoomFlag 0x00ff - _0807E930 0x0005 + SetAnimation 0x0005 Wait 0x000f SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/kinstoneFusion/script_ObjectB3KinstoneSparkFromBottom.inc b/data/scripts/kinstoneFusion/script_ObjectB3KinstoneSparkFromBottom.inc index 6b6cfe46..44d5e43f 100644 --- a/data/scripts/kinstoneFusion/script_ObjectB3KinstoneSparkFromBottom.inc +++ b/data/scripts/kinstoneFusion/script_ObjectB3KinstoneSparkFromBottom.inc @@ -2,7 +2,7 @@ SCRIPT_START script_ObjectB3KinstoneSparkFromBottom BeginBlock SetEntitySpeed 0x0120 - _0807E930 0x0004 + SetAnimation 0x0004 EndBlock Wait 0x000a DoPostScriptAction 0x0007 @@ -12,7 +12,7 @@ SCRIPT_START script_ObjectB3KinstoneSparkFromBottom _0807EEF4 0x0000, 0xffb0 Wait 0x003c SetRoomFlag 0x00ff - _0807E930 0x0005 + SetAnimation 0x0005 Wait 0x000f SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/kinstoneFusion/script_ObjectB3KinstoneSparkGoron.inc b/data/scripts/kinstoneFusion/script_ObjectB3KinstoneSparkGoron.inc index e6bb438f..e77f34d3 100644 --- a/data/scripts/kinstoneFusion/script_ObjectB3KinstoneSparkGoron.inc +++ b/data/scripts/kinstoneFusion/script_ObjectB3KinstoneSparkGoron.inc @@ -3,7 +3,7 @@ SCRIPT_START script_ObjectB3KinstoneSparkGoron BeginBlock SetEntitySpeed 0x0100 - _0807E930 0x0004 + SetAnimation 0x0004 DoPostScriptAction 0x0008 EndBlock WaitForSyncFlagAndClear 0x00000001 @@ -15,6 +15,6 @@ SCRIPT_START script_ObjectB3KinstoneSparkGoron _0807EEF4 0x0000, 0x0060 Wait 0x001e SetRoomFlag 0x00ff - _0807E930 0x0005 + SetAnimation 0x0005 Wait 0x000f SCRIPT_END diff --git a/data/scripts/kinstoneFusion/script_ObjectB3KinstoneSparkGoronMerchang.inc b/data/scripts/kinstoneFusion/script_ObjectB3KinstoneSparkGoronMerchang.inc index 24ef7101..3a35b424 100644 --- a/data/scripts/kinstoneFusion/script_ObjectB3KinstoneSparkGoronMerchang.inc +++ b/data/scripts/kinstoneFusion/script_ObjectB3KinstoneSparkGoronMerchang.inc @@ -3,7 +3,7 @@ SCRIPT_START script_ObjectB3KinstoneSparkGoronMerchang BeginBlock SetEntitySpeed 0x0180 - _0807E930 0x0004 + SetAnimation 0x0004 EndBlock Wait 0x000a DoPostScriptAction 0x0007 @@ -13,7 +13,7 @@ SCRIPT_START script_ObjectB3KinstoneSparkGoronMerchang _0807EEF4 0x0070, 0x0000 Wait 0x003c SetRoomFlag 0x00ff - _0807E930 0x0005 + SetAnimation 0x0005 Wait 0x000f SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/kinstoneFusion/script_StampKinstone.inc b/data/scripts/kinstoneFusion/script_StampKinstone.inc index 2e026161..6940cc83 100644 --- a/data/scripts/kinstoneFusion/script_StampKinstone.inc +++ b/data/scripts/kinstoneFusion/script_StampKinstone.inc @@ -2,9 +2,9 @@ SCRIPT_START script_StampKinstone BeginBlock DoPostScriptAction 0x0007 - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 - Call sub_0807F348 + Call SetPriorityMessage EndBlock script_0800BBBA: CheckRoomFlag 0x00ff diff --git a/data/scripts/lakeHylia/script_EzloTalkOcarina.inc b/data/scripts/lakeHylia/script_EzloTalkOcarina.inc index 0846a9a4..0233ac50 100644 --- a/data/scripts/lakeHylia/script_EzloTalkOcarina.inc +++ b/data/scripts/lakeHylia/script_EzloTalkOcarina.inc @@ -1,12 +1,12 @@ @ Ezlo talk after first ocarina travel SCRIPT_START script_EzloTalkOcarina EndBlock - _0807E864 - Call sub_0807FA40 + SetPlayerIdle + Call WaitForPlayerNormalOrTalkEzlo Call sub_0807DF28 - _0807EB28 0x0b5f + EzloMessage 0x0b5f WaitUntilTextboxCloses Call sub_0807DF50 - _0807E878 + EnablePlayerControl DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/lakeHylia/script_ForestMinish3.inc b/data/scripts/lakeHylia/script_ForestMinish3.inc index 583eeaa9..26ad3f5a 100644 --- a/data/scripts/lakeHylia/script_ForestMinish3.inc +++ b/data/scripts/lakeHylia/script_ForestMinish3.inc @@ -13,8 +13,8 @@ script_0800C5D6: Jump script_0800C5D6 script_0800C5EA: EndBlock - _0807E864 + SetPlayerIdle Call sub_08060270 WaitUntilTextboxCloses - _0807E878 + EnablePlayerControl Jump script_0800C5D6 diff --git a/data/scripts/lakeHylia/script_KingGustafHologram.inc b/data/scripts/lakeHylia/script_KingGustafHologram.inc index 66c576f1..295cd219 100644 --- a/data/scripts/lakeHylia/script_KingGustafHologram.inc +++ b/data/scripts/lakeHylia/script_KingGustafHologram.inc @@ -7,23 +7,23 @@ script_08012368: CheckLocalFlag 0x0004 JumpIfNot script_08012368 Call sub_0807DF28 - _0807E864 + SetPlayerIdle StopBgm BeginBlock - _0807E778 0x0004 + SetFadeTime 0x0004 SetFadeMask 0x00007fff DoFade5 _0807E858 0x0080 EndBlock WaitForFadeFinish PlayBgm BGM_ELEMENTAL_SANCTUARY - _0807EB28 0x1401 + EzloMessage 0x1401 WaitUntilTextboxCloses - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 DoPostScriptAction 0x0007 PlaySound SFX_ELEMENT_FLOAT - SetEntity0x20 0xffff8000 + SetEntityVelocity 0xffff8000 Wait 0x003c _0807E8E4_0 StartPlayerScript script_PlayerAfterToD @@ -31,22 +31,22 @@ script_08012368: MessageNoOverlap 0x1402 WaitUntilTextboxCloses StopBgm - SetEntity0x20 0x00010000 + SetEntityVelocity 0x00010000 Wait 0x003c BeginBlock - _0807E778 0x0004 + SetFadeTime 0x0004 SetFadeMask 0xffffffff DoFade4 _0807E858 0x0080 EndBlock WaitForFadeFinish PlayBGM - _0807EB28 0x1403 + EzloMessage 0x1403 WaitUntilTextboxCloses SetIntVariable 0x00000203 - Call sub_0807F420 + Call LoadMenu Call sub_0807DF50 - _0807E878 + EnablePlayerControl DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/lakeHylia/script_Object69AfterToD.inc b/data/scripts/lakeHylia/script_Object69AfterToD.inc index 2ec33ffe..2a5c6a62 100644 --- a/data/scripts/lakeHylia/script_Object69AfterToD.inc +++ b/data/scripts/lakeHylia/script_Object69AfterToD.inc @@ -1,6 +1,6 @@ @ After ToD OBJECT_69 Cutscene SCRIPT_START script_Object69AfterToD - _0807E864 + SetPlayerIdle script_0800AFB2: EndBlock BeginBlock @@ -9,11 +9,11 @@ script_0800AFB2: JumpIfNot script_0800AFB2 EndBlock Call sub_0807DF28 - _0807EB28 0x1c04 + EzloMessage 0x1c04 WaitUntilTextboxCloses SetLocalFlagByBank 0x0100, 0x0004 Call sub_0807DF50 - _0807E878 + EnablePlayerControl DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/lakeHylia/script_ShopwellsDog.inc b/data/scripts/lakeHylia/script_ShopwellsDog.inc index fbf22a4f..eaa7c31e 100644 --- a/data/scripts/lakeHylia/script_ShopwellsDog.inc +++ b/data/scripts/lakeHylia/script_ShopwellsDog.inc @@ -2,7 +2,7 @@ SCRIPT_START script_ShopwellsDog BeginBlock SetEntitySpeed 0x0100 - _0807EB44 0x0004 + SetAnimationState 0x0004 EndBlock Wait 0x001e PlaySound SFX_VO_DOG diff --git a/data/scripts/lonLonRanch/scriptMalonInside.inc b/data/scripts/lonLonRanch/scriptMalonInside.inc index 6cbe0145..f573b3f3 100644 --- a/data/scripts/lonLonRanch/scriptMalonInside.inc +++ b/data/scripts/lonLonRanch/scriptMalonInside.inc @@ -3,19 +3,19 @@ SCRIPT_START scriptMalonInside BeginBlock DoPostScriptAction 0x000a DoPostScriptAction 0x0007 - _0807EB44 0x0004 - _0807E930 0x000a + SetAnimationState 0x0004 + SetAnimation 0x000a EndBlock script_08014F0C: CheckEntityInteractType JumpIfNot script_08014F0C - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer DoPostScriptAction 0x0000 MessageNoOverlap 0x200e WaitUntilTextboxCloses - _0807E878 - _0807EB44 0x0004 - _0807E930 0x000a + EnablePlayerControl + SetAnimationState 0x0004 + SetAnimation 0x000a Jump script_08014F0C .2byte 0x0000 diff --git a/data/scripts/lonLonRanch/script_GoronPunching.inc b/data/scripts/lonLonRanch/script_GoronPunching.inc index 77b616b6..44c7f7b2 100644 --- a/data/scripts/lonLonRanch/script_GoronPunching.inc +++ b/data/scripts/lonLonRanch/script_GoronPunching.inc @@ -10,27 +10,27 @@ script_0800B9CA: Call sub_0807F434 JumpTable script_0800B9CA, script_0800B9D8, script_0800B9F4 script_0800B9D8: - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer DoPostScriptAction 0x0000 Call sub_080694D8 WaitUntilTextboxCloses Call sub_080694EC - _0807E878 + EnablePlayerControl Jump script_0800B9CA script_0800B9F4: - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer DoPostScriptAction 0x0000 Call sub_0807F650 _0807E9F0 - _0807E864 + SetPlayerIdle Call sub_0806948C JumpIf script_0800BA24 WaitUntilTextboxCloses Call sub_080694EC Call sub_0807DF50 - _0807E878 + EnablePlayerControl Jump script_0800B9CA script_0800BA24: WaitUntilTextboxCloses @@ -38,5 +38,5 @@ script_0800BA24: _0807E9D4 Call sub_080694EC Call sub_0807DF50 - _0807E878 + EnablePlayerControl Jump script_0800B9CA diff --git a/data/scripts/lonLonRanch/script_MalonLostKey.inc b/data/scripts/lonLonRanch/script_MalonLostKey.inc index 7298bdca..664c68c2 100644 --- a/data/scripts/lonLonRanch/script_MalonLostKey.inc +++ b/data/scripts/lonLonRanch/script_MalonLostKey.inc @@ -14,26 +14,26 @@ script_0800B4BC: JumpIf script_0800B4F0 Jump script_0800B4BC script_0800B4D4: - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer DoPostScriptAction 0x0000 MessageFromTarget 0x200b EndBlock - _0807E878 - _0807EB44 0x0004 + EnablePlayerControl + SetAnimationState 0x0004 DoPostScriptAction 0x0001 Jump script_0800B4BC script_0800B4F0: EndBlock ClearSyncFlag 0x00000008 _0807EDD4 0x0134, 0x0288 - _0807EB44 0x0004 + SetAnimationState 0x0004 WaitForSyncFlagAndClear 0x00000008 MessageFromTarget 0x2016 WaitUntilTextboxCloses _0807EDD4 0x0158, 0x0288 DoPostScriptAction 0x0000 - _0807EB44 0x0000 + SetAnimationState 0x0000 Wait 0x000a SetSyncFlag 0x00000010 DoPostScriptAction 0x0008 @@ -41,7 +41,7 @@ script_0800B4F0: SetSyncFlag 0x00000010 SetGlobalFlag 0x001d Call sub_0807921C - _0807E878 + EnablePlayerControl Call sub_0807FBCC DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/lonLonRanch/script_PlayerGiveKey.inc b/data/scripts/lonLonRanch/script_PlayerGiveKey.inc index 2034cd11..5ca5f8f0 100644 --- a/data/scripts/lonLonRanch/script_PlayerGiveKey.inc +++ b/data/scripts/lonLonRanch/script_PlayerGiveKey.inc @@ -5,7 +5,7 @@ SCRIPT_START script_PlayerGiveKey EndBlock _0807EDD4 0x0128, 0x0298 Wait 0x000a - _0807EB44 0x0002 + SetAnimationState 0x0002 DoPostScriptAction 0x0000 SetSyncFlag 0x00000004 WaitForSyncFlagAndClear 0x00000002 diff --git a/data/scripts/lonLonRanch/script_TalonGotKey.inc b/data/scripts/lonLonRanch/script_TalonGotKey.inc index 1fb43ad5..ac25fc74 100644 --- a/data/scripts/lonLonRanch/script_TalonGotKey.inc +++ b/data/scripts/lonLonRanch/script_TalonGotKey.inc @@ -2,9 +2,9 @@ SCRIPT_START script_TalonGotKey BeginBlock SetEntitySpeed 0x00c0 - _0807E908 0x0001 + SetAction 0x0001 DoPostScriptAction 0x000b - _0807E864 + SetPlayerIdle Call sub_0807FBC4 EndBlock Wait 0x000a @@ -12,14 +12,14 @@ SCRIPT_START script_TalonGotKey SetSyncFlag 0x00000008 StartPlayerScript script_PlayerGiveKey _0807EDD4 0x0140, 0x0298 - _0807EB74 + FacePlayer WaitForSyncFlagAndClear 0x00000004 - _0807EB74 + FacePlayer Wait 0x003c PlaySound SFX_TASK_COMPLETE _0807F088 0x0037 WaitPlayerGetItem - _0807EB8C + FaceAwayFromPlayer MessageFromTarget 0x200c WaitUntilTextboxCloses Wait 0x0014 diff --git a/data/scripts/lonLonRanch/script_TalonInside.inc b/data/scripts/lonLonRanch/script_TalonInside.inc index 71485a34..ce0469db 100644 --- a/data/scripts/lonLonRanch/script_TalonInside.inc +++ b/data/scripts/lonLonRanch/script_TalonInside.inc @@ -3,15 +3,15 @@ SCRIPT_START script_TalonInside BeginBlock DoPostScriptAction 0x000a DoPostScriptAction 0x0007 - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 EndBlock script_08014E64: CheckEntityInteractType JumpIfNot script_08014E64 - _0807E864 + SetPlayerIdle Call sub_0807DF28 - _0807EB74 + FacePlayer CallWithArg sub_0807F78C, 0x00000022 WaitUntilTextboxCloses CheckTextboxResult @@ -32,6 +32,6 @@ script_08014EB8: script_08014EBC: WaitUntilTextboxCloses Call sub_0807DF50 - _0807E878 + EnablePlayerControl Jump script_08014E64 .2byte 0x0000 diff --git a/data/scripts/lonLonRanch/script_TalonInside2.inc b/data/scripts/lonLonRanch/script_TalonInside2.inc index ff3fcf53..27c19f50 100644 --- a/data/scripts/lonLonRanch/script_TalonInside2.inc +++ b/data/scripts/lonLonRanch/script_TalonInside2.inc @@ -3,16 +3,16 @@ SCRIPT_START script_TalonInside2 BeginBlock DoPostScriptAction 0x000a DoPostScriptAction 0x0007 - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 EndBlock script_08014EE0: CheckEntityInteractType JumpIfNot script_08014EE0 - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer MessageNoOverlap 0x200d WaitUntilTextboxCloses - _0807E878 + EnablePlayerControl Jump script_08014EE0 .2byte 0x0000 diff --git a/data/scripts/lonLonRanch/script_TalonLostKey.inc b/data/scripts/lonLonRanch/script_TalonLostKey.inc index 244d7435..0a5463c6 100644 --- a/data/scripts/lonLonRanch/script_TalonLostKey.inc +++ b/data/scripts/lonLonRanch/script_TalonLostKey.inc @@ -2,10 +2,10 @@ SCRIPT_START script_TalonLostKey BeginBlock DoPostScriptAction 0x000a - Call sub_0807F158 + Call SetCollisionLayer1 SetEntitySpeed 0x0120 - _0807EB44 0x0004 - _0807E908 0x0002 + SetAnimationState 0x0004 + SetAction 0x0002 SetIntVariable 0x0000200a EndBlock script_0800B3C4: diff --git a/data/scripts/minishWoods/script_08012C98.inc b/data/scripts/minishWoods/script_08012C98.inc index 64ddd7ac..c6ea3050 100644 --- a/data/scripts/minishWoods/script_08012C98.inc +++ b/data/scripts/minishWoods/script_08012C98.inc @@ -8,12 +8,12 @@ script_08012CA0: BeginBlock CheckPlayerInRegion 0x0398, 0x03b0, 0x2040 JumpIfNot script_08012CA0 - _0807E564 + CheckPlayerMinish JumpIf script_08012CD2 EndBlock - _0807E864 + SetPlayerIdle Call sub_0807DF28 - _0807EB28 0x2202 + EzloMessage 0x2202 WaitUntilTextboxCloses .ifdef JP SetLocalFlag 0x003a @@ -29,7 +29,7 @@ script_08012CA0: .endif .endif Call sub_0807DF50 - _0807E878 + EnablePlayerControl script_08012CD2: DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/minishWoods/script_08012D18.inc b/data/scripts/minishWoods/script_08012D18.inc index 9b8be5cf..c8dbcadb 100644 --- a/data/scripts/minishWoods/script_08012D18.inc +++ b/data/scripts/minishWoods/script_08012D18.inc @@ -9,15 +9,15 @@ SCRIPT_START script_08012D18 CheckPlayerInRegion 0x0000, 0x01a8, 0x2010 JumpIfNot script_08012D18 EndBlock - _0807E864 - Call sub_0807F9A4 + SetPlayerIdle + Call WaitForPlayerNormal Call sub_0807DF28 - _0807EB28 0x111a + EzloMessage 0x111a WaitUntilTextboxCloses StartPlayerScript script_PlayerCannotEnter WaitForSyncFlagAndClear 0x00000001 Call sub_0807DF50 - _0807E878 + EnablePlayerControl Jump script_08012D18 script_08012D68: DoPostScriptAction 0x0006 diff --git a/data/scripts/minishWoods/script_BombMinish.inc b/data/scripts/minishWoods/script_BombMinish.inc index 7a57205d..ce58873e 100644 --- a/data/scripts/minishWoods/script_BombMinish.inc +++ b/data/scripts/minishWoods/script_BombMinish.inc @@ -1,7 +1,7 @@ @ Minish Woods Bomb Minish SCRIPT_START script_BombMinish BeginBlock - _0807EB44 0x0004 + SetAnimationState 0x0004 Call sub_08060090 DoPostScriptAction 0x000a CheckKinstoneFused 0x001c @@ -16,7 +16,7 @@ script_08009F36: CheckEntityInteractType JumpIfNot script_08009F36 EndBlock - _0807E864 + SetPlayerIdle Call sub_0807DF28 DoPostScriptAction 0x000b StartPlayerScript script_PlayerAtBombMinish @@ -29,7 +29,7 @@ script_08009F36: WaitPlayerGetItem DoPostScriptAction 0x000a Call sub_0807DF50 - _0807E878 + EnablePlayerControl script_08009F84: EndBlock script_08009F86: @@ -39,19 +39,19 @@ script_08009F86: CheckEntityInteractType JumpIfNot script_08009F86 EndBlock - _0807E864 + SetPlayerIdle Call sub_080602BC WaitUntilTextboxCloses - CallWithArg sub_0807F970, 0x00001f03 + CallWithArg CheckMessageEqual, 0x00001f03 JumpIf script_08009FB6 - _0807E878 + EnablePlayerControl Jump script_08009F86 script_08009FB6: Wait 0x0008 PlaySound SFX_103 CallWithArg sub_0806030C, 0x00000063 Wait 0x0008 - _0807E878 + EnablePlayerControl Jump script_08009F86 script_08009FD2: EndBlock @@ -64,12 +64,12 @@ script_08009FDC: CheckEntityInteractType JumpIfNot script_08009FDC EndBlock - _0807E864 + SetPlayerIdle MessageNoOverlap 0x1f0e WaitUntilTextboxCloses CheckTextboxResult JumpIf script_0800A002 - _0807E878 + EnablePlayerControl Jump script_08009FDC script_0800A002: Wait 0x0008 @@ -77,11 +77,11 @@ script_0800A002: Call sub_08060318 WaitPlayerGetItem Wait 0x0008 - _0807EB8C + FaceAwayFromPlayer MessageFromTarget 0x1f13 WaitUntilTextboxCloses SetLocalFlag 0x00b0 - _0807E878 + EnablePlayerControl script_0800A024: EndBlock BeginBlock @@ -89,21 +89,21 @@ script_0800A024: CheckEntityInteractType JumpIfNot script_0800A024 EndBlock - _0807E864 + SetPlayerIdle CheckInventory1 0x0008 JumpIf script_0800A052 MessageNoOverlap 0x1f14 WaitUntilTextboxCloses CheckTextboxResult JumpIf script_0800A002 - _0807E878 + EnablePlayerControl Jump script_0800A024 script_0800A052: MessageNoOverlap 0x1f11 WaitUntilTextboxCloses CheckTextboxResult JumpIf script_0800A064 - _0807E878 + EnablePlayerControl Jump script_0800A024 script_0800A064: Wait 0x0008 @@ -111,9 +111,9 @@ script_0800A064: Call sub_08060318 WaitPlayerGetItem Wait 0x0008 - _0807EB8C + FaceAwayFromPlayer MessageFromTarget 0x1f10 WaitUntilTextboxCloses - _0807E878 + EnablePlayerControl Jump script_0800A024 .2byte 0x0000 diff --git a/data/scripts/minishWoods/script_EzloTalkDWS.inc b/data/scripts/minishWoods/script_EzloTalkDWS.inc index 942b81bf..72455e32 100644 --- a/data/scripts/minishWoods/script_EzloTalkDWS.inc +++ b/data/scripts/minishWoods/script_EzloTalkDWS.inc @@ -1,12 +1,12 @@ @ Minish Woods Ezlo talks after finishing earth temple SCRIPT_START script_EzloTalkDWS - _0807E864 + SetPlayerIdle Call sub_0807DF28 - _0807EB28 0x1c01 + EzloMessage 0x1c01 WaitUntilTextboxCloses SetLocalFlagByBank 0x0100, 0x0001 Call sub_0807DF50 - _0807E878 + EnablePlayerControl DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/minishWoods/script_EzloTalkMinishPortal.inc b/data/scripts/minishWoods/script_EzloTalkMinishPortal.inc index b97e943e..b7f9c3b4 100644 --- a/data/scripts/minishWoods/script_EzloTalkMinishPortal.inc +++ b/data/scripts/minishWoods/script_EzloTalkMinishPortal.inc @@ -2,16 +2,16 @@ SCRIPT_START script_EzloTalkMinishPortal EndBlock BeginBlock - _0807E564 + CheckPlayerMinish JumpIfNot script_EzloTalkMinishPortal CheckPlayerInRegion 0x0380, 0x03b0, 0x4040 JumpIfNot script_EzloTalkMinishPortal ComparePlayerAction 0x0015 JumpIf script_EzloTalkMinishPortal - _0807E864 + SetPlayerIdle Call sub_0807DF28 EndBlock - _0807EB28 0x2203 + EzloMessage 0x2203 WaitUntilTextboxCloses .ifdef JP SetLocalFlag 0x003d @@ -27,6 +27,6 @@ SCRIPT_START script_EzloTalkMinishPortal .endif .endif Call sub_0807DF50 - _0807E878 + EnablePlayerControl DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/minishWoods/script_Festari.inc b/data/scripts/minishWoods/script_Festari.inc index ebaca487..0a79dea6 100644 --- a/data/scripts/minishWoods/script_Festari.inc +++ b/data/scripts/minishWoods/script_Festari.inc @@ -3,15 +3,15 @@ SCRIPT_START script_Festari BeginBlock DoPostScriptAction 0x000a SetEntitySpeed 0x0080 - _0807EB44 0x0004 + SetAnimationState 0x0004 CheckLocalFlag 0x0082 JumpIfNot script_0800C650 OffsetEntityPosition 0x0010, 0x0000 script_0800C650: EndBlock script_0800C652: - _0807E944 - _0807E864 + TriggerInteract + SetPlayerIdle Call sub_0807DF28 CheckLocalFlag 0x0082 JumpIf script_0800C684 @@ -34,7 +34,7 @@ script_0800C684: Wait 0x000a SetLocalFlag 0x0080 Call sub_0807DF50 - _0807E878 + EnablePlayerControl Jump script_0800C652 script_0800C6B6: CheckLocalFlag 0x0081 @@ -45,7 +45,7 @@ script_0800C6B6: DoPostScriptAction 0x0015 Wait 0x000a Call sub_0807DF50 - _0807E878 + EnablePlayerControl Jump script_0800C652 script_0800C6DC: CheckLocalFlag 0x0082 @@ -55,10 +55,10 @@ script_0800C6DC: WaitUntilTextboxCloses DoPostScriptAction 0x0015 Wait 0x000a - _0807EB44 0x0002 + SetAnimationState 0x0002 DoPostScriptAction 0x0001 - _0807EC94 0x0020 - _0807EB44 0x0004 + WalkEast 0x0020 + SetAnimationState 0x0004 Wait 0x000f PlaySound SFX_SECRET SetLocalFlag 0x0082 @@ -69,7 +69,7 @@ script_0800C712: DoPostScriptAction 0x0015 Wait 0x000a Call sub_0807DF50 - _0807E878 + EnablePlayerControl Jump script_0800C652 script_0800C730: CheckLocalFlag 0x0083 @@ -80,7 +80,7 @@ script_0800C730: DoPostScriptAction 0x0015 Wait 0x000a Call sub_0807DF50 - _0807E878 + EnablePlayerControl Jump script_0800C652 script_0800C756: DoPostScriptAction 0x0002 @@ -89,5 +89,5 @@ script_0800C756: DoPostScriptAction 0x0015 Wait 0x000a Call sub_0807DF50 - _0807E878 + EnablePlayerControl Jump script_0800C652 diff --git a/data/scripts/minishWoods/script_ForestMinish10.inc b/data/scripts/minishWoods/script_ForestMinish10.inc index cc7dfc2e..f7c4ebe6 100644 --- a/data/scripts/minishWoods/script_ForestMinish10.inc +++ b/data/scripts/minishWoods/script_ForestMinish10.inc @@ -15,7 +15,7 @@ script_0800CD92: Jump script_0800CD92 script_0800CDA6: EndBlock - _0807E864 + SetPlayerIdle Call sub_0807DF28 CheckLocalFlag 0x009d JumpIf script_0800CDC4 @@ -57,7 +57,7 @@ script_0800CE14: _0807F088 0x0022 WaitPlayerGetItem script_0800CE32: - _0807EB8C + FaceAwayFromPlayer SetGlobalFlag 0x0054 Call sub_08060340 MessageNoOverlap 0x213f @@ -85,7 +85,7 @@ script_0800CE6E: PlaySound SFX_TASK_COMPLETE _0807F088 0x0027 WaitPlayerGetItem - _0807EB8C + FaceAwayFromPlayer SetGlobalFlag 0x0054 Call sub_08060340 MessageNoOverlap 0x2143 @@ -113,14 +113,14 @@ script_0800CECE: PlaySound SFX_TASK_COMPLETE _0807F088 0x0024 WaitPlayerGetItem - _0807EB8C + FaceAwayFromPlayer SetGlobalFlag 0x0054 Call sub_08060340 MessageNoOverlap 0x2147 script_0800CF02: WaitUntilTextboxCloses Call sub_0807DF50 - _0807E878 + EnablePlayerControl script_0800CF0C: EndBlock BeginBlock @@ -130,19 +130,19 @@ script_0800CF0C: Jump script_0800CF0C script_0800CF20: EndBlock - _0807E864 + SetPlayerIdle Call sub_0807DF28 script_0800CF2A: MessageNoOverlap 0x2140 WaitUntilTextboxCloses Call sub_0807DF50 - _0807E878 + EnablePlayerControl Jump script_0800CF0C script_0800CF3C: MessageNoOverlap 0x214a script_0800CF40: WaitUntilTextboxCloses Call sub_0807DF50 - _0807E878 + EnablePlayerControl Jump script_0800CD92 .2byte 0x0000 diff --git a/data/scripts/minishWoods/script_ForestMinish4.inc b/data/scripts/minishWoods/script_ForestMinish4.inc index 792f37d0..2663d585 100644 --- a/data/scripts/minishWoods/script_ForestMinish4.inc +++ b/data/scripts/minishWoods/script_ForestMinish4.inc @@ -14,9 +14,9 @@ script_0800C60A: Jump script_0800C60A script_0800C61E: EndBlock - _0807E864 + SetPlayerIdle Call sub_0806021C WaitUntilTextboxCloses Wait 0x000f - _0807E878 + EnablePlayerControl Jump script_0800C60A diff --git a/data/scripts/minishWoods/script_Gentari.inc b/data/scripts/minishWoods/script_Gentari.inc index 4d7c8507..e032bf03 100644 --- a/data/scripts/minishWoods/script_Gentari.inc +++ b/data/scripts/minishWoods/script_Gentari.inc @@ -2,11 +2,11 @@ SCRIPT_START script_Gentari BeginBlock DoPostScriptAction 0x000a - _0807EB44 0x0004 + SetAnimationState 0x0004 EndBlock script_0800C780: - _0807E944 - _0807E864 + TriggerInteract + SetPlayerIdle Call sub_0807DF28 StartPlayerScript script_PlayerAtGentari WaitForSyncFlagAndClear 0x00000001 @@ -14,44 +14,44 @@ script_0800C780: JumpIf script_0800C824 CheckInventory1 0x005b JumpIf script_0800C7C0 - _0807E930 0x0008 + SetAnimation 0x0008 MessageFromTarget 0x2122 WaitUntilTextboxCloses DoPostScriptAction 0x0000 Call sub_0807DF50 - _0807E878 + EnablePlayerControl Jump script_0800C780 script_0800C7C0: - _0807E930 0x0008 + SetAnimation 0x0008 CheckLocalFlag 0x0081 JumpIf script_0800C80A MessageFromTarget 0x1130 WaitUntilTextboxCloses - _0807EB28 0x1131 + EzloMessage 0x1131 WaitUntilTextboxCloses - _0807EB8C + FaceAwayFromPlayer MessageFromTarget 0x1132 WaitUntilTextboxCloses SetIntVariable 0x00000103 - Call sub_0807F420 + Call LoadMenu MessageFromTarget 0x1133 WaitUntilTextboxCloses Wait 0x000a DoPostScriptAction 0x0000 SetLocalFlag 0x0081 Call sub_0807DF50 - _0807E878 + EnablePlayerControl Jump script_0800C780 script_0800C80A: MessageFromTarget 0x1133 WaitUntilTextboxCloses Wait 0x000a - _0807E930 0x0000 + SetAnimation 0x0000 Call sub_0807DF50 - _0807E878 + EnablePlayerControl Jump script_0800C780 script_0800C824: - _0807E930 0x0008 + SetAnimation 0x0008 CheckLocalFlag 0x0083 JumpIf script_0800C8AE MessageFromTarget 0x1135 @@ -64,22 +64,22 @@ script_0800C824: Wait 0x003c PlaySound SFX_SECRET Wait 0x003c - _0807EB74 - _0807EB8C + FacePlayer + FaceAwayFromPlayer MessageFromTarget 0x1136 WaitUntilTextboxCloses - _0807EB28 0x1137 + EzloMessage 0x1137 WaitUntilTextboxCloses Wait 0x000a - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 Call sub_0807DF50 - _0807E878 + EnablePlayerControl script_0800C87C: - _0807E944 - _0807E864 + TriggerInteract + SetPlayerIdle Call sub_0807DF28 - _0807EB74 + FacePlayer SetIntVariable 0x00000008 Call sub_0807F3D8 MessageFromTarget 0x1136 @@ -87,7 +87,7 @@ script_0800C87C: Wait 0x000a DoPostScriptAction 0x0000 Call sub_0807DF50 - _0807E878 + EnablePlayerControl Jump script_0800C87C script_0800C8AE: MessageFromTarget 0x1136 @@ -95,5 +95,5 @@ script_0800C8AE: Wait 0x000a DoPostScriptAction 0x0000 Call sub_0807DF50 - _0807E878 + EnablePlayerControl Jump script_0800C780 diff --git a/data/scripts/minishWoods/script_Object69PotionBlue.inc b/data/scripts/minishWoods/script_Object69PotionBlue.inc index 365530bf..6f865f7f 100644 --- a/data/scripts/minishWoods/script_Object69PotionBlue.inc +++ b/data/scripts/minishWoods/script_Object69PotionBlue.inc @@ -6,7 +6,7 @@ SCRIPT_START script_Object69PotionBlue script_08016146: CheckEntityInteractType JumpIfNot script_08016146 - _0807E864 + SetPlayerIdle GetInventoryValue 0x0025 MessageFromTargetTable 0x2d03, 0x2d02, 0x2d02, 0x2d02 CheckTextboxResult @@ -24,7 +24,7 @@ script_08016184: WaitPlayerGetItem MessageFromTarget 0x2d06 script_0801618A: - _0807E878 + EnablePlayerControl Jump script_08016146 .align 2, 0 diff --git a/data/scripts/minishWoods/script_Object69PotionRed.inc b/data/scripts/minishWoods/script_Object69PotionRed.inc index 6e3ed4a2..7bd47121 100644 --- a/data/scripts/minishWoods/script_Object69PotionRed.inc +++ b/data/scripts/minishWoods/script_Object69PotionRed.inc @@ -6,7 +6,7 @@ SCRIPT_START script_Object69PotionRed script_0801619A: CheckEntityInteractType JumpIfNot script_0801619A - _0807E864 + SetPlayerIdle GetInventoryValue 0x0024 MessageFromTargetTable 0x2d05, 0x2d04, 0x2d04, 0x2d04 CheckTextboxResult @@ -24,13 +24,13 @@ script_080161D8: .ifndef EU WaitPlayerGetItem WaitUntilTextboxCloses - _0807EB8C + FaceAwayFromPlayer MessageNoOverlap 0x2d06 .else MessageFromTarget 0x2d06 .endif script_080161E2: - _0807E878 + EnablePlayerControl Jump script_0801619A .align 2, 0 diff --git a/data/scripts/minishWoods/script_PlayerAtBombMinish.inc b/data/scripts/minishWoods/script_PlayerAtBombMinish.inc index 8d5d71c9..aa830e48 100644 --- a/data/scripts/minishWoods/script_PlayerAtBombMinish.inc +++ b/data/scripts/minishWoods/script_PlayerAtBombMinish.inc @@ -3,9 +3,9 @@ SCRIPT_START script_PlayerAtBombMinish BeginBlock SetEntitySpeed 0x0100 EndBlock - _0807ECC4 0x0010 + WalkSouth 0x0010 _0807EDD4 0x0078, 0x0060 - _0807EB44 0x0000 + SetAnimationState 0x0000 Wait 0x000f DoPostScriptAction 0x0000 SetSyncFlag 0x00000002 diff --git a/data/scripts/minishWoods/script_PlayerAtFestari.inc b/data/scripts/minishWoods/script_PlayerAtFestari.inc index 3f69b969..90ad2c76 100644 --- a/data/scripts/minishWoods/script_PlayerAtFestari.inc +++ b/data/scripts/minishWoods/script_PlayerAtFestari.inc @@ -4,7 +4,7 @@ SCRIPT_START script_PlayerAtFestari SetEntitySpeed 0x0100 EndBlock _0807EDD4 0x00e8, 0x0068 - _0807EB44 0x0000 + SetAnimationState 0x0000 Wait 0x000f DoPostScriptAction 0x0000 SetSyncFlag 0x00000001 diff --git a/data/scripts/minishWoods/script_PlayerAtGentari.inc b/data/scripts/minishWoods/script_PlayerAtGentari.inc index f53f6f0e..9e6468d3 100644 --- a/data/scripts/minishWoods/script_PlayerAtGentari.inc +++ b/data/scripts/minishWoods/script_PlayerAtGentari.inc @@ -3,9 +3,9 @@ SCRIPT_START script_PlayerAtGentari BeginBlock SetEntitySpeed 0x0100 EndBlock - _0807ECC4 0x0010 + WalkSouth 0x0010 _0807EDD4 0x0078, 0x0058 - _0807EB44 0x0000 + SetAnimationState 0x0000 Wait 0x000f DoPostScriptAction 0x0000 SetSyncFlag 0x00000001 diff --git a/data/scripts/minishWoods/script_PlayerAtMadderpillar.inc b/data/scripts/minishWoods/script_PlayerAtMadderpillar.inc index 8a0c171a..4c48cc9f 100644 --- a/data/scripts/minishWoods/script_PlayerAtMadderpillar.inc +++ b/data/scripts/minishWoods/script_PlayerAtMadderpillar.inc @@ -4,13 +4,13 @@ SCRIPT_START script_PlayerAtMadderpillar BeginBlock SetEntitySpeed 0x0140 SetEntityDirection 0x0018 - _0807E864 - Call sub_0807F354 + SetPlayerIdle + Call SetPriorityPlayerEvent EndBlock - WaitForPlayerAction0x17 + WaitForPlayerEnterRoom _0807E8E4_3 DoPostScriptAction 0x0001 Call sub_080752AC - _0807E878 + EnablePlayerControl Call sub_080791D0 SCRIPT_END diff --git a/data/scripts/minishWoods/script_Syrup.inc b/data/scripts/minishWoods/script_Syrup.inc index 332de656..0f6d46a5 100644 --- a/data/scripts/minishWoods/script_Syrup.inc +++ b/data/scripts/minishWoods/script_Syrup.inc @@ -2,7 +2,7 @@ SCRIPT_START script_Syrup BeginBlock _0807E9D4 - _0807E930 0x0008 + SetAnimation 0x0008 script_080160B0: EndBlock BeginBlock @@ -15,12 +15,12 @@ script_080160B0: Jump script_080160B0 script_080160D2: EndBlock - _0807EB74 + FacePlayer WaitForSyncFlagAndClear 0x00000004 Jump script_080160B0 script_080160E0: - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer EndBlock HasRoomItemForSale JumpIfNot script_0801611A @@ -36,7 +36,7 @@ script_080160E0: script_0801610C: WaitPlayerGetItem .ifndef EU - _0807EB8C + FaceAwayFromPlayer MessageFromTarget 0x2d0d .else MessageFromTarget 0x2d08 @@ -53,8 +53,8 @@ script_0801612C: MessageFromTarget 0x2d01 WaitUntilTextboxCloses script_08016132: - _0807E878 - _0807EB44 0x0004 + EnablePlayerControl + SetAnimationState 0x0004 Jump script_080160B0 .align 2, 0 diff --git a/data/scripts/mtCrenel/script_CrenelHermit.inc b/data/scripts/mtCrenel/script_CrenelHermit.inc index 9a05a3cf..91d499ad 100644 --- a/data/scripts/mtCrenel/script_CrenelHermit.inc +++ b/data/scripts/mtCrenel/script_CrenelHermit.inc @@ -3,17 +3,17 @@ SCRIPT_START script_CrenelHermit BeginBlock Call sub_08061E70 DoPostScriptAction 0x000a - _0807EB44 0x0004 + SetAnimationState 0x0004 Call sub_08061FD8 EndBlock script_0800B8FC: CheckEntityInteractType JumpIfNot script_0800B8FC - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer Call sub_08061FD8 Call sub_08062048 WaitUntilTextboxCloses - _0807E878 + EnablePlayerControl Jump script_0800B8FC .2byte 0x0000 diff --git a/data/scripts/mtCrenel/script_EzloTalkCoF.inc b/data/scripts/mtCrenel/script_EzloTalkCoF.inc index bfc736fb..61676e73 100644 --- a/data/scripts/mtCrenel/script_EzloTalkCoF.inc +++ b/data/scripts/mtCrenel/script_EzloTalkCoF.inc @@ -1,12 +1,12 @@ @ Mountain Ezlo text after beating CoF SCRIPT_START script_EzloTalkCoF - _0807E864 + SetPlayerIdle Call sub_0807DF28 - _0807EB28 0x1c02 + EzloMessage 0x1c02 WaitUntilTextboxCloses SetLocalFlagByBank 0x0100, 0x0002 Call sub_0807DF50 - _0807E878 + EnablePlayerControl DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/mtCrenel/script_GreatFairyBombs.inc b/data/scripts/mtCrenel/script_GreatFairyBombs.inc index e25eb65f..05470c3d 100644 --- a/data/scripts/mtCrenel/script_GreatFairyBombs.inc +++ b/data/scripts/mtCrenel/script_GreatFairyBombs.inc @@ -6,9 +6,9 @@ script_0800B734: Call sub_0808747C JumpIfNot script_0800B734 Call sub_08079184 - _0807E864 + SetPlayerIdle Wait 0x000a - Call sub_0807F9A4 + Call WaitForPlayerNormal StartPlayerScript script_PlayerAtGreatFairy WaitForSyncFlagAndClear 0x00000004 SetRoomFlag 0x0000 @@ -17,7 +17,7 @@ script_0800B734: JumpIf script_0800B7A2 MessageNoOverlap 0x0580 WaitUntilTextboxCloses - CallWithArg sub_0807F970, 0x00000582 + CallWithArg CheckMessageEqual, 0x00000582 JumpIf script_0800B794 CallWithArg sub_08087424, 0x00000001 Wait 0x00b4 @@ -30,7 +30,7 @@ script_0800B794: script_0800B7A2: MessageNoOverlap 0x0590 WaitUntilTextboxCloses - _0807E778 0x0010 + SetFadeTime 0x0010 DoFade7 WaitForFadeFinish ModHealth 0x00a0 diff --git a/data/scripts/mtCrenel/script_Melari.inc b/data/scripts/mtCrenel/script_Melari.inc index ccf1c55a..cb6458fc 100644 --- a/data/scripts/mtCrenel/script_Melari.inc +++ b/data/scripts/mtCrenel/script_Melari.inc @@ -3,14 +3,14 @@ SCRIPT_START script_Melari BeginBlock _0807E9D4 DoPostScriptAction 0x000a - _0807EB44 0x0004 - _0807E930 0x0000 + SetAnimationState 0x0004 + SetAnimation 0x0000 EndBlock CheckInventory1 0x0041 JumpIf script_0800CFD2 CheckLocalFlag 0x007e JumpIfNot script_0800CFD2 - _0807E930 0x0008 + SetAnimation 0x0008 script_0800CFD2: CheckInventory1 0x0002 JumpIf script_0800CFFA @@ -29,11 +29,11 @@ script_0800CFFA: CheckEntityInteractType JumpIfNot script_0800CFFA EndBlock - _0807E864 + SetPlayerIdle Call sub_0807DF28 CheckInventory1 0x0002 JumpIfNot script_0800D032 - _0807EB74 + FacePlayer SetIntVariable 0x00000000 Call sub_0806C028 MessageNoOverlap 0x1219 @@ -43,14 +43,14 @@ script_0800D032: JumpIfNot script_0800D098 StartPlayerScript script_PlayerAtMelari WaitForSyncFlagAndClear 0x00000008 - _0807EB74 + FacePlayer SetIntVariable 0x00000000 Call sub_0806C028 MessageFromTargetPos 0x125c, 0x0002 WaitUntilTextboxCloses StartPlayerScript script_PlayerPlaceBrokenSword WaitForSyncFlagAndClear 0x00000008 - _0807EB44 0x0002 + SetAnimationState 0x0002 SetIntVariable 0x00000000 Call sub_0806C028 Wait 0x000f @@ -71,14 +71,14 @@ script_0800D0A8: WaitForSyncFlagAndClear 0x00000004 SetSyncFlag 0x00000001 WaitForSyncFlagAndClear 0x00000004 - _0807EB74 + FacePlayer SetIntVariable 0x00000000 Call sub_0806C028 MessageFromTargetPos 0x123d, 0x0002 WaitUntilTextboxCloses StartPlayerScript script_PlayerPlaceBrokenSword WaitForSyncFlagAndClear 0x00000008 - _0807EB44 0x0002 + SetAnimationState 0x0002 SetIntVariable 0x00000000 Call sub_0806C028 PlaySound SFX_TASK_COMPLETE @@ -92,7 +92,7 @@ script_0800D108: MessageFromTargetPos 0x123e, 0x0002 WaitUntilTextboxCloses Wait 0x000f - _0807E930 0x0009 + SetAnimation 0x0009 SetSyncFlag 0x00000002 WaitForSyncFlagAndClear 0x00000004 SetSyncFlag 0x00000002 @@ -104,14 +104,14 @@ script_0800D108: WaitForSyncFlagAndClear 0x00000004 SetSyncFlag 0x00000001 WaitForSyncFlagAndClear 0x00000004 - _0807E930 0x0008 + SetAnimation 0x0008 Wait 0x003c Call sub_08095164 - _0807EB28 0x1240 + EzloMessage 0x1240 script_0800D17C: WaitUntilTextboxCloses Wait 0x000f - _0807E878 + EnablePlayerControl Call sub_0807DF50 Jump script_0800CFFA .2byte 0x0000 diff --git a/data/scripts/mtCrenel/script_MelariInRoom.inc b/data/scripts/mtCrenel/script_MelariInRoom.inc index 255d95e6..a8e7e283 100644 --- a/data/scripts/mtCrenel/script_MelariInRoom.inc +++ b/data/scripts/mtCrenel/script_MelariInRoom.inc @@ -3,8 +3,8 @@ SCRIPT_START script_MelariInRoom BeginBlock Call sub_08068884 DoPostScriptAction 0x000a - _0807EB44 0x0004 - _0807E930 0x0000 + SetAnimationState 0x0004 + SetAnimation 0x0000 EndBlock script_0800D31E: EndBlock @@ -13,12 +13,12 @@ script_0800D31E: CheckEntityInteractType JumpIfNot script_0800D31E EndBlock - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer SetIntVariable 0x00000000 Call sub_0806C028 MessageFromTarget 0x1219 WaitUntilTextboxCloses Wait 0x000f - _0807E878 + EnablePlayerControl Jump script_0800D31E diff --git a/data/scripts/mtCrenel/script_MountainMinish1.inc b/data/scripts/mtCrenel/script_MountainMinish1.inc index ef7567fc..20e946d1 100644 --- a/data/scripts/mtCrenel/script_MountainMinish1.inc +++ b/data/scripts/mtCrenel/script_MountainMinish1.inc @@ -13,9 +13,9 @@ script_0800CF5E: Jump script_0800CF5E script_0800CF72: EndBlock - _0807E864 + SetPlayerIdle Call sub_08068190 WaitUntilTextboxCloses Wait 0x000f - _0807E878 + EnablePlayerControl Jump script_0800CF5E diff --git a/data/scripts/mtCrenel/script_MountainMinish2.inc b/data/scripts/mtCrenel/script_MountainMinish2.inc index ff89c97d..de34aca9 100644 --- a/data/scripts/mtCrenel/script_MountainMinish2.inc +++ b/data/scripts/mtCrenel/script_MountainMinish2.inc @@ -5,10 +5,10 @@ SCRIPT_START script_MountainMinish2 DoPostScriptAction 0x000a EndBlock script_0800CF96: - _0807E944 - _0807E864 + TriggerInteract + SetPlayerIdle Call sub_08068190 WaitUntilTextboxCloses Wait 0x000f - _0807E878 + EnablePlayerControl Jump script_0800CF96 diff --git a/data/scripts/mtCrenel/script_MountainMinish3.inc b/data/scripts/mtCrenel/script_MountainMinish3.inc index 2fe3f475..59268025 100644 --- a/data/scripts/mtCrenel/script_MountainMinish3.inc +++ b/data/scripts/mtCrenel/script_MountainMinish3.inc @@ -20,28 +20,28 @@ script_0800D292: Jump script_0800D282 script_0800D2B0: EndBlock - _0807E864 + SetPlayerIdle Call sub_08068190 WaitUntilTextboxCloses Wait 0x000f - _0807E878 + EnablePlayerControl Jump script_0800D282 script_0800D2C6: EndBlock SetSyncFlag 0x00000004 WaitForSyncFlagAndClear 0x00000002 SetSyncFlag 0x00000004 - _0807E930 0x000c + SetAnimation 0x000c WaitForSyncFlagAndClear 0x00000001 SetSyncFlag 0x00000004 script_0800D2EA: - _0807E930 0x000b + SetAnimation 0x000b script_0800D2EE: CheckEntityInteractType JumpIfNot script_0800D2EE - _0807E864 + SetPlayerIdle Call sub_08068190 WaitUntilTextboxCloses Wait 0x000f - _0807E878 + EnablePlayerControl Jump script_0800D2EE diff --git a/data/scripts/mtCrenel/script_MountainMinish4.inc b/data/scripts/mtCrenel/script_MountainMinish4.inc index a953ebfa..f1689e97 100644 --- a/data/scripts/mtCrenel/script_MountainMinish4.inc +++ b/data/scripts/mtCrenel/script_MountainMinish4.inc @@ -13,7 +13,7 @@ script_0800D35E: Jump script_0800D35E script_0800D372: EndBlock - _0807E864 + SetPlayerIdle Call sub_08068190 WaitUntilTextboxCloses Wait 0x000f @@ -28,11 +28,11 @@ script_0800D372: StartPlayerScript script_PlayerAtMountainMinishExit WaitForSyncFlagAndClear 0x00000001 script_0800D3B2: - _0807EB44 0x0002 - _0807E930 0x0005 + SetAnimationState 0x0002 + SetAnimation 0x0005 _0807EDD4 0x00a0, 0x0130 - _0807EB44 0x0006 - _0807E930 0x0003 + SetAnimationState 0x0006 + SetAnimation 0x0003 SetIntVariable 0x00000004 Call sub_080681D8 PlaySound SFX_TASK_COMPLETE @@ -40,6 +40,6 @@ script_0800D3B2: DoPostScriptAction 0x000a SetLocalFlag 0x007f script_0800D3E4: - _0807E878 + EnablePlayerControl Jump script_0800D35E .2byte 0x0000 diff --git a/data/scripts/mtCrenel/script_MountainMinish5.inc b/data/scripts/mtCrenel/script_MountainMinish5.inc index a31a712b..edbf2f01 100644 --- a/data/scripts/mtCrenel/script_MountainMinish5.inc +++ b/data/scripts/mtCrenel/script_MountainMinish5.inc @@ -6,35 +6,35 @@ SCRIPT_START script_MountainMinish5 DoPostScriptAction 0x000a EndBlock script_0800D426: - _0807EB44 0x0002 + SetAnimationState 0x0002 SetIntVariable 0x00000000 Call sub_0806AF60 Wait 0x0014 - _0807EB44 0x0004 + SetAnimationState 0x0004 SetIntVariable 0x00000000 Call sub_0806AF60 Wait 0x0014 - _0807EB44 0x0006 + SetAnimationState 0x0006 SetIntVariable 0x00000000 Call sub_0806AF60 Wait 0x0014 - _0807EB44 0x0006 + SetAnimationState 0x0006 SetIntVariable 0x00000004 Call sub_0806AF60 _0807EDD4 0x00a8, 0x01e8 - _0807EB44 0x0006 + SetAnimationState 0x0006 SetIntVariable 0x00000000 Call sub_0806AF60 Wait 0x0014 - _0807EB44 0x0004 + SetAnimationState 0x0004 SetIntVariable 0x00000000 Call sub_0806AF60 Wait 0x0014 - _0807EB44 0x0002 + SetAnimationState 0x0002 SetIntVariable 0x00000000 Call sub_0806AF60 Wait 0x0014 - _0807EB44 0x0002 + SetAnimationState 0x0002 SetIntVariable 0x00000004 Call sub_0806AF60 _0807EDD4 0x0228, 0x01e8 @@ -43,13 +43,13 @@ script_0800D426: BeginBlock DoPostScriptAction 0x000a Call sub_08062A48 - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 script_0800D4E4: EndBlock Call sub_08062698 Call sub_080626AC - CallWithArg sub_0807F0EC, 0x00000009 + CallWithArg GetRandomInt, 0x00000009 JumpTable script_0800D510, script_0800D51A, script_0800D524, script_0800D52E, script_0800D538, script_0800D542, script_0800D54C, script_0800D556, script_0800D560 script_0800D510: _0807EE04 0x0038, 0x0068 @@ -89,10 +89,10 @@ script_0800D566: Jump script_0800D4E4 script_0800D584: EndBlock - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer Call sub_0806265C WaitUntilTextboxCloses Wait 0x000f - _0807E878 + EnablePlayerControl Jump script_0800D4E4 diff --git a/data/scripts/mtCrenel/script_Object6ABrokenSword.inc b/data/scripts/mtCrenel/script_Object6ABrokenSword.inc index d586f992..8a738321 100644 --- a/data/scripts/mtCrenel/script_Object6ABrokenSword.inc +++ b/data/scripts/mtCrenel/script_Object6ABrokenSword.inc @@ -13,7 +13,7 @@ SCRIPT_START script_Object6ABrokenSword SCRIPT_END script_0800D242: DoPostScriptAction 0x0007 - _0807E930 0x0003 + SetAnimation 0x0003 SCRIPT_END script_0800D24C: DoPostScriptAction 0x0006 diff --git a/data/scripts/mtCrenel/script_PlayerAtMelari.inc b/data/scripts/mtCrenel/script_PlayerAtMelari.inc index 409ed3cc..82b3248e 100644 --- a/data/scripts/mtCrenel/script_PlayerAtMelari.inc +++ b/data/scripts/mtCrenel/script_PlayerAtMelari.inc @@ -4,7 +4,7 @@ SCRIPT_START script_PlayerAtMelari SetEntitySpeed 0x0100 EndBlock _0807EDD4 0x0170, 0x0140 - _0807EB44 0x0002 + SetAnimationState 0x0002 DoPostScriptAction 0x0000 SetSyncFlag 0x00000008 Call sub_080791BC diff --git a/data/scripts/mtCrenel/script_PlayerAtMountainMinishExit.inc b/data/scripts/mtCrenel/script_PlayerAtMountainMinishExit.inc index 0934f626..0fda5e29 100644 --- a/data/scripts/mtCrenel/script_PlayerAtMountainMinishExit.inc +++ b/data/scripts/mtCrenel/script_PlayerAtMountainMinishExit.inc @@ -3,10 +3,10 @@ SCRIPT_START script_PlayerAtMountainMinishExit BeginBlock SetEntitySpeed 0x0080 EndBlock - _0807EB44 0x0000 + SetAnimationState 0x0000 DoPostScriptAction 0x0000 DoPostScriptAction 0x000d - _0807ECC4 0x0020 + WalkSouth 0x0020 SetSyncFlag 0x00000001 Call sub_080791BC SCRIPT_END diff --git a/data/scripts/mtCrenel/script_PlayerGetWhiteSword.inc b/data/scripts/mtCrenel/script_PlayerGetWhiteSword.inc index d9138b1b..10eed28e 100644 --- a/data/scripts/mtCrenel/script_PlayerGetWhiteSword.inc +++ b/data/scripts/mtCrenel/script_PlayerGetWhiteSword.inc @@ -1,10 +1,10 @@ @ Mines Player get white sword SCRIPT_START script_PlayerGetWhiteSword _0807F078 0x0002, 0x0001 - CallWithArg sub_0807F918, 0x00000002 + CallWithArg PutItemAnySlot, 0x00000002 PlaySound SFX_109 - CallWithArg sub_0807F238, 0x000001e2 - Call sub_0807F304 + CallWithArg SetPlayerAnimation2, 0x000001e2 + Call WaitForPlayerFrameHiBit MessageNoOverlap 0x0502 WaitUntilTextboxCloses SetSyncFlag 0x00000008 diff --git a/data/scripts/mtCrenel/script_PlayerPlaceBrokenSword.inc b/data/scripts/mtCrenel/script_PlayerPlaceBrokenSword.inc index 0cda5bcd..804412ab 100644 --- a/data/scripts/mtCrenel/script_PlayerPlaceBrokenSword.inc +++ b/data/scripts/mtCrenel/script_PlayerPlaceBrokenSword.inc @@ -5,7 +5,7 @@ SCRIPT_START script_PlayerPlaceBrokenSword EndBlock _0807EDD4 0x0170, 0x0120 _0807EDD4 0x01a8, 0x0120 - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 SetSyncFlag 0x00000008 Call sub_080791BC diff --git a/data/scripts/northHyruleField/script_CarpenterOutsideTown.inc b/data/scripts/northHyruleField/script_CarpenterOutsideTown.inc index c081612b..e9af8375 100644 --- a/data/scripts/northHyruleField/script_CarpenterOutsideTown.inc +++ b/data/scripts/northHyruleField/script_CarpenterOutsideTown.inc @@ -4,22 +4,22 @@ SCRIPT_START script_CarpenterOutsideTown BeginBlock Call sub_08067314 DoPostScriptAction 0x000a - _0807EB44 0x0004 + SetAnimationState 0x0004 SetIntVariable 0x00000000 Call sub_080672B0 EndBlock script_08009592: CheckEntityInteractType JumpIfNot script_08009592 - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer SetIntVariable 0x00000004 Call sub_080672B0 Call sub_080672C8 WaitUntilTextboxCloses Wait 0x000f - _0807E878 - _0807EB44 0x0004 + EnablePlayerControl + SetAnimationState 0x0004 SetIntVariable 0x00000000 Call sub_080672B0 Jump script_08009592 diff --git a/data/scripts/northHyruleField/script_GuardNorthHyruleField.inc b/data/scripts/northHyruleField/script_GuardNorthHyruleField.inc index fb4474ad..f0acd305 100644 --- a/data/scripts/northHyruleField/script_GuardNorthHyruleField.inc +++ b/data/scripts/northHyruleField/script_GuardNorthHyruleField.inc @@ -2,7 +2,7 @@ @ also at Lon Lon Ranch SCRIPT_START script_GuardNorthHyruleField BeginBlock - _0807EB44 0x0004 + SetAnimationState 0x0004 _0807E9D4 DoPostScriptAction 0x000a CallWithArg sub_0807F3D8, 0x00000000 @@ -10,11 +10,11 @@ SCRIPT_START script_GuardNorthHyruleField script_08014E2C: CheckEntityInteractType JumpIfNot script_08014E2C - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer CallWithArg sub_0807F3D8, 0x00000000 Call sub_08064428 WaitUntilTextboxCloses - _0807E878 + EnablePlayerControl Jump script_08014E2C .2byte 0x0000 diff --git a/data/scripts/northHyruleField/script_MutohOutsideTown.inc b/data/scripts/northHyruleField/script_MutohOutsideTown.inc index 11002fe7..72f84118 100644 --- a/data/scripts/northHyruleField/script_MutohOutsideTown.inc +++ b/data/scripts/northHyruleField/script_MutohOutsideTown.inc @@ -3,19 +3,19 @@ SCRIPT_START script_MutohOutsideTown BeginBlock Call sub_08067100 DoPostScriptAction 0x000a - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 EndBlock script_08009512: CheckEntityInteractType JumpIfNot script_08009512 - _0807E864 + SetPlayerIdle DoPostScriptAction 0x0001 - _0807EB74 + FacePlayer Call sub_080670B4 WaitUntilTextboxCloses - _0807E878 - _0807EB44 0x0004 + EnablePlayerControl + SetAnimationState 0x0004 DoPostScriptAction 0x0000 Jump script_08009512 .2byte 0x0000 diff --git a/data/scripts/northHyruleField/script_Object69FixBridge.inc b/data/scripts/northHyruleField/script_Object69FixBridge.inc index 3dff4c45..e7fca431 100644 --- a/data/scripts/northHyruleField/script_Object69FixBridge.inc +++ b/data/scripts/northHyruleField/script_Object69FixBridge.inc @@ -14,14 +14,14 @@ SCRIPT_START script_Object69FixBridge .endif .endif .endif - _0807E864 + SetPlayerIdle MoveEntityToPlayer CameraTargetEntity SetEntitySpeed 0x0200 EndBlock Wait 0x000f _0807E8E4_2 - Call sub_0807F3F8 + Call CreatePlayerExclamationMark Wait 0x001e _0807EDD4 0x00b8, 0x0258 Wait 0x001e @@ -29,6 +29,6 @@ SCRIPT_START script_Object69FixBridge Wait 0x0078 _0807EEB4 CameraTargetPlayer - _0807E878 + EnablePlayerControl DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/npc/script_BladeBrothers.inc b/data/scripts/npc/script_BladeBrothers.inc index 8fec6673..e42d8c46 100644 --- a/data/scripts/npc/script_BladeBrothers.inc +++ b/data/scripts/npc/script_BladeBrothers.inc @@ -1,9 +1,9 @@ @ Blade Brothers SCRIPT_START script_BladeBrothers BeginBlock - Call sub_0807F348 + Call SetPriorityMessage DoPostScriptAction 0x000a - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 EndBlock script_080161FE: @@ -11,9 +11,9 @@ script_080161FE: script_08016204: CheckEntityInteractType JumpIfNot script_08016204 - _0807E864 + SetPlayerIdle Call sub_0807DF28 - _0807EB74 + FacePlayer Call sub_08068CA0 JumpIf script_0801633E Call sub_08068CFC @@ -26,7 +26,7 @@ script_08016204: JumpIfNot script_08016346 StartPlayerScript script_PlayerAtBladeBrothers WaitForSyncFlagAndClear 0x00000001 - _0807EB74 + FacePlayer Call sub_08068C8C JumpIf script_08016262 Call sub_08068DE8 @@ -36,14 +36,14 @@ script_08016262: Call sub_08068E00 WaitUntilTextboxCloses DoPostScriptAction 0x0001 - Call sub_0807F2D4 + Call WaitForFrameHiBit Call sub_08068E90 Call sub_08068C8C JumpIf script_0801631C Call sub_08068F00 Call sub_08068F14 Call sub_08068BB4 - CallWithArg sub_0807F244, 0x00010001 + CallWithArg EquipItem, 0x00010001 Call sub_08068B84 Call sub_0807F2A8 Call sub_08068BD0 @@ -52,7 +52,7 @@ script_08016262: WaitUntilTextboxCloses Call sub_08068EB4 Call sub_0807DF50 - _0807E878 + EnablePlayerControl script_080162CC: EndBlock BeginBlock @@ -63,17 +63,17 @@ script_080162CC: Jump script_080162CC script_080162E4: EndBlock - _0807E864 + SetPlayerIdle Call sub_08068E78 WaitUntilTextboxCloses - _0807E878 + EnablePlayerControl Jump script_080162CC script_080162F6: EndBlock - _0807E888 - Call sub_0807F594 + DisablePlayerControl + Call WaitForPlayerIdle Call sub_0807DF28 - _0807E864 + SetPlayerIdle StopBgm PlaySound SFX_TASK_COMPLETE Wait 0x003c @@ -95,8 +95,8 @@ script_0801633E: WaitUntilTextboxCloses script_08016346: Call sub_0807DF50 - _0807E878 - _0807EB44 0x0004 + EnablePlayerControl + SetAnimationState 0x0004 DoPostScriptAction 0x0000 Jump script_080161FE .2byte 0x0000 diff --git a/data/scripts/npc/script_Farmer.inc b/data/scripts/npc/script_Farmer.inc index 7316606b..a03617d1 100644 --- a/data/scripts/npc/script_Farmer.inc +++ b/data/scripts/npc/script_Farmer.inc @@ -9,23 +9,23 @@ script_0800B0E8: Call sub_0807F434 JumpTable script_0800B0E8, script_0800B0F6, script_0800B134 script_0800B0F6: - _0807E864 + SetPlayerIdle Call sub_0807DF28 - Call sub_0807F2D4 - _0807EB74 + Call WaitForFrameHiBit + FacePlayer CallWithArg sub_0806BC94, 0x00000004 Call sub_0806BCE8 WaitUntilTextboxCloses Call sub_0807DF50 - _0807E878 + EnablePlayerControl Call sub_0806BCB8 CallWithArg sub_0806BC94, 0x00000000 Jump script_0800B0E8 script_0800B134: - _0807E864 + SetPlayerIdle Call sub_0807DF28 - Call sub_0807F2D4 - _0807EB74 + Call WaitForFrameHiBit + FacePlayer CallWithArg sub_0806BC94, 0x00000004 Call sub_0807F650 _0807E9F0 @@ -35,7 +35,7 @@ script_0800B134: Call sub_0806BCC0 script_0800B160: Call sub_0807DF50 - _0807E878 + EnablePlayerControl Call sub_0806BCB8 CallWithArg sub_0806BC94, 0x00000000 Jump script_0800B0E8 diff --git a/data/scripts/npc/script_ForestMinish12.inc b/data/scripts/npc/script_ForestMinish12.inc index 0ba2e7ea..944ee213 100644 --- a/data/scripts/npc/script_ForestMinish12.inc +++ b/data/scripts/npc/script_ForestMinish12.inc @@ -4,7 +4,7 @@ SCRIPT_START script_ForestMinish12 _0807E9D4 EndBlock script_080165FE: - _0807E30C + FacePlayerAndCheckDist JumpIfNot script_080165FE MessageFromTarget 0x0601 Jump script_080165FE diff --git a/data/scripts/npc/script_ForestMinish13.inc b/data/scripts/npc/script_ForestMinish13.inc index c277126a..448f7c85 100644 --- a/data/scripts/npc/script_ForestMinish13.inc +++ b/data/scripts/npc/script_ForestMinish13.inc @@ -4,11 +4,11 @@ SCRIPT_START script_ForestMinish13 _0807E9D4 EndBlock script_08016612: - _0807E944 - _0807E864 + TriggerInteract + SetPlayerIdle MessageFromTarget 0x0602 WaitUntilTextboxCloses Wait 0x000f - _0807E878 + EnablePlayerControl Jump script_08016612 .2byte 0x0000 diff --git a/data/scripts/npc/script_ForestMinish14.inc b/data/scripts/npc/script_ForestMinish14.inc index 7eb3fa47..6fb1a794 100644 --- a/data/scripts/npc/script_ForestMinish14.inc +++ b/data/scripts/npc/script_ForestMinish14.inc @@ -4,11 +4,11 @@ SCRIPT_START script_ForestMinish14 _0807E9D4 EndBlock script_0801662E: - _0807E944 - _0807E864 - _0807EB28 0x0603 + TriggerInteract + SetPlayerIdle + EzloMessage 0x0603 WaitUntilTextboxCloses Wait 0x000f - _0807E878 + EnablePlayerControl Jump script_0801662E .2byte 0x0000 diff --git a/data/scripts/npc/script_ForestMinish15.inc b/data/scripts/npc/script_ForestMinish15.inc index c9b227b0..9ab52552 100644 --- a/data/scripts/npc/script_ForestMinish15.inc +++ b/data/scripts/npc/script_ForestMinish15.inc @@ -2,12 +2,12 @@ SCRIPT_START script_ForestMinish15 SetEntitySpeed 0x0100 script_08016648: - _0807ECF4 0x0030 + WalkWest 0x0030 Wait 0x0008 - _0807ECC4 0x0030 + WalkSouth 0x0030 Wait 0x0008 - _0807EC94 0x0030 + WalkEast 0x0030 Wait 0x0008 - _0807EC64 0x0030 + WalkNorth 0x0030 Wait 0x0008 Jump script_08016648 diff --git a/data/scripts/npc/script_ForestMinish18.inc b/data/scripts/npc/script_ForestMinish18.inc index 4198e7da..140817c4 100644 --- a/data/scripts/npc/script_ForestMinish18.inc +++ b/data/scripts/npc/script_ForestMinish18.inc @@ -2,38 +2,38 @@ SCRIPT_START script_ForestMinish18 SetEntitySpeed 0x0100 script_08016700: - _0807EC94 0x0030 + WalkEast 0x0030 SetSyncFlag 0x00000002 Wait 0x000f DoPostScriptAction 0x0000 - _0807EB44 0x0004 + SetAnimationState 0x0004 WaitForSyncFlag 0x00000001 ClearSyncFlag 0x00000001 DoPostScriptAction 0x0003 Wait 0x0002 - _0807EB44 0x0006 + SetAnimationState 0x0006 Wait 0x0002 - _0807EB44 0x0000 + SetAnimationState 0x0000 Wait 0x0002 - _0807EB44 0x0002 + SetAnimationState 0x0002 Wait 0x0002 - _0807EB44 0x0004 + SetAnimationState 0x0004 WaitForSyncFlag 0x00000001 ClearSyncFlag 0x00000001 - _0807ECF4 0x0030 + WalkWest 0x0030 Wait 0x000f DoPostScriptAction 0x0000 - _0807EB44 0x0004 + SetAnimationState 0x0004 Wait 0x001e SetSyncFlag 0x00000006 DoPostScriptAction 0x0003 Wait 0x0002 - _0807EB44 0x0006 + SetAnimationState 0x0006 Wait 0x0002 - _0807EB44 0x0000 + SetAnimationState 0x0000 Wait 0x0002 - _0807EB44 0x0002 + SetAnimationState 0x0002 Wait 0x0002 - _0807EB44 0x0004 + SetAnimationState 0x0004 Wait 0x003c Jump script_08016700 diff --git a/data/scripts/npc/script_ForestMinish19.inc b/data/scripts/npc/script_ForestMinish19.inc index 1e5e8056..44ac6a5f 100644 --- a/data/scripts/npc/script_ForestMinish19.inc +++ b/data/scripts/npc/script_ForestMinish19.inc @@ -4,38 +4,38 @@ SCRIPT_START script_ForestMinish19 script_0801679C: WaitForSyncFlag 0x00000002 ClearSyncFlag 0x00000002 - _0807EC94 0x0030 + WalkEast 0x0030 SetSyncFlag 0x00000004 Wait 0x000f DoPostScriptAction 0x0000 - _0807EB44 0x0004 + SetAnimationState 0x0004 WaitForSyncFlag 0x00000002 ClearSyncFlag 0x00000002 DoPostScriptAction 0x0003 Wait 0x0002 - _0807EB44 0x0006 + SetAnimationState 0x0006 Wait 0x0002 - _0807EB44 0x0000 + SetAnimationState 0x0000 Wait 0x0002 - _0807EB44 0x0002 + SetAnimationState 0x0002 Wait 0x0002 - _0807EB44 0x0004 + SetAnimationState 0x0004 WaitForSyncFlag 0x00000002 ClearSyncFlag 0x00000002 - _0807ECF4 0x0030 + WalkWest 0x0030 SetSyncFlag 0x00000001 Wait 0x000f DoPostScriptAction 0x0000 - _0807EB44 0x0004 + SetAnimationState 0x0004 WaitForSyncFlag 0x00000002 ClearSyncFlag 0x00000002 DoPostScriptAction 0x0003 Wait 0x0002 - _0807EB44 0x0006 + SetAnimationState 0x0006 Wait 0x0002 - _0807EB44 0x0000 + SetAnimationState 0x0000 Wait 0x0002 - _0807EB44 0x0002 + SetAnimationState 0x0002 Wait 0x0002 - _0807EB44 0x0004 + SetAnimationState 0x0004 Jump script_0801679C diff --git a/data/scripts/npc/script_ForestMinish20.inc b/data/scripts/npc/script_ForestMinish20.inc index e9aa1833..e07a0ef3 100644 --- a/data/scripts/npc/script_ForestMinish20.inc +++ b/data/scripts/npc/script_ForestMinish20.inc @@ -4,36 +4,36 @@ SCRIPT_START script_ForestMinish20 script_08016848: WaitForSyncFlag 0x00000004 ClearSyncFlag 0x00000004 - _0807EC94 0x0030 + WalkEast 0x0030 Wait 0x000f DoPostScriptAction 0x0000 - _0807EB44 0x0004 + SetAnimationState 0x0004 Wait 0x001e SetSyncFlag 0x00000003 DoPostScriptAction 0x0003 Wait 0x0002 - _0807EB44 0x0006 + SetAnimationState 0x0006 Wait 0x0002 - _0807EB44 0x0000 + SetAnimationState 0x0000 Wait 0x0002 - _0807EB44 0x0002 + SetAnimationState 0x0002 Wait 0x0002 - _0807EB44 0x0004 + SetAnimationState 0x0004 Wait 0x003c - _0807ECF4 0x0030 + WalkWest 0x0030 SetSyncFlag 0x00000002 Wait 0x000f DoPostScriptAction 0x0000 - _0807EB44 0x0004 + SetAnimationState 0x0004 WaitForSyncFlag 0x00000004 ClearSyncFlag 0x00000004 DoPostScriptAction 0x0003 Wait 0x0002 - _0807EB44 0x0006 + SetAnimationState 0x0006 Wait 0x0002 - _0807EB44 0x0000 + SetAnimationState 0x0000 Wait 0x0002 - _0807EB44 0x0002 + SetAnimationState 0x0002 Wait 0x0002 - _0807EB44 0x0004 + SetAnimationState 0x0004 Jump script_08016848 diff --git a/data/scripts/npc/script_ForestMinish21.inc b/data/scripts/npc/script_ForestMinish21.inc index 4708f47d..f6b901c9 100644 --- a/data/scripts/npc/script_ForestMinish21.inc +++ b/data/scripts/npc/script_ForestMinish21.inc @@ -4,8 +4,8 @@ SCRIPT_START script_ForestMinish21 _0807E9D4 EndBlock script_080168E6: - _0807E944 - _0807E864 + TriggerInteract + SetPlayerIdle Wait 0x000f - _0807E878 + EnablePlayerControl Jump script_080168E6 diff --git a/data/scripts/npc/script_MysteriousWall.inc b/data/scripts/npc/script_MysteriousWall.inc index a55a6817..d7a22778 100644 --- a/data/scripts/npc/script_MysteriousWall.inc +++ b/data/scripts/npc/script_MysteriousWall.inc @@ -13,12 +13,12 @@ script_0800B98A: _0807E9F0 JumpIf script_0800B99E Call sub_0807DF50 - _0807E878 + EnablePlayerControl Jump script_0800B98A script_0800B99E: Call sub_0806F188 Call sub_0807DF50 - _0807E878 + EnablePlayerControl script_0800B9AC: DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/npc/script_PlayerAtBladeBrothers.inc b/data/scripts/npc/script_PlayerAtBladeBrothers.inc index 7db4fb9c..d2025632 100644 --- a/data/scripts/npc/script_PlayerAtBladeBrothers.inc +++ b/data/scripts/npc/script_PlayerAtBladeBrothers.inc @@ -2,7 +2,7 @@ SCRIPT_START script_PlayerAtBladeBrothers SetEntitySpeed 0x0100 _0807EDD4 0x0078, 0x0050 - _0807EB44 0x0000 + SetAnimationState 0x0000 DoPostScriptAction 0x0000 SetSyncFlag 0x00000001 Call sub_080791BC diff --git a/data/scripts/npc/script_PlayerAtGreatFairy.inc b/data/scripts/npc/script_PlayerAtGreatFairy.inc index 8839a3cb..af017dba 100644 --- a/data/scripts/npc/script_PlayerAtGreatFairy.inc +++ b/data/scripts/npc/script_PlayerAtGreatFairy.inc @@ -18,8 +18,8 @@ script_0800B7FC: Jump script_0800B7EE BeginBlock DoPostScriptAction 0x0007 - _0807EB44 0x0004 - _0807E930 0x0000 + SetAnimationState 0x0004 + SetAnimation 0x0000 EndBlock SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/npc/script_TingleSiblings.inc b/data/scripts/npc/script_TingleSiblings.inc index 8393ee87..f877881f 100644 --- a/data/scripts/npc/script_TingleSiblings.inc +++ b/data/scripts/npc/script_TingleSiblings.inc @@ -2,52 +2,52 @@ SCRIPT_START script_TingleSiblings BeginBlock Call sub_08064EA4 - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 DoPostScriptAction 0x000a EndBlock script_0801690A: - _0807E30C + FacePlayerAndCheckDist JumpIfNot script_0801690A - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer Call sub_08064F28 WaitUntilTextboxCloses JumpIfNot script_08016926 GivePlayerItem 0x003d WaitPlayerGetItem script_08016926: - _0807E878 + EnablePlayerControl SetGlobalFlag 0x005c Jump script_0801690A BeginBlock _0807E9D4 - _0807EB44 0x0000 + SetAnimationState 0x0000 DoPostScriptAction 0x000a EndBlock script_0801693E: - _0807E944 - _0807E864 + TriggerInteract + SetPlayerIdle Wait 0x0018 MessageFromTarget 0x0a01 WaitUntilTextboxCloses Wait 0x000f - _0807E878 + EnablePlayerControl Jump script_0801693E .2byte 0x0000 BeginBlock _0807E9D4 - _0807EB44 0x0000 + SetAnimationState 0x0000 DoPostScriptAction 0x000a - _0807E930 0x0000 + SetAnimation 0x0000 EndBlock script_0801696A: - _0807E944 - _0807E864 + TriggerInteract + SetPlayerIdle Wait 0x0018 MessageFromTarget 0x0a01 WaitUntilTextboxCloses Wait 0x000f - _0807E878 + EnablePlayerControl Jump script_0801696A .2byte 0x0000 diff --git a/data/scripts/npc/script_Windcrest.inc b/data/scripts/npc/script_Windcrest.inc index ef4d0c4d..bc49eddd 100644 --- a/data/scripts/npc/script_Windcrest.inc +++ b/data/scripts/npc/script_Windcrest.inc @@ -9,7 +9,7 @@ SCRIPT_START script_Windcrest script_0800B024: CheckEntityInteractType JumpIfNot script_0800B024 - _0807E864 + SetPlayerIdle Call sub_0807DF28 CheckGlobalFlag 0x0052 JumpIf script_0800B082 @@ -20,7 +20,7 @@ script_0800B024: DoPostScriptAction 0x0008 Call Windcrest_Unlock Wait 0x003c - _0807EB28 0x0b5c + EzloMessage 0x0b5c WaitUntilTextboxCloses SetGlobalFlag 0x0053 Jump script_0800B09C @@ -30,7 +30,7 @@ script_0800B064: DoPostScriptAction 0x0008 Call Windcrest_Unlock Wait 0x003c - _0807EB28 0x0b5d + EzloMessage 0x0b5d WaitUntilTextboxCloses Jump script_0800B09C script_0800B082: @@ -39,11 +39,11 @@ script_0800B082: DoPostScriptAction 0x0008 Call Windcrest_Unlock Wait 0x003c - _0807EB28 0x0b5e + EzloMessage 0x0b5e WaitUntilTextboxCloses script_0800B09C: Call sub_0807DF50 - _0807E878 + EnablePlayerControl DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/sanctuary/script_08013F94.inc b/data/scripts/sanctuary/script_08013F94.inc index ec8cf7c0..4dc3b9e0 100644 --- a/data/scripts/sanctuary/script_08013F94.inc +++ b/data/scripts/sanctuary/script_08013F94.inc @@ -13,15 +13,15 @@ script_08013FA4: CheckPlayerFlags 0x00400000 JumpIfNot script_08013FA4 EndBlock - Call sub_0807FA40 - _0807E888 + Call WaitForPlayerNormalOrTalkEzlo + DisablePlayerControl Call sub_0807DF38 Wait 0x0078 - _0807EB28 0x1505 + EzloMessage 0x1505 WaitUntilTextboxCloses SetLocalFlag 0x007d Call sub_0807DF50 - _0807E878 + EnablePlayerControl script_08013FE0: DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/sanctuary/script_NPC4EPreventPlayerLeave.inc b/data/scripts/sanctuary/script_NPC4EPreventPlayerLeave.inc index 56929281..8dca707e 100644 --- a/data/scripts/sanctuary/script_NPC4EPreventPlayerLeave.inc +++ b/data/scripts/sanctuary/script_NPC4EPreventPlayerLeave.inc @@ -15,17 +15,17 @@ script_08013FF0: CallWithArg sub_0807F6B4, 0x000000d0 JumpIfNot script_08013FF0 EndBlock - Call sub_0807F9A4 + Call WaitForPlayerNormal BeginBlock - _0807E864 + SetPlayerIdle Call sub_0807DF28 EndBlock - _0807EB28 0x1508 + EzloMessage 0x1508 WaitUntilTextboxCloses StartPlayerScript script_PlayerSanctuary WaitForSyncFlagAndClear 0x00000001 Call sub_0807DF50 - _0807E878 + EnablePlayerControl Jump script_08013FF0 script_0801404C: DoPostScriptAction 0x0006 diff --git a/data/scripts/sanctuary/script_Npc4EFinalSwordRumble.inc b/data/scripts/sanctuary/script_Npc4EFinalSwordRumble.inc index 3939de1e..d5c22881 100644 --- a/data/scripts/sanctuary/script_Npc4EFinalSwordRumble.inc +++ b/data/scripts/sanctuary/script_Npc4EFinalSwordRumble.inc @@ -1,6 +1,6 @@ @ Sanctuary NPC4E Rumble after fusing final sword SCRIPT_START script_Npc4EFinalSwordRumble - Call sub_0807F3F8 + Call CreatePlayerExclamationMark Wait 0x003c .ifdef EU _0807F0B4 0x0007 @@ -23,13 +23,13 @@ SCRIPT_START script_Npc4EFinalSwordRumble MoveEntityToPlayer CameraTargetEntity Wait 0x003c - _0807EB28 0x1502 + EzloMessage 0x1502 WaitUntilTextboxCloses _0807F0B4 0x0004 CameraTargetPlayer SetLocalFlag 0x007c Call sub_08053250 Call sub_0807DF50 - _0807E878 + EnablePlayerControl DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/sanctuary/script_Npc4ELookAtPictureAgain.inc b/data/scripts/sanctuary/script_Npc4ELookAtPictureAgain.inc index 26ed2582..dcc7d6c7 100644 --- a/data/scripts/sanctuary/script_Npc4ELookAtPictureAgain.inc +++ b/data/scripts/sanctuary/script_Npc4ELookAtPictureAgain.inc @@ -13,9 +13,9 @@ script_0801427C: script_08014298: CheckEntityInteractType JumpIfNot script_08014298 - _0807E864 + SetPlayerIdle MessageFromTargetPos 0x0647, 0x000c WaitUntilTextboxCloses - _0807E878 + EnablePlayerControl Jump script_08014298 .2byte 0x0000 diff --git a/data/scripts/sanctuary/script_Npc4EPedestal.inc b/data/scripts/sanctuary/script_Npc4EPedestal.inc index 43bc49a9..6662c61f 100644 --- a/data/scripts/sanctuary/script_Npc4EPedestal.inc +++ b/data/scripts/sanctuary/script_Npc4EPedestal.inc @@ -10,7 +10,7 @@ SCRIPT_START script_Npc4EPedestal script_080134F8: CheckEntityInteractType JumpIfNot script_080134F8 - _0807E864 + SetPlayerIdle Call sub_0807DF28 StartPlayerScript script_PlayerAtPedestal WaitForSyncFlagAndClear 0x00000001 @@ -55,15 +55,15 @@ script_080134F8: _0807F078 0x0003, 0x0001 Call sub_0806DC3C Call sub_0806DC58 - Call sub_0807F304 + Call WaitForPlayerFrameHiBit Wait 0x003c - _0807E778 0x0004 + SetFadeTime 0x0004 DoFade7 PlaySound SFX_EVAPORATE WaitForFadeFinish Wait 0x003c SetSyncFlag 0x00000010 - _0807E778 0x0002 + SetFadeTime 0x0002 DoFade6 WaitForFadeFinish PlaySound SFX_109 diff --git a/data/scripts/sanctuary/script_Npc4EPreventPlayerLeaving.inc b/data/scripts/sanctuary/script_Npc4EPreventPlayerLeaving.inc index d34f479b..11af2ca2 100644 --- a/data/scripts/sanctuary/script_Npc4EPreventPlayerLeaving.inc +++ b/data/scripts/sanctuary/script_Npc4EPreventPlayerLeaving.inc @@ -12,14 +12,14 @@ script_08013B1E: CheckLocalFlag 0x0078 JumpIf script_08013B1E EndBlock - _0807E864 - Call sub_0807F9A4 + SetPlayerIdle + Call WaitForPlayerNormal Call sub_0807DF28 - _0807EB28 0x1507 + EzloMessage 0x1507 WaitUntilTextboxCloses StartPlayerScript script_PlayerSanctuary WaitForSyncFlagAndClear 0x00000001 Call sub_0807DF50 - _0807E878 + EnablePlayerControl Jump script_08013B1E .2byte 0x0000 diff --git a/data/scripts/sanctuary/script_Npc4ESanctuaryIntro.inc b/data/scripts/sanctuary/script_Npc4ESanctuaryIntro.inc index d52e0ba7..df1b5847 100644 --- a/data/scripts/sanctuary/script_Npc4ESanctuaryIntro.inc +++ b/data/scripts/sanctuary/script_Npc4ESanctuaryIntro.inc @@ -4,23 +4,23 @@ SCRIPT_START script_Npc4ESanctuaryIntro script_08013CA6: CheckPlayerInRegion 0x00e8, 0x01e8, 0x4080 JumpIfNot script_08013CA6 - _0807E864 - Call sub_0807F9A4 + SetPlayerIdle + Call WaitForPlayerNormal Call sub_0807DF28 - Call sub_0807F3F8 + Call CreatePlayerExclamationMark Wait 0x003c _0807F0B4 0x0001 SetEntityPositionRelative 0x00e8, 0x0138 CameraTargetEntity - Call sub_0807F5C0 + Call WaitForCameraTouchRoomBorder Wait 0x0078 _0807F0B4 0x0004 CameraTargetPlayer - Call sub_0807F5C0 - _0807EB28 0x1504 + Call WaitForCameraTouchRoomBorder + EzloMessage 0x1504 WaitUntilTextboxCloses SetLocalFlag 0x0079 Call sub_0807DF50 - _0807E878 + EnablePlayerControl DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/sanctuary/script_Npc4ESecondSanctuary.inc b/data/scripts/sanctuary/script_Npc4ESecondSanctuary.inc index e5bef48f..155c1dbf 100644 --- a/data/scripts/sanctuary/script_Npc4ESecondSanctuary.inc +++ b/data/scripts/sanctuary/script_Npc4ESecondSanctuary.inc @@ -10,7 +10,7 @@ SCRIPT_START script_Npc4ESecondSanctuary script_0801373C: CheckEntityInteractType JumpIfNot script_0801373C - _0807E864 + SetPlayerIdle Call sub_0807DF28 StartPlayerScript script_PlayerAtPedestal WaitForSyncFlagAndClear 0x00000001 @@ -58,15 +58,15 @@ script_0801373C: _0807F078 0x0004, 0x0001 Call sub_0806DC3C Call sub_0806DC58 - Call sub_0807F304 + Call WaitForPlayerFrameHiBit Wait 0x003c - _0807E778 0x0004 + SetFadeTime 0x0004 DoFade7 PlaySound SFX_EVAPORATE WaitForFadeFinish Wait 0x003c SetSyncFlag 0x00000010 - _0807E778 0x0002 + SetFadeTime 0x0002 DoFade6 WaitForFadeFinish PlaySound SFX_109 @@ -76,7 +76,7 @@ script_0801373C: SetLocalFlag 0x007b Call sub_08053250 Call sub_0807DF50 - _0807E878 + EnablePlayerControl DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/sanctuary/script_Npc4ESpawnTextBoard.inc b/data/scripts/sanctuary/script_Npc4ESpawnTextBoard.inc index 24eb4ce1..4c913d06 100644 --- a/data/scripts/sanctuary/script_Npc4ESpawnTextBoard.inc +++ b/data/scripts/sanctuary/script_Npc4ESpawnTextBoard.inc @@ -1,6 +1,6 @@ @ Sanctuary NPC4E spawn text board SCRIPT_START script_Npc4ESpawnTextBoard - Call sub_0807F3F8 + Call CreatePlayerExclamationMark Wait 0x003c _0807F0B4 0x0007 SetEntityPositionRelative 0x00e8, 0x00a8 @@ -12,13 +12,13 @@ SCRIPT_START script_Npc4ESpawnTextBoard _0807F0C8 0x0000, 0x0000 StartPlayerScript script_PlayerTextBoardAppears WaitForSyncFlagAndClear 0x00000002 - _0807EB28 0x1501 + EzloMessage 0x1501 WaitUntilTextboxCloses _0807F0B4 0x0004 CameraTargetPlayer SetLocalFlag 0x007a Call sub_08053250 Call sub_0807DF50 - _0807E878 + EnablePlayerControl DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/sanctuary/script_Npc4EThirdSanctuary.inc b/data/scripts/sanctuary/script_Npc4EThirdSanctuary.inc index 05e2ccd9..9a57f37f 100644 --- a/data/scripts/sanctuary/script_Npc4EThirdSanctuary.inc +++ b/data/scripts/sanctuary/script_Npc4EThirdSanctuary.inc @@ -10,7 +10,7 @@ SCRIPT_START script_Npc4EThirdSanctuary script_080138D0: CheckEntityInteractType JumpIfNot script_080138D0 - _0807E864 + SetPlayerIdle Call sub_0807DF28 StartPlayerScript script_PlayerAtPedestal WaitForSyncFlagAndClear 0x00000001 @@ -63,15 +63,15 @@ script_080138D0: Call sub_0807AEE4 Call sub_0806DC3C Call sub_0806DC58 - Call sub_0807F304 + Call WaitForPlayerFrameHiBit Wait 0x003c - _0807E778 0x0004 + SetFadeTime 0x0004 DoFade7 PlaySound SFX_EVAPORATE WaitForFadeFinish Wait 0x003c SetSyncFlag 0x00000010 - _0807E778 0x0002 + SetFadeTime 0x0002 DoFade6 WaitForFadeFinish PlaySound SFX_109 @@ -84,7 +84,7 @@ script_080138D0: CameraTargetEntity .endif Call sub_0806DC3C - CallWithArg sub_0807F244, 0x00010001 + CallWithArg EquipItem, 0x00010001 CallWithArg sub_0807F29C, gUnk_080049FE Wait 0x00c8 CallWithArg sub_0807F29C, 0x00000000 diff --git a/data/scripts/sanctuary/script_Object6AEarthElement.inc b/data/scripts/sanctuary/script_Object6AEarthElement.inc index 55980676..6754c480 100644 --- a/data/scripts/sanctuary/script_Object6AEarthElement.inc +++ b/data/scripts/sanctuary/script_Object6AEarthElement.inc @@ -2,9 +2,9 @@ SCRIPT_START script_Object6AEarthElement BeginBlock DoPostScriptAction 0x0007 - Call sub_0807F180 + Call SetCollisionLayer2 SetEntityPositionRelative 0x00b0, 0x00f8 - _0807E930 0x0001 + SetAnimation 0x0001 EndBlock SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/sanctuary/script_Object6AEarthElementFloating.inc b/data/scripts/sanctuary/script_Object6AEarthElementFloating.inc index 4ab4fd4d..e6a7c7b8 100644 --- a/data/scripts/sanctuary/script_Object6AEarthElementFloating.inc +++ b/data/scripts/sanctuary/script_Object6AEarthElementFloating.inc @@ -2,11 +2,11 @@ SCRIPT_START script_Object6AEarthElementFloating BeginBlock DoPostScriptAction 0x0007 - _0807E930 0x0000 + SetAnimation 0x0000 EndBlock SetEntitySpeed 0x0080 _0807EDD4 0x00b0, 0x00f8 - _0807E930 0x0001 + SetAnimation 0x0001 SetSyncFlag 0x08000000 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/sanctuary/script_Object6AFireElement.inc b/data/scripts/sanctuary/script_Object6AFireElement.inc index 48385c7a..e82683c5 100644 --- a/data/scripts/sanctuary/script_Object6AFireElement.inc +++ b/data/scripts/sanctuary/script_Object6AFireElement.inc @@ -2,9 +2,9 @@ SCRIPT_START script_Object6AFireElement BeginBlock DoPostScriptAction 0x0007 - Call sub_0807F180 + Call SetCollisionLayer2 SetEntityPositionRelative 0x0120, 0x00f8 - _0807E930 0x0003 + SetAnimation 0x0003 EndBlock SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/sanctuary/script_Object6AFireElementFloating.inc b/data/scripts/sanctuary/script_Object6AFireElementFloating.inc index 0e1febcc..65938a07 100644 --- a/data/scripts/sanctuary/script_Object6AFireElementFloating.inc +++ b/data/scripts/sanctuary/script_Object6AFireElementFloating.inc @@ -2,11 +2,11 @@ SCRIPT_START script_Object6AFireElementFloating BeginBlock DoPostScriptAction 0x0007 - _0807E930 0x0002 + SetAnimation 0x0002 EndBlock SetEntitySpeed 0x0080 _0807EDD4 0x0120, 0x00f8 - _0807E930 0x0003 + SetAnimation 0x0003 SetSyncFlag 0x10000000 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/sanctuary/script_Object6ASword2.inc b/data/scripts/sanctuary/script_Object6ASword2.inc index fab7bbba..2acab4f5 100644 --- a/data/scripts/sanctuary/script_Object6ASword2.inc +++ b/data/scripts/sanctuary/script_Object6ASword2.inc @@ -2,11 +2,11 @@ SCRIPT_START script_Object6ASword2 BeginBlock DoPostScriptAction 0x0007 - _0807E930 0x0009 + SetAnimation 0x0009 EndBlock WaitForSyncFlagAndClear 0x00000080 - _0807E930 0x000c - Call sub_0807F2D4 + SetAnimation 0x000c + Call WaitForFrameHiBit SetSyncFlag 0x00000100 WaitForSyncFlagAndClear 0x00000080 DoPostScriptAction 0x0006 diff --git a/data/scripts/sanctuary/script_Object6ASword3.inc b/data/scripts/sanctuary/script_Object6ASword3.inc index 74a51519..38b36455 100644 --- a/data/scripts/sanctuary/script_Object6ASword3.inc +++ b/data/scripts/sanctuary/script_Object6ASword3.inc @@ -2,11 +2,11 @@ SCRIPT_START script_Object6ASword3 BeginBlock DoPostScriptAction 0x0007 - _0807E930 0x000a + SetAnimation 0x000a EndBlock WaitForSyncFlagAndClear 0x00000080 - _0807E930 0x000d - Call sub_0807F2D4 + SetAnimation 0x000d + Call WaitForFrameHiBit SetSyncFlag 0x00000100 WaitForSyncFlagAndClear 0x00000080 DoPostScriptAction 0x0006 diff --git a/data/scripts/sanctuary/script_Object6ASwordChange1.inc b/data/scripts/sanctuary/script_Object6ASwordChange1.inc index d17fcb9e..6285b5c4 100644 --- a/data/scripts/sanctuary/script_Object6ASwordChange1.inc +++ b/data/scripts/sanctuary/script_Object6ASwordChange1.inc @@ -2,7 +2,7 @@ SCRIPT_START script_Object6ASwordChange1 BeginBlock DoPostScriptAction 0x0007 - _0807E930 0x0000 + SetAnimation 0x0000 Call sub_0807F738 EndBlock WaitForSyncFlag 0x00000040 diff --git a/data/scripts/sanctuary/script_Object6ASwordCharge10.inc b/data/scripts/sanctuary/script_Object6ASwordCharge10.inc index 11e22661..000d1c95 100644 --- a/data/scripts/sanctuary/script_Object6ASwordCharge10.inc +++ b/data/scripts/sanctuary/script_Object6ASwordCharge10.inc @@ -2,13 +2,13 @@ SCRIPT_START script_Object6ASwordCharge10 BeginBlock DoPostScriptAction 0x0007 - _0807E930 0x0015 + SetAnimation 0x0015 Call sub_0807F714 Call sub_0807F714 - CallWithArg sub_0807F994, 0x0000fffc + CallWithArg SetSpriteOffset, 0x0000fffc EndBlock WaitForSyncFlag 0x00000020 Wait 0x0078 - Call sub_0807F2D4 + Call WaitForFrameHiBit DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/sanctuary/script_Object6ASwordCharge2.inc b/data/scripts/sanctuary/script_Object6ASwordCharge2.inc index d4ad0786..4fbd87f4 100644 --- a/data/scripts/sanctuary/script_Object6ASwordCharge2.inc +++ b/data/scripts/sanctuary/script_Object6ASwordCharge2.inc @@ -2,7 +2,7 @@ SCRIPT_START script_Object6ASwordCharge2 BeginBlock DoPostScriptAction 0x0007 - _0807E930 0x0001 + SetAnimation 0x0001 Call sub_0807F738 EndBlock WaitForSyncFlag 0x00000040 diff --git a/data/scripts/sanctuary/script_Object6ASwordCharge3.inc b/data/scripts/sanctuary/script_Object6ASwordCharge3.inc index dc8c915c..79a859c2 100644 --- a/data/scripts/sanctuary/script_Object6ASwordCharge3.inc +++ b/data/scripts/sanctuary/script_Object6ASwordCharge3.inc @@ -2,7 +2,7 @@ SCRIPT_START script_Object6ASwordCharge3 BeginBlock DoPostScriptAction 0x0007 - _0807E930 0x0002 + SetAnimation 0x0002 Call sub_0807F738 OffsetEntityPosition 0x0000, 0xfff0 EndBlock diff --git a/data/scripts/sanctuary/script_Object6ASwordCharge4.inc b/data/scripts/sanctuary/script_Object6ASwordCharge4.inc index 55fea219..dd4a6123 100644 --- a/data/scripts/sanctuary/script_Object6ASwordCharge4.inc +++ b/data/scripts/sanctuary/script_Object6ASwordCharge4.inc @@ -2,7 +2,7 @@ SCRIPT_START script_Object6ASwordCharge4 BeginBlock DoPostScriptAction 0x0007 - _0807E930 0x0003 + SetAnimation 0x0003 Call sub_0807F738 OffsetEntityPosition 0x0000, 0xfff0 EndBlock diff --git a/data/scripts/sanctuary/script_Object6ASwordCharge5.inc b/data/scripts/sanctuary/script_Object6ASwordCharge5.inc index deba7486..3b06636f 100644 --- a/data/scripts/sanctuary/script_Object6ASwordCharge5.inc +++ b/data/scripts/sanctuary/script_Object6ASwordCharge5.inc @@ -2,15 +2,15 @@ SCRIPT_START script_Object6ASwordCharge5 BeginBlock DoPostScriptAction 0x0007 - _0807E930 0x0004 + SetAnimation 0x0004 EndBlock WaitForSyncFlagAndClear 0x00000200 - _0807E930 0x0008 - Call sub_0807F2D4 - _0807E930 0x000c + SetAnimation 0x0008 + Call WaitForFrameHiBit + SetAnimation 0x000c SetSyncFlag 0x00002000 WaitForSyncFlag 0x00000020 - _0807E930 0x0010 - Call sub_0807F2D4 + SetAnimation 0x0010 + Call WaitForFrameHiBit DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/sanctuary/script_Object6ASwordCharge6.inc b/data/scripts/sanctuary/script_Object6ASwordCharge6.inc index 6712fe80..0fccc71d 100644 --- a/data/scripts/sanctuary/script_Object6ASwordCharge6.inc +++ b/data/scripts/sanctuary/script_Object6ASwordCharge6.inc @@ -2,15 +2,15 @@ SCRIPT_START script_Object6ASwordCharge6 BeginBlock DoPostScriptAction 0x0007 - _0807E930 0x0005 + SetAnimation 0x0005 EndBlock WaitForSyncFlagAndClear 0x00000400 - _0807E930 0x0009 - Call sub_0807F2D4 - _0807E930 0x000d + SetAnimation 0x0009 + Call WaitForFrameHiBit + SetAnimation 0x000d SetSyncFlag 0x00004000 WaitForSyncFlag 0x00000020 - _0807E930 0x0011 - Call sub_0807F2D4 + SetAnimation 0x0011 + Call WaitForFrameHiBit DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/sanctuary/script_Object6ASwordCharge8.inc b/data/scripts/sanctuary/script_Object6ASwordCharge8.inc index db235e91..9120d4b9 100644 --- a/data/scripts/sanctuary/script_Object6ASwordCharge8.inc +++ b/data/scripts/sanctuary/script_Object6ASwordCharge8.inc @@ -2,17 +2,17 @@ SCRIPT_START script_Object6ASwordCharge8 BeginBlock DoPostScriptAction 0x0007 - _0807E930 0x0007 + SetAnimation 0x0007 OffsetEntityPosition 0x0000, 0xfff0 EndBlock WaitForSyncFlagAndClear 0x00001000 - _0807E930 0x000b - Call sub_0807F2D4 - _0807E930 0x000f + SetAnimation 0x000b + Call WaitForFrameHiBit + SetAnimation 0x000f SetSyncFlag 0x00010000 WaitForSyncFlag 0x00000020 - _0807E930 0x0013 - Call sub_0807F2D4 + SetAnimation 0x0013 + Call WaitForFrameHiBit DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/sanctuary/script_Object6ASwordCharge9.inc b/data/scripts/sanctuary/script_Object6ASwordCharge9.inc index 2920f0bc..637466b7 100644 --- a/data/scripts/sanctuary/script_Object6ASwordCharge9.inc +++ b/data/scripts/sanctuary/script_Object6ASwordCharge9.inc @@ -2,13 +2,13 @@ SCRIPT_START script_Object6ASwordCharge9 BeginBlock DoPostScriptAction 0x0007 - _0807E930 0x0014 + SetAnimation 0x0014 Call sub_0807F714 - CallWithArg sub_0807F994, 0x0000fffc + CallWithArg SetSpriteOffset, 0x0000fffc EndBlock WaitForSyncFlag 0x00000020 Wait 0x0078 - Call sub_0807F2D4 + Call WaitForFrameHiBit DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/sanctuary/script_Object6ASwordInPedestal.inc b/data/scripts/sanctuary/script_Object6ASwordInPedestal.inc index 7681251b..2584cb86 100644 --- a/data/scripts/sanctuary/script_Object6ASwordInPedestal.inc +++ b/data/scripts/sanctuary/script_Object6ASwordInPedestal.inc @@ -2,11 +2,11 @@ SCRIPT_START script_Object6ASwordInPedestal BeginBlock DoPostScriptAction 0x0007 - _0807E930 0x0008 + SetAnimation 0x0008 EndBlock WaitForSyncFlagAndClear 0x00000080 - _0807E930 0x000b - Call sub_0807F2D4 + SetAnimation 0x000b + Call WaitForFrameHiBit SetSyncFlag 0x00000100 WaitForSyncFlagAndClear 0x00000080 DoPostScriptAction 0x0006 diff --git a/data/scripts/sanctuary/script_Object6ATextBoard.inc b/data/scripts/sanctuary/script_Object6ATextBoard.inc index 174f0b6d..63469b76 100644 --- a/data/scripts/sanctuary/script_Object6ATextBoard.inc +++ b/data/scripts/sanctuary/script_Object6ATextBoard.inc @@ -14,7 +14,7 @@ SCRIPT_START script_Object6ATextBoard EndBlock DoPostScriptAction 0x0008 WaitForSyncFlagAndClear 0x00000004 - _0807E908 0x0002 + SetAction 0x0002 PlaySound SFX_134 Jump script_08013C32 script_08013C2A: @@ -38,22 +38,22 @@ script_08013C58: CheckEntityInteractType JumpIfNot script_08013C58 EndBlock - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer CheckLocalFlag 0x007d JumpIf script_08013C82 - _0807EB28 0x1501 + EzloMessage 0x1501 Jump script_08013C86 script_08013C82: - _0807EB28 0x1506 + EzloMessage 0x1506 script_08013C86: WaitUntilTextboxCloses Wait 0x000f - _0807E878 + EnablePlayerControl Jump script_08013C58 script_08013C92: EndBlock - _0807E908 0x0004 + SetAction 0x0004 script_08013C98: DoPostScriptAction 0x0008 DoPostScriptAction 0x0006 diff --git a/data/scripts/sanctuary/script_Object6AWaterElement.inc b/data/scripts/sanctuary/script_Object6AWaterElement.inc index 0d40a625..e0617edf 100644 --- a/data/scripts/sanctuary/script_Object6AWaterElement.inc +++ b/data/scripts/sanctuary/script_Object6AWaterElement.inc @@ -2,9 +2,9 @@ SCRIPT_START script_Object6AWaterElement BeginBlock DoPostScriptAction 0x0007 - Call sub_0807F180 + Call SetCollisionLayer2 SetEntityPositionRelative 0x0120, 0x0168 - _0807E930 0x0005 + SetAnimation 0x0005 EndBlock SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/sanctuary/script_Object6AWaterElementFloating.inc b/data/scripts/sanctuary/script_Object6AWaterElementFloating.inc index 5571ce4f..9625d7c8 100644 --- a/data/scripts/sanctuary/script_Object6AWaterElementFloating.inc +++ b/data/scripts/sanctuary/script_Object6AWaterElementFloating.inc @@ -2,11 +2,11 @@ SCRIPT_START script_Object6AWaterElementFloating BeginBlock DoPostScriptAction 0x0007 - _0807E930 0x0004 + SetAnimation 0x0004 EndBlock SetEntitySpeed 0x0080 _0807EDD4 0x0120, 0x0168 - _0807E930 0x0005 + SetAnimation 0x0005 SetSyncFlag 0x20000000 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/sanctuary/script_Object6AWindElement.inc b/data/scripts/sanctuary/script_Object6AWindElement.inc index b0a2e2c4..ab7eb8f0 100644 --- a/data/scripts/sanctuary/script_Object6AWindElement.inc +++ b/data/scripts/sanctuary/script_Object6AWindElement.inc @@ -2,9 +2,9 @@ SCRIPT_START script_Object6AWindElement BeginBlock DoPostScriptAction 0x0007 - Call sub_0807F180 + Call SetCollisionLayer2 SetEntityPositionRelative 0x00b0, 0x0168 - _0807E930 0x0007 + SetAnimation 0x0007 EndBlock SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/sanctuary/script_Object6AWindElementFloating.inc b/data/scripts/sanctuary/script_Object6AWindElementFloating.inc index c88547f6..3ee4e871 100644 --- a/data/scripts/sanctuary/script_Object6AWindElementFloating.inc +++ b/data/scripts/sanctuary/script_Object6AWindElementFloating.inc @@ -2,11 +2,11 @@ SCRIPT_START script_Object6AWindElementFloating BeginBlock DoPostScriptAction 0x0007 - _0807E930 0x0006 + SetAnimation 0x0006 EndBlock SetEntitySpeed 0x0080 _0807EDD4 0x00b0, 0x0168 - _0807E930 0x0007 + SetAnimation 0x0007 SetSyncFlag 0x40000000 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/sanctuary/script_Objet6ASwordCharge7.inc b/data/scripts/sanctuary/script_Objet6ASwordCharge7.inc index e56b82e0..30ab72f0 100644 --- a/data/scripts/sanctuary/script_Objet6ASwordCharge7.inc +++ b/data/scripts/sanctuary/script_Objet6ASwordCharge7.inc @@ -2,17 +2,17 @@ SCRIPT_START script_Objet6ASwordCharge7 BeginBlock DoPostScriptAction 0x0007 - _0807E930 0x0006 + SetAnimation 0x0006 OffsetEntityPosition 0x0000, 0xfff0 EndBlock WaitForSyncFlagAndClear 0x00000800 - _0807E930 0x000a - Call sub_0807F2D4 - _0807E930 0x000e + SetAnimation 0x000a + Call WaitForFrameHiBit + SetAnimation 0x000e SetSyncFlag 0x00008000 WaitForSyncFlag 0x00000020 - _0807E930 0x0012 - Call sub_0807F2D4 + SetAnimation 0x0012 + Call WaitForFrameHiBit DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/sanctuary/script_PlayerAtPedestal.inc b/data/scripts/sanctuary/script_PlayerAtPedestal.inc index f67ff329..0f82e0a9 100644 --- a/data/scripts/sanctuary/script_PlayerAtPedestal.inc +++ b/data/scripts/sanctuary/script_PlayerAtPedestal.inc @@ -3,7 +3,7 @@ SCRIPT_START script_PlayerAtPedestal BeginBlock SetEntitySpeed 0x0100 EndBlock - Call sub_0807F584 + Call ReadPlayerAnimationState JumpTable script_080136F0, script_080136FA, script_08013704, script_080136FA script_080136F0: CallWithArg sub_0807F464, 0x000000d0 @@ -11,7 +11,7 @@ script_080136FA: CallWithArg sub_0807F4F8, 0x00000124 script_08013704: _0807EDD4 0x00e8, 0x0124 - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 SetSyncFlag 0x00000001 Call sub_080791BC diff --git a/data/scripts/sanctuary/script_PlayerAtSanctuaryEntrance.inc b/data/scripts/sanctuary/script_PlayerAtSanctuaryEntrance.inc index 69721bca..b6c21762 100644 --- a/data/scripts/sanctuary/script_PlayerAtSanctuaryEntrance.inc +++ b/data/scripts/sanctuary/script_PlayerAtSanctuaryEntrance.inc @@ -4,7 +4,7 @@ SCRIPT_START script_PlayerAtSanctuaryEntrance SetEntitySpeed 0x0100 EndBlock _0807EDD4 0x0088, 0x0068 - _0807EB44 0x0000 + SetAnimationState 0x0000 DoPostScriptAction 0x0000 Wait 0x001e SetSyncFlag 0x00000001 diff --git a/data/scripts/sanctuary/script_PlayerGetElement.inc b/data/scripts/sanctuary/script_PlayerGetElement.inc index c1285a04..71bf1bb6 100644 --- a/data/scripts/sanctuary/script_PlayerGetElement.inc +++ b/data/scripts/sanctuary/script_PlayerGetElement.inc @@ -2,7 +2,7 @@ SCRIPT_START script_PlayerGetElement BeginBlock SetEntitySpeed 0x0140 - _0807E864 + SetPlayerIdle Call sub_0807DF28 EndBlock Wait 0x0078 @@ -18,5 +18,5 @@ script_0800A0D2: WaitForSyncFlagAndClear 0x00000002 Wait 0x003c SetEntitySpeed 0x0080 - _0807EC64 0x0030 + WalkNorth 0x0030 SCRIPT_END diff --git a/data/scripts/sanctuary/script_PlayerPickUpFinalSword.inc b/data/scripts/sanctuary/script_PlayerPickUpFinalSword.inc index e2e0c734..fd4063b1 100644 --- a/data/scripts/sanctuary/script_PlayerPickUpFinalSword.inc +++ b/data/scripts/sanctuary/script_PlayerPickUpFinalSword.inc @@ -2,11 +2,11 @@ SCRIPT_START script_PlayerPickUpFinalSword CallWithArg sub_08095E7C, script_Object6ASwordCharge11 PlaySound SFX_1D3 - CallWithArg sub_0807F238, 0x000008e3 + CallWithArg SetPlayerAnimation2, 0x000008e3 Call sub_08096028 Wait 0x0078 SetSyncFlag 0x00020000 - Call sub_0807F304 + Call WaitForPlayerFrameHiBit Wait 0x0078 WaitForSyncFlagAndClear 0x00040000 Call sub_080791BC diff --git a/data/scripts/sanctuary/script_PlayerPickUpSword.inc b/data/scripts/sanctuary/script_PlayerPickUpSword.inc index 49aea300..0523c018 100644 --- a/data/scripts/sanctuary/script_PlayerPickUpSword.inc +++ b/data/scripts/sanctuary/script_PlayerPickUpSword.inc @@ -1,11 +1,11 @@ @ Player at Sanctuary pick up sword SCRIPT_START script_PlayerPickUpSword PlaySound SFX_1D3 - CallWithArg sub_0807F238, 0x000008bf + CallWithArg SetPlayerAnimation2, 0x000008bf Call sub_08096028 Wait 0x003c SetSyncFlag 0x00020000 - Call sub_0807F304 + Call WaitForPlayerFrameHiBit Wait 0x0078 WaitForSyncFlagAndClear 0x00040000 Call sub_080791BC diff --git a/data/scripts/sanctuary/script_PlayerSanctuary.inc b/data/scripts/sanctuary/script_PlayerSanctuary.inc index 2548d3a1..05672507 100644 --- a/data/scripts/sanctuary/script_PlayerSanctuary.inc +++ b/data/scripts/sanctuary/script_PlayerSanctuary.inc @@ -3,8 +3,8 @@ SCRIPT_START script_PlayerSanctuary BeginBlock SetEntitySpeed 0x0100 EndBlock - _0807EC64 0x0010 - _0807EB44 0x0000 + WalkNorth 0x0010 + SetAnimationState 0x0000 DoPostScriptAction 0x0000 SetSyncFlag 0x00000001 Call sub_080791BC diff --git a/data/scripts/sanctuary/script_PlayerSanctuaryIntro.inc b/data/scripts/sanctuary/script_PlayerSanctuaryIntro.inc index 7ba6faad..9ea5a652 100644 --- a/data/scripts/sanctuary/script_PlayerSanctuaryIntro.inc +++ b/data/scripts/sanctuary/script_PlayerSanctuaryIntro.inc @@ -1,7 +1,7 @@ @ Player in Sanctuary during intro cutscene SCRIPT_START script_PlayerSanctuaryIntro BeginBlock - _0807EB44 0x0000 + SetAnimationState 0x0000 SetEntityPositionRelative 0x0098, 0x0070 EndBlock SetSyncFlag 0x00000002 diff --git a/data/scripts/sanctuary/script_PlayerTextBoardAppears.inc b/data/scripts/sanctuary/script_PlayerTextBoardAppears.inc index 29f92dd2..77e9fc90 100644 --- a/data/scripts/sanctuary/script_PlayerTextBoardAppears.inc +++ b/data/scripts/sanctuary/script_PlayerTextBoardAppears.inc @@ -4,7 +4,7 @@ SCRIPT_START script_PlayerTextBoardAppears SetEntitySpeed 0x0100 EndBlock _0807EDD4 0x00e8, 0x00a8 - _0807EB44 0x0000 + SetAnimationState 0x0000 DoPostScriptAction 0x0000 SetSyncFlag 0x00000002 Call sub_080791BC diff --git a/data/scripts/southHyruleField/script_ForestMinish2.inc b/data/scripts/southHyruleField/script_ForestMinish2.inc index 9815dd19..aa4f65ab 100644 --- a/data/scripts/southHyruleField/script_ForestMinish2.inc +++ b/data/scripts/southHyruleField/script_ForestMinish2.inc @@ -13,7 +13,7 @@ script_0800C592: Jump script_0800C592 script_0800C5A6: EndBlock - _0807E864 + SetPlayerIdle CheckInventory1 0x0067 JumpIfNot script_0800C5BC Call sub_08060208 @@ -22,5 +22,5 @@ script_0800C5BC: MessageNoOverlap 0x4710 script_0800C5C0: WaitUntilTextboxCloses - _0807E878 + EnablePlayerControl Jump script_0800C592 diff --git a/data/scripts/southHyruleField/script_Object69LinksHouseBed.inc b/data/scripts/southHyruleField/script_Object69LinksHouseBed.inc index 7fc77564..2474bfb8 100644 --- a/data/scripts/southHyruleField/script_Object69LinksHouseBed.inc +++ b/data/scripts/southHyruleField/script_Object69LinksHouseBed.inc @@ -5,29 +5,29 @@ SCRIPT_START script_Object69LinksHouseBed script_08009DF0: CheckPlayerInRegion 0x00a0, 0x0038, 0x1830 JumpIfNot script_08009DF0 - _0807E864 - Call sub_0807F9A4 + SetPlayerIdle + Call WaitForPlayerNormal Wait 0x0008 - _0807EB28 0x3207 + EzloMessage 0x3207 CheckTextboxResult JumpIfNot script_08009E4E Call sub_0807DF28 - _0807E778 0x0002 + SetFadeTime 0x0002 DoFade5 WaitForFadeFinish Call sub_0804E864 Wait 0x001e SetSyncFlag 0x00000002 WaitForSyncFlagAndClear 0x00000001 - _0807EB28 0x3209 + EzloMessage 0x3209 Wait 0x000f WaitUntilTextboxCloses - _0807E878 + EnablePlayerControl Call sub_0807DF50 DoPostScriptAction 0x0006 SCRIPT_END script_08009E4E: - _0807E878 + EnablePlayerControl DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/southHyruleField/script_PlayerWakeAfterRest.inc b/data/scripts/southHyruleField/script_PlayerWakeAfterRest.inc index 1b74f94c..e7d0ce43 100644 --- a/data/scripts/southHyruleField/script_PlayerWakeAfterRest.inc +++ b/data/scripts/southHyruleField/script_PlayerWakeAfterRest.inc @@ -4,7 +4,7 @@ SCRIPT_START script_PlayerWakeAfterRest Call sub_0807DF28 EndBlock WaitForSyncFlagAndClear 0x00000002 - _0807E778 0x0002 + SetFadeTime 0x0002 DoFade4 WaitForFadeFinish DoPostScriptAction 0x0014 diff --git a/data/scripts/southHyruleField/script_SmithAtLinksHouse.inc b/data/scripts/southHyruleField/script_SmithAtLinksHouse.inc index 88aa8aa8..91e708c4 100644 --- a/data/scripts/southHyruleField/script_SmithAtLinksHouse.inc +++ b/data/scripts/southHyruleField/script_SmithAtLinksHouse.inc @@ -1,18 +1,18 @@ @ Links house Smith SCRIPT_START script_SmithAtLinksHouse BeginBlock - Call sub_0807F348 + Call SetPriorityMessage Call sub_08066288 Call sub_08066274 DoPostScriptAction 0x000a - _0807E930 0x000c - _0807E908 0x0003 + SetAnimation 0x000c + SetAction 0x0003 EndBlock script_08009DD2: - _0807E944 - _0807E908 0x0002 + TriggerInteract + SetAction 0x0002 Call sub_0806622C WaitUntilTextboxCloses - _0807E908 0x0003 - _0807E930 0x000c + SetAction 0x0003 + SetAnimation 0x000c Jump script_08009DD2 diff --git a/data/scripts/unused/script_0800B828.inc b/data/scripts/unused/script_0800B828.inc index 002888a2..944d257b 100644 --- a/data/scripts/unused/script_0800B828.inc +++ b/data/scripts/unused/script_0800B828.inc @@ -2,21 +2,21 @@ SCRIPT_START script_0800B828 BeginBlock _0807E9D4 - _0807EB44 0x0000 + SetAnimationState 0x0000 DoPostScriptAction 0x000a EndBlock script_0800B836: - _0807E944 - _0807E864 + TriggerInteract + SetPlayerIdle MessageFromTarget 0x0a01 WaitUntilTextboxCloses Wait 0x000f - _0807E878 + EnablePlayerControl Jump script_0800B836 .2byte 0x0000 BeginBlock _0807E9D4 - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 DoPostScriptAction 0x000a EndBlock @@ -26,8 +26,8 @@ script_0800B85E: Jump script_0800B85E BeginBlock _0807E9D4 - _0807EB44 0x0004 - _0807E930 0x0000 + SetAnimationState 0x0004 + SetAnimation 0x0000 DoPostScriptAction 0x000a EndBlock script_0800B87E: @@ -36,17 +36,17 @@ script_0800B87E: Jump script_0800B87E BeginBlock _0807E9D4 - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 DoPostScriptAction 0x000a EndBlock script_0800B89E: CheckEntityInteractType JumpIfNot script_0800B89E - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer MessageFromTarget 0x0a01 WaitUntilTextboxCloses Wait 0x000f - _0807E878 + EnablePlayerControl Jump script_0800B89E diff --git a/data/scripts/unused/script_0800D84C.inc b/data/scripts/unused/script_0800D84C.inc index baf79ed1..0ac50278 100644 --- a/data/scripts/unused/script_0800D84C.inc +++ b/data/scripts/unused/script_0800D84C.inc @@ -5,11 +5,11 @@ SCRIPT_START script_0800D84C script_0800D850: CheckRoomFlag 0x0000 JumpIfNot script_0800D850 - _0807E864 + SetPlayerIdle Call sub_0807DF28 Wait 0x003c Call sub_0807DF50 - _0807E878 + EnablePlayerControl DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/unused/script_0800FB2C.inc b/data/scripts/unused/script_0800FB2C.inc index 2e11fe58..ec0ad048 100644 --- a/data/scripts/unused/script_0800FB2C.inc +++ b/data/scripts/unused/script_0800FB2C.inc @@ -1,6 +1,6 @@ @ TODO UNUSED? SCRIPT_START script_0800FB2C - _0807EB44 0x0002 + SetAnimationState 0x0002 DoPostScriptAction 0x0000 SetSyncFlag 0x00000001 Call sub_080791BC diff --git a/data/scripts/unused/script_08012B24.inc b/data/scripts/unused/script_08012B24.inc index fe88c6a6..5483ab0b 100644 --- a/data/scripts/unused/script_08012B24.inc +++ b/data/scripts/unused/script_08012B24.inc @@ -2,10 +2,10 @@ SCRIPT_START script_08012B24 BeginBlock SetEntitySpeed 0x0100 - _0807EB44 0x0004 + SetAnimationState 0x0004 EndBlock DoPostScriptAction 0x0001 - _0807ECC4 0x0008 + WalkSouth 0x0008 SetSyncFlag 0x00000002 CallWithArg sub_0807FB64, 0xffffffe2 Call sub_080791BC diff --git a/data/scripts/unused/script_08012B50.inc b/data/scripts/unused/script_08012B50.inc index b97d546b..a7a3f781 100644 --- a/data/scripts/unused/script_08012B50.inc +++ b/data/scripts/unused/script_08012B50.inc @@ -2,10 +2,10 @@ SCRIPT_START script_08012B50 BeginBlock SetEntitySpeed 0x0100 - _0807EB44 0x0000 + SetAnimationState 0x0000 EndBlock DoPostScriptAction 0x0001 - _0807EC64 0x0008 + WalkNorth 0x0008 SetSyncFlag 0x00000002 CallWithArg sub_0807FB64, 0xffffffe2 Call sub_080791BC diff --git a/data/scripts/unused/script_08012B7C.inc b/data/scripts/unused/script_08012B7C.inc index d562bd07..50328e8a 100644 --- a/data/scripts/unused/script_08012B7C.inc +++ b/data/scripts/unused/script_08012B7C.inc @@ -2,10 +2,10 @@ SCRIPT_START script_08012B7C BeginBlock SetEntitySpeed 0x0100 - _0807EB44 0x0002 + SetAnimationState 0x0002 EndBlock DoPostScriptAction 0x0001 - _0807EC94 0x0008 + WalkEast 0x0008 SetSyncFlag 0x00000002 CallWithArg sub_0807FB64, 0xffffffe2 Call sub_080791BC diff --git a/data/scripts/unused/script_08012C68.inc b/data/scripts/unused/script_08012C68.inc index c27b36b3..ee6b94d7 100644 --- a/data/scripts/unused/script_08012C68.inc +++ b/data/scripts/unused/script_08012C68.inc @@ -9,11 +9,11 @@ SCRIPT_START script_08012C68 script_08012C7E: CheckEntityInteractType JumpIfNot script_08012C7E - _0807E864 + SetPlayerIdle _0807E8E4_0 MessageFromTarget 0x111d WaitUntilTextboxCloses SetGlobalFlag 0x0022 - _0807E878 + EnablePlayerControl Jump script_08012C7E diff --git a/data/scripts/unused/script_080155F4.inc b/data/scripts/unused/script_080155F4.inc index 7c934a2a..b41c1b81 100644 --- a/data/scripts/unused/script_080155F4.inc +++ b/data/scripts/unused/script_080155F4.inc @@ -1,7 +1,7 @@ @ TODO UNUSED? SCRIPT_START script_080155F4 WaitForSyncFlagAndClear 0x00000020 - _0807E930 0x0000 + SetAnimation 0x0000 Wait 0x0014 SetSyncFlag 0x00000040 script_08015608: diff --git a/data/scripts/unused/script_08015A7C.inc b/data/scripts/unused/script_08015A7C.inc index 3034137b..870e0b9d 100644 --- a/data/scripts/unused/script_08015A7C.inc +++ b/data/scripts/unused/script_08015A7C.inc @@ -2,8 +2,8 @@ SCRIPT_START script_08015A7C SetEntitySpeed 0x0100 DoPostScriptAction 0x0001 - _0807EC64 0x0010 - _0807EB44 0x0000 + WalkNorth 0x0010 + SetAnimationState 0x0000 DoPostScriptAction 0x0000 SetSyncFlag 0x00000004 Call sub_080791BC diff --git a/data/scripts/unused/script_08015AA0.inc b/data/scripts/unused/script_08015AA0.inc index e0187879..746324a2 100644 --- a/data/scripts/unused/script_08015AA0.inc +++ b/data/scripts/unused/script_08015AA0.inc @@ -2,8 +2,8 @@ SCRIPT_START script_08015AA0 SetEntitySpeed 0x0100 DoPostScriptAction 0x0001 - _0807EC94 0x0010 - _0807EB44 0x0002 + WalkEast 0x0010 + SetAnimationState 0x0002 DoPostScriptAction 0x0000 SetSyncFlag 0x00000004 Call sub_080791BC diff --git a/data/scripts/unused/script_08015F80.inc b/data/scripts/unused/script_08015F80.inc index af659a4f..f866aa42 100644 --- a/data/scripts/unused/script_08015F80.inc +++ b/data/scripts/unused/script_08015F80.inc @@ -1,7 +1,7 @@ @ TODO UNUSED? SCRIPT_START script_08015F80 BeginBlock - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 EndBlock WaitForSyncFlag 0x00000200 diff --git a/data/scripts/unused/script_08016384.inc b/data/scripts/unused/script_08016384.inc index 8d5b915f..c76c83cd 100644 --- a/data/scripts/unused/script_08016384.inc +++ b/data/scripts/unused/script_08016384.inc @@ -36,17 +36,17 @@ SCRIPT_START script_08016384 CheckPlayerInRegion 0x0000, 0x0000, 0x0000 CheckPlayerInRegion2 0x0000 CheckEntityInteractType - _0807E30C + FacePlayerAndCheckDist HasRupees 0x00c8 CheckTextboxResult CheckKinstoneFused 0x0001 BuyItem 0x006c, 0x0000 CheckBottleContaining 0x0020 - _0807E4CC 0x00000000 - _0807E4EC 0x00000000 - _0807E514 0x00000000 + VariableBitSet 0x00000000 + VariableOnlyBitSet 0x00000000 + VariableEqual 0x00000000 CheckPlayerFlags 0x00000080 - _0807E564 + CheckPlayerMinish EntityHasHeight ComparePlayerAction 0x0001 ComparePlayerAnimationState 0x0004 @@ -63,8 +63,8 @@ SCRIPT_START script_08016384 WaitForSyncFlag 0x00000001 WaitForSyncFlagAndClear 0x00000002 WaitPlayerGetItem - WaitForPlayerAction0x17 + WaitForPlayerEnterRoom WaitFor_1 WaitForFadeFinish - _0807E778 0x0004 + SetFadeTime 0x0004 SetFadeMask 0x0000ffff diff --git a/data/scripts/unused/script_08016482.inc b/data/scripts/unused/script_08016482.inc index d7a983b0..4d1bcbe0 100644 --- a/data/scripts/unused/script_08016482.inc +++ b/data/scripts/unused/script_08016482.inc @@ -1,6 +1,6 @@ @ TODO UNUSED? SCRIPT_START script_08016482 - _0807E79C + FadeInvert Nop2 0x0080 DoFade4 DoFade5 @@ -9,21 +9,21 @@ SCRIPT_START script_08016482 _0807E800 0x00000000 _0807E80C 0x00000000 _0807E858_0 - _0807E864 - _0807E878 - _0807E888 + SetPlayerIdle + EnablePlayerControl + DisablePlayerControl SetPlayerAction 0x00005408 StartPlayerScript script_08016384 - _0807E8D4 0x03a0 + SetPlayerAnimation 0x03a0 _0807E8E4_0 _0807E8E4_1 _0807E8E4_2 _0807E8E4_3 - _0807E908 0x0004 + SetAction 0x0004 SetIntVariable 0x00000000 - _0807E924 - _0807E930 0x0000 - _0807E944 + SetVariableToFrame + SetAnimation 0x0000 + TriggerInteract _0807E974 0x0600 _0807E9D4 _0807E9DC @@ -35,24 +35,24 @@ SCRIPT_START script_08016482 MessageFromTargetPos_1 0x0601 MessageFromTargetTable 0x0601, 0x0602, 0x0603 MessageNoOverlapVar - _0807EB28 0x0602 + EzloMessage 0x0602 _0807EB38 - _0807EB44 0x0000 + SetAnimationState 0x0000 _0807EB4C 0x0000, 0x0000 - _0807EB74 - _0807EB8C + FacePlayer + FaceAwayFromPlayer SetEntityDirection 0x0000 SetEntityDirectionWithAnimationState 0x0000 SetEntitySpeed 0x0100 - SetEntity0x20 0x00018000 + SetEntityVelocity 0x00018000 SetEntityPositionRelative 0x0000, 0x0000 MoveEntityToPlayer Nop3 - _0807EC1C 0x0010 - _0807EC64 0x0020 - _0807EC94 0x0030 - _0807ECC4 0x0040 - _0807ECF4 0x0050 + WalkForward 0x0010 + WalkNorth 0x0020 + WalkEast 0x0030 + WalkSouth 0x0040 + WalkWest 0x0050 _0807ED24 0x0000, 0x0000, 0x0000 _0807EDD4 0x0000, 0x0000 _0807EE04 0x0000, 0x0000 @@ -68,7 +68,7 @@ SCRIPT_START script_08016482 ModRupees 0xff38 ModHealth 0x0010 IncreaseMaxHealth - _0807F050 0x0001 + GiveKinstone 0x0001 GivePlayerItem 0x0001 GetInventoryValue 0x0001 _0807F078 0x0001, 0x0002 diff --git a/data/scripts/unused/script_080165A4.inc b/data/scripts/unused/script_080165A4.inc index f3be3358..2f111b6f 100644 --- a/data/scripts/unused/script_080165A4.inc +++ b/data/scripts/unused/script_080165A4.inc @@ -2,7 +2,7 @@ SCRIPT_START script_080165A4 BeginBlock DoPostScriptAction 0x000a - _0807EB44 0x0004 + SetAnimationState 0x0004 _0807E9D4 EndBlock script_080165B2: diff --git a/data/scripts/veilFalls/script_BigGoron3.inc b/data/scripts/veilFalls/script_BigGoron3.inc index b6531c84..1718deb5 100644 --- a/data/scripts/veilFalls/script_BigGoron3.inc +++ b/data/scripts/veilFalls/script_BigGoron3.inc @@ -6,7 +6,7 @@ SCRIPT_START script_BigGoron3 script_0800934E: CheckEntityInteractType JumpIfNot script_0800934E - _0807E864 + SetPlayerIdle Call sub_0807DF28 Call sub_0806D638 _0807F0B4 0x0001 @@ -22,7 +22,7 @@ script_08009376: CameraTargetPlayer Wait 0x002d _0807F0B4 0x0004 - _0807E878 + EnablePlayerControl Call sub_0807DF50 Jump script_0800934E SCRIPT_END diff --git a/data/scripts/veilFalls/script_BigGoronMirrorShield.inc b/data/scripts/veilFalls/script_BigGoronMirrorShield.inc index 43fbb794..c0d457c7 100644 --- a/data/scripts/veilFalls/script_BigGoronMirrorShield.inc +++ b/data/scripts/veilFalls/script_BigGoronMirrorShield.inc @@ -22,7 +22,7 @@ SCRIPT_START script_BigGoronMirrorShield Call sub_0806D620 Wait 0x003c WaitPlayerGetItem - _0807EB8C + FaceAwayFromPlayer MessageNoOverlap 0x1d0c WaitUntilTextboxCloses Wait 0x000a diff --git a/data/scripts/veilFalls/script_BigGoronTalk.inc b/data/scripts/veilFalls/script_BigGoronTalk.inc index ceb73548..df44f817 100644 --- a/data/scripts/veilFalls/script_BigGoronTalk.inc +++ b/data/scripts/veilFalls/script_BigGoronTalk.inc @@ -78,7 +78,7 @@ script_080093EE: .endif .endif Call sub_0806D5D4 - _0807EB8C + FaceAwayFromPlayer MessageNoOverlap 0x1d09 WaitUntilTextboxCloses Wait 0x000a diff --git a/data/scripts/veilFalls/script_NPC4ESourceOfTheFlow.inc b/data/scripts/veilFalls/script_NPC4ESourceOfTheFlow.inc index 61995039..08f77eee 100644 --- a/data/scripts/veilFalls/script_NPC4ESourceOfTheFlow.inc +++ b/data/scripts/veilFalls/script_NPC4ESourceOfTheFlow.inc @@ -11,11 +11,11 @@ SCRIPT_START script_NPC4ESourceOfTheFlow script_08015FE4: _0807EA4C _0807E9F0 - _0807E864 + SetPlayerIdle CheckKinstoneFused 0x0009 JumpIf script_08015FFE Call sub_0807DF50 - _0807E878 + EnablePlayerControl Jump script_08015FE4 script_08015FFE: _0807F0C8 0xffff, 0x0000 diff --git a/data/scripts/veilFalls/script_NPC4ESouurceOfTheFlowOpening.inc b/data/scripts/veilFalls/script_NPC4ESouurceOfTheFlowOpening.inc index 9bd85e9f..93cd157c 100644 --- a/data/scripts/veilFalls/script_NPC4ESouurceOfTheFlowOpening.inc +++ b/data/scripts/veilFalls/script_NPC4ESouurceOfTheFlowOpening.inc @@ -4,10 +4,10 @@ SCRIPT_START script_NPC4ESouurceOfTheFlowOpening WaitForSyncFlagAndClear 0x0000000c _0807F0C8 0x0000, 0x0000 PlaySound SFX_SECRET - _0807EB28 0x0b1f + EzloMessage 0x0b1f WaitUntilTextboxCloses Call sub_0807DF50 - _0807E878 + EnablePlayerControl script_08016028: DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/veilFalls/script_Object3ELeftStoneOpening.inc b/data/scripts/veilFalls/script_Object3ELeftStoneOpening.inc index d14749c2..a8e0f613 100644 --- a/data/scripts/veilFalls/script_Object3ELeftStoneOpening.inc +++ b/data/scripts/veilFalls/script_Object3ELeftStoneOpening.inc @@ -8,7 +8,7 @@ SCRIPT_START script_Object3ELeftStoneOpening DoPostScriptAction 0x0010 Wait 0x003c SetEntitySpeed 0x0020 - _0807ECF4 0x0080 + WalkWest 0x0080 Wait 0x001e DoPostScriptAction 0x0010 SetSyncFlag 0x00000008 diff --git a/data/scripts/veilFalls/script_Object3ERightStoneOpening.inc b/data/scripts/veilFalls/script_Object3ERightStoneOpening.inc index b8dfa814..53d2fb10 100644 --- a/data/scripts/veilFalls/script_Object3ERightStoneOpening.inc +++ b/data/scripts/veilFalls/script_Object3ERightStoneOpening.inc @@ -8,7 +8,7 @@ SCRIPT_START script_Object3ERightStoneOpening DoPostScriptAction 0x0010 Wait 0x003c SetEntitySpeed 0x0020 - _0807EC94 0x0080 + WalkEast 0x0080 Wait 0x001e DoPostScriptAction 0x0010 SetSyncFlag 0x00000004 diff --git a/data/scripts/veilFalls/script_Object6AMirrorShield.inc b/data/scripts/veilFalls/script_Object6AMirrorShield.inc index 63bca6f6..ad578502 100644 --- a/data/scripts/veilFalls/script_Object6AMirrorShield.inc +++ b/data/scripts/veilFalls/script_Object6AMirrorShield.inc @@ -5,7 +5,7 @@ SCRIPT_START script_Object6AMirrorShield SetEntitySpeed 0x0180 EndBlock Wait 0x003c - SetEntity0x20 0x00018000 + SetEntityVelocity 0x00018000 Call sub_0806D858 script_080094EA: _0807EE30 diff --git a/data/scripts/veilFalls/script_Object6AVeilFallsTop.inc b/data/scripts/veilFalls/script_Object6AVeilFallsTop.inc index a112bcb8..a17305b5 100644 --- a/data/scripts/veilFalls/script_Object6AVeilFallsTop.inc +++ b/data/scripts/veilFalls/script_Object6AVeilFallsTop.inc @@ -5,7 +5,7 @@ SCRIPT_START script_Object6AVeilFallsTop SetEntitySpeed 0x0080 EndBlock Wait 0x003c - SetEntity0x20 0x00018000 + SetEntityVelocity 0x00018000 script_080094BC: _0807EE30 JumpIfNot script_080094BC diff --git a/data/scripts/westernWood/script_ForestMinish1.inc b/data/scripts/westernWood/script_ForestMinish1.inc index f31443f3..3e681372 100644 --- a/data/scripts/westernWood/script_ForestMinish1.inc +++ b/data/scripts/westernWood/script_ForestMinish1.inc @@ -13,8 +13,8 @@ script_0800C55E: Jump script_0800C55E script_0800C572: EndBlock - _0807E864 + SetPlayerIdle Call sub_08060208 WaitUntilTextboxCloses - _0807E878 + EnablePlayerControl Jump script_0800C55E diff --git a/data/scripts/westernWood/script_MoblinLady.inc b/data/scripts/westernWood/script_MoblinLady.inc index 75d7093e..7c1fb498 100644 --- a/data/scripts/westernWood/script_MoblinLady.inc +++ b/data/scripts/westernWood/script_MoblinLady.inc @@ -1,15 +1,15 @@ @ Western Wood MoblinLady in Percys house SCRIPT_START script_MoblinLady BeginBlock - _0807EB74 + FacePlayer _0807E9D4 DoPostScriptAction 0x000a EndBlock script_08012338: CheckEntityInteractType JumpIfNot script_08012338 - _0807EB74 - _0807E864 + FacePlayer + SetPlayerIdle MessageFromTarget 0x2304 WaitUntilTextboxCloses CheckLocalFlag 0x0042 @@ -18,5 +18,5 @@ script_08012338: GivePlayerItem 0x0057 WaitPlayerGetItem script_0801235A: - _0807E878 + EnablePlayerControl Jump script_08012338 diff --git a/data/scripts/westernWood/script_MoblinLadyDisguised.inc b/data/scripts/westernWood/script_MoblinLadyDisguised.inc index 3000aea1..576f873d 100644 --- a/data/scripts/westernWood/script_MoblinLadyDisguised.inc +++ b/data/scripts/westernWood/script_MoblinLadyDisguised.inc @@ -1,7 +1,7 @@ @ Western Wood Moblin disguised as Townsperson in Percys house SCRIPT_START script_MoblinLadyDisguised BeginBlock - _0807EB44 0x0004 + SetAnimationState 0x0004 Call sub_08061FD8 _0807E9D4 DoPostScriptAction 0x000a @@ -17,12 +17,12 @@ script_08012298: CheckEntityInteractType JumpIfNot script_08012284 EndBlock - _0807EB74 - _0807E864 + FacePlayer + SetPlayerIdle Call sub_08061FD8 MessageFromTarget 0x2302 WaitUntilTextboxCloses - _0807E878 + EnablePlayerControl SetGlobalFlag 0x001e Jump script_08012284 script_080122BA: @@ -36,17 +36,17 @@ script_080122CE: CheckEntityInteractType JumpIfNot script_080122BA EndBlock - _0807EB74 - _0807E864 + FacePlayer + SetPlayerIdle Call sub_08061FD8 MessageFromTarget 0x2303 WaitUntilTextboxCloses - _0807E878 + EnablePlayerControl Jump script_080122BA script_080122EC: EndBlock - _0807EB74 - _0807E864 + FacePlayer + SetPlayerIdle Call sub_08061FD8 DoPostScriptAction 0x000b Call sub_08061FB0 @@ -57,7 +57,7 @@ script_080122EC: PlaySound SFX_SECRET SetLocalFlag 0x0043 Wait 0x001e - _0807E878 + EnablePlayerControl DoPostScriptAction 0x0006 SCRIPT_END .align 2, 0 diff --git a/data/scripts/westernWood/script_PercyInside.inc b/data/scripts/westernWood/script_PercyInside.inc index d0794615..e1c5666a 100644 --- a/data/scripts/westernWood/script_PercyInside.inc +++ b/data/scripts/westernWood/script_PercyInside.inc @@ -1,7 +1,7 @@ @ Tilby Highlands Percy in Tree or in his house SCRIPT_START script_PercyInside BeginBlock - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 DoPostScriptAction 0x000a Call sub_0806B60C @@ -9,12 +9,12 @@ SCRIPT_START script_PercyInside script_08012E9E: CheckEntityInteractType JumpIfNot script_08012E9E - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer DoPostScriptAction 0x0001 Call sub_0806B4F0 WaitUntilTextboxCloses - _0807E878 + EnablePlayerControl DoPostScriptAction 0x0000 Jump script_08012E9E .2byte 0x0000 diff --git a/data/scripts/westernWood/script_PercyOutside.inc b/data/scripts/westernWood/script_PercyOutside.inc index e34359d9..612d4b1a 100644 --- a/data/scripts/westernWood/script_PercyOutside.inc +++ b/data/scripts/westernWood/script_PercyOutside.inc @@ -1,7 +1,7 @@ @ Trilby Highlands Percy in front of house SCRIPT_START script_PercyOutside BeginBlock - _0807EB44 0x0004 + SetAnimationState 0x0004 CallWithArg sub_0807F3D8, 0x00000008 DoPostScriptAction 0x000a Call sub_0806B60C @@ -9,12 +9,12 @@ SCRIPT_START script_PercyOutside script_08012EDC: CheckEntityInteractType JumpIfNot script_08012EDC - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer CallWithArg sub_0807F3D8, 0x0000000c Call sub_0806B4F0 WaitUntilTextboxCloses Wait 0x000f - _0807E878 + EnablePlayerControl CallWithArg sub_0807F3D8, 0x00000008 Jump script_08012EDC diff --git a/data/scripts/windRuins/script_EzloTalkFoW.inc b/data/scripts/windRuins/script_EzloTalkFoW.inc index 8ac839e1..8370f5ef 100644 --- a/data/scripts/windRuins/script_EzloTalkFoW.inc +++ b/data/scripts/windRuins/script_EzloTalkFoW.inc @@ -1,12 +1,12 @@ @ Ezlo talk after Wind Ruins SCRIPT_START script_EzloTalkFoW - _0807E864 + SetPlayerIdle Call sub_0807DF28 - _0807EB28 0x1c03 + EzloMessage 0x1c03 WaitUntilTextboxCloses SetLocalFlagByBank 0x0100, 0x0003 Call sub_0807DF50 - _0807E878 + EnablePlayerControl DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/windRuins/script_Npc4EReceiveOcarina.inc b/data/scripts/windRuins/script_Npc4EReceiveOcarina.inc index b3a0d2f2..b4e78dbb 100644 --- a/data/scripts/windRuins/script_Npc4EReceiveOcarina.inc +++ b/data/scripts/windRuins/script_Npc4EReceiveOcarina.inc @@ -9,14 +9,14 @@ script_0800D8F4: CheckInventory1 0x0017 JumpIfNot script_0800D8F4 Call sub_0807DF28 - _0807E864 + SetPlayerIdle WaitPlayerGetItem - _0807EB28 0x1325 + EzloMessage 0x1325 WaitUntilTextboxCloses PlaySound SFX_113 SetIntVariable 0x00000000 Call sub_0806DA1C - _0807E878 + EnablePlayerControl Call sub_0807DF50 script_0800D924: DoPostScriptAction 0x0006 diff --git a/data/scripts/windRuins/script_Npc4EWindRuinsTextBoard.inc b/data/scripts/windRuins/script_Npc4EWindRuinsTextBoard.inc index 3c0338b0..7d205905 100644 --- a/data/scripts/windRuins/script_Npc4EWindRuinsTextBoard.inc +++ b/data/scripts/windRuins/script_Npc4EWindRuinsTextBoard.inc @@ -9,7 +9,7 @@ SCRIPT_START script_Npc4EWindRuinsTextBoard script_0800D88E: CheckEntityInteractType JumpIfNot script_0800D88E - _0807E864 + SetPlayerIdle Call sub_0807DF28 CheckLocalFlag 0x0045 JumpIf script_0800D8B0 @@ -29,6 +29,6 @@ script_0800D8CE: JumpIfNot script_0800D8CE script_0800D8D6: Call sub_0807DF50 - _0807E878 + EnablePlayerControl Jump script_0800D88E .2byte 0x0000 diff --git a/data/scripts/windRuins/script_PlayerAtTextboard.inc b/data/scripts/windRuins/script_PlayerAtTextboard.inc index a3c2a068..b8b909df 100644 --- a/data/scripts/windRuins/script_PlayerAtTextboard.inc +++ b/data/scripts/windRuins/script_PlayerAtTextboard.inc @@ -5,7 +5,7 @@ SCRIPT_START script_PlayerAtTextboard EndBlock DoPostScriptAction 0x0001 _0807EDD4 0x00a0, 0x0078 - _0807EB44 0x0000 + SetAnimationState 0x0000 DoPostScriptAction 0x0000 SetSyncFlag 0x00000001 Call sub_080791BC diff --git a/src/player.c b/src/player.c index c50474c6..53cbe00b 100644 --- a/src/player.c +++ b/src/player.c @@ -3631,7 +3631,7 @@ void sub_08074F8C(Entity* this) { UpdateAnimationSingleFrame(this); if (this->frame == 1) { this->frame = 0; - gActiveScriptInfo.unk_00 |= 4; + gActiveScriptInfo.syncFlags |= 4; } if (this->frame & 0x80) { this->field_0x68.HALF.LO++; diff --git a/src/script.c b/src/script.c index ba508cf0..c59c267b 100644 --- a/src/script.c +++ b/src/script.c @@ -38,19 +38,19 @@ void ScriptCommand_CheckRoomFlag(Entity* entity, ScriptExecutionContext* context void ScriptCommand_CheckPlayerInRegion(Entity* entity, ScriptExecutionContext* context); void ScriptCommand_CheckPlayerInRegion2(Entity* entity, ScriptExecutionContext* context); void ScriptCommand_CheckEntityInteractType(Entity* entity, ScriptExecutionContext* context); -void ScriptCommand_0807E30C(Entity* entity, ScriptExecutionContext* context); +void ScriptCommand_FacePlayerAndCheckDist(Entity* entity, ScriptExecutionContext* context); void ScriptCommand_HasRupees(Entity* entity, ScriptExecutionContext* context); -void ScriptCommand_0807E3BC(Entity* entity, ScriptExecutionContext* context); +void ScriptCommand_HasShells(Entity* entity, ScriptExecutionContext* context); void ScriptCommand_CheckTextboxResult(Entity* entity, ScriptExecutionContext* context); void ScriptCommand_CheckKinstoneFused(Entity* entity, ScriptExecutionContext* context); void ScriptCommand_BuyItem(Entity* entity, ScriptExecutionContext* context); void ScriptCommand_CheckBottleContaining(Entity* entity, ScriptExecutionContext* context); void ScriptCommand_HasRoomItemForSale(Entity* entity, ScriptExecutionContext* context); -void ScriptCommand_0807E4CC(Entity* entity, ScriptExecutionContext* context); -void ScriptCommand_0807E4EC(Entity* entity, ScriptExecutionContext* context); -void ScriptCommand_0807E514(Entity* entity, ScriptExecutionContext* context); +void ScriptCommand_VariableBitSet(Entity* entity, ScriptExecutionContext* context); +void ScriptCommand_VariableOnlyBitSet(Entity* entity, ScriptExecutionContext* context); +void ScriptCommand_VariableEqual(Entity* entity, ScriptExecutionContext* context); void ScriptCommand_CheckPlayerFlags(Entity* entity, ScriptExecutionContext* context); -void ScriptCommand_0807E564(Entity* entity, ScriptExecutionContext* context); +void ScriptCommand_CheckPlayerMinish(Entity* entity, ScriptExecutionContext* context); void ScriptCommand_EntityHasHeight(Entity* entity, ScriptExecutionContext* context); void ScriptCommand_ComparePlayerAction(Entity* entity, ScriptExecutionContext* context); void ScriptCommand_ComparePlayerAnimationState(Entity* entity, ScriptExecutionContext* context); @@ -67,12 +67,12 @@ void ScriptCommand_Wait(Entity* entity, ScriptExecutionContext* context); void ScriptCommand_WaitForSyncFlag(Entity* entity, ScriptExecutionContext* context); void ScriptCommand_WaitForSyncFlagAndClear(Entity* entity, ScriptExecutionContext* context); void ScriptCommand_WaitPlayerGetItem(Entity* entity, ScriptExecutionContext* context); -void ScriptCommand_WaitForPlayerAction0x17(Entity* entity, ScriptExecutionContext* context); +void ScriptCommand_WaitForPlayerEnterRoom(Entity* entity, ScriptExecutionContext* context); void ScriptCommand_WaitFor_1(Entity* entity, ScriptExecutionContext* context); void ScriptCommand_WaitForFadeFinish(Entity* entity, ScriptExecutionContext* context); -void ScriptCommand_0807E778(Entity* entity, ScriptExecutionContext* context); +void ScriptCommand_SetFadeTime(Entity* entity, ScriptExecutionContext* context); void ScriptCommand_SetFadeMask(Entity* entity, ScriptExecutionContext* context); -void ScriptCommand_0807E79C(Entity* entity, ScriptExecutionContext* context); +void ScriptCommand_FadeInvert(Entity* entity, ScriptExecutionContext* context); void ScriptCommandNop2(Entity* entity, ScriptExecutionContext* context); void ScriptCommand_DoFade4(Entity* entity, ScriptExecutionContext* context); void ScriptCommand_DoFade5(Entity* entity, ScriptExecutionContext* context); @@ -82,18 +82,18 @@ void ScriptCommand_0807E800(Entity* entity, ScriptExecutionContext* context); void ScriptCommand_0807E80C(Entity* entity, ScriptExecutionContext* context); void sub_0807E818(u32); void ScriptCommand_0807E858(Entity* entity, ScriptExecutionContext* context); -void ScriptCommand_0807E864(Entity* entity, ScriptExecutionContext* context); -void ScriptCommand_0807E878(Entity* entity, ScriptExecutionContext* context); -void ScriptCommand_0807E888(Entity* entity, ScriptExecutionContext* context); +void ScriptCommand_SetPlayerIdle(Entity* entity, ScriptExecutionContext* context); +void ScriptCommand_EnablePlayerControl(Entity* entity, ScriptExecutionContext* context); +void ScriptCommand_DisablePlayerControl(Entity* entity, ScriptExecutionContext* context); void ScriptCommand_SetPlayerAction(Entity* entity, ScriptExecutionContext* context); void ScriptCommand_StartPlayerScript(Entity* entity, ScriptExecutionContext* context); -void ScriptCommand_0807E8D4(Entity* entity, ScriptExecutionContext* context); +void ScriptCommand_SetPlayerAnimation(Entity* entity, ScriptExecutionContext* context); void ScriptCommand_0807E8E4(Entity* entity, ScriptExecutionContext* context); -void ScriptCommand_0807E908(Entity* entity, ScriptExecutionContext* context); +void ScriptCommand_SetAction(Entity* entity, ScriptExecutionContext* context); void ScriptCommand_SetIntVariable(Entity* entity, ScriptExecutionContext* context); -void ScriptCommand_0807E924(Entity* entity, ScriptExecutionContext* context); -void ScriptCommand_0807E930(Entity* entity, ScriptExecutionContext* context); -void ScriptCommand_0807E944(Entity* entity, ScriptExecutionContext* context); +void ScriptCommand_SetVariableToFrame(Entity* entity, ScriptExecutionContext* context); +void ScriptCommand_SetAnimation(Entity* entity, ScriptExecutionContext* context); +void ScriptCommand_TriggerInteract(Entity* entity, ScriptExecutionContext* context); void ScriptCommand_0807E974(Entity* entity, ScriptExecutionContext* context); void ScriptCommand_0807E9D4(Entity* entity, ScriptExecutionContext* context); void ScriptCommand_0807E9DC(Entity* entity, ScriptExecutionContext* context); @@ -107,26 +107,26 @@ void ScriptCommand_MessageNoOverlap(Entity* entity, ScriptExecutionContext* cont void ScriptCommand_MessageFromTargetPos(Entity* entity, ScriptExecutionContext* context); void ScriptCommand_MessageFromTargetTable(Entity* entity, ScriptExecutionContext* context); void ScriptCommand_MessageNoOverlapVar(Entity* entity, ScriptExecutionContext* context); -void ScriptCommand_0807EB28(Entity* entity, ScriptExecutionContext* context); +void ScriptCommand_EzloMessage(Entity* entity, ScriptExecutionContext* context); void ScriptCommand_0807EB38(Entity* entity, ScriptExecutionContext* context); -void ScriptCommand_0807EB44(Entity* entity, ScriptExecutionContext* context); +void ScriptCommand_SetAnimationState(Entity* entity, ScriptExecutionContext* context); void ScriptCommand_0807EB4C(Entity* entity, ScriptExecutionContext* context); -void ScriptCommand_0807EB74(Entity* entity, ScriptExecutionContext* context); -void ScriptCommand_0807EB8C(Entity* entity, ScriptExecutionContext* context); +void ScriptCommand_FacePlayer(Entity* entity, ScriptExecutionContext* context); +void ScriptCommand_FaceAwayFromPlayer(Entity* entity, ScriptExecutionContext* context); void ScriptCommand_SetEntityDirection(Entity* entity, ScriptExecutionContext* context); void ScriptCommand_SetEntityDirectionWithAnimationState(Entity* entity, ScriptExecutionContext* context); void ScriptCommand_SetEntitySpeed(Entity* entity, ScriptExecutionContext* context); -void ScriptCommand_SetEntity0x20(Entity* entity, ScriptExecutionContext* context); +void ScriptCommand_SetEntityVelocity(Entity* entity, ScriptExecutionContext* context); void ScriptCommand_SetEntityPositionRelative(Entity* entity, ScriptExecutionContext* context); void ScriptCommand_OffsetEntityPosition(Entity* entity, ScriptExecutionContext* context); void ScriptCommand_MoveEntityToPlayer(Entity* entity, ScriptExecutionContext* context); void ScriptCommandNop3(Entity* entity, ScriptExecutionContext* context); -void ScriptCommand_0807EC1C(Entity* entity, ScriptExecutionContext* context); +void ScriptCommand_WalkForward(Entity* entity, ScriptExecutionContext* context); void sub_0807EC44(Entity*, ScriptExecutionContext*); -void ScriptCommand_0807EC64(Entity* entity, ScriptExecutionContext* context); -void ScriptCommand_0807EC94(Entity* entity, ScriptExecutionContext* context); -void ScriptCommand_0807ECC4(Entity* entity, ScriptExecutionContext* context); -void ScriptCommand_0807ECF4(Entity* entity, ScriptExecutionContext* context); +void ScriptCommand_WalkNorth(Entity* entity, ScriptExecutionContext* context); +void ScriptCommand_WalkEast(Entity* entity, ScriptExecutionContext* context); +void ScriptCommand_WalkSouth(Entity* entity, ScriptExecutionContext* context); +void ScriptCommand_WalkWest(Entity* entity, ScriptExecutionContext* context); void ScriptCommand_0807ED24(Entity* entity, ScriptExecutionContext* context); void ScriptCommand_0807EDD4(Entity* entity, ScriptExecutionContext* context); void ScriptCommand_0807EE04(Entity* entity, ScriptExecutionContext* context); @@ -144,7 +144,7 @@ void ScriptCommand_ModRupees(Entity* entity, ScriptExecutionContext* context); void ScriptCommand_ModHealth(Entity* entity, ScriptExecutionContext* context); void ScriptCommand_IncreaseMaxHealth(Entity* entity, ScriptExecutionContext* context); void ScriptCommand_GivePlayerItem(Entity* entity, ScriptExecutionContext* context); -void ScriptCommand_0807F050(Entity* entity, ScriptExecutionContext* context); +void ScriptCommand_GiveKinstone(Entity* entity, ScriptExecutionContext* context); void ScriptCommand_GetInventoryValue(Entity* entity, ScriptExecutionContext* context); void ScriptCommand_0807F078(Entity* entity, ScriptExecutionContext* context); void ScriptCommand_0807F088(Entity* entity, ScriptExecutionContext* context); @@ -157,14 +157,10 @@ extern void RecoverUI(u32); typedef void (*ScriptCommand)(Entity*, ScriptExecutionContext*); -extern const ScriptCommand gScriptCommands[]; - extern u16* gUnk_08001A7C[]; extern u8 gUnk_08114F30[]; extern u8 gUnk_08114F34[]; extern const u16 gUnk_08016984; -extern u8 gUnk_0811E514[]; -extern u8 gUnk_0811E510[]; extern ScriptExecutionContext gPlayerScriptExecutionContext; extern ScriptExecutionContext gScriptExecutionContextArray[0x20]; @@ -492,18 +488,18 @@ void ExecuteScript(Entity* entity, ScriptExecutionContext* context) { ScriptCommand_CheckPlayerInRegion, ScriptCommand_CheckPlayerInRegion2, ScriptCommand_CheckEntityInteractType, - ScriptCommand_0807E30C, + ScriptCommand_FacePlayerAndCheckDist, ScriptCommand_HasRupees, - ScriptCommand_0807E3BC, + ScriptCommand_HasShells, ScriptCommand_CheckTextboxResult, ScriptCommand_CheckKinstoneFused, ScriptCommand_BuyItem, ScriptCommand_CheckBottleContaining, - ScriptCommand_0807E4CC, - ScriptCommand_0807E4EC, - ScriptCommand_0807E514, + ScriptCommand_VariableBitSet, + ScriptCommand_VariableOnlyBitSet, + ScriptCommand_VariableEqual, ScriptCommand_CheckPlayerFlags, - ScriptCommand_0807E564, + ScriptCommand_CheckPlayerMinish, ScriptCommand_EntityHasHeight, ScriptCommand_ComparePlayerAction, ScriptCommand_ComparePlayerAnimationState, @@ -520,12 +516,12 @@ void ExecuteScript(Entity* entity, ScriptExecutionContext* context) { ScriptCommand_WaitForSyncFlag, ScriptCommand_WaitForSyncFlagAndClear, ScriptCommand_WaitPlayerGetItem, - ScriptCommand_WaitForPlayerAction0x17, + ScriptCommand_WaitForPlayerEnterRoom, ScriptCommand_WaitFor_1, ScriptCommand_WaitForFadeFinish, - ScriptCommand_0807E778, + ScriptCommand_SetFadeTime, ScriptCommand_SetFadeMask, - ScriptCommand_0807E79C, + ScriptCommand_FadeInvert, ScriptCommandNop2, ScriptCommand_DoFade4, ScriptCommand_DoFade5, @@ -534,21 +530,21 @@ void ExecuteScript(Entity* entity, ScriptExecutionContext* context) { ScriptCommand_0807E800, ScriptCommand_0807E80C, ScriptCommand_0807E858, - ScriptCommand_0807E864, - ScriptCommand_0807E878, - ScriptCommand_0807E888, + ScriptCommand_SetPlayerIdle, + ScriptCommand_EnablePlayerControl, + ScriptCommand_DisablePlayerControl, ScriptCommand_SetPlayerAction, ScriptCommand_StartPlayerScript, - ScriptCommand_0807E8D4, + ScriptCommand_SetPlayerAnimation, ScriptCommand_0807E8E4, ScriptCommand_0807E8E4, ScriptCommand_0807E8E4, ScriptCommand_0807E8E4, - ScriptCommand_0807E908, + ScriptCommand_SetAction, ScriptCommand_SetIntVariable, - ScriptCommand_0807E924, - ScriptCommand_0807E930, - ScriptCommand_0807E944, + ScriptCommand_SetVariableToFrame, + ScriptCommand_SetAnimation, + ScriptCommand_TriggerInteract, ScriptCommand_0807E974, ScriptCommand_0807E9D4, ScriptCommand_0807E9DC, @@ -562,25 +558,25 @@ void ExecuteScript(Entity* entity, ScriptExecutionContext* context) { ScriptCommand_MessageFromTargetPos, ScriptCommand_MessageFromTargetTable, ScriptCommand_MessageNoOverlapVar, - ScriptCommand_0807EB28, + ScriptCommand_EzloMessage, ScriptCommand_0807EB38, - ScriptCommand_0807EB44, + ScriptCommand_SetAnimationState, ScriptCommand_0807EB4C, - ScriptCommand_0807EB74, - ScriptCommand_0807EB8C, + ScriptCommand_FacePlayer, + ScriptCommand_FaceAwayFromPlayer, ScriptCommand_SetEntityDirection, ScriptCommand_SetEntityDirectionWithAnimationState, ScriptCommand_SetEntitySpeed, - ScriptCommand_SetEntity0x20, + ScriptCommand_SetEntityVelocity, ScriptCommand_SetEntityPositionRelative, ScriptCommand_OffsetEntityPosition, ScriptCommand_MoveEntityToPlayer, ScriptCommandNop3, - ScriptCommand_0807EC1C, - ScriptCommand_0807EC64, - ScriptCommand_0807EC94, - ScriptCommand_0807ECC4, - ScriptCommand_0807ECF4, + ScriptCommand_WalkForward, + ScriptCommand_WalkNorth, + ScriptCommand_WalkEast, + ScriptCommand_WalkSouth, + ScriptCommand_WalkWest, ScriptCommand_0807ED24, ScriptCommand_0807EDD4, ScriptCommand_0807EE04, @@ -598,7 +594,7 @@ void ExecuteScript(Entity* entity, ScriptExecutionContext* context) { ScriptCommand_ModHealth, ScriptCommand_IncreaseMaxHealth, ScriptCommand_GivePlayerItem, - ScriptCommand_0807F050, + ScriptCommand_GiveKinstone, ScriptCommand_GetInventoryValue, ScriptCommand_0807F078, ScriptCommand_0807F088, @@ -805,7 +801,7 @@ void ScriptCommand_CheckEntityInteractType(Entity* entity, ScriptExecutionContex gActiveScriptInfo.flags |= 1; } -void ScriptCommand_0807E30C(Entity* entity, ScriptExecutionContext* context) { +void ScriptCommand_FacePlayerAndCheckDist(Entity* entity, ScriptExecutionContext* context) { if ((context->unk_1A & 0xF) == 0 && (gPlayerState.flags & PL_MINISH) == 0 && EntityInRectRadius(entity, &gPlayerEntity, 40, 40)) { entity->animationState = sub_0806F5B0(GetFacingDirection(entity, &gPlayerEntity)); @@ -826,7 +822,7 @@ void ScriptCommand_HasRupees(Entity* entity, ScriptExecutionContext* context) { gActiveScriptInfo.flags |= 1; } -void ScriptCommand_0807E3BC(Entity* entity, ScriptExecutionContext* context) { +void ScriptCommand_HasShells(Entity* entity, ScriptExecutionContext* context) { context->condition = (context->scriptInstructionPointer[1] <= gSave.stats.field_0x1a); gActiveScriptInfo.flags |= 1; } @@ -871,18 +867,18 @@ void ScriptCommand_HasRoomItemForSale(Entity* entity, ScriptExecutionContext* co gActiveScriptInfo.flags |= 1; } -void ScriptCommand_0807E4CC(Entity* entity, ScriptExecutionContext* context) { +void ScriptCommand_VariableBitSet(Entity* entity, ScriptExecutionContext* context) { context->condition = !!(context->intVariable & context->scriptInstructionPointer[1]); gActiveScriptInfo.flags |= 1; } -void ScriptCommand_0807E4EC(Entity* entity, ScriptExecutionContext* context) { +void ScriptCommand_VariableOnlyBitSet(Entity* entity, ScriptExecutionContext* context) { u32 tmp = context->scriptInstructionPointer[1]; context->condition = tmp == (tmp & context->intVariable); gActiveScriptInfo.flags |= 1; } -void ScriptCommand_0807E514(Entity* entity, ScriptExecutionContext* context) { +void ScriptCommand_VariableEqual(Entity* entity, ScriptExecutionContext* context) { u32 tmp = context->scriptInstructionPointer[1]; context->condition = tmp == context->intVariable; gActiveScriptInfo.flags |= 1; @@ -894,7 +890,7 @@ void ScriptCommand_CheckPlayerFlags(Entity* entity, ScriptExecutionContext* cont gActiveScriptInfo.flags |= 1; } -void ScriptCommand_0807E564(Entity* entity, ScriptExecutionContext* context) { +void ScriptCommand_CheckPlayerMinish(Entity* entity, ScriptExecutionContext* context) { context->condition = (gPlayerState.flags >> 7) & 1; gActiveScriptInfo.flags |= 1; } @@ -979,8 +975,8 @@ void ScriptCommand_WaitPlayerGetItem(Entity* entity, ScriptExecutionContext* con } } -void ScriptCommand_WaitForPlayerAction0x17(Entity* entity, ScriptExecutionContext* context) { - if (gPlayerEntity.action != 0x17) { +void ScriptCommand_WaitForPlayerEnterRoom(Entity* entity, ScriptExecutionContext* context) { + if (gPlayerEntity.action != PLAYER_ROOMTRANSITION) { gActiveScriptInfo.flags |= 1; } else { gActiveScriptInfo.commandSize = 0; @@ -1001,7 +997,7 @@ void ScriptCommand_WaitForFadeFinish(Entity* entity, ScriptExecutionContext* con } } -void ScriptCommand_0807E778(Entity* entity, ScriptExecutionContext* context) { +void ScriptCommand_SetFadeTime(Entity* entity, ScriptExecutionContext* context) { gActiveScriptInfo.unk_08 = context->scriptInstructionPointer[1]; } @@ -1009,7 +1005,7 @@ void ScriptCommand_SetFadeMask(Entity* entity, ScriptExecutionContext* context) gFadeControl.mask = GetNextScriptCommandWordAfterCommandMetadata(context->scriptInstructionPointer); } -void ScriptCommand_0807E79C(Entity* entity, ScriptExecutionContext* context) { +void ScriptCommand_FadeInvert(Entity* entity, ScriptExecutionContext* context) { sub_080500F4(gActiveScriptInfo.unk_08); } @@ -1057,16 +1053,16 @@ void ScriptCommand_0807E858(Entity* entity, ScriptExecutionContext* context) { sub_08050038(context->scriptInstructionPointer[1]); } -void ScriptCommand_0807E864(Entity* entity, ScriptExecutionContext* context) { +void ScriptCommand_SetPlayerIdle(Entity* entity, ScriptExecutionContext* context) { gPlayerState.controlMode = CONTROL_DISABLED; sub_08078B48(); } -void ScriptCommand_0807E878(Entity* entity, ScriptExecutionContext* context) { +void ScriptCommand_EnablePlayerControl(Entity* entity, ScriptExecutionContext* context) { gPlayerState.controlMode = 1; } -void ScriptCommand_0807E888(Entity* entity, ScriptExecutionContext* context) { +void ScriptCommand_DisablePlayerControl(Entity* entity, ScriptExecutionContext* context) { gPlayerState.controlMode = CONTROL_DISABLED; } @@ -1082,7 +1078,7 @@ void ScriptCommand_StartPlayerScript(Entity* entity, ScriptExecutionContext* con StartPlayerScript((u16*)GetNextScriptCommandWordAfterCommandMetadata(context->scriptInstructionPointer)); } -void ScriptCommand_0807E8D4(Entity* entity, ScriptExecutionContext* context) { +void ScriptCommand_SetPlayerAnimation(Entity* entity, ScriptExecutionContext* context) { gPlayerState.animation = context->scriptInstructionPointer[1]; } @@ -1092,7 +1088,7 @@ void ScriptCommand_0807E8E4(Entity* entity, ScriptExecutionContext* context) { gPlayerEntity.animationState = tmp2 = (context->scriptInstructionPointer[0] - tmp) << 1; } -void ScriptCommand_0807E908(Entity* entity, ScriptExecutionContext* context) { +void ScriptCommand_SetAction(Entity* entity, ScriptExecutionContext* context) { entity->action = context->scriptInstructionPointer[1]; entity->subAction = 0; } @@ -1101,17 +1097,17 @@ void ScriptCommand_SetIntVariable(Entity* entity, ScriptExecutionContext* contex context->intVariable = GetNextScriptCommandWordAfterCommandMetadata(context->scriptInstructionPointer); } -void ScriptCommand_0807E924(Entity* entity, ScriptExecutionContext* context) { +void ScriptCommand_SetVariableToFrame(Entity* entity, ScriptExecutionContext* context) { context->intVariable = entity->frame; entity->frame = 0; } -void ScriptCommand_0807E930(Entity* entity, ScriptExecutionContext* context) { +void ScriptCommand_SetAnimation(Entity* entity, ScriptExecutionContext* context) { entity->field_0x80.HWORD = context->scriptInstructionPointer[1]; InitAnimationForceUpdate(entity, context->scriptInstructionPointer[1]); } -void ScriptCommand_0807E944(Entity* entity, ScriptExecutionContext* context) { +void ScriptCommand_TriggerInteract(Entity* entity, ScriptExecutionContext* context) { if (entity->interactType) { entity->interactType = 0; gActiveScriptInfo.flags |= 1; @@ -1227,7 +1223,7 @@ void ScriptCommand_MessageNoOverlapVar(Entity* entity, ScriptExecutionContext* c MessageNoOverlap(context->intVariable, entity); } -void ScriptCommand_0807EB28(Entity* entity, ScriptExecutionContext* context) { +void ScriptCommand_EzloMessage(Entity* entity, ScriptExecutionContext* context) { CreateEzloHint(context->scriptInstructionPointer[1], 0); } @@ -1235,7 +1231,7 @@ void ScriptCommand_0807EB38(Entity* entity, ScriptExecutionContext* context) { context->intVariable = gUnk_02000040.unk_01; } -void ScriptCommand_0807EB44(Entity* entity, ScriptExecutionContext* context) { +void ScriptCommand_SetAnimationState(Entity* entity, ScriptExecutionContext* context) { entity->animationState = context->scriptInstructionPointer[1]; } @@ -1245,11 +1241,11 @@ void ScriptCommand_0807EB4C(Entity* entity, ScriptExecutionContext* context) { context->scriptInstructionPointer[2] + gRoomControls.roomOriginY)); } -void ScriptCommand_0807EB74(Entity* entity, ScriptExecutionContext* context) { +void ScriptCommand_FacePlayer(Entity* entity, ScriptExecutionContext* context) { entity->animationState = sub_0806F5B0(GetFacingDirection(entity, &gPlayerEntity)); } -void ScriptCommand_0807EB8C(Entity* entity, ScriptExecutionContext* context) { +void ScriptCommand_FaceAwayFromPlayer(Entity* entity, ScriptExecutionContext* context) { gPlayerEntity.animationState = sub_0806F5B0(GetFacingDirection(&gPlayerEntity, entity)) & ~1; } @@ -1266,7 +1262,7 @@ void ScriptCommand_SetEntitySpeed(Entity* entity, ScriptExecutionContext* contex entity->speed = context->scriptInstructionPointer[1]; } -void ScriptCommand_SetEntity0x20(Entity* entity, ScriptExecutionContext* context) { +void ScriptCommand_SetEntityVelocity(Entity* entity, ScriptExecutionContext* context) { entity->zVelocity = GetNextScriptCommandWordAfterCommandMetadata(context->scriptInstructionPointer); } @@ -1287,7 +1283,7 @@ void ScriptCommand_MoveEntityToPlayer(Entity* entity, ScriptExecutionContext* co void ScriptCommandNop3(Entity* entity, ScriptExecutionContext* context) { } -void ScriptCommand_0807EC1C(Entity* entity, ScriptExecutionContext* context) { +void ScriptCommand_WalkForward(Entity* entity, ScriptExecutionContext* context) { if (!context->unk_18) { context->unk_18 = 1; context->unk_12 = context->scriptInstructionPointer[1]; @@ -1303,7 +1299,7 @@ void sub_0807EC44(Entity* entity, ScriptExecutionContext* context) { } } -void ScriptCommand_0807EC64(Entity* entity, ScriptExecutionContext* context) { +void ScriptCommand_WalkNorth(Entity* entity, ScriptExecutionContext* context) { if (!context->unk_18) { context->unk_18 = 1; context->unk_12 = context->scriptInstructionPointer[1]; @@ -1314,7 +1310,7 @@ void ScriptCommand_0807EC64(Entity* entity, ScriptExecutionContext* context) { sub_0807EC44(entity, context); } -void ScriptCommand_0807EC94(Entity* entity, ScriptExecutionContext* context) { +void ScriptCommand_WalkEast(Entity* entity, ScriptExecutionContext* context) { if (!context->unk_18) { context->unk_18 = 1; context->unk_12 = context->scriptInstructionPointer[1]; @@ -1325,7 +1321,7 @@ void ScriptCommand_0807EC94(Entity* entity, ScriptExecutionContext* context) { sub_0807EC44(entity, context); } -void ScriptCommand_0807ECC4(Entity* entity, ScriptExecutionContext* context) { +void ScriptCommand_WalkSouth(Entity* entity, ScriptExecutionContext* context) { if (!context->unk_18) { context->unk_18 = 1; context->unk_12 = context->scriptInstructionPointer[1]; @@ -1336,7 +1332,7 @@ void ScriptCommand_0807ECC4(Entity* entity, ScriptExecutionContext* context) { sub_0807EC44(entity, context); } -void ScriptCommand_0807ECF4(Entity* entity, ScriptExecutionContext* context) { +void ScriptCommand_WalkWest(Entity* entity, ScriptExecutionContext* context) { if (!context->unk_18) { context->unk_18 = 1; context->unk_12 = context->scriptInstructionPointer[1]; @@ -1497,7 +1493,7 @@ void ScriptCommand_GivePlayerItem(Entity* entity, ScriptExecutionContext* contex sub_080A7C18(context->scriptInstructionPointer[1], tmp, 0); } -void ScriptCommand_0807F050(Entity* entity, ScriptExecutionContext* context) { +void ScriptCommand_GiveKinstone(Entity* entity, ScriptExecutionContext* context) { sub_080A7C18(0x5C, context->scriptInstructionPointer[1], 0); } @@ -1534,11 +1530,11 @@ extern u8 gUnk_0811E750[]; extern u8 gUnk_0811E758[]; extern u8 gUnk_0811E760[]; -void sub_0807F0D8(Entity* entity, ScriptExecutionContext* context) { +void CheckAnyKeyPressed(Entity* entity, ScriptExecutionContext* context) { context->condition = !!gInput.newKeys; } -void sub_0807F0EC(Entity* entity, ScriptExecutionContext* context) { +void GetRandomInt(Entity* entity, ScriptExecutionContext* context) { context->intVariable = (s32)Random() % (s32)context->intVariable; } @@ -1559,17 +1555,17 @@ void sub_0807F128(Entity* entity, ScriptExecutionContext* context) { context->unk_1A = sValues[(rand >> 8) % 8]; } -void sub_0807F158(Entity* entity, ScriptExecutionContext* context) { +void SetCollisionLayer1(Entity* entity, ScriptExecutionContext* context) { entity->collisionLayer = 1; UpdateSpriteForCollisionLayer(entity); } -void sub_0807F168(Entity* entity, ScriptExecutionContext* context) { +void SetPlayerCollisionLayer1(Entity* entity, ScriptExecutionContext* context) { gPlayerEntity.collisionLayer = 1; UpdateSpriteForCollisionLayer(&gPlayerEntity); } -void sub_0807F180(Entity* entity, ScriptExecutionContext* context) { +void SetCollisionLayer2(Entity* entity, ScriptExecutionContext* context) { entity->collisionLayer = 2; UpdateSpriteForCollisionLayer(entity); } @@ -1607,11 +1603,11 @@ void sub_0807F210(Entity* entity, ScriptExecutionContext* context) { } } -void sub_0807F238(Entity* entity, ScriptExecutionContext* context) { +void SetPlayerAnimation2(Entity* entity, ScriptExecutionContext* context) { gPlayerState.animation = context->intVariable; } -void sub_0807F244(Entity* entity, ScriptExecutionContext* context) { +void EquipItem(Entity* entity, ScriptExecutionContext* context) { u32 slot; u32 item; @@ -1651,7 +1647,7 @@ void sub_0807F2A8(Entity* entity, ScriptExecutionContext* context) { } } -void sub_0807F2D4(Entity* entity, ScriptExecutionContext* context) { +void WaitForFrameHiBit(Entity* entity, ScriptExecutionContext* context) { if ((entity->frame & 0x80) != 0) { gActiveScriptInfo.flags |= 1; } else { @@ -1659,7 +1655,7 @@ void sub_0807F2D4(Entity* entity, ScriptExecutionContext* context) { } } -void sub_0807F304(Entity* entity, ScriptExecutionContext* context) { +void WaitForPlayerFrameHiBit(Entity* entity, ScriptExecutionContext* context) { if ((gPlayerEntity.frame & 0x80) != 0) { gActiveScriptInfo.flags |= 1; } else { @@ -1667,20 +1663,20 @@ void sub_0807F304(Entity* entity, ScriptExecutionContext* context) { } } -void sub_0807F338(Entity* entity, ScriptExecutionContext* context) { +void DeleteHitbox(Entity* entity, ScriptExecutionContext* context) { entity->hitbox = NULL; entity->field_0x17 &= ~1; } -void sub_0807F348(Entity* entity, ScriptExecutionContext* context) { +void SetPriorityMessage(Entity* entity, ScriptExecutionContext* context) { SetDefaultPriority(entity, PRIO_MESSAGE); } -void sub_0807F354(Entity* entity, ScriptExecutionContext* context) { +void SetPriorityPlayerEvent(Entity* entity, ScriptExecutionContext* context) { SetDefaultPriority(entity, PRIO_PLAYER_EVENT); } -void sub_0807F360(Entity* entity, ScriptExecutionContext* context) { +void SetPriorityHighest(Entity* entity, ScriptExecutionContext* context) { SetDefaultPriority(entity, PRIO_NO_BLOCK); } @@ -1707,15 +1703,15 @@ void sub_0807F3D8(Entity* entity, ScriptExecutionContext* context) { entity->field_0x80.HWORD = entity->animIndex; } -void sub_0807F3F8(Entity* entity, ScriptExecutionContext* context) { +void CreatePlayerExclamationMark(Entity* entity, ScriptExecutionContext* context) { CreateSpeechBubbleExclamationMark(&gPlayerEntity, 8, -24); } -void sub_0807F40C(Entity* entity, ScriptExecutionContext* context) { +void CreatePlayerQuestionMark(Entity* entity, ScriptExecutionContext* context) { CreateSpeechBubbleQuestionMark(&gPlayerEntity, 8, -24); } -void sub_0807F420(Entity* entity, ScriptExecutionContext* context) { +void LoadMenu(Entity* entity, ScriptExecutionContext* context) { MenuFadeIn(context->intVariable & 0xff, (u8)(context->intVariable >> 8)); } @@ -1784,11 +1780,11 @@ void sub_0807F4F8(Entity* entity, ScriptExecutionContext* context) { gActiveScriptInfo.commandSize = 0; } -void sub_0807F584(Entity* entity, ScriptExecutionContext* context) { +void ReadPlayerAnimationState(Entity* entity, ScriptExecutionContext* context) { context->intVariable = gPlayerEntity.animationState >> 1; } -void sub_0807F594(Entity* entity, ScriptExecutionContext* context) { +void WaitForPlayerIdle(Entity* entity, ScriptExecutionContext* context) { if (gPlayerState.framestate) gActiveScriptInfo.commandSize = 0; } @@ -1797,7 +1793,7 @@ void sub_0807F5B0(Entity* entity, ScriptExecutionContext* context) { gPlayerState.field_0x27[0] = context->intVariable; } -void sub_0807F5C0(Entity* entity, ScriptExecutionContext* context) { +void WaitForCameraTouchRoomBorder(Entity* entity, ScriptExecutionContext* context) { s32 left; s32 bottom; @@ -1843,11 +1839,11 @@ void sub_0807F6B4(Entity* entity, ScriptExecutionContext* context) { gActiveScriptInfo.flags |= 1; } -void sub_0807F6E8(Entity* entity, ScriptExecutionContext* context) { +void SetPlayerFlag(Entity* entity, ScriptExecutionContext* context) { gPlayerState.flags |= context->intVariable; } -void sub_0807F6F8(Entity* entity, ScriptExecutionContext* context) { +void ResetPlayerFlag(Entity* entity, ScriptExecutionContext* context) { gPlayerState.flags &= ~context->intVariable; } @@ -1865,13 +1861,13 @@ void sub_0807F738(Entity* entity, ScriptExecutionContext* context) { ResolveEntityBelow(entity, entity); } -void sub_0807F75C(Entity* entity, ScriptExecutionContext* context) { +void SetPlayerPos(Entity* entity, ScriptExecutionContext* context) { s32 s32Var = context->intVariable; gPlayerEntity.x.HALF.HI = (s32Var >> 16) + gRoomControls.roomOriginX; gPlayerEntity.y.HALF.HI = (s32Var & 0xffff) + gRoomControls.roomOriginY; } -void sub_0807F77C(Entity* entity, ScriptExecutionContext* context) { +void GetConditionSet(Entity* entity, ScriptExecutionContext* context) { if (context->condition) context->intVariable = 1; else @@ -1951,14 +1947,14 @@ void sub_0807F854(Entity* entity, ScriptExecutionContext* context) { } } -void sub_0807F8BC(Entity* entity, ScriptExecutionContext* context) { +void CheckEntityOnScreen(Entity* entity, ScriptExecutionContext* context) { if (CheckOnScreen(entity)) context->condition = 1; else context->condition = 0; } -void sub_0807F8D0(Entity* entity, ScriptExecutionContext* context) { +void DoGravity(Entity* entity, ScriptExecutionContext* context) { GravityUpdate(entity, context->intVariable); gActiveScriptInfo.flags |= 1; } @@ -1971,7 +1967,7 @@ void sub_0807F8E8(Entity* entity, ScriptExecutionContext* context) { } } -void sub_0807F918(Entity* entity, ScriptExecutionContext* context) { +void PutItemAnySlot(Entity* entity, ScriptExecutionContext* context) { PutItemOnSlot(context->intVariable); } @@ -1997,70 +1993,70 @@ void sub_0807F950(Entity* entity, ScriptExecutionContext* context) { DeleteEntity(c); } -void sub_0807F970(Entity* entity, ScriptExecutionContext* context) { +void CheckMessageEqual(Entity* entity, ScriptExecutionContext* context) { context->condition = context->intVariable == gTextRender.curToken.textIndex; } -void sub_0807F98C(Entity* entity, ScriptExecutionContext* context) { +void SetEntityHeight(Entity* entity, ScriptExecutionContext* context) { entity->z.WORD = context->intVariable; } -void sub_0807F994(Entity* entity, ScriptExecutionContext* context) { +void SetSpriteOffset(Entity* entity, ScriptExecutionContext* context) { entity->spriteOffsetX = (s32)context->intVariable >> 0x10; entity->spriteOffsetY = context->intVariable & 0xffff; } -void sub_0807F9A4(Entity* entity, ScriptExecutionContext* context) { +void WaitForPlayerNormal(Entity* entity, ScriptExecutionContext* context) { switch (gPlayerState.framestate) { - case 5: - case 7: - case 8: - case 10: - case 11: - case 12: - case 13: - case 14: - case 15: - case 16: - case 17: - case 18: - case 19: - case 20: - case 21: - case 22: - case 23: - case 24: - case 27: - case 28: + case PL_STATE_THROW: + case PL_STATE_SWIM: + case PL_STATE_PARACHUTE: + case PL_STATE_FALL: + case PL_STATE_JUMP: + case PL_STATE_C: + case PL_STATE_D: + case PL_STATE_USEPORTAL: + case PL_STATE_F: + case PL_STATE_TRAPPED: + case PL_STATE_11: + case PL_STATE_DIE: + case PL_STATE_TALKEZLO: + case PL_STATE_CAPE: + case PL_STATE_ITEMGET: + case PL_STATE_DROWN: + case PL_STATE_HOLE: + case PL_STATE_CLIMB: + case PL_STATE_1B: + case PL_STATE_STAIRS: gActiveScriptInfo.commandSize = 0; break; default: - gActiveScriptInfo.flags |= 1u; + gActiveScriptInfo.flags |= 1; break; } } -void sub_0807FA40(Entity* entity, ScriptExecutionContext* context) { +void WaitForPlayerNormalOrTalkEzlo(Entity* entity, ScriptExecutionContext* context) { switch (gPlayerState.framestate) { - case 5: - case 7: - case 8: - case 10: - case 11: - case 12: - case 13: - case 14: - case 15: - case 16: - case 17: - case 18: - case 20: - case 21: - case 22: - case 23: - case 24: - case 27: - case 28: + case PL_STATE_THROW: + case PL_STATE_SWIM: + case PL_STATE_PARACHUTE: + case PL_STATE_FALL: + case PL_STATE_JUMP: + case PL_STATE_C: + case PL_STATE_D: + case PL_STATE_USEPORTAL: + case PL_STATE_F: + case PL_STATE_TRAPPED: + case PL_STATE_11: + case PL_STATE_DIE: + case PL_STATE_CAPE: + case PL_STATE_ITEMGET: + case PL_STATE_DROWN: + case PL_STATE_HOLE: + case PL_STATE_CLIMB: + case PL_STATE_1B: + case PL_STATE_STAIRS: gActiveScriptInfo.commandSize = 0; break; default: