summaryrefslogtreecommitdiff
path: root/main.asm
diff options
context:
space:
mode:
authorpikalaxalt <PikalaxALT@gmail.com>2016-06-21 20:27:23 -0400
committerpikalaxalt <PikalaxALT@gmail.com>2016-06-21 20:27:23 -0400
commitd316bf52338ea3567e7b9849240f158863899c1b (patch)
tree18b2c1d51324312d5e78e90f56e3fd0ba4fbd499 /main.asm
parent0ec25fcb101fc2e29961df801b2739e905c661c5 (diff)
Whirlpool OW function
Diffstat (limited to 'main.asm')
-rw-r--r--main.asm16
1 files changed, 14 insertions, 2 deletions
diff --git a/main.asm b/main.asm
index e4966647..19ee8bee 100644
--- a/main.asm
+++ b/main.asm
@@ -966,7 +966,10 @@ Function8c3e9:: ; 8c3e9
dr $8c3e9, $8c513
Predef_StartBattle::
- dr $8c513, $8ca6b
+ dr $8c513, $8ca5e
+
+PlayWhirlpoolSound:
+ dr $8ca5e, $8ca6b
BlindingFlash:
dr $8ca6b, $8cbb8
@@ -1418,7 +1421,16 @@ Text_BouldersMayNowBeMoved_::
dr $194199, $1941b5
Text_MonMayBeAbleToMove_::
- dr $1941b5, $195610
+ dr $1941b5, $1941d7
+
+Text_UsedWhirlpool_::
+ dr $1941d7, $1941ec
+
+Text_MightyWhirlpool_::
+ dr $1941ec, $194225
+
+Text_AskWhirlpool_::
+ dr $194225, $195610
ClockTimeUnknownText_:: ; 195610
dr $195610, $195624