crystal special effect finished

g3headers

@@ -1 +1 @@
-Subproject commit c4659d3ab4f6062818f1e776746d7be46582f992
+Subproject commit fd98d6c1df9c3f8e52c931dbbd019d2c439f62d8

main.asm

@@ -64,6 +64,9 @@
 .org 0x0815F9B8
     .word 0x08069ED5 // fix nop1 for now...
 
+.org 0x08727994
+    .word the_old_test_script
+
 .org 0x09000000
 .importobj "object/linked.o"
 .close

src/include/script_language.h

@@ -16,7 +16,7 @@
 
 @@@@@@@@@@@@@@@@@ Macro
 
-@@ Costum commands
+@@ Custom commands
 
 .macro msgbox msgbox_textpointer msgbox_callstd
 loadpointer 0x0 \msgbox_textpointer

src/specials/custom_specials.c

@@ -73,9 +73,11 @@ void get_text_pointer_from_lookup();
 
 void sp_check_tileset();
 
+extern void sp_crystal_fade(void);
+
 /* === STATICS === */
 
-static callback special_routines[8] = {
+static callback special_routines[9] = {
     met_play,
     cam_sp_move_camera,
     sp_init_script,
@@ -83,7 +85,8 @@ static callback special_routines[8] = {
     sp_dns_switch,
     sp_random_number,
     sp_check_tileset,
-    sp_batchmaptile
+    sp_batchmaptile,
+    sp_crystal_fade,
 };
 
 /* === IMPLEMENTATIONS === */

src/specials/special_effects/crystal_fade.c

@@ -1,21 +1,24 @@
 #include <pokeagb/pokeagb.h>
 
+#define CRYSTAL_MAX_INTENSITY 5
+#define CRYSTAL_SPEED 1
+
 void task_fade_flash(u8 id) {
     switch (tasks[id].priv[1]) {
     case 0:
-        fade_screen(0xFFFFFFFF, 5, 0, 16, tasks[id].priv[0]);
+        fade_screen(0xFFFFFFFF, CRYSTAL_SPEED, 0, CRYSTAL_MAX_INTENSITY, tasks[id].priv[0]);
         tasks[id].priv[1]++;
         break;
     case 1:
         if (!pal_fade_control.active) {
-            fade_screen(0xFFFFFFFF, 5, 16, 0, tasks[id].priv[0]);
+            fade_screen(0xFFFFFFFF, CRYSTAL_SPEED, CRYSTAL_MAX_INTENSITY, 0, tasks[id].priv[0]);
             tasks[id].priv[1]++;
         }
         break;
     case 2:
-        if(!pal_fade_control.active)
-        {
+        if (!pal_fade_control.active) {
             task_del(id);
+            script_env_2_enable_and_set_ctx_running();
         }
         break;
     }

src/test/alabastia.S

@@ -1,171 +0,0 @@
-@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-@                                                                    @
-@           file: E:\OneDrive\sots tilesets\alabastia.tmx            @
-@                     converted using tiled2agb                      @
-@                      converted on 31.05.2017                       @
-@                   program created by Sturmvogel                    @
-@                                                                    @
-@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-
-@@@  SECTION: MAPHEADER  @@@
-
-.align 2
-.global mapheader_alabastia
-mapheader_alabastia:
-	.word mapfooter_alabastia
-	.word mapevents_alabastia
-	.word 0x0816545A
-	.word 0x0835276C
-	.hword 0x012C @music
-	.hword 0x004E @index
-	.byte 0x58 @name
-	.byte 0x00 @cave
-	.byte 0x02 @weather
-	.byte 0x01 @light
-	.byte 0x01 @unknown
-	.hword 0x0006 @showName
-	.byte 0x00 @battleStyle
-
-@@@  SECTION: MAPFOOTER  @@@
-
-.align 2
-.global mapfooter_alabastia
-mapfooter_alabastia:
-	.word 0x00000018
-	.word 0x00000014
-	.word mapborderblocks_alabastia
-	.word mapblocks_alabastia
-	.word 0x082D4A94
-	.word 0x082D4AAC
-	.byte 2
-	.byte 2
-	.hword 0
-@@@  SECTION: MAPBLOCKS  @@@
-.align 2
-
-.global mapblocks_alabastia
-mapblocks_alabastia:
-	.hword 0x041C,0x041D,0x041C,0x041D,0x041C,0x041D,0x041C,0x041D,0x041C,0x041D,0x041C,0x041D,0x32A6,0x32A7,0x041C,0x041D,0x041C,0x041D,0x041C,0x041D,0x041C,0x041D,0x041E,0x041F
-	.hword 0x0414,0x0415,0x0424,0x0425,0x0424,0x0425,0x0424,0x0425,0x0424,0x0425,0x0424,0x0425,0x32AE,0x32AF,0x0424,0x0425,0x0424,0x0425,0x0424,0x0425,0x0424,0x0425,0x0416,0x0417
-	.hword 0x041C,0x041D,0x32A6,0x328E,0x328E,0x328E,0x328E,0x328E,0x328E,0x328E,0x328E,0x328E,0x3285,0x3286,0x328E,0x328E,0x328E,0x328E,0x328E,0x328E,0x328E,0x328F,0x041E,0x041F
-	.hword 0x0414,0x0415,0x32AE,0x3296,0x3296,0x3281,0x3282,0x3282,0x3282,0x3283,0x3296,0x3296,0x3296,0x3296,0x3281,0x3282,0x3282,0x3282,0x3283,0x3296,0x3296,0x3297,0x0416,0x0417
-	.hword 0x041C,0x041D,0x32AE,0x32C7,0x329E,0x0689,0x068A,0x068A,0x068A,0x068B,0x329E,0x329E,0x329E,0x329E,0x0689,0x068A,0x068A,0x068A,0x068B,0x32C6,0x3296,0x3297,0x041E,0x041F
-	.hword 0x0414,0x0415,0x32AE,0x3297,0x3001,0x0691,0x0692,0x0692,0x0693,0x0694,0x300E,0x300F,0x3008,0x3001,0x0691,0x0692,0x0692,0x0693,0x0694,0x3295,0x3296,0x3297,0x0416,0x0417
-	.hword 0x041C,0x041D,0x32AE,0x3297,0x32A5,0x0698,0x0699,0x069A,0x069B,0x069C,0x041E,0x041F,0x3008,0x32A5,0x0698,0x0699,0x069A,0x069B,0x069C,0x3295,0x3296,0x3297,0x041E,0x041F
-	.hword 0x0414,0x0415,0x32AE,0x3297,0x06AD,0x06A0,0x06A3,0x06A2,0x06A1,0x06A4,0x0426,0x0427,0x3008,0x06AD,0x06A0,0x06A3,0x06A2,0x06A1,0x06A4,0x3295,0x3296,0x3297,0x0416,0x0417
-	.hword 0x041C,0x041D,0x32AE,0x32BF,0x328E,0x32BE,0x3296,0x32BF,0x328E,0x328E,0x328E,0x328E,0x328E,0x328E,0x32BE,0x3296,0x32BF,0x328E,0x328E,0x32BE,0x3296,0x3297,0x041E,0x041F
-	.hword 0x0414,0x0415,0x32AE,0x3296,0x3296,0x3296,0x3296,0x3296,0x3296,0x3296,0x3296,0x3296,0x3296,0x32A8,0x32A9,0x32A9,0x32A9,0x32A9,0x32BD,0x32B5,0x3296,0x3297,0x0416,0x0417
-	.hword 0x041C,0x041D,0x32AE,0x3296,0x3296,0x3296,0x3296,0x3296,0x3296,0x3296,0x3296,0x3296,0x32C7,0x06B0,0x06B1,0x06B1,0x06B1,0x06B1,0x06B3,0x06B4,0x3296,0x3297,0x041E,0x041F
-	.hword 0x0414,0x0415,0x32AE,0x3296,0x32C7,0x0684,0x0684,0x0684,0x0684,0x0402,0x32C6,0x3296,0x3297,0x06B8,0x06B9,0x06B9,0x06B9,0x06B9,0x06BB,0x06BC,0x32CE,0x3297,0x0416,0x0417
-	.hword 0x041C,0x041D,0x32AE,0x3296,0x3297,0x3004,0x3004,0x3004,0x3004,0x3001,0x3295,0x3296,0x3297,0x06C0,0x06C1,0x06D0,0x06C2,0x06C3,0x06C4,0x06C5,0x32AE,0x3297,0x041E,0x041F
-	.hword 0x0414,0x0415,0x32AE,0x3296,0x3297,0x3004,0x3004,0x3004,0x3004,0x3001,0x3295,0x3296,0x3297,0x06C8,0x06C9,0x06D8,0x06AC,0x06CB,0x06CC,0x06CD,0x32AE,0x3297,0x0416,0x0417
-	.hword 0x041C,0x041D,0x32AE,0x3296,0x3297,0x0403,0x3001,0x3001,0x3001,0x3001,0x3295,0x3296,0x32BF,0x328E,0x328E,0x32BE,0x3296,0x32BF,0x328E,0x328E,0x3285,0x3297,0x041E,0x041F
-	.hword 0x0414,0x0415,0x32AE,0x3296,0x32BF,0x328E,0x328E,0x328E,0x328E,0x328E,0x32BE,0x3296,0x32C7,0x329E,0x329E,0x329E,0x329E,0x329E,0x329E,0x32C6,0x3296,0x3297,0x0416,0x0417
-	.hword 0x041C,0x041D,0x32AE,0x3296,0x3296,0x3296,0x3296,0x3296,0x3296,0x3296,0x3296,0x3296,0x3290,0x0687,0x0687,0x0687,0x0687,0x0687,0x0687,0x32BE,0x3296,0x3297,0x041E,0x041F
-	.hword 0x0414,0x0415,0x32B6,0x329E,0x329E,0x329E,0x329E,0x32D1,0x3123,0x3123,0x32D2,0x3296,0x3296,0x3296,0x3296,0x3296,0x3296,0x3296,0x3296,0x3296,0x3296,0x3297,0x0416,0x0417
-	.hword 0x041C,0x041D,0x3004,0x3001,0x3004,0x3001,0x3001,0x312A,0x312B,0x312B,0x312C,0x329E,0x329E,0x329E,0x329E,0x329E,0x329E,0x329E,0x329E,0x329E,0x329E,0x329F,0x041E,0x041F
-	.hword 0x0414,0x0415,0x300E,0x300F,0x300E,0x300F,0x3001,0x312A,0x312B,0x312B,0x312C,0x3001,0x3004,0x3001,0x3001,0x3001,0x3004,0x3001,0x300E,0x300F,0x300E,0x300F,0x0416,0x0417
-@@@  SECTION: BORDERBLOCKS  @@@
-.align 2
-
-.global mapborderblocks_alabastia
-mapborderblocks_alabastia:
-	.hword 0x001C,0x001D
-	.hword 0x0014,0x0015
-@@@  SECTION: MAPEVENTS  @@@
-
-.align 2
-.global mapevents_alabastia
-mapevents_alabastia:
-.byte	0x02, 0x03, 0x02, 0x00
-.word 	mapevents_persons_alabastia
-.word 	mapevents_warps_alabastia
-.word 	mapevents_triggers_alabastia
-.word 	00000000
-
-@@@ SECTION: PERSON EVENTS @@@
-.align 2
-mapevents_persons_alabastia:
-@PERSON ID: 0
-
-	.byte 0x09
-	.byte 0x14
-	.byte 0x00
-	.byte 0x00
-	.hword 0x000A
-	.hword 0x0004
-	.byte 0x00
-	.byte 0x01
-	.byte 0x40
-	.byte 0x00
-	.byte 0x00
-	.byte 0x00
-	.hword 0x0000
-	.word scr_map_test
-	.hword 0x0500
-	.hword 0x0000
-@PERSON ID: 1
-
-	.byte 0x07
-	.byte 0x0A
-	.byte 0x00
-	.byte 0x00
-	.hword 0x000E
-	.hword 0x0002
-	.byte 0x00
-	.byte 0x03
-	.byte 0x40
-	.byte 0x00
-	.byte 0x01
-	.byte 0x00
-	.hword 0x0004
-	.word 0x00000000
-	.hword 0x0501
-	.hword 0x0000
-@@@ SECTION: WARP EVENTS @@@
-.align 2
-mapevents_warps_alabastia:
-@WARP ID: 0
-	.hword 6
-	.hword 7
-	.byte 0
-	.byte 1
-	.byte 0
-	.byte 4
-@WARP ID: 1
-	.hword 15
-	.hword 7
-	.byte 0
-	.byte 0
-	.byte 2
-	.byte 4
-@WARP ID: 2
-	.hword 16
-	.hword 13
-	.byte 0
-	.byte 0
-	.byte 3
-	.byte 4
-@@@ SECTION: TRIGGER EVENTS @@@
-.align 2
-mapevents_triggers_alabastia:
-@WARP ID: 0
-	.hword 12
-	.hword 1
-	.byte 0
-	.byte 0
-	.hword 20497
-	.hword 0
-	.byte 0
-	.byte 0
-	.word scr_trigger_test_two
-@WARP ID: 1
-	.hword 13
-	.hword 1
-	.byte 0
-	.byte 0
-	.hword 20498
-	.hword 0
-	.byte 0
-	.byte 0
-	.word scr_trigger_test

src/test/test_scripts.S

@@ -3,36 +3,15 @@
 .align 2
 .thumb
 
-.global scr_map_test
-scr_map_test:
+.global the_old_test_script
+the_old_test_script:
+
 lock
 faceplayer
+setvar 0x8000 0x7C00
+setvar 0x5006 8
+special 0x68
+waitstate
 msgbox str_test_text 0x6
 release
-end
-
-.global scr_trainer_test
-scr_trainer_test:
-trainerbattle 0 5 0 str_test_text str_test_text
-
-.global scr_trigger_test
-scr_trigger_test:
-lockall
-msgbox str_test_text 6
-applymovement 0xFF move_data
-waitmovement 0x0
-releaseall
-end
-
-.global scr_trigger_test_two
-scr_trigger_test_two:
-lockall
-msgbox str_test_text_two 6
-applymovement 0xFF move_data
-waitmovement 0x0
-setvar 0x5011
-releaseall
-end
-
-move_data:
-.byte APPLYMOVE_JUMP_ONE_DOWN, APPLYMOVE_END
+end