New Maps, Moved Edward Event

Author: Dakorias

constants/battle_constants.asm

@@ -10,6 +10,8 @@ DEF NUM_MOVES EQU 4
 DEF BASE_STAT_LEVEL EQU 7
 DEF MAX_STAT_LEVEL EQU 13
 
+MIN_NEUTRAL_DAMAGE EQU 2
+
 ; turns that sleep lasts
 DEF REST_SLEEP_TURNS EQU 2
 DEF TREEMON_SLEEP_TURNS EQU 7

constants/event_flags.asm

@@ -38,6 +38,7 @@
 	const EVENT_GOT_A_POKEMON_FROM_OAK
 	const EVENT_BATTLE_PERCY_2ND_GYM
 	const EVENT_GOT_ITEMS_FROM_HERALD_HOUSE
+	const EVENT_EDWARD_MISSING_FROM_GYM
 	const EVENT_GOT_MAP_FROM_EDWARD
 	const EVENT_GYM_TRAINERS_IN_HERALD_COVE
 	const EVENT_LASS_AT_HERALD_ROUTE
@@ -50,7 +51,6 @@
 	const EVENT_BEAT_KENJI_TOURNAMENT
 	const EVENT_SCENIC_BLUFF_SEEN_BLUE
 	const EVENT_OAK_MISSING_FROM_LAB
-	const EVENT_FOUGHT_SUDOWOODO
 	const EVENT_CLEARED_SLOWPOKE_WELL
 	const EVENT_REFUSED_TO_TAKE_EGG_FROM_ELMS_AIDE
 	const EVENT_GOT_TOGEPI_EGG_FROM_ELMS_AIDE

constants/landmark_constants.asm

@@ -4,10 +4,11 @@
 ; Johto landmarks
 	const LANDMARK_HERALD_COVE		 ; 60
 	const LANDMARK_HERALD_ROUTE		 ; 61
+	const LANDMARK_HERALD_BAY
 	const LANDMARK_CRAGGY_BEACH		 ; 62
 	const LANDMARK_CRAGGY_COAST		 ; 63
 	const LANDMARK_SCENIC_BLUFF  	 ; 64
-	const LANDMARK_MOUNTAIN_CAVE	 ; 65
+	const LANDMARK_MT_MONEGO    	 ; 65
 	const LANDMARK_BERRY_FOREST    ; 66
 
 DEF KANTO_LANDMARK EQU const_value

constants/map_constants.asm

@@ -76,19 +76,22 @@ ENDM
 	map_const PLAYERS_HOUSE_2F,                             4,  3 ;  9
 	map_const REGISTRATION_CENTER,							 						5,  5 ; 10
 	map_const HERALD_GROTTO,																4,  8 ; 11
-	map_const CRAGGY_BEACH,																 12, 40 ; 12
+	map_const HERALD_BAY,																	 14, 20 ; 12
+	map_const HERALD_BAY_HOUSE,														 5,  4  ; 13
+	map_const CRAGGY_BEACH,																 12, 40 ; 14
 	endgroup
 
 	newgroup CRAGGY_COAST																					; 6
 	map_const CRAGGY_COAST,																 20, 16 ; 1
 	map_const SCENIC_BLUFF, 													   	 14, 26 ; 2
-	map_const MOUNTAIN_CAVE, 															 10, 14 ; 3
-	map_const CRAGGY_COAST_HOUSE1,													5,  4 ; 4
-	map_const CRAGGY_COAST_HOUSE2,													5,  4 ; 5
-	map_const CRAGGY_COAST_POKECENTER,				 							7,  4 ; 6
-	map_const CRAGGY_COAST_FISHING,												  5,  4 ; 7
-	map_const BEACH_GROTTO, 																5,  5 ; 8
-	map_const MOUNTAIN_GYM,																	5,  5 ; 9
+	map_const MT_MONEGO, 															     10, 14 ; 3
+	map_const MT_MONEGO_B1F,															 10, 14 ; 4
+	map_const CRAGGY_COAST_HOUSE1,													5,  4 ; 5
+	map_const CRAGGY_COAST_HOUSE2,													5,  4 ; 6
+	map_const CRAGGY_COAST_POKECENTER,				 							7,  4 ; 7
+	map_const CRAGGY_COAST_FISHING,												  5,  4 ; 8
+	map_const BEACH_GROTTO, 																5,  5 ; 9
+	map_const MOUNTAIN_GYM,																	5,  5 ; 10
 	endgroup
 
 	newgroup BERRY_FOREST																					; 7

data/maps/attributes.asm

@@ -101,10 +101,14 @@ ENDM
 	map_attributes HeraldCove, HERALD_COVE, $35, WEST
 	connection west, HeraldRoute, HERALD_ROUTE, 0
 
-	map_attributes HeraldRoute, HERALD_ROUTE, $35, NORTH | EAST
+	map_attributes HeraldRoute, HERALD_ROUTE, $35, NORTH | SOUTH | EAST
 	connection north, CraggyBeach, CRAGGY_BEACH, 15
+	connection south, HeraldBay, HERALD_BAY, 0
 	connection east, HeraldCove, HERALD_COVE, 0
 
+	map_attributes HeraldBay, HERALD_BAY, $35, NORTH
+	connection north, HeraldRoute, HERALD_ROUTE, 0
+
 	map_attributes CraggyBeach, CRAGGY_BEACH, $35, NORTH | SOUTH
 	connection north, CraggyCoast, CRAGGY_COAST, 0
 	connection south, HeraldRoute, HERALD_ROUTE, -15
@@ -120,10 +124,12 @@ ENDM
 	map_attributes HeraldPokecenter, HERALD_POKECENTER, $00, 0
 	map_attributes HeraldGym, HERALD_GYM, $00, 0
 	map_attributes HeraldHouse, HERALD_HOUSE, $00, 0
+	map_attributes HeraldBayHouse, HERALD_HOUSE, $00, 0
 	map_attributes HeraldPort, HERALD_PORT, $00, 0
 	map_attributes RegistrationCenter, REGISTRATION_CENTER, $00, 0
 	map_attributes HeraldGrotto, HERALD_GROTTO, $05, 0
-	map_attributes MountainCave, MOUNTAIN_CAVE, $00, 0
+	map_attributes MtMonego, MT_MONEGO, $00, 0
+	map_attributes MtMonegoB1F, MT_MONEGO_B1F, $00, 0
 	map_attributes CraggyCoastHouse1, CRAGGY_COAST_HOUSE1, $00, 0
 	map_attributes CraggyCoastHouse2, CRAGGY_COAST_HOUSE2, $00, 0
 	map_attributes CraggyCoastPokecenter, CRAGGY_COAST_POKECENTER, $00, 0

data/maps/blocks.asm

@@ -37,6 +37,12 @@ HeraldCove_Blocks:
 HeraldRoute_Blocks:
 	INCBIN "maps/HeraldRoute.blk"
 
+HeraldBay_Blocks:
+	INCBIN "maps/HeraldBay.blk"
+
+HeraldBayHouse_Blocks:
+	INCBIN "maps/House.blk"
+
 HeraldLab_Blocks:
 	INCBIN "maps/HeraldLab.blk"
 
@@ -100,8 +106,11 @@ CraggyCoast_Blocks:
 ScenicBluff_Blocks:
 	INCBIN "maps/ScenicBluff.blk"
 
-MountainCave_Blocks:
-	INCBIN "maps/MountainCave.blk"
+MtMonego_Blocks:
+	INCBIN "maps/MtMonego.blk"
+
+MtMonegoB1F_Blocks:
+	INCBIN "maps/MtMonegoB1F.blk"
 
 CraggyCoastHouse1_Blocks:
 	INCBIN "maps/House.blk"

data/maps/landmarks.asm

@@ -8,13 +8,14 @@ Landmarks:
 ; entries correspond to constants/landmark_constants.asm
 	table_width 4, Landmarks
 	landmark -8, -16, SpecialMapName
-	landmark 28, 76, HeraldCoveName
-	landmark 18, 76, HeraldRouteName
-	landmark 20, 64, CraggyBeachName
-	landmark 20, 52, CraggyCoastName
-	landmark 20, 40, ScenicBluffName
-	landmark 20, 28, MountainCaveName
-	landmark 12, 60, BerryForestName
+	landmark 20, 84, HeraldCoveName
+	landmark 8, 84, HeraldRouteName
+	landmark 0, 0, HeraldBayName
+	landmark 12, 73, CraggyBeachName
+	landmark 12, 60, CraggyCoastName
+	landmark 12, 48, ScenicBluffName
+	landmark 12, 36, MtMonegoName
+	landmark 4, 68, BerryForestName
 
 	assert_table_length KANTO_LANDMARK
 	landmark  52, 108, PalletTownName
@@ -71,10 +72,11 @@ Landmarks:
 
 HeraldCoveName:  	 	 db "HERALD¯COVE@"
 HeraldRouteName:  	 db "HERALD¯ROUTE@"
+HeraldBayName:  		 db "HERALD¯BAY@"
 CraggyBeachName:  	 db "CRAGGY¯BEACH@"
 CraggyCoastName:  	 db "CRAGGY¯COAST@"
 ScenicBluffName:     db "SCENIC¯BLUFF@"
-MountainCaveName:    db "MOUNTAIN¯CAVE@"
+MtMonegoName:        db "MT.¯MONEGO@"
 BerryForestName:     db "BERRY¯FOREST@"
 NewBarkTownName:     db "NEW BARK¯TOWN@"
 CherrygroveCityName: db "CHERRYGROVE¯CITY@"

data/maps/maps.asm

@@ -72,20 +72,23 @@ MapGroup_HeraldCove:
 	map PlayersHouse2F, TILESET_PLAYERS_ROOM, INDOOR, LANDMARK_HERALD_COVE, MUSIC_NEW_BARK_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
 	map RegistrationCenter, TILESET_POKECENTER, INDOOR, LANDMARK_HERALD_ROUTE, MUSIC_MOBILE_ADAPTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
 	map HeraldGrotto, TILESET_JOHTO, ROUTE, LANDMARK_HERALD_ROUTE, MUSIC_LIGHTHOUSE, FALSE, PALETTE_NITE, FISHGROUP_SHORE
+	map HeraldBay, TILESET_JOHTO, ROUTE, LANDMARK_HERALD_BAY, MUSIC_ROUTE_29, FALSE, PALETTE_AUTO, FISHGROUP_OCEAN
+	map HeraldBayHouse, TILESET_HOUSE, INDOOR, LANDMARK_HERALD_BAY, MUSIC_VERMILION_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
 	map CraggyBeach, TILESET_JOHTO, ROUTE, LANDMARK_CRAGGY_BEACH, MUSIC_ROUTE_30, FALSE, PALETTE_AUTO, FISHGROUP_OCEAN
 	assert_table_length NUM_HERALD_COVE_MAPS
 
 MapGroup_CraggyCoast:
 	table_width MAP_LENGTH, MapGroup_CraggyCoast
 	map CraggyCoast, TILESET_JOHTO, TOWN, LANDMARK_CRAGGY_COAST, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_AUTO, FISHGROUP_OCEAN
 	map ScenicBluff, TILESET_JOHTO, ROUTE, LANDMARK_SCENIC_BLUFF, MUSIC_ROUTE_37, FALSE, PALETTE_AUTO, FISHGROUP_OCEAN
-	map MountainCave, TILESET_CAVE, CAVE, LANDMARK_MOUNTAIN_CAVE, MUSIC_BURNED_TOWER, FALSE, PALETTE_NITE, FISHGROUP_OCEAN
+	map MtMonego, TILESET_CAVE, CAVE, LANDMARK_MT_MONEGO, MUSIC_BURNED_TOWER, FALSE, PALETTE_NITE, FISHGROUP_OCEAN
+	map MtMonegoB1F, TILESET_CAVE, CAVE, LANDMARK_MT_MONEGO, MUSIC_BURNED_TOWER, FALSE, PALETTE_NITE, FISHGROUP_OCEAN
 	map CraggyCoastHouse1, TILESET_HOUSE, INDOOR, LANDMARK_CRAGGY_COAST, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
 	map CraggyCoastHouse2, TILESET_HOUSE, INDOOR, LANDMARK_CRAGGY_COAST, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
 	map CraggyCoastPokecenter, TILESET_POKECENTER, INDOOR, LANDMARK_CRAGGY_COAST, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
 	map CraggyCoastFishing, TILESET_HOUSE, INDOOR, LANDMARK_CRAGGY_COAST, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
 	map BeachGrotto, TILESET_JOHTO, ROUTE, LANDMARK_CRAGGY_BEACH, MUSIC_ROUTE_30, FALSE, PALETTE_AUTO, FISHGROUP_OCEAN
-	map MountainGym, TILESET_TOWER, INDOOR, LANDMARK_MOUNTAIN_CAVE, MUSIC_GYM, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map MountainGym, TILESET_TOWER, INDOOR, LANDMARK_MT_MONEGO, MUSIC_GYM, FALSE, PALETTE_DAY, FISHGROUP_SHORE
 	assert_table_length NUM_CRAGGY_COAST_MAPS
 
 MapGroup_BerryForest:

data/maps/scripts.asm

@@ -31,6 +31,8 @@ SECTION "Map Scripts 4", ROMX
 INCLUDE "maps/PlayersHouse1F.asm"
 INCLUDE "maps/PlayersHouse2F.asm"
 INCLUDE "maps/HeraldRoute.asm"
+INCLUDE "maps/HeraldBay.asm"
+INCLUDE "maps/HeraldBayHouse.asm"
 INCLUDE "maps/RegistrationCenter.asm"
 INCLUDE "maps/HeraldGrotto.asm"
 INCLUDE "maps/IndigoPlateauPokecenter1F.asm"
@@ -44,7 +46,8 @@ INCLUDE "maps/HallOfFame.asm"
 SECTION "Map Scripts 5", ROMX
 INCLUDE "maps/CraggyCoast.asm"
 INCLUDE "maps/ScenicBluff.asm"
-INCLUDE "maps/MountainCave.asm"
+INCLUDE "maps/MtMonego.asm"
+INCLUDE "maps/MtMonegoB1F.asm"
 INCLUDE "maps/CraggyCoastHouse1.asm"
 INCLUDE "maps/CraggyCoastHouse2.asm"
 INCLUDE "maps/CraggyCoastPokecenter.asm"

data/pokemon/base_stats/baltoy.asm

@@ -11,7 +11,7 @@
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
 	db 5 ; unknown 2
-	INCBIN "gfx/pokemon/charmander/front.dimensions"
+	INCBIN "gfx/pokemon/baltoy/front.dimensions"
 	dw NULL, NULL ; unused (beta front/back pics)
 	db GROWTH_MEDIUM_SLOW ; growth rate
 	dn EGG_GROUND, EGG_GROUND ; egg groups

data/wild/johto_grass.asm

@@ -38,6 +38,41 @@ JohtoGrassWildMons:
 
 	end_grass_wildmons
 
+	def_grass_wildmons HERALD_BAY
+	db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
+	; morn
+	;	 %,  Species,				min, max
+	db 30,  PIDGEY,					2,  4
+	db 25,  SENTRET,				2,  4
+	db 25,  CATERPIE,				2,  5
+	db 10,  FLETCHLING,			3,  5
+	db  5,  KRABBY,					3,  4
+	db  2,  PIDGEY,					3,  5
+	db  2,  PIDGEY,					3,  5
+	db  1,  COTTONEE,				2,  6
+
+	; day
+	db 30,  PIDGEY,					2,  4
+	db 25,  SENTRET,				2,  4
+	db 25,  CATERPIE,				2,  5
+	db 10,  FLETCHLING,			3,  5
+	db  5,  KRABBY,					3,  4
+	db  2,  PIDGEY,					3,  5
+	db  2,  PIDGEY,					3,  5
+	db  1,  SHINX,			  	2,  6
+
+	; nite
+	db 30,  PIDGEY,					2,  4
+	db 25,  SENTRET,				2,  4
+	db 25,  CATERPIE,				2,  5
+	db 10,  FLETCHLING,			3,  5
+	db  5,  KRABBY,					3,  4
+	db  2,  PIDGEY,					3,  5
+	db  2,  PIDGEY,					3,  5
+	db  1,  MURKROW,				2,  6
+
+	end_grass_wildmons
+
 	def_grass_wildmons CRAGGY_BEACH
 	db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
 	; morn
@@ -108,7 +143,7 @@ JohtoGrassWildMons:
 
 	end_grass_wildmons
 
-	def_grass_wildmons MOUNTAIN_CAVE
+	def_grass_wildmons MT_MONEGO
 	db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
 	; morn
 	;	 %,  Species,				min, max

engine/battle/effect_commands.asm

@@ -3090,85 +3090,80 @@ BattleCommand_DamageCalc:
 ; Critical hits
 	call .CriticalMultiplier
 
-; Update wCurDamage. Max 999 (capped at 997, then add 2).
-DEF MAX_DAMAGE EQU 999
-DEF MIN_DAMAGE EQU 2
-DEF DAMAGE_CAP EQU MAX_DAMAGE - MIN_DAMAGE
-
+; Update wCurDamage (capped at 997).
 	ld hl, wCurDamage
 	ld b, [hl]
-	ldh a, [hQuotient + 3]
+	ldh a, [hProduct + 3]
 	add b
-	ldh [hQuotient + 3], a
+	ldh [hProduct + 3], a
 	jr nc, .dont_cap_1
 
-	ldh a, [hQuotient + 2]
+	ldh a, [hProduct + 2]
 	inc a
-	ldh [hQuotient + 2], a
+	ldh [hProduct + 2], a
 	and a
 	jr z, .Cap
 
 .dont_cap_1
-	ldh a, [hQuotient]
+	ldh a, [hProduct]
 	ld b, a
-	ldh a, [hQuotient + 1]
+	ldh a, [hProduct + 1]
 	or a
 	jr nz, .Cap
 
-	ldh a, [hQuotient + 2]
-	cp HIGH(DAMAGE_CAP + 1)
+	ldh a, [hProduct + 2]
+	cp HIGH(MAX_STAT_VALUE - MIN_NEUTRAL_DAMAGE + 1)
 	jr c, .dont_cap_2
 
-	cp HIGH(DAMAGE_CAP + 1) + 1
+	cp HIGH(MAX_STAT_VALUE - MIN_NEUTRAL_DAMAGE + 1) + 1
 	jr nc, .Cap
 
-	ldh a, [hQuotient + 3]
-	cp LOW(DAMAGE_CAP + 1)
+	ldh a, [hProduct + 3]
+	cp LOW(MAX_STAT_VALUE - MIN_NEUTRAL_DAMAGE + 1)
 	jr nc, .Cap
 
 .dont_cap_2
 	inc hl
 
-	ldh a, [hQuotient + 3]
+	ldh a, [hProduct + 3]
 	ld b, [hl]
 	add b
 	ld [hld], a
 
-	ldh a, [hQuotient + 2]
+	ldh a, [hProduct + 2]
 	ld b, [hl]
 	adc b
 	ld [hl], a
 	jr c, .Cap
 
 	ld a, [hl]
-	cp HIGH(DAMAGE_CAP + 1)
+	cp HIGH(MAX_STAT_VALUE - MIN_NEUTRAL_DAMAGE + 1)
 	jr c, .dont_cap_3
 
-	cp HIGH(DAMAGE_CAP + 1) + 1
+	cp HIGH(MAX_STAT_VALUE - MIN_NEUTRAL_DAMAGE + 1) + 1
 	jr nc, .Cap
 
 	inc hl
 	ld a, [hld]
-	cp LOW(DAMAGE_CAP + 1)
+	cp LOW(MAX_STAT_VALUE - MIN_NEUTRAL_DAMAGE + 1)
 	jr c, .dont_cap_3
 
 .Cap:
-	ld a, HIGH(DAMAGE_CAP)
+	ld a, HIGH(MAX_STAT_VALUE - MIN_NEUTRAL_DAMAGE)
 	ld [hli], a
-	ld a, LOW(DAMAGE_CAP)
+	ld a, LOW(MAX_STAT_VALUE - MIN_NEUTRAL_DAMAGE)
 	ld [hld], a
 
 .dont_cap_3
-; Add back MIN_DAMAGE (capping at 999).
+; Minimum neutral damage is 2 (bringing the cap to 999).
 	inc hl
 	ld a, [hl]
-	add MIN_DAMAGE
+	add MIN_NEUTRAL_DAMAGE
 	ld [hld], a
 	jr nc, .dont_floor
 	inc [hl]
 .dont_floor
 
-; Returns nz and nc.
 	ld a, 1
 	and a
 	ret
@@ -3181,18 +3176,18 @@ DEF DAMAGE_CAP EQU MAX_DAMAGE - MIN_DAMAGE
 ; x2
 	ldh a, [hQuotient + 3]
 	add a
-	ldh [hQuotient + 3], a
+	ldh [hProduct + 3], a
 
 	ldh a, [hQuotient + 2]
 	rl a
-	ldh [hQuotient + 2], a
+	ldh [hProduct + 2], a
 
 ; Cap at $ffff.
 	ret nc
 
 	ld a, $ff
-	ldh [hQuotient + 2], a
-	ldh [hQuotient + 3], a
+	ldh [hProduct + 2], a
+	ldh [hProduct + 3], a
 
 	ret