Merge branch 'master' into master

This commit is contained in:
SatoMew
2019-08-04 20:35:38 +01:00
committed by GitHub
370 changed files with 59184 additions and 35860 deletions

1
.gitignore vendored
View File

@@ -27,5 +27,6 @@ Thumbs.db
build/
.DS_Store
*.ddump
.idea/
porymap.project.cfg
.vscode/

View File

@@ -22,9 +22,16 @@ install:
matrix:
include:
- os: linux
addons:
apt:
sources:
- ubuntu-toolchain-r-test
packages:
- g++-7
env: _="Build"
script:
- ./build_tools.sh
- make -j2 tools CXX=g++-7
- make -j2 compare
- make -j2 modern
after_success:
- .travis/calcrom/webhook.sh pokeemerald

View File

@@ -1,6 +1,6 @@
## Prerequisites
# Prerequisites
| Linux | macOS | Windows 10 (build 18917+) | Windows 10 (1709+) | Windows Vista, 7, 8, 8.1, and 10 (1507, 1511, 1607, 1703)
| Linux | macOS | Windows 10 (build 18917+) | Windows 10 (1709+) | Windows Vista, 7, 8, 8.1, and 10 (1507, 1511, 1607, and 1703)
| ----- | ----- | ------------------------- | ------------------ | ---------------------------------------------------------
| none | [Xcode Command Line Tools package][xcode] | [Windows Subsystem for Linux 2][wsl2] | [Windows Subsystem for Linux][wsl] | MSYS2 (see below)
@@ -20,7 +20,7 @@ Install the **devkitARM** toolchain of [devkitPro](https://devkitpro.org/wiki/Ge
echo "export DEVKITARM=$DEVKITARM" >> ~/.bashrc
## Installation
# Installation
To set up the repository:
@@ -32,22 +32,59 @@ To set up the repository:
./install.sh ../pokeemerald
cd ../pokeemerald
./build_tools.sh
If the repository was previously set up using Cygwin, delete the `.exe` files in the subfolders of the `tools` folder except for `agbcc` and run the `build_tools.sh` script again.
To build **pokeemerald.gba** and confirm it matches the official ROM image:
To build **pokeemerald.gba**:
make compare
## Notes
* If the base tools are not found on macOS in new Terminal sessions after the first successful build, run `echo "if [ -f ~/.bashrc ]; then . ~/.bashrc; fi" >> ~/.bash_profile` once to prevent the issue from occurring again. Verify that the `devkitarm-rules` package is installed as well; if not, install it by running `sudo dkp-pacman -S devkitarm-rules`.
* If the repository was previously set up using Cygwin, delete the `.exe` files in the subfolders of the `tools` folder except for `agbcc` and try building again. [Learn the differences between MSYS2 and Cygwin.](https://github.com/msys2/msys2/wiki/How-does-MSYS2-differ-from-Cygwin)
# Guidance
To build **pokeemerald.gba** with your changes:
make
## Parallel builds
See [the GNU docs](https://www.gnu.org/software/make/manual/html_node/Parallel.html) and [this Stack Exchange thread](https://unix.stackexchange.com/questions/208568) for more information.
To speed up building, run:
make -j$(nproc)
To confirm it matches the official ROM image while building, do this instead:
`nproc` is not available on macOS. The alternative is `sysctl -n hw.ncpu` ([relevant Stack Overflow thread](https://stackoverflow.com/questions/1715580)).
make compare -j$(nproc)
## Building without dependency scanning
If only `.c` or `.s` files were changed, turn off the dependency scanning temporarily. Changes to any other files will be ignored and the build will either fail or not reflect those changes.
make -j$(nproc) NODEP=1
make NODEP=1
**Note:** If the build command is not recognized on Linux, including the Linux environment used within Windows, run `nproc` and replace `$(nproc)` with the returned value (e.g.: `make -j4`). Because `nproc` is not available on macOS, the alternative is `sysctl -n hw.ncpu`.
## Building with devkitARM's C compiler
**Note 2:** If the base tools are not found on macOS in new Terminal sessions after the first successful build, run `echo "if [ -f ~/.bashrc ]; then . ~/.bashrc; fi" >> ~/.bash_profile` once to prevent the issue from occurring again.
This project supports the `arm-none-eabi-gcc` compiler included with devkitARM r52. To build this target, simply run:
make modern
## Building with other toolchains
To build using a toolchain other than devkitARM, override the `TOOLCHAIN` environment variable with the path to your toolchain, which must contain the subdirectory `bin`.
make TOOLCHAIN="/path/to/toolchain/here"
The following is an example:
make TOOLCHAIN="/usr/local/arm-none-eabi"
To compile the `modern` target with this toolchain, the subdirectories `lib`, `include`, and `arm-none-eabi` must also be present.
## Building with debug info
To build **pokeemerald.elf** with enhanced debug info, use the `DINFO` variable.
make DINFO=1

103
Makefile
View File

@@ -1,4 +1,13 @@
include $(DEVKITARM)/base_tools
TOOLCHAIN := $(DEVKITARM)
ifneq (,$(wildcard $(TOOLCHAIN)/base_tools))
include $(TOOLCHAIN)/base_tools
else
export PATH := $(TOOLCHAIN)/bin:$(PATH)
PREFIX := arm-none-eabi-
OBJCOPY := $(PREFIX)objcopy
export CC := $(PREFIX)gcc
export AS := $(PREFIX)as
endif
export CPP := $(PREFIX)cpp
export LD := $(PREFIX)ld
@@ -12,17 +21,16 @@ TITLE := POKEMON EMER
GAME_CODE := BPEE
MAKER_CODE := 01
REVISION := 0
MODERN ?= 0
SHELL := /bin/bash -o pipefail
ROM := pokeemerald.gba
OBJ_DIR := build/emerald
ELF = $(ROM:.gba=.elf)
MAP = $(ROM:.gba=.map)
C_SUBDIR = src
ASM_SUBDIR = asm
DATA_SRC_SUBDIR = src/data
DATA_ASM_SUBDIR = data
SONG_SUBDIR = sound/songs
MID_SUBDIR = sound/songs/midi
@@ -33,16 +41,32 @@ DATA_ASM_BUILDDIR = $(OBJ_DIR)/$(DATA_ASM_SUBDIR)
SONG_BUILDDIR = $(OBJ_DIR)/$(SONG_SUBDIR)
MID_BUILDDIR = $(OBJ_DIR)/$(MID_SUBDIR)
ASFLAGS := -mcpu=arm7tdmi
ASFLAGS := -mcpu=arm7tdmi --defsym MODERN=$(MODERN)
GCC_VER = $(shell $(CC) -dumpversion)
ifeq ($(MODERN),0)
CC1 := tools/agbcc/bin/agbcc$(EXE)
override CFLAGS += -mthumb-interwork -Wimplicit -Wparentheses -Werror -O2 -fhex-asm
ROM := pokeemerald.gba
OBJ_DIR := build/emerald
LIBPATH := -L ../../tools/agbcc/lib
else
CC1 = $(shell $(CC) --print-prog-name=cc1) -quiet
override CFLAGS += -mthumb -mthumb-interwork -O2 -mabi=apcs-gnu -mtune=arm7tdmi -march=armv4t -fno-toplevel-reorder -fno-aggressive-loop-optimizations -Wno-pointer-to-int-cast
ROM := pokeemerald_modern.gba
OBJ_DIR := build/modern
LIBPATH := -L $(TOOLCHAIN)/lib/gcc/arm-none-eabi/$(GCC_VER)/thumb -L $(TOOLCHAIN)/arm-none-eabi/lib/thumb
endif
CPPFLAGS := -I tools/agbcc/include -I tools/agbcc -iquote include -Wno-trigraphs
CPPFLAGS := -iquote include -Wno-trigraphs -DMODERN=$(MODERN)
ifeq ($(MODERN),0)
CPPFLAGS += -I tools/agbcc/include -I tools/agbcc
endif
LDFLAGS = -Map ../../$(MAP)
LIB := -L ../../tools/agbcc/lib -lgcc -lc
LIB := $(LIBPATH) -lgcc -lc
SHA1 := $(shell { command -v sha1sum || command -v shasum; } 2>/dev/null) -c
GFX := tools/gbagfx/gbagfx$(EXE)
@@ -53,6 +77,13 @@ PREPROC := tools/preproc/preproc$(EXE)
RAMSCRGEN := tools/ramscrgen/ramscrgen$(EXE)
FIX := tools/gbafix/gbafix$(EXE)
MAPJSON := tools/mapjson/mapjson$(EXE)
JSONPROC := tools/jsonproc/jsonproc$(EXE)
TOOLDIRS := $(filter-out tools/agbcc tools/binutils,$(wildcard tools/*))
TOOLBASE = $(TOOLDIRS:tools/%=%)
TOOLS = $(foreach tool,$(TOOLBASE),tools/$(tool)/$(tool)$(EXE))
MAKEFLAGS += --no-print-directory
# Clear the default suffixes
.SUFFIXES:
@@ -64,7 +95,17 @@ MAPJSON := tools/mapjson/mapjson$(EXE)
# Secondary expansion is required for dependency variables in object rules.
.SECONDEXPANSION:
.PHONY: rom clean compare tidy
.PHONY: all rom clean compare tidy tools mostlyclean clean-tools $(TOOLDIRS)
infoshell = $(foreach line, $(shell $1 | sed "s/ /__SPACE__/g"), $(info $(subst __SPACE__, ,$(line))))
# Build tools when building the rom
# Disable dependency scanning for clean/tidy/tools
ifeq (,$(filter-out all compare,$(MAKECMDGOALS)))
$(call infoshell, $(MAKE) tools)
else
NODEP := 1
endif
C_SRCS := $(wildcard $(C_SUBDIR)/*.c $(C_SUBDIR)/*/*.c $(C_SUBDIR)/*/*/*.c)
C_OBJS := $(patsubst $(C_SUBDIR)/%.c,$(C_BUILDDIR)/%.o,$(C_SRCS))
@@ -86,29 +127,48 @@ OBJS_REL := $(patsubst $(OBJ_DIR)/%,%,$(OBJS))
SUBDIRS := $(sort $(dir $(OBJS)))
AUTO_GEN_TARGETS :=
$(shell mkdir -p $(SUBDIRS))
all: rom
tools: $(TOOLDIRS)
$(TOOLDIRS):
@$(MAKE) -C $@
rom: $(ROM)
# For contributors to make sure a change didn't affect the contents of the ROM.
compare: $(ROM)
compare: all
@$(SHA1) rom.sha1
clean: tidy
clean: mostlyclean clean-tools
clean-tools:
@$(foreach tooldir,$(TOOLDIRS),$(MAKE) clean -C $(tooldir);)
mostlyclean: tidy
rm -f sound/direct_sound_samples/*.bin
rm -f $(SONG_OBJS) $(MID_OBJS) $(MID_SUBDIR)/*.s
rm -f $(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 {} +
rm -f $(AUTO_GEN_TARGETS)
tidy:
rm -f $(ROM) $(ELF) $(MAP)
rm -r build/*
rm -r $(OBJ_DIR)
ifeq ($(MODERN),0)
@$(MAKE) tidy MODERN=1
endif
include graphics_file_rules.mk
include map_data_rules.mk
include spritesheet_rules.mk
include json_data_rules.mk
include songs.mk
%.s: ;
@@ -127,6 +187,7 @@ sound/direct_sound_samples/cry_%.bin: sound/direct_sound_samples/cry_%.aif ; $(A
sound/%.bin: sound/%.aif ; $(AIF) $< $@
ifeq ($(MODERN),0)
$(C_BUILDDIR)/libc.o: CC1 := tools/agbcc/bin/old_agbcc
$(C_BUILDDIR)/libc.o: CFLAGS := -O2
@@ -139,6 +200,7 @@ $(C_BUILDDIR)/agb_flash_mx.o: CFLAGS := -O -mthumb-interwork
$(C_BUILDDIR)/m4a.o: CC1 := tools/agbcc/bin/old_agbcc
$(C_BUILDDIR)/record_mixing.o: CFLAGS += -ffreestanding
endif
ifeq ($(NODEP),1)
$(C_BUILDDIR)/%.o: c_dep :=
@@ -186,12 +248,23 @@ $(OBJ_DIR)/sym_common.ld: sym_common.txt $(C_OBJS) $(wildcard common_syms/*.txt)
$(OBJ_DIR)/sym_ewram.ld: sym_ewram.txt
$(RAMSCRGEN) ewram_data $< ENGLISH > $@
$(OBJ_DIR)/ld_script.ld: ld_script.txt $(OBJ_DIR)/sym_bss.ld $(OBJ_DIR)/sym_common.ld $(OBJ_DIR)/sym_ewram.ld
cd $(OBJ_DIR) && sed "s#tools/#../../tools/#g" ../../ld_script.txt > ld_script.ld
ifeq ($(MODERN),0)
LD_SCRIPT := ld_script.txt
LD_SCRIPT_DEPS := $(OBJ_DIR)/sym_bss.ld $(OBJ_DIR)/sym_common.ld $(OBJ_DIR)/sym_ewram.ld
else
LD_SCRIPT := ld_script_modern.txt
LD_SCRIPT_DEPS :=
endif
$(OBJ_DIR)/ld_script.ld: $(LD_SCRIPT) $(LD_SCRIPT_DEPS)
cd $(OBJ_DIR) && sed "s#tools/#../../tools/#g" ../../$(LD_SCRIPT) > ld_script.ld
$(ELF): $(OBJ_DIR)/ld_script.ld $(OBJS)
cd $(OBJ_DIR) && $(LD) $(LDFLAGS) -T ld_script.ld -o ../../$@ $(OBJS_REL) $(LIB)
$(FIX) $@ -t"$(TITLE)" -c$(GAME_CODE) -m$(MAKER_CODE) -r$(REVISION) --silent
$(ROM): $(ELF)
$(OBJCOPY) -O binary $< $@
$(FIX) $@ -p -t"$(TITLE)" -c$(GAME_CODE) -m$(MAKER_CODE) -r$(REVISION) --silent
$(FIX) $@ -p --silent
modern: ; @$(MAKE) MODERN=1

View File

@@ -5,438 +5,8 @@
.text
thumb_func_start sub_80216E0
sub_80216E0: @ 80216E0
push {r4-r7,lr}
mov r7, r10
mov r6, r9
mov r5, r8
push {r5-r7}
sub sp, 0x10
adds r6, r0, 0
str r1, [sp]
movs r0, 0
str r0, [sp, 0x4]
movs r1, 0x4E
adds r1, r6
mov r10, r1
mov r9, r0
ldrb r2, [r6, 0x9]
cmp r0, r2
bcs _080217AE
ldr r7, =gUnknown_082F41CC
_08021704:
mov r3, r10
ldrh r0, [r3, 0xA]
mov r4, r9
lsls r1, r4, 1
add r1, r9
asrs r0, r1
lsls r0, 16
movs r1, 0xE0
lsls r1, 11
ands r1, r0
lsrs r1, 16
mov r8, r1
cmp r1, 0
beq _0802179E
ldr r0, [sp, 0x4]
adds r0, 0x1
lsls r0, 24
lsrs r0, 24
str r0, [sp, 0x4]
movs r0, 0x4
ands r0, r1
cmp r0, 0
beq _08021748
lsls r4, 2
ldr r5, [sp]
adds r5, 0x24
adds r0, r5, r4
ldr r0, [r0]
movs r1, 0x1
bl StartSpriteAnim
b _0802175A
.pool
_08021748:
mov r0, r9
lsls r4, r0, 2
ldr r5, [sp]
adds r5, 0x24
adds r0, r5, r4
ldr r0, [r0]
movs r1, 0
bl StartSpriteAnim
_0802175A:
adds r3, r5, r4
ldr r2, [r3]
adds r2, 0x3E
ldrb r0, [r2]
movs r4, 0x5
negs r4, r4
adds r1, r4, 0
ands r0, r1
strb r0, [r2]
ldr r2, [r3]
adds r2, 0x2C
ldrb r0, [r2]
subs r4, 0x3C
adds r1, r4, 0
ands r0, r1
strb r0, [r2]
ldr r2, [r3]
movs r0, 0x3
mov r1, r8
ands r1, r0
mov r8, r1
subs r1, 0x1
lsls r1, 1
adds r0, r1, r7
ldrb r0, [r0]
lsls r0, 24
asrs r0, 24
strh r0, [r2, 0x24]
ldr r2, [r3]
ldr r3, =gUnknown_082F41CC+1
adds r1, r3
movs r0, 0
ldrsb r0, [r1, r0]
strh r0, [r2, 0x26]
_0802179E:
mov r0, r9
adds r0, 0x1
lsls r0, 24
lsrs r0, 24
mov r9, r0
ldrb r4, [r6, 0x9]
cmp r9, r4
bcc _08021704
_080217AE:
ldr r0, [sp, 0x4]
cmp r0, 0
bne _080217C0
adds r2, r6, 0
adds r2, 0x25
ldrb r1, [r2]
b _0802189C
.pool
_080217C0:
ldrh r0, [r6, 0x28]
movs r1, 0x3
bl __umodsi3
lsls r0, 24
lsrs r0, 24
mov r8, r0
mov r1, r8
str r1, [sp, 0x8]
movs r2, 0
mov r9, r2
mov r3, r10
ldrh r1, [r3, 0xC]
lsls r0, r1, 1
adds r0, 0x3
adds r6, 0x25
str r6, [sp, 0xC]
adds r3, r1, 0
cmp r9, r0
bge _08021890
_080217E8:
mov r4, r9
lsls r1, r4, 2
ldr r0, [sp]
adds r0, 0x4C
adds r7, r0, r1
ldr r2, [r7]
adds r0, r2, 0
adds r0, 0x3E
ldrb r1, [r0]
movs r0, 0x4
ands r0, r1
cmp r0, 0
beq _0802187E
ldr r0, =sub_8022B28
str r0, [r2, 0x1C]
lsls r1, r4, 1
ldr r3, =gUnknown_082F41CC+6
adds r0, r1, r3
movs r4, 0
ldrsb r4, [r0, r4]
adds r0, r4, 0
adds r0, 0x78
strh r0, [r2, 0x20]
ldr r2, [r7]
ldr r0, =gUnknown_082F41CC+7
adds r1, r0
movs r6, 0
ldrsb r6, [r1, r6]
mov r1, r8
lsls r0, r1, 2
subs r0, 0x88
subs r0, r6, r0
strh r0, [r2, 0x22]
ldr r5, [r7]
ldr r2, [sp, 0x8]
lsls r1, r2, 2
adds r0, r4, 0
bl __divsi3
adds r4, r0
strh r4, [r5, 0x24]
ldr r0, [r7]
strh r6, [r0, 0x26]
mov r3, r10
ldrb r1, [r3, 0x4]
movs r0, 0x2
ands r0, r1
cmp r0, 0
beq _08021860
ldr r0, [r7]
movs r1, 0x1
bl StartSpriteAnim
b _08021868
.pool
_08021860:
ldr r0, [r7]
movs r1, 0
bl StartSpriteAnim
_08021868:
mov r0, r8
adds r0, 0x1
lsls r0, 16
lsrs r0, 16
mov r8, r0
mov r4, r10
ldrh r3, [r4, 0xC]
cmp r0, 0x3
bls _0802187E
movs r0, 0
mov r8, r0
_0802187E:
mov r0, r9
adds r0, 0x1
lsls r0, 24
lsrs r0, 24
mov r9, r0
lsls r0, r3, 1
adds r0, 0x3
cmp r9, r0
blt _080217E8
_08021890:
ldr r2, [sp, 0xC]
ldrb r1, [r2]
movs r0, 0x4
ands r0, r1
cmp r0, 0
beq _080218A6
_0802189C:
movs r0, 0x5
negs r0, r0
ands r0, r1
strb r0, [r2]
b _080218C4
_080218A6:
ldr r3, [sp, 0x4]
cmp r3, 0x1
bne _080218B4
movs r0, 0x4E
bl PlaySE
b _080218BA
_080218B4:
movs r0, 0x4D
bl PlaySE
_080218BA:
ldr r4, [sp, 0xC]
ldrb r0, [r4]
movs r1, 0x4
orrs r0, r1
strb r0, [r4]
_080218C4:
add sp, 0x10
pop {r3-r5}
mov r8, r3
mov r9, r4
mov r10, r5
pop {r4-r7}
pop {r0}
bx r0
thumb_func_end sub_80216E0
thumb_func_start sub_80218D4
sub_80218D4: @ 80218D4
push {r4-r7,lr}
adds r5, r0, 0
adds r6, r1, 0
movs r2, 0
ldrb r0, [r5, 0x9]
cmp r2, r0
bcs _08021906
adds r4, r6, 0
adds r4, 0x24
movs r7, 0x4
adds r3, r0, 0
_080218EA:
lsls r0, r2, 2
adds r0, r4, r0
ldr r0, [r0]
adds r0, 0x3E
ldrb r1, [r0]
adds r0, r7, 0
ands r0, r1
cmp r0, 0
beq _08021920
adds r0, r2, 0x1
lsls r0, 24
lsrs r2, r0, 24
cmp r2, r3
bcc _080218EA
_08021906:
movs r2, 0
adds r3, r6, 0
adds r3, 0x4C
movs r4, 0x4
_0802190E:
lsls r0, r2, 2
adds r0, r3, r0
ldr r0, [r0]
adds r0, 0x3E
ldrb r1, [r0]
adds r0, r4, 0
ands r0, r1
cmp r0, 0
bne _08021924
_08021920:
movs r0, 0
b _0802193C
_08021924:
adds r0, r2, 0x1
lsls r0, 24
lsrs r2, r0, 24
cmp r2, 0xA
bls _0802190E
movs r1, 0x2C
ldrsh r0, [r5, r1]
cmp r0, 0
beq _0802193A
movs r0, 0
strh r0, [r5, 0x2C]
_0802193A:
movs r0, 0x1
_0802193C:
pop {r4-r7}
pop {r1}
bx r1
thumb_func_end sub_80218D4
thumb_func_start sub_8021944
sub_8021944: @ 8021944
push {r4-r7,lr}
adds r6, r0, 0
lsls r4, r1, 16
lsrs r4, 16
movs r7, 0
movs r5, 0xE1
lsls r5, 4
adds r0, r4, 0
adds r1, r5, 0
bl __udivsi3
strh r0, [r6, 0x4]
adds r0, r4, 0
adds r1, r5, 0
bl __umodsi3
lsls r0, 16
lsrs r0, 16
movs r1, 0x3C
bl __udivsi3
strh r0, [r6, 0x6]
adds r0, r4, 0
movs r1, 0x3C
bl __umodsi3
lsls r0, 24
asrs r0, 16
movs r1, 0x4
bl sub_8151534
adds r2, r7, 0
lsls r0, 16
asrs r3, r0, 16
movs r0, 0x7
mov r12, r0
ldr r5, =gUnknown_082F334C
movs r4, 0x1
_08021990:
mov r0, r12
subs r1, r0, r2
adds r0, r3, 0
asrs r0, r1
ands r0, r4
cmp r0, 0
beq _080219A6
lsls r0, r2, 2
adds r0, r5
ldr r0, [r0]
adds r7, r0
_080219A6:
adds r0, r2, 0x1
lsls r0, 24
lsrs r2, r0, 24
cmp r2, 0x7
bls _08021990
ldr r1, =0x000f4240
adds r0, r7, 0
bl __udivsi3
strh r0, [r6, 0x8]
pop {r4-r7}
pop {r0}
bx r0
.pool
thumb_func_end sub_8021944
thumb_func_start sub_80219C8
sub_80219C8: @ 80219C8
push {r4-r6,lr}
mov r6, r8
push {r6}
sub sp, 0xC
adds r6, r0, 0
adds r4, r1, 0
adds r5, r2, 0
mov r8, r3
lsls r6, 24
lsrs r6, 24
lsls r4, 24
lsrs r4, 24
lsls r5, 24
lsrs r5, 24
movs r2, 0x1
negs r2, r2
movs r0, 0x2
mov r1, r8
bl GetStringWidth
lsls r4, 2
lsrs r0, 1
subs r4, r0
lsls r4, 24
lsrs r4, 24
lsls r0, r5, 1
adds r0, r5
ldr r1, =gUnknown_082F32D8
adds r0, r1
str r0, [sp]
movs r0, 0
str r0, [sp, 0x4]
mov r0, r8
str r0, [sp, 0x8]
adds r0, r6, 0
movs r1, 0x2
adds r2, r4, 0
movs r3, 0
bl AddTextPrinterParameterized3
add sp, 0xC
pop {r3}
mov r8, r3
pop {r4-r6}
pop {r0}
bx r0
.pool
thumb_func_end sub_80219C8
thumb_func_start sub_8021A28
sub_8021A28: @ 8021A28

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@@ -1305,881 +1305,5 @@ _081D0E5A:
bx r1
thumb_func_end sub_81D0E00
thumb_func_start sub_81D0E60
sub_81D0E60: @ 81D0E60
push {r4,lr}
adds r4, r0, 0
ldr r0, =gUnknown_08624BB8
bl AddWindow
strh r0, [r4, 0xA]
lsls r0, 24
lsrs r0, 24
bl PutWindowTilemap
adds r0, r4, 0
bl sub_81D0E84
pop {r4}
pop {r0}
bx r0
.pool
thumb_func_end sub_81D0E60
thumb_func_start sub_81D0E84
sub_81D0E84: @ 81D0E84
push {r4,r5,lr}
sub sp, 0x10
adds r5, r0, 0
ldr r1, =gUnknown_08624BC0
add r0, sp, 0xC
movs r2, 0x3
bl memcpy
ldr r4, =gStringVar1
bl sub_81D07D8
adds r1, r0, 0
adds r0, r4, 0
movs r2, 0
movs r3, 0x2
bl ConvertIntToDecimalStringN
bl DynamicPlaceholderTextUtil_Reset
movs r0, 0
adds r1, r4, 0
bl DynamicPlaceholderTextUtil_SetPlaceholderPtr
ldr r4, =gStringVar4
ldr r1, =gText_RibbonsF700
adds r0, r4, 0
bl DynamicPlaceholderTextUtil_ExpandPlaceholders
ldrb r0, [r5, 0xA]
movs r1, 0x44
bl FillWindowPixelBuffer
ldrb r0, [r5, 0xA]
add r1, sp, 0xC
str r1, [sp]
movs r1, 0x1
negs r1, r1
str r1, [sp, 0x4]
str r4, [sp, 0x8]
movs r1, 0x1
movs r2, 0
movs r3, 0x1
bl AddTextPrinterParameterized3
ldrb r0, [r5, 0xA]
movs r1, 0x2
bl CopyWindowToVram
add sp, 0x10
pop {r4,r5}
pop {r0}
bx r0
.pool
thumb_func_end sub_81D0E84
thumb_func_start sub_81D0EFC
sub_81D0EFC: @ 81D0EFC
push {r4-r7,lr}
mov r7, r8
push {r7}
sub sp, 0x10
adds r7, r0, 0
bl sub_81D0954
adds r5, r0, 0
ldr r1, =gUnknown_08624BC0
add r0, sp, 0xC
movs r2, 0x3
bl memcpy
ldrb r0, [r7, 0xA]
movs r1, 0x44
bl FillWindowPixelBuffer
cmp r5, 0x18
bhi _081D0F60
lsls r1, r5, 3
ldr r0, =gRibbonDescriptionPointers
adds r6, r1, r0
movs r5, 0x80
lsls r5, 17
movs r4, 0x1
_081D0F2E:
ldrb r0, [r7, 0xA]
lsrs r3, r5, 24
add r1, sp, 0xC
str r1, [sp]
movs r1, 0x1
negs r1, r1
str r1, [sp, 0x4]
ldm r6!, {r1}
str r1, [sp, 0x8]
movs r1, 0x1
movs r2, 0
bl AddTextPrinterParameterized3
movs r0, 0x80
lsls r0, 21
adds r5, r0
subs r4, 0x1
cmp r4, 0
bge _081D0F2E
b _081D0FAA
.pool
_081D0F60:
ldr r0, =gSaveBlock1Ptr
ldr r0, [r0]
adds r0, r5
ldr r1, =0x0000318f
adds r0, r1
ldrb r5, [r0]
cmp r5, 0
beq _081D0FB2
subs r5, 0x1
movs r4, 0
ldr r0, =gGiftRibbonDescriptionPointers
mov r8, r0
movs r6, 0x80
lsls r6, 17
_081D0F7C:
ldrb r0, [r7, 0xA]
lsrs r3, r6, 24
add r1, sp, 0xC
str r1, [sp]
movs r1, 0x1
negs r1, r1
str r1, [sp, 0x4]
lsls r1, r4, 2
lsls r2, r5, 3
adds r1, r2
add r1, r8
ldr r1, [r1]
str r1, [sp, 0x8]
movs r1, 0x1
movs r2, 0
bl AddTextPrinterParameterized3
movs r0, 0x80
lsls r0, 21
adds r6, r0
adds r4, 0x1
cmp r4, 0x1
ble _081D0F7C
_081D0FAA:
ldrb r0, [r7, 0xA]
movs r1, 0x2
bl CopyWindowToVram
_081D0FB2:
add sp, 0x10
pop {r3}
mov r8, r3
pop {r4-r7}
pop {r0}
bx r0
.pool
thumb_func_end sub_81D0EFC
thumb_func_start sub_81D0FCC
sub_81D0FCC: @ 81D0FCC
push {r4,lr}
adds r4, r0, 0
ldr r0, =gUnknown_08624BC4
bl AddWindow
strh r0, [r4, 0x8]
lsls r0, 24
lsrs r0, 24
bl PutWindowTilemap
adds r0, r4, 0
bl sub_81D0FF0
pop {r4}
pop {r0}
bx r0
.pool
thumb_func_end sub_81D0FCC
thumb_func_start sub_81D0FF0
sub_81D0FF0: @ 81D0FF0
push {r4-r7,lr}
sub sp, 0x10
ldrh r7, [r0, 0x8]
ldrb r5, [r0, 0x8]
adds r0, r5, 0
movs r1, 0x11
bl FillWindowPixelBuffer
ldr r4, =gStringVar3
mov r6, sp
adds r6, 0xD
adds r0, r4, 0
add r1, sp, 0xC
adds r2, r6, 0
bl sub_81D06E4
movs r0, 0x1
str r0, [sp]
movs r0, 0xFF
str r0, [sp, 0x4]
movs r0, 0
str r0, [sp, 0x8]
adds r0, r5, 0
movs r1, 0x1
adds r2, r4, 0
movs r3, 0
bl AddTextPrinterParameterized
ldrb r0, [r6]
cmp r0, 0
beq _081D1040
cmp r0, 0xFE
beq _081D1048
ldr r1, =gUnknown_08624BE4
b _081D104A
.pool
_081D1040:
ldr r1, =gUnknown_08624BCC
b _081D104A
.pool
_081D1048:
ldr r1, =gUnknown_08624BD8
_081D104A:
ldr r5, =gStringVar1
adds r0, r5, 0
bl StringCopy
movs r1, 0xBA
strb r1, [r0]
adds r0, 0x1
movs r1, 0xF9
strb r1, [r0]
adds r0, 0x1
movs r1, 0x5
strb r1, [r0]
adds r0, 0x1
add r1, sp, 0xC
ldrb r1, [r1]
movs r2, 0
movs r3, 0x3
bl ConvertIntToDecimalStringN
lsls r4, r7, 24
lsrs r4, 24
movs r0, 0x1
str r0, [sp]
movs r0, 0xFF
str r0, [sp, 0x4]
movs r0, 0
str r0, [sp, 0x8]
adds r0, r4, 0
movs r1, 0x1
adds r2, r5, 0
movs r3, 0x3C
bl AddTextPrinterParameterized
adds r0, r4, 0
movs r1, 0x2
bl CopyWindowToVram
add sp, 0x10
pop {r4-r7}
pop {r0}
bx r0
.pool
thumb_func_end sub_81D0FF0
thumb_func_start sub_81D10A4
sub_81D10A4: @ 81D10A4
push {r4,lr}
adds r4, r0, 0
ldr r0, =gUnknown_08624BE8
bl AddWindow
strh r0, [r4, 0xC]
lsls r0, 24
lsrs r0, 24
movs r1, 0x11
bl FillWindowPixelBuffer
ldrb r0, [r4, 0xC]
bl PutWindowTilemap
adds r0, r4, 0
bl sub_81D10D0
pop {r4}
pop {r0}
bx r0
.pool
thumb_func_end sub_81D10A4
thumb_func_start sub_81D10D0
sub_81D10D0: @ 81D10D0
push {r4-r6,lr}
mov r6, r8
push {r6}
sub sp, 0xC
mov r8, r0
bl sub_81D06C4
adds r4, r0, 0
adds r4, 0x1
bl sub_81D06D4
adds r6, r0, 0
ldr r5, =gStringVar1
adds r0, r5, 0
adds r1, r4, 0
movs r2, 0x1
movs r3, 0x3
bl ConvertIntToDecimalStringN
movs r1, 0xBA
strb r1, [r0]
adds r0, 0x1
adds r1, r6, 0
movs r2, 0x1
movs r3, 0x3
bl ConvertIntToDecimalStringN
movs r0, 0x1
adds r1, r5, 0
movs r2, 0x38
bl GetStringCenterAlignXOffset
adds r3, r0, 0
mov r1, r8
ldrb r0, [r1, 0xC]
lsls r3, 24
lsrs r3, 24
movs r1, 0x1
str r1, [sp]
movs r1, 0xFF
str r1, [sp, 0x4]
movs r1, 0
str r1, [sp, 0x8]
movs r1, 0x1
adds r2, r5, 0
bl AddTextPrinterParameterized
mov r1, r8
ldrb r0, [r1, 0xC]
movs r1, 0x2
bl CopyWindowToVram
add sp, 0xC
pop {r3}
mov r8, r3
pop {r4-r6}
pop {r0}
bx r0
.pool
thumb_func_end sub_81D10D0
thumb_func_start sub_81D1148
sub_81D1148: @ 81D1148
push {r4,lr}
sub sp, 0xC
adds r4, r0, 0
add r1, sp, 0x4
add r2, sp, 0x8
mov r0, sp
bl sub_81D0760
bl ResetAllPicSprites
movs r0, 0x28
movs r1, 0x68
bl sub_81D1184
strh r0, [r4, 0x10]
movs r0, 0xF
movs r1, 0
bl sub_81C7990
add sp, 0xC
pop {r4}
pop {r0}
bx r0
thumb_func_end sub_81D1148
thumb_func_start sub_81D1178
sub_81D1178: @ 81D1178
push {lr}
ldrh r0, [r0, 0x10]
bl FreeAndDestroyMonPicSprite
pop {r0}
bx r0
thumb_func_end sub_81D1178
thumb_func_start sub_81D1184
sub_81D1184: @ 81D1184
push {lr}
sub sp, 0x1C
add r1, sp, 0x14
add r2, sp, 0x18
add r0, sp, 0x10
bl sub_81D0760
add r0, sp, 0x10
ldrh r0, [r0]
ldr r1, [sp, 0x18]
ldr r2, [sp, 0x14]
movs r3, 0x28
str r3, [sp]
movs r3, 0x68
str r3, [sp, 0x4]
movs r3, 0xF
str r3, [sp, 0x8]
ldr r3, =0x0000ffff
str r3, [sp, 0xC]
movs r3, 0x1
bl CreateMonPicSprite_HandleDeoxys
lsls r0, 16
lsrs r0, 16
ldr r1, =gSprites
lsls r2, r0, 4
adds r2, r0
lsls r2, 2
adds r2, r1
ldrb r3, [r2, 0x5]
movs r1, 0xD
negs r1, r1
ands r1, r3
strb r1, [r2, 0x5]
add sp, 0x1C
pop {r1}
bx r1
.pool
thumb_func_end sub_81D1184
thumb_func_start sub_81D11D8
sub_81D11D8: @ 81D11D8
push {lr}
ldrh r1, [r0, 0x10]
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =gSprites
adds r0, r1
movs r2, 0x20
negs r2, r2
movs r1, 0x28
movs r3, 0x6
bl sub_81D1258
pop {r0}
bx r0
.pool
thumb_func_end sub_81D11D8
thumb_func_start sub_81D11FC
sub_81D11FC: @ 81D11FC
push {r4,r5,lr}
adds r4, r0, 0
ldrh r0, [r4, 0x10]
bl FreeAndDestroyMonPicSprite
movs r5, 0x20
negs r5, r5
adds r0, r5, 0
movs r1, 0x68
bl sub_81D1184
strh r0, [r4, 0x10]
ldrh r1, [r4, 0x10]
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =gSprites
adds r0, r1
adds r1, r5, 0
movs r2, 0x28
movs r3, 0x6
bl sub_81D1258
pop {r4,r5}
pop {r0}
bx r0
.pool
thumb_func_end sub_81D11FC
thumb_func_start sub_81D1234
sub_81D1234: @ 81D1234
ldr r2, =gSprites
ldrh r1, [r0, 0x10]
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
adds r2, 0x1C
adds r0, r2
ldr r1, [r0]
ldr r0, =SpriteCallbackDummy
eors r1, r0
negs r0, r1
orrs r0, r1
lsrs r0, 31
bx lr
.pool
thumb_func_end sub_81D1234
thumb_func_start sub_81D1258
sub_81D1258: @ 81D1258
push {r4-r6,lr}
adds r4, r0, 0
adds r6, r2, 0
adds r5, r3, 0
subs r0, r6, r1
strh r1, [r4, 0x20]
lsls r1, 4
strh r1, [r4, 0x2E]
lsls r0, 4
adds r1, r5, 0
bl __udivsi3
strh r0, [r4, 0x30]
strh r5, [r4, 0x32]
strh r6, [r4, 0x34]
ldr r0, =sub_81D1284
str r0, [r4, 0x1C]
pop {r4-r6}
pop {r0}
bx r0
.pool
thumb_func_end sub_81D1258
thumb_func_start sub_81D1284
sub_81D1284: @ 81D1284
push {lr}
adds r2, r0, 0
ldrh r1, [r2, 0x32]
movs r3, 0x32
ldrsh r0, [r2, r3]
cmp r0, 0
beq _081D12C8
subs r0, r1, 0x1
strh r0, [r2, 0x32]
ldrh r0, [r2, 0x30]
ldrh r1, [r2, 0x2E]
adds r0, r1
strh r0, [r2, 0x2E]
lsls r0, 16
asrs r0, 20
strh r0, [r2, 0x20]
movs r1, 0x20
negs r1, r1
cmp r0, r1
bgt _081D12BA
adds r0, r2, 0
adds r0, 0x3E
ldrb r1, [r0]
movs r2, 0x4
orrs r1, r2
strb r1, [r0]
b _081D12D0
_081D12BA:
adds r2, 0x3E
ldrb r1, [r2]
movs r0, 0x5
negs r0, r0
ands r0, r1
strb r0, [r2]
b _081D12D0
_081D12C8:
ldrh r0, [r2, 0x34]
strh r0, [r2, 0x20]
ldr r0, =SpriteCallbackDummy
str r0, [r2, 0x1C]
_081D12D0:
pop {r0}
bx r0
.pool
thumb_func_end sub_81D1284
thumb_func_start sub_81D12D8
sub_81D12D8: @ 81D12D8
push {r4-r6,lr}
bl sub_81D1350
ldr r5, =gUnknown_030012C0
adds r0, r5, 0
bl sub_81D0914
adds r6, r0, 0
ldr r2, =gUnknown_030012C4
movs r1, 0
str r1, [r2]
ldr r0, [r5]
cmp r1, r0
bcs _081D130A
adds r4, r2, 0
_081D12F6:
ldr r0, [r4]
ldm r6!, {r1}
bl sub_81D1370
ldr r1, [r4]
adds r1, 0x1
str r1, [r4]
ldr r0, [r5]
cmp r1, r0
bcc _081D12F6
_081D130A:
ldr r4, =gUnknown_030012C0
adds r0, r4, 0
bl sub_81D092C
adds r6, r0, 0
ldr r2, =gUnknown_030012C4
movs r1, 0
str r1, [r2]
ldr r0, [r4]
cmp r1, r0
bcs _081D133A
adds r4, r2, 0
_081D1322:
ldr r0, [r4]
adds r0, 0x1B
ldm r6!, {r1}
bl sub_81D1370
ldr r1, [r4]
adds r1, 0x1
str r1, [r4]
ldr r0, =gUnknown_030012C0
ldr r0, [r0]
cmp r1, r0
bcc _081D1322
_081D133A:
movs r0, 0x1
bl CopyBgTilemapBufferToVram
pop {r4-r6}
pop {r0}
bx r0
.pool
thumb_func_end sub_81D12D8
thumb_func_start sub_81D1350
sub_81D1350: @ 81D1350
push {lr}
sub sp, 0x8
movs r0, 0x20
str r0, [sp]
movs r0, 0x14
str r0, [sp, 0x4]
movs r0, 0x1
movs r1, 0
movs r2, 0
movs r3, 0
bl FillBgTilemapBufferRect_Palette0
add sp, 0x8
pop {r0}
bx r0
thumb_func_end sub_81D1350
thumb_func_start sub_81D1370
sub_81D1370: @ 81D1370
push {r4-r6,lr}
sub sp, 0x10
adds r4, r0, 0
adds r6, r1, 0
movs r1, 0x9
bl __umodsi3
adds r5, r0, 0
lsls r5, 1
adds r5, 0xB
adds r0, r4, 0
movs r1, 0x9
bl __udivsi3
adds r4, r0, 0
lsls r4, 1
adds r4, 0x4
add r0, sp, 0x8
adds r1, r6, 0
bl sub_81D13BC
lsls r5, 24
lsrs r5, 24
lsls r4, 24
lsrs r4, 24
movs r0, 0x2
str r0, [sp]
str r0, [sp, 0x4]
movs r0, 0x1
add r1, sp, 0x8
adds r2, r5, 0
adds r3, r4, 0
bl CopyToBgTilemapBufferRect
add sp, 0x10
pop {r4-r6}
pop {r0}
bx r0
thumb_func_end sub_81D1370
thumb_func_start sub_81D13BC
sub_81D13BC: @ 81D13BC
push {r4,r5,lr}
ldr r2, =gUnknown_08624BF8
lsls r1, 2
adds r1, r2
ldrh r3, [r1, 0x2]
adds r3, 0x2
lsls r3, 16
ldrh r1, [r1]
lsls r1, 1
adds r1, 0x1
lsls r1, 16
lsrs r1, 16
lsrs r3, 4
adds r2, r1, 0
orrs r2, r3
strh r2, [r0]
movs r5, 0x80
lsls r5, 3
adds r4, r5, 0
orrs r2, r4
strh r2, [r0, 0x2]
adds r1, 0x1
orrs r1, r3
strh r1, [r0, 0x4]
orrs r1, r4
strh r1, [r0, 0x6]
pop {r4,r5}
pop {r0}
bx r0
.pool
thumb_func_end sub_81D13BC
thumb_func_start sub_81D13FC
sub_81D13FC: @ 81D13FC
push {r4,lr}
adds r4, r0, 0
ldr r0, =gUnknown_08624C78
bl LoadCompressedSpriteSheet
ldr r0, =gUnknown_08624C80
bl Pokenav_AllocAndLoadPalettes
ldr r0, =gUnknown_08624D04
movs r1, 0
movs r2, 0
movs r3, 0
bl CreateSprite
lsls r0, 24
lsrs r0, 24
lsls r1, r0, 4
adds r1, r0
lsls r1, 2
ldr r0, =gSprites
adds r1, r0
str r1, [r4, 0x14]
adds r1, 0x3E
ldrb r0, [r1]
movs r2, 0x4
orrs r0, r2
strb r0, [r1]
pop {r4}
pop {r0}
bx r0
.pool
thumb_func_end sub_81D13FC
thumb_func_start sub_81D1448
sub_81D1448: @ 81D1448
push {r4-r6,lr}
mov r6, r8
push {r6}
adds r6, r0, 0
bl sub_81D0944
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
adds r0, r4, 0
movs r1, 0x9
bl __modsi3
adds r5, r0, 0
lsls r5, 4
adds r5, 0x60
adds r0, r4, 0
movs r1, 0x9
bl __divsi3
lsls r0, 4
adds r0, 0x28
ldr r1, [r6, 0x14]
movs r2, 0
mov r8, r2
strh r5, [r1, 0x20]
ldr r1, [r6, 0x14]
strh r0, [r1, 0x22]
bl sub_81D0954
adds r4, r0, 0
movs r0, 0x9
bl GetSpriteTileStartByTag
ldr r3, [r6, 0x14]
ldr r1, =gUnknown_08624BF8
lsls r4, 2
adds r4, r1
ldrh r1, [r4]
lsls r1, 4
adds r0, r1
ldr r2, =0x000003ff
adds r1, r2, 0
ands r0, r1
ldrh r2, [r3, 0x4]
ldr r1, =0xfffffc00
ands r1, r2
orrs r1, r0
strh r1, [r3, 0x4]
ldrh r0, [r4, 0x2]
adds r0, 0xF
lsls r0, 16
lsrs r0, 16
bl IndexOfSpritePaletteTag
ldr r3, [r6, 0x14]
lsls r0, 4
ldrb r2, [r3, 0x5]
movs r1, 0xF
ands r1, r2
orrs r1, r0
strb r1, [r3, 0x5]
ldr r0, [r6, 0x14]
movs r1, 0x1
bl StartSpriteAffineAnim
ldr r1, [r6, 0x14]
adds r1, 0x3E
ldrb r2, [r1]
movs r0, 0x5
negs r0, r0
ands r0, r2
strb r0, [r1]
ldr r0, [r6, 0x14]
mov r1, r8
strh r1, [r0, 0x2E]
ldr r1, [r6, 0x14]
ldr r0, =sub_81D1538
str r0, [r1, 0x1C]
pop {r3}
mov r8, r3
pop {r4-r6}
pop {r0}
bx r0
.pool
thumb_func_end sub_81D1448
thumb_func_start sub_81D1500
sub_81D1500: @ 81D1500
push {r4,lr}
adds r4, r0, 0
ldr r1, [r4, 0x14]
movs r0, 0x1
strh r0, [r1, 0x2E]
ldr r0, [r4, 0x14]
movs r1, 0x2
bl StartSpriteAffineAnim
ldr r1, [r4, 0x14]
ldr r0, =sub_81D1538
str r0, [r1, 0x1C]
pop {r4}
pop {r0}
bx r0
.pool
thumb_func_end sub_81D1500
thumb_func_start sub_81D1524
sub_81D1524: @ 81D1524
ldr r0, [r0, 0x14]
ldr r1, [r0, 0x1C]
ldr r0, =SpriteCallbackDummy
eors r1, r0
negs r0, r1
orrs r0, r1
lsrs r0, 31
bx lr
.pool
thumb_func_end sub_81D1524
thumb_func_start sub_81D1538
sub_81D1538: @ 81D1538
push {lr}
adds r3, r0, 0
adds r0, 0x3F
ldrb r1, [r0]
movs r0, 0x20
ands r0, r1
cmp r0, 0
beq _081D156A
movs r0, 0x3E
adds r0, r3
mov r12, r0
movs r0, 0x1
ldrh r1, [r3, 0x2E]
ands r1, r0
lsls r1, 2
mov r0, r12
ldrb r2, [r0]
movs r0, 0x5
negs r0, r0
ands r0, r2
orrs r0, r1
mov r1, r12
strb r0, [r1]
ldr r0, =SpriteCallbackDummy
str r0, [r3, 0x1C]
_081D156A:
pop {r0}
bx r0
.pool
thumb_func_end sub_81D1538
.align 2, 0 @ Don't pad with nop.

View File

@@ -5,44 +5,6 @@
@ File centered around AllocSubstruct(2)
thumb_func_start sub_81C98D4
sub_81C98D4: @ 81C98D4
push {r4,lr}
movs r4, 0
_081C98D8:
adds r0, r4, 0
bl sub_81CB0C8
ldr r1, =gMapHeader
lsls r0, 24
lsrs r0, 24
ldrb r1, [r1, 0x14]
cmp r0, r1
bne _081C9914
adds r0, r4, 0
bl sub_81CAE08
cmp r0, 0
beq _081C9914
ldr r0, =gSaveBlock1Ptr
ldr r0, [r0]
ldr r1, =0x000009ca
adds r0, r1
adds r0, r4
ldrb r0, [r0]
cmp r0, 0
beq _081C9914
movs r0, 0x1
b _081C991C
.pool
_081C9914:
adds r4, 0x1
cmp r4, 0x4D
ble _081C98D8
movs r0, 0
_081C991C:
pop {r4}
pop {r1}
bx r1
thumb_func_end sub_81C98D4
thumb_func_start sub_81C9924
sub_81C9924: @ 81C9924
@@ -981,7 +943,7 @@ sub_81CA0C8: @ 81CA0C8
lsls r2, r0, 3
subs r2, r0
lsls r2, 2
ldr r1, =gUnknown_08620244
ldr r1, =gUnknown_08620240+4
adds r0, r2, r1
subs r1, 0x4
adds r2, r1

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@@ -5,219 +5,7 @@
@ File centered around AllocSubstruct(7)
thumb_func_start sub_81CEF3C
sub_81CEF3C: @ 81CEF3C
push {r4,lr}
movs r0, 0x7
movs r1, 0x24
bl AllocSubstruct
adds r4, r0, 0
cmp r4, 0
beq _081CEF90
ldr r1, =0x000006ac
movs r0, 0x12
bl AllocSubstruct
str r0, [r4, 0x20]
cmp r0, 0
beq _081CEF90
ldr r0, =sub_81CF010
str r0, [r4]
ldr r0, =sub_81CF11C
movs r1, 0x1
bl CreateLoopedTask
str r0, [r4, 0x4]
movs r0, 0
str r0, [r4, 0x18]
bl sub_81C76AC
ldr r1, =gUnknown_086233A0
lsls r0, 2
adds r0, r1
ldr r0, [r0]
str r0, [r4, 0x14]
movs r0, 0x1
b _081CEF92
.pool
_081CEF90:
movs r0, 0
_081CEF92:
pop {r4}
pop {r1}
bx r1
thumb_func_end sub_81CEF3C
thumb_func_start sub_81CEF98
sub_81CEF98: @ 81CEF98
push {r4,lr}
movs r0, 0x7
movs r1, 0x24
bl AllocSubstruct
adds r4, r0, 0
cmp r4, 0
beq _081CEFD4
movs r0, 0x12
bl GetSubstructPtr
str r0, [r4, 0x20]
ldr r0, =sub_81CF030
str r0, [r4]
movs r0, 0x1
str r0, [r4, 0x18]
bl sub_81C76AC
ldr r1, =gUnknown_086233A0
lsls r0, 2
adds r0, r1
ldr r0, [r0]
str r0, [r4, 0x14]
movs r0, 0x1
b _081CEFD6
.pool
_081CEFD4:
movs r0, 0
_081CEFD6:
pop {r4}
pop {r1}
bx r1
thumb_func_end sub_81CEF98
thumb_func_start sub_81CEFDC
sub_81CEFDC: @ 81CEFDC
push {lr}
movs r0, 0x7
bl GetSubstructPtr
ldr r1, [r0]
bl _call_via_r1
pop {r1}
bx r1
thumb_func_end sub_81CEFDC
thumb_func_start sub_81CEFF0
sub_81CEFF0: @ 81CEFF0
push {lr}
movs r0, 0x7
bl GetSubstructPtr
ldr r0, [r0, 0x1C]
cmp r0, 0
bne _081CF004
movs r0, 0x12
bl FreePokenavSubstruct
_081CF004:
movs r0, 0x7
bl FreePokenavSubstruct
pop {r0}
bx r0
thumb_func_end sub_81CEFF0
thumb_func_start sub_81CF010
sub_81CF010: @ 81CF010
push {r4,lr}
adds r4, r0, 0
ldr r0, [r4, 0x4]
bl IsLoopedTaskActive
cmp r0, 0
bne _081CF022
ldr r0, =sub_81CF030
str r0, [r4]
_081CF022:
movs r0, 0
pop {r4}
pop {r1}
bx r1
.pool
thumb_func_end sub_81CF010
thumb_func_start sub_81CF030
sub_81CF030: @ 81CF030
push {r4,r5,lr}
adds r4, r0, 0
ldr r2, =gMain
ldrh r1, [r2, 0x30]
movs r0, 0x40
ands r0, r1
cmp r0, 0
beq _081CF048
movs r0, 0x1
b _081CF0A6
.pool
_081CF048:
movs r0, 0x80
ands r0, r1
cmp r0, 0
beq _081CF054
movs r0, 0x2
b _081CF0A6
_081CF054:
ldrh r1, [r2, 0x2E]
movs r0, 0x20
ands r0, r1
cmp r0, 0
beq _081CF062
movs r0, 0x3
b _081CF0A6
_081CF062:
movs r0, 0x10
ands r0, r1
lsls r0, 16
lsrs r2, r0, 16
cmp r2, 0
beq _081CF072
movs r0, 0x4
b _081CF0A6
_081CF072:
movs r0, 0x2
ands r0, r1
cmp r0, 0
beq _081CF088
str r2, [r4, 0x1C]
ldr r0, =sub_81CF0B0
str r0, [r4]
movs r0, 0x5
b _081CF0A6
.pool
_081CF088:
movs r5, 0x1
adds r0, r5, 0
ands r0, r1
cmp r0, 0
bne _081CF096
movs r0, 0
b _081CF0A6
_081CF096:
bl GetSelectedMatchCall
ldr r1, [r4, 0x20]
strh r0, [r1, 0x2]
str r5, [r4, 0x1C]
ldr r0, =sub_81CF0B8
str r0, [r4]
movs r0, 0x6
_081CF0A6:
pop {r4,r5}
pop {r1}
bx r1
.pool
thumb_func_end sub_81CF030
thumb_func_start sub_81CF0B0
sub_81CF0B0: @ 81CF0B0
ldr r0, =0x000186a3
bx lr
.pool
thumb_func_end sub_81CF0B0
thumb_func_start sub_81CF0B8
sub_81CF0B8: @ 81CF0B8
ldr r0, =0x000186a9
bx lr
.pool
thumb_func_end sub_81CF0B8
thumb_func_start sub_81CF0C0
sub_81CF0C0: @ 81CF0C0
push {lr}
movs r0, 0x7
bl GetSubstructPtr
ldr r0, [r0, 0x18]
pop {r1}
bx r1
thumb_func_end sub_81CF0C0
thumb_func_start sub_81CF0D0
sub_81CF0D0: @ 81CF0D0

View File

@@ -4,4 +4,4 @@ OBJDUMP="$DEVKITARM/bin/arm-none-eabi-objdump -D -bbinary -marmv4t -Mforce-thumb
OPTIONS="--start-address=$(($1)) --stop-address=$(($1 + $2))"
$OBJDUMP $OPTIONS baserom.gba > baserom.dump
$OBJDUMP $OPTIONS pokeemerald.gba > pokeemerald.dump
diff baserom.dump pokeemerald.dump
diff -u baserom.dump pokeemerald.dump

View File

@@ -9,3 +9,4 @@ 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++}
make -C tools/jsonproc CXX=${1:-g++}

View File

@@ -0,0 +1 @@
gUnknown_03006370

6
common_syms/librfu.txt Normal file
View File

@@ -0,0 +1,6 @@
gUnknown_03007870
gUnknown_03007880
gUnknown_03007890
gUnknown_03007894
gUnknown_03007898
gUnknown_030078A0

View File

@@ -0,0 +1 @@
gRfuState

View File

@@ -1,663 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnknown_082F449C:: @ 82F449C
.byte 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07
.byte 0x08, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x03, 0x08
.byte 0x09, 0x00, 0x00, 0x01, 0x02, 0x05, 0x06, 0x03
.byte 0x04, 0x05, 0x08, 0x09, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01
.byte 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x02, 0x09
.byte 0x00, 0x00, 0x01, 0x04, 0x05, 0x06, 0x07, 0x02
.byte 0x03, 0x04, 0x09, 0x00, 0x00, 0x01, 0x06, 0x07
.byte 0x02, 0x03, 0x04, 0x05, 0x06, 0x09, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02
.byte 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x01, 0x00
.byte 0x00, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x01
.byte 0x02, 0x03, 0x00, 0x00, 0x05, 0x06, 0x07, 0x08
.byte 0x01, 0x02, 0x03, 0x04, 0x05, 0x00, 0x00, 0x07
.byte 0x08, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x03
.byte 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x00, 0x02
.byte 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x00
.byte 0x01, 0x02, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09
.byte 0x00, 0x01, 0x02, 0x03, 0x04, 0x06, 0x07, 0x08
.byte 0x09, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06
.byte 0x08, 0x09, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05
.byte 0x06, 0x07, 0x08, 0x04, 0x05, 0x06, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x03, 0x04, 0x05, 0x05, 0x06, 0x03
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x04, 0x05, 0x06, 0x06, 0x07, 0x02, 0x02
.byte 0x03, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x03, 0x04, 0x05, 0x05, 0x06, 0x07, 0x07, 0x08
.byte 0x01, 0x01, 0x02, 0x03, 0x00, 0x00, 0x00, 0x04
.byte 0x05, 0x06, 0x06, 0x07, 0x08, 0x08, 0x09, 0x00
.byte 0x00, 0x01, 0x02, 0x02, 0x03, 0x04, 0x01, 0x00
.byte 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01
.byte 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x01, 0x00
.byte 0x01, 0x02, 0x01, 0x02, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x03, 0x00, 0x01, 0x00, 0x01
.byte 0x02, 0x01, 0x02, 0x03, 0x02, 0x03, 0x00, 0x00
.byte 0x00, 0x00, 0x04, 0x00, 0x01, 0x00, 0x01, 0x02
.byte 0x01, 0x02, 0x03, 0x02, 0x03, 0x04, 0x03, 0x04
.byte 0x00, 0x00, 0x00, 0x00, 0x09, 0x09, 0x09, 0x09
.byte 0x01, 0x01, 0x01, 0x09, 0x09, 0x09, 0x09, 0x09
.byte 0x09, 0x09, 0x00, 0x00, 0x01, 0x01, 0x00, 0x09
.byte 0x09, 0x09, 0x09, 0x09, 0x02, 0x02, 0x00, 0x00
.byte 0x01, 0x01, 0x01, 0x09, 0x09, 0x09, 0x03, 0x03
.byte 0x00, 0x00, 0x01, 0x01, 0x02, 0x02, 0x03, 0x09
.byte 0x03, 0x03, 0x04, 0x04, 0x00, 0x00, 0x01, 0x01
.byte 0x02, 0x02, 0x03, 0x05, 0x00, 0x00, 0x00, 0x00
.byte 0x04, 0x06, 0x00, 0x00, 0x00, 0x03, 0x05, 0x07
.byte 0x00, 0x00, 0x02, 0x04, 0x06, 0x08, 0x00, 0x01
.byte 0x03, 0x05, 0x06, 0x09
.align 2
gUnknown_082F7DF0_UnrefDupe:: @ 82F4698
.incbin "graphics/link_games/dodrioberry_bg1.gbapal"
.align 2
.incbin "graphics/link_games/dodrioberry_bg2.gbapal"
.align 2
gUnknown_082F7E30_UnrefDupe:: @ 82F46B8
.incbin "graphics/link_games/dodrioberry_pkmn.gbapal"
.align 2
gUnknown_082F7E50_UnrefDupe:: @ 82F46D8
.incbin "graphics/link_games/dodrioberry_shiny.gbapal"
.align 2
gUnknown_082F7E70_UnrefDupe:: @ 82F46F8
.incbin "graphics/link_games/dodrioberry_status.gbapal"
.align 2
gUnknown_082F7E90_UnrefDupe:: @ 82F4718
.incbin "graphics/link_games/dodrioberry_berrysprites.gbapal"
.align 2
gUnknown_082F7EB0_UnrefDupe:: @ 82F4738
.incbin "graphics/link_games/dodrioberry_berrysprites.4bpp.lz"
.align 2
gUnknown_082F8064_UnrefDupe:: @ 82F490C
.incbin "graphics/link_games/dodrioberry_platform.gbapal"
.align 2
gUnknown_082F8084_UnrefDupe:: @ 82F492C
.incbin "graphics/link_games/dodrioberry_bg1.4bpp.lz"
.align 2
gUnknown_082F8914_UnrefDupe:: @ 82F51BC
.incbin "graphics/link_games/dodrioberry_bg2.4bpp.lz"
.align 2
gUnknown_082F96E0_UnrefDupe:: @ 82F5F88
.incbin "graphics/link_games/dodrioberry_status.4bpp.lz"
.align 2
gUnknown_082F9774_UnrefDupe:: @ 82F601C
.incbin "graphics/link_games/dodrioberry_platform.4bpp.lz"
.align 2
gUnknown_082F98BC_UnrefDupe:: @ 82F6164
.incbin "graphics/link_games/dodrioberry_pkmn.4bpp.lz"
.align 2
gUnknown_082FAAD8_UnrefDupe:: @ 82F7380
.incbin "graphics/link_games/dodrioberry_bg1.bin.lz"
.align 2
gUnknown_082FAD44_UnrefDupe:: @ 82F75EC
.incbin "graphics/link_games/dodrioberry_bg2right.bin.lz"
.align 2
gUnknown_082FAF94_UnrefDupe:: @ 82F783C
.incbin "graphics/link_games/dodrioberry_bg2left.bin.lz"
.align 2
gUnknown_082F7A88:: @ 82F7A88
.byte 0x28, 0x18, 0x0d, 0x20, 0x13, 0x0a, 0x16, 0x0d
.byte 0x07, 0x00, 0x00, 0x00
.align 2
gUnknown_082F7A94:: @ 82F7A94
.byte 0x08, 0x05, 0x08, 0x0b, 0x0f, 0x00, 0x00, 0x00
.align 2
gUnknown_082F7A9C:: @ 82F7A9C
.byte 0x05, 0x0a, 0x14, 0x1e, 0x32, 0x46, 0x64, 0x00
.align 2
gUnknown_082F7AA4:: @ 82F7AA4
.byte 0x0f, 0x10, 0x11, 0x12, 0x13, 0x13, 0x12, 0x11
.byte 0x10, 0x0f, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19
.byte 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f, 0x20, 0x21
.byte 0x22, 0x22, 0x21, 0x20, 0x1f, 0x1e, 0x00, 0x00
.align 2
gUnknown_082F7AC4:: @ 82F7AC4
.4byte sub_8024DBC
.4byte sub_8024E00
.4byte sub_8024E38
.4byte sub_8024F10
.4byte sub_8024F38
.4byte sub_8025198
.4byte sub_8025324
.4byte sub_8025470
.4byte sub_8025644
.4byte sub_80256AC
.4byte sub_8025758
.4byte sub_80250D4
.align 2
gUnknown_082F7AF4:: @ 82F7AF4
.4byte sub_8024DBC
.4byte sub_8024E00
.4byte sub_8024E38
.4byte sub_8024F10
.4byte sub_8024FFC
.4byte sub_8025230
.4byte sub_8025324
.4byte sub_8025470
.4byte sub_8025644
.4byte sub_80256AC
.4byte sub_8025758
.4byte sub_8025158
.align 2
gUnknown_082F7B24:: @ 82F7B24
.2byte 0x000a, 0x001e, 0x0032, 0x0032
.align 2
gUnknown_082F7B2C:: @ 82F7B2C
.byte 0x00, 0x05, 0x01, 0x14, 0x0b, 0x0f, 0x01, 0x00
.align 2
gUnknown_082F7B34:: @ 82F7B34
.4byte gText_BerriesPicked
.4byte gText_BestScore
.4byte gText_BerriesInRowFivePlayers
.align 2
gUnknown_082F7B40:: @ 82F7B40
.byte 0x04, 0x07, 0x04, 0x00
.align 2
gUnknown_082F7B44:: @ 82F7B44
.2byte 0x0019, 0x0029, 0x0039
gUnknown_082F7B4A:: @ 82F7B4A
.2byte 0x0019, 0x0029, 0x0049
.align 2
gUnknown_082F7B50:: @ 82F7B50
.2byte 0x270f, 0x0000, 0x005a, 0x270f, 0x270f, 0x270f, 0x0046, 0x270f
.2byte 0x270f, 0x0000, 0x270f, 0x0000, 0x270f, 0x270f, 0x003c, 0x0000
.2byte 0x270f, 0x270f, 0x270f, 0x0000
.align 2
gUnknown_082F7B78:: @ 82F7B78
.string "ÀÁÂÇÈÉÊ$"
.align 2
gUnknown_082F7B80:: @ 82F7B80
.string "ABCDEFG$"
.align 2
gUnknown_082F7B88:: @ 82F7B88
.string "0123456$"
.align 2
gUnknown_082F7B90:: @ 82F7B90
.4byte gUnknown_082F7B78
.4byte gUnknown_082F7B78
.4byte gUnknown_082F7B78
.4byte gUnknown_082F7B80
.4byte gUnknown_082F7B88
.align 2
gUnknown_082F7BA4:: @ 82F7BA4 struct BgTemplate
.4byte 0x000001e0
.4byte 0x000012c9
.4byte 0x000012ea
.4byte 0x000021ff
.4byte 0x000000ff
.4byte 0x00000000
.align 2
gUnknown_082F7BBC:: @ 82F7BBC
window_template 0x00, 0x01, 0x01, 0x1c, 0x02, 0x0d, 0x0013
window_template 0x00, 0x01, 0x05, 0x1c, 0x0e, 0x0d, 0x004b
.align 2
gUnknown_082F7BCC:: @ 82F7BCC
window_template 0x00, 0x01, 0x05, 0x1c, 0x07, 0x0d, 0x004b
.align 2
gUnknown_082F7BD4:: @ 82F7BD4
window_template 0x00, 0x01, 0x08, 0x13, 0x03, 0x0d, 0x0013
window_template 0x00, 0x16, 0x07, 0x06, 0x04, 0x0d, 0x004c
.align 2
gUnknown_082F7BE4:: @ 82F7BE4
window_template 0x00, 0x04, 0x06, 0x16, 0x05, 0x0d, 0x0013
.align 2
gUnknown_082F7BEC:: @ 82F7BEC
window_template 0x00, 0x05, 0x08, 0x13, 0x03, 0x0d, 0x0013
.align 2
gUnknown_082F449C_UnrefDupe:: @ 82F7BF4
.byte 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07
.byte 0x08, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x03, 0x08
.byte 0x09, 0x00, 0x00, 0x01, 0x02, 0x05, 0x06, 0x03
.byte 0x04, 0x05, 0x08, 0x09, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01
.byte 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x02, 0x09
.byte 0x00, 0x00, 0x01, 0x04, 0x05, 0x06, 0x07, 0x02
.byte 0x03, 0x04, 0x09, 0x00, 0x00, 0x01, 0x06, 0x07
.byte 0x02, 0x03, 0x04, 0x05, 0x06, 0x09, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02
.byte 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x01, 0x00
.byte 0x00, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x01
.byte 0x02, 0x03, 0x00, 0x00, 0x05, 0x06, 0x07, 0x08
.byte 0x01, 0x02, 0x03, 0x04, 0x05, 0x00, 0x00, 0x07
.byte 0x08, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x03
.byte 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x00, 0x02
.byte 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x00
.byte 0x01, 0x02, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09
.byte 0x00, 0x01, 0x02, 0x03, 0x04, 0x06, 0x07, 0x08
.byte 0x09, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06
.byte 0x08, 0x09, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05
.byte 0x06, 0x07, 0x08, 0x04, 0x05, 0x06, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x03, 0x04, 0x05, 0x05, 0x06, 0x03
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x04, 0x05, 0x06, 0x06, 0x07, 0x02, 0x02
.byte 0x03, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x03, 0x04, 0x05, 0x05, 0x06, 0x07, 0x07, 0x08
.byte 0x01, 0x01, 0x02, 0x03, 0x00, 0x00, 0x00, 0x04
.byte 0x05, 0x06, 0x06, 0x07, 0x08, 0x08, 0x09, 0x00
.byte 0x00, 0x01, 0x02, 0x02, 0x03, 0x04, 0x01, 0x00
.byte 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01
.byte 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x01, 0x00
.byte 0x01, 0x02, 0x01, 0x02, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x03, 0x00, 0x01, 0x00, 0x01
.byte 0x02, 0x01, 0x02, 0x03, 0x02, 0x03, 0x00, 0x00
.byte 0x00, 0x00, 0x04, 0x00, 0x01, 0x00, 0x01, 0x02
.byte 0x01, 0x02, 0x03, 0x02, 0x03, 0x04, 0x03, 0x04
.byte 0x00, 0x00, 0x00, 0x00, 0x09, 0x09, 0x09, 0x09
.byte 0x01, 0x01, 0x01, 0x09, 0x09, 0x09, 0x09, 0x09
.byte 0x09, 0x09, 0x00, 0x00, 0x01, 0x01, 0x00, 0x09
.byte 0x09, 0x09, 0x09, 0x09, 0x02, 0x02, 0x00, 0x00
.byte 0x01, 0x01, 0x01, 0x09, 0x09, 0x09, 0x03, 0x03
.byte 0x00, 0x00, 0x01, 0x01, 0x02, 0x02, 0x03, 0x09
.byte 0x03, 0x03, 0x04, 0x04, 0x00, 0x00, 0x01, 0x01
.byte 0x02, 0x02, 0x03, 0x05, 0x00, 0x00, 0x00, 0x00
.byte 0x04, 0x06, 0x00, 0x00, 0x00, 0x03, 0x05, 0x07
.byte 0x00, 0x00, 0x02, 0x04, 0x06, 0x08, 0x00, 0x01
.byte 0x03, 0x05, 0x06, 0x09
.align 2
gDodrioBerryBgPal1:: @ 82F7DF0
.incbin "graphics/link_games/dodrioberry_bg1.gbapal"
.align 2
.incbin "graphics/link_games/dodrioberry_bg2.gbapal"
.align 2
gDodrioBerryPkmnPal:: @ 82F7E30
.incbin "graphics/link_games/dodrioberry_pkmn.gbapal"
.align 2
gDodrioBerryShinyPal:: @ 82F7E50
.incbin "graphics/link_games/dodrioberry_shiny.gbapal"
.align 2
gDodrioBerryStatusPal:: @ 82F7E70
.incbin "graphics/link_games/dodrioberry_status.gbapal"
.align 2
gDodrioBerrySpritesPal:: @ 82F7E90
.incbin "graphics/link_games/dodrioberry_berrysprites.gbapal"
.align 2
gDodrioBerrySpritesGfx:: @ 82F7EB0
.incbin "graphics/link_games/dodrioberry_berrysprites.4bpp.lz"
.align 2
gDodrioBerryPlatformPal:: @ 82F8064
.incbin "graphics/link_games/dodrioberry_platform.gbapal"
.align 2
gDodrioBerryBgGfx1:: @ 82F8084
.incbin "graphics/link_games/dodrioberry_bg1.4bpp.lz"
.align 2
gDodrioBerryBgGfx2:: @ 82F8914
.incbin "graphics/link_games/dodrioberry_bg2.4bpp.lz"
.align 2
gDodrioBerryStatusGfx:: @ 82F96E0
.incbin "graphics/link_games/dodrioberry_status.4bpp.lz"
.align 2
gDodrioBerryPlatformGfx:: @ 82F9774
.incbin "graphics/link_games/dodrioberry_platform.4bpp.lz"
.align 2
gDodrioBerryPkmnGfx:: @ 82F98BC
.incbin "graphics/link_games/dodrioberry_pkmn.4bpp.lz"
.align 2
gDodrioBerryBgTilemap1:: @ 82FAAD8
.incbin "graphics/link_games/dodrioberry_bg1.bin.lz"
.align 2
gDodrioBerryBgTilemap2Right:: @ 82FAD44
.incbin "graphics/link_games/dodrioberry_bg2right.bin.lz"
.align 2
gDodrioBerryBgTilemap2Left:: @ 82FAF94
.incbin "graphics/link_games/dodrioberry_bg2left.bin.lz"
.align 2
gUnknown_082FB1E0:: @ 82FB1E0
.byte 0x00, 0x00, 0x00, 0xc0, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_082FB1E8:: @ 82FB1E8
.byte 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00
.align 2
gUnknown_082FB1F0:: @ 82FB1F0
.byte 0x00, 0x00, 0x00, 0x40, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_082FB1F8:: @ 82FB1F8
.byte 0x00, 0x40, 0x00, 0xc0, 0x00, 0x0c, 0x00, 0x00
.align 2
gUnknown_082FB200:: @ 82FB200
.2byte 0x0000, 0x0014
.2byte 0xfffe, 0x0000
.align 2
gUnknown_082FB208:: @ 82FB208
.2byte 0x0040, 0x0014
.2byte 0xfffe, 0x0000
.align 2
gUnknown_082FB210:: @ 82FB210
.2byte 0x0080, 0x0014
.2byte 0xfffe, 0x0000
.align 2
gUnknown_082FB218:: @ 82FB218
.2byte 0x00c0, 0x0014
.2byte 0xfffe, 0x0000
.align 2
gUnknown_082FB220:: @ 82FB220
.2byte 0x0100, 0x0014
.2byte 0xfffe, 0x0000
.align 2
gUnknown_082FB228:: @ 82FB228
.4byte gUnknown_082FB200
.4byte gUnknown_082FB208
.4byte gUnknown_082FB210
.4byte gUnknown_082FB218
.4byte gUnknown_082FB220
.align 2
gUnknown_082FB23C:: @ 82FB23C
.2byte 0x0000, 0x0014
.2byte 0xfffe, 0x0000
.align 2
gUnknown_082FB244:: @ 82FB244
.2byte 0x0004, 0x0014
.2byte 0xfffe, 0x0000
.align 2
gUnknown_082FB24C:: @ 82FB24C
.2byte 0x0008, 0x0014
.2byte 0xfffe, 0x0000
.align 2
gUnknown_082FB254:: @ 82FB254
.4byte gUnknown_082FB23C
.4byte gUnknown_082FB244
.4byte gUnknown_082FB24C
.align 2
gUnknown_082FB260:: @ 82FB260
.2byte 0x0000, 0x0014
.2byte 0xfffe, 0x0000
.align 2
gUnknown_082FB268:: @ 82FB268
.2byte 0x0004, 0x0014
.2byte 0xfffe, 0x0000
.align 2
gUnknown_082FB270:: @ 82FB270
.2byte 0x0008, 0x0014
.2byte 0xfffe, 0x0000
.align 2
gUnknown_082FB278:: @ 82FB278
.2byte 0x000c, 0x0014
.2byte 0xfffe, 0x0000
.align 2
gUnknown_082FB280:: @ 82FB280
.2byte 0x0010, 0x0014
.2byte 0xfffe, 0x0000
.align 2
gUnknown_082FB288:: @ 82FB288
.2byte 0x0014, 0x0014
.2byte 0xfffe, 0x0000
.align 2
gUnknown_082FB290:: @ 82FB290
.2byte 0x0018, 0x0014
.2byte 0xfffe, 0x0000
.align 2
gUnknown_082FB298:: @ 82FB298
.2byte 0x001c, 0x0014
.2byte 0xfffe, 0x0000
.align 2
gUnknown_082FB2A0:: @ 82FB2A0
.2byte 0x0020, 0x0014
.2byte 0xfffe, 0x0000
.align 2
gUnknown_082FB2A8:: @ 82FB2A8
.4byte gUnknown_082FB260
.4byte gUnknown_082FB268
.4byte gUnknown_082FB270
.4byte gUnknown_082FB278
.4byte gUnknown_082FB280
.4byte gUnknown_082FB288
.4byte gUnknown_082FB290
.4byte gUnknown_082FB298
.4byte gUnknown_082FB2A0
.align 2
gUnknown_082FB2CC:: @ 82FB2CC
.2byte 0x0000, 0x0014
.2byte 0xfffe, 0x0000
.align 2
gUnknown_082FB2D4:: @ 82FB2D4
.4byte gUnknown_082FB2CC
.align 2
gUnknown_082FB2D8:: @ 82FB2D8
obj_pal gDodrioBerryPkmnPal, 0x0000
.align 2
gUnknown_082FB2E0:: @ 82FB2E0
obj_pal gDodrioBerryShinyPal, 0x0001
.align 2
gUnknown_082FB2E8:: @ 82FB2E8
obj_pal gDodrioBerryStatusPal, 0x0002
.align 2
gUnknown_082FB2F0:: @ 82FB2F0
spr_template 0x0001, 0x0002, gUnknown_082FB1E8, gUnknown_082FB254, NULL, gDummySpriteAffineAnimTable, nullsub_15
.align 2
.byte 0xD4, 0x3E, 0x3F, 0x40, 0x41, 0x42, 0x43, 0x44
.byte 0x45, 0xFB, 0x00, 0x00
.align 2
gUnknown_082FB314:: @ 82FB314
obj_pal gDodrioBerrySpritesPal, 0x0003
.align 2
gUnknown_082FB31C:: @ 82FB31C
.2byte 0x0058, 0x0080, 0x00a8, 0x00d0
.align 2
gUnknown_082FB324:: @ 82FB324
spr_template 0x0002, 0x0003, gUnknown_082FB1F0, gUnknown_082FB2A8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
gUnknown_082FB33C:: @ 82FB33C
spr_template 0x0002, 0x0003, gUnknown_082FB1E8, gUnknown_082FB2A8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
gUnknown_082FB354:: @ 82FB354
.byte 0x1E, 0x14
gUnknown_082FB356:: @ 82FB356
.byte 0xE6, 0x00
.align 2
gUnknown_082FB358:: @ 82FB358
.2byte 0x0037, 0x001e, 0x004a, 0x0000
.align 2
gUnknown_082FB360:: @ 82FB360
obj_pal gDodrioBerryPlatformPal, 0x0006
.align 2
gUnknown_082FB368:: @ 82FB368
spr_template 0x0005, 0x0006, gUnknown_082FB1F8, gUnknown_082FB2D4, NULL, gDummySpriteAffineAnimTable, sub_8028CF4
.align 2
gUnknown_082FB380:: @ 82FB380
.byte 0x01, 0x02, 0x03
gUnknown_082FB383:: @ 82FB383
.byte 0x01, 0x04, 0x05
.byte 0x01, 0x08, 0x09
.byte 0x01, 0x06, 0x07
.align 2
gUnknown_082FB38C:: @ 82FB38C
.byte 0x0c, 0x06, 0x00, 0x00
.align 2
gUnknown_082FB390:: @ 82FB390
.byte 0x09, 0x0a, 0x00, 0x00, 0x0f, 0x06, 0x00, 0x00
.align 2
gUnknown_082FB398:: @ 82FB398
.byte 0x0c, 0x06, 0x00, 0x00, 0x12, 0x0a, 0x00, 0x00
.byte 0x06, 0x0a, 0x00, 0x00
.align 2
gUnknown_082FB3A4:: @ 82FB3A4
.byte 0x09, 0x0a, 0x00, 0x00, 0x0f, 0x06, 0x00, 0x00
.byte 0x15, 0x0a, 0x00, 0x00, 0x03, 0x06, 0x00, 0x00
.align 2
gUnknown_082FB3B4:: @ 82FB3B4
.byte 0x0c, 0x06, 0x00, 0x00, 0x12, 0x0a, 0x00, 0x00
.byte 0x17, 0x06, 0x00, 0x00, 0x01, 0x06, 0x00, 0x00
.byte 0x06, 0x0a, 0x00, 0x00
.align 2
gUnknown_082FB3C8:: @ 82FB3C8
.4byte gUnknown_082FB38C
.4byte gUnknown_082FB390
.4byte gUnknown_082FB398
.4byte gUnknown_082FB3A4
.4byte gUnknown_082FB3B4
.align 2
gUnknown_082FB3DC:: @ 82FB3DC
.4byte gText_1Colon
.4byte gText_2Colon
.4byte gText_3Colon
.4byte gText_4Colon
.4byte gText_5Colon
.align 2
gUnknown_082FB3F0:: @ 82FB3F0
.2byte 0x005c, 0x0084, 0x00ac, 0x00d4
gUnknown_082FB3F8:: @ 82FB3F8
.2byte 0x0021, 0x0031, 0x0041, 0x0051, 0x0061
gUnknown_082FB402:: @ 82FB402
.2byte 0x0011, 0x0021, 0x0031, 0x0041, 0x0051
.align 2
gUnknown_082FB40C:: @ 82FB40C
.4byte 0x00000000, sub_8029338
.4byte 0x00000001, sub_8029440
.4byte 0x00000002, sub_802988C
.4byte 0x00000003, sub_802A010
.4byte 0x00000004, sub_802A380
.4byte 0x00000005, sub_802A454
.4byte 0x00000006, sub_802A534
.4byte 0x00000007, sub_802A588
.4byte 0x00000008, unused_0
.4byte 0x00000009, nullsub_16
.align 2
gUnknown_082FB45C:: @ 82FB45C
.byte 0x00, 0x01, 0x02, 0x03, 0x04, 0x00, 0x00, 0x00

View File

@@ -20,6 +20,7 @@
#include "constants/weather.h"
#include "constants/trainer_hill.h"
#include "constants/battle.h"
#include "constants/metatile_labels.h"
.include "asm/macros.inc"
.include "asm/macros/event.inc"
.include "constants/constants.inc"
@@ -848,86 +849,86 @@ Std_MsgboxAutoclose:: @ 8271494
return
EventScript_ResetAllBerries:: @ 827149D
setberrytree 2, 7, 5
setberrytree 1, 3, 5
setberrytree 11, 7, 5
setberrytree 13, 3, 5
setberrytree 4, 7, 5
setberrytree 76, 1, 5
setberrytree 8, 1, 5
setberrytree 10, 6, 5
setberrytree 25, 20, 5
setberrytree 26, 2, 5
setberrytree 66, 2, 5
setberrytree 67, 20, 5
setberrytree 69, 22, 5
setberrytree 70, 22, 5
setberrytree 71, 22, 5
setberrytree 55, 17, 5
setberrytree 56, 17, 5
setberrytree 5, 1, 5
setberrytree 6, 6, 5
setberrytree 7, 1, 5
setberrytree 16, 18, 5
setberrytree 17, 18, 5
setberrytree 18, 18, 5
setberrytree 29, 19, 5
setberrytree 28, 19, 5
setberrytree 27, 19, 5
setberrytree 24, 4, 5
setberrytree 23, 3, 5
setberrytree 22, 3, 5
setberrytree 21, 4, 5
setberrytree 19, 16, 5
setberrytree 20, 16, 5
setberrytree 80, 7, 5
setberrytree 81, 7, 5
setberrytree 77, 8, 5
setberrytree 78, 8, 5
setberrytree 68, 8, 5
setberrytree 31, 10, 5
setberrytree 33, 10, 5
setberrytree 34, 21, 5
setberrytree 35, 21, 5
setberrytree 36, 21, 5
setberrytree 83, 24, 5
setberrytree 84, 24, 5
setberrytree 85, 10, 5
setberrytree 86, 6, 5
setberrytree 37, 5, 5
setberrytree 38, 5, 5
setberrytree 39, 5, 5
setberrytree 40, 3, 5
setberrytree 41, 3, 5
setberrytree 42, 3, 5
setberrytree 46, 19, 5
setberrytree 45, 20, 5
setberrytree 44, 18, 5
setberrytree 43, 16, 5
setberrytree 47, 8, 5
setberrytree 48, 5, 5
setberrytree 49, 4, 5
setberrytree 50, 2, 5
setberrytree 52, 18, 5
setberrytree 53, 18, 5
setberrytree 62, 6, 5
setberrytree 64, 6, 5
setberrytree 58, 21, 5
setberrytree 59, 21, 5
setberrytree 60, 25, 5
setberrytree 61, 25, 5
setberrytree 79, 23, 5
setberrytree 14, 23, 5
setberrytree 15, 21, 5
setberrytree 30, 21, 5
setberrytree 65, 25, 5
setberrytree 72, 25, 5
setberrytree 73, 23, 5
setberrytree 74, 23, 5
setberrytree 87, 3, 5
setberrytree 88, 10, 5
setberrytree 89, 4, 5
setberrytree 82, 36, 5
setberrytree 2, ITEM_TO_BERRY(ITEM_ORAN_BERRY), 5
setberrytree 1, ITEM_TO_BERRY(ITEM_PECHA_BERRY), 5
setberrytree 11, ITEM_TO_BERRY(ITEM_ORAN_BERRY), 5
setberrytree 13, ITEM_TO_BERRY(ITEM_PECHA_BERRY), 5
setberrytree 4, ITEM_TO_BERRY(ITEM_ORAN_BERRY), 5
setberrytree 76, ITEM_TO_BERRY(ITEM_CHERI_BERRY), 5
setberrytree 8, ITEM_TO_BERRY(ITEM_CHERI_BERRY), 5
setberrytree 10, ITEM_TO_BERRY(ITEM_LEPPA_BERRY), 5
setberrytree 25, ITEM_TO_BERRY(ITEM_PINAP_BERRY), 5
setberrytree 26, ITEM_TO_BERRY(ITEM_CHESTO_BERRY), 5
setberrytree 66, ITEM_TO_BERRY(ITEM_CHESTO_BERRY), 5
setberrytree 67, ITEM_TO_BERRY(ITEM_PINAP_BERRY), 5
setberrytree 69, ITEM_TO_BERRY(ITEM_KELPSY_BERRY), 5
setberrytree 70, ITEM_TO_BERRY(ITEM_KELPSY_BERRY), 5
setberrytree 71, ITEM_TO_BERRY(ITEM_KELPSY_BERRY), 5
setberrytree 55, ITEM_TO_BERRY(ITEM_BLUK_BERRY), 5
setberrytree 56, ITEM_TO_BERRY(ITEM_BLUK_BERRY), 5
setberrytree 5, ITEM_TO_BERRY(ITEM_CHERI_BERRY), 5
setberrytree 6, ITEM_TO_BERRY(ITEM_LEPPA_BERRY), 5
setberrytree 7, ITEM_TO_BERRY(ITEM_CHERI_BERRY), 5
setberrytree 16, ITEM_TO_BERRY(ITEM_NANAB_BERRY), 5
setberrytree 17, ITEM_TO_BERRY(ITEM_NANAB_BERRY), 5
setberrytree 18, ITEM_TO_BERRY(ITEM_NANAB_BERRY), 5
setberrytree 29, ITEM_TO_BERRY(ITEM_WEPEAR_BERRY), 5
setberrytree 28, ITEM_TO_BERRY(ITEM_WEPEAR_BERRY), 5
setberrytree 27, ITEM_TO_BERRY(ITEM_WEPEAR_BERRY), 5
setberrytree 24, ITEM_TO_BERRY(ITEM_RAWST_BERRY), 5
setberrytree 23, ITEM_TO_BERRY(ITEM_PECHA_BERRY), 5
setberrytree 22, ITEM_TO_BERRY(ITEM_PECHA_BERRY), 5
setberrytree 21, ITEM_TO_BERRY(ITEM_RAWST_BERRY), 5
setberrytree 19, ITEM_TO_BERRY(ITEM_RAZZ_BERRY), 5
setberrytree 20, ITEM_TO_BERRY(ITEM_RAZZ_BERRY), 5
setberrytree 80, ITEM_TO_BERRY(ITEM_ORAN_BERRY), 5
setberrytree 81, ITEM_TO_BERRY(ITEM_ORAN_BERRY), 5
setberrytree 77, ITEM_TO_BERRY(ITEM_PERSIM_BERRY), 5
setberrytree 78, ITEM_TO_BERRY(ITEM_PERSIM_BERRY), 5
setberrytree 68, ITEM_TO_BERRY(ITEM_PERSIM_BERRY), 5
setberrytree 31, ITEM_TO_BERRY(ITEM_SITRUS_BERRY), 5
setberrytree 33, ITEM_TO_BERRY(ITEM_SITRUS_BERRY), 5
setberrytree 34, ITEM_TO_BERRY(ITEM_POMEG_BERRY), 5
setberrytree 35, ITEM_TO_BERRY(ITEM_POMEG_BERRY), 5
setberrytree 36, ITEM_TO_BERRY(ITEM_POMEG_BERRY), 5
setberrytree 83, ITEM_TO_BERRY(ITEM_HONDEW_BERRY), 5
setberrytree 84, ITEM_TO_BERRY(ITEM_HONDEW_BERRY), 5
setberrytree 85, ITEM_TO_BERRY(ITEM_SITRUS_BERRY), 5
setberrytree 86, ITEM_TO_BERRY(ITEM_LEPPA_BERRY), 5
setberrytree 37, ITEM_TO_BERRY(ITEM_ASPEAR_BERRY), 5
setberrytree 38, ITEM_TO_BERRY(ITEM_ASPEAR_BERRY), 5
setberrytree 39, ITEM_TO_BERRY(ITEM_ASPEAR_BERRY), 5
setberrytree 40, ITEM_TO_BERRY(ITEM_PECHA_BERRY), 5
setberrytree 41, ITEM_TO_BERRY(ITEM_PECHA_BERRY), 5
setberrytree 42, ITEM_TO_BERRY(ITEM_PECHA_BERRY), 5
setberrytree 46, ITEM_TO_BERRY(ITEM_WEPEAR_BERRY), 5
setberrytree 45, ITEM_TO_BERRY(ITEM_PINAP_BERRY), 5
setberrytree 44, ITEM_TO_BERRY(ITEM_NANAB_BERRY), 5
setberrytree 43, ITEM_TO_BERRY(ITEM_RAZZ_BERRY), 5
setberrytree 47, ITEM_TO_BERRY(ITEM_PERSIM_BERRY), 5
setberrytree 48, ITEM_TO_BERRY(ITEM_ASPEAR_BERRY), 5
setberrytree 49, ITEM_TO_BERRY(ITEM_RAWST_BERRY), 5
setberrytree 50, ITEM_TO_BERRY(ITEM_CHESTO_BERRY), 5
setberrytree 52, ITEM_TO_BERRY(ITEM_NANAB_BERRY), 5
setberrytree 53, ITEM_TO_BERRY(ITEM_NANAB_BERRY), 5
setberrytree 62, ITEM_TO_BERRY(ITEM_LEPPA_BERRY), 5
setberrytree 64, ITEM_TO_BERRY(ITEM_LEPPA_BERRY), 5
setberrytree 58, ITEM_TO_BERRY(ITEM_POMEG_BERRY), 5
setberrytree 59, ITEM_TO_BERRY(ITEM_POMEG_BERRY), 5
setberrytree 60, ITEM_TO_BERRY(ITEM_GREPA_BERRY), 5
setberrytree 61, ITEM_TO_BERRY(ITEM_GREPA_BERRY), 5
setberrytree 79, ITEM_TO_BERRY(ITEM_QUALOT_BERRY), 5
setberrytree 14, ITEM_TO_BERRY(ITEM_QUALOT_BERRY), 5
setberrytree 15, ITEM_TO_BERRY(ITEM_POMEG_BERRY), 5
setberrytree 30, ITEM_TO_BERRY(ITEM_POMEG_BERRY), 5
setberrytree 65, ITEM_TO_BERRY(ITEM_GREPA_BERRY), 5
setberrytree 72, ITEM_TO_BERRY(ITEM_GREPA_BERRY), 5
setberrytree 73, ITEM_TO_BERRY(ITEM_QUALOT_BERRY), 5
setberrytree 74, ITEM_TO_BERRY(ITEM_QUALOT_BERRY), 5
setberrytree 87, ITEM_TO_BERRY(ITEM_PECHA_BERRY), 5
setberrytree 88, ITEM_TO_BERRY(ITEM_SITRUS_BERRY), 5
setberrytree 89, ITEM_TO_BERRY(ITEM_RAWST_BERRY), 5
setberrytree 82, ITEM_TO_BERRY(ITEM_LIECHI_BERRY), 5
return
EventScript_ResetAllMapFlags:: @ 82715DE
@@ -2292,21 +2293,22 @@ EverGrandeCity_DrakesRoom_EventScript_2723F8:: @ 82723F8
EverGrandeCity_GlaciasRoom_EventScript_2723F8:: @ 82723F8
EverGrandeCity_PhoebesRoom_EventScript_2723F8:: @ 82723F8
EverGrandeCity_SidneysRoom_EventScript_2723F8:: @ 82723F8
PokemonLeague_EliteFour_SetAdvanceToNextRoomMetatiles:: @ 82723F8
applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_SidneysRoom_Movement_2725C6
waitmovement 0
playse SE_DOOR
setmetatile 6, 1, 836, 0
setmetatile 6, 2, 837, 0
setmetatile 0, 2, 734, 1
setmetatile 1, 2, 733, 1
setmetatile 2, 2, 734, 1
setmetatile 3, 2, 733, 1
setmetatile 4, 2, 734, 1
setmetatile 8, 2, 733, 1
setmetatile 9, 2, 734, 1
setmetatile 10, 2, 733, 1
setmetatile 11, 2, 734, 1
setmetatile 12, 2, 733, 1
setmetatile 6, 1, METATILE_EliteFour_OpenDoor_Frame, 0
setmetatile 6, 2, METATILE_EliteFour_OpenDoor_Opening, 0
setmetatile 0, 2, METATILE_EliteFour_RightSpotlightOff, 1
setmetatile 1, 2, METATILE_EliteFour_LeftSpotlightOff, 1
setmetatile 2, 2, METATILE_EliteFour_RightSpotlightOff, 1
setmetatile 3, 2, METATILE_EliteFour_LeftSpotlightOff, 1
setmetatile 4, 2, METATILE_EliteFour_RightSpotlightOff, 1
setmetatile 8, 2, METATILE_EliteFour_LeftSpotlightOff, 1
setmetatile 9, 2, METATILE_EliteFour_RightSpotlightOff, 1
setmetatile 10, 2, METATILE_EliteFour_LeftSpotlightOff, 1
setmetatile 11, 2, METATILE_EliteFour_RightSpotlightOff, 1
setmetatile 12, 2, METATILE_EliteFour_LeftSpotlightOff, 1
special DrawWholeMapView
return
@@ -2317,12 +2319,12 @@ EverGrandeCity_SidneysRoom_EventScript_272475:: @ 8272475
applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_SidneysRoom_Movement_2725BA
waitmovement 0
playse SE_TRACK_DOOR
setmetatile 5, 12, 518, 1
setmetatile 6, 12, 518, 1
setmetatile 7, 12, 518, 1
setmetatile 5, 13, 526, 1
setmetatile 6, 13, 526, 1
setmetatile 7, 13, 526, 1
setmetatile 5, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1
setmetatile 6, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1
setmetatile 7, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1
setmetatile 5, 13, METATILE_EliteFour_EntryDoor_ClosedBottom, 1
setmetatile 6, 13, METATILE_EliteFour_EntryDoor_ClosedBottom, 1
setmetatile 7, 13, METATILE_EliteFour_EntryDoor_ClosedBottom, 1
special DrawWholeMapView
return
@@ -2330,36 +2332,36 @@ EverGrandeCity_DrakesRoom_EventScript_2724BC:: @ 82724BC
EverGrandeCity_GlaciasRoom_EventScript_2724BC:: @ 82724BC
EverGrandeCity_PhoebesRoom_EventScript_2724BC:: @ 82724BC
EverGrandeCity_SidneysRoom_EventScript_2724BC:: @ 82724BC
setmetatile 6, 1, 836, 0
setmetatile 6, 2, 837, 0
setmetatile 5, 12, 518, 1
setmetatile 6, 12, 518, 1
setmetatile 7, 12, 518, 1
setmetatile 5, 13, 526, 1
setmetatile 6, 13, 526, 1
setmetatile 7, 13, 526, 1
setmetatile 0, 2, 734, 1
setmetatile 1, 2, 733, 1
setmetatile 2, 2, 734, 1
setmetatile 3, 2, 733, 1
setmetatile 4, 2, 734, 1
setmetatile 8, 2, 733, 1
setmetatile 9, 2, 734, 1
setmetatile 10, 2, 733, 1
setmetatile 11, 2, 734, 1
setmetatile 12, 2, 733, 1
setmetatile 6, 1, METATILE_EliteFour_OpenDoor_Frame, 0
setmetatile 6, 2, METATILE_EliteFour_OpenDoor_Opening, 0
setmetatile 5, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1
setmetatile 6, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1
setmetatile 7, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1
setmetatile 5, 13, METATILE_EliteFour_EntryDoor_ClosedBottom, 1
setmetatile 6, 13, METATILE_EliteFour_EntryDoor_ClosedBottom, 1
setmetatile 7, 13, METATILE_EliteFour_EntryDoor_ClosedBottom, 1
setmetatile 0, 2, METATILE_EliteFour_RightSpotlightOff, 1
setmetatile 1, 2, METATILE_EliteFour_LeftSpotlightOff, 1
setmetatile 2, 2, METATILE_EliteFour_RightSpotlightOff, 1
setmetatile 3, 2, METATILE_EliteFour_LeftSpotlightOff, 1
setmetatile 4, 2, METATILE_EliteFour_RightSpotlightOff, 1
setmetatile 8, 2, METATILE_EliteFour_LeftSpotlightOff, 1
setmetatile 9, 2, METATILE_EliteFour_RightSpotlightOff, 1
setmetatile 10, 2, METATILE_EliteFour_LeftSpotlightOff, 1
setmetatile 11, 2, METATILE_EliteFour_RightSpotlightOff, 1
setmetatile 12, 2, METATILE_EliteFour_LeftSpotlightOff, 1
return
EverGrandeCity_DrakesRoom_EventScript_27255F:: @ 827255F
EverGrandeCity_GlaciasRoom_EventScript_27255F:: @ 827255F
EverGrandeCity_PhoebesRoom_EventScript_27255F:: @ 827255F
EverGrandeCity_SidneysRoom_EventScript_27255F:: @ 827255F
setmetatile 5, 12, 518, 1
setmetatile 6, 12, 518, 1
setmetatile 7, 12, 518, 1
setmetatile 5, 13, 526, 1
setmetatile 6, 13, 526, 1
setmetatile 7, 13, 526, 1
setmetatile 5, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1
setmetatile 6, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1
setmetatile 7, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1
setmetatile 5, 13, METATILE_EliteFour_EntryDoor_ClosedBottom, 1
setmetatile 6, 13, METATILE_EliteFour_EntryDoor_ClosedBottom, 1
setmetatile 7, 13, METATILE_EliteFour_EntryDoor_ClosedBottom, 1
return
SlateportCity_Movement_272596: @ 8272596
@@ -2995,163 +2997,163 @@ EventScript_2738FF:: @ 82738FF
end
UnusualWeather_EventScript_PlaceTilesRoute114North:: @ 8273913
setmetatile 7, 3, 839, 1
setmetatile 7, 4, 847, 0
setmetatile 7, 3, METATILE_Fallarbor_RedCaveEntrance_Top, 1
setmetatile 7, 4, METATILE_Fallarbor_RedCaveEntrance_Bottom, 0
return
UnusualWeather_EventScript_PlaceTilesRoute114South:: @ 8273926
setmetatile 6, 45, 601, 1
setmetatile 6, 46, 609, 0
setmetatile 6, 45, METATILE_Fallarbor_BrownCaveEntrance_Top, 1
setmetatile 6, 46, METATILE_Fallarbor_BrownCaveEntrance_Bottom, 0
return
UnusualWeather_EventScript_PlaceTilesRoute115West:: @ 8273939
setmetatile 21, 5, 601, 1
setmetatile 21, 6, 609, 0
setmetatile 21, 5, METATILE_Fallarbor_BrownCaveEntrance_Top, 1
setmetatile 21, 6, METATILE_Fallarbor_BrownCaveEntrance_Bottom, 0
return
UnusualWeather_EventScript_PlaceTilesRoute115East:: @ 827394C
setmetatile 36, 9, 601, 1
setmetatile 36, 10, 609, 0
setmetatile 36, 9, METATILE_Fallarbor_BrownCaveEntrance_Top, 1
setmetatile 36, 10, METATILE_Fallarbor_BrownCaveEntrance_Bottom, 0
return
UnusualWeather_EventScript_PlaceTilesRoute116North:: @ 827395F
setmetatile 59, 12, 159, 1
setmetatile 59, 13, 167, 0
setmetatile 59, 12, METATILE_General_CaveEntrance_Top, 1
setmetatile 59, 13, METATILE_General_CaveEntrance_Bottom, 0
return
UnusualWeather_EventScript_PlaceTilesRoute116South:: @ 8273972
setmetatile 79, 5, 159, 1
setmetatile 79, 6, 167, 0
setmetatile 79, 5, METATILE_General_CaveEntrance_Top, 1
setmetatile 79, 6, METATILE_General_CaveEntrance_Bottom, 0
return
UnusualWeather_EventScript_PlaceTilesRoute118East:: @ 8273985
setmetatile 42, 5, 159, 1
setmetatile 42, 6, 167, 0
setmetatile 42, 5, METATILE_General_CaveEntrance_Top, 1
setmetatile 42, 6, METATILE_General_CaveEntrance_Bottom, 0
return
UnusualWeather_EventScript_PlaceTilesRoute118West:: @ 8273998
setmetatile 9, 5, 159, 1
setmetatile 9, 6, 167, 0
setmetatile 9, 5, METATILE_General_CaveEntrance_Top, 1
setmetatile 9, 6, METATILE_General_CaveEntrance_Bottom, 0
return
UnusualWeather_EventScript_PlaceTilesRoute105North:: @ 82739AB
setmetatile 10, 28, 334, 0
setmetatile 11, 28, 334, 0
setmetatile 9, 29, 334, 0
setmetatile 10, 29, 335, 0
setmetatile 11, 29, 335, 0
setmetatile 12, 29, 334, 0
setmetatile 9, 30, 334, 0
setmetatile 10, 30, 335, 0
setmetatile 11, 30, 335, 0
setmetatile 12, 30, 334, 0
setmetatile 10, 31, 334, 0
setmetatile 11, 31, 334, 0
setmetatile 10, 28, METATILE_General_RoughWater, 0
setmetatile 11, 28, METATILE_General_RoughWater, 0
setmetatile 9, 29, METATILE_General_RoughWater, 0
setmetatile 10, 29, METATILE_General_RoughDeepWater, 0
setmetatile 11, 29, METATILE_General_RoughDeepWater, 0
setmetatile 12, 29, METATILE_General_RoughWater, 0
setmetatile 9, 30, METATILE_General_RoughWater, 0
setmetatile 10, 30, METATILE_General_RoughDeepWater, 0
setmetatile 11, 30, METATILE_General_RoughDeepWater, 0
setmetatile 12, 30, METATILE_General_RoughWater, 0
setmetatile 10, 31, METATILE_General_RoughWater, 0
setmetatile 11, 31, METATILE_General_RoughWater, 0
return
UnusualWeather_EventScript_PlaceTilesRoute105South:: @ 8273A18
setmetatile 20, 53, 334, 0
setmetatile 21, 53, 334, 0
setmetatile 19, 54, 334, 0
setmetatile 20, 54, 335, 0
setmetatile 21, 54, 335, 0
setmetatile 22, 54, 334, 0
setmetatile 19, 55, 334, 0
setmetatile 20, 55, 335, 0
setmetatile 21, 55, 335, 0
setmetatile 22, 55, 334, 0
setmetatile 20, 56, 334, 0
setmetatile 21, 56, 334, 0
setmetatile 20, 53, METATILE_General_RoughWater, 0
setmetatile 21, 53, METATILE_General_RoughWater, 0
setmetatile 19, 54, METATILE_General_RoughWater, 0
setmetatile 20, 54, METATILE_General_RoughDeepWater, 0
setmetatile 21, 54, METATILE_General_RoughDeepWater, 0
setmetatile 22, 54, METATILE_General_RoughWater, 0
setmetatile 19, 55, METATILE_General_RoughWater, 0
setmetatile 20, 55, METATILE_General_RoughDeepWater, 0
setmetatile 21, 55, METATILE_General_RoughDeepWater, 0
setmetatile 22, 55, METATILE_General_RoughWater, 0
setmetatile 20, 56, METATILE_General_RoughWater, 0
setmetatile 21, 56, METATILE_General_RoughWater, 0
return
UnusualWeather_EventScript_PlaceTilesRoute125West:: @ 8273A85
setmetatile 8, 16, 334, 0
setmetatile 9, 16, 334, 0
setmetatile 7, 17, 334, 0
setmetatile 8, 17, 335, 0
setmetatile 9, 17, 335, 0
setmetatile 10, 17, 334, 0
setmetatile 7, 18, 334, 0
setmetatile 8, 18, 335, 0
setmetatile 9, 18, 335, 0
setmetatile 10, 18, 334, 0
setmetatile 8, 19, 334, 0
setmetatile 9, 19, 334, 0
setmetatile 8, 16, METATILE_General_RoughWater, 0
setmetatile 9, 16, METATILE_General_RoughWater, 0
setmetatile 7, 17, METATILE_General_RoughWater, 0
setmetatile 8, 17, METATILE_General_RoughDeepWater, 0
setmetatile 9, 17, METATILE_General_RoughDeepWater, 0
setmetatile 10, 17, METATILE_General_RoughWater, 0
setmetatile 7, 18, METATILE_General_RoughWater, 0
setmetatile 8, 18, METATILE_General_RoughDeepWater, 0
setmetatile 9, 18, METATILE_General_RoughDeepWater, 0
setmetatile 10, 18, METATILE_General_RoughWater, 0
setmetatile 8, 19, METATILE_General_RoughWater, 0
setmetatile 9, 19, METATILE_General_RoughWater, 0
return
UnusualWeather_EventScript_PlaceTilesRoute125East:: @ 8273AF2
setmetatile 53, 18, 334, 0
setmetatile 54, 18, 334, 0
setmetatile 52, 19, 334, 0
setmetatile 53, 19, 335, 0
setmetatile 54, 19, 335, 0
setmetatile 55, 19, 334, 0
setmetatile 52, 20, 334, 0
setmetatile 53, 20, 335, 0
setmetatile 54, 20, 335, 0
setmetatile 55, 20, 334, 0
setmetatile 53, 21, 334, 0
setmetatile 54, 21, 334, 0
setmetatile 53, 18, METATILE_General_RoughWater, 0
setmetatile 54, 18, METATILE_General_RoughWater, 0
setmetatile 52, 19, METATILE_General_RoughWater, 0
setmetatile 53, 19, METATILE_General_RoughDeepWater, 0
setmetatile 54, 19, METATILE_General_RoughDeepWater, 0
setmetatile 55, 19, METATILE_General_RoughWater, 0
setmetatile 52, 20, METATILE_General_RoughWater, 0
setmetatile 53, 20, METATILE_General_RoughDeepWater, 0
setmetatile 54, 20, METATILE_General_RoughDeepWater, 0
setmetatile 55, 20, METATILE_General_RoughWater, 0
setmetatile 53, 21, METATILE_General_RoughWater, 0
setmetatile 54, 21, METATILE_General_RoughWater, 0
return
UnusualWeather_EventScript_PlaceTilesRoute127North:: @ 8273B5F
setmetatile 57, 9, 334, 0
setmetatile 58, 9, 334, 0
setmetatile 56, 10, 334, 0
setmetatile 57, 10, 335, 0
setmetatile 58, 10, 335, 0
setmetatile 59, 10, 334, 0
setmetatile 56, 11, 334, 0
setmetatile 57, 11, 335, 0
setmetatile 58, 11, 335, 0
setmetatile 59, 11, 334, 0
setmetatile 57, 12, 334, 0
setmetatile 58, 12, 334, 0
setmetatile 57, 9, METATILE_General_RoughWater, 0
setmetatile 58, 9, METATILE_General_RoughWater, 0
setmetatile 56, 10, METATILE_General_RoughWater, 0
setmetatile 57, 10, METATILE_General_RoughDeepWater, 0
setmetatile 58, 10, METATILE_General_RoughDeepWater, 0
setmetatile 59, 10, METATILE_General_RoughWater, 0
setmetatile 56, 11, METATILE_General_RoughWater, 0
setmetatile 57, 11, METATILE_General_RoughDeepWater, 0
setmetatile 58, 11, METATILE_General_RoughDeepWater, 0
setmetatile 59, 11, METATILE_General_RoughWater, 0
setmetatile 57, 12, METATILE_General_RoughWater, 0
setmetatile 58, 12, METATILE_General_RoughWater, 0
return
UnusualWeather_EventScript_PlaceTilesRoute127South:: @ 8273BCC
setmetatile 61, 30, 334, 0
setmetatile 62, 30, 334, 0
setmetatile 60, 31, 334, 0
setmetatile 61, 31, 335, 0
setmetatile 62, 31, 335, 0
setmetatile 63, 31, 334, 0
setmetatile 60, 32, 334, 0
setmetatile 61, 32, 335, 0
setmetatile 62, 32, 335, 0
setmetatile 63, 32, 334, 0
setmetatile 61, 33, 334, 0
setmetatile 62, 33, 334, 0
setmetatile 61, 30, METATILE_General_RoughWater, 0
setmetatile 62, 30, METATILE_General_RoughWater, 0
setmetatile 60, 31, METATILE_General_RoughWater, 0
setmetatile 61, 31, METATILE_General_RoughDeepWater, 0
setmetatile 62, 31, METATILE_General_RoughDeepWater, 0
setmetatile 63, 31, METATILE_General_RoughWater, 0
setmetatile 60, 32, METATILE_General_RoughWater, 0
setmetatile 61, 32, METATILE_General_RoughDeepWater, 0
setmetatile 62, 32, METATILE_General_RoughDeepWater, 0
setmetatile 63, 32, METATILE_General_RoughWater, 0
setmetatile 61, 33, METATILE_General_RoughWater, 0
setmetatile 62, 33, METATILE_General_RoughWater, 0
return
UnusualWeather_EventScript_PlaceTilesRoute129West:: @ 8273C39
setmetatile 16, 14, 334, 0
setmetatile 17, 14, 334, 0
setmetatile 15, 15, 334, 0
setmetatile 16, 15, 335, 0
setmetatile 17, 15, 335, 0
setmetatile 18, 15, 334, 0
setmetatile 15, 16, 334, 0
setmetatile 16, 16, 335, 0
setmetatile 17, 16, 335, 0
setmetatile 18, 16, 334, 0
setmetatile 16, 17, 334, 0
setmetatile 17, 17, 334, 0
setmetatile 16, 14, METATILE_General_RoughWater, 0
setmetatile 17, 14, METATILE_General_RoughWater, 0
setmetatile 15, 15, METATILE_General_RoughWater, 0
setmetatile 16, 15, METATILE_General_RoughDeepWater, 0
setmetatile 17, 15, METATILE_General_RoughDeepWater, 0
setmetatile 18, 15, METATILE_General_RoughWater, 0
setmetatile 15, 16, METATILE_General_RoughWater, 0
setmetatile 16, 16, METATILE_General_RoughDeepWater, 0
setmetatile 17, 16, METATILE_General_RoughDeepWater, 0
setmetatile 18, 16, METATILE_General_RoughWater, 0
setmetatile 16, 17, METATILE_General_RoughWater, 0
setmetatile 17, 17, METATILE_General_RoughWater, 0
return
UnusualWeather_EventScript_PlaceTilesRoute129East:: @ 8273CA6
setmetatile 42, 19, 334, 0
setmetatile 43, 19, 334, 0
setmetatile 41, 20, 334, 0
setmetatile 42, 20, 335, 0
setmetatile 43, 20, 335, 0
setmetatile 44, 20, 334, 0
setmetatile 41, 21, 334, 0
setmetatile 42, 21, 335, 0
setmetatile 43, 21, 335, 0
setmetatile 44, 21, 334, 0
setmetatile 42, 22, 334, 0
setmetatile 43, 22, 334, 0
setmetatile 42, 19, METATILE_General_RoughWater, 0
setmetatile 43, 19, METATILE_General_RoughWater, 0
setmetatile 41, 20, METATILE_General_RoughWater, 0
setmetatile 42, 20, METATILE_General_RoughDeepWater, 0
setmetatile 43, 20, METATILE_General_RoughDeepWater, 0
setmetatile 44, 20, METATILE_General_RoughWater, 0
setmetatile 41, 21, METATILE_General_RoughWater, 0
setmetatile 42, 21, METATILE_General_RoughDeepWater, 0
setmetatile 43, 21, METATILE_General_RoughDeepWater, 0
setmetatile 44, 21, METATILE_General_RoughWater, 0
setmetatile 42, 22, METATILE_General_RoughWater, 0
setmetatile 43, 22, METATILE_General_RoughWater, 0
return
Route105_EventScript_273D13:: @ 8273D13
@@ -3225,163 +3227,163 @@ UnusualWeather_EventScript_CleanupMapTiles:: @ 8273D6D
return
UnusualWeather_EventScript_CleanupRoute114North:: @ 8273E23
setmetatile 7, 3, 617, 1
setmetatile 7, 4, 617, 1
setmetatile 7, 3, METATILE_Fallarbor_RedRockWall, 1
setmetatile 7, 4, METATILE_Fallarbor_RedRockWall, 1
return
UnusualWeather_EventScript_CleanupRoute114South:: @ 8273E36
setmetatile 6, 45, 613, 1
setmetatile 6, 46, 613, 1
setmetatile 6, 45, METATILE_Fallarbor_BrownRockWall, 1
setmetatile 6, 46, METATILE_Fallarbor_BrownRockWall, 1
return
UnusualWeather_EventScript_CleanupRoute115West:: @ 8273E49
setmetatile 21, 5, 613, 1
setmetatile 21, 6, 613, 1
setmetatile 21, 5, METATILE_Fallarbor_BrownRockWall, 1
setmetatile 21, 6, METATILE_Fallarbor_BrownRockWall, 1
return
UnusualWeather_EventScript_CleanupRoute115East:: @ 8273E5C
setmetatile 36, 9, 613, 1
setmetatile 36, 10, 613, 1
setmetatile 36, 9, METATILE_Fallarbor_BrownRockWall, 1
setmetatile 36, 10, METATILE_Fallarbor_BrownRockWall, 1
return
UnusualWeather_EventScript_CleanupRoute116North:: @ 8273E6F
setmetatile 59, 12, 124, 1
setmetatile 59, 13, 124, 1
setmetatile 59, 12, METATILE_General_RockWall_RockBase, 1
setmetatile 59, 13, METATILE_General_RockWall_RockBase, 1
return
UnusualWeather_EventScript_CleanupRoute116South:: @ 8273E82
setmetatile 79, 5, 124, 1
setmetatile 79, 6, 124, 1
setmetatile 79, 5, METATILE_General_RockWall_RockBase, 1
setmetatile 79, 6, METATILE_General_RockWall_RockBase, 1
return
UnusualWeather_EventScript_CleanupRoute118East:: @ 8273E95
setmetatile 42, 5, 124, 1
setmetatile 42, 6, 121, 1
setmetatile 42, 5, METATILE_General_RockWall_RockBase, 1
setmetatile 42, 6, METATILE_General_RockWall_GrassBase, 1
return
UnusualWeather_EventScript_CleanupRoute118West:: @ 8273EA8
setmetatile 9, 5, 124, 1
setmetatile 9, 6, 121, 1
setmetatile 9, 5, METATILE_General_RockWall_RockBase, 1
setmetatile 9, 6, METATILE_General_RockWall_GrassBase, 1
return
UnusualWeather_EventScript_CleanupRoute105North:: @ 8273EBB
setmetatile 10, 28, 368, 0
setmetatile 11, 28, 368, 0
setmetatile 9, 29, 368, 0
setmetatile 10, 29, 368, 0
setmetatile 11, 29, 368, 0
setmetatile 12, 29, 368, 0
setmetatile 9, 30, 368, 0
setmetatile 10, 30, 368, 0
setmetatile 11, 30, 368, 0
setmetatile 12, 30, 368, 0
setmetatile 10, 31, 368, 0
setmetatile 11, 31, 368, 0
setmetatile 10, 28, METATILE_General_CalmWater, 0
setmetatile 11, 28, METATILE_General_CalmWater, 0
setmetatile 9, 29, METATILE_General_CalmWater, 0
setmetatile 10, 29, METATILE_General_CalmWater, 0
setmetatile 11, 29, METATILE_General_CalmWater, 0
setmetatile 12, 29, METATILE_General_CalmWater, 0
setmetatile 9, 30, METATILE_General_CalmWater, 0
setmetatile 10, 30, METATILE_General_CalmWater, 0
setmetatile 11, 30, METATILE_General_CalmWater, 0
setmetatile 12, 30, METATILE_General_CalmWater, 0
setmetatile 10, 31, METATILE_General_CalmWater, 0
setmetatile 11, 31, METATILE_General_CalmWater, 0
return
UnusualWeather_EventScript_CleanupRoute105South:: @ 8273F28
setmetatile 20, 53, 368, 0
setmetatile 21, 53, 368, 0
setmetatile 19, 54, 368, 0
setmetatile 20, 54, 368, 0
setmetatile 21, 54, 368, 0
setmetatile 22, 54, 368, 0
setmetatile 19, 55, 368, 0
setmetatile 20, 55, 368, 0
setmetatile 21, 55, 368, 0
setmetatile 22, 55, 368, 0
setmetatile 20, 56, 368, 0
setmetatile 21, 56, 368, 0
setmetatile 20, 53, METATILE_General_CalmWater, 0
setmetatile 21, 53, METATILE_General_CalmWater, 0
setmetatile 19, 54, METATILE_General_CalmWater, 0
setmetatile 20, 54, METATILE_General_CalmWater, 0
setmetatile 21, 54, METATILE_General_CalmWater, 0
setmetatile 22, 54, METATILE_General_CalmWater, 0
setmetatile 19, 55, METATILE_General_CalmWater, 0
setmetatile 20, 55, METATILE_General_CalmWater, 0
setmetatile 21, 55, METATILE_General_CalmWater, 0
setmetatile 22, 55, METATILE_General_CalmWater, 0
setmetatile 20, 56, METATILE_General_CalmWater, 0
setmetatile 21, 56, METATILE_General_CalmWater, 0
return
UnusualWeather_EventScript_CleanupRoute125West:: @ 8273F95
setmetatile 8, 16, 368, 0
setmetatile 9, 16, 368, 0
setmetatile 7, 17, 368, 0
setmetatile 8, 17, 368, 0
setmetatile 9, 17, 368, 0
setmetatile 10, 17, 368, 0
setmetatile 7, 18, 368, 0
setmetatile 8, 18, 368, 0
setmetatile 9, 18, 368, 0
setmetatile 10, 18, 368, 0
setmetatile 8, 19, 368, 0
setmetatile 9, 19, 368, 0
setmetatile 8, 16, METATILE_General_CalmWater, 0
setmetatile 9, 16, METATILE_General_CalmWater, 0
setmetatile 7, 17, METATILE_General_CalmWater, 0
setmetatile 8, 17, METATILE_General_CalmWater, 0
setmetatile 9, 17, METATILE_General_CalmWater, 0
setmetatile 10, 17, METATILE_General_CalmWater, 0
setmetatile 7, 18, METATILE_General_CalmWater, 0
setmetatile 8, 18, METATILE_General_CalmWater, 0
setmetatile 9, 18, METATILE_General_CalmWater, 0
setmetatile 10, 18, METATILE_General_CalmWater, 0
setmetatile 8, 19, METATILE_General_CalmWater, 0
setmetatile 9, 19, METATILE_General_CalmWater, 0
return
UnusualWeather_EventScript_CleanupRoute125East:: @ 8274002
setmetatile 53, 18, 368, 0
setmetatile 54, 18, 368, 0
setmetatile 52, 19, 368, 0
setmetatile 53, 19, 368, 0
setmetatile 54, 19, 368, 0
setmetatile 55, 19, 368, 0
setmetatile 52, 20, 368, 0
setmetatile 53, 20, 368, 0
setmetatile 54, 20, 368, 0
setmetatile 55, 20, 368, 0
setmetatile 53, 21, 368, 0
setmetatile 54, 21, 368, 0
setmetatile 53, 18, METATILE_General_CalmWater, 0
setmetatile 54, 18, METATILE_General_CalmWater, 0
setmetatile 52, 19, METATILE_General_CalmWater, 0
setmetatile 53, 19, METATILE_General_CalmWater, 0
setmetatile 54, 19, METATILE_General_CalmWater, 0
setmetatile 55, 19, METATILE_General_CalmWater, 0
setmetatile 52, 20, METATILE_General_CalmWater, 0
setmetatile 53, 20, METATILE_General_CalmWater, 0
setmetatile 54, 20, METATILE_General_CalmWater, 0
setmetatile 55, 20, METATILE_General_CalmWater, 0
setmetatile 53, 21, METATILE_General_CalmWater, 0
setmetatile 54, 21, METATILE_General_CalmWater, 0
return
UnusualWeather_EventScript_CleanupRoute127North:: @ 827406F
setmetatile 57, 9, 368, 0
setmetatile 58, 9, 368, 0
setmetatile 56, 10, 368, 0
setmetatile 57, 10, 368, 0
setmetatile 58, 10, 368, 0
setmetatile 59, 10, 368, 0
setmetatile 56, 11, 368, 0
setmetatile 57, 11, 368, 0
setmetatile 58, 11, 368, 0
setmetatile 59, 11, 368, 0
setmetatile 57, 12, 368, 0
setmetatile 58, 12, 368, 0
setmetatile 57, 9, METATILE_General_CalmWater, 0
setmetatile 58, 9, METATILE_General_CalmWater, 0
setmetatile 56, 10, METATILE_General_CalmWater, 0
setmetatile 57, 10, METATILE_General_CalmWater, 0
setmetatile 58, 10, METATILE_General_CalmWater, 0
setmetatile 59, 10, METATILE_General_CalmWater, 0
setmetatile 56, 11, METATILE_General_CalmWater, 0
setmetatile 57, 11, METATILE_General_CalmWater, 0
setmetatile 58, 11, METATILE_General_CalmWater, 0
setmetatile 59, 11, METATILE_General_CalmWater, 0
setmetatile 57, 12, METATILE_General_CalmWater, 0
setmetatile 58, 12, METATILE_General_CalmWater, 0
return
UnusualWeather_EventScript_CleanupRoute127South:: @ 82740DC
setmetatile 61, 30, 368, 0
setmetatile 62, 30, 368, 0
setmetatile 60, 31, 368, 0
setmetatile 61, 31, 368, 0
setmetatile 62, 31, 368, 0
setmetatile 63, 31, 368, 0
setmetatile 60, 32, 368, 0
setmetatile 61, 32, 368, 0
setmetatile 62, 32, 368, 0
setmetatile 63, 32, 368, 0
setmetatile 61, 33, 368, 0
setmetatile 62, 33, 368, 0
setmetatile 61, 30, METATILE_General_CalmWater, 0
setmetatile 62, 30, METATILE_General_CalmWater, 0
setmetatile 60, 31, METATILE_General_CalmWater, 0
setmetatile 61, 31, METATILE_General_CalmWater, 0
setmetatile 62, 31, METATILE_General_CalmWater, 0
setmetatile 63, 31, METATILE_General_CalmWater, 0
setmetatile 60, 32, METATILE_General_CalmWater, 0
setmetatile 61, 32, METATILE_General_CalmWater, 0
setmetatile 62, 32, METATILE_General_CalmWater, 0
setmetatile 63, 32, METATILE_General_CalmWater, 0
setmetatile 61, 33, METATILE_General_CalmWater, 0
setmetatile 62, 33, METATILE_General_CalmWater, 0
return
UnusualWeather_EventScript_CleanupRoute129West:: @ 8274149
setmetatile 16, 14, 368, 0
setmetatile 17, 14, 368, 0
setmetatile 15, 15, 368, 0
setmetatile 16, 15, 368, 0
setmetatile 17, 15, 368, 0
setmetatile 18, 15, 368, 0
setmetatile 15, 16, 368, 0
setmetatile 16, 16, 368, 0
setmetatile 17, 16, 368, 0
setmetatile 18, 16, 368, 0
setmetatile 16, 17, 368, 0
setmetatile 17, 17, 368, 0
setmetatile 16, 14, METATILE_General_CalmWater, 0
setmetatile 17, 14, METATILE_General_CalmWater, 0
setmetatile 15, 15, METATILE_General_CalmWater, 0
setmetatile 16, 15, METATILE_General_CalmWater, 0
setmetatile 17, 15, METATILE_General_CalmWater, 0
setmetatile 18, 15, METATILE_General_CalmWater, 0
setmetatile 15, 16, METATILE_General_CalmWater, 0
setmetatile 16, 16, METATILE_General_CalmWater, 0
setmetatile 17, 16, METATILE_General_CalmWater, 0
setmetatile 18, 16, METATILE_General_CalmWater, 0
setmetatile 16, 17, METATILE_General_CalmWater, 0
setmetatile 17, 17, METATILE_General_CalmWater, 0
return
UnusualWeather_EventScript_CleanupRoute129East:: @ 82741B6
setmetatile 42, 19, 368, 0
setmetatile 43, 19, 368, 0
setmetatile 41, 20, 368, 0
setmetatile 42, 20, 368, 0
setmetatile 43, 20, 368, 0
setmetatile 44, 20, 368, 0
setmetatile 41, 21, 368, 0
setmetatile 42, 21, 368, 0
setmetatile 43, 21, 368, 0
setmetatile 44, 21, 368, 0
setmetatile 42, 22, 368, 0
setmetatile 43, 22, 368, 0
setmetatile 42, 19, METATILE_General_CalmWater, 0
setmetatile 43, 19, METATILE_General_CalmWater, 0
setmetatile 41, 20, METATILE_General_CalmWater, 0
setmetatile 42, 20, METATILE_General_CalmWater, 0
setmetatile 43, 20, METATILE_General_CalmWater, 0
setmetatile 44, 20, METATILE_General_CalmWater, 0
setmetatile 41, 21, METATILE_General_CalmWater, 0
setmetatile 42, 21, METATILE_General_CalmWater, 0
setmetatile 43, 21, METATILE_General_CalmWater, 0
setmetatile 44, 21, METATILE_General_CalmWater, 0
setmetatile 42, 22, METATILE_General_CalmWater, 0
setmetatile 43, 22, METATILE_General_CalmWater, 0
return
UnusualWeather_Underwater_SetupEscapeWarp:: @ 8274223

View File

@@ -13,11 +13,11 @@ AbandonedShip_Corridors_B1F_MapScript1_237D98: @ 8237D98
end
AbandonedShip_Corridors_B1F_EventScript_237DAB:: @ 8237DAB
setmetatile 11, 4, 563, 1
setmetatile 11, 4, METATILE_InsideShip_InTactDoor0_Bottom, 1
return
AbandonedShip_Corridors_B1F_EventScript_237DB5:: @ 8237DB5
setmetatile 11, 4, 555, 1
setmetatile 11, 4, METATILE_InsideShip_InTactDoor1_Bottom, 1
return
AbandonedShip_Corridors_B1F_EventScript_237DBF:: @ 8237DBF

View File

@@ -19,35 +19,35 @@ AbandonedShip_HiddenFloorCorridors_MapScript1_238980: @ 8238980
end
AbandonedShip_HiddenFloorCorridors_EventScript_2389C9:: @ 82389C9
setmetatile 3, 8, 555, 1
setmetatile 3, 8, METATILE_InsideShip_InTactDoor1_Bottom, 1
return
AbandonedShip_HiddenFloorCorridors_EventScript_2389D3:: @ 82389D3
setmetatile 6, 8, 555, 1
setmetatile 6, 8, METATILE_InsideShip_InTactDoor1_Bottom, 1
return
AbandonedShip_HiddenFloorCorridors_EventScript_2389DD:: @ 82389DD
setmetatile 3, 3, 538, 0
setmetatile 3, 3, METATILE_InsideShip_DoorIndent1, 0
return
AbandonedShip_HiddenFloorCorridors_EventScript_2389E7:: @ 82389E7
setmetatile 9, 3, 538, 0
setmetatile 9, 3, METATILE_InsideShip_DoorIndent1, 0
return
AbandonedShip_HiddenFloorCorridors_EventScript_2389F1:: @ 82389F1
setmetatile 3, 8, 563, 1
setmetatile 3, 8, METATILE_InsideShip_InTactDoor0_Bottom, 1
return
AbandonedShip_HiddenFloorCorridors_EventScript_2389FB:: @ 82389FB
setmetatile 6, 8, 563, 1
setmetatile 6, 8, METATILE_InsideShip_InTactDoor0_Bottom, 1
return
AbandonedShip_HiddenFloorCorridors_EventScript_238A05:: @ 8238A05
setmetatile 3, 3, 564, 0
setmetatile 3, 3, METATILE_InsideShip_DoorIndent0, 0
return
AbandonedShip_HiddenFloorCorridors_EventScript_238A0F:: @ 8238A0F
setmetatile 9, 3, 564, 0
setmetatile 9, 3, METATILE_InsideShip_DoorIndent0, 0
return
AbandonedShip_HiddenFloorCorridors_EventScript_238A19:: @ 8238A19

View File

@@ -29,12 +29,12 @@ AncientTomb_MapScript1_238FF2: @ 8238FF2
end
AncientTomb_EventScript_238FFC:: @ 8238FFC
setmetatile 7, 19, 553, 1
setmetatile 8, 19, 553, 1
setmetatile 9, 19, 553, 1
setmetatile 7, 20, 565, 1
setmetatile 8, 20, 565, 1
setmetatile 9, 20, 565, 1
setmetatile 7, 19, METATILE_Cave_EntranceCover, 1
setmetatile 8, 19, METATILE_Cave_EntranceCover, 1
setmetatile 9, 19, METATILE_Cave_EntranceCover, 1
setmetatile 7, 20, METATILE_Cave_SealedChamberBraille_Mid, 1
setmetatile 8, 20, METATILE_Cave_SealedChamberBraille_Mid, 1
setmetatile 9, 20, METATILE_Cave_SealedChamberBraille_Mid, 1
return
AncientTomb_EventScript_239033:: @ 8239033

View File

@@ -595,76 +595,76 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C52F:: @ 824C52F
return
BattleFrontier_BattleDomeBattleRoom_EventScript_24C530:: @ 824C530
createvobject 46, 1, 3, 0, 3, 1
createvobject 22, 4, 6, 0, 3, 1
createvobject 5, 6, 8, 0, 3, 1
createvobject 12, 9, 11, 0, 3, 1
createvobject 46, 11, 13, 0, 3, 1
createvobject 66, 13, 15, 0, 3, 1
createvobject 45, 19, 7, 1, 3, 1
createvobject 34, 22, 11, 1, 3, 1
createvobject 11, 25, 15, 1, 3, 1
createvobject 35, 26, 2, 2, 3, 1
createvobject 38, 29, 5, 1, 3, 1
createvobject EVENT_OBJ_GFX_SCIENTIST_1, 1, 3, 0, 3, 1
createvobject EVENT_OBJ_GFX_EXPERT_F, 4, 6, 0, 3, 1
createvobject EVENT_OBJ_GFX_NINJA_BOY, 6, 8, 0, 3, 1
createvobject EVENT_OBJ_GFX_LITTLE_GIRL, 9, 11, 0, 3, 1
createvobject EVENT_OBJ_GFX_SCIENTIST_1, 11, 13, 0, 3, 1
createvobject EVENT_OBJ_GFX_MAN_5, 13, 15, 0, 3, 1
createvobject EVENT_OBJ_GFX_BEAUTY, 19, 7, 1, 3, 1
createvobject EVENT_OBJ_GFX_WOMAN_5, 22, 11, 1, 3, 1
createvobject EVENT_OBJ_GFX_LITTLE_BOY, 25, 15, 1, 3, 1
createvobject EVENT_OBJ_GFX_YOUNGSTER, 26, 2, 2, 3, 1
createvobject EVENT_OBJ_GFX_SCHOOL_KID_M, 29, 5, 1, 3, 1
return
BattleFrontier_BattleDomeBattleRoom_EventScript_24C594:: @ 824C594
createvobject 46, 1, 3, 0, 3, 1
createvobject 22, 4, 6, 0, 3, 1
createvobject 5, 6, 8, 0, 3, 1
createvobject 20, 7, 9, 0, 3, 1
createvobject 12, 9, 11, 0, 3, 1
createvobject 47, 10, 12, 0, 3, 1
createvobject 46, 11, 13, 0, 3, 1
createvobject 66, 13, 15, 0, 3, 1
createvobject 48, 15, 2, 1, 3, 1
createvobject 5, 16, 3, 1, 3, 1
createvobject 20, 17, 4, 1, 3, 1
createvobject 45, 19, 7, 1, 3, 1
createvobject 22, 20, 9, 1, 3, 1
createvobject 34, 22, 11, 1, 3, 1
createvobject 46, 23, 13, 1, 3, 1
createvobject 11, 25, 15, 1, 3, 1
createvobject 35, 26, 2, 2, 3, 1
createvobject 40, 28, 5, 2, 3, 1
createvobject 38, 29, 5, 1, 3, 1
createvobject 83, 30, 6, 2, 3, 1
createvobject 34, 31, 8, 2, 3, 1
createvobject EVENT_OBJ_GFX_SCIENTIST_1, 1, 3, 0, 3, 1
createvobject EVENT_OBJ_GFX_EXPERT_F, 4, 6, 0, 3, 1
createvobject EVENT_OBJ_GFX_NINJA_BOY, 6, 8, 0, 3, 1
createvobject EVENT_OBJ_GFX_WOMAN_2, 7, 9, 0, 3, 1
createvobject EVENT_OBJ_GFX_LITTLE_GIRL, 9, 11, 0, 3, 1
createvobject EVENT_OBJ_GFX_LASS, 10, 12, 0, 3, 1
createvobject EVENT_OBJ_GFX_SCIENTIST_1, 11, 13, 0, 3, 1
createvobject EVENT_OBJ_GFX_MAN_5, 13, 15, 0, 3, 1
createvobject EVENT_OBJ_GFX_GENTLEMAN, 15, 2, 1, 3, 1
createvobject EVENT_OBJ_GFX_NINJA_BOY, 16, 3, 1, 3, 1
createvobject EVENT_OBJ_GFX_WOMAN_2, 17, 4, 1, 3, 1
createvobject EVENT_OBJ_GFX_BEAUTY, 19, 7, 1, 3, 1
createvobject EVENT_OBJ_GFX_EXPERT_F, 20, 9, 1, 3, 1
createvobject EVENT_OBJ_GFX_WOMAN_5, 22, 11, 1, 3, 1
createvobject EVENT_OBJ_GFX_SCIENTIST_1, 23, 13, 1, 3, 1
createvobject EVENT_OBJ_GFX_LITTLE_BOY, 25, 15, 1, 3, 1
createvobject EVENT_OBJ_GFX_YOUNGSTER, 26, 2, 2, 3, 1
createvobject EVENT_OBJ_GFX_HEX_MANIAC, 28, 5, 2, 3, 1
createvobject EVENT_OBJ_GFX_SCHOOL_KID_M, 29, 5, 1, 3, 1
createvobject EVENT_OBJ_GFX_MART_EMPLOYEE, 30, 6, 2, 3, 1
createvobject EVENT_OBJ_GFX_WOMAN_5, 31, 8, 2, 3, 1
return
BattleFrontier_BattleDomeBattleRoom_EventScript_24C652:: @ 824C652
createvobject 5, 0, 2, 0, 3, 1
createvobject 46, 1, 3, 0, 3, 1
createvobject 45, 2, 15, 0, 3, 1
createvobject 66, 3, 5, 0, 3, 1
createvobject 22, 4, 6, 0, 3, 1
createvobject 46, 5, 7, 0, 3, 1
createvobject 5, 6, 8, 0, 3, 1
createvobject 20, 7, 9, 0, 3, 1
createvobject 24, 8, 10, 0, 3, 1
createvobject 12, 9, 11, 0, 3, 1
createvobject 47, 10, 12, 0, 3, 1
createvobject 46, 11, 13, 0, 3, 1
createvobject 45, 12, 14, 0, 3, 1
createvobject 66, 13, 15, 2, 3, 1
createvobject 55, 14, 12, 2, 3, 1
createvobject 48, 15, 2, 1, 3, 1
createvobject 5, 16, 3, 1, 3, 1
createvobject 20, 17, 4, 1, 3, 1
createvobject 24, 18, 6, 1, 3, 1
createvobject 45, 19, 7, 1, 3, 1
createvobject 22, 20, 9, 1, 3, 1
createvobject 23, 21, 10, 1, 3, 1
createvobject 34, 22, 11, 1, 3, 1
createvobject 46, 23, 13, 1, 3, 1
createvobject 48, 24, 14, 1, 3, 1
createvobject 11, 25, 15, 1, 3, 1
createvobject 35, 26, 2, 2, 3, 1
createvobject 17, 27, 3, 2, 3, 1
createvobject 40, 28, 5, 2, 3, 1
createvobject 38, 29, 5, 1, 3, 1
createvobject 83, 30, 6, 2, 3, 1
createvobject 34, 31, 8, 2, 3, 1
createvobject EVENT_OBJ_GFX_NINJA_BOY, 0, 2, 0, 3, 1
createvobject EVENT_OBJ_GFX_SCIENTIST_1, 1, 3, 0, 3, 1
createvobject EVENT_OBJ_GFX_BEAUTY, 2, 15, 0, 3, 1
createvobject EVENT_OBJ_GFX_MAN_5, 3, 5, 0, 3, 1
createvobject EVENT_OBJ_GFX_EXPERT_F, 4, 6, 0, 3, 1
createvobject EVENT_OBJ_GFX_SCIENTIST_1, 5, 7, 0, 3, 1
createvobject EVENT_OBJ_GFX_NINJA_BOY, 6, 8, 0, 3, 1
createvobject EVENT_OBJ_GFX_WOMAN_2, 7, 9, 0, 3, 1
createvobject EVENT_OBJ_GFX_WOMAN_3, 8, 10, 0, 3, 1
createvobject EVENT_OBJ_GFX_LITTLE_GIRL, 9, 11, 0, 3, 1
createvobject EVENT_OBJ_GFX_LASS, 10, 12, 0, 3, 1
createvobject EVENT_OBJ_GFX_SCIENTIST_1, 11, 13, 0, 3, 1
createvobject EVENT_OBJ_GFX_BEAUTY, 12, 14, 0, 3, 1
createvobject EVENT_OBJ_GFX_MAN_5, 13, 15, 2, 3, 1
createvobject EVENT_OBJ_GFX_HIKER, 14, 12, 2, 3, 1
createvobject EVENT_OBJ_GFX_GENTLEMAN, 15, 2, 1, 3, 1
createvobject EVENT_OBJ_GFX_NINJA_BOY, 16, 3, 1, 3, 1
createvobject EVENT_OBJ_GFX_WOMAN_2, 17, 4, 1, 3, 1
createvobject EVENT_OBJ_GFX_WOMAN_3, 18, 6, 1, 3, 1
createvobject EVENT_OBJ_GFX_BEAUTY, 19, 7, 1, 3, 1
createvobject EVENT_OBJ_GFX_EXPERT_F, 20, 9, 1, 3, 1
createvobject EVENT_OBJ_GFX_MAN_2, 21, 10, 1, 3, 1
createvobject EVENT_OBJ_GFX_WOMAN_5, 22, 11, 1, 3, 1
createvobject EVENT_OBJ_GFX_SCIENTIST_1, 23, 13, 1, 3, 1
createvobject EVENT_OBJ_GFX_GENTLEMAN, 24, 14, 1, 3, 1
createvobject EVENT_OBJ_GFX_LITTLE_BOY, 25, 15, 1, 3, 1
createvobject EVENT_OBJ_GFX_YOUNGSTER, 26, 2, 2, 3, 1
createvobject EVENT_OBJ_GFX_FAT_MAN, 27, 3, 2, 3, 1
createvobject EVENT_OBJ_GFX_HEX_MANIAC, 28, 5, 2, 3, 1
createvobject EVENT_OBJ_GFX_SCHOOL_KID_M, 29, 5, 1, 3, 1
createvobject EVENT_OBJ_GFX_MART_EMPLOYEE, 30, 6, 2, 3, 1
createvobject EVENT_OBJ_GFX_WOMAN_5, 31, 8, 2, 3, 1
return
BattleFrontier_BattleArenaBattleRoom_Movement_24C773: @ 824C773

View File

@@ -645,46 +645,46 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D88D:: @ 825D88D
end
BattleFrontier_BattlePikeRandomRoom1_EventScript_25D8A4:: @ 825D8A4
setmetatile 4, 1, 554, 1
setmetatile 3, 2, 561, 1
setmetatile 4, 2, 562, 1
setmetatile 5, 2, 563, 1
setmetatile 3, 3, 569, 1
setmetatile 4, 3, 570, 0
setmetatile 5, 3, 571, 1
setmetatile 4, 1, METATILE_BattlePike_Curtain_Stage1_Tile0, 1
setmetatile 3, 2, METATILE_BattlePike_Curtain_Stage1_Tile1, 1
setmetatile 4, 2, METATILE_BattlePike_Curtain_Stage1_Tile2, 1
setmetatile 5, 2, METATILE_BattlePike_Curtain_Stage1_Tile3, 1
setmetatile 3, 3, METATILE_BattlePike_Curtain_Stage1_Tile4, 1
setmetatile 4, 3, METATILE_BattlePike_Curtain_Stage1_Tile5, 0
setmetatile 5, 3, METATILE_BattlePike_Curtain_Stage1_Tile6, 1
special DrawWholeMapView
return
BattleFrontier_BattlePikeRandomRoom1_EventScript_25D8E7:: @ 825D8E7
setmetatile 4, 1, 522, 1
setmetatile 3, 2, 529, 1
setmetatile 4, 2, 530, 1
setmetatile 5, 2, 531, 1
setmetatile 3, 3, 537, 1
setmetatile 4, 3, 538, 0
setmetatile 5, 3, 539, 1
setmetatile 4, 1, METATILE_BattlePike_Curtain_Stage2_Tile0, 1
setmetatile 3, 2, METATILE_BattlePike_Curtain_Stage2_Tile1, 1
setmetatile 4, 2, METATILE_BattlePike_Curtain_Stage2_Tile2, 1
setmetatile 5, 2, METATILE_BattlePike_Curtain_Stage2_Tile3, 1
setmetatile 3, 3, METATILE_BattlePike_Curtain_Stage2_Tile4, 1
setmetatile 4, 3, METATILE_BattlePike_Curtain_Stage2_Tile5, 0
setmetatile 5, 3, METATILE_BattlePike_Curtain_Stage2_Tile6, 1
special DrawWholeMapView
return
BattleFrontier_BattlePikeRandomRoom1_EventScript_25D92A:: @ 825D92A
setmetatile 4, 1, 683, 1
setmetatile 3, 2, 690, 1
setmetatile 4, 2, 691, 1
setmetatile 5, 2, 692, 1
setmetatile 3, 3, 698, 1
setmetatile 4, 3, 699, 0
setmetatile 5, 3, 700, 1
setmetatile 4, 1, METATILE_BattlePike_Curtain_Stage3_Tile0, 1
setmetatile 3, 2, METATILE_BattlePike_Curtain_Stage3_Tile1, 1
setmetatile 4, 2, METATILE_BattlePike_Curtain_Stage3_Tile2, 1
setmetatile 5, 2, METATILE_BattlePike_Curtain_Stage3_Tile3, 1
setmetatile 3, 3, METATILE_BattlePike_Curtain_Stage3_Tile4, 1
setmetatile 4, 3, METATILE_BattlePike_Curtain_Stage3_Tile5, 0
setmetatile 5, 3, METATILE_BattlePike_Curtain_Stage3_Tile6, 1
special DrawWholeMapView
return
BattleFrontier_BattlePikeRandomRoom1_EventScript_25D96D:: @ 825D96D
setmetatile 4, 1, 586, 1
setmetatile 3, 2, 593, 1
setmetatile 4, 2, 594, 1
setmetatile 5, 2, 595, 1
setmetatile 3, 3, 601, 1
setmetatile 4, 3, 602, 0
setmetatile 5, 3, 603, 1
setmetatile 4, 1, METATILE_BattlePike_Curtain_Stage0_Tile0, 1
setmetatile 3, 2, METATILE_BattlePike_Curtain_Stage0_Tile1, 1
setmetatile 4, 2, METATILE_BattlePike_Curtain_Stage0_Tile2, 1
setmetatile 5, 2, METATILE_BattlePike_Curtain_Stage0_Tile3, 1
setmetatile 3, 3, METATILE_BattlePike_Curtain_Stage0_Tile4, 1
setmetatile 4, 3, METATILE_BattlePike_Curtain_Stage0_Tile5, 0
setmetatile 5, 3, METATILE_BattlePike_Curtain_Stage0_Tile6, 1
special DrawWholeMapView
return

View File

@@ -6,13 +6,13 @@ BattleFrontier_BattleTowerCorridor_MapScripts:: @ 8241AAA
BattleFrontier_BattleTowerCorridor_MapScript1_241AB5: @ 8241AB5
compare VAR_0x8006, 1
goto_if_eq BattleFrontier_BattleTowerCorridor_EventScript_241AD3
setmetatile 12, 0, 519, 0
setmetatile 12, 1, 527, 0
setmetatile 12, 0, METATILE_BattleFrontier_CorridorOpenDoor_Top, 0
setmetatile 12, 1, METATILE_BattleFrontier_CorridorOpenDoor_Bottom, 0
end
BattleFrontier_BattleTowerCorridor_EventScript_241AD3:: @ 8241AD3
setmetatile 15, 0, 519, 0
setmetatile 15, 1, 527, 0
setmetatile 15, 0, METATILE_BattleFrontier_CorridorOpenDoor_Top, 0
setmetatile 15, 1, METATILE_BattleFrontier_CorridorOpenDoor_Bottom, 0
end
BattleFrontier_BattleTowerCorridor_MapScript2_241AE6: @ 8241AE6

View File

@@ -20,12 +20,12 @@ DesertRuins_MapScript1_22D989: @ 822D989
end
DesertRuins_EventScript_22D993:: @ 822D993
setmetatile 7, 19, 553, 1
setmetatile 8, 19, 553, 1
setmetatile 9, 19, 553, 1
setmetatile 7, 20, 565, 1
setmetatile 8, 20, 565, 1
setmetatile 9, 20, 565, 1
setmetatile 7, 19, METATILE_Cave_EntranceCover, 1
setmetatile 8, 19, METATILE_Cave_EntranceCover, 1
setmetatile 9, 19, METATILE_Cave_EntranceCover, 1
setmetatile 7, 20, METATILE_Cave_SealedChamberBraille_Mid, 1
setmetatile 8, 20, METATILE_Cave_SealedChamberBraille_Mid, 1
setmetatile 9, 20, METATILE_Cave_SealedChamberBraille_Mid, 1
return
DesertRuins_OnTransition: @ 822D9CA

View File

@@ -46,8 +46,8 @@ EverGrandeCity_ChampionsRoom_EventScript_228A45:: @ 8228A45
EverGrandeCity_ChampionsRoom_EventScript_228A61:: @ 8228A61
playse SE_DOOR
setmetatile 6, 1, 838, 0
setmetatile 6, 2, 839, 0
setmetatile 6, 1, METATILE_EliteFour_OpenDoorChampion_Frame, 0
setmetatile 6, 2, METATILE_EliteFour_OpenDoorChampion_Opening, 0
special DrawWholeMapView
msgbox EverGrandeCity_ChampionsRoom_Text_228F66, MSGBOX_DEFAULT
closemessage

View File

@@ -4,9 +4,9 @@ InsideOfTruck_MapScripts:: @ 823BEDA
.byte 0
InsideOfTruck_MapScript1_23BEE5: @ 823BEE5
setmetatile 4, 1, 520, 0
setmetatile 4, 2, 528, 0
setmetatile 4, 3, 536, 0
setmetatile 4, 1, METATILE_InsideOfTruck_ExitLight_Top, 0
setmetatile 4, 2, METATILE_InsideOfTruck_ExitLight_Mid, 0
setmetatile 4, 3, METATILE_InsideOfTruck_ExitLight_Bottom, 0
end
InsideOfTruck_MapScript1_23BF01: @ 823BF01

View File

@@ -20,12 +20,12 @@ IslandCave_MapScript1_238E58: @ 8238E58
end
IslandCave_EventScript_238E62:: @ 8238E62
setmetatile 7, 19, 553, 1
setmetatile 8, 19, 553, 1
setmetatile 9, 19, 553, 1
setmetatile 7, 20, 565, 1
setmetatile 8, 20, 565, 1
setmetatile 9, 20, 565, 1
setmetatile 7, 19, METATILE_Cave_EntranceCover, 1
setmetatile 8, 19, METATILE_Cave_EntranceCover, 1
setmetatile 9, 19, METATILE_Cave_EntranceCover, 1
setmetatile 7, 20, METATILE_Cave_SealedChamberBraille_Mid, 1
setmetatile 8, 20, METATILE_Cave_SealedChamberBraille_Mid, 1
setmetatile 9, 20, METATILE_Cave_SealedChamberBraille_Mid, 1
return
IslandCave_OnTransition: @ 8238E99
@@ -39,12 +39,12 @@ IslandCave_EventScript_238EAB:: @ 8238EAB
return
IslandCave_EventScript_238EAF:: @ 8238EAF
setmetatile 7, 19, 554, 1
setmetatile 8, 19, 555, 1
setmetatile 9, 19, 556, 1
setmetatile 7, 20, 562, 1
setmetatile 8, 20, 563, 0
setmetatile 9, 20, 564, 1
setmetatile 7, 19, METATILE_Cave_SealedChamberEntrance_TopLeft, 1
setmetatile 8, 19, METATILE_Cave_SealedChamberEntrance_TopMid, 1
setmetatile 9, 19, METATILE_Cave_SealedChamberEntrance_TopRight, 1
setmetatile 7, 20, METATILE_Cave_SealedChamberEntrance_BottomLeft, 1
setmetatile 8, 20, METATILE_Cave_SealedChamberEntrance_BottomMid, 0
setmetatile 9, 20, METATILE_Cave_SealedChamberEntrance_BottomRight, 1
special DrawWholeMapView
playse SE_BAN
setflag FLAG_SYS_BRAILLE_REGICE_COMPLETED

View File

@@ -36,8 +36,8 @@ JaggedPass_MapScript1_23069C: @ 823069C
end
JaggedPass_EventScript_2306A8:: @ 82306A8
setmetatile 16, 17, 628, 1
setmetatile 16, 18, 628, 1
setmetatile 16, 17, METATILE_Lavaridge_RockWall, 1
setmetatile 16, 18, METATILE_Lavaridge_RockWall, 1
end
JaggedPass_EventScript_2306BB:: @ 82306BB
@@ -57,8 +57,8 @@ JaggedPass_EventScript_2306BB:: @ 82306BB
special sub_8139560
waitstate
playse SE_KOUKA_M
setmetatile 16, 17, 598, 1
setmetatile 16, 18, 606, 0
setmetatile 16, 17, METATILE_Lavaridge_CaveEntrance_Top, 1
setmetatile 16, 18, METATILE_Lavaridge_CaveEntrance_Bottom, 0
special DrawWholeMapView
delay 30
setvar VAR_JAGGED_PASS_STATE, 2

View File

@@ -16,18 +16,18 @@ LilycoveCity_MapScript1_1E2B61: @ 81E2B61
end
LilycoveCity_EventScript_1E2B6B:: @ 81E2B6B
setmetatile 76, 12, 656, 1
setmetatile 77, 12, 657, 1
setmetatile 76, 13, 672, 1
setmetatile 77, 13, 673, 1
setmetatile 76, 14, 664, 1
setmetatile 77, 14, 665, 1
setmetatile 76, 15, 672, 1
setmetatile 77, 15, 673, 1
setmetatile 77, 16, 664, 1
setmetatile 78, 16, 665, 1
setmetatile 77, 17, 672, 1
setmetatile 78, 17, 673, 1
setmetatile 76, 12, METATILE_Lilycove_Wailmer0, 1
setmetatile 77, 12, METATILE_Lilycove_Wailmer1, 1
setmetatile 76, 13, METATILE_Lilycove_Wailmer2, 1
setmetatile 77, 13, METATILE_Lilycove_Wailmer3, 1
setmetatile 76, 14, METATILE_Lilycove_Wailmer0_Alt, 1
setmetatile 77, 14, METATILE_Lilycove_Wailmer1_Alt, 1
setmetatile 76, 15, METATILE_Lilycove_Wailmer2, 1
setmetatile 77, 15, METATILE_Lilycove_Wailmer3, 1
setmetatile 77, 16, METATILE_Lilycove_Wailmer0_Alt, 1
setmetatile 78, 16, METATILE_Lilycove_Wailmer1_Alt, 1
setmetatile 77, 17, METATILE_Lilycove_Wailmer2, 1
setmetatile 78, 17, METATILE_Lilycove_Wailmer3, 1
return
LilycoveCity_EventScript_1E2BD8:: @ 81E2BD8

View File

@@ -408,14 +408,14 @@ LilycoveCity_ContestLobby_EventScript_21A670:: @ 821A670
applymovement 1, LilycoveCity_ContestLobby_Movement_21A6F5
waitmovement 0
playse SE_HASHI
setmetatile 12, 2, 545, 1
setmetatile 12, 3, 609, 1
setmetatile 12, 2, METATILE_Contest_WallShadow, 1
setmetatile 12, 3, METATILE_Contest_FloorShadow, 1
special DrawWholeMapView
applymovement 1, LilycoveCity_ContestLobby_Movement_21A6F9
waitmovement 0
playse SE_HASHI
setmetatile 12, 2, 721, 1
setmetatile 12, 3, 729, 1
setmetatile 12, 2, METATILE_Contest_CounterFlap_Top, 1
setmetatile 12, 3, METATILE_Contest_CounterFlap_Bottom, 1
special DrawWholeMapView
delay 20
applymovement 1, LilycoveCity_ContestLobby_Movement_21A706
@@ -931,14 +931,14 @@ LilycoveCity_ContestLobby_EventScript_21AC49:: @ 821AC49
applymovement 2, LilycoveCity_ContestLobby_Movement_21ACDD
waitmovement 0
playse SE_HASHI
setmetatile 17, 2, 545, 1
setmetatile 17, 3, 609, 1
setmetatile 17, 2, METATILE_Contest_WallShadow, 1
setmetatile 17, 3, METATILE_Contest_FloorShadow, 1
special DrawWholeMapView
applymovement 2, LilycoveCity_ContestLobby_Movement_21ACE1
waitmovement 0
playse SE_HASHI
setmetatile 17, 2, 721, 1
setmetatile 17, 3, 729, 1
setmetatile 17, 2, METATILE_Contest_CounterFlap_Top, 1
setmetatile 17, 3, METATILE_Contest_CounterFlap_Bottom, 1
special DrawWholeMapView
delay 20
applymovement 2, LilycoveCity_ContestLobby_Movement_21ACEF

View File

@@ -28,32 +28,32 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_219781:: @ 8219781
end
LilycoveCity_LilycoveMuseum_2F_EventScript_21978B:: @ 821978B
setmetatile 10, 6, 606, 1
setmetatile 11, 6, 607, 1
setmetatile 10, 6, METATILE_LilycoveMuseum_Painting2_Left, 1
setmetatile 11, 6, METATILE_LilycoveMuseum_Painting2_Right, 1
goto LilycoveCity_LilycoveMuseum_2F_EventScript_219754
end
LilycoveCity_LilycoveMuseum_2F_EventScript_2197A3:: @ 82197A3
setmetatile 18, 6, 604, 1
setmetatile 19, 6, 605, 1
setmetatile 18, 6, METATILE_LilycoveMuseum_Painting1_Left, 1
setmetatile 19, 6, METATILE_LilycoveMuseum_Painting1_Right, 1
goto LilycoveCity_LilycoveMuseum_2F_EventScript_219763
end
LilycoveCity_LilycoveMuseum_2F_EventScript_2197BB:: @ 82197BB
setmetatile 14, 10, 608, 1
setmetatile 15, 10, 609, 1
setmetatile 14, 10, METATILE_LilycoveMuseum_Painting3_Left, 1
setmetatile 15, 10, METATILE_LilycoveMuseum_Painting3_Right, 1
goto LilycoveCity_LilycoveMuseum_2F_EventScript_219772
end
LilycoveCity_LilycoveMuseum_2F_EventScript_2197D3:: @ 82197D3
setmetatile 6, 10, 602, 1
setmetatile 7, 10, 603, 1
setmetatile 6, 10, METATILE_LilycoveMuseum_Painting0_Left, 1
setmetatile 7, 10, METATILE_LilycoveMuseum_Painting0_Right, 1
goto LilycoveCity_LilycoveMuseum_2F_EventScript_219781
end
LilycoveCity_LilycoveMuseum_2F_EventScript_2197EB:: @ 82197EB
setmetatile 2, 6, 610, 1
setmetatile 3, 6, 611, 1
setmetatile 2, 6, METATILE_LilycoveMuseum_Painting4_Left, 1
setmetatile 3, 6, METATILE_LilycoveMuseum_Painting4_Right, 1
end
LilycoveCity_LilycoveMuseum_2F_MapScript2_2197FE: @ 82197FE

View File

@@ -312,97 +312,97 @@ LinkContestRoom1_EventScript_23BB2B:: @ 823BB2B
return
LinkContestRoom1_EventScript_23BB78:: @ 823BB78
createvobject 5, 20, 3, 2, 3, 1
createvobject 46, 24, 11, 2, 3, 1
createvobject EVENT_OBJ_GFX_NINJA_BOY, 20, 3, 2, 3, 1
createvobject EVENT_OBJ_GFX_SCIENTIST_1, 24, 11, 2, 3, 1
return
LinkContestRoom1_EventScript_23BB8B:: @ 823BB8B
createvobject 45, 0, 2, 3, 3, 4
createvobject 66, 1, 2, 4, 3, 4
createvobject 55, 2, 2, 7, 3, 4
createvobject 46, 3, 2, 8, 3, 4
createvobject 5, 10, 12, 3, 3, 3
createvobject 20, 11, 12, 4, 3, 3
createvobject 24, 12, 12, 7, 3, 3
createvobject 12, 13, 12, 8, 3, 3
createvobject 47, 20, 3, 2, 3, 1
createvobject 46, 24, 11, 2, 3, 1
createvobject EVENT_OBJ_GFX_BEAUTY, 0, 2, 3, 3, 4
createvobject EVENT_OBJ_GFX_MAN_5, 1, 2, 4, 3, 4
createvobject EVENT_OBJ_GFX_HIKER, 2, 2, 7, 3, 4
createvobject EVENT_OBJ_GFX_SCIENTIST_1, 3, 2, 8, 3, 4
createvobject EVENT_OBJ_GFX_NINJA_BOY, 10, 12, 3, 3, 3
createvobject EVENT_OBJ_GFX_WOMAN_2, 11, 12, 4, 3, 3
createvobject EVENT_OBJ_GFX_WOMAN_3, 12, 12, 7, 3, 3
createvobject EVENT_OBJ_GFX_LITTLE_GIRL, 13, 12, 8, 3, 3
createvobject EVENT_OBJ_GFX_LASS, 20, 3, 2, 3, 1
createvobject EVENT_OBJ_GFX_SCIENTIST_1, 24, 11, 2, 3, 1
return
LinkContestRoom1_EventScript_23BBE6:: @ 823BBE6
createvobject 45, 0, 2, 3, 3, 4
createvobject 66, 1, 2, 4, 3, 4
createvobject 55, 2, 2, 7, 3, 4
createvobject 48, 3, 2, 8, 3, 4
createvobject 5, 10, 12, 3, 3, 3
createvobject 20, 11, 12, 4, 3, 3
createvobject 24, 12, 12, 7, 3, 3
createvobject 45, 13, 12, 8, 3, 3
createvobject 22, 20, 3, 2, 3, 1
createvobject 23, 20, 6, 2, 3, 1
createvobject 34, 20, 7, 2, 3, 1
createvobject 46, 24, 8, 2, 3, 1
createvobject 48, 24, 11, 2, 3, 1
createvobject 11, 25, 3, 9, 3, 2
createvobject 35, 26, 4, 9, 3, 2
createvobject 17, 27, 5, 9, 3, 2
createvobject 40, 28, 9, 9, 3, 2
createvobject 38, 29, 10, 9, 3, 2
createvobject 83, 30, 11, 9, 3, 2
createvobject EVENT_OBJ_GFX_BEAUTY, 0, 2, 3, 3, 4
createvobject EVENT_OBJ_GFX_MAN_5, 1, 2, 4, 3, 4
createvobject EVENT_OBJ_GFX_HIKER, 2, 2, 7, 3, 4
createvobject EVENT_OBJ_GFX_GENTLEMAN, 3, 2, 8, 3, 4
createvobject EVENT_OBJ_GFX_NINJA_BOY, 10, 12, 3, 3, 3
createvobject EVENT_OBJ_GFX_WOMAN_2, 11, 12, 4, 3, 3
createvobject EVENT_OBJ_GFX_WOMAN_3, 12, 12, 7, 3, 3
createvobject EVENT_OBJ_GFX_BEAUTY, 13, 12, 8, 3, 3
createvobject EVENT_OBJ_GFX_EXPERT_F, 20, 3, 2, 3, 1
createvobject EVENT_OBJ_GFX_MAN_2, 20, 6, 2, 3, 1
createvobject EVENT_OBJ_GFX_WOMAN_5, 20, 7, 2, 3, 1
createvobject EVENT_OBJ_GFX_SCIENTIST_1, 24, 8, 2, 3, 1
createvobject EVENT_OBJ_GFX_GENTLEMAN, 24, 11, 2, 3, 1
createvobject EVENT_OBJ_GFX_LITTLE_BOY, 25, 3, 9, 3, 2
createvobject EVENT_OBJ_GFX_YOUNGSTER, 26, 4, 9, 3, 2
createvobject EVENT_OBJ_GFX_FAT_MAN, 27, 5, 9, 3, 2
createvobject EVENT_OBJ_GFX_HEX_MANIAC, 28, 9, 9, 3, 2
createvobject EVENT_OBJ_GFX_SCHOOL_KID_M, 29, 10, 9, 3, 2
createvobject EVENT_OBJ_GFX_MART_EMPLOYEE, 30, 11, 9, 3, 2
return
LinkContestRoom1_EventScript_23BC92:: @ 823BC92
createvobject 45, 0, 2, 3, 3, 4
createvobject 66, 1, 2, 4, 3, 4
createvobject 55, 2, 2, 7, 3, 4
createvobject 12, 3, 2, 8, 3, 4
createvobject 39, 4, 1, 3, 3, 4
createvobject 34, 6, 1, 5, 3, 4
createvobject 26, 7, 1, 6, 3, 4
createvobject 48, 9, 1, 8, 3, 4
createvobject 5, 10, 12, 3, 3, 3
createvobject 20, 11, 12, 4, 3, 3
createvobject 24, 12, 12, 7, 3, 3
createvobject 45, 13, 12, 8, 3, 3
createvobject 50, 14, 13, 3, 3, 3
createvobject 52, 15, 13, 4, 3, 3
createvobject 65, 17, 13, 6, 3, 3
createvobject 83, 18, 13, 7, 3, 3
createvobject 116, 19, 13, 8, 3, 3
createvobject 25, 20, 3, 2, 3, 1
createvobject 31, 21, 6, 2, 3, 1
createvobject 33, 22, 7, 2, 3, 1
createvobject 46, 24, 11, 2, 3, 1
createvobject 49, 25, 3, 9, 3, 2
createvobject 35, 26, 4, 9, 3, 2
createvobject 48, 27, 5, 9, 3, 2
createvobject 40, 28, 9, 9, 3, 2
createvobject 38, 29, 10, 9, 3, 2
createvobject 83, 30, 11, 9, 3, 2
createvobject EVENT_OBJ_GFX_BEAUTY, 0, 2, 3, 3, 4
createvobject EVENT_OBJ_GFX_MAN_5, 1, 2, 4, 3, 4
createvobject EVENT_OBJ_GFX_HIKER, 2, 2, 7, 3, 4
createvobject EVENT_OBJ_GFX_LITTLE_GIRL, 3, 2, 8, 3, 4
createvobject EVENT_OBJ_GFX_MANIAC, 4, 1, 3, 3, 4
createvobject EVENT_OBJ_GFX_WOMAN_5, 6, 1, 5, 3, 4
createvobject EVENT_OBJ_GFX_WOMAN_4, 7, 1, 6, 3, 4
createvobject EVENT_OBJ_GFX_GENTLEMAN, 9, 1, 8, 3, 4
createvobject EVENT_OBJ_GFX_NINJA_BOY, 10, 12, 3, 3, 3
createvobject EVENT_OBJ_GFX_WOMAN_2, 11, 12, 4, 3, 3
createvobject EVENT_OBJ_GFX_WOMAN_3, 12, 12, 7, 3, 3
createvobject EVENT_OBJ_GFX_BEAUTY, 13, 12, 8, 3, 3
createvobject EVENT_OBJ_GFX_FISHERMAN, 14, 13, 3, 3, 3
createvobject EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F, 15, 13, 4, 3, 3
createvobject EVENT_OBJ_GFX_MAN_4, 17, 13, 6, 3, 3
createvobject EVENT_OBJ_GFX_MART_EMPLOYEE, 18, 13, 7, 3, 3
createvobject EVENT_OBJ_GFX_DEVON_EMPLOYEE, 19, 13, 8, 3, 3
createvobject EVENT_OBJ_GFX_POKEFAN_M, 20, 3, 2, 3, 1
createvobject EVENT_OBJ_GFX_CAMPER, 21, 6, 2, 3, 1
createvobject EVENT_OBJ_GFX_MAN_3, 22, 7, 2, 3, 1
createvobject EVENT_OBJ_GFX_SCIENTIST_1, 24, 11, 2, 3, 1
createvobject EVENT_OBJ_GFX_SAILOR, 25, 3, 9, 3, 2
createvobject EVENT_OBJ_GFX_YOUNGSTER, 26, 4, 9, 3, 2
createvobject EVENT_OBJ_GFX_GENTLEMAN, 27, 5, 9, 3, 2
createvobject EVENT_OBJ_GFX_HEX_MANIAC, 28, 9, 9, 3, 2
createvobject EVENT_OBJ_GFX_SCHOOL_KID_M, 29, 10, 9, 3, 2
createvobject EVENT_OBJ_GFX_MART_EMPLOYEE, 30, 11, 9, 3, 2
return
LinkContestRoom1_EventScript_23BD86:: @ 823BD86
createvobject 45, 0, 2, 3, 3, 4
createvobject 66, 1, 2, 4, 3, 4
createvobject 55, 2, 2, 7, 3, 4
createvobject 12, 3, 2, 8, 3, 4
createvobject 39, 4, 1, 3, 3, 4
createvobject 34, 6, 1, 5, 3, 4
createvobject 26, 7, 1, 6, 3, 4
createvobject 48, 9, 1, 8, 3, 4
createvobject 5, 10, 12, 3, 3, 3
createvobject 20, 11, 12, 4, 3, 3
createvobject 24, 12, 12, 7, 3, 3
createvobject 45, 13, 12, 8, 3, 3
createvobject 50, 14, 13, 3, 3, 3
createvobject 52, 15, 13, 4, 3, 3
createvobject 65, 17, 13, 6, 3, 3
createvobject 83, 18, 13, 7, 3, 3
createvobject 116, 19, 13, 8, 3, 3
createvobject 25, 20, 3, 2, 3, 1
createvobject 31, 21, 6, 2, 3, 1
createvobject 33, 22, 7, 2, 3, 1
createvobject 46, 24, 11, 2, 3, 1
createvobject EVENT_OBJ_GFX_BEAUTY, 0, 2, 3, 3, 4
createvobject EVENT_OBJ_GFX_MAN_5, 1, 2, 4, 3, 4
createvobject EVENT_OBJ_GFX_HIKER, 2, 2, 7, 3, 4
createvobject EVENT_OBJ_GFX_LITTLE_GIRL, 3, 2, 8, 3, 4
createvobject EVENT_OBJ_GFX_MANIAC, 4, 1, 3, 3, 4
createvobject EVENT_OBJ_GFX_WOMAN_5, 6, 1, 5, 3, 4
createvobject EVENT_OBJ_GFX_WOMAN_4, 7, 1, 6, 3, 4
createvobject EVENT_OBJ_GFX_GENTLEMAN, 9, 1, 8, 3, 4
createvobject EVENT_OBJ_GFX_NINJA_BOY, 10, 12, 3, 3, 3
createvobject EVENT_OBJ_GFX_WOMAN_2, 11, 12, 4, 3, 3
createvobject EVENT_OBJ_GFX_WOMAN_3, 12, 12, 7, 3, 3
createvobject EVENT_OBJ_GFX_BEAUTY, 13, 12, 8, 3, 3
createvobject EVENT_OBJ_GFX_FISHERMAN, 14, 13, 3, 3, 3
createvobject EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F, 15, 13, 4, 3, 3
createvobject EVENT_OBJ_GFX_MAN_4, 17, 13, 6, 3, 3
createvobject EVENT_OBJ_GFX_MART_EMPLOYEE, 18, 13, 7, 3, 3
createvobject EVENT_OBJ_GFX_DEVON_EMPLOYEE, 19, 13, 8, 3, 3
createvobject EVENT_OBJ_GFX_POKEFAN_M, 20, 3, 2, 3, 1
createvobject EVENT_OBJ_GFX_CAMPER, 21, 6, 2, 3, 1
createvobject EVENT_OBJ_GFX_MAN_3, 22, 7, 2, 3, 1
createvobject EVENT_OBJ_GFX_SCIENTIST_1, 24, 11, 2, 3, 1
return
LinkContestRoom1_EventScript_23BE44:: @ 823BE44

View File

@@ -11,8 +11,8 @@ LittlerootTown_BrendansHouse_1F_MapScript1_1F7765: @ 81F7765
end
LittlerootTown_BrendansHouse_1F_EventScript_1F777A:: @ 81F777A
setmetatile 5, 4, 624, 1
setmetatile 5, 2, 616, 1
setmetatile 5, 4, METATILE_BrendansMaysHouse_MovingBox_Open, 1
setmetatile 5, 2, METATILE_BrendansMaysHouse_MovingBox_Closed, 1
return
LittlerootTown_BrendansHouse_1F_EventScript_1F778D:: @ 81F778D
@@ -22,7 +22,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_1F778D:: @ 81F778D
return
LittlerootTown_BrendansHouse_1F_EventScript_1F779A:: @ 81F779A
setmetatile 3, 7, 659, 1
setmetatile 3, 7, METATILE_BrendansMaysHouse_BookOnTable, 1
return
LittlerootTown_BrendansHouse_1F_MapScript1_1F77A4: @ 81F77A4

View File

@@ -11,8 +11,8 @@ LittlerootTown_MaysHouse_1F_MapScript1_1F88B5: @ 81F88B5
end
LittlerootTown_MaysHouse_1F_EventScript_1F88CA:: @ 81F88CA
setmetatile 5, 4, 624, 1
setmetatile 5, 2, 616, 1
setmetatile 5, 4, METATILE_BrendansMaysHouse_MovingBox_Open, 1
setmetatile 5, 2, METATILE_BrendansMaysHouse_MovingBox_Closed, 1
return
LittlerootTown_MaysHouse_1F_EventScript_1F88DD:: @ 81F88DD
@@ -22,7 +22,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1F88DD:: @ 81F88DD
return
LittlerootTown_MaysHouse_1F_EventScript_1F88EA:: @ 81F88EA
setmetatile 6, 7, 659, 1
setmetatile 6, 7, METATILE_BrendansMaysHouse_BookOnTable, 1
return
LittlerootTown_MaysHouse_1F_MapScript1_1F88F4: @ 81F88F4

View File

@@ -334,7 +334,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA061:: @ 81FA061
LittlerootTown_ProfessorBirchsLab_EventScript_1FA06C:: @ 81FA06C
bufferspeciesname 0, SPECIES_CYNDAQUIL
setvar VAR_TEMP_1, 155
setvar VAR_TEMP_1, SPECIES_CYNDAQUIL
givemon SPECIES_CYNDAQUIL, 5, ITEM_NONE, 0x0, 0x0, 0
compare VAR_RESULT, 0
goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA0A1
@@ -379,7 +379,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA0FD:: @ 81FA0FD
LittlerootTown_ProfessorBirchsLab_EventScript_1FA10D:: @ 81FA10D
bufferspeciesname 0, SPECIES_TOTODILE
setvar VAR_TEMP_1, 158
setvar VAR_TEMP_1, SPECIES_TOTODILE
givemon SPECIES_TOTODILE, 5, ITEM_NONE, 0x0, 0x0, 0
compare VAR_RESULT, 0
goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA142
@@ -424,7 +424,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA19E:: @ 81FA19E
LittlerootTown_ProfessorBirchsLab_EventScript_1FA1AE:: @ 81FA1AE
bufferspeciesname 0, SPECIES_CHIKORITA
setvar VAR_TEMP_1, 152
setvar VAR_TEMP_1, SPECIES_CHIKORITA
givemon SPECIES_CHIKORITA, 5, ITEM_NONE, 0x0, 0x0, 0
compare VAR_RESULT, 0
goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA1E3

View File

@@ -17,32 +17,32 @@ MauvilleCity_Gym_EventScript_20DDBA:: @ 820DDBA
end
MauvilleCity_Gym_EventScript_20DDC4:: @ 820DDC4
setmetatile 3, 11, 577, 1
setmetatile 3, 12, 585, 1
setmetatile 3, 13, 592, 1
setmetatile 4, 10, 546, 0
setmetatile 5, 10, 547, 0
setmetatile 4, 11, 554, 1
setmetatile 5, 11, 555, 1
setmetatile 7, 10, 546, 0
setmetatile 8, 10, 547, 0
setmetatile 7, 11, 554, 1
setmetatile 8, 11, 555, 1
setmetatile 4, 13, 560, 0
setmetatile 5, 13, 561, 0
setmetatile 4, 14, 568, 0
setmetatile 5, 14, 569, 0
setmetatile 1, 10, 560, 0
setmetatile 2, 10, 561, 0
setmetatile 1, 11, 568, 0
setmetatile 2, 11, 569, 0
setmetatile 6, 8, 578, 1
setmetatile 6, 9, 538, 0
setmetatile 6, 10, 593, 0
setmetatile 4, 6, 560, 0
setmetatile 5, 6, 561, 0
setmetatile 4, 7, 568, 0
setmetatile 5, 7, 569, 0
setmetatile 3, 11, METATILE_MauvilleGym_RedBeamV1_On, 1
setmetatile 3, 12, METATILE_MauvilleGym_RedBeamV2_On, 1
setmetatile 3, 13, METATILE_MauvilleGym_PoleTop_On, 1
setmetatile 4, 10, METATILE_MauvilleGym_RedBeamH1_On, 0
setmetatile 5, 10, METATILE_MauvilleGym_RedBeamH2_On, 0
setmetatile 4, 11, METATILE_MauvilleGym_RedBeamH3_On, 1
setmetatile 5, 11, METATILE_MauvilleGym_RedBeamH4_On, 1
setmetatile 7, 10, METATILE_MauvilleGym_RedBeamH1_On, 0
setmetatile 8, 10, METATILE_MauvilleGym_RedBeamH2_On, 0
setmetatile 7, 11, METATILE_MauvilleGym_RedBeamH3_On, 1
setmetatile 8, 11, METATILE_MauvilleGym_RedBeamH4_On, 1
setmetatile 4, 13, METATILE_MauvilleGym_GreenBeamH1_Off, 0
setmetatile 5, 13, METATILE_MauvilleGym_GreenBeamH2_Off, 0
setmetatile 4, 14, METATILE_MauvilleGym_GreenBeamH3_Off, 0
setmetatile 5, 14, METATILE_MauvilleGym_GreenBeamH4_Off, 0
setmetatile 1, 10, METATILE_MauvilleGym_GreenBeamH1_Off, 0
setmetatile 2, 10, METATILE_MauvilleGym_GreenBeamH2_Off, 0
setmetatile 1, 11, METATILE_MauvilleGym_GreenBeamH3_Off, 0
setmetatile 2, 11, METATILE_MauvilleGym_GreenBeamH4_Off, 0
setmetatile 6, 8, METATILE_MauvilleGym_PoleBottom_On, 1
setmetatile 6, 9, METATILE_MauvilleGym_FloorTile, 0
setmetatile 6, 10, METATILE_MauvilleGym_PoleTop_Off, 0
setmetatile 4, 6, METATILE_MauvilleGym_GreenBeamH1_Off, 0
setmetatile 5, 6, METATILE_MauvilleGym_GreenBeamH2_Off, 0
setmetatile 4, 7, METATILE_MauvilleGym_GreenBeamH3_Off, 0
setmetatile 5, 7, METATILE_MauvilleGym_GreenBeamH4_Off, 0
end
MauvilleCity_Gym_EventScript_20DEAF:: @ 820DEAF

View File

@@ -7,10 +7,10 @@ MeteorFalls_1F_1R_MapScript1_22BD30: @ 822BD30
end
MeteorFalls_1F_1R_EventScript_22BD3A:: @ 822BD3A
setmetatile 4, 1, 582, 1
setmetatile 3, 2, 589, 1
setmetatile 4, 2, 590, 0
setmetatile 5, 2, 591, 1
setmetatile 4, 1, METATILE_MeteorFalls_CaveEntrance_Top, 1
setmetatile 3, 2, METATILE_MeteorFalls_CaveEntrance_Left, 1
setmetatile 4, 2, METATILE_MeteorFalls_CaveEntrance_Bottom, 0
setmetatile 5, 2, METATILE_MeteorFalls_CaveEntrance_Right, 1
return
MeteorFalls_1F_1R_EventScript_22BD5F:: @ 822BD5F

View File

@@ -22,26 +22,26 @@ MossdeepCity_Gym_EventScript_220833:: @ 8220833
end
MossdeepCity_Gym_EventScript_22083D:: @ 822083D
setmetatile 5, 5, 516, 0
setmetatile 2, 7, 569, 1
setmetatile 5, 5, METATILE_MossdeepGym_Obelisk_Top, 0
setmetatile 2, 7, METATILE_MossdeepGym_Empty1, 1
goto MossdeepCity_Gym_EventScript_220815
end
MossdeepCity_Gym_EventScript_220855:: @ 8220855
setmetatile 8, 14, 516, 0
setmetatile 8, 10, 569, 1
setmetatile 8, 14, METATILE_MossdeepGym_Obelisk_Top, 0
setmetatile 8, 10, METATILE_MossdeepGym_Empty1, 1
goto MossdeepCity_Gym_EventScript_220824
end
MossdeepCity_Gym_EventScript_22086D:: @ 822086D
setmetatile 15, 17, 524, 0
setmetatile 17, 15, 569, 1
setmetatile 15, 17, METATILE_MossdeepGym_Obelisk_Base, 0
setmetatile 17, 15, METATILE_MossdeepGym_Empty1, 1
goto MossdeepCity_Gym_EventScript_220833
end
MossdeepCity_Gym_EventScript_220885:: @ 8220885
setmetatile 1, 23, 525, 0
setmetatile 5, 24, 569, 1
setmetatile 1, 23, METATILE_MossdeepGym_Wall_LeftCorner, 0
setmetatile 5, 24, METATILE_MossdeepGym_Empty1, 1
end
MossdeepCity_Gym_EventScript_220898:: @ 8220898
@@ -114,8 +114,8 @@ MossdeepCity_Gym_EventScript_220999:: @ 8220999
setflag FLAG_MOSSDEEP_GYM_SWITCH_1
applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_Gym_Movement_220C30
waitmovement 0
setmetatile 5, 5, 516, 0
setmetatile 2, 7, 569, 1
setmetatile 5, 5, METATILE_MossdeepGym_Obelisk_Top, 0
setmetatile 2, 7, METATILE_MossdeepGym_Empty1, 1
goto MossdeepCity_Gym_EventScript_2209C8
end
@@ -129,8 +129,8 @@ MossdeepCity_Gym_EventScript_2209D0:: @ 82209D0
clearflag FLAG_MOSSDEEP_GYM_SWITCH_1
applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_Gym_Movement_220C30
waitmovement 0
setmetatile 5, 5, 524, 0
setmetatile 2, 7, 568, 1
setmetatile 5, 5, METATILE_MossdeepGym_Obelisk_Base, 0
setmetatile 2, 7, METATILE_MossdeepGym_Empty0, 1
goto MossdeepCity_Gym_EventScript_2209C8
end
@@ -140,8 +140,8 @@ MossdeepCity_Gym_EventScript_2209F5:: @ 82209F5
setflag FLAG_MOSSDEEP_GYM_SWITCH_2
applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_Gym_Movement_220C30
waitmovement 0
setmetatile 8, 14, 516, 0
setmetatile 8, 10, 569, 1
setmetatile 8, 14, METATILE_MossdeepGym_Obelisk_Top, 0
setmetatile 8, 10, METATILE_MossdeepGym_Empty1, 1
goto MossdeepCity_Gym_EventScript_2209C8
end
@@ -149,8 +149,8 @@ MossdeepCity_Gym_EventScript_220A24:: @ 8220A24
clearflag FLAG_MOSSDEEP_GYM_SWITCH_2
applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_Gym_Movement_220C30
waitmovement 0
setmetatile 8, 14, 517, 0
setmetatile 8, 10, 568, 1
setmetatile 8, 14, METATILE_MossdeepGym_OuterWall_RightCorner, 0
setmetatile 8, 10, METATILE_MossdeepGym_Empty0, 1
goto MossdeepCity_Gym_EventScript_2209C8
end
@@ -160,8 +160,8 @@ MossdeepCity_Gym_EventScript_220A49:: @ 8220A49
setflag FLAG_MOSSDEEP_GYM_SWITCH_3
applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_Gym_Movement_220C30
waitmovement 0
setmetatile 15, 17, 524, 0
setmetatile 17, 15, 569, 1
setmetatile 15, 17, METATILE_MossdeepGym_Obelisk_Base, 0
setmetatile 17, 15, METATILE_MossdeepGym_Empty1, 1
goto MossdeepCity_Gym_EventScript_2209C8
end
@@ -169,8 +169,8 @@ MossdeepCity_Gym_EventScript_220A78:: @ 8220A78
clearflag FLAG_MOSSDEEP_GYM_SWITCH_3
applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_Gym_Movement_220C30
waitmovement 0
setmetatile 15, 17, 516, 0
setmetatile 17, 15, 568, 1
setmetatile 15, 17, METATILE_MossdeepGym_Obelisk_Top, 0
setmetatile 17, 15, METATILE_MossdeepGym_Empty0, 1
goto MossdeepCity_Gym_EventScript_2209C8
end
@@ -180,8 +180,8 @@ MossdeepCity_Gym_EventScript_220A9D:: @ 8220A9D
setflag FLAG_MOSSDEEP_GYM_SWITCH_4
applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_Gym_Movement_220C30
waitmovement 0
setmetatile 1, 23, 525, 0
setmetatile 5, 24, 569, 1
setmetatile 1, 23, METATILE_MossdeepGym_Wall_LeftCorner, 0
setmetatile 5, 24, METATILE_MossdeepGym_Empty1, 1
goto MossdeepCity_Gym_EventScript_2209C8
end
@@ -189,8 +189,8 @@ MossdeepCity_Gym_EventScript_220ACC:: @ 8220ACC
clearflag FLAG_MOSSDEEP_GYM_SWITCH_4
applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_Gym_Movement_220C30
waitmovement 0
setmetatile 1, 23, 516, 0
setmetatile 5, 24, 568, 1
setmetatile 1, 23, METATILE_MossdeepGym_Obelisk_Top, 0
setmetatile 5, 24, METATILE_MossdeepGym_Empty0, 1
goto MossdeepCity_Gym_EventScript_2209C8
end

View File

@@ -44,7 +44,7 @@ MossdeepCity_SpaceCenter_1F_MapScript1_222FC2: @ 8222FC2
end
MossdeepCity_SpaceCenter_1F_EventScript_222FCE:: @ 8222FCE
setmetatile 2, 5, 996, 1
setmetatile 2, 5, METATILE_Facility_DataPad, 1
return
MossdeepCity_SpaceCenter_1F_EventScript_222FD8:: @ 8222FD8

View File

@@ -9,7 +9,7 @@ MossdeepCity_StevensHouse_MapScript1_222794: @ 8222794
end
MossdeepCity_StevensHouse_EventScript_22279E:: @ 822279E
setmetatile 6, 4, 753, 1
setmetatile 6, 4, METATILE_GenericBuilding_TableEdge, 1
return
MossdeepCity_StevensHouse_OnTransition: @ 82227A8
@@ -84,7 +84,7 @@ MossdeepCity_StevensHouse_EventScript_22285B:: @ 822285B
end
MossdeepCity_StevensHouse_EventScript_222865:: @ 8222865
setvar VAR_TEMP_1, 398
setvar VAR_TEMP_1, SPECIES_BELDUM
givemon SPECIES_BELDUM, 5, ITEM_NONE, 0x0, 0x0, 0
compare VAR_RESULT, 0
goto_if_eq MossdeepCity_StevensHouse_EventScript_222895

View File

@@ -9,12 +9,12 @@ NewMauville_Entrance_MapScript1_2372B8: @ 82372B8
end
NewMauville_Entrance_EventScript_2372C4:: @ 82372C4
setmetatile 3, 0, 788, 1
setmetatile 4, 0, 789, 1
setmetatile 5, 0, 790, 1
setmetatile 3, 1, 796, 1
setmetatile 4, 1, 797, 1
setmetatile 5, 1, 798, 1
setmetatile 3, 0, METATILE_Facility_NewMauvilleDoor_Closed_Tile0, 1
setmetatile 4, 0, METATILE_Facility_NewMauvilleDoor_Closed_Tile1, 1
setmetatile 5, 0, METATILE_Facility_NewMauvilleDoor_Closed_Tile2, 1
setmetatile 3, 1, METATILE_Facility_NewMauvilleDoor_Closed_Tile3, 1
setmetatile 4, 1, METATILE_Facility_NewMauvilleDoor_Closed_Tile4, 1
setmetatile 5, 1, METATILE_Facility_NewMauvilleDoor_Closed_Tile5, 1
return
NewMauville_Entrance_OnTransition: @ 82372FB
@@ -33,12 +33,12 @@ NewMauville_Entrance_EventScript_2372FF:: @ 82372FF
compare VAR_RESULT, 0
goto_if_eq NewMauville_Entrance_EventScript_237380
msgbox NewMauville_Entrance_Text_2373AC, MSGBOX_DEFAULT
setmetatile 3, 0, 707, 0
setmetatile 4, 0, 708, 0
setmetatile 5, 0, 709, 0
setmetatile 3, 1, 715, 1
setmetatile 4, 1, 716, 0
setmetatile 5, 1, 717, 1
setmetatile 3, 0, METATILE_Facility_NewMauvilleDoor_Open_Tile0, 0
setmetatile 4, 0, METATILE_Facility_NewMauvilleDoor_Open_Tile1, 0
setmetatile 5, 0, METATILE_Facility_NewMauvilleDoor_Open_Tile2, 0
setmetatile 3, 1, METATILE_Facility_NewMauvilleDoor_Open_Tile3, 1
setmetatile 4, 1, METATILE_Facility_NewMauvilleDoor_Open_Tile4, 0
setmetatile 5, 1, METATILE_Facility_NewMauvilleDoor_Open_Tile5, 1
special DrawWholeMapView
playse SE_BAN
setvar VAR_NEW_MAUVILLE_STATE, 1

View File

@@ -65,83 +65,83 @@ NewMauville_Inside_EventScript_237471:: @ 8237471
end
NewMauville_Inside_EventScript_237489:: @ 8237489
setmetatile 23, 34, 617, 1
setmetatile 23, 35, 625, 1
setmetatile 23, 36, 621, 0
setmetatile 23, 37, 641, 0
setmetatile 10, 16, 617, 1
setmetatile 10, 17, 625, 1
setmetatile 10, 18, 621, 0
setmetatile 10, 19, 641, 0
setmetatile 10, 0, 617, 1
setmetatile 10, 1, 625, 1
setmetatile 10, 2, 621, 0
setmetatile 10, 3, 641, 0
setmetatile 37, 33, 694, 1
setmetatile 37, 34, 702, 1
setmetatile 37, 35, 710, 1
setmetatile 37, 36, 718, 1
setmetatile 28, 22, 694, 1
setmetatile 28, 23, 702, 1
setmetatile 28, 24, 710, 1
setmetatile 28, 25, 718, 1
setmetatile 10, 24, 694, 1
setmetatile 10, 25, 702, 1
setmetatile 10, 26, 710, 1
setmetatile 10, 27, 718, 1
setmetatile 21, 2, 694, 1
setmetatile 21, 3, 702, 1
setmetatile 21, 4, 710, 1
setmetatile 21, 5, 718, 1
setmetatile 6, 11, 591, 0
setmetatile 13, 10, 591, 0
setmetatile 16, 22, 591, 0
setmetatile 4, 26, 591, 0
setmetatile 30, 38, 591, 0
setmetatile 2, 11, 558, 0
setmetatile 17, 10, 558, 0
setmetatile 25, 18, 558, 0
setmetatile 18, 36, 558, 0
setmetatile 23, 34, METATILE_BikeShop_Barrier_Hidden_Top, 1
setmetatile 23, 35, METATILE_BikeShop_Barrier_Hidden_Bottom, 1
setmetatile 23, 36, METATILE_BikeShop_Floor_Shadow_Top, 0
setmetatile 23, 37, METATILE_BikeShop_Wall_Edge_Top, 0
setmetatile 10, 16, METATILE_BikeShop_Barrier_Hidden_Top, 1
setmetatile 10, 17, METATILE_BikeShop_Barrier_Hidden_Bottom, 1
setmetatile 10, 18, METATILE_BikeShop_Floor_Shadow_Top, 0
setmetatile 10, 19, METATILE_BikeShop_Wall_Edge_Top, 0
setmetatile 10, 0, METATILE_BikeShop_Barrier_Hidden_Top, 1
setmetatile 10, 1, METATILE_BikeShop_Barrier_Hidden_Bottom, 1
setmetatile 10, 2, METATILE_BikeShop_Floor_Shadow_Top, 0
setmetatile 10, 3, METATILE_BikeShop_Wall_Edge_Top, 0
setmetatile 37, 33, METATILE_BikeShop_Barrier_Green_Top, 1
setmetatile 37, 34, METATILE_BikeShop_Barrier_Green_TopMid, 1
setmetatile 37, 35, METATILE_BikeShop_Barrier_Green_BottomMid, 1
setmetatile 37, 36, METATILE_BikeShop_Barrier_Green_Bottom, 1
setmetatile 28, 22, METATILE_BikeShop_Barrier_Green_Top, 1
setmetatile 28, 23, METATILE_BikeShop_Barrier_Green_TopMid, 1
setmetatile 28, 24, METATILE_BikeShop_Barrier_Green_BottomMid, 1
setmetatile 28, 25, METATILE_BikeShop_Barrier_Green_Bottom, 1
setmetatile 10, 24, METATILE_BikeShop_Barrier_Green_Top, 1
setmetatile 10, 25, METATILE_BikeShop_Barrier_Green_TopMid, 1
setmetatile 10, 26, METATILE_BikeShop_Barrier_Green_BottomMid, 1
setmetatile 10, 27, METATILE_BikeShop_Barrier_Green_Bottom, 1
setmetatile 21, 2, METATILE_BikeShop_Barrier_Green_Top, 1
setmetatile 21, 3, METATILE_BikeShop_Barrier_Green_TopMid, 1
setmetatile 21, 4, METATILE_BikeShop_Barrier_Green_BottomMid, 1
setmetatile 21, 5, METATILE_BikeShop_Barrier_Green_Bottom, 1
setmetatile 6, 11, METATILE_BikeShop_Button_Pressed, 0
setmetatile 13, 10, METATILE_BikeShop_Button_Pressed, 0
setmetatile 16, 22, METATILE_BikeShop_Button_Pressed, 0
setmetatile 4, 26, METATILE_BikeShop_Button_Pressed, 0
setmetatile 30, 38, METATILE_BikeShop_Button_Pressed, 0
setmetatile 2, 11, METATILE_BikeShop_Button_Green, 0
setmetatile 17, 10, METATILE_BikeShop_Button_Green, 0
setmetatile 25, 18, METATILE_BikeShop_Button_Green, 0
setmetatile 18, 36, METATILE_BikeShop_Button_Green, 0
return
NewMauville_Inside_EventScript_2375D7:: @ 82375D7
setmetatile 23, 34, 695, 1
setmetatile 23, 35, 703, 1
setmetatile 23, 36, 711, 1
setmetatile 23, 37, 719, 1
setmetatile 10, 16, 695, 1
setmetatile 10, 17, 703, 1
setmetatile 10, 18, 711, 1
setmetatile 10, 19, 719, 1
setmetatile 10, 0, 695, 1
setmetatile 10, 1, 703, 1
setmetatile 10, 2, 711, 1
setmetatile 10, 3, 719, 1
setmetatile 37, 33, 617, 1
setmetatile 37, 34, 625, 1
setmetatile 37, 35, 621, 0
setmetatile 37, 36, 641, 0
setmetatile 28, 22, 617, 1
setmetatile 28, 23, 625, 1
setmetatile 28, 24, 621, 0
setmetatile 28, 25, 641, 0
setmetatile 10, 24, 617, 1
setmetatile 10, 25, 625, 1
setmetatile 10, 26, 621, 0
setmetatile 10, 27, 641, 0
setmetatile 21, 2, 617, 1
setmetatile 21, 3, 625, 1
setmetatile 21, 4, 621, 0
setmetatile 21, 5, 641, 0
setmetatile 2, 11, 591, 0
setmetatile 17, 10, 591, 0
setmetatile 25, 18, 591, 0
setmetatile 18, 36, 591, 0
setmetatile 6, 11, 566, 0
setmetatile 13, 10, 566, 0
setmetatile 16, 22, 566, 0
setmetatile 4, 26, 566, 0
setmetatile 30, 38, 566, 0
setmetatile 23, 34, METATILE_BikeShop_Barrier_Blue_Top, 1
setmetatile 23, 35, METATILE_BikeShop_Barrier_Blue_TopMid, 1
setmetatile 23, 36, METATILE_BikeShop_Barrier_Blue_BottomMid, 1
setmetatile 23, 37, METATILE_BikeShop_Barrier_Blue_Bottom, 1
setmetatile 10, 16, METATILE_BikeShop_Barrier_Blue_Top, 1
setmetatile 10, 17, METATILE_BikeShop_Barrier_Blue_TopMid, 1
setmetatile 10, 18, METATILE_BikeShop_Barrier_Blue_BottomMid, 1
setmetatile 10, 19, METATILE_BikeShop_Barrier_Blue_Bottom, 1
setmetatile 10, 0, METATILE_BikeShop_Barrier_Blue_Top, 1
setmetatile 10, 1, METATILE_BikeShop_Barrier_Blue_TopMid, 1
setmetatile 10, 2, METATILE_BikeShop_Barrier_Blue_BottomMid, 1
setmetatile 10, 3, METATILE_BikeShop_Barrier_Blue_Bottom, 1
setmetatile 37, 33, METATILE_BikeShop_Barrier_Hidden_Top, 1
setmetatile 37, 34, METATILE_BikeShop_Barrier_Hidden_Bottom, 1
setmetatile 37, 35, METATILE_BikeShop_Floor_Shadow_Top, 0
setmetatile 37, 36, METATILE_BikeShop_Wall_Edge_Top, 0
setmetatile 28, 22, METATILE_BikeShop_Barrier_Hidden_Top, 1
setmetatile 28, 23, METATILE_BikeShop_Barrier_Hidden_Bottom, 1
setmetatile 28, 24, METATILE_BikeShop_Floor_Shadow_Top, 0
setmetatile 28, 25, METATILE_BikeShop_Wall_Edge_Top, 0
setmetatile 10, 24, METATILE_BikeShop_Barrier_Hidden_Top, 1
setmetatile 10, 25, METATILE_BikeShop_Barrier_Hidden_Bottom, 1
setmetatile 10, 26, METATILE_BikeShop_Floor_Shadow_Top, 0
setmetatile 10, 27, METATILE_BikeShop_Wall_Edge_Top, 0
setmetatile 21, 2, METATILE_BikeShop_Barrier_Hidden_Top, 1
setmetatile 21, 3, METATILE_BikeShop_Barrier_Hidden_Bottom, 1
setmetatile 21, 4, METATILE_BikeShop_Floor_Shadow_Top, 0
setmetatile 21, 5, METATILE_BikeShop_Wall_Edge_Top, 0
setmetatile 2, 11, METATILE_BikeShop_Button_Pressed, 0
setmetatile 17, 10, METATILE_BikeShop_Button_Pressed, 0
setmetatile 25, 18, METATILE_BikeShop_Button_Pressed, 0
setmetatile 18, 36, METATILE_BikeShop_Button_Pressed, 0
setmetatile 6, 11, METATILE_BikeShop_Button_Blue, 0
setmetatile 13, 10, METATILE_BikeShop_Button_Blue, 0
setmetatile 16, 22, METATILE_BikeShop_Button_Blue, 0
setmetatile 4, 26, METATILE_BikeShop_Button_Blue, 0
setmetatile 30, 38, METATILE_BikeShop_Button_Blue, 0
return
NewMauville_Inside_EventScript_237725:: @ 8237725
@@ -153,15 +153,15 @@ NewMauville_Inside_EventScript_237725:: @ 8237725
end
NewMauville_Inside_EventScript_23773A:: @ 823773A
setmetatile 33, 6, 591, 0
setmetatile 32, 2, 752, 1
setmetatile 33, 2, 753, 1
setmetatile 34, 2, 754, 1
setmetatile 35, 2, 755, 1
setmetatile 32, 3, 756, 1
setmetatile 33, 3, 757, 1
setmetatile 34, 3, 758, 1
setmetatile 35, 3, 759, 1
setmetatile 33, 6, METATILE_BikeShop_Button_Pressed, 0
setmetatile 32, 2, METATILE_BikeShop_Generator_Off_Tile0, 1
setmetatile 33, 2, METATILE_BikeShop_Generator_Off_Tile1, 1
setmetatile 34, 2, METATILE_BikeShop_Generator_Off_Tile2, 1
setmetatile 35, 2, METATILE_BikeShop_Generator_Off_Tile3, 1
setmetatile 32, 3, METATILE_BikeShop_Generator_Off_Tile4, 1
setmetatile 33, 3, METATILE_BikeShop_Generator_Off_Tile5, 1
setmetatile 34, 3, METATILE_BikeShop_Generator_Off_Tile6, 1
setmetatile 35, 3, METATILE_BikeShop_Generator_Off_Tile7, 1
special DrawWholeMapView
return

View File

@@ -25,7 +25,7 @@
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "PetalburgCity_Gym_EventScript_2049F1",
"flag": "FLAG_HIDE_PETALYBURG_GYM_NORMAN"
"flag": "FLAG_HIDE_PETALBURG_GYM_NORMAN"
},
{
"graphics_id": "EVENT_OBJ_GFX_WOMAN_5",

View File

@@ -1146,51 +1146,51 @@ PetalburgCity_Gym_EventScript_205645:: @ 8205645
return
PetalburgCity_Gym_EventScript_205666:: @ 8205666
setmetatile 6, 85, 528, 0
setmetatile 7, 85, 529, 0
setmetatile 1, 98, 528, 0
setmetatile 2, 98, 529, 0
setmetatile 6, 85, METATILE_PetalburgGym_RoomEntrance_Left, 0
setmetatile 7, 85, METATILE_PetalburgGym_RoomEntrance_Right, 0
setmetatile 1, 98, METATILE_PetalburgGym_RoomEntrance_Left, 0
setmetatile 2, 98, METATILE_PetalburgGym_RoomEntrance_Right, 0
return
PetalburgCity_Gym_EventScript_20568B:: @ 820568B
setmetatile 6, 46, 528, 0
setmetatile 7, 46, 529, 0
setmetatile 1, 59, 528, 0
setmetatile 2, 59, 529, 0
setmetatile 6, 46, METATILE_PetalburgGym_RoomEntrance_Left, 0
setmetatile 7, 46, METATILE_PetalburgGym_RoomEntrance_Right, 0
setmetatile 1, 59, METATILE_PetalburgGym_RoomEntrance_Left, 0
setmetatile 2, 59, METATILE_PetalburgGym_RoomEntrance_Right, 0
return
PetalburgCity_Gym_EventScript_2056B0:: @ 82056B0
setmetatile 6, 59, 528, 0
setmetatile 7, 59, 529, 0
setmetatile 1, 72, 528, 0
setmetatile 2, 72, 529, 0
setmetatile 6, 59, METATILE_PetalburgGym_RoomEntrance_Left, 0
setmetatile 7, 59, METATILE_PetalburgGym_RoomEntrance_Right, 0
setmetatile 1, 72, METATILE_PetalburgGym_RoomEntrance_Left, 0
setmetatile 2, 72, METATILE_PetalburgGym_RoomEntrance_Right, 0
return
PetalburgCity_Gym_EventScript_2056D5:: @ 82056D5
setmetatile 1, 20, 528, 0
setmetatile 2, 20, 529, 0
setmetatile 1, 20, METATILE_PetalburgGym_RoomEntrance_Left, 0
setmetatile 2, 20, METATILE_PetalburgGym_RoomEntrance_Right, 0
return
PetalburgCity_Gym_EventScript_2056E8:: @ 82056E8
setmetatile 6, 20, 528, 0
setmetatile 7, 20, 529, 0
setmetatile 1, 33, 528, 0
setmetatile 2, 33, 529, 0
setmetatile 6, 20, METATILE_PetalburgGym_RoomEntrance_Left, 0
setmetatile 7, 20, METATILE_PetalburgGym_RoomEntrance_Right, 0
setmetatile 1, 33, METATILE_PetalburgGym_RoomEntrance_Left, 0
setmetatile 2, 33, METATILE_PetalburgGym_RoomEntrance_Right, 0
return
PetalburgCity_Gym_EventScript_20570D:: @ 820570D
setmetatile 6, 33, 528, 0
setmetatile 7, 33, 529, 0
setmetatile 6, 33, METATILE_PetalburgGym_RoomEntrance_Left, 0
setmetatile 7, 33, METATILE_PetalburgGym_RoomEntrance_Right, 0
return
PetalburgCity_Gym_EventScript_205720:: @ 8205720
setmetatile 1, 7, 528, 0
setmetatile 2, 7, 529, 0
setmetatile 1, 7, METATILE_PetalburgGym_RoomEntrance_Left, 0
setmetatile 2, 7, METATILE_PetalburgGym_RoomEntrance_Right, 0
return
PetalburgCity_Gym_EventScript_205733:: @ 8205733
setmetatile 6, 7, 528, 0
setmetatile 7, 7, 529, 0
setmetatile 6, 7, METATILE_PetalburgGym_RoomEntrance_Left, 0
setmetatile 7, 7, METATILE_PetalburgGym_RoomEntrance_Right, 0
return
PetalburgCity_Gym_EventScript_205746:: @ 8205746

View File

@@ -13,8 +13,8 @@ Route103_MapScript1_1EC3A4: @ 81EC3A4
end
Route103_EventScript_1EC3AE:: @ 81EC3AE
setmetatile 45, 5, 159, 1
setmetatile 45, 6, 167, 0
setmetatile 45, 5, METATILE_General_CaveEntrance_Top, 1
setmetatile 45, 6, METATILE_General_CaveEntrance_Bottom, 0
return
Route103_EventScript_1EC3C1:: @ 81EC3C1

View File

@@ -13,8 +13,8 @@ Route105_MapScript1_1EE1EB: @ 81EE1EB
end
Route105_EventScript_1EE20B:: @ 81EE20B
setmetatile 9, 19, 124, 1
setmetatile 9, 20, 145, 1
setmetatile 9, 19, METATILE_General_RockWall_RockBase, 1
setmetatile 9, 20, METATILE_General_RockWall_SandBase, 1
return
Route105_OnTransition: @ 81EE21E

View File

@@ -37,7 +37,7 @@ Route110_TrickHouseEnd_EventScript_26ACFF:: @ 826ACFF
end
Route110_TrickHouseEnd_EventScript_26AD0D:: @ 826AD0D
setmetatile 10, 1, 539, 1
setmetatile 10, 1, METATILE_GenericBuilding_TrickHouse_Door_Closed, 1
return
Route110_TrickHouseEnd_EventScript_26AD17:: @ 826AD17

View File

@@ -503,7 +503,7 @@ Route110_TrickHouseEntrance_EventScript_26A110:: @ 826A110
end
Route110_TrickHouseEntrance_EventScript_26A126:: @ 826A126
setmetatile 5, 1, 537, 0
setmetatile 5, 1, METATILE_GenericBuilding_TrickHouse_Stairs_Down, 0
special DrawWholeMapView
delay 20
applymovement EVENT_OBJ_ID_PLAYER, Route110_TrickHouseEntrance_Movement_2725C9
@@ -609,7 +609,7 @@ Route110_TrickHouseEntrance_EventScript_26A289:: @ 826A289
msgbox Route110_TrickHousePuzzle1_Text_26B98D, MSGBOX_DEFAULT
playse SE_PIN
setvar VAR_TRICK_HOUSE_PUZZLE_1_STATE, 2
setmetatile 13, 1, 523, 0
setmetatile 13, 1, METATILE_TrickHousePuzzle_Stairs_Down, 0
special DrawWholeMapView
releaseall
end
@@ -620,7 +620,7 @@ Route110_TrickHouseEntrance_EventScript_26A2B2:: @ 826A2B2
msgbox Route110_TrickHousePuzzle2_Text_26BCBA, MSGBOX_DEFAULT
playse SE_PIN
setvar VAR_TRICK_HOUSE_PUZZLE_2_STATE, 2
setmetatile 13, 1, 523, 0
setmetatile 13, 1, METATILE_TrickHousePuzzle_Stairs_Down, 0
special DrawWholeMapView
releaseall
end
@@ -631,7 +631,7 @@ Route110_TrickHouseEntrance_EventScript_26A2DB:: @ 826A2DB
msgbox Route110_TrickHousePuzzle3_Text_26C609, MSGBOX_DEFAULT
playse SE_PIN
setvar VAR_TRICK_HOUSE_PUZZLE_3_STATE, 2
setmetatile 13, 1, 523, 0
setmetatile 13, 1, METATILE_TrickHousePuzzle_Stairs_Down, 0
special DrawWholeMapView
releaseall
end
@@ -642,7 +642,7 @@ Route110_TrickHouseEntrance_EventScript_26A304:: @ 826A304
msgbox Route110_TrickHousePuzzle4_Text_26C8C3, MSGBOX_DEFAULT
playse SE_PIN
setvar VAR_TRICK_HOUSE_PUZZLE_4_STATE, 2
setmetatile 13, 1, 523, 0
setmetatile 13, 1, METATILE_TrickHousePuzzle_Stairs_Down, 0
special DrawWholeMapView
releaseall
end
@@ -653,7 +653,7 @@ Route110_TrickHouseEntrance_EventScript_26A32D:: @ 826A32D
msgbox Route110_TrickHousePuzzle5_Text_26D660, MSGBOX_DEFAULT
playse SE_PIN
setvar VAR_TRICK_HOUSE_PUZZLE_5_STATE, 2
setmetatile 13, 1, 523, 0
setmetatile 13, 1, METATILE_TrickHousePuzzle_Stairs_Down, 0
special DrawWholeMapView
releaseall
end
@@ -664,7 +664,7 @@ Route110_TrickHouseEntrance_EventScript_26A356:: @ 826A356
msgbox Route110_TrickHousePuzzle6_Text_26DE26, MSGBOX_DEFAULT
playse SE_PIN
setvar VAR_TRICK_HOUSE_PUZZLE_6_STATE, 2
setmetatile 13, 1, 523, 0
setmetatile 13, 1, METATILE_TrickHousePuzzle_Stairs_Down, 0
special DrawWholeMapView
releaseall
end
@@ -675,7 +675,7 @@ Route110_TrickHouseEntrance_EventScript_26A37F:: @ 826A37F
msgbox Route110_TrickHousePuzzle7_EventScript_26E413, MSGBOX_DEFAULT
playse SE_PIN
setvar VAR_TRICK_HOUSE_PUZZLE_7_STATE, 2
setmetatile 13, 1, 523, 0
setmetatile 13, 1, METATILE_TrickHousePuzzle_Stairs_Down, 0
special DrawWholeMapView
releaseall
end
@@ -686,7 +686,7 @@ Route110_TrickHouseEntrance_EventScript_26A3A8:: @ 826A3A8
msgbox Route110_TrickHousePuzzle8_EventScript_26E864, MSGBOX_DEFAULT
playse SE_PIN
setvar VAR_TRICK_HOUSE_PUZZLE_8_STATE, 2
setmetatile 13, 1, 523, 0
setmetatile 13, 1, METATILE_TrickHousePuzzle_Stairs_Down, 0
special DrawWholeMapView
releaseall
end

View File

@@ -8,7 +8,7 @@ Route110_TrickHousePuzzle1_MapScript1_26B915: @ 826B915
end
Route110_TrickHousePuzzle1_EventScript_26B921:: @ 826B921
setmetatile 13, 1, 523, 0
setmetatile 13, 1, METATILE_TrickHousePuzzle_Stairs_Down, 0
end
Route110_TrickHousePuzzle1_EventScript_26B92B:: @ 826B92B

View File

@@ -70,23 +70,23 @@ Route110_TrickHousePuzzle2_EventScript_26BC16:: @ 826BC16
end
Route110_TrickHousePuzzle2_EventScript_26BC29:: @ 826BC29
setmetatile 11, 12, 601, 0
setmetatile 1, 13, 618, 0
setmetatile 11, 12, METATILE_TrickHousePuzzle_Button_Pressed, 0
setmetatile 1, 13, METATILE_TrickHousePuzzle_Door_Shuttered, 0
return
Route110_TrickHousePuzzle2_EventScript_26BC3C:: @ 826BC3C
setmetatile 0, 4, 601, 0
setmetatile 5, 6, 618, 0
setmetatile 0, 4, METATILE_TrickHousePuzzle_Button_Pressed, 0
setmetatile 5, 6, METATILE_TrickHousePuzzle_Door_Shuttered, 0
return
Route110_TrickHousePuzzle2_EventScript_26BC4F:: @ 826BC4F
setmetatile 14, 5, 601, 0
setmetatile 7, 15, 618, 0
setmetatile 14, 5, METATILE_TrickHousePuzzle_Button_Pressed, 0
setmetatile 7, 15, METATILE_TrickHousePuzzle_Door_Shuttered, 0
return
Route110_TrickHousePuzzle2_EventScript_26BC62:: @ 826BC62
setmetatile 7, 11, 601, 0
setmetatile 14, 12, 618, 0
setmetatile 7, 11, METATILE_TrickHousePuzzle_Button_Pressed, 0
setmetatile 14, 12, METATILE_TrickHousePuzzle_Door_Shuttered, 0
return
Route110_TrickHousePuzzle2_EventScript_26BC75:: @ 826BC75

View File

@@ -21,10 +21,10 @@ Route110_TrickHousePuzzle3_OnTransition: @ 826BEFF
end
Route110_TrickHousePuzzle3_EventScript_26BF1E:: @ 826BF1E
setmetatile 4, 14, 600, 0
setmetatile 3, 11, 600, 0
setmetatile 12, 5, 600, 0
setmetatile 8, 2, 600, 0
setmetatile 4, 14, METATILE_TrickHousePuzzle_Button_Up, 0
setmetatile 3, 11, METATILE_TrickHousePuzzle_Button_Up, 0
setmetatile 12, 5, METATILE_TrickHousePuzzle_Button_Up, 0
setmetatile 8, 2, METATILE_TrickHousePuzzle_Button_Up, 0
compare VAR_TEMP_8, 1
call_if_eq Route110_TrickHousePuzzle3_EventScript_26BF6F
compare VAR_TEMP_8, 2
@@ -36,173 +36,173 @@ Route110_TrickHousePuzzle3_EventScript_26BF1E:: @ 826BF1E
return
Route110_TrickHousePuzzle3_EventScript_26BF6F:: @ 826BF6F
setmetatile 4, 14, 601, 0
setmetatile 4, 14, METATILE_TrickHousePuzzle_Button_Pressed, 0
return
Route110_TrickHousePuzzle3_EventScript_26BF79:: @ 826BF79
setmetatile 3, 11, 601, 0
setmetatile 3, 11, METATILE_TrickHousePuzzle_Button_Pressed, 0
return
Route110_TrickHousePuzzle3_EventScript_26BF83:: @ 826BF83
setmetatile 12, 5, 601, 0
setmetatile 12, 5, METATILE_TrickHousePuzzle_Button_Pressed, 0
return
Route110_TrickHousePuzzle3_EventScript_26BF8D:: @ 826BF8D
setmetatile 8, 2, 601, 0
setmetatile 8, 2, METATILE_TrickHousePuzzle_Button_Pressed, 0
return
Route110_TrickHousePuzzle3_EventScript_26BF97:: @ 826BF97
setmetatile 1, 6, 587, 0
setmetatile 2, 6, 588, 0
setmetatile 1, 7, 595, 0
setmetatile 2, 7, 596, 0
setmetatile 1, 9, 587, 0
setmetatile 2, 9, 588, 0
setmetatile 1, 10, 595, 0
setmetatile 2, 10, 596, 0
setmetatile 4, 15, 587, 0
setmetatile 5, 15, 588, 0
setmetatile 4, 16, 595, 0
setmetatile 5, 16, 596, 0
setmetatile 13, 9, 587, 0
setmetatile 14, 9, 588, 0
setmetatile 13, 10, 595, 0
setmetatile 14, 10, 596, 0
setmetatile 13, 15, 587, 0
setmetatile 14, 15, 588, 0
setmetatile 13, 16, 595, 0
setmetatile 14, 16, 596, 0
setmetatile 3, 7, 589, 1
setmetatile 3, 8, 597, 0
setmetatile 3, 13, 589, 1
setmetatile 3, 14, 597, 0
setmetatile 6, 4, 589, 1
setmetatile 6, 5, 597, 0
setmetatile 9, 16, 589, 1
setmetatile 9, 17, 597, 0
setmetatile 12, 7, 589, 1
setmetatile 12, 8, 597, 0
setmetatile 1, 3, 568, 0
setmetatile 2, 3, 569, 0
setmetatile 1, 4, 576, 1
setmetatile 2, 4, 577, 1
setmetatile 1, 12, 568, 0
setmetatile 2, 12, 569, 0
setmetatile 1, 13, 576, 1
setmetatile 2, 13, 577, 1
setmetatile 4, 6, 568, 0
setmetatile 5, 6, 569, 0
setmetatile 4, 7, 576, 1
setmetatile 5, 7, 577, 1
setmetatile 4, 12, 568, 0
setmetatile 5, 12, 569, 0
setmetatile 4, 13, 576, 1
setmetatile 5, 13, 577, 1
setmetatile 4, 18, 568, 0
setmetatile 5, 18, 569, 0
setmetatile 4, 19, 576, 1
setmetatile 5, 19, 577, 1
setmetatile 7, 9, 568, 0
setmetatile 8, 9, 569, 0
setmetatile 7, 10, 576, 1
setmetatile 8, 10, 577, 1
setmetatile 10, 6, 568, 0
setmetatile 11, 6, 569, 0
setmetatile 10, 7, 576, 1
setmetatile 11, 7, 577, 1
setmetatile 10, 12, 568, 0
setmetatile 11, 12, 569, 0
setmetatile 10, 13, 576, 1
setmetatile 11, 13, 577, 1
setmetatile 10, 18, 568, 0
setmetatile 11, 18, 569, 0
setmetatile 10, 19, 576, 1
setmetatile 11, 19, 577, 1
setmetatile 13, 3, 568, 0
setmetatile 14, 3, 569, 0
setmetatile 13, 4, 576, 1
setmetatile 14, 4, 577, 1
setmetatile 3, 16, 570, 1
setmetatile 3, 17, 578, 1
setmetatile 9, 4, 570, 1
setmetatile 9, 5, 578, 1
setmetatile 1, 6, METATILE_TrickHousePuzzle_BlueDoorH_Open_Tile0, 0
setmetatile 2, 6, METATILE_TrickHousePuzzle_BlueDoorH_Open_Tile1, 0
setmetatile 1, 7, METATILE_TrickHousePuzzle_BlueDoorH_Open_Tile2, 0
setmetatile 2, 7, METATILE_TrickHousePuzzle_BlueDoorH_Open_Tile3, 0
setmetatile 1, 9, METATILE_TrickHousePuzzle_BlueDoorH_Open_Tile0, 0
setmetatile 2, 9, METATILE_TrickHousePuzzle_BlueDoorH_Open_Tile1, 0
setmetatile 1, 10, METATILE_TrickHousePuzzle_BlueDoorH_Open_Tile2, 0
setmetatile 2, 10, METATILE_TrickHousePuzzle_BlueDoorH_Open_Tile3, 0
setmetatile 4, 15, METATILE_TrickHousePuzzle_BlueDoorH_Open_Tile0, 0
setmetatile 5, 15, METATILE_TrickHousePuzzle_BlueDoorH_Open_Tile1, 0
setmetatile 4, 16, METATILE_TrickHousePuzzle_BlueDoorH_Open_Tile2, 0
setmetatile 5, 16, METATILE_TrickHousePuzzle_BlueDoorH_Open_Tile3, 0
setmetatile 13, 9, METATILE_TrickHousePuzzle_BlueDoorH_Open_Tile0, 0
setmetatile 14, 9, METATILE_TrickHousePuzzle_BlueDoorH_Open_Tile1, 0
setmetatile 13, 10, METATILE_TrickHousePuzzle_BlueDoorH_Open_Tile2, 0
setmetatile 14, 10, METATILE_TrickHousePuzzle_BlueDoorH_Open_Tile3, 0
setmetatile 13, 15, METATILE_TrickHousePuzzle_BlueDoorH_Open_Tile0, 0
setmetatile 14, 15, METATILE_TrickHousePuzzle_BlueDoorH_Open_Tile1, 0
setmetatile 13, 16, METATILE_TrickHousePuzzle_BlueDoorH_Open_Tile2, 0
setmetatile 14, 16, METATILE_TrickHousePuzzle_BlueDoorH_Open_Tile3, 0
setmetatile 3, 7, METATILE_TrickHousePuzzle_BlueDoorV_Retracted, 1
setmetatile 3, 8, METATILE_TrickHousePuzzle_Floor_ShadowTop, 0
setmetatile 3, 13, METATILE_TrickHousePuzzle_BlueDoorV_Retracted, 1
setmetatile 3, 14, METATILE_TrickHousePuzzle_Floor_ShadowTop, 0
setmetatile 6, 4, METATILE_TrickHousePuzzle_BlueDoorV_Retracted, 1
setmetatile 6, 5, METATILE_TrickHousePuzzle_Floor_ShadowTop, 0
setmetatile 9, 16, METATILE_TrickHousePuzzle_BlueDoorV_Retracted, 1
setmetatile 9, 17, METATILE_TrickHousePuzzle_Floor_ShadowTop, 0
setmetatile 12, 7, METATILE_TrickHousePuzzle_BlueDoorV_Retracted, 1
setmetatile 12, 8, METATILE_TrickHousePuzzle_Floor_ShadowTop, 0
setmetatile 1, 3, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile0, 0
setmetatile 2, 3, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile1, 0
setmetatile 1, 4, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile2, 1
setmetatile 2, 4, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile3, 1
setmetatile 1, 12, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile0, 0
setmetatile 2, 12, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile1, 0
setmetatile 1, 13, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile2, 1
setmetatile 2, 13, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile3, 1
setmetatile 4, 6, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile0, 0
setmetatile 5, 6, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile1, 0
setmetatile 4, 7, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile2, 1
setmetatile 5, 7, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile3, 1
setmetatile 4, 12, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile0, 0
setmetatile 5, 12, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile1, 0
setmetatile 4, 13, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile2, 1
setmetatile 5, 13, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile3, 1
setmetatile 4, 18, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile0, 0
setmetatile 5, 18, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile1, 0
setmetatile 4, 19, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile2, 1
setmetatile 5, 19, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile3, 1
setmetatile 7, 9, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile0, 0
setmetatile 8, 9, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile1, 0
setmetatile 7, 10, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile2, 1
setmetatile 8, 10, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile3, 1
setmetatile 10, 6, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile0, 0
setmetatile 11, 6, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile1, 0
setmetatile 10, 7, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile2, 1
setmetatile 11, 7, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile3, 1
setmetatile 10, 12, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile0, 0
setmetatile 11, 12, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile1, 0
setmetatile 10, 13, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile2, 1
setmetatile 11, 13, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile3, 1
setmetatile 10, 18, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile0, 0
setmetatile 11, 18, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile1, 0
setmetatile 10, 19, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile2, 1
setmetatile 11, 19, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile3, 1
setmetatile 13, 3, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile0, 0
setmetatile 14, 3, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile1, 0
setmetatile 13, 4, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile2, 1
setmetatile 14, 4, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile3, 1
setmetatile 3, 16, METATILE_TrickHousePuzzle_RedDoorV_Open0, 1
setmetatile 3, 17, METATILE_TrickHousePuzzle_RedDoorV_Open1, 1
setmetatile 9, 4, METATILE_TrickHousePuzzle_RedDoorV_Open0, 1
setmetatile 9, 5, METATILE_TrickHousePuzzle_RedDoorV_Open1, 1
return
Route110_TrickHousePuzzle3_EventScript_26C232:: @ 826C232
setmetatile 1, 6, 571, 0
setmetatile 2, 6, 572, 0
setmetatile 1, 7, 579, 1
setmetatile 2, 7, 580, 1
setmetatile 1, 9, 571, 0
setmetatile 2, 9, 572, 0
setmetatile 1, 10, 579, 1
setmetatile 2, 10, 580, 1
setmetatile 4, 15, 571, 0
setmetatile 5, 15, 572, 0
setmetatile 4, 16, 579, 1
setmetatile 5, 16, 580, 1
setmetatile 13, 9, 571, 0
setmetatile 14, 9, 572, 0
setmetatile 13, 10, 579, 1
setmetatile 14, 10, 580, 1
setmetatile 13, 15, 571, 0
setmetatile 14, 15, 572, 0
setmetatile 13, 16, 579, 1
setmetatile 14, 16, 580, 1
setmetatile 3, 7, 573, 1
setmetatile 3, 8, 581, 1
setmetatile 3, 13, 573, 1
setmetatile 3, 14, 581, 1
setmetatile 6, 4, 573, 1
setmetatile 6, 5, 581, 1
setmetatile 9, 16, 573, 1
setmetatile 9, 17, 581, 1
setmetatile 12, 7, 573, 1
setmetatile 12, 8, 581, 1
setmetatile 1, 3, 584, 0
setmetatile 2, 3, 585, 0
setmetatile 1, 4, 592, 0
setmetatile 2, 4, 593, 0
setmetatile 1, 12, 584, 0
setmetatile 2, 12, 585, 0
setmetatile 1, 13, 592, 0
setmetatile 2, 13, 593, 0
setmetatile 4, 6, 584, 0
setmetatile 5, 6, 585, 0
setmetatile 4, 7, 592, 0
setmetatile 5, 7, 593, 0
setmetatile 4, 12, 584, 0
setmetatile 5, 12, 585, 0
setmetatile 4, 13, 592, 0
setmetatile 5, 13, 593, 0
setmetatile 4, 18, 584, 0
setmetatile 5, 18, 585, 0
setmetatile 4, 19, 592, 0
setmetatile 5, 19, 593, 0
setmetatile 7, 9, 584, 0
setmetatile 8, 9, 585, 0
setmetatile 7, 10, 592, 0
setmetatile 8, 10, 593, 0
setmetatile 10, 6, 584, 0
setmetatile 11, 6, 585, 0
setmetatile 10, 7, 592, 0
setmetatile 11, 7, 593, 0
setmetatile 10, 12, 584, 0
setmetatile 11, 12, 585, 0
setmetatile 10, 13, 592, 0
setmetatile 11, 13, 593, 0
setmetatile 10, 18, 584, 0
setmetatile 11, 18, 585, 0
setmetatile 10, 19, 592, 0
setmetatile 11, 19, 593, 0
setmetatile 13, 3, 584, 0
setmetatile 14, 3, 585, 0
setmetatile 13, 4, 592, 0
setmetatile 14, 4, 593, 0
setmetatile 3, 16, 586, 1
setmetatile 3, 17, 594, 0
setmetatile 9, 4, 586, 1
setmetatile 9, 5, 594, 0
setmetatile 1, 6, METATILE_TrickHousePuzzle_BlueDoorH_Closed_Tile0, 0
setmetatile 2, 6, METATILE_TrickHousePuzzle_BlueDoorH_Closed_Tile1, 0
setmetatile 1, 7, METATILE_TrickHousePuzzle_BlueDoorH_Closed_Tile2, 1
setmetatile 2, 7, METATILE_TrickHousePuzzle_BlueDoorH_Closed_Tile3, 1
setmetatile 1, 9, METATILE_TrickHousePuzzle_BlueDoorH_Closed_Tile0, 0
setmetatile 2, 9, METATILE_TrickHousePuzzle_BlueDoorH_Closed_Tile1, 0
setmetatile 1, 10, METATILE_TrickHousePuzzle_BlueDoorH_Closed_Tile2, 1
setmetatile 2, 10, METATILE_TrickHousePuzzle_BlueDoorH_Closed_Tile3, 1
setmetatile 4, 15, METATILE_TrickHousePuzzle_BlueDoorH_Closed_Tile0, 0
setmetatile 5, 15, METATILE_TrickHousePuzzle_BlueDoorH_Closed_Tile1, 0
setmetatile 4, 16, METATILE_TrickHousePuzzle_BlueDoorH_Closed_Tile2, 1
setmetatile 5, 16, METATILE_TrickHousePuzzle_BlueDoorH_Closed_Tile3, 1
setmetatile 13, 9, METATILE_TrickHousePuzzle_BlueDoorH_Closed_Tile0, 0
setmetatile 14, 9, METATILE_TrickHousePuzzle_BlueDoorH_Closed_Tile1, 0
setmetatile 13, 10, METATILE_TrickHousePuzzle_BlueDoorH_Closed_Tile2, 1
setmetatile 14, 10, METATILE_TrickHousePuzzle_BlueDoorH_Closed_Tile3, 1
setmetatile 13, 15, METATILE_TrickHousePuzzle_BlueDoorH_Closed_Tile0, 0
setmetatile 14, 15, METATILE_TrickHousePuzzle_BlueDoorH_Closed_Tile1, 0
setmetatile 13, 16, METATILE_TrickHousePuzzle_BlueDoorH_Closed_Tile2, 1
setmetatile 14, 16, METATILE_TrickHousePuzzle_BlueDoorH_Closed_Tile3, 1
setmetatile 3, 7, METATILE_TrickHousePuzzle_BlueDoorV_Open0, 1
setmetatile 3, 8, METATILE_TrickHousePuzzle_BlueDoorV_Open1, 1
setmetatile 3, 13, METATILE_TrickHousePuzzle_BlueDoorV_Open0, 1
setmetatile 3, 14, METATILE_TrickHousePuzzle_BlueDoorV_Open1, 1
setmetatile 6, 4, METATILE_TrickHousePuzzle_BlueDoorV_Open0, 1
setmetatile 6, 5, METATILE_TrickHousePuzzle_BlueDoorV_Open1, 1
setmetatile 9, 16, METATILE_TrickHousePuzzle_BlueDoorV_Open0, 1
setmetatile 9, 17, METATILE_TrickHousePuzzle_BlueDoorV_Open1, 1
setmetatile 12, 7, METATILE_TrickHousePuzzle_BlueDoorV_Open0, 1
setmetatile 12, 8, METATILE_TrickHousePuzzle_BlueDoorV_Open1, 1
setmetatile 1, 3, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile0, 0
setmetatile 2, 3, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile1, 0
setmetatile 1, 4, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile2, 0
setmetatile 2, 4, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile3, 0
setmetatile 1, 12, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile0, 0
setmetatile 2, 12, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile1, 0
setmetatile 1, 13, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile2, 0
setmetatile 2, 13, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile3, 0
setmetatile 4, 6, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile0, 0
setmetatile 5, 6, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile1, 0
setmetatile 4, 7, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile2, 0
setmetatile 5, 7, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile3, 0
setmetatile 4, 12, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile0, 0
setmetatile 5, 12, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile1, 0
setmetatile 4, 13, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile2, 0
setmetatile 5, 13, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile3, 0
setmetatile 4, 18, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile0, 0
setmetatile 5, 18, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile1, 0
setmetatile 4, 19, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile2, 0
setmetatile 5, 19, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile3, 0
setmetatile 7, 9, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile0, 0
setmetatile 8, 9, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile1, 0
setmetatile 7, 10, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile2, 0
setmetatile 8, 10, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile3, 0
setmetatile 10, 6, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile0, 0
setmetatile 11, 6, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile1, 0
setmetatile 10, 7, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile2, 0
setmetatile 11, 7, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile3, 0
setmetatile 10, 12, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile0, 0
setmetatile 11, 12, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile1, 0
setmetatile 10, 13, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile2, 0
setmetatile 11, 13, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile3, 0
setmetatile 10, 18, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile0, 0
setmetatile 11, 18, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile1, 0
setmetatile 10, 19, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile2, 0
setmetatile 11, 19, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile3, 0
setmetatile 13, 3, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile0, 0
setmetatile 14, 3, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile1, 0
setmetatile 13, 4, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile2, 0
setmetatile 14, 4, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile3, 0
setmetatile 3, 16, METATILE_TrickHousePuzzle_RedDoorV_Retracted, 1
setmetatile 3, 17, METATILE_TrickHousePuzzle_Floor_ShadowTop_Alt, 0
setmetatile 9, 4, METATILE_TrickHousePuzzle_RedDoorV_Retracted, 1
setmetatile 9, 5, METATILE_TrickHousePuzzle_Floor_ShadowTop_Alt, 0
return
Route110_TrickHousePuzzle3_EventScript_26C4CD:: @ 826C4CD

View File

@@ -18,53 +18,53 @@ Route110_TrickHousePuzzle7_EventScript_26E0AC:: @ 826E0AC
return
Route110_TrickHousePuzzle7_EventScript_26E0DA:: @ 826E0DA
setmetatile 13, 17, 610, 0
setmetatile 12, 16, 575, 1
setmetatile 13, 17, METATILE_TrickHousePuzzle_Arrow_RedOnBlack_Up, 0
setmetatile 12, 16, METATILE_TrickHousePuzzle_Lever_On, 1
return
Route110_TrickHousePuzzle7_EventScript_26E0ED:: @ 826E0ED
setmetatile 12, 13, 610, 0
setmetatile 12, 11, 575, 1
setmetatile 12, 13, METATILE_TrickHousePuzzle_Arrow_RedOnBlack_Up, 0
setmetatile 12, 11, METATILE_TrickHousePuzzle_Lever_On, 1
return
Route110_TrickHousePuzzle7_EventScript_26E100:: @ 826E100
setmetatile 7, 12, 610, 0
setmetatile 5, 10, 575, 1
setmetatile 7, 12, METATILE_TrickHousePuzzle_Arrow_RedOnBlack_Up, 0
setmetatile 5, 10, METATILE_TrickHousePuzzle_Lever_On, 1
return
Route110_TrickHousePuzzle7_EventScript_26E113:: @ 826E113
setmetatile 6, 6, 636, 0
setmetatile 4, 4, 575, 1
setmetatile 6, 6, METATILE_TrickHousePuzzle_Arrow_RedOnBlack_Right_Alt, 0
setmetatile 4, 4, METATILE_TrickHousePuzzle_Lever_On, 1
return
Route110_TrickHousePuzzle7_EventScript_26E126:: @ 826E126
setmetatile 8, 4, 609, 0
setmetatile 7, 5, 575, 1
setmetatile 8, 4, METATILE_TrickHousePuzzle_Arrow_RedOnBlack_Left, 0
setmetatile 7, 5, METATILE_TrickHousePuzzle_Lever_On, 1
return
Route110_TrickHousePuzzle7_EventScript_26E139:: @ 826E139
setmetatile 13, 17, 611, 0
setmetatile 12, 16, 574, 1
setmetatile 13, 17, METATILE_TrickHousePuzzle_Arrow_RedOnBlack_Down, 0
setmetatile 12, 16, METATILE_TrickHousePuzzle_Lever_Off, 1
return
Route110_TrickHousePuzzle7_EventScript_26E14C:: @ 826E14C
setmetatile 12, 13, 609, 0
setmetatile 12, 11, 574, 1
setmetatile 12, 13, METATILE_TrickHousePuzzle_Arrow_RedOnBlack_Left, 0
setmetatile 12, 11, METATILE_TrickHousePuzzle_Lever_Off, 1
return
Route110_TrickHousePuzzle7_EventScript_26E15F:: @ 826E15F
setmetatile 7, 12, 611, 0
setmetatile 5, 10, 574, 1
setmetatile 7, 12, METATILE_TrickHousePuzzle_Arrow_RedOnBlack_Down, 0
setmetatile 5, 10, METATILE_TrickHousePuzzle_Lever_Off, 1
return
Route110_TrickHousePuzzle7_EventScript_26E172:: @ 826E172
setmetatile 6, 6, 635, 0
setmetatile 4, 4, 574, 1
setmetatile 6, 6, METATILE_TrickHousePuzzle_Arrow_RedOnBlack_Left_Alt, 0
setmetatile 4, 4, METATILE_TrickHousePuzzle_Lever_Off, 1
return
Route110_TrickHousePuzzle7_EventScript_26E185:: @ 826E185
setmetatile 8, 4, 608, 0
setmetatile 7, 5, 574, 1
setmetatile 8, 4, METATILE_TrickHousePuzzle_Arrow_RedOnBlack_Right, 0
setmetatile 7, 5, METATILE_TrickHousePuzzle_Lever_Off, 1
return
Route110_TrickHousePuzzle7_OnTransition: @ 826E198

View File

@@ -12,29 +12,29 @@ Route111_MapScript1_1F0CBC: @ 81F0CBC
end
Route111_EventScript_1F0CD1:: @ 81F0CD1
setmetatile 29, 86, 124, 1
setmetatile 29, 87, 145, 1
setmetatile 29, 86, METATILE_General_RockWall_RockBase, 1
setmetatile 29, 87, METATILE_General_RockWall_SandBase, 1
return
Route111_EventScript_1F0CE4:: @ 81F0CE4
setmetatile 18, 53, 984, 0
setmetatile 19, 53, 985, 0
setmetatile 20, 53, 986, 0
setmetatile 18, 54, 992, 0
setmetatile 19, 54, 993, 0
setmetatile 20, 54, 994, 0
setmetatile 18, 55, 1000, 0
setmetatile 19, 55, 1001, 0
setmetatile 20, 55, 1002, 0
setmetatile 18, 56, 1008, 0
setmetatile 19, 56, 1009, 0
setmetatile 20, 56, 1010, 0
setmetatile 18, 57, 987, 0
setmetatile 19, 57, 988, 0
setmetatile 20, 57, 989, 0
setmetatile 18, 58, 995, 0
setmetatile 19, 58, 996, 0
setmetatile 20, 58, 997, 0
setmetatile 18, 53, METATILE_Mauville_MirageTower_Tile0, 0
setmetatile 19, 53, METATILE_Mauville_MirageTower_Tile1, 0
setmetatile 20, 53, METATILE_Mauville_MirageTower_Tile2, 0
setmetatile 18, 54, METATILE_Mauville_MirageTower_Tile3, 0
setmetatile 19, 54, METATILE_Mauville_MirageTower_Tile4, 0
setmetatile 20, 54, METATILE_Mauville_MirageTower_Tile5, 0
setmetatile 18, 55, METATILE_Mauville_MirageTower_Tile6, 0
setmetatile 19, 55, METATILE_Mauville_MirageTower_Tile7, 0
setmetatile 20, 55, METATILE_Mauville_MirageTower_Tile8, 0
setmetatile 18, 56, METATILE_Mauville_MirageTower_Tile9, 0
setmetatile 19, 56, METATILE_Mauville_MirageTower_TileA, 0
setmetatile 20, 56, METATILE_Mauville_MirageTower_TileB, 0
setmetatile 18, 57, METATILE_Mauville_MirageTower_TileC, 0
setmetatile 19, 57, METATILE_Mauville_MirageTower_TileD, 0
setmetatile 20, 57, METATILE_Mauville_MirageTower_TileE, 0
setmetatile 18, 58, METATILE_Mauville_MirageTower_TileF, 0
setmetatile 19, 58, METATILE_Mauville_MirageTower_Tile10, 0
setmetatile 20, 58, METATILE_Mauville_MirageTower_Tile11, 0
return
Route111_OnTransition: @ 81F0D87

View File

@@ -17,8 +17,8 @@ Route114_FossilManiacsTunnel_MapScript1_22AF49: @ 822AF49
end
Route114_FossilManiacsTunnel_EventScript_22AF53:: @ 822AF53
setmetatile 6, 1, 617, 1
setmetatile 6, 2, 617, 1
setmetatile 6, 1, METATILE_Fallarbor_RedRockWall, 1
setmetatile 6, 2, METATILE_Fallarbor_RedRockWall, 1
return
Route114_FossilManiacsTunnel_EventScript_22AF66:: @ 822AF66

View File

@@ -83,7 +83,7 @@ Route119_WeatherInstitute_2F_EventScript_26FFC8:: @ 826FFC8
Route119_WeatherInstitute_2F_EventScript_27004D:: @ 827004D
msgbox Route119_WeatherInstitute_2F_Text_270650, MSGBOX_DEFAULT
setvar VAR_TEMP_1, 385
setvar VAR_TEMP_1, SPECIES_CASTFORM
givemon SPECIES_CASTFORM, 25, ITEM_MYSTIC_WATER, 0x0, 0x0, 0
compare VAR_RESULT, 0
goto_if_eq Route119_WeatherInstitute_2F_EventScript_270085

View File

@@ -45,15 +45,15 @@ Route120_MapScript1_1F5474: @ 81F5474
end
Route120_EventScript_1F5490:: @ 81F5490
setmetatile 7, 54, 124, 1
setmetatile 7, 55, 145, 1
setmetatile 7, 54, METATILE_General_RockWall_RockBase, 1
setmetatile 7, 55, METATILE_General_RockWall_SandBase, 1
return
Route120_EventScript_1F54A3:: @ 81F54A3
setmetatile 13, 15, 663, 0
setmetatile 12, 16, 671, 0
setmetatile 12, 17, 161, 0
setmetatile 13, 17, 161, 0
setmetatile 13, 15, METATILE_Fortree_WoodBridge_Kecleon0, 0
setmetatile 12, 16, METATILE_Fortree_WoodBridge_Kecleon1, 0
setmetatile 12, 17, METATILE_General_ReflectiveWater, 0
setmetatile 13, 17, METATILE_General_ReflectiveWater, 0
return
Route120_EventScript_1F54C8:: @ 81F54C8
@@ -249,10 +249,10 @@ Route120_EventScript_1F572C:: @ 81F572C
delay 15
removeobject 31
waitfieldeffect FLDEFF_NPCFLY_OUT
setmetatile 13, 15, 663, 0
setmetatile 12, 16, 671, 0
setmetatile 12, 17, 161, 0
setmetatile 13, 17, 161, 0
setmetatile 13, 15, METATILE_Fortree_WoodBridge_Kecleon0, 0
setmetatile 12, 16, METATILE_Fortree_WoodBridge_Kecleon1, 0
setmetatile 12, 17, METATILE_General_ReflectiveWater, 0
setmetatile 13, 17, METATILE_General_ReflectiveWater, 0
special DrawWholeMapView
release
end

View File

@@ -156,7 +156,7 @@ RustboroCity_DevonCorp_2F_EventScript_211A2C:: @ 8211A2C
end
RustboroCity_DevonCorp_2F_EventScript_211A3E:: @ 8211A3E
setvar VAR_TEMP_1, 388
setvar VAR_TEMP_1, SPECIES_LILEEP
givemon SPECIES_LILEEP, 20, ITEM_NONE, 0x0, 0x0, 0
compare VAR_RESULT, 0
goto_if_eq RustboroCity_DevonCorp_2F_EventScript_211A6E
@@ -205,7 +205,7 @@ RustboroCity_DevonCorp_2F_EventScript_211AD7:: @ 8211AD7
end
RustboroCity_DevonCorp_2F_EventScript_211AE1:: @ 8211AE1
setvar VAR_TEMP_1, 390
setvar VAR_TEMP_1, SPECIES_ANORITH
givemon SPECIES_ANORITH, 20, ITEM_NONE, 0x0, 0x0, 0
compare VAR_RESULT, 0
goto_if_eq RustboroCity_DevonCorp_2F_EventScript_211B11

View File

@@ -18,12 +18,12 @@ SealedChamber_OuterRoom_MapScript1_23912B: @ 823912B
end
SealedChamber_OuterRoom_EventScript_239135:: @ 8239135
setmetatile 9, 1, 553, 1
setmetatile 10, 1, 553, 1
setmetatile 11, 1, 553, 1
setmetatile 9, 2, 565, 1
setmetatile 10, 2, 565, 1
setmetatile 11, 2, 565, 1
setmetatile 9, 1, METATILE_Cave_EntranceCover, 1
setmetatile 10, 1, METATILE_Cave_EntranceCover, 1
setmetatile 11, 1, METATILE_Cave_EntranceCover, 1
setmetatile 9, 2, METATILE_Cave_SealedChamberBraille_Mid, 1
setmetatile 10, 2, METATILE_Cave_SealedChamberBraille_Mid, 1
setmetatile 11, 2, METATILE_Cave_SealedChamberBraille_Mid, 1
return
SealedChamber_OuterRoom_EventScript_23916C:: @ 823916C

View File

@@ -22,38 +22,38 @@ ShoalCave_LowTideInnerRoom_MapScript1_236F16: @ 8236F16
ShoalCave_LowTideInnerRoom_EventScript_236F1C:: @ 8236F1C
goto_if_set FLAG_RECEIVED_SHOAL_SALT_1, ShoalCave_LowTideInnerRoom_EventScript_236F3D
goto_if_set FLAG_SYS_SHOAL_TIDE, ShoalCave_LowTideInnerRoom_EventScript_236F3D
setmetatile 31, 8, 856, 1
setmetatile 31, 8, METATILE_Cave_ShoalCave_DirtPile_Large, 1
goto ShoalCave_LowTideInnerRoom_EventScript_236F3D
end
ShoalCave_LowTideInnerRoom_EventScript_236F3D:: @ 8236F3D
goto_if_set FLAG_RECEIVED_SHOAL_SALT_2, ShoalCave_LowTideInnerRoom_EventScript_236F5E
goto_if_set FLAG_SYS_SHOAL_TIDE, ShoalCave_LowTideInnerRoom_EventScript_236F5E
setmetatile 14, 26, 856, 1
setmetatile 14, 26, METATILE_Cave_ShoalCave_DirtPile_Large, 1
goto ShoalCave_LowTideInnerRoom_EventScript_236F5E
end
ShoalCave_LowTideInnerRoom_EventScript_236F5E:: @ 8236F5E
goto_if_set FLAG_RECEIVED_SHOAL_SHELL_1, ShoalCave_LowTideInnerRoom_EventScript_236F76
setmetatile 41, 20, 857, 1
setmetatile 41, 20, METATILE_Cave_ShoalCave_BlueStone_Large, 1
goto ShoalCave_LowTideInnerRoom_EventScript_236F76
end
ShoalCave_LowTideInnerRoom_EventScript_236F76:: @ 8236F76
goto_if_set FLAG_RECEIVED_SHOAL_SHELL_2, ShoalCave_LowTideInnerRoom_EventScript_236F8E
setmetatile 41, 10, 857, 1
setmetatile 41, 10, METATILE_Cave_ShoalCave_BlueStone_Large, 1
goto ShoalCave_LowTideInnerRoom_EventScript_236F8E
end
ShoalCave_LowTideInnerRoom_EventScript_236F8E:: @ 8236F8E
goto_if_set FLAG_RECEIVED_SHOAL_SHELL_3, ShoalCave_LowTideInnerRoom_EventScript_236FA6
setmetatile 6, 9, 857, 1
setmetatile 6, 9, METATILE_Cave_ShoalCave_BlueStone_Large, 1
goto ShoalCave_LowTideInnerRoom_EventScript_236FA6
end
ShoalCave_LowTideInnerRoom_EventScript_236FA6:: @ 8236FA6
goto_if_set FLAG_RECEIVED_SHOAL_SHELL_4, ShoalCave_LowTideInnerRoom_EventScript_236FB9
setmetatile 16, 13, 857, 1
setmetatile 16, 13, METATILE_Cave_ShoalCave_BlueStone_Large, 1
return
ShoalCave_LowTideInnerRoom_EventScript_236FB9:: @ 8236FB9
@@ -65,7 +65,7 @@ ShoalCave_LowTideInnerRoom_EventScript_236FBA:: @ 8236FBA
giveitem_std ITEM_SHOAL_SHELL
compare VAR_RESULT, 0
goto_if_eq Common_EventScript_ShowBagIsFull
setmetatile 41, 20, 859, 0
setmetatile 41, 20, METATILE_Cave_ShoalCave_BlueStone_Small, 0
special DrawWholeMapView
setflag FLAG_RECEIVED_SHOAL_SHELL_1
releaseall
@@ -82,7 +82,7 @@ ShoalCave_LowTideInnerRoom_EventScript_236FF6:: @ 8236FF6
giveitem_std ITEM_SHOAL_SHELL
compare VAR_RESULT, 0
goto_if_eq Common_EventScript_ShowBagIsFull
setmetatile 41, 10, 859, 0
setmetatile 41, 10, METATILE_Cave_ShoalCave_BlueStone_Small, 0
special DrawWholeMapView
setflag FLAG_RECEIVED_SHOAL_SHELL_2
releaseall
@@ -94,7 +94,7 @@ ShoalCave_LowTideInnerRoom_EventScript_237028:: @ 8237028
giveitem_std ITEM_SHOAL_SHELL
compare VAR_RESULT, 0
goto_if_eq Common_EventScript_ShowBagIsFull
setmetatile 6, 9, 859, 0
setmetatile 6, 9, METATILE_Cave_ShoalCave_BlueStone_Small, 0
special DrawWholeMapView
setflag FLAG_RECEIVED_SHOAL_SHELL_3
releaseall
@@ -106,7 +106,7 @@ ShoalCave_LowTideInnerRoom_EventScript_23705A:: @ 823705A
giveitem_std ITEM_SHOAL_SHELL
compare VAR_RESULT, 0
goto_if_eq Common_EventScript_ShowBagIsFull
setmetatile 16, 13, 859, 0
setmetatile 16, 13, METATILE_Cave_ShoalCave_BlueStone_Small, 0
special DrawWholeMapView
setflag FLAG_RECEIVED_SHOAL_SHELL_4
releaseall
@@ -118,7 +118,7 @@ ShoalCave_LowTideInnerRoom_EventScript_23708C:: @ 823708C
giveitem_std ITEM_SHOAL_SALT
compare VAR_RESULT, 0
goto_if_eq Common_EventScript_ShowBagIsFull
setmetatile 31, 8, 858, 0
setmetatile 31, 8, METATILE_Cave_ShoalCave_DirtPile_Small, 0
special DrawWholeMapView
setflag FLAG_RECEIVED_SHOAL_SALT_1
releaseall
@@ -135,7 +135,7 @@ ShoalCave_LowTideInnerRoom_EventScript_2370C8:: @ 82370C8
giveitem_std ITEM_SHOAL_SALT
compare VAR_RESULT, 0
goto_if_eq Common_EventScript_ShowBagIsFull
setmetatile 14, 26, 858, 0
setmetatile 14, 26, METATILE_Cave_ShoalCave_DirtPile_Small, 0
special DrawWholeMapView
setflag FLAG_RECEIVED_SHOAL_SALT_2
releaseall

View File

@@ -24,8 +24,8 @@ SkyPillar_Outside_MapScript1_2392DD: @ 82392DD
end
SkyPillar_Outside_EventScript_2392E7:: @ 82392E7
setmetatile 14, 4, 682, 0
setmetatile 14, 5, 690, 0
setmetatile 14, 4, METATILE_Pacifidlog_SkyPillar_DoorOpen_Top, 0
setmetatile 14, 5, METATILE_Pacifidlog_SkyPillar_DoorOpen_Bottom, 0
return
SkyPillar_Outside_MapScript2_2392FA: @ 82392FA

View File

@@ -1372,4 +1372,4 @@ SlateportCity_Text_1DF28C: @ 81DF28C
.string "That's a really great idea!\p"
.string "After all, a tough TRAINER is\n"
.string "the perfect fit for the BATTLE TENT!\p"
.string "Give it your best effort!$"
.string "Give it your best effort!$"

View File

@@ -58,7 +58,7 @@ SlateportCity_House1_EventScript_209B50:: @ 8209B50
SlateportCity_House1_EventScript_209B5A:: @ 8209B5A
msgbox SlateportCity_House1_Text_209CA4, MSGBOX_DEFAULT
call Common_EventScript_NameReceivedPokemon
specialvar VAR_RESULT, TV_PutNameRaterShowOnTheAirIfNicnkameChanged
specialvar VAR_RESULT, TV_PutNameRaterShowOnTheAirIfNicknameChanged
special TV_CopyNicknameToStringVar1AndEnsureTerminated
compare VAR_RESULT, 1
goto_if_eq SlateportCity_House1_EventScript_209B84

View File

@@ -16,19 +16,19 @@ SootopolisCity_EventScript_1E5692:: @ 81E5692
end
SootopolisCity_EventScript_1E5693:: @ 81E5693
setmetatile 9, 6, 584, 1
setmetatile 9, 17, 584, 1
setmetatile 9, 26, 584, 1
setmetatile 44, 17, 584, 1
setmetatile 8, 35, 584, 1
setmetatile 53, 28, 584, 1
setmetatile 45, 6, 584, 1
setmetatile 48, 25, 584, 1
setmetatile 51, 36, 584, 1
setmetatile 9, 6, METATILE_Sootopolis_Door_Closed, 1
setmetatile 9, 17, METATILE_Sootopolis_Door_Closed, 1
setmetatile 9, 26, METATILE_Sootopolis_Door_Closed, 1
setmetatile 44, 17, METATILE_Sootopolis_Door_Closed, 1
setmetatile 8, 35, METATILE_Sootopolis_Door_Closed, 1
setmetatile 53, 28, METATILE_Sootopolis_Door_Closed, 1
setmetatile 45, 6, METATILE_Sootopolis_Door_Closed, 1
setmetatile 48, 25, METATILE_Sootopolis_Door_Closed, 1
setmetatile 51, 36, METATILE_Sootopolis_Door_Closed, 1
return
SootopolisCity_EventScript_1E56E5:: @ 81E56E5
setmetatile 31, 32, 592, 1
setmetatile 31, 32, METATILE_Sootopolis_GymDoor_Closed, 1
return
SootopolisCity_OnTransition: @ 81E56EF
@@ -603,30 +603,30 @@ SootopolisCity_EventScript_1E5CCE:: @ 81E5CCE
end
SootopolisCity_EventScript_1E5D82:: @ 81E5D82
setmetatile 27, 43, 656, 0
setmetatile 28, 43, 656, 0
setmetatile 29, 43, 656, 0
setmetatile 30, 43, 656, 0
setmetatile 27, 44, 656, 0
setmetatile 28, 44, 656, 0
setmetatile 29, 44, 656, 0
setmetatile 30, 44, 656, 0
setmetatile 27, 45, 656, 0
setmetatile 28, 45, 656, 0
setmetatile 29, 45, 656, 0
setmetatile 30, 45, 656, 0
setmetatile 32, 43, 656, 0
setmetatile 33, 43, 656, 0
setmetatile 34, 43, 656, 0
setmetatile 35, 43, 656, 0
setmetatile 32, 44, 656, 0
setmetatile 33, 44, 656, 0
setmetatile 34, 44, 656, 0
setmetatile 35, 44, 656, 0
setmetatile 32, 45, 656, 0
setmetatile 33, 45, 656, 0
setmetatile 34, 45, 656, 0
setmetatile 35, 45, 656, 0
setmetatile 27, 43, METATILE_Sootopolis_RoughWater, 0
setmetatile 28, 43, METATILE_Sootopolis_RoughWater, 0
setmetatile 29, 43, METATILE_Sootopolis_RoughWater, 0
setmetatile 30, 43, METATILE_Sootopolis_RoughWater, 0
setmetatile 27, 44, METATILE_Sootopolis_RoughWater, 0
setmetatile 28, 44, METATILE_Sootopolis_RoughWater, 0
setmetatile 29, 44, METATILE_Sootopolis_RoughWater, 0
setmetatile 30, 44, METATILE_Sootopolis_RoughWater, 0
setmetatile 27, 45, METATILE_Sootopolis_RoughWater, 0
setmetatile 28, 45, METATILE_Sootopolis_RoughWater, 0
setmetatile 29, 45, METATILE_Sootopolis_RoughWater, 0
setmetatile 30, 45, METATILE_Sootopolis_RoughWater, 0
setmetatile 32, 43, METATILE_Sootopolis_RoughWater, 0
setmetatile 33, 43, METATILE_Sootopolis_RoughWater, 0
setmetatile 34, 43, METATILE_Sootopolis_RoughWater, 0
setmetatile 35, 43, METATILE_Sootopolis_RoughWater, 0
setmetatile 32, 44, METATILE_Sootopolis_RoughWater, 0
setmetatile 33, 44, METATILE_Sootopolis_RoughWater, 0
setmetatile 34, 44, METATILE_Sootopolis_RoughWater, 0
setmetatile 35, 44, METATILE_Sootopolis_RoughWater, 0
setmetatile 32, 45, METATILE_Sootopolis_RoughWater, 0
setmetatile 33, 45, METATILE_Sootopolis_RoughWater, 0
setmetatile 34, 45, METATILE_Sootopolis_RoughWater, 0
setmetatile 35, 45, METATILE_Sootopolis_RoughWater, 0
return
SootopolisCity_Movement_1E5E5B: @ 81E5E5B

View File

@@ -25,16 +25,16 @@ SootopolisCity_Gym_1F_EventScript_224E73:: @ 8224E73
goto_if_lt SootopolisCity_Gym_1F_EventScript_224EB8
compare VAR_ICE_STEP_COUNT, 67
goto_if_lt SootopolisCity_Gym_1F_EventScript_224EA6
setmetatile 8, 4, 519, 0
setmetatile 8, 5, 519, 0
setmetatile 8, 4, METATILE_SootopolisGym_Stairs, 0
setmetatile 8, 5, METATILE_SootopolisGym_Stairs, 0
SootopolisCity_Gym_1F_EventScript_224EA6:: @ 8224EA6
setmetatile 8, 10, 519, 0
setmetatile 8, 11, 519, 0
setmetatile 8, 10, METATILE_SootopolisGym_Stairs, 0
setmetatile 8, 11, METATILE_SootopolisGym_Stairs, 0
SootopolisCity_Gym_1F_EventScript_224EB8:: @ 8224EB8
setmetatile 8, 15, 519, 0
setmetatile 8, 16, 519, 0
setmetatile 8, 15, METATILE_SootopolisGym_Stairs, 0
setmetatile 8, 16, METATILE_SootopolisGym_Stairs, 0
SootopolisCity_Gym_1F_EventScript_224ECA:: @ 8224ECA
return

View File

@@ -50,7 +50,7 @@ TrainerHill_Entrance_MapScript1_268128: @ 8268128
end
TrainerHill_Entrance_EventScript_268134:: @ 8268134
setmetatile 17, 10, 775, 0
setmetatile 17, 10, METATILE_TrainerHill_GreenFloorTile, 0
return
TrainerHill_Entrance_MapScript2_26813E: @ 826813E
@@ -64,7 +64,7 @@ TrainerHill_Entrance_EventScript_268160:: @ 8268160
lockall
applymovement EVENT_OBJ_ID_PLAYER, TrainerHill_Entrance_Movement_268385
waitmovement 0
setmetatile 17, 10, 820, 1
setmetatile 17, 10, METATILE_TrainerHill_CounterDoor, 1
special DrawWholeMapView
playse SE_TK_KASYA
waitse

View File

@@ -18,18 +18,18 @@ Underwater_SeafloorCavern_MapScript1_23435C: @ 823435C
end
Underwater_SeafloorCavern_EventScript_234366:: @ 8234366
setmetatile 5, 3, 542, 1
setmetatile 6, 3, 542, 1
setmetatile 7, 3, 542, 1
setmetatile 8, 3, 542, 1
setmetatile 5, 4, 552, 0
setmetatile 6, 4, 552, 0
setmetatile 7, 4, 552, 0
setmetatile 8, 4, 552, 0
setmetatile 5, 5, 552, 0
setmetatile 6, 5, 552, 0
setmetatile 7, 5, 552, 0
setmetatile 8, 5, 552, 0
setmetatile 5, 3, METATILE_Underwater_RockWall, 1
setmetatile 6, 3, METATILE_Underwater_RockWall, 1
setmetatile 7, 3, METATILE_Underwater_RockWall, 1
setmetatile 8, 3, METATILE_Underwater_RockWall, 1
setmetatile 5, 4, METATILE_Underwater_FloorShadow, 0
setmetatile 6, 4, METATILE_Underwater_FloorShadow, 0
setmetatile 7, 4, METATILE_Underwater_FloorShadow, 0
setmetatile 8, 4, METATILE_Underwater_FloorShadow, 0
setmetatile 5, 5, METATILE_Underwater_FloorShadow, 0
setmetatile 6, 5, METATILE_Underwater_FloorShadow, 0
setmetatile 7, 5, METATILE_Underwater_FloorShadow, 0
setmetatile 8, 5, METATILE_Underwater_FloorShadow, 0
return
Underwater_SeafloorCavern_MapScript1_2343D3: @ 82343D3

File diff suppressed because it is too large Load Diff

View File

@@ -1390,34 +1390,34 @@ EventScript_277BB4:: @ 8277BB4
end
OldaleTown_PokemonCenter_2F_EventScript_277BBE:: @ 8277BBE
setmetatile 5, 2, 732, 0
setmetatile 5, 3, 740, 0
setmetatile 5, 2, METATILE_PokemonCenter_Floor_ShadowTop_Alt, 0
setmetatile 5, 3, METATILE_PokemonCenter_Floor_Plain_Alt, 0
return
OldaleTown_PokemonCenter_2F_EventScript_277BD1:: @ 8277BD1
setmetatile 5, 2, 542, 1
setmetatile 5, 3, 605, 1
setmetatile 5, 2, METATILE_PokemonCenter_Floor_ShadowTop, 1
setmetatile 5, 3, METATILE_PokemonCenter_CounterBarrier, 1
return
OldaleTown_PokemonCenter_2F_EventScript_277BE4:: @ 8277BE4
setmetatile 9, 2, 732, 0
setmetatile 9, 3, 740, 0
setmetatile 9, 2, METATILE_PokemonCenter_Floor_ShadowTop_Alt, 0
setmetatile 9, 3, METATILE_PokemonCenter_Floor_Plain_Alt, 0
return
OldaleTown_PokemonCenter_2F_EventScript_277BF7:: @ 8277BF7
setmetatile 9, 2, 542, 1
setmetatile 9, 3, 605, 1
setmetatile 9, 2, METATILE_PokemonCenter_Floor_ShadowTop, 1
setmetatile 9, 3, METATILE_PokemonCenter_CounterBarrier, 1
return
MossdeepCity_GameCorner_1F_EventScript_277C0A:: @ 8277C0A
OldaleTown_PokemonCenter_2F_EventScript_277C0A:: @ 8277C0A
setmetatile 5, 2, 556, 0
setmetatile 5, 3, 564, 0
setmetatile 5, 2, METATILE_MossdeepGameCorner_CounterOpen_Top, 0
setmetatile 5, 3, METATILE_MossdeepGameCorner_CounterOpen_Bottom, 0
return
OldaleTown_PokemonCenter_2F_EventScript_277C1D:: @ 8277C1D
setmetatile 5, 2, 554, 1
setmetatile 5, 3, 562, 1
setmetatile 5, 2, METATILE_MossdeepGameCorner_CounterClosed_Top, 1
setmetatile 5, 3, METATILE_MossdeepGameCorner_CounterClosed_Bottom, 1
return
BattleFrontier_PokemonCenter_1F_MapScript1_277C30: @ 8277C30

View File

@@ -134,7 +134,7 @@ gSpecials:: @ 81DBA64
def_special CompareSeedotSize
def_special GetLotadSizeRecordInfo
def_special CompareLotadSize
def_special TV_PutNameRaterShowOnTheAirIfNicnkameChanged
def_special TV_PutNameRaterShowOnTheAirIfNicknameChanged
def_special TV_CopyNicknameToStringVar1AndEnsureTerminated
def_special TV_CheckMonOTIDEqualsPlayerID
def_special BufferTrendyPhraseString

View File

@@ -1,207 +0,0 @@
gGiftRibbonDescriptionPart1_2003RegionalTourney:: @ 8623A74
.string "2003 REGIONAL TOURNEY$"
gGiftRibbonDescriptionPart2_Champion:: @ 8623A8A
.string "CHAMPION RIBBON$"
gGiftRibbonDescriptionPart1_2003NationalTourney:: @ 8623A9A
.string "2003 NATIONAL TOURNEY$"
gGiftRibbonDescriptionPart1_2003GlobalCup:: @ 8623AB0
.string "2003 GLOBAL CUP$"
gGiftRibbonDescriptionPart2_RunnerUp:: @ 8623AC0
.string "Runner-up RIBBON$"
gGiftRibbonDescriptionPart2_Semifinalist:: @ 8623AD1
.string "Semifinalist RIBBON$"
gGiftRibbonDescriptionPart1_2004RegionalTourney:: @ 8623AE5
.string "2004 REGIONAL TOURNEY$"
gGiftRibbonDescriptionPart1_2004NationalTourney:: @ 8623AFB
.string "2004 NATIONAL TOURNEY$"
gGiftRibbonDescriptionPart1_2004GlobalCup:: @ 8623B11
.string "2004 GLOBAL CUP$"
gGiftRibbonDescriptionPart1_2005RegionalTourney:: @ 8623B21
.string "2005 REGIONAL TOURNEY$"
gGiftRibbonDescriptionPart1_2005NationalTourney:: @ 8623B37
.string "2005 NATIONAL TOURNEY$"
gGiftRibbonDescriptionPart1_2005GlobalCup:: @ 8623B4D
.string "2005 GLOBAL CUP$"
gGiftRibbonDescriptionPart1_PokemonBattleCup:: @ 8623B5D
.string "POKéMON BATTLE CUP$"
gGiftRibbonDescriptionPart2_Participation:: @ 8623B70
.string "Participation RIBBON$"
gGiftRibbonDescriptionPart1_PokemonLeague:: @ 8623B85
.string "POKéMON LEAGUE$"
gGiftRibbonDescriptionPart1_AdvanceCup:: @ 8623B94
.string "ADVANCE CUP$"
gGiftRibbonDescriptionPart1_PokemonTournament:: @ 8623BA0
.string "POKéMON Tournament$"
gGiftRibbonDescriptionPart2_Participation2:: @ 8623BB3
.string "Participation RIBBON$"
gGiftRibbonDescriptionPart1_PokemonEvent:: @ 8623BC8
.string "POKéMON Event$"
gGiftRibbonDescriptionPart1_PokemonFestival:: @ 8623BD6
.string "POKéMON Festival$"
gGiftRibbonDescriptionPart1_DifficultyClearing:: @ 8623BE7
.string "Difficulty-clearing$"
gGiftRibbonDescriptionPart2_Commemorative:: @ 8623BFB
.string "Commemorative RIBBON$"
gGiftRibbonDescriptionPart1_ClearingAllChallenges:: @ 8623C10
.string "RIBBON awarded for$"
gGiftRibbonDescriptionPart2_ClearingAllChallenges:: @ 8623C23
.string "clearing all challenges.$"
gGiftRibbonDescriptionPart1_100StraightWin:: @ 8623C3C
.string "100-straight Win$"
gGiftRibbonDescriptionPart1_DarknessTower:: @ 8623C4D
.string "DARKNESS TOWER Clear$"
gGiftRibbonDescriptionPart1_RedTower:: @ 8623C62
.string "RED TOWER Clear$"
gGiftRibbonDescriptionPart1_BlackironTower:: @ 8623C72
.string "BLACKIRON TOWER Clear$"
gGiftRibbonDescriptionPart1_FinalTower:: @ 8623C88
.string "FINAL TOWER Clear$"
gGiftRibbonDescriptionPart1_LegendMaking:: @ 8623C9A
.string "Legend-making$"
gGiftRibbonDescriptionPart1_PokemonCenterTokyo:: @ 8623CA8
.string "POKéMON CENTER TOKYO$"
gGiftRibbonDescriptionPart1_PokemonCenterOsaka:: @ 8623CBD
.string "POKéMON CENTER OSAKA$"
gGiftRibbonDescriptionPart1_PokemonCenterNagoya:: @ 8623CD2
.string "POKéMON CENTER NAGOYA$"
gGiftRibbonDescriptionPart1_PokemonCenterNY:: @ 8623CE8
.string "POKéMON CENTER NY$"
gGiftRibbonDescriptionPart1_SummerHolidays:: @ 8623CFA
.string "Summer Holidays RIBBON$"
gGiftRibbonDescriptionPart2_EmptyString:: @ 8623D11
.string "$"
gGiftRibbonDescriptionPart1_WinterHolidays:: @ 8623D12
.string "Winter Holidays RIBBON$"
gGiftRibbonDescriptionPart1_SpringHolidays:: @ 8623D29
.string "Spring Holidays RIBBON$"
gGiftRibbonDescriptionPart1_Evergreen:: @ 8623D40
.string "Evergreen RIBBON$"
gGiftRibbonDescriptionPart1_SpecialHoliday:: @ 8623D51
.string "Special Holiday RIBBON$"
gGiftRibbonDescriptionPart1_HardWorker:: @ 8623D68
.string "Hard Worker RIBBON$"
gGiftRibbonDescriptionPart1_LotsOfFriends:: @ 8623D7B
.string "Lots of Friends RIBBON$"
gGiftRibbonDescriptionPart1_FullOfEnergy:: @ 8623D92
.string "Full of Energy RIBBON$"
gGiftRibbonDescriptionPart1_LovedPokemon:: @ 8623DA8
.string "A commemorative RIBBON$"
gGiftRibbonDescriptionPart2_LovedPokemon:: @ 8623DBF
.string "for a loved POKéMON.$"
gGiftRibbonDescriptionPart1_LoveForPokemon:: @ 8623DD4
.string "RIBBON that shows$"
gGiftRibbonDescriptionPart2_LoveForPokemon:: @ 8623DE6
.string "love for POKéMON.$"
.align 2
gGiftRibbonDescriptionPointers:: @ 8623DF8
.4byte gGiftRibbonDescriptionPart1_2003RegionalTourney, gGiftRibbonDescriptionPart2_Champion
.4byte gGiftRibbonDescriptionPart1_2003NationalTourney, gGiftRibbonDescriptionPart2_Champion
.4byte gGiftRibbonDescriptionPart1_2003GlobalCup, gGiftRibbonDescriptionPart2_Champion
.4byte gGiftRibbonDescriptionPart1_2003RegionalTourney, gGiftRibbonDescriptionPart2_RunnerUp
.4byte gGiftRibbonDescriptionPart1_2003NationalTourney, gGiftRibbonDescriptionPart2_RunnerUp
.4byte gGiftRibbonDescriptionPart1_2003GlobalCup, gGiftRibbonDescriptionPart2_RunnerUp
.4byte gGiftRibbonDescriptionPart1_2003RegionalTourney, gGiftRibbonDescriptionPart2_Semifinalist
.4byte gGiftRibbonDescriptionPart1_2003NationalTourney, gGiftRibbonDescriptionPart2_Semifinalist
.4byte gGiftRibbonDescriptionPart1_2003GlobalCup, gGiftRibbonDescriptionPart2_Semifinalist
.4byte gGiftRibbonDescriptionPart1_2004RegionalTourney, gGiftRibbonDescriptionPart2_Champion
.4byte gGiftRibbonDescriptionPart1_2004NationalTourney, gGiftRibbonDescriptionPart2_Champion
.4byte gGiftRibbonDescriptionPart1_2004GlobalCup, gGiftRibbonDescriptionPart2_Champion
.4byte gGiftRibbonDescriptionPart1_2004RegionalTourney, gGiftRibbonDescriptionPart2_RunnerUp
.4byte gGiftRibbonDescriptionPart1_2004NationalTourney, gGiftRibbonDescriptionPart2_RunnerUp
.4byte gGiftRibbonDescriptionPart1_2004GlobalCup, gGiftRibbonDescriptionPart2_RunnerUp
.4byte gGiftRibbonDescriptionPart1_2004RegionalTourney, gGiftRibbonDescriptionPart2_Semifinalist
.4byte gGiftRibbonDescriptionPart1_2004NationalTourney, gGiftRibbonDescriptionPart2_Semifinalist
.4byte gGiftRibbonDescriptionPart1_2004GlobalCup, gGiftRibbonDescriptionPart2_Semifinalist
.4byte gGiftRibbonDescriptionPart1_2005RegionalTourney, gGiftRibbonDescriptionPart2_Champion
.4byte gGiftRibbonDescriptionPart1_2005NationalTourney, gGiftRibbonDescriptionPart2_Champion
.4byte gGiftRibbonDescriptionPart1_2005GlobalCup, gGiftRibbonDescriptionPart2_Champion
.4byte gGiftRibbonDescriptionPart1_2005RegionalTourney, gGiftRibbonDescriptionPart2_RunnerUp
.4byte gGiftRibbonDescriptionPart1_2005NationalTourney, gGiftRibbonDescriptionPart2_RunnerUp
.4byte gGiftRibbonDescriptionPart1_2005GlobalCup, gGiftRibbonDescriptionPart2_RunnerUp
.4byte gGiftRibbonDescriptionPart1_2005RegionalTourney, gGiftRibbonDescriptionPart2_Semifinalist
.4byte gGiftRibbonDescriptionPart1_2005NationalTourney, gGiftRibbonDescriptionPart2_Semifinalist
.4byte gGiftRibbonDescriptionPart1_2005GlobalCup, gGiftRibbonDescriptionPart2_Semifinalist
.4byte gGiftRibbonDescriptionPart1_PokemonBattleCup, gGiftRibbonDescriptionPart2_Champion
.4byte gGiftRibbonDescriptionPart1_PokemonBattleCup, gGiftRibbonDescriptionPart2_RunnerUp
.4byte gGiftRibbonDescriptionPart1_PokemonBattleCup, gGiftRibbonDescriptionPart2_Semifinalist
.4byte gGiftRibbonDescriptionPart1_PokemonBattleCup, gGiftRibbonDescriptionPart2_Participation
.4byte gGiftRibbonDescriptionPart1_PokemonLeague, gGiftRibbonDescriptionPart2_Champion
.4byte gGiftRibbonDescriptionPart1_PokemonLeague, gGiftRibbonDescriptionPart2_RunnerUp
.4byte gGiftRibbonDescriptionPart1_PokemonLeague, gGiftRibbonDescriptionPart2_Semifinalist
.4byte gGiftRibbonDescriptionPart1_PokemonLeague, gGiftRibbonDescriptionPart2_Participation
.4byte gGiftRibbonDescriptionPart1_AdvanceCup, gGiftRibbonDescriptionPart2_Champion
.4byte gGiftRibbonDescriptionPart1_AdvanceCup, gGiftRibbonDescriptionPart2_RunnerUp
.4byte gGiftRibbonDescriptionPart1_AdvanceCup, gGiftRibbonDescriptionPart2_Semifinalist
.4byte gGiftRibbonDescriptionPart1_AdvanceCup, gGiftRibbonDescriptionPart2_Participation
.4byte gGiftRibbonDescriptionPart1_PokemonTournament, gGiftRibbonDescriptionPart2_Participation2
.4byte gGiftRibbonDescriptionPart1_PokemonEvent, gGiftRibbonDescriptionPart2_Participation2
.4byte gGiftRibbonDescriptionPart1_PokemonFestival, gGiftRibbonDescriptionPart2_Participation2
.4byte gGiftRibbonDescriptionPart1_DifficultyClearing, gGiftRibbonDescriptionPart2_Commemorative
.4byte gGiftRibbonDescriptionPart1_ClearingAllChallenges, gGiftRibbonDescriptionPart2_ClearingAllChallenges
.4byte gGiftRibbonDescriptionPart1_100StraightWin, gGiftRibbonDescriptionPart2_Commemorative
.4byte gGiftRibbonDescriptionPart1_DarknessTower, gGiftRibbonDescriptionPart2_Commemorative
.4byte gGiftRibbonDescriptionPart1_RedTower, gGiftRibbonDescriptionPart2_Commemorative
.4byte gGiftRibbonDescriptionPart1_BlackironTower, gGiftRibbonDescriptionPart2_Commemorative
.4byte gGiftRibbonDescriptionPart1_FinalTower, gGiftRibbonDescriptionPart2_Commemorative
.4byte gGiftRibbonDescriptionPart1_LegendMaking, gGiftRibbonDescriptionPart2_Commemorative
.4byte gGiftRibbonDescriptionPart1_PokemonCenterTokyo, gGiftRibbonDescriptionPart2_Commemorative
.4byte gGiftRibbonDescriptionPart1_PokemonCenterOsaka, gGiftRibbonDescriptionPart2_Commemorative
.4byte gGiftRibbonDescriptionPart1_PokemonCenterNagoya, gGiftRibbonDescriptionPart2_Commemorative
.4byte gGiftRibbonDescriptionPart1_PokemonCenterNY, gGiftRibbonDescriptionPart2_Commemorative
.4byte gGiftRibbonDescriptionPart1_SummerHolidays, gGiftRibbonDescriptionPart2_EmptyString
.4byte gGiftRibbonDescriptionPart1_WinterHolidays, gGiftRibbonDescriptionPart2_EmptyString
.4byte gGiftRibbonDescriptionPart1_SpringHolidays, gGiftRibbonDescriptionPart2_EmptyString
.4byte gGiftRibbonDescriptionPart1_Evergreen, gGiftRibbonDescriptionPart2_EmptyString
.4byte gGiftRibbonDescriptionPart1_SpecialHoliday, gGiftRibbonDescriptionPart2_EmptyString
.4byte gGiftRibbonDescriptionPart1_HardWorker, gGiftRibbonDescriptionPart2_EmptyString
.4byte gGiftRibbonDescriptionPart1_LotsOfFriends, gGiftRibbonDescriptionPart2_EmptyString
.4byte gGiftRibbonDescriptionPart1_FullOfEnergy, gGiftRibbonDescriptionPart2_EmptyString
.4byte gGiftRibbonDescriptionPart1_LovedPokemon, gGiftRibbonDescriptionPart2_LovedPokemon
.4byte gGiftRibbonDescriptionPart1_LoveForPokemon, gGiftRibbonDescriptionPart2_LoveForPokemon

View File

@@ -1,84 +0,0 @@
gRibbonDescriptionPart1_Champion:: @ 862383C
.string "CHAMPION-beating, HALL$"
gRibbonDescriptionPart2_Champion:: @ 8623853
.string "OF FAME Member RIBBON$"
gRibbonDescriptionPart1_CoolContest:: @ 8623869
.string "COOL CONTEST$"
gRibbonDescriptionPart1_BeautyContest:: @ 8623876
.string "BEAUTY CONTEST$"
gRibbonDescriptionPart1_CuteContest:: @ 8623885
.string "CUTE CONTEST$"
gRibbonDescriptionPart1_SmartContest:: @ 8623892
.string "SMART CONTEST$"
gRibbonDescriptionPart1_ToughContest:: @ 86238A0
.string "TOUGH CONTEST$"
gRibbonDescriptionPart2_NormalRank:: @ 86238AE
.string "Normal Rank winner!$"
gRibbonDescriptionPart2_SuperRank:: @ 86238C2
.string "Super Rank winner!$"
gRibbonDescriptionPart2_HyperRank:: @ 86238D5
.string "Hyper Rank winner!$"
gRibbonDescriptionPart2_MasterRank:: @ 86238E8
.string "Master Rank winner!$"
gRibbonDescriptionPart1_Winning:: @ 86238FC
.string "For clearing LV50$"
gRibbonDescriptionPart2_Winning:: @ 862390E
.string "at the BATTLE TOWER.$"
gRibbonDescriptionPart1_Victory:: @ 8623923
.string "For clearing Open Level$"
gRibbonDescriptionPart2_Victory:: @ 862393B
.string "at the BATTLE TOWER.$"
gRibbonDescriptionPart1_Artist:: @ 8623950
.string "RIBBON for being chosen$"
gRibbonDescriptionPart2_Artist:: @ 8623968
.string "as a super sketch model.$"
gRibbonDescriptionPart1_Effort:: @ 8623981
.string "RIBBON awarded for$"
gRibbonDescriptionPart2_Effort:: @ 8623994
.string "being a hard worker.$"
.align 2
gRibbonDescriptionPointers:: @ 86239AC
.4byte gRibbonDescriptionPart1_Champion, gRibbonDescriptionPart2_Champion
.4byte gRibbonDescriptionPart1_CoolContest, gRibbonDescriptionPart2_NormalRank
.4byte gRibbonDescriptionPart1_CoolContest, gRibbonDescriptionPart2_SuperRank
.4byte gRibbonDescriptionPart1_CoolContest, gRibbonDescriptionPart2_HyperRank
.4byte gRibbonDescriptionPart1_CoolContest, gRibbonDescriptionPart2_MasterRank
.4byte gRibbonDescriptionPart1_BeautyContest, gRibbonDescriptionPart2_NormalRank
.4byte gRibbonDescriptionPart1_BeautyContest, gRibbonDescriptionPart2_SuperRank
.4byte gRibbonDescriptionPart1_BeautyContest, gRibbonDescriptionPart2_HyperRank
.4byte gRibbonDescriptionPart1_BeautyContest, gRibbonDescriptionPart2_MasterRank
.4byte gRibbonDescriptionPart1_CuteContest, gRibbonDescriptionPart2_NormalRank
.4byte gRibbonDescriptionPart1_CuteContest, gRibbonDescriptionPart2_SuperRank
.4byte gRibbonDescriptionPart1_CuteContest, gRibbonDescriptionPart2_HyperRank
.4byte gRibbonDescriptionPart1_CuteContest, gRibbonDescriptionPart2_MasterRank
.4byte gRibbonDescriptionPart1_SmartContest, gRibbonDescriptionPart2_NormalRank
.4byte gRibbonDescriptionPart1_SmartContest, gRibbonDescriptionPart2_SuperRank
.4byte gRibbonDescriptionPart1_SmartContest, gRibbonDescriptionPart2_HyperRank
.4byte gRibbonDescriptionPart1_SmartContest, gRibbonDescriptionPart2_MasterRank
.4byte gRibbonDescriptionPart1_ToughContest, gRibbonDescriptionPart2_NormalRank
.4byte gRibbonDescriptionPart1_ToughContest, gRibbonDescriptionPart2_SuperRank
.4byte gRibbonDescriptionPart1_ToughContest, gRibbonDescriptionPart2_HyperRank
.4byte gRibbonDescriptionPart1_ToughContest, gRibbonDescriptionPart2_MasterRank
.4byte gRibbonDescriptionPart1_Winning, gRibbonDescriptionPart2_Winning
.4byte gRibbonDescriptionPart1_Victory, gRibbonDescriptionPart2_Victory
.4byte gRibbonDescriptionPart1_Artist, gRibbonDescriptionPart2_Artist
.4byte gRibbonDescriptionPart1_Effort, gRibbonDescriptionPart2_Effort

View File

@@ -1,113 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 4
gUnknown_085DFA60:: @ 85DFA60
.incbin "graphics/interface/85DFA60.bin"
gUnknown_085DFA80:: @ 85DFA80
.incbin "graphics/interface/85DFA80.4bpp"
gUnknown_085DFB60:: @ 85DFB60
.incbin "graphics/interface/85DFB60.bin"
gUnknown_085DFC0C:: @ 85DFC0C
.incbin "graphics/interface/85DFC0C.bin"
gUnknown_085DFCB0:: @ 85DFCB0
.4byte 22, 47, 33, 24, 23
gUnknown_085DFCC4:: @ 85DFCC4
.byte 0, 4, 3, 2, 1
gUnknown_085DFCC9:: @ 85DFCC9
.byte 0, 8, 1
gUnknown_085DFCCC:: @ 85DFCCC
.4byte 0x1F8
.4byte 0x31E1
.4byte 0x4021DF
.4byte 0x1172
gUnknown_085DFCDC:: @ 85DFCDC
window_template 0, 0xD, 1, 0xD, 4, 0xF, 1
window_template 0, 0, 0xE, 0xB, 2, 0xF, 0x35
window_template 0, 1, 0x11, 0x1C, 2, 0xF, 0x4B
null_window_template
sUsePokeblockYesNoWinTemplate:: @ 85DFCFC
window_template 0, 0x18, 0xB, 5, 4, 0xF, 0x83
sContestStatNames:: @ 85DFD04
.4byte gText_Coolness
.4byte gText_Toughness
.4byte gText_Smartness
.4byte gText_Cuteness
.4byte gText_Beauty3
gSpriteSheet_ConditionUpDown:: @ 85DFD18
obj_tiles gUsePokeblockUpDown_Gfx, 0x200, 0
gSpritePalette_ConditionUpDown:: @ 85DFD20
obj_pal gUsePokeblockUpDown_Pal, 0
gUnknown_085DFD28:: @ 85DFD28
.2byte 0x9c, 0x24
.2byte 0x75, 0x3b
.2byte 0x75, 0x76
.2byte 0xc5, 0x76
.2byte 0xc5, 0x3b
gUnknown_085DFD3C:: @ 85DFD3C
.2byte 0x4000
.2byte 0x8000
.2byte 0x400
.2byte 0
gUnknown_085DFD44:: @ 85DFD44
obj_image_anim_frame 0, 5
obj_image_anim_end
gUnknown_085DFD4C:: @ 85DFD4C
obj_image_anim_frame 8, 5
obj_image_anim_end
gUnknown_085DFD54:: @ 85DFD54
.4byte gUnknown_085DFD44
.4byte gUnknown_085DFD4C
gSpriteTemplate_085DFD5C:: @ 85DFD5C
spr_template 0, 0, gUnknown_085DFD3C, gUnknown_085DFD54, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
gUnknown_085DFD74:: @ 85DFD74
.2byte 0x4000
.2byte 0xC000
.2byte 0x400
.2byte 0
gUnknown_085DFD7C:: @ 85DFD7C
obj_image_anim_frame 0, 5
obj_image_anim_end
gUnknown_085DFD84:: @ 85DFD84
obj_image_anim_frame 32, 5
obj_image_anim_end
gUnknown_085DFD8C:: @ 85DFD8C
obj_image_anim_frame 64, 5
obj_image_anim_end
gUnknown_085DFD94:: @ 85DFD94
.4byte gUnknown_085DFD7C
.4byte gUnknown_085DFD84
.4byte gUnknown_085DFD8C
gUnknown_085DFDA0:: @ 85DFDA0
spr_template 1, 1, gUnknown_085DFD74, gUnknown_085DFD94, NULL, gDummySpriteAffineAnimTable, sub_8168374
gUnknown_085DFDB8:: @ 85DFDB8
.4byte gUsePokeblockCondition_Pal
.4byte 1

View File

@@ -1 +1,3 @@
0000000000000000000000000000000 0 0000000000000000000 00000000000000000000 00000000000000000000000000000
00000000000000000000000000000000 0 0 0 0 00 000000000
0000 0 0 0 0 0 00 000000000
000000 0 0 0 00 0000000000000000000000

View File

@@ -1,3 +1 @@
00000000000000000000000000000000 0 0 0 0 00 000000000
0000 0 0 0 0 0 00 000000000
000000 0 0 0 00 0000000000000000000000
0000000000000000000000000000000 0 0000000000000000000 00000000000000000000 00000000000000000000000000000

View File

@@ -1,3 +1,3 @@
000000000000000000000000000000000000000000 00 00 0 000000
0000000000
00000000 0 00 00000000000000000000000000
000000000000000000000000000000000000
000000 000 00 0 000000
0000000000 0000000000000 0 00000000 00000000000000

View File

@@ -1,3 +1,3 @@
000000000000000000000000000000000000
000000 000 00 0 000000
0000000000 0000000000000 0 00000000 00000000000000
000000000000000000000000000000000000000000 00 00 0 000000
0000000000
00000000 0 00 00000000000000000000000000

View File

@@ -1 +1,3 @@
0000000000000000000000000000000000000000000000000000000000000000000000000000000000 0 00000000000000000
00000000000000000000000000 0 00000000
0000000000
000000000 000000000 000 0 00000000 0000000000000000000000000

View File

@@ -1,3 +1 @@
00000000000000000000000000 0 00000000
0000000000
000000000 000000000 000 0 00000000 0000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000000000000000000000 0 00000000000000000

View File

@@ -154,7 +154,7 @@
{ \
textVar[0] = B_BUFF_PLACEHOLDER_BEGIN; \
textVar[1] = B_BUFF_MOVE; \
textVar[2] = move; \
textVar[2] = (move & 0xFF); \
textVar[3] = (move & 0xFF00) >> 8; \
textVar[4] = B_BUFF_EOS; \
}

View File

@@ -1,6 +1,8 @@
#ifndef GUARD_BERRY_CRUSH_H
#define GUARD_BERRY_CRUSH_H
#include "main.h"
void sub_8020C70(MainCallback callback);
#endif // GUARD_BERRY_CRUSH_H

View File

@@ -725,7 +725,7 @@
#define FLAG_HIDE_ROUTE_111_VICTORIA_WINSTRATE 0x301
#define FLAG_HIDE_ROUTE_111_VIVI_WINSTRATE 0x302
#define FLAG_HIDE_ROUTE_111_VICKY_WINSTRATE 0x303
#define FLAG_HIDE_PETALYBURG_GYM_NORMAN 0x304
#define FLAG_HIDE_PETALBURG_GYM_NORMAN 0x304
#define FLAG_HIDE_SKY_PILLAR_TOP_RAYQUAZA_2 0x305
#define FLAG_HIDE_LILYCOVE_CONTEST_HALL_CONTEST_ATTENDANT_1 0x306
#define FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR 0x307

View File

@@ -9,4 +9,4 @@
#define MAP_SCRIPT_ON_DIVE_WARP 6
#define MAP_SCRIPT_ON_RETURN_TO_FIELD 7
#endif // GUARD_CONSTANTS_MAP_SCRIPTS_H
#endif // GUARD_CONSTANTS_MAP_SCRIPTS_H

View File

@@ -0,0 +1,413 @@
#ifndef GUARD_METATILE_LABELS_H
#define GUARD_METATILE_LABELS_H
// gTileset_General
#define METATILE_General_Grass 0x001
#define METATILE_General_TallGrass 0x00D
#define METATILE_General_LongGrass 0x015
#define METATILE_General_TallGrass_TreeUp 0x025
#define METATILE_General_Grass_TreeUp 0x00E
#define METATILE_General_TallGrass_TreeLeft 0x1C6
#define METATILE_General_TallGrass_TreeRight 0x1C7
#define METATILE_General_Grass_TreeLeft 0x1CE
#define METATILE_General_Grass_TreeRight 0x1CF
#define METATILE_General_MuddySlope_Frame0 0x0E8
#define METATILE_General_MuddySlope_Frame1 0x0E9
#define METATILE_General_MuddySlope_Frame2 0x0EA
#define METATILE_General_MuddySlope_Frame3 0x0EB
#define METATILE_General_SandPit_Center 0x121
#define METATILE_General_CaveEntrance_Top 0x09F
#define METATILE_General_CaveEntrance_Bottom 0x0A7
#define METATILE_General_RockWall_GrassBase 0x079
#define METATILE_General_RockWall_RockBase 0x07C
#define METATILE_General_RockWall_SandBase 0x091
#define METATILE_General_CalmWater 0x170
#define METATILE_General_RoughWater 0x14E
#define METATILE_General_RoughDeepWater 0x14F
#define METATILE_General_ReflectiveWater 0x0A1
// gTileset_Building
#define METATILE_Building_PC_Off 0x004
#define METATILE_Building_PC_On 0x005
// gTileset_MauvilleGym
#define METATILE_MauvilleGym_RaisedSwitch 0x205
#define METATILE_MauvilleGym_PressedSwitch 0x206
#define METATILE_MauvilleGym_FloorTile 0x21A
#define METATILE_MauvilleGym_GreenBeamH1_On 0x220
#define METATILE_MauvilleGym_GreenBeamH2_On 0x221
#define METATILE_MauvilleGym_GreenBeamH3_On 0x228
#define METATILE_MauvilleGym_GreenBeamH4_On 0x229
#define METATILE_MauvilleGym_GreenBeamH1_Off 0x230
#define METATILE_MauvilleGym_GreenBeamH2_Off 0x231
#define METATILE_MauvilleGym_GreenBeamH3_Off 0x238
#define METATILE_MauvilleGym_GreenBeamH4_Off 0x239
#define METATILE_MauvilleGym_RedBeamH1_On 0x222
#define METATILE_MauvilleGym_RedBeamH2_On 0x223
#define METATILE_MauvilleGym_RedBeamH3_On 0x22A
#define METATILE_MauvilleGym_RedBeamH4_On 0x22B
#define METATILE_MauvilleGym_RedBeamH1_Off 0x232
#define METATILE_MauvilleGym_RedBeamH2_Off 0x233
#define METATILE_MauvilleGym_RedBeamH3_Off 0x23A
#define METATILE_MauvilleGym_RedBeamH4_Off 0x23B
#define METATILE_MauvilleGym_GreenBeamV1_On 0x240
#define METATILE_MauvilleGym_GreenBeamV2_On 0x248
#define METATILE_MauvilleGym_RedBeamV1_On 0x241
#define METATILE_MauvilleGym_RedBeamV2_On 0x249
#define METATILE_MauvilleGym_PoleTop_On 0x250
#define METATILE_MauvilleGym_PoleTop_Off 0x251
#define METATILE_MauvilleGym_PoleBottom_On 0x242
#define METATILE_MauvilleGym_PoleBottom_Off 0x243
// gTileset_PetalburgGym
#define METATILE_PetalburgGym_RoomEntrance_Left 0x210
#define METATILE_PetalburgGym_RoomEntrance_Right 0x211
#define METATILE_PetalburgGym_SlidingDoor_Frame0 0x218
#define METATILE_PetalburgGym_SlidingDoor_Frame1 0x219
#define METATILE_PetalburgGym_SlidingDoor_Frame2 0x21A
#define METATILE_PetalburgGym_SlidingDoor_Frame3 0x21B
#define METATILE_PetalburgGym_SlidingDoor_Frame4 0x21C
// gTileset_MossdeepGym
#define METATILE_MossdeepGym_Obelisk_Top 0x204
#define METATILE_MossdeepGym_Obelisk_Base 0x20C
#define METATILE_MossdeepGym_Wall_LeftCorner 0x20D
#define METATILE_MossdeepGym_OuterWall_RightCorner 0x205
#define METATILE_MossdeepGym_Empty0 0x238
#define METATILE_MossdeepGym_Empty1 0x239
// gTileset_BrendansMaysHouse
#define METATILE_BrendansMaysHouse_BrendanPC_Off 0x25A
#define METATILE_BrendansMaysHouse_BrendanPC_On 0x27F
#define METATILE_BrendansMaysHouse_MayPC_Off 0x259
#define METATILE_BrendansMaysHouse_MayPC_On 0x27E
#define METATILE_BrendansMaysHouse_MovingBox_Closed 0x268
#define METATILE_BrendansMaysHouse_MovingBox_Open 0x270
#define METATILE_BrendansMaysHouse_BookOnTable 0x293
// gTileset_Shop
#define METATILE_Shop_Laptop1_Normal 0x29D
#define METATILE_Shop_Laptop2_Normal 0x2A5
#define METATILE_Shop_Laptop1_Flash 0x258
#define METATILE_Shop_Laptop2_Flash 0x260
// gTileset_BattleFrontier
#define METATILE_BattleFrontier_CorridorOpenDoor_Top 0x207
#define METATILE_BattleFrontier_CorridorOpenDoor_Bottom 0x20F
#define METATILE_BattleFrontier_Elevator_Top0 0x329
#define METATILE_BattleFrontier_Elevator_Top1 0x32A
#define METATILE_BattleFrontier_Elevator_Top2 0x32B
#define METATILE_BattleFrontier_Elevator_Mid0 0x331
#define METATILE_BattleFrontier_Elevator_Mid1 0x332
#define METATILE_BattleFrontier_Elevator_Mid2 0x333
#define METATILE_BattleFrontier_Elevator_Bottom0 0x339
#define METATILE_BattleFrontier_Elevator_Bottom1 0x33A
#define METATILE_BattleFrontier_Elevator_Bottom2 0x33B
// gTileset_Cave
#define METATILE_Cave_EntranceCover 0x229
#define METATILE_Cave_SealedChamberEntrance_TopLeft 0x22A
#define METATILE_Cave_SealedChamberEntrance_TopMid 0x22B
#define METATILE_Cave_SealedChamberEntrance_TopRight 0x22C
#define METATILE_Cave_SealedChamberEntrance_BottomLeft 0x232
#define METATILE_Cave_SealedChamberEntrance_BottomMid 0x233
#define METATILE_Cave_SealedChamberEntrance_BottomRight 0x234
#define METATILE_Cave_SealedChamberBraille_Mid 0x235
#define METATILE_Cave_ShoalCave_DirtPile_Large 0x358
#define METATILE_Cave_ShoalCave_DirtPile_Small 0x35A
#define METATILE_Cave_ShoalCave_BlueStone_Large 0x359
#define METATILE_Cave_ShoalCave_BlueStone_Small 0x35B
// gTileset_Pacifidlog
#define METATILE_Pacifidlog_FloatingLogs_Horizontal0 0x250
#define METATILE_Pacifidlog_FloatingLogs_Horizontal1 0x251
#define METATILE_Pacifidlog_HalfSubmergedLogs_Horizontal0 0x252
#define METATILE_Pacifidlog_HalfSubmergedLogs_Horizontal1 0x253
#define METATILE_Pacifidlog_SubmergedLogs_Horizontal0 0x254
#define METATILE_Pacifidlog_SubmergedLogs_Horizontal1 0x255
#define METATILE_Pacifidlog_FloatingLogs_Vertical0 0x258
#define METATILE_Pacifidlog_FloatingLogs_Vertical1 0x260
#define METATILE_Pacifidlog_HalfSubmergedLogs_Vertical0 0x259
#define METATILE_Pacifidlog_HalfSubmergedLogs_Vertical1 0x261
#define METATILE_Pacifidlog_SubmergedLogs_Vertical0 0x25A
#define METATILE_Pacifidlog_SubmergedLogs_Vertical1 0x262
#define METATILE_Pacifidlog_SkyPillar_DoorOpen_Top 0x2AA
#define METATILE_Pacifidlog_SkyPillar_DoorOpen_Bottom 0x2B2
// gTileset_Fortree
#define METATILE_Fortree_LongGrass_Root 0x208
#define METATILE_Fortree_BridgeOverGrass_Raised 0x24E
#define METATILE_Fortree_BridgeOverGrass_Lowered 0x24F
#define METATILE_Fortree_BridgeOverTrees_Raised 0x256
#define METATILE_Fortree_BridgeOverTrees_Lowered 0x257
#define METATILE_Fortree_SecretBase_LongGrass_TopLeft 0x279
#define METATILE_Fortree_SecretBase_LongGrass_TopMid 0x27A
#define METATILE_Fortree_SecretBase_LongGrass_TopRight 0x27B
#define METATILE_Fortree_SecretBase_LongGrass_BottomLeft 0x281
#define METATILE_Fortree_SecretBase_LongGrass_BottomMid 0x282
#define METATILE_Fortree_SecretBase_LongGrass_BottomRight 0x283
#define METATILE_Fortree_WoodBridge_Kecleon0 0x297
#define METATILE_Fortree_WoodBridge_Kecleon1 0x29F
// gTileset_Sootopolis
#define METATILE_Sootopolis_Door_Closed 0x248
#define METATILE_Sootopolis_GymDoor_Closed 0x250
#define METATILE_Sootopolis_RoughWater 0x290
// gTileset_SootopolisGym
#define METATILE_SootopolisGym_Ice_Cracked 0x20E
#define METATILE_SootopolisGym_Ice_Broken 0x206
#define METATILE_SootopolisGym_Stairs 0x207
// gTileset_Fallarbor
#define METATILE_Fallarbor_AshGrass 0x20A
#define METATILE_Fallarbor_NormalGrass 0x212
#define METATILE_Fallarbor_AshField 0x218
#define METATILE_Fallarbor_BrownCaveEntrance_Top 0x259
#define METATILE_Fallarbor_BrownCaveEntrance_Bottom 0x261
#define METATILE_Fallarbor_RedCaveEntrance_Top 0x347
#define METATILE_Fallarbor_RedCaveEntrance_Bottom 0x34F
#define METATILE_Fallarbor_BrownRockWall 0x265
#define METATILE_Fallarbor_RedRockWall 0x269
// gTileset_Lavaridge
#define METATILE_Lavaridge_NormalGrass 0x206
#define METATILE_Lavaridge_AshGrass 0x207
#define METATILE_Lavaridge_LavaField 0x271
#define METATILE_Lavaridge_RockWall 0x274
#define METATILE_Lavaridge_CaveEntrance_Top 0x256
#define METATILE_Lavaridge_CaveEntrance_Bottom 0x25E
// gTileset_Mauville
#define METATILE_Mauville_DeepSand_Center 0x251
#define METATILE_Mauville_DeepSand_BottomMid 0x259
#define METATILE_Mauville_MirageTower_Tile0 0x3D8
#define METATILE_Mauville_MirageTower_Tile1 0x3D9
#define METATILE_Mauville_MirageTower_Tile2 0x3DA
#define METATILE_Mauville_MirageTower_Tile3 0x3E0
#define METATILE_Mauville_MirageTower_Tile4 0x3E1
#define METATILE_Mauville_MirageTower_Tile5 0x3E2
#define METATILE_Mauville_MirageTower_Tile6 0x3E8
#define METATILE_Mauville_MirageTower_Tile7 0x3E9
#define METATILE_Mauville_MirageTower_Tile8 0x3EA
#define METATILE_Mauville_MirageTower_Tile9 0x3F0
#define METATILE_Mauville_MirageTower_TileA 0x3F1
#define METATILE_Mauville_MirageTower_TileB 0x3F2
#define METATILE_Mauville_MirageTower_TileC 0x3DB
#define METATILE_Mauville_MirageTower_TileD 0x3DC
#define METATILE_Mauville_MirageTower_TileE 0x3DD
#define METATILE_Mauville_MirageTower_TileF 0x3E3
#define METATILE_Mauville_MirageTower_Tile10 0x3E4
#define METATILE_Mauville_MirageTower_Tile11 0x3E5
// gTileset_PokemonCenter
#define METATILE_PokemonCenter_Elevator1F_Tile0_Frame0 0x280
#define METATILE_PokemonCenter_Elevator1F_Tile0_Frame1 0x282
#define METATILE_PokemonCenter_Elevator1F_Tile0_Frame2 0x284
#define METATILE_PokemonCenter_Elevator1F_Tile1_Frame0 0x281
#define METATILE_PokemonCenter_Elevator1F_Tile1_Frame1 0x283
#define METATILE_PokemonCenter_Elevator1F_Tile1_Frame2 0x285
#define METATILE_PokemonCenter_Elevator1F_Tile2_Frame0 0x288
#define METATILE_PokemonCenter_Elevator1F_Tile2_Frame1 0x28A
#define METATILE_PokemonCenter_Elevator1F_Tile2_Frame2 0x28C
#define METATILE_PokemonCenter_Elevator1F_Tile3_Frame0 0x289
#define METATILE_PokemonCenter_Elevator1F_Tile3_Frame1 0x28B
#define METATILE_PokemonCenter_Elevator1F_Tile3_Frame2 0x28D
#define METATILE_PokemonCenter_Elevator2F_Tile0_Frame0 0x2A0
#define METATILE_PokemonCenter_Elevator2F_Tile0_Frame1 0x2A2
#define METATILE_PokemonCenter_Elevator2F_Tile0_Frame2 0x2A4
#define METATILE_PokemonCenter_Elevator2F_Tile1_Frame0 0x2A1
#define METATILE_PokemonCenter_Elevator2F_Tile1_Frame1 0x2A3
#define METATILE_PokemonCenter_Elevator2F_Tile1_Frame2 0x2A5
#define METATILE_PokemonCenter_Elevator2F_Tile2_Frame0 0x2A8
#define METATILE_PokemonCenter_Elevator2F_Tile2_Frame1 0x2AA
#define METATILE_PokemonCenter_Elevator2F_Tile2_Frame2 0x2AC
#define METATILE_PokemonCenter_Floor_ShadowTop_Alt 0x2DC
#define METATILE_PokemonCenter_Floor_Plain_Alt 0x2E4
#define METATILE_PokemonCenter_Floor_ShadowTop 0x21E
#define METATILE_PokemonCenter_CounterBarrier 0x25D
// gTileset_InsideOfTruck
#define METATILE_InsideOfTruck_ExitLight_Top 0x208
#define METATILE_InsideOfTruck_ExitLight_Mid 0x210
#define METATILE_InsideOfTruck_ExitLight_Bottom 0x218
#define METATILE_InsideOfTruck_DoorClosedFloor_Top 0x20D
#define METATILE_InsideOfTruck_DoorClosedFloor_Mid 0x215
#define METATILE_InsideOfTruck_DoorClosedFloor_Bottom 0x21D
// gTileset_MossdeepGameCorner
#define METATILE_MossdeepGameCorner_CounterOpen_Top 0x22C
#define METATILE_MossdeepGameCorner_CounterOpen_Bottom 0x234
#define METATILE_MossdeepGameCorner_CounterClosed_Top 0x22A
#define METATILE_MossdeepGameCorner_CounterClosed_Bottom 0x232
// gTileset_EliteFour
#define METATILE_EliteFour_OpenDoor_Frame 0x344
#define METATILE_EliteFour_OpenDoor_Opening 0x345
#define METATILE_EliteFour_OpenDoorChampion_Frame 0x346
#define METATILE_EliteFour_OpenDoorChampion_Opening 0x347
#define METATILE_EliteFour_LeftSpotlightOff 0x2DD
#define METATILE_EliteFour_RightSpotlightOff 0x2DE
#define METATILE_EliteFour_EntryDoor_ClosedTop 0x206
#define METATILE_EliteFour_EntryDoor_ClosedBottom 0x20E
// gTileset_InsideShip
#define METATILE_InsideShip_InTactDoor0_Bottom 0x233
#define METATILE_InsideShip_InTactDoor1_Bottom 0x22B
#define METATILE_InsideShip_DoorIndent1 0x21A
#define METATILE_InsideShip_DoorIndent0 0x234
// gTileset_BattlePike
#define METATILE_BattlePike_Curtain_Stage0_Tile0 0x24A
#define METATILE_BattlePike_Curtain_Stage0_Tile1 0x251
#define METATILE_BattlePike_Curtain_Stage0_Tile2 0x252
#define METATILE_BattlePike_Curtain_Stage0_Tile3 0x253
#define METATILE_BattlePike_Curtain_Stage0_Tile4 0x259
#define METATILE_BattlePike_Curtain_Stage0_Tile5 0x25A
#define METATILE_BattlePike_Curtain_Stage0_Tile6 0x25B
#define METATILE_BattlePike_Curtain_Stage1_Tile0 0x22A
#define METATILE_BattlePike_Curtain_Stage1_Tile1 0x231
#define METATILE_BattlePike_Curtain_Stage1_Tile2 0x232
#define METATILE_BattlePike_Curtain_Stage1_Tile3 0x233
#define METATILE_BattlePike_Curtain_Stage1_Tile4 0x239
#define METATILE_BattlePike_Curtain_Stage1_Tile5 0x23A
#define METATILE_BattlePike_Curtain_Stage1_Tile6 0x23B
#define METATILE_BattlePike_Curtain_Stage2_Tile0 0x20A
#define METATILE_BattlePike_Curtain_Stage2_Tile1 0x211
#define METATILE_BattlePike_Curtain_Stage2_Tile2 0x212
#define METATILE_BattlePike_Curtain_Stage2_Tile3 0x213
#define METATILE_BattlePike_Curtain_Stage2_Tile4 0x219
#define METATILE_BattlePike_Curtain_Stage2_Tile5 0x21A
#define METATILE_BattlePike_Curtain_Stage2_Tile6 0x21B
#define METATILE_BattlePike_Curtain_Stage3_Tile0 0x2AB
#define METATILE_BattlePike_Curtain_Stage3_Tile1 0x2B2
#define METATILE_BattlePike_Curtain_Stage3_Tile2 0x2B3
#define METATILE_BattlePike_Curtain_Stage3_Tile3 0x2B4
#define METATILE_BattlePike_Curtain_Stage3_Tile4 0x2BA
#define METATILE_BattlePike_Curtain_Stage3_Tile5 0x2BB
#define METATILE_BattlePike_Curtain_Stage3_Tile6 0x2BC
// gTileset_Lilycove
#define METATILE_Lilycove_Wailmer0 0x290
#define METATILE_Lilycove_Wailmer1 0x291
#define METATILE_Lilycove_Wailmer2 0x2A0
#define METATILE_Lilycove_Wailmer3 0x2A1
#define METATILE_Lilycove_Wailmer0_Alt 0x298
#define METATILE_Lilycove_Wailmer1_Alt 0x299
// gTileset_Contest
#define METATILE_Contest_WallShadow 0x221
#define METATILE_Contest_FloorShadow 0x261
#define METATILE_Contest_CounterFlap_Top 0x2D1
#define METATILE_Contest_CounterFlap_Bottom 0x2D9
// gTileset_LilycoveMuseum
#define METATILE_LilycoveMuseum_Painting0_Left 0x25A
#define METATILE_LilycoveMuseum_Painting0_Right 0x25B
#define METATILE_LilycoveMuseum_Painting1_Left 0x25C
#define METATILE_LilycoveMuseum_Painting1_Right 0x25D
#define METATILE_LilycoveMuseum_Painting2_Left 0x25E
#define METATILE_LilycoveMuseum_Painting2_Right 0x25F
#define METATILE_LilycoveMuseum_Painting3_Left 0x260
#define METATILE_LilycoveMuseum_Painting3_Right 0x261
#define METATILE_LilycoveMuseum_Painting4_Left 0x262
#define METATILE_LilycoveMuseum_Painting4_Right 0x263
// gTileset_MeteorFalls
#define METATILE_MeteorFalls_CaveEntrance_Top 0x246
#define METATILE_MeteorFalls_CaveEntrance_Left 0x24D
#define METATILE_MeteorFalls_CaveEntrance_Bottom 0x24E
#define METATILE_MeteorFalls_CaveEntrance_Right 0x24F
// gTileset_Facility
#define METATILE_Facility_NewMauvilleDoor_Closed_Tile0 0x314
#define METATILE_Facility_NewMauvilleDoor_Closed_Tile1 0x315
#define METATILE_Facility_NewMauvilleDoor_Closed_Tile2 0x316
#define METATILE_Facility_NewMauvilleDoor_Closed_Tile3 0x31C
#define METATILE_Facility_NewMauvilleDoor_Closed_Tile4 0x31D
#define METATILE_Facility_NewMauvilleDoor_Closed_Tile5 0x31E
#define METATILE_Facility_NewMauvilleDoor_Open_Tile0 0x2C3
#define METATILE_Facility_NewMauvilleDoor_Open_Tile1 0x2C4
#define METATILE_Facility_NewMauvilleDoor_Open_Tile2 0x2C5
#define METATILE_Facility_NewMauvilleDoor_Open_Tile3 0x2CB
#define METATILE_Facility_NewMauvilleDoor_Open_Tile4 0x2CC
#define METATILE_Facility_NewMauvilleDoor_Open_Tile5 0x2CD
#define METATILE_Facility_DataPad 0x3E4
// gTileset_GenericBuilding
#define METATILE_GenericBuilding_TableEdge 0x2F1
#define METATILE_GenericBuilding_TrickHouse_Door_Closed 0x21B
#define METATILE_GenericBuilding_TrickHouse_Stairs_Down 0x219
// gTileset_TrickHousePuzzle
#define METATILE_TrickHousePuzzle_Stairs_Down 0x20B
#define METATILE_TrickHousePuzzle_Lever_Off 0x23E
#define METATILE_TrickHousePuzzle_Lever_On 0x23F
#define METATILE_TrickHousePuzzle_Button_Up 0x258
#define METATILE_TrickHousePuzzle_Button_Pressed 0x259
#define METATILE_TrickHousePuzzle_Door_Shuttered 0x26A
#define METATILE_TrickHousePuzzle_Floor_ShadowTop_Alt 0x252
#define METATILE_TrickHousePuzzle_Floor_ShadowTop 0x255
#define METATILE_TrickHousePuzzle_BlueDoorH_Open_Tile0 0x24B
#define METATILE_TrickHousePuzzle_BlueDoorH_Open_Tile1 0x24C
#define METATILE_TrickHousePuzzle_BlueDoorH_Open_Tile2 0x253
#define METATILE_TrickHousePuzzle_BlueDoorH_Open_Tile3 0x254
#define METATILE_TrickHousePuzzle_BlueDoorH_Closed_Tile0 0x23B
#define METATILE_TrickHousePuzzle_BlueDoorH_Closed_Tile1 0x23C
#define METATILE_TrickHousePuzzle_BlueDoorH_Closed_Tile2 0x243
#define METATILE_TrickHousePuzzle_BlueDoorH_Closed_Tile3 0x244
#define METATILE_TrickHousePuzzle_RedDoorH_Open_Tile0 0x248
#define METATILE_TrickHousePuzzle_RedDoorH_Open_Tile1 0x249
#define METATILE_TrickHousePuzzle_RedDoorH_Open_Tile2 0x250
#define METATILE_TrickHousePuzzle_RedDoorH_Open_Tile3 0x251
#define METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile0 0x238
#define METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile1 0x239
#define METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile2 0x240
#define METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile3 0x241
#define METATILE_TrickHousePuzzle_BlueDoorV_Retracted 0x24D
#define METATILE_TrickHousePuzzle_RedDoorV_Retracted 0x24A
#define METATILE_TrickHousePuzzle_RedDoorV_Open0 0x23A
#define METATILE_TrickHousePuzzle_RedDoorV_Open1 0x242
#define METATILE_TrickHousePuzzle_BlueDoorV_Open0 0x23D
#define METATILE_TrickHousePuzzle_BlueDoorV_Open1 0x245
#define METATILE_TrickHousePuzzle_Arrow_RedOnBlack_Right 0x260
#define METATILE_TrickHousePuzzle_Arrow_RedOnBlack_Left 0x261
#define METATILE_TrickHousePuzzle_Arrow_RedOnBlack_Up 0x262
#define METATILE_TrickHousePuzzle_Arrow_RedOnBlack_Down 0x263
#define METATILE_TrickHousePuzzle_Arrow_RedOnBlack_Left_Alt 0x27B
#define METATILE_TrickHousePuzzle_Arrow_RedOnBlack_Right_Alt 0x27C
// gTileset_BikeShop
#define METATILE_BikeShop_Barrier_Hidden_Top 0x269
#define METATILE_BikeShop_Barrier_Hidden_Bottom 0x271
#define METATILE_BikeShop_Floor_Shadow_Top 0x26D
#define METATILE_BikeShop_Wall_Edge_Top 0x281
#define METATILE_BikeShop_Button_Pressed 0x24F
#define METATILE_BikeShop_Button_Green 0x22E
#define METATILE_BikeShop_Button_Blue 0x236
#define METATILE_BikeShop_Barrier_Green_Top 0x2B6
#define METATILE_BikeShop_Barrier_Green_TopMid 0x2BE
#define METATILE_BikeShop_Barrier_Green_BottomMid 0x2C6
#define METATILE_BikeShop_Barrier_Green_Bottom 0x2CE
#define METATILE_BikeShop_Barrier_Blue_Top 0x2B7
#define METATILE_BikeShop_Barrier_Blue_TopMid 0x2BF
#define METATILE_BikeShop_Barrier_Blue_BottomMid 0x2C7
#define METATILE_BikeShop_Barrier_Blue_Bottom 0x2CF
#define METATILE_BikeShop_Generator_Off_Tile0 0x2F0
#define METATILE_BikeShop_Generator_Off_Tile1 0x2F1
#define METATILE_BikeShop_Generator_Off_Tile2 0x2F2
#define METATILE_BikeShop_Generator_Off_Tile3 0x2F3
#define METATILE_BikeShop_Generator_Off_Tile4 0x2F4
#define METATILE_BikeShop_Generator_Off_Tile5 0x2F5
#define METATILE_BikeShop_Generator_Off_Tile6 0x2F6
#define METATILE_BikeShop_Generator_Off_Tile7 0x2F7
// gTileset_TrainerHill
#define METATILE_TrainerHill_GreenFloorTile 0x307
#define METATILE_TrainerHill_CounterDoor 0x334
// gTileset_Underwater
#define METATILE_Underwater_RockWall 0x21E
#define METATILE_Underwater_FloorShadow 0x228
#endif // GUARD_METATILE_LABELS_H

View File

@@ -82,4 +82,7 @@
#define NUM_STATS 6
#define NUM_BATTLE_STATS 8
// Shiny odds
#define SHINY_ODDS 8 // Actual probability is SHINY_ODDS/65536
#endif // GUARD_CONSTANTS_POKEMON_H

View File

@@ -26,4 +26,4 @@
#define TRAINER_HILL_PLAYER_STATUS_ECARD_SCANNED 1
#define TRAINER_HILL_PLAYER_STATUS_NORMAL 2
#endif
#endif

View File

@@ -202,8 +202,8 @@
#define FACILITY_CLASSES_COUNT 0x52
#define TRAINER_CLASS_PKMN_TRAINER_1 0x0
#define TRAINER_CLASS_PKMN_TRAINER_2 0x1
#define TRAINER_CLASS_PKMN_TRAINER_1 0x0 // Unused
#define TRAINER_CLASS_PKMN_TRAINER_2 0x1 // Unused
#define TRAINER_CLASS_HIKER 0x2
#define TRAINER_CLASS_TEAM_AQUA 0x3
#define TRAINER_CLASS_PKMN_BREEDER 0x4
@@ -250,7 +250,7 @@
#define TRAINER_CLASS_SWIMMER_F 0x2d
#define TRAINER_CLASS_TWINS 0x2e
#define TRAINER_CLASS_SAILOR 0x2f
#define TRAINER_CLASS_COOLTRAINER_UNUSED 0x30
#define TRAINER_CLASS_COOLTRAINER_2 0x30 // Used for only one trainer.
#define TRAINER_CLASS_MAGMA_ADMIN 0x31
#define TRAINER_CLASS_PKMN_TRAINER_3 0x32
#define TRAINER_CLASS_BUG_CATCHER 0x33
@@ -267,7 +267,7 @@
#define TRAINER_CLASS_FACTORY_HEAD 0x3e
#define TRAINER_CLASS_PIKE_QUEEN 0x3f
#define TRAINER_CLASS_PYRAMID_KING 0x40
#define TRAINER_CLASS_PKMN_TRAINER_4 0x41
#define TRAINER_CLASS_RS_PROTAG 0x41
#define TRAINER_ENCOUNTER_MUSIC_MALE 0 // standard male encounter music
#define TRAINER_ENCOUNTER_MUSIC_FEMALE 1 // standard female encounter music

View File

@@ -0,0 +1,8 @@
#ifndef GUARD_DODRIO_BERRY_PICKING_H
#define GUARD_DODRIO_BERRY_PICKING_H
void sub_802493C(u16 a0, void (*callback)(void));
void sub_8027A5C(void);
void sub_8027AAC(void);
#endif // GUARD_DODRIO_BERRY_PICKING_H

View File

@@ -23,9 +23,9 @@ int GetMapBorderIdAt(int x, int y);
int CanCameraMoveInDirection(int direction);
u16 GetBehaviorByMetatileId(u16 metatileId);
void GetCameraFocusCoords(u16 *x, u16 *y);
u8 MapGridGetMetatileLayerTypeAt(s32 x, s32 y);
u8 MapGridGetMetatileLayerTypeAt(int x, int y);
u8 MapGridGetZCoordAt(int x, int y);
u8 CameraMove(s32 deltaX, s32 deltaY);
bool8 CameraMove(int deltaX, int deltaY);
struct MapConnection *sub_8088950(u8 direction, int x, int y);
bool8 sub_80889A8(u8 direction, int x, int y, struct MapConnection *connection);
bool8 sub_8088A0C(int x, int src_width, int dest_width, int offset);

View File

@@ -6,9 +6,16 @@
#define TRUE 1
#define FALSE 0
#define BSS_DATA __attribute__((section(".bss")))
#define IWRAM_DATA __attribute__((section("iwram_data")))
#define EWRAM_DATA __attribute__((section("ewram_data")))
#if MODERN
#define NOINLINE __attribute__((noinline))
#else
#define NOINLINE
#endif
#define ALIGNED(n) __attribute__((aligned(n)))
#define SOUND_INFO_PTR (*(struct SoundInfo **)0x3007FF0)

View File

@@ -8,6 +8,8 @@
#define METATILE_COLLISION_SHIFT 10
#define METATILE_ELEVATION_MASK 0xF000
#define METATILE_ID(tileset, name) (METATILE_##tileset##_##name)
enum
{
CONNECTION_SOUTH = 1,

View File

@@ -2,6 +2,7 @@
#define GUARD_GLOBAL_H
#include <string.h>
#include <limits.h>
#include "config.h" // we need to define config before gba headers as print stuff needs the functions nulled before defines.
#include "gba/gba.h"
#include "constants/global.h"
@@ -62,6 +63,10 @@
#define min(a, b) ((a) < (b) ? (a) : (b))
#define max(a, b) ((a) >= (b) ? (a) : (b))
#if MODERN
#define abs(x) (((x) < 0) ? -(x) : (x))
#endif
// Extracts the upper 16 bits of a 32-bit number
#define HIHALF(n) (((n) & 0xFFFF0000) >> 16)
@@ -86,6 +91,11 @@
#define T2_READ_32(ptr) ((ptr)[0] + ((ptr)[1] << 8) + ((ptr)[2] << 16) + ((ptr)[3] << 24))
#define T2_READ_PTR(ptr) (void*) T2_READ_32(ptr)
// Macros for checking the joypad
#define TEST_BUTTON(field, button) ({(field) & (button);})
#define JOY_NEW(button) TEST_BUTTON(gMain.newKeys, button)
#define JOY_HELD(button) TEST_BUTTON(gMain.heldKeys, button)
#define S16TOPOSFLOAT(val) \
({ \
s16 v = (val); \
@@ -235,7 +245,7 @@ struct BattleTowerPokemon
u32 spAttackIV:5;
u32 spDefenseIV:5;
u32 gap:1;
u32 altAbility:1;
u32 abilityNum:1;
u32 personality;
u8 nickname[POKEMON_NAME_LENGTH + 1];
u8 friendship;
@@ -282,7 +292,7 @@ struct RentalMon
u16 monId;
u32 personality;
u8 ivs;
u8 abilityBit;
u8 abilityNum;
};
struct BattleDomeTrainer

View File

@@ -3301,10 +3301,10 @@ extern const u32 gPokedexSearch1_Tilemap[];
extern const u16 gPokedexSearchMenu_Pal[];
// berry tag screen
extern const u32 gUnknown_08D9BB44[];
extern const u32 gUnknown_08D9BF98[];
extern const u32 gUnknown_08D9C13C[];
extern const u32 gUnknown_08D9BEF0[];
extern const u32 gBerryCheck_Gfx[];
extern const u32 gBerryCheck_Pal[];
extern const u32 gBerryTag_Gfx[];
extern const u32 gBerryTag_Pal[];
// rayquaza scene gfx
extern const u32 gRaySceneGroudon_Gfx[];
@@ -3859,6 +3859,7 @@ extern const u8 gFireRedMenuElements_Gfx[];
// item menu graphics
extern const u32 gBagScreen_Gfx[];
extern const u32 gBagScreen_GfxTileMap[];
extern const u32 gBagScreenFemale_Pal[];
extern const u32 gBagScreenMale_Pal[];
extern const u8 gBagMenuHMIcon_Gfx[];
@@ -4004,10 +4005,13 @@ extern const u32 gBerryPalette_Starf[];
extern const u32 gBerryPic_Enigma[];
extern const u32 gBerryPalette_Enigma[];
//credits
extern const u32 gCreditsCopyrightEnd_Gfx[];
//pokenav
extern const u16 gPokenavCondition_Pal[];
extern const u32 gPokenavCondition_Gfx[];
extern const u32 gPokenavCondition_Tilemap[];
extern const u16 gPokenavOptions_Tilemap[];
extern const u32 gPokenavOptions_Gfx[];
extern const u16 gPokenavOptions_Pal[];
extern const u8 gPokenavConditionMarker_Gfx[];
extern const u16 gPokenavConditionMarker_Pal[];
extern const u16 gPokenavLeftHeader_Pal[];
@@ -4092,11 +4096,11 @@ extern const u16 gBattleInterface_BallDisplayPal[];
extern const u32 gBagSwapLineGfx[];
extern const u32 gBagSwapLinePal[];
extern const u32 gUnknown_08D9ADD0[];
extern const u32 gUnknown_08D9AE04[];
extern const u32 gBattleFrontierGfx_PyramidBag[];
extern const u32 gBattleFrontierGfx_PyramidBag_Pal[];
extern const u32 gBattleFrontierGfx_PyramidBagTileMap[];
extern const u32 gUnknown_08D9AF44[];
extern const u16 gUnknown_0860F074[];
extern const u32 gBattleFrontierGfx_PyramidBag[];
extern const u32 gTitleScreenEmeraldVersionGfx[];
extern const u32 gTitleScreenPressStartGfx[];
@@ -4762,7 +4766,6 @@ extern const u32 gBattleStatMask6_Pal[];
extern const u32 gBattleStatMask7_Pal[];
extern const u32 gBattleStatMask8_Pal[];
extern const u32 gUnknown_08D9A88C[];
extern const u32 gContestMiscGfx[];
extern const u32 gContestAudienceGfx[];
extern const u8 gContestApplauseMeterGfx[];
@@ -4936,6 +4939,9 @@ extern const u32 gLinkMiscMenu_Tilemap[];
// Use Pokeblock
extern const u8 gPokenavConditionCancel_Gfx[];
extern const u16 gPokenavConditionCancel_Pal[];
extern const u8 gUsePokeblockUpDown_Gfx[];
extern const u16 gUsePokeblockUpDown_Pal[];
extern const u16 gUsePokeblockCondition_Pal[];
// Berry Crush
extern const u32 gUnknown_08DE34B8[];

View File

@@ -29,9 +29,9 @@ struct BagStruct
u16 scrollPosition[POCKETS_COUNT];
};
extern struct BagStruct gUnknown_0203CE58;
extern struct BagStruct gBagPositionStruct;
struct UnkBagStruct
struct BagMenuStruct
{
void (*mainCallback2)(void);
u8 tilemapBuffer[0x800];
@@ -61,7 +61,7 @@ struct UnkBagStruct
u8 filler2[4];
};
extern struct UnkBagStruct *gUnknown_0203CE54;
extern struct BagMenuStruct *gBagMenu;
// Exported RAM declarations
@@ -85,7 +85,7 @@ void ResetBagScrollPositions(void);
void sub_81AABF0(void (*callback)(void));
void CB2_ChooseBerry(void);
void unknown_ItemMenu_Confirm(u8 taskId);
void bag_menu_yes_no(u8, u8, const struct YesNoFuncTable*);
void BagMenu_YesNo(u8, u8, const struct YesNoFuncTable*);
void sub_81AB9A8(u8 pocketId);

View File

@@ -1,11 +1,11 @@
#ifndef GUARD_ITEM_MENU_ICONS
#define GUARD_ITEM_MENU_ICONS
extern const struct CompressedSpriteSheet gUnknown_0857FB34;
extern const struct CompressedSpriteSheet gUnknown_0857FB3C;
extern const struct CompressedSpritePalette gUnknown_0857FB44;
extern const struct CompressedSpriteSheet gUnknown_0857FDEC;
extern const struct CompressedSpritePalette gUnknown_0857FDF4;
extern const struct CompressedSpriteSheet gBagMaleSpriteSheet;
extern const struct CompressedSpriteSheet gBagFemaleSpriteSheet;
extern const struct CompressedSpritePalette gBagPaletteTable;
extern const struct CompressedSpriteSheet gBerryCheckCircleSpriteSheet;
extern const struct CompressedSpritePalette gBerryCheckCirclePaletteTable;
void RemoveBagSprite(u8 id);
void AddBagVisualSprite(u8 bagPocketId);
@@ -19,7 +19,13 @@ void sub_80D4FC8(u8 arg0);
void sub_80D4FEC(u8 arg0);
u8 CreateBerryTagSprite(u8 id, s16 x, s16 y);
void FreeBerryTagSpritePalette(void);
u8 sub_80D511C(u8 berryId, u8 x, u8 y, bool8 startAffine);
u8 LoadSpinningBerryPicGfx(u8 berryId, u8 x, u8 y, bool8 startAffine);
u8 CreateBerryFlavorCircleSprite(s16 x);
#define TAG_BAG_GFX 100
#define TAG_ROTATING_BALL_GFX 101
#define TAG_BERRY_CHECK_CIRCLE_GFX 10000
#define TAG_BERRY_PIC_TILE 0xFFFF
#define TAG_BERRY_PIC_PAL 0x7544
#endif // GUARD_ITEM_MENU_ICONS

View File

@@ -275,15 +275,17 @@ void sub_8010FCC(u32 a0, u32 a1, u32 a2);
void sub_8011C84(void);
void sub_8012188(const u8 *name, struct UnkLinkRfuStruct_02022B14 *structPtr, u8 a2);
bool32 sub_8011B90(void);
void sub_800FE50(u16 *a0);
void sub_800FE50(void *a0);
bool32 sub_800E540(u16 id, u8 *name);
void sub_8011DE0(u32 arg0);
u8 sub_801100C(int a0);
u8 sub_801100C(s32 a0);
void sub_800EF7C(void);
bool8 sub_800DE7C(struct UnkLinkRfuStruct_02022B14 *buff1, u8 *buff2, u8 idx);
bool8 sub_800DF34(struct UnkLinkRfuStruct_02022B14 *buff1, u8 *buff2, u8 idx);
s32 sub_800E87C(u8 idx);
void sub_8011BA4(void);
void sub_8010198(void);
void sub_8011AC8(void);
void LinkRfu_FatalError(void);
bool32 sub_8011A9C(void);
void sub_80104B0(void);

View File

@@ -25,7 +25,7 @@ void InitStandardTextBoxWindows(void);
void sub_8197200(void);
u16 RunTextPrintersAndIsPrinter0Active(void);
void sub_81973A4(void);
void DrawDialogueFrame(u8, u8);
void DrawDialogueFrame(u8 windowId, bool8 copyToVram);
void ClearStdWindowAndFrame(u8 windowId, bool8 copyToVram);
u16 AddTextPrinterParameterized2(u8 windowId, u8 fontId, const u8 *str, u8 speed, void (*callback)(struct TextPrinterTemplate *, u16), u8 fgColor, u8 bgColor, u8 shadowColor);
void PrintPlayerNameOnWindow(u8, const u8*, u16, u16);

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