From beab109a1661b36669ce12713deb9953b92c3d86 Mon Sep 17 00:00:00 2001 From: Llinos Evans <36418502+PlagueVonKarma@users.noreply.github.com> Date: Tue, 20 Jun 2023 17:29:42 +0100 Subject: [PATCH] Some work on GMolt fight Currently, the movement is buggy and the battle repeats. It works without the movement, though... Alternatively, give Galarian Moltres trainer sight. --- data/maps/objects/CelesteHillOutside.asm | 2 +- data/maps/objects/RedsHouse2F.asm | 4 +-- data/wild/maps/CelesteHill.asm | 14 ++++---- data/wild/maps/CelesteHillCave.asm | 2 +- maps/CelesteHillOutside.blk | Bin 360 -> 360 bytes scripts/CelesteHill.asm | 39 +++++++++++++++++++++-- 6 files changed, 47 insertions(+), 14 deletions(-) diff --git a/data/maps/objects/CelesteHillOutside.asm b/data/maps/objects/CelesteHillOutside.asm index 274aae90..4c3f0260 100644 --- a/data/maps/objects/CelesteHillOutside.asm +++ b/data/maps/objects/CelesteHillOutside.asm @@ -1,5 +1,5 @@ CelesteHillOutside_Object: - db $0 ; border block + db $3 ; border block def_warp_events warp_event 18, 35, CITRINE_CITY, 5 diff --git a/data/maps/objects/RedsHouse2F.asm b/data/maps/objects/RedsHouse2F.asm index 5e016684..685b481f 100644 --- a/data/maps/objects/RedsHouse2F.asm +++ b/data/maps/objects/RedsHouse2F.asm @@ -7,8 +7,8 @@ RedsHouse2F_Object: ;warp_event 5, 1, SILPH_CO_11F, 1 ; - Test Omega & Giovanni ;warp_event 5, 1, ROCKET_HIDEOUT_B4F, 2 ; - Test Giovanni 1 ;warp_event 5, 1, MT_MOON_SQUARE, 1 ; - Test Shop, NPCs, and Crater - ;warp_event 5, 1, CELESTE_HILL, 2 ; - Test Birds - warp_event 5, 1, INDIGO_PLATEAU_LOBBY, 1 ; easy league access + warp_event 5, 1, CELESTE_HILL, 2 ; - Test Birds + ;warp_event 5, 1, INDIGO_PLATEAU_LOBBY, 1 ; easy league access def_bg_events diff --git a/data/wild/maps/CelesteHill.asm b/data/wild/maps/CelesteHill.asm index cd8adbed..0feb3f73 100644 --- a/data/wild/maps/CelesteHill.asm +++ b/data/wild/maps/CelesteHill.asm @@ -1,15 +1,15 @@ CelesteHillWildMons: def_grass_wildmons 10 ; encounter rate - db 55, FEAROW + db 55, FARFETCHD db 55, PIDGEOT - db 56, MADAAMU + db 56, FARFETCHD db 56, FEAROW - db 57, SCYTHER + db 57, FEAROW db 57, MADAAMU - db 70, ARTICUNO_G ; currently placeholders before static encounters are added - db 70, ZAPDOS_G - db 70, MOLTRES_G - db 70, MOLTRES_G + db 57, SIRFETCHD + db 57, DODRIO + db 56, GYARADOS + db 59, DRAGONITE end_grass_wildmons def_water_wildmons 0 ; encounter rate diff --git a/data/wild/maps/CelesteHillCave.asm b/data/wild/maps/CelesteHillCave.asm index a6dbafd5..b2165ee3 100644 --- a/data/wild/maps/CelesteHillCave.asm +++ b/data/wild/maps/CelesteHillCave.asm @@ -6,7 +6,7 @@ CelesteHillCaveWildMons: db 52, MAROWAK db 52, GRAVELER db 51, MAROWAK - db 53, TOEDSCOOL + db 53, CROBAT db 53, RHYDON db 53, STEELIX db 54, GOLEM diff --git a/maps/CelesteHillOutside.blk b/maps/CelesteHillOutside.blk index 6c2e30ff9293a293f80d52654140e9183eb792e8..8da6bcc94ff25a92d95120cfe4235a58d29e66f8 100644 GIT binary patch delta 56 zcmaFC^nz)^K0OT$4IPb^#&#w!aBymC0`h>M$q6FD#N^