more pokedex progress, fix allocation and alignment issues

g3headers

@@ -1 +1 @@
-Subproject commit 51b88ad16c551b386614c2e6f7d41c1acd552d92
+Subproject commit ef2af052b8e5436da9efb035e06ee091b8d53e69

sots-private

@@ -1 +1 @@
-Subproject commit 25f3b9e569e5bc34cfc90edcb186ac26c6a9843c
+Subproject commit fcd34be58b09881a1306213a4feb1b546a76f41b

src/pokedex/pokedex.c

@@ -17,12 +17,6 @@
 #define TB_CAUGHT 3
 #define TB_MAIN 4
 
-
-#define TB_STD_LEN 10
-#define TB_STD_LEN_PX (TB_STD_LEN * 8)
-#define TB_BOT_LEN 9
-#define TB_BOT_LEN_PX (TB_BOT_LEN * 8)
-
 #define TB_SEEN_Y (6)
 #define TB_CAUGHT_Y 3
 
@@ -115,8 +109,8 @@ void pdex_load_sc(void) {
     rboxid_print(TB_SEEN, FONT_DEX_STD, 0, TB_SEEN_Y, &pdex_text_color, 0, &pdex_str_seen[0]);
     rboxid_print(TB_CAUGHT, FONT_DEX_STD, 0, TB_CAUGHT_Y, &pdex_text_color, 0, &pdex_str_caught[0]);
 
-    rboxid_print(TB_SEEN, FONT_DEX_STD, TB_STD_RIGHT(twidthSeen), TB_SEEN_Y + 1, &pdex_text_color, 0, seenBuffer);
-    rboxid_print(TB_CAUGHT, FONT_DEX_STD, TB_STD_RIGHT(twidthCaught), TB_CAUGHT_Y + 1, &pdex_text_color, 0,
+    rboxid_print(TB_SEEN, FONT_DEX_STD, TB_STD_RIGHT(twidthSeen,TB_BOT_LEN_PX), TB_SEEN_Y + 1, &pdex_text_color, 0, seenBuffer);
+    rboxid_print(TB_CAUGHT, FONT_DEX_STD, TB_STD_RIGHT(twidthCaught,TB_BOT_LEN_PX), TB_CAUGHT_Y + 1, &pdex_text_color, 0,
                  caughtBuffer);
 
     rboxid_update_tilemap_and_tileset(TB_SEEN);
@@ -135,7 +129,7 @@ void pdex_pokemon_load(u16 species) {
     /* this is very temporary */
     rboxid_clear_pixels(TB_PKMN, 0);
     u32 twidth = font_get_width_of_string(FONT_DEX_STD, &pokemon_names[species][0], 0x0000);
-    rboxid_print(TB_PKMN, FONT_DEX_STD, TB_STD_CENTER(twidth), 3, &pdex_text_color, 0, &pokemon_names[species][0]);
+    rboxid_print(TB_PKMN, FONT_DEX_STD, TB_STD_CENTER(twidth,TB_STD_LEN_PX), 3, &pdex_text_color, 0, &pokemon_names[species][0]);
     if (pokedex_context->pokemon_oam != -1) {
         lz77UnCompVram(pokemon_graphics_front[species].data,
                        ((void *)(objects[pokedex_context->pokemon_oam].final_oam.tile_num * 32) + ADDR_VRAM + 0x10000));
@@ -442,6 +436,10 @@ void pdex_loop(u8 tid) {
         break;
     case 4:
         /* main control */
+        if(super.buttons_new & KEY_A)
+        {
+            pokedex_context->state = 15;
+        }
         if (super.buttons_new & KEY_B) {
             pokedex_context->state = 10;
         }
@@ -460,12 +458,26 @@ void pdex_loop(u8 tid) {
     case 11:
         if (!pal_fade_control.active) {
             task_del(tid);
+            pdex_vram_free_bgmaps();
             free(pokedex_context->lookup);
             free(pokedex_context);
             set_callback2(c2_overworld_switch_start_menu);
             set_callback1(c1_overworld);
         }
         break;
+    case 15:
+        /* load the detail screen */
+        fade_screen(0xFFFFFFFF, PDEX_FADEIN_SPD, 0, 16, 0x0000);
+        pokedex_context->state++;
+        break;
+    case 16:
+        if(!pal_fade_control.active)
+        {
+            pdex_vram_free_bgmaps();
+            task_del(tid);
+            void dexdetail_load(void);
+            set_callback2(dexdetail_load);
+        }
     default:
         break;
     }

src/pokedex/pokedex_common.c

@@ -1,5 +1,5 @@
-#include <pokeagb/pokeagb.h>
 #include "pokedex_common.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),
                              rgb5(255, 0, 255), rgb5(255, 0, 255),   rgb5(255, 0, 255), rgb5(255, 0, 255),
@@ -57,6 +57,16 @@ void pdex_vblank_handler(void) {
     gpu_pal_upload();
 }
 
+u8 pstr_lines(pchar *str) {
+    u8 lines = 1;
+    while (*str != 0xFF) {
+        if (*str == 0xFE)
+            lines++;
+        str++;
+    }
+    return lines;
+}
+
 void pdex_cb_handler(void) {
     if (pal_fade_control.active)
         process_palfade();
@@ -69,6 +79,22 @@ void pdex_cb_handler(void) {
     }
 }
 
+void pdex_vram_free_bgmaps(void) {
+    for (u8 i = 0; i < 3; ++i) {
+        void *tmap = bgid_get_tilemap(i);
+        if (tmap != NULL) {
+            free(tmap);
+            bgid_nullify_tilemap(i);
+        }
+    }
+}
+
+void pdex_vram_allocate_bgmaps(void) {
+    bgid_set_tilemap(0, malloc(0x800));
+    bgid_set_tilemap(1, malloc(0x800));
+    bgid_set_tilemap(2, malloc(0x800));
+}
+
 void pdex_vram_setup(void) {
     vblank_handler_set(NULL);
     pal_fade_control_and_dead_struct_reset();
@@ -93,8 +119,5 @@ void pdex_vram_setup(void) {
 
     vblank_handler_set(pdex_vblank_handler);
     interrupts_enable(INTERRUPT_VBLANK);
-
-    u8 *bgMap = malloc(0x800);
-    bgid_set_tilemap(2, bgMap);
-    
+    pdex_vram_allocate_bgmaps();
 }

src/pokedex/pokedex_common.h

@@ -15,8 +15,13 @@
 
 #define FONT_DEX_STD 1
 
-#define TB_STD_CENTER(t) (((TB_STD_LEN_PX - t) >> 1) + 2)
-#define TB_STD_RIGHT(t) ((TB_BOT_LEN_PX - t))
+#define TB_STD_LEN 10
+#define TB_STD_LEN_PX (TB_STD_LEN * 8)
+#define TB_BOT_LEN 9
+#define TB_BOT_LEN_PX (TB_BOT_LEN * 8)
+
+#define TB_STD_CENTER(t,w) (((w - t) >> 1) + 2)
+#define TB_STD_RIGHT(t,w) ((w - t))
 
 #define DEX_PKMN_TAG 0x1300
 #define DEX_BALL_TAG 0x1301
@@ -32,11 +37,13 @@
 void pdex_cb_handler(void);
 void pdex_vblank_handler(void);
 void pdex_vram_setup(void);
+void pdex_vram_free_bgmaps(void);
 
 void pdex_load(void);
 
 const u16 pdex_text_pal[16];
 const struct BgConfig pdex_bg_config[4];
 struct TextColor pdex_text_color;
+u8 pstr_lines(pchar* str);
 
 #endif

src/pokedex/pokedex_detail.c

@@ -0,0 +1,91 @@
+#include <agb_debug.h>
+#include <pokeagb/pokeagb.h>
+#include <pokedex/pdexDetailBg.h>
+
+#include "pokedex_common.h"
+
+#define TB_PKNAME 0
+#define TB_PKSIZE 2
+#define TB_PKWEIGHT 3
+#define TB_DESC 2
+
+#define TB_PKNAME_W 30
+#define TB_SW_W 20
+
+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[];
+
+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 = 0xFF},
+};
+
+void dexdetail_load_pokemon(u16 dexindex) {
+    u16 species = pokedex_context->lookup[dexindex].species;
+    rboxid_clear_pixels(TB_PKNAME, 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);
+    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);
+
+}
+
+void dexdetail_loop(u8 tid) {
+    (void)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++;
+        break;
+    case 1:
+        gpu_sync_bg_show(0);
+        gpu_sync_bg_show(1);
+        gpu_sync_bg_hide(3);
+
+        gpu_sync_bg_show(2);
+        fade_screen(0xFFFFFFFF, PDEX_FADEIN_SPD, 16, 0, 0x0000);
+        pokedex_context->state++;
+        break;
+    default:
+        break;
+    }
+}
+
+void dexdetail_load_gfx(void) {
+    rbox_init_from_templates(&dexdetail_boxes[0]);
+    lz77UnCompVram(pdexDetailBgTiles, (void *)0x0600C000);
+    LZ77UnCompWram(pdexDetailBgMap, bgid_get_tilemap(2));
+    gpu_pal_apply_compressed(pdexDetailBgPal, 0, 32);
+    gpu_pal_apply(pdex_text_pal, 15 * 16, 32);
+
+    lcd_io_set(REG_ID_WIN0H, (8 << 8) | (232));
+    lcd_io_set(REG_ID_WIN0V, ((100 << 8) | (160)));
+    lcd_io_set(REG_ID_WININ, WIN_BG0 | WIN_BG1 | WIN_BG2 | WIN_BG3 | WIN_OBJ);
+    lcd_io_set(REG_ID_WINOUT, WIN_BG0 | WIN_BG2 | WIN_BG3 | WIN_OBJ);
+    bgid_mod_y_offset(1, -24576, 1);
+    bgid_mark_for_sync(0);
+}
+
+void dexdetail_load(void) {
+    pdex_vram_setup();
+    dexdetail_load_gfx();
+    pokedex_context->state = 0;
+    task_add(dexdetail_loop, 0);
+    set_callback2(pdex_cb_handler);
+}

src/pokedex/pokedex_region.c

@@ -189,8 +189,7 @@ void region_loop(u8 tid) {
     case 10:
         if (!pal_fade_control.active) {
             task_del(tid);
-            if(bgid_get_tilemap(2) != NULL)
-                free(bgid_get_tilemap(2));
+            pdex_vram_free_bgmaps();
             set_callback2(pdex_load);
         }
         break;

src/pokedex/pokedex_string.s

@@ -16,11 +16,32 @@ pdex_str_caught:
     .string LAN_DE "Gef.:"
     .string LAN_EN "Caught:"
 
+.global pdex_str_size
+pdex_str_size:
+    .string LAN_DE "Größe:"
+    .string LAN_EN "Size:"
+
+.global pdex_str_weight
+pdex_str_weight:
+    .string LAN_DE "Gewicht:"
+    .string LAN_EN "Weight:"
+
+.global pdex_str_size_unit
+pdex_str_size_unit:
+    .string LAN_DE "m"
+    .string LAN_EN "m"
+
+.global pdex_str_weight_unit
+pdex_str_weight_unit:
+    .string LAN_DE "kg"
+    .string LAN_EN "kg"
+
 .global pdex_str_empty
 pdex_str_empty:
     .string LAN_DE "----------"
     .string LAN_EN "----------"
 
+.align 2
 .global pdex_str_regions
 pdex_str_regions:
 .word pdex_str_empty
@@ -58,4 +79,9 @@ pdex_str_kalos:
 
 pdex_str_alola:
     .string LAN_DE "Alola"
-    .string LAN_EN "Alola"
+    .string LAN_EN "Alola"
+
+.global pdex_entry_debug
+pdex_entry_debug:
+    .string LAN_DE "Glurak fliegt durch die Lüfte, um starke\nGegner aufzuspüren. Sein heißer Feuer-\natem bringt alles zum Schmelzen.\nAber es richtet seinen Feueratem nie auf\nschwächere Gegner."
+    .string LAN_EN "Glurak fliegt durch die Lüfte, um starke Gegner aufzuspüren.\nSein heißer Feueratem bringt alles zum Schmelzen.\nAber es richtet seinen Feueratem nie auf schwächere Gegner."