diff --git a/constants/event_constants.asm b/constants/event_constants.asm index 38c7632d..7bce4667 100644 --- a/constants/event_constants.asm +++ b/constants/event_constants.asm @@ -735,6 +735,7 @@ ; Safari Zone events const_next $880 const EVENT_GOT_HM03 + const EVENT_GOT_MELTAN ; Cerulean Cave events const_next $8C0 diff --git a/data/maps/objects/CeladonPokecenter.asm b/data/maps/objects/CeladonPokecenter.asm index e27d516e..790c4704 100644 --- a/data/maps/objects/CeladonPokecenter.asm +++ b/data/maps/objects/CeladonPokecenter.asm @@ -9,9 +9,9 @@ CeladonPokecenter_Object: def_object_events object_event 3, 1, SPRITE_NURSE, STAY, DOWN, 1 ; person - object_event 7, 3, SPRITE_GENTLEMAN, WALK, LEFT_RIGHT, 2 ; person + object_event 5, 4, SPRITE_GENTLEMAN, WALK, LEFT_RIGHT, 2 ; person object_event 10, 5, SPRITE_BEAUTY, WALK, ANY_DIR, 3 ; person object_event 11, 2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 4 ; person - object_event 7, 3, SPRITE_GAMEBOY_KID, STAY, DOWN, 5 ; Sandslash Trader + object_event 8, 3, SPRITE_GAMEBOY_KID, STAY, DOWN, 5 ; Sandslash Trader def_warps_to CELADON_POKECENTER diff --git a/data/maps/objects/CeruleanPokecenter.asm b/data/maps/objects/CeruleanPokecenter.asm index 4e6a5495..7884702d 100644 --- a/data/maps/objects/CeruleanPokecenter.asm +++ b/data/maps/objects/CeruleanPokecenter.asm @@ -12,6 +12,6 @@ CeruleanPokecenter_Object: object_event 10, 5, SPRITE_SUPER_NERD, WALK, ANY_DIR, 2 ; person object_event 4, 3, SPRITE_GENTLEMAN, STAY, DOWN, 3 ; person object_event 11, 2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 4 ; person - object_event 10, 7, SPRITE_GAMEBOY_KID, STAY, DOWN, 5 ; Ninetales Trader + object_event 9, 3, SPRITE_GAMEBOY_KID, STAY, DOWN, 5 ; Ninetales Trader def_warps_to CERULEAN_POKECENTER diff --git a/data/maps/objects/LavenderPokecenter.asm b/data/maps/objects/LavenderPokecenter.asm index 6a9b2dc7..e248471f 100644 --- a/data/maps/objects/LavenderPokecenter.asm +++ b/data/maps/objects/LavenderPokecenter.asm @@ -12,6 +12,6 @@ LavenderPokecenter_Object: object_event 5, 3, SPRITE_GENTLEMAN, STAY, NONE, 2 ; person object_event 2, 6, SPRITE_LITTLE_GIRL, WALK, UP_DOWN, 3 ; person object_event 11, 2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 4 ; person - object_event 10, 7, SPRITE_GAMEBOY_KID, STAY, DOWN, 5 ; Dugtrio Trader + object_event 9, 3, SPRITE_GAMEBOY_KID, STAY, DOWN, 5 ; Dugtrio Trader def_warps_to LAVENDER_POKECENTER diff --git a/data/maps/objects/SafariZoneEastRestHouse.asm b/data/maps/objects/SafariZoneEastRestHouse.asm index bf506605..f79a5cfc 100644 --- a/data/maps/objects/SafariZoneEastRestHouse.asm +++ b/data/maps/objects/SafariZoneEastRestHouse.asm @@ -8,8 +8,9 @@ SafariZoneEastRestHouse_Object: def_bg_events def_object_events - object_event 1, 3, SPRITE_SCIENTIST, WALK, UP_DOWN, 1 ; person - object_event 4, 2, SPRITE_ROCKER, STAY, NONE, 2 ; person + object_event 2, 3, SPRITE_SCIENTIST, WALK, UP_DOWN, 1 ; person + object_event 0, 2, SPRITE_ROCKER, STAY, NONE, 2 ; person object_event 5, 2, SPRITE_SILPH_WORKER, STAY, NONE, 3 ; person + object_event 6, 2, SPRITE_SILPH_WORKER, STAY, NONE, 4 ; person def_warps_to SAFARI_ZONE_EAST_REST_HOUSE diff --git a/engine/debug/debug_party.asm b/engine/debug/debug_party.asm index 5a84c9aa..57b76290 100644 --- a/engine/debug/debug_party.asm +++ b/engine/debug/debug_party.asm @@ -27,7 +27,6 @@ IshiharaTeam: db PORYGON, 50 IF DEF(_DEBUG) db NINETALES, 50 - db DUGTRIO, 50 ENDC db -1 ; end diff --git a/scripts/SafariZoneEastRestHouse.asm b/scripts/SafariZoneEastRestHouse.asm index 03655d69..63dae453 100644 --- a/scripts/SafariZoneEastRestHouse.asm +++ b/scripts/SafariZoneEastRestHouse.asm @@ -6,6 +6,7 @@ SafariZoneEastRestHouse_TextPointers: dw SafariZoneRestHouse3Text1 dw SafariZoneRestHouse3Text2 dw SafariZoneRestHouse3Text3 + dw SafariZoneRestHouse3Meltan SafariZoneRestHouse3Text1: text_far _SafariZoneRestHouse3Text1 @@ -18,3 +19,44 @@ SafariZoneRestHouse3Text2: SafariZoneRestHouse3Text3: text_far _SafariZoneRestHouse3Text3 text_end + +SafariZoneRestHouse3Meltan: +; meltan guy + text_asm + ld a, [wd72e] + bit 0, a ; got meltan? + jr z, .giveMeltan + CheckEvent EVENT_GOT_MELTAN + jr nz, .MeltanInfo + ld hl, .MeltanGuyText + call PrintText + jr .done +.giveMeltan + ld hl, .MeltanGuyText + call PrintText + lb bc, MELTAN, 5 + SetEvent EVENT_GOT_MELTAN + call GivePokemon + jr nc, .done + ld a, [wSimulatedJoypadStatesEnd] + and a + call z, WaitForTextScrollButtonPress + call EnableAutoTextBoxDrawing + ld hl, .MeltanInfoWithBlackjackAndHookers + call PrintText + ld hl, wd72e + set 0, [hl] + jr .done +.MeltanInfo + ld hl, .MeltanInfoWithBlackjackAndHookers + call PrintText +.done + jp TextScriptEnd + +.MeltanInfoWithBlackjackAndHookers + text_far _MeltanInfo + text_end + +.MeltanGuyText + text_far _MeltanGuyText + text_end diff --git a/text/SafariZoneEastRestHouse.asm b/text/SafariZoneEastRestHouse.asm index d5f7abc8..d3441f1c 100644 --- a/text/SafariZoneEastRestHouse.asm +++ b/text/SafariZoneEastRestHouse.asm @@ -16,3 +16,23 @@ _SafariZoneRestHouse3Text3:: text "Whew! I'm tired" line "from all the fun!" done + +_MeltanGuyText:: + text "I found a lost" + line "#MON. It seems" + cont "to be looking" + cont "for its friends." + + para "Could you take" + line "care of it, kid?" + + prompt + +_MeltanInfo:: + text "My sources say it's" + line "called MELTAN." + + para "It's never seen in" + line "KANTO..." + + done