Merge pull request #1586 from GriffinRichards/clean-areascreen

Clean up pokedex_area_screen
pret · Jan 7, 2022 · 577e6cc · 577e6cc
2 parents 71e0b48 + 713cd66
commit 577e6cc
Show file tree

Hide file tree

Showing 15 changed files with 612 additions and 337 deletions.
diff --git a/data/mystery_gift.s b/data/mystery_gift.s
@@ -8,6 +8,7 @@
 #include "constants/songs.h"
 #include "constants/species.h"
 #include "constants/vars.h"
+#include "constants/wild_encounter.h"
 	.include "asm/macros.inc"
 	.include "asm/macros/event.inc"
 	.include "constants/constants.inc"

diff --git a/data/scripts/gift_altering_cave.inc b/data/scripts/gift_altering_cave.inc
@@ -1,7 +1,7 @@
 MysteryGiftScript_AlteringCave::
 	setvaddress MysteryGiftScript_AlteringCave
 	addvar VAR_ALTERING_CAVE_WILD_SET, 1
-	vgoto_if_ne VAR_ALTERING_CAVE_WILD_SET, 10, MysteryGiftScript_AlteringCave_
+	vgoto_if_ne VAR_ALTERING_CAVE_WILD_SET, (NUM_ALTERING_CAVE_TABLES + 1), MysteryGiftScript_AlteringCave_
 	setvar VAR_ALTERING_CAVE_WILD_SET, 0
 MysteryGiftScript_AlteringCave_:
 	lock

diff --git a/graphics/interface/region_map.bin → graphics/pokedex/region_map.bin b/graphics/interface/region_map.bin → graphics/pokedex/region_map.bin
diff --git a/graphics/interface/region_map.pal → graphics/pokedex/region_map.pal b/graphics/interface/region_map.pal → graphics/pokedex/region_map.pal
diff --git a/graphics/interface/region_map.png → graphics/pokedex/region_map.png b/graphics/interface/region_map.png → graphics/pokedex/region_map.png
diff --git a/graphics/interface/region_map_affine.bin → graphics/pokedex/region_map_affine.bin b/graphics/interface/region_map_affine.bin → graphics/pokedex/region_map_affine.bin
diff --git a/graphics/interface/region_map_affine.png → graphics/pokedex/region_map_affine.png b/graphics/interface/region_map_affine.png → graphics/pokedex/region_map_affine.png
diff --git a/graphics_file_rules.mk b/graphics_file_rules.mk
@@ -18,6 +18,7 @@ WALLPAPERGFXDIR := graphics/pokemon_storage/wallpapers
 OBJEVENTGFXDIR := graphics/object_events
 MISCGFXDIR := graphics/misc
 JPCONTESTGFXDIR := graphics/contest/japanese
+POKEDEXGFXDIR := graphics/pokedex
 
 types := normal fight flying poison ground rock bug ghost steel mystery fire water grass electric psychic ice dragon dark
 contest_types := cool beauty cute smart tough
@@ -700,10 +701,10 @@ $(PKNAVGFXDIR)/device_outline.4bpp: %.4bpp: %.png
 $(PKNAVGFXDIR)/match_call/ui.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 13
 
-$(INTERFACEGFXDIR)/region_map.8bpp: %.8bpp: %.png
+$(POKEDEXGFXDIR)/region_map.8bpp: %.8bpp: %.png
 	$(GFX) $< $@ -num_tiles 232
 
-$(INTERFACEGFXDIR)/region_map_affine.8bpp: %.8bpp: %.png
+$(POKEDEXGFXDIR)/region_map_affine.8bpp: %.8bpp: %.png
 	$(GFX) $< $@ -num_tiles 233
 
 $(MISCGFXDIR)/birch_help.4bpp: $(MISCGFXDIR)/birch_bag.4bpp $(MISCGFXDIR)/birch_grass.4bpp

diff --git a/include/constants/maps.h b/include/constants/maps.h
@@ -9,12 +9,6 @@
 #define MAP_GROUP(map) (MAP_##map >> 8)
 #define MAP_NUM(map) (MAP_##map & 0xFF)
 
-// These groups are used by pokedex_area_screen.c to find wild
-// pokemon locations.
-#define MAP_GROUP_OVERWORLD_MONS MAP_GROUP(PETALBURG_CITY)
-#define MAP_GROUP_SPECIAL_MONS_1 MAP_GROUP(METEOR_FALLS_1F_1R)
-#define MAP_GROUP_SPECIAL_MONS_2 MAP_GROUP(SAFARI_ZONE_NORTHWEST)
-
 // IDs for dynamic warps. Both are used in the dest_warp_id field for warp events, but they
 // are never read in practice. A dest_map of MAP_NONE is used to indicate that a
 // dynamic warp should be used, at which point the warp id is ignored. It can be passed to

diff --git a/include/constants/wild_encounter.h b/include/constants/wild_encounter.h
@@ -0,0 +1,11 @@
+#ifndef GUARD_CONSTANTS_WILD_ENCOUNTER_H
+#define GUARD_CONSTANTS_WILD_ENCOUNTER_H
+
+#define LAND_WILD_COUNT     12
+#define WATER_WILD_COUNT    5
+#define ROCK_WILD_COUNT     5
+#define FISH_WILD_COUNT     10
+
+#define NUM_ALTERING_CAVE_TABLES 9
+
+#endif // GUARD_CONSTANTS_WILD_ENCOUNTER_H
diff --git a/include/wild_encounter.h b/include/wild_encounter.h
@@ -1,10 +1,7 @@
 #ifndef GUARD_WILD_ENCOUNTER_H
 #define GUARD_WILD_ENCOUNTER_H
 
-#define LAND_WILD_COUNT     12
-#define WATER_WILD_COUNT    5
-#define ROCK_WILD_COUNT     5
-#define FISH_WILD_COUNT     10
+#include "constants/wild_encounter.h"
 
 struct WildPokemon
 {

diff --git a/src/data/pokedex_area_glow.h b/src/data/pokedex_area_glow.h
diff --git a/src/pokedex_area_region_map.c b/src/pokedex_area_region_map.c
@@ -8,11 +8,11 @@
 
 static EWRAM_DATA u8 *sPokedexAreaMapBgNum = NULL;
 
-static const u16 sPokedexAreaMap_Pal[] = INCBIN_U16("graphics/interface/region_map.gbapal");
-static const u32 sPokedexAreaMap_Gfx[] = INCBIN_U32("graphics/interface/region_map.8bpp.lz");
-static const u32 sPokedexAreaMap_Tilemap[] = INCBIN_U32("graphics/interface/region_map.bin.lz");
-static const u32 sPokedexAreaMapAffine_Gfx[] = INCBIN_U32("graphics/interface/region_map_affine.8bpp.lz");
-static const u32 sPokedexAreaMapAffine_Tilemap[] = INCBIN_U32("graphics/interface/region_map_affine.bin.lz");
+static const u16 sPokedexAreaMap_Pal[] = INCBIN_U16("graphics/pokedex/region_map.gbapal");
+static const u32 sPokedexAreaMap_Gfx[] = INCBIN_U32("graphics/pokedex/region_map.8bpp.lz");
+static const u32 sPokedexAreaMap_Tilemap[] = INCBIN_U32("graphics/pokedex/region_map.bin.lz");
+static const u32 sPokedexAreaMapAffine_Gfx[] = INCBIN_U32("graphics/pokedex/region_map_affine.8bpp.lz");
+static const u32 sPokedexAreaMapAffine_Tilemap[] = INCBIN_U32("graphics/pokedex/region_map_affine.bin.lz");
 
 void LoadPokedexAreaMapGfx(const struct PokedexAreaMapTemplate *template)
 {
@@ -41,7 +41,7 @@ void LoadPokedexAreaMapGfx(const struct PokedexAreaMapTemplate *template)
     ChangeBgX(template->bg, 0, BG_COORD_SET);
     ChangeBgY(template->bg, 0, BG_COORD_SET);
     SetBgAttribute(template->bg, BG_ATTR_PALETTEMODE, 1);
-    CpuCopy32(sPokedexAreaMap_Pal, &gPlttBufferUnfaded[0x70], 0x60);
+    CpuCopy32(sPokedexAreaMap_Pal, &gPlttBufferUnfaded[0x70], sizeof(sPokedexAreaMap_Pal));
     *sPokedexAreaMapBgNum = template->bg;
 }