thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2025-09-17 02:40:50 +12:00
Code Issues Actions Packages Projects Releases Wiki Activity

Some work on GMolt fight

Browse source 
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
Show stats Download patch file Download diff file Expand all files Collapse all files

2
data/maps/objects/CelesteHillOutside.asm
View file

@ -1,5 +1,5 @@
CelesteHillOutside_Object: CelesteHillOutside_Object:
db $0 ; border block db $3 ; border block
def_warp_events def_warp_events
warp_event 18, 35, CITRINE_CITY, 5 warp_event 18, 35, CITRINE_CITY, 5

4
data/maps/objects/RedsHouse2F.asm
View file

@ -7,8 +7,8 @@ RedsHouse2F_Object:
;warp_event 5, 1, SILPH_CO_11F, 1 ; - Test Omega & Giovanni ;warp_event 5, 1, SILPH_CO_11F, 1 ; - Test Omega & Giovanni
;warp_event 5, 1, ROCKET_HIDEOUT_B4F, 2 ; - Test Giovanni 1 ;warp_event 5, 1, ROCKET_HIDEOUT_B4F, 2 ; - Test Giovanni 1
;warp_event 5, 1, MT_MOON_SQUARE, 1 ; - Test Shop, NPCs, and Crater ;warp_event 5, 1, MT_MOON_SQUARE, 1 ; - Test Shop, NPCs, and Crater
;warp_event 5, 1, CELESTE_HILL, 2 ; - Test Birds warp_event 5, 1, CELESTE_HILL, 2 ; - Test Birds
warp_event 5, 1, INDIGO_PLATEAU_LOBBY, 1 ; easy league access ;warp_event 5, 1, INDIGO_PLATEAU_LOBBY, 1 ; easy league access
def_bg_events def_bg_events

14
data/wild/maps/CelesteHill.asm
View file

@ -1,15 +1,15 @@
CelesteHillWildMons: CelesteHillWildMons:
def_grass_wildmons 10 ; encounter rate def_grass_wildmons 10 ; encounter rate
db 55, FEAROW db 55, FARFETCHD
db 55, PIDGEOT db 55, PIDGEOT
db 56, MADAAMU db 56, FARFETCHD
db 56, FEAROW db 56, FEAROW
db 57, SCYTHER db 57, FEAROW
db 57, MADAAMU db 57, MADAAMU
db 70, ARTICUNO_G ; currently placeholders before static encounters are added db 57, SIRFETCHD
db 70, ZAPDOS_G db 57, DODRIO
db 70, MOLTRES_G db 56, GYARADOS
db 70, MOLTRES_G db 59, DRAGONITE
end_grass_wildmons end_grass_wildmons
def_water_wildmons 0 ; encounter rate def_water_wildmons 0 ; encounter rate

2
data/wild/maps/CelesteHillCave.asm
View file

@ -6,7 +6,7 @@ CelesteHillCaveWildMons:
db 52, MAROWAK db 52, MAROWAK
db 52, GRAVELER db 52, GRAVELER
db 51, MAROWAK db 51, MAROWAK
db 53, TOEDSCOOL db 53, CROBAT
db 53, RHYDON db 53, RHYDON
db 53, STEELIX db 53, STEELIX
db 54, GOLEM db 54, GOLEM

BIN
maps/CelesteHillOutside.blk
View file

Binary file not shown.

39
scripts/CelesteHill.asm
View file

@ -8,13 +8,46 @@ CelesteHill_Script:
ret ret
CelesteHill_ScriptPointers: CelesteHill_ScriptPointers:
dw GMoltFound
dw CheckFightingMapTrainers dw CheckFightingMapTrainers
dw DisplayEnemyTrainerTextAndStartBattle dw DisplayEnemyTrainerTextAndStartBattle
dw EndTrainerBattle dw EndTrainerBattle
; CelesteHillCoords1: ; Galarian Moltres fight script.
; dbmapcoord 11, 9 ; Unlike other legendary Pokemon, Moltres will engage the player first.
; db -1 ; end 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: CelesteHill_TextPointers:
dw GalarianMoltresText dw GalarianMoltresText