summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/pewterpokecenter2.asm72
-rwxr-xr-xscripts/route8gate.asm2
2 files changed, 73 insertions, 1 deletions
diff --git a/scripts/pewterpokecenter2.asm b/scripts/pewterpokecenter2.asm
new file mode 100755
index 00000000..1aae37d1
--- /dev/null
+++ b/scripts/pewterpokecenter2.asm
@@ -0,0 +1,72 @@
+Func_f1d98:
+ ld hl, PewterPokecenterText_f1d9f
+ call PrintText
+ ret
+
+PewterPokecenterText_f1d9f:
+ TX_FAR _PewterPokecenterText2
+ db "@"
+
+Func_f1da4:
+ ld a, $1
+ ld [wDoNotWaitForButtonPressAfterDisplayingText], a
+ ld hl, PewterPokecenterText_f1e19
+ call PrintText
+ call StopAllMusic
+ ld c, 32
+ call DelayFrames
+ ld hl, JigglypuffSpinData
+ ld de, wJigglypuffFacingDirections
+ ld bc, JigglypuffSpinDataEnd - JigglypuffSpinData
+ call CopyData
+ ld a, [wSpriteStateData1 + 3 * $10 + 2]
+ ld hl, wJigglypuffFacingDirections
+.asm_f1dc9
+ cp [hl]
+ inc hl
+ jr nz, .asm_f1dc9
+ dec hl
+ push hl
+ ld c, BANK(Music_JigglypuffSong)
+ ld a, MUSIC_JIGGLYPUFF_SONG
+ call PlayMusic
+ pop hl
+.asm_f1dd7
+ ld a, [hl]
+ ld [wSpriteStateData1 + 3 * $10 + 2], a
+ push hl
+ ld hl, wJigglypuffFacingDirections
+ ld de, wJigglypuffFacingDirections2
+ ld bc, JigglypuffSpinDataEnd - JigglypuffSpinData
+ call CopyData
+ ld a, [wJigglypuffFacingDirections2]
+ ld [wcd42], a
+ pop hl
+ ld c, 24
+ call DelayFrames
+ ld a, [wChannelSoundIDs]
+ ld b, a
+ ld a, [wChannelSoundIDs + 1]
+ or b
+ jr nz, .asm_f1dd7
+ ld c, 48
+ call DelayFrames
+ call PlayDefaultMusic
+ ld a, [wd472]
+ bit 7, a
+ ret z
+ callab Func_fce73
+ ret c
+ call SetPikachuAsleep
+ ret
+
+PewterPokecenterText_f1e19:
+ TX_FAR _PewterPokecenterText5
+ db "@"
+
+JigglypuffSpinData:
+ db $40 | SPRITE_FACING_DOWN
+ db $40 | SPRITE_FACING_LEFT
+ db $40 | SPRITE_FACING_UP
+ db $40 | SPRITE_FACING_RIGHT
+JigglypuffSpinDataEnd:
diff --git a/scripts/route8gate.asm b/scripts/route8gate.asm
index fe2e3c3c..5a26b424 100755
--- a/scripts/route8gate.asm
+++ b/scripts/route8gate.asm
@@ -27,7 +27,7 @@ Route8GateScript0: ; 1e1ee (7:61ee)
ld hl, CoordsData_1e22c
call ArePlayerCoordsInArray
ret nc
- ld a, PLAYER_DIR_LEFT
+ ld a, PLAYER_DIR_UP
ld [wPlayerMovingDirection], a
xor a
ld [hJoyHeld], a