diff options
| author | notyourav <65437533+notyourav@users.noreply.github.com> | 2022-01-22 11:35:36 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-22 11:35:36 -0800 |
| commit | 85aaada18f7eace3284937c4da8db05f047d316b (patch) | |
| tree | b9aa9840d57e5d3bd889e29a86163d3387b5aec5 /data | |
| parent | 93e745e9638bb4f48e27908eebe2bb4eb349812e (diff) | |
| parent | 737302d9d1808e5a1def42725e27cef99d0196b2 (diff) | |
Merge pull request #310 from notyourav/pressurePlate
pressure plate ok
Diffstat (limited to 'data')
| -rw-r--r-- | data/animations/object/pressurePlate.s | 27 | ||||
| -rw-r--r-- | data/const/object/pressurePlate.s | 13 | ||||
| -rw-r--r-- | data/scripts/hyruleTown/script_Carlov.inc | 2 | ||||
| -rw-r--r-- | data/sound/sounds.s | 4 |
4 files changed, 3 insertions, 43 deletions
diff --git a/data/animations/object/pressurePlate.s b/data/animations/object/pressurePlate.s deleted file mode 100644 index 75e87fa0..00000000 --- a/data/animations/object/pressurePlate.s +++ /dev/null @@ -1,27 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata -@ .align 2 - -gSpriteAnimations_PressurePlate_0:: @ 08120BF1 - .include "animations/gSpriteAnimations_PressurePlate_0.s" - -gSpriteAnimations_PressurePlate_1:: @ 08120BF5 - .include "animations/gSpriteAnimations_PressurePlate_1.s" - -gSpriteAnimations_PressurePlate_2:: @ 08120BF9 - .include "animations/gSpriteAnimations_PressurePlate_2.s" - -gSpriteAnimations_PressurePlate_3:: @ 08120BFD - .include "animations/gSpriteAnimations_PressurePlate_3.s" - -gSpriteAnimations_PressurePlate_4:: @ 08120C01 - .include "animations/gSpriteAnimations_PressurePlate_4.s" - -gSpriteAnimations_PressurePlate:: @ 08120C08 - .4byte gSpriteAnimations_PressurePlate_0 - .4byte gSpriteAnimations_PressurePlate_1 - .4byte gSpriteAnimations_PressurePlate_2 - .4byte gSpriteAnimations_PressurePlate_3 - .4byte gSpriteAnimations_PressurePlate_4 diff --git a/data/const/object/pressurePlate.s b/data/const/object/pressurePlate.s deleted file mode 100644 index 15f9e807..00000000 --- a/data/const/object/pressurePlate.s +++ /dev/null @@ -1,13 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - .align 2 - -gUnk_08120BE0:: @ 08120BE0 - .4byte sub_08088840 - .4byte sub_0808886C - .4byte sub_080888F4 - -gUnk_08120BEC:: @ 08120BEC - .incbin "PressurePlate/gUnk_08120BEC.bin" diff --git a/data/scripts/hyruleTown/script_Carlov.inc b/data/scripts/hyruleTown/script_Carlov.inc index 8a925f4d..3248dd3a 100644 --- a/data/scripts/hyruleTown/script_Carlov.inc +++ b/data/scripts/hyruleTown/script_Carlov.inc @@ -46,7 +46,7 @@ script_080144C0: script_080144C8: ModRupees 0xfff6 MessageFromTarget 0x420c - PlaySound SFX_10C + PlaySound SFX_BUTTON_PRESS Wait 0x0018 SetRoomFlag 0x0000 SetLocalFlag 0x0092 diff --git a/data/sound/sounds.s b/data/sound/sounds.s index fb2a0819..840cb9fe 100644 --- a/data/sound/sounds.s +++ b/data/sound/sounds.s @@ -232,7 +232,7 @@ .include "sounds/sfx109.s" .include "sounds/sfx10A.s" .include "sounds/sfx10B.s" - .include "sounds/sfx10C.s" + .include "sounds/sfxButtonPress.s" .include "sounds/sfx10D.s" .include "sounds/sfx10E.s" .include "sounds/sfx10F.s" @@ -327,7 +327,7 @@ .include "sounds/sfx168.s" .include "sounds/sfx169.s" .include "sounds/sfx16A.s" - .include "sounds/sfx16B.s" + .include "sounds/sfxPressurePlate.s" .include "sounds/sfx16C.s" .include "sounds/sfx16D.s" .include "sounds/sfx16E.s" |