hopefully last hud update, and some map fixes

Dakorias · Dakorias · commit 75f7a7d342d4 · 2024-06-14T14:00:53.000-04:00
diff --git a/constants/map_constants.asm b/constants/map_constants.asm
@@ -93,6 +93,8 @@ ENDM
 	map_const BEACH_GROTTO, 																5,  5 ; 9
 	map_const MOUNTAIN_GYM,																	5,  5 ; 10
 	map_const RUGGED_CLIFF,																 18, 22 ; 11
+	map_const RUGGED_CLIFF_HOUSE,														5,  4 ; 12
+	map_const RUGGED_CLIFF_POKECENTER,				 							7,  4 ; 13
 	endgroup
 
 	newgroup BERRY_FOREST																					; 7
diff --git a/data/maps/attributes.asm b/data/maps/attributes.asm
@@ -128,8 +128,8 @@ ENDM
 	map_attributes HeraldPort, HERALD_PORT, $00, 0
 	map_attributes RegistrationCenter, REGISTRATION_CENTER, $00, 0
 	map_attributes HeraldGrotto, HERALD_GROTTO, $05, 0
-	map_attributes MtMonego, MT_MONEGO, $00, 0
-	map_attributes MtMonegoB1F, MT_MONEGO_B1F, $00, 0
+	map_attributes MtMonego, MT_MONEGO, $09, 0
+	map_attributes MtMonegoB1F, MT_MONEGO_B1F, $09, 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
@@ -139,6 +139,8 @@ ENDM
 	map_attributes BerryForest, BERRY_FOREST, $05, 0
 	map_attributes BerryForestHouse, BERRY_FOREST_HOUSE, $00, 0
 	map_attributes RuggedCliff, RUGGED_CLIFF, $05, 0
+	map_attributes RuggedCliffHouse, RUGGED_CLIFF_HOUSE, $00, 0
+	map_attributes RuggedCliffPokecenter, RUGGED_CLIFF_POKECENTER, $00, 0
 
 
 	map_attributes BattleTowerOutside, BATTLE_TOWER_OUTSIDE, $05, 0
diff --git a/data/maps/blocks.asm b/data/maps/blocks.asm
@@ -98,14 +98,14 @@ HeraldGrotto_Blocks:
 CraggyBeach_Blocks:
 	INCBIN "maps/CraggyBeach.blk"
 
-SECTION "Map Blocks 5", ROMX
-
 CraggyCoast_Blocks:
 	INCBIN "maps/CraggyCoast.blk"
 
 ScenicBluff_Blocks:
 	INCBIN "maps/ScenicBluff.blk"
 
+SECTION "Map Blocks 5", ROMX
+
 MtMonego_Blocks:
 	INCBIN "maps/MtMonego.blk"
 
@@ -138,3 +138,9 @@ BerryForestHouse_Blocks:
 
 RuggedCliff_Blocks:
 	INCBIN "maps/RuggedCliff.blk"
+
+RuggedCliffHouse_Blocks:
+	INCBIN "maps/House.blk"
+
+RuggedCliffPokecenter_Blocks:
+	INCBIN "maps/Pokecenter1F.blk"
diff --git a/data/maps/maps.asm b/data/maps/maps.asm
@@ -90,6 +90,8 @@ MapGroup_CraggyCoast:
 	map BeachGrotto, TILESET_JOHTO, ROUTE, LANDMARK_CRAGGY_BEACH, MUSIC_ROUTE_30, FALSE, PALETTE_AUTO, FISHGROUP_OCEAN
 	map MountainGym, TILESET_TOWER, INDOOR, LANDMARK_MT_MONEGO, MUSIC_GYM, FALSE, PALETTE_DAY, FISHGROUP_SHORE
 	map RuggedCliff, TILESET_JOHTO, ROUTE, LANDMARK_RUGGED_CLIFF, MUSIC_ROUTE_30, FALSE, PALETTE_AUTO, FISHGROUP_OCEAN
+	map RuggedCliffHouse, TILESET_HOUSE, INDOOR, LANDMARK_RUGGED_CLIFF, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map RuggedCliffPokecenter, TILESET_POKECENTER, INDOOR, LANDMARK_RUGGED_CLIFF, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
 	assert_table_length NUM_CRAGGY_COAST_MAPS
 
 MapGroup_BerryForest:
diff --git a/data/maps/scripts.asm b/data/maps/scripts.asm
@@ -59,7 +59,8 @@ SECTION "Map Scripts 6", ROMX
 INCLUDE "maps/BerryForest.asm"
 INCLUDE "maps/BerryForestHouse.asm"
 INCLUDE "maps/RuggedCliff.asm"
-
+INCLUDE "maps/RuggedCliffHouse.asm"
+INCLUDE "maps/RuggedCliffPokecenter.asm"
 
 SECTION "Map Scripts 7", ROMX
 
diff --git a/engine/battle/core.asm b/engine/battle/core.asm
@@ -8086,7 +8086,7 @@ PlaceExpBar:
 	sub $8
 	jr c, .next
 	ld b, a
-	ld a, $5d ; full bar
+	ld a, $5c ; full bar
 	ld [hld], a
 	dec c
 	jr z, .finish
diff --git a/engine/pokemon/mon_stats.asm b/engine/pokemon/mon_stats.asm
@@ -177,17 +177,28 @@ GetGender:
 	call z, OpenSRAM
 
 ; Attack DV
-	ld a, [hli]
-	and $f0
-	ld b, a
-; Speed DV
 	ld a, [hl]
-	and $f0
+	cpl
+	and $10
 	swap a
-
-; Put our DVs together.
+	ld b, a  ; ~(Atk DV & 1) << 1
+; Defense DV
+	ld a, [hli]
+	and $1
+	add a
+	add a
 	or b
-	ld b, a
+	ld b, a  ; ~(Atk DV & 1) << 1 | (Def DV & 1) << 2
+; Special DV
+	ld a, [hl]
+	cpl
+	and $1
+	add a
+	add a
+	add a
+	or b
+	swap a
+	ld b, a  ; ~(Atk DV & 1) << 1 | (Def DV & 1) << 2 | ~(Spc DV & 1) << 3
 
 ; Close SRAM if we were dealing with a sBoxMon.
 	ld a, [wMonType]
diff --git a/gfx/battle/expbar.png b/gfx/battle/expbar.png
diff --git a/maps/HeraldRoute.asm b/maps/HeraldRoute.asm
@@ -448,7 +448,7 @@ HeraldRoute_MapEvents:
 	bg_event 22,  6, BGEVENT_READ, RegistrationCenterSignScript
 
 	def_object_events
-	object_event 31,  12, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerYoungsterKevin, -1
+	object_event 31,  12, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerYoungsterKevin, -1
 	object_event 17, 14, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerYoungsterJames, -1
 	object_event  8, 11, SPRITE_LASS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerLassAlexis, -1
 	object_event 19,  5, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCoolTrainerFStacy, -1
diff --git a/maps/MtMonego.asm b/maps/MtMonego.asm
@@ -116,13 +116,16 @@ MtMonego_MapEvents:
 	db 0, 0 ; filler
 
 	def_warp_events
-	warp_event 5,  25, SCENIC_BLUFF, 1
-	warp_event 14,  5, MOUNTAIN_GYM, 1
+	warp_event 13, 29, SCENIC_BLUFF, 1
+	warp_event 22,  5, MOUNTAIN_GYM, 1
+	warp_event 3,  11, RUGGED_CLIFF, 1
+	warp_event 15,  1, RUGGED_CLIFF, 2
+	warp_event 19, 11, MT_MONEGO_B1F, 1
 	def_coord_events
 
 	def_bg_events
 
 	def_object_events
-	object_event  11, 23, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 2, TrainerHikerDonny, -1
-	object_event  3,  14, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 1, TrainerYoungsterDavid, -1
-	object_event  6,   6, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 1, TrainerHikerConnor, -1
+	object_event  9,  18, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 2, TrainerHikerDonny, -1
+	object_event  12, 12, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 1, TrainerYoungsterDavid, -1
+	object_event  18,  6, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 1, TrainerHikerConnor, -1
diff --git a/maps/MtMonegoB1F.asm b/maps/MtMonegoB1F.asm
@@ -9,7 +9,7 @@ MtMonegoB1F_MapEvents:
 	db 0, 0 ; filler
 
 	def_warp_events
-	warp_event 5,  25, SCENIC_BLUFF, 1
+	warp_event 17,  7, MT_MONEGO, 5
 	def_coord_events
 
 	def_bg_events
diff --git a/maps/RuggedCliff.asm b/maps/RuggedCliff.asm
@@ -10,6 +10,10 @@ RuggedCliff_MapEvents:
 	db 0, 0 ; filler
 
 	def_warp_events
+	warp_event 24,  29, MT_MONEGO, 3
+	warp_event 30,   5, MT_MONEGO, 4
+	warp_event  5,  35, RUGGED_CLIFF_HOUSE, 1
+	warp_event 11,   3, RUGGED_CLIFF_POKECENTER, 1
 
 	def_coord_events
 
diff --git a/maps/RuggedCliff.blk b/maps/RuggedCliff.blk
@@ -1 +1 @@
-��?�{hqlrrn��f�\lrrsnh����]G=hh����hh�����f`facjqh�����<bfhqh���\jppqqh��?�aahqqqjq���<NbZVjqjppqq����RWShqhqqq���bhjqqqqq���dfhhornqq����ahlmqhqq���]<^hqqqlrr�����lsrnqqq��=��]Eahqqq��d�blrnq��=��������ln��d>^�������h��jk>=\bh�jpqi>jkh�hqqidflmal
+��?�{hqlrrn��f�\lrnqnh����]G=lshh����hh�����f`facqh�����<bfjqh���\jppqqh��?�aahqqqjq���<NbZVjqjppqq����RWShqhqqq���bhjqqqqq���dfhhornqq����ahlmqhqq���]<^hqqqlrr�����lsrnqqq��=��]Eahqqq��d�blrnq��=��������ln��d>^�������h��jk>=\bh�jpqi>jkh�hqqidflmal
diff --git a/maps/RuggedCliffHouse.asm b/maps/RuggedCliffHouse.asm
@@ -0,0 +1,20 @@
+	object_const_def
+
+RuggedCliffHouse_MapScripts:
+	def_scene_scripts
+
+	def_callbacks
+
+
+RuggedCliffHouse_MapEvents:
+	db 0, 0 ; filler
+
+	def_warp_events
+	warp_event 2,  7, RUGGED_CLIFF, 3
+	warp_event 3,  7, RUGGED_CLIFF, 3
+
+	def_coord_events
+
+	def_bg_events
+
+	def_object_events
diff --git a/maps/RuggedCliffPokecenter.asm b/maps/RuggedCliffPokecenter.asm
@@ -0,0 +1,25 @@
+	object_const_def
+	const RUGGED_CLIFF_PC_NURSE
+
+RuggedCliffPokecenter_MapScripts:
+	def_scene_scripts
+
+	def_callbacks
+
+RuggedCliffPCNurseScript:
+		jumpstd PokecenterNurseScript
+
+
+RuggedCliffPokecenter_MapEvents:
+	db 0, 0 ; filler
+
+	def_warp_events
+	warp_event 2,  7, RUGGED_CLIFF, 4
+	warp_event 3,  7, RUGGED_CLIFF, 4
+
+	def_coord_events
+
+	def_bg_events
+
+	def_object_events
+	object_event  6,  1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RuggedCliffPCNurseScript, -1
diff --git a/pokecrystal.cheats b/pokecrystal.cheats
@@ -1,4 +1,3 @@
-!disabled
 # 
 0100FAC2
 0100FBC2

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		-��?�{hqlrrn��f�\lrrsnh��]G=hh��hh��f`facjqh��<bfhqh��\jppqqh��?�aahqqqjq��<NbZVjqjppqq��RWShqhqqq��bhjqqqqq��dfhhornqq��ahlmqhqq��]<^hqqqlrr��lsrnqqq��=��]Eahqqq��d�blrnq��=��ln��d>^��h��jk>=\bh�jpqi>jkh�hqqidflmal
	`1`	+��?�{hqlrrn��f�\lrnqnh��]G=lshh��hh��f`facqh��<bfjqh��\jppqqh��?�aahqqqjq��<NbZVjqjppqq��RWShqhqqq��bhjqqqqq��dfhhornqq��ahlmqhqq��]<^hqqqlrr��lsrnqqq��=��]Eahqqq��d�blrnq��=��ln��d>^��h��jk>=\bh�jpqi>jkh�hqqidflmal
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-!disabled`
`2`	`1`	`#`
`3`	`2`	`0100FAC2`
`4`	`3`	`0100FBC2`