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/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/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 52761814..2d2cc8e3 100644 --- a/engine/gfx/palettes.asm +++ b/engine/gfx/palettes.asm @@ -207,6 +207,12 @@ 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 MT_MOON_CRATER + jp z, .areazero cp CERULEAN_CAVE_2F jp c, .normalDungeonOrBuilding cp LORELEIS_ROOM @@ -291,9 +297,15 @@ 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 +.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 diff --git a/gfx/blocksets/forest.bst b/gfx/blocksets/forest.bst index 8ab5e338..314d1016 100644 Binary files a/gfx/blocksets/forest.bst and b/gfx/blocksets/forest.bst differ diff --git a/gfx/pokemon/back/annihilapeb.png b/gfx/pokemon/back/annihilapeb.png index 11b7a64f..64c513d8 100644 Binary files a/gfx/pokemon/back/annihilapeb.png and b/gfx/pokemon/back/annihilapeb.png differ diff --git a/gfx/pokemon/back/jynxb.png b/gfx/pokemon/back/jynxb.png index 00c2ad04..104c2f5d 100644 Binary files a/gfx/pokemon/back/jynxb.png and b/gfx/pokemon/back/jynxb.png differ diff --git a/gfx/pokemon/front/bellossom.png b/gfx/pokemon/front/bellossom.png index c4cc7661..01464f33 100644 Binary files a/gfx/pokemon/front/bellossom.png and b/gfx/pokemon/front/bellossom.png differ 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 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/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 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