fixes regarding overworlds, cutscenes, camera movement

assets.makefile

@@ -78,7 +78,7 @@ $(C_MET_BG): $(PNG_MET_BG)
 $(C_MET_SKY): $(PNG_MET_SKY)
 	$(GRIT) $< -gu32 -gzl -gB 4 -gt -m -mu16 -mzl -mp1 -mRtpf -p -pu16 -pzl -ftc -o $@
 
-$(C_MET_RG): $(PNG_MET_RG)
+$(C_MET_FG): $(PNG_MET_FG)
 	$(GRIT) $< -gu32 -gzl -gB 4 -gt -m -mu16 -mzl -mp3 -mRtpf -p -pu16 -pzl -ftc -o $@
 
 $(C_MET_CLOUDS): $(PNG_MET_CLOUDS)

data/text_lookup/text_lookup_array.s

@@ -5,6 +5,10 @@
 .global get_text_pointer_from_lookup
 get_text_pointer_from_lookup:
 push {r4-r5, lr}
+ldr r0, =str_invalid_text
+b valid_text_two
+@delete those two lines to activate the system
+
 ldr r0, =sav_one
 ldr r0, [r0]
 ldrb r4, [r0, #4] @r4 = bank
@@ -30,12 +34,15 @@ bl bxr2
 lsl r0, #2
 add r1, r0, r4
 ldr r0, [r1, #0] @load specific ID
+lsr r1, r0, #0x18
+cmp r1, #8
+beq valid_text_two
+cmp r1, #9
+beq valid_text_two
+ldr r0, =str_invalid_text
+valid_text_two:
 ldr r1, lp_offset
 str r0, [r1]
-mov r0, #0
-ldr r1, =0x500C
-ldr r2, =var_set
-bl bxr2
 pop {r4-r5}
 pop {r1}
 bx r1
@@ -43,6 +50,10 @@ bx r1
 .global get_map_pointer_from_lookup
 get_map_pointer_from_lookup:
 push {r4-r5, lr}
+ldr r0, =str_invalid_text
+b valid_text_one
+@delete those two lines to activate the system
+
 ldr r0, =sav_one
 ldr r0, [r0]
 ldrb r4, [r0, #4] @r4 = bank
@@ -61,12 +72,15 @@ bl bxr2
 lsl r0, #2
 add r1, r0, r4
 ldr r0, [r1, #0] @load specific ID
+lsr r1, r0, #0x18
+cmp r1, #8
+beq valid_text_one
+cmp r1, #9
+beq valid_text_one
+ldr r0, =str_invalid_text
+valid_text_one:
 ldr r1, lp_offset
 str r0, [r1]
-mov r0, #0
-ldr r1, =0x500C
-ldr r2, =var_set
-bl bxr2
 pop {r4-r5}
 pop {r1}
 bx r1

main.asm

@@ -32,7 +32,7 @@
 .include "patches/pokemon_data/pokemon_icons.asm"
 .include "patches/pokemon_data/pokemon_habitats.asm"
 
-.include "patches/dns/core.asm"
+//.include "patches/dns/core.asm"
 
 .include "patches/overworlds/overworld.asm"
 

nbproject/configurations.xml

@@ -143,7 +143,6 @@
           <in>custom_specials.c</in>
           <in>cutscene_meteor.c</in>
           <in>load_text_special.c</in>
-          <in>script_overrides.c</in>
         </df>
       </df>
       <df name="string">
@@ -645,8 +644,6 @@
       </item>
       <item path="src/specials/load_text_special.c" ex="false" tool="0" flavor2="0">
       </item>
-      <item path="src/specials/script_overrides.c" ex="false" tool="0" flavor2="0">
-      </item>
       <item path="string/de/story_text/tundra_hq/globals.txt"
             ex="false"
             tool="3"

patches/dns/core.asm

@@ -19,6 +19,6 @@
     .pool
 
 .org 0x08056578
-    ldr r0, =dns_cb_overworld_hacked+1
-    bx r0
-    .pool
+    //ldr r0, =dns_cb_overworld_hacked+1
+    //bx r0
+    //.pool

patches/hooks.asm

@@ -28,7 +28,7 @@
   .org 0x081DD0F4
     LDR R1, =music_override|1
     BX R1
-  .pool
+   .pool
 
 
 
@@ -151,7 +151,7 @@
 .org 0x080D9EDC
     ldr r0, =load_hijack|1
     bx r0
-	.pool
+    .pool
 
 .org 0x080d991E
     bx r7

patches/special.asm

@@ -7,5 +7,5 @@
 .org 0x0815FD60 + (4*0x6A)
 .word get_map_pointer_from_lookup|1
 
-.org 0x0815F9B0 + (4*0x2)   //end cmd
-.word s02_end|1
+.org 0x0815FD60 + (4*0x6B)
+.word sp_clear_variables|1

src/assets/meteor/met_background.c

@@ -10,18 +10,18 @@
 //	+ regular map (flat), lz77 compressed, 32x20 
 //	Total size: 12 + 20 + 164 = 196
 //
-//	Time-stamp: 2016-05-29, 04:14:05
-//	Exported by Cearn's GBA Image Transmogrifier, v0.8.13
+//	Time-stamp: 2017-01-01, 21:27:37
+//	Exported by Cearn's GBA Image Transmogrifier, v0.8.6
 //	( http://www.coranac.com/projects/#grit )
 //
 //======================================================================
 
-const unsigned int met_backgroundTiles[5] __attribute__((aligned(4))) __attribute__((visibility("hidden")))=
+const unsigned int met_backgroundTiles[5] __attribute__((aligned(4)))=
 {
-	0x00004010,0xF0000033,0x11059001,0x9001F011,0x00000005,
+	0x00004010,0xF0000033,0x11059001,0x9001F011,0xF001F005,
 };
 
-const unsigned short met_backgroundMap[82] __attribute__((aligned(4))) __attribute__((visibility("hidden")))=
+const unsigned short met_backgroundMap[82] __attribute__((aligned(4)))=
 {
 	0x0010,0x0005,0x013F,0xF000,0xF001,0xF001,0xF001,0xF001,
 	0xF001,0xFB01,0x01F0,0x01F0,0x01F0,0x01F0,0x0770,0xF000,
@@ -37,9 +37,9 @@ const unsigned short met_backgroundMap[82] __attribute__((aligned(4))) __attribu
 	0x003F,0x0000,
 };
 
-const unsigned short met_backgroundPal[6] __attribute__((aligned(4))) __attribute__((visibility("hidden")))=
+const unsigned short met_backgroundPal[6] __attribute__((aligned(4)))=
 {
-	0x2010,0x0000,0x0030,0xF000,0x9001,0x1101,
+	0x2010,0x0000,0x0030,0xF000,0x9001,0x0001,
 };
 
 //}}BLOCK(met_background)

src/assets/meteor/met_background.h

@@ -10,8 +10,8 @@
 //	+ regular map (flat), lz77 compressed, 32x20 
 //	Total size: 12 + 20 + 164 = 196
 //
-//	Time-stamp: 2016-05-29, 04:14:05
-//	Exported by Cearn's GBA Image Transmogrifier, v0.8.13
+//	Time-stamp: 2017-01-01, 21:27:37
+//	Exported by Cearn's GBA Image Transmogrifier, v0.8.6
 //	( http://www.coranac.com/projects/#grit )
 //
 //======================================================================

src/assets/meteor/met_clouds.c

@@ -9,13 +9,13 @@
 //	+ regular map (flat), lz77 compressed, 32x20 
 //	Total size: 28 + 448 + 256 = 732
 //
-//	Time-stamp: 2016-05-29, 04:14:05
-//	Exported by Cearn's GBA Image Transmogrifier, v0.8.13
+//	Time-stamp: 2017-01-01, 21:29:18
+//	Exported by Cearn's GBA Image Transmogrifier, v0.8.6
 //	( http://www.coranac.com/projects/#grit )
 //
 //======================================================================
 
-const unsigned int met_cloudsTiles[112] __attribute__((aligned(4))) __attribute__((visibility("hidden")))=
+const unsigned int met_cloudsTiles[112] __attribute__((aligned(4)))=
 {
 	0x0005C010,0xF0000033,0x6003B001,0x7013F066,0x66661707,0x601F1066,0x1F7019F0,0x60722320,
 	0x1FF02720,0x06661E40,0xD1064320,0x41301FF0,0x063F0060,0x43E00606,0x105F50F8,0x805DF042,
@@ -34,7 +34,7 @@ const unsigned int met_cloudsTiles[112] __attribute__((aligned(4))) __attribute_
 	0x3FF10722,0x99F0FFB0,0x7420C821,0xC4FF1AF0,0xC49BF0BF,0xF01044BF,0x442E741F,0x003F9231,
 };
 
-const unsigned short met_cloudsMap[128] __attribute__((aligned(4))) __attribute__((visibility("hidden")))=
+const unsigned short met_cloudsMap[128] __attribute__((aligned(4)))=
 {
 	0x0010,0x0005,0x003F,0xF020,0xF001,0xF001,0xF001,0xF001,
 	0xF001,0xF801,0x01F0,0x01F0,0x01F0,0x01F0,0x0590,0x2001,
@@ -55,10 +55,10 @@ const unsigned short met_cloudsMap[128] __attribute__((aligned(4))) __attribute_
 	0x01F0,0x01F0,0xF0F8,0xF001,0xF001,0xF001,0x8001,0x0005,
 };
 
-const unsigned short met_cloudsPal[14] __attribute__((aligned(4))) __attribute__((visibility("hidden")))=
+const unsigned short met_cloudsPal[14] __attribute__((aligned(4)))=
 {
 	0x2010,0x0000,0x0000,0x9602,0x747F,0x517F,0x007F,0x7FFE,
-	0x7F9C,0x7F7A,0x0000,0xD080,0x0001,0x0000,
+	0x7F9C,0x7F7A,0x0000,0xD080,0x0101,0x01F0,
 };
 
 //}}BLOCK(met_clouds)

src/assets/meteor/met_clouds.h

@@ -9,8 +9,8 @@
 //	+ regular map (flat), lz77 compressed, 32x20 
 //	Total size: 28 + 448 + 256 = 732
 //
-//	Time-stamp: 2016-05-29, 04:14:05
-//	Exported by Cearn's GBA Image Transmogrifier, v0.8.13
+//	Time-stamp: 2017-01-01, 21:29:18
+//	Exported by Cearn's GBA Image Transmogrifier, v0.8.6
 //	( http://www.coranac.com/projects/#grit )
 //
 //======================================================================

src/assets/meteor/met_foreground.c

@@ -9,13 +9,13 @@
 //	+ regular map (flat), lz77 compressed, 32x20 
 //	Total size: 36 + 2356 + 464 = 2856
 //
-//	Time-stamp: 2016-05-29, 04:14:05
-//	Exported by Cearn's GBA Image Transmogrifier, v0.8.13
+//	Time-stamp: 2017-01-01, 21:29:18
+//	Exported by Cearn's GBA Image Transmogrifier, v0.8.6
 //	( http://www.coranac.com/projects/#grit )
 //
 //======================================================================
 
-const unsigned int met_foregroundTiles[589] __attribute__((aligned(4))) __attribute__((visibility("hidden")))=
+const unsigned int met_foregroundTiles[589] __attribute__((aligned(4)))=
 {
 	0x00118010,0xF000003D,0xF001F001,0x990F0001,0xBB600200,0x1C4017F0,0xBB999999,0xF0BB63BB,
 	0xAA1F901F,0x19F0AAAA,0x095C0B30,0x109A1200,0x1001F004,0x0300440E,0x00114000,0x03001400,
@@ -102,7 +102,7 @@ const unsigned int met_foregroundTiles[589] __attribute__((aligned(4))) __attrib
 	0x2142212F,0x400C787F,0xC0517F21,0xB0C0BFF1,0x001F9003,
 };
 
-const unsigned short met_foregroundMap[232] __attribute__((aligned(4))) __attribute__((visibility("hidden")))=
+const unsigned short met_foregroundMap[232] __attribute__((aligned(4)))=
 {
 	0x0010,0x0005,0x003F,0xF030,0xF001,0xF001,0xF001,0xF001,
 	0xF001,0xFF01,0x01F0,0x01F0,0x01F0,0x01F0,0x01F0,0x01F0,
@@ -135,10 +135,10 @@ const unsigned short met_foregroundMap[232] __attribute__((aligned(4))) __attrib
 	0x7E30,0x7F30,0x8030,0x0030,0x3081,0x3082,0x3083,0x3084,
 	0x8500,0x8630,0x8730,0x8630,0x0034,0x3088,0x3089,0x308A,
 	0x308B,0x8A7F,0x4F01,0x01F0,0x01F0,0x01F0,0x01F0,0x01F0,
-	0x01F0,0xF0F8,0xF001,0xF001,0xF001,0xB001,0x0003,0x008F,
+	0x01F0,0xF0F8,0xF001,0xF001,0xF001,0xB001,0x3003,0x0000,
 };
 
-const unsigned short met_foregroundPal[18] __attribute__((aligned(4))) __attribute__((visibility("hidden")))=
+const unsigned short met_foregroundPal[18] __attribute__((aligned(4)))=
 {
 	0x2010,0x0000,0x0000,0x0E7E,0xCB3B,0x8932,0x002A,0x21E0,
 	0x5F19,0x4E97,0x4634,0xF200,0x493D,0xF825,0xB619,0x2015,

src/assets/meteor/met_foreground.h

@@ -9,8 +9,8 @@
 //	+ regular map (flat), lz77 compressed, 32x20 
 //	Total size: 36 + 2356 + 464 = 2856
 //
-//	Time-stamp: 2016-05-29, 04:14:05
-//	Exported by Cearn's GBA Image Transmogrifier, v0.8.13
+//	Time-stamp: 2017-01-01, 21:29:18
+//	Exported by Cearn's GBA Image Transmogrifier, v0.8.6
 //	( http://www.coranac.com/projects/#grit )
 //
 //======================================================================

src/assets/meteor/met_meteor.c

@@ -8,13 +8,13 @@
 //	+ 48 tiles lz77 compressed
 //	Total size: 32 + 1168 = 1200
 //
-//	Time-stamp: 2016-05-29, 04:14:05
-//	Exported by Cearn's GBA Image Transmogrifier, v0.8.13
+//	Time-stamp: 2017-01-01, 21:29:18
+//	Exported by Cearn's GBA Image Transmogrifier, v0.8.6
 //	( http://www.coranac.com/projects/#grit )
 //
 //======================================================================
 
-const unsigned int met_meteorTiles[292] __attribute__((aligned(4))) __attribute__((visibility("hidden")))=
+const unsigned int met_meteorTiles[292] __attribute__((aligned(4)))=
 {
 	0x00060010,0xF000003A,0x2001F001,0x1300100D,0x00001013,0x221A0020,0x02100032,0x11000031,
 	0x27801103,0x10334002,0x00401134,0x00300001,0x11300000,0x10442230,0x3740246C,0x20023E30,
@@ -59,7 +59,7 @@ const unsigned int met_meteorTiles[292] __attribute__((aligned(4))) __attribute_
 	0x57451634,0x10B0F754,0x13F40667,0x00FF0160,
 };
 
-const unsigned short met_meteorPal[16] __attribute__((aligned(4))) __attribute__((visibility("hidden")))=
+const unsigned short met_meteorPal[16] __attribute__((aligned(4)))=
 {
 	0x2108,0x211B,0x223E,0x2117,0x22BE,0x4BDE,0x375E,0x5FDE,
 	0x7BDE,0x21BE,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,

src/assets/meteor/met_meteor.h

@@ -8,8 +8,8 @@
 //	+ 48 tiles lz77 compressed
 //	Total size: 32 + 1168 = 1200
 //
-//	Time-stamp: 2016-05-29, 04:14:05
-//	Exported by Cearn's GBA Image Transmogrifier, v0.8.13
+//	Time-stamp: 2017-01-01, 21:29:18
+//	Exported by Cearn's GBA Image Transmogrifier, v0.8.6
 //	( http://www.coranac.com/projects/#grit )
 //
 //======================================================================

src/assets/meteor/met_sky.c

@@ -9,13 +9,13 @@
 //	+ regular map (flat), lz77 compressed, 32x20 
 //	Total size: 28 + 204 + 240 = 472
 //
-//	Time-stamp: 2016-05-29, 04:14:05
-//	Exported by Cearn's GBA Image Transmogrifier, v0.8.13
+//	Time-stamp: 2017-01-01, 21:27:37
+//	Exported by Cearn's GBA Image Transmogrifier, v0.8.6
 //	( http://www.coranac.com/projects/#grit )
 //
 //======================================================================
 
-const unsigned int met_skyTiles[51] __attribute__((aligned(4))) __attribute__((visibility("hidden")))=
+const unsigned int met_skyTiles[51] __attribute__((aligned(4)))=
 {
 	0x00032010,0xF0000033,0x33059001,0x2001F033,0x3332010D,0x23232333,0xBD19F023,0xF0321E60,
 	0xF040B01F,0x325E801F,0xF0E03FF0,0x601EF07F,0x23332308,0x30E13232,0x90471001,0x22232207,
@@ -26,7 +26,7 @@ const unsigned int met_skyTiles[51] __attribute__((aligned(4))) __attribute__((v
 	0x11789C10,0x01F04300,0x01F001F0,
 };
 
-const unsigned short met_skyMap[120] __attribute__((aligned(4))) __attribute__((visibility("hidden")))=
+const unsigned short met_skyMap[120] __attribute__((aligned(4)))=
 {
 	0x0010,0x0005,0x003F,0xF010,0xF001,0xF001,0xF001,0xF001,
 	0xF001,0xF801,0x01F0,0x01F0,0x01F0,0x01F0,0x0770,0x1001,
@@ -43,13 +43,13 @@ const unsigned short met_skyMap[120] __attribute__((aligned(4))) __attribute__((
 	0x3FF0,0x01F0,0x01F0,0x3FF0,0x01F0,0x01F0,0xF0FF,0xF001,
 	0xF03F,0xF001,0xF001,0xF03F,0xF015,0xF001,0xFF01,0x3FF0,
 	0x01F0,0x01F0,0x3FF0,0x01F0,0x01F0,0x01F0,0x01F0,0xF0FE,
-	0xF001,0xF001,0xF001,0xF001,0xF001,0xB001,0x0003,0x0000,
+	0xF001,0xF001,0xF001,0xF001,0xF001,0xB001,0x1003,0x0000,
 };
 
-const unsigned short met_skyPal[14] __attribute__((aligned(4))) __attribute__((visibility("hidden")))=
+const unsigned short met_skyPal[14] __attribute__((aligned(4)))=
 {
 	0x2010,0x0000,0x0000,0x9602,0x747F,0x517F,0x007F,0x7FFE,
-	0x7F9C,0x7F7A,0x0000,0xD080,0x0001,0x0000,
+	0x7F9C,0x7F7A,0x0000,0xD080,0x1101,0x1111,
 };
 
 //}}BLOCK(met_sky)

src/assets/meteor/met_sky.h

@@ -9,8 +9,8 @@
 //	+ regular map (flat), lz77 compressed, 32x20 
 //	Total size: 28 + 204 + 240 = 472
 //
-//	Time-stamp: 2016-05-29, 04:14:05
-//	Exported by Cearn's GBA Image Transmogrifier, v0.8.13
+//	Time-stamp: 2017-01-01, 21:27:37
+//	Exported by Cearn's GBA Image Transmogrifier, v0.8.6
 //	( http://www.coranac.com/projects/#grit )
 //
 //======================================================================

src/specials/custom_specials.c

@@ -55,6 +55,12 @@ void sp_init_script();
  */
 void sp_special_casm();
 
+/**
+ * @brief clears some variables at the end of a script
+ */
+void sp_clear_variables();
+
+
 void get_text_pointer_from_lookup();
 
 /* === STATICS === */
@@ -90,3 +96,15 @@ void sp_special_casm() //special 0x68
     u16* var_special = var_access(CALLASM_VAR);
     special_routines[*var_special]();
 }
+
+void sp_clear_variables()
+{
+    (void) var_set(MUGHSOT_1_TABLE, 0);
+    (void) var_set(MUGHSOT_2_TABLE, 0);
+    (void) var_set(MUGSHOT_1_X, 0);
+    (void) var_set(MUGSHOT_2_X, 0);
+    (void) var_set(MUGSHOT_1_Y, 0);
+    (void) var_set(MUGSHOT_2_Y, 0);
+    (void) var_set(TEXT_VAR, 0);
+    return;
+}

src/specials/cutscene_meteor.c

@@ -270,10 +270,10 @@ void met_setup_scrolling()
 
 void met_setup_palettes()
 {
-	wram_decompress((void*)met_skyPal, palette_unfaded_buffer + PALETTE_SKY*32);
-	wram_decompress((void*)met_cloudsPal, palette_unfaded_buffer + PALETTE_CLOUD*32);
-	wram_decompress((void*)met_foregroundPal, palette_unfaded_buffer + PALETTE_FG*32);
-	wram_decompress((void*)met_backgroundPal, palette_unfaded_buffer + PALETTE_BG*32);
+	wram_decompress((void*)met_skyPal, palette_unfaded_buffer + PALETTE_SKY*16);
+	wram_decompress((void*)met_cloudsPal, palette_unfaded_buffer + PALETTE_CLOUD*16);
+	wram_decompress((void*)met_foregroundPal, palette_unfaded_buffer + PALETTE_FG*16);
+	wram_decompress((void*)met_backgroundPal, palette_unfaded_buffer + PALETTE_BG*16);
 }
 
 void met_setup_vram()

src/specials/script_overrides.c

@@ -1,64 +0,0 @@
-/****************************************************************************
- * Copyright (C) 2015-2016 by the SotS Team                                 *
- *                                                                          *
- * This file is part of Sovereign of the Skies.                             *
- *                                                                          *
- *   Sovereign of the Skies is free software: you can redistribute it       *
- *   and/or modify it                                                       *
- *   under the terms of the GNU Lesser General Public License as published  *
- *   by the Free Software Foundation, either version 3 of the License, or   *
- *   (at your option) any later version provided you include a copy of the  *
- *   licence and this header.                                               *
- *                                                                          *
- *   Sovereign of the Skies is distributed in the hope that it will be      *
- *   useful, but WITHOUT ANY WARRANTY; without even the implied warranty of *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the          *
- *   GNU Lesser General Public License for more details.                    *
- *                                                                          *
- *   You should have received a copy of the GNU Lesser General Public       *
- *   License along with Sovereign of the Skies.                             *
- *   If not, see <http://www.gnu.org/licenses/>.                            *
- ****************************************************************************/
-
-/**
- * @file script_overrides.c
- * @author Sturmvogel
- * @date 01 Jan 2016
- * @brief Override some internal script commands e.g. end
- *
- */
-
-
-/* === INCLUDE === */
-
-#include <game_engine.h>
-#include <types.h>
-#include <config.h>
-
-/* === PROTOTYPES === */
-
-/**
- * @brief set the script environment to end_of_script
- */
-extern void script_mode_set_stopped();
-
-/**
- * @brief command to end a script
- * @return always false (for the script environment)
- */
-u8 s02_end();
-
-/* === IMPLEMENTATIONS === */
-
-u8 s02_end()
-{
-    var_set(MUGHSOT_1_TABLE, 0);
-    var_set(MUGHSOT_2_TABLE, 0);
-    var_set(MUGSHOT_1_X, 0);
-    var_set(MUGSHOT_2_X, 0);
-    var_set(MUGSHOT_1_Y, 0);
-    var_set(MUGSHOT_2_Y, 0);
-    var_set(TEXT_VAR, 0);
-    script_mode_set_stopped();
-    return false;
-}

string/de/text.txt

@@ -1,2 +1,3 @@
 str_person_test=Dies ist ein Test\num die Funktionalität\lzu testen!
-str_person_zero=Falscher Text!
+str_person_zero=Falscher Text!
+str_invalid_text=Dies ist ein Dummy Text!