Add more to Celadon University

This adds;
- Text and stuff on the interior to add some really nice worldbuilding
- Trainers outside that you can fight with repeatedly.

The trainers need yes/no menus but I can't figure it out for the life of me. If anyone can do it, lemme know!
This commit is contained in:
May Evans 2022-09-27 01:48:52 +01:00
parent c243548fc4
commit 0b65243c75
11 changed files with 176 additions and 20 deletions

View file

@ -4,6 +4,10 @@ CeladonUniversityInside_Script:
CeladonUniversityInside_TextPointers:
dw CeladonUniversityInsideText1
dw CeladonUniversityTrader
dw CeladonUniversityInsideText2
dw CeladonUniversityInsideText3
dw CeladonUniversityInsideText4
dw CeladonUniversityInsideText5
CeladonUniversityInsideText1:
text_far _CeladonUniversityInsideText1
@ -16,4 +20,28 @@ CeladonUniversityTrader:
predef DoInGameTradeDialogue
jp TextScriptEnd
CeladonUniversityInsideText2:
text_far _CeladonUniversityInsideText2
text_end
CeladonUniversityInsideText3:
text_far _CeladonUniversityInsideText3
text_end
CeladonUniversityInsideText4:
text_far _CeladonUniversityInsideText4
text_end
CeladonUniversityInsideMagikarpText:
text_far _CeladonUniversityInsideMagikarpText
text_end
CeladonUniversityInsideText5:
text_asm
ld hl, CeladonUniversityInsideMagikarpText
call PrintText
ld a, MAGIKARP
call DisplayPokedex
jp TextScriptEnd
text_end ; unused

View file

@ -1,6 +1,46 @@
CeladonUniversityOutside_Script:
jp EnableAutoTextBoxDrawing
ld hl, CeladonUniversityOutsideTrainerHeaders
ld de, CeladonUniversityOutside_ScriptPointers
; ld a, [wCeladonUniversityOutsideCurScript]
; call ExecuteCurMapScriptInTable
; ld [wCeladonUniversityOutsideCurScript], a
ret
CeladonUniversityOutside_ScriptPointers:
dw CheckFightingMapTrainers
dw DisplayEnemyTrainerTextAndStartBattle
dw EndTrainerBattle
CeladonUniversityOutside_TextPointers:
dw CeladonUniversityOutsideText1
CeladonUniversityOutsideTrainerHeaders:
def_trainers 2
CeladonUniversityOutsideTrainerHeader0:
trainer EVENT_BEAT_CELADON_UNIVERSITY_OUTSIDE_TRAINER_0, 3, CeladonUniversityOutsideBattleText1, CeladonUniversityOutsideEndBattleText1, CeladonUniversityOutsideAfterBattleText1
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
db -1 ; end
CeladonUniversityOutsideText1: ; trainer 0
text_asm
ld hl, CeladonUniversityOutsideTrainerHeader0
call TalkToTrainer
jp TextScriptEnd
CeladonUniversityOutsideBattleText1:
text_far _CeladonUniversityOutsideBattleText1
text_end
CeladonUniversityOutsideEndBattleText1:
text_far _CeladonUniversityOutsideEndBattleText1
text_end
CeladonUniversityOutsideAfterBattleText1:
text_far _CeladonUniversityOutsideAfterBattleText1
text_end
text_end ; unused