touch pokedex

g3headers

@@ -1 +1 @@
-Subproject commit 98ab5bcce4025410bc8ba8ffac90c12480dffeb2
+Subproject commit 49715f90bdcc302e550383737d5282cfde00dbe3

sots-private

@@ -1 +1 @@
-Subproject commit ce95fff5f8e8a38439ccafac1311e204fb65e01b
+Subproject commit 0d148aaf0367dab7082a16085b2ae596782aabd5

src/pokedex/pokedex_common.c

@@ -1,4 +1,5 @@
 #include "pokedex_common.h"
+#include <constants/pkmns.h>
 #include <pokeagb/pokeagb.h>
 
 const u16 pdex_text_pal[] = {rgb5(255, 0, 255), rgb5(255, 255, 255), rgb5(0, 0, 0),     rgb5(255, 0, 255),
@@ -49,6 +50,13 @@ const struct BgConfig pdex_bg_config[4] = {
     },
 };
 
+struct DexForm pdex_forms[FORM_COUNT] = 
+{
+    {.index = 19, .forms = {{814, PKMN_ALOLA_RATTFRATZ, ALOLA}, {0xFFFF, 0xFFFF, FORM_END}}},
+    {.index = 20, .forms = {{815, PKMN_ALOLA_RATIKARL, ALOLA}, {0xFFFF, 0xFFFF, FORM_END}}},
+    {.index = 0xFFFF, .forms = {{0xFFFF, 0xFFFF, FORM_END}}},
+};
+
 const struct OamData pdex_oam_pkmn = {
     .affine_mode = 0,
     .obj_mode = 0,
@@ -121,8 +129,8 @@ void pdex_free_memory(void) {
 
 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));
+    pokedex_context->lookup = malloc_and_clear((PDEX_LAST_ENTRY + 1) * sizeof(struct PdexLookup));
+    memset(pokedex_context->lookup, 0xFF, (PDEX_LAST_ENTRY + 1) * sizeof(struct PdexLookup));
 }
 
 void pdex_vram_allocate_bgmaps(void) {

src/pokedex/pokedex_common.h

@@ -3,7 +3,9 @@
 
 #include <pokeagb/pokeagb.h>
 
-#define PDEX_LAST_SHOWN 813
+#define PDEX_ALOLA_COUNT (18)
+#define PDEX_LAST_ENTRY (813 + PDEX_ALOLA_COUNT)
+#define PDEX_LAST_SHOWN (813)
 
 #define CPUFSCPY 0
 #define CPUFSSET 1
@@ -38,6 +40,14 @@
 
 #define DEX_REGION_PAL(i) (0x1307 + i)
 #define DEX_REGION_ICON(i) (0x1307 + i)
+#define MAX_FORMS 7
+#define FORM_COUNT 20
+
+struct DexForm
+{
+    u16 index;
+    struct DexFormEntry forms[MAX_FORMS];
+};
 
 void pdex_cb_handler(void);
 void pdex_vblank_handler(void);
@@ -46,13 +56,13 @@ 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);
 
 const u16 pdex_text_pal[16];
 const struct BgConfig pdex_bg_config[4];
 struct TextColor pdex_text_color;
 const struct OamData pdex_oam_pkmn;
+struct DexForm pdex_forms[FORM_COUNT];
 
 u8 pstr_lines(pchar* str);
 

src/pokedex/pokedex_detail.c

@@ -1,5 +1,6 @@
 #include <agb_debug.h>
 #include <pokeagb/pokeagb.h>
+#include <pokedex/pdexArrowRotated.h>
 #include <pokedex/pdexDetailBg.h>
 
 #include "pokedex_common.h"
@@ -62,14 +63,24 @@ s8 dexdetail_load_type_oam(u8 type, u16 tag) {
     return id;
 }
 
-void dexdetail_load_pokemon(u16 dexindex) {
+extern pchar pdex_str_form_alola[];
+
+void dexdetail_load_pokemon(u16 dexindex, enum DexFormType formType) {
     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);
-    u16 twidth = font_get_width_of_string(FONT_DEX_STD, &pokemon_names[species][0], 0x0000);
+    pstrcpy(string_buffer, &pokemon_names[species][0]);
+    switch (formType) {
+    case ALOLA:
+        pstrcat(string_buffer, pdex_str_form_alola);
+        break;
+    default:
+        break;
+    }
+    u16 twidth = font_get_width_of_string(FONT_DEX_STD, string_buffer, 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]);
+                 string_buffer);
 
     pchar *strType = &pokedex_data[dexindex].category_name[0];
     u16 typeTwidth = font_get_width_of_string(FONT_DEX_STD, strType, 0x0000);
@@ -105,7 +116,11 @@ void dexdetail_load_pokemon(u16 dexindex) {
 
     /* load the species sprite */
     if (pokedex_context->detail_pokemon_oam != -1) {
-
+        lz77UnCompVram(
+            pokemon_graphics_front[species].data,
+            ((void *)(objects[pokedex_context->detail_pokemon_oam].final_oam.tile_num * 32) + ADDR_VRAM + 0x10000));
+        gpu_pal_apply_compressed(pokemon_palette_normal[species].data,
+                                 16 * (objects[pokedex_context->detail_pokemon_oam].final_oam.palette_num + 16), 32);
     } else {
         struct SpriteTiles pkmnTiles = {pokemon_graphics_front[species].data, 2048, DEX_PKMN_TAG};
         struct SpritePalette pkmnPal = {pokemon_palette_normal[species].data, DEX_PKMN_TAG};
@@ -151,18 +166,124 @@ void dexdetail_load_pokemon(u16 dexindex) {
     } else {
         OBJID_HIDE(pokedex_context->detail_type_oam[1]);
     }
-
     rboxid_update_tilemap_and_tileset(TB_DESC);
     rboxid_update_tilemap_and_tileset(TB_PKNAME);
     rboxid_update_tilemap_and_tileset(TB_PKSIZE);
 }
 
+void dexdetail_update_form(u16 form) {
+    REG_DISPCNT &= ~((1 << 8) | (1 << 9));
+    if (form == 0) {
+        dexdetail_load_pokemon(pokedex_context->cursor_position_top + pokedex_context->cursor_position_internal,
+                               NORMAL);
+    } else {
+        form--;
+        if (pokedex_context->detail_forms[form].index > PDEX_LAST_SHOWN) {
+            dexdetail_load_pokemon(pokedex_context->detail_forms[form].index, pokedex_context->detail_forms[form].type);
+        } else {
+            // update the oam only
+            u16 species = pokedex_context->detail_forms[form].species;
+            lz77UnCompVram(
+                pokemon_graphics_front[species].data,
+                ((void *)(objects[pokedex_context->detail_pokemon_oam].final_oam.tile_num * 32) + ADDR_VRAM + 0x10000));
+            gpu_pal_apply_compressed(pokemon_palette_normal[species].data,
+                                     16 * (objects[pokedex_context->detail_pokemon_oam].final_oam.palette_num + 16),
+                                     32);
+        }
+    }
+    REG_DISPCNT |= ((1 << 8) | (1 << 9));
+}
+
+struct DexFormEntry *dexdetail_get_forms(u16 index) {
+    u16 current = 0;
+    while (pdex_forms[current].index != 0xFFFF) {
+        if (pdex_forms[current].index == index)
+            return &pdex_forms[current].forms[0];
+        current++;
+    }
+    return NULL;
+}
+
+void dexdetail_oac_arrow(struct Object *obj) {
+    if (pokedex_context->detail_forms != NULL) {
+        if (obj->priv[0]) {
+            // this is the left arrow
+            if (pokedex_context->detail_form_position != 0) {
+                obj->final_oam.palette_num = obj->priv[1];
+            } else {
+                obj->final_oam.palette_num = obj->priv[2];
+            }
+        } else {
+            // this is the right arrow
+            if (pokedex_context->detail_forms[pokedex_context->detail_form_position].type != FORM_END) {
+                obj->final_oam.palette_num = obj->priv[1];
+            } else {
+                obj->final_oam.palette_num = obj->priv[2];
+            }
+        }
+    }
+}
+
+struct SpriteTiles pdex_arrow_rot_tiles = {pdexArrowRotatedTiles, 256, DEX_ARROW_TAG};
+struct SpritePalette pdex_arrow_rot_pal = {pdexArrowRotatedPal, DEX_ARROW_TAG};
+struct SpritePalette pdex_arrow_rot_pal_gray = {pdexArrowRotatedPal, DEX_ARROW_TAG_EPAL};
+
+const struct OamData pdex_arrow_rot_oam = {
+    .affine_mode = 0,
+    .obj_mode = 0,
+    .mosaic = false,
+    .shape = 0,
+    .size = 1,
+};
+
+const struct Template pdex_arrow_rot_template = {
+    .tiles_tag = DEX_ARROW_TAG,
+    .pal_tag = DEX_ARROW_TAG,
+    .oam = &pdex_arrow_rot_oam,
+    .animation = &anim_image_empty,
+    .graphics = &pdex_arrow_rot_tiles,
+    .rotscale = &rotscale_empty,
+    .callback = dexdetail_oac_arrow,
+};
+
+void dexdetail_load_form_arrows(void) {
+    gpu_tile_obj_decompress_alloc_tag_and_upload(&pdex_arrow_rot_tiles);
+    u8 normalPal = gpu_pal_obj_alloc_tag_and_apply(&pdex_arrow_rot_pal);
+    u8 grayPal = gpu_pal_obj_alloc_tag_and_apply(&pdex_arrow_rot_pal_gray);
+    tint_palette_gray(&palette_bg_unfaded[16 * (16 + grayPal)], 16);
+    u8 leftArrow = template_instanciate_forward_search(&pdex_arrow_rot_template, 20, 80, 0);
+    u8 rightArrow = template_instanciate_forward_search(&pdex_arrow_rot_template, 80, 80, 0);
+    objects[leftArrow].priv[0] = true;
+    objects[leftArrow].final_oam.h_flip = true;
+    objects[leftArrow].priv[1] = normalPal;
+    objects[leftArrow].priv[2] = grayPal;
+    objects[rightArrow].priv[0] = false;
+    objects[rightArrow].priv[1] = normalPal;
+    objects[rightArrow].priv[2] = grayPal;
+    pokedex_context->detail_arrows_oam[0] = leftArrow;
+    pokedex_context->detail_arrows_oam[1] = rightArrow;
+}
+
 void dexdetail_loop(u8 tid) {
     (void)tid;
     switch (pokedex_context->state) {
     case 0:
         bgid_send_tilemap(2);
-        dexdetail_load_pokemon(pokedex_context->cursor_position_top + pokedex_context->cursor_position_internal);
+        u16 currentIndex = pokedex_context->cursor_position_top + pokedex_context->cursor_position_internal;
+        dexdetail_load_form_arrows();
+        dexdetail_load_pokemon(currentIndex, NORMAL);
+        pokedex_context->detail_form_position = 0;
+        struct DexFormEntry *forms = dexdetail_get_forms(currentIndex);
+        if (forms != NULL) {
+            OBJID_SHOW(pokedex_context->detail_arrows_oam[0]);
+            OBJID_SHOW(pokedex_context->detail_arrows_oam[1]);
+        } else {
+            OBJID_HIDE(pokedex_context->detail_arrows_oam[0]);
+            OBJID_HIDE(pokedex_context->detail_arrows_oam[1]);
+        }
+        dprintf("test: %d", pokedex_index_to_species(1000));
+        pokedex_context->detail_forms = forms;
+
         palette_bg_faded_fill_black();
         pokedex_context->state++;
         break;
@@ -190,6 +311,18 @@ void dexdetail_loop(u8 tid) {
 
             fade_screen(0xFFFFFFFF, PDEX_FADEIN_SPD, 0, 16, 0x0000);
             break;
+        case KEY_LEFT:
+            if (pokedex_context->detail_form_position != 0) {
+                pokedex_context->detail_form_position--;
+                dexdetail_update_form(pokedex_context->detail_form_position);
+            }
+            break;
+        case KEY_RIGHT:
+            if (pokedex_context->detail_forms[pokedex_context->detail_form_position].type != FORM_END) {
+                pokedex_context->detail_form_position++;
+                dexdetail_update_form(pokedex_context->detail_form_position);
+            }
+            break;
         }
         break;
     case 12:

src/pokedex/pokedex_string.s

@@ -46,6 +46,11 @@ pdex_str_empty:
     .string LAN_DE "----------"
     .string LAN_EN "----------"
 
+.global pdex_str_form_alola
+pdex_str_form_alola:
+    .string LAN_DE " (Alola)"
+    .string LAN_DE " (Alola)"
+
 .align 2
 .global pdex_str_regions
 pdex_str_regions: