diff --git a/constants/event_constants.asm b/constants/event_constants.asm index 8eaabb2c..88d8d51e 100644 --- a/constants/event_constants.asm +++ b/constants/event_constants.asm @@ -778,6 +778,15 @@ const_skip 8 const EVENT_BEAT_ARTICUNO +; Celadon University events + const_next $9E0 + const_skip + const_skip + const EVENT_BEAT_CELADON_UNIVERSITY_OUTSIDE_TRAINER_0 + const EVENT_BEAT_CELADON_UNIVERSITY_OUTSIDE_TRAINER_1 + const EVENT_BEAT_CELADON_UNIVERSITY_OUTSIDE_TRAINER_2 + const EVENT_BEAT_CELADON_UNIVERSITY_OUTSIDE_TRAINER_3 + ; End of events const_next $A00 DEF NUM_EVENTS EQU const_value diff --git a/data/maps/objects/CeladonUniversityInside.asm b/data/maps/objects/CeladonUniversityInside.asm index ec91872c..35ad2bf2 100644 --- a/data/maps/objects/CeladonUniversityInside.asm +++ b/data/maps/objects/CeladonUniversityInside.asm @@ -6,9 +6,13 @@ CeladonUniversityInside_Object: warp_event 11, 19, CELADON_UNIVERSITY_OUTSIDE, 1 def_bg_events + bg_event 9, 3, 6 ; Magikarp def_object_events - object_event 2, 3, SPRITE_MIDDLE_AGED_MAN, STAY, ANY_DIR, 1 ; person + object_event 18, 5, SPRITE_MIDDLE_AGED_MAN, STAY, ANY_DIR, 1 ; person object_event 4, 17, SPRITE_GAMEBOY_KID, STAY, DOWN, 2 ; person + object_event 3, 15, SPRITE_POKEDEX, STAY, NONE, 3 ; person + object_event 17, 5, SPRITE_POKEDEX, STAY, NONE, 4 ; person + object_event 10, 5, SPRITE_SCIENTIST, STAY, NONE, 5 ; person def_warps_to CELADON_UNIVERSITY_INSIDE \ No newline at end of file diff --git a/data/maps/objects/CeladonUniversityOutside.asm b/data/maps/objects/CeladonUniversityOutside.asm index d22c218d..3e20a37b 100644 --- a/data/maps/objects/CeladonUniversityOutside.asm +++ b/data/maps/objects/CeladonUniversityOutside.asm @@ -7,5 +7,8 @@ CeladonUniversityOutside_Object: def_bg_events def_object_events + object_event 19, 30, SPRITE_COOLTRAINER_F, STAY, RIGHT, 1, OPP_JR_TRAINER_F, 3 + object_event 22, 26, SPRITE_SUPER_NERD, STAY, LEFT, 2, OPP_SUPER_NERD, 6 + object_event 9, 6, SPRITE_BALDING_GUY, STAY, DOWN, 3, OPP_ENGINEER, 1 def_warps_to CELADON_UNIVERSITY_OUTSIDE \ No newline at end of file diff --git a/data/trainers/parties.asm b/data/trainers/parties.asm index ed3ff119..fbf93e9e 100644 --- a/data/trainers/parties.asm +++ b/data/trainers/parties.asm @@ -167,7 +167,7 @@ JrTrainerFData: ; Route 6 db 16, RATTATA, PIKACHU, 0 db 16, PIDGEY, PIDGEY, PIDGEY, 0 -; Unused +; Unused - used in celadon university db 22, BULBASAUR, 0 ; Route 9 db 18, ODDISH, BELLSPROUT, ODDISH, BELLSPROUT, 0 @@ -222,7 +222,7 @@ SuperNerdData: db 22, GRIMER, MUK, GRIMER, 0 db 26, KOFFING, 0 ; Unused - db 22, KOFFING, MAGNEMITE, WEEZING, 0 + db 22, KOFFING, MAGNEMITE, WEEZING, 0 ; - used in celadon university db 20, MAGNEMITE, MAGNEMITE, KOFFING, MAGNEMITE, 0 db 24, MAGNEMITE, VOLTORB, 0 ; Cinnabar Gym @@ -302,7 +302,7 @@ BurglarData: db 34, GROWLITHE, PONYTA, 0 EngineerData: -; Unused +; Unused - used in celadon university db 21, VOLTORB, MAGNEMITE, 0 ; Route 11 db 21, MAGNEMITE, 0 @@ -372,7 +372,7 @@ GamblerData: db 18, GROWLITHE, VULPIX, 0 ; Route 8 db 22, POLIWAG, POLIWAG, POLIWHIRL, 0 -; Unused +; Unused - used in celadon university db 22, ONIX, GEODUDE, GRAVELER, 0 ; Route 8 db 24, GROWLITHE, VULPIX, 0 diff --git a/engine/battle/experience.asm b/engine/battle/experience.asm index 0eab6e08..f4d31cb2 100644 --- a/engine/battle/experience.asm +++ b/engine/battle/experience.asm @@ -324,19 +324,19 @@ DivideExpDataByNumMonsGainingExp: jr nz, .divideLoop ret -; multiplies exp by 1.5 +; multiplies exp by 1.5...NOT!!!! - PvK BoostExp: - ldh a, [hQuotient + 2] - ld b, a - ldh a, [hQuotient + 3] - ld c, a - srl b - rr c - add c - ldh [hQuotient + 3], a - ldh a, [hQuotient + 2] - adc b - ldh [hQuotient + 2], a + ; ldh a, [hQuotient + 2] + ; ld b, a + ; ldh a, [hQuotient + 3] + ; ld c, a + ; srl b + ; rr c + ; add c + ; ldh [hQuotient + 3], a + ; ldh a, [hQuotient + 2] + ; adc b + ; ldh [hQuotient + 2], a ret GainedText: diff --git a/maps/CeladonUniversityInside.blk b/maps/CeladonUniversityInside.blk index c14abdb9..12780fec 100644 --- a/maps/CeladonUniversityInside.blk +++ b/maps/CeladonUniversityInside.blk @@ -1,3 +1,3 @@ -,-../02113)))( )))7777467777 +,-../02113)))( )))7777467777  -    \ No newline at end of file +    \ No newline at end of file diff --git a/scripts/CeladonUniversityInside.asm b/scripts/CeladonUniversityInside.asm index 7be2fafc..c4d1e38c 100644 --- a/scripts/CeladonUniversityInside.asm +++ b/scripts/CeladonUniversityInside.asm @@ -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 diff --git a/scripts/CeladonUniversityOutside.asm b/scripts/CeladonUniversityOutside.asm index 17b36351..d6d54d94 100644 --- a/scripts/CeladonUniversityOutside.asm +++ b/scripts/CeladonUniversityOutside.asm @@ -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 diff --git a/text.asm b/text.asm index 8c208973..fc9567bb 100644 --- a/text.asm +++ b/text.asm @@ -271,6 +271,7 @@ SECTION "Text 11", ROMX INCLUDE "data/text/text_7.asm" INCLUDE "data/pokemon/new_dex_text.asm" +INCLUDE "text/CeladonUniversityOutside.asm" INCLUDE "text/CeladonUniversityInside.asm" SECTION "Pokédex Text", ROMX diff --git a/text/CeladonUniversityInside.asm b/text/CeladonUniversityInside.asm index 8ddac679..a83bf987 100644 --- a/text/CeladonUniversityInside.asm +++ b/text/CeladonUniversityInside.asm @@ -9,4 +9,54 @@ _CeladonUniversityInsideText1:: line "created the" cont "#BALL!" - done \ No newline at end of file + done + +_CeladonUniversityInsideText2:: + text "It's an old letter" + line "about selling the" + para "#BALL patent" + line "to SILPH CO." + + done + +_CeladonUniversityInsideText3:: + text "Seismic tremors" + line "have been" + cont "detected inside" + + para "VICTORY ROAD." + line "Investigation" + cont "is ongoing." + + para "WESTWOOD, can" + line "you see me" + cont "at SILPH?" + + done + +_CeladonUniversityInsideText4:: + text "I don't get it." + line "Why is this" + cont "MAGIKARP so" + cont "powerful?" + + para "It was attacking" + line "TRAINERs in" + cont "VERMILLION!" + + para "So far, nobody" + line "has come up" + cont "with a reason." + + done + +_CeladonUniversityInsideMagikarpText:: + text "Name: MAGIKARP" + + para "This specimen has" + line "unusual strength." + cont "Like its old" + cont "ancestors, it" + cont "can use DRAGON" + cont "RAGE." + prompt \ No newline at end of file diff --git a/text/CeladonUniversityOutside.asm b/text/CeladonUniversityOutside.asm new file mode 100644 index 00000000..a705a7c3 --- /dev/null +++ b/text/CeladonUniversityOutside.asm @@ -0,0 +1,21 @@ +_CeladonUniversityOutsideYesNo:: + text "I love battles!" + cont "Wanna go?" + done + +_CeladonUniversityRefuse:: + text "Aww! Next time?" + done + +_CeladonUniversityOutsideBattleText1:: + text "Ok! Game on!" + done + +_CeladonUniversityOutsideEndBattleText1:: + text "Darn! You" + line "beat me again!" + prompt + +_CeladonUniversityOutsideAfterBattleText1:: + text "!" + done \ No newline at end of file