From e3b924a0ed215d50e66f00c14d45a219f145b0b0 Mon Sep 17 00:00:00 2001 From: Martha Schilling Date: Thu, 21 Dec 2023 11:33:16 +0000 Subject: [PATCH 1/6] Mt. Moon Crater improvements - Made the warp down to the crater an actual hole instead of a cave entrance - Added a path below the water section to prevent softlocks --- data/maps/objects/MtMoonCrater.asm | 2 +- gfx/blocksets/forest.bst | Bin 2064 -> 2080 bytes maps/MtMoonCrater.blk | 2 +- ram/wram.asm | 3 ++- scripts/MtMoonB1F.asm | 40 ++++++++++++++++++++++++++--- 5 files changed, 41 insertions(+), 6 deletions(-) diff --git a/data/maps/objects/MtMoonCrater.asm b/data/maps/objects/MtMoonCrater.asm index 92f06219..6fa16f4e 100644 --- a/data/maps/objects/MtMoonCrater.asm +++ b/data/maps/objects/MtMoonCrater.asm @@ -1,5 +1,5 @@ MtMoonCrater_Object: - db $03 ; border block + db $41 ; border block def_warp_events warp_event 46, 47, MT_MOON_B1F, 14 diff --git a/gfx/blocksets/forest.bst b/gfx/blocksets/forest.bst index 8ab5e3385ec7d07bbde4979fa3c386f3b3f899c1..314d1016d750b35de7a974ae60aa36863a2eee59 100644 GIT binary patch delta 24 XcmbOrus~pg0Ed8wh=>;mD?kANMN9;p delta 7 OcmZ1=FhO9000#gH4+0qg diff --git a/maps/MtMoonCrater.blk b/maps/MtMoonCrater.blk index eacef248..48108764 100644 --- a/maps/MtMoonCrater.blk +++ b/maps/MtMoonCrater.blk @@ -1,5 +1,5 @@ AAAAAAAAAAAAAAAAAAAAAAAAAACEEEEEEEEEEEEEEEEEEEE?AAABbCF,5   DD?AABCF// - D@AABF9 ),@ACF,<=========>)@AB)@AK>@AAB)@CF$%,\QQQQ@AB @AAB)@BZ--v=JAB@AAB@B"#rk-zG?AB @AAB@K=>,012@AB @AAB.@AAB%_@AB @AAB)@ACF)<=====JCF@AAB.@AB,@ACEE?ABD?AB@AB7@CFD?B@AB@AB 6DF)DF<==JAB@AB 5,DE?AAB @AB + D@AABF9 ),@ACF,<=========>)@AB)@AK>@AAB)@CF$%,\QQQQ@AB @AAB)@BZ--v=JAB@AAB@B"#rk-zG?AB @AAB@K=>,012@AB @AAB.@AAB%@AB @AAB)@ACF)<=====JCF@AAB.@AB,@ACEE?ABD?AB@AB7@CFD?B@AB@AB 6DF)DF<==JAB@AB 5,DE?AAB @AB 6,DD?AB D?K============>@AB,@DE?AACEEE?AAC?K>@AB|DEFDEEFD?CFDGF>@AB,.}},.@ABDGEF.@AB,||)DEEF,g@AK======================A \ No newline at end of file diff --git a/ram/wram.asm b/ram/wram.asm index 48c81e70..d65f8e49 100644 --- a/ram/wram.asm +++ b/ram/wram.asm @@ -2024,7 +2024,8 @@ wCeruleanCityCurScript:: db wCelesteHillOutsideCurScript:: db wCelesteHillCaveCurScript:: db wBrunswickGladeCurScript:: db - ds 2 +wMtMoonB1FCurScript:: db + ds 1 wSSAnneBowCurScript:: db wViridianForestCurScript:: db wMuseum1FCurScript:: db diff --git a/scripts/MtMoonB1F.asm b/scripts/MtMoonB1F.asm index 9c8cd112..e43f6e5c 100644 --- a/scripts/MtMoonB1F.asm +++ b/scripts/MtMoonB1F.asm @@ -1,14 +1,48 @@ MtMoonB1F_Script: call EnableAutoTextBoxDrawing + ld de, MtMoonB1F_ScriptPointers + ld a, [wMtMoonB1FCurScript] + call ExecuteCurMapScriptInTable + ld [wMtMoonB1FCurScript], a + ret + +MtMoonB1F_ScriptPointers: + dw MtMoonB1FScript0 + +MtMoonB1FScript0: + ld hl, CoordsData_Crater + call MtMoonB1FScript_5225b + ld a, [wWhichDungeonWarp] + and a ld a, MT_MOON_CRATER ld [wDungeonWarpDestinationMap], a - ld hl, MtMoonHolesCoords - jp IsPlayerOnDungeonWarp + ret -MtMoonHolesCoords: +CoordsData_Crater: dbmapcoord 6, 23 db -1 ; end +MtMoonB1FScript_5225b: + xor a + ld [wWhichDungeonWarp], a + ld a, [wd72d] + bit 4, a + ret nz + call ArePlayerCoordsInArray + ret nc + ld a, [wCoordIndex] + ld [wWhichDungeonWarp], a + ld hl, wd72d + set 4, [hl] + ld hl, wd732 + set 4, [hl] + ld a, SFX_STOP_ALL_MUSIC + call PlaySound + ld c, 0 ; BANK(Music_MeetRival) + ld a, MUSIC_AREA_ZERO + call PlayMusic + ret + MtMoonB1F_TextPointers: dw MtMoonText1 From 75c66e50691edd1640a0ac3e0d793c4e01bd2f28 Mon Sep 17 00:00:00 2001 From: Martha Schilling Date: Thu, 21 Dec 2023 14:27:54 +0000 Subject: [PATCH 2/6] Update main.asm lol it actually builds now --- main.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.asm b/main.asm index b8e020d6..cfa53daa 100644 --- a/main.asm +++ b/main.asm @@ -307,7 +307,6 @@ INCLUDE "engine/events/hidden_objects/pokecenter_pc.asm" SECTION "Battle Engine 11", ROMX INCLUDE "engine/battle/decrement_pp.asm" -INCLUDE "gfx/version.asm" SECTION "bank1C", ROMX @@ -323,6 +322,7 @@ INCLUDE "engine/gfx/mon_icons.asm" INCLUDE "engine/gfx/palettes.asm" INCLUDE "engine/menus/save.asm" INCLUDE "engine/overworld/field_moves.asm" +INCLUDE "gfx/version.asm" SECTION "In-Game Trade Zone", ROMX From 8514a917dec392915d0993bee9a4ee07a8962c9a Mon Sep 17 00:00:00 2001 From: Martha Schilling Date: Thu, 21 Dec 2023 16:29:21 +0000 Subject: [PATCH 3/6] "There's no way fixing the post-HoF blackout crash is that easy." "...it's that easy." --- scripts/HallOfFame.asm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/scripts/HallOfFame.asm b/scripts/HallOfFame.asm index 1b7aee1d..6fd57c39 100644 --- a/scripts/HallOfFame.asm +++ b/scripts/HallOfFame.asm @@ -43,8 +43,7 @@ HallofFameRoomScript2: ResetEventRange INDIGO_PLATEAU_EVENTS_START, INDIGO_PLATEAU_EVENTS_END, 1 xor a ld [wHallOfFameCurScript], a - ld hl, FirstMapSpec - ld a, [hli] + ld a, PALLET_TOWN ld [wLastBlackoutMap], a farcall SaveSAVtoSRAM ld b, 5 From 20444bb9e9790155566404b0b56ab641171d754c Mon Sep 17 00:00:00 2001 From: Martha Schilling Date: Thu, 21 Dec 2023 17:06:55 +0000 Subject: [PATCH 4/6] Small palette changes - Fixes a bug where the player's house would have the wrong palette after returning there after beating the Champion - Gave Jabetta's line the dark purple/peach palette since I just thought it looked better --- data/pokemon/palettes.asm | 4 ++-- engine/gfx/palettes.asm | 7 +++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/data/pokemon/palettes.asm b/data/pokemon/palettes.asm index c5e0be6b..773cdaeb 100644 --- a/data/pokemon/palettes.asm +++ b/data/pokemon/palettes.asm @@ -106,8 +106,8 @@ MonsterPalettes: db PAL_YELLOWMON ; ABRA db PAL_YELLOWMON ; KADABRA db PAL_YELLOWMON ; ALAKAZAM - db PAL_PURPLEMON ; CHEEP - db PAL_PURPLEMON ; JABETTA + db PAL_MEWMON ; CHEEP + db PAL_MEWMON ; JABETTA db PAL_PINKMON ; LICKITUNG db PAL_PINKMON ; LICKILICKY db PAL_REDMON ; GROWLITHE diff --git a/engine/gfx/palettes.asm b/engine/gfx/palettes.asm index 52761814..f103fe39 100644 --- a/engine/gfx/palettes.asm +++ b/engine/gfx/palettes.asm @@ -207,6 +207,10 @@ SetPal_Overworld: jp z, .ferry cp SILPH_GAUNTLET_5F jp z, .trans + cp REDS_HOUSE_1F + jp z, .pallet + cp REDS_HOUSE_2F + jp z, .pallet cp CERULEAN_CAVE_2F jp c, .normalDungeonOrBuilding cp LORELEIS_ROOM @@ -291,6 +295,9 @@ SetPal_Overworld: .citrine ld a, PAL_CITRINE - 1 jr .town +.pallet + ld a, PAL_PALLET - 1 + jr .town .ferry ld a, PAL_BLUEMON - 1 jr .town From 67445c0c3bf7fb6e8d0b1bca85f61ff753fc35a3 Mon Sep 17 00:00:00 2001 From: Martha Schilling Date: Thu, 21 Dec 2023 19:24:30 +0000 Subject: [PATCH 5/6] Sprite updates (again!) - (Albatross) Updated Annihilape's back sprite so there isn't any cutoff - (Martha) Made Jynx less racist for the second time - (Albatross) Polished Bellossom a little, mainly improving the face and shading --- gfx/pokemon/back/annihilapeb.png | Bin 504 -> 642 bytes gfx/pokemon/back/jynxb.png | Bin 225 -> 590 bytes gfx/pokemon/front/bellossom.png | Bin 785 -> 845 bytes 3 files changed, 0 insertions(+), 0 deletions(-) diff --git a/gfx/pokemon/back/annihilapeb.png b/gfx/pokemon/back/annihilapeb.png index 11b7a64f5d3a843265751254cfd1804695af110c..64c513d8a2a208abec2c5a26510a0bd0797a1c87 100644 GIT binary patch literal 642 zcmeAS@N?(olHy`uVBq!ia0vp^3Lwk`Bp75C+IE6C$sR$z3=CCj3=9n|3=F@3LJcn% z7)lKo7+xhXFj&oCU=S~uvn$XBD8ZEE?e4?NMQuI$fwM1_U5w@u7D3lw6^FY*gvJin-X7LcP_;u=wsl30>zm0Xkxq!^40jEr>+ zjdYC+LkumgfXKv1+rYrez#wb;cM%i~x%nxXX_Z(s7(g`il*TmzHE6(XD9OxCEiOsS zEx@A37^3G@M=H?y3{j~Oo@u_m3|c@o2Lmgk5Cb!i#R!B9j8Y7&U^WAT7o#+s9mJ>s zRRau6CSinnpjr^{0AiqS2rVD<-2}+K=jq}YB5^tS$L#li3XeDcudjSvwP4oy=k@tE z>HL@ey}Yaa?x(`r+2y)#qxe$3?1?Z9&1RYqxGz{c3*YHQXv zu?3c%tN*QiwR`^m`46A``oDV9@5V0wH~+VLWgAZTnEPLw|TQP?@2XaCPDY|Dy_%INrC&vx<5%wT6{$DROz4edrw4PF188Rgg* YLcZ*k;x)SS1?W=-Pgg&ebxsLQ0Kpv8g#Z8m delta 374 zcmZo-{lPpzg_kAW(btiIVPik{pG4M)imvrX7#R4DFizFxlV)IGU@!6Xb!C6X!z#>e zqIA4I8Ysk=U*s3Ucz#j&EFkBer;B5V#O2zv8?%@k1=t=mPBN%;g zjzz~j&m%rL!1F>E%chD+Zv6}F`lGG#8oor|x*R1IaLq3D!ma%urCRp?Y1W>$ee2be zY%FH82e^w6robv@$i)HZZU?NMQuI$fwM1_U5w@u7D3lw6^FY*gvJin-X7LcP_;u=wsl30>zm0Xkxq!^40jEr>+ zjdYC+LkumgfXKvH+rYrez~Ib*KMPPa|E2(Vt*+tS-Ar#iJ%O0~7s z{R78Kktqs~1bY@#w;d?k*t6GFz*;c4LojL5`}w|Ef3GG#FgE7Oz2YC@^;2x;wRNsc zdp8zr;AT~Qm85avqvo}?3Z-hEnn%7REa@|TTPO?7$ao~6`S4^4my7cB0*?IK40|mP zo_+C+)A@+@3a@om8{@e21okwnc73(oB8@}0Y0EwCu7t|X7dE%r{i)u0QvCee`*A1C SomK-~&EV4su_A|3v4PU+dWF|8Tebi61YT!}XOgrST3kQweTF{`Ymx2nP zdL?+Ge9VdQW(*U?8B_++#s#sg`@NIn>+DT5ft6snc03Lb9+ zR|sCf&7nwo9A?-$n6TRmY7^WYtQp(v-^)H<_%qx;sG6tfThZ@SUc$xMuy^(#GH978nD+g{x7t?Vem{=xR60KekV)LFSYYh-5s=3i8x zl_Pv-ZhCc$u*!G&8%Gp2dX!29AJNk8OxY*)jjJkriRHmVpZJm#IigyAGcRoY^ zh!3|EcAn5keZW>8z4HDPgN$YT6~CrFO?vbuf%euhIXLbH4EVb;bR+ovnRRx{o&P?aTVL;?vs1 z!nu+RD+6!#JLKMJ4r5ztXr|g(c+2M0mU zc!i?B+FJV?jX!3VoMF2d-F~fP{TZL_)$dh8j+~kGJo?DRw1f*zk?!&*|FkN-vXbhQ z2(MT8t{>9>)I_h_LP&kpTJGz{^?{oDF>^%sW&W{tX{*>RyUg^Te5lqF+4*ga$AXoe zpD;S^x?RQAbAnw;X`jZl&K9>h%Qo$nl1WrLR@xj`&>MNXxifys3w~*%x_-N|J-K}|sb0I`n?{9y%=Aw?a;000ie0hKEb8vp%2Njs5ORy~^EeFI<510uw~3Pr3a8g0 zEmzmG1`~iYpg*Z*9B{9+9y0&ag5oi5P3#uV__@|~JHe|u6f90}P+46OW7qmCo1ke4 zG1nyMwFK2_C7*y5gm5pLAKaiE1J#N_LngR Date: Thu, 21 Dec 2023 20:04:51 +0000 Subject: [PATCH 6/6] Mt Moon Crater improvement (wait, didn't we already have this today?) I'M ON A FUCKING ROLL HERE AND I WON'T STOP - Made Mt. Moon Crater have a more 'mystical' purple palette at LuciShrimp's request :3 --- data/sgb/sgb_palettes.asm | 2 +- engine/gfx/palettes.asm | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/data/sgb/sgb_palettes.asm b/data/sgb/sgb_palettes.asm index 14752e7e..4beb709f 100644 --- a/data/sgb/sgb_palettes.asm +++ b/data/sgb/sgb_palettes.asm @@ -18,7 +18,7 @@ SuperPalettes: RGB 31,31,31, 00,21,31, 10,28,00, 01,01,01 ; PAL_TOWNMAP RGB 31,31,31, 31,31,00, 31,01,09, 31,13,15 ; PAL_LOGO1 RGB 31,31,31, 31,31,00, 07,07,25, 00,00,17 ; PAL_LOGO2 - RGB 31,31,31, 13,01,31, 00,09,31, 01,01,01 ; PAL_0F + RGB 31,31,31, 29,16,30, 09,03,27, 01,01,01 ; PAL_0F RGB 31,31,31, 30,17,11, 11,05,14, 03,03,03 ; PAL_MEWMON RGB 31,31,31, 16,18,31, 00,01,25, 03,03,03 ; PAL_BLUEMON RGB 31,31,31, 31,17,00, 31,00,00, 03,03,03 ; PAL_REDMON diff --git a/engine/gfx/palettes.asm b/engine/gfx/palettes.asm index f103fe39..2d2cc8e3 100644 --- a/engine/gfx/palettes.asm +++ b/engine/gfx/palettes.asm @@ -211,6 +211,8 @@ SetPal_Overworld: jp z, .pallet cp REDS_HOUSE_2F jp z, .pallet + cp MT_MOON_CRATER + jp z, .areazero cp CERULEAN_CAVE_2F jp c, .normalDungeonOrBuilding cp LORELEIS_ROOM @@ -301,6 +303,9 @@ SetPal_Overworld: .ferry ld a, PAL_BLUEMON - 1 jr .town +.areazero + ld a, PAL_0F - 1 + jr .town ; used when a Pokemon is the only thing on the screen ; such as evolution, trading and the Hall of Fame