thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2026-02-21 22:52:15 +13:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'mistress' into renewables

Browse source
This commit is contained in:
Thorn Avery 2023-12-01 07:52:50 +11:00
commit 5187896598
176 changed files with 1999 additions and 943 deletions
Download patch file Download diff file Expand all files Collapse all files

4
scripts/BattleTent.asm
View file

@ -718,11 +718,11 @@ BattleTentWelcome:
text "Welcome to the"
line "BATTLE TENT!"
para "Here, TRAINERs"
para "Here, trainers"
line "from far and"
cont "wide come to"
;cont "face a gauntlet"
;cont "of 10 TRAINERs!"
;cont "of 10 trainers!"
cont "spar against"
cont "one another!"

6
scripts/CinnabarVolcano.asm
View file

@ -14,6 +14,12 @@ CinnabarVolcano_ScriptPointers:
CinnabarVolcano_TextPointers:
dw MoltresText
dw BoulderText
dw BoulderText
dw BoulderText
dw BoulderText
dw BoulderText
dw BoulderText
CinnabarVolcanoTrainerHeaders:
def_trainers

109
scripts/CinnabarVolcanoFloors.asm
View file

@ -1,6 +1,113 @@
CinnabarVolcanoFloors_Script:
jp EnableAutoTextBoxDrawing
call EnableAutoTextBoxDrawing
ld hl, CinnabarVolcanoFloorsTrainerHeaders
ld de, CinnabarVolcanoFloors_ScriptPointers
ld a, [wCinnabarVolcanoFloorsCurScript]
call ExecuteCurMapScriptInTable
ld [wCinnabarVolcanoFloorsCurScript], a
ret
CinnabarVolcanoFloors_ScriptPointers:
dw CheckFightingMapTrainers
dw DisplayEnemyTrainerTextAndStartBattle
dw EndTrainerBattle
CinnabarVolcanoFloors_TextPointers:
dw CinnabarVolcanoFloorsText1
dw CinnabarVolcanoFloorsText2
dw CinnabarVolcanoFloorsText3
dw CinnabarVolcanoFloorsText4
dw PickUpItemText
dw BoulderText
dw BoulderText
dw BoulderText
dw BoulderText
dw BoulderText
dw BoulderText
dw BoulderText
CinnabarVolcanoFloorsTrainerHeaders:
def_trainers
CinnabarVolcanoFloorsTrainerHeader0:
trainer EVENT_BEAT_CINNABAR_VOLCANO_TRAINER_1, 2, CinnabarVolcanoFloorsBattleText1, CinnabarVolcanoFloorsEndBattleText1, CinnabarVolcanoFloorsAfterBattleText1
CinnabarVolcanoFloorsTrainerHeader1:
trainer EVENT_BEAT_CINNABAR_VOLCANO_TRAINER_2, 5, CinnabarVolcanoFloorsBattleText2, CinnabarVolcanoFloorsEndBattleText2, CinnabarVolcanoFloorsAfterBattleText2
CinnabarVolcanoFloorsTrainerHeader2:
trainer EVENT_BEAT_CINNABAR_VOLCANO_TRAINER_3, 2, CinnabarVolcanoFloorsBattleText3, CinnabarVolcanoFloorsEndBattleText3, CinnabarVolcanoFloorsAfterBattleText3
CinnabarVolcanoFloorsTrainerHeader3:
trainer EVENT_BEAT_CINNABAR_VOLCANO_TRAINER_4, 3, CinnabarVolcanoFloorsBattleText4, CinnabarVolcanoFloorsEndBattleText4, CinnabarVolcanoFloorsAfterBattleText4
db -1 ; end
CinnabarVolcanoFloorsText1:
text_asm
ld hl, CinnabarVolcanoFloorsTrainerHeader0
call TalkToTrainer
jp TextScriptEnd
CinnabarVolcanoFloorsBattleText1:
text_far _CinnabarVolcanoFloorsBattleText1
text_end
CinnabarVolcanoFloorsEndBattleText1:
text_far _CinnabarVolcanoFloorsEndBattleText1
text_end
CinnabarVolcanoFloorsAfterBattleText1:
text_far _CinnabarVolcanoFloorsAfterBattleText1
text_end
CinnabarVolcanoFloorsText2:
text_asm
ld hl, CinnabarVolcanoFloorsTrainerHeader1
call TalkToTrainer
jp TextScriptEnd
CinnabarVolcanoFloorsBattleText2:
text_far _CinnabarVolcanoFloorsBattleText2
text_end
CinnabarVolcanoFloorsEndBattleText2:
text_far _CinnabarVolcanoFloorsEndBattleText2
text_end
CinnabarVolcanoFloorsAfterBattleText2:
text_far _CinnabarVolcanoFloorsAfterBattleText2
text_end
CinnabarVolcanoFloorsText3:
text_asm
ld hl, CinnabarVolcanoFloorsTrainerHeader2
call TalkToTrainer
jp TextScriptEnd
CinnabarVolcanoFloorsBattleText3:
text_far _CinnabarVolcanoFloorsBattleText3
text_end
CinnabarVolcanoFloorsEndBattleText3:
text_far _CinnabarVolcanoFloorsEndBattleText3
text_end
CinnabarVolcanoFloorsAfterBattleText3:
text_far _CinnabarVolcanoFloorsAfterBattleText3
text_end
CinnabarVolcanoFloorsText4:
text_asm
ld hl, CinnabarVolcanoFloorsTrainerHeader3
call TalkToTrainer
jp TextScriptEnd
CinnabarVolcanoFloorsBattleText4:
text_far _CinnabarVolcanoFloorsBattleText4
text_end
CinnabarVolcanoFloorsEndBattleText4:
text_far _CinnabarVolcanoFloorsEndBattleText4
text_end
CinnabarVolcanoFloorsAfterBattleText4:
text_far _CinnabarVolcanoFloorsAfterBattleText4
text_end
text_end ; unused

6
scripts/FarawayFerryDock.asm Normal file
View file

@ -0,0 +1,6 @@
FarawayFerryDock_Script:
jp EnableAutoTextBoxDrawing
FarawayFerryDock_TextPointers:
text_end

60
scripts/FuchsiaCity.asm
View file

@ -13,6 +13,7 @@ FuchsiaCity_TextPointers:
dw FuchsiaCityText9
dw FuchsiaCityText10
dw SubstituteGuy
dw SafariBallSalesman
dw FuchsiaCityText12
dw FuchsiaCityText13
dw MartSignText
@ -167,6 +168,65 @@ FuchsiaCityText_19b2a:
text_far _FuchsiaCityText_19b2a
text_end
SafariBallSalesman:
text_asm
ld hl, .Text1
call PrintText
ld a, MONEY_BOX
ld [wTextBoxID], a
call DisplayTextBoxID
call YesNoChoice
ld a, [wCurrentMenuItem]
and a
jp nz, .choseNo
ldh [hMoney], a
ldh [hMoney + 2], a
ld a, $24
ldh [hMoney + 1], a
call HasEnoughMoney
jr nc, .enoughMoney
ld hl, .NoMoneyText
jr .printText
.enoughMoney
lb bc, SAFARI_BALL, 3
call GiveItem
jr nc, .done
xor a
ld [wPriceTemp], a
ld [wPriceTemp + 2], a
ld a, $24
ld [wPriceTemp + 1], a
ld hl, wPriceTemp + 2
ld de, wPlayerMoney + 2
ld c, $3
predef SubBCDPredef
ld a, MONEY_BOX
ld [wTextBoxID], a
call DisplayTextBoxID
jr .done
.choseNo
ld hl, .RefuseText
.printText
call PrintText
.done
jp TextScriptEnd
.Text1
text_far _SafariBallSalesmanText1
text_end
.RefuseText
text_far _SafariBallSalesmanNoText
text_end
.NoMoneyText
text_far _SafariBallSalesmanNoMoneyText
text_end
SafariBallBagFull:
text_far _SafariBallBagFull
text_end
; FireRed NPC
; This guy has a Kangaskhan fetish or something wtf
SubstituteGuy:

9
scripts/PokemonMansionB2F.asm
View file

@ -10,15 +10,6 @@ PokemonMansionB2F_TextPointers:
dw B2FBook2
dw PickUpItemText
dw PickUpItemText
dw BoulderText
dw BoulderText
dw BoulderText
dw BoulderText
dw BoulderText
dw BoulderText
dw BoulderText
dw BoulderText
dw BoulderText
dw B2FPicture
dw B2FTrioPods
dw B2FTrioPods

1
scripts/SaffronGym.asm
View file

@ -47,6 +47,7 @@ SaffronGymReceiveTM46:
ldh [hSpriteIndexOrTextID], a
call DisplayTextID
SetEvent EVENT_BEAT_SABRINA
ResetEvent EVENT_SS_ANNE_LEFT
lb bc, TM_PSYWAVE, 1
call GiveItem
jr nc, .BagFull

31
scripts/SilphCo11F.asm
View file

@ -165,16 +165,10 @@ MissableObjectIDs_6219b:
db HS_SAFFRON_CITY_E
db HS_SILPH_CO_3F_1
db HS_SILPH_CO_3F_2
;db HS_SILPH_CO_4F_1
;db HS_SILPH_CO_4F_2
;db HS_SILPH_CO_4F_3
db HS_SILPH_CO_5F_1
db HS_SILPH_CO_5F_2
db HS_SILPH_CO_5F_3
db HS_SILPH_CO_5F_4
;db HS_SILPH_CO_6F_1
;db HS_SILPH_CO_6F_2
;db HS_SILPH_CO_6F_3
db HS_SILPH_CO_7F_1
db HS_SILPH_CO_7F_2
db HS_SILPH_CO_7F_3
@ -616,6 +610,7 @@ SaffronCityCitizens:
db HS_SAFFRON_CITY_B
db HS_SAFFRON_CITY_C
db HS_SAFFRON_CITY_F
db HS_SILPH_CO_1F_RECEPTIONIST
db -1 ; end
SaffronCityRockets:
@ -630,23 +625,14 @@ SaffronCityRockets:
db HS_SAFFRON_CITY_E
db HS_SILPH_CO_3F_1
db HS_SILPH_CO_3F_2
;db HS_SILPH_CO_4F_1
;db HS_SILPH_CO_4F_2
;db HS_SILPH_CO_4F_3
db HS_SILPH_CO_5F_1
db HS_SILPH_CO_5F_2
db HS_SILPH_CO_5F_3
db HS_SILPH_CO_5F_4
;db HS_SILPH_CO_6F_1
;db HS_SILPH_CO_6F_2
;db HS_SILPH_CO_6F_3
db HS_SILPH_CO_7F_1
db HS_SILPH_CO_7F_2
db HS_SILPH_CO_7F_3
db HS_SILPH_CO_7F_4
;db HS_SILPH_CO_8F_1
;db HS_SILPH_CO_8F_2
;db HS_SILPH_CO_8F_3
db HS_SILPH_CO_10F_1
db HS_SILPH_CO_10F_2
db HS_SILPH_CO_11F_1
@ -667,11 +653,12 @@ SilphCo11F_TextPointers:
dw OmegaText
dw Omega2Text
dw StupidGiovanniFix
dw SilphCo11FPorygonText
SilphCo11TrainerHeaders:
def_trainers 5
SilphCo11TrainerHeader0:
trainer EVENT_BEAT_SILPH_CO_11F_TRAINER_1, 3, SilphCo11Trainer1BattleText, SilphCo11Trainer1EndBattleText, SilphCo11Trainer1AfterBattleText
trainer EVENT_BEAT_SILPH_CO_11F_TRAINER_1, 1, SilphCo11Trainer1BattleText, SilphCo11Trainer1EndBattleText, SilphCo11Trainer1AfterBattleText
Omega2TrainerHeader:
trainer EVENT_BEAT_OMEGA, 0, Omega2BattleText, Omega2BattleText, Omega2BattleText
db -1 ; end
@ -810,3 +797,15 @@ Omega2BattleText:
StupidGiovanniFix:
text_far _SilphCo10Text_62335
text_end
SilphCo11FPorygonText:
text_asm
ld hl, .Text
call PrintText
ld a, PORYGON
call DisplayPokedex
jp TextScriptEnd
.Text:
text_far _SilphCo11FPorygonText
text_end

61
scripts/SilphCo1F.asm
View file

@ -1,16 +1,65 @@
SilphCo1F_Script:
call EnableAutoTextBoxDrawing
CheckEvent EVENT_BEAT_SILPH_CO_GIOVANNI
ret z
CheckAndSetEvent EVENT_SILPH_CO_RECEPTIONIST_AT_DESK
ld hl, SilphCo1F_ScriptPointers
ld a, [wSilphCo1FCurScript]
jp CallFunctionInTable
SilphCo1F_ScriptPointers:
dw SilphCo1FScript0
dw SilphCo1FScript1
SilphCo1FScript0:
ld b, SILPHLETTER
call IsItemInBag
ret nz
ld a, HS_SILPH_CO_1F_RECEPTIONIST
ld [wMissableObjectIndex], a
predef_jump ShowObject
ld a, [wYCoord]
cp 3
ret nz
ld a, [wXCoord]
cp 15
ret nz
ld a, PLAYER_DIR_LEFT
ld [wPlayerMovingDirection], a
ld a, $3
ldh [hSpriteIndexOrTextID], a
call DisplayTextID
xor a
ldh [hJoyHeld], a
ld a, $1
ld [wSimulatedJoypadStatesIndex], a
ld a, D_DOWN
ld [wSimulatedJoypadStatesEnd], a
call StartSimulatingJoypadStates
xor a
ld [wSpritePlayerStateData1FacingDirection], a
ld [wJoyIgnore], a
ld a, $1
ld [wSilphCo1FCurScript], a
ret
SilphCo1FScript1:
ld a, [wSimulatedJoypadStatesIndex]
and a
ret nz
call Delay3
ld a, $0
ld [wSilphCo1FCurScript], a
ret
SilphCo1F_TextPointers:
dw SilphCo1Text1
dw SilphCo1Text2
dw SilphCo1Text3
SilphCo1Text1:
text_far _SilphCo1Text1
text_end
SilphCo1Text2:
text_far _SilphCo1Text2
text_end
SilphCo1Text3:
text_far _SilphCo1Text3
text_end

18
scripts/VermilionCity.asm
View file

@ -50,11 +50,8 @@ VermilionCityScript0:
ld a, $3
ldh [hSpriteIndexOrTextID], a
call DisplayTextID
CheckEvent EVENT_BEAT_SABRINA
jr nz, .default
CheckEvent EVENT_SS_ANNE_LEFT
jr nz, .shipHasDeparted
.default
ld b, S_S_TICKET
predef GetQuantityOfItemInBag
ld a, b
@ -167,7 +164,6 @@ VermilionCityTextSSAnneDeparted:
VermilionCityText3:
text_asm
CheckEvent EVENT_SS_ANNE_LEFT
jr nz, .shipHasDeparted
ld a, [wSpritePlayerStateData1FacingDirection]
@ -247,23 +243,9 @@ VermilionCityText14:
text_end
VermilionCityText6:
text_asm
CheckEvent EVENT_BEAT_SABRINA
jr z, .default
ld hl, VermilionCityText15
ret
.default
ld hl, VermilionCityText6get
ret
VermilionCityText6get:
text_far _VermilionCityText6
text_end
VermilionCityText15:
text_far _VermilionCityText15
text_end
VermilionCityText7:
text_far _VermilionCityText7
text_end