Some work on GMolt fight

Currently, the movement is buggy and the battle repeats. It works without the movement, though...

Alternatively, give Galarian Moltres trainer sight.
This commit is contained in:
Llinos Evans 2023-06-20 17:29:42 +01:00
parent 8c80ee22bd
commit beab109a16
6 changed files with 47 additions and 14 deletions

View file

@ -8,13 +8,46 @@ CelesteHill_Script:
ret
CelesteHill_ScriptPointers:
dw GMoltFound
dw CheckFightingMapTrainers
dw DisplayEnemyTrainerTextAndStartBattle
dw EndTrainerBattle
; CelesteHillCoords1:
; dbmapcoord 11, 9
; db -1 ; end
; 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
db -1 ; end
GMoltMovement:
db NPC_MOVEMENT_DOWN
db NPC_MOVEMENT_DOWN
db -1 ;end
CelesteHill_TextPointers:
dw GalarianMoltresText