Merge branch 'master' of github.com:pret/pokeemerald

This commit is contained in:
Diegoisawesome
2019-02-05 14:35:42 -06:00
2332 changed files with 81408 additions and 65244 deletions

View File

@@ -52,6 +52,7 @@ SCANINC := tools/scaninc/scaninc$(EXE)
PREPROC := tools/preproc/preproc$(EXE)
RAMSCRGEN := tools/ramscrgen/ramscrgen$(EXE)
FIX := tools/gbafix/gbafix$(EXE)
MAPJSON := tools/mapjson/mapjson$(EXE)
# Clear the default suffixes
.SUFFIXES:
@@ -97,12 +98,16 @@ clean: tidy
rm -f sound/direct_sound_samples/*.bin
rm -f $(SONG_OBJS) $(MID_OBJS) $(MID_SUBDIR)/*.s
find . \( -iname '*.1bpp' -o -iname '*.4bpp' -o -iname '*.8bpp' -o -iname '*.gbapal' -o -iname '*.lz' -o -iname '*.latfont' -o -iname '*.hwjpnfont' -o -iname '*.fwjpnfont' \) -exec rm {} +
rm -f $(DATA_ASM_SUBDIR)/layouts/layouts.inc $(DATA_ASM_SUBDIR)/layouts/layouts_table.inc
rm -f $(DATA_ASM_SUBDIR)/maps/connections.inc $(DATA_ASM_SUBDIR)/maps/events.inc $(DATA_ASM_SUBDIR)/maps/groups.inc $(DATA_ASM_SUBDIR)/maps/headers.inc
find $(DATA_ASM_SUBDIR)/maps \( -iname 'connections.inc' -o -iname 'events.inc' -o -iname 'header.inc' \) -exec rm {} +
tidy:
rm -f $(ROM) $(ELF) $(MAP)
rm -r build/*
include graphics_file_rules.mk
include map_data_rules.mk
include spritesheet_rules.mk
include songs.mk
@@ -121,6 +126,7 @@ include songs.mk
sound/direct_sound_samples/cry_%.bin: sound/direct_sound_samples/cry_%.aif ; $(AIF) $< $@ --compress
sound/%.bin: sound/%.aif ; $(AIF) $< $@
$(C_BUILDDIR)/libc.o: CC1 := tools/agbcc/bin/old_agbcc
$(C_BUILDDIR)/libc.o: CFLAGS := -O2
@@ -130,8 +136,7 @@ $(C_BUILDDIR)/agb_flash.o: CFLAGS := -O -mthumb-interwork
$(C_BUILDDIR)/agb_flash_1m.o: CFLAGS := -O -mthumb-interwork
$(C_BUILDDIR)/agb_flash_mx.o: CFLAGS := -O -mthumb-interwork
$(C_BUILDDIR)/m4a_2.o: CC1 := tools/agbcc/bin/old_agbcc
$(C_BUILDDIR)/m4a_4.o: CC1 := tools/agbcc/bin/old_agbcc
$(C_BUILDDIR)/m4a.o: CC1 := tools/agbcc/bin/old_agbcc
$(C_BUILDDIR)/record_mixing.o: CFLAGS += -ffreestanding

File diff suppressed because it is too large Load Diff

View File

@@ -1,574 +0,0 @@
.include "asm/macros.inc"
.include "constants/gba_constants.inc"
.include "constants/m4a_constants.inc"
.syntax unified
.text
thumb_func_start CgbSound
CgbSound: @ 81DEA70
push {r4-r7,lr}
mov r7, r10
mov r6, r9
mov r5, r8
push {r5-r7}
sub sp, 0x1C
ldr r0, =SOUND_INFO_PTR
ldr r0, [r0]
str r0, [sp, 0x4]
ldrb r0, [r0, 0xA]
cmp r0, 0
beq _081DEA94
subs r0, 0x1
ldr r1, [sp, 0x4]
strb r0, [r1, 0xA]
b _081DEA9A
.pool
_081DEA94:
movs r0, 0xE
ldr r2, [sp, 0x4]
strb r0, [r2, 0xA]
_081DEA9A:
movs r6, 0x1
ldr r0, [sp, 0x4]
ldr r4, [r0, 0x1C]
_081DEAA0:
ldrb r1, [r4]
movs r0, 0xC7
ands r0, r1
adds r2, r6, 0x1
mov r10, r2
movs r2, 0x40
adds r2, r4
mov r9, r2
cmp r0, 0
bne _081DEAB6
b _081DEEA0
_081DEAB6:
cmp r6, 0x2
beq _081DEAE8
cmp r6, 0x2
bgt _081DEAC4
cmp r6, 0x1
beq _081DEACA
b _081DEB20
_081DEAC4:
cmp r6, 0x3
beq _081DEB00
b _081DEB20
_081DEACA:
ldr r0, =REG_NR10
str r0, [sp, 0x8]
ldr r7, =REG_NR11
ldr r2, =REG_NR12
str r2, [sp, 0xC]
adds r0, 0x4
str r0, [sp, 0x10]
adds r2, 0x2
b _081DEB30
.pool
_081DEAE8:
ldr r0, =REG_NR10 + 1
str r0, [sp, 0x8]
ldr r7, =REG_NR21
ldr r2, =REG_NR22
b _081DEB28
.pool
_081DEB00:
ldr r0, =REG_NR30
str r0, [sp, 0x8]
ldr r7, =REG_NR31
ldr r2, =REG_NR32
str r2, [sp, 0xC]
adds r0, 0x4
str r0, [sp, 0x10]
adds r2, 0x2
b _081DEB30
.pool
_081DEB20:
ldr r0, =REG_NR30 + 1
str r0, [sp, 0x8]
ldr r7, =REG_NR41
ldr r2, =REG_NR42
_081DEB28:
str r2, [sp, 0xC]
adds r0, 0xB
str r0, [sp, 0x10]
adds r2, 0x4
_081DEB30:
str r2, [sp, 0x14]
ldr r0, [sp, 0x4]
ldrb r0, [r0, 0xA]
str r0, [sp]
ldr r2, [sp, 0xC]
ldrb r0, [r2]
mov r8, r0
adds r2, r1, 0
movs r0, 0x80
ands r0, r2
cmp r0, 0
beq _081DEC26
movs r3, 0x40
adds r0, r3, 0
ands r0, r2
lsls r0, 24
lsrs r5, r0, 24
adds r0, r6, 0x1
mov r10, r0
movs r1, 0x40
adds r1, r4
mov r9, r1
cmp r5, 0
bne _081DEC4A
movs r0, 0x3
strb r0, [r4]
strb r0, [r4, 0x1D]
adds r0, r4, 0
str r3, [sp, 0x18]
bl CgbModVol
ldr r3, [sp, 0x18]
cmp r6, 0x2
beq _081DEB98
cmp r6, 0x2
bgt _081DEB8C
cmp r6, 0x1
beq _081DEB92
b _081DEBEC
.pool
_081DEB8C:
cmp r6, 0x3
beq _081DEBA4
b _081DEBEC
_081DEB92:
ldrb r0, [r4, 0x1F]
ldr r2, [sp, 0x8]
strb r0, [r2]
_081DEB98:
ldr r0, [r4, 0x24]
lsls r0, 6
ldrb r1, [r4, 0x1E]
adds r0, r1, r0
strb r0, [r7]
b _081DEBF8
_081DEBA4:
ldr r1, [r4, 0x24]
ldr r0, [r4, 0x28]
cmp r1, r0
beq _081DEBCC
ldr r2, [sp, 0x8]
strb r3, [r2]
ldr r1, =REG_WAVE_RAM
ldr r2, [r4, 0x24]
ldr r0, [r2]
str r0, [r1]
adds r1, 0x4
ldr r0, [r2, 0x4]
str r0, [r1]
adds r1, 0x4
ldr r0, [r2, 0x8]
str r0, [r1]
adds r1, 0x4
ldr r0, [r2, 0xC]
str r0, [r1]
str r2, [r4, 0x28]
_081DEBCC:
ldr r0, [sp, 0x8]
strb r5, [r0]
ldrb r0, [r4, 0x1E]
strb r0, [r7]
ldrb r0, [r4, 0x1E]
cmp r0, 0
beq _081DEBE4
movs r0, 0xC0
b _081DEC06
.pool
_081DEBE4:
movs r1, 0x80
negs r1, r1
strb r1, [r4, 0x1A]
b _081DEC08
_081DEBEC:
ldrb r0, [r4, 0x1E]
strb r0, [r7]
ldr r0, [r4, 0x24]
lsls r0, 3
ldr r2, [sp, 0x10]
strb r0, [r2]
_081DEBF8:
ldrb r0, [r4, 0x4]
adds r0, 0x8
mov r8, r0
ldrb r0, [r4, 0x1E]
cmp r0, 0
beq _081DEC06
movs r0, 0x40
_081DEC06:
strb r0, [r4, 0x1A]
_081DEC08:
ldrb r1, [r4, 0x4]
movs r2, 0
strb r1, [r4, 0xB]
movs r0, 0xFF
ands r0, r1
adds r1, r6, 0x1
mov r10, r1
movs r1, 0x40
adds r1, r4
mov r9, r1
cmp r0, 0
bne _081DEC22
b _081DED5E
_081DEC22:
strb r2, [r4, 0x9]
b _081DED8C
_081DEC26:
movs r0, 0x4
ands r0, r2
cmp r0, 0
beq _081DEC58
ldrb r0, [r4, 0xD]
subs r0, 0x1
strb r0, [r4, 0xD]
movs r2, 0xFF
ands r0, r2
lsls r0, 24
adds r1, r6, 0x1
mov r10, r1
movs r2, 0x40
adds r2, r4
mov r9, r2
cmp r0, 0
ble _081DEC4A
b _081DED9E
_081DEC4A:
lsls r0, r6, 24
lsrs r0, 24
bl CgbOscOff
movs r0, 0
strb r0, [r4]
b _081DEE9C
_081DEC58:
movs r0, 0x40
ands r0, r1
adds r2, r6, 0x1
mov r10, r2
movs r2, 0x40
adds r2, r4
mov r9, r2
cmp r0, 0
beq _081DEC98
movs r0, 0x3
ands r0, r1
cmp r0, 0
beq _081DEC98
movs r0, 0xFC
ands r0, r1
movs r2, 0
strb r0, [r4]
ldrb r1, [r4, 0x7]
strb r1, [r4, 0xB]
movs r0, 0xFF
ands r0, r1
cmp r0, 0
beq _081DECCA
movs r0, 0x1
ldrb r1, [r4, 0x1D]
orrs r0, r1
strb r0, [r4, 0x1D]
cmp r6, 0x3
beq _081DED8C
ldrb r2, [r4, 0x7]
mov r8, r2
b _081DED8C
_081DEC98:
ldrb r0, [r4, 0xB]
cmp r0, 0
bne _081DED8C
cmp r6, 0x3
bne _081DECAA
movs r0, 0x1
ldrb r1, [r4, 0x1D]
orrs r0, r1
strb r0, [r4, 0x1D]
_081DECAA:
adds r0, r4, 0
bl CgbModVol
movs r0, 0x3
ldrb r2, [r4]
ands r0, r2
cmp r0, 0
bne _081DECFE
ldrb r0, [r4, 0x9]
subs r0, 0x1
strb r0, [r4, 0x9]
movs r1, 0xFF
ands r0, r1
lsls r0, 24
cmp r0, 0
bgt _081DECFA
_081DECCA:
ldrb r2, [r4, 0xC]
ldrb r1, [r4, 0xA]
adds r0, r2, 0
muls r0, r1
adds r0, 0xFF
asrs r0, 8
movs r1, 0
strb r0, [r4, 0x9]
lsls r0, 24
cmp r0, 0
beq _081DEC4A
movs r0, 0x4
ldrb r2, [r4]
orrs r0, r2
strb r0, [r4]
movs r0, 0x1
ldrb r1, [r4, 0x1D]
orrs r0, r1
strb r0, [r4, 0x1D]
cmp r6, 0x3
beq _081DED9E
movs r2, 0x8
mov r8, r2
b _081DED9E
_081DECFA:
ldrb r0, [r4, 0x7]
b _081DED8A
_081DECFE:
cmp r0, 0x1
bne _081DED0A
_081DED02:
ldrb r0, [r4, 0x19]
strb r0, [r4, 0x9]
movs r0, 0x7
b _081DED8A
_081DED0A:
cmp r0, 0x2
bne _081DED4E
ldrb r0, [r4, 0x9]
subs r0, 0x1
strb r0, [r4, 0x9]
movs r1, 0xFF
ands r0, r1
lsls r0, 24
ldrb r2, [r4, 0x19]
lsls r1, r2, 24
cmp r0, r1
bgt _081DED4A
_081DED22:
ldrb r0, [r4, 0x6]
cmp r0, 0
bne _081DED32
movs r0, 0xFC
ldrb r1, [r4]
ands r0, r1
strb r0, [r4]
b _081DECCA
_081DED32:
ldrb r0, [r4]
subs r0, 0x1
strb r0, [r4]
movs r0, 0x1
ldrb r2, [r4, 0x1D]
orrs r0, r2
strb r0, [r4, 0x1D]
cmp r6, 0x3
beq _081DED02
movs r0, 0x8
mov r8, r0
b _081DED02
_081DED4A:
ldrb r0, [r4, 0x5]
b _081DED8A
_081DED4E:
ldrb r0, [r4, 0x9]
adds r0, 0x1
strb r0, [r4, 0x9]
movs r1, 0xFF
ands r0, r1
ldrb r2, [r4, 0xA]
cmp r0, r2
bcc _081DED88
_081DED5E:
ldrb r0, [r4]
subs r0, 0x1
movs r2, 0
strb r0, [r4]
ldrb r1, [r4, 0x5]
strb r1, [r4, 0xB]
movs r0, 0xFF
ands r0, r1
cmp r0, 0
beq _081DED22
movs r0, 0x1
ldrb r1, [r4, 0x1D]
orrs r0, r1
strb r0, [r4, 0x1D]
ldrb r0, [r4, 0xA]
strb r0, [r4, 0x9]
cmp r6, 0x3
beq _081DED8C
ldrb r2, [r4, 0x5]
mov r8, r2
b _081DED8C
_081DED88:
ldrb r0, [r4, 0x4]
_081DED8A:
strb r0, [r4, 0xB]
_081DED8C:
ldrb r0, [r4, 0xB]
subs r0, 0x1
strb r0, [r4, 0xB]
ldr r0, [sp]
cmp r0, 0
bne _081DED9E
subs r0, 0x1
str r0, [sp]
b _081DEC98
_081DED9E:
movs r0, 0x2
ldrb r1, [r4, 0x1D]
ands r0, r1
cmp r0, 0
beq _081DEE16
cmp r6, 0x3
bgt _081DEDDE
movs r0, 0x8
ldrb r2, [r4, 0x1]
ands r0, r2
cmp r0, 0
beq _081DEDDE
ldr r0, =REG_SOUNDBIAS + 1
ldrb r0, [r0]
cmp r0, 0x3F
bgt _081DEDD0
ldr r0, [r4, 0x20]
adds r0, 0x2
ldr r1, =0x000007fc
b _081DEDDA
.pool
_081DEDD0:
cmp r0, 0x7F
bgt _081DEDDE
ldr r0, [r4, 0x20]
adds r0, 0x1
ldr r1, =0x000007fe
_081DEDDA:
ands r0, r1
str r0, [r4, 0x20]
_081DEDDE:
cmp r6, 0x4
beq _081DEDF0
ldr r0, [r4, 0x20]
ldr r1, [sp, 0x10]
strb r0, [r1]
b _081DEDFE
.pool
_081DEDF0:
ldr r2, [sp, 0x10]
ldrb r0, [r2]
movs r1, 0x8
ands r1, r0
ldr r0, [r4, 0x20]
orrs r0, r1
strb r0, [r2]
_081DEDFE:
movs r0, 0xC0
ldrb r1, [r4, 0x1A]
ands r0, r1
adds r1, r4, 0
adds r1, 0x21
ldrb r1, [r1]
adds r0, r1, r0
strb r0, [r4, 0x1A]
movs r2, 0xFF
ands r0, r2
ldr r1, [sp, 0x14]
strb r0, [r1]
_081DEE16:
movs r0, 0x1
ldrb r2, [r4, 0x1D]
ands r0, r2
cmp r0, 0
beq _081DEE9C
ldr r1, =REG_NR51
ldrb r0, [r1]
ldrb r2, [r4, 0x1C]
bics r0, r2
ldrb r2, [r4, 0x1B]
orrs r0, r2
strb r0, [r1]
cmp r6, 0x3
bne _081DEE68
ldr r0, =gCgb3Vol
ldrb r1, [r4, 0x9]
adds r0, r1, r0
ldrb r0, [r0]
ldr r2, [sp, 0xC]
strb r0, [r2]
movs r1, 0x80
adds r0, r1, 0
ldrb r2, [r4, 0x1A]
ands r0, r2
cmp r0, 0
beq _081DEE9C
ldr r0, [sp, 0x8]
strb r1, [r0]
ldrb r0, [r4, 0x1A]
ldr r1, [sp, 0x14]
strb r0, [r1]
movs r0, 0x7F
ldrb r2, [r4, 0x1A]
ands r0, r2
strb r0, [r4, 0x1A]
b _081DEE9C
.pool
_081DEE68:
movs r0, 0xF
mov r1, r8
ands r1, r0
mov r8, r1
ldrb r2, [r4, 0x9]
lsls r0, r2, 4
add r0, r8
ldr r1, [sp, 0xC]
strb r0, [r1]
movs r2, 0x80
ldrb r0, [r4, 0x1A]
orrs r0, r2
ldr r1, [sp, 0x14]
strb r0, [r1]
cmp r6, 0x1
bne _081DEE9C
ldr r0, [sp, 0x8]
ldrb r1, [r0]
movs r0, 0x8
ands r0, r1
cmp r0, 0
bne _081DEE9C
ldrb r0, [r4, 0x1A]
orrs r0, r2
ldr r1, [sp, 0x14]
strb r0, [r1]
_081DEE9C:
movs r0, 0
strb r0, [r4, 0x1D]
_081DEEA0:
mov r6, r10
mov r4, r9
cmp r6, 0x4
bgt _081DEEAA
b _081DEAA0
_081DEEAA:
add sp, 0x1C
pop {r3-r5}
mov r8, r3
mov r9, r4
mov r10, r5
pop {r4-r7}
pop {r0}
bx r0
thumb_func_end CgbSound
.align 2, 0 @ Don't pad with nop.

View File

@@ -731,7 +731,7 @@ _080171DC:
_08017228:
mov r3, r9
ldrb r0, [r3]
bl ListMenuHandleInputGetItemId
bl ListMenu_ProcessInput
mov r8, r0
ldr r0, =gMain
ldrh r1, [r0, 0x2E]
@@ -847,7 +847,7 @@ _08017314:
_0801731C:
mov r3, r10
ldrb r0, [r3]
bl ListMenuHandleInputGetItemId
bl ListMenu_ProcessInput
adds r1, r0, 0
ldr r0, =gMain
ldrh r2, [r0, 0x2E]

View File

@@ -8,3 +8,4 @@ make -C tools/aif2pcm CXX=${1:-g++}
make -C tools/ramscrgen CXX=${1:-g++}
make -C tools/gbafix CXX=${1:-g++}
make -C tools/mid2agb CXX=${1:-g++}
make -C tools/mapjson CXX=${1:-g++}

View File

@@ -0,0 +1,4 @@
gUnknown_03006190
gUnknown_030061A0
gUnknown_030061C0
gContestPaintingMonPalette

View File

@@ -0,0 +1,10 @@
gUnknown_03006164
gUnknown_03006168
gUnknown_0300616C
gUnknown_03006170
gUnknown_03006174
gUnknown_03006178
gUnknown_0300617C
gUnknown_03006180
gUnknown_03006184
gUnknown_03006188

View File

@@ -0,0 +1 @@
gCB2_AfterEvolution

View File

@@ -0,0 +1 @@
gUnknown_03006328

View File

@@ -0,0 +1 @@
gDexCryScreenState

View File

@@ -1,89 +0,0 @@
#include "constants/battle_anim.h"
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnknown_0853EDE4:: @ 853EDE4
.2byte 0x0000, 0x0003, 0x0004, 0x0003, 0x0008, 0x0003, 0x000c, 0x0003, 0xfffe, 0x0000
.align 2
gUnknown_0853EDF8:: @ 853EDF8
.4byte gUnknown_0853EDE4
.align 2
gUnknown_0853EDFC:: @ 853EDFC
spr_template ANIM_TAG_UNUSED_ORB, ANIM_TAG_UNUSED_ORB, gUnknown_0852490C, gUnknown_0853EDF8, NULL, gDummySpriteAffineAnimTable, sub_80A8AEC
spr_template ANIM_TAG_UNUSED_ORB, ANIM_TAG_UNUSED_ORB, gUnknown_0852490C, gUnknown_0853EDF8, NULL, gDummySpriteAffineAnimTable, sub_80A8A6C
.align 2
gUnknown_0853EE2C:: @ 853EE2C
.2byte 0x0000, 0x0003, 0xfffe, 0x0000
.align 2
gUnknown_0853EE34:: @ 853EE34
.4byte gUnknown_0853EE2C
.align 2
gUnknown_0853EE38:: @ 853EE38
spr_template ANIM_TAG_WEATHER_BALL, ANIM_TAG_WEATHER_BALL, gUnknown_08524914, gUnknown_0853EE34, NULL, gDummySpriteAffineAnimTable, sub_80A8E30
.align 2
gUnknown_0853EE50:: @ 853EE50
spr_template ANIM_TAG_WEATHER_BALL, ANIM_TAG_WEATHER_BALL, gUnknown_08524914, gUnknown_0853EE34, NULL, gDummySpriteAffineAnimTable, sub_80A8EE4
.align 2
gUnknown_0853EE68:: @ 853EE68
.2byte 0x0000, 0x0003, 0x0010, 0x0003, 0x0020, 0x0003, 0x0030, 0x0003, 0x0040, 0x0003, 0xffff, 0x0000
.align 2
gUnknown_0853EE80:: @ 853EE80
.4byte gUnknown_0853EE68
.align 2
gUnknown_0853EE84:: @ 853EE84
spr_template ANIM_TAG_SPARKLE_4, ANIM_TAG_SPARKLE_4, gUnknown_08524914, gUnknown_0853EE80, NULL, gDummySpriteAffineAnimTable, sub_80A8B64
spr_template ANIM_TAG_UNUSED_MONSTER_FOOT, ANIM_TAG_UNUSED_MONSTER_FOOT, gUnknown_08524914, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A8AEC
.align 2
gUnknown_0853EEB4:: @ 853EEB4
.2byte 0x0000, 0x0005, 0xfffe, 0x0000
.align 2
gUnknown_0853EEBC:: @ 853EEBC
.2byte 0x0000, 0x0005, 0xfffe, 0x0000
.align 2
gUnknown_0853EEC4:: @ 853EEC4
.2byte 0x0000, 0x0005, 0xfffe, 0x0000
.align 2
gUnknown_0853EECC:: @ 853EECC
.4byte gUnknown_0853EEB4
.4byte gUnknown_0853EEBC
.4byte gUnknown_0853EEC4
.align 2
gUnknown_0853EED8:: @ 853EED8
spr_template ANIM_TAG_IMPACT, ANIM_TAG_IMPACT, gUnknown_08524914, gUnknown_0853EECC, NULL, gDummySpriteAffineAnimTable, sub_80A8AEC
.align 2
gUnknown_0853EEF0:: @ 853EEF0
.2byte 0x0000, 0x000f, 0xfffe, 0x0000
.align 2
gUnknown_0853EEF8:: @ 853EEF8
.4byte gUnknown_0853EEF0
.align 2
gUnknown_0853EEFC:: @ 853EEFC
.2byte 0x0060, 0x0060, 0x0000, 0x0000, 0x0002, 0x0002, 0x0100, 0x0000, 0x7ffe, 0x0001, 0x0000, 0x0000
.align 2
gUnknown_0853EF14:: @ 853EF14
.4byte gUnknown_0853EEFC
.align 2
gUnknown_0853EF18:: @ 853EF18
spr_template ANIM_TAG_UNUSED_ORB, ANIM_TAG_UNUSED_ORB, gUnknown_085249CC, gUnknown_0853EEF8, NULL, gUnknown_0853EF14, sub_80A8A6C

View File

@@ -406,7 +406,7 @@ gSpriteTemplate_858998C:: @ 858998C
spr_template 0x80eb, 0x80eb, gOamData_8589944, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_8589984, SpriteCallbackDummy
.align 2
gUnknown_085899EC:: @ 85899EC
gContestExcitementTable:: @ 85899EC
.2byte 0x0001, 0xffff, 0x0000, 0x0001, 0xffff, 0x00ff, 0x0001, 0xffff, 0x00ff, 0x0001, 0xff00, 0x00ff, 0x0001, 0x0000

View File

@@ -2,10 +2,12 @@
#include "constants/battle_frontier.h"
#include "constants/battle_setup.h"
#include "constants/event_objects.h"
#include "constants/event_object_movement_constants.h"
#include "constants/field_effects.h"
#include "constants/flags.h"
#include "constants/items.h"
#include "constants/heal_locations.h"
#include "constants/layouts.h"
#include "constants/maps.h"
#include "constants/moves.h"
#include "constants/songs.h"
@@ -60,11 +62,7 @@ gStdScripts:: @ 81DC2A0
.4byte Std_RegisteredInMatchCall
.4byte Std_9
.4byte Std_10
gStdScripts_End:: @ 81DC2CC
map_script 3, PetalburgCity_MapScript1_1DC2D7
map_script 2, PetalburgCity_MapScript2_1DC31C
.byte 0
.include "data/maps/PetalburgCity/scripts.inc"
.include "data/maps/SlateportCity/scripts.inc"
@@ -638,17 +636,17 @@ SecretBase_RedCave1_Text_23B759: @ 823B759
.include "data/maps/RecordCorner/scripts.inc"
.include "data/maps/DoubleBattleColosseum/scripts.inc"
.include "data/maps/LinkContestRoom1/scripts.inc"
.include "data/maps/LinkContestRoom2/scripts.inc"
.include "data/maps/LinkContestRoom3/scripts.inc"
.include "data/maps/LinkContestRoom4/scripts.inc"
.include "data/maps/LinkContestRoom5/scripts.inc"
.include "data/maps/LinkContestRoom6/scripts.inc"
.include "data/maps/UnknownMap_25_29/scripts.inc"
.include "data/maps/UnknownMap_25_30/scripts.inc"
.include "data/maps/UnknownMap_25_31/scripts.inc"
.include "data/maps/UnknownMap_25_32/scripts.inc"
.include "data/maps/UnknownMap_25_33/scripts.inc"
.include "data/maps/UnknownMap_25_34/scripts.inc"
.include "data/maps/LinkContestRoom2/scripts.inc"
.include "data/maps/LinkContestRoom3/scripts.inc"
.include "data/maps/LinkContestRoom4/scripts.inc"
.include "data/maps/LinkContestRoom5/scripts.inc"
.include "data/maps/LinkContestRoom6/scripts.inc"
.include "data/maps/InsideOfTruck/scripts.inc"
.include "data/maps/SSTidalCorridor/scripts.inc"
.include "data/maps/SSTidalLowerDeck/scripts.inc"

View File

@@ -1,26 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2, 0
sFanfares:: @ 85248BC
@ song number, duration
.2byte 0x016f, 0x0050
.2byte 0x0172, 0x00a0
.2byte 0x0173, 0x00dc
.2byte 0x0174, 0x00dc
.2byte 0x0170, 0x00a0
.2byte 0x0171, 0x0154
.2byte 0x017a, 0x00b4
.2byte 0x0183, 0x0078
.2byte 0x0184, 0x02c6
.2byte 0x0185, 0x00fa
.2byte 0x0186, 0x0096
.2byte 0x0187, 0x00a0
.2byte 0x0226, 0x01c2
.2byte 0x0212, 0x00aa
.2byte 0x0211, 0x00c4
.2byte 0x01cb, 0x0139
.2byte 0x01d2, 0x013e
.2byte 0x01cc, 0x0087

View File

@@ -1,103 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnknown_0854014C:: @ 854014C
.incbin "graphics/misc/sunny_day/0.gbapal"
.incbin "graphics/misc/sunny_day/1.gbapal"
.incbin "graphics/misc/sunny_day/2.gbapal"
.incbin "graphics/misc/sunny_day/3.gbapal"
.incbin "graphics/misc/sunny_day/4.gbapal"
.incbin "graphics/misc/sunny_day/5.gbapal"
.incbin "graphics/misc/sunny_day/6.gbapal"
.incbin "graphics/misc/sunny_day/7.gbapal"
.incbin "graphics/misc/sunny_day/8.gbapal"
.incbin "graphics/misc/sunny_day/9.gbapal"
.incbin "graphics/misc/sunny_day/10.gbapal"
.incbin "graphics/misc/sunny_day/11.gbapal"
.incbin "graphics/misc/sunny_day/12.gbapal"
.incbin "graphics/misc/sunny_day/13.gbapal"
.incbin "graphics/misc/sunny_day/14.gbapal"
.incbin "graphics/misc/sunny_day/15.gbapal"
.incbin "graphics/misc/sunny_day/16.gbapal"
.incbin "graphics/misc/sunny_day/17.gbapal"
.incbin "graphics/misc/sunny_day/18.gbapal"
.incbin "graphics/misc/sunny_day/19.gbapal"
.incbin "graphics/misc/sunny_day/20.gbapal"
.incbin "graphics/misc/sunny_day/21.gbapal"
.incbin "graphics/misc/sunny_day/22.gbapal"
.incbin "graphics/misc/sunny_day/23.gbapal"
.incbin "graphics/misc/sunny_day/24.gbapal"
.incbin "graphics/misc/sunny_day/25.gbapal"
.incbin "graphics/misc/sunny_day/26.gbapal"
.incbin "graphics/misc/sunny_day/27.gbapal"
.incbin "graphics/misc/sunny_day/28.gbapal"
.incbin "graphics/misc/sunny_day/29.gbapal"
.incbin "graphics/misc/sunny_day/30.gbapal"
.incbin "graphics/misc/sunny_day/31.gbapal"
.incbin "graphics/misc/sunny_day/32.gbapal"
.incbin "graphics/misc/sunny_day/33.gbapal"
.incbin "graphics/misc/sunny_day/34.gbapal"
.incbin "graphics/misc/sunny_day/35.gbapal"
.incbin "graphics/misc/sunny_day/36.gbapal"
.incbin "graphics/misc/sunny_day/37.gbapal"
.incbin "graphics/misc/sunny_day/38.gbapal"
.incbin "graphics/misc/sunny_day/39.gbapal"
.incbin "graphics/misc/sunny_day/40.gbapal"
.incbin "graphics/misc/sunny_day/41.gbapal"
.incbin "graphics/misc/sunny_day/42.gbapal"
.incbin "graphics/misc/sunny_day/43.gbapal"
.incbin "graphics/misc/sunny_day/44.gbapal"
.incbin "graphics/misc/sunny_day/45.gbapal"
.incbin "graphics/misc/sunny_day/46.gbapal"
.incbin "graphics/misc/sunny_day/47.gbapal"
.incbin "graphics/misc/sunny_day/48.gbapal"
.incbin "graphics/misc/sunny_day/49.gbapal"
.incbin "graphics/misc/sunny_day/50.gbapal"
.incbin "graphics/misc/sunny_day/51.gbapal"
.incbin "graphics/misc/sunny_day/52.gbapal"
.incbin "graphics/misc/sunny_day/53.gbapal"
.incbin "graphics/misc/sunny_day/54.gbapal"
.incbin "graphics/misc/sunny_day/55.gbapal"
.incbin "graphics/misc/sunny_day/56.gbapal"
.incbin "graphics/misc/sunny_day/57.gbapal"
.incbin "graphics/misc/sunny_day/58.gbapal"
.incbin "graphics/misc/sunny_day/59.gbapal"
.incbin "graphics/misc/sunny_day/60.gbapal"
.incbin "graphics/misc/sunny_day/61.gbapal"
.incbin "graphics/misc/sunny_day/62.gbapal"
.incbin "graphics/misc/sunny_day/63.gbapal"
.incbin "graphics/misc/sunny_day/64.gbapal"
.incbin "graphics/misc/sunny_day/65.gbapal"
.incbin "graphics/misc/sunny_day/66.gbapal"
.incbin "graphics/misc/sunny_day/67.gbapal"
.incbin "graphics/misc/sunny_day/68.gbapal"
.incbin "graphics/misc/sunny_day/69.gbapal"
.incbin "graphics/misc/sunny_day/70.gbapal"
.incbin "graphics/misc/sunny_day/71.gbapal"
.incbin "graphics/misc/sunny_day/72.gbapal"
.incbin "graphics/misc/sunny_day/73.gbapal"
.incbin "graphics/misc/sunny_day/74.gbapal"
.incbin "graphics/misc/sunny_day/75.gbapal"
.incbin "graphics/misc/sunny_day/76.gbapal"
.incbin "graphics/misc/sunny_day/77.gbapal"
.incbin "graphics/misc/sunny_day/78.gbapal"
.incbin "graphics/misc/sunny_day/79.gbapal"
.incbin "graphics/misc/sunny_day/80.gbapal"
.incbin "graphics/misc/sunny_day/81.gbapal"
.incbin "graphics/misc/sunny_day/82.gbapal"
.incbin "graphics/misc/sunny_day/83.gbapal"
.incbin "graphics/misc/sunny_day/84.gbapal"
.incbin "graphics/misc/sunny_day/85.gbapal"
.incbin "graphics/misc/sunny_day/86.gbapal"
.incbin "graphics/misc/sunny_day/87.gbapal"
.incbin "graphics/misc/sunny_day/88.gbapal"
.incbin "graphics/misc/sunny_day/89.gbapal"
.incbin "graphics/misc/sunny_day/90.gbapal"
.incbin "graphics/misc/sunny_day/91.gbapal"
.incbin "graphics/misc/sunny_day/92.gbapal"
.incbin "graphics/misc/sunny_day/93.gbapal"
.incbin "graphics/misc/sunny_day/94.gbapal"
.incbin "graphics/misc/sunny_day/95.gbapal"

View File

@@ -1,441 +0,0 @@
.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/Route111_NoMirageTower/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"

2
data/layouts/.gitignore vendored Executable file
View File

@@ -0,0 +1,2 @@
layouts.inc
layouts_table.inc

View File

@@ -1,15 +0,0 @@
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

View File

@@ -1,15 +0,0 @@
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

View File

@@ -1,15 +0,0 @@
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

View File

@@ -1,15 +0,0 @@
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

View File

@@ -1,15 +0,0 @@
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

View File

@@ -1,15 +0,0 @@
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

View File

@@ -1,15 +0,0 @@
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

View File

@@ -1,15 +0,0 @@
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

View File

@@ -1,15 +0,0 @@
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

View File

@@ -1,15 +0,0 @@
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

View File

@@ -1,15 +0,0 @@
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

View File

@@ -1,15 +0,0 @@
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

View File

@@ -1,15 +0,0 @@
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

View File

@@ -1,15 +0,0 @@
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

View File

@@ -1,15 +0,0 @@
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

View File

@@ -1,15 +0,0 @@
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

View File

@@ -1,15 +0,0 @@
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

View File

@@ -1,15 +0,0 @@
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

View File

@@ -1,15 +0,0 @@
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

View File

@@ -1,15 +0,0 @@
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

View File

@@ -1,15 +0,0 @@
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

View File

@@ -1,15 +0,0 @@
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

View File

@@ -1,15 +0,0 @@
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

View File

@@ -1,15 +0,0 @@
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

View File

@@ -1,15 +0,0 @@
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

View File

@@ -1,15 +0,0 @@
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

View File

@@ -1,15 +0,0 @@
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

View File

@@ -1,15 +0,0 @@
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

View File

@@ -1,15 +0,0 @@
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

View File

@@ -1,15 +0,0 @@
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

View File

@@ -1,15 +0,0 @@
BattleFrontier_BattleDomePreBattleRoom_MapBorder::
.incbin "data/layouts/BattleFrontier_BattleDomePreBattleRoom/border.bin"
BattleFrontier_BattleDomePreBattleRoom_MapBlockdata::
.incbin "data/layouts/BattleFrontier_BattleDomePreBattleRoom/map.bin"
.align 2
BattleFrontier_BattleDomePreBattleRoom_Layout::
.4byte 0x9
.4byte 0x8
.4byte BattleFrontier_BattleDomePreBattleRoom_MapBorder
.4byte BattleFrontier_BattleDomePreBattleRoom_MapBlockdata
.4byte gTileset_Building
.4byte gTileset_BattleDome

View File

@@ -1,15 +0,0 @@
BattleFrontier_BattleFactoryBattleRoom_MapBorder::
.incbin "data/layouts/BattleFrontier_BattleFactoryBattleRoom/border.bin"
BattleFrontier_BattleFactoryBattleRoom_MapBlockdata::
.incbin "data/layouts/BattleFrontier_BattleFactoryBattleRoom/map.bin"
.align 2
BattleFrontier_BattleFactoryBattleRoom_Layout::
.4byte 0xd
.4byte 0xc
.4byte BattleFrontier_BattleFactoryBattleRoom_MapBorder
.4byte BattleFrontier_BattleFactoryBattleRoom_MapBlockdata
.4byte gTileset_Building
.4byte gTileset_BattleFactory

View File

@@ -1,15 +0,0 @@
BattleFrontier_BattleFactoryLobby_MapBorder::
.incbin "data/layouts/BattleFrontier_BattleFactoryLobby/border.bin"
BattleFrontier_BattleFactoryLobby_MapBlockdata::
.incbin "data/layouts/BattleFrontier_BattleFactoryLobby/map.bin"
.align 2
BattleFrontier_BattleFactoryLobby_Layout::
.4byte 0x13
.4byte 0xc
.4byte BattleFrontier_BattleFactoryLobby_MapBorder
.4byte BattleFrontier_BattleFactoryLobby_MapBlockdata
.4byte gTileset_Building
.4byte gTileset_BattleFactory

View File

@@ -1,15 +0,0 @@
BattleFrontier_BattleFactoryPreBattleRoom_MapBorder::
.incbin "data/layouts/BattleFrontier_BattleFactoryPreBattleRoom/border.bin"
BattleFrontier_BattleFactoryPreBattleRoom_MapBlockdata::
.incbin "data/layouts/BattleFrontier_BattleFactoryPreBattleRoom/map.bin"
.align 2
BattleFrontier_BattleFactoryPreBattleRoom_Layout::
.4byte 0x11
.4byte 0xe
.4byte BattleFrontier_BattleFactoryPreBattleRoom_MapBorder
.4byte BattleFrontier_BattleFactoryPreBattleRoom_MapBlockdata
.4byte gTileset_Building
.4byte gTileset_BattleFactory

View File

@@ -1,15 +0,0 @@
BattleFrontier_BattlePalaceBattleRoom_MapBorder::
.incbin "data/layouts/BattleFrontier_BattlePalaceBattleRoom/border.bin"
BattleFrontier_BattlePalaceBattleRoom_MapBlockdata::
.incbin "data/layouts/BattleFrontier_BattlePalaceBattleRoom/map.bin"
.align 2
BattleFrontier_BattlePalaceBattleRoom_Layout::
.4byte 0xf
.4byte 0xa
.4byte BattleFrontier_BattlePalaceBattleRoom_MapBorder
.4byte BattleFrontier_BattlePalaceBattleRoom_MapBlockdata
.4byte gTileset_General
.4byte gTileset_BattlePalace

View File

@@ -1,15 +0,0 @@
BattleFrontier_BattlePalaceCorridor_MapBorder::
.incbin "data/layouts/BattleFrontier_BattlePalaceCorridor/border.bin"
BattleFrontier_BattlePalaceCorridor_MapBlockdata::
.incbin "data/layouts/BattleFrontier_BattlePalaceCorridor/map.bin"
.align 2
BattleFrontier_BattlePalaceCorridor_Layout::
.4byte 0x11
.4byte 0xe
.4byte BattleFrontier_BattlePalaceCorridor_MapBorder
.4byte BattleFrontier_BattlePalaceCorridor_MapBlockdata
.4byte gTileset_General
.4byte gTileset_BattlePalace

View File

@@ -1,15 +0,0 @@
BattleFrontier_BattlePalaceLobby_MapBorder::
.incbin "data/layouts/BattleFrontier_BattlePalaceLobby/border.bin"
BattleFrontier_BattlePalaceLobby_MapBlockdata::
.incbin "data/layouts/BattleFrontier_BattlePalaceLobby/map.bin"
.align 2
BattleFrontier_BattlePalaceLobby_Layout::
.4byte 0x19
.4byte 0xc
.4byte BattleFrontier_BattlePalaceLobby_MapBorder
.4byte BattleFrontier_BattlePalaceLobby_MapBlockdata
.4byte gTileset_Building
.4byte gTileset_BattlePalace

View File

@@ -1,15 +0,0 @@
BattleFrontier_BattlePikeCorridor_MapBorder::
.incbin "data/layouts/BattleFrontier_BattlePikeCorridor/border.bin"
BattleFrontier_BattlePikeCorridor_MapBlockdata::
.incbin "data/layouts/BattleFrontier_BattlePikeCorridor/map.bin"
.align 2
BattleFrontier_BattlePikeCorridor_Layout::
.4byte 0xe
.4byte 0x8
.4byte BattleFrontier_BattlePikeCorridor_MapBorder
.4byte BattleFrontier_BattlePikeCorridor_MapBlockdata
.4byte gTileset_Building
.4byte gTileset_BattlePike

View File

@@ -1,15 +0,0 @@
BattleFrontier_BattlePikeLobby_MapBorder::
.incbin "data/layouts/BattleFrontier_BattlePikeLobby/border.bin"
BattleFrontier_BattlePikeLobby_MapBlockdata::
.incbin "data/layouts/BattleFrontier_BattlePikeLobby/map.bin"
.align 2
BattleFrontier_BattlePikeLobby_Layout::
.4byte 0xb
.4byte 0xd
.4byte BattleFrontier_BattlePikeLobby_MapBorder
.4byte BattleFrontier_BattlePikeLobby_MapBlockdata
.4byte gTileset_Building
.4byte gTileset_BattlePike

View File

@@ -1,15 +0,0 @@
BattleFrontier_BattlePikeRandomRoom1_MapBorder::
.incbin "data/layouts/BattleFrontier_BattlePikeRandomRoom1/border.bin"
BattleFrontier_BattlePikeRandomRoom1_MapBlockdata::
.incbin "data/layouts/BattleFrontier_BattlePikeRandomRoom1/map.bin"
.align 2
BattleFrontier_BattlePikeRandomRoom1_Layout::
.4byte 0x9
.4byte 0x8
.4byte BattleFrontier_BattlePikeRandomRoom1_MapBorder
.4byte BattleFrontier_BattlePikeRandomRoom1_MapBlockdata
.4byte gTileset_Building
.4byte gTileset_BattlePike

View File

@@ -1,15 +0,0 @@
BattleFrontier_BattlePikeRandomRoom2_MapBorder::
.incbin "data/layouts/BattleFrontier_BattlePikeRandomRoom2/border.bin"
BattleFrontier_BattlePikeRandomRoom2_MapBlockdata::
.incbin "data/layouts/BattleFrontier_BattlePikeRandomRoom2/map.bin"
.align 2
BattleFrontier_BattlePikeRandomRoom2_Layout::
.4byte 0x5
.4byte 0x8
.4byte BattleFrontier_BattlePikeRandomRoom2_MapBorder
.4byte BattleFrontier_BattlePikeRandomRoom2_MapBlockdata
.4byte gTileset_Building
.4byte gTileset_BattlePike

View File

@@ -1,15 +0,0 @@
BattleFrontier_BattlePikeRandomRoom3_MapBorder::
.incbin "data/layouts/BattleFrontier_BattlePikeRandomRoom3/border.bin"
BattleFrontier_BattlePikeRandomRoom3_MapBlockdata::
.incbin "data/layouts/BattleFrontier_BattlePikeRandomRoom3/map.bin"
.align 2
BattleFrontier_BattlePikeRandomRoom3_Layout::
.4byte 0x9
.4byte 0x14
.4byte BattleFrontier_BattlePikeRandomRoom3_MapBorder
.4byte BattleFrontier_BattlePikeRandomRoom3_MapBlockdata
.4byte gTileset_Building
.4byte gTileset_BattlePike

View File

@@ -1,15 +0,0 @@
BattleFrontier_BattlePikeThreePathRoom_MapBorder::
.incbin "data/layouts/BattleFrontier_BattlePikeThreePathRoom/border.bin"
BattleFrontier_BattlePikeThreePathRoom_MapBlockdata::
.incbin "data/layouts/BattleFrontier_BattlePikeThreePathRoom/map.bin"
.align 2
BattleFrontier_BattlePikeThreePathRoom_Layout::
.4byte 0xd
.4byte 0xb
.4byte BattleFrontier_BattlePikeThreePathRoom_MapBorder
.4byte BattleFrontier_BattlePikeThreePathRoom_MapBlockdata
.4byte gTileset_Building
.4byte gTileset_BattlePike

View File

@@ -1,15 +0,0 @@
BattleFrontier_BattlePointExchangeServiceCorner_MapBorder::
.incbin "data/layouts/BattleFrontier_BattlePointExchangeServiceCorner/border.bin"
BattleFrontier_BattlePointExchangeServiceCorner_MapBlockdata::
.incbin "data/layouts/BattleFrontier_BattlePointExchangeServiceCorner/map.bin"
.align 2
BattleFrontier_BattlePointExchangeServiceCorner_Layout::
.4byte 0xf
.4byte 0xb
.4byte BattleFrontier_BattlePointExchangeServiceCorner_MapBorder
.4byte BattleFrontier_BattlePointExchangeServiceCorner_MapBlockdata
.4byte gTileset_Building
.4byte gTileset_BattleFrontier

View File

@@ -1,15 +0,0 @@
BattleFrontier_BattlePyramidEmptySquare_MapBorder::
.incbin "data/layouts/BattleFrontier_BattlePyramidEmptySquare/border.bin"
BattleFrontier_BattlePyramidEmptySquare_MapBlockdata::
.incbin "data/layouts/BattleFrontier_BattlePyramidEmptySquare/map.bin"
.align 2
BattleFrontier_BattlePyramidEmptySquare_Layout::
.4byte 0x8
.4byte 0x8
.4byte BattleFrontier_BattlePyramidEmptySquare_MapBorder
.4byte BattleFrontier_BattlePyramidEmptySquare_MapBlockdata
.4byte gTileset_Building
.4byte gTileset_BattlePyramid

View File

@@ -1,15 +0,0 @@
BattleFrontier_BattlePyramidLobby_MapBorder::
.incbin "data/layouts/BattleFrontier_BattlePyramidLobby/border.bin"
BattleFrontier_BattlePyramidLobby_MapBlockdata::
.incbin "data/layouts/BattleFrontier_BattlePyramidLobby/map.bin"
.align 2
BattleFrontier_BattlePyramidLobby_Layout::
.4byte 0xf
.4byte 0x12
.4byte BattleFrontier_BattlePyramidLobby_MapBorder
.4byte BattleFrontier_BattlePyramidLobby_MapBlockdata
.4byte gTileset_Building
.4byte gTileset_BattlePyramid

View File

@@ -1,15 +0,0 @@
BattleFrontier_BattlePyramidTop_MapBorder::
.incbin "data/layouts/BattleFrontier_BattlePyramidTop/border.bin"
BattleFrontier_BattlePyramidTop_MapBlockdata::
.incbin "data/layouts/BattleFrontier_BattlePyramidTop/map.bin"
.align 2
BattleFrontier_BattlePyramidTop_Layout::
.4byte 0x22
.4byte 0x17
.4byte BattleFrontier_BattlePyramidTop_MapBorder
.4byte BattleFrontier_BattlePyramidTop_MapBlockdata
.4byte gTileset_Building
.4byte gTileset_BattlePyramid

View File

@@ -1,15 +0,0 @@
BattleFrontier_BattleTowerBattleRoom_MapBorder::
.incbin "data/layouts/BattleFrontier_BattleTowerBattleRoom/border.bin"
BattleFrontier_BattleTowerBattleRoom_MapBlockdata::
.incbin "data/layouts/BattleFrontier_BattleTowerBattleRoom/map.bin"
.align 2
BattleFrontier_BattleTowerBattleRoom_Layout::
.4byte 0xa
.4byte 0x9
.4byte BattleFrontier_BattleTowerBattleRoom_MapBorder
.4byte BattleFrontier_BattleTowerBattleRoom_MapBlockdata
.4byte gTileset_Building
.4byte gTileset_BattleFrontier

View File

@@ -1,15 +0,0 @@
BattleFrontier_BattleTowerCorridor_MapBorder::
.incbin "data/layouts/BattleFrontier_BattleTowerCorridor/border.bin"
BattleFrontier_BattleTowerCorridor_MapBlockdata::
.incbin "data/layouts/BattleFrontier_BattleTowerCorridor/map.bin"
.align 2
BattleFrontier_BattleTowerCorridor_Layout::
.4byte 0x11
.4byte 0x5
.4byte BattleFrontier_BattleTowerCorridor_MapBorder
.4byte BattleFrontier_BattleTowerCorridor_MapBlockdata
.4byte gTileset_Building
.4byte gTileset_BattleFrontier

View File

@@ -1,15 +0,0 @@
BattleFrontier_BattleTowerCorridor2_MapBorder::
.incbin "data/layouts/BattleFrontier_BattleTowerCorridor2/border.bin"
BattleFrontier_BattleTowerCorridor2_MapBlockdata::
.incbin "data/layouts/BattleFrontier_BattleTowerCorridor2/map.bin"
.align 2
BattleFrontier_BattleTowerCorridor2_Layout::
.4byte 0x11
.4byte 0x5
.4byte BattleFrontier_BattleTowerCorridor2_MapBorder
.4byte BattleFrontier_BattleTowerCorridor2_MapBlockdata
.4byte gTileset_Building
.4byte gTileset_BattleFrontier

View File

@@ -1,15 +0,0 @@
BattleFrontier_BattleTowerLobby_MapBorder::
.incbin "data/layouts/BattleFrontier_BattleTowerLobby/border.bin"
BattleFrontier_BattleTowerLobby_MapBlockdata::
.incbin "data/layouts/BattleFrontier_BattleTowerLobby/map.bin"
.align 2
BattleFrontier_BattleTowerLobby_Layout::
.4byte 0x19
.4byte 0xa
.4byte BattleFrontier_BattleTowerLobby_MapBorder
.4byte BattleFrontier_BattleTowerLobby_MapBlockdata
.4byte gTileset_Building
.4byte gTileset_BattleFrontier

View File

@@ -1,15 +0,0 @@
BattleFrontier_BattleTowerMultiBattleRoom_MapBorder::
.incbin "data/layouts/BattleFrontier_BattleTowerMultiBattleRoom/border.bin"
BattleFrontier_BattleTowerMultiBattleRoom_MapBlockdata::
.incbin "data/layouts/BattleFrontier_BattleTowerMultiBattleRoom/map.bin"
.align 2
BattleFrontier_BattleTowerMultiBattleRoom_Layout::
.4byte 0x15
.4byte 0xf
.4byte BattleFrontier_BattleTowerMultiBattleRoom_MapBorder
.4byte BattleFrontier_BattleTowerMultiBattleRoom_MapBlockdata
.4byte gTileset_Building
.4byte gTileset_BattleFrontier

View File

@@ -1,15 +0,0 @@
BattleFrontier_Lounge1_MapBorder::
.incbin "data/layouts/BattleFrontier_Lounge1/border.bin"
BattleFrontier_Lounge1_MapBlockdata::
.incbin "data/layouts/BattleFrontier_Lounge1/map.bin"
.align 2
BattleFrontier_Lounge1_Layout::
.4byte 0xd
.4byte 0x8
.4byte BattleFrontier_Lounge1_MapBorder
.4byte BattleFrontier_Lounge1_MapBlockdata
.4byte gTileset_Building
.4byte gTileset_BattleFrontier

View File

@@ -1,15 +0,0 @@
BattleFrontier_Lounge2_MapBorder::
.incbin "data/layouts/BattleFrontier_Lounge2/border.bin"
BattleFrontier_Lounge2_MapBlockdata::
.incbin "data/layouts/BattleFrontier_Lounge2/map.bin"
.align 2
BattleFrontier_Lounge2_Layout::
.4byte 0x9
.4byte 0xa
.4byte BattleFrontier_Lounge2_MapBorder
.4byte BattleFrontier_Lounge2_MapBlockdata
.4byte gTileset_Building
.4byte gTileset_BattleFrontier

View File

@@ -1,15 +0,0 @@
BattleFrontier_OutsideEast_MapBorder::
.incbin "data/layouts/BattleFrontier_OutsideEast/border.bin"
BattleFrontier_OutsideEast_MapBlockdata::
.incbin "data/layouts/BattleFrontier_OutsideEast/map.bin"
.align 2
BattleFrontier_OutsideEast_Layout::
.4byte 0x48
.4byte 0x48
.4byte BattleFrontier_OutsideEast_MapBorder
.4byte BattleFrontier_OutsideEast_MapBlockdata
.4byte gTileset_General
.4byte gTileset_BattleFrontierOutsideEast

View File

@@ -1,15 +0,0 @@
BattleFrontier_OutsideWest_MapBorder::
.incbin "data/layouts/BattleFrontier_OutsideWest/border.bin"
BattleFrontier_OutsideWest_MapBlockdata::
.incbin "data/layouts/BattleFrontier_OutsideWest/map.bin"
.align 2
BattleFrontier_OutsideWest_Layout::
.4byte 0x38
.4byte 0x48
.4byte BattleFrontier_OutsideWest_MapBorder
.4byte BattleFrontier_OutsideWest_MapBlockdata
.4byte gTileset_General
.4byte gTileset_BattleFrontierOutsideWest

View File

@@ -1,15 +0,0 @@
BattleFrontier_RankingHall_MapBorder::
.incbin "data/layouts/BattleFrontier_RankingHall/border.bin"
BattleFrontier_RankingHall_MapBlockdata::
.incbin "data/layouts/BattleFrontier_RankingHall/map.bin"
.align 2
BattleFrontier_RankingHall_Layout::
.4byte 0x35
.4byte 0xf
.4byte BattleFrontier_RankingHall_MapBorder
.4byte BattleFrontier_RankingHall_MapBlockdata
.4byte gTileset_Building
.4byte gTileset_BattleFrontierRankingHall

View File

@@ -1,15 +0,0 @@
BattleFrontier_ReceptionGate_MapBorder::
.incbin "data/layouts/BattleFrontier_ReceptionGate/border.bin"
BattleFrontier_ReceptionGate_MapBlockdata::
.incbin "data/layouts/BattleFrontier_ReceptionGate/map.bin"
.align 2
BattleFrontier_ReceptionGate_Layout::
.4byte 0x9
.4byte 0xe
.4byte BattleFrontier_ReceptionGate_MapBorder
.4byte BattleFrontier_ReceptionGate_MapBlockdata
.4byte gTileset_General
.4byte gTileset_BattleFrontier

View File

@@ -1,15 +0,0 @@
BattleFrontier_ScottsHouse_MapBorder::
.incbin "data/layouts/BattleFrontier_ScottsHouse/border.bin"
BattleFrontier_ScottsHouse_MapBlockdata::
.incbin "data/layouts/BattleFrontier_ScottsHouse/map.bin"
.align 2
BattleFrontier_ScottsHouse_Layout::
.4byte 0x6
.4byte 0x8
.4byte BattleFrontier_ScottsHouse_MapBorder
.4byte BattleFrontier_ScottsHouse_MapBlockdata
.4byte gTileset_Building
.4byte gTileset_BattleFrontier

View File

@@ -1,15 +0,0 @@
BattlePyramidSquare01_MapBorder::
.incbin "data/layouts/BattlePyramidSquare01/border.bin"
BattlePyramidSquare01_MapBlockdata::
.incbin "data/layouts/BattlePyramidSquare01/map.bin"
.align 2
BattlePyramidSquare01_Layout::
.4byte 0x8
.4byte 0x8
.4byte BattlePyramidSquare01_MapBorder
.4byte BattlePyramidSquare01_MapBlockdata
.4byte gTileset_Building
.4byte gTileset_BattlePyramid

View File

@@ -1,15 +0,0 @@
BattlePyramidSquare02_MapBorder::
.incbin "data/layouts/BattlePyramidSquare02/border.bin"
BattlePyramidSquare02_MapBlockdata::
.incbin "data/layouts/BattlePyramidSquare02/map.bin"
.align 2
BattlePyramidSquare02_Layout::
.4byte 0x8
.4byte 0x8
.4byte BattlePyramidSquare02_MapBorder
.4byte BattlePyramidSquare02_MapBlockdata
.4byte gTileset_Building
.4byte gTileset_BattlePyramid

View File

@@ -1,15 +0,0 @@
BattlePyramidSquare03_MapBorder::
.incbin "data/layouts/BattlePyramidSquare03/border.bin"
BattlePyramidSquare03_MapBlockdata::
.incbin "data/layouts/BattlePyramidSquare03/map.bin"
.align 2
BattlePyramidSquare03_Layout::
.4byte 0x8
.4byte 0x8
.4byte BattlePyramidSquare03_MapBorder
.4byte BattlePyramidSquare03_MapBlockdata
.4byte gTileset_Building
.4byte gTileset_BattlePyramid

View File

@@ -1,15 +0,0 @@
BattlePyramidSquare04_MapBorder::
.incbin "data/layouts/BattlePyramidSquare04/border.bin"
BattlePyramidSquare04_MapBlockdata::
.incbin "data/layouts/BattlePyramidSquare04/map.bin"
.align 2
BattlePyramidSquare04_Layout::
.4byte 0x8
.4byte 0x8
.4byte BattlePyramidSquare04_MapBorder
.4byte BattlePyramidSquare04_MapBlockdata
.4byte gTileset_Building
.4byte gTileset_BattlePyramid

View File

@@ -1,15 +0,0 @@
BattlePyramidSquare05_MapBorder::
.incbin "data/layouts/BattlePyramidSquare05/border.bin"
BattlePyramidSquare05_MapBlockdata::
.incbin "data/layouts/BattlePyramidSquare05/map.bin"
.align 2
BattlePyramidSquare05_Layout::
.4byte 0x8
.4byte 0x8
.4byte BattlePyramidSquare05_MapBorder
.4byte BattlePyramidSquare05_MapBlockdata
.4byte gTileset_Building
.4byte gTileset_BattlePyramid

View File

@@ -1,15 +0,0 @@
BattlePyramidSquare06_MapBorder::
.incbin "data/layouts/BattlePyramidSquare06/border.bin"
BattlePyramidSquare06_MapBlockdata::
.incbin "data/layouts/BattlePyramidSquare06/map.bin"
.align 2
BattlePyramidSquare06_Layout::
.4byte 0x8
.4byte 0x8
.4byte BattlePyramidSquare06_MapBorder
.4byte BattlePyramidSquare06_MapBlockdata
.4byte gTileset_Building
.4byte gTileset_BattlePyramid

View File

@@ -1,15 +0,0 @@
BattlePyramidSquare07_MapBorder::
.incbin "data/layouts/BattlePyramidSquare07/border.bin"
BattlePyramidSquare07_MapBlockdata::
.incbin "data/layouts/BattlePyramidSquare07/map.bin"
.align 2
BattlePyramidSquare07_Layout::
.4byte 0x8
.4byte 0x8
.4byte BattlePyramidSquare07_MapBorder
.4byte BattlePyramidSquare07_MapBlockdata
.4byte gTileset_Building
.4byte gTileset_BattlePyramid

View File

@@ -1,15 +0,0 @@
BattlePyramidSquare08_MapBorder::
.incbin "data/layouts/BattlePyramidSquare08/border.bin"
BattlePyramidSquare08_MapBlockdata::
.incbin "data/layouts/BattlePyramidSquare08/map.bin"
.align 2
BattlePyramidSquare08_Layout::
.4byte 0x8
.4byte 0x8
.4byte BattlePyramidSquare08_MapBorder
.4byte BattlePyramidSquare08_MapBlockdata
.4byte gTileset_Building
.4byte gTileset_BattlePyramid

View File

@@ -1,15 +0,0 @@
BattlePyramidSquare09_MapBorder::
.incbin "data/layouts/BattlePyramidSquare09/border.bin"
BattlePyramidSquare09_MapBlockdata::
.incbin "data/layouts/BattlePyramidSquare09/map.bin"
.align 2
BattlePyramidSquare09_Layout::
.4byte 0x8
.4byte 0x8
.4byte BattlePyramidSquare09_MapBorder
.4byte BattlePyramidSquare09_MapBlockdata
.4byte gTileset_Building
.4byte gTileset_BattlePyramid

View File

@@ -1,15 +0,0 @@
BattlePyramidSquare10_MapBorder::
.incbin "data/layouts/BattlePyramidSquare10/border.bin"
BattlePyramidSquare10_MapBlockdata::
.incbin "data/layouts/BattlePyramidSquare10/map.bin"
.align 2
BattlePyramidSquare10_Layout::
.4byte 0x8
.4byte 0x8
.4byte BattlePyramidSquare10_MapBorder
.4byte BattlePyramidSquare10_MapBlockdata
.4byte gTileset_Building
.4byte gTileset_BattlePyramid

View File

@@ -1,15 +0,0 @@
BattlePyramidSquare11_MapBorder::
.incbin "data/layouts/BattlePyramidSquare11/border.bin"
BattlePyramidSquare11_MapBlockdata::
.incbin "data/layouts/BattlePyramidSquare11/map.bin"
.align 2
BattlePyramidSquare11_Layout::
.4byte 0x8
.4byte 0x8
.4byte BattlePyramidSquare11_MapBorder
.4byte BattlePyramidSquare11_MapBlockdata
.4byte gTileset_Building
.4byte gTileset_BattlePyramid

View File

@@ -1,15 +0,0 @@
BattlePyramidSquare12_MapBorder::
.incbin "data/layouts/BattlePyramidSquare12/border.bin"
BattlePyramidSquare12_MapBlockdata::
.incbin "data/layouts/BattlePyramidSquare12/map.bin"
.align 2
BattlePyramidSquare12_Layout::
.4byte 0x8
.4byte 0x8
.4byte BattlePyramidSquare12_MapBorder
.4byte BattlePyramidSquare12_MapBlockdata
.4byte gTileset_Building
.4byte gTileset_BattlePyramid

View File

@@ -1,15 +0,0 @@
BattlePyramidSquare13_MapBorder::
.incbin "data/layouts/BattlePyramidSquare13/border.bin"
BattlePyramidSquare13_MapBlockdata::
.incbin "data/layouts/BattlePyramidSquare13/map.bin"
.align 2
BattlePyramidSquare13_Layout::
.4byte 0x8
.4byte 0x8
.4byte BattlePyramidSquare13_MapBorder
.4byte BattlePyramidSquare13_MapBlockdata
.4byte gTileset_Building
.4byte gTileset_BattlePyramid

View File

@@ -1,15 +0,0 @@
BattlePyramidSquare14_MapBorder::
.incbin "data/layouts/BattlePyramidSquare14/border.bin"
BattlePyramidSquare14_MapBlockdata::
.incbin "data/layouts/BattlePyramidSquare14/map.bin"
.align 2
BattlePyramidSquare14_Layout::
.4byte 0x8
.4byte 0x8
.4byte BattlePyramidSquare14_MapBorder
.4byte BattlePyramidSquare14_MapBlockdata
.4byte gTileset_Building
.4byte gTileset_BattlePyramid

View File

@@ -1,15 +0,0 @@
BattlePyramidSquare15_MapBorder::
.incbin "data/layouts/BattlePyramidSquare15/border.bin"
BattlePyramidSquare15_MapBlockdata::
.incbin "data/layouts/BattlePyramidSquare15/map.bin"
.align 2
BattlePyramidSquare15_Layout::
.4byte 0x8
.4byte 0x8
.4byte BattlePyramidSquare15_MapBorder
.4byte BattlePyramidSquare15_MapBlockdata
.4byte gTileset_Building
.4byte gTileset_BattlePyramid

View File

@@ -1,15 +0,0 @@
BattlePyramidSquare16_MapBorder::
.incbin "data/layouts/BattlePyramidSquare16/border.bin"
BattlePyramidSquare16_MapBlockdata::
.incbin "data/layouts/BattlePyramidSquare16/map.bin"
.align 2
BattlePyramidSquare16_Layout::
.4byte 0x8
.4byte 0x8
.4byte BattlePyramidSquare16_MapBorder
.4byte BattlePyramidSquare16_MapBlockdata
.4byte gTileset_Building
.4byte gTileset_BattlePyramid

View File

@@ -1,15 +0,0 @@
BattleTentBattleRoom_MapBorder::
.incbin "data/layouts/BattleTentBattleRoom/border.bin"
BattleTentBattleRoom_MapBlockdata::
.incbin "data/layouts/BattleTentBattleRoom/map.bin"
.align 2
BattleTentBattleRoom_Layout::
.4byte 0xa
.4byte 0x9
.4byte BattleTentBattleRoom_MapBorder
.4byte BattleTentBattleRoom_MapBlockdata
.4byte gTileset_Building
.4byte gTileset_BattleTent

View File

@@ -1,15 +0,0 @@
BattleTentCorridor_MapBorder::
.incbin "data/layouts/BattleTentCorridor/border.bin"
BattleTentCorridor_MapBlockdata::
.incbin "data/layouts/BattleTentCorridor/map.bin"
.align 2
BattleTentCorridor_Layout::
.4byte 0x5
.4byte 0x8
.4byte BattleTentCorridor_MapBorder
.4byte BattleTentCorridor_MapBlockdata
.4byte gTileset_Building
.4byte gTileset_BattleTent

View File

@@ -1,15 +0,0 @@
BattleTentLobby_MapBorder::
.incbin "data/layouts/BattleTentLobby/border.bin"
BattleTentLobby_MapBlockdata::
.incbin "data/layouts/BattleTentLobby/map.bin"
.align 2
BattleTentLobby_Layout::
.4byte 0xd
.4byte 0xa
.4byte BattleTentLobby_MapBorder
.4byte BattleTentLobby_MapBlockdata
.4byte gTileset_Building
.4byte gTileset_BattleTent

View File

@@ -1,15 +0,0 @@
BirthIsland_Exterior_MapBorder::
.incbin "data/layouts/BirthIsland_Exterior/border.bin"
BirthIsland_Exterior_MapBlockdata::
.incbin "data/layouts/BirthIsland_Exterior/map.bin"
.align 2
BirthIsland_Exterior_Layout::
.4byte 0x1e
.4byte 0x1e
.4byte BirthIsland_Exterior_MapBorder
.4byte BirthIsland_Exterior_MapBlockdata
.4byte gTileset_General
.4byte gTileset_Dewford

View File

@@ -1,15 +0,0 @@
CableCarStation_MapBorder::
.incbin "data/layouts/CableCarStation/border.bin"
CableCarStation_MapBlockdata::
.incbin "data/layouts/CableCarStation/map.bin"
.align 2
CableCarStation_Layout::
.4byte 0xd
.4byte 0xc
.4byte CableCarStation_MapBorder
.4byte CableCarStation_MapBlockdata
.4byte gTileset_General
.4byte gTileset_Facility

View File

@@ -1,15 +0,0 @@
CaveOfOrigin_1F_MapBorder::
.incbin "data/layouts/CaveOfOrigin_1F/border.bin"
CaveOfOrigin_1F_MapBlockdata::
.incbin "data/layouts/CaveOfOrigin_1F/map.bin"
.align 2
CaveOfOrigin_1F_Layout::
.4byte 0x17
.4byte 0x17
.4byte CaveOfOrigin_1F_MapBorder
.4byte CaveOfOrigin_1F_MapBlockdata
.4byte gTileset_General
.4byte gTileset_Cave

View File

@@ -1,15 +0,0 @@
CaveOfOrigin_B1F_MapBorder::
.incbin "data/layouts/CaveOfOrigin_B1F/border.bin"
CaveOfOrigin_B1F_MapBlockdata::
.incbin "data/layouts/CaveOfOrigin_B1F/map.bin"
.align 2
CaveOfOrigin_B1F_Layout::
.4byte 0x13
.4byte 0x13
.4byte CaveOfOrigin_B1F_MapBorder
.4byte CaveOfOrigin_B1F_MapBlockdata
.4byte gTileset_General
.4byte gTileset_Cave

Some files were not shown because too many files have changed in this diff Show More