add item image preview to giveitem, fixes #92

.clang-format

@@ -1,90 +0,0 @@
----
-Language:        Cpp
-# BasedOnStyle:  LLVM
-AccessModifierOffset: -2
-AlignAfterOpenBracket: Align
-AlignConsecutiveAssignments: false
-AlignConsecutiveDeclarations: false
-AlignEscapedNewlinesLeft: false
-AlignOperands:   true
-AlignTrailingComments: true
-AllowAllParametersOfDeclarationOnNextLine: true
-AllowShortBlocksOnASingleLine: false
-AllowShortCaseLabelsOnASingleLine: false
-AllowShortFunctionsOnASingleLine: All
-AllowShortIfStatementsOnASingleLine: false
-AllowShortLoopsOnASingleLine: false
-AlwaysBreakAfterDefinitionReturnType: None
-AlwaysBreakAfterReturnType: None
-AlwaysBreakBeforeMultilineStrings: false
-AlwaysBreakTemplateDeclarations: false
-BinPackArguments: true
-BinPackParameters: true
-BraceWrapping:   
-  AfterClass:      false
-  AfterControlStatement: false
-  AfterEnum:       false
-  AfterFunction:   false
-  AfterNamespace:  false
-  AfterObjCDeclaration: false
-  AfterStruct:     false
-  AfterUnion:      false
-  BeforeCatch:     false
-  BeforeElse:      false
-  IndentBraces:    false
-BreakBeforeBinaryOperators: None
-BreakBeforeBraces: Attach
-BreakBeforeTernaryOperators: true
-BreakConstructorInitializersBeforeComma: false
-ColumnLimit:     120
-CommentPragmas:  '^ IWYU pragma:'
-ConstructorInitializerAllOnOneLineOrOnePerLine: false
-ConstructorInitializerIndentWidth: 4
-ContinuationIndentWidth: 4
-Cpp11BracedListStyle: true
-DerivePointerAlignment: false
-DisableFormat:   false
-ExperimentalAutoDetectBinPacking: false
-ForEachMacros:   [ foreach, Q_FOREACH, BOOST_FOREACH ]
-IncludeCategories: 
-  - Regex:           '^"(llvm|llvm-c|clang|clang-c)/'
-    Priority:        2
-  - Regex:           '^(<|"(gtest|isl|json)/)'
-    Priority:        3
-  - Regex:           '.*'
-    Priority:        1
-IndentCaseLabels: false
-IndentWidth:     4
-IndentWrappedFunctionNames: false
-KeepEmptyLinesAtTheStartOfBlocks: true
-MacroBlockBegin: ''
-MacroBlockEnd:   ''
-MaxEmptyLinesToKeep: 1
-NamespaceIndentation: None
-ObjCBlockIndentWidth: 2
-ObjCSpaceAfterProperty: false
-ObjCSpaceBeforeProtocolList: true
-PenaltyBreakBeforeFirstCallParameter: 19
-PenaltyBreakComment: 300
-PenaltyBreakFirstLessLess: 120
-PenaltyBreakString: 1000
-PenaltyExcessCharacter: 1000000
-PenaltyReturnTypeOnItsOwnLine: 60
-PointerAlignment: Right
-ReflowComments:  true
-SortIncludes:    true
-SpaceAfterCStyleCast: false
-SpaceBeforeAssignmentOperators: true
-SpaceBeforeParens: ControlStatements
-SpaceInEmptyParentheses: false
-SpacesBeforeTrailingComments: 1
-SpacesInAngles:  false
-SpacesInContainerLiterals: true
-SpacesInCStyleCastParentheses: false
-SpacesInParentheses: false
-SpacesInSquareBrackets: false
-Standard:        Cpp11
-TabWidth:        8
-UseTab:          Never
-...
-

data/script/debug.s

@@ -0,0 +1,17 @@
+#include <script/language.h>
+
+.text
+.thumb
+.align 2
+
+.global debug_script
+debug_script:
+    lock
+    faceplayer
+    giveitem 1 1 0
+    msgbox debug 6
+    release
+    end
+
+debug:
+    .string LAN_DE "debug script"

sots-private

@@ -1 +1 @@
-Subproject commit c3d50f2675c5d4b707b0581610d7dcfa10457b2b
+Subproject commit aff5be521a19c96566bbe4016438c69f1a9a4bfa

src/include/script/language.h

@@ -175,7 +175,11 @@ callstd \msgbox_callstd
 .macro giveitem giveitem_item:req giveitem_quantity:req giveitem_messagetyp:req
 copyvarifnotzero 0x8000 \giveitem_item
 copyvarifnotzero 0x8001 \giveitem_quantity
+setvar 0x5006 10
+special 0x68
 callstd \giveitem_messagetyp
+setvar 0x5006 11
+special 0x68
 .endm
 
 .macro giveitem2 giveitem2_item:req giveitem2_quantity:req giveitem2_song:req

src/interface/show_item.c

@@ -1,11 +1,46 @@
 #include <pokeagb/pokeagb.h>
+#include <agb_debug.h>
 
-const struct OamData item_oam = {.size = 2};
+#define SHOW_ITEM_TAG 0x1340
+
+const struct OamData item_oam = {.size = 2, .shape = 0, .priority = 0};
+
+/*
+ * Need to fix the alignment to follow a 24x24 pattern
+ * 
+ * from
+ * 
+ * # # # #
+ * # # # #
+ * # X X X
+ * X X X X
+ * 
+ * to
+ * 
+ * # # # X
+ * # # # X
+ * # # # X
+ * X X X X
+ * 
+ * where # is a valid data tile
+ */
+void item_fix_alignment(u8* buffer, u8* dst)
+{
+    memcpy(32*0 + dst, 32*0 + buffer, 3*32);
+    memcpy(32*4 + dst, 32*3 + buffer, 3*32);
+    memcpy(32*8 + dst, 32*6 + buffer, 3*32);
+}
 
 void show_item_load_gfx(u16 item)
 {
-    struct SpriteTiles tiles = {.data = item_gfx_table[item].gfx, .size = 32*16, .tag = 0x1340};
-    struct SpritePalette pal = {.data = item_gfx_table[item].pal, .tag = 0x1340};
+    u8* temp_buffer = malloc_and_clear(32*16);
+    u8* item_gfx_buffer = malloc_and_clear(32*16);
+    LZ77UnCompWram(item_gfx_table[item].gfx, temp_buffer);
+    item_fix_alignment(temp_buffer, item_gfx_buffer);
+
+    struct SpriteTiles tiles = {.data = item_gfx_buffer, .size = 32*16, .tag = SHOW_ITEM_TAG};
+    struct SpritePalette pal = {.data = item_gfx_table[item].pal, .tag = SHOW_ITEM_TAG};
+
     struct Template template = {
         .tiles_tag = 0x1340,
         .pal_tag = 0x1340,
@@ -15,7 +50,22 @@ void show_item_load_gfx(u16 item)
         .rotscale = SPRITE_NO_ROTSCALE,
         .callback = oac_nullsub
     };
-    gpu_tile_obj_decompress_alloc_tag_and_upload(&tiles);
-    gpu_pal_obj_alloc_tag_and_apply(&pal);
-    template_instanciate_forward_search(&template, 100,100,0);
+
+    gpu_tile_obj_alloc_tag_and_upload(&tiles); //has already been decompressed above
+    gpu_pal_decompress_alloc_tag_and_upload(&pal); //this has not
+    var_800A = template_instanciate_forward_search(&template, 210,140,0);
+    free(temp_buffer);
+    free(item_gfx_buffer);
+}
+
+void hide_item_unload_gfx(void)
+{
+    obj_delete_and_free(&objects[var_800A]);
+    gpu_pal_free_by_tag(SHOW_ITEM_TAG);
+}
+
+void sp_show_item(void)
+{
+    dprintf("entering sp_show_item");
+    show_item_load_gfx(var_load(0x8001));
 }

src/specials/custom_specials.c

@@ -65,6 +65,8 @@ void sp_clear_variables();
  */
 void sp_random_number();
 
+void sp_show_item(void);
+
 extern void sp_batchmaptile(void);
 
 void get_text_pointer_from_lookup();
@@ -73,6 +75,8 @@ void sp_check_tileset();
 
 void sp_set_rival(void);
 
+void hide_item_unload_gfx(void);
+
 extern void sp_crystal_fade(void);
 
 extern pchar name_rival_male[5];
@@ -80,9 +84,10 @@ extern pchar name_rival_female[5];
 
 /* === STATICS === */
 
-static special_func special_routines[10] = {
+static special_func special_routines[12] = {
     NULL,         cam_sp_move_camera, sp_init_script,  NULL, NULL,
     sp_random_number, sp_check_tileset,   sp_batchmaptile, sp_crystal_fade, sp_set_rival,
+    sp_show_item, hide_item_unload_gfx
 };
 
 /* === IMPLEMENTATIONS === */