Rework CeladonU Trainers

This refactors the Celadon University trainers to ensure that they process properly without the odd memory leak-y thing I did before. Overall works the same, just works for the intended purpose.

I also applied what I learned to Professor Oak, giving a Yes/No prompt and adding some pre-battle music as I originally intended.
This commit is contained in:
May Evans 2023-03-29 17:41:45 +01:00
parent c9b01f2c64
commit c759efdeea
4 changed files with 185 additions and 47 deletions

View file

@ -8,10 +8,10 @@ CeladonUniversityOutside_Object:
def_bg_events
def_object_events
object_event 19, 30, SPRITE_COOLTRAINER_F, WALK, RIGHT, 1, OPP_JR_TRAINER_F, 4
object_event 22, 26, SPRITE_SUPER_NERD, WALK, LEFT, 2, OPP_SUPER_NERD, 6
object_event 9, 6, SPRITE_GAMBLER, WALK, DOWN, 3, OPP_ENGINEER, 1
object_event 25, 20, SPRITE_SUPER_NERD, WALK, DOWN, 4, OPP_SUPER_NERD, 7
object_event 19, 30, SPRITE_COOLTRAINER_F, WALK, RIGHT, 1 ; trainer
object_event 22, 26, SPRITE_SUPER_NERD, WALK, LEFT, 2 ; trainer
object_event 9, 6, SPRITE_GAMBLER, WALK, DOWN, 3 ; trainer
object_event 25, 20, SPRITE_SUPER_NERD, WALK, DOWN, 4 ; trainer
object_event 4, 27, SPRITE_ROCKER, WALK, LEFT, 5
object_event 33, 16, SPRITE_BEAUTY, WALK, DOWN, 6
object_event 7, 22, SPRITE_SEEL, WALK, RIGHT, 7