diff options
Diffstat (limited to 'main.asm')
-rwxr-xr-x | main.asm | 26 |
1 files changed, 13 insertions, 13 deletions
@@ -728,18 +728,16 @@ INCLUDE "engine/hidden_object_functions14.asm" SECTION "bank15",ROMX,BANK[$15] dr $54000,$5525f -GainExperience: ; 5525f (15:525f) - dr $5525f,$56745 -_GetSpritePosition1: ; 56745 (15:6745) - dr $56745,$56765 -_GetSpritePosition2: ; 56765 (15:6765) - dr $56765,$56789 -_SetSpritePosition1: ; 56789 (15:6789) - dr $56789,$567a9 -_SetSpritePosition2: ; 567a9 (15:67a9) - dr $567a9,$567cd -TrainerWalkUpToPlayer: ; 567cd (15:67cd) - dr $567cd,$58000 + +INCLUDE "engine/battle/experience.asm" + + dr $554f7,$56714 + +INCLUDE "engine/menu/diploma_1.asm" + +INCLUDE "engine/overworld/trainers.asm" + + SECTION "bank16",ROMX,BANK[$16] dr $58000,$58d99 @@ -865,7 +863,9 @@ Func_e8d35:: ; e8d35 (3a:4d35) Func_e8e79: ; e8e79 (3a:4e79) dr $e8e79,$e928a SurfingPikachu2Graphics: INCBIN "gfx/surfing_pikachu_2.2bpp" - dr $e988a,$e9bfa + dr $e988a,$e9a08 +_DisplayDiploma: ; e9a08 (3a:5a08) + dr $e9a08,$e9bfa SurfingPikachu3Graphics: INCBIN "gfx/surfing_pikachu_3.t1.2bpp" |