Merge remote-tracking branch 'upstream/master' into use_pokeblock

# Conflicts:
#	src/use_pokeblock.c
This commit is contained in:
Marcus Huderle
2019-03-23 09:39:46 -05:00
5866 changed files with 120190 additions and 82893 deletions

1
.gitattributes vendored
View File

@@ -9,6 +9,7 @@ Makefile text eol=lf
*.pl text eol=lf
*.inc text eol=lf
*.sha1 text eol=lf
*.json text eol=lf
*.png binary
*.bin binary

View File

@@ -1,5 +1,7 @@
#!/usr/bin/perl
use IPC::Cmd qw[ run ];
(@ARGV == 1)
or die "ERROR: no map file specified.\n";
open(my $file, $ARGV[0])
@@ -7,7 +9,6 @@ open(my $file, $ARGV[0])
my $src = 0;
my $asm = 0;
my $undocumented = 0;
while (my $line = <$file>)
{
if ($line =~ /^ \.(\w+)\s+0x[0-9a-f]+\s+(0x[0-9a-f]+) (\w+)\/.+\.o/)
@@ -28,19 +29,92 @@ while (my $line = <$file>)
}
}
}
if($line =~ /^\s+0x([0-9A-f]+)\s+[A-z_]+([0-9A-f]+)/) {
my $thing1 = sprintf("%08X", hex($1));
my $thing2 = sprintf("%08X", hex($2));
if($thing1 eq $thing2) {
$undocumented += 1;
}
}
}
# Note that the grep filters out all branch labels. It also requires a minimum
# line length of 5, to filter out a ton of generated symbols (like AcCn). No
# settings to nm seem to remove these symbols. Finally, nm prints out a separate
# entry for whenever a name appears in a file, not just where it's defined. uniq
# removes all the duplicate entries.
#
#
# You'd expect this to take a while, because of uniq. It runs in under a second,
# though. Uniq is pretty fast!
my $base_cmd = "nm pokeemerald.elf | awk '{print \$3}' | grep '^[^_].\\{4\\}' | uniq";
# This looks for Unknown_, Unknown_, or sub_, followed by just numbers. Note that
# it matches even if stuff precedes the unknown, like sUnknown/gUnknown.
my $undoc_cmd = "grep '[Uu]nknown_[0-9a-fA-F]*\\|sub_[0-9a-fA-F]*'";
# This looks for every symbol with an address at the end of it. Some things are
# given a name based on their type / location, but still have an unknown purpose.
# For example, FooMap_EventScript_FFFFFFF.
my $partial_doc_cmd = "grep '[0-9a-fA-F]\\{6,7\\}'";
my $count_cmd = "wc -l";
# It sucks that we have to run this three times, but I can't figure out how to get
# stdin working for subcommands in perl while still having a timeout. It's decently
# fast anyway.
my $total_syms_as_string;
(run (
command => "$base_cmd | $count_cmd",
buffer => \$total_syms_as_string,
timeout => 60
))
or die "ERROR: Error while getting all symbols: $?";
my $undocumented_as_string;
(run (
command => "$base_cmd | $undoc_cmd | $count_cmd",
buffer => \$undocumented_as_string,
timeout => 60
))
or die "ERROR: Error while filtering for undocumented symbols: $?";
my $partial_documented_as_string;
(run (
command => "$base_cmd | $partial_doc_cmd | $count_cmd",
buffer => \$partial_documented_as_string,
timeout => 60
))
or die "ERROR: Error while filtering for partial symbols: $?";
# Performing addition on a string converts it to a number. Any string that fails
# to convert to a number becomes 0. So if our converted number is 0, but our string
# is nonzero, then the conversion was an error.
my $undocumented = $undocumented_as_string + 0;
(($undocumented != 0) and ($undocumented_as_string ne "0"))
or die "ERROR: Cannot convert string to num: '$undocumented_as_string'";
my $partial_documented = $partial_documented_as_string + 0;
(($partial_documented != 0) and ($partial_documented_as_string ne "0"))
or die "ERROR: Cannot convert string to num: '$partial_documented_as_string'";
my $total_syms = $total_syms_as_string + 0;
(($total_syms != 0) and ($total_syms_as_string ne "0"))
or die "ERROR: Cannot convert string to num: '$total_syms_as_string'";
($total_syms != 0)
or die "ERROR: No symbols found.";
my $total = $src + $asm;
my $srcPct = sprintf("%.4f", 100 * $src / $total);
my $asmPct = sprintf("%.4f", 100 * $asm / $total);
# partial_documented is double-counting the unknown_* and sub_* symbols.
$partial_documented = $partial_documented - $undocumented;
my $documented = $total_syms - ($undocumented + $partial_documented);
my $docPct = sprintf("%.4f", 100 * $documented / $total_syms);
my $partialPct = sprintf("%.4f", 100 * $partial_documented / $total_syms);
my $undocPct = sprintf("%.4f", 100 * $undocumented / $total_syms);
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";
print "$undocumented global symbols undocumented\n";
print "\n";
print "$total_syms total symbols\n";
print "$documented symbols documented ($docPct%)\n";
print "$partial_documented symbols partially documented ($partialPct%)\n";
print "$undocumented symbols undocumented ($undocPct%)\n";

View File

@@ -66,6 +66,14 @@ cd ../pokeemerald
And build the ROM with `make`.
If the step `./build.sh` in the above list of commands fails with the error `Makefile:1: /opt/devkitpro/devkitARM/base_tools: No such file or directory`, then try installing the pacman package `devkitarm-rules` by executing the command
```
sudo dkp-pacman -S devkitarm-rules
```
Executing `./build.sh` again should now succeed.
# Faster builds
After the first build, subsequent builds are faster. You can further speed up the build:

View File

@@ -38,7 +38,7 @@ ASFLAGS := -mcpu=arm7tdmi
CC1 := tools/agbcc/bin/agbcc$(EXE)
override CFLAGS += -mthumb-interwork -Wimplicit -Wparentheses -Werror -O2 -fhex-asm
CPPFLAGS := -I tools/agbcc/include -I tools/agbcc -iquote include
CPPFLAGS := -I tools/agbcc/include -I tools/agbcc -iquote include -Wno-trigraphs
LDFLAGS = -Map ../../$(MAP)
@@ -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
@@ -153,7 +159,7 @@ $(C_BUILDDIR)/%.o : $(C_SUBDIR)/%.c $$(c_dep)
ifeq ($(NODEP),1)
$(ASM_BUILDDIR)/%.o: asm_dep :=
else
$(ASM_BUILDDIR)/%.o: asm_dep = $(shell $(SCANINC) $(ASM_SUBDIR)/$*.s)
$(ASM_BUILDDIR)/%.o: asm_dep = $(shell $(SCANINC) -I "" $(ASM_SUBDIR)/$*.s)
endif
$(ASM_BUILDDIR)/%.o: $(ASM_SUBDIR)/%.s $$(asm_dep)
@@ -162,7 +168,7 @@ $(ASM_BUILDDIR)/%.o: $(ASM_SUBDIR)/%.s $$(asm_dep)
ifeq ($(NODEP),1)
$(DATA_ASM_BUILDDIR)/%.o: data_dep :=
else
$(DATA_ASM_BUILDDIR)/%.o: data_dep = $(shell $(SCANINC) $(DATA_ASM_SUBDIR)/$*.s)
$(DATA_ASM_BUILDDIR)/%.o: data_dep = $(shell $(SCANINC) -I include -I "" $(DATA_ASM_SUBDIR)/$*.s)
endif
$(DATA_ASM_BUILDDIR)/%.o: $(DATA_ASM_SUBDIR)/%.s $$(data_dep)

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@@ -1078,7 +1078,7 @@
.4byte \param0
.endm
.macro tryimprision param0:req
.macro tryimprison param0:req
.byte 0xdb
.4byte \param0
.endm
@@ -1341,15 +1341,15 @@
.endm
.macro sethword dst:req, value:req
setbyte \dst, \value & 0xFF
setbyte \dst + 1, (\value >> 8) & 0xFF
setbyte \dst, (\value) & 0xFF
setbyte \dst + 1, ((\value) >> 8) & 0xFF
.endm
.macro setword dst:req, value:req
setbyte \dst, \value & 0xFF
setbyte \dst + 1, (\value >> 8) & 0xFF
setbyte \dst + 2, (\value >> 16) & 0xFF
setbyte \dst + 3, (\value >> 24) & 0xFF
setbyte \dst, (\value) & 0xFF
setbyte \dst + 1, ((\value) >> 8) & 0xFF
setbyte \dst + 2, ((\value) >> 16) & 0xFF
setbyte \dst + 3, ((\value) >> 24) & 0xFF
.endm
.macro copybyte dst:req, src:req

View File

@@ -313,7 +313,7 @@
.endm
@ Runs time based events. In FireRed, this command is a nop.
.macro dodailyevents
.macro dotimebasedevents
.byte 0x2d
.endm
@@ -824,7 +824,7 @@
.byte \y
.endm
@ Displays a multichoice box from which the user can choose a selection, and blocks script execution until a selection is made. Lists of options are predefined and the one to be used is specified with list. If b is set to a non-zero value, then the user will not be allowed to back out of the multichoice with the B button.
@ Displays a multichoice box from which the user can choose a selection, and blocks script execution until a selection is made. Lists of options are predefined (gMultichoiceLists) and the one to be used is specified with list. If b is set to a non-zero value, then the user will not be allowed to back out of the multichoice with the B button.
.macro multichoice x:req, y:req, list:req, b:req
.byte 0x6f
.byte \x
@@ -833,7 +833,7 @@
.byte \b
.endm
@ Displays a multichoice box from which the user can choose a selection, and blocks script execution until a selection is made. Lists of options are predefined and the one to be used is specified with list. The default argument determines the initial position of the cursor when the box is first opened; it is zero-indexed, and if it is too large, it is treated as 0x00. If b is set to a non-zero value, then the user will not be allowed to back out of the multichoice with the B button.
@ Displays a multichoice box from which the user can choose a selection, and blocks script execution until a selection is made. Lists of options are predefined (gMultichoiceLists) and the one to be used is specified with list. The default argument determines the initial position of the cursor when the box is first opened; it is zero-indexed, and if it is too large, it is treated as 0x00. If b is set to a non-zero value, then the user will not be allowed to back out of the multichoice with the B button.
.macro multichoicedefault x:req, y:req, list:req, default:req, b:req
.byte 0x70
.byte \x
@@ -843,7 +843,7 @@
.byte \b
.endm
@ Displays a multichoice box from which the user can choose a selection, and blocks script execution until a selection is made. Lists of options are predefined and the one to be used is specified with list. The per_row argument determines how many list items will be shown on a single row of the box.
@ Displays a multichoice box from which the user can choose a selection, and blocks script execution until a selection is made. Lists of options are predefined (gMultichoiceLists) and the one to be used is specified with list. The per_row argument determines how many list items will be shown on a single row of the box.
.macro multichoicegrid x:req, y:req, list:req, per_row:req, B:req
.byte 0x71
.byte \x
@@ -1163,12 +1163,12 @@
.endm
@ Changes the metatile at (x, y) on the current map.
.macro setmetatile x:req, y:req, metatile_number:req, tile_attrib:req
.macro setmetatile x:req, y:req, metatile_number:req, has_collision:req
.byte 0xa2
.2byte \x
.2byte \y
.2byte \metatile_number
.2byte \tile_attrib
.2byte \has_collision
.endm
@ Queues a weather change to the default weather for the map.

1654
asm/menu_specialized.s Normal file

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@@ -472,7 +472,7 @@ sub_8017020: @ 8017020
bl sub_81973A4
movs r0, 0
movs r1, 0x1
bl NewMenuHelpers_DrawDialogueFrame
bl DrawDialogueFrame
ldr r0, =gStringVar4
adds r1, r4, 0
bl StringExpandPlaceholders
@@ -517,7 +517,7 @@ _08017076:
bl sub_81973A4
movs r0, 0
movs r1, 0x1
bl NewMenuHelpers_DrawDialogueFrame
bl DrawDialogueFrame
ldr r0, =gStringVar4
adds r1, r5, 0
bl StringExpandPlaceholders
@@ -563,7 +563,7 @@ _080170CA:
negs r0, r0
b _08017110
_080170D4:
bl DisplayYesNoMenu
bl DisplayYesNoMenuDefaultYes
ldrb r0, [r4]
adds r0, 0x1
strb r0, [r4]
@@ -609,7 +609,7 @@ sub_8017118: @ 8017118
lsrs r4, 24
adds r0, r4, 0
movs r1, 0
bl NewMenuHelpers_DrawStdWindowFrame
bl DrawStdWindowFrame
adds r0, r4, 0
movs r1, 0xFF
bl FillWindowPixelBuffer
@@ -705,7 +705,7 @@ _080171DC:
strb r0, [r5]
ldrb r0, [r5]
movs r1, 0
bl NewMenuHelpers_DrawStdWindowFrame
bl DrawStdWindowFrame
ldr r0, =gMultiuseListMenuTemplate
adds r2, r0, 0
ldr r1, [sp, 0x24]
@@ -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]
@@ -745,7 +745,7 @@ _08017228:
bl DestroyListMenuTask
ldrb r0, [r5]
movs r1, 0x1
bl sub_819746C
bl ClearStdWindowAndFrame
ldrb r0, [r5]
bl RemoveWindow
movs r0, 0
@@ -765,7 +765,7 @@ _08017264:
bl DestroyListMenuTask
ldrb r0, [r5]
movs r1, 0x1
bl sub_819746C
bl ClearStdWindowAndFrame
ldrb r0, [r5]
bl RemoveWindow
strb r4, [r7]
@@ -818,7 +818,7 @@ _080172C8:
strb r0, [r6]
ldrb r0, [r6]
movs r1, 0
bl NewMenuHelpers_DrawStdWindowFrame
bl DrawStdWindowFrame
ldr r0, =gMultiuseListMenuTemplate
adds r2, r0, 0
ldr r1, [sp, 0x24]
@@ -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]
@@ -8315,6 +8315,11 @@ _0801AFC2:
.pool
thumb_func_end sub_801AC54
@void sub_801AFD8() {
@ CpuFill32(0, &gSaveBlock1Ptr->field_322C, 219);
@ sub_801B180();
@ sub_811F8BC();
@}
thumb_func_start sub_801AFD8
sub_801AFD8: @ 801AFD8
push {lr}
@@ -8367,25 +8372,25 @@ sav1_get_mevent_buffer_2: @ 801B034
.pool
thumb_func_end sav1_get_mevent_buffer_2
thumb_func_start sub_801B044
sub_801B044: @ 801B044
thumb_func_start GetSaveBlock1Field356C
GetSaveBlock1Field356C: @ 801B044
ldr r0, =gSaveBlock1Ptr
ldr r0, [r0]
ldr r1, =0x0000356c
adds r0, r1
bx lr
.pool
thumb_func_end sub_801B044
thumb_func_end GetSaveBlock1Field356C
thumb_func_start sub_801B058
sub_801B058: @ 801B058
thumb_func_start GetSaveBlock1Field3564
GetSaveBlock1Field3564: @ 801B058
ldr r0, =gSaveBlock1Ptr
ldr r0, [r0]
ldr r1, =0x00003564
adds r0, r1
bx lr
.pool
thumb_func_end sub_801B058
thumb_func_end GetSaveBlock1Field3564
thumb_func_start sub_801B06C
sub_801B06C: @ 801B06C
@@ -8531,7 +8536,7 @@ sub_801B180: @ 801B180
sub sp, 0x4
movs r0, 0
str r0, [sp]
bl sub_801B044
bl GetSaveBlock1Field356C
adds r1, r0, 0
ldr r2, =0x05000001
mov r0, sp
@@ -13795,7 +13800,7 @@ _0801DB60:
sub_801DB68: @ 801DB68
push {r4,r5,lr}
adds r4, r0, 0
bl sub_801B044
bl GetSaveBlock1Field356C
adds r5, r0, 0
movs r0, 0x3
adds r1, r4, 0
@@ -13841,7 +13846,7 @@ _0801DBB8:
thumb_func_start sub_801DBC0
sub_801DBC0: @ 801DBC0
push {lr}
bl sub_801B044
bl GetSaveBlock1Field356C
movs r1, 0
strb r1, [r0]
strb r1, [r0, 0x1]
@@ -13858,7 +13863,7 @@ sub_801DBDC: @ 801DBDC
ldr r0, =0x0000402e
bl GetVarPointer
adds r4, r0, 0
bl sub_801B044
bl GetSaveBlock1Field356C
adds r2, r0, 0
ldr r0, [r2]
lsls r0, 24
@@ -13889,7 +13894,7 @@ _0801DC10:
sub_801DC20: @ 801DC20
push {r4-r6,lr}
ldr r6, =gSpecialVar_Result
bl sub_801B044
bl GetSaveBlock1Field356C
adds r4, r0, 0
bl IsMysteryEventEnabled
cmp r0, 0
@@ -18237,7 +18242,7 @@ sub_801FEBC: @ 801FEBC
lsls r0, 24
lsrs r0, 24
movs r1, 0
bl sub_8198070
bl ClearStdWindowAndFrameToTransparent
ldr r0, [r4]
ldrb r0, [r0, 0x18]
bl ClearWindowTilemap
@@ -18465,7 +18470,7 @@ sub_8020094: @ 8020094
lsls r0, 24
lsrs r0, 24
movs r1, 0
bl sub_8198070
bl ClearStdWindowAndFrameToTransparent
ldr r0, [r4]
ldrb r0, [r0, 0x1E]
bl ClearWindowTilemap
@@ -18908,7 +18913,7 @@ sub_802040C: @ 802040C
push {lr}
movs r0, 0x3
movs r1, 0
bl sub_8198070
bl ClearStdWindowAndFrameToTransparent
movs r0, 0x3
bl ClearWindowTilemap
pop {r0}
@@ -22373,7 +22378,7 @@ _0802210C:
movs r1, 0
adds r2, r4, 0
movs r3, 0xD
bl SetWindowBorderStyle
bl DrawStdFrameWithCustomTileAndPalette
b _08022218
.pool
_08022130:
@@ -22504,7 +22509,7 @@ sub_802222C: @ 802222C
adds r5, r4, r0
ldrb r0, [r5]
movs r1, 0x1
bl sub_8198070
bl ClearStdWindowAndFrameToTransparent
ldrb r0, [r5]
bl RemoveWindow
adds r0, r4, 0
@@ -22572,7 +22577,7 @@ _08022296:
movs r1, 0
adds r2, r4, 0
movs r3, 0xD
bl SetWindowBorderStyle
bl DrawStdFrameWithCustomTileAndPalette
b _080224BA
.pool
_080222D0:
@@ -22768,7 +22773,7 @@ _08022480:
_08022494:
ldrb r0, [r6, 0x2]
movs r1, 0x1
bl sub_8198070
bl ClearStdWindowAndFrameToTransparent
ldrb r0, [r6, 0x2]
bl ClearWindowTilemap
ldrb r0, [r6, 0x2]
@@ -23859,7 +23864,7 @@ _08022D38:
_08022D42:
movs r0, 0
movs r1, 0
bl NewMenuHelpers_DrawDialogueFrame
bl DrawDialogueFrame
ldrb r1, [r5, 0x1]
movs r0, 0x2
mov r8, r0
@@ -23941,7 +23946,7 @@ _08022DE8:
beq _08022DFA
movs r0, 0
movs r1, 0x1
bl sub_8197434
bl ClearDialogWindowAndFrame
_08022DFA:
ldrb r0, [r7, 0xE]
movs r1, 0x1
@@ -24245,7 +24250,7 @@ _0802301E:
_08023044:
movs r0, 0
movs r1, 0x1
bl sub_8197434
bl ClearDialogWindowAndFrame
movs r0, 0xA
movs r1, 0x1
movs r2, 0
@@ -26457,7 +26462,7 @@ _080241A6:
beq _0802421E
movs r0, 0
movs r1, 0
bl NewMenuHelpers_DrawDialogueFrame
bl DrawDialogueFrame
ldr r2, =gText_SavingDontTurnOffPower
movs r0, 0
str r0, [sp]
@@ -26545,7 +26550,7 @@ _08024246:
strb r0, [r5, 0xC]
b _080242D8
_0802426A:
bl DisplayYesNoMenu
bl DisplayYesNoMenuDefaultYes
b _080242D0
_08024270:
bl Menu_ProcessInputNoWrapClearOnChoose
@@ -26578,7 +26583,7 @@ _080242A4:
_080242A6:
movs r0, 0
movs r1, 0x1
bl sub_8197434
bl ClearDialogWindowAndFrame
movs r4, 0
str r4, [sp]
adds r0, r6, 0
@@ -26756,7 +26761,7 @@ _080243EA:
_080243F6:
movs r0, 0
movs r1, 0x1
bl sub_8197434
bl ClearDialogWindowAndFrame
adds r0, r5, 0
bl sub_8021488
movs r0, 0x1
@@ -26814,7 +26819,7 @@ _0802445A:
_08024460:
movs r0, 0
movs r1, 0
bl NewMenuHelpers_DrawDialogueFrame
bl DrawDialogueFrame
ldrh r1, [r5, 0x14]
cmp r1, 0x3
bne _08024490
@@ -27181,7 +27186,7 @@ sub_8024700: @ 8024700
adds r0, r5, 0
bl sub_8024668
adds r1, r0, r4
ldr r2, =0x0001869f
ldr r2, =0x0001869f @ Note to decompiler: See UNKNOWN_OFFSET
cmp r1, r2
bhi _08024730
adds r0, r5, 0
@@ -27342,7 +27347,7 @@ sub_802482C: @ 802482C
movs r1, 0
adds r2, r4, 0
adds r3, r5, 0
bl SetWindowBorderStyle
bl DrawStdFrameWithCustomTileAndPalette
ldr r2, =gText_Powder
movs r0, 0x1
str r0, [sp]
@@ -27441,7 +27446,7 @@ sub_8024918: @ 8024918
bl ClearWindowTilemap
ldrb r0, [r4]
movs r1, 0x1
bl sub_8198070
bl ClearStdWindowAndFrameToTransparent
ldrb r0, [r4]
bl RemoveWindow
pop {r4}
@@ -38547,7 +38552,7 @@ _0802A3A4:
_0802A3AE:
movs r0, 0
movs r1, 0
bl NewMenuHelpers_DrawDialogueFrame
bl DrawDialogueFrame
ldr r2, =gText_SavingDontTurnOffPower
str r4, [sp]
movs r0, 0x2

File diff suppressed because it is too large Load Diff

114
asmdiff.ps1 Normal file
View File

@@ -0,0 +1,114 @@
Param
(
[Parameter(Position = 0)]
[string]$Start,
[Parameter(Position = 1)]
[string]$Offset,
[Parameter()]
[string[]]$DiffTool
)
$ErrorActionPreference = "Stop"
$offset_default_value = "0x100"
$diff_tool_default_value = "diff"
$help = "
$($args[0]) [OPTIONS] Start [Offset]
Performs a diff on the assembly of a function in a rom. 'Start' is the start
location of the function, and 'Offset' is the number of bytes to disassemble.
The assembly is saved to *.dump files.
'Offset' is optional, and defaults to $offset_default_value. If this value is
very large (0x10000+), objdump may hang / freeze.
Requirements:
- A clean copy of the rom named 'baserom.gba'.
- $$ENV:DEVKITARM to point to the installation of devkitpro. By default, it is
installed to 'C:\devkitpro\devkitARM'.
Options:
-DiffTool <tool> The tool to use for diffing. Defaults to '$diff_tool_default_value'. For VSCode,
you can use -DiffTool 'code --diff'. (Quotes are necessary around 'code --diff')
"
if ((-not (Test-Path variable:Start)) -or [string]::IsNullOrWhiteSpace($Start))
{
Write-Host $help
exit
}
if (-not (Test-Path variable:DiffTool) -or [string]::IsNullOrWhiteSpace($DiffTool))
{
$DiffTool = $diff_tool_default_value
}
if (-not (Test-Path variable:Offset) -or [string]::IsNullOrWhiteSpace($Offset))
{
$Offset = $offset_default_value
}
if (-Not (Test-Path env:DEVKITARM))
{
Write-Host "ENV:DEVKITARM variable not set."
Write-Host $help
exit
}
if (-Not (Test-Path $env:DEVKITARM))
{
Write-Host "DEVKITARM path '$env:DEVKITARM' does not exist."
Write-Host $help
exit
}
if (-Not (Test-Path ".\pokeemerald.gba"))
{
Write-Host "File 'pokeemerald.gba' not found."
Write-Host $help
exit
}
if (-Not (Test-Path ".\baserom.gba"))
{
Write-Host "File 'baserom.gba' not found."
}
try
{
$start_num = [System.Convert]::ToUInt64($Start, 16)
}
catch
{
Write-Host "Error parsing '$start_num' as a hex number."
Write-Host $help
exit
}
try
{
$offset_num = [System.Convert]::ToUInt64($Offset, 16)
}
catch
{
Write-Host "Error parsing '$offset_num' as a hex number."
Write-Host $help
exit
}
if ($start_num -gt 0x1000000)
{
Write-Host "Warning: Start address is larger than the ROM file. Hint: ignore the leading number in the address."
}
$end_str = [System.Convert]::ToString($start_num + $offset_num, 16)
$end_str = "0x$end_str"
Write-Host "$Start - $end_str"
$objdump = Join-Path -Path $env:DEVKITARM -ChildPath "arm-none-eabi\bin\objdump.exe"
&$objdump -D -bbinary -marmv4t -Mforce-thumb --start-address="$Start" --stop-address="$end_str" .\baserom.gba > .\baserom.dump
&$objdump -D -bbinary -marmv4t -Mforce-thumb --start-address="$Start" --stop-address="$end_str" .\pokeemerald.gba > .\pokeemerald.dump
Invoke-Expression "$DiffTool .\baserom.dump .\pokeemerald.dump"

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

@@ -1,8 +1,8 @@
gBGTilemapBuffers1
gBGTilemapBuffers2
gBGTilemapBuffers3
gUnknown_03005DA8
gHeldKeyCodeToSend
gFieldCallback
gFieldCallback2
gUnknown_03005DB4
gLocalLinkPlayerId
gFieldLinkPlayerCount

View File

@@ -0,0 +1 @@
gUnknown_03006328

View File

@@ -1,2 +1,2 @@
gUnknown_030060B0
gUnusedPokedexU8
gUnknown_030060B4

View File

@@ -0,0 +1 @@
gDexCryScreenState

View File

@@ -1,5 +1,5 @@
filler_03002F58
filler_03002F5C
gUnknown_03002F60
gTransparentTileNumber
filler_03002F64
gUnknown_03002F70

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

@@ -2538,7 +2538,7 @@ BattleScript_EffectImprison::
attackcanceler
attackstring
ppreduce
tryimprision BattleScript_ButItFailed
tryimprison BattleScript_ButItFailed
attackanimation
waitanimation
printstring STRINGID_PKMNSEALEDOPPONENTMOVE
@@ -3684,11 +3684,11 @@ BattleScript_MoveUsedIsImprisoned::
waitmessage 0x40
goto BattleScript_MoveEnd
BattleScript_SelectingImprisionedMove::
BattleScript_SelectingImprisonedMove::
printselectionstring STRINGID_PKMNCANTUSEMOVESEALED
endselectionscript
BattleScript_SelectingImprisionedMoveInPalace::
BattleScript_SelectingImprisonedMoveInPalace::
printstring STRINGID_PKMNCANTUSEMOVESEALED
goto BattleScript_SelectingUnusableMoveInPalace
@@ -3876,7 +3876,7 @@ BattleScript_MoveUsedIsInLove::
status2animation BS_ATTACKER, STATUS2_INFATUATION
return
BattleScript_MoveUsedIsParalyzedCantAttack::
BattleScript_MoveUsedIsInLoveCantAttack::
printstring STRINGID_PKMNIMMOBILIZEDBYLOVE
waitmessage 0x40
goto BattleScript_MoveEnd

View File

@@ -1,473 +0,0 @@
#include "constants/easy_chat.h"
#include "constants/moves.h"
#include "constants/species.h"
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnknown_08597530:: @ 8597530
.4byte 0x0000001a
.4byte sub_811A8CC
.4byte 0x00000019
.4byte sub_811A8F0
.4byte 0x0000001c
.4byte sub_811A914
.4byte 0x0000001b
.4byte sub_811A938
gUnknown_08597550:: @ 8597550
.byte 0x00, 0x02, 0x02, 0x00
.align 2
.4byte gText_Profile
.4byte gText_CombineFourWordsOrPhrases
.4byte gText_AndMakeYourProfile
.4byte gText_YourProfile
.4byte gText_IsAsShownOkay
.byte 0x01, 0x02, 0x03, 0x01
.align 2
.4byte gText_AtTheBattlesStart
.4byte gText_CombineSixWordsOrPhrases
.4byte gText_AndMakeAMessage
.4byte gText_YourFeelingAtTheBattlesStart
.4byte gText_IsAsShownOkay
.byte 0x02, 0x02, 0x03, 0x01
.align 2
.4byte gText_UponWinningABattle
.4byte gText_CombineSixWordsOrPhrases
.4byte gText_AndMakeAMessage
.4byte gText_WhatYouSayIfYouWin
.4byte gText_IsAsShownOkay
.byte 0x03, 0x02, 0x03, 0x01
.align 2
.4byte gText_UponLosingABattle
.4byte gText_CombineSixWordsOrPhrases
.4byte gText_AndMakeAMessage
.4byte gText_WhatYouSayIfYouLose
.4byte gText_IsAsShownOkay
.byte 0x04, 0x02, 0x05, 0x02
.align 2
.4byte NULL
.4byte gText_CombineNineWordsOrPhrases
.4byte gText_AndMakeAMessage2
.4byte gText_TheMailMessage
.4byte gText_IsAsShownOkay
.byte 0x05, 0x02, 0x02, 0x05
.align 2
.4byte gText_Interview
.4byte gText_CombineFourWordsOrPhrases
.4byte gText_LetsReplyToTheInterview
.4byte gText_TheAnswer
.4byte gText_IsAsShownOkay
.byte 0x06, 0x02, 0x03, 0x01
.align 2
.4byte gText_TheBardsSong
.4byte gText_ChangeJustOneWordOrPhrase
.4byte gText_AndImproveTheBardsSong
.4byte gText_TheBardsSong2
.4byte gText_IsAsShownOkay
.byte 0x07, 0x01, 0x01, 0x04
.align 2
.4byte gText_Interview
.4byte gText_FindWordsThatDescribeYour
.4byte gText_FeelingsRightNow
.4byte gText_TheAnswer
.4byte gText_IsAsShownOkay
.byte 0x09, 0x02, 0x01, 0x03
.align 2
.4byte gText_WhatsHipAndHappening
.4byte gText_CombineTwoWordsOrPhrases
.4byte gText_AndMakeATrendySaying
.4byte gText_TheTrendySaying
.4byte gText_IsAsShownOkay
.byte 0x10, 0x02, 0x05, 0x87
.align 2
.4byte NULL
.4byte gText_AfterYouHaveReadTheQuiz
.4byte gText_QuestionPressTheAButton
.4byte NULL
.4byte NULL
.byte 0x0f, 0x01, 0x01, 0x86
.align 2
.4byte gText_TheQuizAnswerIs
.4byte gText_OutOfTheListedChoices
.4byte gText_SelectTheAnswerToTheQuiz
.4byte gText_TheAnswerColon
.4byte gText_IsAsShownOkay
.byte 0x11, 0x02, 0x05, 0x88
.align 2
.4byte NULL
.4byte gText_CombineNineWordsOrPhrases
.4byte gText_AndCreateAQuiz
.4byte gText_IsThisQuizOK
.4byte NULL
.byte 0x12, 0x01, 0x01, 0x86
.align 2
.4byte gText_TheQuizAnswerIs
.4byte gText_PickAWordOrPhraseAnd
.4byte gText_SetTheQuizAnswer
.4byte gText_IsThisQuizOK
.4byte NULL
.byte 0x06, 0x02, 0x03, 0x01
.align 2
.4byte gText_TheBardsSong
.4byte gText_ChangeJustOneWordOrPhrase
.4byte gText_AndImproveTheBardsSong
.4byte gText_TheBardsSong2
.4byte gText_IsAsShownOkay
.byte 0x13, 0x02, 0x03, 0x01
.align 2
.4byte gText_ApprenticesPhrase
.4byte gText_FindWordsWhichFit
.4byte gText_TheTrainersImage
.4byte gText_ApprenticePhrase
.4byte gText_IsAsShownOkay
.byte 0x0d, 0x02, 0x01, 0x03
.align 2
.4byte gText_GoodSaying
.4byte gText_CombineTwoWordsOrPhrases2
.4byte gText_ToTeachHerAGoodSaying
.4byte gText_TheAnswer
.4byte gText_IsAsShownOkay
.byte 0x0a, 0x01, 0x01, 0x04
.align 2
.4byte gText_Interview
.4byte gText_FindWordsThatDescribeYour
.4byte gText_FeelingsRightNow
.4byte gText_TheAnswer
.4byte gText_IsAsShownOkay
.byte 0x0c, 0x01, 0x01, 0x04
.align 2
.4byte gText_Interview
.4byte gText_FindWordsThatDescribeYour
.4byte gText_FeelingsRightNow
.4byte gText_TheAnswer
.4byte gText_IsAsShownOkay
.byte 0x0b, 0x01, 0x01, 0x04
.align 2
.4byte gText_Interview
.4byte gText_FindWordsThatDescribeYour
.4byte gText_FeelingsRightNow
.4byte gText_TheAnswer
.4byte gText_IsAsShownOkay
.byte 0x0e, 0x01, 0x01, 0x04
.align 2
.4byte gText_FansQuestion
.4byte gText_FindWordsWhichFit
.4byte gText_TheTrainersImage
.4byte gText_TheImage
.4byte gText_IsAsShownOkay
.byte 0x14, 0x02, 0x02, 0x00
.align 2
.4byte gText_Questionnaire
.4byte gText_CombineFourWordsOrPhrases
.4byte gText_AndFillOutTheQuestionnaire
.4byte gText_TheAnswer
.4byte gText_IsAsShownOkay
gUnknown_08597748:: @ 8597748
.byte 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x00, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x00, 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1a
gUnknown_08597764:: @ 8597764
.2byte 0x0209, 0x140b, 0x1030, 0x102a
gUnknown_0859776C:: @ 859776C
.2byte 0x1240, 0x0628, 0x061f, 0x2204, 0x1422, 0x0197, 0x0415, 0x0198, 0x2207, 0x0449
.align 2
gUnknown_08597780:: @ 8597780
.incbin "graphics/misc/interview_triangle_cursor.gbapal"
.align 2
gUnknown_085977A0:: @ 85977A0
.incbin "graphics/misc/interview_triangle_cursor.4bpp"
.align 2
gUnknown_085977C0:: @ 85977C0
.incbin "graphics/misc/interview_arrow.4bpp"
.align 2
gUnknown_085978C0:: @ 85978C0
.incbin "graphics/misc/interview_buttons.4bpp"
.align 2
gUnknown_085979C0:: @ 85979C0
.incbin "graphics/misc/interview_frame.gbapal"
.align 2
gUnknown_085979E0:: @ 85979E0
.incbin "graphics/misc/interview_frame.4bpp.lz"
.align 2
gUnknown_08597B14:: @ 8597B14
.incbin "graphics/misc/interview_frame_orange.gbapal"
.align 2
gUnknown_08597B34:: @ 8597B34
.incbin "graphics/misc/interview_frame_green.gbapal"
.align 2
gUnknown_08597B54:: @ 8597B54
.incbin "graphics/misc/interview_frame_2.4bpp.lz"
.align 2
gUnknown_08597C1C:: @ 8597C1C
.incbin "graphics/misc/8597C1C.gbapal"
.align 2
gUnknown_08597C24:: @ 8597C24
.incbin "graphics/misc/8597C24.gbapal"
gUnknown_08597C30:: @ 8597C30
.byte 0x83, 0x18, 0x04, 0x00, 0x63, 0x18, 0x06, 0x00, 0x03, 0x18, 0x0a, 0x00, 0xa3, 0x18, 0x02, 0x00, 0xb0, 0x0c, 0x02, 0x00, 0x83, 0x18, 0x04, 0x00, 0x89, 0x0c, 0x02, 0x01, 0x65, 0x14, 0x0a, 0x03
.byte 0x03, 0x18, 0x0a, 0x02
.align 2
gUnknown_08597C54:: @ 8597C54
.4byte 0x000001c0, 0x000011dd, 0x002021e2, 0x000031fb
.align 2
gUnknown_08597C64:: @ 8597C64
window_template 0x01, 0x06, 0x00, 0x12, 0x02, 0x0a, 0x0010
window_template 0x00, 0x03, 0x0f, 0x18, 0x04, 0x0f, 0x000a
window_template 0x02, 0x01, 0x00, 0x1c, 0x20, 0x03, 0x0000
null_window_template
.align 2
gUnknown_08597C84:: @ 8597C84
window_template 0x00, 0x16, 0x09, 0x05, 0x04, 0x0f, 0x006a
gUnknown_08597C8C:: @ 8597C8C
.string "{CLEAR 17}$"
.align 2
gUnknown_08597C90:: @ 8597C90
.4byte gUnknown_862B810
.4byte gUnknown_862B832
.4byte gUnknown_862B84B
.4byte gUnknown_862B86C
.align 2
gUnknown_08597CA0:: @ 8597CA0
obj_tiles gUnknown_085977A0, 0x0020, 0x0000
obj_tiles gUnknown_085977C0, 0x0100, 0x0002
obj_tiles gUnknown_085978C0, 0x0100, 0x0003
null_obj_tiles
.align 2
gUnknown_08597CC0:: @ 8597CC0
obj_pal gUnknown_08597780, 0x0000
obj_pal gEasyChatCursor_Pal, 0x0001
obj_pal gEasyChatRightWindow_Pal, 0x0002
obj_pal gUnknown_085979C0, 0x0003
null_obj_pal
.align 2
gUnknown_08597CE8:: @ 8597CE8
obj_tiles gUnknown_085979E0, 0x0800, 0x0005
obj_tiles gEasyChatCursor_Gfx, 0x1000, 0x0001
obj_tiles gEasyChatRightWindow_Gfx, 0x0800, 0x0006
obj_tiles gEasyChatMode_Gfx, 0x1000, 0x0004
gUnknown_08597D08:: @ 8597D08
.byte 0x00, 0x0c, 0x18, 0x38, 0x44, 0x50, 0x5c, 0x00
.align 2
gOamData_8597D10:: @ 8597D10
.2byte 0x0000
.2byte 0x0000
.2byte 0x0C00
.align 2
gUnknown_08597D18:: @ 8597D18
spr_template 0x0000, 0x0000, gOamData_8597D10, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_811DF28
.align 2
gUnknown_08597D30:: @ 8597D30
.2byte 0x4000, 0xc000, 0x0400, 0x0000
.align 2
gUnknown_08597D38:: @ 8597D38
.2byte 0x0000, 0x0000, 0xffff, 0x0000
.align 2
gUnknown_08597D40:: @ 8597D40
.2byte 0x0020, 0x0000, 0xffff, 0x0000
.align 2
gUnknown_08597D48:: @ 8597D48
.2byte 0x0040, 0x0000, 0xffff, 0x0000
.align 2
gUnknown_08597D50:: @ 8597D50
.2byte 0x0060, 0x0000, 0xffff, 0x0000
.align 2
gUnknown_08597D58:: @ 8597D58
.4byte gUnknown_08597D38
.4byte gUnknown_08597D40
.4byte gUnknown_08597D48
.4byte gUnknown_08597D50
.align 2
gUnknown_08597D68:: @ 8597D68
spr_template 0x0001, 0x0001, gUnknown_08597D30, gUnknown_08597D58, NULL, gDummySpriteAffineAnimTable, sub_811DF28
.align 2
gUnknown_08597D80:: @ 8597D80
.2byte 0x4000, 0xc000, 0x0400, 0x0000
.align 2
gUnknown_08597D88:: @ 8597D88
.2byte 0x0060, 0x0000, 0xffff, 0x0000
.align 2
gUnknown_08597D90:: @ 8597D90
.2byte 0x0040, 0x0004, 0x0020, 0x0004, 0xffff, 0x0000
.align 2
gUnknown_08597D9C:: @ 8597D9C
.2byte 0x0040, 0x0004, 0x0000, 0x0004, 0xffff, 0x0000
.align 2
gUnknown_08597DA8:: @ 8597DA8
.2byte 0x0040, 0x0004, 0x0060, 0x0000, 0xffff, 0x0000
.align 2
gUnknown_08597DB4:: @ 8597DB4
.2byte 0x0040, 0x0004, 0xffff, 0x0000
.align 2
gUnknown_08597DBC:: @ 8597DBC
.4byte gUnknown_08597D88
.4byte gUnknown_08597D90
.4byte gUnknown_08597D9C
.4byte gUnknown_08597DA8
.4byte gUnknown_08597DB4
.align 2
gUnknown_08597DD0:: @ 8597DD0
spr_template 0x0004, 0x0002, gUnknown_08597D80, gUnknown_08597DBC, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
gUnknown_08597DE8:: @ 8597DE8
.2byte 0x0000, 0xc000, 0x0c00, 0x0000
.align 2
gUnknown_08597DF0:: @ 8597DF0
spr_template 0x0006, 0x0002, gUnknown_08597DE8, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
gUnknown_08597E08:: @ 8597E08
.2byte 0x4000, 0x4000, 0x0400, 0x0000
.align 2
gUnknown_08597E10:: @ 8597E10
.2byte 0x0000, 0x4000, 0x0400, 0x0000
.align 2
gUnknown_08597E18:: @ 8597E18
.2byte 0x0000, 0x0000, 0xffff, 0x0000
.align 2
gUnknown_08597E20:: @ 8597E20
.2byte 0x0004, 0x0000, 0xffff, 0x0000
.align 2
gUnknown_08597E28:: @ 8597E28
.4byte gUnknown_08597E18
.4byte gUnknown_08597E20
.align 2
gUnknown_08597E30:: @ 8597E30
spr_template 0x0003, 0x0002, gUnknown_08597E08, gUnknown_08597E28, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
gUnknown_08597E48:: @ 8597E48
spr_template 0x0002, 0x0002, gUnknown_08597E10, gUnknown_08597E28, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
gUnknown_08597E60:: @ 8597E60
.byte 0x10, 0x6f, 0xc4, 0x00, 0x10, 0x4e, 0x82, 0xa0, 0x10, 0x50, 0x86, 0xaa
.align 2
gUnknown_08597E6C:: @ 8597E6C
.4byte gText_DelAll
.4byte gText_Cancel5
.4byte gText_Ok2
.4byte NULL
.4byte gText_DelAll
.4byte gText_Cancel5
.4byte gText_Ok2
.4byte gText_Quiz
.4byte gText_DelAll
.4byte gText_Cancel5
.4byte gText_Ok2
.4byte gText_Answer
@ 8597E9C
.include "data/text/easy_chat/easy_chat_groups.inc"
@ 859D0B4
.include "data/text/easy_chat/easy_chat_words_by_letter.inc"
@ 859E5D4
.include "data/text/easy_chat/easy_chat_group_name_pointers.inc"
gUnknown_0859E62C:: @ 859E62C
.2byte 0x0a29, 0x1020, 0x020e, 0x0a33
gUnknown_0859E634:: @ 859E634
.2byte 0x100f, 0x0a02, 0x0e25, 0x0c03, 0x0803, 0x0c00
gUnknown_0859E640:: @ 859E640
.2byte 0x0c3a, 0x0c3a, 0x0c01, 0x0a2a, 0x0607, 0x0c01
gUnknown_0859E64C:: @ 859E64C
.2byte 0x1039, 0x122e, 0x0c04, 0x0a3d, 0x0630, 0x0c04
gUnknown_0859E658:: @ 859E658
.2byte 0x019a, 0x0000

View File

@@ -3,200 +3,6 @@
.section .rodata
gUnknown_086253E8:: @ 86253E8
.4byte 0x8010100
.4byte 0x80F02
.4byte 0x8011500
.4byte 0x180F12
.4byte 0xB010100
.4byte 0x180F08
gUnknown_08625400:: @ 8625400
.byte 1, 2, 3
gUnknown_08625403:: @ 8625403
.byte 0xFF
gUnknown_08625404:: @ 8625404
.byte 0x40, 0, 0, 4, 1, 0, 0x60, 0xA6, 1, 0, 0, 0
gUnknown_08625410:: @ 8625410
.byte 4, 5, 6, 7, 8, 9, 9, 0xA, 0xA, 0xB, 0xB, 0xC, 0xC, 0xD, 0xD, 0xD, 0xD, 0xE, 0xE, 0xE, 0xE, 0xF, 0xF, 0xF, 0xF, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x12, 0x12, 0x12, 0x12, 0x12, 0x12, 0x13, 0x13, 0x13, 0x13, 0x13, 0x13, 0x13, 0x13, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x15, 0x15, 0x15, 0x15, 0x15, 0x15, 0x15, 0x15, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x1A, 0x1A, 0x1A, 0x1A, 0x1A, 0x1A, 0x1A, 0x1A, 0x1A, 0x1A, 0x1A, 0x1A, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x23
gUnknown_08625510:: @ 8625510
.4byte 0x10010101
.4byte 0xA0F0C
.4byte 0x10010101
.4byte 0xCA0F0C
.4byte 0xA011301
.4byte 0x18A0F0C
.4byte 0x160F0401
.4byte 0x2020F04
.4byte 0x5081600
.4byte 0x25A0F04
.4byte 0xFF
.4byte NULL
gUnknown_08625540:: @ 8625540
.4byte 0x5081600
.4byte 0x25A0F04
gUnknown_08625548:: @ 8625548
.4byte NULL
.4byte sub_81D2BD0
.4byte NULL
.2byte 0
.2byte 0
.byte 2
.byte 0
.byte 8
.byte 0
.4byte 0x1003121
gUnknown_08625560:: @ 8625560
.incbin "graphics/pokenav/pokeball.4bpp"
gUnknown_08625660:: @ 8625660
.incbin "graphics/pokenav/8625660.4bpp"
gUnknown_08625680:: @ 8625680
.incbin "graphics/pokenav/sparkle.gbapal"
gUnknown_086256A0:: @ 86255A0
.incbin "graphics/pokenav/sparkle.4bpp"
gUnknown_08625A20:: @ 8625A20
.2byte 0
.2byte 0xC000
.2byte 0x400
.2byte 0
gUnknown_08625A28:: @ 8625A28
.2byte 0
.2byte 0x4000
.2byte 0x800
.2byte 0
gUnknown_08625A30:: @ 8625A30
.2byte 0
.2byte 5
.2byte 0xFFFF
.2byte 0
gUnknown_08625A38:: @ 8625A38
.2byte 4
.2byte 5
.2byte 0xFFFF
.2byte 0
gUnknown_08625A40:: @ 8625A40
.4byte gUnknown_08625A30
.4byte gUnknown_08625A38
gUnknown_08625A48:: @ 8625A48
.4byte NULL
.4byte 0x640800
gUnknown_08625A50:: @ 8625A50
spr_template 0x64, 0x64, gUnknown_08625A20, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
gUnknown_08625A68:: @ 8625A68
.4byte NULL
.4byte 0x64
gUnknown_08625A70:: @ 8625A70
.4byte gUnknown_08625560
.byte 0, 1, 0x65, 0
.4byte gUnknown_08625660
.2byte 0x20, 0x67
.4byte gPokenavConditionCancel_Gfx
.byte 0, 1, 0x66, 0
.4byte NULL, NULL
gUnknown_08625A90:: @ 8625A90
.4byte gPokenavConditionCancel_Pal + 0x0
.byte 0x65, 0, 0, 0
.4byte gPokenavConditionCancel_Pal + 0x20
.byte 0x66, 0, 0, 0
.4byte NULL, NULL
gUnknown_08625AA8:: @ 8625AA8
spr_template 0x65, 0x65, gUnknown_08625A28, gUnknown_08625A40, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
gUnknown_08625AC0:: @ 8625AC0
.4byte gUnknown_086256A0
.byte 0x80, 3, 0x68, 0
gUnknown_08625AC8:: @ 8625AC8
.4byte gUnknown_08625680
.byte 0x68, 0, 0, 0
gUnknown_08625AD0:: @ 8625AD0
.2byte 0
.2byte 0x4000
.2byte 0
.2byte 0
gUnknown_08625AD8:: @ 8625AD8
.2byte 0
.2byte 5
.2byte 4
.2byte 5
gUnknown_08625AE0:: @ 8625AE0
.2byte 8
.2byte 5
.2byte 12
.2byte 5
gUnknown_08625AE8:: @ 8625AE8
.2byte 16
.2byte 5
.2byte 20
.2byte 5
gUnknown_08625AF0:: @ 8625AF0
.2byte 24
.2byte 5
.2byte 0xFFFF
.2byte 0
gUnknown_08625AF8:: @ 8625AF8
.4byte gUnknown_08625AD8
.4byte gUnknown_08625AE0
gUnknown_08625B00:: @ 8625B00
.4byte gUnknown_08625AE8
.4byte gUnknown_08625AF0
gUnknown_08625B08:: @ 8625B08
.4byte gUnknown_08625AF8
.4byte gUnknown_08625B00
.4byte gUnknown_08625B08
gUnknown_08625B14:: @ 8625B14
spr_template 0x68, 0x68, gUnknown_08625AD0, gUnknown_08625AF8, NULL gDummySpriteAffineAnimTable, sub_81D3564
gUnknown_08625B2C:: @ 8625B2C
.2byte 0, 0xFFDD
.2byte 20, 0xFFE4
.2byte 33, 0xFFF6
.2byte 33, 10
.2byte 20, 28
.2byte 0, 35
.2byte 0xFFEC, 28
.2byte 0xFFDF, 10
.2byte 0xFFDF, 0xFFF6
.2byte 0xFFEC, 0xFFE4
gUnknown_08625B54:: @ 8625B54
.4byte gUnknown_085EEA46
.4byte gUnknown_085EEA4E
.4byte gUnknown_085EEA55
.4byte gUnknown_085EEA63
.4byte gUnknown_085EEA6B
.4byte gUnknown_085EEA5D
gUnknown_08625B6C:: @ 8625B6C
@ apparently e-reader trainer data? idk
.byte 0x6f, 0x57, 0x54, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x0c, 0x01, 0x00, 0x00, 0x00, 0x2e, 0x14, 0x0c, 0x0e, 0x23, 0x10, 0x47, 0x0a, 0x1f, 0x06, 0x24, 0x0e, 0x48, 0x0a, 0x0f, 0x06
@@ -240,12 +46,3 @@ gUnknown_08625B6C:: @ 8625B6C
.byte 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x4b, 0x01, 0xc6, 0x00, 0x39, 0x00, 0xf2, 0x00, 0x26, 0x00, 0x59, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x10
.byte 0xa5, 0x94, 0x52, 0x0a, 0x96, 0x00, 0x00, 0x00, 0x5b, 0x72, 0x6a, 0x91, 0xae, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7a, 0x01, 0x8d, 0x00, 0x5e, 0x00, 0xf7, 0x00, 0x55, 0x00, 0x05, 0x01
.byte 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x10, 0xa5, 0x94, 0x52, 0x0a, 0x96, 0x00, 0x00, 0x00, 0x8d, 0x85, 0x9e, 0xa0, 0x60, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
gUnknown_0862608C:: @ 862608C
.2byte 21, 16
.2byte 25, 16
.2byte 16, 17
.2byte 20, 20
gUnknown_0862609C:: @ 862609C
.incbin "data/unknown_jp_62609C.bin"

7
data/ereader_screen.s Executable file
View File

@@ -0,0 +1,7 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
gUnknown_0862609C:: @ 862609C
.incbin "data/unknown_jp_62609C.bin"

File diff suppressed because it is too large Load Diff

View File

@@ -65,7 +65,7 @@ gFieldEffectScriptPointers:: @ 82DB9D4
.4byte gFieldEffectScript_Unknown57
.4byte gFieldEffectScript_Unknown58
.4byte gFieldEffectScript_FieldMoveShowMonInit
.4byte gFieldEffectScript_Unknown60
.4byte gFieldEffectScript_UsePuzzleEffect
.4byte gFieldEffectScript_Unknown61
.4byte gFieldEffectScript_Unknown62
.4byte gFieldEffectScript_Unknown63
@@ -315,7 +315,7 @@ gFieldEffectScript_FieldMoveShowMonInit:: @ 82DBCCC
field_eff_callnative FldEff_FieldMoveShowMonInit
field_eff_end
gFieldEffectScript_Unknown60:: @ 82DBCD2
gFieldEffectScript_UsePuzzleEffect:: @ 82DBCD2
field_eff_callnative FldEff_UsePuzzleEffect
field_eff_end

View File

@@ -24,11 +24,11 @@ gUnref_82EC784:: @ 82EC784
.4byte 0x02000100
.4byte 0x08000400
gUnknown_82EC7C4:: @ 82EC7C4
.2byte 0x0100
.2byte 0x0200
.2byte 0x0400
.2byte 0x0800
gOverworldBackgroundLayerFlags:: @ 82EC7C4
.2byte 0x0100 /* BLDCNT_TGT2_BG0 */
.2byte 0x0200 /* BLDCNT_TGT2_BG1 */
.2byte 0x0400 /* BLDCNT_TGT2_BG2 */
.2byte 0x0800 /* BLDCNT_TGT2_BG3 */
gUnknown_82EC7CC:: @ 82EC7CC
.2byte 0x0001

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

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