thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2025-11-11 15:54:49 +13:00
Code Issues Actions Packages Projects Releases Wiki Activity

Cactus and Gapdos now disappear after the battle

Browse source
This commit is contained in:
MementoMartha 2023-04-27 10:34:23 +01:00
parent 108fb01070
commit 858e7bc92a
5 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
constants/event_constants.asm
View file

@ -640,9 +640,10 @@
const EVENT_BEAT_MEW const EVENT_BEAT_MEW
const_skip 7 const_skip 7
const EVENT_BEAT_MOLTRES const EVENT_BEAT_MOLTRES
;const_skip 7
;const EVENT_BEAT_OMEGA
const_skip 7 const_skip 7
const EVENT_BEAT_CACTUS
const EVENT_BEAT_ZAPDOSG
const_skip 6
const EVENT_BEAT_DRAGONITE const EVENT_BEAT_DRAGONITE
; Celadon University, Salesman ; Celadon University, Salesman
@ -785,8 +786,6 @@
; Safari Zone events ; Safari Zone events
const_next $880 const_next $880
const EVENT_BEAT_CACTUS
const EVENT_BEAT_ZAPDOSG
const EVENT_GOT_HM03 const EVENT_GOT_HM03
const EVENT_GOT_MELTAN const EVENT_GOT_MELTAN

1
data/maps/objects/CelesteHill.asm
View file

@ -2,6 +2,7 @@ CelesteHill_Object:
db $0 ; border block db $0 ; border block
def_warp_events def_warp_events
warp_event 12, 23, BRUNSWICK_TRAIL, 1
warp_event 13, 23, BRUNSWICK_TRAIL, 1 warp_event 13, 23, BRUNSWICK_TRAIL, 1
def_bg_events def_bg_events

4
data/wild/maps/MtMoonCrater.asm
View file

@ -7,9 +7,9 @@ MtMoonCraterMons:
db 52, DUGTRIO db 52, DUGTRIO
db 55, ESPEON db 55, ESPEON
db 55, UMBREON db 55, UMBREON
db 56, SANDY_SHOCKS db 50, SANDY_SHOCKS
db 50, SCREAM_TAIL db 50, SCREAM_TAIL
db 50, CHANSEY ; I don't like this but I also don't like the Paradox Pokemon not both being 4%. Sue me. db 56, CHANSEY ; I don't like this but I also don't like the Paradox Pokemon not both being 4%. Sue me.
end_grass_wildmons end_grass_wildmons
def_water_wildmons 10 ; encounter rate def_water_wildmons 10 ; encounter rate

11
scripts/BrunswickTrail.asm
View file

@ -1,8 +1,11 @@
BrunswickTrail_Script: BrunswickTrail_Script:
jp EnableAutoTextBoxDrawing call EnableAutoTextBoxDrawing
ld hl, BrunswickTrail_ScriptPointers ld hl, BrunswickTrailTrainerHeaders
ld de, BrunswickTrail_ScriptPointers
ld a, [wBrunswickTrailCurScript] ld a, [wBrunswickTrailCurScript]
jp CallFunctionInTable call ExecuteCurMapScriptInTable
ld [wBrunswickTrailCurScript], a
ret
BrunswickTrail_ScriptPointers: BrunswickTrail_ScriptPointers:
dw CheckFightingMapTrainers dw CheckFightingMapTrainers
@ -15,7 +18,7 @@ BrunswickTrail_TextPointers:
dw GalarianZapdosText dw GalarianZapdosText
BrunswickTrailTrainerHeaders: BrunswickTrailTrainerHeaders:
def_trainers 0 def_trainers
CactusTrainerHeader: CactusTrainerHeader:
trainer EVENT_BEAT_CACTUS, 0, CactusBattleText, CactusBattleText, CactusBattleText trainer EVENT_BEAT_CACTUS, 0, CactusBattleText, CactusBattleText, CactusBattleText
GalarianZapdosTrainerHeader: GalarianZapdosTrainerHeader:

2
text/BrunswickTrail.asm
View file

@ -34,7 +34,7 @@ _FakeTreeAttack::
prompt prompt
_GalarianZapdosBattleText:: _GalarianZapdosBattleText::
text "Kyooo!" text "Gyaoo!" ; making the cries consistent with the other legendary birds
prompt prompt
; Martha can do the text for her things... ; Martha can do the text for her things...