merge with battle tent update

.travis.yml

@@ -26,3 +26,5 @@ matrix:
       script:
         - ./build_tools.sh
         - make -j2 compare
+after_success:
+  - .travis/calcrom/webhook.sh pokeemerald

.travis/calcrom/calcrom.pl

@@ -0,0 +1,37 @@
+#!/usr/bin/perl
+
+(@ARGV == 1)
+    or die "ERROR: no map file specified.\n";
+open(my $file, $ARGV[0])
+    or die "ERROR: could not open file '$ARGV[0]'.\n";
+
+my $src = 0;
+my $asm = 0;
+while (my $line = <$file>)
+{
+    if ($line =~ /^ \.(\w+)\s+0x[0-9a-f]+\s+(0x[0-9a-f]+) (\w+)\/.+\.o/)
+    {
+        my $section = $1;
+        my $size = hex($2);
+        my $dir = $3;
+
+        if ($section =~ /text/)
+        {
+            if ($dir eq 'src')
+            {
+                $src += $size;
+            }
+            elsif ($dir eq 'asm')
+            {
+                $asm += $size;
+            }
+        }
+    }
+}
+
+my $total = $src + $asm;
+my $srcPct = sprintf("%.4f", 100 * $src / $total);
+my $asmPct = sprintf("%.4f", 100 * $asm / $total);
+print "$total total bytes of code\n";
+print "$src bytes of code in src ($srcPct%)\n";
+print "$asm bytes of code in asm ($asmPct%)\n";

.travis/calcrom/webhook.sh

@@ -0,0 +1,16 @@
+#!/bin/bash -ex
+
+# Only run this script if it's the master branch build.
+if [[ "$TRAVIS_BRANCH" != "master" || "$TRAVIS_PULL_REQUEST" != "false" ]]; then
+  exit 0
+fi
+
+build_name=$1
+map_file=$build_name.map
+if [ ! -f $map_file ]; then
+  echo "$map_file does not exist!"
+  exit 1
+fi
+
+output=$(perl $(dirname "$0")/calcrom.pl $build_name.map | sed -E ':a;N;$!ba;s/\r{0,1}\n/\\n/g')
+curl -d "{\"username\": \"$CALCROM_DISCORD_WEBHOOK_USERNAME\", \"avatar_url\": \"$CALCROM_DISCORD_WEBHOOK_AVATAR_URL\", \"content\":\"\`\`\`$build_name progress:\\n$output\`\`\`\"}" -H "Content-Type: application/json" -X POST $CALCROM_DISCORD_WEBHOOK_URL

Makefile

@@ -99,7 +99,7 @@ include graphics_file_rules.mk
 %.lz: % ; $(GFX) $< $@
 %.rl: % ; $(GFX) $< $@
 sound/direct_sound_samples/cry_%.bin: sound/direct_sound_samples/cry_%.aif ; $(AIF) $< $@ --compress
-%.bin: %.aif ; $(AIF) $< $@
+sound/%.bin: sound/%.aif ; $(AIF) $< $@
 sound/songs/%.s: sound/songs/%.mid
 	cd $(@D) && ../../$(MID) $(<F)
 

asm/battle_frontier_2.s

@@ -30026,7 +30026,7 @@ _081AA0A6:
 	ldr r2, =0x00000169
 	adds r0, r2
 	lsls r0, 2
-	ldr r1, =gMapAttributes
+	ldr r1, =gMapLayouts
 	adds r0, r1
 	ldr r6, [r0]
 	ldr r2, [r6, 0xC]

asm/battle_tent.s

@@ -5,586 +5,6 @@
 
 	.text
 
-	thumb_func_start sub_81B99B4
-sub_81B99B4: @ 81B99B4
-	push {lr}
-	ldr r1, =gUnknown_086160B4
-	ldr r0, =gSpecialVar_0x8004
-	ldrh r0, [r0]
-	lsls r0, 2
-	adds r0, r1
-	ldr r0, [r0]
-	bl _call_via_r0
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_81B99B4
-
-	thumb_func_start sub_81B99D4
-sub_81B99D4: @ 81B99D4
-	push {lr}
-	ldr r1, =gSaveBlock2Ptr
-	ldr r0, [r1]
-	ldr r2, =0x00000ca8
-	adds r0, r2
-	movs r2, 0
-	strb r2, [r0]
-	ldr r1, [r1]
-	ldr r3, =0x00000cb2
-	adds r0, r1, r3
-	strh r2, [r0]
-	ldr r0, =0x00000ca9
-	adds r1, r0
-	ldrb r2, [r1]
-	movs r0, 0x5
-	negs r0, r0
-	ands r0, r2
-	strb r0, [r1]
-	ldr r0, =gSaveBlock1Ptr
-	ldr r0, [r0]
-	movs r1, 0x4
-	ldrsb r1, [r0, r1]
-	movs r2, 0x5
-	ldrsb r2, [r0, r2]
-	movs r3, 0x1
-	negs r3, r3
-	movs r0, 0
-	bl saved_warp2_set
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_81B99D4
-
-	thumb_func_start sub_81B9A28
-sub_81B9A28: @ 81B9A28
-	ldr r1, =gSpecialVar_Result
-	ldr r0, =gSaveBlock2Ptr
-	ldr r0, [r0]
-	ldr r2, =0x00000e6a
-	adds r0, r2
-	ldrh r0, [r0]
-	strh r0, [r1]
-	bx lr
-	.pool
-	thumb_func_end sub_81B9A28
-
-	thumb_func_start sub_81B9A44
-sub_81B9A44: @ 81B9A44
-	ldr r0, =gSaveBlock2Ptr
-	ldr r0, [r0]
-	ldr r1, =gSpecialVar_0x8006
-	ldrh r1, [r1]
-	ldr r2, =0x00000e6a
-	adds r0, r2
-	strh r1, [r0]
-	bx lr
-	.pool
-	thumb_func_end sub_81B9A44
-
-	thumb_func_start sub_81B9A60
-sub_81B9A60: @ 81B9A60
-	push {r4,lr}
-	ldr r4, =gTrainerBattleOpponent_A
-	bl Random
-	lsls r0, 16
-	lsrs r0, 16
-	movs r1, 0xFF
-	bl __umodsi3
-	lsls r0, 16
-	lsrs r0, 16
-	lsls r1, r0, 2
-	adds r1, r0
-	lsrs r1, 6
-	strh r1, [r4]
-	ldrh r0, [r4]
-	movs r1, 0
-	bl sub_8162614
-	pop {r4}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_81B9A60
-
-	thumb_func_start sub_81B9A90
-sub_81B9A90: @ 81B9A90
-	push {lr}
-	ldr r3, =gTrainerBattleOpponent_A
-	ldrh r1, [r3]
-	ldr r0, =0x0000012b
-	cmp r1, r0
-	bhi _081B9AAC
-	ldr r2, =gUnknown_0203BC88
-	movs r0, 0x34
-	muls r1, r0
-	ldr r0, [r2]
-	adds r0, r1
-	adds r0, 0xC
-	bl ConvertBattleFrontierTrainerSpeechToString
-_081B9AAC:
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_81B9A90
-
-	thumb_func_start sub_81B9ABC
-sub_81B9ABC: @ 81B9ABC
-	push {r4,lr}
-	ldr r4, =gSaveBlock2Ptr
-	ldr r0, [r4]
-	ldr r1, =gSpecialVar_0x8005
-	ldrh r1, [r1]
-	ldr r2, =0x00000ca8
-	adds r0, r2
-	strb r1, [r0]
-	movs r0, 0x80
-	lsls r0, 7
-	movs r1, 0
-	bl VarSet
-	ldr r1, [r4]
-	ldr r0, =0x00000ca9
-	adds r1, r0
-	ldrb r0, [r1]
-	movs r2, 0x4
-	orrs r0, r2
-	strb r0, [r1]
-	bl sub_81A4C30
-	pop {r4}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_81B9ABC
-
-	thumb_func_start sub_81B9B00
-sub_81B9B00: @ 81B9B00
-	push {r4,r5,lr}
-	ldr r0, =gSaveBlock2Ptr
-	ldr r4, [r0]
-	ldr r5, =gUnknown_086160D4
-	bl Random
-	ldrh r0, [r5]
-	ldr r1, =0x00000e6a
-	adds r4, r1
-	strh r0, [r4]
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_81B9B00
-
-	thumb_func_start sub_81B9B28
-sub_81B9B28: @ 81B9B28
-	push {r4,r5,lr}
-	ldr r4, =gSaveBlock2Ptr
-	ldr r0, [r4]
-	ldr r1, =0x00000e6a
-	adds r0, r1
-	ldrh r0, [r0]
-	movs r1, 0x1
-	bl AddBagItem
-	lsls r0, 24
-	lsrs r5, r0, 24
-	cmp r5, 0x1
-	bne _081B9B70
-	ldr r0, [r4]
-	ldr r1, =0x00000e6a
-	adds r0, r1
-	ldrh r0, [r0]
-	ldr r1, =gStringVar1
-	bl CopyItemName
-	ldr r0, [r4]
-	ldr r1, =0x00000e6a
-	adds r0, r1
-	movs r1, 0
-	strh r1, [r0]
-	ldr r0, =gSpecialVar_Result
-	strh r5, [r0]
-	b _081B9B76
-	.pool
-_081B9B70:
-	ldr r1, =gSpecialVar_Result
-	movs r0, 0
-	strh r0, [r1]
-_081B9B76:
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_81B9B28
-
-	thumb_func_start sub_81B9B80
-sub_81B9B80: @ 81B9B80
-	push {lr}
-	ldr r1, =gUnknown_086160D8
-	ldr r0, =gSpecialVar_0x8004
-	ldrh r0, [r0]
-	lsls r0, 2
-	adds r0, r1
-	ldr r0, [r0]
-	bl _call_via_r0
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_81B9B80
-
-	thumb_func_start sub_81B9BA0
-sub_81B9BA0: @ 81B9BA0
-	push {lr}
-	ldr r1, =gSaveBlock2Ptr
-	ldr r0, [r1]
-	ldr r2, =0x00000ca8
-	adds r0, r2
-	movs r2, 0
-	strb r2, [r0]
-	ldr r1, [r1]
-	ldr r3, =0x00000cb2
-	adds r0, r1, r3
-	strh r2, [r0]
-	ldr r0, =0x00000ca9
-	adds r1, r0
-	ldrb r2, [r1]
-	movs r0, 0x5
-	negs r0, r0
-	ands r0, r2
-	strb r0, [r1]
-	ldr r0, =gSaveBlock1Ptr
-	ldr r0, [r0]
-	movs r1, 0x4
-	ldrsb r1, [r0, r1]
-	movs r2, 0x5
-	ldrsb r2, [r0, r2]
-	movs r3, 0x1
-	negs r3, r3
-	movs r0, 0
-	bl saved_warp2_set
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_81B9BA0
-
-	thumb_func_start sub_81B9BF4
-sub_81B9BF4: @ 81B9BF4
-	ldr r1, =gSpecialVar_Result
-	ldr r0, =gSaveBlock2Ptr
-	ldr r0, [r0]
-	ldr r2, =0x00000e6c
-	adds r0, r2
-	ldrh r0, [r0]
-	strh r0, [r1]
-	bx lr
-	.pool
-	thumb_func_end sub_81B9BF4
-
-	thumb_func_start sub_81B9C10
-sub_81B9C10: @ 81B9C10
-	ldr r0, =gSaveBlock2Ptr
-	ldr r0, [r0]
-	ldr r1, =gSpecialVar_0x8006
-	ldrh r1, [r1]
-	ldr r2, =0x00000e6c
-	adds r0, r2
-	strh r1, [r0]
-	bx lr
-	.pool
-	thumb_func_end sub_81B9C10
-
-	thumb_func_start sub_81B9C2C
-sub_81B9C2C: @ 81B9C2C
-	push {r4,lr}
-	ldr r4, =gSaveBlock2Ptr
-	ldr r0, [r4]
-	ldr r1, =gSpecialVar_0x8005
-	ldrh r1, [r1]
-	ldr r2, =0x00000ca8
-	adds r0, r2
-	strb r1, [r0]
-	movs r0, 0x80
-	lsls r0, 7
-	movs r1, 0
-	bl VarSet
-	ldr r1, [r4]
-	ldr r0, =0x00000ca9
-	adds r1, r0
-	ldrb r0, [r1]
-	movs r2, 0x4
-	orrs r0, r2
-	strb r0, [r1]
-	bl sub_81A4C30
-	pop {r4}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_81B9C2C
-
-	thumb_func_start sub_81B9C70
-sub_81B9C70: @ 81B9C70
-	push {r4,r5,lr}
-	ldr r0, =gSaveBlock2Ptr
-	ldr r4, [r0]
-	ldr r5, =gUnknown_086160F4
-	bl Random
-	ldrh r0, [r5]
-	ldr r1, =0x00000e6c
-	adds r4, r1
-	strh r0, [r4]
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_81B9C70
-
-	thumb_func_start sub_81B9C98
-sub_81B9C98: @ 81B9C98
-	push {r4,r5,lr}
-	ldr r4, =gSaveBlock2Ptr
-	ldr r0, [r4]
-	ldr r1, =0x00000e6c
-	adds r0, r1
-	ldrh r0, [r0]
-	movs r1, 0x1
-	bl AddBagItem
-	lsls r0, 24
-	lsrs r5, r0, 24
-	cmp r5, 0x1
-	bne _081B9CE0
-	ldr r0, [r4]
-	ldr r1, =0x00000e6c
-	adds r0, r1
-	ldrh r0, [r0]
-	ldr r1, =gStringVar1
-	bl CopyItemName
-	ldr r0, [r4]
-	ldr r1, =0x00000e6c
-	adds r0, r1
-	movs r1, 0
-	strh r1, [r0]
-	ldr r0, =gSpecialVar_Result
-	strh r5, [r0]
-	b _081B9CE6
-	.pool
-_081B9CE0:
-	ldr r1, =gSpecialVar_Result
-	movs r0, 0
-	strh r0, [r1]
-_081B9CE6:
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_81B9C98
-
-	thumb_func_start sub_81B9CF0
-sub_81B9CF0: @ 81B9CF0
-	push {lr}
-	ldr r0, =gStringVar1
-	ldr r1, =gTrainerBattleOpponent_A
-	ldrh r1, [r1]
-	bl GetFrontierTrainerName
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_81B9CF0
-
-	thumb_func_start sub_81B9D08
-sub_81B9D08: @ 81B9D08
-	push {lr}
-	ldr r1, =gUnknown_086160F8
-	ldr r0, =gSpecialVar_0x8004
-	ldrh r0, [r0]
-	lsls r0, 2
-	adds r0, r1
-	ldr r0, [r0]
-	bl _call_via_r0
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_81B9D08
-
-	thumb_func_start sub_81B9D28
-sub_81B9D28: @ 81B9D28
-	push {lr}
-	ldr r1, =gSaveBlock2Ptr
-	ldr r0, [r1]
-	ldr r2, =0x00000ca8
-	adds r0, r2
-	movs r2, 0
-	strb r2, [r0]
-	ldr r1, [r1]
-	ldr r3, =0x00000cb2
-	adds r0, r1, r3
-	strh r2, [r0]
-	ldr r0, =0x00000ca9
-	adds r1, r0
-	ldrb r2, [r1]
-	movs r0, 0x5
-	negs r0, r0
-	ands r0, r2
-	strb r0, [r1]
-	ldr r0, =gSaveBlock1Ptr
-	ldr r0, [r0]
-	movs r1, 0x4
-	ldrsb r1, [r0, r1]
-	movs r2, 0x5
-	ldrsb r2, [r0, r2]
-	movs r3, 0x1
-	negs r3, r3
-	movs r0, 0
-	bl saved_warp2_set
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_81B9D28
-
-	thumb_func_start sub_81B9D7C
-sub_81B9D7C: @ 81B9D7C
-	ldr r1, =gSpecialVar_Result
-	ldr r0, =gSaveBlock2Ptr
-	ldr r0, [r0]
-	ldr r2, =0x00000e6e
-	adds r0, r2
-	ldrh r0, [r0]
-	strh r0, [r1]
-	bx lr
-	.pool
-	thumb_func_end sub_81B9D7C
-
-	thumb_func_start sub_81B9D98
-sub_81B9D98: @ 81B9D98
-	ldr r0, =gSaveBlock2Ptr
-	ldr r0, [r0]
-	ldr r1, =gSpecialVar_0x8006
-	ldrh r1, [r1]
-	ldr r2, =0x00000e6e
-	adds r0, r2
-	strh r1, [r0]
-	bx lr
-	.pool
-	thumb_func_end sub_81B9D98
-
-	thumb_func_start sub_81B9DB4
-sub_81B9DB4: @ 81B9DB4
-	push {r4,lr}
-	ldr r4, =gSaveBlock2Ptr
-	ldr r0, [r4]
-	ldr r1, =gSpecialVar_0x8005
-	ldrh r1, [r1]
-	ldr r2, =0x00000ca8
-	adds r0, r2
-	strb r1, [r0]
-	movs r0, 0x80
-	lsls r0, 7
-	movs r1, 0
-	bl VarSet
-	ldr r1, [r4]
-	ldr r0, =0x00000ca9
-	adds r1, r0
-	ldrb r0, [r1]
-	movs r2, 0x4
-	orrs r0, r2
-	strb r0, [r1]
-	bl sub_81A4C30
-	pop {r4}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_81B9DB4
-
-	thumb_func_start sub_81B9DF8
-sub_81B9DF8: @ 81B9DF8
-	push {r4,r5,lr}
-	ldr r0, =gSaveBlock2Ptr
-	ldr r4, [r0]
-	ldr r5, =gUnknown_08616120
-	bl Random
-	ldrh r0, [r5]
-	ldr r1, =0x00000e6e
-	adds r4, r1
-	strh r0, [r4]
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_81B9DF8
-
-	thumb_func_start sub_81B9E20
-sub_81B9E20: @ 81B9E20
-	push {r4,r5,lr}
-	ldr r4, =gSaveBlock2Ptr
-	ldr r0, [r4]
-	ldr r1, =0x00000e6e
-	adds r0, r1
-	ldrh r0, [r0]
-	movs r1, 0x1
-	bl AddBagItem
-	lsls r0, 24
-	lsrs r5, r0, 24
-	cmp r5, 0x1
-	bne _081B9E68
-	ldr r0, [r4]
-	ldr r1, =0x00000e6e
-	adds r0, r1
-	ldrh r0, [r0]
-	ldr r1, =gStringVar1
-	bl CopyItemName
-	ldr r0, [r4]
-	ldr r1, =0x00000e6e
-	adds r0, r1
-	movs r1, 0
-	strh r1, [r0]
-	ldr r0, =gSpecialVar_Result
-	strh r5, [r0]
-	b _081B9E6E
-	.pool
-_081B9E68:
-	ldr r1, =gSpecialVar_Result
-	movs r0, 0
-	strh r0, [r1]
-_081B9E6E:
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_81B9E20
-
-	thumb_func_start sub_81B9E78
-sub_81B9E78: @ 81B9E78
-	push {lr}
-	bl ZeroPlayerPartyMons
-	bl sub_819A4F8
-	pop {r0}
-	bx r0
-	thumb_func_end sub_81B9E78
-
-	thumb_func_start sub_81B9E88
-sub_81B9E88: @ 81B9E88
-	push {lr}
-	bl sub_819DC00
-	pop {r0}
-	bx r0
-	thumb_func_end sub_81B9E88
-
-	thumb_func_start sub_81B9E94
-sub_81B9E94: @ 81B9E94
-	push {lr}
-	movs r2, 0
-	ldr r1, =gMapHeader
-	ldrb r0, [r1, 0x14]
-	cmp r0, 0x8
-	bne _081B9EB2
-	ldr r3, =0xfffffe7f
-	adds r0, r3, 0
-	ldrh r1, [r1, 0x12]
-	adds r0, r1
-	lsls r0, 16
-	lsrs r0, 16
-	cmp r0, 0x1
-	bhi _081B9EB2
-	movs r2, 0x1
-_081B9EB2:
-	adds r0, r2, 0
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end sub_81B9E94
 
 	thumb_func_start sub_81B9EC0
 sub_81B9EC0: @ 81B9EC0

data/battle_scripts_1.s

@@ -3991,7 +3991,7 @@ BattleScript_DrizzleActivates::
 	pause 0x20
 	printstring STRINGID_PKMNMADEITRAIN
 	waitstate
-	playanimation BS_BANK_0, B_ANIM_RAIN_CONTINUES, NULL
+	playanimation BS_BATTLER_0, B_ANIM_RAIN_CONTINUES, NULL
 	call BattleScript_WeatherFormChanges
 	end3
 
@@ -4019,7 +4019,7 @@ BattleScript_SandstreamActivates::
 	pause 0x20
 	printstring STRINGID_PKMNSXWHIPPEDUPSANDSTORM
 	waitstate
-	playanimation BS_BANK_0, B_ANIM_SANDSTORM_CONTINUES, NULL
+	playanimation BS_BATTLER_0, B_ANIM_SANDSTORM_CONTINUES, NULL
 	call BattleScript_WeatherFormChanges
 	end3
 
@@ -4085,7 +4085,7 @@ BattleScript_DroughtActivates::
 	pause 0x20
 	printstring STRINGID_PKMNSXINTENSIFIEDSUN
 	waitstate
-	playanimation BS_BANK_0, B_ANIM_SUN_CONTINUES, NULL
+	playanimation BS_BATTLER_0, B_ANIM_SUN_CONTINUES, NULL
 	call BattleScript_WeatherFormChanges
 	end3
 
@@ -4561,8 +4561,8 @@ BattleScript_82DB973::
 	end2
 
 BattleScript_82DB992::
-	various16 BS_BANK_0
-	various17 BS_BANK_0
+	various16 BS_BATTLER_0
+	various17 BS_BATTLER_0
 	various9 BS_ATTACKER
 	various15 BS_ATTACKER
 	printstring STRINGID_TIEDOPPONENTBYREFEREE

data/battle_tent.s

@@ -1,51 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-
-    .align 2
-gUnknown_086160B4:: @ 86160B4
-	.4byte sub_81B99D4
-	.4byte sub_81B9A28
-	.4byte sub_81B9A44
-	.4byte sub_81B9A60
-	.4byte sub_81B9A90
-	.4byte sub_81B9ABC
-	.4byte sub_81B9B00
-	.4byte sub_81B9B28
-
-    .align 2
-gUnknown_086160D4:: @ 86160D4
-	.4byte 0x00000008
-
-    .align 2
-gUnknown_086160D8:: @ 86160D8
-	.4byte sub_81B9BA0
-	.4byte sub_81B9BF4
-	.4byte sub_81B9C10
-	.4byte sub_81B9C2C
-	.4byte sub_81B9C70
-	.4byte sub_81B9C98
-	.4byte sub_81B9CF0
-
-    .align 2
-gUnknown_086160F4:: @ 86160F4
-	.4byte 0x00000015
-
-    .align 2
-gUnknown_086160F8:: @ 86160F8
-	.4byte sub_81B9D28
-	.4byte sub_81B9D7C
-	.4byte sub_81B9D98
-	.4byte sub_81B9DB4
-	.4byte sub_81B9DF8
-	.4byte sub_81B9E20
-	.4byte sub_81B9E78
-	.4byte sub_81B9E88
-	.4byte sub_81BA040
-	.4byte sub_81B9EC0
-
-    .align 2
-gUnknown_08616120:: @ 8616120
-	.4byte 0x00000017
-

data/layouts.inc

@@ -0,0 +1,441 @@
+	.include "data/layouts/PetalburgCity/layout.inc"
+	.include "data/layouts/SlateportCity/layout.inc"
+	.include "data/layouts/MauvilleCity/layout.inc"
+	.include "data/layouts/RustboroCity/layout.inc"
+	.include "data/layouts/FortreeCity/layout.inc"
+	.include "data/layouts/LilycoveCity/layout.inc"
+	.include "data/layouts/MossdeepCity/layout.inc"
+	.include "data/layouts/SootopolisCity/layout.inc"
+	.include "data/layouts/EverGrandeCity/layout.inc"
+	.include "data/layouts/LittlerootTown/layout.inc"
+	.include "data/layouts/OldaleTown/layout.inc"
+	.include "data/layouts/DewfordTown/layout.inc"
+	.include "data/layouts/LavaridgeTown/layout.inc"
+	.include "data/layouts/FallarborTown/layout.inc"
+	.include "data/layouts/VerdanturfTown/layout.inc"
+	.include "data/layouts/PacifidlogTown/layout.inc"
+	.include "data/layouts/Route101/layout.inc"
+	.include "data/layouts/Route102/layout.inc"
+	.include "data/layouts/Route103/layout.inc"
+	.include "data/layouts/Route104/layout.inc"
+	.include "data/layouts/Route105/layout.inc"
+	.include "data/layouts/Route106/layout.inc"
+	.include "data/layouts/Route107/layout.inc"
+	.include "data/layouts/Route108/layout.inc"
+	.include "data/layouts/Route109/layout.inc"
+	.include "data/layouts/Route110/layout.inc"
+	.include "data/layouts/Route111/layout.inc"
+	.include "data/layouts/Route112/layout.inc"
+	.include "data/layouts/Route113/layout.inc"
+	.include "data/layouts/Route114/layout.inc"
+	.include "data/layouts/Route115/layout.inc"
+	.include "data/layouts/Route116/layout.inc"
+	.include "data/layouts/Route117/layout.inc"
+	.include "data/layouts/Route118/layout.inc"
+	.include "data/layouts/Route119/layout.inc"
+	.include "data/layouts/Route120/layout.inc"
+	.include "data/layouts/Route121/layout.inc"
+	.include "data/layouts/Route122/layout.inc"
+	.include "data/layouts/Route123/layout.inc"
+	.include "data/layouts/Route124/layout.inc"
+	.include "data/layouts/Route125/layout.inc"
+	.include "data/layouts/Route126/layout.inc"
+	.include "data/layouts/Route127/layout.inc"
+	.include "data/layouts/Route128/layout.inc"
+	.include "data/layouts/Route129/layout.inc"
+	.include "data/layouts/UnknownMap_08417FC4/layout.inc"
+	.include "data/layouts/Route131/layout.inc"
+	.include "data/layouts/Route132/layout.inc"
+	.include "data/layouts/Route133/layout.inc"
+	.include "data/layouts/Route134/layout.inc"
+	.include "data/layouts/Underwater2/layout.inc"
+	.include "data/layouts/Underwater3/layout.inc"
+	.include "data/layouts/Underwater4/layout.inc"
+	.include "data/layouts/LittlerootTown_BrendansHouse_1F/layout.inc"
+	.include "data/layouts/LittlerootTown_BrendansHouse_2F/layout.inc"
+	.include "data/layouts/LittlerootTown_MaysHouse_1F/layout.inc"
+	.include "data/layouts/LittlerootTown_MaysHouse_2F/layout.inc"
+	.include "data/layouts/LittlerootTown_ProfessorBirchsLab/layout.inc"
+	.include "data/layouts/House1/layout.inc"
+	.include "data/layouts/House2/layout.inc"
+	.include "data/layouts/PokemonCenter_1F/layout.inc"
+	.include "data/layouts/PokemonCenter_2F/layout.inc"
+	.include "data/layouts/Mart/layout.inc"
+	.include "data/layouts/House3/layout.inc"
+	.include "data/layouts/DewfordTown_Gym/layout.inc"
+	.include "data/layouts/DewfordTown_Hall/layout.inc"
+	.include "data/layouts/House4/layout.inc"
+	.include "data/layouts/LavaridgeTown_HerbShop/layout.inc"
+	.include "data/layouts/LavaridgeTown_Gym_1F/layout.inc"
+	.include "data/layouts/LavaridgeTown_Gym_B1F/layout.inc"
+	.include "data/layouts/LavaridgeTown_PokemonCenter_1F/layout.inc"
+	.include "data/layouts/FallarborTown_LeftoverRSContestLobby/layout.inc"
+	.include "data/layouts/FallarborTown_LeftoverRSContestHall/layout.inc"
+	.include "data/layouts/LilycoveCity_House2/layout.inc"
+	.include "data/layouts/UnknownMap_08428450/layout.inc"
+	.include "data/layouts/VerdanturfTown_WandasHouse/layout.inc"
+	.include "data/layouts/PacifidlogTown_House1/layout.inc"
+	.include "data/layouts/PacifidlogTown_House2/layout.inc"
+	.include "data/layouts/PetalburgCity_Gym/layout.inc"
+	.include "data/layouts/HouseWithBed/layout.inc"
+	.include "data/layouts/SlateportCity_SternsShipyard_1F/layout.inc"
+	.include "data/layouts/SlateportCity_SternsShipyard_2F/layout.inc"
+	.include "data/layouts/UnknownMap_084294C4/layout.inc"
+	.include "data/layouts/UnknownMap_084294E8/layout.inc"
+	.include "data/layouts/SlateportCity_PokemonFanClub/layout.inc"
+	.include "data/layouts/SlateportCity_OceanicMuseum_1F/layout.inc"
+	.include "data/layouts/SlateportCity_OceanicMuseum_2F/layout.inc"
+	.include "data/layouts/Harbor/layout.inc"
+	.include "data/layouts/MauvilleCity_Gym/layout.inc"
+	.include "data/layouts/MauvilleCity_BikeShop/layout.inc"
+	.include "data/layouts/MauvilleCity_GameCorner/layout.inc"
+	.include "data/layouts/RustboroCity_DevonCorp_1F/layout.inc"
+	.include "data/layouts/RustboroCity_DevonCorp_2F/layout.inc"
+	.include "data/layouts/RustboroCity_Gym/layout.inc"
+	.include "data/layouts/RustboroCity_PokemonSchool/layout.inc"
+	.include "data/layouts/RustboroCity_House/layout.inc"
+	.include "data/layouts/RustboroCity_House1/layout.inc"
+	.include "data/layouts/RustboroCity_CuttersHouse/layout.inc"
+	.include "data/layouts/FortreeCity_House1/layout.inc"
+	.include "data/layouts/FortreeCity_Gym/layout.inc"
+	.include "data/layouts/FortreeCity_House2/layout.inc"
+	.include "data/layouts/Route104_MrBrineysHouse/layout.inc"
+	.include "data/layouts/LilycoveCity_LilycoveMuseum_1F/layout.inc"
+	.include "data/layouts/LilycoveCity_LilycoveMuseum_2F/layout.inc"
+	.include "data/layouts/LilycoveCity_ContestLobby/layout.inc"
+	.include "data/layouts/LilycoveCity_ContestHall/layout.inc"
+	.include "data/layouts/LilycoveCity_PokemonTrainerFanClub/layout.inc"
+	.include "data/layouts/MossdeepCity_Gym/layout.inc"
+	.include "data/layouts/SootopolisCity_Gym_1F/layout.inc"
+	.include "data/layouts/SootopolisCity_Gym_B1F/layout.inc"
+	.include "data/layouts/EverGrandeCity_SidneysRoom/layout.inc"
+	.include "data/layouts/EverGrandeCity_PhoebesRoom/layout.inc"
+	.include "data/layouts/EverGrandeCity_GlaciasRoom/layout.inc"
+	.include "data/layouts/EverGrandeCity_DrakesRoom/layout.inc"
+	.include "data/layouts/EverGrandeCity_ChampionsRoom/layout.inc"
+	.include "data/layouts/EverGrandeCity_ShortHall/layout.inc"
+	.include "data/layouts/Route104_PrettyPetalFlowerShop/layout.inc"
+	.include "data/layouts/CableCarStation/layout.inc"
+	.include "data/layouts/Route114_FossilManiacsHouse/layout.inc"
+	.include "data/layouts/Route114_FossilManiacsTunnel/layout.inc"
+	.include "data/layouts/Route114_LanettesHouse/layout.inc"
+	.include "data/layouts/Route116_TunnelersRestHouse/layout.inc"
+	.include "data/layouts/Route117_PokemonDayCare/layout.inc"
+	.include "data/layouts/Route121_SafariZoneEntrance/layout.inc"
+	.include "data/layouts/MeteorFalls_1F_1R/layout.inc"
+	.include "data/layouts/MeteorFalls_1F_2R/layout.inc"
+	.include "data/layouts/MeteorFalls_B1F_1R/layout.inc"
+	.include "data/layouts/MeteorFalls_B1F_2R/layout.inc"
+	.include "data/layouts/RusturfTunnel/layout.inc"
+	.include "data/layouts/Underwater_SootopolisCity/layout.inc"
+	.include "data/layouts/DesertRuins/layout.inc"
+	.include "data/layouts/GraniteCave_1F/layout.inc"
+	.include "data/layouts/GraniteCave_B1F/layout.inc"
+	.include "data/layouts/GraniteCave_B2F/layout.inc"
+	.include "data/layouts/PetalburgWoods/layout.inc"
+	.include "data/layouts/MtChimney/layout.inc"
+	.include "data/layouts/MtPyre_1F/layout.inc"
+	.include "data/layouts/MtPyre_2F/layout.inc"
+	.include "data/layouts/MtPyre_3F/layout.inc"
+	.include "data/layouts/MtPyre_4F/layout.inc"
+	.include "data/layouts/MtPyre_5F/layout.inc"
+	.include "data/layouts/MtPyre_6F/layout.inc"
+	.include "data/layouts/AquaHideout_1F/layout.inc"
+	.include "data/layouts/AquaHideout_B1F/layout.inc"
+	.include "data/layouts/AquaHideout_B2F/layout.inc"
+	.include "data/layouts/Underwater_SeafloorCavern/layout.inc"
+	.include "data/layouts/SeafloorCavern_Entrance/layout.inc"
+	.include "data/layouts/SeafloorCavern_Room1/layout.inc"
+	.include "data/layouts/SeafloorCavern_Room2/layout.inc"
+	.include "data/layouts/SeafloorCavern_Room3/layout.inc"
+	.include "data/layouts/SeafloorCavern_Room4/layout.inc"
+	.include "data/layouts/SeafloorCavern_Room5/layout.inc"
+	.include "data/layouts/SeafloorCavern_Room6/layout.inc"
+	.include "data/layouts/SeafloorCavern_Room7/layout.inc"
+	.include "data/layouts/SeafloorCavern_Room8/layout.inc"
+	.include "data/layouts/SeafloorCavern_Room9/layout.inc"
+	.include "data/layouts/CaveOfOrigin_Entrance/layout.inc"
+	.include "data/layouts/CaveOfOrigin_1F/layout.inc"
+	.include "data/layouts/CaveOfOrigin_UnusedRubySapphireMap1/layout.inc"
+	.include "data/layouts/CaveOfOrigin_UnusedRubySapphireMap2/layout.inc"
+	.include "data/layouts/CaveOfOrigin_UnusedRubySapphireMap3/layout.inc"
+	.include "data/layouts/CaveOfOrigin_B1F/layout.inc"
+	.include "data/layouts/VictoryRoad_1F/layout.inc"
+	.include "data/layouts/ShoalCave_LowTideEntranceRoom/layout.inc"
+	.include "data/layouts/ShoalCave_LowTideInnerRoom/layout.inc"
+	.include "data/layouts/ShoalCave_LowTideStairsRoom/layout.inc"
+	.include "data/layouts/ShoalCave_LowTideLowerRoom/layout.inc"
+	.include "data/layouts/ShoalCave_HighTideEntranceRoom/layout.inc"
+	.include "data/layouts/ShoalCave_HighTideInnerRoom/layout.inc"
+	.include "data/layouts/UnknownMap_0843E6C0/layout.inc"
+	.include "data/layouts/UnknownMap_0843E6E4/layout.inc"
+	.include "data/layouts/UnknownMap_0843E708/layout.inc"
+	.include "data/layouts/UnknownMap_0843E72C/layout.inc"
+	.include "data/layouts/UnknownMap_0843E750/layout.inc"
+	.include "data/layouts/UnknownMap_0843E774/layout.inc"
+	.include "data/layouts/UnknownMap_0843E798/layout.inc"
+	.include "data/layouts/UnknownMap_0843E7BC/layout.inc"
+	.include "data/layouts/UnknownMap_0843E7E0/layout.inc"
+	.include "data/layouts/UnknownMap_0843E804/layout.inc"
+	.include "data/layouts/UnknownMap_0843E828/layout.inc"
+	.include "data/layouts/UnknownMap_0843E84C/layout.inc"
+	.include "data/layouts/UnknownMap_0843E870/layout.inc"
+	.include "data/layouts/UnknownMap_0843E894/layout.inc"
+	.include "data/layouts/NewMauville_Entrance/layout.inc"
+	.include "data/layouts/NewMauville_Inside/layout.inc"
+	.include "data/layouts/AbandonedShip_Deck/layout.inc"
+	.include "data/layouts/AbandonedShip_Corridors_1F/layout.inc"
+	.include "data/layouts/AbandonedShip_Rooms_1F/layout.inc"
+	.include "data/layouts/AbandonedShip_Corridors_B1F/layout.inc"
+	.include "data/layouts/AbandonedShip_Rooms_B1F/layout.inc"
+	.include "data/layouts/AbandonedShip_Rooms2_B1F/layout.inc"
+	.include "data/layouts/AbandonedShip_Underwater1/layout.inc"
+	.include "data/layouts/AbandonedShip_Room_B1F/layout.inc"
+	.include "data/layouts/AbandonedShip_Rooms2_1F/layout.inc"
+	.include "data/layouts/AbandonedShip_CaptainsOffice/layout.inc"
+	.include "data/layouts/AbandonedShip_Underwater2/layout.inc"
+	.include "data/layouts/SecretBase_RedCave1/layout.inc"
+	.include "data/layouts/SecretBase_BrownCave1/layout.inc"
+	.include "data/layouts/SecretBase_BlueCave1/layout.inc"
+	.include "data/layouts/SecretBase_YellowCave1/layout.inc"
+	.include "data/layouts/SecretBase_Tree1/layout.inc"
+	.include "data/layouts/SecretBase_Shrub1/layout.inc"
+	.include "data/layouts/SecretBase_RedCave2/layout.inc"
+	.include "data/layouts/SecretBase_BrownCave2/layout.inc"
+	.include "data/layouts/SecretBase_BlueCave2/layout.inc"
+	.include "data/layouts/SecretBase_YellowCave2/layout.inc"
+	.include "data/layouts/SecretBase_Tree2/layout.inc"
+	.include "data/layouts/SecretBase_Shrub2/layout.inc"
+	.include "data/layouts/SecretBase_RedCave3/layout.inc"
+	.include "data/layouts/SecretBase_BrownCave3/layout.inc"
+	.include "data/layouts/SecretBase_BlueCave3/layout.inc"
+	.include "data/layouts/SecretBase_YellowCave3/layout.inc"
+	.include "data/layouts/SecretBase_Tree3/layout.inc"
+	.include "data/layouts/SecretBase_Shrub3/layout.inc"
+	.include "data/layouts/SecretBase_RedCave4/layout.inc"
+	.include "data/layouts/SecretBase_BrownCave4/layout.inc"
+	.include "data/layouts/SecretBase_BlueCave4/layout.inc"
+	.include "data/layouts/SecretBase_YellowCave4/layout.inc"
+	.include "data/layouts/SecretBase_Tree4/layout.inc"
+	.include "data/layouts/SecretBase_Shrub4/layout.inc"
+	.include "data/layouts/SingleBattleColosseum/layout.inc"
+	.include "data/layouts/TradeCenter/layout.inc"
+	.include "data/layouts/RecordCorner/layout.inc"
+	.include "data/layouts/DoubleBattleColosseum/layout.inc"
+	.include "data/layouts/LinkContestRoom1/layout.inc"
+	.include "data/layouts/UnknownMap_25_29/layout.inc"
+	.include "data/layouts/UnknownMap_25_30/layout.inc"
+	.include "data/layouts/UnknownMap_25_31/layout.inc"
+	.include "data/layouts/UnknownMap_25_32/layout.inc"
+	.include "data/layouts/UnknownMap_25_33/layout.inc"
+	.include "data/layouts/UnknownMap_25_34/layout.inc"
+	.include "data/layouts/LinkContestRoom2/layout.inc"
+	.include "data/layouts/LinkContestRoom3/layout.inc"
+	.include "data/layouts/LinkContestRoom4/layout.inc"
+	.include "data/layouts/LinkContestRoom5/layout.inc"
+	.include "data/layouts/LinkContestRoom6/layout.inc"
+	.include "data/layouts/InsideOfTruck/layout.inc"
+	.include "data/layouts/SafariZone_Northwest/layout.inc"
+	.include "data/layouts/SafariZone_North/layout.inc"
+	.include "data/layouts/SafariZone_Southwest/layout.inc"
+	.include "data/layouts/SafariZone_South/layout.inc"
+	.include "data/layouts/UnknownMap_08447028/layout.inc"
+	.include "data/layouts/Route109_SeashoreHouse/layout.inc"
+	.include "data/layouts/Route110_TrickHouseEntrance/layout.inc"
+	.include "data/layouts/Route110_TrickHouseEnd/layout.inc"
+	.include "data/layouts/Route110_TrickHouseCorridor/layout.inc"
+	.include "data/layouts/Route110_TrickHousePuzzle1/layout.inc"
+	.include "data/layouts/Route110_TrickHousePuzzle2/layout.inc"
+	.include "data/layouts/Route110_TrickHousePuzzle3/layout.inc"
+	.include "data/layouts/Route110_TrickHousePuzzle4/layout.inc"
+	.include "data/layouts/Route110_TrickHousePuzzle5/layout.inc"
+	.include "data/layouts/Route110_TrickHousePuzzle6/layout.inc"
+	.include "data/layouts/Route110_TrickHousePuzzle7/layout.inc"
+	.include "data/layouts/Route110_TrickHousePuzzle8/layout.inc"
+	.include "data/layouts/FortreeCity_DecorationShop/layout.inc"
+	.include "data/layouts/Route110_SeasideCyclingRoadEntrance/layout.inc"
+	.include "data/layouts/LilycoveCity_DepartmentStore_1F/layout.inc"
+	.include "data/layouts/LilycoveCity_DepartmentStore_2F/layout.inc"
+	.include "data/layouts/LilycoveCity_DepartmentStore_3F/layout.inc"
+	.include "data/layouts/LilycoveCity_DepartmentStore_4F/layout.inc"
+	.include "data/layouts/LilycoveCity_DepartmentStore_5F/layout.inc"
+	.include "data/layouts/LilycoveCity_DepartmentStoreRooftop/layout.inc"
+	.include "data/layouts/Route130/layout.inc"
+	.include "data/layouts/BattleFrontier_BattleTowerLobby/layout.inc"
+	.include "data/layouts/BattleFrontier_OutsideWest/layout.inc"
+	.include "data/layouts/BattleElevator/layout.inc"
+	.include "data/layouts/BattleFrontier_BattleTowerCorridor/layout.inc"
+	.include "data/layouts/BattleFrontier_BattleTowerBattleRoom/layout.inc"
+	.include "data/layouts/RustboroCity_DevonCorp_3F/layout.inc"
+	.include "data/layouts/EverGrandeCity_PokemonLeague_1F/layout.inc"
+	.include "data/layouts/Route119_WeatherInstitute_1F/layout.inc"
+	.include "data/layouts/Route119_WeatherInstitute_2F/layout.inc"
+	.include "data/layouts/LilycoveCity_DepartmentStoreElevator/layout.inc"
+	.include "data/layouts/Underwater1/layout.inc"
+	.include "data/layouts/MossdeepCity_SpaceCenter_1F/layout.inc"
+	.include "data/layouts/MossdeepCity_SpaceCenter_2F/layout.inc"
+	.include "data/layouts/SSTidalCorridor/layout.inc"
+	.include "data/layouts/SSTidalLowerDeck/layout.inc"
+	.include "data/layouts/SSTidalRooms/layout.inc"
+	.include "data/layouts/IslandCave/layout.inc"
+	.include "data/layouts/AncientTomb/layout.inc"
+	.include "data/layouts/Underwater_Route134/layout.inc"
+	.include "data/layouts/Underwater_SealedChamber/layout.inc"
+	.include "data/layouts/SealedChamber_OuterRoom/layout.inc"
+	.include "data/layouts/VictoryRoad_B1F/layout.inc"
+	.include "data/layouts/VictoryRoad_B2F/layout.inc"
+	.include "data/layouts/Route104_Prototype/layout.inc"
+	.include "data/layouts/GraniteCave_StevensRoom/layout.inc"
+	.include "data/layouts/AbandonedShip_HiddenFloorCorridors/layout.inc"
+	.include "data/layouts/SouthernIsland_Exterior/layout.inc"
+	.include "data/layouts/SouthernIsland_Interior/layout.inc"
+	.include "data/layouts/JaggedPass/layout.inc"
+	.include "data/layouts/FieryPath/layout.inc"
+	.include "data/layouts/RustboroCity_Flat2_1F/layout.inc"
+	.include "data/layouts/RustboroCity_Flat2_2F/layout.inc"
+	.include "data/layouts/RustboroCity_Flat2_3F/layout.inc"
+	.include "data/layouts/SootopolisCity_LotadAndSeedotHouse/layout.inc"
+	.include "data/layouts/EverGrandeCity_HallOfFame/layout.inc"
+	.include "data/layouts/LilycoveCity_CoveLilyMotel_1F/layout.inc"
+	.include "data/layouts/LilycoveCity_CoveLilyMotel_2F/layout.inc"
+	.include "data/layouts/Route124_DivingTreasureHuntersHouse/layout.inc"
+	.include "data/layouts/MtPyre_Exterior/layout.inc"
+	.include "data/layouts/MtPyre_Summit/layout.inc"
+	.include "data/layouts/SealedChamber_InnerRoom/layout.inc"
+	.include "data/layouts/MossdeepCity_GameCorner_1F/layout.inc"
+	.include "data/layouts/MossdeepCity_GameCorner_B1F/layout.inc"
+	.include "data/layouts/SootopolisCity_House1/layout.inc"
+	.include "data/layouts/SootopolisCity_House2/layout.inc"
+	.include "data/layouts/SootopolisCity_House3/layout.inc"
+	.include "data/layouts/AbandonedShip_HiddenFloorRooms/layout.inc"
+	.include "data/layouts/ScorchedSlab/layout.inc"
+	.include "data/layouts/UnknownMap_0845A394/layout.inc"
+	.include "data/layouts/RustboroCity_Flat1_1F/layout.inc"
+	.include "data/layouts/RustboroCity_Flat1_2F/layout.inc"
+	.include "data/layouts/EverGrandeCity_Hall4/layout.inc"
+	.include "data/layouts/AquaHideout_UnusedRubyMap1/layout.inc"
+	.include "data/layouts/AquaHideout_UnusedRubyMap2/layout.inc"
+	.include "data/layouts/AquaHideout_UnusedRubyMap3/layout.inc"
+	.include "data/layouts/UnknownMap_0845D470/layout.inc"
+	.include "data/layouts/SkyPillar_Entrance/layout.inc"
+	.include "data/layouts/SkyPillar_Outside/layout.inc"
+	.include "data/layouts/SkyPillar_1F/layout.inc"
+	.include "data/layouts/SkyPillar_2F/layout.inc"
+	.include "data/layouts/SkyPillar_3F/layout.inc"
+	.include "data/layouts/SkyPillar_4F/layout.inc"
+	.include "data/layouts/UnknownMap_0845ECB4/layout.inc"
+	.include "data/layouts/MossdeepCity_StevensHouse/layout.inc"
+	.include "data/layouts/ShoalCave_LowTideIceRoom/layout.inc"
+	.include "data/layouts/SafariZone_RestHouse/layout.inc"
+	.include "data/layouts/SkyPillar_5F/layout.inc"
+	.include "data/layouts/SkyPillar_Top/layout.inc"
+	.include "data/layouts/BattleFrontier_BattleDomeLobby/layout.inc"
+	.include "data/layouts/BattleFrontier_BattleDomeCorridor/layout.inc"
+	.include "data/layouts/BattleFrontier_BattleDomePreBattleRoom/layout.inc"
+	.include "data/layouts/BattleFrontier_BattleDomeBattleRoom/layout.inc"
+	.include "data/layouts/MagmaHideout_1F/layout.inc"
+	.include "data/layouts/MagmaHideout_2F_1R/layout.inc"
+	.include "data/layouts/MagmaHideout_2F_2R/layout.inc"
+	.include "data/layouts/MagmaHideout_3F_1R/layout.inc"
+	.include "data/layouts/MagmaHideout_3F_2R/layout.inc"
+	.include "data/layouts/MagmaHideout_4F/layout.inc"
+	.include "data/layouts/BattleFrontier_BattlePalaceLobby/layout.inc"
+	.include "data/layouts/BattleFrontier_BattlePalaceCorridor/layout.inc"
+	.include "data/layouts/BattleFrontier_BattlePalaceBattleRoom/layout.inc"
+	.include "data/layouts/BattleFrontier_OutsideEast/layout.inc"
+	.include "data/layouts/BattleFrontier_BattleFactoryLobby/layout.inc"
+	.include "data/layouts/BattleFrontier_BattleFactoryPreBattleRoom/layout.inc"
+	.include "data/layouts/BattleFrontier_BattleFactoryBattleRoom/layout.inc"
+	.include "data/layouts/BattleFrontier_BattlePikeLobby/layout.inc"
+	.include "data/layouts/BattleFrontier_BattlePikeCorridor/layout.inc"
+	.include "data/layouts/BattleFrontier_BattlePikeThreePathRoom/layout.inc"
+	.include "data/layouts/BattleFrontier_BattlePikeRandomRoom1/layout.inc"
+	.include "data/layouts/BattleFrontier_BattlePikeRandomRoom2/layout.inc"
+	.include "data/layouts/BattleFrontier_BattleArenaLobby/layout.inc"
+	.include "data/layouts/BattleFrontier_BattleArenaCorridor/layout.inc"
+	.include "data/layouts/BattleFrontier_BattleArenaBattleRoom/layout.inc"
+	.include "data/layouts/UnknownMap_08469200/layout.inc"
+	.include "data/layouts/BattleFrontier_BattlePikeRandomRoom3/layout.inc"
+	.include "data/layouts/UnknownMap_084693AC/layout.inc"
+	.include "data/layouts/BattleFrontier_BattlePyramidLobby/layout.inc"
+	.include "data/layouts/BattleFrontier_BattlePyramidEmptySquare/layout.inc"
+	.include "data/layouts/BattlePyramidSquare01/layout.inc"
+	.include "data/layouts/BattlePyramidSquare02/layout.inc"
+	.include "data/layouts/BattlePyramidSquare03/layout.inc"
+	.include "data/layouts/BattlePyramidSquare04/layout.inc"
+	.include "data/layouts/BattlePyramidSquare05/layout.inc"
+	.include "data/layouts/BattlePyramidSquare06/layout.inc"
+	.include "data/layouts/BattlePyramidSquare07/layout.inc"
+	.include "data/layouts/BattlePyramidSquare08/layout.inc"
+	.include "data/layouts/BattlePyramidSquare09/layout.inc"
+	.include "data/layouts/BattlePyramidSquare10/layout.inc"
+	.include "data/layouts/BattlePyramidSquare11/layout.inc"
+	.include "data/layouts/BattlePyramidSquare12/layout.inc"
+	.include "data/layouts/BattlePyramidSquare13/layout.inc"
+	.include "data/layouts/BattlePyramidSquare14/layout.inc"
+	.include "data/layouts/BattlePyramidSquare15/layout.inc"
+	.include "data/layouts/BattlePyramidSquare16/layout.inc"
+	.include "data/layouts/BattleFrontier_BattlePyramidTop/layout.inc"
+	.include "data/layouts/MagmaHideout_3F_3R/layout.inc"
+	.include "data/layouts/MagmaHideout_2F_3R/layout.inc"
+	.include "data/layouts/MirageTower_1F/layout.inc"
+	.include "data/layouts/MirageTower_2F/layout.inc"
+	.include "data/layouts/MirageTower_3F/layout.inc"
+	.include "data/layouts/BattleTentLobby/layout.inc"
+	.include "data/layouts/BattleTentCorridor/layout.inc"
+	.include "data/layouts/BattleTentBattleRoom/layout.inc"
+	.include "data/layouts/VerdanturfTown_BattleTentBattleRoom/layout.inc"
+	.include "data/layouts/MirageTower_4F/layout.inc"
+	.include "data/layouts/DesertUnderpass/layout.inc"
+	.include "data/layouts/BattleFrontier_BattleTowerMultiBattleRoom/layout.inc"
+	.include "data/layouts/BattleFrontier_BattleTowerCorridor2/layout.inc"
+	.include "data/layouts/UnknownMap_08470BD8/layout.inc"
+	.include "data/layouts/UnionRoom/layout.inc"
+	.include "data/layouts/SafariZone_Northeast/layout.inc"
+	.include "data/layouts/SafariZone_Southeast/layout.inc"
+	.include "data/layouts/BattleFrontier_RankingHall/layout.inc"
+	.include "data/layouts/BattleFrontier_Lounge1/layout.inc"
+	.include "data/layouts/BattleFrontier_BattlePointExchangeServiceCorner/layout.inc"
+	.include "data/layouts/BattleFrontier_ReceptionGate/layout.inc"
+	.include "data/layouts/ArtisanCave_B1F/layout.inc"
+	.include "data/layouts/ArtisanCave_1F/layout.inc"
+	.include "data/layouts/FarawayIsland_Entrance/layout.inc"
+	.include "data/layouts/FarawayIsland_Interior/layout.inc"
+	.include "data/layouts/BirthIsland_Exterior/layout.inc"
+	.include "data/layouts/IslandHarbor/layout.inc"
+	.include "data/layouts/Underwater_MarineCave/layout.inc"
+	.include "data/layouts/MarineCave_Entrance/layout.inc"
+	.include "data/layouts/TerraCave_Entrance/layout.inc"
+	.include "data/layouts/TerraCave_End/layout.inc"
+	.include "data/layouts/Underwater6/layout.inc"
+	.include "data/layouts/Underwater7/layout.inc"
+	.include "data/layouts/Underwater5/layout.inc"
+	.include "data/layouts/MarineCave_End/layout.inc"
+	.include "data/layouts/TrainerHill_Entrance/layout.inc"
+	.include "data/layouts/TrainerHill_1F/layout.inc"
+	.include "data/layouts/TrainerHill_2F/layout.inc"
+	.include "data/layouts/TrainerHill_3F/layout.inc"
+	.include "data/layouts/TrainerHill_4F/layout.inc"
+	.include "data/layouts/TrainerHill_Roof/layout.inc"
+	.include "data/layouts/AlteringCave/layout.inc"
+	.include "data/layouts/NavelRock_Exterior/layout.inc"
+	.include "data/layouts/NavelRock_Entrance/layout.inc"
+	.include "data/layouts/NavelRock_Top/layout.inc"
+	.include "data/layouts/NavelRock_Bottom/layout.inc"
+	.include "data/layouts/NavelRock_LadderRoom1/layout.inc"
+	.include "data/layouts/NavelRock_LadderRoom2/layout.inc"
+	.include "data/layouts/NavelRock_B1F/layout.inc"
+	.include "data/layouts/NavelRock_Fork/layout.inc"
+	.include "data/layouts/BattleFrontier_Lounge2/layout.inc"
+	.include "data/layouts/BattleFrontier_ScottsHouse/layout.inc"
+	.include "data/layouts/MeteorFalls_StevensCave/layout.inc"
+	.include "data/layouts/UnknownMap_08480DAC/layout.inc"
+	.include "data/layouts/UnknownMap_08480F54/layout.inc"
+	.include "data/layouts/UnknownMap_084810FC/layout.inc"
+	.include "data/layouts/UnknownMap_084812A4/layout.inc"
+	.include "data/layouts/UnknownMap_0848144C/layout.inc"
+	.include "data/layouts/UnknownMap_084815F4/layout.inc"
+	.include "data/layouts/UnknownMap_08481B24/layout.inc"
+	.include "data/layouts/SootopolisCity_MysteryEventsHouse_1F/layout.inc"
+	.include "data/layouts/SootopolisCity_MysteryEventsHouse_B1F/layout.inc"
+	.include "data/layouts/UnknownMap_08481DBC/layout.inc"

data/layouts/AbandonedShip_CaptainsOffice/layout.inc

@@ -0,0 +1,15 @@
+AbandonedShip_CaptainsOffice_MapBorder::
+	.incbin "data/layouts/AbandonedShip_CaptainsOffice/border.bin"
+
+AbandonedShip_CaptainsOffice_MapBlockdata::
+	.incbin "data/layouts/AbandonedShip_CaptainsOffice/map.bin"
+
+	.align 2
+AbandonedShip_CaptainsOffice_Layout::
+	.4byte 0x9
+	.4byte 0x7
+	.4byte AbandonedShip_CaptainsOffice_MapBorder
+	.4byte AbandonedShip_CaptainsOffice_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Facility
+

data/layouts/AbandonedShip_Corridors_1F/layout.inc

@@ -0,0 +1,15 @@
+AbandonedShip_Corridors_1F_MapBorder::
+	.incbin "data/layouts/AbandonedShip_Corridors_1F/border.bin"
+
+AbandonedShip_Corridors_1F_MapBlockdata::
+	.incbin "data/layouts/AbandonedShip_Corridors_1F/map.bin"
+
+	.align 2
+AbandonedShip_Corridors_1F_Layout::
+	.4byte 0x12
+	.4byte 0xc
+	.4byte AbandonedShip_Corridors_1F_MapBorder
+	.4byte AbandonedShip_Corridors_1F_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_InsideShip
+

data/layouts/AbandonedShip_Corridors_B1F/layout.inc

@@ -0,0 +1,15 @@
+AbandonedShip_Corridors_B1F_MapBorder::
+	.incbin "data/layouts/AbandonedShip_Corridors_B1F/border.bin"
+
+AbandonedShip_Corridors_B1F_MapBlockdata::
+	.incbin "data/layouts/AbandonedShip_Corridors_B1F/map.bin"
+
+	.align 2
+AbandonedShip_Corridors_B1F_Layout::
+	.4byte 0xd
+	.4byte 0xa
+	.4byte AbandonedShip_Corridors_B1F_MapBorder
+	.4byte AbandonedShip_Corridors_B1F_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_InsideShip
+

data/layouts/AbandonedShip_Deck/layout.inc

@@ -0,0 +1,15 @@
+AbandonedShip_Deck_MapBorder::
+	.incbin "data/layouts/AbandonedShip_Deck/border.bin"
+
+AbandonedShip_Deck_MapBlockdata::
+	.incbin "data/layouts/AbandonedShip_Deck/map.bin"
+
+	.align 2
+AbandonedShip_Deck_Layout::
+	.4byte 0x17
+	.4byte 0x15
+	.4byte AbandonedShip_Deck_MapBorder
+	.4byte AbandonedShip_Deck_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Facility
+

data/layouts/AbandonedShip_HiddenFloorCorridors/layout.inc

@@ -0,0 +1,15 @@
+AbandonedShip_HiddenFloorCorridors_MapBorder::
+	.incbin "data/layouts/AbandonedShip_HiddenFloorCorridors/border.bin"
+
+AbandonedShip_HiddenFloorCorridors_MapBlockdata::
+	.incbin "data/layouts/AbandonedShip_HiddenFloorCorridors/map.bin"
+
+	.align 2
+AbandonedShip_HiddenFloorCorridors_Layout::
+	.4byte 0xd
+	.4byte 0xb
+	.4byte AbandonedShip_HiddenFloorCorridors_MapBorder
+	.4byte AbandonedShip_HiddenFloorCorridors_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_InsideShip
+

data/layouts/AbandonedShip_HiddenFloorRooms/layout.inc

@@ -0,0 +1,15 @@
+AbandonedShip_HiddenFloorRooms_MapBorder::
+	.incbin "data/layouts/AbandonedShip_HiddenFloorRooms/border.bin"
+
+AbandonedShip_HiddenFloorRooms_MapBlockdata::
+	.incbin "data/layouts/AbandonedShip_HiddenFloorRooms/map.bin"
+
+	.align 2
+AbandonedShip_HiddenFloorRooms_Layout::
+	.4byte 0x2c
+	.4byte 0xf
+	.4byte AbandonedShip_HiddenFloorRooms_MapBorder
+	.4byte AbandonedShip_HiddenFloorRooms_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_InsideShip
+

data/layouts/AbandonedShip_Room_B1F/layout.inc

@@ -0,0 +1,15 @@
+AbandonedShip_Room_B1F_MapBorder::
+	.incbin "data/layouts/AbandonedShip_Room_B1F/border.bin"
+
+AbandonedShip_Room_B1F_MapBlockdata::
+	.incbin "data/layouts/AbandonedShip_Room_B1F/map.bin"
+
+	.align 2
+AbandonedShip_Room_B1F_Layout::
+	.4byte 0x9
+	.4byte 0x8
+	.4byte AbandonedShip_Room_B1F_MapBorder
+	.4byte AbandonedShip_Room_B1F_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_InsideShip
+

data/layouts/AbandonedShip_Rooms2_1F/layout.inc

@@ -0,0 +1,15 @@
+AbandonedShip_Rooms2_1F_MapBorder::
+	.incbin "data/layouts/AbandonedShip_Rooms2_1F/border.bin"
+
+AbandonedShip_Rooms2_1F_MapBlockdata::
+	.incbin "data/layouts/AbandonedShip_Rooms2_1F/map.bin"
+
+	.align 2
+AbandonedShip_Rooms2_1F_Layout::
+	.4byte 0x9
+	.4byte 0x11
+	.4byte AbandonedShip_Rooms2_1F_MapBorder
+	.4byte AbandonedShip_Rooms2_1F_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_InsideShip
+

data/layouts/AbandonedShip_Rooms2_B1F/layout.inc

@@ -0,0 +1,15 @@
+AbandonedShip_Rooms2_B1F_MapBorder::
+	.incbin "data/layouts/AbandonedShip_Rooms2_B1F/border.bin"
+
+AbandonedShip_Rooms2_B1F_MapBlockdata::
+	.incbin "data/layouts/AbandonedShip_Rooms2_B1F/map.bin"
+
+	.align 2
+AbandonedShip_Rooms2_B1F_Layout::
+	.4byte 0x12
+	.4byte 0x8
+	.4byte AbandonedShip_Rooms2_B1F_MapBorder
+	.4byte AbandonedShip_Rooms2_B1F_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_InsideShip
+

data/layouts/AbandonedShip_Rooms_1F/layout.inc

@@ -0,0 +1,15 @@
+AbandonedShip_Rooms_1F_MapBorder::
+	.incbin "data/layouts/AbandonedShip_Rooms_1F/border.bin"
+
+AbandonedShip_Rooms_1F_MapBlockdata::
+	.incbin "data/layouts/AbandonedShip_Rooms_1F/map.bin"
+
+	.align 2
+AbandonedShip_Rooms_1F_Layout::
+	.4byte 0x12
+	.4byte 0x11
+	.4byte AbandonedShip_Rooms_1F_MapBorder
+	.4byte AbandonedShip_Rooms_1F_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_InsideShip
+

data/layouts/AbandonedShip_Rooms_B1F/layout.inc

@@ -0,0 +1,15 @@
+AbandonedShip_Rooms_B1F_MapBorder::
+	.incbin "data/layouts/AbandonedShip_Rooms_B1F/border.bin"
+
+AbandonedShip_Rooms_B1F_MapBlockdata::
+	.incbin "data/layouts/AbandonedShip_Rooms_B1F/map.bin"
+
+	.align 2
+AbandonedShip_Rooms_B1F_Layout::
+	.4byte 0x1b
+	.4byte 0x8
+	.4byte AbandonedShip_Rooms_B1F_MapBorder
+	.4byte AbandonedShip_Rooms_B1F_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_InsideShip
+

data/layouts/AbandonedShip_Underwater1/layout.inc

@@ -0,0 +1,15 @@
+AbandonedShip_Underwater1_MapBorder::
+	.incbin "data/layouts/AbandonedShip_Underwater1/border.bin"
+
+AbandonedShip_Underwater1_MapBlockdata::
+	.incbin "data/layouts/AbandonedShip_Underwater1/map.bin"
+
+	.align 2
+AbandonedShip_Underwater1_Layout::
+	.4byte 0x8
+	.4byte 0x8
+	.4byte AbandonedShip_Underwater1_MapBorder
+	.4byte AbandonedShip_Underwater1_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_InsideShip
+

data/layouts/AbandonedShip_Underwater2/layout.inc

@@ -0,0 +1,15 @@
+AbandonedShip_Underwater2_MapBorder::
+	.incbin "data/layouts/AbandonedShip_Underwater2/border.bin"
+
+AbandonedShip_Underwater2_MapBlockdata::
+	.incbin "data/layouts/AbandonedShip_Underwater2/map.bin"
+
+	.align 2
+AbandonedShip_Underwater2_Layout::
+	.4byte 0x15
+	.4byte 0x7
+	.4byte AbandonedShip_Underwater2_MapBorder
+	.4byte AbandonedShip_Underwater2_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_InsideShip
+

data/layouts/AlteringCave/layout.inc

@@ -0,0 +1,15 @@
+AlteringCave_MapBorder::
+	.incbin "data/layouts/AlteringCave/border.bin"
+
+AlteringCave_MapBlockdata::
+	.incbin "data/layouts/AlteringCave/map.bin"
+
+	.align 2
+AlteringCave_Layout::
+	.4byte 0x20
+	.4byte 0x18
+	.4byte AlteringCave_MapBorder
+	.4byte AlteringCave_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
+

data/layouts/AncientTomb/layout.inc

@@ -0,0 +1,15 @@
+AncientTomb_MapBorder::
+	.incbin "data/layouts/AncientTomb/border.bin"
+
+AncientTomb_MapBlockdata::
+	.incbin "data/layouts/AncientTomb/map.bin"
+
+	.align 2
+AncientTomb_Layout::
+	.4byte 0x11
+	.4byte 0x21
+	.4byte AncientTomb_MapBorder
+	.4byte AncientTomb_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
+

data/layouts/AquaHideout_1F/layout.inc

@@ -0,0 +1,15 @@
+AquaHideout_1F_MapBorder::
+	.incbin "data/layouts/AquaHideout_1F/border.bin"
+
+AquaHideout_1F_MapBlockdata::
+	.incbin "data/layouts/AquaHideout_1F/map.bin"
+
+	.align 2
+AquaHideout_1F_Layout::
+	.4byte 0x1c
+	.4byte 0x1e
+	.4byte AquaHideout_1F_MapBorder
+	.4byte AquaHideout_1F_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Facility
+

data/layouts/AquaHideout_B1F/layout.inc

@@ -0,0 +1,15 @@
+AquaHideout_B1F_MapBorder::
+	.incbin "data/layouts/AquaHideout_B1F/border.bin"
+
+AquaHideout_B1F_MapBlockdata::
+	.incbin "data/layouts/AquaHideout_B1F/map.bin"
+
+	.align 2
+AquaHideout_B1F_Layout::
+	.4byte 0x33
+	.4byte 0x18
+	.4byte AquaHideout_B1F_MapBorder
+	.4byte AquaHideout_B1F_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Facility
+

data/layouts/AquaHideout_B2F/layout.inc

@@ -0,0 +1,15 @@
+AquaHideout_B2F_MapBorder::
+	.incbin "data/layouts/AquaHideout_B2F/border.bin"
+
+AquaHideout_B2F_MapBlockdata::
+	.incbin "data/layouts/AquaHideout_B2F/map.bin"
+
+	.align 2
+AquaHideout_B2F_Layout::
+	.4byte 0x22
+	.4byte 0x18
+	.4byte AquaHideout_B2F_MapBorder
+	.4byte AquaHideout_B2F_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Facility
+

data/layouts/AquaHideout_UnusedRubyMap1/layout.inc

@@ -0,0 +1,15 @@
+AquaHideout_UnusedRubyMap1_MapBorder::
+	.incbin "data/layouts/AquaHideout_UnusedRubyMap1/border.bin"
+
+AquaHideout_UnusedRubyMap1_MapBlockdata::
+	.incbin "data/layouts/AquaHideout_UnusedRubyMap1/map.bin"
+
+	.align 2
+AquaHideout_UnusedRubyMap1_Layout::
+	.4byte 0x1c
+	.4byte 0x1e
+	.4byte AquaHideout_UnusedRubyMap1_MapBorder
+	.4byte AquaHideout_UnusedRubyMap1_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Facility
+

data/layouts/AquaHideout_UnusedRubyMap2/layout.inc

@@ -0,0 +1,15 @@
+AquaHideout_UnusedRubyMap2_MapBorder::
+	.incbin "data/layouts/AquaHideout_UnusedRubyMap2/border.bin"
+
+AquaHideout_UnusedRubyMap2_MapBlockdata::
+	.incbin "data/layouts/AquaHideout_UnusedRubyMap2/map.bin"
+
+	.align 2
+AquaHideout_UnusedRubyMap2_Layout::
+	.4byte 0x3e
+	.4byte 0x18
+	.4byte AquaHideout_UnusedRubyMap2_MapBorder
+	.4byte AquaHideout_UnusedRubyMap2_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Facility
+

data/layouts/AquaHideout_UnusedRubyMap3/layout.inc

@@ -0,0 +1,15 @@
+AquaHideout_UnusedRubyMap3_MapBorder::
+	.incbin "data/layouts/AquaHideout_UnusedRubyMap3/border.bin"
+
+AquaHideout_UnusedRubyMap3_MapBlockdata::
+	.incbin "data/layouts/AquaHideout_UnusedRubyMap3/map.bin"
+
+	.align 2
+AquaHideout_UnusedRubyMap3_Layout::
+	.4byte 0x22
+	.4byte 0x18
+	.4byte AquaHideout_UnusedRubyMap3_MapBorder
+	.4byte AquaHideout_UnusedRubyMap3_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Facility
+

data/layouts/ArtisanCave_1F/layout.inc

@@ -0,0 +1,15 @@
+ArtisanCave_1F_MapBorder::
+	.incbin "data/layouts/ArtisanCave_1F/border.bin"
+
+ArtisanCave_1F_MapBlockdata::
+	.incbin "data/layouts/ArtisanCave_1F/map.bin"
+
+	.align 2
+ArtisanCave_1F_Layout::
+	.4byte 0x15
+	.4byte 0x16
+	.4byte ArtisanCave_1F_MapBorder
+	.4byte ArtisanCave_1F_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
+

data/layouts/ArtisanCave_B1F/layout.inc

@@ -0,0 +1,15 @@
+ArtisanCave_B1F_MapBorder::
+	.incbin "data/layouts/ArtisanCave_B1F/border.bin"
+
+ArtisanCave_B1F_MapBlockdata::
+	.incbin "data/layouts/ArtisanCave_B1F/map.bin"
+
+	.align 2
+ArtisanCave_B1F_Layout::
+	.4byte 0x2e
+	.4byte 0x36
+	.4byte ArtisanCave_B1F_MapBorder
+	.4byte ArtisanCave_B1F_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
+

data/layouts/BattleElevator/layout.inc

@@ -0,0 +1,15 @@
+BattleElevator_MapBorder::
+	.incbin "data/layouts/BattleElevator/border.bin"
+
+BattleElevator_MapBlockdata::
+	.incbin "data/layouts/BattleElevator/map.bin"
+
+	.align 2
+BattleElevator_Layout::
+	.4byte 0x5
+	.4byte 0x7
+	.4byte BattleElevator_MapBorder
+	.4byte BattleElevator_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_BattleFrontier
+

data/layouts/BattleFrontier_BattleArenaBattleRoom/layout.inc

@@ -0,0 +1,15 @@
+BattleFrontier_BattleArenaBattleRoom_MapBorder::
+	.incbin "data/layouts/BattleFrontier_BattleArenaBattleRoom/border.bin"
+
+BattleFrontier_BattleArenaBattleRoom_MapBlockdata::
+	.incbin "data/layouts/BattleFrontier_BattleArenaBattleRoom/map.bin"
+
+	.align 2
+BattleFrontier_BattleArenaBattleRoom_Layout::
+	.4byte 0x10
+	.4byte 0xb
+	.4byte BattleFrontier_BattleArenaBattleRoom_MapBorder
+	.4byte BattleFrontier_BattleArenaBattleRoom_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_BattleArena
+

data/layouts/BattleFrontier_BattleArenaCorridor/layout.inc

@@ -0,0 +1,15 @@
+BattleFrontier_BattleArenaCorridor_MapBorder::
+	.incbin "data/layouts/BattleFrontier_BattleArenaCorridor/border.bin"
+
+BattleFrontier_BattleArenaCorridor_MapBlockdata::
+	.incbin "data/layouts/BattleFrontier_BattleArenaCorridor/map.bin"
+
+	.align 2
+BattleFrontier_BattleArenaCorridor_Layout::
+	.4byte 0x12
+	.4byte 0xe
+	.4byte BattleFrontier_BattleArenaCorridor_MapBorder
+	.4byte BattleFrontier_BattleArenaCorridor_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_BattleArena
+

data/layouts/BattleFrontier_BattleArenaLobby/layout.inc

@@ -0,0 +1,15 @@
+BattleFrontier_BattleArenaLobby_MapBorder::
+	.incbin "data/layouts/BattleFrontier_BattleArenaLobby/border.bin"
+
+BattleFrontier_BattleArenaLobby_MapBlockdata::
+	.incbin "data/layouts/BattleFrontier_BattleArenaLobby/map.bin"
+
+	.align 2
+BattleFrontier_BattleArenaLobby_Layout::
+	.4byte 0x10
+	.4byte 0xd
+	.4byte BattleFrontier_BattleArenaLobby_MapBorder
+	.4byte BattleFrontier_BattleArenaLobby_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_BattleArena
+

data/layouts/BattleFrontier_BattleDomeBattleRoom/layout.inc

@@ -0,0 +1,15 @@
+BattleFrontier_BattleDomeBattleRoom_MapBorder::
+	.incbin "data/layouts/BattleFrontier_BattleDomeBattleRoom/border.bin"
+
+BattleFrontier_BattleDomeBattleRoom_MapBlockdata::
+	.incbin "data/layouts/BattleFrontier_BattleDomeBattleRoom/map.bin"
+
+	.align 2
+BattleFrontier_BattleDomeBattleRoom_Layout::
+	.4byte 0x14
+	.4byte 0xa
+	.4byte BattleFrontier_BattleDomeBattleRoom_MapBorder
+	.4byte BattleFrontier_BattleDomeBattleRoom_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_BattleDome
+

data/layouts/BattleFrontier_BattleDomeCorridor/layout.inc

@@ -0,0 +1,15 @@
+BattleFrontier_BattleDomeCorridor_MapBorder::
+	.incbin "data/layouts/BattleFrontier_BattleDomeCorridor/border.bin"
+
+BattleFrontier_BattleDomeCorridor_MapBlockdata::
+	.incbin "data/layouts/BattleFrontier_BattleDomeCorridor/map.bin"
+
+	.align 2
+BattleFrontier_BattleDomeCorridor_Layout::
+	.4byte 0x30
+	.4byte 0x7
+	.4byte BattleFrontier_BattleDomeCorridor_MapBorder
+	.4byte BattleFrontier_BattleDomeCorridor_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_BattleDome
+

data/layouts/BattleFrontier_BattleDomeLobby/layout.inc

@@ -0,0 +1,15 @@
+BattleFrontier_BattleDomeLobby_MapBorder::
+	.incbin "data/layouts/BattleFrontier_BattleDomeLobby/border.bin"
+
+BattleFrontier_BattleDomeLobby_MapBlockdata::
+	.incbin "data/layouts/BattleFrontier_BattleDomeLobby/map.bin"
+
+	.align 2
+BattleFrontier_BattleDomeLobby_Layout::
+	.4byte 0x17
+	.4byte 0x11
+	.4byte BattleFrontier_BattleDomeLobby_MapBorder
+	.4byte BattleFrontier_BattleDomeLobby_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_BattleDome
+