merge

.gitattributes

@@ -0,0 +1,8 @@
+.s text eol=lf
+.txt text eol=lf
+.c text eol=lf
+.h text eol=lf
+.json text
+
+.png binary
+.bin binary

.gitignore

@@ -7,4 +7,5 @@ temp
 *.mid
 *.a
 base/*.*
-nbproject/private/tools/
+nbproject/private/tools/
+build/*

build/.gitignore

@@ -3,3 +3,4 @@
 *.bak
 *.sav
 *.sgm
+*.png

data/string/map_names.s

@@ -0,0 +1,94 @@
+.align 2
+.thumb
+.text
+
+.global map_name_table
+map_name_table:
+.word str_map_name_hesperia
+.word str_map_name_carun
+.word str_map_name_veternia
+.word str_map_name_urbania
+.word str_map_name_route_one
+.word str_map_name_route_two
+.word str_map_name_route_three
+.word str_map_name_invalid
+.word str_map_name_invalid
+.word str_map_name_invalid
+.word str_map_name_invalid
+.word str_map_name_invalid
+.word str_map_name_invalid
+.word str_map_name_invalid
+.word str_map_name_invalid
+.word str_map_name_invalid
+.word str_map_name_invalid
+.word str_map_name_invalid
+.word str_map_name_invalid
+.word str_map_name_invalid
+.word str_map_name_invalid
+.word str_map_name_invalid
+.word str_map_name_invalid
+.word str_map_name_invalid
+.word str_map_name_invalid
+.word str_map_name_invalid
+.word str_map_name_invalid
+.word str_map_name_invalid
+.word str_map_name_invalid
+.word str_map_name_invalid
+.word str_map_name_invalid
+.word str_map_name_invalid
+.word str_map_name_invalid
+.word str_map_name_invalid
+.word str_map_name_invalid
+.word str_map_name_invalid
+.word str_map_name_invalid
+.word str_map_name_invalid
+.word str_map_name_invalid
+.word str_map_name_invalid
+.word str_map_name_invalid
+.word str_map_name_invalid
+.word str_map_name_invalid
+.word str_map_name_invalid
+.word str_map_name_invalid
+.word str_map_name_invalid
+.word str_map_name_invalid
+.word str_map_name_invalid
+.word str_map_name_invalid
+.word str_map_name_invalid
+.word str_map_name_invalid
+.word str_map_name_invalid
+.word str_map_name_invalid
+.word str_map_name_invalid
+.word str_map_name_invalid
+.word str_map_name_invalid
+.word str_map_name_invalid
+.word str_map_name_invalid
+.word str_map_name_invalid
+.word str_map_name_invalid
+.word str_map_name_invalid
+.word str_map_name_invalid
+
+
+str_map_name_hesperia:
+.string LAN_DE "Hesperia"
+
+str_map_name_carun:
+.string LAN_DE "Carun City"
+
+str_map_name_veternia:
+.string LAN_DE "Veternia City"
+
+str_map_name_urbania:
+.string LAN_DE "Urbania City"
+
+str_map_name_route_one:
+.string LAN_DE "Route 1"
+
+str_map_name_route_two:
+.string LAN_DE "Route 2"
+
+str_map_name_route_three:
+.string LAN_DE "Route 3"
+
+str_map_name_invalid:
+.string LAN_DE "Invalider Name"
+.string LAN_EN "Invalid Name"

generated_image/bootscreen/boot_tileset.h

@@ -0,0 +1,32 @@
+
+//{{BLOCK(boot_tileset)
+
+//======================================================================
+//
+//	boot_tileset, 256x160@4, 
+//	+ palette 16 entries, not compressed
+//	+ 68 tiles (t|f|p reduced) lz77 compressed
+//	+ regular map (flat), lz77 compressed, 32x20 
+//	Total size: 32 + 672 + 412 = 1116
+//
+//	Time-stamp: 2017-08-31, 14:41:54
+//	Exported by Cearn's GBA Image Transmogrifier, v0.8.6
+//	( http://www.coranac.com/projects/#grit )
+//
+//======================================================================
+
+#ifndef GRIT_BOOT_TILESET_H
+#define GRIT_BOOT_TILESET_H
+
+#define boot_tilesetTilesLen 672
+extern const unsigned int boot_tilesetTiles[168];
+
+#define boot_tilesetMapLen 412
+extern const unsigned short boot_tilesetMap[206];
+
+#define boot_tilesetPalLen 32
+extern const unsigned short boot_tilesetPal[16];
+
+#endif // GRIT_BOOT_TILESET_H
+
+//}}BLOCK(boot_tileset)

generated_image/char/bag/hero_bag.h

@@ -0,0 +1,28 @@
+
+//{{BLOCK(hero_bag)
+
+//======================================================================
+//
+//	hero_bag, 64x384@4, 
+//	+ palette 20 entries, lz77 compressed
+//	+ 384 tiles lz77 compressed
+//	Total size: 40 + 3564 = 3604
+//
+//	Time-stamp: 2017-08-31, 14:41:57
+//	Exported by Cearn's GBA Image Transmogrifier, v0.8.6
+//	( http://www.coranac.com/projects/#grit )
+//
+//======================================================================
+
+#ifndef GRIT_HERO_BAG_H
+#define GRIT_HERO_BAG_H
+
+#define hero_bagTilesLen 3564
+extern const unsigned int hero_bagTiles[891];
+
+#define hero_bagPalLen 40
+extern const unsigned short hero_bagPal[20];
+
+#endif // GRIT_HERO_BAG_H
+
+//}}BLOCK(hero_bag)

generated_image/char/bag/heroine_bag.h

@@ -0,0 +1,28 @@
+
+//{{BLOCK(heroine_bag)
+
+//======================================================================
+//
+//	heroine_bag, 64x384@4, 
+//	+ palette 20 entries, lz77 compressed
+//	+ 384 tiles lz77 compressed
+//	Total size: 40 + 4044 = 4084
+//
+//	Time-stamp: 2017-08-31, 14:41:57
+//	Exported by Cearn's GBA Image Transmogrifier, v0.8.6
+//	( http://www.coranac.com/projects/#grit )
+//
+//======================================================================
+
+#ifndef GRIT_HEROINE_BAG_H
+#define GRIT_HEROINE_BAG_H
+
+#define heroine_bagTilesLen 4044
+extern const unsigned int heroine_bagTiles[1011];
+
+#define heroine_bagPalLen 40
+extern const unsigned short heroine_bagPal[20];
+
+#endif // GRIT_HEROINE_BAG_H
+
+//}}BLOCK(heroine_bag)

generated_image/char/throw_out/hero_backsprite.h

@@ -0,0 +1,28 @@
+
+//{{BLOCK(hero_backsprite)
+
+//======================================================================
+//
+//	hero_backsprite, 64x320@4, 
+//	+ palette 20 entries, lz77 compressed
+//	+ 320 tiles not compressed
+//	Total size: 40 + 10240 = 10280
+//
+//	Time-stamp: 2017-08-31, 14:41:58
+//	Exported by Cearn's GBA Image Transmogrifier, v0.8.6
+//	( http://www.coranac.com/projects/#grit )
+//
+//======================================================================
+
+#ifndef GRIT_HERO_BACKSPRITE_H
+#define GRIT_HERO_BACKSPRITE_H
+
+#define hero_backspriteTilesLen 10240
+extern const unsigned int hero_backspriteTiles[2560];
+
+#define hero_backspritePalLen 40
+extern const unsigned short hero_backspritePal[20];
+
+#endif // GRIT_HERO_BACKSPRITE_H
+
+//}}BLOCK(hero_backsprite)

generated_image/char/throw_out/heroine_backsprite.h

@@ -0,0 +1,28 @@
+
+//{{BLOCK(heroine_backsprite)
+
+//======================================================================
+//
+//	heroine_backsprite, 64x320@4, 
+//	+ palette 20 entries, lz77 compressed
+//	+ 320 tiles not compressed
+//	Total size: 40 + 10240 = 10280
+//
+//	Time-stamp: 2017-08-31, 14:41:58
+//	Exported by Cearn's GBA Image Transmogrifier, v0.8.6
+//	( http://www.coranac.com/projects/#grit )
+//
+//======================================================================
+
+#ifndef GRIT_HEROINE_BACKSPRITE_H
+#define GRIT_HEROINE_BACKSPRITE_H
+
+#define heroine_backspriteTilesLen 10240
+extern const unsigned int heroine_backspriteTiles[2560];
+
+#define heroine_backspritePalLen 40
+extern const unsigned short heroine_backspritePal[20];
+
+#endif // GRIT_HEROINE_BACKSPRITE_H
+
+//}}BLOCK(heroine_backsprite)

generated_image/cutscene_meteor/met_background.h

@@ -0,0 +1,33 @@
+
+//{{BLOCK(met_background)
+
+//======================================================================
+//
+//	met_background, 256x160@4, 
+//	Transparent color : 00,FF,00
+//	+ palette 6 entries, lz77 compressed
+//	+ 2 tiles (t|f reduced) lz77 compressed
+//	+ regular map (flat), lz77 compressed, 32x20 
+//	Total size: 12 + 20 + 164 = 196
+//
+//	Time-stamp: 2017-08-31, 14:41:55
+//	Exported by Cearn's GBA Image Transmogrifier, v0.8.6
+//	( http://www.coranac.com/projects/#grit )
+//
+//======================================================================
+
+#ifndef GRIT_MET_BACKGROUND_H
+#define GRIT_MET_BACKGROUND_H
+
+#define met_backgroundTilesLen 20
+extern const unsigned int met_backgroundTiles[5];
+
+#define met_backgroundMapLen 164
+extern const unsigned short met_backgroundMap[82];
+
+#define met_backgroundPalLen 12
+extern const unsigned short met_backgroundPal[6];
+
+#endif // GRIT_MET_BACKGROUND_H
+
+//}}BLOCK(met_background)

generated_image/cutscene_meteor/met_clouds.h

@@ -0,0 +1,32 @@
+
+//{{BLOCK(met_clouds)
+
+//======================================================================
+//
+//	met_clouds, 256x160@4, 
+//	+ palette 14 entries, lz77 compressed
+//	+ 46 tiles (t|f reduced) lz77 compressed
+//	+ regular map (flat), lz77 compressed, 32x20 
+//	Total size: 28 + 448 + 256 = 732
+//
+//	Time-stamp: 2017-08-31, 14:41:56
+//	Exported by Cearn's GBA Image Transmogrifier, v0.8.6
+//	( http://www.coranac.com/projects/#grit )
+//
+//======================================================================
+
+#ifndef GRIT_MET_CLOUDS_H
+#define GRIT_MET_CLOUDS_H
+
+#define met_cloudsTilesLen 448
+extern const unsigned int met_cloudsTiles[112];
+
+#define met_cloudsMapLen 256
+extern const unsigned short met_cloudsMap[128];
+
+#define met_cloudsPalLen 28
+extern const unsigned short met_cloudsPal[14];
+
+#endif // GRIT_MET_CLOUDS_H
+
+//}}BLOCK(met_clouds)

generated_image/cutscene_meteor/met_foreground.h

@@ -0,0 +1,32 @@
+
+//{{BLOCK(met_foreground)
+
+//======================================================================
+//
+//	met_foreground, 256x160@4, 
+//	+ palette 18 entries, lz77 compressed
+//	+ 140 tiles (t|f reduced) lz77 compressed
+//	+ regular map (flat), lz77 compressed, 32x20 
+//	Total size: 36 + 2356 + 464 = 2856
+//
+//	Time-stamp: 2017-08-31, 14:41:55
+//	Exported by Cearn's GBA Image Transmogrifier, v0.8.6
+//	( http://www.coranac.com/projects/#grit )
+//
+//======================================================================
+
+#ifndef GRIT_MET_FOREGROUND_H
+#define GRIT_MET_FOREGROUND_H
+
+#define met_foregroundTilesLen 2356
+extern const unsigned int met_foregroundTiles[589];
+
+#define met_foregroundMapLen 464
+extern const unsigned short met_foregroundMap[232];
+
+#define met_foregroundPalLen 36
+extern const unsigned short met_foregroundPal[18];
+
+#endif // GRIT_MET_FOREGROUND_H
+
+//}}BLOCK(met_foreground)

generated_image/cutscene_meteor/met_foreground_red.h

@@ -0,0 +1,28 @@
+
+//{{BLOCK(met_foreground_red)
+
+//======================================================================
+//
+//	met_foreground_red, 256x160@8, 
+//	+ palette 256 entries, not compressed
+//	+ 640 tiles not compressed
+//	Total size: 512 + 40960 = 41472
+//
+//	Time-stamp: 2017-08-31, 14:41:55
+//	Exported by Cearn's GBA Image Transmogrifier, v0.8.6
+//	( http://www.coranac.com/projects/#grit )
+//
+//======================================================================
+
+#ifndef GRIT_MET_FOREGROUND_RED_H
+#define GRIT_MET_FOREGROUND_RED_H
+
+#define met_foreground_redTilesLen 40960
+extern const unsigned int met_foreground_redTiles[10240];
+
+#define met_foreground_redPalLen 512
+extern const unsigned short met_foreground_redPal[256];
+
+#endif // GRIT_MET_FOREGROUND_RED_H
+
+//}}BLOCK(met_foreground_red)

generated_image/cutscene_meteor/met_meteor.h

@@ -0,0 +1,28 @@
+
+//{{BLOCK(met_meteor)
+
+//======================================================================
+//
+//	met_meteor, 32x96@4, 
+//	+ palette 16 entries, not compressed
+//	+ 48 tiles lz77 compressed
+//	Total size: 32 + 1168 = 1200
+//
+//	Time-stamp: 2017-08-31, 14:41:56
+//	Exported by Cearn's GBA Image Transmogrifier, v0.8.6
+//	( http://www.coranac.com/projects/#grit )
+//
+//======================================================================
+
+#ifndef GRIT_MET_METEOR_H
+#define GRIT_MET_METEOR_H
+
+#define met_meteorTilesLen 1168
+extern const unsigned int met_meteorTiles[292];
+
+#define met_meteorPalLen 32
+extern const unsigned short met_meteorPal[16];
+
+#endif // GRIT_MET_METEOR_H
+
+//}}BLOCK(met_meteor)

generated_image/cutscene_meteor/met_sky.h

@@ -0,0 +1,32 @@
+
+//{{BLOCK(met_sky)
+
+//======================================================================
+//
+//	met_sky, 256x160@4, 
+//	+ palette 14 entries, lz77 compressed
+//	+ 25 tiles (t|f reduced) lz77 compressed
+//	+ regular map (flat), lz77 compressed, 32x20 
+//	Total size: 28 + 204 + 240 = 472
+//
+//	Time-stamp: 2017-08-31, 14:41:56
+//	Exported by Cearn's GBA Image Transmogrifier, v0.8.6
+//	( http://www.coranac.com/projects/#grit )
+//
+//======================================================================
+
+#ifndef GRIT_MET_SKY_H
+#define GRIT_MET_SKY_H
+
+#define met_skyTilesLen 204
+extern const unsigned int met_skyTiles[51];
+
+#define met_skyMapLen 240
+extern const unsigned short met_skyMap[120];
+
+#define met_skyPalLen 28
+extern const unsigned short met_skyPal[14];
+
+#endif // GRIT_MET_SKY_H
+
+//}}BLOCK(met_sky)

generated_image/cutscene_meteor/met_sky_red.h

@@ -0,0 +1,28 @@
+
+//{{BLOCK(met_sky_red)
+
+//======================================================================
+//
+//	met_sky_red, 256x160@8, 
+//	+ palette 256 entries, not compressed
+//	+ 640 tiles not compressed
+//	Total size: 512 + 40960 = 41472
+//
+//	Time-stamp: 2017-08-31, 14:41:55
+//	Exported by Cearn's GBA Image Transmogrifier, v0.8.6
+//	( http://www.coranac.com/projects/#grit )
+//
+//======================================================================
+
+#ifndef GRIT_MET_SKY_RED_H
+#define GRIT_MET_SKY_RED_H
+
+#define met_sky_redTilesLen 40960
+extern const unsigned int met_sky_redTiles[10240];
+
+#define met_sky_redPalLen 512
+extern const unsigned short met_sky_redPal[256];
+
+#endif // GRIT_MET_SKY_RED_H
+
+//}}BLOCK(met_sky_red)

generated_image/emoticons/emot_arrows.h

@@ -0,0 +1,24 @@
+
+//{{BLOCK(emot_arrows)
+
+//======================================================================
+//
+//	emot_arrows, 16x96@4, 
+//	+ 24 tiles not compressed
+//	Total size: 768 = 768
+//
+//	Time-stamp: 2017-08-31, 14:41:54
+//	Exported by Cearn's GBA Image Transmogrifier, v0.8.6
+//	( http://www.coranac.com/projects/#grit )
+//
+//======================================================================
+
+#ifndef GRIT_EMOT_ARROWS_H
+#define GRIT_EMOT_ARROWS_H
+
+#define emot_arrowsTilesLen 768
+extern const unsigned int emot_arrowsTiles[192];
+
+#endif // GRIT_EMOT_ARROWS_H
+
+//}}BLOCK(emot_arrows)

generated_image/mugshots/mug_00.h

@@ -0,0 +1,28 @@
+
+//{{BLOCK(mug_00)
+
+//======================================================================
+//
+//	mug_00, 32x32@4, 
+//	+ palette 16 entries, not compressed
+//	+ 16 tiles lz77 compressed
+//	Total size: 32 + 400 = 432
+//
+//	Time-stamp: 2017-08-31, 14:41:59
+//	Exported by Cearn's GBA Image Transmogrifier, v0.8.6
+//	( http://www.coranac.com/projects/#grit )
+//
+//======================================================================
+
+#ifndef GRIT_MUG_00_H
+#define GRIT_MUG_00_H
+
+#define mug_00TilesLen 400
+extern const unsigned int mug_00Tiles[100];
+
+#define mug_00PalLen 32
+extern const unsigned short mug_00Pal[16];
+
+#endif // GRIT_MUG_00_H
+
+//}}BLOCK(mug_00)

generated_image/mugshots/mug_01.h

@@ -0,0 +1,28 @@
+
+//{{BLOCK(mug_01)
+
+//======================================================================
+//
+//	mug_01, 32x32@4, 
+//	+ palette 16 entries, not compressed
+//	+ 16 tiles lz77 compressed
+//	Total size: 32 + 428 = 460
+//
+//	Time-stamp: 2017-08-31, 14:42:00
+//	Exported by Cearn's GBA Image Transmogrifier, v0.8.6
+//	( http://www.coranac.com/projects/#grit )
+//
+//======================================================================
+
+#ifndef GRIT_MUG_01_H
+#define GRIT_MUG_01_H
+
+#define mug_01TilesLen 428
+extern const unsigned int mug_01Tiles[107];
+
+#define mug_01PalLen 32
+extern const unsigned short mug_01Pal[16];
+
+#endif // GRIT_MUG_01_H
+
+//}}BLOCK(mug_01)

generated_image/mugshots/mug_02.h

@@ -0,0 +1,28 @@
+
+//{{BLOCK(mug_02)
+
+//======================================================================
+//
+//	mug_02, 32x32@4, 
+//	+ palette 16 entries, not compressed
+//	+ 16 tiles lz77 compressed
+//	Total size: 32 + 460 = 492
+//
+//	Time-stamp: 2017-08-31, 14:41:59
+//	Exported by Cearn's GBA Image Transmogrifier, v0.8.6
+//	( http://www.coranac.com/projects/#grit )
+//
+//======================================================================
+
+#ifndef GRIT_MUG_02_H
+#define GRIT_MUG_02_H
+
+#define mug_02TilesLen 460
+extern const unsigned int mug_02Tiles[115];
+
+#define mug_02PalLen 32
+extern const unsigned short mug_02Pal[16];
+
+#endif // GRIT_MUG_02_H
+
+//}}BLOCK(mug_02)

generated_image/mugshots/mug_03.h

@@ -0,0 +1,28 @@
+
+//{{BLOCK(mug_03)
+
+//======================================================================
+//
+//	mug_03, 32x32@4, 
+//	+ palette 16 entries, not compressed
+//	+ 16 tiles lz77 compressed
+//	Total size: 32 + 512 = 544
+//
+//	Time-stamp: 2017-08-31, 14:41:58
+//	Exported by Cearn's GBA Image Transmogrifier, v0.8.6
+//	( http://www.coranac.com/projects/#grit )
+//
+//======================================================================
+
+#ifndef GRIT_MUG_03_H
+#define GRIT_MUG_03_H
+
+#define mug_03TilesLen 512
+extern const unsigned int mug_03Tiles[128];
+
+#define mug_03PalLen 32
+extern const unsigned short mug_03Pal[16];
+
+#endif // GRIT_MUG_03_H
+
+//}}BLOCK(mug_03)

generated_image/mugshots/mug_04.h

@@ -0,0 +1,28 @@
+
+//{{BLOCK(mug_04)
+
+//======================================================================
+//
+//	mug_04, 32x32@4, 
+//	+ palette 16 entries, not compressed
+//	+ 16 tiles lz77 compressed
+//	Total size: 32 + 444 = 476
+//
+//	Time-stamp: 2017-08-31, 14:41:59
+//	Exported by Cearn's GBA Image Transmogrifier, v0.8.6
+//	( http://www.coranac.com/projects/#grit )
+//
+//======================================================================
+
+#ifndef GRIT_MUG_04_H
+#define GRIT_MUG_04_H
+
+#define mug_04TilesLen 444
+extern const unsigned int mug_04Tiles[111];
+
+#define mug_04PalLen 32
+extern const unsigned short mug_04Pal[16];
+
+#endif // GRIT_MUG_04_H
+
+//}}BLOCK(mug_04)

generated_image/mugshots/mug_05.h

@@ -0,0 +1,28 @@
+
+//{{BLOCK(mug_05)
+
+//======================================================================
+//
+//	mug_05, 32x32@4, 
+//	+ palette 16 entries, not compressed
+//	+ 16 tiles lz77 compressed
+//	Total size: 32 + 492 = 524
+//
+//	Time-stamp: 2017-08-31, 14:42:00
+//	Exported by Cearn's GBA Image Transmogrifier, v0.8.6
+//	( http://www.coranac.com/projects/#grit )
+//
+//======================================================================
+
+#ifndef GRIT_MUG_05_H
+#define GRIT_MUG_05_H
+
+#define mug_05TilesLen 492
+extern const unsigned int mug_05Tiles[123];
+
+#define mug_05PalLen 32
+extern const unsigned short mug_05Pal[16];
+
+#endif // GRIT_MUG_05_H
+
+//}}BLOCK(mug_05)

generated_image/mugshots/mug_06.h

@@ -0,0 +1,28 @@
+
+//{{BLOCK(mug_06)
+
+//======================================================================
+//
+//	mug_06, 32x32@4, 
+//	+ palette 16 entries, not compressed
+//	+ 16 tiles lz77 compressed
+//	Total size: 32 + 476 = 508
+//
+//	Time-stamp: 2017-08-31, 14:41:59
+//	Exported by Cearn's GBA Image Transmogrifier, v0.8.6
+//	( http://www.coranac.com/projects/#grit )
+//
+//======================================================================
+
+#ifndef GRIT_MUG_06_H
+#define GRIT_MUG_06_H
+
+#define mug_06TilesLen 476
+extern const unsigned int mug_06Tiles[119];
+
+#define mug_06PalLen 32
+extern const unsigned short mug_06Pal[16];
+
+#endif // GRIT_MUG_06_H
+
+//}}BLOCK(mug_06)

generated_image/mugshots/mug_07.h

@@ -0,0 +1,28 @@
+
+//{{BLOCK(mug_07)
+
+//======================================================================
+//
+//	mug_07, 32x32@4, 
+//	+ palette 16 entries, not compressed
+//	+ 16 tiles lz77 compressed
+//	Total size: 32 + 484 = 516
+//
+//	Time-stamp: 2017-08-31, 14:41:58
+//	Exported by Cearn's GBA Image Transmogrifier, v0.8.6
+//	( http://www.coranac.com/projects/#grit )
+//
+//======================================================================
+
+#ifndef GRIT_MUG_07_H
+#define GRIT_MUG_07_H
+
+#define mug_07TilesLen 484
+extern const unsigned int mug_07Tiles[121];
+
+#define mug_07PalLen 32
+extern const unsigned short mug_07Pal[16];
+
+#endif // GRIT_MUG_07_H
+
+//}}BLOCK(mug_07)

generated_image/mugshots/mug_08.h

@@ -0,0 +1,28 @@
+
+//{{BLOCK(mug_08)
+
+//======================================================================
+//
+//	mug_08, 32x32@4, 
+//	+ palette 16 entries, not compressed
+//	+ 16 tiles lz77 compressed
+//	Total size: 32 + 504 = 536
+//
+//	Time-stamp: 2017-08-31, 14:41:59
+//	Exported by Cearn's GBA Image Transmogrifier, v0.8.6
+//	( http://www.coranac.com/projects/#grit )
+//
+//======================================================================
+
+#ifndef GRIT_MUG_08_H
+#define GRIT_MUG_08_H
+
+#define mug_08TilesLen 504
+extern const unsigned int mug_08Tiles[126];
+
+#define mug_08PalLen 32
+extern const unsigned short mug_08Pal[16];
+
+#endif // GRIT_MUG_08_H
+
+//}}BLOCK(mug_08)

generated_image/mugshots/mug_09.h

@@ -0,0 +1,28 @@
+
+//{{BLOCK(mug_09)
+
+//======================================================================
+//
+//	mug_09, 32x32@4, 
+//	+ palette 16 entries, not compressed
+//	+ 16 tiles lz77 compressed
+//	Total size: 32 + 468 = 500
+//
+//	Time-stamp: 2017-08-31, 14:41:59
+//	Exported by Cearn's GBA Image Transmogrifier, v0.8.6
+//	( http://www.coranac.com/projects/#grit )
+//
+//======================================================================
+
+#ifndef GRIT_MUG_09_H
+#define GRIT_MUG_09_H
+
+#define mug_09TilesLen 468
+extern const unsigned int mug_09Tiles[117];
+
+#define mug_09PalLen 32
+extern const unsigned short mug_09Pal[16];
+
+#endif // GRIT_MUG_09_H
+
+//}}BLOCK(mug_09)

generated_image/titlescreen/title_sprite_sky.h

@@ -0,0 +1,28 @@
+
+//{{BLOCK(title_sprite_sky)
+
+//======================================================================
+//
+//	title_sprite_sky, 16x160@4, 
+//	+ palette 16 entries, not compressed
+//	+ 40 tiles lz77 compressed
+//	Total size: 32 + 780 = 812
+//
+//	Time-stamp: 2017-08-31, 14:41:57
+//	Exported by Cearn's GBA Image Transmogrifier, v0.8.6
+//	( http://www.coranac.com/projects/#grit )
+//
+//======================================================================
+
+#ifndef GRIT_TITLE_SPRITE_SKY_H
+#define GRIT_TITLE_SPRITE_SKY_H
+
+#define title_sprite_skyTilesLen 780
+extern const unsigned int title_sprite_skyTiles[195];
+
+#define title_sprite_skyPalLen 32
+extern const unsigned short title_sprite_skyPal[16];
+
+#endif // GRIT_TITLE_SPRITE_SKY_H
+
+//}}BLOCK(title_sprite_sky)

generated_image/titlescreen/title_tileset_background.h

@@ -0,0 +1,28 @@
+
+//{{BLOCK(title_tileset_background)
+
+//======================================================================
+//
+//	title_tileset_background, 256x160@4, 
+//	+ 255 tiles (t|f reduced) lz77 compressed
+//	+ regular map (flat), lz77 compressed, 32x20 
+//	Total size: 2456 + 736 = 3192
+//
+//	Time-stamp: 2017-08-31, 14:41:56
+//	Exported by Cearn's GBA Image Transmogrifier, v0.8.6
+//	( http://www.coranac.com/projects/#grit )
+//
+//======================================================================
+
+#ifndef GRIT_TITLE_TILESET_BACKGROUND_H
+#define GRIT_TITLE_TILESET_BACKGROUND_H
+
+#define title_tileset_backgroundTilesLen 2456
+extern const unsigned int title_tileset_backgroundTiles[614];
+
+#define title_tileset_backgroundMapLen 736
+extern const unsigned short title_tileset_backgroundMap[368];
+
+#endif // GRIT_TITLE_TILESET_BACKGROUND_H
+
+//}}BLOCK(title_tileset_background)

generated_image/titlescreen/title_tileset_latias_latios_deoxys.h

@@ -0,0 +1,28 @@
+
+//{{BLOCK(title_tileset_latias_latios_deoxys)
+
+//======================================================================
+//
+//	title_tileset_latias_latios_deoxys, 256x160@4, 
+//	+ 296 tiles (t|f reduced) lz77 compressed
+//	+ regular map (flat), lz77 compressed, 32x20 
+//	Total size: 5656 + 784 = 6440
+//
+//	Time-stamp: 2017-08-31, 14:41:57
+//	Exported by Cearn's GBA Image Transmogrifier, v0.8.6
+//	( http://www.coranac.com/projects/#grit )
+//
+//======================================================================
+
+#ifndef GRIT_TITLE_TILESET_LATIAS_LATIOS_DEOXYS_H
+#define GRIT_TITLE_TILESET_LATIAS_LATIOS_DEOXYS_H
+
+#define title_tileset_latias_latios_deoxysTilesLen 5656
+extern const unsigned int title_tileset_latias_latios_deoxysTiles[1414];
+
+#define title_tileset_latias_latios_deoxysMapLen 784
+extern const unsigned short title_tileset_latias_latios_deoxysMap[392];
+
+#endif // GRIT_TITLE_TILESET_LATIAS_LATIOS_DEOXYS_H
+
+//}}BLOCK(title_tileset_latias_latios_deoxys)

generated_image/titlescreen/title_tileset_logo_name.h

@@ -0,0 +1,28 @@
+
+//{{BLOCK(title_tileset_logo_name)
+
+//======================================================================
+//
+//	title_tileset_logo_name, 256x160@8, 
+//	+ 168 tiles (t|f reduced) lz77 compressed
+//	+ regular map (flat), lz77 compressed, 32x20 
+//	Total size: 3616 + 500 = 4116
+//
+//	Time-stamp: 2017-08-31, 14:41:57
+//	Exported by Cearn's GBA Image Transmogrifier, v0.8.6
+//	( http://www.coranac.com/projects/#grit )
+//
+//======================================================================
+
+#ifndef GRIT_TITLE_TILESET_LOGO_NAME_H
+#define GRIT_TITLE_TILESET_LOGO_NAME_H
+
+#define title_tileset_logo_nameTilesLen 3616
+extern const unsigned int title_tileset_logo_nameTiles[904];
+
+#define title_tileset_logo_nameMapLen 500
+extern const unsigned short title_tileset_logo_nameMap[250];
+
+#endif // GRIT_TITLE_TILESET_LOGO_NAME_H
+
+//}}BLOCK(title_tileset_logo_name)

generated_image/titlescreen/title_tileset_press_start.h

@@ -0,0 +1,28 @@
+
+//{{BLOCK(title_tileset_press_start)
+
+//======================================================================
+//
+//	title_tileset_press_start, 256x160@4, 
+//	+ 35 tiles (t|f reduced) lz77 compressed
+//	+ regular map (flat), lz77 compressed, 32x20 
+//	Total size: 676 + 240 = 916
+//
+//	Time-stamp: 2017-08-31, 14:41:56
+//	Exported by Cearn's GBA Image Transmogrifier, v0.8.6
+//	( http://www.coranac.com/projects/#grit )
+//
+//======================================================================
+
+#ifndef GRIT_TITLE_TILESET_PRESS_START_H
+#define GRIT_TITLE_TILESET_PRESS_START_H
+
+#define title_tileset_press_startTilesLen 676
+extern const unsigned int title_tileset_press_startTiles[169];
+
+#define title_tileset_press_startMapLen 240
+extern const unsigned short title_tileset_press_startMap[120];
+
+#endif // GRIT_TITLE_TILESET_PRESS_START_H
+
+//}}BLOCK(title_tileset_press_start)

main.asm

@@ -1,11 +1,11 @@
 .gba
 .thumb
 .open "base/bpre0.gba","build/pkmn_sots.gba",0x08000000
-
 //exclude for now
 //.include "patches/split_physical_special.asm"
 .include "patches/hooks.asm"
 
+.include "patches/maps.asm"
 
 .include "patches/dynamic_overworld_hooks.asm"
 

makefile

@@ -10,6 +10,9 @@ PREPROC := @preproc
 VBA		:= vba
 LAN	:= de
 STRAGB	:= string2agb
+PYPROJS := @python ../tools/v_tools/pyproj2s.py
+PYMAPS	:= @python ../tools/v_tools/pymap2s.py
+PYSETS	:= @python ../tools/v_tools/pyset2s.py
 
 export PATH := $(realpath ../tools):$(PATH)
 
@@ -21,7 +24,7 @@ AUTO_ASSET_ROOT := sots-private/assets/images
 
 CHARMAP := charmap.txt
 
-DEFINES   := -DBPRE -DSOFTWARE_VERSION=0
+DEFINES   := -DBPRE -DSOFTWARE_VERSION=0 -DLAN_DE
 ASFLAGS   := -mthumb
 CFLAGS    := -mthumb -mthumb-interwork -g -mcpu=arm7tdmi -fno-inline -fdiagnostics-show-option -fdiagnostics-color -mlong-calls -march=armv4t -Og -std=c11 -Wall -Wextra -Wunreachable-code -I$(PAGB_INCLUDE) -Isrc/include -Igenerated_image -fdiagnostics-color $(DEFINES)
 GRITFLAGS := -ftc -fa
@@ -32,7 +35,9 @@ SOURCEDIR := src
 STRINGDIR := string
 MAPROOT	  := sots-private/map
 MAPMAPS	  := $(MAPROOT)/maps
-MAPTS	  := $(MAPROOT)/tilesets
+MAPTS	  := $(MAPROOT)/tileset
+MAP_PROJ	:= $(MAPROOT)/sots.json
+SCRIPTROOT := $(MAPROOT)/script
 
 MAIN_OBJ  := $(BLDPATH)/linked.o
 B_ENGINE  := battle_engine/build/linked.o
@@ -53,14 +58,28 @@ rwildcard=$(wildcard $1$2) $(foreach d,$(wildcard $1*),$(call rwildcard,$d/,$2))
 
 IMAGES=$(call rwildcard,$(AUTO_ASSET_ROOT),*.png)
 
+TSPNG=$(call rwildcard,$(MAPTS)/,*.png)
+TS_GEN_SRC	:= $(TSPNG:%.png=%.s)
+TS_GEN_O	:= $(TSPNG:%.png=$(BLDPATH)/%.o)
+
 GEN_SRC		:= $(IMAGES:$(AUTO_ASSET_ROOT)/%.png=generated_image/%.c)
 ASM_SRC     := $(call rwildcard,src/,*.s)
 C_SRC       := $(call rwildcard,src/,*.c)
 DATA_SRC    := $(call rwildcard,data/,*.s)
 STRING		:= $(call rwildcard,string/$(LAN)/,*.txt)
 STRING_SRC	:= $(STRING:%.txt=%.s)
-SCRIPT_SRC	:= $(call rwildcard,$(MAPMAPS)/,*.s)
+SCRIPT_SRC	:= $(call rwildcard,$(SCRIPTROOT)/,*.s)
+
+MAP_PROJ_S	:= $(MAP_PROJ:%.json=%.s)
+MAP_PROJ_O	:= $(MAP_PROJ:%.json=$(BLDPATH)/%.o)
 
+MAP_FILES	:= $(call rwildcard,$(MAPMAPS)/,*.pmh)
+MAP_FILES_S	:= $(MAP_FILES:%.pmh=%.s)
+MAP_FILES_O	:= $(MAP_FILES:%.pmh=$(BLDPATH)/%.o)
+
+TS_FILES	:= $(call rwildcard,$(MAPTS)/,*.pts)
+TS_FILES_S	:= $(TS_FILES:%.pts=%.s)
+TS_FILES_O	:= $(TS_FILES:%.pts=$(BLDPATH)/%.o)
 
 GEN_OBJ		:= $(GEN_SRC:%.c=$(BLDPATH)/%.o)
 STRING_OBJ	:= $(STRING_SRC:%.s=$(BLDPATH)/%.o)
@@ -68,7 +87,15 @@ ASM_OBJ     := $(ASM_SRC:%.s=$(BLDPATH)/%.o)
 C_OBJ       := $(C_SRC:%.c=$(BLDPATH)/%.o)
 DATA_OBJ    := $(DATA_SRC:%.s=$(BLDPATH)/%.o)
 SCRIPT_OBJ	:= $(SCRIPT_SRC:%.s=$(BLDPATH)/%.o)
-ALL_OBJ     := $(GEN_OBJ) $(C_OBJ) $(ASM_OBJ) $(DATA_OBJ) $(STRING_OBJ) $(SCRIPT_OBJ)
+ALL_OBJ     := $(GEN_OBJ) $(C_OBJ) $(ASM_OBJ) $(DATA_OBJ) $(STRING_OBJ) $(SCRIPT_OBJ) $(MAP_PROJ_O) $(MAP_FILES_O) $(TS_FILES_O) $(TS_GEN_O)
+
+$(MAPMAPS)/%.s: $(MAPMAPS)/%.pmh
+	@echo -e "\e[96mGenerating map $<\e[0m"
+	$(PYMAPS) -o $@ $<
+
+$(MAPTS)/%.s: $(MAPTS)/%.pts
+	@echo -e "\e[94mGenerating tileset $<\e[0m"
+	$(PYSETS) -o $@ $<
 
 $(STRINGDIR)/%.s: $(STRINGDIR)/%.txt
 	@echo -e "\e[93mGenerating strings $<\e[0m"
@@ -86,6 +113,10 @@ $(BLDPATH)/%.o: %.s
 	$(CC) $(CFLAGS) -c -x assembler-with-cpp $*.i -o $@
 	@rm -f $*.i
 
+$(MAPTS)/%.s: $(MAPTS)/%.png
+	@echo -e "\e[34mProcessing image (tileset) $<\e[0m"
+	$(GRIT) $< -o $@ -fts -gzl -pz! -pu16 -gB4 -m! -mR!
+
 generated_image/%.c: $(AUTO_ASSET_ROOT)/%.png $(AUTO_ASSET_ROOT)/%.grit
 	@echo -e "\e[34mProcessing image $<\e[0m"
 	$(shell mkdir -p $(dir $@))
@@ -104,6 +135,7 @@ rom: main.asm $(MAIN_OBJ)
 	$(NM) $(BLDPATH)/linked.o -n -g --defined-only | \
 		sed -e '{s/^/0x/g};{/.*\sA\s.*/d};{s/\sT\s/ /g}' > $(OUTPATH)/__symbols.sym
 	@echo "*** SUCCESSFULLY BUILT PROJECT ***"
+	@echo "*** REMOVING INTERMEDIATE FILES ***"
 	
 $(MAIN_OBJ): $(ALL_OBJ) $(ICONS_AR) $(SPRITES) $(MUSIC_AR) $(SMPL_AR) $(VOICE_AR) $(LIST_AR) $(CRY_AR) $()#$(B_ENGINE)
 	$(MAKE) -f assets.makefile
@@ -112,6 +144,10 @@ $(MAIN_OBJ): $(ALL_OBJ) $(ICONS_AR) $(SPRITES) $(MUSIC_AR) $(SMPL_AR) $(VOICE_AR
 	$(LD) $(LDFLAGS) -T $(PAGB_LINK) -T linker.ld -T bpre.sym --whole-archive -r -o $@ --start-group -T $(TMP_LD) --end-group
 	@rm -f $(TMP_LD)
 
+$(MAP_PROJ_S): $(MAP_PROJ)
+	@echo -e "\e[91mGenerating map project $<\e[0m"
+	$(PYPROJS) -b sovereign_banks -f sovereign_footer -o $@ $<
+
 .PHONY: $(B_ENGINE)
 $(B_ENGINE):
 	$(MAKE) -C battle_engine build/linked.o
@@ -131,35 +167,47 @@ clean:
 
 .PHONY: $(ASSETS)
 $(ASSETS):
+	@echo -e "\e[95mMaking Assets\e[0m"
 	$(MAKE) -f assets.makefile
 
 .PHONY: $(SPRITES)
 $(SPRITES):
+	@echo -e "\e[95mMaking Sprites\e[0m"
 	$(MAKE) -f sprites.makefile
 
 .PHONY: $(ICONS_AR)
 $(ICONS_AR):
+	@echo -e "\e[95mMaking Icons\e[0m"
 	$(MAKE) -f icons.makefile
 
 .PHONY: $(MUSIC_AR)
 $(MUSIC_AR):
+	@echo -e "\e[95mMaking Music\e[0m"
 	$(MAKE) -C $(dir $@) all
 
 .PHONY: $(SMPL_AR)
 $(SMPL_AR):
+	@echo -e "\e[95mMaking Sampler\e[0m"
 	$(MAKE) -C $(dir $@) all
 
 .PHONY: $(VOICE_AR)
 $(VOICE_AR):
+	@echo -e "\e[95mMaking Voice\e[0m"
 	$(MAKE) -C $(dir $@) all
 
 .PHONY: $(LIST_AR)
 $(LIST_AR):
+	@echo -e "\e[95mMaking Songlist\e[0m"
 	$(MAKE) -C $(dir $@) all
 
 .PHONY: $(CRY_AR)
 $(CRY_AR):
+	@echo -e "\e[95mMaking Cries\e[0m"
 	$(MAKE) -C $(dir $@) all
 
+.PHONY: constants
+constants:
+	python ../tools/v_tools/constants.py src/include/
+
 run: rom
 	$(VBA) "build/pkmn_sots.gba"

patches/dynamic_overworld_hooks.asm

@@ -255,11 +255,10 @@ bx r5
 
 .pool
 
-.org 0x08007280
+/*.org 0x08007280
 ldr r1, =obj_delete_and_free_tiles_hook|1
 bx r1
-
-.pool
+.pool*/
 
 .org 0x0800779A
 ldr r1, =obj_delete_all_hook|1
@@ -277,5 +276,24 @@ bx r0
 
 bxr4:
 bx r4
+.pool
 
+/*.org 0x0808265C
+ldr r3, =ov_emot_load|1
+bx r3
+.pool*/
+
+/*.org 0x08083614
+ldr r1, =oec01_load_pal_impl|1
+bx r1
+.pool
+
+.org 0x0808365C
+ldr r1, =oec02_load_pal_impl|1
+bx r1
+.pool*/
+
+.org 0x0805E510
+ldr r1, =npc_delete_obj_and_free_tiles_for_npc_hack|1
+bx r1
 .pool

patches/game_engine/quick_hacks.asm

@@ -72,13 +72,24 @@ PLAYER_S_M EQU 0
 .word 0x00000000
 
 .org 0x08054A08
-//.byte 0x7
+.byte 0x7
 
 .org 0x08054A00
-//.byte 0x13
+.byte 0x13
 
 .org 0x08054A04
-//.byte 0x5
+.byte 0x5
 
 .org 0x08054A06
-//.byte 0x0
+.byte 0x0
+
+.org 0x0807F5EC
+.word scr_whiteout_mom
+
+.org 0x0807F5CC
+.word scr_whiteout_center
+
+.org 0x080BFD54
+ldr r0, =whiteout_hook|1
+bx r0
+.pool

patches/maps.asm

@@ -0,0 +1,13 @@
+/* all map bank table symbols and map footer tables go here */
+
+.org 0x0805524C
+.word sovereign_banks
+
+.org 0x08055194
+.word sovereign_footer
+
+.org 0x080C0C94
+.word map_name_table
+
+.org 0x080C4DB8
+.word map_name_table

patches/overworlds/overworld.asm

@@ -16,10 +16,10 @@ strb r0, [r4]
 ldrb r0, [r5, #3]
 strb r0, [r4, #0x1A]
 
-.org 0x0805E510
+/*.org 0x0805E510
     ldr r1, =overworld_h_two+1
     bx r1
-    .pool
+    .pool*/
 
 .org 0x0805E744
     lsl r4, r4, #0x10

sots-private

@@ -1 +1 @@
-Subproject commit 04d6d99a48f025594551fe535770abbc3b9d8075
+Subproject commit f9e6ee59b56752bf25f71986a0fcd69690992ff2

src/game_engine/whiteout_hook.s

@@ -0,0 +1,33 @@
+#include <config.h>
+
+.align 2
+.thumb
+.text
+
+.global whiteout_hook
+whiteout_hook:
+ldr r0, =HEALING_BANK_MAP_VAR
+bl var_get_rekt
+lsl r1, r0, #0x18
+lsr r0, r0, #8
+lsr r1, r1, #0x18
+strb r1, [r4]
+strb r0, [r4,#1]
+mov r0, #0xFF
+strb r0, [r4, #2]
+ldr r0, =HEALING_X_VAR
+bl var_get_rekt
+lsl r0, #0x10
+lsr r0, #0x10
+strh r0, [r4, #4]
+ldr r0, =HEALING_Y_VAR
+bl var_get_rekt
+lsl r0, #0x10
+lsr r0, #0x10
+strh r0, [r4,#6]
+ldr r0, =0x080BFDF5
+bx r0
+
+var_get_rekt:
+ldr r1, =var_get
+bx r1

src/include/hiddenflags.h

@@ -0,0 +1,7 @@
+#include <script_language.h>
+
+.macro sethiddenflags
+setflag 0x501
+setflag 0x507
+setflag 0x509
+.endm

src/include/mugssprites.h

@@ -0,0 +1,15 @@
+#ifndef MUG_IDS_H_
+#define MUG_IDS_H_
+
+#define MUG_NOAH 0x1
+#define MUG_EMMA 0x2
+#define MUG_LINDA 0x3
+#define MUG_IDAN 0x4
+#define MUG_ACHIM 0x5
+#define MUG_NORMAN 0x6
+#define MUG_JANA 0x7
+#define MUG_VORSTAND 0x8
+#define MUG_VORSTANDIN 0x9
+#define MUG_DIANA 0xA
+
+#endif /* MUG_IDS_H */

src/include/pymap_constants.h

@@ -1336,17 +1336,17 @@
 .equ REGENMUT, 0x55
 .equ KAELTEWAHN, 0x56
 .equ SANDHERZ, 0x57
-.equ WANDLUNGSK., 0x58
+.equ WANDLUNGSKUNST, 0x58
 .equ TOLLWUT, 0x59
 .equ ZEITSPIEL, 0x5a
 .equ STROLCH, 0x5b
-.equ ORKANSCHW., 0x5c
+.equ ORKANSCHWINGE, 0x5c
 .equ DUNKLE_MAGIE, 0x5d
 .equ LERNFAEHIG, 0x5e
 .equ HAGELALARM, 0x5f
 .equ HOCHMUT, 0x60
 .equ AP_SPARER, 0x61
-.equ TAKTIKWECHS., 0x62
+.equ TAKTIKWECHSEL, 0x62
 .equ LUZID, 0x63
 .equ UNGEBROCHEN, 0x64
 .equ LEBENSRAEUBER, 0x65
@@ -1358,9 +1358,6 @@
 .equ ALLROUNDER, 0x6b
 .equ HITZEWAHN, 0x6c
 .equ GIFTWAHN, 0x6d
-.equ XXX, 0x6e
-.equ XXX, 0x6f
-.equ XXX, 0x70
 
 
 
@@ -1593,9 +1590,9 @@
 .equ MUS_KAMPF_GEGEN_TRAINER_HOENN, 0x10a
 .equ MUS_CHANEIRA_TANZ, 0x10b
 .equ MUS_SOUND_GLUCKWUNSCH, 0x10c
-.equ MUS_SOUND_GLUCKWUNSCH, 0x10d
+.equ MUS_SOUND_GLUCKWUNSCH_TWO, 0x10d
 .equ MUS_VERRUCKTER_SOUND, 0x10e
-.equ MUS_VERRUCKTER_SOUND, 0x10f
+.equ MUS_VERRUCKTER_SOUND_TWO, 0x10f
 .equ MUS_KOMMT_MIT_SPIELER_WIRD_HERUMGEFUHRT, 0x110
 .equ MUS_SPIELHALLE, 0x111
 .equ MUS_ROCKET_HQ_AND_AZURIA_HOHLE_AND_TOP_4_BRUNO, 0x112
@@ -1702,9 +1699,9 @@
 .equ BEHAVIOUR_UMHERBLICKEN, 0x1
 .equ BEHAVIOUR_HERUMGEHEN, 0x2
 .equ BEHAVIOUR_GEHE_AUF_UND_AB, 0x3
-.equ BEHAVIOUR_GEHE_AUF_UND_AB, 0x4
+.equ BEHAVIOUR_GEHE_AUF_UND_AB_TWO, 0x4
 .equ BEHAVIOUR_GEHE_HIN_UND_HER, 0x5
-.equ BEHAVIOUR_GEHE_HIN_UND_HER, 0x6
+.equ BEHAVIOUR_GEHE_HIN_UND_HER_TWO, 0x6
 .equ BEHAVIOUR_BLICKE_NACH_OBEN, 0x7
 .equ BEHAVIOUR_BLICKE_NACH_UNTEN, 0x8
 .equ BEHAVIOUR_BLICKE_NACH_LINKS, 0x9
@@ -1724,9 +1721,9 @@
 .equ BEHAVIOUR_BLICKE_RUNDUM_GEGEN_DEN_UHRZEIGERSINN, 0x17
 .equ BEHAVIOUR_BLICKE_RUNDUM_IM_UHRZEIGERSINN, 0x18
 .equ BEHAVIOUR_LAUFE_AUF_UND_AB, 0x19
-.equ BEHAVIOUR_LAUFE_AUF_UND_AB, 0x1a
+.equ BEHAVIOUR_LAUFE_AUF_UND_AB_TWO, 0x1a
 .equ BEHAVIOUR_LAUFE_HIN_UND_HER, 0x1b
-.equ BEHAVIOUR_LAUFE_HIN_UND_HER, 0x1c
+.equ BEHAVIOUR_LAUFE_HIN_UND_HER_TWO, 0x1c
 .equ BEHAVIOUR_LAUFE_HOCH__RECHTS__LINKS__RUNTER, 0x1d
 .equ BEHAVIOUR_LAUFE_RECHTS__LINKS__HOCH__RUNTER, 0x1e
 .equ BEHAVIOUR_LAUFE_RUNTER__HOCH__RECHTS__LINKS, 0x1f
@@ -1737,31 +1734,31 @@
 .equ BEHAVIOUR_LAUFE_RECHTS__RUNTER__HOCH__LINKS, 0x24
 .equ BEHAVIOUR_LAUFE_LINKS__HOCH__RUNTER__RECHTS, 0x25
 .equ BEHAVIOUR_LAUFE_HOCH__RUNTER__RECHTS__LINKS, 0x26
-.equ BEHAVIOUR_LAUFE_RECHTS__LINKS__HOCH__RUNTER, 0x27
+.equ BEHAVIOUR_LAUFE_RECHTS__LINKS__HOCH__RUNTER_TWO, 0x27
 .equ BEHAVIOUR_LAUFE_RUNTER__RECHTS__LINKS__HOCH, 0x28
 .equ BEHAVIOUR_LAUFE_RECHTS__HOCH__RUNTER__LINKS, 0x29
 .equ BEHAVIOUR_LAUFE_HOCH__RUNTER__LINKS__RECHTS, 0x2a
 .equ BEHAVIOUR_LAUFE_LINKS__RECHTS__HOCH__RUNTER, 0x2b
 .equ BEHAVIOUR_LAUFE_RUNTER__LINKS__RECHTS__HOCH, 0x2c
 .equ BEHAVIOUR_LAUFE_GEGEN_DEN_UHRZEIGERSINN, 0x2d
-.equ BEHAVIOUR_LAUFE_GEGEN_DEN_UHRZEIGERSINN, 0x2e
-.equ BEHAVIOUR_LAUFE_GEGEN_DEN_UHRZEIGERSINN, 0x2f
-.equ BEHAVIOUR_LAUFE_GEGEN_DEN_UHRZEIGERSINN, 0x30
-.equ BEHAVIOUR_LAUFE_GEGEN_DEN_UHRZEIGERSINN, 0x31
+.equ BEHAVIOUR_LAUFE_GEGEN_DEN_UHRZEIGERSINN_TWO, 0x2e
+.equ BEHAVIOUR_LAUFE_GEGEN_DEN_UHRZEIGERSINN_THREE, 0x2f
+.equ BEHAVIOUR_LAUFE_GEGEN_DEN_UHRZEIGERSINN_FOUR, 0x30
+.equ BEHAVIOUR_LAUFE_GEGEN_DEN_UHRZEIGERSINN_FIVE, 0x31
 .equ BEHAVIOUR_LAUFE_IM_UHRZEIGERSINN, 0x32
-.equ BEHAVIOUR_LAUFE_IM_UHRZEIGERSINN, 0x33
-.equ BEHAVIOUR_LAUFE_IM_UHRZEIGERSINN, 0x34
+.equ BEHAVIOUR_LAUFE_IM_UHRZEIGERSINN_TWO, 0x33
+.equ BEHAVIOUR_LAUFE_IM_UHRZEIGERSINN_THREE, 0x34
 .equ BEHAVIOUR_SPIELER_KOPIEREN, 0x35
 .equ BEHAVIOUR_SPIELER_SPIEGELN, 0x36
-.equ BEHAVIOUR_SPIELER_SPIEGELN, 0x37
-.equ BEHAVIOUR_SPIELER_SPIEGELN, 0x38
+.equ BEHAVIOUR_SPIELER_SPIEGELN_TWO, 0x37
+.equ BEHAVIOUR_SPIELER_SPIEGELN_THREE, 0x38
 .equ BEHAVIOUR_BAUM_WAND_VERKLEIDUNG, 0x39
 .equ BEHAVIOUR_FELS_WAND_VERKLEIDUNG, 0x3a
 .equ BEHAVIOUR_SPIELER_SPIEGELN_IM_STAND, 0x3b
-.equ BEHAVIOUR_SPIELER_KOPIEREN_IM_STAND, 0x3c
-.equ BEHAVIOUR_SPIELER_SPIEGELN_IM_STAND, 0x3d
-.equ BEHAVIOUR_SPIELER_SPIEGELN_IM_STAND, 0x3e
-.equ BEHAVIOUR_VERSTECKT, 0x3f
+.equ BEHAVIOUR_SPIELER_KOPIEREN_IM_STAND_TWO, 0x3c
+.equ BEHAVIOUR_SPIELER_SPIEGELN_IM_STAND_THREE, 0x3d
+.equ BEHAVIOUR_SPIELER_SPIEGELN_IM_STAND_FOUR, 0x3e
+.equ BEHAVIOUR_VERSTECKT_TWO, 0x3f
 .equ BEHAVIOUR_AUF_DER_STELLE_GEHEN_UNTEN, 0x40
 .equ BEHAVIOUR_AUF_DER_STELLE_GEHEN_OBEN, 0x41
 .equ BEHAVIOUR_AUF_DER_STELLE_GEHEN_LINKS, 0x42
@@ -1774,11 +1771,11 @@
 .equ BEHAVIOUR_AUF_DER_STELLE_LAUFEN_OBEN, 0x49
 .equ BEHAVIOUR_AUF_DER_STELLE_LAUFEN_LINKS, 0x4a
 .equ BEHAVIOUR_AUF_DER_STELLE_LAUFEN_RECHTS, 0x4b
-.equ BEHAVIOUR_VERSTECKT, 0x4c
+.equ BEHAVIOUR_VERSTECKT_THREE, 0x4c
 .equ BEHAVIOUR_AUF_DER_STELLE_GEHEN_UNTEN_, 0x4d
 .equ BEHAVIOUR_AUF_DER_STELLE_GEHEN_OBEN_, 0x4e
 .equ BEHAVIOUR_AUF_DER_STELLE_GEHEN_LINKS_, 0x4f
-.equ BEHAVIOUR_AUF_DER_STELLE_GEHEN_RECHTS, 0x50
+.equ BEHAVIOUR_AUF_DER_STELLE_GEHEN_RECHTS_TWO, 0x50
 
 
 
@@ -1789,111 +1786,6 @@
 .equ MAP_MERIANA_CITY, 0x59
 .equ MAP_AKTANIA, 0x5a
 .equ MAP_SILVANIA, 0x5b
-.equ MAP_KASKADA, 0x5c
-.equ MAP_ORINA_CITY, 0x5d
-.equ MAP_INFERIOR, 0x5e
-.equ MAP_CEOMETRIA, 0x5f
-.equ MAP_ZINNOBERINSEL, 0x60
-.equ MAP_INDIGO_PLATEAU, 0x61
-.equ MAP_SAFFRONIA_CITY, 0x62
-.equ MAP_ROUTE_4, 0x63
-.equ MAP_ROUTE_10, 0x64
-.equ MAP_ROUTE_1, 0x65
-.equ MAP_ROUTE_3, 0x66
-.equ MAP_FELSIGE_OEDNIS, 0x67
-.equ MAP_ROUTE_4, 0x68
-.equ MAP_ROUTE_5, 0x69
-.equ MAP_ROUTE_6, 0x6a
-.equ MAP_ROUTE_7, 0x6b
-.equ MAP_ROUTE_8, 0x6c
-.equ MAP_ROUTE_9, 0x6d
-.equ MAP_ROUTE_10, 0x6e
-.equ MAP_ROUTE_11, 0x6f
-.equ MAP_ROUTE_12, 0x70
-.equ MAP_ROUTE_13, 0x71
-.equ MAP_ROUTE_14, 0x72
-.equ MAP_ROUTE_15, 0x73
-.equ MAP_ROUTE_16, 0x74
-.equ MAP_ROUTE_17, 0x75
-.equ MAP_ROUTE_18, 0x76
-.equ MAP_ROUTE_19, 0x77
-.equ MAP_ROUTE_20, 0x78
-.equ MAP_ROUTE_21, 0x79
-.equ MAP_ROUTE_2, 0x7a
-.equ MAP_ROUTE_23, 0x7b
-.equ MAP_ROUTE_24, 0x7c
-.equ MAP_ROUTE_25, 0x7d
-.equ MAP_SILVANIA_WALD, 0x7e
-.equ MAP_PKMN_FRIEDHOF, 0x7f
-.equ MAP_KUESTENBERG, 0x80
-.equ MAP_ASCHHAIN, 0x81
-.equ MAP_TUNNELPFAD, 0x82
-.equ MAP_WASSERPFAD, 0x83
-.equ MAP_SIEGESSTRASSE, 0x84
-.equ MAP_ROCKET_HQ, 0x85
-.equ MAP_SILPH_CO., 0x86
-.equ MAP_KUESTENBERG, 0x87
-.equ MAP_SAFARI_ZONE, 0x88
-.equ MAP_POKEMON_LIGA, 0x89
-.equ MAP_VULCANO, 0x8a
-.equ MAP_SEESCHAUMINSELN, 0x8b
-.equ MAP_POKEMON_TURM, 0x8c
-.equ MAP_AZURIA_HOEHLE, 0x8d
-.equ MAP_KRAFTWERK, 0x8e
-.equ MAP_EILAND_EINS, 0x8f
-.equ MAP_EILAND_ZWEI, 0x90
-.equ MAP_EILAND_DREI, 0x91
-.equ MAP_EILAND_VIER, 0x92
-.equ MAP_EILAND_FUENF, 0x93
-.equ MAP_EILAND_SIEBEN, 0x94
-.equ MAP_EILAND_SECHS, 0x95
-.equ MAP_GLUEHWEG, 0x96
-.equ MAP_SCHATZGESTADE, 0x97
-.equ MAP_KAP_KANTE, 0x98
-.equ MAP_BUNDBRUECKE, 0x99
-.equ MAP_TRI_EILAND_HAFEN, 0x9a
-.equ MAP_SEVII_EILAND_6, 0x9b
-.equ MAP_SEVII_EILAND_7, 0x9c
-.equ MAP_SEVII_EILAND_8, 0x9d
-.equ MAP_SEVII_EILAND_9, 0x9e
-.equ MAP_FERIENPARADIES, 0x9f
-.equ MAP_WASSERIRRGARTEN, 0xa0
-.equ MAP_EILAND_5_WEIDE, 0xa1
-.equ MAP_TRAINERSCHULE, 0xa2
-.equ MAP_FERN_EILAND, 0xa3
-.equ MAP_GRUENER_PFAD, 0xa4
-.equ MAP_WASSERWEG, 0xa5
-.equ MAP_RUINENTAL, 0xa6
-.equ MAP_TRAINERTURM, 0xa7
-.equ MAP_SCHLUCHTEINGANG, 0xa8
-.equ MAP_7_SCHATZSCHLUCHT, 0xa9
-.equ MAP_TANIBO_RUINEN, 0xaa
-.equ MAP_SEVII_EILAND_22, 0xab
-.equ MAP_SEVII_EILAND_23, 0xac
-.equ MAP_SEVII_EILAND_24, 0xad
-.equ MAP_NABELFELS, 0xae
-.equ MAP_GLUTBERG, 0xaf
-.equ MAP_BEERENFORST, 0xb0
-.equ MAP_EISKASKADENHOEHLE, 0xb1
-.equ MAP_ROCKET_LAGER, 0xb2
-.equ MAP_TRAINERTURM, 0xb3
-.equ MAP_PUNKTLOCH, 0xb4
-.equ MAP_VERLORENE_HOEHLE, 0xb5
-.equ MAP_MUSTERBUSCHWALD, 0xb6
-.equ MAP_WANDELHOEHLE, 0xb7
-.equ MAP_TANIBO_KAMMER, 0xb8
-.equ MAP_TRI_EILAND_PFAD, 0xb9
-.equ MAP_TANIBO_SCHLUESSEL, 0xba
-.equ MAP_ENTSTEHUNGSINSEL, 0xbb
-.equ MAP_WUESTENKAMMER, 0xbc
-.equ MAP_PEZWULP_KAMMER, 0xbd
-.equ MAP_DREICKE_KAMMER, 0xbe
-.equ MAP_VIERZISSE_KAMMER, 0xbf
-.equ MAP_FUENIBISKU_KAMMER, 0xc0
-.equ MAP_LILECHS_KAMMER, 0xc1
-.equ MAP_ARC_SCRIM, 0xc2
-.equ MAP_GLUTTHERME, 0xc3
-.equ MAP_PRISMANIA_EINK, 0xc4
 
 
 

src/include/script_language.h

@@ -1,5 +1,13 @@
+#ifndef SCRIPT_LANG_H_
+#define SCRIPT_LANG_H_
+
 #include <config.h>
 #include <applymovements.h>
+#include <hiddenflags.h>
+#include <mugssprites.h>
+
+@@ Costum Specials
+.equ SP_BATCHMAPTILE, 0x7
 
 @@ Compare operands
 .equ B_LT, 0x0
@@ -9,24 +17,114 @@
 .equ B_GE, 0x4
 .equ B_NE, 0x5
 
+@@ Important flags
+.equ FLAG_PKMN_MENU, 0x828
+.equ FLAG_POKDEX, 0x829
+.equ FLAG_RUNNING_SHOES, 0x82F
+.equ FLAG_ORDEN_1, 0x820
+.equ FLAG_ORDEN_2, 0x821
+.equ FLAG_ORDEN_3, 0x822
+.equ FLAG_ORDEN_4, 0x823
+.equ FLAG_ORDEN_5, 0x824
+.equ FLAG_ORDEN_6, 0x825
+.equ FLAG_ORDEN_7, 0x826
+.equ FLAG_ORDEN_8, 0x827
+
 @@ Flag operands
 .equ B_T, 0x0
 .equ B_F, 0x1
 
 @@ callstd alias
-.equ ITEM_OBTAIN, 0
-.equ ITEM_FIND, 1
-.equ MSG_FACE, 2
-.equ MSG_SIGN, 3
-.equ MSG_KEYOPEN, 4
-.equ MSG_YES_NO, 5
-.equ MSG_STD, 6
-
+.equ ITEM_OBTAIN, 0x0
+.equ ITEM_FIND, 0x1
+.equ MSG_FACE, 0x2
+.equ MSG_SIGN, 0x3
+.equ MSG_KEYOPEN, 0x4
+.equ MSG_YES_NO, 0x5
+.equ MSG_STD, 0x6
+
+@@ Definition
+.equ MUGFACE_LEFT, 0x0
+.equ MUGFACE_RIGHT, 0x1
+
+@@ Effect
+.equ EFFECT_NORMAL, 0x0
+.equ EFFECT_GREY, 0x1
+.equ EFFECT_SERPIA, 0x2
 
 @@@@@@@@@@@@@@@@@ Macro
 
 @@ Custom commands
 
+.macro batchmaptile batchmaptile_tiles_from:req batchmaptile_tiles_to:req batchmaptile_kollision_from:req batchmaptile_kollision_to:req
+setvar 0x8000 \batchmaptile_tiles_from
+setvar 0x8001 \batchmaptile_tiles_to
+setvar 0x8002 \batchmaptile_kollision_from
+setvar 0x8003 \batchmaptile_kollision_to
+setvar 0x5006 SP_BATCHMAPTILE
+special 0x68
+.endm
+
+.macro seteffect seteffect_effect_id:req
+writebytetooffset \seteffect_effect_id 0x02036E28
+.endm
+
+.macro setecutscene
+writebytetooffset 0x80 0x4000044
+writebytetooffset 0x20 0x4000045
+.endm
+
+.macro clearcutscene
+writebytetooffset 0xFF 0x4000044
+writebytetooffset 0x00 0x4000045
+.endm
+
+.macro pokemsg pokemsg_string:req pokemsg_callstd:req pokemsg_ID:req
+checksound
+cry \pokemsg_ID 0x0
+showpokepic \pokemsg_ID 0x0 0x5
+loadpointer 0x0 \pokemsg_string
+callstd \pokemsg_callstd
+hidepokepic
+waitcry
+.endm
+
+.macro earthquake earthquake_horri:req earthquake_tiles:req earthquake_sec:req earthquake_vert:req
+setvar 0x8004 \earthquake_horri
+setvar 0x8005 \earthquake_tiles
+setvar 0x8006 \earthquake_sec
+setvar 0x8007 \earthquake_vert
+special 0x136
+.endm
+
+.macro lookbattle lookbattle_id:req lookbattle_before:req lookbattle_after:req
+trainerbattle 0x0 \lookbattle_id 0x0 \lookbattle_before \lookbattle_after
+.endm
+
+.macro gymbattle gymbattle_id:req gymbattle_before:req gymbattle_after:req
+trainerbattle 0x1 \gymbattle_id 0x0 \gymbattle_before \gymbattle_after \gymbattle_later
+.endm
+
+.macro betweenbattle betweenbattle_id:req betweenbattle_before:req betweenbattle_after:req betweenbattle_between:req
+trainerbattle 0x2 \betweenbattle_id 0x0 \betweenbattle_before \betweenbattle_after \betweenbattle_between
+.endm
+
+.macro scriptbattle scriptbattle_id:req scriptbattle_after:req
+trainerbattle 0x3 \scriptbattle_id 0x0 \scriptbattle_after
+.endm
+
+.macro doublebattle doublebattle_id:req doublebattle_before:req doublebattle_after:req doublebattle_onepoke:req
+trainerbattle 0x4 \doublebattle_id 0x0 \doublebattle_before \doublebattle_after \doublebattle_onepoke
+.endm
+
+.macro doublegymbattle doublegymbattle_id:req doublegymbattle_before:req doublegymbattle_after:req doublegymbattle_later:req doublegymbattle_onepoke:req
+trainerbattle 0x8 \doublegymbattle_id 0x0 \doublegymbattle_before \doublegymbattle_after \doublegymbattle_later \doublegymbattle_onepoke
+.endm
+
+.macro winlosebattle winlosebattle_id:req winlosebattle_win:req winlosebattle_lose:req
+trainerbattle 0x9 \winlosebattle_id 0x3 \winlosebattle_win \winlosebattle_lose
+.endm
+
 .macro msgbox msgbox_textpointer:req msgbox_callstd:req
 loadpointer 0x0 \msgbox_textpointer
 callstd \msgbox_callstd
@@ -56,19 +154,37 @@ special 0x137
 waitstate
 .endm
 
-.macro msgmugr msgmugr_textpointer:req msgmugr_callstd:req msgmugr_sprite:req
-setvar MUGHSOT_1_TABLE \msgmugr_sprite
+.macro wildbattlemusic wildbattlemusic_spezies:req wildbattlemusic_level:req wildbattlemusic_item:req wildbattlemusic_music:req
+setwildbattle \wildbattlemusic_spezies \wildbattlemusic_level \wildbattlemusic_item
+special 0x138
+playsong \wildbattlemusic_music 0x0
+.endm
+
+.macro costumtrainerbattlemusic costumtrainerbattlemusic_id:req
+special 0x3B
+playsong \costumtrainerbattlemusic_id 0x0
+.endm
+
+.macro mugmsgr mugmsgr_textpointer:req mugmsgr_callstd:req mugmsgr_sprite:req
+setvar MUGHSOT_1_TABLE \mugmsgr_sprite
 setvar MUGSHOT_1_X 0xD0
 setvar MUGSHOT_1_Y 0x60
-msgbox \msgmugr_textpointer \msgmugr_callstd
+msgbox \mugmsgr_textpointer \mugmsgr_callstd
 setvar MUGHSOT_1_TABLE 0x0
 .endm
 
-.macro msgmugl msgmugl_textpointer:req msgmugl_callstd:req msgmugl_sprite:req
-setvar MUGHSOT_1_TABLE \msgmugl_sprite
+.macro mugmsgl mugmsgl_textpointer:req mugmsgl_callstd:req mugmsgl_sprite:req
+setvar MUGHSOT_1_TABLE \mugmsgl_sprite | 0x8000
 setvar MUGSHOT_1_X 0x16
 setvar MUGSHOT_1_Y 0x60
-msgbox \msgmugl_textpointer \msgmugl_callstd
+msgbox \mugmsgl_textpointer \mugmsgl_callstd
+setvar MUGHSOT_1_TABLE 0x0
+.endm
+
+.macro mugrival mugrival_textpointer:req mugrival_callstd:req mugrival_facing:req
+setvar 0x8000 \mugrival_facing
+call scr_mugrival
+msgbox \mugrival_textpointer \mugrival_callstd
 setvar MUGHSOT_1_TABLE 0x0
 .endm
 
@@ -104,24 +220,6 @@ setflag FLAG_WALK_SCRIPT
 clearflag FLAG_WALK_SCRIPT
 .endm
 
-.macro writemusikto1 writemusikto1_from:req writemusikto1_to:req
-setflag FLAG_ENABLE_MUSIC_OVERRIDES
-setvar VAR_FROM_1 \writemusikto1_from
-setvar VAR_TO_1 \writemusikto1_to
-.endm
-
-.macro writemusikto2 writemusikto2_from:req writemusikto2_to:req
-setflag FLAG_ENABLE_MUSIC_OVERRIDES
-setvar VAR_FROM_2 \writemusikto2_from
-setvar VAR_TO_2 \writemusikto2_to
-.endm
-
-.macro writemusikto3 writemusikto3_from:req writemusikto3_to:req
-setflag FLAG_ENABLE_MUSIC_OVERRIDES
-setvar VAR_FROM_3 \writemusikto3_from
-setvar VAR_TO_3 \writemusikto3_to
-.endm
-
 .macro writemusikwithmapmusik writemusikwithmapmusik_mapmusik:req
 setflag FLAG_ENABLE_MUSIC_OVERRIDES
 setvar VAR_FROM_1 \writemusikwithmapmusik_mapmusik
@@ -132,10 +230,6 @@ setvar VAR_TO_1 MUS_SKIP_PLAY
 clearflag FLAG_ENABLE_MUSIC_OVERRIDES
 .endm
 
-
-
-
-
 @@ Index commands
 
 .macro nop
@@ -164,13 +258,13 @@ clearflag FLAG_ENABLE_MUSIC_OVERRIDES
 .word \goto_address
 .endm
 
-.macro callif if1_value:req if1_pointer:req
+.macro gotoif if1_value:req if1_pointer:req
 .byte 0x6
 .byte \if1_value
 .word \if1_pointer
 .endm
 
-.macro gotoif if2_value:req if2_pointer:req
+.macro callif if2_value:req if2_pointer:req
 .byte 0x7
 .byte \if2_value
 .word \if2_pointer
@@ -514,7 +608,7 @@ clearflag FLAG_ENABLE_MUSIC_OVERRIDES
 .byte \spriteface_facing
 .endm
 
-.macro trainerbattle trainerbattle_kind:req trainerbattle_id:req trainerbattle_value:req trainerbattle_before:req trainerbattle_after:req trainerbattle_later
+.macro trainerbattle trainerbattle_kind:req trainerbattle_id:req trainerbattle_value:req trainerbattle_before:req trainerbattle_after trainerbattle_later trainerbattle_onepoke
 .byte 0x5C
 .byte \trainerbattle_kind
 .hword \trainerbattle_id
@@ -522,6 +616,7 @@ clearflag FLAG_ENABLE_MUSIC_OVERRIDES
 .word \trainerbattle_before
 .word \trainerbattle_after
 .word \trainerbattle_later
+.word \trainerbattle_onepoke
 .endm
 
 .macro repeattrainerbattle
@@ -814,9 +909,10 @@ clearflag FLAG_ENABLE_MUSIC_OVERRIDES
 .hword \checkanimation_animation
 .endm
 
-.macro sethealingplace sethealingplace_flightspot:req
-.byte 0x9F
-.hword \sethealingplace_flightspot
+.macro sethealingplace shp_bank:req shp_map:req shp_x:req shp_y:req
+    setvar HEALING_BANK_MAP_VAR \shp_map << 8 | \shp_bank
+    setvar HEALING_X_VAR \shp_x
+    setvar HEALING_Y_VAR \shp_y
 .endm
 
 .macro checkgender
@@ -945,3 +1041,5 @@ clearflag FLAG_ENABLE_MUSIC_OVERRIDES
 .hword \bufferitems_item
 .hword \bufferitems_quantity
 .endm
+
+#endif

src/overworld/dyn_npc_hooks.S

@@ -6,9 +6,16 @@
 obj_delete_and_free_tiles_hook:
 	push {r4-r7,lr}
 	mov r5, r0
+	ldr r0, [r5, #0x14] @template
+	ldr r1, =0x8231D00 @ template for empty OBJ
+	cmp r0, r1
+	beq no_entry_remove
     ldrb r0, [r5,#5]
+	ldr r1, [r5, #0x14]
+	ldrh r1, [r1,#2] @tag
     lsr r0, #4
     bl npc_dynamic_remove_entry
+no_entry_remove:
 	mov r0, r5
 	add r0, #0x3E
 	ldrb r1, [r0]
@@ -17,12 +24,12 @@ obj_delete_and_free_tiles_hook:
 
 .global obj_delete_all_hook
 obj_delete_all_hook:
-ldr r1, =obj_delete
-bl bxr1
-bl npc_dynamic_reset
-pop {r4-r5}
-pop {r0}
-bx r0
+	ldr r1, =obj_delete
+	bl bxr1
+	bl npc_dynamic_reset
+	pop {r4-r5}
+	pop {r0}
+	bx r0
 
 bxr1:
 bx r1

src/overworld/dyn_npc_hooks.s

@@ -6,9 +6,16 @@
 obj_delete_and_free_tiles_hook:
 	push {r4-r7,lr}
 	mov r5, r0
+	ldr r0, [r5, #0x14] @template
+	ldr r1, =0x8231D00 @ template for empty OBJ
+	cmp r0, r1
+	beq no_entry_remove
     ldrb r0, [r5,#5]
+	ldr r1, [r5, #0x14]
+	ldrh r1, [r1,#2] @tag
     lsr r0, #4
     bl npc_dynamic_remove_entry
+no_entry_remove:
 	mov r0, r5
 	add r0, #0x3E
 	ldrb r1, [r0]
@@ -17,12 +24,12 @@ obj_delete_and_free_tiles_hook:
 
 .global obj_delete_all_hook
 obj_delete_all_hook:
-ldr r1, =obj_delete
-bl bxr1
-bl npc_dynamic_reset
-pop {r4-r5}
-pop {r0}
-bx r0
+	ldr r1, =obj_delete
+	bl bxr1
+	bl npc_dynamic_reset
+	pop {r4-r5}
+	pop {r0}
+	bx r0
 
 bxr1:
 bx r1

src/overworld/dynamic_overworld.c

@@ -62,6 +62,18 @@ u8 npc_dynamic_load_palette(u16 tag) {
     return (u8)store_entry;
 }
 
+void ov_emot_load(struct Object *obj, u16 a2, u8 a3) {
+    (void)npc_dynamic_load_palette(0x1100);
+    obj->final_oam.priority = 2;
+    obj->bitfield2 |= 2;
+    obj->priv[0] = oe_state.effect_pos.x;
+    obj->priv[1] = oe_state.effect_pos.y;
+    obj->priv[2] = oe_state.priority;
+    obj->priv[3] = -5;
+    obj->priv[7] = a2;
+    obj_anim_image_start(obj, a3);
+}
+
 void npc_dynamic_reset() {
     for (u8 i = 0; i < MAX_PAL_STORE; ++i) {
         stored_palettes[i].reference_count = 0;
@@ -87,14 +99,19 @@ void npc_restore_state(u8 id, u16 x, u16 y) {
     }
 
     struct NpcState *npc_to_load = &npc_states[id];
-    struct NpcType *type_to_load = npc_get_type(((u16)npc_to_load->type_id) | (((u16)npc_to_load->field1A << 8)));
+    u16 type_id = ((u16)npc_to_load->type_id) | (((u16)npc_to_load->field1A << 8));
+    struct NpcType *type_to_load = npc_get_type(type_id);
 
     struct Template template_to_load;
     u32 f14;
-    npc_to_objtemplate__with_indexed_objfunc(npc_to_load->type_id, npc_to_load->running_behavior, &template_to_load,
-                                             &f14);
+    npc_to_objtemplate__with_indexed_objfunc(type_id, npc_to_load->running_behavior, &template_to_load, &f14);
     template_to_load.pal_tag = 0xFFFF;
     s8 pal_slot = npc_dynamic_load_palette(type_to_load->pal_num);
+
+    /*template_to_load.pal_tag = type_to_load->pal_num;
+    gpu_pal_obj_alloc_tag_and_apply(&npc_palettes[npc_pal_idx_for_given_tag(type_to_load->pal_num)]);
+    u8 pal_slot = gpu_pal_tags_index_of(type_to_load->pal_num);*/
+
     u8 obj_id = template_instanciate_forward_search(&template_to_load, 0, 0, 0);
 
     if (obj_id == 64)
@@ -113,7 +130,7 @@ void npc_restore_state(u8 id, u16 x, u16 y) {
     }
 
     if (f14 != 0) {
-        (void) obj_set_f18_to_r0_f42_to_40(npc_obj, f14);
+        (void)obj_set_f18_to_r0_f42_to_40(npc_obj, f14);
     }
 
     npc_obj->final_oam.palette_num = pal_slot;
@@ -135,11 +152,16 @@ u8 npc_spawn_with_provided_template(struct RomNpc *npc, struct Template *templat
 
     struct NpcState *created_state = &npc_states[state];
     struct NpcType *type = npc_get_type(created_state->type_id | (npc->field3 << 8));
+
     s8 pal_slot = npc_dynamic_load_palette(type->pal_num);
 
+    // gpu_pal_obj_alloc_tag_and_apply(&npc_palettes[npc_pal_idx_for_given_tag(type->pal_num)]);
+    // u8 pal_slot = gpu_pal_tags_index_of(type->pal_num);
+
     if (created_state->running_behavior == 76)
         created_state->field1 |= 0x20;
     template->pal_tag = 0xFFFF;
+    // template->pal_tag = type->pal_num;
     u8 obj_id = template_instanciate_forward_search(template, 0, 0, 0);
     if (obj_id == 64) {
         created_state->bitfield &= 0xFE;
@@ -168,3 +190,44 @@ u8 npc_spawn_with_provided_template(struct RomNpc *npc, struct Template *templat
     npc_obj_offscreen_culling_and_flag_update(created_state, npc_object);
     return state;
 }
+
+void oec01_load_pal_impl(u32 *oe_script) {
+    struct SpritePalette *pal = (struct SpritePalette *)oe_read_word(oe_script);
+    s8 allocated = npc_dynamic_find_palette(pal->tag);
+    if (allocated == -1)
+        allocated = npc_dynamic_allocate_palette(pal->tag);
+    if (allocated > 0) {
+        gpu_pal_apply(pal->data, 256 + (16 * allocated), 32);
+        tint_palette_switch(allocated);
+        palette_obj_807AA8C(allocated);
+    } else {
+        dprintf("ERROR: RAN OUT OF PALETTES FOR DYNAMIC SYSTEM\n");
+    }
+    *oe_script += 4;
+}
+
+void oec02_load_pal_impl(u32 *oe_script) {
+    struct SpritePalette *pal = (struct SpritePalette *)oe_read_word(oe_script);
+    s8 allocated = npc_dynamic_find_palette(pal->tag);
+    if (allocated == -1)
+        allocated = npc_dynamic_allocate_palette(pal->tag);
+    if (allocated > 0) {
+        gpu_pal_apply(pal->data, 256 + (16 * allocated), 32);
+        tint_palette_switch(allocated);
+    } else {
+        dprintf("ERROR: RAN OUT OF PALETTES FOR DYNAMIC SYSTEM\n");
+    }
+    *oe_script += 4;
+}
+
+void npc_delete_obj_and_free_tiles_for_npc_hack(struct NpcState *state) {
+    struct SpriteTiles tiles;
+    u16 npc_id = ((u16)state->type_id) | (((u16)state->field1A << 8));
+    struct NpcType *type = npc_get_type(npc_id);
+    tiles.size = type->field_6;
+    objects[state->oam_id].gfx_table = &tiles;
+    u8 pal_num = objects[state->oam_id].final_oam.palette_num;
+    obj_delete_and_free(&objects[state->oam_id]);
+    npc_dynamic_remove_entry(pal_num);
+    dprintf("deleted npc state at x: %d y: %d\n", state->to.x, state->to.y);
+}