Functioning Galarian Moltres

- Moltres now functions correctly, seeing you like a normal trainer would.

- Slightly tidied up Brunswick Trail and Celeste Hill Outside's maps

- Celeste Hill Outside and Cave now play Digda01 as a music track
This commit is contained in:
Martha Schilling 2023-07-04 12:59:54 +01:00
parent f973ad3ac4
commit baa94d76ae
7 changed files with 12 additions and 50 deletions

View file

@ -8,57 +8,20 @@ CelesteHill_Script:
ret
CelesteHill_ScriptPointers:
dw GMoltFound
dw CheckFightingMapTrainers
dw DisplayEnemyTrainerTextAndStartBattle
dw EndTrainerBattle
; Galarian Moltres fight script.
; Unlike other legendary Pokemon, Moltres will engage the player first.
GMoltFound:
CheckEvent EVENT_BEAT_GALARIAN_MOLTRES
jr nz, .done
ld hl, CelesteHillCoords1
call ArePlayerCoordsInArray
jp nc, CheckFightingMapTrainers
ld a, [wCoordIndex]
ld [wcf0d], a
xor a
ldh [hJoyHeld], a
ld a, $f0
ld [wJoyIgnore], a
ld a, $1
ldh [hSpriteIndex], a
call SetSpriteMovementBytesToFF
ld de, GMoltMovement
call MoveSprite
ld a, $1
ldh [hSpriteIndexOrTextID], a
call DisplayTextID
.done
ret
CelesteHillCoords1:
dbmapcoord 11, 9
CelesteHillTrainerHeaders:
def_trainers
GalarianMoltresTrainerHeader:
trainer EVENT_BEAT_GALARIAN_MOLTRES, 3, GalarianMoltresBattleText, GalarianMoltresBattleText, GalarianMoltresBattleText
db -1 ; end
GMoltMovement:
db NPC_MOVEMENT_DOWN
db NPC_MOVEMENT_DOWN
db -1 ;end
CelesteHill_TextPointers:
dw GalarianMoltresText
dw CelesteHillSign
CelesteHillTrainerHeaders:
def_trainers
GalarianMoltresTrainerHeader:
trainer EVENT_BEAT_GALARIAN_MOLTRES, 0, GalarianMoltresBattleText, GalarianMoltresBattleText, GalarianMoltresBattleText
db -1 ; end
GalarianMoltresText:
text_asm
ld hl, GalarianMoltresTrainerHeader