mirror of
https://github.com/thornAvery/kep-hack.git
synced 2026-02-21 22:52:15 +13:00
Merge branch 'master' of https://github.com/pret/pokered
This commit is contained in:
dannye
commit
e8dd755e18
3702 changed files with 163333 additions and 159040 deletions
125
scripts/Route22.asm
Executable file → Normal file
125
scripts/Route22.asm
Executable file → Normal file
|
|
@ -44,7 +44,7 @@ Route22MoveRivalSprite:
|
|||
.asm_50ef1
|
||||
call MoveSprite
|
||||
ld a, SPRITE_FACING_RIGHT
|
||||
ld [hSpriteFacingDirection], a
|
||||
ldh [hSpriteFacingDirection], a
|
||||
jp SetSpriteFacingDirectionAndDelay
|
||||
|
||||
Route22RivalMovementData:
|
||||
|
|
@ -52,7 +52,7 @@ Route22RivalMovementData:
|
|||
db NPC_MOVEMENT_RIGHT
|
||||
db NPC_MOVEMENT_RIGHT
|
||||
db NPC_MOVEMENT_RIGHT
|
||||
db $FF
|
||||
db -1 ; end
|
||||
|
||||
Route22Script0:
|
||||
CheckEvent EVENT_ROUTE22_RIVAL_WANTS_BATTLE
|
||||
|
|
@ -63,7 +63,7 @@ Route22Script0:
|
|||
ld a, [wCoordIndex]
|
||||
ld [wcf0d], a
|
||||
xor a
|
||||
ld [hJoyHeld], a
|
||||
ldh [hJoyHeld], a
|
||||
ld a, $f0
|
||||
ld [wJoyIgnore], a
|
||||
ld a, PLAYER_DIR_LEFT
|
||||
|
|
@ -75,9 +75,9 @@ Route22Script0:
|
|||
ret
|
||||
|
||||
.Route22RivalBattleCoords
|
||||
db $04, $1D
|
||||
db $05, $1D
|
||||
db $FF
|
||||
dbmapcoord 29, 4
|
||||
dbmapcoord 29, 5
|
||||
db -1 ; end
|
||||
|
||||
.firstRivalBattle
|
||||
ld a, $1
|
||||
|
|
@ -88,7 +88,7 @@ Route22Script0:
|
|||
ld a, [wWalkBikeSurfState]
|
||||
and a
|
||||
jr z, .asm_50f4e
|
||||
ld a, $ff
|
||||
ld a, SFX_STOP_ALL_MUSIC
|
||||
ld [wNewSoundID], a
|
||||
call PlaySound
|
||||
.asm_50f4e
|
||||
|
|
@ -96,7 +96,7 @@ Route22Script0:
|
|||
ld a, MUSIC_MEET_RIVAL
|
||||
call PlayMusic
|
||||
ld a, $1
|
||||
ld [H_SPRITEINDEX], a
|
||||
ldh [hSpriteIndex], a
|
||||
call Route22MoveRivalSprite
|
||||
ld a, $1
|
||||
ld [wRoute22CurScript], a
|
||||
|
|
@ -116,14 +116,14 @@ Route22Script1:
|
|||
.asm_50f78
|
||||
ld a, SPRITE_FACING_RIGHT
|
||||
.asm_50f7a
|
||||
ld [hSpriteFacingDirection], a
|
||||
ldh [hSpriteFacingDirection], a
|
||||
ld a, $1
|
||||
ld [H_SPRITEINDEX], a
|
||||
ldh [hSpriteIndex], a
|
||||
call SetSpriteFacingDirectionAndDelay
|
||||
xor a
|
||||
ld [wJoyIgnore], a
|
||||
ld a, $1
|
||||
ld [hSpriteIndexOrTextID], a
|
||||
ldh [hSpriteIndexOrTextID], a
|
||||
call DisplayTextID
|
||||
ld hl, wd72d
|
||||
set 6, [hl]
|
||||
|
|
@ -131,7 +131,7 @@ Route22Script1:
|
|||
ld hl, Route22RivalDefeatedText1
|
||||
ld de, Route22Text_511bc
|
||||
call SaveEndBattleTextPointers
|
||||
ld a, OPP_SONY1
|
||||
ld a, OPP_RIVAL1
|
||||
ld [wCurOpponent], a
|
||||
ld hl, StarterMons_50faf
|
||||
call Route22Script_50ed6
|
||||
|
|
@ -141,15 +141,15 @@ Route22Script1:
|
|||
|
||||
StarterMons_50faf:
|
||||
; starter the rival picked, rival trainer number
|
||||
db STARTER2,$04
|
||||
db STARTER3,$05
|
||||
db STARTER1,$06
|
||||
db STARTER2, 4
|
||||
db STARTER3, 5
|
||||
db STARTER1, 6
|
||||
|
||||
Route22Script2:
|
||||
ld a, [wIsInBattle]
|
||||
cp $ff
|
||||
jp z, Route22Script_50ece
|
||||
ld a, [wSpriteStateData1 + 9]
|
||||
ld a, [wSpritePlayerStateData1FacingDirection]
|
||||
and a ; cp SPRITE_FACING_DOWN
|
||||
jr nz, .notDown
|
||||
ld a, SPRITE_FACING_UP
|
||||
|
|
@ -157,20 +157,20 @@ Route22Script2:
|
|||
.notDown
|
||||
ld a, SPRITE_FACING_RIGHT
|
||||
.done
|
||||
ld [hSpriteFacingDirection], a
|
||||
ldh [hSpriteFacingDirection], a
|
||||
ld a, $1
|
||||
ld [H_SPRITEINDEX], a
|
||||
ldh [hSpriteIndex], a
|
||||
call SetSpriteFacingDirectionAndDelay
|
||||
ld a, $f0
|
||||
ld [wJoyIgnore], a
|
||||
SetEvent EVENT_BEAT_ROUTE22_RIVAL_1ST_BATTLE
|
||||
ld a, $1
|
||||
ld [hSpriteIndexOrTextID], a
|
||||
ldh [hSpriteIndexOrTextID], a
|
||||
call DisplayTextID
|
||||
ld a, $ff
|
||||
ld a, SFX_STOP_ALL_MUSIC
|
||||
ld [wNewSoundID], a
|
||||
call PlaySound
|
||||
callba Music_RivalAlternateStart
|
||||
farcall Music_RivalAlternateStart
|
||||
ld a, [wcf0d]
|
||||
cp $1
|
||||
jr nz, .asm_50fff
|
||||
|
|
@ -191,7 +191,7 @@ Route22Script_5100d:
|
|||
ld de, Route22RivalExitMovementData2
|
||||
Route22MoveRival1:
|
||||
ld a, $1
|
||||
ld [H_SPRITEINDEX], a
|
||||
ldh [hSpriteIndex], a
|
||||
jp MoveSprite
|
||||
|
||||
Route22RivalExitMovementData1:
|
||||
|
|
@ -202,7 +202,7 @@ Route22RivalExitMovementData1:
|
|||
db NPC_MOVEMENT_DOWN
|
||||
db NPC_MOVEMENT_DOWN
|
||||
db NPC_MOVEMENT_DOWN
|
||||
db $FF
|
||||
db -1 ; end
|
||||
|
||||
Route22RivalExitMovementData2:
|
||||
db NPC_MOVEMENT_UP
|
||||
|
|
@ -215,7 +215,7 @@ Route22RivalExitMovementData2:
|
|||
db NPC_MOVEMENT_DOWN
|
||||
db NPC_MOVEMENT_DOWN
|
||||
db NPC_MOVEMENT_DOWN
|
||||
db $FF
|
||||
db -1 ; end
|
||||
|
||||
Route22Script3:
|
||||
ld a, [wd730]
|
||||
|
|
@ -241,16 +241,16 @@ Route22Script_5104e:
|
|||
ld a, [wWalkBikeSurfState]
|
||||
and a
|
||||
jr z, .skipYVisibilityTesta
|
||||
ld a, $ff
|
||||
ld a, SFX_STOP_ALL_MUSIC
|
||||
ld [wNewSoundID], a
|
||||
call PlaySound
|
||||
.skipYVisibilityTesta
|
||||
ld a, $ff
|
||||
ld a, SFX_STOP_ALL_MUSIC
|
||||
ld [wNewSoundID], a
|
||||
call PlaySound
|
||||
callba Music_RivalAlternateTempo
|
||||
farcall Music_RivalAlternateTempo
|
||||
ld a, $2
|
||||
ld [H_SPRITEINDEX], a
|
||||
ldh [hSpriteIndex], a
|
||||
call Route22MoveRivalSprite
|
||||
ld a, $4
|
||||
ld [wRoute22CurScript], a
|
||||
|
|
@ -261,7 +261,7 @@ Route22Script4:
|
|||
bit 0, a
|
||||
ret nz
|
||||
ld a, $2
|
||||
ld [H_SPRITEINDEX], a
|
||||
ldh [hSpriteIndex], a
|
||||
ld a, [wcf0d]
|
||||
cp $1
|
||||
jr nz, .asm_510a1
|
||||
|
|
@ -274,12 +274,12 @@ Route22Script4:
|
|||
ld [wPlayerMovingDirection], a
|
||||
ld a, SPRITE_FACING_RIGHT
|
||||
.asm_510a8
|
||||
ld [hSpriteFacingDirection], a
|
||||
ldh [hSpriteFacingDirection], a
|
||||
call SetSpriteFacingDirectionAndDelay
|
||||
xor a
|
||||
ld [wJoyIgnore], a
|
||||
ld a, $2
|
||||
ld [hSpriteIndexOrTextID], a
|
||||
ldh [hSpriteIndexOrTextID], a
|
||||
call DisplayTextID
|
||||
ld hl, wd72d
|
||||
set 6, [hl]
|
||||
|
|
@ -287,7 +287,7 @@ Route22Script4:
|
|||
ld hl, Route22RivalDefeatedText2
|
||||
ld de, Route22Text_511d0
|
||||
call SaveEndBattleTextPointers
|
||||
ld a, OPP_SONY2
|
||||
ld a, OPP_RIVAL2
|
||||
ld [wCurOpponent], a
|
||||
ld hl, StarterMons_510d9
|
||||
call Route22Script_50ed6
|
||||
|
|
@ -296,16 +296,16 @@ Route22Script4:
|
|||
ret
|
||||
|
||||
StarterMons_510d9:
|
||||
db STARTER2,$0a
|
||||
db STARTER3,$0b
|
||||
db STARTER1,$0c
|
||||
db STARTER2, 10
|
||||
db STARTER3, 11
|
||||
db STARTER1, 12
|
||||
|
||||
Route22Script5:
|
||||
ld a, [wIsInBattle]
|
||||
cp $ff
|
||||
jp z, Route22Script_50ece
|
||||
ld a, $2
|
||||
ld [H_SPRITEINDEX], a
|
||||
ldh [hSpriteIndex], a
|
||||
ld a, [wcf0d]
|
||||
cp $1
|
||||
jr nz, .asm_510fb
|
||||
|
|
@ -318,18 +318,18 @@ Route22Script5:
|
|||
ld [wPlayerMovingDirection], a
|
||||
ld a, SPRITE_FACING_RIGHT
|
||||
.asm_51102
|
||||
ld [hSpriteFacingDirection], a
|
||||
ldh [hSpriteFacingDirection], a
|
||||
call SetSpriteFacingDirectionAndDelay
|
||||
ld a, $f0
|
||||
ld [wJoyIgnore], a
|
||||
SetEvent EVENT_BEAT_ROUTE22_RIVAL_2ND_BATTLE
|
||||
ld a, $2
|
||||
ld [hSpriteIndexOrTextID], a
|
||||
ldh [hSpriteIndexOrTextID], a
|
||||
call DisplayTextID
|
||||
ld a, $ff
|
||||
ld a, SFX_STOP_ALL_MUSIC
|
||||
ld [wNewSoundID], a
|
||||
call PlaySound
|
||||
callba Music_RivalAlternateStartAndTempo
|
||||
farcall Music_RivalAlternateStartAndTempo
|
||||
ld a, [wcf0d]
|
||||
cp $1
|
||||
jr nz, .asm_51134
|
||||
|
|
@ -350,17 +350,16 @@ Route22Script_51142:
|
|||
ld de, MovementData_5114d
|
||||
Route22MoveRival2:
|
||||
ld a, $2
|
||||
ld [H_SPRITEINDEX], a
|
||||
ldh [hSpriteIndex], a
|
||||
jp MoveSprite
|
||||
|
||||
MovementData_5114c:
|
||||
db NPC_MOVEMENT_LEFT
|
||||
|
||||
MovementData_5114d:
|
||||
db NPC_MOVEMENT_LEFT
|
||||
db NPC_MOVEMENT_LEFT
|
||||
db NPC_MOVEMENT_LEFT
|
||||
db $FF
|
||||
db -1 ; end
|
||||
|
||||
Route22Script6:
|
||||
ld a, [wd730]
|
||||
|
|
@ -383,7 +382,7 @@ Route22_TextPointers:
|
|||
dw Route22FrontGateText
|
||||
|
||||
Route22Text1:
|
||||
TX_ASM
|
||||
text_asm
|
||||
CheckEvent EVENT_BEAT_ROUTE22_RIVAL_1ST_BATTLE
|
||||
jr z, .asm_5118b
|
||||
ld hl, Route22RivalAfterBattleText1
|
||||
|
|
@ -396,7 +395,7 @@ Route22Text1:
|
|||
jp TextScriptEnd
|
||||
|
||||
Route22Text2:
|
||||
TX_ASM
|
||||
text_asm
|
||||
CheckEvent EVENT_BEAT_ROUTE22_RIVAL_2ND_BATTLE
|
||||
jr z, .asm_511a4
|
||||
ld hl, Route22RivalAfterBattleText2
|
||||
|
|
@ -409,37 +408,37 @@ Route22Text2:
|
|||
jp TextScriptEnd
|
||||
|
||||
Route22RivalBeforeBattleText1:
|
||||
TX_FAR _Route22RivalBeforeBattleText1
|
||||
db "@"
|
||||
text_far _Route22RivalBeforeBattleText1
|
||||
text_end
|
||||
|
||||
Route22RivalAfterBattleText1:
|
||||
TX_FAR _Route22RivalAfterBattleText1
|
||||
db "@"
|
||||
text_far _Route22RivalAfterBattleText1
|
||||
text_end
|
||||
|
||||
Route22RivalDefeatedText1:
|
||||
TX_FAR _Route22RivalDefeatedText1
|
||||
db "@"
|
||||
text_far _Route22RivalDefeatedText1
|
||||
text_end
|
||||
|
||||
Route22Text_511bc:
|
||||
TX_FAR _Route22Text_511bc
|
||||
db "@"
|
||||
text_far _Route22Text_511bc
|
||||
text_end
|
||||
|
||||
Route22RivalBeforeBattleText2:
|
||||
TX_FAR _Route22RivalBeforeBattleText2
|
||||
db "@"
|
||||
text_far _Route22RivalBeforeBattleText2
|
||||
text_end
|
||||
|
||||
Route22RivalAfterBattleText2:
|
||||
TX_FAR _Route22RivalAfterBattleText2
|
||||
db "@"
|
||||
text_far _Route22RivalAfterBattleText2
|
||||
text_end
|
||||
|
||||
Route22RivalDefeatedText2:
|
||||
TX_FAR _Route22RivalDefeatedText2
|
||||
db "@"
|
||||
text_far _Route22RivalDefeatedText2
|
||||
text_end
|
||||
|
||||
Route22Text_511d0:
|
||||
TX_FAR _Route22Text_511d0
|
||||
db "@"
|
||||
text_far _Route22Text_511d0
|
||||
text_end
|
||||
|
||||
Route22FrontGateText:
|
||||
TX_FAR _Route22FrontGateText
|
||||
db "@"
|
||||
text_far _Route22FrontGateText
|
||||
text_end
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue