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

g3headers

@@ -1 +1 @@
-Subproject commit ef2af052b8e5436da9efb035e06ee091b8d53e69
+Subproject commit ea54ef42e9c16dfa5ec7fca2fcdade01c8ebe47c

src/pokedex/pokedex.c

@@ -9,7 +9,8 @@
 
 #include "pokedex_common.h"
 
-#define PDEX_LAST_SHOWN PKMN_AMIGENTO
+
+#define PDEX_LAST_SHOWN 813
 
 #define TB_TITLE 0
 #define TB_PKMN 1
@@ -85,7 +86,7 @@ void pdex_update_balls(void) {
 
 void pdex_update_page_full() {
     rboxid_clear_pixels(TB_MAIN, 0);
-    for (s8 i = pokedex_context->cursor_position_top; i < pokedex_context->cursor_position_top + 8; ++i) {
+    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);
     }
@@ -117,14 +118,6 @@ void pdex_load_sc(void) {
     rboxid_update_tilemap_and_tileset(TB_CAUGHT);
 }
 
-const struct OamData pdex_oam_pkmn = {
-    .affine_mode = 0,
-    .obj_mode = 0,
-    .mosaic = false,
-    .shape = 0,
-    .size = 3,
-};
-
 void pdex_pokemon_load(u16 species) {
     /* this is very temporary */
     rboxid_clear_pixels(TB_PKMN, 0);
@@ -328,7 +321,7 @@ void pdex_data_setup(void) {
             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
+                //pokedex_context->cursor_position_top = 1; //i is set in region dex
                 first = true;
             }
         }
@@ -413,7 +406,7 @@ void pdex_loop(u8 tid) {
 
         pdex_pokeballs_init();
         pdex_load_scroll_ui();
-        pdex_pokemon_load(pokedex_context->lookup[pokedex_context->first_seen].species);
+        pdex_pokemon_load(pokedex_context->lookup[pokedex_context->cursor_position_top].species);
         pdex_load_sc();
         pdex_update_page_full();
 

src/pokedex/pokedex_common.c

@@ -49,6 +49,14 @@ const struct BgConfig pdex_bg_config[4] = {
     },
 };
 
+const struct OamData pdex_oam_pkmn = {
+    .affine_mode = 0,
+    .obj_mode = 0,
+    .mosaic = false,
+    .shape = 0,
+    .size = 3,
+};
+
 struct TextColor pdex_text_color = {0, 1, 2};
 
 void pdex_vblank_handler(void) {

src/pokedex/pokedex_common.h

@@ -44,6 +44,8 @@ void pdex_load(void);
 const u16 pdex_text_pal[16];
 const struct BgConfig pdex_bg_config[4];
 struct TextColor pdex_text_color;
+const struct OamData pdex_oam_pkmn;
+
 u8 pstr_lines(pchar* str);
 
 #endif

src/pokedex/pokedex_detail.c

@@ -5,23 +5,23 @@
 #include "pokedex_common.h"
 
 #define TB_PKNAME 0
-#define TB_PKSIZE 2
-#define TB_PKWEIGHT 3
+#define TB_PKSIZE 1
 #define TB_DESC 2
 
 #define TB_PKNAME_W 30
-#define TB_SW_W 20
+#define TB_SW_W 12
 
 extern pchar pdex_entry_debug[];
 extern pchar pdex_str_size[];
 extern pchar pdex_str_weight[];
 extern pchar pdex_str_size_unit[];
 extern pchar pdex_str_weight_unit[];
+extern pchar pdex_str_comma[];
 
 struct TextboxTemplate dexdetail_boxes[] = {
     {.bg_id = 0, .x = 0, .y = 0, .width = TB_PKNAME_W, .height = 4, .pal_id = 15, .charbase = 1},
-
-    {.bg_id = 1, .x = 1, .y = 0, .width = 28, .height = 20, .pal_id = 15, .charbase = 121},
+    {.bg_id = 0, .x = 17, .y = 5, .width = TB_SW_W, .height = 4, .pal_id = 15, .charbase = 121},
+    {.bg_id = 1, .x = 1, .y = 0, .width = 28, .height = 20, .pal_id = 15, .charbase = 161},
 
     {.bg_id = 0xFF},
 };
@@ -29,14 +29,71 @@ struct TextboxTemplate dexdetail_boxes[] = {
 void dexdetail_load_pokemon(u16 dexindex) {
     u16 species = pokedex_context->lookup[dexindex].species;
     rboxid_clear_pixels(TB_PKNAME, 0);
+    rboxid_clear_pixels(TB_PKSIZE, 0);
+    rboxid_clear_pixels(TB_DESC, 0);
     u16 twidth = font_get_width_of_string(FONT_DEX_STD, &pokemon_names[species][0], 0x0000);
-    //rboxid_print(TB_PKNAME, FONT_DEX_STD, TB_STD_CENTER(twidth,8*TB_PKNAME_W), 0, &pdex_text_color, 0, &pokemon_names[species][0]);
-    rboxid_print(TB_PKNAME, FONT_DEX_STD, 0, 0, &pdex_text_color, 0, pdex_entry_debug);
+    rboxid_print(TB_PKNAME, FONT_DEX_STD, TB_STD_CENTER(twidth, 8 * TB_PKNAME_W), 0, &pdex_text_color, 0,
+                 &pokemon_names[species][0]);
+
     pchar *strType = &pokedex_data[dexindex].category_name[0];
     u16 typeTwidth = font_get_width_of_string(FONT_DEX_STD, strType, 0x0000);
-    rboxid_print(TB_PKNAME, FONT_DEX_STD, 50, 16, &pdex_text_color, 0, strType);
-    rboxid_update_tilemap_and_tileset(TB_PKNAME);
+    rboxid_print(TB_PKNAME, FONT_DEX_STD, TB_STD_CENTER(typeTwidth, 88) + 110, 14, &pdex_text_color, 0, strType);
+    rboxid_print(TB_PKSIZE, FONT_DEX_STD, 4, 1, &pdex_text_color, 0, pdex_str_size);
+    rboxid_print(TB_PKSIZE, FONT_DEX_STD, 4, 14, &pdex_text_color, 0, pdex_str_weight);
+
+    u16 weightNumber = pokedex_data[dexindex].weight / 10;
+    u16 weightDecimal = pokedex_data[dexindex].weight % 10;
+    pchar buffer[20];
+    fmt_int_10(string_buffer, weightNumber, 0, 3);
+    fmt_int_10(&buffer[0], weightDecimal, 0, 1);
+    pstrcat(string_buffer, pdex_str_comma);
+    pstrcat(string_buffer, buffer);
+    pstrcat(string_buffer, pdex_str_weight_unit);
+    u16 weightTwidth = font_get_width_of_string(FONT_DEX_STD, string_buffer, 0x0000);
+
+    rboxid_print(TB_PKSIZE, FONT_DEX_STD, TB_STD_RIGHT(weightTwidth, TB_SW_W * 8) - 6, 1, &pdex_text_color, 0,
+                 string_buffer);
+
+    u16 sizeNumber = pokedex_data[dexindex].height / 10;
+    u16 sizeDecimal = pokedex_data[dexindex].height % 10;
+    fmt_int_10(string_buffer, sizeNumber, 0, 3);
+    fmt_int_10(&buffer[0], sizeDecimal, 0, 1);
+    pstrcat(string_buffer, pdex_str_comma);
+    pstrcat(string_buffer, buffer);
+    pstrcat(string_buffer, pdex_str_size_unit);
+
+    rboxid_print(TB_PKSIZE, FONT_DEX_STD, TB_STD_RIGHT(weightTwidth, TB_SW_W * 8) - 6, 14, &pdex_text_color, 0,
+                 string_buffer);
 
+    rboxid_print(TB_DESC, FONT_DEX_STD, 3, 2, &pdex_text_color, 0, pokedex_data[dexindex].description1);
+
+    /* load the species sprite */
+    if (pokedex_context->detail_pokemon_oam != -1) {
+
+    } else {
+        struct SpriteTiles pkmnTiles = {pokemon_graphics_front[species].data, 2048, DEX_PKMN_TAG};
+        struct SpritePalette pkmnPal = {pokemon_palette_normal[species].data, DEX_PKMN_TAG};
+        const struct Template pkmnTemplate = {
+            .tiles_tag = DEX_PKMN_TAG,
+            .pal_tag = DEX_PKMN_TAG,
+            .oam = &pdex_oam_pkmn,
+            .animation = &anim_image_empty,
+            .graphics = &pkmnTiles,
+            .rotscale = &rotscale_empty,
+            .callback = oac_nullsub,
+        };
+        gpu_tile_obj_decompress_alloc_tag_and_upload(&pkmnTiles);
+
+        gpu_pal_decompress_alloc_tag_and_upload(&pkmnPal);
+        pokedex_context->detail_pokemon_oam = (s8)template_instanciate_forward_search(&pkmnTemplate, 10, 10, 0);
+
+        objects[pokedex_context->detail_pokemon_oam].pos1.x = 55;
+        objects[pokedex_context->detail_pokemon_oam].pos1.y = 55;
+    }
+
+    rboxid_update_tilemap_and_tileset(TB_DESC);
+    rboxid_update_tilemap_and_tileset(TB_PKNAME);
+    rboxid_update_tilemap_and_tileset(TB_PKSIZE);
 }
 
 void dexdetail_loop(u8 tid) {
@@ -44,11 +101,7 @@ void dexdetail_loop(u8 tid) {
     switch (pokedex_context->state) {
     case 0:
         bgid_send_tilemap(2);
-        // rboxid_fill_rectangle(4, 1, 0, 0, 28 * 8, 20 * 8);
         dexdetail_load_pokemon(pokedex_context->cursor_position_top + pokedex_context->cursor_position_internal);
-        //rboxid_clear_pixels(TB_DESC, 0);
-        //rboxid_print(TB_DESC, FONT_DEX_STD, 3, 2, &pdex_text_color, 0, pdex_entry_debug);
-        //rboxid_update_tilemap_and_tileset(TB_DESC);
 
         palette_bg_faded_fill_black();
         pokedex_context->state++;
@@ -86,6 +139,7 @@ void dexdetail_load(void) {
     pdex_vram_setup();
     dexdetail_load_gfx();
     pokedex_context->state = 0;
+    pokedex_context->detail_pokemon_oam = -1;
     task_add(dexdetail_loop, 0);
     set_callback2(pdex_cb_handler);
 }

src/pokedex/pokedex_region.c

@@ -10,6 +10,8 @@ void region_select_load(void);
 extern const pchar *pdex_str_regions[];
 extern const pchar *pdex_str_empty;
 
+const u16 region_to_dex[] = {1, 152, 252, 393, 501, 656, 728};
+
 struct TextboxTemplate region_select_boxes[] = {
     {.bg_id = 0, .x = 4, .y = 7, .width = 6, .height = 3, .pal_id = 15, .charbase = 1},
     {.bg_id = 0, .x = 13, .y = 7, .width = 6, .height = 3, .pal_id = 15, .charbase = 19},
@@ -190,6 +192,7 @@ void region_loop(u8 tid) {
         if (!pal_fade_control.active) {
             task_del(tid);
             pdex_vram_free_bgmaps();
+            pokedex_context->cursor_position_top = region_to_dex[pokedex_context->region_selected];
             set_callback2(pdex_load);
         }
         break;

src/pokedex/pokedex_string.s

@@ -36,6 +36,11 @@ pdex_str_weight_unit:
     .string LAN_DE "kg"
     .string LAN_EN "kg"
 
+.global pdex_str_comma
+pdex_str_comma:
+    .string LAN_DE ","
+    .string LAN_EN ","
+
 .global pdex_str_empty
 pdex_str_empty:
     .string LAN_DE "----------"