diff --git a/constants/event_constants.asm b/constants/event_constants.asm index 88d8d51e..74555d6f 100644 --- a/constants/event_constants.asm +++ b/constants/event_constants.asm @@ -488,7 +488,7 @@ const EVENT_BEAT_VICTORY_ROAD_2_TRAINER_2 const EVENT_BEAT_VICTORY_ROAD_2_TRAINER_3 const EVENT_BEAT_VICTORY_ROAD_2_TRAINER_4 - const EVENT_BEAT_MOLTRES + const EVENT_BEAT_GYAOON const EVENT_VICTORY_ROAD_2_BOULDER_ON_SWITCH2 ; Route 24 events @@ -787,6 +787,11 @@ const EVENT_BEAT_CELADON_UNIVERSITY_OUTSIDE_TRAINER_2 const EVENT_BEAT_CELADON_UNIVERSITY_OUTSIDE_TRAINER_3 +; Cinnabar Volcano events + const_next $9F0 + const_skip + const EVENT_BEAT_MOLTRES + ; End of events const_next $A00 DEF NUM_EVENTS EQU const_value diff --git a/constants/hide_show_constants.asm b/constants/hide_show_constants.asm index ad371b2a..6cbf6585 100644 --- a/constants/hide_show_constants.asm +++ b/constants/hide_show_constants.asm @@ -100,7 +100,7 @@ DEF SHOW EQU $15 const HS_POWER_PLANT_ITEM_3 ; 58 X const HS_POWER_PLANT_ITEM_4 ; 59 X const HS_POWER_PLANT_ITEM_5 ; 5A X - const HS_MOLTRES ; 5B X + const HS_GYAOON ; 5B X const HS_VICTORY_ROAD_2F_ITEM_1 ; 5C X const HS_VICTORY_ROAD_2F_ITEM_2 ; 5D X const HS_VICTORY_ROAD_2F_ITEM_3 ; 5E X @@ -239,4 +239,5 @@ DEF SHOW EQU $15 const HS_ARTICUNO ; E3 X const HS_CROCKY ; E4 X const HS_MEW ; E5 X + const HS_MOLTRES ; E6 X DEF NUM_HS_OBJECTS EQU const_value diff --git a/constants/map_constants.asm b/constants/map_constants.asm index d944b1bc..9c462be1 100644 --- a/constants/map_constants.asm +++ b/constants/map_constants.asm @@ -250,7 +250,7 @@ DEF FIRST_INDOOR_MAP EQU const_value mapconst CERULEAN_CAVE_1F, 9, 15 ; $E4 mapconst NAME_RATERS_HOUSE, 4, 4 ; $E5 mapconst CERULEAN_BADGE_HOUSE, 4, 4 ; $E6 - mapconst UNUSED_MAP_E7, 0, 0 ; $E7 + mapconst CINNABAR_VOLCANO, 12, 14 ; $E7 - was UNUSED_MAP_E7 mapconst ROCK_TUNNEL_B1F, 18, 20 ; $E8 mapconst SILPH_CO_9F, 9, 13 ; $E9 mapconst SILPH_CO_10F, 9, 8 ; $EA diff --git a/data/maps/dungeon_maps.asm b/data/maps/dungeon_maps.asm index d647923c..f4977ae8 100644 --- a/data/maps/dungeon_maps.asm +++ b/data/maps/dungeon_maps.asm @@ -10,6 +10,7 @@ DungeonMaps1: db ROCK_TUNNEL_1F db SEAFOAM_ISLANDS_1F db ROCK_TUNNEL_B1F + db CINNABAR_VOLCANO db -1 ; end ; GetBattleTransitionID_IsDungeonMap checks if wCurMap diff --git a/data/maps/headers/CinnabarVolcano.asm b/data/maps/headers/CinnabarVolcano.asm new file mode 100644 index 00000000..bd8231c7 --- /dev/null +++ b/data/maps/headers/CinnabarVolcano.asm @@ -0,0 +1,2 @@ + map_header CinnabarVolcano, CINNABAR_VOLCANO, CAVERN, 0 + end_map_header diff --git a/data/maps/hide_show_data.asm b/data/maps/hide_show_data.asm index 7ff85e86..027bccec 100644 --- a/data/maps/hide_show_data.asm +++ b/data/maps/hide_show_data.asm @@ -234,7 +234,7 @@ MapHSPointers: dw CeruleanCaveHS dw NoHS dw NoHS - dw NoHS + dw CinnabarVolcanoHS dw NoHS dw SilphCo9FHS dw SilphCo10FHS @@ -509,6 +509,8 @@ SilphCo11FHS: db SILPH_CO_11F, $05, SHOW UnusedMapF4HS: db UNUSED_MAP_F4, $02, SHOW +CinnabarVolcanoHS: + db CINNABAR_VOLCANO, $01, SHOW PokemonMansion2FHS: db POKEMON_MANSION_2F, $02, SHOW PokemonMansion3FHS: diff --git a/data/maps/map_header_banks.asm b/data/maps/map_header_banks.asm index 5a2fe3a2..d4796bf6 100644 --- a/data/maps/map_header_banks.asm +++ b/data/maps/map_header_banks.asm @@ -232,7 +232,7 @@ MapHeaderBanks:: db BANK(CeruleanCave1F_h) db BANK(NameRatersHouse_h) db BANK(CeruleanBadgeHouse_h) - db $01 ; UNUSED_MAP_E7 + db BANK(CinnabarVolcano_h) ; $01 UNUSED_MAP_E7 db BANK(RockTunnelB1F_h) db BANK(SilphCo9F_h) db BANK(SilphCo10F_h) diff --git a/data/maps/map_header_pointers.asm b/data/maps/map_header_pointers.asm index 348dbd5c..ed1b6e6c 100644 --- a/data/maps/map_header_pointers.asm +++ b/data/maps/map_header_pointers.asm @@ -232,7 +232,7 @@ MapHeaderPointers:: dw CeruleanCave1F_h dw NameRatersHouse_h dw CeruleanBadgeHouse_h - dw Route16Gate1F_h ; UNUSED_MAP_E7 + dw CinnabarVolcano_h ; UNUSED_MAP_E7 dw RockTunnelB1F_h dw SilphCo9F_h dw SilphCo10F_h diff --git a/data/maps/objects/CinnabarIsland.asm b/data/maps/objects/CinnabarIsland.asm index bbb598b4..35cf018b 100644 --- a/data/maps/objects/CinnabarIsland.asm +++ b/data/maps/objects/CinnabarIsland.asm @@ -7,13 +7,14 @@ CinnabarIsland_Object: warp_event 6, 21, CINNABAR_LAB, 1 warp_event 15, 17, CINNABAR_POKECENTER, 1 warp_event 21, 19, CINNABAR_MART, 1 + warp_event 14, 11, CINNABAR_VOLCANO, 1 def_bg_events bg_event 11, 15, 3 ; CinnabarIslandText3 bg_event 22, 19, 4 ; MartSignText bg_event 16, 17, 5 ; PokeCenterSignText bg_event 9, 23, 6 ; CinnabarIslandText6 - bg_event 9, 9, 7 ; CinnabarIslandText7 + bg_event 23, 13, 7 ; CinnabarIslandText7 def_object_events object_event 11, 18, SPRITE_GIRL, WALK, LEFT_RIGHT, 1 ; person diff --git a/data/maps/objects/CinnabarVolcano.asm b/data/maps/objects/CinnabarVolcano.asm new file mode 100644 index 00000000..74d6f549 --- /dev/null +++ b/data/maps/objects/CinnabarVolcano.asm @@ -0,0 +1,13 @@ +CinnabarVolcano_Object: + db $7d ; border block + + def_warp_events + warp_event 2, 23, LAST_MAP, 6 + warp_event 3, 23, LAST_MAP, 6 + + def_bg_events + + def_object_events + object_event 14, 12, SPRITE_BIRD, STAY, UP, 1, MOLTRES, 50 | OW_POKEMON + + def_warps_to CINNABAR_VOLCANO diff --git a/data/maps/objects/VictoryRoad2F.asm b/data/maps/objects/VictoryRoad2F.asm index 906323cd..00fbb99e 100644 --- a/data/maps/objects/VictoryRoad2F.asm +++ b/data/maps/objects/VictoryRoad2F.asm @@ -18,7 +18,7 @@ VictoryRoad2F_Object: object_event 19, 8, SPRITE_COOLTRAINER_M, STAY, DOWN, 3, OPP_TAMER, 5 object_event 4, 2, SPRITE_SUPER_NERD, STAY, DOWN, 4, OPP_POKEMANIAC, 6 object_event 26, 3, SPRITE_SUPER_NERD, STAY, LEFT, 5, OPP_JUGGLER, 5 - object_event 11, 5, SPRITE_BIRD, STAY, UP, 6, MOLTRES, 50 | OW_POKEMON + object_event 11, 5, SPRITE_MONSTER, STAY, DOWN, 6, GYAOON, 50 | OW_POKEMON object_event 27, 5, SPRITE_POKE_BALL, STAY, NONE, 7, TM_SUBMISSION object_event 18, 9, SPRITE_POKE_BALL, STAY, NONE, 8, FULL_HEAL object_event 9, 11, SPRITE_POKE_BALL, STAY, NONE, 9, TM_MEGA_KICK diff --git a/data/maps/songs.asm b/data/maps/songs.asm index 3100606c..38f408ee 100644 --- a/data/maps/songs.asm +++ b/data/maps/songs.asm @@ -231,7 +231,7 @@ MapSongBanks:: db MUSIC_DUNGEON1, BANK(Music_Dungeon1) ; CERULEAN_CAVE_1F db MUSIC_CITIES2, BANK(Music_Cities2) ; NAME_RATERS_HOUSE db MUSIC_CITIES1, BANK(Music_Cities1) ; CERULEAN_BADGE_HOUSE - db MUSIC_CINNABAR, BANK(Music_Cinnabar) ; UNUSED_MAP_E7 + db MUSIC_DUNGEON3, BANK(Music_Dungeon3) ; UNUSED_MAP_E7 / Cinnabar Volcano db MUSIC_DUNGEON3, BANK(Music_Dungeon3) ; ROCK_TUNNEL_B1F db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; SILPH_CO_9F db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; SILPH_CO_10F diff --git a/data/wild/grass_water.asm b/data/wild/grass_water.asm index a09fdce6..7aca95a1 100644 --- a/data/wild/grass_water.asm +++ b/data/wild/grass_water.asm @@ -231,7 +231,7 @@ WildDataPointers: dw CeruleanCave1FWildMons dw NothingWildMons dw NothingWildMons - dw NothingWildMons + dw CinnabarVolcanoWildMons dw RockTunnelB1FWildMons dw NothingWildMons dw NothingWildMons @@ -321,3 +321,4 @@ INCLUDE "data/wild/maps/VictoryRoad2F.asm" INCLUDE "data/wild/maps/VictoryRoad3F.asm" INCLUDE "data/wild/maps/VictoryRoad1F.asm" INCLUDE "data/wild/maps/DiglettsCave.asm" +INCLUDE "data/wild/maps/CinnabarVolcano.asm" diff --git a/data/wild/maps/CinnabarVolcano.asm b/data/wild/maps/CinnabarVolcano.asm new file mode 100644 index 00000000..4ebed49c --- /dev/null +++ b/data/wild/maps/CinnabarVolcano.asm @@ -0,0 +1,16 @@ +CinnabarVolcanoWildMons: + def_grass_wildmons 10 ; encounter rate + db 37, VULPIX + db 38, PONYTA + db 37, GROWLITHE + db 37, PONYTA + db 38, GROWLITHE + db 41, RAPIDASH + db 33, CHARMANDER + db 38, MAGMAR + db 39, MAGMAR + db 40, CHARMELEON + end_grass_wildmons + + def_water_wildmons 0 ; encounter rate + end_water_wildmons diff --git a/data/wild/maps/PokemonMansion1F.asm b/data/wild/maps/PokemonMansion1F.asm index ee9a38b2..cfa355e5 100644 --- a/data/wild/maps/PokemonMansion1F.asm +++ b/data/wild/maps/PokemonMansion1F.asm @@ -1,15 +1,15 @@ PokemonMansion1FWildMons: def_grass_wildmons 10 ; encounter rate - db 32, GRIMER - db 30, GRIMER - db 34, PONYTA - db 30, PONYTA - db 34, VULPIX - db 32, PONYTA - db 30, KOFFING - db 28, PONYTA - db 37, MUK - db 39, WEEZING + db 36, GRIMER + db 35, GRIMER + db 35, KOFFING + db 36, GASTLY + db 34, KOFFING + db 35, GASTLY + db 36, GASTLY + db 38, MUK + db 38, WEEZING + db 38, WEEZING end_grass_wildmons def_water_wildmons 0 ; encounter rate diff --git a/data/wild/maps/PokemonMansion2F.asm b/data/wild/maps/PokemonMansion2F.asm index 84e397c9..6f919603 100644 --- a/data/wild/maps/PokemonMansion2F.asm +++ b/data/wild/maps/PokemonMansion2F.asm @@ -1,15 +1,15 @@ PokemonMansion2FWildMons: def_grass_wildmons 10 ; encounter rate - db 32, GROWLITHE - db 34, KOFFING - db 34, KOFFING - db 30, PONYTA - db 30, KOFFING - db 32, PONYTA - db 30, GRIMER - db 28, PONYTA - db 39, WEEZING - db 37, MUK + db 34, GRIMER + db 35, KOFFING + db 36, KOFFING + db 35, GRIMER + db 35, GASTLY + db 34, GASTLY + db 36, DROWZEE + db 38, HYPNO + db 40, WEEZING + db 40, MUK end_grass_wildmons def_water_wildmons 0 ; encounter rate diff --git a/data/wild/maps/PokemonMansion3F.asm b/data/wild/maps/PokemonMansion3F.asm index 6ee7c21e..2635f2cf 100644 --- a/data/wild/maps/PokemonMansion3F.asm +++ b/data/wild/maps/PokemonMansion3F.asm @@ -1,15 +1,15 @@ PokemonMansion3FWildMons: def_grass_wildmons 10 ; encounter rate - db 31, GRIMER - db 33, VULPIX + db 35, KOFFING + db 34, GRIMER db 35, GRIMER - db 32, PONYTA - db 34, MAGMAR - db 40, MUK db 34, KOFFING - db 38, MUK - db 36, PONYTA - db 42, WEEZING + db 34, DROWZEE + db 35, DROWZEE + db 36, GASTLY + db 37, GASTLY + db 38, HYPNO + db 40, HYPNO end_grass_wildmons def_water_wildmons 0 ; encounter rate diff --git a/data/wild/maps/PokemonMansionB1F.asm b/data/wild/maps/PokemonMansionB1F.asm index 66800fb4..053b4fe6 100644 --- a/data/wild/maps/PokemonMansionB1F.asm +++ b/data/wild/maps/PokemonMansionB1F.asm @@ -1,15 +1,15 @@ PokemonMansionB1FWildMons: def_grass_wildmons 10 ; encounter rate - db 33, GRIMER - db 31, GRIMER - db 35, VULPIX - db 32, PONYTA - db 31, GRIMER - db 40, MUK - db 34, PONYTA + db 35, GASTLY db 35, KOFFING - db 38, MAGMAR + db 35, GRIMER + db 34, DITTO + db 36, GASTLY + db 36, DITTO db 42, WEEZING + db 42, MUK + db 38, DITTO + db 42, HAUNTER end_grass_wildmons def_water_wildmons 0 ; encounter rate diff --git a/data/wild/maps/PowerPlant.asm b/data/wild/maps/PowerPlant.asm index e239c6d5..feb3d224 100644 --- a/data/wild/maps/PowerPlant.asm +++ b/data/wild/maps/PowerPlant.asm @@ -1,15 +1,15 @@ PowerPlantWildMons: def_grass_wildmons 10 ; encounter rate - db 21, VOLTORB - db 21, MAGNEMITE - db 20, PIKACHU - db 24, PIKACHU - db 23, MAGNEMITE - db 23, VOLTORB - db 32, MAGNETON - db 35, MAGNETON - db 33, ELECTABUZZ - db 36, ELECTABUZZ + db 37, VOLTORB + db 38, MAGNETITE + db 37, GAOTORA + db 37, MAGNETITE + db 38, GAOTORA + db 41, MAGNETON + db 33, PIKACHU + db 38, ELECTABUZZ + db 39, ELECTABUZZ + db 40, RAICHU end_grass_wildmons def_water_wildmons 0 ; encounter rate diff --git a/data/wild/maps/Route10.asm b/data/wild/maps/Route10.asm index f874ab40..fc137112 100644 --- a/data/wild/maps/Route10.asm +++ b/data/wild/maps/Route10.asm @@ -6,7 +6,7 @@ Route10WildMons: db 11, EKANS db 13, SPEAROW db 15, EKANS - db 17, CACTUS + db 17, MAGNEMITE db 20, FEAROW db 13, SANDSHREW db 17, SANDSHREW diff --git a/data/wild/maps/SeafoamIslands1F.asm b/data/wild/maps/SeafoamIslands1F.asm index fff4bce2..f662b29d 100644 --- a/data/wild/maps/SeafoamIslands1F.asm +++ b/data/wild/maps/SeafoamIslands1F.asm @@ -1,15 +1,15 @@ SeafoamIslands1FWildMons: def_grass_wildmons 15 ; encounter rate - db 30, SEEL - db 30, PSYDUCK - db 30, STARYU - db 30, KRABBY - db 28, KRABBY - db 21, ZUBAT - db 29, GOLBAT - db 28, SLOWPOKE - db 28, STARYU - db 38, SLOWBRO + db 35, SEEL + db 35, PSYDUCK + db 35, STARYU + db 35, KRABBY + db 36, WEIRDUCK + db 33, SEEL + db 34, SLOWPOKE + db 34, SLOWPOKE + db 38, JYNX + db 38, DEWGONG end_grass_wildmons def_water_wildmons 0 ; encounter rate diff --git a/data/wild/maps/SeafoamIslandsB1F.asm b/data/wild/maps/SeafoamIslandsB1F.asm index c34c9412..f2dba908 100644 --- a/data/wild/maps/SeafoamIslandsB1F.asm +++ b/data/wild/maps/SeafoamIslandsB1F.asm @@ -1,15 +1,15 @@ SeafoamIslandsB1FWildMons: def_grass_wildmons 10 ; encounter rate - db 30, STARYU - db 30, HORSEA - db 32, SHELLDER - db 32, HORSEA - db 28, SLOWPOKE - db 30, SEEL - db 30, SLOWPOKE - db 28, SEEL - db 38, DEWGONG - db 37, SEADRA + db 35, SHELLDER + db 35, BLASTYKE + db 36, SHELLDER + db 36, BLASTYKE + db 34, SLOWPOKE + db 35, SEEL + db 35, SLOWPOKE + db 35, SEEL + db 38, JYNX + db 39, SLOWBRO end_grass_wildmons def_water_wildmons 0 ; encounter rate diff --git a/data/wild/maps/SeafoamIslandsB2F.asm b/data/wild/maps/SeafoamIslandsB2F.asm index 451f4ff6..1f2fe8c4 100644 --- a/data/wild/maps/SeafoamIslandsB2F.asm +++ b/data/wild/maps/SeafoamIslandsB2F.asm @@ -1,15 +1,15 @@ SeafoamIslandsB2FWildMons: def_grass_wildmons 10 ; encounter rate - db 30, SEEL - db 30, SLOWPOKE - db 32, SEEL - db 32, SLOWPOKE - db 28, HORSEA - db 30, STARYU - db 30, HORSEA - db 28, SHELLDER - db 30, GOLBAT - db 37, SLOWBRO + db 35, SEEL + db 35, SLOWPOKE + db 36, SEEL + db 36, SLOWPOKE + db 34, WEIRDUCK + db 35, STARYU + db 35, WEIRDUCK + db 38, JYNX + db 36, STARYU + db 39, GOLDUCK end_grass_wildmons def_water_wildmons 0 ; encounter rate diff --git a/data/wild/maps/SeafoamIslandsB3F.asm b/data/wild/maps/SeafoamIslandsB3F.asm index f2970c36..52c24156 100644 --- a/data/wild/maps/SeafoamIslandsB3F.asm +++ b/data/wild/maps/SeafoamIslandsB3F.asm @@ -1,15 +1,15 @@ SeafoamIslandsB3FWildMons: def_grass_wildmons 10 ; encounter rate - db 31, PSYDUCK - db 31, SEEL - db 33, PSYDUCK - db 33, SEEL - db 29, KRABBY - db 31, STARYU - db 31, KRABBY - db 29, STARYU - db 39, KINGLER - db 37, DEWGONG + db 36, BLASTYKE + db 36, SEEL + db 37, BLASTYKE + db 37, SEEL + db 35, KRABBY + db 36, STARYU + db 36, KRABBY + db 38, JYNX + db 39, JYNX + db 39, BLASTOISE end_grass_wildmons def_water_wildmons 0 ; encounter rate diff --git a/data/wild/maps/SeafoamIslandsB4F.asm b/data/wild/maps/SeafoamIslandsB4F.asm index 5eef8f11..efc57346 100644 --- a/data/wild/maps/SeafoamIslandsB4F.asm +++ b/data/wild/maps/SeafoamIslandsB4F.asm @@ -1,15 +1,15 @@ SeafoamIslandsB4FWildMons: def_grass_wildmons 10 ; encounter rate - db 31, KRABBY - db 31, STARYU - db 33, KRABBY - db 33, STARYU - db 29, PSYDUCK - db 31, SEEL - db 31, PSYDUCK - db 29, SEEL - db 39, GOLDUCK - db 32, GOLBAT + db 37, WEIRDUCK + db 38, STARYU + db 37, SHELLDER + db 37, STARYU + db 38, SHELLDER + db 41, GOLDUCK + db 33, SQUIRTLE + db 38, BUU + db 39, BUU + db 40, WARTORTLE end_grass_wildmons def_water_wildmons 0 ; encounter rate diff --git a/engine/gfx/palettes.asm b/engine/gfx/palettes.asm index 31af685d..936b55ed 100644 --- a/engine/gfx/palettes.asm +++ b/engine/gfx/palettes.asm @@ -174,6 +174,8 @@ SetPal_Overworld: ld a, [wCurMap] cp SEAFOAM_ISLANDS_1F jr z, .seafoam + cp CINNABAR_VOLCANO + jr z, .volcano cp SEAFOAM_ISLANDS_B1F jr c, .caveDefault cp SEAFOAM_ISLANDS_B4F + 1 @@ -190,6 +192,9 @@ SetPal_Overworld: .seafoam ld a, PAL_0F - 1 jr .town +.volcano + ld a, PAL_REDMON - 1 + jr .town ; used when a Pokemon is the only thing on the screen ; such as evolution, trading and the Hall of Fame @@ -283,7 +288,7 @@ BadgeBlkDataLengths: DeterminePaletteID: bit TRANSFORMED, a ; a is battle status 3 - ld a, PAL_GREYMON ; if the mon has used Transform, use Ditto's palette + ld a, PAL_PURPLEMON ; if the mon has used Transform, use Ditto's palette ret nz ld a, [hl] DeterminePaletteIDOutOfBattle: diff --git a/maps.asm b/maps.asm index e7f0bbb7..e6dea652 100644 --- a/maps.asm +++ b/maps.asm @@ -1231,4 +1231,9 @@ CeladonUniversityOutside_Blocks: INCBIN "maps/CeladonUniversityOutside.blk" INCLUDE "data/maps/headers/CeladonUniversityInside.asm" INCLUDE "scripts/CeladonUniversityInside.asm" INCLUDE "data/maps/objects/CeladonUniversityInside.asm" -CeladonUniversityInside_Blocks: INCBIN "maps/CeladonUniversityInside.blk" \ No newline at end of file +CeladonUniversityInside_Blocks: INCBIN "maps/CeladonUniversityInside.blk" + +INCLUDE "data/maps/headers/CinnabarVolcano.asm" +INCLUDE "scripts/CinnabarVolcano.asm" +INCLUDE "data/maps/objects/CinnabarVolcano.asm" +CinnabarVolcano_Blocks: INCBIN "maps/CinnabarVolcano.blk" diff --git a/maps/CinnabarIsland.blk b/maps/CinnabarIsland.blk index 09001b68..99d4d041 100644 --- a/maps/CinnabarIsland.blk +++ b/maps/CinnabarIsland.blk @@ -1 +1 @@ -CCCCCC>???;CCCCTCC>$*,+%;CCCTC>+W$W%W*;d{{{$%+ *()d{{y$*)($%d{{{{$p/$*)d !{{{{{{{$%d7:~y{ !{{{{ed{{{{{|r{ !{ed !{{{{{|s{ed7:~{{{{{{{{ed{{y{0{0{{e-{{{{{{{{{{eC-.kkkkkkkkkkkkk \ No newline at end of file +CCCCCC>???;CCCCTCC>$*,+%;CCCTC>+W$W%W*;d{{{$%+ *()d{{{$*)($%d{{{{$p/$*)d !{{{{{{y$%d7:~y{ !{{{{ed{{{{{|r{ !{ed !{{{{{|s{ed7:~{{{{{{{{ed{{y{0{0{{e-{{{{{{{{{{eC-.kkkkkkkkkkkkk \ No newline at end of file diff --git a/maps/CinnabarVolcano.blk b/maps/CinnabarVolcano.blk new file mode 100644 index 00000000..6998aac6 --- /dev/null +++ b/maps/CinnabarVolcano.blk @@ -0,0 +1,2 @@ +..............}R +R}}j[[[{}}f+,+NRvv+,vvN vvvvvv}vvvvvvNvvvvvvvvf}vvvvvvvvSN}}vvvvvv}N}NN}}$}}}NN} \ No newline at end of file diff --git a/ram/wram.asm b/ram/wram.asm index 2b6123d2..dbd3d423 100644 --- a/ram/wram.asm +++ b/ram/wram.asm @@ -1999,6 +1999,7 @@ wPokemonMansion2FCurScript:: db wPokemonMansion3FCurScript:: db wPokemonMansionB1FCurScript:: db wDiglettsCaveCurScript:: db +wCinnabarVolcanoCurScript:: db wVictoryRoad2FCurScript:: db wVictoryRoad3FCurScript:: db ds 1 diff --git a/scripts/CinnabarVolcano.asm b/scripts/CinnabarVolcano.asm new file mode 100644 index 00000000..b81e7761 --- /dev/null +++ b/scripts/CinnabarVolcano.asm @@ -0,0 +1,36 @@ +CinnabarVolcano_Script: + call EnableAutoTextBoxDrawing + ld hl, CinnabarVolcanoTrainerHeaders + ld de, CinnabarVolcano_ScriptPointers + ld a, [wCinnabarVolcanoCurScript] + call ExecuteCurMapScriptInTable + ld [wCinnabarVolcanoCurScript], a + ret + +CinnabarVolcano_ScriptPointers: + dw CheckFightingMapTrainers + dw DisplayEnemyTrainerTextAndStartBattle + dw EndTrainerBattle + +CinnabarVolcano_TextPointers: + dw MoltresText + +CinnabarVolcanoTrainerHeaders: + def_trainers +MoltresTrainerHeader: + trainer EVENT_BEAT_MOLTRES, 0, MoltresBattleText, MoltresBattleText, MoltresBattleText + db -1 ; end + +MoltresText: + text_asm + ld hl, MoltresTrainerHeader + call TalkToTrainer + jp TextScriptEnd + +MoltresBattleText: + text_far _MoltresBattleText + text_asm + ld a, MOLTRES + call PlayCry + call WaitForSoundToFinish + jp TextScriptEnd diff --git a/scripts/VictoryRoad2F.asm b/scripts/VictoryRoad2F.asm index d86c7a16..3a8e9eee 100644 --- a/scripts/VictoryRoad2F.asm +++ b/scripts/VictoryRoad2F.asm @@ -72,7 +72,7 @@ VictoryRoad2F_TextPointers: dw VictoryRoad2Text3 dw VictoryRoad2Text4 dw VictoryRoad2Text5 - dw MoltresText + dw GyaoonText dw PickUpItemText dw PickUpItemText dw PickUpItemText @@ -93,8 +93,8 @@ VictoryRoad2TrainerHeader3: trainer EVENT_BEAT_VICTORY_ROAD_2_TRAINER_3, 1, VictoryRoad2BattleText4, VictoryRoad2EndBattleText4, VictoryRoad2AfterBattleText4 VictoryRoad2TrainerHeader4: trainer EVENT_BEAT_VICTORY_ROAD_2_TRAINER_4, 3, VictoryRoad2BattleText5, VictoryRoad2EndBattleText5, VictoryRoad2AfterBattleText5 -MoltresTrainerHeader: - trainer EVENT_BEAT_MOLTRES, 0, MoltresBattleText, MoltresBattleText, MoltresBattleText +GyaoonTrainerHeader: + trainer EVENT_BEAT_GYAOON, 0, GyaoonBattleText, GyaoonBattleText, GyaoonBattleText db -1 ; end VictoryRoad2Text1: @@ -127,16 +127,16 @@ VictoryRoad2Text5: call TalkToTrainer jp TextScriptEnd -MoltresText: +GyaoonText: text_asm - ld hl, MoltresTrainerHeader + ld hl, GyaoonTrainerHeader call TalkToTrainer jp TextScriptEnd -MoltresBattleText: - text_far _MoltresBattleText +GyaoonBattleText: + text_far _GyaoonBattleText text_asm - ld a, MOLTRES + ld a, GYAOON call PlayCry call WaitForSoundToFinish jp TextScriptEnd diff --git a/text.asm b/text.asm index fc9567bb..d06334fd 100644 --- a/text.asm +++ b/text.asm @@ -273,6 +273,7 @@ INCLUDE "data/text/text_7.asm" INCLUDE "data/pokemon/new_dex_text.asm" INCLUDE "text/CeladonUniversityOutside.asm" INCLUDE "text/CeladonUniversityInside.asm" +INCLUDE "text/CinnabarVolcano.asm" SECTION "Pokédex Text", ROMX diff --git a/text/CinnabarVolcano.asm b/text/CinnabarVolcano.asm new file mode 100644 index 00000000..e46ed08e --- /dev/null +++ b/text/CinnabarVolcano.asm @@ -0,0 +1,3 @@ +_MoltresBattleText:: + text "Gyaoo!@" + text_end diff --git a/text/VictoryRoad2F.asm b/text/VictoryRoad2F.asm index ff72afaa..049387f5 100644 --- a/text/VictoryRoad2F.asm +++ b/text/VictoryRoad2F.asm @@ -1,5 +1,5 @@ -_MoltresBattleText:: - text "Gyaoo!@" +_GyaoonBattleText:: + text "Gawaarrgh!@" text_end _VictoryRoad2BattleText1::