mirror of
https://github.com/thornAvery/kep-hack.git
synced 2026-02-06 15:45:24 +13:00
Brunswick groundwork, misc. changes
The groundwork for Brunswick Trail events has been done. Wild data, Cactus event, and Zapdos-G events are set up, plus an NPC. This also makes the Fake Tree sprite available. I made the warp at the tunnel in Brunswick goes directly to Celeste Hill and back. Warp tile made functional. Many bugs right now: - Cactus doesn't disappear after battling it. Also, making this work how I want it to is hard. - Pokemon are encountered on every tile, which is likely because it's considered to be indoors. In trying to fix this, I seemed to completely screw up the maps, so this isn't being committed. Handle this with care. - I made a spriteset specifically for Citrine, but it doesn't seem to be working for Brunswick, likely because Brunswick is an indoor map and thus isn't just taking it. Misc. changes: - Moved Sandy Shocks to a 4% encounter slot in Mt. Moon Crater to be equal to Scream Tail. - Restored the proper translation for the "rotten PRESIDENT" scientist, courtesy of Dr. Lava and Nob Ogasawara.
This commit is contained in:
parent
7850a87e83
commit
108fb01070
19 changed files with 205 additions and 28 deletions
|
|
@ -1,6 +1,92 @@
|
|||
BrunswickTrail_Script:
|
||||
jp EnableAutoTextBoxDrawing
|
||||
ld hl, BrunswickTrail_ScriptPointers
|
||||
ld a, [wBrunswickTrailCurScript]
|
||||
jp CallFunctionInTable
|
||||
|
||||
BrunswickTrail_ScriptPointers:
|
||||
dw CheckFightingMapTrainers
|
||||
dw DisplayEnemyTrainerTextAndStartBattle
|
||||
dw EndTrainerBattle
|
||||
|
||||
BrunswickTrail_TextPointers:
|
||||
dw FakeTreeEvent
|
||||
dw ZapdosGuy
|
||||
dw GalarianZapdosText
|
||||
|
||||
BrunswickTrailTrainerHeaders:
|
||||
def_trainers 0
|
||||
CactusTrainerHeader:
|
||||
trainer EVENT_BEAT_CACTUS, 0, CactusBattleText, CactusBattleText, CactusBattleText
|
||||
GalarianZapdosTrainerHeader:
|
||||
trainer EVENT_BEAT_ZAPDOSG, 0, GalarianZapdosBattleText, GalarianZapdosBattleText, GalarianZapdosBattleText
|
||||
db -1 ; end
|
||||
|
||||
ZapdosGuy:
|
||||
text_far _ZapdosGuy
|
||||
text_end
|
||||
|
||||
FakeTreeNoCut:
|
||||
text_far _FakeTreeNoCut
|
||||
text_end
|
||||
|
||||
FakeTreePrompt:
|
||||
text_far _FakeTreePrompt
|
||||
text_end
|
||||
|
||||
; Ok, so here's how it is.
|
||||
; So look, I tried to make the text work more efficiently with FakeTreeEvent.
|
||||
; But one bug literally took me back to the fucking title screen and at that point I gave up and decided to do it this hacky way.
|
||||
; I wanted to have some text before the CUT check. It did not work. It was terrifying.
|
||||
; So instead I have two different versions of the same text, despite some being the same.
|
||||
; It is inefficient, but it works. There's a lot to see in this life, and I'm not wasting it in Notepad++.
|
||||
FakeTreeEvent:
|
||||
text_asm
|
||||
; ld d, CUT
|
||||
; farcall HasPartyMove
|
||||
; jr z, .NoCut
|
||||
; jr nz, .HasCut
|
||||
;.HasCut
|
||||
ld hl, FakeTreePrompt
|
||||
call PrintText
|
||||
call YesNoChoice
|
||||
ld a, [wCurrentMenuItem]
|
||||
and a
|
||||
jr nz, .refused
|
||||
|
||||
ld a, SFX_CUT
|
||||
call PlaySound
|
||||
|
||||
ld hl, CactusTrainerHeader
|
||||
call TalkToTrainer
|
||||
jp TextScriptEnd ; I have tried a lot of things and it's not disappearing AAA
|
||||
;.NoCut
|
||||
; ld hl, FakeTreeNoCut ; Why do you have to be this way? I scream, for I do not know.
|
||||
; call PrintText
|
||||
; ret
|
||||
.refused
|
||||
jp TextScriptEnd
|
||||
|
||||
CactusBattleText:
|
||||
text_far _FakeTreeAttack
|
||||
text_asm
|
||||
ld a, CACTUS
|
||||
call PlayCry
|
||||
call WaitForSoundToFinish
|
||||
jp TextScriptEnd
|
||||
|
||||
GalarianZapdosText:
|
||||
text_asm
|
||||
ld hl, GalarianZapdosTrainerHeader
|
||||
call TalkToTrainer
|
||||
jp TextScriptEnd
|
||||
|
||||
GalarianZapdosBattleText:
|
||||
text_far _GalarianZapdosBattleText
|
||||
text_asm
|
||||
ld a, ZAPDOS_G
|
||||
call PlayCry
|
||||
call WaitForSoundToFinish
|
||||
jp TextScriptEnd
|
||||
|
||||
text_end ; unused
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue