Merge branch 'master' of https://github.com/SBird1337/source_of_the_sovereign

g3headers

@@ -1 +1 @@
-Subproject commit ee7c8b28b58f61df864f7716c7ee9bbae82f5411
+Subproject commit e0402c99b51968537abb0f09ed017558e2055385

src/pokedex/pokedex.c

@@ -77,7 +77,7 @@ void pdex_main_box_species_fill(s8 n, u16 species, bool seen, bool caught) {
 
 void pdex_update_balls(void) {
     for (u8 i = 0; i < 8; ++i) {
-        if (pokedex_context->lookup[i + pokedex_context->cursor_position_top].caught)
+        if (pdex_lazy_lookup_entry(i + pokedex_context->cursor_position_top)->caught)
             OBJID_SHOW(pokedex_context->ball_oams[i]);
         else
             OBJID_HIDE(pokedex_context->ball_oams[i]);
@@ -87,8 +87,8 @@ void pdex_update_balls(void) {
 void pdex_update_page_full() {
     rboxid_clear_pixels(TB_MAIN, 0);
     for (u16 i = pokedex_context->cursor_position_top; i < pokedex_context->cursor_position_top + 8; ++i) {
-        pdex_main_box_species_fill(i - pokedex_context->cursor_position_top, pokedex_context->lookup[i].species,
-                                   pokedex_context->lookup[i].seen, pokedex_context->lookup[i].caught);
+        pdex_main_box_species_fill(i - pokedex_context->cursor_position_top, pdex_lazy_lookup_entry(i)->species,
+                                   pdex_lazy_lookup_entry(i)->seen, pdex_lazy_lookup_entry(i)->caught);
     }
     pdex_update_balls();
     rboxid_update_tilemap_and_tileset(TB_MAIN);
@@ -309,23 +309,7 @@ void pdex_load_scroll_ui(void) {
 }
 
 void pdex_data_setup(void) {
-    /* fill the LUT */
-    /* TODO: get data from various pokedex lists */
-    pokedex_context->lookup = malloc_and_clear((PDEX_LAST_SHOWN + 1) * sizeof(struct PdexLookup));
-    bool first = false;
-    for (u32 i = 0; i <= PDEX_LAST_SHOWN; ++i) {
-        u16 species = pokedex_index_to_species(i);
-        if (species > 0) {
-            pokedex_context->lookup[i].species = species;
-            pokedex_context->lookup[i].seen = dex_flag_pokedex_index(i, DEX_FLAG_CHECK_SEEN);
-            pokedex_context->lookup[i].caught = dex_flag_pokedex_index(i, DEX_FLAG_CHECK_CAUGHT);
-            if (!first && (pokedex_context->lookup[i].seen)) {
-                pokedex_context->first_seen = 1; //i
-                //pokedex_context->cursor_position_top = 1; //i is set in region dex
-                first = true;
-            }
-        }
-    }
+    pokedex_context->first_seen = 1;
 }
 
 void pdex_hardware_scroll(bool up) {
@@ -351,14 +335,14 @@ void pdex_hardware_scroll(bool up) {
 
 void pdex_fill_previous_slot(void) {
     u16 pIndex = pokedex_context->cursor_position_top - 1;
-    pdex_main_box_species_fill(-1, pokedex_context->lookup[pIndex].species, pokedex_context->lookup[pIndex].seen,
-                               pokedex_context->lookup[pIndex].caught);
+    pdex_main_box_species_fill(-1, pdex_lazy_lookup_entry(pIndex)->species, pdex_lazy_lookup_entry(pIndex)->seen,
+                               pdex_lazy_lookup_entry(pIndex)->caught);
 }
 
 void pdex_fill_next_slot(void) {
     u16 pIndex = pokedex_context->cursor_position_top + 8;
-    pdex_main_box_species_fill(8, pokedex_context->lookup[pIndex].species, pokedex_context->lookup[pIndex].seen,
-                               pokedex_context->lookup[pIndex].caught);
+    pdex_main_box_species_fill(8, pdex_lazy_lookup_entry(pIndex)->species, pdex_lazy_lookup_entry(pIndex)->seen,
+                               pdex_lazy_lookup_entry(pIndex)->caught);
 }
 
 void pdex_try_advance(u8 reverse) {
@@ -385,10 +369,10 @@ void pdex_try_advance(u8 reverse) {
     }
 
     u16 pkIndexToLoad = pokedex_context->cursor_position_internal + pokedex_context->cursor_position_top;
-    if (pokedex_context->lookup[pkIndexToLoad].seen || pokedex_context->lookup[pkIndexToLoad].caught)
-        pdex_pokemon_load(pokedex_context->lookup[pkIndexToLoad].species);
+    if (pdex_lazy_lookup_entry(pkIndexToLoad)->seen || pdex_lazy_lookup_entry(pkIndexToLoad)->caught)
+        pdex_pokemon_load(pdex_lazy_lookup_entry(pkIndexToLoad)->species);
     else
-        pdex_pokemon_load(pokedex_context->lookup[pkIndexToLoad].species); /* debug, just display the mofo */
+        pdex_pokemon_load(pdex_lazy_lookup_entry(pkIndexToLoad)->species); /* debug, just display the mofo */
     pdex_update_balls();
 }
 
@@ -409,7 +393,7 @@ void pdex_loop(u8 tid) {
 
         pdex_pokeballs_init();
         pdex_load_scroll_ui();
-        pdex_pokemon_load(pokedex_context->lookup[pokedex_context->cursor_position_top + pokedex_context->cursor_position_internal].species);
+        pdex_pokemon_load(pdex_lazy_lookup_entry(pokedex_context->cursor_position_top + pokedex_context->cursor_position_internal)->species);
         pdex_load_sc();
         pdex_update_page_full();
 

src/pokedex/pokedex_common.c

@@ -97,13 +97,34 @@ void pdex_vram_free_bgmaps(void) {
     }
 }
 
-void pdex_free_memory(void)
-{
-    if(pokedex_context->lookup != NULL)
+struct PdexLookup *pdex_fill_lookup(u16 dexIndex) {
+    u16 species = pokedex_index_to_species(dexIndex);
+    pokedex_context->lookup[dexIndex].species = species;
+    pokedex_context->lookup[dexIndex].seen = dex_flag_pokedex_index(dexIndex, DEX_FLAG_CHECK_SEEN);
+    pokedex_context->lookup[dexIndex].caught = dex_flag_pokedex_index(dexIndex, DEX_FLAG_CHECK_CAUGHT);
+    return &pokedex_context->lookup[dexIndex];
+}
+
+struct PdexLookup *pdex_lazy_lookup_entry(u16 dexIndex) {
+    if (pokedex_context->lookup[dexIndex].species != -1) {
+        return &pokedex_context->lookup[dexIndex];
+    } else {
+        return pdex_fill_lookup(dexIndex);
+    }
+}
+
+void pdex_free_memory(void) {
+    if (pokedex_context->lookup != NULL)
         free(pokedex_context->lookup);
     free(pokedex_context);
 }
 
+void pdex_alloc_memory(void) {
+    pokedex_context = malloc_and_clear(sizeof(struct PdexCtx));
+    pokedex_context->lookup = malloc_and_clear((PDEX_LAST_SHOWN + 1) * sizeof(struct PdexLookup));
+    memset(pokedex_context->lookup, 0xFF, (PDEX_LAST_SHOWN + 1) * sizeof(struct PdexLookup));
+}
+
 void pdex_vram_allocate_bgmaps(void) {
     bgid_set_tilemap(0, malloc(0x800));
     bgid_set_tilemap(1, malloc(0x800));

src/pokedex/pokedex_common.h

@@ -44,6 +44,8 @@ void pdex_vblank_handler(void);
 void pdex_vram_setup(void);
 void pdex_vram_free_bgmaps(void);
 void pdex_free_memory(void);
+void pdex_alloc_memory(void);
+struct PdexLookup *pdex_lazy_lookup_entry(u16 dexIndex);
 
 void pdex_load(void);
 

src/pokedex/pokedex_detail.c

@@ -63,7 +63,7 @@ s8 dexdetail_load_type_oam(u8 type, u16 tag) {
 }
 
 void dexdetail_load_pokemon(u16 dexindex) {
-    u16 species = pokedex_context->lookup[dexindex].species;
+    u16 species = pdex_lazy_lookup_entry(dexindex)->species;
     rboxid_clear_pixels(TB_PKNAME, 0);
     rboxid_clear_pixels(TB_PKSIZE, 0);
     rboxid_clear_pixels(TB_DESC, 0);
@@ -180,17 +180,14 @@ void dexdetail_loop(u8 tid) {
         case KEY_B:
             pokedex_context->state = 12;
             u16 dexindex = pokedex_context->cursor_position_top + pokedex_context->cursor_position_internal;
-            if(dexindex <= PDEX_LAST_SHOWN - 7)
-            {
+            if (dexindex <= PDEX_LAST_SHOWN - 7) {
                 pokedex_context->cursor_position_top = dexindex;
                 pokedex_context->cursor_position_internal = 0;
-            }
-            else
-            {
+            } else {
                 pokedex_context->cursor_position_top = PDEX_LAST_SHOWN - 7;
                 pokedex_context->cursor_position_internal = (dexindex - pokedex_context->cursor_position_top);
             }
-            
+
             fade_screen(0xFFFFFFFF, PDEX_FADEIN_SPD, 0, 16, 0x0000);
             break;
         }

src/pokedex/pokedex_region.c

@@ -223,7 +223,7 @@ void region_loop(u8 tid) {
 
 void region_select_load(void) {
     pdex_vram_setup();
-    pokedex_context = malloc_and_clear(sizeof(struct PdexCtx));
+    pdex_alloc_memory();
 
     region_select_load_gfx();
     task_add(region_loop, 0);