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

Add trainers to Celadon University, add two new salesmen, etc

Browse source 
Overall completes Celadon University sans a problem with sprites being a bit corrupted until you leave. New Magikarp Salesman-esque events in other pokecenters which is kinda neat
This commit is contained in:
May Evans 2022-09-27 16:06:13 +01:00
parent 89bb05b2dc
commit 19d5f2293c
27 changed files with 478 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

124
scripts/CeladonUniversityOutside.asm
View file

@ -1,8 +1,8 @@
CeladonUniversityOutside_Script:
jp EnableAutoTextBoxDrawing
call EnableAutoTextBoxDrawing
ld hl, CeladonUniversityOutsideTrainerHeaders
ld de, CeladonUniversityOutside_ScriptPointers
; ld a, [wCeladonUniversityOutsideCurScript]
; ld a, [wCeladonUniversityOutsideCurScript] these caused the trainers to have lines of sight?
; call ExecuteCurMapScriptInTable
; ld [wCeladonUniversityOutsideCurScript], a
ret
@ -14,6 +14,12 @@ CeladonUniversityOutside_ScriptPointers:
CeladonUniversityOutside_TextPointers:
dw CeladonUniversityOutsideText1
dw CeladonUniversityOutsideText2
dw CeladonUniversityOutsideText3
dw CeladonUniversityOutsideText4
dw CeladonUniversityOutsideNPC1
dw CeladonUniversityOutsideNPC2
dw CeladonMagikarp
CeladonUniversityOutsideTrainerHeaders:
def_trainers 2
@ -23,13 +29,97 @@ CeladonUniversityOutsideTrainerHeader1:
trainer EVENT_BEAT_CELADON_UNIVERSITY_OUTSIDE_TRAINER_1, 3, CeladonUniversityOutsideBattleText1, CeladonUniversityOutsideEndBattleText1, CeladonUniversityOutsideAfterBattleText1
CeladonUniversityOutsideTrainerHeader2:
trainer EVENT_BEAT_CELADON_UNIVERSITY_OUTSIDE_TRAINER_2, 3, CeladonUniversityOutsideBattleText1, CeladonUniversityOutsideEndBattleText1, CeladonUniversityOutsideAfterBattleText1
CeladonUniversityOutsideTrainerHeader3:
trainer EVENT_BEAT_CELADON_UNIVERSITY_OUTSIDE_TRAINER_3, 3, CeladonUniversityOutsideBattleText1, CeladonUniversityOutsideEndBattleText1, CeladonUniversityOutsideAfterBattleText1
db -1 ; end
CeladonUniversityOutsideText1: ; trainer 0
CeladonUniversityOutsideText1: ; Starter girl
text_asm
ld hl, CeladonUniversityOutsideYesNo1
call PrintText
call YesNoChoice
ld a, [wCurrentMenuItem]
and a
jr nz, .refused
ld hl, CeladonUniversityOutsideTrainerHeader0
call TalkToTrainer
jp TextScriptEnd
jr .done
.refused
ld hl, CeladonUniversityRefuse
jr .done
.done
ld hl, CeladonUniversityOutsideAfterBattleText1
call PrintText
jp TextScriptEnd
CeladonUniversityOutsideText2: ; Porygon guy
text_asm
ld hl, CeladonUniversityOutsideYesNo2
call PrintText
call YesNoChoice
ld a, [wCurrentMenuItem]
and a
jr nz, .refused
ld hl, CeladonUniversityOutsideTrainerHeader0
call TalkToTrainer
jp TextScriptEnd
jr .done
.refused
ld hl, CeladonUniversityRefuse
jr .done
.done
ld hl, CeladonUniversityOutsideAfterBattleText1
call PrintText
jp TextScriptEnd
CeladonUniversityOutsideText3: ; Golem guy
text_asm
ld hl, CeladonUniversityOutsideYesNo3
call PrintText
call YesNoChoice
ld a, [wCurrentMenuItem]
and a
jr nz, .refused
ld hl, CeladonUniversityOutsideTrainerHeader0
call TalkToTrainer
jp TextScriptEnd
jr .done
.refused
ld hl, CeladonUniversityRefuse
jr .done
.done
ld hl, CeladonUniversityOutsideAfterBattleText1
call PrintText
jp TextScriptEnd
CeladonUniversityOutsideText4: ; Mt Moon guy
text_asm
ld hl, CeladonUniversityOutsideYesNo4
call PrintText
call YesNoChoice
ld a, [wCurrentMenuItem]
and a
jr nz, .refused
ld hl, CeladonUniversityOutsideTrainerHeader0
call TalkToTrainer
jp TextScriptEnd
jr .done
.refused
ld hl, CeladonUniversityRefuse
jr .done
.done
ld hl, CeladonUniversityOutsideAfterBattleText1
call PrintText
jp TextScriptEnd
CeladonUniversityOutsideNPC1:
text_far _CeladonUniversityOutsideNPC1
text_end
CeladonUniversityOutsideNPC2:
text_far _CeladonUniversityOutsideNPC2
text_end
CeladonUniversityOutsideBattleText1:
text_far _CeladonUniversityOutsideBattleText1
@ -43,4 +133,32 @@ CeladonUniversityOutsideAfterBattleText1:
text_far _CeladonUniversityOutsideAfterBattleText1
text_end
CeladonUniversityOutsideYesNo1:
text_far _CeladonUniversityOutsideYesNo1
text_end
CeladonUniversityOutsideYesNo2:
text_far _CeladonUniversityOutsideYesNo2
text_end
CeladonUniversityOutsideYesNo3:
text_far _CeladonUniversityOutsideYesNo3
text_end
CeladonUniversityOutsideYesNo4:
text_far _CeladonUniversityOutsideYesNo4
text_end
CeladonUniversityRefuse:
text_far _CeladonUniversityRefuse
text_end
CeladonMagikarp:
text_far _CeladonMagikarp
text_asm
ld a, MAGIKARP
call PlayCry
call WaitForSoundToFinish
jp TextScriptEnd
text_end ; unused