diff --git a/constants/event_flags.asm b/constants/event_flags.asm index 51c3dd0..3ab291a 100644 --- a/constants/event_flags.asm +++ b/constants/event_flags.asm @@ -1565,6 +1565,9 @@ const EVENT_BRIEFED_BY_BLUE const EVENT_GOT_TM47_STEEL_WING2 const EVENT_IN_SAFARI_ZONE + const EVENT_CRYPT_DOKUROAR_1 + const EVENT_CRYPT_DOKUROAR_2 + const EVENT_FOUGHT_DOKUROAR ; Unused: next 37 events const_next 2048 diff --git a/data/maps/scenes.asm b/data/maps/scenes.asm index 3517d86..40c4df9 100644 --- a/data/maps/scenes.asm +++ b/data/maps/scenes.asm @@ -92,4 +92,5 @@ MapScenes:: scene_var SAFARI_ZONE_FUCHSIA_GATE_BETA, wFuchsiaSafariZoneGateID scene_var VERMILION_CITY, wVermilionCityID scene_var ROUTE_14, wVermilionCityID + scene_var LAVENDER_CRYPT_DOKUROARS_ROOM, wLavenderCryptDokuroarsRoomID db -1 ; end diff --git a/data/pokemon/base_stats/dokuroar.asm b/data/pokemon/base_stats/dokuroar.asm index 6d3f8c9..b4714df 100644 --- a/data/pokemon/base_stats/dokuroar.asm +++ b/data/pokemon/base_stats/dokuroar.asm @@ -1,19 +1,19 @@ db 0 ; species ID placeholder - db 87, 123, 110, 65, 65, 65 + db 87, 125, 110, 66, 66, 66 ; hp atk def spd sat sdf db GHOST, ROCK ; type - db 45 ; catch rate ; PLACEHOLDER - db 64 ; base exp ; PLACEHOLDER - db NO_ITEM, NO_ITEM ; items + db 25 ; catch rate + db 166 ; base exp + db THICK_CLUB, THICK_CLUB ; items db GENDER_F50 ; gender ratio db 100 ; unknown 1 db 120 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/dokuroar/front.dimensions" dw NULL, NULL ; unused (beta front/back pics) - db GROWTH_MEDIUM_SLOW ; growth rate ; PLACEHOLDER + db GROWTH_SLOW ; growth rate dn EGG_NONE, EGG_NONE ; egg groups ; tm/hm learnset diff --git a/maps/LavenderCryptDokuroarsRoom.ablk b/maps/LavenderCryptDokuroarsRoom.ablk index d21b6e3..843c83b 100644 --- a/maps/LavenderCryptDokuroarsRoom.ablk +++ b/maps/LavenderCryptDokuroarsRoom.ablk @@ -1 +1 @@ -kklkkk-22.m3_mm0H`I0mmmmmmmmmmmmmmmmmmm \ No newline at end of file +j-2Z2\ijVT_ij00ij0W`0ijWijiji \ No newline at end of file diff --git a/maps/LavenderCryptDokuroarsRoom.asm b/maps/LavenderCryptDokuroarsRoom.asm index dd52427..eeb977e 100644 --- a/maps/LavenderCryptDokuroarsRoom.asm +++ b/maps/LavenderCryptDokuroarsRoom.asm @@ -1,20 +1,143 @@ object_const_def + const LAVENDERCRYPT_DOKUROAR1 + const LAVENDERCRYPT_DOKUROAR2 LavenderCryptDokuroarsRoom_MapScripts: def_scene_scripts + scene_script LavenderCryptNoopScene1, SCENE_CRYPT_NOOP + scene_script LavenderCryptNoopScene2, SCENE_DOKUROAR_ATTACKS def_callbacks + callback MAPCALLBACK_OBJECTS, LavenderCryptDokuroarCallback + +LavenderCryptNoopScene1: + end + +LavenderCryptNoopScene2: + end + +LavenderCryptDokuroarCallback: + checkevent EVENT_FOUGHT_DOKUROAR + iftrue .NoAppear + sjump .Appear + +.NoAppear: + disappear LAVENDERCRYPT_DOKUROAR1 + disappear LAVENDERCRYPT_DOKUROAR2 + endcallback + +.Appear: + appear LAVENDERCRYPT_DOKUROAR1 + endcallback + +DokuroarTalkScript: + opentext + writetext LavenderCryptDokuroarTalk + yesorno + iffalse .Refused + writetext LavenderCryptDokuroarYesText + waitbutton + closetext + disappear LAVENDERCRYPT_DOKUROAR1 + setscene SCENE_DOKUROAR_ATTACKS + end + +.Refused: + writetext LavenderCryptDokuroarNopeText + waitbutton + closetext + end + +DokuroarTalkScript2: + opentext + writetext LavenderCryptDokuroarNopeText + waitbutton + closetext + end + +DokuroarAttackScript: + setscene SCENE_CRYPT_NOOP + special FadeOutMusic + opentext + writetext DokuroarLaughText + cry DOKUROAR + pause 15 + closetext + applymovement LAVENDERCRYPT_DOKUROAR2, DokuroarJumpscare + pause 12 + applymovement LAVENDERCRYPT_DOKUROAR2, DokuroarJumpscare + pause 12 + applymovement LAVENDERCRYPT_DOKUROAR2, DokuroarJumpscare + turnobject PLAYER, UP + showemote EMOTE_SHOCK, PLAYER, 15 + pause 15 + opentext + writetext DokuroarFightText + cry DOKUROAR + pause 15 + closetext + loadvar VAR_BATTLETYPE, BATTLETYPE_FORCEITEM + loadwildmon DOKUROAR, 60 + startbattle + disappear LAVENDERCRYPT_DOKUROAR2 + setevent EVENT_FOUGHT_DOKUROAR + reloadmapafterbattle + end + +DokuroarJumpscare: + big_step DOWN + step_end + +LavenderCryptDokuroarTalk: + text "Looks like a huge" + line "#MON skeleton." + + para "Reach out and" + line "touch it?" + done + +LavenderCryptDokuroarYesText: + text " tapped" + line "the skeleton." + + para "Nothing happened." + + para " tapped" + line "the skeleton a" + cont "second time." + + para "..." + + para "Nothing happened." + + done + +LavenderCryptDokuroarNopeText: + text "Better leave it" + line "alone..." + done + +DokuroarLaughText: + text "Kekekek..." + done + +DokuroarFightText: + text "Kekekek..." + line "KEKEKEK...!!!" + done LavenderCryptDokuroarsRoom_MapEvents: db 0, 0 ; filler def_warp_events - warp_event 7, 15, LAVENDER_CRYPT_SET_3, 2 ; Entrance - warp_event 6, 15, LAVENDER_CRYPT_SET_3, 2 ; Entrance - warp_event 7, 2, LAVENDER_CRYPT, 5 ; Exit + warp_event 7, 3, LAVENDER_CRYPT_SET_3, 2 ; Entrance + warp_event 7, 14, LAVENDER_CRYPT, 5 ; Exit def_coord_events + coord_event 6, 11, SCENE_DOKUROAR_ATTACKS, DokuroarAttackScript def_bg_events - def_object_events \ No newline at end of file + def_object_events + object_event 6, 7, SPRITE_MONSTER, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, PAL_NPC_EMOTE, OBJECTTYPE_SCRIPT, 0, DokuroarTalkScript, EVENT_CRYPT_DOKUROAR_1 + object_event 6, 7, SPRITE_MONSTER, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, PAL_NPC_EMOTE, OBJECTTYPE_SCRIPT, 0, DokuroarTalkScript2, EVENT_CRYPT_DOKUROAR_2 diff --git a/maps/LavenderCryptSet3.ablk b/maps/LavenderCryptSet3.ablk index 0732026..54efb58 100644 Binary files a/maps/LavenderCryptSet3.ablk and b/maps/LavenderCryptSet3.ablk differ diff --git a/maps/LavenderCryptSet3.asm b/maps/LavenderCryptSet3.asm index 69149a2..1ced7cf 100644 --- a/maps/LavenderCryptSet3.asm +++ b/maps/LavenderCryptSet3.asm @@ -127,11 +127,11 @@ LavenderCryptSet3_MapEvents: def_warp_events warp_event 3, 8, LAVENDER_CRYPT, 4 ; Entrance - warp_event 7, 13, LAVENDER_CRYPT_DOKUROARS_ROOM, 1 ; To Dokuroar + warp_event 7, 14, LAVENDER_CRYPT_DOKUROARS_ROOM, 1 ; To Dokuroar ; Correct Path warp_event 22, 3, LAVENDER_CRYPT_SET_2, 3 ; Right Route warp_event 19, 10, LAVENDER_CRYPT_SET_2, 4 ; Right Route - warp_event 7, 17, LAVENDER_CRYPT_SET_2, 5 ; END + warp_event 6, 17, LAVENDER_CRYPT_SET_2, 5 ; END warp_event 8, 4, LAVENDER_CRYPT_SET_2, 9 ; Left Route ; Incorrect Path diff --git a/ram/wram.asm b/ram/wram.asm index 44e5f18..38a536b 100644 --- a/ram/wram.asm +++ b/ram/wram.asm @@ -3113,7 +3113,8 @@ wRoute66WhiteCityGateID:: db wFuchsiaSafariZoneGateID:: db wVermilionCityID:: db wRoute14ID:: db - ds 42 +wLavenderCryptDokuroarsRoomID:: db + ds 41 ; fight counts wJackFightCount:: db