update hesperia mapscript, add new script_language makros

generated_image/bootscreen/boot_tileset.h

@@ -9,7 +9,7 @@
 //	+ regular map (flat), lz77 compressed, 32x20 
 //	Total size: 32 + 672 + 412 = 1116
 //
-//	Time-stamp: 2017-08-29, 15:28:28
+//	Time-stamp: 2017-08-31, 14:41:54
 //	Exported by Cearn's GBA Image Transmogrifier, v0.8.6
 //	( http://www.coranac.com/projects/#grit )
 //

generated_image/char/bag/hero_bag.h

@@ -8,7 +8,7 @@
 //	+ 384 tiles lz77 compressed
 //	Total size: 40 + 3564 = 3604
 //
-//	Time-stamp: 2017-08-29, 15:28:32
+//	Time-stamp: 2017-08-31, 14:41:57
 //	Exported by Cearn's GBA Image Transmogrifier, v0.8.6
 //	( http://www.coranac.com/projects/#grit )
 //

generated_image/char/bag/heroine_bag.h

@@ -8,7 +8,7 @@
 //	+ 384 tiles lz77 compressed
 //	Total size: 40 + 4044 = 4084
 //
-//	Time-stamp: 2017-08-29, 15:28:32
+//	Time-stamp: 2017-08-31, 14:41:57
 //	Exported by Cearn's GBA Image Transmogrifier, v0.8.6
 //	( http://www.coranac.com/projects/#grit )
 //

generated_image/char/throw_out/hero_backsprite.h

@@ -8,7 +8,7 @@
 //	+ 320 tiles not compressed
 //	Total size: 40 + 10240 = 10280
 //
-//	Time-stamp: 2017-08-29, 15:28:32
+//	Time-stamp: 2017-08-31, 14:41:58
 //	Exported by Cearn's GBA Image Transmogrifier, v0.8.6
 //	( http://www.coranac.com/projects/#grit )
 //

generated_image/char/throw_out/heroine_backsprite.h

@@ -8,7 +8,7 @@
 //	+ 320 tiles not compressed
 //	Total size: 40 + 10240 = 10280
 //
-//	Time-stamp: 2017-08-29, 15:28:33
+//	Time-stamp: 2017-08-31, 14:41:58
 //	Exported by Cearn's GBA Image Transmogrifier, v0.8.6
 //	( http://www.coranac.com/projects/#grit )
 //

generated_image/cutscene_meteor/met_background.h

@@ -10,7 +10,7 @@
 //	+ regular map (flat), lz77 compressed, 32x20 
 //	Total size: 12 + 20 + 164 = 196
 //
-//	Time-stamp: 2017-08-29, 15:28:30
+//	Time-stamp: 2017-08-31, 14:41:55
 //	Exported by Cearn's GBA Image Transmogrifier, v0.8.6
 //	( http://www.coranac.com/projects/#grit )
 //

generated_image/cutscene_meteor/met_clouds.h

@@ -9,7 +9,7 @@
 //	+ regular map (flat), lz77 compressed, 32x20 
 //	Total size: 28 + 448 + 256 = 732
 //
-//	Time-stamp: 2017-08-29, 15:28:31
+//	Time-stamp: 2017-08-31, 14:41:56
 //	Exported by Cearn's GBA Image Transmogrifier, v0.8.6
 //	( http://www.coranac.com/projects/#grit )
 //

generated_image/cutscene_meteor/met_foreground.h

@@ -9,7 +9,7 @@
 //	+ regular map (flat), lz77 compressed, 32x20 
 //	Total size: 36 + 2356 + 464 = 2856
 //
-//	Time-stamp: 2017-08-29, 15:28:30
+//	Time-stamp: 2017-08-31, 14:41:55
 //	Exported by Cearn's GBA Image Transmogrifier, v0.8.6
 //	( http://www.coranac.com/projects/#grit )
 //

generated_image/cutscene_meteor/met_foreground_red.h

@@ -8,7 +8,7 @@
 //	+ 640 tiles not compressed
 //	Total size: 512 + 40960 = 41472
 //
-//	Time-stamp: 2017-08-29, 15:28:30
+//	Time-stamp: 2017-08-31, 14:41:55
 //	Exported by Cearn's GBA Image Transmogrifier, v0.8.6
 //	( http://www.coranac.com/projects/#grit )
 //

generated_image/cutscene_meteor/met_meteor.h

@@ -8,7 +8,7 @@
 //	+ 48 tiles lz77 compressed
 //	Total size: 32 + 1168 = 1200
 //
-//	Time-stamp: 2017-08-29, 15:28:31
+//	Time-stamp: 2017-08-31, 14:41:56
 //	Exported by Cearn's GBA Image Transmogrifier, v0.8.6
 //	( http://www.coranac.com/projects/#grit )
 //

generated_image/cutscene_meteor/met_sky.h

@@ -9,7 +9,7 @@
 //	+ regular map (flat), lz77 compressed, 32x20 
 //	Total size: 28 + 204 + 240 = 472
 //
-//	Time-stamp: 2017-08-29, 15:28:31
+//	Time-stamp: 2017-08-31, 14:41:56
 //	Exported by Cearn's GBA Image Transmogrifier, v0.8.6
 //	( http://www.coranac.com/projects/#grit )
 //

generated_image/cutscene_meteor/met_sky_red.h

@@ -8,7 +8,7 @@
 //	+ 640 tiles not compressed
 //	Total size: 512 + 40960 = 41472
 //
-//	Time-stamp: 2017-08-29, 15:28:30
+//	Time-stamp: 2017-08-31, 14:41:55
 //	Exported by Cearn's GBA Image Transmogrifier, v0.8.6
 //	( http://www.coranac.com/projects/#grit )
 //

generated_image/emoticons/emot_arrows.h

@@ -7,7 +7,7 @@
 //	+ 24 tiles not compressed
 //	Total size: 768 = 768
 //
-//	Time-stamp: 2017-08-29, 15:28:29
+//	Time-stamp: 2017-08-31, 14:41:54
 //	Exported by Cearn's GBA Image Transmogrifier, v0.8.6
 //	( http://www.coranac.com/projects/#grit )
 //

generated_image/mugshots/mug_00.h

@@ -8,7 +8,7 @@
 //	+ 16 tiles lz77 compressed
 //	Total size: 32 + 400 = 432
 //
-//	Time-stamp: 2017-08-29, 15:28:34
+//	Time-stamp: 2017-08-31, 14:41:59
 //	Exported by Cearn's GBA Image Transmogrifier, v0.8.6
 //	( http://www.coranac.com/projects/#grit )
 //

generated_image/mugshots/mug_01.h

@@ -8,7 +8,7 @@
 //	+ 16 tiles lz77 compressed
 //	Total size: 32 + 428 = 460
 //
-//	Time-stamp: 2017-08-29, 15:28:35
+//	Time-stamp: 2017-08-31, 14:42:00
 //	Exported by Cearn's GBA Image Transmogrifier, v0.8.6
 //	( http://www.coranac.com/projects/#grit )
 //

generated_image/mugshots/mug_02.h

@@ -8,7 +8,7 @@
 //	+ 16 tiles lz77 compressed
 //	Total size: 32 + 460 = 492
 //
-//	Time-stamp: 2017-08-29, 15:28:34
+//	Time-stamp: 2017-08-31, 14:41:59
 //	Exported by Cearn's GBA Image Transmogrifier, v0.8.6
 //	( http://www.coranac.com/projects/#grit )
 //

generated_image/mugshots/mug_03.h

@@ -8,7 +8,7 @@
 //	+ 16 tiles lz77 compressed
 //	Total size: 32 + 512 = 544
 //
-//	Time-stamp: 2017-08-29, 15:28:33
+//	Time-stamp: 2017-08-31, 14:41:58
 //	Exported by Cearn's GBA Image Transmogrifier, v0.8.6
 //	( http://www.coranac.com/projects/#grit )
 //

generated_image/mugshots/mug_04.h

@@ -8,7 +8,7 @@
 //	+ 16 tiles lz77 compressed
 //	Total size: 32 + 444 = 476
 //
-//	Time-stamp: 2017-08-29, 15:28:33
+//	Time-stamp: 2017-08-31, 14:41:59
 //	Exported by Cearn's GBA Image Transmogrifier, v0.8.6
 //	( http://www.coranac.com/projects/#grit )
 //

generated_image/mugshots/mug_05.h

@@ -8,7 +8,7 @@
 //	+ 16 tiles lz77 compressed
 //	Total size: 32 + 492 = 524
 //
-//	Time-stamp: 2017-08-29, 15:28:35
+//	Time-stamp: 2017-08-31, 14:42:00
 //	Exported by Cearn's GBA Image Transmogrifier, v0.8.6
 //	( http://www.coranac.com/projects/#grit )
 //

generated_image/mugshots/mug_06.h

@@ -8,7 +8,7 @@
 //	+ 16 tiles lz77 compressed
 //	Total size: 32 + 476 = 508
 //
-//	Time-stamp: 2017-08-29, 15:28:34
+//	Time-stamp: 2017-08-31, 14:41:59
 //	Exported by Cearn's GBA Image Transmogrifier, v0.8.6
 //	( http://www.coranac.com/projects/#grit )
 //

generated_image/mugshots/mug_07.h

@@ -8,7 +8,7 @@
 //	+ 16 tiles lz77 compressed
 //	Total size: 32 + 484 = 516
 //
-//	Time-stamp: 2017-08-29, 15:28:33
+//	Time-stamp: 2017-08-31, 14:41:58
 //	Exported by Cearn's GBA Image Transmogrifier, v0.8.6
 //	( http://www.coranac.com/projects/#grit )
 //

generated_image/mugshots/mug_08.h

@@ -8,7 +8,7 @@
 //	+ 16 tiles lz77 compressed
 //	Total size: 32 + 504 = 536
 //
-//	Time-stamp: 2017-08-29, 15:28:34
+//	Time-stamp: 2017-08-31, 14:41:59
 //	Exported by Cearn's GBA Image Transmogrifier, v0.8.6
 //	( http://www.coranac.com/projects/#grit )
 //

generated_image/mugshots/mug_09.h

@@ -8,7 +8,7 @@
 //	+ 16 tiles lz77 compressed
 //	Total size: 32 + 468 = 500
 //
-//	Time-stamp: 2017-08-29, 15:28:34
+//	Time-stamp: 2017-08-31, 14:41:59
 //	Exported by Cearn's GBA Image Transmogrifier, v0.8.6
 //	( http://www.coranac.com/projects/#grit )
 //

generated_image/titlescreen/title_sprite_sky.h

@@ -8,7 +8,7 @@
 //	+ 40 tiles lz77 compressed
 //	Total size: 32 + 780 = 812
 //
-//	Time-stamp: 2017-08-29, 15:28:32
+//	Time-stamp: 2017-08-31, 14:41:57
 //	Exported by Cearn's GBA Image Transmogrifier, v0.8.6
 //	( http://www.coranac.com/projects/#grit )
 //

generated_image/titlescreen/title_tileset_background.h

@@ -8,7 +8,7 @@
 //	+ regular map (flat), lz77 compressed, 32x20 
 //	Total size: 2456 + 736 = 3192
 //
-//	Time-stamp: 2017-08-29, 15:28:31
+//	Time-stamp: 2017-08-31, 14:41:56
 //	Exported by Cearn's GBA Image Transmogrifier, v0.8.6
 //	( http://www.coranac.com/projects/#grit )
 //

generated_image/titlescreen/title_tileset_latias_latios_deoxys.h

@@ -8,7 +8,7 @@
 //	+ regular map (flat), lz77 compressed, 32x20 
 //	Total size: 5656 + 784 = 6440
 //
-//	Time-stamp: 2017-08-29, 15:28:31
+//	Time-stamp: 2017-08-31, 14:41:57
 //	Exported by Cearn's GBA Image Transmogrifier, v0.8.6
 //	( http://www.coranac.com/projects/#grit )
 //

generated_image/titlescreen/title_tileset_logo_name.h

@@ -8,7 +8,7 @@
 //	+ regular map (flat), lz77 compressed, 32x20 
 //	Total size: 3616 + 500 = 4116
 //
-//	Time-stamp: 2017-08-29, 15:28:32
+//	Time-stamp: 2017-08-31, 14:41:57
 //	Exported by Cearn's GBA Image Transmogrifier, v0.8.6
 //	( http://www.coranac.com/projects/#grit )
 //

generated_image/titlescreen/title_tileset_press_start.h

@@ -8,7 +8,7 @@
 //	+ regular map (flat), lz77 compressed, 32x20 
 //	Total size: 676 + 240 = 916
 //
-//	Time-stamp: 2017-08-29, 15:28:31
+//	Time-stamp: 2017-08-31, 14:41:56
 //	Exported by Cearn's GBA Image Transmogrifier, v0.8.6
 //	( http://www.coranac.com/projects/#grit )
 //

sots-private

@@ -1 +1 @@
-Subproject commit dc898bdaa63d13e87dd158f54756b11135ac96e9
+Subproject commit 2e7288290d8843a9323c3cf7c1742809eb5b44ad

src/include/script_language.h

@@ -32,6 +32,34 @@
 
 @@ Custom commands
 
+.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
@@ -62,7 +90,7 @@ waitstate
 .endm
 
 .macro mugmsgr mugmsgr_textpointer:req mugmsgr_callstd:req mugmsgr_sprite:req
-setvar MUGHSOT_1_TABLE \mugmsgr_sprite | 0x8000
+setvar MUGHSOT_1_TABLE \mugmsgr_sprite
 setvar MUGSHOT_1_X 0xD0
 setvar MUGSHOT_1_Y 0x60
 msgbox \mugmsgr_textpointer \mugmsgr_callstd
@@ -70,7 +98,7 @@ setvar MUGHSOT_1_TABLE 0x0
 .endm
 
 .macro mugmsgl mugmsgl_textpointer:req mugmsgl_callstd:req mugmsgl_sprite:req
-setvar MUGHSOT_1_TABLE \mugmsgl_sprite
+setvar MUGHSOT_1_TABLE \mugmsgl_sprite | 0x8000
 setvar MUGSHOT_1_X 0x16
 setvar MUGSHOT_1_Y 0x60
 msgbox \mugmsgl_textpointer \mugmsgl_callstd
@@ -497,7 +525,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
@@ -505,6 +533,7 @@ clearflag FLAG_ENABLE_MUSIC_OVERRIDES
 .word \trainerbattle_before
 .word \trainerbattle_after
 .word \trainerbattle_later
+.word \trainerbattle_onepoke
 .endm
 
 .macro repeattrainerbattle