dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Slawter666
2018-09-07 11:50:23 +01:00
parent bc42c5054c ef62393289
commit 9dec2bdef8
440 changed files with 61013 additions and 100907 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.travis.yml
+1 -1
View File
@@ -14,7 +14,7 @@ cache:
apt: true
install:
- pushd $HOME
- travis_retry wget https://github.com/devkitPro/buildscripts/releases/download/devkitARM_r48/devkitARM_r48-linux.tar.xz
- travis_retry wget https://github.com/devkitPro/buildscripts/releases/download/devkitARM_r49/devkitARM_r49-linux.tar.xz
- tar xJf devkitARM*.tar.xz
- travis_retry git clone https://github.com/pret/agbcc.git
- cd agbcc && ./build.sh && ./install.sh $TRAVIS_BUILD_DIR
INSTALL.md
+72 -4
View File
@@ -8,16 +8,22 @@ Make sure that there is an environment variable called DEVKITARM with the path o
Then get the compiler from https://github.com/pret/agbcc and run the following commands.
./build.sh
./install.sh PATH_OF_POKEEMERALD_DIRECTORY
```
./build.sh
./install.sh PATH_OF_POKEEMERALD_DIRECTORY
```
Then in the pokeemerald directory, build the tools.
./build_tools.sh
```
./build_tools.sh
```
Finally, build the rom.
make
```
make
```
# Windows
@@ -26,3 +32,65 @@ Install [**devkitARM**](http://devkitpro.org/wiki/Getting_Started/devkitARM).
Then get the compiled tools from https://github.com/pret/pokeruby-tools. Copy the `tools/` folder over the `tools/` folder in your pokeemerald directory.
You can then build pokeemerald using `make` in the MSYS environment provided with devkitARM.
# Mac
Installing pokeemerald on a Mac requires macOS >= 10.12 (Sierra or higher).
Download a [devkitPRO pacman](https://github.com/devkitPro/pacman/releases/tag/v1.0.0)
Run the following commands in Terminal:
```
xcode-select --install
sudo dkp-pacman -S devkitARM
export DEVKITPRO=/opt/devkitpro
echo "export DEVKITPRO=$DEVKITPRO" >> ~/.bashrc
export DEVKITARM=$DEVKITPRO/devkitARM
echo "export DEVKITARM=$DEVKITARM" >> ~/.bashrc
echo "if [ -f ~/.bashrc ]; then . ~/.bashrc; fi" >> ~/.bash_profile
git clone https://github.com/pret/pokeemerald
git clone https://github.com/pret/agbcc
cd agbcc/
./build.sh
./install.sh ../pokeemerald
cd ../pokeemerald
./build_tools.sh
```
And build the ROM with `make`.
# Faster builds
After the first build, subsequent builds are faster. You can further speed up the build:
## Parallel build
This significantly speeds up the build on modern machines.
By default `make` only runs a single thread. You can tell `make` to run on multiple threads with `make -j`. See the manfile for usage (`man make`).
The optimal value for `-j` is the number of logical cores on your machine. You can run `nproc` to see the exact number.
```
$ nproc
8
```
If you have 8 cores, run: `make -j8`
`-j` on its own will spawn a new thread for each job. A clean build will have thousands of jobs, which will be slower than not using -j at all.
## Disable the dependency scanning
If you've only changed `.c` or `.s` files, you can 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 NODEP=1`
Makefile
+10 -4
View File
@@ -2,6 +2,11 @@ include $(DEVKITARM)/base_tools
export CPP := $(PREFIX)cpp
export LD := $(PREFIX)ld
TITLE := POKEMON EMER
GAME_CODE := BPEE
MAKER_CODE := 01
REVISION := 0
SHELL := /bin/bash -o pipefail
ROM := pokeemerald.gba
@@ -25,20 +30,20 @@ ASFLAGS := -mcpu=arm7tdmi
CC1 := tools/agbcc/bin/agbcc
override CFLAGS += -mthumb-interwork -Wimplicit -Wparentheses -Werror -O2 -fhex-asm
CPPFLAGS := -I tools/agbcc/include -iquote include -nostdinc -undef
CPPFLAGS := -I tools/agbcc/include -I tools/agbcc -iquote include -nostdinc -undef
LDFLAGS = -Map ../../$(MAP)
LIB := -L ../../tools/agbcc/lib -lgcc -lc
SHA1 := sha1sum -c
SHA1 := $(shell { command -v sha1sum || command -v shasum; } 2>/dev/null) -c
GFX := tools/gbagfx/gbagfx
AIF := tools/aif2pcm/aif2pcm
MID := $(abspath tools/mid2agb/mid2agb)
SCANINC := tools/scaninc/scaninc
PREPROC := tools/preproc/preproc
RAMSCRGEN := tools/ramscrgen/ramscrgen
FIX := tools/gbafix/gbafix
# Clear the default suffixes
.SUFFIXES:
@@ -166,5 +171,6 @@ $(ELF): $(OBJ_DIR)/ld_script.ld $(OBJS)
cd $(OBJ_DIR) && $(LD) $(LDFLAGS) -T ld_script.ld -o ../../$@ $(OBJS_REL) $(LIB)
$(ROM): $(ELF)
$(OBJCOPY) -O binary --gap-fill 0xFF --pad-to 0x9000000 $< $@
$(OBJCOPY) -O binary $< $@
$(FIX) $@ -p -t"$(TITLE)" -c$(GAME_CODE) -m$(MAKER_CODE) -r$(REVISION)
asm/battle_frontier_1.s
-13351
View File
File diff suppressed because it is too large Load Diff
asm/battle_frontier_2.s
+74 -74
View File
@@ -1244,7 +1244,7 @@ _0819AF1A:
movs r0, 0x1
adds r2, r6, 0
movs r3, 0x5
bl sub_81BF8EC
bl ShowPokemonSummaryScreen
_0819AF50:
add sp, 0x4
pop {r4-r6}
@@ -1867,7 +1867,7 @@ sub_819B484: @ 819B484
lsls r0, 24
lsrs r0, 24
str r0, [sp, 0x18]
ldr r1, =gUnknown_0203BC8C
ldr r1, =gFacilityTrainerMons
ldr r0, =gBattleFrontierMons
str r0, [r1]
ldrb r1, [r4]
@@ -1948,7 +1948,7 @@ _0819B572:
ldr r0, [r2]
adds r0, r4
adds r0, 0x8
ldr r1, =gUnknown_0203BC8C
ldr r1, =gFacilityTrainerMons
ldr r2, [r1]
lsls r5, 4
adds r2, r5, r2
@@ -1973,7 +1973,7 @@ _0819B5B8:
ldr r0, [r3]
adds r0, r4
adds r0, 0x8
ldr r5, =gUnknown_0203BC8C
ldr r5, =gFacilityTrainerMons
ldr r1, [r5]
adds r1, r7, r1
lsls r2, r6, 1
@@ -2045,7 +2045,7 @@ sub_819B63C: @ 819B63C
add r0, sp, 0xC
movs r1, 0
strb r1, [r0]
ldr r2, =gUnknown_0203BC8C
ldr r2, =gFacilityTrainerMons
ldr r0, =gSlateportBattleTentMons
str r0, [r2]
ldr r0, =gSaveBlock2Ptr
@@ -2089,7 +2089,7 @@ _0819B678:
adds r4, 0xC
adds r0, r4
adds r0, 0x8
ldr r3, =gUnknown_0203BC8C
ldr r3, =gFacilityTrainerMons
ldr r2, [r3]
mov r7, r8
lsls r5, r7, 4
@@ -2114,7 +2114,7 @@ _0819B6D4:
ldr r0, [r1]
adds r0, r4
adds r0, 0x8
ldr r3, =gUnknown_0203BC8C
ldr r3, =gFacilityTrainerMons
ldr r2, [r3]
mov r3, r8
lsls r1, r3, 4
@@ -2145,7 +2145,7 @@ _0819B6D4:
ldr r0, [r2]
adds r0, r4
adds r0, 0x8
ldr r3, =gUnknown_0203BC8C
ldr r3, =gFacilityTrainerMons
ldr r1, [r3]
adds r1, r5, r1
ldrb r2, [r1, 0xA]
@@ -2935,7 +2935,7 @@ sub_819BD70: @ 819BD70
adds r0, r5, 0
mov r2, r8
movs r3, 0x1
bl sub_818D7D8
bl CreateMonPicSprite_HandleDeoxys
ldr r1, [r6]
movs r2, 0xA6
lsls r2, 2
@@ -3053,7 +3053,7 @@ sub_819BE34: @ 819BE34
adds r0, r5, 0
mov r2, r9
movs r3, 0x1
bl sub_818D7D8
bl CreateMonPicSprite_HandleDeoxys
ldr r1, [r6]
movs r2, 0xA6
lsls r2, 2
@@ -3166,7 +3166,7 @@ _0819BF48:
adds r0, r5, 0
adds r2, r6, 0
movs r3, 0x1
bl sub_818D7D8
bl CreateMonPicSprite_HandleDeoxys
mov r2, r9
ldr r1, [r2]
add r1, r8
@@ -3846,19 +3846,19 @@ sub_819C568: @ 819C568
lsls r1, 2
adds r0, r1
ldrb r0, [r0]
bl sub_818D820
bl FreeAndDestroyMonPicSprite
ldr r0, [r4]
movs r1, 0xA6
lsls r1, 2
adds r0, r1
ldrb r0, [r0]
bl sub_818D820
bl FreeAndDestroyMonPicSprite
ldr r0, [r4]
movs r1, 0xA7
lsls r1, 2
adds r0, r1
ldrb r0, [r0]
bl sub_818D820
bl FreeAndDestroyMonPicSprite
ldr r0, =sub_819C2D4
movs r1, 0x1
bl CreateTask
@@ -3936,7 +3936,7 @@ sub_819C5D0: @ 819C5D0
sub_819C634: @ 819C634
push {r4-r7,lr}
lsls r0, 16
ldr r2, =gUnknown_0203BC8C
ldr r2, =gFacilityTrainerMons
ldr r1, [r2]
lsrs r0, 12
adds r0, r1
@@ -4373,7 +4373,7 @@ _0819C9C4:
str r0, [sp]
movs r0, 0
movs r3, 0x2
bl sub_81BF8EC
bl ShowPokemonSummaryScreen
_0819C9F0:
add sp, 0x4
pop {r4-r6}
@@ -6709,7 +6709,7 @@ _0819DDA8:
bl ResetSpriteData
bl ResetTasks
bl FreeAllSpritePalettes
bl dp13_810BB8C
bl ResetAllPicSprites
ldr r0, =gFrontierFactorySelectMenu_Gfx
ldr r5, =gUnknown_0203CE40
ldr r1, [r5]
@@ -9315,7 +9315,7 @@ sub_819F304: @ 819F304
adds r0, r5, 0
mov r1, r9
movs r3, 0x1
bl sub_818D7D8
bl CreateMonPicSprite_HandleDeoxys
ldr r1, [r6]
adds r1, 0x2C
strb r0, [r1]
@@ -9370,7 +9370,7 @@ sub_819F3F8: @ 819F3F8
lsrs r5, 24
lsls r0, r4, 24
lsrs r0, 24
bl sub_818D820
bl FreeAndDestroyMonPicSprite
ldr r0, =sub_819F7B4
movs r1, 0x1
bl CreateTask
@@ -9403,7 +9403,7 @@ sub_819F444: @ 819F444
adds r6, r1, 0
lsls r0, r4, 24
lsrs r0, 24
bl sub_818D820
bl FreeAndDestroyMonPicSprite
ldr r5, =gSprites
lsls r4, 16
lsrs r1, r4, 24
@@ -9996,7 +9996,7 @@ _0819F908:
adds r0, r4, 0
adds r2, r5, 0
movs r3, 0x1
bl sub_818D7D8
bl CreateMonPicSprite_HandleDeoxys
ldr r2, =gUnknown_03001284
ldr r1, [r2]
adds r1, 0x2C
@@ -11771,7 +11771,7 @@ sub_81A070C: @ 81A070C
ldrsh r0, [r4, r1]
cmp r0, 0
bne _081A0730
bl ProcessMenuInputNoWrapAround
bl Menu_ProcessInputNoWrapAround
b _081A0734
.pool
_081A0730:
@@ -11843,7 +11843,7 @@ sub_81A0784: @ 81A0784
movs r1, 0
adds r2, r4, 0
adds r3, r5, 0
bl sub_8198A50
bl CreateWindowTemplate
ldr r0, [sp, 0x10]
ldr r1, [sp, 0x14]
str r0, [sp, 0x18]
@@ -14195,7 +14195,7 @@ sub_81A1B1C: @ 81A1B1C
thumb_func_start sub_81A1B28
sub_81A1B28: @ 81A1B28
ldr r1, =gUnknown_0203BC88
ldr r1, =gFacilityTrainers
ldr r0, =gBattleFrontierTrainers
str r0, [r1]
bx lr
@@ -17391,7 +17391,7 @@ _081A370C:
ldr r0, =0x0000012b
cmp r3, r0
bhi _081A3738
ldr r2, =gUnknown_0203BC88
ldr r2, =gFacilityTrainers
movs r0, 0x34
adds r1, r3, 0
muls r1, r0
@@ -17443,7 +17443,7 @@ _081A3794:
ldr r0, =0x0000012b
cmp r3, r0
bhi _081A37B8
ldr r2, =gUnknown_0203BC88
ldr r2, =gFacilityTrainers
movs r0, 0x34
adds r1, r3, 0
muls r1, r0
@@ -17511,7 +17511,7 @@ _081A3844:
ldr r0, =0x0000012b
cmp r3, r0
bhi _081A3868
ldr r2, =gUnknown_0203BC88
ldr r2, =gFacilityTrainers
movs r0, 0x34
adds r1, r3, 0
muls r1, r0
@@ -20046,10 +20046,10 @@ sub_81A4E04: @ 81A4E04
cmp r0, 0x1
bne _081A4E44
ldr r0, =0x000003fe
bl sub_81953A0
bl TrainerIdToDomeTournamentId
lsls r0, 16
lsrs r0, 16
bl sub_818FC78
bl GetTrainerMonCountInBits
adds r4, r0, 0
b _081A4E46
.pool
@@ -20059,7 +20059,7 @@ _081A4E46:
bl ZeroEnemyPartyMons
movs r1, 0
str r1, [sp, 0x18]
bl sub_8165C40
bl GetFacilityEnemyMonLevel
lsls r0, 24
lsrs r0, 24
str r0, [sp, 0x1C]
@@ -22329,7 +22329,7 @@ sub_81A61B0: @ 81A61B0
ldrh r0, [r1]
movs r1, 0x7
bl __udivsi3
ldr r2, =gUnknown_0203BC88
ldr r2, =gFacilityTrainers
ldr r1, =gBattleFrontierTrainers
str r1, [r2]
ldr r5, =0x00000cb2
@@ -22413,7 +22413,7 @@ _081A627A:
lsls r0, 16
lsrs r0, 16
mov r9, r0
ldr r4, =gUnknown_0203BC8C
ldr r4, =gFacilityTrainerMons
ldr r2, [r4]
lsls r1, r0, 4
adds r0, r1, r2
@@ -22458,7 +22458,7 @@ _081A62D0:
cmp r0, r5
beq _081A6302
adds r6, r4, 0
ldr r3, =gUnknown_0203BC8C
ldr r3, =gFacilityTrainerMons
mov r12, r3
mov r5, r8
ldr r3, [sp, 0x14]
@@ -22493,7 +22493,7 @@ _081A631C:
ldrh r1, [r3]
cmp r1, 0
beq _081A6336
ldr r6, =gUnknown_0203BC8C
ldr r6, =gFacilityTrainerMons
ldr r0, [r6]
ldr r6, [sp, 0x24]
adds r0, r6, r0
@@ -22512,7 +22512,7 @@ _081A633E:
cmp r2, r4
bne _081A636E
lsls r4, r7, 1
ldr r0, =gUnknown_0203BC8C
ldr r0, =gFacilityTrainerMons
ldr r1, [r0]
add r1, r8
ldrh r0, [r1]
@@ -22573,12 +22573,12 @@ sub_81A63CC: @ 81A63CC
ands r0, r1
cmp r0, 0x2
beq _081A63FC
ldr r1, =gUnknown_0203BC8C
ldr r1, =gFacilityTrainerMons
ldr r0, =gBattleFrontierMons
b _081A6400
.pool
_081A63FC:
ldr r1, =gUnknown_0203BC8C
ldr r1, =gFacilityTrainerMons
ldr r0, =gSlateportBattleTentMons
_081A6400:
str r0, [r1]
@@ -22637,7 +22637,7 @@ _081A6408:
adds r1, r2
strb r0, [r1]
ldrh r1, [r6]
ldr r0, =gUnknown_0203BC8C
ldr r0, =gFacilityTrainerMons
ldr r0, [r0]
lsls r1, 4
adds r1, r0
@@ -22679,7 +22679,7 @@ sub_81A64C4: @ 81A64C4
ands r0, r1
cmp r0, 0x2
bne _081A6500
ldr r1, =gUnknown_0203BC8C
ldr r1, =gFacilityTrainerMons
ldr r0, =gSlateportBattleTentMons
str r0, [r1]
movs r2, 0x1E
@@ -22687,7 +22687,7 @@ sub_81A64C4: @ 81A64C4
b _081A6518
.pool
_081A6500:
ldr r1, =gUnknown_0203BC8C
ldr r1, =gFacilityTrainerMons
ldr r0, =gBattleFrontierMons
str r0, [r1]
ldrb r1, [r2]
@@ -22712,7 +22712,7 @@ _081A6522:
mov r1, sp
adds r1, 0x12
str r1, [sp, 0x1C]
ldr r2, =gUnknown_0203BC8C
ldr r2, =gFacilityTrainerMons
mov r9, r2
_081A6534:
ldr r4, =gSaveBlock2Ptr
@@ -22879,7 +22879,7 @@ _081A666C:
_081A667A:
movs r2, 0
mov r8, r2
ldr r4, =gUnknown_0203BC8C
ldr r4, =gFacilityTrainerMons
mov r9, r4
_081A6682:
ldr r5, =gSaveBlock2Ptr
@@ -23050,7 +23050,7 @@ sub_81A67EC: @ 81A67EC
mov r5, r8
push {r5-r7}
sub sp, 0x4C
ldr r1, =gUnknown_0203BC88
ldr r1, =gFacilityTrainers
ldr r0, =gBattleFrontierTrainers
str r0, [r1]
mov r0, sp
@@ -23113,7 +23113,7 @@ _081A681A:
bne _081A6878
movs r2, 0x1
_081A6878:
ldr r1, =gUnknown_0203BC8C
ldr r1, =gFacilityTrainerMons
ldr r0, =gBattleFrontierMons
str r0, [r1]
mov r1, r9
@@ -23166,7 +23166,7 @@ _081A68F2:
bl sub_81A6EF0
lsls r0, 16
lsrs r7, r0, 16
ldr r0, =gUnknown_0203BC8C
ldr r0, =gFacilityTrainerMons
ldr r1, [r0]
lsls r2, r7, 4
adds r4, r2, r1
@@ -23226,7 +23226,7 @@ _081A6964:
ldrh r4, [r5]
cmp r4, 0
beq _081A6994
ldr r1, =gUnknown_0203BC8C
ldr r1, =gFacilityTrainerMons
ldr r0, [r1]
mov r2, r9
adds r1, r2, r0
@@ -23262,7 +23262,7 @@ _081A699C:
lsls r0, 4
adds r1, r0
strh r7, [r1]
ldr r2, =gUnknown_0203BC8C
ldr r2, =gFacilityTrainerMons
ldr r1, [r2]
add r1, r9
ldrh r0, [r1]
@@ -23307,7 +23307,7 @@ sub_81A6A08: @ 81A6A08
mov r7, r8
push {r7}
sub sp, 0x18
ldr r1, =gUnknown_0203BC8C
ldr r1, =gFacilityTrainerMons
ldr r0, =gBattleFrontierMons
str r0, [r1]
movs r4, 0
@@ -23326,7 +23326,7 @@ _081A6A1E:
movs r4, 0
ldr r0, =gUnknown_03006298
mov r8, r0
ldr r0, =gUnknown_0203BC8C
ldr r0, =gFacilityTrainerMons
ldr r6, [r0]
ldr r1, =gBaseStats
mov r12, r1
@@ -23423,7 +23423,7 @@ sub_81A6AEC: @ 81A6AEC
push {r4-r7,lr}
sub sp, 0x8
movs r7, 0
ldr r1, =gUnknown_0203BC8C
ldr r1, =gFacilityTrainerMons
ldr r0, =gBattleFrontierMons
str r0, [r1]
movs r4, 0
@@ -23445,7 +23445,7 @@ _081A6B0E:
ldrh r6, [r0]
movs r5, 0
_081A6B18:
ldr r0, =gUnknown_0203BC8C
ldr r0, =gFacilityTrainerMons
ldr r1, [r0]
lsls r0, r6, 4
adds r0, r1
@@ -23590,12 +23590,12 @@ sub_81A6C1C: @ 81A6C1C
ands r0, r1
cmp r0, 0x2
beq _081A6C48
ldr r1, =gUnknown_0203BC8C
ldr r1, =gFacilityTrainerMons
ldr r0, =gBattleFrontierMons
b _081A6C4C
.pool
_081A6C48:
ldr r1, =gUnknown_0203BC8C
ldr r1, =gFacilityTrainerMons
ldr r0, =gSlateportBattleTentMons
_081A6C4C:
str r0, [r1]
@@ -23615,7 +23615,7 @@ _081A6C50:
lsls r1, 4
adds r2, r1
ldrh r2, [r2]
ldr r1, =gUnknown_0203BC8C
ldr r1, =gFacilityTrainerMons
ldr r1, [r1]
lsls r2, 4
adds r2, r1
@@ -23702,7 +23702,7 @@ sub_81A6CD0: @ 81A6CD0
lsls r0, 24
lsrs r0, 24
str r0, [sp, 0x24]
bl sub_8165C40
bl GetFacilityEnemyMonLevel
lsls r0, 24
lsrs r0, 24
str r0, [sp, 0x20]
@@ -23727,7 +23727,7 @@ _081A6D4C:
bl sub_81A6EF0
lsls r0, 16
lsrs r5, r0, 16
ldr r7, =gUnknown_0203BC8C
ldr r7, =gFacilityTrainerMons
ldr r1, [r7]
lsls r0, r5, 4
adds r0, r1
@@ -23775,7 +23775,7 @@ _081A6DA8:
cmp r4, r9
bge _081A6DDC
add r2, sp, 0xC
ldr r7, =gUnknown_0203BC8C
ldr r7, =gFacilityTrainerMons
ldr r0, [r7]
lsls r1, r5, 4
adds r0, r1, r0
@@ -23784,7 +23784,7 @@ _081A6DA8:
ldrh r0, [r0]
cmp r2, r0
beq _081A6DDC
ldr r6, =gUnknown_0203BC8C
ldr r6, =gFacilityTrainerMons
adds r3, r7, 0
add r2, sp, 0xC
_081A6DC8:
@@ -23805,7 +23805,7 @@ _081A6DDC:
cmp r4, r9
bge _081A6E0C
ldr r7, =gBattleFrontierHeldItems
ldr r6, =gUnknown_0203BC8C
ldr r6, =gFacilityTrainerMons
add r2, sp, 0x14
lsls r3, r5, 4
_081A6DEE:
@@ -23833,7 +23833,7 @@ _081A6E0C:
mov r1, sp
adds r1, r2
adds r1, 0xC
ldr r3, =gUnknown_0203BC8C
ldr r3, =gFacilityTrainerMons
ldr r4, [r3]
lsls r5, 4
mov r8, r5
@@ -23875,7 +23875,7 @@ _081A6E0C:
add r0, r9
mov r8, r0
_081A6E6E:
ldr r1, =gUnknown_0203BC8C
ldr r1, =gFacilityTrainerMons
ldr r0, [r1]
adds r0, r7, r0
lsls r1, r4, 1
@@ -23898,7 +23898,7 @@ _081A6E6E:
movs r1, 0x20
mov r2, r10
bl SetMonData
ldr r2, =gUnknown_0203BC8C
ldr r2, =gFacilityTrainerMons
ldr r0, [r2]
adds r0, r7, r0
ldrb r2, [r0, 0xA]
@@ -26455,7 +26455,7 @@ _081A831A:
bne _081A82D2
ldr r5, =gTrainerBattleOpponent_A
strh r4, [r5]
ldr r1, =gUnknown_0203BC88
ldr r1, =gFacilityTrainers
ldr r0, =gBattleFrontierTrainers
str r0, [r1]
ldrh r0, [r5]
@@ -26500,7 +26500,7 @@ sub_81A8374: @ 81A8374
bl __udivsi3
lsls r0, 16
lsrs r5, r0, 16
ldr r1, =gUnknown_0203BC88
ldr r1, =gFacilityTrainers
ldr r0, =gBattleFrontierTrainers
str r0, [r1]
lsls r7, r5, 24
@@ -26667,7 +26667,7 @@ sub_81A84EC: @ 81A84EC
ldr r0, =0x0000012b
cmp r1, r0
bhi _081A8542
ldr r2, =gUnknown_0203BC88
ldr r2, =gFacilityTrainers
movs r0, 0x34
muls r1, r0
ldr r0, [r2]
@@ -26684,7 +26684,7 @@ _081A8524:
ldr r0, =0x0000012b
cmp r1, r0
bhi _081A8542
ldr r2, =gUnknown_0203BC88
ldr r2, =gFacilityTrainers
movs r0, 0x34
muls r1, r0
ldr r0, [r2]
@@ -28498,7 +28498,7 @@ _081A940A:
thumb_func_start sub_81A9414
sub_81A9414: @ 81A9414
ldr r1, =gUnknown_0203BC88
ldr r1, =gFacilityTrainers
ldr r0, =gBattleFrontierTrainers
str r0, [r1]
bx lr
@@ -28534,7 +28534,7 @@ sub_81A9424: @ 81A9424
lsrs r5, r0, 16
movs r6, 0
ldr r2, =gUnknown_08613C1C
ldr r0, =gUnknown_0203BC88
ldr r0, =gFacilityTrainers
ldr r1, [r0]
movs r0, 0x34
muls r0, r5
@@ -28554,7 +28554,7 @@ _081A9488:
ldr r4, =gUnknown_08613C1C
lsls r3, r6, 1
adds r2, r3, r4
ldr r0, =gUnknown_0203BC88
ldr r0, =gFacilityTrainers
ldr r1, [r0]
movs r0, 0x34
muls r0, r5
@@ -29517,7 +29517,7 @@ _081A9C56:
bl SetMonData
cmp r5, 0
beq _081A9CD4
bl sub_8165C40
bl GetFacilityEnemyMonLevel
lsls r0, 24
lsrs r5, r0, 24
ldr r1, [sp, 0x10]
@@ -29795,7 +29795,7 @@ sub_81A9EDC: @ 81A9EDC
push {lr}
lsls r0, 16
lsrs r0, 16
ldr r2, =gUnknown_0203BC88
ldr r2, =gFacilityTrainers
movs r1, 0x34
muls r1, r0
ldr r0, [r2]
@@ -29812,7 +29812,7 @@ sub_81A9EFC: @ 81A9EFC
push {lr}
lsls r0, 16
lsrs r0, 16
ldr r2, =gUnknown_0203BC88
ldr r2, =gFacilityTrainers
movs r1, 0x34
muls r1, r0
ldr r0, [r2]
@@ -29829,7 +29829,7 @@ sub_81A9F1C: @ 81A9F1C
push {lr}
lsls r0, 16
lsrs r0, 16
ldr r2, =gUnknown_0203BC88
ldr r2, =gFacilityTrainers
movs r1, 0x34
muls r1, r0
ldr r0, [r2]
@@ -29848,7 +29848,7 @@ GetTrainerEncounterMusicIdInBattlePyramind: @ 81A9F3C
lsrs r0, 16
movs r4, 0
ldr r3, =gFacilityClassToTrainerClass
ldr r1, =gUnknown_0203BC88
ldr r1, =gFacilityTrainers
ldr r2, [r1]
movs r1, 0x34
muls r0, r1
asm/battle_tent.s
+7 -195
View File
@@ -6,194 +6,6 @@
.text
thumb_func_start sub_81B9EC0
sub_81B9EC0: @ 81B9EC0
push {r4-r7,lr}
mov r7, r10
mov r6, r9
mov r5, r8
push {r5-r7}
sub sp, 0x3C
ldr r1, =gUnknown_0203BC88
ldr r0, =gSlateportBattleTentTrainers
str r0, [r1]
add r0, sp, 0xC
mov r9, r0
mov r1, sp
adds r1, 0x18
str r1, [sp, 0x2C]
ldr r5, =gUnknown_0203BC8C
ldr r4, =gSlateportBattleTentMons
movs r2, 0
adds r3, r1, 0
mov r1, r9
mov r0, sp
movs r6, 0x5
mov r8, r6
_081B9EEC:
strh r2, [r0]
strh r2, [r1]
strh r2, [r3]
adds r3, 0x2
adds r1, 0x2
adds r0, 0x2
movs r7, 0x1
negs r7, r7
add r8, r7
mov r6, r8
cmp r6, 0
bge _081B9EEC
str r4, [r5]
movs r7, 0
mov r10, r7
movs r0, 0
mov r8, r0
ldr r1, [sp, 0x2C]
str r1, [sp, 0x30]
mov r2, sp
str r2, [sp, 0x34]
lsls r6, r0, 1
str r6, [sp, 0x24]
add r6, r9
str r6, [sp, 0x28]
_081B9F1E:
bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0x46
bl __umodsi3
lsls r0, 16
lsrs r5, r0, 16
movs r2, 0
mov r7, r8
adds r6, r2, r7
cmp r2, r6
bge _081B9F7C
ldr r1, [sp, 0x28]
ldrh r0, [r1]
cmp r0, r5
beq _081B9F7C
ldr r0, =gUnknown_0203BC8C
ldr r1, [r0]
lsls r0, r5, 4
adds r4, r0, r1
ldrh r7, [r4]
mov r12, r7
lsls r3, r2, 1
ldr r1, [sp, 0x24]
add r1, sp
str r6, [sp, 0x38]
_081B9F56:
ldrh r0, [r1]
cmp r0, r12
bne _081B9F66
mov r0, r10
cmp r0, 0
bne _081B9F7C
ldrh r7, [r4]
mov r10, r7
_081B9F66:
adds r3, 0x2
adds r1, 0x2
adds r2, 0x1
ldr r0, [sp, 0x38]
cmp r2, r0
bge _081B9F7C
mov r7, r9
adds r0, r7, r3
ldrh r0, [r0]
cmp r0, r5
bne _081B9F56
_081B9F7C:
cmp r2, r6
bne _081BA01C
movs r2, 0
cmp r2, r6
bge _081B9FD4
ldr r0, =gBattleFrontierHeldItems
mov r12, r0
ldr r7, =gUnknown_0203BC8C
ldr r1, [sp, 0x24]
ldr r0, [sp, 0x2C]
adds r4, r1, r0
_081B9F92:
ldrh r3, [r4]
cmp r3, 0
beq _081B9FCC
ldr r1, [r7]
lsls r0, r5, 4
adds r1, r0, r1
ldrb r0, [r1, 0xA]
lsls r0, 1
add r0, r12
ldrh r0, [r0]
cmp r3, r0
bne _081B9FCC
ldrh r0, [r1]
cmp r0, r10
bne _081B9FD4
movs r1, 0
mov r10, r1
b _081B9FD4
.pool
_081B9FCC:
adds r4, 0x2
adds r2, 0x1
cmp r2, r6
blt _081B9F92
_081B9FD4:
cmp r2, r6
bne _081BA01C
ldr r0, =gSaveBlock2Ptr
ldr r1, [r0]
mov r2, r8
lsls r3, r2, 1
adds r0, r3, r2
lsls r0, 2
adds r1, r0
movs r6, 0xE7
lsls r6, 4
adds r1, r6
strh r5, [r1]
ldr r0, =gUnknown_0203BC8C
ldr r0, [r0]
lsls r1, r5, 4
adds r1, r0
ldrh r0, [r1]
ldr r7, [sp, 0x34]
strh r0, [r7]
ldr r2, =gBattleFrontierHeldItems
ldrb r0, [r1, 0xA]
lsls r0, 1
adds r0, r2
ldrh r0, [r0]
ldr r1, [sp, 0x30]
strh r0, [r1]
add r3, r9
strh r5, [r3]
adds r1, 0x2
str r1, [sp, 0x30]
adds r2, r7, 0
adds r2, 0x2
str r2, [sp, 0x34]
movs r6, 0x1
add r8, r6
_081BA01C:
mov r7, r8
cmp r7, 0x6
beq _081BA024
b _081B9F1E
_081BA024:
add sp, 0x3C
pop {r3-r5}
mov r8, r3
mov r9, r4
mov r10, r5
pop {r4-r7}
pop {r0}
bx r0
.pool
thumb_func_end sub_81B9EC0
thumb_func_start sub_81BA040
sub_81BA040: @ 81BA040
@@ -205,10 +17,10 @@ sub_81BA040: @ 81BA040
sub sp, 0x10
movs r0, 0
mov r10, r0
ldr r1, =gUnknown_0203BC88
ldr r1, =gFacilityTrainers
ldr r0, =gSlateportBattleTentTrainers
str r0, [r1]
ldr r1, =gUnknown_0203BC8C
ldr r1, =gFacilityTrainerMons
ldr r0, =gSlateportBattleTentMons
str r0, [r1]
ldr r7, =gSaveBlock2Ptr
@@ -261,7 +73,7 @@ _081BA0AA:
ldr r2, =gTrainerBattleOpponent_A
strh r3, [r2]
ldrh r3, [r2]
ldr r4, =gUnknown_0203BC88
ldr r4, =gFacilityTrainers
ldr r1, [r4]
movs r0, 0x34
muls r0, r3
@@ -324,7 +136,7 @@ _081BA13E:
strh r0, [r7]
movs r2, 0
ldrh r0, [r7]
ldr r4, =gUnknown_0203BC8C
ldr r4, =gFacilityTrainerMons
ldr r3, [r4]
lsls r0, 4
adds r0, r3
@@ -356,7 +168,7 @@ _081BA180:
cmp r0, r6
beq _081BA1B0
ldr r6, =gUnknown_03001298
ldr r3, =gUnknown_0203BC8C
ldr r3, =gFacilityTrainerMons
mov r2, sp
_081BA198:
adds r2, 0x2
@@ -386,7 +198,7 @@ _081BA1C0:
beq _081BA1DE
ldr r1, =gUnknown_03001298
ldrh r0, [r1]
ldr r6, =gUnknown_0203BC8C
ldr r6, =gFacilityTrainerMons
ldr r1, [r6]
lsls r0, 4
adds r0, r1
@@ -406,7 +218,7 @@ _081BA1E6:
bne _081BA220
lsls r2, r5, 1
ldrh r0, [r7]
ldr r1, =gUnknown_0203BC8C
ldr r1, =gFacilityTrainerMons
ldr r4, [r1]
lsls r0, 4
adds r0, r4
asm/battle_tower.s
+80 -333
View File
@@ -5,261 +5,8 @@
.text
thumb_func_start sub_8161F74
sub_8161F74: @ 8161F74
push {lr}
ldr r1, =gUnknown_085DF96C
ldr r0, =gSpecialVar_0x8004
ldrh r0, [r0]
lsls r0, 2
adds r0, r1
ldr r0, [r0]
bl _call_via_r0
pop {r0}
bx r0
.pool
thumb_func_end sub_8161F74
thumb_func_start sub_8161F94
sub_8161F94: @ 8161F94
push {r4-r7,lr}
ldr r4, =gSaveBlock2Ptr
ldr r0, [r4]
ldr r1, =0x00000ca9
adds r0, r1
ldrb r0, [r0]
lsls r0, 30
lsrs r5, r0, 30
ldr r0, =0x000040ce
bl VarGet
lsls r0, 16
lsrs r6, r0, 16
ldr r0, [r4]
ldr r2, =0x00000ca8
adds r0, r2
movs r7, 0
movs r1, 0x1
strb r1, [r0]
ldr r1, [r4]
adds r2, 0xA
adds r0, r1, r2
strh r7, [r0]
ldr r0, =0x00000ca9
adds r1, r0
ldrb r2, [r1]
movs r0, 0x5
negs r0, r0
ands r0, r2
strb r0, [r1]
ldr r1, [r4]
ldr r2, =0x00000ca9
adds r1, r2
ldrb r2, [r1]
movs r0, 0x9
negs r0, r0
ands r0, r2
strb r0, [r1]
bl sub_81A3ACC
ldr r4, [r4]
ldr r0, =0x00000cdc
adds r3, r4, r0
ldr r2, =gUnknown_085DF9AC
lsls r1, r5, 2
lsls r0, r6, 3
adds r1, r0
adds r1, r2
ldr r0, [r3]
ldr r1, [r1]
ands r0, r1
cmp r0, 0
bne _0816200E
lsls r0, r5, 1
lsls r1, r6, 2
adds r0, r1
movs r2, 0xCE
lsls r2, 4
adds r1, r4, r2
adds r1, r0
strh r7, [r1]
_0816200E:
bl sub_8164ED8
ldr r0, =gSaveBlock1Ptr
ldr r0, [r0]
movs r1, 0x4
ldrsb r1, [r0, r1]
movs r2, 0x5
ldrsb r2, [r0, r2]
movs r3, 0x1
negs r3, r3
movs r0, 0
bl saved_warp2_set
ldr r0, =gTrainerBattleOpponent_A
strh r7, [r0]
pop {r4-r7}
pop {r0}
bx r0
.pool
thumb_func_end sub_8161F94
thumb_func_start sub_8162054
sub_8162054: @ 8162054
push {r4-r6,lr}
ldr r5, =gSaveBlock2Ptr
ldr r0, [r5]
ldr r4, =0x00000ca9
adds r0, r4
ldrb r0, [r0]
lsls r0, 30
lsrs r6, r0, 30
ldr r0, =0x000040ce
bl VarGet
lsls r0, 16
lsrs r1, r0, 16
ldr r0, =gSpecialVar_0x8005
ldrh r0, [r0]
cmp r0, 0x1
beq _08162094
cmp r0, 0x1
ble _081620E8
cmp r0, 0x2
beq _081620A8
cmp r0, 0x3
beq _081620D8
b _081620E8
.pool
_08162094:
adds r0, r6, 0
lsls r1, 24
lsrs r1, 24
bl sub_8164FCC
ldr r1, =gSpecialVar_Result
strh r0, [r1]
b _081620E8
.pool
_081620A8:
ldr r4, =gSpecialVar_Result
ldr r2, [r5]
ldr r0, =0x00000cdc
adds r2, r0
ldr r3, =gUnknown_085DF9AC
lsls r0, r6, 2
lsls r1, 3
adds r0, r1
adds r0, r3
ldr r1, [r2]
ldr r0, [r0]
ands r1, r0
negs r0, r1
orrs r0, r1
lsrs r0, 31
strh r0, [r4]
b _081620E8
.pool
_081620D8:
ldr r1, [r5]
adds r0, r1, r4
ldrb r0, [r0]
lsls r0, 30
lsrs r0, 30
ldr r2, =0x00000d07
adds r1, r2
strb r0, [r1]
_081620E8:
pop {r4-r6}
pop {r0}
bx r0
.pool
thumb_func_end sub_8162054
thumb_func_start sub_81620F4
sub_81620F4: @ 81620F4
push {r4-r7,lr}
ldr r6, =gSaveBlock2Ptr
ldr r0, [r6]
ldr r7, =0x00000ca9
adds r0, r7
ldrb r0, [r0]
lsls r0, 30
lsrs r5, r0, 30
ldr r0, =0x000040ce
bl VarGet
lsls r0, 16
lsrs r4, r0, 16
ldr r0, =gSpecialVar_0x8005
ldrh r0, [r0]
cmp r0, 0x1
beq _08162134
cmp r0, 0x1
ble _081621B4
cmp r0, 0x2
beq _08162150
cmp r0, 0x3
beq _081621A4
b _081621B4
.pool
_08162134:
ldr r2, [r6]
lsls r0, r5, 1
lsls r1, r4, 2
adds r0, r1
movs r1, 0xCE
lsls r1, 4
adds r2, r1
adds r2, r0
ldr r0, =gSpecialVar_0x8006
ldrh r0, [r0]
strh r0, [r2]
b _081621B4
.pool
_08162150:
ldr r0, =gSpecialVar_0x8006
ldrh r0, [r0]
cmp r0, 0
beq _08162180
ldr r2, [r6]
ldr r0, =0x00000cdc
adds r2, r0
ldr r3, =gUnknown_085DF9AC
lsls r1, r5, 2
lsls r0, r4, 3
adds r1, r0
adds r1, r3
ldr r0, [r2]
ldr r1, [r1]
orrs r0, r1
str r0, [r2]
b _081621B4
.pool
_08162180:
ldr r2, [r6]
ldr r1, =0x00000cdc
adds r2, r1
ldr r3, =gUnknown_085DF9CC
lsls r1, r5, 2
lsls r0, r4, 3
adds r1, r0
adds r1, r3
ldr r0, [r2]
ldr r1, [r1]
ands r0, r1
str r0, [r2]
b _081621B4
.pool
_081621A4:
ldr r1, [r6]
adds r0, r1, r7
ldrb r0, [r0]
lsls r0, 30
lsrs r0, 30
ldr r2, =0x00000d07
adds r1, r2
strb r0, [r1]
_081621B4:
pop {r4-r7}
pop {r0}
bx r0
.pool
thumb_func_end sub_81620F4
thumb_func_start sub_81621C0
sub_81621C0: @ 81621C0
@@ -391,7 +138,7 @@ _081622B2:
adds r4, r1, r0
mov r0, r10
str r2, [sp, 0x38]
bl BattleFrontierGetOpponentLvl
bl GetFrontierEnemyMonLevel
ldrb r1, [r4]
lsls r0, 24
lsrs r0, 24
@@ -551,7 +298,7 @@ _08162414:
bl __udivsi3
lsls r0, 16
lsrs r5, r0, 16
bl sub_8165C40
bl GetFacilityEnemyMonLevel
subs r4, 0x2
cmp r4, 0x1
bhi _08162488
@@ -784,7 +531,7 @@ sub_8162614: @ 8162614
adds r6, r4, 0
lsls r1, 24
lsrs r5, r1, 24
bl sub_8165C40
bl GetFacilityEnemyMonLevel
movs r0, 0xFA
lsls r0, 1
cmp r4, r0
@@ -806,7 +553,7 @@ _08162650:
ldr r0, =0x0000012b
cmp r4, r0
bhi _0816266C
ldr r0, =gUnknown_0203BC88
ldr r0, =gFacilityTrainers
ldr r1, [r0]
movs r0, 0x34
muls r0, r4
@@ -962,7 +709,7 @@ sub_81627A4: @ 81627A4
lsls r0, 16
lsrs r4, r0, 16
adds r5, r4, 0
bl sub_8165C40
bl GetFacilityEnemyMonLevel
movs r0, 0xFA
lsls r0, 1
cmp r4, r0
@@ -977,7 +724,7 @@ _081627CC:
ldr r0, =0x0000012b
cmp r4, r0
bhi _081627E8
ldr r0, =gUnknown_0203BC88
ldr r0, =gFacilityTrainers
ldr r1, [r0]
movs r0, 0x34
muls r0, r4
@@ -1335,7 +1082,7 @@ GetFrontierTrainerFrontSpriteId: @ 8162AA0
lsls r0, 16
lsrs r4, r0, 16
adds r5, r4, 0
bl sub_8165C40
bl GetFacilityEnemyMonLevel
movs r0, 0xFA
lsls r0, 1
cmp r4, r0
@@ -1363,7 +1110,7 @@ _08162AE4:
cmp r4, r0
bhi _08162B08
ldr r2, =gFacilityClassToPicIndex
ldr r0, =gUnknown_0203BC88
ldr r0, =gFacilityTrainers
ldr r1, [r0]
movs r0, 0x34
muls r0, r4
@@ -1462,7 +1209,7 @@ GetFrontierOpponentClass: @ 8162BD8
lsls r0, 16
lsrs r4, r0, 16
adds r5, r4, 0
bl sub_8165C40
bl GetFacilityEnemyMonLevel
movs r0, 0xFA
lsls r0, 1
cmp r4, r0
@@ -1500,7 +1247,7 @@ _08162C38:
cmp r4, r0
bhi _08162C60
ldr r2, =gFacilityClassToTrainerClass
ldr r0, =gUnknown_0203BC88
ldr r0, =gFacilityTrainers
ldr r1, [r0]
movs r0, 0x34
muls r0, r4
@@ -1602,7 +1349,7 @@ sub_8162D34: @ 8162D34
lsls r0, 16
lsrs r4, r0, 16
adds r5, r4, 0
bl sub_8165C40
bl GetFacilityEnemyMonLevel
movs r0, 0xFA
lsls r0, 1
cmp r4, r0
@@ -1617,7 +1364,7 @@ _08162D5C:
ldr r0, =0x0000012b
cmp r4, r0
bhi _08162D78
ldr r0, =gUnknown_0203BC88
ldr r0, =gFacilityTrainers
ldr r1, [r0]
movs r0, 0x34
muls r0, r4
@@ -1704,7 +1451,7 @@ GetFrontierTrainerName: @ 8162E20
lsls r1, 16
lsrs r5, r1, 16
movs r4, 0
bl sub_8165C40
bl GetFacilityEnemyMonLevel
movs r0, 0xFA
lsls r0, 1
cmp r5, r0
@@ -1751,7 +1498,7 @@ _08162E88:
ldr r0, =0x0000012b
cmp r5, r0
bhi _08162EB4
ldr r0, =gUnknown_0203BC88
ldr r0, =gFacilityTrainers
ldr r1, [r0]
movs r0, 0x34
muls r0, r5
@@ -1854,7 +1601,7 @@ sub_8162F68: @ 8162F68
lsls r0, 16
lsrs r4, r0, 16
adds r5, r4, 0
bl sub_8165C40
bl GetFacilityEnemyMonLevel
movs r0, 0xFA
lsls r0, 1
cmp r4, r0
@@ -1878,7 +1625,7 @@ _08162FA4:
ldr r0, =0x0000012b
cmp r4, r0
bhi _08162FC0
ldr r0, =gUnknown_0203BC88
ldr r0, =gFacilityTrainers
ldr r1, [r0]
movs r0, 0x34
muls r0, r4
@@ -2025,7 +1772,7 @@ sub_81630C4: @ 81630C4
add r4, sp, 0x14
movs r0, 0xFF
strb r0, [r4]
bl sub_8165C40
bl GetFacilityEnemyMonLevel
lsls r0, 24
lsrs r0, 24
str r0, [sp, 0x20]
@@ -2039,7 +1786,7 @@ sub_81630C4: @ 81630C4
str r0, [sp, 0x24]
ldr r0, =gTrainerBattleOpponent_A
ldrh r2, [r0]
ldr r0, =gUnknown_0203BC88
ldr r0, =gFacilityTrainers
ldr r1, [r0]
movs r0, 0x34
muls r0, r2
@@ -2258,7 +2005,7 @@ _081632D2:
movs r1, 0xB
movs r2, 0
bl GetMonData
ldr r1, =gUnknown_0203BC8C
ldr r1, =gFacilityTrainerMons
ldr r2, [r1]
lsls r1, r4, 4
adds r1, r2
@@ -2291,7 +2038,7 @@ _08163308:
movs r1, 0xC
movs r2, 0
bl GetMonData
ldr r1, =gUnknown_0203BC8C
ldr r1, =gFacilityTrainerMons
ldr r2, [r1]
lsls r1, r4, 4
adds r1, r2
@@ -2338,7 +2085,7 @@ _08163368:
muls r0, r1
ldr r2, =gEnemyParty
adds r0, r2
ldr r5, =gUnknown_0203BC8C
ldr r5, =gFacilityTrainerMons
ldr r2, [r5]
lsls r4, 4
adds r2, r4, r2
@@ -2405,7 +2152,7 @@ _081633EC:
movs r1, 0x20
add r2, sp, 0x14
bl SetMonData
ldr r0, =gUnknown_0203BC8C
ldr r0, =gFacilityTrainerMons
ldr r0, [r0]
add r0, r9
ldrb r2, [r0, 0xA]
@@ -2545,16 +2292,16 @@ _081634D4:
.pool
thumb_func_end sub_8163444
thumb_func_start sub_8163524
sub_8163524: @ 8163524
thumb_func_start RandomizeFacilityTrainerMonId
RandomizeFacilityTrainerMonId: @ 8163524
push {r4-r6,lr}
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
bl sub_8165C40
bl GetFacilityEnemyMonLevel
lsls r0, 24
lsrs r6, r0, 24
ldr r0, =gUnknown_0203BC88
ldr r0, =gFacilityTrainers
ldr r1, [r0]
movs r0, 0x34
muls r0, r4
@@ -2598,7 +2345,7 @@ _08163580:
pop {r1}
bx r1
.pool
thumb_func_end sub_8163524
thumb_func_end RandomizeFacilityTrainerMonId
thumb_func_start sub_8163590
sub_8163590: @ 8163590
@@ -2728,7 +2475,7 @@ _081636A4:
movs r0, 0x1F
_081636A6:
str r0, [sp, 0x18]
bl sub_8165C40
bl GetFacilityEnemyMonLevel
lsls r0, 24
lsrs r0, 24
str r0, [sp, 0x14]
@@ -2759,7 +2506,7 @@ _081636CE:
muls r6, r0
ldr r1, =gEnemyParty
adds r0, r6, r1
ldr r3, =gUnknown_0203BC8C
ldr r3, =gFacilityTrainerMons
ldr r2, [r3]
mov r1, r9
lsls r4, r1, 4
@@ -2784,7 +2531,7 @@ _081636CE:
mov r10, r7
adds r7, r4, 0
_08163718:
ldr r0, =gUnknown_0203BC8C
ldr r0, =gFacilityTrainerMons
ldr r1, [r0]
mov r2, r9
lsls r0, r2, 4
@@ -2813,7 +2560,7 @@ _08163718:
movs r1, 0x20
add r2, sp, 0xC
bl SetMonData
ldr r1, =gUnknown_0203BC8C
ldr r1, =gFacilityTrainerMons
ldr r0, [r1]
adds r0, r7, r0
ldrb r2, [r0, 0xA]
@@ -2881,7 +2628,7 @@ _081637D0:
muls r6, r7
ldr r1, =gEnemyParty
adds r0, r6, r1
ldr r7, =gUnknown_0203BC8C
ldr r7, =gFacilityTrainerMons
ldr r2, [r7]
lsls r4, 4
adds r2, r4, r2
@@ -2905,7 +2652,7 @@ _081637D0:
mov r8, r4
mov r5, r8
_08163818:
ldr r1, =gUnknown_0203BC8C
ldr r1, =gFacilityTrainerMons
ldr r0, [r1]
adds r0, r5, r0
lsls r4, r7, 1
@@ -2916,7 +2663,7 @@ _08163818:
adds r0, r6, r2
adds r2, r7, 0
bl sub_81A7024
ldr r1, =gUnknown_0203BC8C
ldr r1, =gFacilityTrainerMons
ldr r0, [r1]
adds r0, r5, r0
adds r0, 0x2
@@ -2942,7 +2689,7 @@ _08163846:
movs r1, 0x20
add r2, sp, 0xC
bl SetMonData
ldr r1, =gUnknown_0203BC8C
ldr r1, =gFacilityTrainerMons
ldr r0, [r1]
add r0, r8
ldrb r2, [r0, 0xA]
@@ -3029,7 +2776,7 @@ _0816390A:
thumb_func_start sub_8163914
sub_8163914: @ 8163914
push {lr}
bl sub_8165C40
bl GetFacilityEnemyMonLevel
ldr r0, =gSpecialVar_0x8005
ldrh r0, [r0]
cmp r0, 0
@@ -3054,7 +2801,7 @@ _08163950:
ldr r0, =0x0000012b
cmp r3, r0
bhi _08163974
ldr r2, =gUnknown_0203BC88
ldr r2, =gFacilityTrainers
movs r0, 0x34
adds r1, r3, 0
muls r1, r0
@@ -3979,7 +3726,7 @@ _081641E6:
lsls r0, r1, 24
lsrs r0, 24
str r2, [sp, 0x18]
bl BattleFrontierGetOpponentLvl
bl GetFrontierEnemyMonLevel
ldrb r1, [r4]
lsls r0, 24
lsrs r0, 24
@@ -4091,7 +3838,7 @@ sub_81642A0: @ 81642A0
movs r2, 0
bl GetMonData
str r0, [sp, 0x20]
bl sub_8165C40
bl GetFacilityEnemyMonLevel
movs r7, 0
ldr r0, [sp, 0x18]
lsls r0, 24
@@ -4116,7 +3863,7 @@ _0816431A:
ldrh r0, [r1]
cmp r0, r8
beq _08164368
ldr r0, =gUnknown_0203BC88
ldr r0, =gFacilityTrainers
ldr r2, [r0]
movs r4, 0x34
mov r0, r8
@@ -4186,7 +3933,7 @@ _081643A8:
str r0, [sp, 0x28]
_081643C0:
mov r0, r8
bl sub_8163524
bl RandomizeFacilityTrainerMonId
lsls r0, 16
lsrs r6, r0, 16
movs r0, 0x1
@@ -4200,7 +3947,7 @@ _081643C0:
ldr r1, [sp, 0x28]
adds r0, r1
ldrh r2, [r0]
ldr r0, =gUnknown_0203BC8C
ldr r0, =gFacilityTrainerMons
ldr r0, [r0]
lsls r2, 4
adds r2, r0
@@ -4216,7 +3963,7 @@ _081643F4:
bge _08164430
ldr r2, =gSaveBlock2Ptr
ldr r0, [r2]
ldr r1, =gUnknown_0203BC8C
ldr r1, =gFacilityTrainerMons
ldr r3, [r1]
lsls r1, r6, 4
adds r1, r3
@@ -4464,7 +4211,7 @@ _081645B8:
lsls r0, r1, 24
lsrs r0, 24
str r3, [sp, 0x48]
bl BattleFrontierGetOpponentLvl
bl GetFrontierEnemyMonLevel
ldrb r1, [r4]
lsls r0, 24
lsrs r0, 24
@@ -4556,7 +4303,7 @@ sub_81646BC: @ 81646BC
movs r0, 0
mov r9, r0
mov r10, r0
bl sub_8165C40
bl GetFacilityEnemyMonLevel
movs r0, 0xFA
lsls r0, 1
cmp r5, r0
@@ -4564,7 +4311,7 @@ sub_81646BC: @ 81646BC
subs r0, 0xC9
cmp r5, r0
bhi _081646FC
ldr r0, =gUnknown_0203BC8C
ldr r0, =gFacilityTrainerMons
ldr r1, [r0]
lsls r0, r4, 4
adds r0, r1
@@ -4705,7 +4452,7 @@ sub_8164828: @ 8164828
mov r5, r8
push {r5-r7}
sub sp, 0x8
bl sub_8165C40
bl GetFacilityEnemyMonLevel
bl sub_81A39C4
lsls r0, 16
lsrs r0, 16
@@ -6073,7 +5820,7 @@ sub_8165404: @ 8165404
sub sp, 0x70
lsls r0, 16
lsrs r7, r0, 16
bl sub_8165C40
bl GetFacilityEnemyMonLevel
ldr r0, =0x00000c03
cmp r7, r0
beq _08165420
@@ -6228,7 +5975,7 @@ _08165564:
bls _0816556C
b _081656E8
_0816556C:
bl sub_8165C40
bl GetFacilityEnemyMonLevel
lsls r0, 24
lsrs r0, 24
str r0, [sp, 0x50]
@@ -6272,7 +6019,7 @@ _081655A6:
mov r9, r0
mov r0, r8
add r0, r9
ldr r6, =gUnknown_0203BC8C
ldr r6, =gFacilityTrainerMons
ldr r4, [r6]
lsls r5, r1, 4
adds r4, r5, r4
@@ -6339,7 +6086,7 @@ _08165634:
movs r1, 0x20
ldr r2, [sp, 0x5C]
bl SetMonData
ldr r0, =gUnknown_0203BC8C
ldr r0, =gFacilityTrainerMons
ldr r1, [r0]
ldr r2, [sp, 0x54]
lsls r0, r2, 4
@@ -6354,7 +6101,7 @@ _08165634:
movs r0, 0
str r0, [sp, 0x44]
movs r2, 0
ldr r0, =gUnknown_0203BC88
ldr r0, =gFacilityTrainers
ldr r1, [r0]
movs r0, 0x34
muls r0, r7
@@ -7083,8 +6830,8 @@ _08165C2A:
.pool
thumb_func_end sub_8165B88
thumb_func_start sub_8165C40
sub_8165C40: @ 8165C40
thumb_func_start GetFacilityEnemyMonLevel
GetFacilityEnemyMonLevel: @ 8165C40
push {lr}
ldr r0, =gSaveBlock2Ptr
ldr r0, [r0]
@@ -7095,29 +6842,29 @@ sub_8165C40: @ 8165C40
ands r0, r1
cmp r0, 0x2
beq _08165C84
ldr r1, =gUnknown_0203BC88
ldr r1, =gFacilityTrainers
ldr r0, =gBattleFrontierTrainers
str r0, [r1]
ldr r1, =gUnknown_0203BC8C
ldr r1, =gFacilityTrainerMons
ldr r0, =gBattleFrontierMons
str r0, [r1]
ldrb r0, [r2]
lsls r0, 30
lsrs r0, 30
bl BattleFrontierGetOpponentLvl
bl GetFrontierEnemyMonLevel
b _08165C88
.pool
_08165C84:
bl sub_8165D78
bl GetTentEnemyMonLevel
_08165C88:
lsls r0, 24
lsrs r0, 24
pop {r1}
bx r1
thumb_func_end sub_8165C40
thumb_func_end GetFacilityEnemyMonLevel
thumb_func_start BattleFrontierGetOpponentLvl
BattleFrontierGetOpponentLvl: @ 8165C90
thumb_func_start GetFrontierEnemyMonLevel
GetFrontierEnemyMonLevel: @ 8165C90
push {lr}
lsls r0, 24
lsrs r0, 24
@@ -7138,7 +6885,7 @@ _08165CA2:
_08165CB0:
pop {r1}
bx r1
thumb_func_end BattleFrontierGetOpponentLvl
thumb_func_end GetFrontierEnemyMonLevel
thumb_func_start sub_8165CB4
sub_8165CB4: @ 8165CB4
@@ -7246,8 +6993,8 @@ _08165D72:
bx r1
thumb_func_end sub_8165D40
thumb_func_start sub_8165D78
sub_8165D78: @ 8165D78
thumb_func_start GetTentEnemyMonLevel
GetTentEnemyMonLevel: @ 8165D78
push {lr}
ldr r0, =0x000040cf
bl VarGet
@@ -7255,38 +7002,38 @@ sub_8165D78: @ 8165D78
lsrs r0, 16
cmp r0, 0x4
bne _08165DA8
ldr r1, =gUnknown_0203BC88
ldr r1, =gFacilityTrainers
ldr r0, =gSlateportBattleTentTrainers
str r0, [r1]
ldr r1, =gUnknown_0203BC8C
ldr r1, =gFacilityTrainerMons
ldr r0, =gSlateportBattleTentMons
b _08165DF2
.pool
_08165DA8:
cmp r0, 0x2
bne _08165DC8
ldr r1, =gUnknown_0203BC88
ldr r1, =gFacilityTrainers
ldr r0, =gVerdanturfBattleTentTrainers
str r0, [r1]
ldr r1, =gUnknown_0203BC8C
ldr r1, =gFacilityTrainerMons
ldr r0, =gVerdanturfBattleTentMons
b _08165DF2
.pool
_08165DC8:
cmp r0, 0x3
bne _08165DE8
ldr r1, =gUnknown_0203BC88
ldr r1, =gFacilityTrainers
ldr r0, =gFallarborBattleTentTrainers
str r0, [r1]
ldr r1, =gUnknown_0203BC8C
ldr r1, =gFacilityTrainerMons
ldr r0, =gFallarborBattleTentMons
b _08165DF2
.pool
_08165DE8:
ldr r1, =gUnknown_0203BC88
ldr r1, =gFacilityTrainers
ldr r0, =gBattleFrontierTrainers
str r0, [r1]
ldr r1, =gUnknown_0203BC8C
ldr r1, =gFacilityTrainerMons
ldr r0, =gBattleFrontierMons
_08165DF2:
str r0, [r1]
@@ -7300,7 +7047,7 @@ _08165E02:
pop {r1}
bx r1
.pool
thumb_func_end sub_8165D78
thumb_func_end GetTentEnemyMonLevel
thumb_func_start sub_8165E18
sub_8165E18: @ 8165E18
@@ -7384,13 +7131,13 @@ sub_8165EA4: @ 8165EA4
lsls r2, 24
lsrs r2, 24
str r2, [sp, 0x1C]
bl sub_8165D78
bl GetTentEnemyMonLevel
lsls r0, 24
lsrs r0, 24
str r0, [sp, 0x20]
ldr r0, =gTrainerBattleOpponent_A
ldrh r2, [r0]
ldr r0, =gUnknown_0203BC88
ldr r0, =gFacilityTrainers
ldr r1, [r0]
movs r0, 0x34
muls r0, r2
@@ -7456,7 +7203,7 @@ _08165F44:
movs r1, 0xB
movs r2, 0
bl GetMonData
ldr r1, =gUnknown_0203BC8C
ldr r1, =gFacilityTrainerMons
ldr r2, [r1]
lsls r1, r4, 4
adds r1, r2
@@ -7489,7 +7236,7 @@ _08165F7A:
movs r1, 0xC
movs r2, 0
bl GetMonData
ldr r1, =gUnknown_0203BC8C
ldr r1, =gFacilityTrainerMons
ldr r2, [r1]
lsls r1, r4, 4
adds r1, r2
@@ -7537,7 +7284,7 @@ _08165FDA:
muls r0, r6
ldr r1, =gEnemyParty
adds r0, r1
ldr r5, =gUnknown_0203BC8C
ldr r5, =gFacilityTrainerMons
ldr r2, [r5]
lsls r4, 4
adds r2, r4, r2
@@ -7603,7 +7350,7 @@ _0816605E:
movs r1, 0x20
add r2, sp, 0x14
bl SetMonData
ldr r0, =gUnknown_0203BC8C
ldr r0, =gFacilityTrainerMons
ldr r0, [r0]
add r0, r9
ldrb r2, [r0, 0xA]
@@ -7756,7 +7503,7 @@ sub_8166188: @ 8166188
ands r0, r1
cmp r0, 0
beq _081661E8
bl sub_8165C40
bl GetFacilityEnemyMonLevel
lsls r0, 24
movs r5, 0
ldr r7, =gBaseStats
asm/cable_car.s
+1 -1
View File
@@ -774,7 +774,7 @@ _08150340:
orrs r3, r0
str r3, [r2, 0x8]
ldr r0, [r2, 0x8]
bl warp_in
bl WarpIntoMap
ldr r0, =gFieldCallback
str r4, [r0]
ldr r0, =CB2_LoadMap
asm/contest.s
+111 -7693
View File
File diff suppressed because it is too large Load Diff
asm/contest_ai.s
-5278
View File
File diff suppressed because it is too large Load Diff
asm/contest_effect.s
-3175
View File
File diff suppressed because it is too large Load Diff
asm/contest_link_80F57C4.s
+49 -49
View File
@@ -276,10 +276,10 @@ sub_80F5A74: @ 80F5A74
lsrs r0, 24
adds r5, r0, 0
lsls r1, r5, 6
ldr r0, =gUnknown_02039E00
ldr r0, =gContestMons
adds r7, r1, r0
ldr r6, =gDisplayedStringBattle
ldr r0, =gUnknown_02039F25
ldr r0, =gContestPlayerMonIndex
ldrb r0, [r0]
cmp r5, r0
bne _080F5A96
@@ -398,7 +398,7 @@ sub_80F5B00: @ 80F5B00
movs r1, 0x14
bl CreateTask
bl sub_80F7880
ldr r0, =gUnknown_02039F2A
ldr r0, =gIsLinkContest
ldrb r1, [r0]
movs r0, 0x2
ands r0, r1
@@ -503,7 +503,7 @@ sub_80F5CE4: @ 80F5CE4
push {r4-r7,lr}
lsls r0, 24
lsrs r6, r0, 24
ldr r3, =gUnknown_02039F2A
ldr r3, =gIsLinkContest
ldrb r1, [r3]
movs r0, 0x1
ands r0, r1
@@ -535,8 +535,8 @@ _080F5D20:
b _080F5E2E
_080F5D2A:
bl sub_80DBED4
ldr r1, =gUnknown_02039F20
ldr r0, =gUnknown_02039F25
ldr r1, =gContestFinalStandings
ldr r0, =gContestPlayerMonIndex
ldrb r0, [r0]
adds r0, r1
ldrb r0, [r0]
@@ -648,7 +648,7 @@ _080F5E2E:
lsls r0, 3
adds r4, r0, r1
strh r2, [r4, 0x8]
ldr r0, =gUnknown_02039F2A
ldr r0, =gIsLinkContest
ldrb r1, [r0]
movs r5, 0x1
adds r0, r5, 0
@@ -663,8 +663,8 @@ _080F5E2E:
_080F5E78:
movs r0, 0x24
bl IncrementGameStat
ldr r1, =gUnknown_02039F20
ldr r0, =gUnknown_02039F25
ldr r1, =gContestFinalStandings
ldr r0, =gContestPlayerMonIndex
ldrb r0, [r0]
adds r0, r1
ldrb r0, [r0]
@@ -1160,7 +1160,7 @@ _080F6298:
adds r1, r0
lsls r1, 3
adds r1, r7
ldr r0, =gUnknown_02039F20
ldr r0, =gContestFinalStandings
adds r0, r4, r0
ldrb r0, [r0]
strh r0, [r1, 0x8]
@@ -1201,7 +1201,7 @@ _080F62F2:
adds r0, 0x1
strh r0, [r4, 0x8]
movs r4, 0
ldr r1, =gUnknown_02039F20
ldr r1, =gContestFinalStandings
ldrb r0, [r1]
cmp r0, 0
beq _080F631C
@@ -1236,10 +1236,10 @@ _080F6334:
movs r0, 0
strh r0, [r2, 0xA]
movs r4, 0
ldr r1, =gUnknown_02039F20
ldr r1, =gContestFinalStandings
ldrb r0, [r1]
ldr r7, =gStringVar1
ldr r2, =gUnknown_02039E00 + 13
ldr r2, =gContestMons + 13
mov r8, r2
cmp r0, 0
beq _080F636E
@@ -1355,12 +1355,12 @@ _080F6454:
adds r0, r3, 0
strh r0, [r1]
movs r2, 0
ldr r1, =gUnknown_02039F20
ldr r1, =gContestFinalStandings
ldrb r0, [r1]
lsls r4, r7, 2
mov r10, r4
ldr r3, =gUnknown_02039E00
ldr r4, =gUnknown_02039F25
ldr r3, =gContestMons
ldr r4, =gContestPlayerMonIndex
mov r9, r4
ldr r4, =gMonFrontPicTable
mov r12, r4
@@ -1623,14 +1623,14 @@ sub_80F66B4: @ 80F66B4
ands r0, r1
cmp r0, 0
beq _080F6702
ldr r0, =gUnknown_02039F2A
ldr r0, =gIsLinkContest
ldrb r1, [r0]
adds r0, r2, 0
ands r0, r1
lsls r6, r7, 2
cmp r0, 0
bne _080F66F2
ldr r5, =gUnknown_02039E00
ldr r5, =gContestMons
movs r4, 0x3
_080F66DA:
ldrh r0, [r5]
@@ -1664,7 +1664,7 @@ sub_80F671C: @ 80F671C
push {r4,lr}
lsls r0, 24
lsrs r2, r0, 24
ldr r0, =gUnknown_02039F2A
ldr r0, =gIsLinkContest
ldrb r1, [r0]
movs r0, 0x1
ands r0, r1
@@ -1710,7 +1710,7 @@ sub_80F677C: @ 80F677C
ldrb r0, [r0]
cmp r0, 0
bne _080F67AC
ldr r0, =gUnknown_02039F2A
ldr r0, =gIsLinkContest
ldrb r1, [r0]
movs r0, 0x2
ands r0, r1
@@ -1739,14 +1739,14 @@ task_repel: @ 80F67C4
sub sp, 0x4
lsls r0, 24
lsrs r4, r0, 24
ldr r0, =gUnknown_02039F2A
ldr r0, =gIsLinkContest
ldrb r1, [r0]
movs r0, 0x1
ands r0, r1
cmp r0, 0
bne _080F67E6
ldr r1, =gUnknown_02039F20
ldr r0, =gUnknown_02039F25
ldr r1, =gContestFinalStandings
ldr r0, =gContestPlayerMonIndex
ldrb r0, [r0]
adds r0, r1
ldrb r0, [r0]
@@ -1980,7 +1980,7 @@ sub_80F69B8: @ 80F69B8
lsrs r5, r2, 24
lsls r3, 24
lsrs r6, r3, 24
ldr r0, =gUnknown_02039F25
ldr r0, =gContestPlayerMonIndex
movs r2, 0
ldrb r0, [r0]
cmp r4, r0
@@ -2059,7 +2059,7 @@ sub_80F6A64: @ 80F6A64
lsls r1, 24
lsrs r6, r1, 24
movs r5, 0
ldr r4, =gUnknown_02039E00
ldr r4, =gContestMons
_080F6A74:
ldrh r0, [r4]
lsls r1, r5, 24
@@ -2088,7 +2088,7 @@ sub_80F6A9C: @ 80F6A9C
movs r5, 0xA0
lsls r5, 16
_080F6AA6:
ldr r1, =gUnknown_02039E00
ldr r1, =gContestMons
lsls r0, r4, 6
adds r0, r1
ldrh r0, [r0]
@@ -2119,7 +2119,7 @@ _080F6AA6:
thumb_func_start sub_80F6AE8
sub_80F6AE8: @ 80F6AE8
push {r4,lr}
ldr r0, =gUnknown_02039F2A
ldr r0, =gIsLinkContest
ldrb r1, [r0]
movs r0, 0x2
ands r0, r1
@@ -2955,7 +2955,7 @@ sub_80F71C8: @ 80F71C8
sub sp, 0xC
movs r5, 0x5
movs r4, 0x1
ldr r0, =gUnknown_02039F2A
ldr r0, =gIsLinkContest
ldrb r1, [r0]
adds r0, r4, 0
ands r0, r1
@@ -3104,7 +3104,7 @@ sub_80F7310: @ 80F7310
lsls r0, 24
lsls r1, 24
lsrs r5, r1, 24
ldr r1, =gUnknown_02039F00
ldr r1, =gContestMonConditions
lsrs r0, 23
adds r0, r1
movs r1, 0
@@ -3322,7 +3322,7 @@ sub_80F74BC: @ 80F74BC
lsls r0, 24
lsrs r5, r0, 24
movs r4, 0
ldr r1, =gUnknown_02039F20
ldr r1, =gContestFinalStandings
ldrb r0, [r1]
ldr r6, =gUnknown_0203A034
cmp r0, 0
@@ -3729,7 +3729,7 @@ sub_80F77E0: @ 80F77E0
adds r1, r2
strh r4, [r1, 0x8]
strh r5, [r1, 0xA]
ldr r0, =gUnknown_02039E00
ldr r0, =gContestMons
lsls r4, 6
adds r4, r0
ldrh r0, [r4]
@@ -3765,7 +3765,7 @@ sub_80F7824: @ 80F7824
strh r0, [r4, 0x1C]
ldrh r0, [r4, 0xC]
ldrb r2, [r4, 0x1E]
ldr r1, =gUnknown_02039E00
ldr r1, =gContestMons
lsls r3, r5, 6
adds r1, 0x38
adds r3, r1
@@ -3847,7 +3847,7 @@ _080F78E4:
mov r8, r5
mov r10, r5
_080F78EA:
ldr r0, =gUnknown_02039F00
ldr r0, =gContestMonConditions
mov r1, r8
lsls r7, r1, 1
adds r0, r7, r0
@@ -3987,7 +3987,7 @@ _080F79CC:
negs r0, r0
_080F7A02:
strb r0, [r1, 0x12]
ldr r0, =gUnknown_02039F20
ldr r0, =gContestFinalStandings
add r0, r8
ldrb r0, [r0]
cmp r0, 0
@@ -4721,8 +4721,8 @@ _080F7FEE:
sub_80F7FFC: @ 80F7FFC
push {r4-r7,lr}
sub sp, 0x4
ldr r1, =gUnknown_02039F20
ldr r0, =gUnknown_02039F25
ldr r1, =gContestFinalStandings
ldr r0, =gContestPlayerMonIndex
ldrb r0, [r0]
adds r0, r1
ldrb r0, [r0]
@@ -4994,7 +4994,7 @@ sub_80F8264: @ 80F8264
ldr r0, =gSpecialVar_0x8006
ldrh r1, [r0]
lsls r1, 6
ldr r0, =gUnknown_02039E00 + 13
ldr r0, =gContestMons + 13
adds r1, r0
adds r0, r4, 0
bl StringCopy
@@ -5013,7 +5013,7 @@ sub_80F8290: @ 80F8290
ldr r1, =gSpecialVar_0x8006
ldrh r1, [r1]
lsls r1, 6
ldr r2, =gUnknown_02039E00 + 2
ldr r2, =gContestMons + 2
adds r1, r2
bl StringCopy
pop {r0}
@@ -5027,7 +5027,7 @@ sub_80F82B4: @ 80F82B4
movs r1, 0
movs r2, 0
ldr r5, =gSpecialVar_0x8004
ldr r4, =gUnknown_02039F00
ldr r4, =gContestMonConditions
ldr r0, =gSpecialVar_0x8006
ldrh r0, [r0]
lsls r0, 1
@@ -5060,7 +5060,7 @@ _080F82DC:
thumb_func_start sub_80F82FC
sub_80F82FC: @ 80F82FC
ldr r2, =gSpecialVar_0x8004
ldr r1, =gUnknown_02039F00
ldr r1, =gContestMonConditions
ldr r0, =gSpecialVar_0x8006
ldrh r0, [r0]
lsls r0, 1
@@ -5075,7 +5075,7 @@ sub_80F82FC: @ 80F82FC
sub_80F831C: @ 80F831C
push {lr}
movs r1, 0
ldr r2, =gUnknown_02039F20
ldr r2, =gContestFinalStandings
ldrb r0, [r2]
ldr r3, =gSpecialVar_0x8005
cmp r0, 0
@@ -5101,10 +5101,10 @@ _080F833C:
sub_80F834C: @ 80F834C
push {r4,lr}
movs r1, 0
ldr r2, =gUnknown_02039F20
ldr r2, =gContestFinalStandings
ldrb r0, [r2]
ldr r4, =gStringVar3
ldr r3, =gUnknown_02039E00 + 13
ldr r3, =gContestMons + 13
cmp r0, 0
beq _080F836E
_080F835C:
@@ -5134,10 +5134,10 @@ _080F836E:
sub_80F8390: @ 80F8390
push {r4,lr}
movs r1, 0
ldr r2, =gUnknown_02039F20
ldr r2, =gContestFinalStandings
ldrb r0, [r2]
ldr r4, =gStringVar1
ldr r3, =gUnknown_02039E00 + 2
ldr r3, =gContestMons + 2
cmp r0, 0
beq _080F83B2
_080F83A0:
@@ -5216,7 +5216,7 @@ sub_80F840C: @ 80F840C
thumb_func_start sub_80F8438
sub_80F8438: @ 80F8438
ldr r2, =gSpecialVar_0x8004
ldr r1, =gUnknown_02039E00
ldr r1, =gContestMons
ldr r0, =gSpecialVar_0x8006
ldrh r0, [r0]
lsls r0, 6
@@ -5272,7 +5272,7 @@ sub_80F8484: @ 80F8484
thumb_func_start sub_80F84B0
sub_80F84B0: @ 80F84B0
ldr r0, =gSpecialVar_0x8004
ldr r1, =gUnknown_02039F25
ldr r1, =gContestPlayerMonIndex
ldrb r1, [r1]
strh r1, [r0]
bx lr
@@ -5314,7 +5314,7 @@ sub_80F8508: @ 80F8508
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
ldr r0, =gUnknown_02039F2A
ldr r0, =gIsLinkContest
ldrb r1, [r0]
movs r0, 0x4
ands r0, r1
@@ -5578,7 +5578,7 @@ sub_80F8714: @ 80F8714
b _080F877E
.pool
_080F8748:
ldr r5, =gUnknown_02039E00 + 2
ldr r5, =gContestMons + 2
movs r4, 0x3
_080F874C:
adds r0, r5, 0
asm/contest_link_80FC4F4.s
+17 -17
View File
@@ -11,7 +11,7 @@ sub_80FC4F4: @ 80FC4F4
adds r2, r0, 0
lsls r4, r1, 16
lsrs r4, 16
ldr r5, =0x0201c000
ldr r5, =gDecompressionBuffer
adds r0, r5, 0
adds r1, r2, 0
adds r2, r4, 0
@@ -139,12 +139,12 @@ sub_80FC5DC: @ 80FC5DC
cmp r0, 0
beq _080FC650
bl GetMultiplayerId
ldr r1, =gUnknown_02039F25
ldr r1, =gContestPlayerMonIndex
strb r0, [r1]
bl GetLinkPlayerCount
ldr r4, =gUnknown_02039F30
strb r0, [r4]
ldr r1, =gUnknown_02039F2A
ldr r1, =gIsLinkContest
movs r0, 0x1
strb r0, [r1]
ldr r0, =gWirelessCommType
@@ -182,7 +182,7 @@ _080FC63A:
ldrb r6, [r6]
cmp r3, r6
bge _080FC64A
ldr r0, =gUnknown_02039F2A
ldr r0, =gIsLinkContest
ldrb r1, [r0]
movs r2, 0x4
orrs r1, r2
@@ -201,7 +201,7 @@ _080FC650:
sub_80FC670: @ 80FC670
push {r4,lr}
adds r4, r0, 0
ldr r0, =gUnknown_02039F2A
ldr r0, =gIsLinkContest
ldrb r1, [r0]
movs r0, 0x4
ands r0, r1
@@ -285,10 +285,10 @@ _080FC6FE:
cmp r0, 0
beq _080FC7F4
ldr r0, =gBlockSendBuffer
ldr r1, =gUnknown_02039F25
ldr r1, =gContestPlayerMonIndex
ldrb r1, [r1]
lsls r1, 6
ldr r2, =gUnknown_02039E00
ldr r2, =gContestMons
adds r1, r2
movs r2, 0x40
bl memcpy
@@ -298,10 +298,10 @@ _080FC6FE:
.pool
_080FC738:
ldr r0, =gBlockSendBuffer
ldr r1, =gUnknown_02039F25
ldr r1, =gContestPlayerMonIndex
ldrb r1, [r1]
lsls r1, 6
ldr r2, =gUnknown_02039E00
ldr r2, =gContestMons
adds r1, r2
movs r2, 0x40
bl memcpy
@@ -321,7 +321,7 @@ _080FC758:
ldr r6, =gLinkPlayers
_080FC770:
lsls r4, r5, 6
ldr r0, =gUnknown_02039E00
ldr r0, =gContestMons
adds r4, r0
lsls r1, r5, 8
ldr r0, =gBlockRecvBuffer
@@ -434,7 +434,7 @@ _080FC858:
adds r1, r4, 0
movs r2, 0x4
bl memcpy
ldr r0, =gUnknown_030060B8
ldr r0, =gContestRngValue
adds r1, r4, 0
movs r2, 0x4
bl memcpy
@@ -603,7 +603,7 @@ _080FC9C4:
lsls r0, 24
cmp r0, 0
beq _080FC9F0
ldr r0, =gUnknown_02039F25
ldr r0, =gContestPlayerMonIndex
movs r1, 0x1
bl sub_80FC4F4
cmp r0, 0x1
@@ -659,7 +659,7 @@ _080FCA30:
beq _080FCAB2
ldr r0, =gContestResources
ldr r2, [r0]
ldr r0, =gUnknown_02039F25
ldr r0, =gContestPlayerMonIndex
ldrb r0, [r0]
lsls r1, r0, 3
subs r1, r0
@@ -860,7 +860,7 @@ _080FCC08:
lsls r0, 24
cmp r0, 0
beq _080FCC82
ldr r0, =gUnknown_02039F20
ldr r0, =gContestFinalStandings
movs r1, 0x4
_080FCC16:
bl sub_80FC4F4
@@ -881,7 +881,7 @@ _080FCC38:
lsls r0, 24
cmp r0, 0
beq _080FCC82
ldr r0, =gUnknown_02039F20
ldr r0, =gContestFinalStandings
ldr r1, =gUnknown_02039F2B
ldrb r1, [r1]
lsls r1, 8
@@ -1262,7 +1262,7 @@ _080FCF80:
lsls r0, 24
cmp r0, 0
beq _080FCFBE
ldr r0, =gUnknown_02039F00
ldr r0, =gContestMonConditions
movs r1, 0x8
bl sub_80FC4F4
cmp r0, 0x1
@@ -1274,7 +1274,7 @@ _080FCF9C:
lsls r0, 24
cmp r0, 0
beq _080FCFBE
ldr r0, =gUnknown_02039F00
ldr r0, =gContestMonConditions
ldr r1, =gUnknown_02039F2B
ldrb r1, [r1]
lsls r1, 8
asm/contest_link_81D9DE4.s
+9 -9
View File
@@ -88,8 +88,8 @@ _081D9EA4:
_081D9EB4:
bl GetMonData
strb r0, [r4]
ldr r5, =gUnknown_02039E00
ldr r4, =gUnknown_02039F25
ldr r5, =gContestMons
ldr r4, =gContestPlayerMonIndex
ldrb r0, [r4]
lsls r0, 6
adds r0, r5
@@ -266,7 +266,7 @@ _081DA02A:
lsls r0, 24
cmp r0, 0
bne _081DA0B8
ldr r0, =gUnknown_02039E00
ldr r0, =gContestMons
adds r1, r0, 0
adds r1, 0x2C
ldrb r2, [r1]
@@ -438,10 +438,10 @@ _081DA1A4:
lsls r0, 24
cmp r0, 0
beq _081DA224
ldr r0, =gUnknown_02039F25
ldr r0, =gContestPlayerMonIndex
ldrb r0, [r0]
lsls r0, 6
ldr r1, =gUnknown_02039E00
ldr r1, =gContestMons
adds r0, r1
movs r1, 0x40
bl sub_80FC4F4
@@ -466,7 +466,7 @@ _081DA1D4:
ldr r6, =gLinkPlayers
_081DA1EC:
lsls r4, r5, 6
ldr r0, =gUnknown_02039E00
ldr r0, =gContestMons
adds r4, r0
lsls r1, r5, 8
ldr r0, =gBlockRecvBuffer
@@ -558,7 +558,7 @@ _081DA2AC:
adds r1, r4, 0
movs r2, 0x4
bl memcpy
ldr r0, =gUnknown_030060B8
ldr r0, =gContestRngValue
adds r1, r4, 0
movs r2, 0x4
bl memcpy
@@ -823,7 +823,7 @@ _081DA4CC:
ldr r0, =gUnknown_02039F30
ldrb r2, [r0]
lsls r0, r2, 6
ldr r1, =gUnknown_02039E00
ldr r1, =gContestMons
adds r0, r1
movs r1, 0x4
subs r1, r2
@@ -847,7 +847,7 @@ _081DA50C:
ldr r4, =gUnknown_02039F30
ldrb r3, [r4]
lsls r0, r3, 6
ldr r5, =gUnknown_02039E00
ldr r5, =gContestMons
adds r0, r5
ldr r1, =gBlockRecvBuffer
movs r2, 0x4
asm/easy_chat.s
+6 -1272
View File
File diff suppressed because it is too large Load Diff
asm/field_control_avatar.s
+10 -10
View File
@@ -530,7 +530,7 @@ sub_809C2C8: @ 809C2C8
ldrh r1, [r4, 0x2]
b _0809C30E
_0809C2F0:
ldr r1, =gUnknown_08339D64
ldr r1, =gDirectionToVectors
lsls r2, r6, 3
adds r0, r2, r1
ldr r3, [r0]
@@ -631,7 +631,7 @@ _0809C3B4:
lsrs r0, 24
cmp r0, 0x1
bne _0809C400
ldr r1, =gUnknown_08339D64
ldr r1, =gDirectionToVectors
lsls r2, r7, 3
adds r0, r2, r1
ldr r3, [r0]
@@ -1658,7 +1658,7 @@ mapheader_run_first_tag2_script_list_match_conditionally: @ 809CC38
negs r0, r0
cmp r4, r0
beq _0809CC90
bl walkrun_find_lowest_active_bit_in_bitfield
bl StoreInitialPlayerAvatarState
mov r0, r8
adds r1, r4, 0
adds r2, r7, 0
@@ -1699,7 +1699,7 @@ sub_809CC9C: @ 809CC9C
lsrs r0, 24
cmp r0, 0x1
bne _0809CD8A
bl walkrun_find_lowest_active_bit_in_bitfield
bl StoreInitialPlayerAvatarState
adds r0, r7, 0
adds r1, r4, 0
adds r2, r6, 0
@@ -2083,7 +2083,7 @@ _0809CFB0:
lsrs r0, 24
cmp r0, 0x1
bne _0809CFFC
bl walkrun_find_lowest_active_bit_in_bitfield
bl StoreInitialPlayerAvatarState
adds r0, r6, 0
adds r1, r4, 0
adds r2, r5, 0
@@ -2334,7 +2334,7 @@ dive_warp: @ 809D16C
subs r1, 0x7
lsls r1, 16
lsrs r1, 16
bl sub_8085058
bl SetDiveWarpEmerge
b _0809D1C8
.pool
_0809D1A4:
@@ -2353,12 +2353,12 @@ _0809D1A4:
subs r1, 0x7
lsls r1, 16
lsrs r1, 16
bl sub_8085078
bl SetDiveWarpDive
_0809D1C8:
lsls r0, 24
cmp r0, 0
beq _0809D1E0
bl walkrun_find_lowest_active_bit_in_bitfield
bl StoreInitialPlayerAvatarState
bl sp13E_warp_to_last_warp
movs r0, 0xE9
bl PlaySE
@@ -2407,7 +2407,7 @@ sub_809D1E8: @ 809D1E8
subs r1, 0x7
lsls r1, 16
lsrs r1, 16
bl sub_8085058
bl SetDiveWarpEmerge
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -2431,7 +2431,7 @@ _0809D244:
subs r1, 0x7
lsls r1, 16
lsrs r1, 16
bl sub_8085078
bl SetDiveWarpDive
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
asm/field_effect_helpers.s
+8 -8
View File
@@ -20,7 +20,7 @@ SetUpReflection: @ 8153ED4
ldrsh r2, [r4, r0]
adds r0, r4, 0
movs r3, 0x98
bl obj_unfreeze
bl CreateCopySpriteAt
lsls r0, 24
lsrs r0, 24
lsls r1, r0, 4
@@ -34,7 +34,7 @@ SetUpReflection: @ 8153ED4
movs r0, 0xC
orrs r1, r0
strb r1, [r7, 0x5]
ldr r2, =gUnknown_084975C4
ldr r2, =gReflectionEffectPaletteMap
lsrs r0, r1, 4
adds r0, r2
ldrb r0, [r0]
@@ -185,7 +185,7 @@ npc_pal_op_B: @ 815401C
bne _0815404C
ldrh r0, [r2, 0x2]
adds r1, r4, 0
bl npc_load_two_palettes__no_record
bl LoadPlayerObjectReflectionPalette
b _0815406A
.pool
_0815404C:
@@ -193,15 +193,15 @@ _0815404C:
bne _0815405A
ldrh r0, [r2, 0x2]
adds r1, r4, 0
bl npc_load_two_palettes__and_record
bl LoadSpecialObjectReflectionPalette
b _0815406A
_0815405A:
adds r0, r4, 0
bl npc_paltag_by_palslot
bl GetObjectPaletteTag
lsls r0, 16
lsrs r0, 16
adds r1, r4, 0
bl pal_patch_for_npc
bl PatchObjectPalette
_0815406A:
adds r0, r4, 0
bl UpdateSpritePaletteWithWeather
@@ -225,7 +225,7 @@ npc_pal_op_A: @ 8154078
beq _0815409C
adds r0, r1, 0
adds r1, r4, 0
bl pal_patch_for_npc
bl PatchObjectPalette
adds r0, r4, 0
bl UpdateSpritePaletteWithWeather
_0815409C:
@@ -277,7 +277,7 @@ _081540E0:
b _08154214
.pool
_081540FC:
ldr r1, =gUnknown_084975C4
ldr r1, =gReflectionEffectPaletteMap
ldrb r0, [r5, 0x5]
lsrs r0, 4
adds r0, r1
asm/field_player_avatar.s
+1 -1273
View File
File diff suppressed because it is too large Load Diff
asm/field_screen.s
+12 -12
View File
@@ -7914,7 +7914,7 @@ sub_80AF0B4: @ 80AF0B4
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
bl warp1_get_mapheader
bl GetDestinationWarpMapHeader
ldrb r1, [r0, 0x17]
adds r0, r4, 0
bl sub_8137360
@@ -8924,7 +8924,7 @@ _080AF914:
bl sub_80AF710
cmp r0, 0
bne _080AF93E
bl sub_80859A0
bl BGMusicStopped
lsls r0, 24
cmp r0, 0
beq _080AF93E
@@ -8934,7 +8934,7 @@ _080AF926:
strh r0, [r4, 0x8]
b _080AF93E
_080AF92E:
bl warp_in
bl WarpIntoMap
ldr r0, =sub_8086074
bl SetMainCallback2
adds r0, r5, 0
@@ -8999,7 +8999,7 @@ _080AF9B2:
bl sub_80AF710
cmp r0, 0
bne _080AF9E8
bl sub_80859A0
bl BGMusicStopped
lsls r0, 24
cmp r0, 0
beq _080AF9E8
@@ -9014,7 +9014,7 @@ _080AF9D0:
ldrb r0, [r0]
cmp r0, 0
bne _080AF9E8
bl warp_in
bl WarpIntoMap
ldr r0, =CB2_LoadMap
bl SetMainCallback2
adds r0, r5, 0
@@ -9076,7 +9076,7 @@ _080AFA44:
bl sub_81BE72C
strh r5, [r4, 0xA]
_080AFA5A:
bl sub_80859A0
bl BGMusicStopped
lsls r0, 24
cmp r0, 0
beq _080AFA7C
@@ -9086,7 +9086,7 @@ _080AFA64:
strh r0, [r4, 0x8]
b _080AFA7C
_080AFA6C:
bl warp_in
bl WarpIntoMap
ldr r0, =CB2_LoadMap
bl SetMainCallback2
adds r0, r6, 0
@@ -9297,7 +9297,7 @@ _080AFC2C:
bl sub_80AF710
cmp r0, 0
bne _080AFC56
bl sub_80859A0
bl BGMusicStopped
lsls r0, 24
cmp r0, 0
beq _080AFC56
@@ -9307,7 +9307,7 @@ _080AFC3E:
strh r0, [r4, 0x8]
b _080AFC56
_080AFC46:
bl warp_in
bl WarpIntoMap
ldr r0, =sub_8086024
bl SetMainCallback2
adds r0, r5, 0
@@ -10049,7 +10049,7 @@ _080B0210:
bl sub_80AF710
cmp r0, 0
bne _080B023A
bl sub_80859A0
bl BGMusicStopped
lsls r0, 24
cmp r0, 0
beq _080B023A
@@ -10059,7 +10059,7 @@ _080B0222:
strh r0, [r4, 0x8]
b _080B023A
_080B022A:
bl warp_in
bl WarpIntoMap
ldr r0, =CB2_LoadMap
bl SetMainCallback2
adds r0, r5, 0
@@ -10492,7 +10492,7 @@ task50_0807F0C8: @ 80B05CC
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
bl sub_80859A0
bl BGMusicStopped
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
asm/field_specials.s
-8075
View File
File diff suppressed because it is too large Load Diff
asm/learn_move.s
-1646
View File
File diff suppressed because it is too large Load Diff
asm/macros/battle_ai_script.inc
+84 -84
View File
@@ -27,86 +27,86 @@
.byte \param0
.endm
.macro if_hp_less_than bank, param1, param2
.macro if_hp_less_than battler, param1, param2
.byte 0x5
.byte \bank
.byte \battler
.byte \param1
.4byte \param2
.endm
.macro if_hp_more_than bank, param1, param2
.macro if_hp_more_than battler, param1, param2
.byte 0x6
.byte \bank
.byte \battler
.byte \param1
.4byte \param2
.endm
.macro if_hp_equal bank, param1, param2
.macro if_hp_equal battler, param1, param2
.byte 0x7
.byte \bank
.byte \battler
.byte \param1
.4byte \param2
.endm
.macro if_hp_not_equal bank, param1, param2
.macro if_hp_not_equal battler, param1, param2
.byte 0x8
.byte \bank
.byte \battler
.byte \param1
.4byte \param2
.endm
.macro if_status bank, status1, param2
.macro if_status battler, status1, param2
.byte 0x9
.byte \bank
.byte \battler
.4byte \status1
.4byte \param2
.endm
.macro if_not_status bank, status1, param2
.macro if_not_status battler, status1, param2
.byte 0xa
.byte \bank
.byte \battler
.4byte \status1
.4byte \param2
.endm
.macro if_status2 bank, status2, param2
.macro if_status2 battler, status2, param2
.byte 0xb
.byte \bank
.byte \battler
.4byte \status2
.4byte \param2
.endm
.macro if_not_status2 bank, status2, param2
.macro if_not_status2 battler, status2, param2
.byte 0xc
.byte \bank
.byte \battler
.4byte \status2
.4byte \param2
.endm
.macro if_status3 bank, status3, param2
.macro if_status3 battler, status3, param2
.byte 0xd
.byte \bank
.byte \battler
.4byte \status3
.4byte \param2
.endm
.macro if_not_status3 bank, status3, param2
.macro if_not_status3 battler, status3, param2
.byte 0xe
.byte \bank
.byte \battler
.4byte \status3
.4byte \param2
.endm
.macro if_side_affecting bank, sidestatus, param2
.macro if_side_affecting battler, sidestatus, param2
.byte 0xf
.byte \bank
.byte \battler
.4byte \sidestatus
.4byte \param2
.endm
.macro if_not_side_affecting bank, sidestatus, param2
.macro if_not_side_affecting battler, sidestatus, param2
.byte 0x10
.byte \bank
.byte \battler
.4byte \sidestatus
.4byte \param2
.endm
@@ -222,9 +222,9 @@
.byte 0x24
.endm
.macro get_last_used_bank_move bank
.macro get_last_used_bank_move battler
.byte 0x25
.byte \bank
.byte \battler
.endm
.macro if_equal_ param0, param1
@@ -259,9 +259,9 @@
.byte 0x2b
.endm
.macro count_usable_party_mons bank
.macro count_usable_party_mons battler
.byte 0x2c
.byte \bank
.byte \battler
.endm
.macro get_considered_move
@@ -272,9 +272,9 @@
.byte 0x2e
.endm
.macro get_ability bank
.macro get_ability battler
.byte 0x2f
.byte \bank
.byte \battler
.endm
.macro get_highest_type_effectiveness
@@ -295,16 +295,16 @@
.byte 0x33
.endm
.macro if_status_in_party bank, status1, param2
.macro if_status_in_party battler, status1, param2
.byte 0x34
.byte \bank
.byte \battler
.4byte \status1
.4byte \param2
.endm
.macro if_status_not_in_party bank, status1, param2
.macro if_status_not_in_party battler, status1, param2
.byte 0x35
.byte \bank
.byte \battler
.4byte \status1
.4byte \param2
.endm
@@ -325,33 +325,33 @@
.4byte \param1
.endm
.macro if_stat_level_less_than bank, stat, param2, param3
.macro if_stat_level_less_than battler, stat, param2, param3
.byte 0x39
.byte \bank
.byte \battler
.byte \stat
.byte \param2
.4byte \param3
.endm
.macro if_stat_level_more_than bank, stat, param2, param3
.macro if_stat_level_more_than battler, stat, param2, param3
.byte 0x3a
.byte \bank
.byte \battler
.byte \stat
.byte \param2
.4byte \param3
.endm
.macro if_stat_level_equal bank, stat, param2, param3
.macro if_stat_level_equal battler, stat, param2, param3
.byte 0x3b
.byte \bank
.byte \battler
.byte \stat
.byte \param2
.4byte \param3
.endm
.macro if_stat_level_not_equal bank, stat, param2, param3
.macro if_stat_level_not_equal battler, stat, param2, param3
.byte 0x3c
.byte \bank
.byte \battler
.byte \stat
.byte \param2
.4byte \param3
@@ -367,37 +367,37 @@
.4byte \param0
.endm
.macro if_has_move bank, param1, param2
.macro if_has_move battler, param1, param2
.byte 0x3f
.byte \bank
.byte \battler
.2byte \param1
.4byte \param2
.endm
.macro if_doesnt_have_move bank, param1, param2
.macro if_doesnt_have_move battler, param1, param2
.byte 0x40
.byte \bank
.byte \battler
.2byte \param1
.4byte \param2
.endm
.macro if_has_move_with_effect bank, param1, param2
.macro if_has_move_with_effect battler, param1, param2
.byte 0x41
.byte \bank
.byte \battler
.byte \param1
.4byte \param2
.endm
.macro if_doesnt_have_move_with_effect bank, param1, param2
.macro if_doesnt_have_move_with_effect battler, param1, param2
.byte 0x42
.byte \bank
.byte \battler
.byte \param1
.4byte \param2
.endm
.macro if_any_move_disabled_or_encored bank, param1, param2
.macro if_any_move_disabled_or_encored battler, param1, param2
.byte 0x43
.byte \bank
.byte \battler
.byte \param1
.4byte \param2
.endm
@@ -421,33 +421,33 @@
.byte 0x47
.endm
.macro get_hold_effect bank
.macro get_hold_effect battler
.byte 0x48
.byte \bank
.byte \battler
.endm
.macro get_gender bank
.macro get_gender battler
.byte 0x49
.byte \bank
.byte \battler
.endm
.macro is_first_turn_for bank
.macro is_first_turn_for battler
.byte 0x4a
.byte \bank
.byte \battler
.endm
.macro get_stockpile_count bank
.macro get_stockpile_count battler
.byte 0x4b
.byte \bank
.byte \battler
.endm
.macro is_double_battle
.byte 0x4c
.endm
.macro get_used_held_item bank
.macro get_used_held_item battler
.byte 0x4d
.byte \bank
.byte \battler
.endm
.macro get_move_type_from_result
@@ -462,9 +462,9 @@
.byte 0x50
.endm
.macro get_protect_count bank
.macro get_protect_count battler
.byte 0x51
.byte \bank
.byte \battler
.endm
.macro nullsub_52
@@ -526,27 +526,27 @@
.4byte \param0
.endm
.macro is_of_type bank, type
.macro is_of_type battler, type
.byte 0x5f
.byte \bank
.byte \battler
.byte \type
.endm
.macro check_ability bank, ability
.macro check_ability battler, ability
.byte 0x60
.byte \bank
.byte \battler
.byte \ability
.endm
.macro if_flash_fired bank, param1
.macro if_flash_fired battler, param1
.byte 0x61
.byte \bank
.byte \battler
.4byte \param1
.endm
.macro if_holds_item bank, param1, param2
.macro if_holds_item battler, param1, param2
.byte 0x62
.byte \bank
.byte \battler
.2byte \param1
.4byte \param2
.endm
@@ -572,23 +572,23 @@
get_type AI_TYPE2_TARGET
.endm
.macro if_ability bank, ability, ptr
check_ability \bank, \ability
.macro if_ability battler, ability, ptr
check_ability \battler, \ability
if_equal 1, \ptr
.endm
.macro if_no_ability bank, ability, ptr
check_ability \bank, \ability
.macro if_no_ability battler, ability, ptr
check_ability \battler, \ability
if_equal 0, \ptr
.endm
.macro if_type bank, type, ptr
is_of_type \bank, \type
.macro if_type battler, type, ptr
is_of_type \battler, \type
if_equal 1, \ptr
.endm
.macro if_no_type bank, type, ptr
is_of_type \bank, \type
.macro if_no_type battler, type, ptr
is_of_type \battler, \type
if_equal 0, \ptr
.endm
@@ -610,10 +610,10 @@
if_equal 0, \ptr
.endm
.macro if_any_move_disabled bank, ptr
if_any_move_disabled_or_encored \bank, 0, \ptr
.macro if_any_move_disabled battler, ptr
if_any_move_disabled_or_encored \battler, 0, \ptr
.endm
.macro if_any_move_encored bank, ptr
if_any_move_disabled_or_encored \bank, 1, \ptr
.macro if_any_move_encored battler, ptr
if_any_move_disabled_or_encored \battler, 1, \ptr
.endm
asm/macros/battle_anim_script.inc
+20 -20
View File
@@ -56,14 +56,14 @@
.2byte \param0
.endm
.macro monbg bank
.macro monbg battler
.byte 0xa
.byte \bank
.byte \battler
.endm
.macro clearmonbg bank
.macro clearmonbg battler
.byte 0xb
.byte \bank
.byte \battler
.endm
.macro setalpha param0
@@ -189,14 +189,14 @@
.4byte \param2
.endm
.macro monbg_22 bank
.macro monbg_22 battler
.byte 0x22
.byte \bank
.byte \battler
.endm
.macro clearmonbg_23 bank
.macro clearmonbg_23 battler
.byte 0x23
.byte \bank
.byte \battler
.endm
.macro jumpifcontest param0
@@ -229,38 +229,38 @@
.byte \param4
.endm
.macro monbgprio_28 bank
.macro monbgprio_28 battler
.byte 0x28
.byte \bank
.byte \battler
.endm
.macro monbgprio_29
.byte 0x29
.endm
.macro monbgprio_2A bank
.macro monbgprio_2A battler
.byte 0x2a
.byte \bank
.byte \battler
.endm
.macro invisible bank
.macro invisible battler
.byte 0x2b
.byte \bank
.byte \battler
.endm
.macro visible bank
.macro visible battler
.byte 0x2c
.byte \bank
.byte \battler
.endm
.macro doublebattle_2D bank
.macro doublebattle_2D battler
.byte 0x2d
.byte \bank
.byte \battler
.endm
.macro doublebattle_2E bank
.macro doublebattle_2E battler
.byte 0x2e
.byte \bank
.byte \battler
.endm
.macro stopsound
asm/macros/battle_script.inc
+150 -150
View File
@@ -45,14 +45,14 @@
.byte 0xa
.endm
.macro healthbarupdate bank
.macro healthbarupdate battler
.byte 0xb
.byte \bank
.byte \battler
.endm
.macro datahpupdate bank
.macro datahpupdate battler
.byte 0xc
.byte \bank
.byte \battler
.endm
.macro critmessage
@@ -104,38 +104,38 @@
.byte 0x17
.endm
.macro clearstatusfromeffect bank
.macro clearstatusfromeffect battler
.byte 0x18
.byte \bank
.byte \battler
.endm
.macro tryfaintmon bank, param1, param2
.macro tryfaintmon battler, param1, param2
.byte 0x19
.byte \bank
.byte \battler
.byte \param1
.4byte \param2
.endm
.macro dofaintanimation bank
.macro dofaintanimation battler
.byte 0x1a
.byte \bank
.byte \battler
.endm
.macro cleareffectsonfaint bank
.macro cleareffectsonfaint battler
.byte 0x1b
.byte \bank
.byte \battler
.endm
.macro jumpifstatus bank, status1, param2
.macro jumpifstatus battler, status1, param2
.byte 0x1c
.byte \bank
.byte \battler
.4byte \status1
.4byte \param2
.endm
.macro jumpifstatus2 bank, status2, param2
.macro jumpifstatus2 battler, status2, param2
.byte 0x1d
.byte \bank
.byte \battler
.4byte \status2
.4byte \param2
.endm
@@ -147,40 +147,40 @@
.4byte \param2
.endm
.macro jumpifsideaffecting bank, sidestatus, param2
.macro jumpifsideaffecting battler, sidestatus, param2
.byte 0x1f
.byte \bank
.byte \battler
.2byte \sidestatus
.4byte \param2
.endm
.macro jumpifstat bank, ifflag, stat, param3, param4
.macro jumpifstat battler, ifflag, stat, param3, param4
.byte 0x20
.byte \bank
.byte \battler
.byte \ifflag
.byte \stat
.byte \param3
.4byte \param4
.endm
.macro jumpifstatus3condition bank, status3, param2, param3
.macro jumpifstatus3condition battler, status3, param2, param3
.byte 0x21
.byte \bank
.byte \battler
.4byte \status3
.byte \param2
.4byte \param3
.endm
.macro jumpiftype bank, type, param2
.macro jumpiftype battler, type, param2
.byte 0x22
.byte \bank
.byte \battler
.byte \type
.4byte \param2
.endm
.macro getexp bank
.macro getexp battler
.byte 0x23
.byte \bank
.byte \battler
.endm
.macro atk24 param0
@@ -325,9 +325,9 @@
.byte 0x3a
.endm
.macro healthbar_update bank
.macro healthbar_update battler
.byte 0x3b
.byte \bank
.byte \battler
.endm
.macro return
@@ -356,9 +356,9 @@
.4byte \param0
.endm
.macro jumpiftype2 bank, type, param2
.macro jumpiftype2 battler, type, param2
.byte 0x42
.byte \bank
.byte \battler
.byte \type
.4byte \param2
.endm
@@ -373,16 +373,16 @@
.byte 0x44
.endm
.macro playanimation bank, param1, param2
.macro playanimation battler, param1, param2
.byte 0x45
.byte \bank
.byte \battler
.byte \param1
.4byte \param2
.endm
.macro playanimation2 bank, param1, param2
.macro playanimation2 battler, param1, param2
.byte 0x46
.byte \bank
.byte \battler
.4byte \param1
.4byte \param2
.endm
@@ -391,9 +391,9 @@
.byte 0x47
.endm
.macro playstatchangeanimation bank, param1, param2
.macro playstatchangeanimation battler, param1, param2
.byte 0x48
.byte \bank
.byte \battler
.byte \param1
.byte \param2
.endm
@@ -412,25 +412,25 @@
.byte 0x4b
.endm
.macro getswitchedmondata bank
.macro getswitchedmondata battler
.byte 0x4c
.byte \bank
.byte \battler
.endm
.macro switchindataupdate bank
.macro switchindataupdate battler
.byte 0x4d
.byte \bank
.byte \battler
.endm
.macro switchinanim bank, dontclearsubstitutebit
.macro switchinanim battler, dontclearsubstitutebit
.byte 0x4e
.byte \bank
.byte \battler
.byte \dontclearsubstitutebit
.endm
.macro jumpifcantswitch bank, param1
.macro jumpifcantswitch battler, param1
.byte 0x4f
.byte \bank
.byte \battler
.4byte \param1
.endm
@@ -440,20 +440,20 @@
.4byte \param1
.endm
.macro switchhandleorder bank, param1
.macro switchhandleorder battler, param1
.byte 0x51
.byte \bank
.byte \battler
.byte \param1
.endm
.macro switchineffects bank
.macro switchineffects battler
.byte 0x52
.byte \bank
.byte \battler
.endm
.macro trainerslidein bank
.macro trainerslidein battler
.byte 0x53
.byte \bank
.byte \battler
.endm
.macro playse param0
@@ -466,18 +466,18 @@
.2byte \param0
.endm
.macro playfaintcry bank
.macro playfaintcry battler
.byte 0x56
.byte \bank
.byte \battler
.endm
.macro atk57
.byte 0x57
.endm
.macro returntoball bank
.macro returntoball battler
.byte 0x58
.byte \bank
.byte \battler
.endm
.macro handlelearnnewmove param0, param1, param2
@@ -497,18 +497,18 @@
.4byte \param0
.endm
.macro hitanimation bank
.macro hitanimation battler
.byte 0x5c
.byte \bank
.byte \battler
.endm
.macro getmoneyreward
.byte 0x5d
.endm
.macro atk5E bank
.macro atk5E battler
.byte 0x5e
.byte \bank
.byte \battler
.endm
.macro swapattackerwithtarget
@@ -520,14 +520,14 @@
.byte \param0
.endm
.macro drawpartystatussummary bank
.macro drawpartystatussummary battler
.byte 0x61
.byte \bank
.byte \battler
.endm
.macro hidepartystatussummary bank
.macro hidepartystatussummary battler
.byte 0x62
.byte \bank
.byte \battler
.endm
.macro jumptorandomattack param0
@@ -535,20 +535,20 @@
.byte \param0
.endm
.macro statusanimation bank
.macro statusanimation battler
.byte 0x64
.byte \bank
.byte \battler
.endm
.macro status2animation bank, status2
.macro status2animation battler, status2
.byte 0x65
.byte \bank
.byte \battler
.4byte \status2
.endm
.macro chosenstatusanimation bank, param1, param2
.macro chosenstatusanimation battler, param1, param2
.byte 0x66
.byte \bank
.byte \battler
.byte \param1
.4byte \param2
.endm
@@ -565,9 +565,9 @@
.byte 0x69
.endm
.macro removeitem bank
.macro removeitem battler
.byte 0x6a
.byte \bank
.byte \battler
.endm
.macro atknameinbuff1
@@ -586,14 +586,14 @@
.byte 0x6e
.endm
.macro makevisible bank
.macro makevisible battler
.byte 0x6f
.byte \bank
.byte \battler
.endm
.macro recordlastability bank
.macro recordlastability battler
.byte 0x70
.byte \bank
.byte \battler
.endm
.macro buffermovetolearn
@@ -605,23 +605,23 @@
.4byte \param0
.endm
.macro hpthresholds bank
.macro hpthresholds battler
.byte 0x73
.byte \bank
.byte \battler
.endm
.macro hpthresholds2 bank
.macro hpthresholds2 battler
.byte 0x74
.byte \bank
.byte \battler
.endm
.macro useitemonopponent
.byte 0x75
.endm
.macro various bank, param1
.macro various battler, param1
.byte 0x76
.byte \bank
.byte \battler
.byte \param1
.endm
@@ -642,10 +642,10 @@
.4byte \param0
.endm
.macro tryhealhalfhealth param0, bank
.macro tryhealhalfhealth param0, battler
.byte 0x7b
.4byte \param0
.byte \bank
.byte \battler
.endm
.macro trymirrormove
@@ -773,9 +773,9 @@
.4byte \param0
.endm
.macro updatestatusicon bank
.macro updatestatusicon battler
.byte 0x98
.byte \bank
.byte \battler
.endm
.macro setmist
@@ -1112,14 +1112,14 @@
.4byte \param0
.endm
.macro switchoutabilities bank
.macro switchoutabilities battler
.byte 0xe2
.byte \bank
.byte \battler
.endm
.macro jumpifhasnohp bank, param1
.macro jumpifhasnohp battler, param1
.byte 0xe3
.byte \bank
.byte \battler
.4byte \param1
.endm
@@ -1215,112 +1215,112 @@
.endm
@ various command changed to more readable macros
.macro cancelmultiturnmoves bank
various \bank, VARIOUS_CANCEL_MULTI_TURN_MOVES
.macro cancelmultiturnmoves battler
various \battler, VARIOUS_CANCEL_MULTI_TURN_MOVES
.endm
.macro setmagiccoattarget bank
various \bank, VARIOUS_SET_MAGIC_COAT_TARGET
.macro setmagiccoattarget battler
various \battler, VARIOUS_SET_MAGIC_COAT_TARGET
.endm
.macro getifcantrunfrombattle bank
various \bank, VARIOUS_IS_RUNNING_IMPOSSIBLE
.macro getifcantrunfrombattle battler
various \battler, VARIOUS_IS_RUNNING_IMPOSSIBLE
.endm
.macro getmovetarget bank
various \bank, VARIOUS_GET_MOVE_TARGET
.macro getmovetarget battler
various \battler, VARIOUS_GET_MOVE_TARGET
.endm
.macro various4 bank
various \bank, 4
.macro various4 battler
various \battler, 4
.endm
.macro resetintrimidatetracebits bank
various \bank, VARIOUS_RESET_INTIMIDATE_TRACE_BITS
.macro resetintrimidatetracebits battler
various \battler, VARIOUS_RESET_INTIMIDATE_TRACE_BITS
.endm
.macro updatechoicemoveonlvlup bank
various \bank, VARIOUS_UPDATE_CHOICE_MOVE_ON_LVL_UP
.macro updatechoicemoveonlvlup battler
various \battler, VARIOUS_UPDATE_CHOICE_MOVE_ON_LVL_UP
.endm
.macro various7 bank
various \bank, 7
.macro various7 battler
various \battler, 7
.endm
.macro various8 bank
various \bank, 8
.macro various8 battler
various \battler, 8
.endm
.macro various9 bank
various \bank, 9
.macro various9 battler
various \battler, 9
.endm
.macro various10 bank
various \bank, 10
.macro various10 battler
various \battler, 10
.endm
.macro various11 bank
various \bank, 11
.macro various11 battler
various \battler, 11
.endm
.macro various12 bank
various \bank, 12
.macro various12 battler
various \battler, 12
.endm
.macro forfeityesnobox bank
various \bank, VARIOUS_EMIT_YESNOBOX
.macro forfeityesnobox battler
various \battler, VARIOUS_EMIT_YESNOBOX
.endm
.macro various14 bank
various \bank, 14
.macro various14 battler
various \battler, 14
.endm
.macro various15 bank
various \bank, 15
.macro various15 battler
various \battler, 15
.endm
.macro various16 bank
various \bank, 16
.macro various16 battler
various \battler, 16
.endm
.macro various17 bank
various \bank, 17
.macro various17 battler
various \battler, 17
.endm
.macro waitcry bank
various \bank, VARIOUS_WAIT_CRY
.macro waitcry battler
various \battler, VARIOUS_WAIT_CRY
.endm
.macro returnopponentmon1toball bank
various \bank, VARIOUS_RETURN_OPPONENT_MON1
.macro returnopponentmon1toball battler
various \battler, VARIOUS_RETURN_OPPONENT_MON1
.endm
.macro returnopponentmon2toball bank
various \bank, VARIOUS_RETURN_OPPONENT_MON2
.macro returnopponentmon2toball battler
various \battler, VARIOUS_RETURN_OPPONENT_MON2
.endm
.macro various21 bank
various \bank, 21
.macro volumedown
various BS_ATTACKER, VARIOUS_VOLUME_DOWN
.endm
.macro various22 bank
various \bank, 22
.macro volumeup
various BS_ATTACKER, VARIOUS_VOLUME_UP
.endm
.macro various23 bank
various \bank, 23
.macro various23 battler
various \battler, 23
.endm
.macro various24 bank
various \bank, 24
.macro various24 battler
various \battler, 24
.endm
.macro setoutcomeonteleport bank
various \bank, VARIOUS_SET_TELEPORT_OUTCOME
.macro setoutcomeonteleport battler
various \battler, VARIOUS_SET_TELEPORT_OUTCOME
.endm
.macro playtrainerdefeatbgm bank
various \bank, VARIOUS_PLAY_TRAINER_DEFEATED_MUSIC
.macro playtrainerdefeatbgm battler
various \battler, VARIOUS_PLAY_TRAINER_DEFEATED_MUSIC
.endm
@ helpful macros
@@ -1332,12 +1332,12 @@
setbyte cEFFECT_CHOOSER \effect
.endm
.macro chosenstatus1animation bank, status
chosenstatusanimation \bank 0x0 \status
.macro chosenstatus1animation battler, status
chosenstatusanimation \battler 0x0 \status
.endm
.macro chosenstatus2animation bank, status
chosenstatusanimation \bank 0x1 \status
.macro chosenstatus2animation battler, status
chosenstatusanimation \battler 0x1 \status
.endm
.macro sethword dst, value
@@ -1380,12 +1380,12 @@
jumpifhalfword CMP_NOT_EQUAL, gCurrentMove, \move, \jumpptr
.endm
.macro jumpifstatus3 bank, status, jumpptr
jumpifstatus3condition \bank, \status, 0x0, \jumpptr
.macro jumpifstatus3 battler, status, jumpptr
jumpifstatus3condition \battler, \status, 0x0, \jumpptr
.endm
.macro jumpifnostatus3 bank, status, jumpptr
jumpifstatus3condition \bank, \status, 0x1, \jumpptr
.macro jumpifnostatus3 battler, status, jumpptr
jumpifstatus3condition \battler, \status, 0x1, \jumpptr
.endm
.macro jumpifmovehadnoeffect jumpptr
asm/party_menu.s
+17 -17
View File
@@ -2740,7 +2740,7 @@ sub_81B1708: @ 81B1708
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
bl ProcessMenuInputNoWrap_
bl Menu_ProcessInputNoWrap_
lsls r0, 24
asrs r1, r0, 24
cmp r1, 0
@@ -4196,7 +4196,7 @@ sub_81B227C: @ 81B227C
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
bl ProcessMenuInputNoWrap_
bl Menu_ProcessInputNoWrap_
lsls r0, 24
asrs r1, r0, 24
cmp r1, 0
@@ -6692,7 +6692,7 @@ sub_81B3730: @ 81B3730
ldrb r0, [r0, 0x17]
cmp r0, 0x3
bhi _081B3774
bl ProcessMenuInputNoWrapAround_other
bl Menu_ProcessInputNoWrapAround_other
b _081B3778
.pool
_081B3774:
@@ -6796,7 +6796,7 @@ sub_81B3828: @ 81B3828
ldr r0, =sub_81B3894
str r0, [sp]
movs r0, 0x1
bl sub_81BF8EC
bl ShowPokemonSummaryScreen
b _081B3880
.pool
_081B3868:
@@ -6810,7 +6810,7 @@ _081B3868:
ldr r0, =sub_81B3894
str r0, [sp]
movs r0, 0
bl sub_81BF8EC
bl ShowPokemonSummaryScreen
_081B3880:
add sp, 0x4
pop {r4}
@@ -8138,7 +8138,7 @@ sub_81B43DC: @ 81B43DC
push {r4-r6,lr}
lsls r0, 24
lsrs r4, r0, 24
bl ProcessMenuInputNoWrap_
bl Menu_ProcessInputNoWrap_
lsls r0, 24
asrs r1, r0, 24
cmp r1, 0
@@ -8671,7 +8671,7 @@ sub_81B48DC: @ 81B48DC
muls r1, r0
ldr r0, =gPlayerParty
adds r4, r1, r0
bl ProcessMenuInputNoWrap_
bl Menu_ProcessInputNoWrap_
lsls r0, 24
asrs r1, r0, 24
cmp r1, 0
@@ -8963,7 +8963,7 @@ sub_81B4BA0: @ 81B4BA0
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
bl ProcessMenuInputNoWrap_
bl Menu_ProcessInputNoWrap_
lsls r0, 24
asrs r1, r0, 24
cmp r1, 0
@@ -9069,7 +9069,7 @@ sub_81B4C94: @ 81B4C94
push {r7}
lsls r0, 24
lsrs r5, r0, 24
bl ProcessMenuInputNoWrap_
bl Menu_ProcessInputNoWrap_
lsls r0, 24
asrs r1, r0, 24
cmp r1, 0
@@ -9877,7 +9877,7 @@ sub_81B5430: @ 81B5430
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
bl ProcessMenuInputNoWrap_
bl Menu_ProcessInputNoWrap_
lsls r0, 24
asrs r1, r0, 24
cmp r1, 0
@@ -10171,7 +10171,7 @@ sub_81B56D8: @ 81B56D8
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
bl ProcessMenuInputNoWrap_
bl Menu_ProcessInputNoWrap_
lsls r0, 24
asrs r1, r0, 24
cmp r1, 0
@@ -11626,7 +11626,7 @@ c2_815ABFC: @ 81B6254
bl GoToBagMenu
b _081B6276
_081B626C:
ldr r0, =gUnknown_0203CF30
ldr r0, =gPyramidBagCursorData
ldr r1, [r0]
movs r0, 0x4
bl sub_81C4F98
@@ -13156,7 +13156,7 @@ sub_81B7028: @ 81B7028
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
bl ProcessMenuInputNoWrap_
bl Menu_ProcessInputNoWrap_
lsls r0, 24
asrs r1, r0, 24
cmp r1, 0
@@ -13235,7 +13235,7 @@ sub_81B70B8: @ 81B70B8
ldr r3, =sub_81B70F0
ldrh r4, [r4, 0xE]
str r4, [sp]
bl sub_81BFA38
bl ShowSelectMovePokemonSummaryScreen
add sp, 0x4
pop {r4}
pop {r0}
@@ -13458,7 +13458,7 @@ sub_81B72C8: @ 81B72C8
muls r1, r0
ldr r0, =gPlayerParty
adds r4, r1, r0
bl ProcessMenuInputNoWrap_
bl Menu_ProcessInputNoWrap_
lsls r0, 24
asrs r5, r0, 24
cmp r5, 0
@@ -15240,7 +15240,7 @@ sub_81B82D4: @ 81B82D4
push {r4-r7,lr}
lsls r0, 24
lsrs r5, r0, 24
bl ProcessMenuInputNoWrap_
bl Menu_ProcessInputNoWrap_
lsls r0, 24
asrs r1, r0, 24
cmp r1, 0
@@ -17663,7 +17663,7 @@ sub_81B968C: @ 81B968C
ldr r0, =CB2_ReturnToField
str r0, [sp]
movs r0, 0x3
bl sub_81BF8EC
bl ShowPokemonSummaryScreen
ldr r1, =gFieldCallback
ldr r0, =sub_80AF168
str r0, [r1]
asm/pokemon_storage_system.s
+22 -1527
View File
File diff suppressed because it is too large Load Diff
asm/pokemon_summary_screen.s
-5216
View File
File diff suppressed because it is too large Load Diff
asm/pokenav.s
+243 -10
View File
@@ -4,6 +4,239 @@
.syntax unified
.text
thumb_func_start sub_81C7078
sub_81C7078: @ 81C7078
push {r4,r5,lr}
adds r5, r0, 0
adds r4, r1, 0
bl is_c1_link_related_active
cmp r0, 0
bne _081C7090
ldr r0, =sub_81C7170
b _081C7092
.pool
_081C7090:
ldr r0, =sub_81C71E4
_081C7092:
lsls r1, r4, 24
lsrs r1, 24
bl CreateTask
lsls r0, 24
lsrs r4, r0, 24
adds r0, r4, 0
movs r1, 0x1
adds r2, r5, 0
bl SetWordTaskArg
ldr r1, =gTasks
lsls r0, r4, 2
adds r0, r4
lsls r0, 3
adds r0, r1
ldr r2, =gUnknown_0203CF3C
ldrb r1, [r2]
strh r1, [r0, 0xE]
ldrb r0, [r2]
adds r1, r0, 0x1
strb r1, [r2]
lsls r0, 24
lsrs r0, 8
orrs r0, r4
pop {r4,r5}
pop {r1}
bx r1
.pool
thumb_func_end sub_81C7078
thumb_func_start sub_81C70D8
sub_81C70D8: @ 81C70D8
push {lr}
ldr r1, =0x0000ffff
ands r1, r0
lsrs r3, r0, 16
ldr r2, =gTasks
lsls r0, r1, 2
adds r0, r1
lsls r0, 3
adds r1, r0, r2
ldrb r0, [r1, 0x4]
cmp r0, 0
beq _081C711C
ldr r2, [r1]
ldr r0, =sub_81C7170
cmp r2, r0
beq _081C70FE
ldr r0, =sub_81C71E4
cmp r2, r0
bne _081C711C
_081C70FE:
movs r2, 0xE
ldrsh r0, [r1, r2]
cmp r0, r3
bne _081C711C
movs r0, 0x1
b _081C711E
.pool
_081C711C:
movs r0, 0
_081C711E:
pop {r1}
bx r1
thumb_func_end sub_81C70D8
thumb_func_start sub_81C7124
sub_81C7124: @ 81C7124
push {r4-r6,lr}
adds r6, r0, 0
movs r5, 0
ldr r4, =gTasks
_081C712C:
ldrb r0, [r4, 0x4]
cmp r0, 0
beq _081C7160
ldr r1, [r4]
ldr r0, =sub_81C7170
cmp r1, r0
beq _081C7140
ldr r0, =sub_81C71E4
cmp r1, r0
bne _081C7160
_081C7140:
lsls r0, r5, 24
lsrs r0, 24
movs r1, 0x1
bl GetWordTaskArg
cmp r0, r6
bne _081C7160
movs r0, 0x1
b _081C716A
.pool
_081C7160:
adds r4, 0x28
adds r5, 0x1
cmp r5, 0xF
ble _081C712C
movs r0, 0
_081C716A:
pop {r4-r6}
pop {r1}
bx r1
thumb_func_end sub_81C7124
thumb_func_start sub_81C7170
sub_81C7170: @ 81C7170
push {r4-r7,lr}
lsls r0, 24
lsrs r5, r0, 24
adds r0, r5, 0
movs r1, 0x1
bl GetWordTaskArg
adds r6, r0, 0
lsls r0, r5, 2
adds r0, r5
lsls r0, 3
ldr r1, =gTasks + 0x8
adds r4, r0, r1
movs r7, 0
_081C718C:
movs r1, 0
ldrsh r0, [r4, r1]
bl _call_via_r6
cmp r0, 0x4
bhi _081C71D6
lsls r0, 2
ldr r1, =_081C71AC
adds r0, r1
ldr r0, [r0]
mov pc, r0
.pool
.align 2, 0
_081C71AC:
.4byte _081C71C6
.4byte _081C71C0
.4byte _081C71DE
.4byte _081C71DA
.4byte _081C71CE
_081C71C0:
ldrh r0, [r4]
adds r0, 0x1
b _081C71D8
_081C71C6:
ldrh r0, [r4]
adds r0, 0x1
strh r0, [r4]
b _081C71DE
_081C71CE:
adds r0, r5, 0
bl DestroyTask
b _081C71DE
_081C71D6:
subs r0, 0x5
_081C71D8:
strh r0, [r4]
_081C71DA:
cmp r7, 0
beq _081C718C
_081C71DE:
pop {r4-r7}
pop {r0}
bx r0
thumb_func_end sub_81C7170
thumb_func_start sub_81C71E4
sub_81C71E4: @ 81C71E4
push {r4,r5,lr}
lsls r0, 24
lsrs r5, r0, 24
bl sub_8087598
cmp r0, 0
bne _081C724A
adds r0, r5, 0
movs r1, 0x1
bl GetWordTaskArg
adds r2, r0, 0
lsls r0, r5, 2
adds r0, r5
lsls r0, 3
ldr r1, =gTasks + 0x8
adds r4, r0, r1
movs r1, 0
ldrsh r0, [r4, r1]
bl _call_via_r2
cmp r0, 0x4
bhi _081C7246
lsls r0, 2
ldr r1, =_081C7224
adds r0, r1
ldr r0, [r0]
mov pc, r0
.pool
.align 2, 0
_081C7224:
.4byte _081C7238
.4byte _081C7238
.4byte _081C724A
.4byte _081C724A
.4byte _081C723E
_081C7238:
ldrh r0, [r4]
adds r0, 0x1
b _081C7248
_081C723E:
adds r0, r5, 0
bl DestroyTask
b _081C724A
_081C7246:
subs r0, 0x5
_081C7248:
strh r0, [r4]
_081C724A:
pop {r4,r5}
pop {r0}
bx r0
thumb_func_end sub_81C71E4
thumb_func_start CB2_PokeNav
CB2_PokeNav: @ 81C7250
@@ -1585,7 +1818,7 @@ sub_81C7E58: @ 81C7E58
adds r0, r4, 0
movs r2, 0x20
bl LoadPalette
ldr r4, =0x0201c000
ldr r4, =gDecompressionBuffer
mov r0, r8
adds r1, r4, 0
bl LZ77UnCompWram
@@ -1667,7 +1900,7 @@ sub_81C7F24: @ 81C7F24
adds r0, r4, 0
movs r2, 0x20
bl LoadPalette
ldr r4, =0x0201d000
ldr r4, =gDecompressionBuffer+0x1000
adds r0, r6, 0
adds r1, r4, 0
bl LZ77UnCompWram
@@ -20169,7 +20402,7 @@ sub_81D1148: @ 81D1148
add r2, sp, 0x8
mov r0, sp
bl sub_81D0760
bl dp13_810BB8C
bl ResetAllPicSprites
movs r0, 0x28
movs r1, 0x68
bl sub_81D1184
@@ -20187,7 +20420,7 @@ sub_81D1148: @ 81D1148
sub_81D1178: @ 81D1178
push {lr}
ldrh r0, [r0, 0x10]
bl sub_818D820
bl FreeAndDestroyMonPicSprite
pop {r0}
bx r0
thumb_func_end sub_81D1178
@@ -20213,7 +20446,7 @@ sub_81D1184: @ 81D1184
ldr r3, =0x0000ffff
str r3, [sp, 0xC]
movs r3, 0x1
bl sub_818D7D8
bl CreateMonPicSprite_HandleDeoxys
lsls r0, 16
lsrs r0, 16
ldr r1, =gSprites
@@ -20256,7 +20489,7 @@ sub_81D11FC: @ 81D11FC
push {r4,r5,lr}
adds r4, r0, 0
ldrh r0, [r4, 0x10]
bl sub_818D820
bl FreeAndDestroyMonPicSprite
movs r5, 0x20
negs r5, r5
adds r0, r5, 0
@@ -22585,7 +22818,7 @@ sub_81D2ACC: @ 81D2ACC
push {r7}
sub sp, 0xC
adds r4, r0, 0
bl sub_816137C
bl ShowHideHearts
movs r0, 0x1
movs r1, 0x11
bl FillWindowPixelBuffer
@@ -27036,7 +27269,7 @@ _081D4E1C:
thumb_func_start sub_81D4E30
sub_81D4E30: @ 81D4E30
push {lr}
ldr r0, =0x0201c000
ldr r0, =gDecompressionBuffer
movs r2, 0x80
lsls r2, 6
movs r1, 0
@@ -27657,7 +27890,7 @@ _081D5386:
strb r0, [r4, 0x8]
b _081D548A
_081D5390:
ldr r0, =0x0201c000
ldr r0, =gDecompressionBuffer
bl sub_81D3920
strb r0, [r4, 0xE]
ldrb r0, [r4, 0xE]
@@ -27683,7 +27916,7 @@ _081D53C0:
strb r0, [r4, 0x8]
b _081D548A
_081D53C6:
ldr r0, =0x0201c000
ldr r0, =gDecompressionBuffer
bl sub_81D3AB0
cmp r0, 0
beq _081D53EC
asm/rom_8011DC0.s
+9 -9
View File
@@ -2920,7 +2920,7 @@ _080170E0:
negs r0, r0
b _08017110
_080170F2:
bl ProcessMenuInputNoWrap_
bl Menu_ProcessInputNoWrap_
lsls r0, 24
asrs r1, r0, 24
movs r2, 0x80
@@ -6278,7 +6278,7 @@ _08018BD6:
b _08018C3E
.pool
_08018BE4:
bl ProcessMenuInputNoWrap_
bl Menu_ProcessInputNoWrap_
lsls r0, 24
asrs r6, r0, 24
movs r1, 0x80
@@ -7909,7 +7909,7 @@ bgid_upload_textbox_1: @ 8019938
lsls r2, 1
movs r3, 0
str r3, [sp]
bl copy_decompressed_tile_data_to_vram_autofree
bl DecompressAndLoadBgGfxUsingHeap
add sp, 0x4
pop {r0}
bx r0
@@ -9386,7 +9386,7 @@ sub_801A43C: @ 801A43C
movs r0, 0x1
movs r2, 0
movs r3, 0
bl copy_decompressed_tile_data_to_vram_autofree
bl DecompressAndLoadBgGfxUsingHeap
ldr r1, =gWirelessInfoScreenTilemap
movs r0, 0x1
movs r2, 0
@@ -15650,7 +15650,7 @@ _0801D7D0:
b _0801D804
.pool
_0801D7F0:
ldr r0, =0x0201c000
ldr r0, =gDecompressionBuffer
ldr r1, [r4, 0x18]
movs r2, 0x80
lsls r2, 3
@@ -15723,7 +15723,7 @@ _0801D858:
sub_801D860: @ 801D860
push {r4,lr}
adds r4, r0, 0
ldr r3, =0x0201c000
ldr r3, =gDecompressionBuffer
adds r0, r4, 0x4
ldr r1, =gSaveBlock2Ptr
ldr r1, [r1]
@@ -25386,7 +25386,7 @@ sub_80226D0: @ 80226D0
adds r6, r0, 0
movs r5, 0
ldr r0, =gUnknown_08DE3FD4
ldr r4, =0x0201c000
ldr r4, =gDecompressionBuffer
adds r1, r4, 0
bl LZ77UnCompWram
b _0802271A
@@ -28890,7 +28890,7 @@ _0802426A:
bl sub_8197930
b _080242D0
_08024270:
bl ProcessMenuInputNoWrap_
bl Menu_ProcessInputNoWrap_
lsls r0, 24
asrs r4, r0, 24
movs r0, 0x2
@@ -47811,7 +47811,7 @@ _0802DA84:
thumb_func_start sub_802DA8C
sub_802DA8C: @ 802DA8C
push {lr}
bl ProcessMenuInputNoWrap_
bl Menu_ProcessInputNoWrap_
lsls r0, 24
asrs r0, 24
pop {r1}
asm/rom_header.inc
+8 -31
View File
@@ -1,38 +1,19 @@
.global RomHeaderNintendoLogo
RomHeaderNintendoLogo:
.byte 0x24,0xff,0xae,0x51,0x69,0x9a,0xa2,0x21
.byte 0x3d,0x84,0x82,0x0a,0x84,0xe4,0x09,0xad
.byte 0x11,0x24,0x8b,0x98,0xc0,0x81,0x7f,0x21
.byte 0xa3,0x52,0xbe,0x19,0x93,0x09,0xce,0x20
.byte 0x10,0x46,0x4a,0x4a,0xf8,0x27,0x31,0xec
.byte 0x58,0xc7,0xe8,0x33,0x82,0xe3,0xce,0xbf
.byte 0x85,0xf4,0xdf,0x94,0xce,0x4b,0x09,0xc1
.byte 0x94,0x56,0x8a,0xc0,0x13,0x72,0xa7,0xfc
.byte 0x9f,0x84,0x4d,0x73,0xa3,0xca,0x9a,0x61
.byte 0x58,0x97,0xa3,0x27,0xfc,0x03,0x98,0x76
.byte 0x23,0x1d,0xc7,0x61,0x03,0x04,0xae,0x56
.byte 0xbf,0x38,0x84,0x00,0x40,0xa7,0x0e,0xfd
.byte 0xff,0x52,0xfe,0x03,0x6f,0x95,0x30,0xf1
.byte 0x97,0xfb,0xc0,0x85,0x60,0xd6,0x80,0x25
.byte 0xa9,0x63,0xbe,0x03,0x01,0x4e,0x38,0xe2
.byte 0xf9,0xa2,0x34,0xff,0xbb,0x3e,0x03,0x44
.byte 0x78,0x00,0x90,0xcb,0x88,0x11,0x3a,0x94
.byte 0x65,0xc0,0x7c,0x63,0x87,0xf0,0x3c,0xaf
.byte 0xd6,0x25,0xe4,0x8b,0x38,0x0a,0xac,0x72
.byte 0x21,0xd4,0xf8,0x07
.space 156
RomHeaderGameTitle:
.ascii "POKEMON EMER"
.space 12
.global RomHeaderGameCode
RomHeaderGameCode:
.ascii "BPEE"
.space 4
RomHeaderMakerCode:
.ascii "01"
.space 2
RomHeaderMagic:
.byte 0x96
.byte 0
RomHeaderMainUnitCode:
.byte 0
@@ -41,18 +22,14 @@ RomHeaderDeviceType:
.byte 0
RomHeaderReserved1:
.rept 7
.byte 0
.endr
.space 7
.global RomHeaderSoftwareVersion
RomHeaderSoftwareVersion:
.byte 0
RomHeaderChecksum:
.byte 0x72
.byte 0
RomHeaderReserved2:
.rept 2
.byte 0
.endr
.space 2
asm/roulette.s
+4 -4
View File
@@ -4948,7 +4948,7 @@ sub_8142CD0: @ 8142CD0
sub sp, 0x8
ldr r4, =gUnknown_085B7488
ldr r0, [r4]
ldr r5, =0x0201c000
ldr r5, =gDecompressionBuffer
adds r1, r5, 0
bl LZ77UnCompWram
str r5, [sp]
@@ -5575,7 +5575,7 @@ sub_81431E4: @ 81431E4
sub sp, 0xC
ldr r4, =gUnknown_085B741C
ldr r0, [r4]
ldr r5, =0x0201c000
ldr r5, =gDecompressionBuffer
adds r1, r5, 0
bl LZ77UnCompWram
str r5, [sp, 0x4]
@@ -5720,7 +5720,7 @@ sub_8143314: @ 8143314
push {r7}
sub sp, 0x8
movs r5, 0
ldr r7, =0x0201c000
ldr r7, =gDecompressionBuffer
mov r6, sp
_08143322:
ldr r0, =gUnknown_085B7750
@@ -6448,7 +6448,7 @@ sub_814391C: @ 814391C
sub sp, 0x8
ldr r4, =gUnknown_085B7948
ldr r0, [r4]
ldr r5, =0x0201c000
ldr r5, =gDecompressionBuffer
adds r1, r5, 0
bl LZ77UnCompWram
str r5, [sp]
asm/script_menu.s
+3 -3
View File
@@ -327,7 +327,7 @@ _080E2090:
ldrsh r0, [r5, r1]
cmp r0, 0
bne _080E209E
bl ProcessMenuInputNoWrapAround
bl Menu_ProcessInputNoWrapAround
b _080E20A2
_080E209E:
bl ProcessMenuInput
@@ -444,7 +444,7 @@ task_yes_no_maybe: @ 80E215C
b _080E21C4
.pool
_080E2180:
bl ProcessMenuInputNoWrap_
bl Menu_ProcessInputNoWrap_
lsls r0, 24
asrs r1, r0, 24
movs r0, 0x1
@@ -1498,7 +1498,7 @@ CreateWindowFromRect: @ 80E2A1C
movs r1, 0
adds r2, r4, 0
adds r3, r5, 0
bl sub_8198A50
bl CreateWindowTemplate
ldr r0, [sp, 0x10]
ldr r1, [sp, 0x14]
str r0, [sp, 0x18]
asm/script_pokemon_util_80F87D8.s
+23 -23
View File
@@ -10,7 +10,7 @@ sub_80F87D8: @ 80F87D8
push {r4,lr}
ldr r0, =gSaveBlock1Ptr
ldr r2, [r0]
ldr r1, =gUnknown_02039E00
ldr r1, =gContestMons
ldrb r3, [r1, 0x15]
ldr r4, =0x000013bc
adds r0, r2, r4
@@ -150,8 +150,8 @@ sub_80F88DC: @ 80F88DC
thumb_func_start sub_80F88E8
sub_80F88E8: @ 80F88E8
push {lr}
ldr r0, =gUnknown_02039F20
ldr r1, =gUnknown_02039F25
ldr r0, =gContestFinalStandings
ldr r1, =gContestPlayerMonIndex
ldrb r2, [r1]
adds r0, r2, r0
ldrb r0, [r0]
@@ -218,11 +218,11 @@ sub_80F8970: @ 80F8970
mov r5, r8
push {r5-r7}
sub sp, 0x8
ldr r0, =gUnknown_02039F00
ldr r0, =gContestMonConditions
mov r12, r0
ldr r1, =gSpecialVar_0x8006
mov r9, r1
ldr r2, =gUnknown_02039E00 + 2
ldr r2, =gContestMons + 2
mov r10, r2
mov r2, r12
mov r1, sp
@@ -413,7 +413,7 @@ ShowContestWinner: @ 80F8ADC
thumb_func_start sub_80F8AFC
sub_80F8AFC: @ 80F8AFC
push {r4,r5,lr}
ldr r0, =gUnknown_02039F2A
ldr r0, =gIsLinkContest
ldrb r1, [r0]
movs r0, 0x1
ands r0, r1
@@ -422,7 +422,7 @@ sub_80F8AFC: @ 80F8AFC
movs r3, 0
ldr r0, =gUnknown_02039F30
adds r4, r0, 0
ldr r5, =gUnknown_02039E00
ldr r5, =gContestMons
ldrb r0, [r4]
cmp r3, r0
bge _080F8B50
@@ -482,7 +482,7 @@ sub_80F8B94: @ 80F8B94
ldr r1, =gReservedSpritePaletteCount
movs r0, 0xC
strb r0, [r1]
ldr r0, =gUnknown_02039F2A
ldr r0, =gIsLinkContest
ldrb r1, [r0]
movs r0, 0x1
ands r0, r1
@@ -594,8 +594,8 @@ sub_80F8C7C: @ 80F8C7C
strb r0, [r1]
cmp r0, 0
bne _080F8D18
ldr r0, =gUnknown_02039F20
ldr r1, =gUnknown_02039F25
ldr r0, =gContestFinalStandings
ldr r1, =gContestPlayerMonIndex
ldrb r2, [r1]
adds r0, r2, r0
ldrb r0, [r0]
@@ -675,7 +675,7 @@ _080F8D44:
mov r9, r0
movs r1, 0x3
mov r10, r1
ldr r2, =gUnknown_02039E00
ldr r2, =gContestMons
ldr r4, =gSpecialVar_0x8006
ldrh r1, [r4]
lsls r1, 6
@@ -702,7 +702,7 @@ _080F8D44:
movs r1, 0
strh r1, [r0, 0x8]
strh r6, [r0, 0xA]
ldr r1, =gUnknown_02039F25
ldr r1, =gContestPlayerMonIndex
ldrh r0, [r4]
ldrb r1, [r1]
cmp r0, r1
@@ -758,7 +758,7 @@ _080F8DD8:
bl CreateSprite
lsls r0, 24
lsrs r5, r0, 24
ldr r0, =gUnknown_02039F2A
ldr r0, =gIsLinkContest
ldrb r1, [r0]
movs r0, 0x1
ands r0, r1
@@ -938,7 +938,7 @@ _080F8F98:
thumb_func_start sub_80F8FA0
sub_80F8FA0: @ 80F8FA0
push {r4,lr}
ldr r0, =gUnknown_02039F2A
ldr r0, =gIsLinkContest
ldrb r1, [r0]
movs r0, 0x1
ands r0, r1
@@ -973,13 +973,13 @@ _080F8FDE:
thumb_func_start sub_80F8FE8
sub_80F8FE8: @ 80F8FE8
push {r4,lr}
ldr r0, =gUnknown_02039F2A
ldr r0, =gIsLinkContest
ldrb r1, [r0]
movs r0, 0x1
ands r0, r1
cmp r0, 0
beq _080F9020
ldr r2, =gUnknown_030060B8
ldr r2, =gContestRngValue
ldr r1, [r2]
ldr r0, =0x41c64e6d
muls r0, r1
@@ -1007,7 +1007,7 @@ _080F902A:
thumb_func_start sub_80F903C
sub_80F903C: @ 80F903C
ldr r2, =gUnknown_030060B8
ldr r2, =gContestRngValue
ldr r1, [r2]
ldr r0, =0x41c64e6d
muls r0, r1
@@ -1022,7 +1022,7 @@ sub_80F903C: @ 80F903C
thumb_func_start sub_80F905C
sub_80F905C: @ 80F905C
push {lr}
ldr r0, =gUnknown_02039F2A
ldr r0, =gIsLinkContest
ldrb r1, [r0]
movs r0, 0x2
ands r0, r1
@@ -1087,7 +1087,7 @@ _080F90D4:
thumb_func_start sub_80F90DC
sub_80F90DC: @ 80F90DC
push {lr}
ldr r0, =gUnknown_02039F2A
ldr r0, =gIsLinkContest
ldrb r1, [r0]
movs r0, 0x2
ands r0, r1
@@ -1110,7 +1110,7 @@ _080F90FE:
thumb_func_start sub_80F910C
sub_80F910C: @ 80F910C
push {lr}
ldr r0, =gUnknown_02039F2A
ldr r0, =gIsLinkContest
ldrb r1, [r0]
movs r0, 0x2
ands r0, r1
@@ -1130,7 +1130,7 @@ _080F9126:
thumb_func_start sub_80F9134
sub_80F9134: @ 80F9134
push {lr}
ldr r0, =gUnknown_02039F2A
ldr r0, =gIsLinkContest
ldrb r1, [r0]
movs r0, 0x4
ands r0, r1
@@ -1148,7 +1148,7 @@ _080F914E:
thumb_func_start sub_80F9154
sub_80F9154: @ 80F9154
ldr r1, =gUnknown_02039F2A
ldr r1, =gIsLinkContest
movs r0, 0
strb r0, [r1]
bx lr
@@ -1158,7 +1158,7 @@ sub_80F9154: @ 80F9154
thumb_func_start sub_80F9160
sub_80F9160: @ 80F9160
push {lr}
ldr r0, =gUnknown_02039F2A
ldr r0, =gIsLinkContest
ldrb r1, [r0]
movs r0, 0x2
ands r0, r1
asm/shop.s
+1 -1
View File
@@ -137,7 +137,7 @@ Task_ShopMenu: @ 80DFB88
lsls r0, 24
lsrs r4, r0, 24
adds r5, r4, 0
bl ProcessMenuInputNoWrapAround
bl Menu_ProcessInputNoWrapAround
lsls r0, 24
asrs r2, r0, 24
movs r0, 0x2
asm/slot_machine.s
+222 -2910
View File
File diff suppressed because it is too large Load Diff
asm/trade.s
+8 -8
View File
@@ -3349,7 +3349,7 @@ sub_8078EF8: @ 8078EF8
sub_8078F50: @ 8078F50
push {lr}
sub sp, 0x4
bl ProcessMenuInputNoWrapAround
bl Menu_ProcessInputNoWrapAround
lsls r0, 24
asrs r0, 24
movs r1, 0x1
@@ -3499,7 +3499,7 @@ sub_807905C: @ 807905C
ldr r0, =sub_8077B74
str r0, [sp]
movs r0, 0x1
bl sub_81BF8EC
bl ShowPokemonSummaryScreen
b _080790C0
.pool
_080790A4:
@@ -3515,7 +3515,7 @@ _080790A4:
ldr r0, =sub_8077B74
str r0, [sp]
movs r0, 0x1
bl sub_81BF8EC
bl ShowPokemonSummaryScreen
_080790C0:
bl FreeAllWindowBuffers
_080790C4:
@@ -3695,7 +3695,7 @@ _0807920E:
thumb_func_start sub_8079218
sub_8079218: @ 8079218
push {lr}
bl ProcessMenuInputNoWrap_
bl Menu_ProcessInputNoWrap_
lsls r0, 24
asrs r1, r0, 24
cmp r1, 0
@@ -3797,7 +3797,7 @@ _080792D8:
thumb_func_start sub_80792E4
sub_80792E4: @ 80792E4
push {lr}
bl ProcessMenuInputNoWrap_
bl Menu_ProcessInputNoWrap_
lsls r0, 24
asrs r1, r0, 24
cmp r1, 0
@@ -7609,10 +7609,10 @@ sub_807B170: @ 807B170
mov r1, r10
movs r2, 0
movs r3, 0
bl copy_decompressed_tile_data_to_vram_autofree
bl DecompressAndLoadBgGfxUsingHeap
ldr r0, =gBattleTextboxTilemap
mov r8, r0
ldr r4, =0x0201c000
ldr r4, =gDecompressionBuffer
adds r1, r4, 0
bl LZDecompressWram
movs r0, 0
@@ -7633,7 +7633,7 @@ sub_807B170: @ 807B170
mov r1, r10
movs r2, 0
movs r3, 0
bl copy_decompressed_tile_data_to_vram_autofree
bl DecompressAndLoadBgGfxUsingHeap
mov r0, r8
adds r1, r4, 0
bl LZDecompressWram
asm/use_pokeblock.s
+1 -1
View File
@@ -900,7 +900,7 @@ sub_8166D44: @ 8166D44
thumb_func_start sub_8166DE4
sub_8166DE4: @ 8166DE4
push {r4,lr}
bl ProcessMenuInputNoWrap_
bl Menu_ProcessInputNoWrap_
lsls r0, 24
lsrs r4, r0, 24
asrs r1, r0, 24
build_tools.sh
+1
View File
@@ -6,3 +6,4 @@ make -C tools/bin2c CXX=${1:-g++}
make -C tools/rsfont CXX=${1:-g++}
make -C tools/aif2pcm CXX=${1:-g++}
make -C tools/ramscrgen CXX=${1:-g++}
make -C tools/gbafix CXX=${1:-g++}
common_syms/contest.txt
+1
View File
@@ -0,0 +1 @@
gContestRngValue
common_syms/field_specials.txt
+1
View File
@@ -0,0 +1 @@
gUnknown_030061D0
data/anim_mon_front_pics.s
-1665
View File
File diff suppressed because it is too large Load Diff
data/battle_ai_scripts.s
+89 -89
View File
@@ -13,8 +13,8 @@
.align 2
gBattleAI_ScriptsTable:: @ 82DBEF8
.4byte AI_CheckBadMove
.4byte AI_CheckViability
.4byte AI_TryToFaint
.4byte AI_CheckViability
.4byte AI_SetupFirstTurn
.4byte AI_Risky
.4byte AI_PreferStrongestMove
@@ -47,12 +47,12 @@ gBattleAI_ScriptsTable:: @ 82DBEF8
AI_CheckBadMove:
if_target_is_ally AI_Ret
if_move MOVE_FISSURE, BattleAIScript_82DBF92
if_move MOVE_HORN_DRILL, BattleAIScript_82DBF92
if_move MOVE_FISSURE, AI_CBM_CheckIfNegatesType
if_move MOVE_HORN_DRILL, AI_CBM_CheckIfNegatesType
get_how_powerful_move_is
if_equal 0, AI_CheckBadMove_CheckSoundproof
BattleAIScript_82DBF92: @ 82DBF92
AI_CBM_CheckIfNegatesType: @ 82DBF92
if_type_effectiveness AI_EFFECTIVENESS_x0, Score_Minus10
get_ability AI_TARGET
if_equal ABILITY_VOLT_ABSORB, CheckIfVoltAbsorbCancelsElectric
@@ -60,32 +60,32 @@ BattleAIScript_82DBF92: @ 82DBF92
if_equal ABILITY_FLASH_FIRE, CheckIfFlashFireCancelsFire
if_equal ABILITY_WONDER_GUARD, CheckIfWonderGuardCancelsMove
if_equal ABILITY_LEVITATE, CheckIfLevitateCancelsGroundMove
goto BattleAIScript_82DBFF7
goto AI_CheckBadMove_CheckSoundproof_
CheckIfVoltAbsorbCancelsElectric: @ 82DBFBD
get_curr_move_type
if_equal_ TYPE_ELECTRIC, Score_Minus12
goto BattleAIScript_82DBFF7
goto AI_CheckBadMove_CheckSoundproof_
CheckIfWaterAbsorbCancelsWater: @ 82DBFCA
get_curr_move_type
if_equal_ TYPE_WATER, Score_Minus12
goto BattleAIScript_82DBFF7
goto AI_CheckBadMove_CheckSoundproof_
CheckIfFlashFireCancelsFire: @ 82DBFD7
get_curr_move_type
if_equal_ TYPE_FIRE, Score_Minus12
goto BattleAIScript_82DBFF7
goto AI_CheckBadMove_CheckSoundproof_
CheckIfWonderGuardCancelsMove: @ 82DBFE4
if_type_effectiveness AI_EFFECTIVENESS_x2, BattleAIScript_82DBFF7
if_type_effectiveness AI_EFFECTIVENESS_x2, AI_CheckBadMove_CheckSoundproof_
goto Score_Minus10
CheckIfLevitateCancelsGroundMove: @ 82DBFEF
get_curr_move_type
if_equal_ TYPE_GROUND, Score_Minus10
BattleAIScript_82DBFF7: @ 82DBFF7
AI_CheckBadMove_CheckSoundproof_: @ 82DBFF7
get_how_powerful_move_is
if_equal 0, AI_CheckBadMove_CheckSoundproof
@@ -654,7 +654,7 @@ Score_Plus10:
score +10
end
AI_TryToFaint:
AI_CheckViability:
if_target_is_ally AI_Ret
if_effect EFFECT_SLEEP, AI_CV_Sleep
if_effect EFFECT_ABSORB, AI_CV_Absorb
@@ -707,7 +707,7 @@ AI_TryToFaint:
if_effect EFFECT_REFLECT, AI_CV_Reflect
if_effect EFFECT_POISON, AI_CV_Poison
if_effect EFFECT_PARALYZE, AI_CV_Paralyze
if_effect EFFECT_SWAGGER, BattleAIScript_82DD286
if_effect EFFECT_SWAGGER, AI_CV_Swagger
if_effect EFFECT_SPEED_DOWN_HIT, AI_CV_SpeedDownFromChance
if_effect EFFECT_SKY_ATTACK, AI_CV_ChargeUpMove
if_effect EFFECT_VITAL_THROW, AI_CV_VitalThrow
@@ -1547,8 +1547,8 @@ AI_CV_HighCrit2:
AI_CV_HighCrit_End:
end
BattleAIScript_82DD286:
if_has_move AI_USER, MOVE_PSYCH_UP, BattleAIScript_82DD2B8
AI_CV_Swagger:
if_has_move AI_USER, MOVE_PSYCH_UP, AI_CV_SwaggerHasPsychUp
AI_CV_Flatter:
if_random_less_than 128, AI_CV_Confuse
@@ -1568,18 +1568,18 @@ AI_CV_Confuse2:
AI_CV_Confuse_End:
end
BattleAIScript_82DD2B8:
if_stat_level_more_than AI_TARGET, STAT_ATK, 3, BattleAIScript_82DD2D0
AI_CV_SwaggerHasPsychUp:
if_stat_level_more_than AI_TARGET, STAT_ATK, 3, AI_CV_SwaggerHasPsychUp_Minus5
score +3
get_turn_count
if_not_equal 0, BattleAIScript_82DD2D2
if_not_equal 0, AI_CV_SwaggerHasPsychUp_End
score +2
goto BattleAIScript_82DD2D2
goto AI_CV_SwaggerHasPsychUp_End
BattleAIScript_82DD2D0:
AI_CV_SwaggerHasPsychUp_Minus5:
score -5
BattleAIScript_82DD2D2:
AI_CV_SwaggerHasPsychUp_End:
end
AI_CV_Reflect:
@@ -1735,7 +1735,7 @@ AI_CV_Counter2:
score -1
AI_CV_Counter3:
if_has_move AI_USER, MOVE_MIRROR_COAT, BattleAIScript_82DD4CD
if_has_move AI_USER, MOVE_MIRROR_COAT, AI_CV_Counter7
get_last_used_bank_move AI_TARGET
get_move_power_from_result
if_equal 0, AI_CV_Counter5
@@ -1763,11 +1763,11 @@ AI_CV_Counter6:
if_in_bytes AI_CV_Counter_PhysicalTypeList, AI_CV_Counter_End
if_random_less_than 50, AI_CV_Counter_End
BattleAIScript_82DD4CD:
if_random_less_than 100, BattleAIScript_82DD4D5
AI_CV_Counter7:
if_random_less_than 100, AI_CV_Counter8
score +4
BattleAIScript_82DD4D5:
AI_CV_Counter8:
end
AI_CV_Counter_ScoreDown1:
@@ -2756,15 +2756,15 @@ AI_CV_DragonDance2:
AI_CV_DragonDance_End:
end
AI_CheckViability:
AI_TryToFaint:
if_target_is_ally AI_Ret
if_can_faint AI_TryToFaint_TryToEncourageQuickAttack
get_how_powerful_move_is
if_equal 1, Score_Minus1
if_type_effectiveness AI_EFFECTIVENESS_x4, BattleAIScript_82DDE57
if_equal MOVE_NOT_MOST_POWERFUL, Score_Minus1
if_type_effectiveness AI_EFFECTIVENESS_x4, AI_TryToFaint_DoubleSuperEffective
end
BattleAIScript_82DDE57:
AI_TryToFaint_DoubleSuperEffective:
if_random_less_than 80, AI_TryToFaint_End
score +2
end
@@ -2895,9 +2895,9 @@ AI_Risky_EffectsToEncourage:
AI_PreferBatonPass:
if_target_is_ally AI_Ret
count_usable_party_mons AI_USER
if_equal 0, BattleAIScript_82DDFB3
if_equal 0, AI_PreferBatonPassEnd
get_how_powerful_move_is
if_not_equal 0, BattleAIScript_82DDFB3
if_not_equal 0, AI_PreferBatonPassEnd
if_has_move_with_effect AI_USER, EFFECT_BATON_PASS, AI_PreferBatonPass_GoForBatonPass
if_random_less_than 80, AI_Risky_End
@@ -2906,7 +2906,7 @@ AI_PreferBatonPass_GoForBatonPass:
if_move MOVE_DRAGON_DANCE, AI_PreferBatonPass2
if_move MOVE_CALM_MIND, AI_PreferBatonPass2
if_effect EFFECT_PROTECT, AI_PreferBatonPass_End
if_move MOVE_BATON_PASS, BattleAIScript_82DDF7B
if_move MOVE_BATON_PASS, AI_PreferBatonPass_EncourageIfHighStats
if_random_less_than 20, AI_Risky_End
score +3
@@ -2918,16 +2918,16 @@ AI_PreferBatonPass2:
AI_PreferBatonPass_End:
get_last_used_bank_move AI_USER
if_in_hwords sMovesTable_82DDF75, Score_Minus2
if_in_hwords sMovesTable_ProtectMoves, Score_Minus2
score +2
end
sMovesTable_82DDF75:
sMovesTable_ProtectMoves:
.2byte MOVE_PROTECT
.2byte MOVE_DETECT
.2byte -1
BattleAIScript_82DDF7B:
AI_PreferBatonPass_EncourageIfHighStats:
get_turn_count
if_equal 0, Score_Minus2
if_stat_level_more_than AI_USER, STAT_ATK, 8, Score_Plus3
@@ -2938,39 +2938,39 @@ BattleAIScript_82DDF7B:
if_stat_level_more_than AI_USER, STAT_SPATK, 6, Score_Plus1
end
BattleAIScript_82DDFB3:
AI_PreferBatonPassEnd:
end
AI_DoubleBattle:
if_target_is_ally AI_TryOnAlly
if_move MOVE_SKILL_SWAP, BattleAIScript_82DE04B
if_move MOVE_SKILL_SWAP, AI_DoubleBattleSkillSwap
get_curr_move_type
if_move MOVE_EARTHQUAKE, BattleAIScript_82DE010
if_move MOVE_MAGNITUDE, BattleAIScript_82DE010
if_equal 13, BattleAIScript_82DE062
if_equal 10, BattleAIScript_82DE079
if_move MOVE_EARTHQUAKE, AI_DoubleBattleAllHittingGroundMove
if_move MOVE_MAGNITUDE, AI_DoubleBattleAllHittingGroundMove
if_equal TYPE_ELECTRIC, AI_DoubleBattleElectricMove
if_equal TYPE_FIRE, AI_DoubleBattleFireMove
get_ability AI_USER
if_not_equal ABILITY_GUTS, BattleAIScript_82DDFF5
if_has_move AI_USER_PARTNER, MOVE_HELPING_HAND, BattleAIScript_82DDFED
if_not_equal ABILITY_GUTS, AI_DoubleBattleCheckUserStatus
if_has_move AI_USER_PARTNER, MOVE_HELPING_HAND, AI_DoubleBattlePartnerHasHelpingHand
end
BattleAIScript_82DDFED:
AI_DoubleBattlePartnerHasHelpingHand:
get_how_powerful_move_is
if_not_equal 0, Score_Plus1
end
BattleAIScript_82DDFF5:
if_status AI_USER, STATUS1_ANY, BattleAIScript_82DE000
AI_DoubleBattleCheckUserStatus:
if_status AI_USER, STATUS1_ANY, AI_DoubleBattleCheckUserStatus2
end
BattleAIScript_82DE000:
AI_DoubleBattleCheckUserStatus2:
get_how_powerful_move_is
if_equal 0, Score_Minus5
if_equal MOVE_POWER_DISCOURAGED, Score_Minus5
score +1
if_equal 2, Score_Plus2
if_equal MOVE_MOST_POWERFUL, Score_Plus2
end
BattleAIScript_82DE010:
AI_DoubleBattleAllHittingGroundMove:
if_ability AI_USER_PARTNER, ABILITY_LEVITATE, Score_Plus2
if_type AI_USER_PARTNER, TYPE_FLYING, Score_Plus2
if_type AI_USER_PARTNER, TYPE_FIRE, Score_Minus10
@@ -2979,7 +2979,7 @@ BattleAIScript_82DE010:
if_type AI_USER_PARTNER, TYPE_ROCK, Score_Minus10
goto Score_Minus3
BattleAIScript_82DE04B:
AI_DoubleBattleSkillSwap:
get_ability AI_USER
if_equal ABILITY_TRUANT, Score_Plus5
get_ability AI_TARGET
@@ -2987,96 +2987,96 @@ BattleAIScript_82DE04B:
if_equal ABILITY_PURE_POWER, Score_Plus2
end
BattleAIScript_82DE062:
if_no_ability AI_TARGET_PARTNER, ABILITY_LIGHTNING_ROD, BattleAIScript_82DE078
AI_DoubleBattleElectricMove:
if_no_ability AI_TARGET_PARTNER, ABILITY_LIGHTNING_ROD, AI_DoubleBattleElectricMoveEnd
score -2
if_no_type AI_TARGET_PARTNER, TYPE_GROUND, BattleAIScript_82DE078
if_no_type AI_TARGET_PARTNER, TYPE_GROUND, AI_DoubleBattleElectricMoveEnd
score -8
BattleAIScript_82DE078:
AI_DoubleBattleElectricMoveEnd:
end
BattleAIScript_82DE079:
if_flash_fired AI_USER, BattleAIScript_82DE080
AI_DoubleBattleFireMove:
if_flash_fired AI_USER, AI_DoubleBattleFireMove2
end
BattleAIScript_82DE080:
AI_DoubleBattleFireMove2:
goto Score_Plus1
AI_TryOnAlly:
get_how_powerful_move_is
if_equal 0, BattleAIScript_82DE0B2
if_equal 0, AI_TryStatusMoveOnAlly
get_curr_move_type
if_equal TYPE_FIRE, BattleAIScript_82DE099
if_equal TYPE_FIRE, AI_TryFireMoveOnAlly
AI_DiscourageOnAlly:
goto Score_Minus30
BattleAIScript_82DE099:
if_ability AI_USER_PARTNER, ABILITY_FLASH_FIRE, BattleAIScript_82DE0A7
AI_TryFireMoveOnAlly:
if_ability AI_USER_PARTNER, ABILITY_FLASH_FIRE, AI_TryFireMoveOnAlly_FlashFire
goto AI_DiscourageOnAlly
BattleAIScript_82DE0A7:
AI_TryFireMoveOnAlly_FlashFire:
if_flash_fired AI_USER_PARTNER, AI_DiscourageOnAlly
goto Score_Plus3
BattleAIScript_82DE0B2:
if_move MOVE_SKILL_SWAP, BattleAIScript_82DE0DA
if_move MOVE_WILL_O_WISP, BattleAIScript_82DE14F
if_move MOVE_TOXIC, BattleAIScript_82DE14F
if_move MOVE_HELPING_HAND, BattleAIScript_82DE16D
if_move MOVE_SWAGGER, BattleAIScript_82DE178
AI_TryStatusMoveOnAlly:
if_move MOVE_SKILL_SWAP, AI_TrySkillSwapOnAlly
if_move MOVE_WILL_O_WISP, AI_TryStatusOnAlly
if_move MOVE_TOXIC, AI_TryStatusOnAlly
if_move MOVE_HELPING_HAND, AI_TryHelpingHandOnAlly
if_move MOVE_SWAGGER, AI_TrySwaggerOnAlly
goto Score_Minus30_
BattleAIScript_82DE0DA:
AI_TrySkillSwapOnAlly:
get_ability AI_TARGET
if_equal ABILITY_TRUANT, Score_Plus10
get_ability AI_USER
if_not_equal ABILITY_LEVITATE, BattleAIScript_82DE107
if_not_equal ABILITY_LEVITATE, AI_TrySkillSwapOnAlly2
get_ability AI_TARGET
if_equal ABILITY_LEVITATE, Score_Minus30_
get_target_type1
if_not_equal TYPE_ELECTRIC, BattleAIScript_82DE107
if_not_equal TYPE_ELECTRIC, AI_TrySkillSwapOnAlly2
score +1
get_target_type2
if_not_equal TYPE_ELECTRIC, BattleAIScript_82DE107
if_not_equal TYPE_ELECTRIC, AI_TrySkillSwapOnAlly2
score +1
end
BattleAIScript_82DE107:
if_not_equal 14, Score_Minus30_
if_has_move AI_USER_PARTNER, MOVE_FIRE_BLAST, BattleAIScript_82DE14A
if_has_move AI_USER_PARTNER, MOVE_THUNDER, BattleAIScript_82DE14A
if_has_move AI_USER_PARTNER, MOVE_CROSS_CHOP, BattleAIScript_82DE14A
if_has_move AI_USER_PARTNER, MOVE_HYDRO_PUMP, BattleAIScript_82DE14A
if_has_move AI_USER_PARTNER, MOVE_DYNAMIC_PUNCH, BattleAIScript_82DE14A
if_has_move AI_USER_PARTNER, MOVE_BLIZZARD, BattleAIScript_82DE14A
if_has_move AI_USER_PARTNER, MOVE_MEGAHORN, BattleAIScript_82DE14A
AI_TrySkillSwapOnAlly2:
if_not_equal ABILITY_COMPOUND_EYES, Score_Minus30_
if_has_move AI_USER_PARTNER, MOVE_FIRE_BLAST, AI_TrySkillSwapOnAllyPlus3
if_has_move AI_USER_PARTNER, MOVE_THUNDER, AI_TrySkillSwapOnAllyPlus3
if_has_move AI_USER_PARTNER, MOVE_CROSS_CHOP, AI_TrySkillSwapOnAllyPlus3
if_has_move AI_USER_PARTNER, MOVE_HYDRO_PUMP, AI_TrySkillSwapOnAllyPlus3
if_has_move AI_USER_PARTNER, MOVE_DYNAMIC_PUNCH, AI_TrySkillSwapOnAllyPlus3
if_has_move AI_USER_PARTNER, MOVE_BLIZZARD, AI_TrySkillSwapOnAllyPlus3
if_has_move AI_USER_PARTNER, MOVE_MEGAHORN, AI_TrySkillSwapOnAllyPlus3
goto Score_Minus30_
BattleAIScript_82DE14A:
AI_TrySkillSwapOnAllyPlus3:
goto Score_Plus3
BattleAIScript_82DE14F:
AI_TryStatusOnAlly:
get_ability AI_TARGET
if_not_equal ABILITY_GUTS, Score_Minus30_
if_status AI_TARGET, STATUS1_ANY, Score_Minus30_
if_hp_less_than AI_USER, 91, Score_Minus30_
goto Score_Plus5
BattleAIScript_82DE16D:
AI_TryHelpingHandOnAlly:
if_random_less_than 64, Score_Minus1
goto Score_Plus2
BattleAIScript_82DE178:
if_holds_item AI_TARGET, ITEM_PERSIM_BERRY, BattleAIScript_82DE185
AI_TrySwaggerOnAlly:
if_holds_item AI_TARGET, ITEM_PERSIM_BERRY, AI_TrySwaggerOnAlly2
goto Score_Minus30_
BattleAIScript_82DE185:
if_stat_level_more_than AI_TARGET, STAT_ATK, 7, BattleAIScript_82DE18F
AI_TrySwaggerOnAlly2:
if_stat_level_more_than AI_TARGET, STAT_ATK, 7, AI_TrySwaggerOnAlly_End
score +3
BattleAIScript_82DE18F:
AI_TrySwaggerOnAlly_End:
end
Score_Minus30_:
data/battle_frontier_1.s
-1436
View File
File diff suppressed because it is too large Load Diff
data/battle_pyramid_bag.s
+40
View File
@@ -0,0 +1,40 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gOamData_861F378:: @ 861F378
.2byte 0x0100, 0xc000, 0x0400, 0x0000
.align 2
gSpriteAnim_861F380:: @ 861F380
.2byte 0x0000, 0x0004, 0xffff, 0x0000
.align 2
gSpriteAnimTable_861F388:: @ 861F388
.4byte gSpriteAnim_861F380
.align 2
gSpriteAffineAnim_861F38C:: @ 861F38C
.2byte 0x0100, 0x0100, 0x0000, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
.align 2
gSpriteAffineAnim_861F39C:: @ 861F39C
.2byte 0x0000, 0x0000, 0x02fe, 0x0000, 0x0000, 0x0000, 0x0402, 0x0000, 0x0000, 0x0000, 0x04fe, 0x0000, 0x0000, 0x0000, 0x0202, 0x0000
.2byte 0x7fff, 0x0000, 0x0000, 0x0000
.align 2
gSpriteAffineAnimTable_861F3C4:: @ 861F3C4
.4byte gSpriteAffineAnim_861F38C
.4byte gSpriteAffineAnim_861F39C
.align 2
gUnknown_0861F3CC:: @ 861F3CC
obj_tiles gBattleFrontierGfx_PyramidBag, 0x0800, 0x1024
.align 2
gUnknown_0861F3D4:: @ 861F3D4
spr_template 0x1024, 0x1024, gOamData_861F378, gSpriteAnimTable_861F388, NULL, gSpriteAffineAnimTable_861F3C4, SpriteCallbackDummy
data/battle_scripts_1.s
+58 -60
View File
@@ -399,19 +399,19 @@ BattleScript_EffectExplosion::
faintifabilitynotdamp
setatkhptozero
waitstate
jumpifbyte CMP_NO_COMMON_BITS, gMoveResultFlags, MOVE_RESULT_MISSED, BattleScript_82D8B94
call BattleScript_82D8BEA
goto BattleScript_82D8B96
BattleScript_82D8B94::
jumpifbyte CMP_NO_COMMON_BITS, gMoveResultFlags, MOVE_RESULT_MISSED, BattleScript_ExplosionDoAnimStartLoop
call BattleScript_PreserveMissedBitDoMoveAnim
goto BattleScript_ExplosionLoop
BattleScript_ExplosionDoAnimStartLoop:
attackanimation
waitanimation
BattleScript_82D8B96::
BattleScript_ExplosionLoop:
movevaluescleanup
critcalc
damagecalc
typecalc
adjustnormaldamage
accuracycheck BattleScript_82D8BCF, ACC_CURR_MOVE
accuracycheck BattleScript_ExplosionMissed, ACC_CURR_MOVE
effectivenesssound
hitanimation BS_TARGET
waitstate
@@ -424,20 +424,20 @@ BattleScript_82D8B96::
tryfaintmon BS_TARGET, FALSE, NULL
setbyte sMOVEEND_STATE, 0x0
moveend 0x2, 0x10
jumpifnexttargetvalid BattleScript_82D8B96
jumpifnexttargetvalid BattleScript_ExplosionLoop
tryfaintmon BS_ATTACKER, FALSE, NULL
end
BattleScript_82D8BCF::
BattleScript_ExplosionMissed:
effectivenesssound
resultmessage
waitmessage 0x40
setbyte sMOVEEND_STATE, 0x0
moveend 0x2, 0x10
jumpifnexttargetvalid BattleScript_82D8B96
jumpifnexttargetvalid BattleScript_ExplosionLoop
tryfaintmon BS_ATTACKER, FALSE, NULL
end
BattleScript_82D8BEA::
BattleScript_PreserveMissedBitDoMoveAnim:
bicbyte gMoveResultFlags, MOVE_RESULT_MISSED
attackanimation
waitanimation
@@ -446,14 +446,14 @@ BattleScript_82D8BEA::
BattleScript_EffectDreamEater::
attackcanceler
jumpifstatus2 BS_TARGET, STATUS2_SUBSTITUTE, BattleScript_82D8C0E
jumpifstatus BS_TARGET, STATUS1_SLEEP, BattleScript_82D8C18
BattleScript_82D8C0E::
jumpifstatus2 BS_TARGET, STATUS2_SUBSTITUTE, BattleScript_DreamEaterNoEffect
jumpifstatus BS_TARGET, STATUS1_SLEEP, BattleScript_DreamEaterWorked
BattleScript_DreamEaterNoEffect:
attackstring
ppreduce
waitmessage 0x40
goto BattleScript_WasntAffected
BattleScript_82D8C18::
BattleScript_DreamEaterWorked:
accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
attackstring
ppreduce
@@ -479,7 +479,7 @@ BattleScript_82D8C18::
jumpifmovehadnoeffect BattleScript_DreamEaterTryFaintEnd
printstring STRINGID_PKMNDREAMEATEN
waitmessage 0x40
BattleScript_DreamEaterTryFaintEnd::
BattleScript_DreamEaterTryFaintEnd:
tryfaintmon BS_TARGET, FALSE, NULL
goto BattleScript_MoveEnd
@@ -606,9 +606,9 @@ BattleScript_EffectRampage::
attackcanceler
accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
attackstring
jumpifstatus2 BS_ATTACKER, STATUS2_MULTIPLETURNS, BattleScript_82D8DAE
jumpifstatus2 BS_ATTACKER, STATUS2_MULTIPLETURNS, BattleScript_EffectRampage2
ppreduce
BattleScript_82D8DAE::
BattleScript_EffectRampage2:
confuseifrepeatingattackends
goto BattleScript_HitFromCritCalc
@@ -2297,8 +2297,7 @@ BattleScript_EffectSmellingsalt::
setmoveeffect MOVE_EFFECT_REMOVE_PARALYSIS | MOVE_EFFECT_CERTAIN
jumpifstatus BS_TARGET, STATUS1_PARALYSIS, BattleScript_SmellingsaltDoubleDmg
goto BattleScript_EffectHit
BattleScript_SmellingsaltDoubleDmg::
BattleScript_SmellingsaltDoubleDmg:
setbyte sDMG_MULTIPLIER, 0x2
goto BattleScript_EffectHit
@@ -2593,7 +2592,7 @@ BattleScript_EffectSecretPower::
goto BattleScript_EffectHit
BattleScript_EffectDoubleEdge::
setmoveeffect MOVE_EFFECT_RECOIL_33_PARALYSIS | MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN
setmoveeffect MOVE_EFFECT_RECOIL_33 | MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN
goto BattleScript_EffectHit
BattleScript_EffectTeeterDance::
@@ -3050,12 +3049,12 @@ BattleScript_82DAA83::
BattleScript_FrontierTrainerBattleWon::
jumpifnotbattletype BATTLE_TYPE_TRAINER, BattleScript_PayDayMoneyAndPickUpItems
jumpifbattletype BATTLE_TYPE_TWO_OPPONENTS, BattleScript_82DAAAB
jumpifbattletype BATTLE_TYPE_TWO_OPPONENTS, BattleScript_FrontierTrainerBattleWon_TwoDefeated
printstring STRINGID_PLAYERDEFEATEDTRAINER1
goto BattleScript_82DAAAE
BattleScript_82DAAAB::
goto BattleScript_FrontierTrainerBattleWon_LoseTexts
BattleScript_FrontierTrainerBattleWon_TwoDefeated:
printstring STRINGID_TWOENEMIESDEFEATED
BattleScript_82DAAAE::
BattleScript_FrontierTrainerBattleWon_LoseTexts:
trainerslidein BS_ATTACKER
waitstate
printstring STRINGID_TRAINER1LOSETEXT
@@ -3065,10 +3064,10 @@ BattleScript_82DAAAE::
trainerslidein BS_FAINTED
waitstate
printstring STRINGID_TRAINER2LOSETEXT
BattleScript_82DAACB::
jumpifnotbattletype BATTLE_TYPE_PYRAMID, BattleScript_82DAADA
BattleScript_82DAACB:
jumpifnotbattletype BATTLE_TYPE_PYRAMID, BattleScript_FrontierTrainerBattleWon_End
pickup
BattleScript_82DAADA::
BattleScript_FrontierTrainerBattleWon_End:
end2
BattleScript_SmokeBallEscape::
@@ -3172,7 +3171,7 @@ BattleScript_PursuitDmgOnSwitchOut::
jumpifbyte CMP_EQUAL, gBattleCommunication, 0x0, BattleScript_PursuitDmgOnSwitchOutRet
setbyte sGIVEEXP_STATE, 0x0
getexp BS_TARGET
BattleScript_PursuitDmgOnSwitchOutRet::
BattleScript_PursuitDmgOnSwitchOutRet:
return
BattleScript_Pausex20::
@@ -3968,17 +3967,17 @@ BattleScript_MoveEffectConfusion::
waitmessage 0x40
return
BattleScript_MoveEffectRecoil33::
jumpifmove MOVE_STRUGGLE, BattleScript_DoRecoil33
jumpifability BS_ATTACKER, ABILITY_ROCK_HEAD, BattleScript_Recoil33End
BattleScript_DoRecoil33::
BattleScript_MoveEffectRecoil::
jumpifmove MOVE_STRUGGLE, BattleScript_DoRecoil
jumpifability BS_ATTACKER, ABILITY_ROCK_HEAD, BattleScript_RecoilEnd
BattleScript_DoRecoil::
orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_x100000
healthbarupdate BS_ATTACKER
datahpupdate BS_ATTACKER
printstring STRINGID_PKMNHITWITHRECOIL
waitmessage 0x40
tryfaintmon BS_ATTACKER, FALSE, NULL
BattleScript_Recoil33End::
BattleScript_RecoilEnd::
return
BattleScript_ItemSteal::
@@ -4048,38 +4047,37 @@ BattleScript_82DB4AF::
waitmessage 0x40
return
BattleScript_82DB4B8::
call BattleScript_82DB4BE
BattleScript_IntimidateActivatesEnd3::
call BattleScript_PauseIntimidateActivates
end3
BattleScript_82DB4BE::
BattleScript_PauseIntimidateActivates:
pause 0x20
BattleScript_82DB4C1::
BattleScript_IntimidateActivates::
setbyte gBattlerTarget, 0x0
setstatchanger STAT_ATK, 1, TRUE
BattleScript_82DB4CD::
trygetintimidatetarget BattleScript_82DB51B
jumpifstatus2 BS_TARGET, STATUS2_SUBSTITUTE, BattleScript_82DB510
jumpifability BS_TARGET, ABILITY_CLEAR_BODY, BattleScript_82DB51C
jumpifability BS_TARGET, ABILITY_HYPER_CUTTER, BattleScript_82DB51C
jumpifability BS_TARGET, ABILITY_WHITE_SMOKE, BattleScript_82DB51C
statbuffchange 0x21, BattleScript_82DB510
jumpifbyte CMP_GREATER_THAN, cMULTISTRING_CHOOSER, 0x1, BattleScript_82DB510
BattleScript_IntimidateActivatesLoop:
trygetintimidatetarget BattleScript_IntimidateActivatesReturn
jumpifstatus2 BS_TARGET, STATUS2_SUBSTITUTE, BattleScript_IntimidateActivatesLoopIncrement
jumpifability BS_TARGET, ABILITY_CLEAR_BODY, BattleScript_IntimidatePrevented
jumpifability BS_TARGET, ABILITY_HYPER_CUTTER, BattleScript_IntimidatePrevented
jumpifability BS_TARGET, ABILITY_WHITE_SMOKE, BattleScript_IntimidatePrevented
statbuffchange 0x21, BattleScript_IntimidateActivatesLoopIncrement
jumpifbyte CMP_GREATER_THAN, cMULTISTRING_CHOOSER, 0x1, BattleScript_IntimidateActivatesLoopIncrement
setgraphicalstatchangevalues
playanimation BS_TARGET, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
printstring STRINGID_PKMNCUTSATTACKWITH
waitmessage 0x40
BattleScript_82DB510::
BattleScript_IntimidateActivatesLoopIncrement:
addbyte gBattlerTarget, 0x1
goto BattleScript_82DB4CD
BattleScript_82DB51B::
goto BattleScript_IntimidateActivatesLoop
BattleScript_IntimidateActivatesReturn:
return
BattleScript_82DB51C::
BattleScript_IntimidatePrevented:
pause 0x20
printstring STRINGID_PREVENTEDFROMWORKING
waitmessage 0x40
goto BattleScript_82DB510
goto BattleScript_IntimidateActivatesLoopIncrement
BattleScript_DroughtActivates::
pause 0x20
@@ -4252,7 +4250,7 @@ BattleScript_AbilityCuredStatus::
updatestatusicon BS_SCRIPTING
return
BattleScript_82DB695::
BattleScript_IgnoresWhileAsleep::
printstring STRINGID_PKMNIGNORESASLEEP
waitmessage 0x40
setbyte sMOVEEND_STATE, 0x0
@@ -4285,7 +4283,7 @@ BattleScript_IgnoresAndFallsAsleep::
moveend 0x2, 0x10
end
BattleScript_82DB6F0::
BattleScript_IgnoresAndHitsItself::
printstring STRINGID_PKMNWONTOBEY
waitmessage 0x40
goto BattleScript_DoSelfConfusionDmg
@@ -4463,7 +4461,7 @@ BattleScript_ActionSelectionItemsCantBeUsed::
printselectionstring STRINGID_ITEMSCANTBEUSEDNOW
endselectionscript
BattleScript_82DB87D::
BattleScript_FlushMessageBox::
printstring STRINGID_EMPTYSTRING3
return
@@ -4481,18 +4479,18 @@ BattleScript_82DB89D::
setbyte gBattleCommunication + 1, 0x0
end2
BattleScript_82DB8BE::
BattleScript_ArenaTurnBeginning::
waitcry BS_ATTACKER
various21 BS_ATTACKER
playse 0x109
volumedown
playse SE_HANTEI1
pause 0x8
playse 0x109
playse SE_HANTEI1
various14 BS_ATTACKER
various16 8
various17 8
pause 0x40
various15 BS_ATTACKER
various22 BS_ATTACKER
volumeup
end2
BattleScript_82DB8E0::
@@ -4509,7 +4507,7 @@ BattleScript_82DB8F3::
waitstate
makevisible BS_OPPONENT1
waitstate
various21 BS_ATTACKER
volumedown
playse 0x109
pause 0x8
playse 0x109
data/contest.s
+1 -1
View File
@@ -352,7 +352,7 @@ gUnknown_08587FA4:: @ 8587FA4
.align 2
gUnknown_085880A4:: @ 85880A4
gContestOpponents:: @ 85880A4
.include "data/contest_opponents.inc"
gUnknown_085898A4:: @ 85898A4
data/contest_ai.s
-144
View File
@@ -1,144 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnknown_085CDD00:: @ 85CDD00
.4byte sub_81564DC
.4byte sub_8156530
.4byte sub_8156550
.4byte sub_8156594
.4byte sub_81565D8
.4byte sub_815661C
.4byte sub_8156660
.4byte sub_8156684
.4byte sub_81566C8
.4byte sub_815670C
.4byte sub_8156750
.4byte sub_8156794
.4byte sub_81567BC
.4byte sub_8156800
.4byte sub_8156844
.4byte sub_8156888
.4byte sub_81568CC
.4byte sub_815690C
.4byte sub_8156950
.4byte sub_8156994
.4byte sub_81569D8
.4byte sub_8156A1C
.4byte sub_8156A48
.4byte sub_8156A98
.4byte sub_8156AE8
.4byte sub_8156B38
.4byte sub_8156B88
.4byte sub_8156BB4
.4byte sub_8156C04
.4byte sub_8156C54
.4byte sub_8156CA4
.4byte sub_8156CF4
.4byte sub_8156D18
.4byte sub_8156D5C
.4byte sub_8156DA0
.4byte sub_8156DE4
.4byte sub_8156E2C
.4byte sub_8156E74
.4byte sub_8156EBC
.4byte sub_8156F04
.4byte sub_8156F44
.4byte sub_8156F88
.4byte sub_8156FCC
.4byte sub_8157018
.4byte sub_815705C
.4byte sub_81570A0
.4byte sub_815712C
.4byte sub_8157174
.4byte sub_8157200
.4byte sub_8157248
.4byte sub_81572A4
.4byte sub_81572E8
.4byte sub_815732C
.4byte sub_8157370
.4byte sub_81573B4
.4byte sub_8157410
.4byte sub_8157454
.4byte sub_8157498
.4byte sub_81574DC
.4byte sub_8157520
.4byte sub_8157578
.4byte sub_81575BC
.4byte sub_8157600
.4byte sub_8157644
.4byte sub_8157688
.4byte sub_8157700
.4byte sub_8157748
.4byte sub_8157790
.4byte sub_8157808
.4byte sub_8157850
.4byte sub_8157898
.4byte sub_81578F8
.4byte sub_8157940
.4byte sub_8157988
.4byte sub_81579CC
.4byte sub_8157A10
.4byte sub_8157A54
.4byte sub_8157A98
.4byte sub_8157ADC
.4byte sub_8157B38
.4byte sub_8157B7C
.4byte sub_8157BC0
.4byte sub_8157C04
.4byte sub_8157C48
.4byte sub_8157C94
.4byte sub_8157CDC
.4byte sub_8157D24
.4byte sub_8157D60
.4byte sub_8157DA8
.4byte sub_8157DF0
.4byte sub_8157E3C
.4byte sub_8157E84
.4byte sub_8157ECC
.4byte sub_8157F14
.4byte sub_8157F5C
.4byte sub_8157FA0
.4byte sub_8157FE8
.4byte sub_8158030
.4byte sub_8158078
.4byte sub_81580C0
.4byte sub_8158108
.4byte sub_815814C
.4byte sub_8158190
.4byte sub_81581D4
.4byte sub_8158218
.4byte sub_8158254
.4byte sub_8158298
.4byte sub_81582DC
.4byte sub_8158320
.4byte sub_8158364
.4byte sub_81583B8
.4byte sub_81583FC
.4byte sub_8158440
.4byte sub_815846C
.4byte sub_815849C
.4byte sub_81584D4
.4byte sub_8158508
.4byte sub_815853C
.4byte sub_815858C
.4byte sub_81585DC
.4byte sub_815862C
.4byte sub_815867C
.4byte sub_81586D0
.4byte sub_8158724
.4byte sub_8158778
.4byte sub_81587CC
.4byte sub_815881C
.4byte sub_815886C
.4byte dp15_call
.4byte sub_81588BC
.4byte sub_8158948
.4byte sub_81589A4
.4byte sub_81589EC
.4byte sub_8158A34
.4byte sub_8158AA0
.4byte sub_8158AE8
data/contest_effect.s
-22
View File
@@ -1,22 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
@ 858C2B4
.include "data/contest_moves.inc"
@ 858CDCC
.include "data/contest_effects.inc"
@ A lookup table with a 1 for each combo starter ID and a 0 for ID 0,
@ which means "not a combo starter move".
gComboStarterLookupTable:: @ 858CE8C
.byte 0
.rept 62
.byte 1
.endr
.align 2
@ 858CECC
.include "data/contest_effect_function_table.inc"
data/contest_effect_function_table.inc
-50
View File
@@ -1,50 +0,0 @@
.align 2
gContestEffectFunctionTable:: @ 858CECC
.4byte ContestEffectFunc_080E547C
.4byte ContestEffectFunc_080E5480
.4byte ContestEffectFunc_080E54B0
.4byte ContestEffectFunc_080E54E0
.4byte ContestEffectFunc_080E5534
.4byte ContestEffectFunc_080E5560
.4byte ContestEffectFunc_080E5590
.4byte ContestEffectFunc_080E55BC
.4byte ContestEffectFunc_080E55EC
.4byte ContestEffectFunc_080E5664
.4byte ContestEffectFunc_080E55EC
.4byte ContestEffectFunc_080E5664
.4byte ContestEffectFunc_080E55EC
.4byte ContestEffectFunc_080E5664
.4byte ContestEffectFunc_080E56E0
.4byte ContestEffectFunc_080E5718
.4byte ContestEffectFunc_080E57CC
.4byte ContestEffectFunc_080E588C
.4byte ContestEffectFunc_080E5938
.4byte ContestEffectFunc_080E5970
.4byte ContestEffectFunc_080E59B0
.4byte ContestEffectFunc_080E59D0
.4byte ContestEffectFunc_080E59F0
.4byte ContestEffectFunc_080E5A10
.4byte ContestEffectFunc_080E5A30
.4byte ContestEffectFunc_080E5A50
.4byte ContestEffectFunc_080E5AD4
.4byte ContestEffectFunc_080E5CD4
.4byte ContestEffectFunc_080E5D7C
.4byte ContestEffectFunc_080E5E04
.4byte ContestEffectFunc_080E5E5C
.4byte ContestEffectFunc_080E5EB4
.4byte ContestEffectFunc_080E5F64
.4byte ContestEffectFunc_080E5FE4
.4byte ContestEffectFunc_080E6068
.4byte ContestEffectFunc_080E611C
.4byte ContestEffectFunc_080E620C
.4byte ContestEffectFunc_080E62B8
.4byte ContestEffectFunc_080E6334
.4byte ContestEffectFunc_080E6398
.4byte ContestEffectFunc_080E63E8
.4byte ContestEffectFunc_080E6520
.4byte ContestEffectFunc_080E6664
.4byte ContestEffectFunc_080E6668
.4byte ContestEffectFunc_080E6778
.4byte ContestEffectFunc_080E67BC
.4byte ContestEffectFunc_080E6868
.4byte ContestEffectFunc_080E68EC
data/contest_effects.inc
-289
View File
@@ -1,289 +0,0 @@
.align 2
gContestEffects:: @ 858CDCC
@ 0x00
.byte 0 @ effect type
.byte 40 @ appeal
.byte 0 @ jam
.byte 0 @ padding
@ 0x01
.byte 0 @ effect type
.byte 60 @ appeal
.byte 0 @ jam
.byte 0 @ padding
@ 0x02
.byte 0 @ effect type
.byte 80 @ appeal
.byte 0 @ jam
.byte 0 @ padding
@ 0x03
.byte 0 @ effect type
.byte 30 @ appeal
.byte 0 @ jam
.byte 0 @ padding
@ 0x04
.byte 1 @ effect type
.byte 20 @ appeal
.byte 0 @ jam
.byte 0 @ padding
@ 0x05
.byte 1 @ effect type
.byte 10 @ appeal
.byte 0 @ jam
.byte 0 @ padding
@ 0x06
.byte 1 @ effect type
.byte 30 @ appeal
.byte 0 @ jam
.byte 0 @ padding
@ 0x07
.byte 1 @ effect type
.byte 30 @ appeal
.byte 0 @ jam
.byte 0 @ padding
@ 0x08
.byte 2 @ effect type
.byte 30 @ appeal
.byte 20 @ jam
.byte 0 @ padding
@ 0x09
.byte 3 @ effect type
.byte 30 @ appeal
.byte 10 @ jam
.byte 0 @ padding
@ 0x0a
.byte 2 @ effect type
.byte 20 @ appeal
.byte 30 @ jam
.byte 0 @ padding
@ 0x0b
.byte 3 @ effect type
.byte 20 @ appeal
.byte 20 @ jam
.byte 0 @ padding
@ 0x0c
.byte 2 @ effect type
.byte 10 @ appeal
.byte 40 @ jam
.byte 0 @ padding
@ 0x0d
.byte 3 @ effect type
.byte 10 @ appeal
.byte 30 @ jam
.byte 0 @ padding
@ 0x0e
.byte 2 @ effect type
.byte 30 @ appeal
.byte 20 @ jam
.byte 0 @ padding
@ 0x0f
.byte 3 @ effect type
.byte 30 @ appeal
.byte 10 @ jam
.byte 0 @ padding
@ 0x10
.byte 4 @ effect type
.byte 30 @ appeal
.byte 0 @ jam
.byte 0 @ padding
@ 0x11
.byte 3 @ effect type
.byte 20 @ appeal
.byte 10 @ jam
.byte 0 @ padding
@ 0x12
.byte 3 @ effect type
.byte 40 @ appeal
.byte 40 @ jam
.byte 0 @ padding
@ 0x13
.byte 3 @ effect type
.byte 20 @ appeal
.byte 10 @ jam
.byte 0 @ padding
@ 0x14
.byte 3 @ effect type
.byte 20 @ appeal
.byte 10 @ jam
.byte 0 @ padding
@ 0x15
.byte 3 @ effect type
.byte 20 @ appeal
.byte 10 @ jam
.byte 0 @ padding
@ 0x16
.byte 3 @ effect type
.byte 20 @ appeal
.byte 10 @ jam
.byte 0 @ padding
@ 0x17
.byte 3 @ effect type
.byte 20 @ appeal
.byte 10 @ jam
.byte 0 @ padding
@ 0x18
.byte 3 @ effect type
.byte 20 @ appeal
.byte 10 @ jam
.byte 0 @ padding
@ 0x19
.byte 4 @ effect type
.byte 20 @ appeal
.byte 0 @ jam
.byte 0 @ padding
@ 0x1a
.byte 4 @ effect type
.byte 20 @ appeal
.byte 0 @ jam
.byte 0 @ padding
@ 0x1b
.byte 4 @ effect type
.byte 30 @ appeal
.byte 0 @ jam
.byte 0 @ padding
@ 0x1c
.byte 3 @ effect type
.byte 30 @ appeal
.byte 10 @ jam
.byte 0 @ padding
@ 0x1d
.byte 5 @ effect type
.byte 20 @ appeal
.byte 0 @ jam
.byte 0 @ padding
@ 0x1e
.byte 5 @ effect type
.byte 20 @ appeal
.byte 0 @ jam
.byte 0 @ padding
@ 0x1f
.byte 5 @ effect type
.byte 10 @ appeal
.byte 0 @ jam
.byte 0 @ padding
@ 0x20
.byte 5 @ effect type
.byte 10 @ appeal
.byte 0 @ jam
.byte 0 @ padding
@ 0x21
.byte 5 @ effect type
.byte 10 @ appeal
.byte 0 @ jam
.byte 0 @ padding
@ 0x22
.byte 5 @ effect type
.byte 10 @ appeal
.byte 0 @ jam
.byte 0 @ padding
@ 0x23
.byte 5 @ effect type
.byte 20 @ appeal
.byte 0 @ jam
.byte 0 @ padding
@ 0x24
.byte 5 @ effect type
.byte 20 @ appeal
.byte 0 @ jam
.byte 0 @ padding
@ 0x25
.byte 5 @ effect type
.byte 30 @ appeal
.byte 0 @ jam
.byte 0 @ padding
@ 0x26
.byte 5 @ effect type
.byte 10 @ appeal
.byte 0 @ jam
.byte 0 @ padding
@ 0x27
.byte 5 @ effect type
.byte 10 @ appeal
.byte 0 @ jam
.byte 0 @ padding
@ 0x28
.byte 6 @ effect type
.byte 30 @ appeal
.byte 0 @ jam
.byte 0 @ padding
@ 0x29
.byte 6 @ effect type
.byte 30 @ appeal
.byte 0 @ jam
.byte 0 @ padding
@ 0x2a
.byte 6 @ effect type
.byte 30 @ appeal
.byte 0 @ jam
.byte 0 @ padding
@ 0x2b
.byte 6 @ effect type
.byte 30 @ appeal
.byte 0 @ jam
.byte 0 @ padding
@ 0x2c
.byte 5 @ effect type
.byte 10 @ appeal
.byte 0 @ jam
.byte 0 @ padding
@ 0x2d
.byte 3 @ effect type
.byte 20 @ appeal
.byte 10 @ jam
.byte 0 @ padding
@ 0x2e
.byte 5 @ effect type
.byte 10 @ appeal
.byte 0 @ jam
.byte 0 @ padding
@ 0x2f
.byte 4 @ effect type
.byte 30 @ appeal
.byte 0 @ jam
.byte 0 @ padding
data/contest_moves.inc
-2486
View File
File diff suppressed because it is too large Load Diff
data/data2b.s
-4413
View File
File diff suppressed because it is too large Load Diff
data/enemy_mon_elevation.inc
-415
View File
@@ -1,415 +0,0 @@
@ This determines how much higher above the usual position the enemy Pokémon
@ is during battle. Species that float or fly have nonzero values.
gEnemyMonElevation:: @ 8305DCC
.byte 0 @ 0
.byte 0 @ SPECIES_BULBASAUR
.byte 0 @ SPECIES_IVYSAUR
.byte 0 @ SPECIES_VENUSAUR
.byte 0 @ SPECIES_CHARMANDER
.byte 0 @ SPECIES_CHARMELEON
.byte 0 @ SPECIES_CHARIZARD
.byte 0 @ SPECIES_SQUIRTLE
.byte 0 @ SPECIES_WARTORTLE
.byte 0 @ SPECIES_BLASTOISE
.byte 0 @ SPECIES_CATERPIE
.byte 0 @ SPECIES_METAPOD
.byte 8 @ SPECIES_BUTTERFREE
.byte 0 @ SPECIES_WEEDLE
.byte 0 @ SPECIES_KAKUNA
.byte 8 @ SPECIES_BEEDRILL
.byte 16 @ SPECIES_PIDGEY
.byte 0 @ SPECIES_PIDGEOTTO
.byte 4 @ SPECIES_PIDGEOT
.byte 0 @ SPECIES_RATTATA
.byte 0 @ SPECIES_RATICATE
.byte 0 @ SPECIES_SPEAROW
.byte 6 @ SPECIES_FEAROW
.byte 0 @ SPECIES_EKANS
.byte 0 @ SPECIES_ARBOK
.byte 0 @ SPECIES_PIKACHU
.byte 0 @ SPECIES_RAICHU
.byte 0 @ SPECIES_SANDSHREW
.byte 0 @ SPECIES_SANDSLASH
.byte 0 @ SPECIES_NIDORAN_F
.byte 0 @ SPECIES_NIDORINA
.byte 0 @ SPECIES_NIDOQUEEN
.byte 0 @ SPECIES_NIDORAN_M
.byte 0 @ SPECIES_NIDORINO
.byte 0 @ SPECIES_NIDOKING
.byte 0 @ SPECIES_CLEFAIRY
.byte 0 @ SPECIES_CLEFABLE
.byte 0 @ SPECIES_VULPIX
.byte 0 @ SPECIES_NINETALES
.byte 0 @ SPECIES_JIGGLYPUFF
.byte 0 @ SPECIES_WIGGLYTUFF
.byte 8 @ SPECIES_ZUBAT
.byte 8 @ SPECIES_GOLBAT
.byte 0 @ SPECIES_ODDISH
.byte 0 @ SPECIES_GLOOM
.byte 0 @ SPECIES_VILEPLUME
.byte 0 @ SPECIES_PARAS
.byte 0 @ SPECIES_PARASECT
.byte 0 @ SPECIES_VENONAT
.byte 8 @ SPECIES_VENOMOTH
.byte 0 @ SPECIES_DIGLETT
.byte 0 @ SPECIES_DUGTRIO
.byte 0 @ SPECIES_MEOWTH
.byte 0 @ SPECIES_PERSIAN
.byte 0 @ SPECIES_PSYDUCK
.byte 0 @ SPECIES_GOLDUCK
.byte 0 @ SPECIES_MANKEY
.byte 0 @ SPECIES_PRIMEAPE
.byte 0 @ SPECIES_GROWLITHE
.byte 0 @ SPECIES_ARCANINE
.byte 0 @ SPECIES_POLIWAG
.byte 0 @ SPECIES_POLIWHIRL
.byte 0 @ SPECIES_POLIWRATH
.byte 0 @ SPECIES_ABRA
.byte 0 @ SPECIES_KADABRA
.byte 0 @ SPECIES_ALAKAZAM
.byte 0 @ SPECIES_MACHOP
.byte 0 @ SPECIES_MACHOKE
.byte 0 @ SPECIES_MACHAMP
.byte 0 @ SPECIES_BELLSPROUT
.byte 0 @ SPECIES_WEEPINBELL
.byte 0 @ SPECIES_VICTREEBEL
.byte 0 @ SPECIES_TENTACOOL
.byte 0 @ SPECIES_TENTACRUEL
.byte 16 @ SPECIES_GEODUDE
.byte 0 @ SPECIES_GRAVELER
.byte 0 @ SPECIES_GOLEM
.byte 0 @ SPECIES_PONYTA
.byte 0 @ SPECIES_RAPIDASH
.byte 0 @ SPECIES_SLOWPOKE
.byte 0 @ SPECIES_SLOWBRO
.byte 16 @ SPECIES_MAGNEMITE
.byte 8 @ SPECIES_MAGNETON
.byte 0 @ SPECIES_FARFETCHD
.byte 0 @ SPECIES_DODUO
.byte 0 @ SPECIES_DODRIO
.byte 0 @ SPECIES_SEEL
.byte 0 @ SPECIES_DEWGONG
.byte 0 @ SPECIES_GRIMER
.byte 0 @ SPECIES_MUK
.byte 0 @ SPECIES_SHELLDER
.byte 0 @ SPECIES_CLOYSTER
.byte 4 @ SPECIES_GASTLY
.byte 4 @ SPECIES_HAUNTER
.byte 0 @ SPECIES_GENGAR
.byte 0 @ SPECIES_ONIX
.byte 0 @ SPECIES_DROWZEE
.byte 0 @ SPECIES_HYPNO
.byte 0 @ SPECIES_KRABBY
.byte 0 @ SPECIES_KINGLER
.byte 10 @ SPECIES_VOLTORB
.byte 12 @ SPECIES_ELECTRODE
.byte 0 @ SPECIES_EXEGGCUTE
.byte 0 @ SPECIES_EXEGGUTOR
.byte 0 @ SPECIES_CUBONE
.byte 0 @ SPECIES_MAROWAK
.byte 0 @ SPECIES_HITMONLEE
.byte 0 @ SPECIES_HITMONCHAN
.byte 0 @ SPECIES_LICKITUNG
.byte 8 @ SPECIES_KOFFING
.byte 6 @ SPECIES_WEEZING
.byte 0 @ SPECIES_RHYHORN
.byte 0 @ SPECIES_RHYDON
.byte 0 @ SPECIES_CHANSEY
.byte 0 @ SPECIES_TANGELA
.byte 0 @ SPECIES_KANGASKHAN
.byte 0 @ SPECIES_HORSEA
.byte 0 @ SPECIES_SEADRA
.byte 0 @ SPECIES_GOLDEEN
.byte 0 @ SPECIES_SEAKING
.byte 0 @ SPECIES_STARYU
.byte 0 @ SPECIES_STARMIE
.byte 0 @ SPECIES_MR_MIME
.byte 0 @ SPECIES_SCYTHER
.byte 0 @ SPECIES_JYNX
.byte 0 @ SPECIES_ELECTABUZZ
.byte 0 @ SPECIES_MAGMAR
.byte 0 @ SPECIES_PINSIR
.byte 0 @ SPECIES_TAUROS
.byte 0 @ SPECIES_MAGIKARP
.byte 0 @ SPECIES_GYARADOS
.byte 0 @ SPECIES_LAPRAS
.byte 0 @ SPECIES_DITTO
.byte 0 @ SPECIES_EEVEE
.byte 0 @ SPECIES_VAPOREON
.byte 0 @ SPECIES_JOLTEON
.byte 0 @ SPECIES_FLAREON
.byte 0 @ SPECIES_PORYGON
.byte 0 @ SPECIES_OMANYTE
.byte 0 @ SPECIES_OMASTAR
.byte 0 @ SPECIES_KABUTO
.byte 0 @ SPECIES_KABUTOPS
.byte 7 @ SPECIES_AERODACTYL
.byte 0 @ SPECIES_SNORLAX
.byte 6 @ SPECIES_ARTICUNO
.byte 8 @ SPECIES_ZAPDOS
.byte 5 @ SPECIES_MOLTRES
.byte 0 @ SPECIES_DRATINI
.byte 0 @ SPECIES_DRAGONAIR
.byte 6 @ SPECIES_DRAGONITE
.byte 0 @ SPECIES_MEWTWO
.byte 8 @ SPECIES_MEW
.byte 0 @ SPECIES_CHIKORITA
.byte 0 @ SPECIES_BAYLEEF
.byte 0 @ SPECIES_MEGANIUM
.byte 0 @ SPECIES_CYNDAQUIL
.byte 0 @ SPECIES_QUILAVA
.byte 0 @ SPECIES_TYPHLOSION
.byte 0 @ SPECIES_TOTODILE
.byte 0 @ SPECIES_CROCONAW
.byte 0 @ SPECIES_FERALIGATR
.byte 0 @ SPECIES_SENTRET
.byte 0 @ SPECIES_FURRET
.byte 0 @ SPECIES_HOOTHOOT
.byte 0 @ SPECIES_NOCTOWL
.byte 0 @ SPECIES_LEDYBA
.byte 8 @ SPECIES_LEDIAN
.byte 0 @ SPECIES_SPINARAK
.byte 0 @ SPECIES_ARIADOS
.byte 6 @ SPECIES_CROBAT
.byte 0 @ SPECIES_CHINCHOU
.byte 0 @ SPECIES_LANTURN
.byte 0 @ SPECIES_PICHU
.byte 0 @ SPECIES_CLEFFA
.byte 0 @ SPECIES_IGGLYBUFF
.byte 0 @ SPECIES_TOGEPI
.byte 0 @ SPECIES_TOGETIC
.byte 0 @ SPECIES_NATU
.byte 0 @ SPECIES_XATU
.byte 0 @ SPECIES_MAREEP
.byte 0 @ SPECIES_FLAAFFY
.byte 0 @ SPECIES_AMPHAROS
.byte 0 @ SPECIES_BELLOSSOM
.byte 0 @ SPECIES_MARILL
.byte 0 @ SPECIES_AZUMARILL
.byte 0 @ SPECIES_SUDOWOODO
.byte 0 @ SPECIES_POLITOED
.byte 11 @ SPECIES_HOPPIP
.byte 12 @ SPECIES_SKIPLOOM
.byte 9 @ SPECIES_JUMPLUFF
.byte 0 @ SPECIES_AIPOM
.byte 0 @ SPECIES_SUNKERN
.byte 0 @ SPECIES_SUNFLORA
.byte 8 @ SPECIES_YANMA
.byte 0 @ SPECIES_WOOPER
.byte 0 @ SPECIES_QUAGSIRE
.byte 0 @ SPECIES_ESPEON
.byte 0 @ SPECIES_UMBREON
.byte 0 @ SPECIES_MURKROW
.byte 0 @ SPECIES_SLOWKING
.byte 8 @ SPECIES_MISDREAVUS
.byte 8 @ SPECIES_UNOWN
.byte 0 @ SPECIES_WOBBUFFET
.byte 0 @ SPECIES_GIRAFARIG
.byte 0 @ SPECIES_PINECO
.byte 0 @ SPECIES_FORRETRESS
.byte 0 @ SPECIES_DUNSPARCE
.byte 6 @ SPECIES_GLIGAR
.byte 0 @ SPECIES_STEELIX
.byte 0 @ SPECIES_SNUBBULL
.byte 0 @ SPECIES_GRANBULL
.byte 0 @ SPECIES_QWILFISH
.byte 0 @ SPECIES_SCIZOR
.byte 0 @ SPECIES_SHUCKLE
.byte 0 @ SPECIES_HERACROSS
.byte 0 @ SPECIES_SNEASEL
.byte 0 @ SPECIES_TEDDIURSA
.byte 0 @ SPECIES_URSARING
.byte 0 @ SPECIES_SLUGMA
.byte 0 @ SPECIES_MAGCARGO
.byte 0 @ SPECIES_SWINUB
.byte 0 @ SPECIES_PILOSWINE
.byte 0 @ SPECIES_CORSOLA
.byte 0 @ SPECIES_REMORAID
.byte 0 @ SPECIES_OCTILLERY
.byte 0 @ SPECIES_DELIBIRD
.byte 0 @ SPECIES_MANTINE
.byte 0 @ SPECIES_SKARMORY
.byte 0 @ SPECIES_HOUNDOUR
.byte 0 @ SPECIES_HOUNDOOM
.byte 0 @ SPECIES_KINGDRA
.byte 0 @ SPECIES_PHANPY
.byte 0 @ SPECIES_DONPHAN
.byte 0 @ SPECIES_PORYGON2
.byte 0 @ SPECIES_STANTLER
.byte 0 @ SPECIES_SMEARGLE
.byte 0 @ SPECIES_TYROGUE
.byte 0 @ SPECIES_HITMONTOP
.byte 0 @ SPECIES_SMOOCHUM
.byte 0 @ SPECIES_ELEKID
.byte 0 @ SPECIES_MAGBY
.byte 0 @ SPECIES_MILTANK
.byte 0 @ SPECIES_BLISSEY
.byte 0 @ SPECIES_RAIKOU
.byte 0 @ SPECIES_ENTEI
.byte 0 @ SPECIES_SUICUNE
.byte 0 @ SPECIES_LARVITAR
.byte 0 @ SPECIES_PUPITAR
.byte 0 @ SPECIES_TYRANITAR
.byte 6 @ SPECIES_LUGIA
.byte 6 @ SPECIES_HO_OH
.byte 15 @ SPECIES_CELEBI
.byte 0 @ 252
.byte 0 @ 253
.byte 0 @ 254
.byte 0 @ 255
.byte 0 @ 256
.byte 0 @ 257
.byte 0 @ 258
.byte 0 @ 259
.byte 0 @ 260
.byte 0 @ 261
.byte 0 @ 262
.byte 0 @ 263
.byte 0 @ 264
.byte 0 @ 265
.byte 0 @ 266
.byte 0 @ 267
.byte 0 @ 268
.byte 0 @ 269
.byte 0 @ 270
.byte 0 @ 271
.byte 0 @ 272
.byte 0 @ 273
.byte 0 @ 274
.byte 0 @ 275
.byte 0 @ 276
.byte 0 @ SPECIES_TREECKO
.byte 0 @ SPECIES_GROVYLE
.byte 0 @ SPECIES_SCEPTILE
.byte 0 @ SPECIES_TORCHIC
.byte 0 @ SPECIES_COMBUSKEN
.byte 0 @ SPECIES_BLAZIKEN
.byte 0 @ SPECIES_MUDKIP
.byte 0 @ SPECIES_MARSHTOMP
.byte 0 @ SPECIES_SWAMPERT
.byte 0 @ SPECIES_POOCHYENA
.byte 0 @ SPECIES_MIGHTYENA
.byte 0 @ SPECIES_ZIGZAGOON
.byte 0 @ SPECIES_LINOONE
.byte 0 @ SPECIES_WURMPLE
.byte 0 @ SPECIES_SILCOON
.byte 8 @ SPECIES_BEAUTIFLY
.byte 0 @ SPECIES_CASCOON
.byte 10 @ SPECIES_DUSTOX
.byte 0 @ SPECIES_LOTAD
.byte 0 @ SPECIES_LOMBRE
.byte 0 @ SPECIES_LUDICOLO
.byte 0 @ SPECIES_SEEDOT
.byte 0 @ SPECIES_NUZLEAF
.byte 0 @ SPECIES_SHIFTRY
.byte 0 @ SPECIES_NINCADA
.byte 10 @ SPECIES_NINJASK
.byte 8 @ SPECIES_SHEDINJA
.byte 0 @ SPECIES_TAILLOW
.byte 0 @ SPECIES_SWELLOW
.byte 0 @ SPECIES_SHROOMISH
.byte 0 @ SPECIES_BRELOOM
.byte 0 @ SPECIES_SPINDA
.byte 16 @ SPECIES_WINGULL
.byte 8 @ SPECIES_PELIPPER
.byte 0 @ SPECIES_SURSKIT
.byte 10 @ SPECIES_MASQUERAIN
.byte 0 @ SPECIES_WAILMER
.byte 0 @ SPECIES_WAILORD
.byte 0 @ SPECIES_SKITTY
.byte 0 @ SPECIES_DELCATTY
.byte 0 @ SPECIES_KECLEON
.byte 4 @ SPECIES_BALTOY
.byte 10 @ SPECIES_CLAYDOL
.byte 0 @ SPECIES_NOSEPASS
.byte 0 @ SPECIES_TORKOAL
.byte 0 @ SPECIES_SABLEYE
.byte 0 @ SPECIES_BARBOACH
.byte 0 @ SPECIES_WHISCASH
.byte 0 @ SPECIES_LUVDISC
.byte 0 @ SPECIES_CORPHISH
.byte 0 @ SPECIES_CRAWDAUNT
.byte 0 @ SPECIES_FEEBAS
.byte 0 @ SPECIES_MILOTIC
.byte 0 @ SPECIES_CARVANHA
.byte 0 @ SPECIES_SHARPEDO
.byte 0 @ SPECIES_TRAPINCH
.byte 0 @ SPECIES_VIBRAVA
.byte 7 @ SPECIES_FLYGON
.byte 0 @ SPECIES_MAKUHITA
.byte 0 @ SPECIES_HARIYAMA
.byte 0 @ SPECIES_ELECTRIKE
.byte 0 @ SPECIES_MANECTRIC
.byte 0 @ SPECIES_NUMEL
.byte 0 @ SPECIES_CAMERUPT
.byte 0 @ SPECIES_SPHEAL
.byte 0 @ SPECIES_SEALEO
.byte 0 @ SPECIES_WALREIN
.byte 0 @ SPECIES_CACNEA
.byte 0 @ SPECIES_CACTURNE
.byte 0 @ SPECIES_SNORUNT
.byte 12 @ SPECIES_GLALIE
.byte 13 @ SPECIES_LUNATONE
.byte 4 @ SPECIES_SOLROCK
.byte 0 @ SPECIES_AZURILL
.byte 0 @ SPECIES_SPOINK
.byte 0 @ SPECIES_GRUMPIG
.byte 0 @ SPECIES_PLUSLE
.byte 0 @ SPECIES_MINUN
.byte 0 @ SPECIES_MAWILE
.byte 0 @ SPECIES_MEDITITE
.byte 0 @ SPECIES_MEDICHAM
.byte 12 @ SPECIES_SWABLU
.byte 8 @ SPECIES_ALTARIA
.byte 0 @ SPECIES_WYNAUT
.byte 9 @ SPECIES_DUSKULL
.byte 0 @ SPECIES_DUSCLOPS
.byte 0 @ SPECIES_ROSELIA
.byte 0 @ SPECIES_SLAKOTH
.byte 0 @ SPECIES_VIGOROTH
.byte 0 @ SPECIES_SLAKING
.byte 0 @ SPECIES_GULPIN
.byte 0 @ SPECIES_SWALOT
.byte 0 @ SPECIES_TROPIUS
.byte 0 @ SPECIES_WHISMUR
.byte 0 @ SPECIES_LOUDRED
.byte 0 @ SPECIES_EXPLOUD
.byte 0 @ SPECIES_CLAMPERL
.byte 0 @ SPECIES_HUNTAIL
.byte 0 @ SPECIES_GOREBYSS
.byte 0 @ SPECIES_ABSOL
.byte 12 @ SPECIES_SHUPPET
.byte 8 @ SPECIES_BANETTE
.byte 0 @ SPECIES_SEVIPER
.byte 0 @ SPECIES_ZANGOOSE
.byte 0 @ SPECIES_RELICANTH
.byte 0 @ SPECIES_ARON
.byte 0 @ SPECIES_LAIRON
.byte 0 @ SPECIES_AGGRON
.byte 16 @ SPECIES_CASTFORM
.byte 0 @ SPECIES_VOLBEAT
.byte 0 @ SPECIES_ILLUMISE
.byte 0 @ SPECIES_LILEEP
.byte 0 @ SPECIES_CRADILY
.byte 0 @ SPECIES_ANORITH
.byte 0 @ SPECIES_ARMALDO
.byte 0 @ SPECIES_RALTS
.byte 0 @ SPECIES_KIRLIA
.byte 0 @ SPECIES_GARDEVOIR
.byte 0 @ SPECIES_BAGON
.byte 0 @ SPECIES_SHELGON
.byte 0 @ SPECIES_SALAMENCE
.byte 8 @ SPECIES_BELDUM
.byte 0 @ SPECIES_METANG
.byte 0 @ SPECIES_METAGROSS
.byte 0 @ SPECIES_REGIROCK
.byte 0 @ SPECIES_REGICE
.byte 0 @ SPECIES_REGISTEEL
.byte 0 @ SPECIES_KYOGRE
.byte 0 @ SPECIES_GROUDON
.byte 6 @ SPECIES_RAYQUAZA
.byte 6 @ SPECIES_LATIAS
.byte 6 @ SPECIES_LATIOS
.byte 12 @ SPECIES_JIRACHI
.byte 8 @ SPECIES_DEOXYS
.byte 12 @ SPECIES_CHIMECHO
data/event_scripts.s
+10 -9
View File
@@ -5,6 +5,7 @@
#include "constants/songs.h"
#include "constants/species.h"
#include "constants/vars.h"
#include "constants/heal_locations.h"
#include "constants/trainers.h"
.include "asm/macros.inc"
.include "asm/macros/event.inc"
@@ -1110,10 +1111,10 @@ EventScript_2715DE:: @ 82715DE
setflag FLAG_0x2DE
setflag FLAG_0x351
setflag FLAG_0x32F
setflag FLAG_0x315
setflag FLAG_0x316
setflag FLAG_0x317
setflag FLAG_0x318
setflag FLAG_HIDE_FANCLUB_OLD_LADY
setflag FLAG_HIDE_FANCLUB_BOY
setflag FLAG_HIDE_FANCLUB_LITTLE_BOY
setflag FLAG_HIDE_FANCLUB_LADY
setflag FLAG_0x2DA
setflag FLAG_0x31D
setflag FLAG_0x31E
@@ -1801,7 +1802,7 @@ EventScript_271E0E:: @ 8271E0E
checkflag FLAG_SYS_PC_LANETTE
call_if 1, EventScript_271E3E
msgbox gUnknown_082726A3, 4
special sub_80C7578
special ShowPokemonStorageSystem
waitstate
goto EventScript_271DAC
end
@@ -2356,8 +2357,8 @@ RusturfTunnel_EventScript_272216:: @ 8272216
removeobject 10
clearflag FLAG_0x328
clearflag FLAG_0x3D8
setvar VAR_0x409A, 6
setflag FLAG_0x0C7
setvar VAR_RUSTURF_TUNNEL_STATE, 6
setflag FLAG_RUSTURF_TUNNEL_OPENED
return
EventScript_27222B:: @ 827222B
@@ -2517,7 +2518,7 @@ Route119_EventScript_272365:: @ 8272365
setflag FLAG_SYS_CTRL_OBJ_DELETE
dowildbattle
clearflag FLAG_SYS_CTRL_OBJ_DELETE
specialvar VAR_RESULT, sub_8138B80
specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 1
goto_eq Route119_EventScript_2723C1
compare VAR_RESULT, 4
@@ -3346,7 +3347,7 @@ EventScript_2736D9:: @ 82736D9
end
EventScript_2736F4:: @ 82736F4
setrespawn 16
setrespawn HEAL_LOCATION_LAVARIDGE_TOWN
return
EventScript_2736F8:: @ 82736F8
data/field_player_avatar.s
-58
View File
@@ -6,63 +6,6 @@
.section .rodata
.align 2, 0
gUnknown_084973FC:: @ 84973FC
.4byte MetatileBehavior_IsTrickHouseSlipperyFloor
.4byte MetatileBehavior_IsIce_2
.4byte MetatileBehavior_IsWalkSouth
.4byte MetatileBehavior_IsWalkNorth
.4byte MetatileBehavior_IsWalkWest
.4byte MetatileBehavior_IsWalkEast
.4byte MetatileBehavior_IsSouthwardCurrent
.4byte MetatileBehavior_IsNorthwardCurrent
.4byte MetatileBehavior_IsWestwardCurrent
.4byte MetatileBehavior_IsEastwardCurrent
.4byte MetatileBehavior_IsSlideSouth
.4byte MetatileBehavior_IsSlideNorth
.4byte MetatileBehavior_IsSlideWest
.4byte MetatileBehavior_IsSlideEast
.4byte MetatileBehavior_IsWaterfall
.4byte MetatileBehavior_IsSecretBaseJumpMat
.4byte MetatileBehavior_IsSecretBaseSpinMat
.4byte MetatileBehavior_IsMuddySlope
gUnknown_08497444:: @ 8497444
.4byte ForcedMovement_None
.4byte ForcedMovement_Slip
.4byte ForcedMovement_Slip
.4byte ForcedMovement_WalkSouth
.4byte ForcedMovement_WalkNorth
.4byte ForcedMovement_WalkWest
.4byte ForcedMovement_WalkEast
.4byte ForcedMovement_PushedSouthByCurrent
.4byte ForcedMovement_PushedNorthByCurrent
.4byte ForcedMovement_PushedWestByCurrent
.4byte ForcedMovement_PushedEastByCurrent
.4byte ForcedMovement_SlideSouth
.4byte ForcedMovement_SlideNorth
.4byte ForcedMovement_SlideWest
.4byte ForcedMovement_SlideEast
.4byte ForcedMovement_PushedSouthByCurrent
.4byte ForcedMovement_0xBB
.4byte ForcedMovement_0xBC
.4byte ForcedMovement_MuddySlope
gUnknown_08497490:: @ 8497490
.4byte PlayerNotOnBikeNotMoving
.4byte PlayerNotOnBikeTurningInPlace
.4byte PlayerNotOnBikeMoving
gUnknown_0849749C:: @ 849749C
.4byte MetatileBehavior_IsBumpySlope
.4byte MetatileBehavior_IsIsolatedVerticalRail
.4byte MetatileBehavior_IsIsolatedHorizontalRail
.4byte MetatileBehavior_IsVerticalRail
.4byte MetatileBehavior_IsHorizontalRail
gUnknown_084974B0:: @ 84974B0
.byte 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x00, 0x00, 0x00
gUnknown_084974B8:: @ 84974B8
.4byte PlayerAvatarTransition_Normal
.4byte PlayerAvatarTransition_MachBike
@@ -158,4 +101,3 @@ gUnknown_084975B0:: @ 84975B0
gUnknown_084975BC:: @ 84975BC
.byte 0x01, 0x03, 0x04, 0x02, 0x01, 0x00, 0x00, 0x00
data/field_specials.s
-547
View File
@@ -1,547 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnknown_085B2B5C:: @ 85B2B5C
.byte 0x07, 0x09, 0x08, 0x0a
.align 2
gUnknown_085B2B60:: @ 85B2B60
.byte 0x00, 0x01, 0x01, 0x00, 0x00, 0xff, 0xff, 0x00
gUnknown_085B2B68:: @ 85B2B68
.byte 0x07, 0x16, 0x00, 0x00, 0x0b, 0x13, 0x00, 0x00, 0x0a, 0x10, 0x00, 0x00, 0x0f, 0x10, 0x00, 0x00
gUnknown_085B2B78:: @ 85B2B78
.byte 0x00, 0x01, 0x01, 0x01, 0x01, 0x00
.align 1
gUnknown_085B2B7E:: @ 85B2B7E
.2byte 0x0218, 0x0219, 0x021a, 0x021b, 0x021c
gUnknown_085B2B88:: @ 85B2B88
.byte 0x0c, 0x02, 0x04, 0x05, 0x01, 0x08, 0x07, 0x0b, 0x03, 0x0a, 0x09, 0x06
gUnknown_085B2B94:: @ 85B2B94
.byte 0x00, 0x01, 0x01, 0x02, 0x02, 0x02, 0x03, 0x03, 0x03, 0x04, 0x04, 0x05
gUnknown_085B2BA0:: @ 85B2BA0
.byte 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x04, 0x04, 0x04, 0x04, 0x05, 0x05
.align 2
gUnknown_085B2BAC:: @ 85B2BAC
.byte 0x00, 0x15, 0x01, 0x08, 0x04, 0x0f, 0x08, 0x00
.align 2
gElevatorFloorsTable:: @ 85B2BB4
.4byte gText_B4F
.4byte gText_B3F
.4byte gText_B2F
.4byte gText_B1F
.4byte gText_1F
.4byte gText_2F
.4byte gText_3F
.4byte gText_4F
.4byte gText_5F
.4byte gText_6F
.4byte gText_7F
.4byte gText_8F
.4byte gText_9F
.4byte gText_10F
.4byte gText_11F
.4byte gText_Rooftop
.align 1
gUnknown_085B2BF4:: @ 85B2BF4
.2byte 0x0329, 0x032a, 0x032b, 0x0331, 0x0332, 0x0333, 0x0339, 0x033a, 0x033b
.align 1
gUnknown_085B2C06:: @ 85B2C06
.2byte 0x0329, 0x032b, 0x032a, 0x0331, 0x0333, 0x0332, 0x0339, 0x033b, 0x033a
gUnknown_085B2C18:: @ 85B2C18
.byte 0x08, 0x10, 0x18, 0x20, 0x26, 0x2e, 0x34, 0x38, 0x39
gUnknown_085B2C21:: @ 85B2C21
.byte 0x03, 0x06, 0x09, 0x0c, 0x0f, 0x12, 0x15, 0x18, 0x1b
.align 1
gUnknown_085B2C2A:: @ 85B2C2A
.2byte 0x0202, 0x0301, 0x0405, 0x0504, 0x0604, 0x0700, 0x0804, 0x090b, 0x0a05, 0x0b05, 0x0c02, 0x0d06, 0x0e03, 0x0f02, 0x100c, 0x100a
.2byte 0x1a35, 0x193c, 0xffff
.align 2
gUnknown_085B2C50:: @ 85B2C50
.4byte BattleFrontier_Lounge2_Text_260971
.4byte BattleFrontier_Lounge2_Text_260A1E
.4byte BattleFrontier_Lounge2_Text_260AE7
.4byte BattleFrontier_Lounge2_Text_2619AC
.4byte BattleFrontier_Lounge2_Text_261A91
.4byte BattleFrontier_Lounge2_Text_261B0C
.4byte BattleFrontier_Lounge2_Text_261B95
.4byte BattleFrontier_Lounge2_Text_261B95
.4byte BattleFrontier_Lounge2_Text_261B95
.4byte BattleFrontier_Lounge2_Text_261C1A
.4byte BattleFrontier_Lounge2_Text_261C1A
.4byte BattleFrontier_Lounge2_Text_261C1A
.4byte BattleFrontier_Lounge2_Text_260BC4
.4byte BattleFrontier_Lounge2_Text_260C6D
.4byte BattleFrontier_Lounge2_Text_260D3A
.4byte BattleFrontier_Lounge2_Text_260E1E
.4byte BattleFrontier_Lounge2_Text_260EC7
.4byte BattleFrontier_Lounge2_Text_260F74
.4byte BattleFrontier_Lounge2_Text_2614E6
.4byte BattleFrontier_Lounge2_Text_261591
.4byte BattleFrontier_Lounge2_Text_26166F
.4byte BattleFrontier_Lounge2_Text_261282
.4byte BattleFrontier_Lounge2_Text_261329
.4byte BattleFrontier_Lounge2_Text_261403
.4byte BattleFrontier_Lounge2_Text_261026
.4byte BattleFrontier_Lounge2_Text_2610CC
.4byte BattleFrontier_Lounge2_Text_261194
.4byte BattleFrontier_Lounge2_Text_26174D
.4byte BattleFrontier_Lounge2_Text_2617F9
.4byte BattleFrontier_Lounge2_Text_2618C4
gUnknown_085B2CC8:: @ 85B2CC8
.byte 0x15, 0x38, 0x15, 0x23, 0xff, 0xff, 0xff, 0xff, 0x02, 0x04, 0x07, 0x15, 0x07, 0x15, 0x0e, 0x1c, 0x0d, 0x70, 0x07, 0x38
.align 1
gUnknown_085B2CDC:: @ 85B2CDC
.2byte 0x0007, 0x000e, 0x0015, 0x001c, 0x0023, 0x0031, 0x003f, 0x004d, 0x005b, 0x0000
.align 2
gUnknown_085B2CF0:: @ 85B2CF0
.4byte gText_Exit
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte gText_BlueFlute
.4byte gText_YellowFlute
.4byte gText_RedFlute
.4byte gText_WhiteFlute
.4byte gText_BlackFlute
.4byte gText_PrettyChair
.4byte gText_PrettyDesk
.4byte gText_Exit
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte gText_0Pts
.4byte gText_10Pts
.4byte gText_20Pts
.4byte gText_30Pts
.4byte gText_40Pts
.4byte gText_50Pts
.4byte gText_60Pts
.4byte gText_70Pts
.4byte gText_80Pts
.4byte gText_90Pts
.4byte gText_100Pts
.4byte gText_QuestionMark
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte gText_KissPoster16BP
.4byte gText_KissCushion32BP
.4byte gText_SmoochumDoll32BP
.4byte gText_TogepiDoll48BP
.4byte gText_MeowthDoll48BP
.4byte gText_ClefairyDoll48BP
.4byte gText_DittoDoll48BP
.4byte gText_CyndaquilDoll80BP
.4byte gText_ChikoritaDoll80BP
.4byte gText_TotodileDoll80BP
.4byte gText_Exit
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte gText_LaprasDoll128BP
.4byte gText_SnorlaxDoll128BP
.4byte gText_VenusaurDoll256BP
.4byte gText_CharizardDoll256BP
.4byte gText_BlastoiseDoll256BP
.4byte gText_Exit
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte gText_Protein1BP
.4byte gText_Calcium1BP
.4byte gText_Iron1BP
.4byte gText_Zinc1BP
.4byte gText_Carbos1BP
.4byte gText_HpUp1BP
.4byte gText_Exit
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte gText_Leftovers48BP
.4byte gText_WhiteHerb48BP
.4byte gText_QuickClaw48BP
.4byte gText_MentalHerb48BP
.4byte gText_BrightPowder64BP
.4byte gText_ChoiceBand64BP
.4byte gText_KingsRock64BP
.4byte gText_FocusBand64BP
.4byte gText_ScopeLens64BP
.4byte gText_Exit
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte gText_EnergyPowder50
.4byte gText_EnergyRoot80
.4byte gText_HealPowder50
.4byte gText_RevivalHerb300
.4byte gText_Protein1000
.4byte gText_Iron1000
.4byte gText_Carbos1000
.4byte gText_Calcium1000
.4byte gText_Zinc1000
.4byte gText_HPUp1000
.4byte gText_PPUp3000
.4byte gText_Exit
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte gText_BattleTower2
.4byte gText_BattleDome
.4byte gText_BattlePalace
.4byte gText_BattleArena
.4byte gText_BattleFactory
.4byte gText_BattlePike
.4byte gText_BattlePyramid
.4byte gText_RankingHall
.4byte gText_ExchangeService
.4byte gText_Exit
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte gText_Softboiled16BP
.4byte gText_SeismicToss24BP
.4byte gText_DreamEater24BP
.4byte gText_MegaPunch24BP
.4byte gText_MegaKick48BP
.4byte gText_BodySlam48BP
.4byte gText_RockSlide48BP
.4byte gText_Counter48BP
.4byte gText_ThunderWave48BP
.4byte gText_SwordsDance48BP
.4byte gText_Exit
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte gText_DefenseCurl16BP
.4byte gText_Snore24BP
.4byte gText_MudSlap24BP
.4byte gText_Swift24BP
.4byte gText_IcyWind24BP
.4byte gText_Endure48BP
.4byte gText_PsychUp48BP
.4byte gText_IcePunch48BP
.4byte gText_ThunderPunch48BP
.4byte gText_FirePunch48BP
.4byte gText_Exit
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte gText_SlateportCity
.4byte gText_BattleFrontier
.4byte gText_SouthernIsland
.4byte gText_NavelRock
.4byte gText_BirthIsland
.4byte gText_FarawayIsland
.4byte gText_Exit
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte gText_BattleTrainers
.4byte gText_BattleBasics
.4byte gText_PokemonNature
.4byte gText_PokemonMoves
.4byte gText_Underpowered
.4byte gText_WhenInDanger
.4byte gText_Exit
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.align 2
gUnknown_085B3030:: @ 85B3030
.4byte 0x03000002, 0x00000000, 0x07d00000, 0x00000064
.align 2
gUnknown_085B3040:: @ 85B3040
.4byte BattleFrontier_Lounge5_Text_26468D
.4byte BattleFrontier_Lounge5_Text_2646E5
.4byte BattleFrontier_Lounge5_Text_264741
.4byte BattleFrontier_Lounge5_Text_2647A4
.4byte BattleFrontier_Lounge5_Text_2647FC
.4byte BattleFrontier_Lounge5_Text_264858
.4byte BattleFrontier_Lounge5_Text_2648BE
.4byte BattleFrontier_Lounge5_Text_264916
.4byte BattleFrontier_Lounge5_Text_264972
.4byte BattleFrontier_Lounge5_Text_2649D5
.4byte BattleFrontier_Lounge5_Text_264A3F
.4byte BattleFrontier_Lounge5_Text_264A9B
.4byte BattleFrontier_Lounge5_Text_264AF3
.4byte BattleFrontier_Lounge5_Text_264B5D
.4byte BattleFrontier_Lounge5_Text_2648BE
.4byte BattleFrontier_Lounge5_Text_264BC3
.4byte BattleFrontier_Lounge5_Text_264C36
.4byte BattleFrontier_Lounge5_Text_2648BE
.4byte BattleFrontier_Lounge5_Text_264C95
.4byte BattleFrontier_Lounge5_Text_264D01
.4byte BattleFrontier_Lounge5_Text_264D6B
.4byte BattleFrontier_Lounge5_Text_264DD7
.4byte BattleFrontier_Lounge5_Text_264E33
.4byte BattleFrontier_Lounge5_Text_264E8F
.4byte BattleFrontier_Lounge5_Text_2648BE
.align 2
gUnknown_085B30A4:: @ 85B30A4
.4byte BattleFrontier_Lounge3_Text_262261
.4byte BattleFrontier_Lounge3_Text_26230D
.4byte BattleFrontier_Lounge3_Text_2623B9
.4byte BattleFrontier_Lounge3_Text_262464
.4byte BattleFrontier_Lounge3_Text_26250E
.4byte BattleFrontier_Lounge3_Text_2625B8
.4byte BattleFrontier_Lounge3_Text_26266A
.4byte BattleFrontier_Lounge3_Text_26271C
.4byte BattleFrontier_Lounge3_Text_2627C9
.4byte BattleFrontier_Lounge3_Text_262876
.4byte BattleFrontier_Lounge3_Text_26291A
.4byte BattleFrontier_Lounge3_Text_2629BC
.align 2
gUnknown_085B30D4:: @ 85B30D4
.4byte BattleFrontier_Lounge3_Text_262C04
.4byte BattleFrontier_Lounge3_Text_262C90
.4byte BattleFrontier_Lounge3_Text_262D1C
.4byte BattleFrontier_Lounge3_Text_262DA7
.4byte BattleFrontier_Lounge3_Text_262E34
.4byte BattleFrontier_Lounge3_Text_262EC1
.4byte BattleFrontier_Lounge3_Text_262F56
.4byte BattleFrontier_Lounge3_Text_262FEB
.4byte BattleFrontier_Lounge3_Text_263078
.4byte BattleFrontier_Lounge3_Text_263105
.4byte BattleFrontier_Lounge3_Text_26318C
.4byte BattleFrontier_Lounge3_Text_263211
.align 1
gUnknown_085B3104:: @ 85B3104
.2byte 0x0000, 0x0001, 0x0002, 0x0100, 0x0101, 0x0400, 0x0401, 0x0200, 0x0201, 0x0300, 0x0500, 0x0600
.align 2
gUnknown_085B311C:: @ 85B311C
window_template 0x00, 0x01, 0x01, 0x06, 0x02, 0x0f, 0x0008
.align 2
gUnknown_085B3124:: @ 85B3124
window_template 0x00, 0x02, 0x09, 0x04, 0x04, 0x0f, 0x0014
.align 1
gUnknown_085B312C:: @ 85B312C
.2byte 0x004b, 0x0067, 0x0057, 0x004f, 0x0054, 0x0055, 0x0056, 0x0050, 0x0051, 0x0052, 0xffff
.align 1
gUnknown_085B3142:: @ 85B3142
.2byte 0x0071, 0x006f, 0x0072, 0x0073, 0x0074, 0xffff
.align 1
gUnknown_085B314E:: @ 85B314E
.2byte 0x0040, 0x0043, 0x0041, 0x0046, 0x0042, 0x003f, 0xffff
.align 1
gUnknown_085B315C:: @ 85B315C
.2byte 0x00c8, 0x00b4, 0x00b7, 0x00b9, 0x00b3, 0x00ba, 0x00bb, 0x00c4, 0x00c6, 0xffff
.align 2
gUnknown_085B3170:: @ 85B3170
.4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_2601AA
.4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_2601D0
.4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_260201
.4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_26022F
.4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_26025B
.4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_260287
.4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_2602B5
.4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_2602E0
.4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_26030F
.4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_26033E
.4byte gText_Exit
.align 2
gUnknown_085B319C:: @ 85B319C
.4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_26036C
.4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_26036C
.4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_26036C
.4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_26036C
.4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_26036C
.4byte gText_Exit
.align 2
gUnknown_085B31B4:: @ 85B31B4
.4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_260397
.4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_2603BE
.4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_2603E6
.4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_26040E
.4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_260436
.4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_26045C
.4byte gText_Exit
.align 2
gUnknown_085B31D0:: @ 85B31D0
.4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_26047A
.4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_2604AC
.4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_2604D8
.4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_26050F
.4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_260542
.4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_260575
.4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_2605A8
.4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_2605E2
.4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_260613
.4byte gText_Exit
.align 1
gUnknown_085B31F8:: @ 85B31F8
.2byte 0x0087, 0x0045, 0x008a, 0x0005, 0x0019, 0x0022, 0x009d, 0x0044, 0x0056, 0x000e
.align 1
gUnknown_085B320C:: @ 85B320C
.2byte 0x006f, 0x00ad, 0x00bd, 0x0081, 0x00c4, 0x00cb, 0x00f4, 0x0008, 0x0009, 0x0007
.align 2
gUnknown_085B3220:: @ 85B3220
window_template 0x00, 0x01, 0x07, 0x0c, 0x06, 0x0f, 0x001c
.align 2
gUnknown_085B3228:: @ 85B3228
.4byte BattleFrontier_Lounge7_Text_265E30
.4byte BattleFrontier_Lounge7_Text_265E5B
.4byte BattleFrontier_Lounge7_Text_265E8A
.4byte BattleFrontier_Lounge7_Text_265EC0
.4byte BattleFrontier_Lounge7_Text_265EED
.4byte BattleFrontier_Lounge7_Text_265F1C
.4byte BattleFrontier_Lounge7_Text_265F47
.4byte BattleFrontier_Lounge7_Text_265F77
.4byte BattleFrontier_Lounge7_Text_265FAA
.4byte BattleFrontier_Lounge7_Text_265FDD
.4byte gText_Exit
.align 2
gUnknown_085B3254:: @ 85B3254
.4byte BattleFrontier_Lounge7_Text_26600A
.4byte BattleFrontier_Lounge7_Text_26603E
.4byte BattleFrontier_Lounge7_Text_266070
.4byte BattleFrontier_Lounge7_Text_2660A6
.4byte BattleFrontier_Lounge7_Text_2660D0
.4byte BattleFrontier_Lounge7_Text_2660FF
.4byte BattleFrontier_Lounge7_Text_26612D
.4byte BattleFrontier_Lounge7_Text_26615F
.4byte BattleFrontier_Lounge7_Text_266185
.4byte BattleFrontier_Lounge7_Text_2661B5
.4byte gText_Exit
.align 2
gUnknown_085B3280:: @ 85B3280
.incbin "graphics/unknown/unknown_5B3280.gbapal"
gUnknown_085B33E0:: @ 85B33E0
.byte 0x0f, 0x0c, 0x0b, 0x0e, 0x0f, 0x08, 0x13, 0x0e, 0x0c, 0x0b, 0x12, 0x0b, 0x0f, 0x0e, 0x0b, 0x0e, 0x13, 0x0e, 0x0f, 0x0f, 0x0f, 0x0a
gUnknown_085B33F6:: @ 85B33F6
.byte 0x04, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x06, 0x03, 0x03
gUnknown_085B3400:: @ 85B3400
.byte 0x1d, 0x1d, 0x1e, 0x1e, 0x1f, 0x1f, 0x21, 0x21, 0x14, 0x14, 0x28, 0x28, 0x2a, 0x2a, 0x2c, 0x2c
gUnknown_085B3410:: @ 85B3410
.byte 0x1d, 0x1d, 0x1e, 0x1e, 0x1f, 0x1f, 0x21, 0x21, 0x14, 0x14, 0x28, 0x28, 0x2a, 0x2a, 0x2c, 0x2c
gUnknown_085B3420:: @ 85B3420
.byte 0x02, 0x04, 0x01, 0x04, 0x04, 0x01, 0x05, 0x00, 0x01, 0x06, 0x03, 0x01, 0x08, 0x06, 0x01, 0x09, 0x0d, 0x01, 0x0a, 0x07, 0x01, 0x0b, 0x07, 0x01, 0x0c, 0x04, 0x01, 0x0e, 0x05, 0x01, 0x0f, 0x04
.byte 0x01, 0x1a, 0x37, 0x01
.align 1
gUnknown_085B3444:: @ 85B3444
.2byte 0x0202, 0x0301, 0x0405, 0x0504, 0x0604, 0x0700, 0x0804, 0x090b, 0x0a05, 0x0b05, 0x0c02, 0x0d06, 0x0e03, 0x0f02, 0x100c, 0x100a
.2byte 0x1a35, 0x1918, 0x1919, 0x191a, 0x191b, 0xffff
gUnknown_085B3470:: @ 85B3470
.byte 0x02, 0x01, 0x02, 0x01
gUnknown_085B3474:: @ 85B3474
.byte 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f
gUnknown_085B347C:: @ 85B347C
.byte 0x08, 0x0d, 0x0e, 0x0b, 0x0a, 0x0c, 0x0f, 0x09
data/graphics.s
-5189
View File
File diff suppressed because it is too large Load Diff
data/graphics/berries/berry_graphics.inc
-343
View File
@@ -1,343 +0,0 @@
.align 2
gBerryPic_Cheri:: @ 8D9C3A8
.incbin "graphics/berries/cheri.4bpp.lz"
.align 2
gBerryPic_Oran:: @ 8D9C4FC
.incbin "graphics/berries/oran.4bpp.lz"
.align 2
gBerryPic_Pecha:: @ 8D9C670
.incbin "graphics/berries/pecha.4bpp.lz"
.align 2
gBerryPic_Rawst:: @ 8D9C7E4
.incbin "graphics/berries/rawst.4bpp.lz"
.align 2
gBerryPic_Aspear:: @ 8D9C97C
.incbin "graphics/berries/aspear.4bpp.lz"
.align 2
gBerryPic_Leppa:: @ 8D9CB24
.incbin "graphics/berries/leppa.4bpp.lz"
.align 2
gBerryPic_Chesto:: @ 8D9CC94
.incbin "graphics/berries/chesto.4bpp.lz"
.align 2
gBerryPic_Persim:: @ 8D9CE78
.incbin "graphics/berries/persim.4bpp.lz"
.align 2
gBerryPic_Lum:: @ 8D9CFC8
.incbin "graphics/berries/lum.4bpp.lz"
.align 2
gBerryPic_Sitrus:: @ 8D9D0E4
.incbin "graphics/berries/sitrus.4bpp.lz"
.align 2
gBerryPic_Figy:: @ 8D9D288
.incbin "graphics/berries/figy.4bpp.lz"
.align 2
gBerryPic_Wiki:: @ 8D9D434
.incbin "graphics/berries/wiki.4bpp.lz"
.align 2
gBerryPic_Mago:: @ 8D9D628
.incbin "graphics/berries/mago.4bpp.lz"
.align 2
gBerryPic_Aguav:: @ 8D9D7DC
.incbin "graphics/berries/aguav.4bpp.lz"
.align 2
gBerryPic_Iapapa:: @ 8D9D950
.incbin "graphics/berries/iapapa.4bpp.lz"
.align 2
gBerryPic_Razz:: @ 8D9DC08
.incbin "graphics/berries/razz.4bpp.lz"
.align 2
gBerryPic_Bluk:: @ 8D9DE38
.incbin "graphics/berries/bluk.4bpp.lz"
.align 2
gBerryPic_Nanab:: @ 8D9E020
.incbin "graphics/berries/nanab.4bpp.lz"
.align 2
gBerryPic_Wepear:: @ 8D9E194
.incbin "graphics/berries/wepear.4bpp.lz"
.align 2
gBerryPic_Pinap:: @ 8D9E35C
.incbin "graphics/berries/pinap.4bpp.lz"
.align 2
gBerryPic_Pomeg:: @ 8D9E570
.incbin "graphics/berries/pomeg.4bpp.lz"
.align 2
gBerryPic_Kelpsy:: @ 8D9E718
.incbin "graphics/berries/kelpsy.4bpp.lz"
.align 2
gBerryPic_Qualot:: @ 8D9E8C0
.incbin "graphics/berries/qualot.4bpp.lz"
.align 2
gBerryPic_Hondew:: @ 8D9EA8C
.incbin "graphics/berries/hondew.4bpp.lz"
.align 2
gBerryPic_Grepa:: @ 8D9ECE4
.incbin "graphics/berries/grepa.4bpp.lz"
.align 2
gBerryPic_Tamato:: @ 8D9EE74
.incbin "graphics/berries/tamato.4bpp.lz"
.align 2
gBerryPic_Cornn:: @ 8D9F138
.incbin "graphics/berries/cornn.4bpp.lz"
.align 2
gBerryPic_Magost:: @ 8D9F33C
.incbin "graphics/berries/magost.4bpp.lz"
.align 2
gBerryPic_Rabuta:: @ 8D9F4E0
.incbin "graphics/berries/rabuta.4bpp.lz"
.align 2
gBerryPic_Nomel:: @ 8D9F7D4
.incbin "graphics/berries/nomel.4bpp.lz"
.align 2
gBerryPic_Spelon:: @ 8D9F9B0
.incbin "graphics/berries/spelon.4bpp.lz"
.align 2
gBerryPic_Pamtre:: @ 8D9FBA0
.incbin "graphics/berries/pamtre.4bpp.lz"
.align 2
gBerryPic_Watmel:: @ 8D9FDF0
.incbin "graphics/berries/watmel.4bpp.lz"
.align 2
gBerryPic_Durin:: @ 8DA00D4
.incbin "graphics/berries/durin.4bpp.lz"
.align 2
gBerryPic_Belue:: @ 8DA04A0
.incbin "graphics/berries/belue.4bpp.lz"
.align 2
gBerryPic_Liechi:: @ 8DA0778
.incbin "graphics/berries/liechi.4bpp.lz"
.align 2
gBerryPic_Ganlon:: @ 8DA09D0
.incbin "graphics/berries/ganlon.4bpp.lz"
.align 2
gBerryPic_Salac:: @ 8DA0B68
.incbin "graphics/berries/salac.4bpp.lz"
.align 2
gBerryPic_Petaya:: @ 8DA0DAC
.incbin "graphics/berries/petaya.4bpp.lz"
.align 2
gBerryPic_Apicot:: @ 8DA1054
.incbin "graphics/berries/apicot.4bpp.lz"
.align 2
gBerryPic_Lansat:: @ 8DA11E4
.incbin "graphics/berries/lansat.4bpp.lz"
.align 2
gBerryPic_Starf:: @ 8DA13D8
.incbin "graphics/berries/starf.4bpp.lz"
.align 2
gBerryPic_Enigma:: @ 8DA15A8
.incbin "graphics/berries/enigma.4bpp.lz"
.align 2
gBerryPalette_Cheri:: @ 8DA17C0
.incbin "graphics/berries/cheri.gbapal.lz"
.align 2
gBerryPalette_Oran:: @ 8DA17E8
.incbin "graphics/berries/oran.gbapal.lz"
.align 2
gBerryPalette_Pecha:: @ 8DA1810
.incbin "graphics/berries/pecha.gbapal.lz"
.align 2
gBerryPalette_Rawst:: @ 8DA1838
.incbin "graphics/berries/rawst.gbapal.lz"
.align 2
gBerryPalette_Aspear:: @ 8DA1860
.incbin "graphics/berries/aspear.gbapal.lz"
.align 2
gBerryPalette_Leppa:: @ 8DA1888
.incbin "graphics/berries/leppa.gbapal.lz"
.align 2
gBerryPalette_Chesto:: @ 8DA18B0
.incbin "graphics/berries/chesto.gbapal.lz"
.align 2
gBerryPalette_Persim:: @ 8DA18D8
.incbin "graphics/berries/persim.gbapal.lz"
.align 2
gBerryPalette_Lum:: @ 8DA1900
.incbin "graphics/berries/lum.gbapal.lz"
.align 2
gBerryPalette_Sitrus:: @ 8DA1928
.incbin "graphics/berries/sitrus.gbapal.lz"
.align 2
gBerryPalette_Figy:: @ 8DA1950
.incbin "graphics/berries/figy.gbapal.lz"
.align 2
gBerryPalette_Wiki:: @ 8DA1978
.incbin "graphics/berries/wiki.gbapal.lz"
.align 2
gBerryPalette_Mago:: @ 8DA19A0
.incbin "graphics/berries/mago.gbapal.lz"
.align 2
gBerryPalette_Aguav:: @ 8DA19C8
.incbin "graphics/berries/aguav.gbapal.lz"
.align 2
gBerryPalette_Iapapa:: @ 8DA19F0
.incbin "graphics/berries/iapapa.gbapal.lz"
.align 2
gBerryPalette_Razz:: @ 8DA1A18
.incbin "graphics/berries/razz.gbapal.lz"
.align 2
gBerryPalette_Bluk:: @ 8DA1A40
.incbin "graphics/berries/bluk.gbapal.lz"
.align 2
gBerryPalette_Nanab:: @ 8DA1A68
.incbin "graphics/berries/nanab.gbapal.lz"
.align 2
gBerryPalette_Wepear:: @ 8DA1A90
.incbin "graphics/berries/wepear.gbapal.lz"
.align 2
gBerryPalette_Pinap:: @ 8DA1AB8
.incbin "graphics/berries/pinap.gbapal.lz"
.align 2
gBerryPalette_Pomeg:: @ 8DA1AE0
.incbin "graphics/berries/pomeg.gbapal.lz"
.align 2
gBerryPalette_Kelpsy:: @ 8DA1B08
.incbin "graphics/berries/kelpsy.gbapal.lz"
.align 2
gBerryPalette_Qualot:: @ 8DA1B30
.incbin "graphics/berries/qualot.gbapal.lz"
.align 2
gBerryPalette_Hondew:: @ 8DA1B58
.incbin "graphics/berries/hondew.gbapal.lz"
.align 2
gBerryPalette_Grepa:: @ 8DA1B80
.incbin "graphics/berries/grepa.gbapal.lz"
.align 2
gBerryPalette_Tamato:: @ 8DA1BA8
.incbin "graphics/berries/tamato.gbapal.lz"
.align 2
gBerryPalette_Cornn:: @ 8DA1BD0
.incbin "graphics/berries/cornn.gbapal.lz"
.align 2
gBerryPalette_Magost:: @ 8DA1BF8
.incbin "graphics/berries/magost.gbapal.lz"
.align 2
gBerryPalette_Rabuta:: @ 8DA1C20
.incbin "graphics/berries/rabuta.gbapal.lz"
.align 2
gBerryPalette_Nomel:: @ 8DA1C48
.incbin "graphics/berries/nomel.gbapal.lz"
.align 2
gBerryPalette_Spelon:: @ 8DA1C70
.incbin "graphics/berries/spelon.gbapal.lz"
.align 2
gBerryPalette_Pamtre:: @ 8DA1C98
.incbin "graphics/berries/pamtre.gbapal.lz"
.align 2
gBerryPalette_Watmel:: @ 8DA1CC0
.incbin "graphics/berries/watmel.gbapal.lz"
.align 2
gBerryPalette_Durin:: @ 8DA1CE8
.incbin "graphics/berries/durin.gbapal.lz"
.align 2
gBerryPalette_Belue:: @ 8DA1D10
.incbin "graphics/berries/belue.gbapal.lz"
.align 2
gBerryPalette_Liechi:: @ 8DA1D38
.incbin "graphics/berries/liechi.gbapal.lz"
.align 2
gBerryPalette_Ganlon:: @ 8DA1D60
.incbin "graphics/berries/ganlon.gbapal.lz"
.align 2
gBerryPalette_Salac:: @ 8DA1D88
.incbin "graphics/berries/salac.gbapal.lz"
.align 2
gBerryPalette_Petaya:: @ 8DA1DB0
.incbin "graphics/berries/petaya.gbapal.lz"
.align 2
gBerryPalette_Apicot:: @ 8DA1DD8
.incbin "graphics/berries/apicot.gbapal.lz"
.align 2
gBerryPalette_Lansat:: @ 8DA1E00
.incbin "graphics/berries/lansat.gbapal.lz"
.align 2
gBerryPalette_Starf:: @ 8DA1E28
.incbin "graphics/berries/starf.gbapal.lz"
.align 2
gBerryPalette_Enigma:: @ 8DA1E50
.incbin "graphics/berries/enigma.gbapal.lz"
data/graphics/decorations/decoration_graphics.inc
-252
View File
@@ -1,252 +0,0 @@
gUnknown_08DB7AA0::
.incbin "graphics/decorations/decor_heavy_desk.4bpp.lz"
gUnknown_08DB7B34::
.incbin "graphics/decorations/decor_heavy_desk.gbapal.lz"
gUnknown_08DB7B5C::
.incbin "graphics/decorations/decor_ragged_desk.4bpp.lz"
gUnknown_08DB7BEC::
.incbin "graphics/decorations/decor_ragged_desk.gbapal.lz"
gUnknown_08DB7C08::
.incbin "graphics/decorations/decor_comfort_desk.4bpp.lz"
gUnknown_08DB7CE8::
.incbin "graphics/decorations/decor_comfort_desk.gbapal.lz"
gUnknown_08DB7D08::
.incbin "graphics/decorations/decor_pretty_desk.4bpp.lz"
gUnknown_08DB7DCC::
.incbin "graphics/decorations/decor_pretty_desk.gbapal.lz"
gUnknown_08DB7DF4::
.incbin "graphics/decorations/decor_brick_desk.4bpp.lz"
gUnknown_08DB7EA0::
.incbin "graphics/decorations/decor_brick_desk.gbapal.lz"
gUnknown_08DB7EC4::
.incbin "graphics/decorations/decor_camp_desk.4bpp.lz"
gUnknown_08DB7F60::
.incbin "graphics/decorations/decor_camp_desk.gbapal.lz"
gUnknown_08DB7F7C::
.incbin "graphics/decorations/decor_hard_desk.4bpp.lz"
gUnknown_08DB8070::
.incbin "graphics/decorations/decor_hard_desk.gbapal.lz"
gUnknown_08DB808C::
.incbin "graphics/decorations/decor_red_plant.4bpp.lz"
gUnknown_08DB8138::
.incbin "graphics/decorations/decor_red_plant.gbapal.lz"
gUnknown_08DB8160::
.incbin "graphics/decorations/decor_tropical_plant.4bpp.lz"
gUnknown_08DB8218::
.incbin "graphics/decorations/decor_tropical_plant.gbapal.lz"
gUnknown_08DB823C::
.incbin "graphics/decorations/decor_pretty_flowers.4bpp.lz"
gUnknown_08DB8300::
.incbin "graphics/decorations/decor_pretty_flowers.gbapal.lz"
gUnknown_08DB8328::
.incbin "graphics/decorations/decor_colorful_plant.4bpp.lz"
gUnknown_08DB8430::
.incbin "graphics/decorations/decor_colorful_plant.gbapal.lz"
gUnknown_08DB8458::
.incbin "graphics/decorations/decor_big_plant.4bpp.lz"
gUnknown_08DB8528::
.incbin "graphics/decorations/decor_big_plant.gbapal.lz"
gUnknown_08DB854C::
.incbin "graphics/decorations/decor_gorgeous_plant.4bpp.lz"
gUnknown_08DB862C::
.incbin "graphics/decorations/decor_gorgeous_plant.gbapal.lz"
gUnknown_08DB8654::
.incbin "graphics/decorations/decor_red_brick.4bpp.lz"
gUnknown_08DB86C4::
.incbin "graphics/decorations/decor_red_brick.gbapal.lz"
gUnknown_08DB86E0::
.incbin "graphics/decorations/decor_yellow_brick.4bpp.lz"
gUnknown_08DB8750::
.incbin "graphics/decorations/decor_yellow_brick.gbapal.lz"
gUnknown_08DB876C::
.incbin "graphics/decorations/decor_blue_brick.4bpp.lz"
gUnknown_08DB87DC::
.incbin "graphics/decorations/decor_blue_brick.gbapal.lz"
gUnknown_08DB87F8::
.incbin "graphics/decorations/decor_red_tent.4bpp.lz"
gUnknown_08DB88D8::
.incbin "graphics/decorations/decor_red_tent.gbapal.lz"
gUnknown_08DB8900::
.incbin "graphics/decorations/decor_blue_tent.4bpp.lz"
gUnknown_08DB89E0::
.incbin "graphics/decorations/decor_blue_tent.gbapal.lz"
gUnknown_08DB8A08::
.incbin "graphics/decorations/decor_solid_board.4bpp.lz"
gUnknown_08DB8A68::
.incbin "graphics/decorations/decor_solid_board.gbapal.lz"
gUnknown_08DB8A84::
.incbin "graphics/decorations/decor_slide.4bpp.lz"
gUnknown_08DB8B40::
.incbin "graphics/decorations/decor_slide.gbapal.lz"
gUnknown_08DB8B68::
.incbin "graphics/decorations/decor_tire.4bpp.lz"
gUnknown_08DB8C40::
.incbin "graphics/decorations/decor_tire.gbapal.lz"
gUnknown_08DB8C5C::
.incbin "graphics/decorations/decor_stand.4bpp.lz"
gUnknown_08DB8CF4::
.incbin "graphics/decorations/decor_stand.gbapal.lz"
gUnknown_08DB8D18::
.incbin "graphics/decorations/decor_breakable_door.4bpp.lz"
gUnknown_08DB8DB0::
.incbin "graphics/decorations/decor_breakable_door.gbapal.lz"
gUnknown_08DB8DD4::
.incbin "graphics/decorations/decor_sand_ornament.4bpp.lz"
gUnknown_08DB8E80::
.incbin "graphics/decorations/decor_sand_ornament.gbapal.lz"
gUnknown_08DB8EA0::
.incbin "graphics/decorations/decor_glass_ornament.4bpp.lz"
gUnknown_08DB8F58::
.incbin "graphics/decorations/decor_glass_ornament.gbapal.lz"
gUnknown_08DB8F7C::
.incbin "graphics/decorations/decor_surf_mat.4bpp.lz"
gUnknown_08DB9038::
.incbin "graphics/decorations/decor_surf_mat.gbapal.lz"
gUnknown_08DB9058::
.incbin "graphics/decorations/decor_thunder_mat.4bpp.lz"
gUnknown_08DB9130::
.incbin "graphics/decorations/decor_thunder_mat.gbapal.lz"
gUnknown_08DB9154::
.incbin "graphics/decorations/decor_fire_blast_mat.4bpp.lz"
gUnknown_08DB9218::
.incbin "graphics/decorations/decor_fire_blast_mat.gbapal.lz"
gUnknown_08DB9234::
.incbin "graphics/decorations/decor_powder_snow_mat.4bpp.lz"
gUnknown_08DB92FC::
.incbin "graphics/decorations/decor_powder_snow_mat.gbapal.lz"
gUnknown_08DB931C::
.incbin "graphics/decorations/decor_attract_mat.4bpp.lz"
gUnknown_08DB93E8::
.incbin "graphics/decorations/decor_attract_mat.gbapal.lz"
gUnknown_08DB940C::
.incbin "graphics/decorations/decor_fissure_mat.4bpp.lz"
gUnknown_08DB94CC::
.incbin "graphics/decorations/decor_fissure_mat.gbapal.lz"
gUnknown_08DB94E8::
.incbin "graphics/decorations/decor_spikes_mat.4bpp.lz"
gUnknown_08DB95AC::
.incbin "graphics/decorations/decor_spikes_mat.gbapal.lz"
gUnknown_08DB95D0::
.incbin "graphics/decorations/decor_snorlax_doll.4bpp.lz"
gUnknown_08DB96C4::
.incbin "graphics/decorations/decor_snorlax_doll.gbapal.lz"
gUnknown_08DB96EC::
.incbin "graphics/decorations/decor_rhydon_doll.4bpp.lz"
gUnknown_08DB97F4::
.incbin "graphics/decorations/decor_rhydon_doll.gbapal.lz"
gUnknown_08DB981C::
.incbin "graphics/decorations/decor_lapras_doll.4bpp.lz"
gUnknown_08DB9908::
.incbin "graphics/decorations/decor_lapras_doll.gbapal.lz"
gUnknown_08DB9930::
.incbin "graphics/decorations/decor_venusaur_doll.4bpp.lz"
gUnknown_08DB9A54::
.incbin "graphics/decorations/decor_venusaur_doll.gbapal.lz"
gUnknown_08DB9A7C::
.incbin "graphics/decorations/decor_charizard_doll.4bpp.lz"
gUnknown_08DB9B7C::
.incbin "graphics/decorations/decor_charizard_doll.gbapal.lz"
gUnknown_08DB9BA4::
.incbin "graphics/decorations/decor_blastoise_doll.4bpp.lz"
gUnknown_08DB9CB0::
.incbin "graphics/decorations/decor_blastoise_doll.gbapal.lz"
gUnknown_08DB9CD8::
.incbin "graphics/decorations/decor_wailmer_doll.4bpp.lz"
gUnknown_08DB9DAC::
.incbin "graphics/decorations/decor_wailmer_doll.gbapal.lz"
gUnknown_08DB9DD4::
.incbin "graphics/decorations/decor_regice_doll.4bpp.lz"
gUnknown_08DB9EE4::
.incbin "graphics/decorations/decor_regice_doll.gbapal.lz"
gUnknown_08DB9F08::
.incbin "graphics/decorations/decor_regirock_doll.4bpp.lz"
gUnknown_08DB9FFC::
.incbin "graphics/decorations/decor_regirock_doll.gbapal.lz"
gUnknown_08DBA020::
.incbin "graphics/decorations/decor_registeel_doll.4bpp.lz"
gUnknown_08DBA12C::
.incbin "graphics/decorations/decor_registeel_doll.gbapal.lz"
data/graphics/items/item_graphics.inc
-1883
View File
File diff suppressed because it is too large Load Diff
data/graphics/pokemon/back_pic_table.inc
-442
View File
@@ -1,442 +0,0 @@
.align 2
gMonBackPicTable:: @ 83028B8
obj_tiles gMonBackPic_CircledQuestionMark, 0x800, 0
obj_tiles gMonBackPic_Bulbasaur, 0x800, 1
obj_tiles gMonBackPic_Ivysaur, 0x800, 2
obj_tiles gMonBackPic_Venusaur, 0x800, 3
obj_tiles gMonBackPic_Charmander, 0x800, 4
obj_tiles gMonBackPic_Charmeleon, 0x800, 5
obj_tiles gMonBackPic_Charizard, 0x800, 6
obj_tiles gMonBackPic_Squirtle, 0x800, 7
obj_tiles gMonBackPic_Wartortle, 0x800, 8
obj_tiles gMonBackPic_Blastoise, 0x800, 9
obj_tiles gMonBackPic_Caterpie, 0x800, 10
obj_tiles gMonBackPic_Metapod, 0x800, 11
obj_tiles gMonBackPic_Butterfree, 0x800, 12
obj_tiles gMonBackPic_Weedle, 0x800, 13
obj_tiles gMonBackPic_Kakuna, 0x800, 14
obj_tiles gMonBackPic_Beedrill, 0x800, 15
obj_tiles gMonBackPic_Pidgey, 0x800, 16
obj_tiles gMonBackPic_Pidgeotto, 0x800, 17
obj_tiles gMonBackPic_Pidgeot, 0x800, 18
obj_tiles gMonBackPic_Rattata, 0x800, 19
obj_tiles gMonBackPic_Raticate, 0x800, 20
obj_tiles gMonBackPic_Spearow, 0x800, 21
obj_tiles gMonBackPic_Fearow, 0x800, 22
obj_tiles gMonBackPic_Ekans, 0x800, 23
obj_tiles gMonBackPic_Arbok, 0x800, 24
obj_tiles gMonBackPic_Pikachu, 0x800, 25
obj_tiles gMonBackPic_Raichu, 0x800, 26
obj_tiles gMonBackPic_Sandshrew, 0x800, 27
obj_tiles gMonBackPic_Sandslash, 0x800, 28
obj_tiles gMonBackPic_NidoranF, 0x800, 29
obj_tiles gMonBackPic_Nidorina, 0x800, 30
obj_tiles gMonBackPic_Nidoqueen, 0x800, 31
obj_tiles gMonBackPic_NidoranM, 0x800, 32
obj_tiles gMonBackPic_Nidorino, 0x800, 33
obj_tiles gMonBackPic_Nidoking, 0x800, 34
obj_tiles gMonBackPic_Clefairy, 0x800, 35
obj_tiles gMonBackPic_Clefable, 0x800, 36
obj_tiles gMonBackPic_Vulpix, 0x800, 37
obj_tiles gMonBackPic_Ninetales, 0x800, 38
obj_tiles gMonBackPic_Jigglypuff, 0x800, 39
obj_tiles gMonBackPic_Wigglytuff, 0x800, 40
obj_tiles gMonBackPic_Zubat, 0x800, 41
obj_tiles gMonBackPic_Golbat, 0x800, 42
obj_tiles gMonBackPic_Oddish, 0x800, 43
obj_tiles gMonBackPic_Gloom, 0x800, 44
obj_tiles gMonBackPic_Vileplume, 0x800, 45
obj_tiles gMonBackPic_Paras, 0x800, 46
obj_tiles gMonBackPic_Parasect, 0x800, 47
obj_tiles gMonBackPic_Venonat, 0x800, 48
obj_tiles gMonBackPic_Venomoth, 0x800, 49
obj_tiles gMonBackPic_Diglett, 0x800, 50
obj_tiles gMonBackPic_Dugtrio, 0x800, 51
obj_tiles gMonBackPic_Meowth, 0x800, 52
obj_tiles gMonBackPic_Persian, 0x800, 53
obj_tiles gMonBackPic_Psyduck, 0x800, 54
obj_tiles gMonBackPic_Golduck, 0x800, 55
obj_tiles gMonBackPic_Mankey, 0x800, 56
obj_tiles gMonBackPic_Primeape, 0x800, 57
obj_tiles gMonBackPic_Growlithe, 0x800, 58
obj_tiles gMonBackPic_Arcanine, 0x800, 59
obj_tiles gMonBackPic_Poliwag, 0x800, 60
obj_tiles gMonBackPic_Poliwhirl, 0x800, 61
obj_tiles gMonBackPic_Poliwrath, 0x800, 62
obj_tiles gMonBackPic_Abra, 0x800, 63
obj_tiles gMonBackPic_Kadabra, 0x800, 64
obj_tiles gMonBackPic_Alakazam, 0x800, 65
obj_tiles gMonBackPic_Machop, 0x800, 66
obj_tiles gMonBackPic_Machoke, 0x800, 67
obj_tiles gMonBackPic_Machamp, 0x800, 68
obj_tiles gMonBackPic_Bellsprout, 0x800, 69
obj_tiles gMonBackPic_Weepinbell, 0x800, 70
obj_tiles gMonBackPic_Victreebel, 0x800, 71
obj_tiles gMonBackPic_Tentacool, 0x800, 72
obj_tiles gMonBackPic_Tentacruel, 0x800, 73
obj_tiles gMonBackPic_Geodude, 0x800, 74
obj_tiles gMonBackPic_Graveler, 0x800, 75
obj_tiles gMonBackPic_Golem, 0x800, 76
obj_tiles gMonBackPic_Ponyta, 0x800, 77
obj_tiles gMonBackPic_Rapidash, 0x800, 78
obj_tiles gMonBackPic_Slowpoke, 0x800, 79
obj_tiles gMonBackPic_Slowbro, 0x800, 80
obj_tiles gMonBackPic_Magnemite, 0x800, 81
obj_tiles gMonBackPic_Magneton, 0x800, 82
obj_tiles gMonBackPic_Farfetchd, 0x800, 83
obj_tiles gMonBackPic_Doduo, 0x800, 84
obj_tiles gMonBackPic_Dodrio, 0x800, 85
obj_tiles gMonBackPic_Seel, 0x800, 86
obj_tiles gMonBackPic_Dewgong, 0x800, 87
obj_tiles gMonBackPic_Grimer, 0x800, 88
obj_tiles gMonBackPic_Muk, 0x800, 89
obj_tiles gMonBackPic_Shellder, 0x800, 90
obj_tiles gMonBackPic_Cloyster, 0x800, 91
obj_tiles gMonBackPic_Gastly, 0x800, 92
obj_tiles gMonBackPic_Haunter, 0x800, 93
obj_tiles gMonBackPic_Gengar, 0x800, 94
obj_tiles gMonBackPic_Onix, 0x800, 95
obj_tiles gMonBackPic_Drowzee, 0x800, 96
obj_tiles gMonBackPic_Hypno, 0x800, 97
obj_tiles gMonBackPic_Krabby, 0x800, 98
obj_tiles gMonBackPic_Kingler, 0x800, 99
obj_tiles gMonBackPic_Voltorb, 0x800, 100
obj_tiles gMonBackPic_Electrode, 0x800, 101
obj_tiles gMonBackPic_Exeggcute, 0x800, 102
obj_tiles gMonBackPic_Exeggutor, 0x800, 103
obj_tiles gMonBackPic_Cubone, 0x800, 104
obj_tiles gMonBackPic_Marowak, 0x800, 105
obj_tiles gMonBackPic_Hitmonlee, 0x800, 106
obj_tiles gMonBackPic_Hitmonchan, 0x800, 107
obj_tiles gMonBackPic_Lickitung, 0x800, 108
obj_tiles gMonBackPic_Koffing, 0x800, 109
obj_tiles gMonBackPic_Weezing, 0x800, 110
obj_tiles gMonBackPic_Rhyhorn, 0x800, 111
obj_tiles gMonBackPic_Rhydon, 0x800, 112
obj_tiles gMonBackPic_Chansey, 0x800, 113
obj_tiles gMonBackPic_Tangela, 0x800, 114
obj_tiles gMonBackPic_Kangaskhan, 0x800, 115
obj_tiles gMonBackPic_Horsea, 0x800, 116
obj_tiles gMonBackPic_Seadra, 0x800, 117
obj_tiles gMonBackPic_Goldeen, 0x800, 118
obj_tiles gMonBackPic_Seaking, 0x800, 119
obj_tiles gMonBackPic_Staryu, 0x800, 120
obj_tiles gMonBackPic_Starmie, 0x800, 121
obj_tiles gMonBackPic_Mrmime, 0x800, 122
obj_tiles gMonBackPic_Scyther, 0x800, 123
obj_tiles gMonBackPic_Jynx, 0x800, 124
obj_tiles gMonBackPic_Electabuzz, 0x800, 125
obj_tiles gMonBackPic_Magmar, 0x800, 126
obj_tiles gMonBackPic_Pinsir, 0x800, 127
obj_tiles gMonBackPic_Tauros, 0x800, 128
obj_tiles gMonBackPic_Magikarp, 0x800, 129
obj_tiles gMonBackPic_Gyarados, 0x800, 130
obj_tiles gMonBackPic_Lapras, 0x800, 131
obj_tiles gMonBackPic_Ditto, 0x800, 132
obj_tiles gMonBackPic_Eevee, 0x800, 133
obj_tiles gMonBackPic_Vaporeon, 0x800, 134
obj_tiles gMonBackPic_Jolteon, 0x800, 135
obj_tiles gMonBackPic_Flareon, 0x800, 136
obj_tiles gMonBackPic_Porygon, 0x800, 137
obj_tiles gMonBackPic_Omanyte, 0x800, 138
obj_tiles gMonBackPic_Omastar, 0x800, 139
obj_tiles gMonBackPic_Kabuto, 0x800, 140
obj_tiles gMonBackPic_Kabutops, 0x800, 141
obj_tiles gMonBackPic_Aerodactyl, 0x800, 142
obj_tiles gMonBackPic_Snorlax, 0x800, 143
obj_tiles gMonBackPic_Articuno, 0x800, 144
obj_tiles gMonBackPic_Zapdos, 0x800, 145
obj_tiles gMonBackPic_Moltres, 0x800, 146
obj_tiles gMonBackPic_Dratini, 0x800, 147
obj_tiles gMonBackPic_Dragonair, 0x800, 148
obj_tiles gMonBackPic_Dragonite, 0x800, 149
obj_tiles gMonBackPic_Mewtwo, 0x800, 150
obj_tiles gMonBackPic_Mew, 0x800, 151
obj_tiles gMonBackPic_Chikorita, 0x800, 152
obj_tiles gMonBackPic_Bayleef, 0x800, 153
obj_tiles gMonBackPic_Meganium, 0x800, 154
obj_tiles gMonBackPic_Cyndaquil, 0x800, 155
obj_tiles gMonBackPic_Quilava, 0x800, 156
obj_tiles gMonBackPic_Typhlosion, 0x800, 157
obj_tiles gMonBackPic_Totodile, 0x800, 158
obj_tiles gMonBackPic_Croconaw, 0x800, 159
obj_tiles gMonBackPic_Feraligatr, 0x800, 160
obj_tiles gMonBackPic_Sentret, 0x800, 161
obj_tiles gMonBackPic_Furret, 0x800, 162
obj_tiles gMonBackPic_Hoothoot, 0x800, 163
obj_tiles gMonBackPic_Noctowl, 0x800, 164
obj_tiles gMonBackPic_Ledyba, 0x800, 165
obj_tiles gMonBackPic_Ledian, 0x800, 166
obj_tiles gMonBackPic_Spinarak, 0x800, 167
obj_tiles gMonBackPic_Ariados, 0x800, 168
obj_tiles gMonBackPic_Crobat, 0x800, 169
obj_tiles gMonBackPic_Chinchou, 0x800, 170
obj_tiles gMonBackPic_Lanturn, 0x800, 171
obj_tiles gMonBackPic_Pichu, 0x800, 172
obj_tiles gMonBackPic_Cleffa, 0x800, 173
obj_tiles gMonBackPic_Igglybuff, 0x800, 174
obj_tiles gMonBackPic_Togepi, 0x800, 175
obj_tiles gMonBackPic_Togetic, 0x800, 176
obj_tiles gMonBackPic_Natu, 0x800, 177
obj_tiles gMonBackPic_Xatu, 0x800, 178
obj_tiles gMonBackPic_Mareep, 0x800, 179
obj_tiles gMonBackPic_Flaaffy, 0x800, 180
obj_tiles gMonBackPic_Ampharos, 0x800, 181
obj_tiles gMonBackPic_Bellossom, 0x800, 182
obj_tiles gMonBackPic_Marill, 0x800, 183
obj_tiles gMonBackPic_Azumarill, 0x800, 184
obj_tiles gMonBackPic_Sudowoodo, 0x800, 185
obj_tiles gMonBackPic_Politoed, 0x800, 186
obj_tiles gMonBackPic_Hoppip, 0x800, 187
obj_tiles gMonBackPic_Skiploom, 0x800, 188
obj_tiles gMonBackPic_Jumpluff, 0x800, 189
obj_tiles gMonBackPic_Aipom, 0x800, 190
obj_tiles gMonBackPic_Sunkern, 0x800, 191
obj_tiles gMonBackPic_Sunflora, 0x800, 192
obj_tiles gMonBackPic_Yanma, 0x800, 193
obj_tiles gMonBackPic_Wooper, 0x800, 194
obj_tiles gMonBackPic_Quagsire, 0x800, 195
obj_tiles gMonBackPic_Espeon, 0x800, 196
obj_tiles gMonBackPic_Umbreon, 0x800, 197
obj_tiles gMonBackPic_Murkrow, 0x800, 198
obj_tiles gMonBackPic_Slowking, 0x800, 199
obj_tiles gMonBackPic_Misdreavus, 0x800, 200
obj_tiles gMonBackPic_UnownA, 0x800, 201
obj_tiles gMonBackPic_Wobbuffet, 0x800, 202
obj_tiles gMonBackPic_Girafarig, 0x800, 203
obj_tiles gMonBackPic_Pineco, 0x800, 204
obj_tiles gMonBackPic_Forretress, 0x800, 205
obj_tiles gMonBackPic_Dunsparce, 0x800, 206
obj_tiles gMonBackPic_Gligar, 0x800, 207
obj_tiles gMonBackPic_Steelix, 0x800, 208
obj_tiles gMonBackPic_Snubbull, 0x800, 209
obj_tiles gMonBackPic_Granbull, 0x800, 210
obj_tiles gMonBackPic_Qwilfish, 0x800, 211
obj_tiles gMonBackPic_Scizor, 0x800, 212
obj_tiles gMonBackPic_Shuckle, 0x800, 213
obj_tiles gMonBackPic_Heracross, 0x800, 214
obj_tiles gMonBackPic_Sneasel, 0x800, 215
obj_tiles gMonBackPic_Teddiursa, 0x800, 216
obj_tiles gMonBackPic_Ursaring, 0x800, 217
obj_tiles gMonBackPic_Slugma, 0x800, 218
obj_tiles gMonBackPic_Magcargo, 0x800, 219
obj_tiles gMonBackPic_Swinub, 0x800, 220
obj_tiles gMonBackPic_Piloswine, 0x800, 221
obj_tiles gMonBackPic_Corsola, 0x800, 222
obj_tiles gMonBackPic_Remoraid, 0x800, 223
obj_tiles gMonBackPic_Octillery, 0x800, 224
obj_tiles gMonBackPic_Delibird, 0x800, 225
obj_tiles gMonBackPic_Mantine, 0x800, 226
obj_tiles gMonBackPic_Skarmory, 0x800, 227
obj_tiles gMonBackPic_Houndour, 0x800, 228
obj_tiles gMonBackPic_Houndoom, 0x800, 229
obj_tiles gMonBackPic_Kingdra, 0x800, 230
obj_tiles gMonBackPic_Phanpy, 0x800, 231
obj_tiles gMonBackPic_Donphan, 0x800, 232
obj_tiles gMonBackPic_Porygon2, 0x800, 233
obj_tiles gMonBackPic_Stantler, 0x800, 234
obj_tiles gMonBackPic_Smeargle, 0x800, 235
obj_tiles gMonBackPic_Tyrogue, 0x800, 236
obj_tiles gMonBackPic_Hitmontop, 0x800, 237
obj_tiles gMonBackPic_Smoochum, 0x800, 238
obj_tiles gMonBackPic_Elekid, 0x800, 239
obj_tiles gMonBackPic_Magby, 0x800, 240
obj_tiles gMonBackPic_Miltank, 0x800, 241
obj_tiles gMonBackPic_Blissey, 0x800, 242
obj_tiles gMonBackPic_Raikou, 0x800, 243
obj_tiles gMonBackPic_Entei, 0x800, 244
obj_tiles gMonBackPic_Suicune, 0x800, 245
obj_tiles gMonBackPic_Larvitar, 0x800, 246
obj_tiles gMonBackPic_Pupitar, 0x800, 247
obj_tiles gMonBackPic_Tyranitar, 0x800, 248
obj_tiles gMonBackPic_Lugia, 0x800, 249
obj_tiles gMonBackPic_HoOh, 0x800, 250
obj_tiles gMonBackPic_Celebi, 0x800, 251
obj_tiles gMonBackPic_DoubleQuestionMark, 0x800, 252
obj_tiles gMonBackPic_DoubleQuestionMark, 0x800, 253
obj_tiles gMonBackPic_DoubleQuestionMark, 0x800, 254
obj_tiles gMonBackPic_DoubleQuestionMark, 0x800, 255
obj_tiles gMonBackPic_DoubleQuestionMark, 0x800, 256
obj_tiles gMonBackPic_DoubleQuestionMark, 0x800, 257
obj_tiles gMonBackPic_DoubleQuestionMark, 0x800, 258
obj_tiles gMonBackPic_DoubleQuestionMark, 0x800, 259
obj_tiles gMonBackPic_DoubleQuestionMark, 0x800, 260
obj_tiles gMonBackPic_DoubleQuestionMark, 0x800, 261
obj_tiles gMonBackPic_DoubleQuestionMark, 0x800, 262
obj_tiles gMonBackPic_DoubleQuestionMark, 0x800, 263
obj_tiles gMonBackPic_DoubleQuestionMark, 0x800, 264
obj_tiles gMonBackPic_DoubleQuestionMark, 0x800, 265
obj_tiles gMonBackPic_DoubleQuestionMark, 0x800, 266
obj_tiles gMonBackPic_DoubleQuestionMark, 0x800, 267
obj_tiles gMonBackPic_DoubleQuestionMark, 0x800, 268
obj_tiles gMonBackPic_DoubleQuestionMark, 0x800, 269
obj_tiles gMonBackPic_DoubleQuestionMark, 0x800, 270
obj_tiles gMonBackPic_DoubleQuestionMark, 0x800, 271
obj_tiles gMonBackPic_DoubleQuestionMark, 0x800, 272
obj_tiles gMonBackPic_DoubleQuestionMark, 0x800, 273
obj_tiles gMonBackPic_DoubleQuestionMark, 0x800, 274
obj_tiles gMonBackPic_DoubleQuestionMark, 0x800, 275
obj_tiles gMonBackPic_DoubleQuestionMark, 0x800, 276
obj_tiles gMonBackPic_Treecko, 0x800, 277
obj_tiles gMonBackPic_Grovyle, 0x800, 278
obj_tiles gMonBackPic_Sceptile, 0x800, 279
obj_tiles gMonBackPic_Torchic, 0x800, 280
obj_tiles gMonBackPic_Combusken, 0x800, 281
obj_tiles gMonBackPic_Blaziken, 0x800, 282
obj_tiles gMonBackPic_Mudkip, 0x800, 283
obj_tiles gMonBackPic_Marshtomp, 0x800, 284
obj_tiles gMonBackPic_Swampert, 0x800, 285
obj_tiles gMonBackPic_Poochyena, 0x800, 286
obj_tiles gMonBackPic_Mightyena, 0x800, 287
obj_tiles gMonBackPic_Zigzagoon, 0x800, 288
obj_tiles gMonBackPic_Linoone, 0x800, 289
obj_tiles gMonBackPic_Wurmple, 0x800, 290
obj_tiles gMonBackPic_Silcoon, 0x800, 291
obj_tiles gMonBackPic_Beautifly, 0x800, 292
obj_tiles gMonBackPic_Cascoon, 0x800, 293
obj_tiles gMonBackPic_Dustox, 0x800, 294
obj_tiles gMonBackPic_Lotad, 0x800, 295
obj_tiles gMonBackPic_Lombre, 0x800, 296
obj_tiles gMonBackPic_Ludicolo, 0x800, 297
obj_tiles gMonBackPic_Seedot, 0x800, 298
obj_tiles gMonBackPic_Nuzleaf, 0x800, 299
obj_tiles gMonBackPic_Shiftry, 0x800, 300
obj_tiles gMonBackPic_Nincada, 0x800, 301
obj_tiles gMonBackPic_Ninjask, 0x800, 302
obj_tiles gMonBackPic_Shedinja, 0x800, 303
obj_tiles gMonBackPic_Taillow, 0x800, 304
obj_tiles gMonBackPic_Swellow, 0x800, 305
obj_tiles gMonBackPic_Shroomish, 0x800, 306
obj_tiles gMonBackPic_Breloom, 0x800, 307
obj_tiles gMonBackPic_Spinda, 0x800, 308
obj_tiles gMonBackPic_Wingull, 0x800, 309
obj_tiles gMonBackPic_Pelipper, 0x800, 310
obj_tiles gMonBackPic_Surskit, 0x800, 311
obj_tiles gMonBackPic_Masquerain, 0x800, 312
obj_tiles gMonBackPic_Wailmer, 0x800, 313
obj_tiles gMonBackPic_Wailord, 0x800, 314
obj_tiles gMonBackPic_Skitty, 0x800, 315
obj_tiles gMonBackPic_Delcatty, 0x800, 316
obj_tiles gMonBackPic_Kecleon, 0x800, 317
obj_tiles gMonBackPic_Baltoy, 0x800, 318
obj_tiles gMonBackPic_Claydol, 0x800, 319
obj_tiles gMonBackPic_Nosepass, 0x800, 320
obj_tiles gMonBackPic_Torkoal, 0x800, 321
obj_tiles gMonBackPic_Sableye, 0x800, 322
obj_tiles gMonBackPic_Barboach, 0x800, 323
obj_tiles gMonBackPic_Whiscash, 0x800, 324
obj_tiles gMonBackPic_Luvdisc, 0x800, 325
obj_tiles gMonBackPic_Corphish, 0x800, 326
obj_tiles gMonBackPic_Crawdaunt, 0x800, 327
obj_tiles gMonBackPic_Feebas, 0x800, 328
obj_tiles gMonBackPic_Milotic, 0x800, 329
obj_tiles gMonBackPic_Carvanha, 0x800, 330
obj_tiles gMonBackPic_Sharpedo, 0x800, 331
obj_tiles gMonBackPic_Trapinch, 0x800, 332
obj_tiles gMonBackPic_Vibrava, 0x800, 333
obj_tiles gMonBackPic_Flygon, 0x800, 334
obj_tiles gMonBackPic_Makuhita, 0x800, 335
obj_tiles gMonBackPic_Hariyama, 0x800, 336
obj_tiles gMonBackPic_Electrike, 0x800, 337
obj_tiles gMonBackPic_Manectric, 0x800, 338
obj_tiles gMonBackPic_Numel, 0x800, 339
obj_tiles gMonBackPic_Camerupt, 0x800, 340
obj_tiles gMonBackPic_Spheal, 0x800, 341
obj_tiles gMonBackPic_Sealeo, 0x800, 342
obj_tiles gMonBackPic_Walrein, 0x800, 343
obj_tiles gMonBackPic_Cacnea, 0x800, 344
obj_tiles gMonBackPic_Cacturne, 0x800, 345
obj_tiles gMonBackPic_Snorunt, 0x800, 346
obj_tiles gMonBackPic_Glalie, 0x800, 347
obj_tiles gMonBackPic_Lunatone, 0x800, 348
obj_tiles gMonBackPic_Solrock, 0x800, 349
obj_tiles gMonBackPic_Azurill, 0x800, 350
obj_tiles gMonBackPic_Spoink, 0x800, 351
obj_tiles gMonBackPic_Grumpig, 0x800, 352
obj_tiles gMonBackPic_Plusle, 0x800, 353
obj_tiles gMonBackPic_Minun, 0x800, 354
obj_tiles gMonBackPic_Mawile, 0x800, 355
obj_tiles gMonBackPic_Meditite, 0x800, 356
obj_tiles gMonBackPic_Medicham, 0x800, 357
obj_tiles gMonBackPic_Swablu, 0x800, 358
obj_tiles gMonBackPic_Altaria, 0x800, 359
obj_tiles gMonBackPic_Wynaut, 0x800, 360
obj_tiles gMonBackPic_Duskull, 0x800, 361
obj_tiles gMonBackPic_Dusclops, 0x800, 362
obj_tiles gMonBackPic_Roselia, 0x800, 363
obj_tiles gMonBackPic_Slakoth, 0x800, 364
obj_tiles gMonBackPic_Vigoroth, 0x800, 365
obj_tiles gMonBackPic_Slaking, 0x800, 366
obj_tiles gMonBackPic_Gulpin, 0x800, 367
obj_tiles gMonBackPic_Swalot, 0x800, 368
obj_tiles gMonBackPic_Tropius, 0x800, 369
obj_tiles gMonBackPic_Whismur, 0x800, 370
obj_tiles gMonBackPic_Loudred, 0x800, 371
obj_tiles gMonBackPic_Exploud, 0x800, 372
obj_tiles gMonBackPic_Clamperl, 0x800, 373
obj_tiles gMonBackPic_Huntail, 0x800, 374
obj_tiles gMonBackPic_Gorebyss, 0x800, 375
obj_tiles gMonBackPic_Absol, 0x800, 376
obj_tiles gMonBackPic_Shuppet, 0x800, 377
obj_tiles gMonBackPic_Banette, 0x800, 378
obj_tiles gMonBackPic_Seviper, 0x800, 379
obj_tiles gMonBackPic_Zangoose, 0x800, 380
obj_tiles gMonBackPic_Relicanth, 0x800, 381
obj_tiles gMonBackPic_Aron, 0x800, 382
obj_tiles gMonBackPic_Lairon, 0x800, 383
obj_tiles gMonBackPic_Aggron, 0x800, 384
obj_tiles gMonBackPic_Castform, 0x800, 385
obj_tiles gMonBackPic_Volbeat, 0x800, 386
obj_tiles gMonBackPic_Illumise, 0x800, 387
obj_tiles gMonBackPic_Lileep, 0x800, 388
obj_tiles gMonBackPic_Cradily, 0x800, 389
obj_tiles gMonBackPic_Anorith, 0x800, 390
obj_tiles gMonBackPic_Armaldo, 0x800, 391
obj_tiles gMonBackPic_Ralts, 0x800, 392
obj_tiles gMonBackPic_Kirlia, 0x800, 393
obj_tiles gMonBackPic_Gardevoir, 0x800, 394
obj_tiles gMonBackPic_Bagon, 0x800, 395
obj_tiles gMonBackPic_Shelgon, 0x800, 396
obj_tiles gMonBackPic_Salamence, 0x800, 397
obj_tiles gMonBackPic_Beldum, 0x800, 398
obj_tiles gMonBackPic_Metang, 0x800, 399
obj_tiles gMonBackPic_Metagross, 0x800, 400
obj_tiles gMonBackPic_Regirock, 0x800, 401
obj_tiles gMonBackPic_Regice, 0x800, 402
obj_tiles gMonBackPic_Registeel, 0x800, 403
obj_tiles gMonBackPic_Kyogre, 0x800, 404
obj_tiles gMonBackPic_Groudon, 0x800, 405
obj_tiles gMonBackPic_Rayquaza, 0x800, 406
obj_tiles gMonBackPic_Latias, 0x800, 407
obj_tiles gMonBackPic_Latios, 0x800, 408
obj_tiles gMonBackPic_Jirachi, 0x800, 409
obj_tiles gMonBackPic_Deoxys, 0x800, 410
obj_tiles gMonBackPic_Chimecho, 0x800, 411
obj_tiles gMonStillFrontPic_Egg, 0x800, 412
obj_tiles gMonBackPic_UnownB, 0x800, 413
obj_tiles gMonBackPic_UnownC, 0x800, 414
obj_tiles gMonBackPic_UnownD, 0x800, 415
obj_tiles gMonBackPic_UnownE, 0x800, 416
obj_tiles gMonBackPic_UnownF, 0x800, 417
obj_tiles gMonBackPic_UnownG, 0x800, 418
obj_tiles gMonBackPic_UnownH, 0x800, 419
obj_tiles gMonBackPic_UnownI, 0x800, 420
obj_tiles gMonBackPic_UnownJ, 0x800, 421
obj_tiles gMonBackPic_UnownK, 0x800, 422
obj_tiles gMonBackPic_UnownL, 0x800, 423
obj_tiles gMonBackPic_UnownM, 0x800, 424
obj_tiles gMonBackPic_UnownN, 0x800, 425
obj_tiles gMonBackPic_UnownO, 0x800, 426
obj_tiles gMonBackPic_UnownP, 0x800, 427
obj_tiles gMonBackPic_UnownQ, 0x800, 428
obj_tiles gMonBackPic_UnownR, 0x800, 429
obj_tiles gMonBackPic_UnownS, 0x800, 430
obj_tiles gMonBackPic_UnownT, 0x800, 431
obj_tiles gMonBackPic_UnownU, 0x800, 432
obj_tiles gMonBackPic_UnownV, 0x800, 433
obj_tiles gMonBackPic_UnownW, 0x800, 434
obj_tiles gMonBackPic_UnownX, 0x800, 435
obj_tiles gMonBackPic_UnownY, 0x800, 436
obj_tiles gMonBackPic_UnownZ, 0x800, 437
obj_tiles gMonBackPic_UnownExclamationMark, 0x800, 438
obj_tiles gMonBackPic_UnownQuestionMark, 0x800, 439
data/graphics/pokemon/circled_question_mark_graphics.inc
-15
View File
@@ -1,15 +0,0 @@
.align 2
gMonStillFrontPic_CircledQuestionMark:: @ 8C00750
.incbin "graphics/pokemon/front_pics/circled_question_mark_still_front_pic.4bpp.lz"
.align 2
gMonBackPic_CircledQuestionMark:: @ 8C00998
.incbin "graphics/pokemon/back_pics/circled_question_mark_back_pic.4bpp.lz"
.align 2
gMonPalette_CircledQuestionMark:: @ 8C00BE0
.incbin "graphics/pokemon/palettes/circled_question_mark_palette.gbapal.lz"
.align 2
gMonShinyPalette_CircledQuestionMark:: @ 8C00BF8
.incbin "graphics/pokemon/palettes/circled_question_mark_shiny_palette.gbapal.lz"
data/graphics/pokemon/front_anims.inc
-6915
View File
File diff suppressed because it is too large Load Diff
data/graphics/pokemon/front_pic_table.inc
-442
View File
@@ -1,442 +0,0 @@
.align 2
gMonFrontPicTable:: @ 830A18C
obj_tiles gMonFrontPic_CircledQuestionMark, 0x800, 0
obj_tiles gMonFrontPic_Bulbasaur, 0x800, 1
obj_tiles gMonFrontPic_Ivysaur, 0x800, 2
obj_tiles gMonFrontPic_Venusaur, 0x800, 3
obj_tiles gMonFrontPic_Charmander, 0x800, 4
obj_tiles gMonFrontPic_Charmeleon, 0x800, 5
obj_tiles gMonFrontPic_Charizard, 0x800, 6
obj_tiles gMonFrontPic_Squirtle, 0x800, 7
obj_tiles gMonFrontPic_Wartortle, 0x800, 8
obj_tiles gMonFrontPic_Blastoise, 0x800, 9
obj_tiles gMonFrontPic_Caterpie, 0x800, 10
obj_tiles gMonFrontPic_Metapod, 0x800, 11
obj_tiles gMonFrontPic_Butterfree, 0x800, 12
obj_tiles gMonFrontPic_Weedle, 0x800, 13
obj_tiles gMonFrontPic_Kakuna, 0x800, 14
obj_tiles gMonFrontPic_Beedrill, 0x800, 15
obj_tiles gMonFrontPic_Pidgey, 0x800, 16
obj_tiles gMonFrontPic_Pidgeotto, 0x800, 17
obj_tiles gMonFrontPic_Pidgeot, 0x800, 18
obj_tiles gMonFrontPic_Rattata, 0x800, 19
obj_tiles gMonFrontPic_Raticate, 0x800, 20
obj_tiles gMonFrontPic_Spearow, 0x800, 21
obj_tiles gMonFrontPic_Fearow, 0x800, 22
obj_tiles gMonFrontPic_Ekans, 0x800, 23
obj_tiles gMonFrontPic_Arbok, 0x800, 24
obj_tiles gMonFrontPic_Pikachu, 0x800, 25
obj_tiles gMonFrontPic_Raichu, 0x800, 26
obj_tiles gMonFrontPic_Sandshrew, 0x800, 27
obj_tiles gMonFrontPic_Sandslash, 0x800, 28
obj_tiles gMonFrontPic_NidoranF, 0x800, 29
obj_tiles gMonFrontPic_Nidorina, 0x800, 30
obj_tiles gMonFrontPic_Nidoqueen, 0x800, 31
obj_tiles gMonFrontPic_NidoranM, 0x800, 32
obj_tiles gMonFrontPic_Nidorino, 0x800, 33
obj_tiles gMonFrontPic_Nidoking, 0x800, 34
obj_tiles gMonFrontPic_Clefairy, 0x800, 35
obj_tiles gMonFrontPic_Clefable, 0x800, 36
obj_tiles gMonFrontPic_Vulpix, 0x800, 37
obj_tiles gMonFrontPic_Ninetales, 0x800, 38
obj_tiles gMonFrontPic_Jigglypuff, 0x800, 39
obj_tiles gMonFrontPic_Wigglytuff, 0x800, 40
obj_tiles gMonFrontPic_Zubat, 0x800, 41
obj_tiles gMonFrontPic_Golbat, 0x800, 42
obj_tiles gMonFrontPic_Oddish, 0x800, 43
obj_tiles gMonFrontPic_Gloom, 0x800, 44
obj_tiles gMonFrontPic_Vileplume, 0x800, 45
obj_tiles gMonFrontPic_Paras, 0x800, 46
obj_tiles gMonFrontPic_Parasect, 0x800, 47
obj_tiles gMonFrontPic_Venonat, 0x800, 48
obj_tiles gMonFrontPic_Venomoth, 0x800, 49
obj_tiles gMonFrontPic_Diglett, 0x800, 50
obj_tiles gMonFrontPic_Dugtrio, 0x800, 51
obj_tiles gMonFrontPic_Meowth, 0x800, 52
obj_tiles gMonFrontPic_Persian, 0x800, 53
obj_tiles gMonFrontPic_Psyduck, 0x800, 54
obj_tiles gMonFrontPic_Golduck, 0x800, 55
obj_tiles gMonFrontPic_Mankey, 0x800, 56
obj_tiles gMonFrontPic_Primeape, 0x800, 57
obj_tiles gMonFrontPic_Growlithe, 0x800, 58
obj_tiles gMonFrontPic_Arcanine, 0x800, 59
obj_tiles gMonFrontPic_Poliwag, 0x800, 60
obj_tiles gMonFrontPic_Poliwhirl, 0x800, 61
obj_tiles gMonFrontPic_Poliwrath, 0x800, 62
obj_tiles gMonFrontPic_Abra, 0x800, 63
obj_tiles gMonFrontPic_Kadabra, 0x800, 64
obj_tiles gMonFrontPic_Alakazam, 0x800, 65
obj_tiles gMonFrontPic_Machop, 0x800, 66
obj_tiles gMonFrontPic_Machoke, 0x800, 67
obj_tiles gMonFrontPic_Machamp, 0x800, 68
obj_tiles gMonFrontPic_Bellsprout, 0x800, 69
obj_tiles gMonFrontPic_Weepinbell, 0x800, 70
obj_tiles gMonFrontPic_Victreebel, 0x800, 71
obj_tiles gMonFrontPic_Tentacool, 0x800, 72
obj_tiles gMonFrontPic_Tentacruel, 0x800, 73
obj_tiles gMonFrontPic_Geodude, 0x800, 74
obj_tiles gMonFrontPic_Graveler, 0x800, 75
obj_tiles gMonFrontPic_Golem, 0x800, 76
obj_tiles gMonFrontPic_Ponyta, 0x800, 77
obj_tiles gMonFrontPic_Rapidash, 0x800, 78
obj_tiles gMonFrontPic_Slowpoke, 0x800, 79
obj_tiles gMonFrontPic_Slowbro, 0x800, 80
obj_tiles gMonFrontPic_Magnemite, 0x800, 81
obj_tiles gMonFrontPic_Magneton, 0x800, 82
obj_tiles gMonFrontPic_Farfetchd, 0x800, 83
obj_tiles gMonFrontPic_Doduo, 0x800, 84
obj_tiles gMonFrontPic_Dodrio, 0x800, 85
obj_tiles gMonFrontPic_Seel, 0x800, 86
obj_tiles gMonFrontPic_Dewgong, 0x800, 87
obj_tiles gMonFrontPic_Grimer, 0x800, 88
obj_tiles gMonFrontPic_Muk, 0x800, 89
obj_tiles gMonFrontPic_Shellder, 0x800, 90
obj_tiles gMonFrontPic_Cloyster, 0x800, 91
obj_tiles gMonFrontPic_Gastly, 0x800, 92
obj_tiles gMonFrontPic_Haunter, 0x800, 93
obj_tiles gMonFrontPic_Gengar, 0x800, 94
obj_tiles gMonFrontPic_Onix, 0x800, 95
obj_tiles gMonFrontPic_Drowzee, 0x800, 96
obj_tiles gMonFrontPic_Hypno, 0x800, 97
obj_tiles gMonFrontPic_Krabby, 0x800, 98
obj_tiles gMonFrontPic_Kingler, 0x800, 99
obj_tiles gMonFrontPic_Voltorb, 0x800, 100
obj_tiles gMonFrontPic_Electrode, 0x800, 101
obj_tiles gMonFrontPic_Exeggcute, 0x800, 102
obj_tiles gMonFrontPic_Exeggutor, 0x800, 103
obj_tiles gMonFrontPic_Cubone, 0x800, 104
obj_tiles gMonFrontPic_Marowak, 0x800, 105
obj_tiles gMonFrontPic_Hitmonlee, 0x800, 106
obj_tiles gMonFrontPic_Hitmonchan, 0x800, 107
obj_tiles gMonFrontPic_Lickitung, 0x800, 108
obj_tiles gMonFrontPic_Koffing, 0x800, 109
obj_tiles gMonFrontPic_Weezing, 0x800, 110
obj_tiles gMonFrontPic_Rhyhorn, 0x800, 111
obj_tiles gMonFrontPic_Rhydon, 0x800, 112
obj_tiles gMonFrontPic_Chansey, 0x800, 113
obj_tiles gMonFrontPic_Tangela, 0x800, 114
obj_tiles gMonFrontPic_Kangaskhan, 0x800, 115
obj_tiles gMonFrontPic_Horsea, 0x800, 116
obj_tiles gMonFrontPic_Seadra, 0x800, 117
obj_tiles gMonFrontPic_Goldeen, 0x800, 118
obj_tiles gMonFrontPic_Seaking, 0x800, 119
obj_tiles gMonFrontPic_Staryu, 0x800, 120
obj_tiles gMonFrontPic_Starmie, 0x800, 121
obj_tiles gMonFrontPic_Mrmime, 0x800, 122
obj_tiles gMonFrontPic_Scyther, 0x800, 123
obj_tiles gMonFrontPic_Jynx, 0x800, 124
obj_tiles gMonFrontPic_Electabuzz, 0x800, 125
obj_tiles gMonFrontPic_Magmar, 0x800, 126
obj_tiles gMonFrontPic_Pinsir, 0x800, 127
obj_tiles gMonFrontPic_Tauros, 0x800, 128
obj_tiles gMonFrontPic_Magikarp, 0x800, 129
obj_tiles gMonFrontPic_Gyarados, 0x800, 130
obj_tiles gMonFrontPic_Lapras, 0x800, 131
obj_tiles gMonFrontPic_Ditto, 0x800, 132
obj_tiles gMonFrontPic_Eevee, 0x800, 133
obj_tiles gMonFrontPic_Vaporeon, 0x800, 134
obj_tiles gMonFrontPic_Jolteon, 0x800, 135
obj_tiles gMonFrontPic_Flareon, 0x800, 136
obj_tiles gMonFrontPic_Porygon, 0x800, 137
obj_tiles gMonFrontPic_Omanyte, 0x800, 138
obj_tiles gMonFrontPic_Omastar, 0x800, 139
obj_tiles gMonFrontPic_Kabuto, 0x800, 140
obj_tiles gMonFrontPic_Kabutops, 0x800, 141
obj_tiles gMonFrontPic_Aerodactyl, 0x800, 142
obj_tiles gMonFrontPic_Snorlax, 0x800, 143
obj_tiles gMonFrontPic_Articuno, 0x800, 144
obj_tiles gMonFrontPic_Zapdos, 0x800, 145
obj_tiles gMonFrontPic_Moltres, 0x800, 146
obj_tiles gMonFrontPic_Dratini, 0x800, 147
obj_tiles gMonFrontPic_Dragonair, 0x800, 148
obj_tiles gMonFrontPic_Dragonite, 0x800, 149
obj_tiles gMonFrontPic_Mewtwo, 0x800, 150
obj_tiles gMonFrontPic_Mew, 0x800, 151
obj_tiles gMonFrontPic_Chikorita, 0x800, 152
obj_tiles gMonFrontPic_Bayleef, 0x800, 153
obj_tiles gMonFrontPic_Meganium, 0x800, 154
obj_tiles gMonFrontPic_Cyndaquil, 0x800, 155
obj_tiles gMonFrontPic_Quilava, 0x800, 156
obj_tiles gMonFrontPic_Typhlosion, 0x800, 157
obj_tiles gMonFrontPic_Totodile, 0x800, 158
obj_tiles gMonFrontPic_Croconaw, 0x800, 159
obj_tiles gMonFrontPic_Feraligatr, 0x800, 160
obj_tiles gMonFrontPic_Sentret, 0x800, 161
obj_tiles gMonFrontPic_Furret, 0x800, 162
obj_tiles gMonFrontPic_Hoothoot, 0x800, 163
obj_tiles gMonFrontPic_Noctowl, 0x800, 164
obj_tiles gMonFrontPic_Ledyba, 0x800, 165
obj_tiles gMonFrontPic_Ledian, 0x800, 166
obj_tiles gMonFrontPic_Spinarak, 0x800, 167
obj_tiles gMonFrontPic_Ariados, 0x800, 168
obj_tiles gMonFrontPic_Crobat, 0x800, 169
obj_tiles gMonFrontPic_Chinchou, 0x800, 170
obj_tiles gMonFrontPic_Lanturn, 0x800, 171
obj_tiles gMonFrontPic_Pichu, 0x800, 172
obj_tiles gMonFrontPic_Cleffa, 0x800, 173
obj_tiles gMonFrontPic_Igglybuff, 0x800, 174
obj_tiles gMonFrontPic_Togepi, 0x800, 175
obj_tiles gMonFrontPic_Togetic, 0x800, 176
obj_tiles gMonFrontPic_Natu, 0x800, 177
obj_tiles gMonFrontPic_Xatu, 0x800, 178
obj_tiles gMonFrontPic_Mareep, 0x800, 179
obj_tiles gMonFrontPic_Flaaffy, 0x800, 180
obj_tiles gMonFrontPic_Ampharos, 0x800, 181
obj_tiles gMonFrontPic_Bellossom, 0x800, 182
obj_tiles gMonFrontPic_Marill, 0x800, 183
obj_tiles gMonFrontPic_Azumarill, 0x800, 184
obj_tiles gMonFrontPic_Sudowoodo, 0x800, 185
obj_tiles gMonFrontPic_Politoed, 0x800, 186
obj_tiles gMonFrontPic_Hoppip, 0x800, 187
obj_tiles gMonFrontPic_Skiploom, 0x800, 188
obj_tiles gMonFrontPic_Jumpluff, 0x800, 189
obj_tiles gMonFrontPic_Aipom, 0x800, 190
obj_tiles gMonFrontPic_Sunkern, 0x800, 191
obj_tiles gMonFrontPic_Sunflora, 0x800, 192
obj_tiles gMonFrontPic_Yanma, 0x800, 193
obj_tiles gMonFrontPic_Wooper, 0x800, 194
obj_tiles gMonFrontPic_Quagsire, 0x800, 195
obj_tiles gMonFrontPic_Espeon, 0x800, 196
obj_tiles gMonFrontPic_Umbreon, 0x800, 197
obj_tiles gMonFrontPic_Murkrow, 0x800, 198
obj_tiles gMonFrontPic_Slowking, 0x800, 199
obj_tiles gMonFrontPic_Misdreavus, 0x800, 200
obj_tiles gMonFrontPic_UnownA, 0x800, 201
obj_tiles gMonFrontPic_Wobbuffet, 0x800, 202
obj_tiles gMonFrontPic_Girafarig, 0x800, 203
obj_tiles gMonFrontPic_Pineco, 0x800, 204
obj_tiles gMonFrontPic_Forretress, 0x800, 205
obj_tiles gMonFrontPic_Dunsparce, 0x800, 206
obj_tiles gMonFrontPic_Gligar, 0x800, 207
obj_tiles gMonFrontPic_Steelix, 0x800, 208
obj_tiles gMonFrontPic_Snubbull, 0x800, 209
obj_tiles gMonFrontPic_Granbull, 0x800, 210
obj_tiles gMonFrontPic_Qwilfish, 0x800, 211
obj_tiles gMonFrontPic_Scizor, 0x800, 212
obj_tiles gMonFrontPic_Shuckle, 0x800, 213
obj_tiles gMonFrontPic_Heracross, 0x800, 214
obj_tiles gMonFrontPic_Sneasel, 0x800, 215
obj_tiles gMonFrontPic_Teddiursa, 0x800, 216
obj_tiles gMonFrontPic_Ursaring, 0x800, 217
obj_tiles gMonFrontPic_Slugma, 0x800, 218
obj_tiles gMonFrontPic_Magcargo, 0x800, 219
obj_tiles gMonFrontPic_Swinub, 0x800, 220
obj_tiles gMonFrontPic_Piloswine, 0x800, 221
obj_tiles gMonFrontPic_Corsola, 0x800, 222
obj_tiles gMonFrontPic_Remoraid, 0x800, 223
obj_tiles gMonFrontPic_Octillery, 0x800, 224
obj_tiles gMonFrontPic_Delibird, 0x800, 225
obj_tiles gMonFrontPic_Mantine, 0x800, 226
obj_tiles gMonFrontPic_Skarmory, 0x800, 227
obj_tiles gMonFrontPic_Houndour, 0x800, 228
obj_tiles gMonFrontPic_Houndoom, 0x800, 229
obj_tiles gMonFrontPic_Kingdra, 0x800, 230
obj_tiles gMonFrontPic_Phanpy, 0x800, 231
obj_tiles gMonFrontPic_Donphan, 0x800, 232
obj_tiles gMonFrontPic_Porygon2, 0x800, 233
obj_tiles gMonFrontPic_Stantler, 0x800, 234
obj_tiles gMonFrontPic_Smeargle, 0x800, 235
obj_tiles gMonFrontPic_Tyrogue, 0x800, 236
obj_tiles gMonFrontPic_Hitmontop, 0x800, 237
obj_tiles gMonFrontPic_Smoochum, 0x800, 238
obj_tiles gMonFrontPic_Elekid, 0x800, 239
obj_tiles gMonFrontPic_Magby, 0x800, 240
obj_tiles gMonFrontPic_Miltank, 0x800, 241
obj_tiles gMonFrontPic_Blissey, 0x800, 242
obj_tiles gMonFrontPic_Raikou, 0x800, 243
obj_tiles gMonFrontPic_Entei, 0x800, 244
obj_tiles gMonFrontPic_Suicune, 0x800, 245
obj_tiles gMonFrontPic_Larvitar, 0x800, 246
obj_tiles gMonFrontPic_Pupitar, 0x800, 247
obj_tiles gMonFrontPic_Tyranitar, 0x800, 248
obj_tiles gMonFrontPic_Lugia, 0x800, 249
obj_tiles gMonFrontPic_HoOh, 0x800, 250
obj_tiles gMonFrontPic_Celebi, 0x800, 251
obj_tiles gMonFrontPic_DoubleQuestionMark, 0x800, 252
obj_tiles gMonFrontPic_DoubleQuestionMark, 0x800, 253
obj_tiles gMonFrontPic_DoubleQuestionMark, 0x800, 254
obj_tiles gMonFrontPic_DoubleQuestionMark, 0x800, 255
obj_tiles gMonFrontPic_DoubleQuestionMark, 0x800, 256
obj_tiles gMonFrontPic_DoubleQuestionMark, 0x800, 257
obj_tiles gMonFrontPic_DoubleQuestionMark, 0x800, 258
obj_tiles gMonFrontPic_DoubleQuestionMark, 0x800, 259
obj_tiles gMonFrontPic_DoubleQuestionMark, 0x800, 260
obj_tiles gMonFrontPic_DoubleQuestionMark, 0x800, 261
obj_tiles gMonFrontPic_DoubleQuestionMark, 0x800, 262
obj_tiles gMonFrontPic_DoubleQuestionMark, 0x800, 263
obj_tiles gMonFrontPic_DoubleQuestionMark, 0x800, 264
obj_tiles gMonFrontPic_DoubleQuestionMark, 0x800, 265
obj_tiles gMonFrontPic_DoubleQuestionMark, 0x800, 266
obj_tiles gMonFrontPic_DoubleQuestionMark, 0x800, 267
obj_tiles gMonFrontPic_DoubleQuestionMark, 0x800, 268
obj_tiles gMonFrontPic_DoubleQuestionMark, 0x800, 269
obj_tiles gMonFrontPic_DoubleQuestionMark, 0x800, 270
obj_tiles gMonFrontPic_DoubleQuestionMark, 0x800, 271
obj_tiles gMonFrontPic_DoubleQuestionMark, 0x800, 272
obj_tiles gMonFrontPic_DoubleQuestionMark, 0x800, 273
obj_tiles gMonFrontPic_DoubleQuestionMark, 0x800, 274
obj_tiles gMonFrontPic_DoubleQuestionMark, 0x800, 275
obj_tiles gMonFrontPic_DoubleQuestionMark, 0x800, 276
obj_tiles gMonFrontPic_Treecko, 0x800, 277
obj_tiles gMonFrontPic_Grovyle, 0x800, 278
obj_tiles gMonFrontPic_Sceptile, 0x800, 279
obj_tiles gMonFrontPic_Torchic, 0x800, 280
obj_tiles gMonFrontPic_Combusken, 0x800, 281
obj_tiles gMonFrontPic_Blaziken, 0x800, 282
obj_tiles gMonFrontPic_Mudkip, 0x800, 283
obj_tiles gMonFrontPic_Marshtomp, 0x800, 284
obj_tiles gMonFrontPic_Swampert, 0x800, 285
obj_tiles gMonFrontPic_Poochyena, 0x800, 286
obj_tiles gMonFrontPic_Mightyena, 0x800, 287
obj_tiles gMonFrontPic_Zigzagoon, 0x800, 288
obj_tiles gMonFrontPic_Linoone, 0x800, 289
obj_tiles gMonFrontPic_Wurmple, 0x800, 290
obj_tiles gMonFrontPic_Silcoon, 0x800, 291
obj_tiles gMonFrontPic_Beautifly, 0x800, 292
obj_tiles gMonFrontPic_Cascoon, 0x800, 293
obj_tiles gMonFrontPic_Dustox, 0x800, 294
obj_tiles gMonFrontPic_Lotad, 0x800, 295
obj_tiles gMonFrontPic_Lombre, 0x800, 296
obj_tiles gMonFrontPic_Ludicolo, 0x800, 297
obj_tiles gMonFrontPic_Seedot, 0x800, 298
obj_tiles gMonFrontPic_Nuzleaf, 0x800, 299
obj_tiles gMonFrontPic_Shiftry, 0x800, 300
obj_tiles gMonFrontPic_Nincada, 0x800, 301
obj_tiles gMonFrontPic_Ninjask, 0x800, 302
obj_tiles gMonFrontPic_Shedinja, 0x800, 303
obj_tiles gMonFrontPic_Taillow, 0x800, 304
obj_tiles gMonFrontPic_Swellow, 0x800, 305
obj_tiles gMonFrontPic_Shroomish, 0x800, 306
obj_tiles gMonFrontPic_Breloom, 0x800, 307
obj_tiles gMonFrontPic_Spinda, 0x800, 308
obj_tiles gMonFrontPic_Wingull, 0x800, 309
obj_tiles gMonFrontPic_Pelipper, 0x800, 310
obj_tiles gMonFrontPic_Surskit, 0x800, 311
obj_tiles gMonFrontPic_Masquerain, 0x800, 312
obj_tiles gMonFrontPic_Wailmer, 0x800, 313
obj_tiles gMonFrontPic_Wailord, 0x800, 314
obj_tiles gMonFrontPic_Skitty, 0x800, 315
obj_tiles gMonFrontPic_Delcatty, 0x800, 316
obj_tiles gMonFrontPic_Kecleon, 0x800, 317
obj_tiles gMonFrontPic_Baltoy, 0x800, 318
obj_tiles gMonFrontPic_Claydol, 0x800, 319
obj_tiles gMonFrontPic_Nosepass, 0x800, 320
obj_tiles gMonFrontPic_Torkoal, 0x800, 321
obj_tiles gMonFrontPic_Sableye, 0x800, 322
obj_tiles gMonFrontPic_Barboach, 0x800, 323
obj_tiles gMonFrontPic_Whiscash, 0x800, 324
obj_tiles gMonFrontPic_Luvdisc, 0x800, 325
obj_tiles gMonFrontPic_Corphish, 0x800, 326
obj_tiles gMonFrontPic_Crawdaunt, 0x800, 327
obj_tiles gMonFrontPic_Feebas, 0x800, 328
obj_tiles gMonFrontPic_Milotic, 0x800, 329
obj_tiles gMonFrontPic_Carvanha, 0x800, 330
obj_tiles gMonFrontPic_Sharpedo, 0x800, 331
obj_tiles gMonFrontPic_Trapinch, 0x800, 332
obj_tiles gMonFrontPic_Vibrava, 0x800, 333
obj_tiles gMonFrontPic_Flygon, 0x800, 334
obj_tiles gMonFrontPic_Makuhita, 0x800, 335
obj_tiles gMonFrontPic_Hariyama, 0x800, 336
obj_tiles gMonFrontPic_Electrike, 0x800, 337
obj_tiles gMonFrontPic_Manectric, 0x800, 338
obj_tiles gMonFrontPic_Numel, 0x800, 339
obj_tiles gMonFrontPic_Camerupt, 0x800, 340
obj_tiles gMonFrontPic_Spheal, 0x800, 341
obj_tiles gMonFrontPic_Sealeo, 0x800, 342
obj_tiles gMonFrontPic_Walrein, 0x800, 343
obj_tiles gMonFrontPic_Cacnea, 0x800, 344
obj_tiles gMonFrontPic_Cacturne, 0x800, 345
obj_tiles gMonFrontPic_Snorunt, 0x800, 346
obj_tiles gMonFrontPic_Glalie, 0x800, 347
obj_tiles gMonFrontPic_Lunatone, 0x800, 348
obj_tiles gMonFrontPic_Solrock, 0x800, 349
obj_tiles gMonFrontPic_Azurill, 0x800, 350
obj_tiles gMonFrontPic_Spoink, 0x800, 351
obj_tiles gMonFrontPic_Grumpig, 0x800, 352
obj_tiles gMonFrontPic_Plusle, 0x800, 353
obj_tiles gMonFrontPic_Minun, 0x800, 354
obj_tiles gMonFrontPic_Mawile, 0x800, 355
obj_tiles gMonFrontPic_Meditite, 0x800, 356
obj_tiles gMonFrontPic_Medicham, 0x800, 357
obj_tiles gMonFrontPic_Swablu, 0x800, 358
obj_tiles gMonFrontPic_Altaria, 0x800, 359
obj_tiles gMonFrontPic_Wynaut, 0x800, 360
obj_tiles gMonFrontPic_Duskull, 0x800, 361
obj_tiles gMonFrontPic_Dusclops, 0x800, 362
obj_tiles gMonFrontPic_Roselia, 0x800, 363
obj_tiles gMonFrontPic_Slakoth, 0x800, 364
obj_tiles gMonFrontPic_Vigoroth, 0x800, 365
obj_tiles gMonFrontPic_Slaking, 0x800, 366
obj_tiles gMonFrontPic_Gulpin, 0x800, 367
obj_tiles gMonFrontPic_Swalot, 0x800, 368
obj_tiles gMonFrontPic_Tropius, 0x800, 369
obj_tiles gMonFrontPic_Whismur, 0x800, 370
obj_tiles gMonFrontPic_Loudred, 0x800, 371
obj_tiles gMonFrontPic_Exploud, 0x800, 372
obj_tiles gMonFrontPic_Clamperl, 0x800, 373
obj_tiles gMonFrontPic_Huntail, 0x800, 374
obj_tiles gMonFrontPic_Gorebyss, 0x800, 375
obj_tiles gMonFrontPic_Absol, 0x800, 376
obj_tiles gMonFrontPic_Shuppet, 0x800, 377
obj_tiles gMonFrontPic_Banette, 0x800, 378
obj_tiles gMonFrontPic_Seviper, 0x800, 379
obj_tiles gMonFrontPic_Zangoose, 0x800, 380
obj_tiles gMonFrontPic_Relicanth, 0x800, 381
obj_tiles gMonFrontPic_Aron, 0x800, 382
obj_tiles gMonFrontPic_Lairon, 0x800, 383
obj_tiles gMonFrontPic_Aggron, 0x800, 384
obj_tiles gMonFrontPic_Castform, 0x800, 385
obj_tiles gMonFrontPic_Volbeat, 0x800, 386
obj_tiles gMonFrontPic_Illumise, 0x800, 387
obj_tiles gMonFrontPic_Lileep, 0x800, 388
obj_tiles gMonFrontPic_Cradily, 0x800, 389
obj_tiles gMonFrontPic_Anorith, 0x800, 390
obj_tiles gMonFrontPic_Armaldo, 0x800, 391
obj_tiles gMonFrontPic_Ralts, 0x800, 392
obj_tiles gMonFrontPic_Kirlia, 0x800, 393
obj_tiles gMonFrontPic_Gardevoir, 0x800, 394
obj_tiles gMonFrontPic_Bagon, 0x800, 395
obj_tiles gMonFrontPic_Shelgon, 0x800, 396
obj_tiles gMonFrontPic_Salamence, 0x800, 397
obj_tiles gMonFrontPic_Beldum, 0x800, 398
obj_tiles gMonFrontPic_Metang, 0x800, 399
obj_tiles gMonFrontPic_Metagross, 0x800, 400
obj_tiles gMonFrontPic_Regirock, 0x800, 401
obj_tiles gMonFrontPic_Regice, 0x800, 402
obj_tiles gMonFrontPic_Registeel, 0x800, 403
obj_tiles gMonFrontPic_Kyogre, 0x800, 404
obj_tiles gMonFrontPic_Groudon, 0x800, 405
obj_tiles gMonFrontPic_Rayquaza, 0x800, 406
obj_tiles gMonFrontPic_Latias, 0x800, 407
obj_tiles gMonFrontPic_Latios, 0x800, 408
obj_tiles gMonFrontPic_Jirachi, 0x800, 409
obj_tiles gMonFrontPic_Deoxys, 0x800, 410
obj_tiles gMonFrontPic_Chimecho, 0x800, 411
obj_tiles gMonFrontPic_Egg, 0x800, 412
obj_tiles gMonFrontPic_UnownB, 0x800, 413
obj_tiles gMonFrontPic_UnownC, 0x800, 414
obj_tiles gMonFrontPic_UnownD, 0x800, 415
obj_tiles gMonFrontPic_UnownE, 0x800, 416
obj_tiles gMonFrontPic_UnownF, 0x800, 417
obj_tiles gMonFrontPic_UnownG, 0x800, 418
obj_tiles gMonFrontPic_UnownH, 0x800, 419
obj_tiles gMonFrontPic_UnownI, 0x800, 420
obj_tiles gMonFrontPic_UnownJ, 0x800, 421
obj_tiles gMonFrontPic_UnownK, 0x800, 422
obj_tiles gMonFrontPic_UnownL, 0x800, 423
obj_tiles gMonFrontPic_UnownM, 0x800, 424
obj_tiles gMonFrontPic_UnownN, 0x800, 425
obj_tiles gMonFrontPic_UnownO, 0x800, 426
obj_tiles gMonFrontPic_UnownP, 0x800, 427
obj_tiles gMonFrontPic_UnownQ, 0x800, 428
obj_tiles gMonFrontPic_UnownR, 0x800, 429
obj_tiles gMonFrontPic_UnownS, 0x800, 430
obj_tiles gMonFrontPic_UnownT, 0x800, 431
obj_tiles gMonFrontPic_UnownU, 0x800, 432
obj_tiles gMonFrontPic_UnownV, 0x800, 433
obj_tiles gMonFrontPic_UnownW, 0x800, 434
obj_tiles gMonFrontPic_UnownX, 0x800, 435
obj_tiles gMonFrontPic_UnownY, 0x800, 436
obj_tiles gMonFrontPic_UnownZ, 0x800, 437
obj_tiles gMonFrontPic_UnownExclamationMark, 0x800, 438
obj_tiles gMonFrontPic_UnownQuestionMark, 0x800, 439
data/graphics/pokemon/graphics.inc
-9619
View File
File diff suppressed because it is too large Load Diff
data/graphics/pokemon/palette_table.inc
-442
View File
@@ -1,442 +0,0 @@
.align 2
gMonPaletteTable:: @ 8303678
obj_pal gMonPalette_CircledQuestionMark, 0
obj_pal gMonPalette_Bulbasaur, 1
obj_pal gMonPalette_Ivysaur, 2
obj_pal gMonPalette_Venusaur, 3
obj_pal gMonPalette_Charmander, 4
obj_pal gMonPalette_Charmeleon, 5
obj_pal gMonPalette_Charizard, 6
obj_pal gMonPalette_Squirtle, 7
obj_pal gMonPalette_Wartortle, 8
obj_pal gMonPalette_Blastoise, 9
obj_pal gMonPalette_Caterpie, 10
obj_pal gMonPalette_Metapod, 11
obj_pal gMonPalette_Butterfree, 12
obj_pal gMonPalette_Weedle, 13
obj_pal gMonPalette_Kakuna, 14
obj_pal gMonPalette_Beedrill, 15
obj_pal gMonPalette_Pidgey, 16
obj_pal gMonPalette_Pidgeotto, 17
obj_pal gMonPalette_Pidgeot, 18
obj_pal gMonPalette_Rattata, 19
obj_pal gMonPalette_Raticate, 20
obj_pal gMonPalette_Spearow, 21
obj_pal gMonPalette_Fearow, 22
obj_pal gMonPalette_Ekans, 23
obj_pal gMonPalette_Arbok, 24
obj_pal gMonPalette_Pikachu, 25
obj_pal gMonPalette_Raichu, 26
obj_pal gMonPalette_Sandshrew, 27
obj_pal gMonPalette_Sandslash, 28
obj_pal gMonPalette_NidoranF, 29
obj_pal gMonPalette_Nidorina, 30
obj_pal gMonPalette_Nidoqueen, 31
obj_pal gMonPalette_NidoranM, 32
obj_pal gMonPalette_Nidorino, 33
obj_pal gMonPalette_Nidoking, 34
obj_pal gMonPalette_Clefairy, 35
obj_pal gMonPalette_Clefable, 36
obj_pal gMonPalette_Vulpix, 37
obj_pal gMonPalette_Ninetales, 38
obj_pal gMonPalette_Jigglypuff, 39
obj_pal gMonPalette_Wigglytuff, 40
obj_pal gMonPalette_Zubat, 41
obj_pal gMonPalette_Golbat, 42
obj_pal gMonPalette_Oddish, 43
obj_pal gMonPalette_Gloom, 44
obj_pal gMonPalette_Vileplume, 45
obj_pal gMonPalette_Paras, 46
obj_pal gMonPalette_Parasect, 47
obj_pal gMonPalette_Venonat, 48
obj_pal gMonPalette_Venomoth, 49
obj_pal gMonPalette_Diglett, 50
obj_pal gMonPalette_Dugtrio, 51
obj_pal gMonPalette_Meowth, 52
obj_pal gMonPalette_Persian, 53
obj_pal gMonPalette_Psyduck, 54
obj_pal gMonPalette_Golduck, 55
obj_pal gMonPalette_Mankey, 56
obj_pal gMonPalette_Primeape, 57
obj_pal gMonPalette_Growlithe, 58
obj_pal gMonPalette_Arcanine, 59
obj_pal gMonPalette_Poliwag, 60
obj_pal gMonPalette_Poliwhirl, 61
obj_pal gMonPalette_Poliwrath, 62
obj_pal gMonPalette_Abra, 63
obj_pal gMonPalette_Kadabra, 64
obj_pal gMonPalette_Alakazam, 65
obj_pal gMonPalette_Machop, 66
obj_pal gMonPalette_Machoke, 67
obj_pal gMonPalette_Machamp, 68
obj_pal gMonPalette_Bellsprout, 69
obj_pal gMonPalette_Weepinbell, 70
obj_pal gMonPalette_Victreebel, 71
obj_pal gMonPalette_Tentacool, 72
obj_pal gMonPalette_Tentacruel, 73
obj_pal gMonPalette_Geodude, 74
obj_pal gMonPalette_Graveler, 75
obj_pal gMonPalette_Golem, 76
obj_pal gMonPalette_Ponyta, 77
obj_pal gMonPalette_Rapidash, 78
obj_pal gMonPalette_Slowpoke, 79
obj_pal gMonPalette_Slowbro, 80
obj_pal gMonPalette_Magnemite, 81
obj_pal gMonPalette_Magneton, 82
obj_pal gMonPalette_Farfetchd, 83
obj_pal gMonPalette_Doduo, 84
obj_pal gMonPalette_Dodrio, 85
obj_pal gMonPalette_Seel, 86
obj_pal gMonPalette_Dewgong, 87
obj_pal gMonPalette_Grimer, 88
obj_pal gMonPalette_Muk, 89
obj_pal gMonPalette_Shellder, 90
obj_pal gMonPalette_Cloyster, 91
obj_pal gMonPalette_Gastly, 92
obj_pal gMonPalette_Haunter, 93
obj_pal gMonPalette_Gengar, 94
obj_pal gMonPalette_Onix, 95
obj_pal gMonPalette_Drowzee, 96
obj_pal gMonPalette_Hypno, 97
obj_pal gMonPalette_Krabby, 98
obj_pal gMonPalette_Kingler, 99
obj_pal gMonPalette_Voltorb, 100
obj_pal gMonPalette_Electrode, 101
obj_pal gMonPalette_Exeggcute, 102
obj_pal gMonPalette_Exeggutor, 103
obj_pal gMonPalette_Cubone, 104
obj_pal gMonPalette_Marowak, 105
obj_pal gMonPalette_Hitmonlee, 106
obj_pal gMonPalette_Hitmonchan, 107
obj_pal gMonPalette_Lickitung, 108
obj_pal gMonPalette_Koffing, 109
obj_pal gMonPalette_Weezing, 110
obj_pal gMonPalette_Rhyhorn, 111
obj_pal gMonPalette_Rhydon, 112
obj_pal gMonPalette_Chansey, 113
obj_pal gMonPalette_Tangela, 114
obj_pal gMonPalette_Kangaskhan, 115
obj_pal gMonPalette_Horsea, 116
obj_pal gMonPalette_Seadra, 117
obj_pal gMonPalette_Goldeen, 118
obj_pal gMonPalette_Seaking, 119
obj_pal gMonPalette_Staryu, 120
obj_pal gMonPalette_Starmie, 121
obj_pal gMonPalette_Mrmime, 122
obj_pal gMonPalette_Scyther, 123
obj_pal gMonPalette_Jynx, 124
obj_pal gMonPalette_Electabuzz, 125
obj_pal gMonPalette_Magmar, 126
obj_pal gMonPalette_Pinsir, 127
obj_pal gMonPalette_Tauros, 128
obj_pal gMonPalette_Magikarp, 129
obj_pal gMonPalette_Gyarados, 130
obj_pal gMonPalette_Lapras, 131
obj_pal gMonPalette_Ditto, 132
obj_pal gMonPalette_Eevee, 133
obj_pal gMonPalette_Vaporeon, 134
obj_pal gMonPalette_Jolteon, 135
obj_pal gMonPalette_Flareon, 136
obj_pal gMonPalette_Porygon, 137
obj_pal gMonPalette_Omanyte, 138
obj_pal gMonPalette_Omastar, 139
obj_pal gMonPalette_Kabuto, 140
obj_pal gMonPalette_Kabutops, 141
obj_pal gMonPalette_Aerodactyl, 142
obj_pal gMonPalette_Snorlax, 143
obj_pal gMonPalette_Articuno, 144
obj_pal gMonPalette_Zapdos, 145
obj_pal gMonPalette_Moltres, 146
obj_pal gMonPalette_Dratini, 147
obj_pal gMonPalette_Dragonair, 148
obj_pal gMonPalette_Dragonite, 149
obj_pal gMonPalette_Mewtwo, 150
obj_pal gMonPalette_Mew, 151
obj_pal gMonPalette_Chikorita, 152
obj_pal gMonPalette_Bayleef, 153
obj_pal gMonPalette_Meganium, 154
obj_pal gMonPalette_Cyndaquil, 155
obj_pal gMonPalette_Quilava, 156
obj_pal gMonPalette_Typhlosion, 157
obj_pal gMonPalette_Totodile, 158
obj_pal gMonPalette_Croconaw, 159
obj_pal gMonPalette_Feraligatr, 160
obj_pal gMonPalette_Sentret, 161
obj_pal gMonPalette_Furret, 162
obj_pal gMonPalette_Hoothoot, 163
obj_pal gMonPalette_Noctowl, 164
obj_pal gMonPalette_Ledyba, 165
obj_pal gMonPalette_Ledian, 166
obj_pal gMonPalette_Spinarak, 167
obj_pal gMonPalette_Ariados, 168
obj_pal gMonPalette_Crobat, 169
obj_pal gMonPalette_Chinchou, 170
obj_pal gMonPalette_Lanturn, 171
obj_pal gMonPalette_Pichu, 172
obj_pal gMonPalette_Cleffa, 173
obj_pal gMonPalette_Igglybuff, 174
obj_pal gMonPalette_Togepi, 175
obj_pal gMonPalette_Togetic, 176
obj_pal gMonPalette_Natu, 177
obj_pal gMonPalette_Xatu, 178
obj_pal gMonPalette_Mareep, 179
obj_pal gMonPalette_Flaaffy, 180
obj_pal gMonPalette_Ampharos, 181
obj_pal gMonPalette_Bellossom, 182
obj_pal gMonPalette_Marill, 183
obj_pal gMonPalette_Azumarill, 184
obj_pal gMonPalette_Sudowoodo, 185
obj_pal gMonPalette_Politoed, 186
obj_pal gMonPalette_Hoppip, 187
obj_pal gMonPalette_Skiploom, 188
obj_pal gMonPalette_Jumpluff, 189
obj_pal gMonPalette_Aipom, 190
obj_pal gMonPalette_Sunkern, 191
obj_pal gMonPalette_Sunflora, 192
obj_pal gMonPalette_Yanma, 193
obj_pal gMonPalette_Wooper, 194
obj_pal gMonPalette_Quagsire, 195
obj_pal gMonPalette_Espeon, 196
obj_pal gMonPalette_Umbreon, 197
obj_pal gMonPalette_Murkrow, 198
obj_pal gMonPalette_Slowking, 199
obj_pal gMonPalette_Misdreavus, 200
obj_pal gMonPalette_Unown, 201
obj_pal gMonPalette_Wobbuffet, 202
obj_pal gMonPalette_Girafarig, 203
obj_pal gMonPalette_Pineco, 204
obj_pal gMonPalette_Forretress, 205
obj_pal gMonPalette_Dunsparce, 206
obj_pal gMonPalette_Gligar, 207
obj_pal gMonPalette_Steelix, 208
obj_pal gMonPalette_Snubbull, 209
obj_pal gMonPalette_Granbull, 210
obj_pal gMonPalette_Qwilfish, 211
obj_pal gMonPalette_Scizor, 212
obj_pal gMonPalette_Shuckle, 213
obj_pal gMonPalette_Heracross, 214
obj_pal gMonPalette_Sneasel, 215
obj_pal gMonPalette_Teddiursa, 216
obj_pal gMonPalette_Ursaring, 217
obj_pal gMonPalette_Slugma, 218
obj_pal gMonPalette_Magcargo, 219
obj_pal gMonPalette_Swinub, 220
obj_pal gMonPalette_Piloswine, 221
obj_pal gMonPalette_Corsola, 222
obj_pal gMonPalette_Remoraid, 223
obj_pal gMonPalette_Octillery, 224
obj_pal gMonPalette_Delibird, 225
obj_pal gMonPalette_Mantine, 226
obj_pal gMonPalette_Skarmory, 227
obj_pal gMonPalette_Houndour, 228
obj_pal gMonPalette_Houndoom, 229
obj_pal gMonPalette_Kingdra, 230
obj_pal gMonPalette_Phanpy, 231
obj_pal gMonPalette_Donphan, 232
obj_pal gMonPalette_Porygon2, 233
obj_pal gMonPalette_Stantler, 234
obj_pal gMonPalette_Smeargle, 235
obj_pal gMonPalette_Tyrogue, 236
obj_pal gMonPalette_Hitmontop, 237
obj_pal gMonPalette_Smoochum, 238
obj_pal gMonPalette_Elekid, 239
obj_pal gMonPalette_Magby, 240
obj_pal gMonPalette_Miltank, 241
obj_pal gMonPalette_Blissey, 242
obj_pal gMonPalette_Raikou, 243
obj_pal gMonPalette_Entei, 244
obj_pal gMonPalette_Suicune, 245
obj_pal gMonPalette_Larvitar, 246
obj_pal gMonPalette_Pupitar, 247
obj_pal gMonPalette_Tyranitar, 248
obj_pal gMonPalette_Lugia, 249
obj_pal gMonPalette_HoOh, 250
obj_pal gMonPalette_Celebi, 251
obj_pal gMonPalette_DoubleQuestionMark, 252
obj_pal gMonPalette_DoubleQuestionMark, 253
obj_pal gMonPalette_DoubleQuestionMark, 254
obj_pal gMonPalette_DoubleQuestionMark, 255
obj_pal gMonPalette_DoubleQuestionMark, 256
obj_pal gMonPalette_DoubleQuestionMark, 257
obj_pal gMonPalette_DoubleQuestionMark, 258
obj_pal gMonPalette_DoubleQuestionMark, 259
obj_pal gMonPalette_DoubleQuestionMark, 260
obj_pal gMonPalette_DoubleQuestionMark, 261
obj_pal gMonPalette_DoubleQuestionMark, 262
obj_pal gMonPalette_DoubleQuestionMark, 263
obj_pal gMonPalette_DoubleQuestionMark, 264
obj_pal gMonPalette_DoubleQuestionMark, 265
obj_pal gMonPalette_DoubleQuestionMark, 266
obj_pal gMonPalette_DoubleQuestionMark, 267
obj_pal gMonPalette_DoubleQuestionMark, 268
obj_pal gMonPalette_DoubleQuestionMark, 269
obj_pal gMonPalette_DoubleQuestionMark, 270
obj_pal gMonPalette_DoubleQuestionMark, 271
obj_pal gMonPalette_DoubleQuestionMark, 272
obj_pal gMonPalette_DoubleQuestionMark, 273
obj_pal gMonPalette_DoubleQuestionMark, 274
obj_pal gMonPalette_DoubleQuestionMark, 275
obj_pal gMonPalette_DoubleQuestionMark, 276
obj_pal gMonPalette_Treecko, 277
obj_pal gMonPalette_Grovyle, 278
obj_pal gMonPalette_Sceptile, 279
obj_pal gMonPalette_Torchic, 280
obj_pal gMonPalette_Combusken, 281
obj_pal gMonPalette_Blaziken, 282
obj_pal gMonPalette_Mudkip, 283
obj_pal gMonPalette_Marshtomp, 284
obj_pal gMonPalette_Swampert, 285
obj_pal gMonPalette_Poochyena, 286
obj_pal gMonPalette_Mightyena, 287
obj_pal gMonPalette_Zigzagoon, 288
obj_pal gMonPalette_Linoone, 289
obj_pal gMonPalette_Wurmple, 290
obj_pal gMonPalette_Silcoon, 291
obj_pal gMonPalette_Beautifly, 292
obj_pal gMonPalette_Cascoon, 293
obj_pal gMonPalette_Dustox, 294
obj_pal gMonPalette_Lotad, 295
obj_pal gMonPalette_Lombre, 296
obj_pal gMonPalette_Ludicolo, 297
obj_pal gMonPalette_Seedot, 298
obj_pal gMonPalette_Nuzleaf, 299
obj_pal gMonPalette_Shiftry, 300
obj_pal gMonPalette_Nincada, 301
obj_pal gMonPalette_Ninjask, 302
obj_pal gMonPalette_Shedinja, 303
obj_pal gMonPalette_Taillow, 304
obj_pal gMonPalette_Swellow, 305
obj_pal gMonPalette_Shroomish, 306
obj_pal gMonPalette_Breloom, 307
obj_pal gMonPalette_Spinda, 308
obj_pal gMonPalette_Wingull, 309
obj_pal gMonPalette_Pelipper, 310
obj_pal gMonPalette_Surskit, 311
obj_pal gMonPalette_Masquerain, 312
obj_pal gMonPalette_Wailmer, 313
obj_pal gMonPalette_Wailord, 314
obj_pal gMonPalette_Skitty, 315
obj_pal gMonPalette_Delcatty, 316
obj_pal gMonPalette_Kecleon, 317
obj_pal gMonPalette_Baltoy, 318
obj_pal gMonPalette_Claydol, 319
obj_pal gMonPalette_Nosepass, 320
obj_pal gMonPalette_Torkoal, 321
obj_pal gMonPalette_Sableye, 322
obj_pal gMonPalette_Barboach, 323
obj_pal gMonPalette_Whiscash, 324
obj_pal gMonPalette_Luvdisc, 325
obj_pal gMonPalette_Corphish, 326
obj_pal gMonPalette_Crawdaunt, 327
obj_pal gMonPalette_Feebas, 328
obj_pal gMonPalette_Milotic, 329
obj_pal gMonPalette_Carvanha, 330
obj_pal gMonPalette_Sharpedo, 331
obj_pal gMonPalette_Trapinch, 332
obj_pal gMonPalette_Vibrava, 333
obj_pal gMonPalette_Flygon, 334
obj_pal gMonPalette_Makuhita, 335
obj_pal gMonPalette_Hariyama, 336
obj_pal gMonPalette_Electrike, 337
obj_pal gMonPalette_Manectric, 338
obj_pal gMonPalette_Numel, 339
obj_pal gMonPalette_Camerupt, 340
obj_pal gMonPalette_Spheal, 341
obj_pal gMonPalette_Sealeo, 342
obj_pal gMonPalette_Walrein, 343
obj_pal gMonPalette_Cacnea, 344
obj_pal gMonPalette_Cacturne, 345
obj_pal gMonPalette_Snorunt, 346
obj_pal gMonPalette_Glalie, 347
obj_pal gMonPalette_Lunatone, 348
obj_pal gMonPalette_Solrock, 349
obj_pal gMonPalette_Azurill, 350
obj_pal gMonPalette_Spoink, 351
obj_pal gMonPalette_Grumpig, 352
obj_pal gMonPalette_Plusle, 353
obj_pal gMonPalette_Minun, 354
obj_pal gMonPalette_Mawile, 355
obj_pal gMonPalette_Meditite, 356
obj_pal gMonPalette_Medicham, 357
obj_pal gMonPalette_Swablu, 358
obj_pal gMonPalette_Altaria, 359
obj_pal gMonPalette_Wynaut, 360
obj_pal gMonPalette_Duskull, 361
obj_pal gMonPalette_Dusclops, 362
obj_pal gMonPalette_Roselia, 363
obj_pal gMonPalette_Slakoth, 364
obj_pal gMonPalette_Vigoroth, 365
obj_pal gMonPalette_Slaking, 366
obj_pal gMonPalette_Gulpin, 367
obj_pal gMonPalette_Swalot, 368
obj_pal gMonPalette_Tropius, 369
obj_pal gMonPalette_Whismur, 370
obj_pal gMonPalette_Loudred, 371
obj_pal gMonPalette_Exploud, 372
obj_pal gMonPalette_Clamperl, 373
obj_pal gMonPalette_Huntail, 374
obj_pal gMonPalette_Gorebyss, 375
obj_pal gMonPalette_Absol, 376
obj_pal gMonPalette_Shuppet, 377
obj_pal gMonPalette_Banette, 378
obj_pal gMonPalette_Seviper, 379
obj_pal gMonPalette_Zangoose, 380
obj_pal gMonPalette_Relicanth, 381
obj_pal gMonPalette_Aron, 382
obj_pal gMonPalette_Lairon, 383
obj_pal gMonPalette_Aggron, 384
obj_pal gMonPalette_Castform, 385
obj_pal gMonPalette_Volbeat, 386
obj_pal gMonPalette_Illumise, 387
obj_pal gMonPalette_Lileep, 388
obj_pal gMonPalette_Cradily, 389
obj_pal gMonPalette_Anorith, 390
obj_pal gMonPalette_Armaldo, 391
obj_pal gMonPalette_Ralts, 392
obj_pal gMonPalette_Kirlia, 393
obj_pal gMonPalette_Gardevoir, 394
obj_pal gMonPalette_Bagon, 395
obj_pal gMonPalette_Shelgon, 396
obj_pal gMonPalette_Salamence, 397
obj_pal gMonPalette_Beldum, 398
obj_pal gMonPalette_Metang, 399
obj_pal gMonPalette_Metagross, 400
obj_pal gMonPalette_Regirock, 401
obj_pal gMonPalette_Regice, 402
obj_pal gMonPalette_Registeel, 403
obj_pal gMonPalette_Kyogre, 404
obj_pal gMonPalette_Groudon, 405
obj_pal gMonPalette_Rayquaza, 406
obj_pal gMonPalette_Latias, 407
obj_pal gMonPalette_Latios, 408
obj_pal gMonPalette_Jirachi, 409
obj_pal gMonPalette_Deoxys, 410
obj_pal gMonPalette_Chimecho, 411
obj_pal gMonPalette_Egg, 412
obj_pal gMonPalette_Unown, 413
obj_pal gMonPalette_Unown, 414
obj_pal gMonPalette_Unown, 415
obj_pal gMonPalette_Unown, 416
obj_pal gMonPalette_Unown, 417
obj_pal gMonPalette_Unown, 418
obj_pal gMonPalette_Unown, 419
obj_pal gMonPalette_Unown, 420
obj_pal gMonPalette_Unown, 421
obj_pal gMonPalette_Unown, 422
obj_pal gMonPalette_Unown, 423
obj_pal gMonPalette_Unown, 424
obj_pal gMonPalette_Unown, 425
obj_pal gMonPalette_Unown, 426
obj_pal gMonPalette_Unown, 427
obj_pal gMonPalette_Unown, 428
obj_pal gMonPalette_Unown, 429
obj_pal gMonPalette_Unown, 430
obj_pal gMonPalette_Unown, 431
obj_pal gMonPalette_Unown, 432
obj_pal gMonPalette_Unown, 433
obj_pal gMonPalette_Unown, 434
obj_pal gMonPalette_Unown, 435
obj_pal gMonPalette_Unown, 436
obj_pal gMonPalette_Unown, 437
obj_pal gMonPalette_Unown, 438
obj_pal gMonPalette_Unown, 439
data/graphics/pokemon/shiny_palette_table.inc
-442
View File
@@ -1,442 +0,0 @@
.align 2
gMonShinyPaletteTable:: @ 8304438
obj_pal gMonShinyPalette_CircledQuestionMark, 500
obj_pal gMonShinyPalette_Bulbasaur, 501
obj_pal gMonShinyPalette_Ivysaur, 502
obj_pal gMonShinyPalette_Venusaur, 503
obj_pal gMonShinyPalette_Charmander, 504
obj_pal gMonShinyPalette_Charmeleon, 505
obj_pal gMonShinyPalette_Charizard, 506
obj_pal gMonShinyPalette_Squirtle, 507
obj_pal gMonShinyPalette_Wartortle, 508
obj_pal gMonShinyPalette_Blastoise, 509
obj_pal gMonShinyPalette_Caterpie, 510
obj_pal gMonShinyPalette_Metapod, 511
obj_pal gMonShinyPalette_Butterfree, 512
obj_pal gMonShinyPalette_Weedle, 513
obj_pal gMonShinyPalette_Kakuna, 514
obj_pal gMonShinyPalette_Beedrill, 515
obj_pal gMonShinyPalette_Pidgey, 516
obj_pal gMonShinyPalette_Pidgeotto, 517
obj_pal gMonShinyPalette_Pidgeot, 518
obj_pal gMonShinyPalette_Rattata, 519
obj_pal gMonShinyPalette_Raticate, 520
obj_pal gMonShinyPalette_Spearow, 521
obj_pal gMonShinyPalette_Fearow, 522
obj_pal gMonShinyPalette_Ekans, 523
obj_pal gMonShinyPalette_Arbok, 524
obj_pal gMonShinyPalette_Pikachu, 525
obj_pal gMonShinyPalette_Raichu, 526
obj_pal gMonShinyPalette_Sandshrew, 527
obj_pal gMonShinyPalette_Sandslash, 528
obj_pal gMonShinyPalette_NidoranF, 529
obj_pal gMonShinyPalette_Nidorina, 530
obj_pal gMonShinyPalette_Nidoqueen, 531
obj_pal gMonShinyPalette_NidoranM, 532
obj_pal gMonShinyPalette_Nidorino, 533
obj_pal gMonShinyPalette_Nidoking, 534
obj_pal gMonShinyPalette_Clefairy, 535
obj_pal gMonShinyPalette_Clefable, 536
obj_pal gMonShinyPalette_Vulpix, 537
obj_pal gMonShinyPalette_Ninetales, 538
obj_pal gMonShinyPalette_Jigglypuff, 539
obj_pal gMonShinyPalette_Wigglytuff, 540
obj_pal gMonShinyPalette_Zubat, 541
obj_pal gMonShinyPalette_Golbat, 542
obj_pal gMonShinyPalette_Oddish, 543
obj_pal gMonShinyPalette_Gloom, 544
obj_pal gMonShinyPalette_Vileplume, 545
obj_pal gMonShinyPalette_Paras, 546
obj_pal gMonShinyPalette_Parasect, 547
obj_pal gMonShinyPalette_Venonat, 548
obj_pal gMonShinyPalette_Venomoth, 549
obj_pal gMonShinyPalette_Diglett, 550
obj_pal gMonShinyPalette_Dugtrio, 551
obj_pal gMonShinyPalette_Meowth, 552
obj_pal gMonShinyPalette_Persian, 553
obj_pal gMonShinyPalette_Psyduck, 554
obj_pal gMonShinyPalette_Golduck, 555
obj_pal gMonShinyPalette_Mankey, 556
obj_pal gMonShinyPalette_Primeape, 557
obj_pal gMonShinyPalette_Growlithe, 558
obj_pal gMonShinyPalette_Arcanine, 559
obj_pal gMonShinyPalette_Poliwag, 560
obj_pal gMonShinyPalette_Poliwhirl, 561
obj_pal gMonShinyPalette_Poliwrath, 562
obj_pal gMonShinyPalette_Abra, 563
obj_pal gMonShinyPalette_Kadabra, 564
obj_pal gMonShinyPalette_Alakazam, 565
obj_pal gMonShinyPalette_Machop, 566
obj_pal gMonShinyPalette_Machoke, 567
obj_pal gMonShinyPalette_Machamp, 568
obj_pal gMonShinyPalette_Bellsprout, 569
obj_pal gMonShinyPalette_Weepinbell, 570
obj_pal gMonShinyPalette_Victreebel, 571
obj_pal gMonShinyPalette_Tentacool, 572
obj_pal gMonShinyPalette_Tentacruel, 573
obj_pal gMonShinyPalette_Geodude, 574
obj_pal gMonShinyPalette_Graveler, 575
obj_pal gMonShinyPalette_Golem, 576
obj_pal gMonShinyPalette_Ponyta, 577
obj_pal gMonShinyPalette_Rapidash, 578
obj_pal gMonShinyPalette_Slowpoke, 579
obj_pal gMonShinyPalette_Slowbro, 580
obj_pal gMonShinyPalette_Magnemite, 581
obj_pal gMonShinyPalette_Magneton, 582
obj_pal gMonShinyPalette_Farfetchd, 583
obj_pal gMonShinyPalette_Doduo, 584
obj_pal gMonShinyPalette_Dodrio, 585
obj_pal gMonShinyPalette_Seel, 586
obj_pal gMonShinyPalette_Dewgong, 587
obj_pal gMonShinyPalette_Grimer, 588
obj_pal gMonShinyPalette_Muk, 589
obj_pal gMonShinyPalette_Shellder, 590
obj_pal gMonShinyPalette_Cloyster, 591
obj_pal gMonShinyPalette_Gastly, 592
obj_pal gMonShinyPalette_Haunter, 593
obj_pal gMonShinyPalette_Gengar, 594
obj_pal gMonShinyPalette_Onix, 595
obj_pal gMonShinyPalette_Drowzee, 596
obj_pal gMonShinyPalette_Hypno, 597
obj_pal gMonShinyPalette_Krabby, 598
obj_pal gMonShinyPalette_Kingler, 599
obj_pal gMonShinyPalette_Voltorb, 600
obj_pal gMonShinyPalette_Electrode, 601
obj_pal gMonShinyPalette_Exeggcute, 602
obj_pal gMonShinyPalette_Exeggutor, 603
obj_pal gMonShinyPalette_Cubone, 604
obj_pal gMonShinyPalette_Marowak, 605
obj_pal gMonShinyPalette_Hitmonlee, 606
obj_pal gMonShinyPalette_Hitmonchan, 607
obj_pal gMonShinyPalette_Lickitung, 608
obj_pal gMonShinyPalette_Koffing, 609
obj_pal gMonShinyPalette_Weezing, 610
obj_pal gMonShinyPalette_Rhyhorn, 611
obj_pal gMonShinyPalette_Rhydon, 612
obj_pal gMonShinyPalette_Chansey, 613
obj_pal gMonShinyPalette_Tangela, 614
obj_pal gMonShinyPalette_Kangaskhan, 615
obj_pal gMonShinyPalette_Horsea, 616
obj_pal gMonShinyPalette_Seadra, 617
obj_pal gMonShinyPalette_Goldeen, 618
obj_pal gMonShinyPalette_Seaking, 619
obj_pal gMonShinyPalette_Staryu, 620
obj_pal gMonShinyPalette_Starmie, 621
obj_pal gMonShinyPalette_Mrmime, 622
obj_pal gMonShinyPalette_Scyther, 623
obj_pal gMonShinyPalette_Jynx, 624
obj_pal gMonShinyPalette_Electabuzz, 625
obj_pal gMonShinyPalette_Magmar, 626
obj_pal gMonShinyPalette_Pinsir, 627
obj_pal gMonShinyPalette_Tauros, 628
obj_pal gMonShinyPalette_Magikarp, 629
obj_pal gMonShinyPalette_Gyarados, 630
obj_pal gMonShinyPalette_Lapras, 631
obj_pal gMonShinyPalette_Ditto, 632
obj_pal gMonShinyPalette_Eevee, 633
obj_pal gMonShinyPalette_Vaporeon, 634
obj_pal gMonShinyPalette_Jolteon, 635
obj_pal gMonShinyPalette_Flareon, 636
obj_pal gMonShinyPalette_Porygon, 637
obj_pal gMonShinyPalette_Omanyte, 638
obj_pal gMonShinyPalette_Omastar, 639
obj_pal gMonShinyPalette_Kabuto, 640
obj_pal gMonShinyPalette_Kabutops, 641
obj_pal gMonShinyPalette_Aerodactyl, 642
obj_pal gMonShinyPalette_Snorlax, 643
obj_pal gMonShinyPalette_Articuno, 644
obj_pal gMonShinyPalette_Zapdos, 645
obj_pal gMonShinyPalette_Moltres, 646
obj_pal gMonShinyPalette_Dratini, 647
obj_pal gMonShinyPalette_Dragonair, 648
obj_pal gMonShinyPalette_Dragonite, 649
obj_pal gMonShinyPalette_Mewtwo, 650
obj_pal gMonShinyPalette_Mew, 651
obj_pal gMonShinyPalette_Chikorita, 652
obj_pal gMonShinyPalette_Bayleef, 653
obj_pal gMonShinyPalette_Meganium, 654
obj_pal gMonShinyPalette_Cyndaquil, 655
obj_pal gMonShinyPalette_Quilava, 656
obj_pal gMonShinyPalette_Typhlosion, 657
obj_pal gMonShinyPalette_Totodile, 658
obj_pal gMonShinyPalette_Croconaw, 659
obj_pal gMonShinyPalette_Feraligatr, 660
obj_pal gMonShinyPalette_Sentret, 661
obj_pal gMonShinyPalette_Furret, 662
obj_pal gMonShinyPalette_Hoothoot, 663
obj_pal gMonShinyPalette_Noctowl, 664
obj_pal gMonShinyPalette_Ledyba, 665
obj_pal gMonShinyPalette_Ledian, 666
obj_pal gMonShinyPalette_Spinarak, 667
obj_pal gMonShinyPalette_Ariados, 668
obj_pal gMonShinyPalette_Crobat, 669
obj_pal gMonShinyPalette_Chinchou, 670
obj_pal gMonShinyPalette_Lanturn, 671
obj_pal gMonShinyPalette_Pichu, 672
obj_pal gMonShinyPalette_Cleffa, 673
obj_pal gMonShinyPalette_Igglybuff, 674
obj_pal gMonShinyPalette_Togepi, 675
obj_pal gMonShinyPalette_Togetic, 676
obj_pal gMonShinyPalette_Natu, 677
obj_pal gMonShinyPalette_Xatu, 678
obj_pal gMonShinyPalette_Mareep, 679
obj_pal gMonShinyPalette_Flaaffy, 680
obj_pal gMonShinyPalette_Ampharos, 681
obj_pal gMonShinyPalette_Bellossom, 682
obj_pal gMonShinyPalette_Marill, 683
obj_pal gMonShinyPalette_Azumarill, 684
obj_pal gMonShinyPalette_Sudowoodo, 685
obj_pal gMonShinyPalette_Politoed, 686
obj_pal gMonShinyPalette_Hoppip, 687
obj_pal gMonShinyPalette_Skiploom, 688
obj_pal gMonShinyPalette_Jumpluff, 689
obj_pal gMonShinyPalette_Aipom, 690
obj_pal gMonShinyPalette_Sunkern, 691
obj_pal gMonShinyPalette_Sunflora, 692
obj_pal gMonShinyPalette_Yanma, 693
obj_pal gMonShinyPalette_Wooper, 694
obj_pal gMonShinyPalette_Quagsire, 695
obj_pal gMonShinyPalette_Espeon, 696
obj_pal gMonShinyPalette_Umbreon, 697
obj_pal gMonShinyPalette_Murkrow, 698
obj_pal gMonShinyPalette_Slowking, 699
obj_pal gMonShinyPalette_Misdreavus, 700
obj_pal gMonShinyPalette_Unown, 701
obj_pal gMonShinyPalette_Wobbuffet, 702
obj_pal gMonShinyPalette_Girafarig, 703
obj_pal gMonShinyPalette_Pineco, 704
obj_pal gMonShinyPalette_Forretress, 705
obj_pal gMonShinyPalette_Dunsparce, 706
obj_pal gMonShinyPalette_Gligar, 707
obj_pal gMonShinyPalette_Steelix, 708
obj_pal gMonShinyPalette_Snubbull, 709
obj_pal gMonShinyPalette_Granbull, 710
obj_pal gMonShinyPalette_Qwilfish, 711
obj_pal gMonShinyPalette_Scizor, 712
obj_pal gMonShinyPalette_Shuckle, 713
obj_pal gMonShinyPalette_Heracross, 714
obj_pal gMonShinyPalette_Sneasel, 715
obj_pal gMonShinyPalette_Teddiursa, 716
obj_pal gMonShinyPalette_Ursaring, 717
obj_pal gMonShinyPalette_Slugma, 718
obj_pal gMonShinyPalette_Magcargo, 719
obj_pal gMonShinyPalette_Swinub, 720
obj_pal gMonShinyPalette_Piloswine, 721
obj_pal gMonShinyPalette_Corsola, 722
obj_pal gMonShinyPalette_Remoraid, 723
obj_pal gMonShinyPalette_Octillery, 724
obj_pal gMonShinyPalette_Delibird, 725
obj_pal gMonShinyPalette_Mantine, 726
obj_pal gMonShinyPalette_Skarmory, 727
obj_pal gMonShinyPalette_Houndour, 728
obj_pal gMonShinyPalette_Houndoom, 729
obj_pal gMonShinyPalette_Kingdra, 730
obj_pal gMonShinyPalette_Phanpy, 731
obj_pal gMonShinyPalette_Donphan, 732
obj_pal gMonShinyPalette_Porygon2, 733
obj_pal gMonShinyPalette_Stantler, 734
obj_pal gMonShinyPalette_Smeargle, 735
obj_pal gMonShinyPalette_Tyrogue, 736
obj_pal gMonShinyPalette_Hitmontop, 737
obj_pal gMonShinyPalette_Smoochum, 738
obj_pal gMonShinyPalette_Elekid, 739
obj_pal gMonShinyPalette_Magby, 740
obj_pal gMonShinyPalette_Miltank, 741
obj_pal gMonShinyPalette_Blissey, 742
obj_pal gMonShinyPalette_Raikou, 743
obj_pal gMonShinyPalette_Entei, 744
obj_pal gMonShinyPalette_Suicune, 745
obj_pal gMonShinyPalette_Larvitar, 746
obj_pal gMonShinyPalette_Pupitar, 747
obj_pal gMonShinyPalette_Tyranitar, 748
obj_pal gMonShinyPalette_Lugia, 749
obj_pal gMonShinyPalette_HoOh, 750
obj_pal gMonShinyPalette_Celebi, 751
obj_pal gMonShinyPalette_DoubleQuestionMark, 752
obj_pal gMonShinyPalette_DoubleQuestionMark, 753
obj_pal gMonShinyPalette_DoubleQuestionMark, 754
obj_pal gMonShinyPalette_DoubleQuestionMark, 755
obj_pal gMonShinyPalette_DoubleQuestionMark, 756
obj_pal gMonShinyPalette_DoubleQuestionMark, 757
obj_pal gMonShinyPalette_DoubleQuestionMark, 758
obj_pal gMonShinyPalette_DoubleQuestionMark, 759
obj_pal gMonShinyPalette_DoubleQuestionMark, 760
obj_pal gMonShinyPalette_DoubleQuestionMark, 761
obj_pal gMonShinyPalette_DoubleQuestionMark, 762
obj_pal gMonShinyPalette_DoubleQuestionMark, 763
obj_pal gMonShinyPalette_DoubleQuestionMark, 764
obj_pal gMonShinyPalette_DoubleQuestionMark, 765
obj_pal gMonShinyPalette_DoubleQuestionMark, 766
obj_pal gMonShinyPalette_DoubleQuestionMark, 767
obj_pal gMonShinyPalette_DoubleQuestionMark, 768
obj_pal gMonShinyPalette_DoubleQuestionMark, 769
obj_pal gMonShinyPalette_DoubleQuestionMark, 770
obj_pal gMonShinyPalette_DoubleQuestionMark, 771
obj_pal gMonShinyPalette_DoubleQuestionMark, 772
obj_pal gMonShinyPalette_DoubleQuestionMark, 773
obj_pal gMonShinyPalette_DoubleQuestionMark, 774
obj_pal gMonShinyPalette_DoubleQuestionMark, 775
obj_pal gMonShinyPalette_DoubleQuestionMark, 776
obj_pal gMonShinyPalette_Treecko, 777
obj_pal gMonShinyPalette_Grovyle, 778
obj_pal gMonShinyPalette_Sceptile, 779
obj_pal gMonShinyPalette_Torchic, 780
obj_pal gMonShinyPalette_Combusken, 781
obj_pal gMonShinyPalette_Blaziken, 782
obj_pal gMonShinyPalette_Mudkip, 783
obj_pal gMonShinyPalette_Marshtomp, 784
obj_pal gMonShinyPalette_Swampert, 785
obj_pal gMonShinyPalette_Poochyena, 786
obj_pal gMonShinyPalette_Mightyena, 787
obj_pal gMonShinyPalette_Zigzagoon, 788
obj_pal gMonShinyPalette_Linoone, 789
obj_pal gMonShinyPalette_Wurmple, 790
obj_pal gMonShinyPalette_Silcoon, 791
obj_pal gMonShinyPalette_Beautifly, 792
obj_pal gMonShinyPalette_Cascoon, 793
obj_pal gMonShinyPalette_Dustox, 794
obj_pal gMonShinyPalette_Lotad, 795
obj_pal gMonShinyPalette_Lombre, 796
obj_pal gMonShinyPalette_Ludicolo, 797
obj_pal gMonShinyPalette_Seedot, 798
obj_pal gMonShinyPalette_Nuzleaf, 799
obj_pal gMonShinyPalette_Shiftry, 800
obj_pal gMonShinyPalette_Nincada, 801
obj_pal gMonShinyPalette_Ninjask, 802
obj_pal gMonShinyPalette_Shedinja, 803
obj_pal gMonShinyPalette_Taillow, 804
obj_pal gMonShinyPalette_Swellow, 805
obj_pal gMonShinyPalette_Shroomish, 806
obj_pal gMonShinyPalette_Breloom, 807
obj_pal gMonShinyPalette_Spinda, 808
obj_pal gMonShinyPalette_Wingull, 809
obj_pal gMonShinyPalette_Pelipper, 810
obj_pal gMonShinyPalette_Surskit, 811
obj_pal gMonShinyPalette_Masquerain, 812
obj_pal gMonShinyPalette_Wailmer, 813
obj_pal gMonShinyPalette_Wailord, 814
obj_pal gMonShinyPalette_Skitty, 815
obj_pal gMonShinyPalette_Delcatty, 816
obj_pal gMonShinyPalette_Kecleon, 817
obj_pal gMonShinyPalette_Baltoy, 818
obj_pal gMonShinyPalette_Claydol, 819
obj_pal gMonShinyPalette_Nosepass, 820
obj_pal gMonShinyPalette_Torkoal, 821
obj_pal gMonShinyPalette_Sableye, 822
obj_pal gMonShinyPalette_Barboach, 823
obj_pal gMonShinyPalette_Whiscash, 824
obj_pal gMonShinyPalette_Luvdisc, 825
obj_pal gMonShinyPalette_Corphish, 826
obj_pal gMonShinyPalette_Crawdaunt, 827
obj_pal gMonShinyPalette_Feebas, 828
obj_pal gMonShinyPalette_Milotic, 829
obj_pal gMonShinyPalette_Carvanha, 830
obj_pal gMonShinyPalette_Sharpedo, 831
obj_pal gMonShinyPalette_Trapinch, 832
obj_pal gMonShinyPalette_Vibrava, 833
obj_pal gMonShinyPalette_Flygon, 834
obj_pal gMonShinyPalette_Makuhita, 835
obj_pal gMonShinyPalette_Hariyama, 836
obj_pal gMonShinyPalette_Electrike, 837
obj_pal gMonShinyPalette_Manectric, 838
obj_pal gMonShinyPalette_Numel, 839
obj_pal gMonShinyPalette_Camerupt, 840
obj_pal gMonShinyPalette_Spheal, 841
obj_pal gMonShinyPalette_Sealeo, 842
obj_pal gMonShinyPalette_Walrein, 843
obj_pal gMonShinyPalette_Cacnea, 844
obj_pal gMonShinyPalette_Cacturne, 845
obj_pal gMonShinyPalette_Snorunt, 846
obj_pal gMonShinyPalette_Glalie, 847
obj_pal gMonShinyPalette_Lunatone, 848
obj_pal gMonShinyPalette_Solrock, 849
obj_pal gMonShinyPalette_Azurill, 850
obj_pal gMonShinyPalette_Spoink, 851
obj_pal gMonShinyPalette_Grumpig, 852
obj_pal gMonShinyPalette_Plusle, 853
obj_pal gMonShinyPalette_Minun, 854
obj_pal gMonShinyPalette_Mawile, 855
obj_pal gMonShinyPalette_Meditite, 856
obj_pal gMonShinyPalette_Medicham, 857
obj_pal gMonShinyPalette_Swablu, 858
obj_pal gMonShinyPalette_Altaria, 859
obj_pal gMonShinyPalette_Wynaut, 860
obj_pal gMonShinyPalette_Duskull, 861
obj_pal gMonShinyPalette_Dusclops, 862
obj_pal gMonShinyPalette_Roselia, 863
obj_pal gMonShinyPalette_Slakoth, 864
obj_pal gMonShinyPalette_Vigoroth, 865
obj_pal gMonShinyPalette_Slaking, 866
obj_pal gMonShinyPalette_Gulpin, 867
obj_pal gMonShinyPalette_Swalot, 868
obj_pal gMonShinyPalette_Tropius, 869
obj_pal gMonShinyPalette_Whismur, 870
obj_pal gMonShinyPalette_Loudred, 871
obj_pal gMonShinyPalette_Exploud, 872
obj_pal gMonShinyPalette_Clamperl, 873
obj_pal gMonShinyPalette_Huntail, 874
obj_pal gMonShinyPalette_Gorebyss, 875
obj_pal gMonShinyPalette_Absol, 876
obj_pal gMonShinyPalette_Shuppet, 877
obj_pal gMonShinyPalette_Banette, 878
obj_pal gMonShinyPalette_Seviper, 879
obj_pal gMonShinyPalette_Zangoose, 880
obj_pal gMonShinyPalette_Relicanth, 881
obj_pal gMonShinyPalette_Aron, 882
obj_pal gMonShinyPalette_Lairon, 883
obj_pal gMonShinyPalette_Aggron, 884
obj_pal gMonShinyPalette_Castform, 885
obj_pal gMonShinyPalette_Volbeat, 886
obj_pal gMonShinyPalette_Illumise, 887
obj_pal gMonShinyPalette_Lileep, 888
obj_pal gMonShinyPalette_Cradily, 889
obj_pal gMonShinyPalette_Anorith, 890
obj_pal gMonShinyPalette_Armaldo, 891
obj_pal gMonShinyPalette_Ralts, 892
obj_pal gMonShinyPalette_Kirlia, 893
obj_pal gMonShinyPalette_Gardevoir, 894
obj_pal gMonShinyPalette_Bagon, 895
obj_pal gMonShinyPalette_Shelgon, 896
obj_pal gMonShinyPalette_Salamence, 897
obj_pal gMonShinyPalette_Beldum, 898
obj_pal gMonShinyPalette_Metang, 899
obj_pal gMonShinyPalette_Metagross, 900
obj_pal gMonShinyPalette_Regirock, 901
obj_pal gMonShinyPalette_Regice, 902
obj_pal gMonShinyPalette_Registeel, 903
obj_pal gMonShinyPalette_Kyogre, 904
obj_pal gMonShinyPalette_Groudon, 905
obj_pal gMonShinyPalette_Rayquaza, 906
obj_pal gMonShinyPalette_Latias, 907
obj_pal gMonShinyPalette_Latios, 908
obj_pal gMonShinyPalette_Jirachi, 909
obj_pal gMonShinyPalette_Deoxys, 910
obj_pal gMonShinyPalette_Chimecho, 911
obj_pal gMonPalette_Egg, 912
obj_pal gMonShinyPalette_Unown, 913
obj_pal gMonShinyPalette_Unown, 914
obj_pal gMonShinyPalette_Unown, 915
obj_pal gMonShinyPalette_Unown, 916
obj_pal gMonShinyPalette_Unown, 917
obj_pal gMonShinyPalette_Unown, 918
obj_pal gMonShinyPalette_Unown, 919
obj_pal gMonShinyPalette_Unown, 920
obj_pal gMonShinyPalette_Unown, 921
obj_pal gMonShinyPalette_Unown, 922
obj_pal gMonShinyPalette_Unown, 923
obj_pal gMonShinyPalette_Unown, 924
obj_pal gMonShinyPalette_Unown, 925
obj_pal gMonShinyPalette_Unown, 926
obj_pal gMonShinyPalette_Unown, 927
obj_pal gMonShinyPalette_Unown, 928
obj_pal gMonShinyPalette_Unown, 929
obj_pal gMonShinyPalette_Unown, 930
obj_pal gMonShinyPalette_Unown, 931
obj_pal gMonShinyPalette_Unown, 932
obj_pal gMonShinyPalette_Unown, 933
obj_pal gMonShinyPalette_Unown, 934
obj_pal gMonShinyPalette_Unown, 935
obj_pal gMonShinyPalette_Unown, 936
obj_pal gMonShinyPalette_Unown, 937
obj_pal gMonShinyPalette_Unown, 938
obj_pal gMonShinyPalette_Unown, 939
data/graphics/pokemon/still_front_pic_table.inc
-442
View File
@@ -1,442 +0,0 @@
.align 2
gMonStillFrontPicTable:: @ 8301418
obj_tiles gMonStillFrontPic_CircledQuestionMark, 0x800, 0
obj_tiles gMonStillFrontPic_Bulbasaur, 0x800, 1
obj_tiles gMonStillFrontPic_Ivysaur, 0x800, 2
obj_tiles gMonStillFrontPic_Venusaur, 0x800, 3
obj_tiles gMonStillFrontPic_Charmander, 0x800, 4
obj_tiles gMonStillFrontPic_Charmeleon, 0x800, 5
obj_tiles gMonStillFrontPic_Charizard, 0x800, 6
obj_tiles gMonStillFrontPic_Squirtle, 0x800, 7
obj_tiles gMonStillFrontPic_Wartortle, 0x800, 8
obj_tiles gMonStillFrontPic_Blastoise, 0x800, 9
obj_tiles gMonStillFrontPic_Caterpie, 0x800, 10
obj_tiles gMonStillFrontPic_Metapod, 0x800, 11
obj_tiles gMonStillFrontPic_Butterfree, 0x800, 12
obj_tiles gMonStillFrontPic_Weedle, 0x800, 13
obj_tiles gMonStillFrontPic_Kakuna, 0x800, 14
obj_tiles gMonStillFrontPic_Beedrill, 0x800, 15
obj_tiles gMonStillFrontPic_Pidgey, 0x800, 16
obj_tiles gMonStillFrontPic_Pidgeotto, 0x800, 17
obj_tiles gMonStillFrontPic_Pidgeot, 0x800, 18
obj_tiles gMonStillFrontPic_Rattata, 0x800, 19
obj_tiles gMonStillFrontPic_Raticate, 0x800, 20
obj_tiles gMonStillFrontPic_Spearow, 0x800, 21
obj_tiles gMonStillFrontPic_Fearow, 0x800, 22
obj_tiles gMonStillFrontPic_Ekans, 0x800, 23
obj_tiles gMonStillFrontPic_Arbok, 0x800, 24
obj_tiles gMonStillFrontPic_Pikachu, 0x800, 25
obj_tiles gMonStillFrontPic_Raichu, 0x800, 26
obj_tiles gMonStillFrontPic_Sandshrew, 0x800, 27
obj_tiles gMonStillFrontPic_Sandslash, 0x800, 28
obj_tiles gMonStillFrontPic_NidoranF, 0x800, 29
obj_tiles gMonStillFrontPic_Nidorina, 0x800, 30
obj_tiles gMonStillFrontPic_Nidoqueen, 0x800, 31
obj_tiles gMonStillFrontPic_NidoranM, 0x800, 32
obj_tiles gMonStillFrontPic_Nidorino, 0x800, 33
obj_tiles gMonStillFrontPic_Nidoking, 0x800, 34
obj_tiles gMonStillFrontPic_Clefairy, 0x800, 35
obj_tiles gMonStillFrontPic_Clefable, 0x800, 36
obj_tiles gMonStillFrontPic_Vulpix, 0x800, 37
obj_tiles gMonStillFrontPic_Ninetales, 0x800, 38
obj_tiles gMonStillFrontPic_Jigglypuff, 0x800, 39
obj_tiles gMonStillFrontPic_Wigglytuff, 0x800, 40
obj_tiles gMonStillFrontPic_Zubat, 0x800, 41
obj_tiles gMonStillFrontPic_Golbat, 0x800, 42
obj_tiles gMonStillFrontPic_Oddish, 0x800, 43
obj_tiles gMonStillFrontPic_Gloom, 0x800, 44
obj_tiles gMonStillFrontPic_Vileplume, 0x800, 45
obj_tiles gMonStillFrontPic_Paras, 0x800, 46
obj_tiles gMonStillFrontPic_Parasect, 0x800, 47
obj_tiles gMonStillFrontPic_Venonat, 0x800, 48
obj_tiles gMonStillFrontPic_Venomoth, 0x800, 49
obj_tiles gMonStillFrontPic_Diglett, 0x800, 50
obj_tiles gMonStillFrontPic_Dugtrio, 0x800, 51
obj_tiles gMonStillFrontPic_Meowth, 0x800, 52
obj_tiles gMonStillFrontPic_Persian, 0x800, 53
obj_tiles gMonStillFrontPic_Psyduck, 0x800, 54
obj_tiles gMonStillFrontPic_Golduck, 0x800, 55
obj_tiles gMonStillFrontPic_Mankey, 0x800, 56
obj_tiles gMonStillFrontPic_Primeape, 0x800, 57
obj_tiles gMonStillFrontPic_Growlithe, 0x800, 58
obj_tiles gMonStillFrontPic_Arcanine, 0x800, 59
obj_tiles gMonStillFrontPic_Poliwag, 0x800, 60
obj_tiles gMonStillFrontPic_Poliwhirl, 0x800, 61
obj_tiles gMonStillFrontPic_Poliwrath, 0x800, 62
obj_tiles gMonStillFrontPic_Abra, 0x800, 63
obj_tiles gMonStillFrontPic_Kadabra, 0x800, 64
obj_tiles gMonStillFrontPic_Alakazam, 0x800, 65
obj_tiles gMonStillFrontPic_Machop, 0x800, 66
obj_tiles gMonStillFrontPic_Machoke, 0x800, 67
obj_tiles gMonStillFrontPic_Machamp, 0x800, 68
obj_tiles gMonStillFrontPic_Bellsprout, 0x800, 69
obj_tiles gMonStillFrontPic_Weepinbell, 0x800, 70
obj_tiles gMonStillFrontPic_Victreebel, 0x800, 71
obj_tiles gMonStillFrontPic_Tentacool, 0x800, 72
obj_tiles gMonStillFrontPic_Tentacruel, 0x800, 73
obj_tiles gMonStillFrontPic_Geodude, 0x800, 74
obj_tiles gMonStillFrontPic_Graveler, 0x800, 75
obj_tiles gMonStillFrontPic_Golem, 0x800, 76
obj_tiles gMonStillFrontPic_Ponyta, 0x800, 77
obj_tiles gMonStillFrontPic_Rapidash, 0x800, 78
obj_tiles gMonStillFrontPic_Slowpoke, 0x800, 79
obj_tiles gMonStillFrontPic_Slowbro, 0x800, 80
obj_tiles gMonStillFrontPic_Magnemite, 0x800, 81
obj_tiles gMonStillFrontPic_Magneton, 0x800, 82
obj_tiles gMonStillFrontPic_Farfetchd, 0x800, 83
obj_tiles gMonStillFrontPic_Doduo, 0x800, 84
obj_tiles gMonStillFrontPic_Dodrio, 0x800, 85
obj_tiles gMonStillFrontPic_Seel, 0x800, 86
obj_tiles gMonStillFrontPic_Dewgong, 0x800, 87
obj_tiles gMonStillFrontPic_Grimer, 0x800, 88
obj_tiles gMonStillFrontPic_Muk, 0x800, 89
obj_tiles gMonStillFrontPic_Shellder, 0x800, 90
obj_tiles gMonStillFrontPic_Cloyster, 0x800, 91
obj_tiles gMonStillFrontPic_Gastly, 0x800, 92
obj_tiles gMonStillFrontPic_Haunter, 0x800, 93
obj_tiles gMonStillFrontPic_Gengar, 0x800, 94
obj_tiles gMonStillFrontPic_Onix, 0x800, 95
obj_tiles gMonStillFrontPic_Drowzee, 0x800, 96
obj_tiles gMonStillFrontPic_Hypno, 0x800, 97
obj_tiles gMonStillFrontPic_Krabby, 0x800, 98
obj_tiles gMonStillFrontPic_Kingler, 0x800, 99
obj_tiles gMonStillFrontPic_Voltorb, 0x800, 100
obj_tiles gMonStillFrontPic_Electrode, 0x800, 101
obj_tiles gMonStillFrontPic_Exeggcute, 0x800, 102
obj_tiles gMonStillFrontPic_Exeggutor, 0x800, 103
obj_tiles gMonStillFrontPic_Cubone, 0x800, 104
obj_tiles gMonStillFrontPic_Marowak, 0x800, 105
obj_tiles gMonStillFrontPic_Hitmonlee, 0x800, 106
obj_tiles gMonStillFrontPic_Hitmonchan, 0x800, 107
obj_tiles gMonStillFrontPic_Lickitung, 0x800, 108
obj_tiles gMonStillFrontPic_Koffing, 0x800, 109
obj_tiles gMonStillFrontPic_Weezing, 0x800, 110
obj_tiles gMonStillFrontPic_Rhyhorn, 0x800, 111
obj_tiles gMonStillFrontPic_Rhydon, 0x800, 112
obj_tiles gMonStillFrontPic_Chansey, 0x800, 113
obj_tiles gMonStillFrontPic_Tangela, 0x800, 114
obj_tiles gMonStillFrontPic_Kangaskhan, 0x800, 115
obj_tiles gMonStillFrontPic_Horsea, 0x800, 116
obj_tiles gMonStillFrontPic_Seadra, 0x800, 117
obj_tiles gMonStillFrontPic_Goldeen, 0x800, 118
obj_tiles gMonStillFrontPic_Seaking, 0x800, 119
obj_tiles gMonStillFrontPic_Staryu, 0x800, 120
obj_tiles gMonStillFrontPic_Starmie, 0x800, 121
obj_tiles gMonStillFrontPic_Mrmime, 0x800, 122
obj_tiles gMonStillFrontPic_Scyther, 0x800, 123
obj_tiles gMonStillFrontPic_Jynx, 0x800, 124
obj_tiles gMonStillFrontPic_Electabuzz, 0x800, 125
obj_tiles gMonStillFrontPic_Magmar, 0x800, 126
obj_tiles gMonStillFrontPic_Pinsir, 0x800, 127
obj_tiles gMonStillFrontPic_Tauros, 0x800, 128
obj_tiles gMonStillFrontPic_Magikarp, 0x800, 129
obj_tiles gMonStillFrontPic_Gyarados, 0x800, 130
obj_tiles gMonStillFrontPic_Lapras, 0x800, 131
obj_tiles gMonStillFrontPic_Ditto, 0x800, 132
obj_tiles gMonStillFrontPic_Eevee, 0x800, 133
obj_tiles gMonStillFrontPic_Vaporeon, 0x800, 134
obj_tiles gMonStillFrontPic_Jolteon, 0x800, 135
obj_tiles gMonStillFrontPic_Flareon, 0x800, 136
obj_tiles gMonStillFrontPic_Porygon, 0x800, 137
obj_tiles gMonStillFrontPic_Omanyte, 0x800, 138
obj_tiles gMonStillFrontPic_Omastar, 0x800, 139
obj_tiles gMonStillFrontPic_Kabuto, 0x800, 140
obj_tiles gMonStillFrontPic_Kabutops, 0x800, 141
obj_tiles gMonStillFrontPic_Aerodactyl, 0x800, 142
obj_tiles gMonStillFrontPic_Snorlax, 0x800, 143
obj_tiles gMonStillFrontPic_Articuno, 0x800, 144
obj_tiles gMonStillFrontPic_Zapdos, 0x800, 145
obj_tiles gMonStillFrontPic_Moltres, 0x800, 146
obj_tiles gMonStillFrontPic_Dratini, 0x800, 147
obj_tiles gMonStillFrontPic_Dragonair, 0x800, 148
obj_tiles gMonStillFrontPic_Dragonite, 0x800, 149
obj_tiles gMonStillFrontPic_Mewtwo, 0x800, 150
obj_tiles gMonStillFrontPic_Mew, 0x800, 151
obj_tiles gMonStillFrontPic_Chikorita, 0x800, 152
obj_tiles gMonStillFrontPic_Bayleef, 0x800, 153
obj_tiles gMonStillFrontPic_Meganium, 0x800, 154
obj_tiles gMonStillFrontPic_Cyndaquil, 0x800, 155
obj_tiles gMonStillFrontPic_Quilava, 0x800, 156
obj_tiles gMonStillFrontPic_Typhlosion, 0x800, 157
obj_tiles gMonStillFrontPic_Totodile, 0x800, 158
obj_tiles gMonStillFrontPic_Croconaw, 0x800, 159
obj_tiles gMonStillFrontPic_Feraligatr, 0x800, 160
obj_tiles gMonStillFrontPic_Sentret, 0x800, 161
obj_tiles gMonStillFrontPic_Furret, 0x800, 162
obj_tiles gMonStillFrontPic_Hoothoot, 0x800, 163
obj_tiles gMonStillFrontPic_Noctowl, 0x800, 164
obj_tiles gMonStillFrontPic_Ledyba, 0x800, 165
obj_tiles gMonStillFrontPic_Ledian, 0x800, 166
obj_tiles gMonStillFrontPic_Spinarak, 0x800, 167
obj_tiles gMonStillFrontPic_Ariados, 0x800, 168
obj_tiles gMonStillFrontPic_Crobat, 0x800, 169
obj_tiles gMonStillFrontPic_Chinchou, 0x800, 170
obj_tiles gMonStillFrontPic_Lanturn, 0x800, 171
obj_tiles gMonStillFrontPic_Pichu, 0x800, 172
obj_tiles gMonStillFrontPic_Cleffa, 0x800, 173
obj_tiles gMonStillFrontPic_Igglybuff, 0x800, 174
obj_tiles gMonStillFrontPic_Togepi, 0x800, 175
obj_tiles gMonStillFrontPic_Togetic, 0x800, 176
obj_tiles gMonStillFrontPic_Natu, 0x800, 177
obj_tiles gMonStillFrontPic_Xatu, 0x800, 178
obj_tiles gMonStillFrontPic_Mareep, 0x800, 179
obj_tiles gMonStillFrontPic_Flaaffy, 0x800, 180
obj_tiles gMonStillFrontPic_Ampharos, 0x800, 181
obj_tiles gMonStillFrontPic_Bellossom, 0x800, 182
obj_tiles gMonStillFrontPic_Marill, 0x800, 183
obj_tiles gMonStillFrontPic_Azumarill, 0x800, 184
obj_tiles gMonStillFrontPic_Sudowoodo, 0x800, 185
obj_tiles gMonStillFrontPic_Politoed, 0x800, 186
obj_tiles gMonStillFrontPic_Hoppip, 0x800, 187
obj_tiles gMonStillFrontPic_Skiploom, 0x800, 188
obj_tiles gMonStillFrontPic_Jumpluff, 0x800, 189
obj_tiles gMonStillFrontPic_Aipom, 0x800, 190
obj_tiles gMonStillFrontPic_Sunkern, 0x800, 191
obj_tiles gMonStillFrontPic_Sunflora, 0x800, 192
obj_tiles gMonStillFrontPic_Yanma, 0x800, 193
obj_tiles gMonStillFrontPic_Wooper, 0x800, 194
obj_tiles gMonStillFrontPic_Quagsire, 0x800, 195
obj_tiles gMonStillFrontPic_Espeon, 0x800, 196
obj_tiles gMonStillFrontPic_Umbreon, 0x800, 197
obj_tiles gMonStillFrontPic_Murkrow, 0x800, 198
obj_tiles gMonStillFrontPic_Slowking, 0x800, 199
obj_tiles gMonStillFrontPic_Misdreavus, 0x800, 200
obj_tiles gMonStillFrontPic_UnownA, 0x800, 201
obj_tiles gMonStillFrontPic_Wobbuffet, 0x800, 202
obj_tiles gMonStillFrontPic_Girafarig, 0x800, 203
obj_tiles gMonStillFrontPic_Pineco, 0x800, 204
obj_tiles gMonStillFrontPic_Forretress, 0x800, 205
obj_tiles gMonStillFrontPic_Dunsparce, 0x800, 206
obj_tiles gMonStillFrontPic_Gligar, 0x800, 207
obj_tiles gMonStillFrontPic_Steelix, 0x800, 208
obj_tiles gMonStillFrontPic_Snubbull, 0x800, 209
obj_tiles gMonStillFrontPic_Granbull, 0x800, 210
obj_tiles gMonStillFrontPic_Qwilfish, 0x800, 211
obj_tiles gMonStillFrontPic_Scizor, 0x800, 212
obj_tiles gMonStillFrontPic_Shuckle, 0x800, 213
obj_tiles gMonStillFrontPic_Heracross, 0x800, 214
obj_tiles gMonStillFrontPic_Sneasel, 0x800, 215
obj_tiles gMonStillFrontPic_Teddiursa, 0x800, 216
obj_tiles gMonStillFrontPic_Ursaring, 0x800, 217
obj_tiles gMonStillFrontPic_Slugma, 0x800, 218
obj_tiles gMonStillFrontPic_Magcargo, 0x800, 219
obj_tiles gMonStillFrontPic_Swinub, 0x800, 220
obj_tiles gMonStillFrontPic_Piloswine, 0x800, 221
obj_tiles gMonStillFrontPic_Corsola, 0x800, 222
obj_tiles gMonStillFrontPic_Remoraid, 0x800, 223
obj_tiles gMonStillFrontPic_Octillery, 0x800, 224
obj_tiles gMonStillFrontPic_Delibird, 0x800, 225
obj_tiles gMonStillFrontPic_Mantine, 0x800, 226
obj_tiles gMonStillFrontPic_Skarmory, 0x800, 227
obj_tiles gMonStillFrontPic_Houndour, 0x800, 228
obj_tiles gMonStillFrontPic_Houndoom, 0x800, 229
obj_tiles gMonStillFrontPic_Kingdra, 0x800, 230
obj_tiles gMonStillFrontPic_Phanpy, 0x800, 231
obj_tiles gMonStillFrontPic_Donphan, 0x800, 232
obj_tiles gMonStillFrontPic_Porygon2, 0x800, 233
obj_tiles gMonStillFrontPic_Stantler, 0x800, 234
obj_tiles gMonStillFrontPic_Smeargle, 0x800, 235
obj_tiles gMonStillFrontPic_Tyrogue, 0x800, 236
obj_tiles gMonStillFrontPic_Hitmontop, 0x800, 237
obj_tiles gMonStillFrontPic_Smoochum, 0x800, 238
obj_tiles gMonStillFrontPic_Elekid, 0x800, 239
obj_tiles gMonStillFrontPic_Magby, 0x800, 240
obj_tiles gMonStillFrontPic_Miltank, 0x800, 241
obj_tiles gMonStillFrontPic_Blissey, 0x800, 242
obj_tiles gMonStillFrontPic_Raikou, 0x800, 243
obj_tiles gMonStillFrontPic_Entei, 0x800, 244
obj_tiles gMonStillFrontPic_Suicune, 0x800, 245
obj_tiles gMonStillFrontPic_Larvitar, 0x800, 246
obj_tiles gMonStillFrontPic_Pupitar, 0x800, 247
obj_tiles gMonStillFrontPic_Tyranitar, 0x800, 248
obj_tiles gMonStillFrontPic_Lugia, 0x800, 249
obj_tiles gMonStillFrontPic_HoOh, 0x800, 250
obj_tiles gMonStillFrontPic_Celebi, 0x800, 251
obj_tiles gMonStillFrontPic_DoubleQuestionMark, 0x800, 252
obj_tiles gMonStillFrontPic_DoubleQuestionMark, 0x800, 253
obj_tiles gMonStillFrontPic_DoubleQuestionMark, 0x800, 254
obj_tiles gMonStillFrontPic_DoubleQuestionMark, 0x800, 255
obj_tiles gMonStillFrontPic_DoubleQuestionMark, 0x800, 256
obj_tiles gMonStillFrontPic_DoubleQuestionMark, 0x800, 257
obj_tiles gMonStillFrontPic_DoubleQuestionMark, 0x800, 258
obj_tiles gMonStillFrontPic_DoubleQuestionMark, 0x800, 259
obj_tiles gMonStillFrontPic_DoubleQuestionMark, 0x800, 260
obj_tiles gMonStillFrontPic_DoubleQuestionMark, 0x800, 261
obj_tiles gMonStillFrontPic_DoubleQuestionMark, 0x800, 262
obj_tiles gMonStillFrontPic_DoubleQuestionMark, 0x800, 263
obj_tiles gMonStillFrontPic_DoubleQuestionMark, 0x800, 264
obj_tiles gMonStillFrontPic_DoubleQuestionMark, 0x800, 265
obj_tiles gMonStillFrontPic_DoubleQuestionMark, 0x800, 266
obj_tiles gMonStillFrontPic_DoubleQuestionMark, 0x800, 267
obj_tiles gMonStillFrontPic_DoubleQuestionMark, 0x800, 268
obj_tiles gMonStillFrontPic_DoubleQuestionMark, 0x800, 269
obj_tiles gMonStillFrontPic_DoubleQuestionMark, 0x800, 270
obj_tiles gMonStillFrontPic_DoubleQuestionMark, 0x800, 271
obj_tiles gMonStillFrontPic_DoubleQuestionMark, 0x800, 272
obj_tiles gMonStillFrontPic_DoubleQuestionMark, 0x800, 273
obj_tiles gMonStillFrontPic_DoubleQuestionMark, 0x800, 274
obj_tiles gMonStillFrontPic_DoubleQuestionMark, 0x800, 275
obj_tiles gMonStillFrontPic_DoubleQuestionMark, 0x800, 276
obj_tiles gMonStillFrontPic_Treecko, 0x800, 277
obj_tiles gMonStillFrontPic_Grovyle, 0x800, 278
obj_tiles gMonStillFrontPic_Sceptile, 0x800, 279
obj_tiles gMonStillFrontPic_Torchic, 0x800, 280
obj_tiles gMonStillFrontPic_Combusken, 0x800, 281
obj_tiles gMonStillFrontPic_Blaziken, 0x800, 282
obj_tiles gMonStillFrontPic_Mudkip, 0x800, 283
obj_tiles gMonStillFrontPic_Marshtomp, 0x800, 284
obj_tiles gMonStillFrontPic_Swampert, 0x800, 285
obj_tiles gMonStillFrontPic_Poochyena, 0x800, 286
obj_tiles gMonStillFrontPic_Mightyena, 0x800, 287
obj_tiles gMonStillFrontPic_Zigzagoon, 0x800, 288
obj_tiles gMonStillFrontPic_Linoone, 0x800, 289
obj_tiles gMonStillFrontPic_Wurmple, 0x800, 290
obj_tiles gMonStillFrontPic_Silcoon, 0x800, 291
obj_tiles gMonStillFrontPic_Beautifly, 0x800, 292
obj_tiles gMonStillFrontPic_Cascoon, 0x800, 293
obj_tiles gMonStillFrontPic_Dustox, 0x800, 294
obj_tiles gMonStillFrontPic_Lotad, 0x800, 295
obj_tiles gMonStillFrontPic_Lombre, 0x800, 296
obj_tiles gMonStillFrontPic_Ludicolo, 0x800, 297
obj_tiles gMonStillFrontPic_Seedot, 0x800, 298
obj_tiles gMonStillFrontPic_Nuzleaf, 0x800, 299
obj_tiles gMonStillFrontPic_Shiftry, 0x800, 300
obj_tiles gMonStillFrontPic_Nincada, 0x800, 301
obj_tiles gMonStillFrontPic_Ninjask, 0x800, 302
obj_tiles gMonStillFrontPic_Shedinja, 0x800, 303
obj_tiles gMonStillFrontPic_Taillow, 0x800, 304
obj_tiles gMonStillFrontPic_Swellow, 0x800, 305
obj_tiles gMonStillFrontPic_Shroomish, 0x800, 306
obj_tiles gMonStillFrontPic_Breloom, 0x800, 307
obj_tiles gMonStillFrontPic_Spinda, 0x800, 308
obj_tiles gMonStillFrontPic_Wingull, 0x800, 309
obj_tiles gMonStillFrontPic_Pelipper, 0x800, 310
obj_tiles gMonStillFrontPic_Surskit, 0x800, 311
obj_tiles gMonStillFrontPic_Masquerain, 0x800, 312
obj_tiles gMonStillFrontPic_Wailmer, 0x800, 313
obj_tiles gMonStillFrontPic_Wailord, 0x800, 314
obj_tiles gMonStillFrontPic_Skitty, 0x800, 315
obj_tiles gMonStillFrontPic_Delcatty, 0x800, 316
obj_tiles gMonStillFrontPic_Kecleon, 0x800, 317
obj_tiles gMonStillFrontPic_Baltoy, 0x800, 318
obj_tiles gMonStillFrontPic_Claydol, 0x800, 319
obj_tiles gMonStillFrontPic_Nosepass, 0x800, 320
obj_tiles gMonStillFrontPic_Torkoal, 0x800, 321
obj_tiles gMonStillFrontPic_Sableye, 0x800, 322
obj_tiles gMonStillFrontPic_Barboach, 0x800, 323
obj_tiles gMonStillFrontPic_Whiscash, 0x800, 324
obj_tiles gMonStillFrontPic_Luvdisc, 0x800, 325
obj_tiles gMonStillFrontPic_Corphish, 0x800, 326
obj_tiles gMonStillFrontPic_Crawdaunt, 0x800, 327
obj_tiles gMonStillFrontPic_Feebas, 0x800, 328
obj_tiles gMonStillFrontPic_Milotic, 0x800, 329
obj_tiles gMonStillFrontPic_Carvanha, 0x800, 330
obj_tiles gMonStillFrontPic_Sharpedo, 0x800, 331
obj_tiles gMonStillFrontPic_Trapinch, 0x800, 332
obj_tiles gMonStillFrontPic_Vibrava, 0x800, 333
obj_tiles gMonStillFrontPic_Flygon, 0x800, 334
obj_tiles gMonStillFrontPic_Makuhita, 0x800, 335
obj_tiles gMonStillFrontPic_Hariyama, 0x800, 336
obj_tiles gMonStillFrontPic_Electrike, 0x800, 337
obj_tiles gMonStillFrontPic_Manectric, 0x800, 338
obj_tiles gMonStillFrontPic_Numel, 0x800, 339
obj_tiles gMonStillFrontPic_Camerupt, 0x800, 340
obj_tiles gMonStillFrontPic_Spheal, 0x800, 341
obj_tiles gMonStillFrontPic_Sealeo, 0x800, 342
obj_tiles gMonStillFrontPic_Walrein, 0x800, 343
obj_tiles gMonStillFrontPic_Cacnea, 0x800, 344
obj_tiles gMonStillFrontPic_Cacturne, 0x800, 345
obj_tiles gMonStillFrontPic_Snorunt, 0x800, 346
obj_tiles gMonStillFrontPic_Glalie, 0x800, 347
obj_tiles gMonStillFrontPic_Lunatone, 0x800, 348
obj_tiles gMonStillFrontPic_Solrock, 0x800, 349
obj_tiles gMonStillFrontPic_Azurill, 0x800, 350
obj_tiles gMonStillFrontPic_Spoink, 0x800, 351
obj_tiles gMonStillFrontPic_Grumpig, 0x800, 352
obj_tiles gMonStillFrontPic_Plusle, 0x800, 353
obj_tiles gMonStillFrontPic_Minun, 0x800, 354
obj_tiles gMonStillFrontPic_Mawile, 0x800, 355
obj_tiles gMonStillFrontPic_Meditite, 0x800, 356
obj_tiles gMonStillFrontPic_Medicham, 0x800, 357
obj_tiles gMonStillFrontPic_Swablu, 0x800, 358
obj_tiles gMonStillFrontPic_Altaria, 0x800, 359
obj_tiles gMonStillFrontPic_Wynaut, 0x800, 360
obj_tiles gMonStillFrontPic_Duskull, 0x800, 361
obj_tiles gMonStillFrontPic_Dusclops, 0x800, 362
obj_tiles gMonStillFrontPic_Roselia, 0x800, 363
obj_tiles gMonStillFrontPic_Slakoth, 0x800, 364
obj_tiles gMonStillFrontPic_Vigoroth, 0x800, 365
obj_tiles gMonStillFrontPic_Slaking, 0x800, 366
obj_tiles gMonStillFrontPic_Gulpin, 0x800, 367
obj_tiles gMonStillFrontPic_Swalot, 0x800, 368
obj_tiles gMonStillFrontPic_Tropius, 0x800, 369
obj_tiles gMonStillFrontPic_Whismur, 0x800, 370
obj_tiles gMonStillFrontPic_Loudred, 0x800, 371
obj_tiles gMonStillFrontPic_Exploud, 0x800, 372
obj_tiles gMonStillFrontPic_Clamperl, 0x800, 373
obj_tiles gMonStillFrontPic_Huntail, 0x800, 374
obj_tiles gMonStillFrontPic_Gorebyss, 0x800, 375
obj_tiles gMonStillFrontPic_Absol, 0x800, 376
obj_tiles gMonStillFrontPic_Shuppet, 0x800, 377
obj_tiles gMonStillFrontPic_Banette, 0x800, 378
obj_tiles gMonStillFrontPic_Seviper, 0x800, 379
obj_tiles gMonStillFrontPic_Zangoose, 0x800, 380
obj_tiles gMonStillFrontPic_Relicanth, 0x800, 381
obj_tiles gMonStillFrontPic_Aron, 0x800, 382
obj_tiles gMonStillFrontPic_Lairon, 0x800, 383
obj_tiles gMonStillFrontPic_Aggron, 0x800, 384
obj_tiles gMonStillFrontPic_Castform, 0x800, 385
obj_tiles gMonStillFrontPic_Volbeat, 0x800, 386
obj_tiles gMonStillFrontPic_Illumise, 0x800, 387
obj_tiles gMonStillFrontPic_Lileep, 0x800, 388
obj_tiles gMonStillFrontPic_Cradily, 0x800, 389
obj_tiles gMonStillFrontPic_Anorith, 0x800, 390
obj_tiles gMonStillFrontPic_Armaldo, 0x800, 391
obj_tiles gMonStillFrontPic_Ralts, 0x800, 392
obj_tiles gMonStillFrontPic_Kirlia, 0x800, 393
obj_tiles gMonStillFrontPic_Gardevoir, 0x800, 394
obj_tiles gMonStillFrontPic_Bagon, 0x800, 395
obj_tiles gMonStillFrontPic_Shelgon, 0x800, 396
obj_tiles gMonStillFrontPic_Salamence, 0x800, 397
obj_tiles gMonStillFrontPic_Beldum, 0x800, 398
obj_tiles gMonStillFrontPic_Metang, 0x800, 399
obj_tiles gMonStillFrontPic_Metagross, 0x800, 400
obj_tiles gMonStillFrontPic_Regirock, 0x800, 401
obj_tiles gMonStillFrontPic_Regice, 0x800, 402
obj_tiles gMonStillFrontPic_Registeel, 0x800, 403
obj_tiles gMonStillFrontPic_Kyogre, 0x800, 404
obj_tiles gMonStillFrontPic_Groudon, 0x800, 405
obj_tiles gMonStillFrontPic_Rayquaza, 0x800, 406
obj_tiles gMonStillFrontPic_Latias, 0x800, 407
obj_tiles gMonStillFrontPic_Latios, 0x800, 408
obj_tiles gMonStillFrontPic_Jirachi, 0x800, 409
obj_tiles gMonStillFrontPic_Deoxys, 0x800, 410
obj_tiles gMonStillFrontPic_Chimecho, 0x800, 411
obj_tiles gMonStillFrontPic_Egg, 0x800, 412
obj_tiles gMonStillFrontPic_UnownB, 0x800, 413
obj_tiles gMonStillFrontPic_UnownC, 0x800, 414
obj_tiles gMonStillFrontPic_UnownD, 0x800, 415
obj_tiles gMonStillFrontPic_UnownE, 0x800, 416
obj_tiles gMonStillFrontPic_UnownF, 0x800, 417
obj_tiles gMonStillFrontPic_UnownG, 0x800, 418
obj_tiles gMonStillFrontPic_UnownH, 0x800, 419
obj_tiles gMonStillFrontPic_UnownI, 0x800, 420
obj_tiles gMonStillFrontPic_UnownJ, 0x800, 421
obj_tiles gMonStillFrontPic_UnownK, 0x800, 422
obj_tiles gMonStillFrontPic_UnownL, 0x800, 423
obj_tiles gMonStillFrontPic_UnownM, 0x800, 424
obj_tiles gMonStillFrontPic_UnownN, 0x800, 425
obj_tiles gMonStillFrontPic_UnownO, 0x800, 426
obj_tiles gMonStillFrontPic_UnownP, 0x800, 427
obj_tiles gMonStillFrontPic_UnownQ, 0x800, 428
obj_tiles gMonStillFrontPic_UnownR, 0x800, 429
obj_tiles gMonStillFrontPic_UnownS, 0x800, 430
obj_tiles gMonStillFrontPic_UnownT, 0x800, 431
obj_tiles gMonStillFrontPic_UnownU, 0x800, 432
obj_tiles gMonStillFrontPic_UnownV, 0x800, 433
obj_tiles gMonStillFrontPic_UnownW, 0x800, 434
obj_tiles gMonStillFrontPic_UnownX, 0x800, 435
obj_tiles gMonStillFrontPic_UnownY, 0x800, 436
obj_tiles gMonStillFrontPic_UnownZ, 0x800, 437
obj_tiles gMonStillFrontPic_UnownExclamationMark, 0x800, 438
obj_tiles gMonStillFrontPic_UnownQuestionMark, 0x800, 439
data/graphics/trainers/back_pic_coords.inc
-10
View File
@@ -1,10 +0,0 @@
.align 2
gTrainerBackPicCoords:: @ 8305D2C
.byte 0x08, 0x04, 0x00, 0x00
.byte 0x08, 0x04, 0x00, 0x00
.byte 0x08, 0x05, 0x00, 0x00
.byte 0x08, 0x05, 0x00, 0x00
.byte 0x08, 0x04, 0x00, 0x00
.byte 0x08, 0x04, 0x00, 0x00
.byte 0x08, 0x04, 0x00, 0x00
.byte 0x08, 0x04, 0x00, 0x00
data/graphics/trainers/back_pic_palette_table.inc
-10
View File
@@ -1,10 +0,0 @@
.align 2
gTrainerBackPicPaletteTable:: @ 8305D8C
obj_pal gTrainerPalette_Brendan, 0
obj_pal gTrainerPalette_May, 1
obj_pal gTrainerBackPicPalette_Red, 2
obj_pal gTrainerBackPicPalette_Leaf, 3
obj_pal gTrainerPalette_RubySapphireBrendan, 4
obj_pal gTrainerPalette_RubySapphireMay, 5
obj_pal gTrainerPalette_Wally, 6
obj_pal gTrainerPalette_Steven, 7
data/graphics/trainers/back_pic_table.inc
-10
View File
@@ -1,10 +0,0 @@
.align 2
gTrainerBackPicTable:: @ 8305D4C
obj_tiles gTrainerBackPic_Brendan, 0x2000, 0
obj_tiles gTrainerBackPic_May, 0x2000, 1
obj_tiles gTrainerBackPic_Red, 0x2800, 2
obj_tiles gTrainerBackPic_Leaf, 0x2800, 3
obj_tiles gTrainerBackPic_RubySapphireBrendan, 0x2000, 4
obj_tiles gTrainerBackPic_RubySapphireMay, 0x2000, 5
obj_tiles gTrainerBackPic_Wally, 0x2000, 6
obj_tiles gTrainerBackPic_Steven, 0x2000, 7
data/graphics/trainers/front_pic_coords.inc
-95
View File
@@ -1,95 +0,0 @@
.align 2
gTrainerFrontPicCoords:: @ 83054E0
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x02, 0x00, 0x00
.byte 0x08, 0x02, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x02, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x02, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x02, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x02, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
data/graphics/trainers/front_pic_palette_table.inc
-95
View File
@@ -1,95 +0,0 @@
.align 2
gTrainerFrontPicPaletteTable:: @ 830593C
obj_pal gTrainerPalette_Hiker, 0
obj_pal gTrainerPalette_AquaGruntM, 1
obj_pal gTrainerPalette_PokemonBreederF, 2
obj_pal gTrainerPalette_CoolTrainerM, 3
obj_pal gTrainerPalette_BirdKeeper, 4
obj_pal gTrainerPalette_Collector, 5
obj_pal gTrainerPalette_AquaGruntF, 6
obj_pal gTrainerPalette_SwimmerM, 7
obj_pal gTrainerPalette_MagmaGruntM, 8
obj_pal gTrainerPalette_ExpertM, 9
obj_pal gTrainerPalette_AquaAdminM, 10
obj_pal gTrainerPalette_BlackBelt, 11
obj_pal gTrainerPalette_AquaAdminF, 12
obj_pal gTrainerPalette_AquaLeaderArchie, 13
obj_pal gTrainerPalette_HexManiac, 14
obj_pal gTrainerPalette_AromaLady, 15
obj_pal gTrainerPalette_RuinManiac, 16
obj_pal gTrainerPalette_Interviewer, 17
obj_pal gTrainerPalette_TuberF, 18
obj_pal gTrainerPalette_TuberM, 19
obj_pal gTrainerPalette_CoolTrainerF, 20
obj_pal gTrainerPalette_Lady, 21
obj_pal gTrainerPalette_Beauty, 22
obj_pal gTrainerPalette_RichBoy, 23
obj_pal gTrainerPalette_ExpertF, 24
obj_pal gTrainerPalette_Pokemaniac, 25
obj_pal gTrainerPalette_MagmaGruntF, 26
obj_pal gTrainerPalette_Guitarist, 27
obj_pal gTrainerPalette_Kindler, 28
obj_pal gTrainerPalette_Camper, 29
obj_pal gTrainerPalette_Picnicker, 30
obj_pal gTrainerPalette_BugManiac, 31
obj_pal gTrainerPalette_PokemonBreederM, 32
obj_pal gTrainerPalette_PsychicM, 33
obj_pal gTrainerPalette_PsychicF, 34
obj_pal gTrainerPalette_Gentleman, 35
obj_pal gTrainerPalette_EliteFourSidney, 36
obj_pal gTrainerPalette_EliteFourPhoebe, 37
obj_pal gTrainerPalette_EliteFourGlacia, 38
obj_pal gTrainerPalette_EliteFourDrake, 39
obj_pal gTrainerPalette_LeaderRoxanne, 40
obj_pal gTrainerPalette_LeaderBrawly, 41
obj_pal gTrainerPalette_LeaderWattson, 42
obj_pal gTrainerPalette_LeaderFlannery, 43
obj_pal gTrainerPalette_LeaderNorman, 44
obj_pal gTrainerPalette_LeaderWinona, 45
obj_pal gTrainerPalette_LeaderTateAndLiza, 46
obj_pal gTrainerPalette_LeaderJuan, 47
obj_pal gTrainerPalette_SchoolKidM, 48
obj_pal gTrainerPalette_SchoolKidF, 49
obj_pal gTrainerPalette_SrAndJr, 50
obj_pal gTrainerPalette_WinstrateM, 51
obj_pal gTrainerPalette_WinstrateF, 52
obj_pal gTrainerPalette_Youngster, 53
obj_pal gTrainerPalette_ChampionWallace, 54
obj_pal gTrainerPalette_Fisherman, 55
obj_pal gTrainerPalette_CyclingTriathleteM, 56
obj_pal gTrainerPalette_CyclingTriathleteF, 57
obj_pal gTrainerPalette_RunningTriathleteM, 58
obj_pal gTrainerPalette_RunningTriathleteF, 59
obj_pal gTrainerPalette_SwimmingTriathleteM, 60
obj_pal gTrainerPalette_SwimmingTriathleteF, 61
obj_pal gTrainerPalette_DragonTamer, 62
obj_pal gTrainerPalette_NinjaBoy, 63
obj_pal gTrainerPalette_BattleGirl, 64
obj_pal gTrainerPalette_ParasolLady, 65
obj_pal gTrainerPalette_SwimmerF, 66
obj_pal gTrainerPalette_Twins, 67
obj_pal gTrainerPalette_Sailor, 68
obj_pal gTrainerPalette_MagmaAdmin, 69
obj_pal gTrainerPalette_Wally, 70
obj_pal gTrainerPalette_Brendan, 71
obj_pal gTrainerPalette_May, 72
obj_pal gTrainerPalette_BugCatcher, 73
obj_pal gTrainerPalette_PokemonRangerM, 74
obj_pal gTrainerPalette_PokemonRangerF, 75
obj_pal gTrainerPalette_MagmaLeaderMaxie, 76
obj_pal gTrainerPalette_Lass, 77
obj_pal gTrainerPalette_YoungCouple, 78
obj_pal gTrainerPalette_OldCouple, 79
obj_pal gTrainerPalette_SisAndBro, 80
obj_pal gTrainerPalette_Steven, 81
obj_pal gTrainerPalette_SalonMaidenAnabel, 82
obj_pal gTrainerPalette_DomeAceTucker, 83
obj_pal gTrainerPalette_PalaceMavenSpenser, 84
obj_pal gTrainerPalette_ArenaTycoonGreta, 85
obj_pal gTrainerPalette_FactoryHeadNoland, 86
obj_pal gTrainerPalette_PikeQueenLucy, 87
obj_pal gTrainerPalette_PyramidKingBrandon, 88
obj_pal gTrainerPalette_Red, 89
obj_pal gTrainerPalette_Leaf, 90
obj_pal gTrainerPalette_RubySapphireBrendan, 91
obj_pal gTrainerPalette_RubySapphireMay, 92
data/graphics/trainers/front_pic_table.inc
-95
View File
@@ -1,95 +0,0 @@
.align 2
gTrainerFrontPicTable:: @ 8305654
obj_tiles gTrainerFrontPic_Hiker, 0x800, 0
obj_tiles gTrainerFrontPic_AquaGruntM, 0x800, 1
obj_tiles gTrainerFrontPic_PokemonBreederF, 0x800, 2
obj_tiles gTrainerFrontPic_CoolTrainerM, 0x800, 3
obj_tiles gTrainerFrontPic_BirdKeeper, 0x800, 4
obj_tiles gTrainerFrontPic_Collector, 0x800, 5
obj_tiles gTrainerFrontPic_AquaGruntF, 0x800, 6
obj_tiles gTrainerFrontPic_SwimmerM, 0x800, 7
obj_tiles gTrainerFrontPic_MagmaGruntM, 0x800, 8
obj_tiles gTrainerFrontPic_ExpertM, 0x800, 9
obj_tiles gTrainerFrontPic_AquaAdminM, 0x800, 10
obj_tiles gTrainerFrontPic_BlackBelt, 0x800, 11
obj_tiles gTrainerFrontPic_AquaAdminF, 0x800, 12
obj_tiles gTrainerFrontPic_AquaLeaderArchie, 0x800, 13
obj_tiles gTrainerFrontPic_HexManiac, 0x800, 14
obj_tiles gTrainerFrontPic_AromaLady, 0x800, 15
obj_tiles gTrainerFrontPic_RuinManiac, 0x800, 16
obj_tiles gTrainerFrontPic_Interviewer, 0x800, 17
obj_tiles gTrainerFrontPic_TuberF, 0x800, 18
obj_tiles gTrainerFrontPic_TuberM, 0x800, 19
obj_tiles gTrainerFrontPic_CoolTrainerF, 0x800, 20
obj_tiles gTrainerFrontPic_Lady, 0x800, 21
obj_tiles gTrainerFrontPic_Beauty, 0x800, 22
obj_tiles gTrainerFrontPic_RichBoy, 0x800, 23
obj_tiles gTrainerFrontPic_ExpertF, 0x800, 24
obj_tiles gTrainerFrontPic_Pokemaniac, 0x800, 25
obj_tiles gTrainerFrontPic_MagmaGruntF, 0x800, 26
obj_tiles gTrainerFrontPic_Guitarist, 0x800, 27
obj_tiles gTrainerFrontPic_Kindler, 0x800, 28
obj_tiles gTrainerFrontPic_Camper, 0x800, 29
obj_tiles gTrainerFrontPic_Picnicker, 0x800, 30
obj_tiles gTrainerFrontPic_BugManiac, 0x800, 31
obj_tiles gTrainerFrontPic_PokemonBreederM, 0x800, 32
obj_tiles gTrainerFrontPic_PsychicM, 0x800, 33
obj_tiles gTrainerFrontPic_PsychicF, 0x800, 34
obj_tiles gTrainerFrontPic_Gentleman, 0x800, 35
obj_tiles gTrainerFrontPic_EliteFourSidney, 0x800, 36
obj_tiles gTrainerFrontPic_EliteFourPhoebe, 0x800, 37
obj_tiles gTrainerFrontPic_EliteFourGlacia, 0x800, 38
obj_tiles gTrainerFrontPic_EliteFourDrake, 0x800, 39
obj_tiles gTrainerFrontPic_LeaderRoxanne, 0x800, 40
obj_tiles gTrainerFrontPic_LeaderBrawly, 0x800, 41
obj_tiles gTrainerFrontPic_LeaderWattson, 0x800, 42
obj_tiles gTrainerFrontPic_LeaderFlannery, 0x800, 43
obj_tiles gTrainerFrontPic_LeaderNorman, 0x800, 44
obj_tiles gTrainerFrontPic_LeaderWinona, 0x800, 45
obj_tiles gTrainerFrontPic_LeaderTateAndLiza, 0x800, 46
obj_tiles gTrainerFrontPic_LeaderJuan, 0x800, 47
obj_tiles gTrainerFrontPic_SchoolKidM, 0x800, 48
obj_tiles gTrainerFrontPic_SchoolKidF, 0x800, 49
obj_tiles gTrainerFrontPic_SrAndJr, 0x1000, 50
obj_tiles gTrainerFrontPic_WinstrateM, 0x1000, 51
obj_tiles gTrainerFrontPic_WinstrateF, 0x800, 52
obj_tiles gTrainerFrontPic_Youngster, 0x800, 53
obj_tiles gTrainerFrontPic_ChampionWallace, 0x1000, 54
obj_tiles gTrainerFrontPic_Fisherman, 0x800, 55
obj_tiles gTrainerFrontPic_CyclingTriathleteM, 0x1000, 56
obj_tiles gTrainerFrontPic_CyclingTriathleteF, 0x800, 57
obj_tiles gTrainerFrontPic_RunningTriathleteM, 0x800, 58
obj_tiles gTrainerFrontPic_RunningTriathleteF, 0x800, 59
obj_tiles gTrainerFrontPic_SwimmingTriathleteM, 0x800, 60
obj_tiles gTrainerFrontPic_SwimmingTriathleteF, 0x800, 61
obj_tiles gTrainerFrontPic_DragonTamer, 0x800, 62
obj_tiles gTrainerFrontPic_NinjaBoy, 0x800, 63
obj_tiles gTrainerFrontPic_BattleGirl, 0x1000, 64
obj_tiles gTrainerFrontPic_ParasolLady, 0x800, 65
obj_tiles gTrainerFrontPic_SwimmerF, 0x800, 66
obj_tiles gTrainerFrontPic_Twins, 0x800, 67
obj_tiles gTrainerFrontPic_Sailor, 0x800, 68
obj_tiles gTrainerFrontPic_MagmaAdmin, 0x800, 69
obj_tiles gTrainerFrontPic_Wally, 0x800, 70
obj_tiles gTrainerFrontPic_Brendan, 0x800, 71
obj_tiles gTrainerFrontPic_May, 0x800, 72
obj_tiles gTrainerFrontPic_BugCatcher, 0x800, 73
obj_tiles gTrainerFrontPic_PokemonRangerM, 0x800, 74
obj_tiles gTrainerFrontPic_PokemonRangerF, 0x800, 75
obj_tiles gTrainerFrontPic_MagmaLeaderMaxie, 0x800, 76
obj_tiles gTrainerFrontPic_Lass, 0x800, 77
obj_tiles gTrainerFrontPic_YoungCouple, 0x800, 78
obj_tiles gTrainerFrontPic_OldCouple, 0x800, 79
obj_tiles gTrainerFrontPic_SisAndBro, 0x800, 80
obj_tiles gTrainerFrontPic_Steven, 0x800, 81
obj_tiles gTrainerFrontPic_SalonMaidenAnabel, 0x800, 82
obj_tiles gTrainerFrontPic_DomeAceTucker, 0x800, 83
obj_tiles gTrainerFrontPic_PalaceMavenSpenser, 0x800, 84
obj_tiles gTrainerFrontPic_ArenaTycoonGreta, 0x1000, 85
obj_tiles gTrainerFrontPic_FactoryHeadNoland, 0x800, 86
obj_tiles gTrainerFrontPic_PikeQueenLucy, 0x800, 87
obj_tiles gTrainerFrontPic_PyramidKingBrandon, 0x800, 88
obj_tiles gTrainerFrontPic_Red, 0x800, 89
obj_tiles gTrainerFrontPic_Leaf, 0x800, 90
obj_tiles gTrainerFrontPic_RubySapphireBrendan, 0x800, 91
obj_tiles gTrainerFrontPic_RubySapphireMay, 0x800, 92
data/graphics/trainers/graphics.inc
-783
View File
@@ -1,783 +0,0 @@
.align 2
gTrainerFrontPic_Hiker:: @ 8D51DC8
.incbin "graphics/trainers/front_pics/hiker_front_pic.4bpp.lz"
.align 2
gTrainerPalette_Hiker:: @ 8D52248
.incbin "graphics/trainers/palettes/hiker.gbapal.lz"
.align 2
gTrainerFrontPic_AquaGruntM:: @ 8D52270
.incbin "graphics/trainers/front_pics/aqua_grunt_m_front_pic.4bpp.lz"
.align 2
gTrainerPalette_AquaGruntM:: @ 8D525D0
.incbin "graphics/trainers/palettes/aqua_grunt_m.gbapal.lz"
.align 2
gTrainerFrontPic_PokemonBreederF:: @ 8D525F8
.incbin "graphics/trainers/front_pics/pokemon_breeder_f_front_pic.4bpp.lz"
.align 2
gTrainerPalette_PokemonBreederF:: @ 8D5292C
.incbin "graphics/trainers/palettes/pokemon_breeder_f.gbapal.lz"
.align 2
gTrainerFrontPic_CoolTrainerM:: @ 8D52954
.incbin "graphics/trainers/front_pics/cool_trainer_m_front_pic.4bpp.lz"
.align 2
gTrainerPalette_CoolTrainerM:: @ 8D52C3C
.incbin "graphics/trainers/palettes/cool_trainer_m.gbapal.lz"
.align 2
gTrainerFrontPic_BirdKeeper:: @ 8D52C64
.incbin "graphics/trainers/front_pics/bird_keeper_front_pic.4bpp.lz"
.align 2
gTrainerPalette_BirdKeeper:: @ 8D52F9C
.incbin "graphics/trainers/palettes/bird_keeper.gbapal.lz"
.align 2
gTrainerFrontPic_Collector:: @ 8D52FC4
.incbin "graphics/trainers/front_pics/collector_front_pic.4bpp.lz"
.align 2
gTrainerPalette_Collector:: @ 8D533C8
.incbin "graphics/trainers/palettes/collector.gbapal.lz"
.align 2
gTrainerFrontPic_AquaGruntF:: @ 8D533F0
.incbin "graphics/trainers/front_pics/aqua_grunt_f_front_pic.4bpp.lz"
.align 2
gTrainerPalette_AquaGruntF:: @ 8D5372C
.incbin "graphics/trainers/palettes/aqua_grunt_f.gbapal.lz"
.align 2
gTrainerFrontPic_SwimmerM:: @ 8D53754
.incbin "graphics/trainers/front_pics/swimmer_m_front_pic.4bpp.lz"
.align 2
gTrainerPalette_SwimmerM:: @ 8D53A14
.incbin "graphics/trainers/palettes/swimmer_m.gbapal.lz"
.align 2
gTrainerFrontPic_MagmaGruntM:: @ 8D53A3C
.incbin "graphics/trainers/front_pics/magma_grunt_m_front_pic.4bpp.lz"
.align 2
gTrainerPalette_MagmaGruntM:: @ 8D53DBC
.incbin "graphics/trainers/palettes/magma_grunt_m.gbapal.lz"
.align 2
gTrainerFrontPic_ExpertM:: @ 8D53DE4
.incbin "graphics/trainers/front_pics/expert_m_front_pic.4bpp.lz"
.align 2
gTrainerPalette_ExpertM:: @ 8D54124
.incbin "graphics/trainers/palettes/expert_m.gbapal.lz"
.align 2
gTrainerFrontPic_AquaAdminM:: @ 8D5414C
.incbin "graphics/trainers/front_pics/aqua_admin_m_front_pic.4bpp.lz"
.align 2
gTrainerPalette_AquaAdminM:: @ 8D54500
.incbin "graphics/trainers/palettes/aqua_admin_m.gbapal.lz"
.align 2
gTrainerFrontPic_BlackBelt:: @ 8D54528
.incbin "graphics/trainers/front_pics/black_belt_front_pic.4bpp.lz"
.align 2
gTrainerPalette_BlackBelt:: @ 8D5488C
.incbin "graphics/trainers/palettes/black_belt.gbapal.lz"
.align 2
gTrainerFrontPic_AquaAdminF:: @ 8D548B4
.incbin "graphics/trainers/front_pics/aqua_admin_f_front_pic.4bpp.lz"
.align 2
gTrainerPalette_AquaAdminF:: @ 8D54C78
.incbin "graphics/trainers/palettes/aqua_admin_f.gbapal.lz"
.align 2
gTrainerFrontPic_AquaLeaderArchie:: @ 8D54CA0
.incbin "graphics/trainers/front_pics/aqua_leader_archie_front_pic.4bpp.lz"
.align 2
gTrainerPalette_AquaLeaderArchie:: @ 8D54FDC
.incbin "graphics/trainers/palettes/aqua_leader_archie.gbapal.lz"
.align 2
gTrainerFrontPic_HexManiac:: @ 8D55004
.incbin "graphics/trainers/front_pics/hex_maniac_front_pic.4bpp.lz"
.align 2
gTrainerPalette_HexManiac:: @ 8D55370
.incbin "graphics/trainers/palettes/hex_maniac.gbapal.lz"
.align 2
gTrainerFrontPic_AromaLady:: @ 8D55398
.incbin "graphics/trainers/front_pics/aroma_lady_front_pic.4bpp.lz"
.align 2
gTrainerPalette_AromaLady:: @ 8D5565C
.incbin "graphics/trainers/palettes/aroma_lady.gbapal.lz"
.align 2
gTrainerFrontPic_RuinManiac:: @ 8D55684
.incbin "graphics/trainers/front_pics/ruin_maniac_front_pic.4bpp.lz"
.align 2
gTrainerPalette_RuinManiac:: @ 8D55A20
.incbin "graphics/trainers/palettes/ruin_maniac.gbapal.lz"
.align 2
gTrainerFrontPic_Interviewer:: @ 8D55A48
.incbin "graphics/trainers/front_pics/interviewer_front_pic.4bpp.lz"
.align 2
gTrainerPalette_Interviewer:: @ 8D55EEC
.incbin "graphics/trainers/palettes/interviewer.gbapal.lz"
.align 2
gTrainerFrontPic_TuberF:: @ 8D55F14
.incbin "graphics/trainers/front_pics/tuber_f_front_pic.4bpp.lz"
.align 2
gTrainerPalette_TuberF:: @ 8D561B8
.incbin "graphics/trainers/palettes/tuber_f.gbapal.lz"
.align 2
gTrainerFrontPic_TuberM:: @ 8D561E0
.incbin "graphics/trainers/front_pics/tuber_m_front_pic.4bpp.lz"
.align 2
gTrainerPalette_TuberM:: @ 8D5646C
.incbin "graphics/trainers/palettes/tuber_m.gbapal.lz"
.align 2
gTrainerFrontPic_CoolTrainerF:: @ 8D56494
.incbin "graphics/trainers/front_pics/cool_trainer_f_front_pic.4bpp.lz"
.align 2
gTrainerPalette_CoolTrainerF:: @ 8D567A8
.incbin "graphics/trainers/palettes/cool_trainer_f.gbapal.lz"
.align 2
gTrainerFrontPic_Lady:: @ 8D567D0
.incbin "graphics/trainers/front_pics/lady_front_pic.4bpp.lz"
.align 2
gTrainerPalette_Lady:: @ 8D56B84
.incbin "graphics/trainers/palettes/lady.gbapal.lz"
.align 2
gTrainerFrontPic_Beauty:: @ 8D56BAC
.incbin "graphics/trainers/front_pics/beauty_front_pic.4bpp.lz"
.align 2
gTrainerPalette_Beauty:: @ 8D56E94
.incbin "graphics/trainers/palettes/beauty.gbapal.lz"
.align 2
gTrainerFrontPic_RichBoy:: @ 8D56EBC
.incbin "graphics/trainers/front_pics/rich_boy_front_pic.4bpp.lz"
.align 2
gTrainerPalette_RichBoy:: @ 8D57170
.incbin "graphics/trainers/palettes/rich_boy.gbapal.lz"
.align 2
gTrainerFrontPic_ExpertF:: @ 8D57198
.incbin "graphics/trainers/front_pics/expert_f_front_pic.4bpp.lz"
.align 2
gTrainerPalette_ExpertF:: @ 8D574B4
.incbin "graphics/trainers/palettes/expert_f.gbapal.lz"
.align 2
gTrainerFrontPic_Pokemaniac:: @ 8D574DC
.incbin "graphics/trainers/front_pics/pokemaniac_front_pic.4bpp.lz"
.align 2
gTrainerPalette_Pokemaniac:: @ 8D5784C
.incbin "graphics/trainers/palettes/pokemaniac.gbapal.lz"
.align 2
gTrainerFrontPic_MagmaGruntF:: @ 8D57874
.incbin "graphics/trainers/front_pics/magma_grunt_f_front_pic.4bpp.lz"
.align 2
gTrainerPalette_MagmaGruntF:: @ 8D57C00
.incbin "graphics/trainers/palettes/magma_grunt_f.gbapal.lz"
.align 2
gTrainerFrontPic_Guitarist:: @ 8D57C28
.incbin "graphics/trainers/front_pics/guitarist_front_pic.4bpp.lz"
.align 2
gTrainerPalette_Guitarist:: @ 8D57FAC
.incbin "graphics/trainers/palettes/guitarist.gbapal.lz"
.align 2
gTrainerFrontPic_Kindler:: @ 8D57FD4
.incbin "graphics/trainers/front_pics/kindler_front_pic.4bpp.lz"
.align 2
gTrainerPalette_Kindler:: @ 8D58340
.incbin "graphics/trainers/palettes/kindler.gbapal.lz"
.align 2
gTrainerFrontPic_Camper:: @ 8D58368
.incbin "graphics/trainers/front_pics/camper_front_pic.4bpp.lz"
.align 2
gTrainerPalette_Camper:: @ 8D58650
.incbin "graphics/trainers/palettes/camper.gbapal.lz"
.align 2
gTrainerFrontPic_Picnicker:: @ 8D58678
.incbin "graphics/trainers/front_pics/picnicker_front_pic.4bpp.lz"
.align 2
gTrainerPalette_Picnicker:: @ 8D58958
.incbin "graphics/trainers/palettes/picnicker.gbapal.lz"
.align 2
gTrainerFrontPic_BugManiac:: @ 8D58980
.incbin "graphics/trainers/front_pics/bug_maniac_front_pic.4bpp.lz"
.align 2
gTrainerPalette_BugManiac:: @ 8D58DD0
.incbin "graphics/trainers/palettes/bug_maniac.gbapal.lz"
.align 2
gTrainerFrontPic_PokemonBreederM:: @ 8D58DF8
.incbin "graphics/trainers/front_pics/pokemon_breeder_m_front_pic.4bpp.lz"
.align 2
gTrainerPalette_PokemonBreederM:: @ 8D59128
.incbin "graphics/trainers/palettes/pokemon_breeder_m.gbapal.lz"
.align 2
gTrainerFrontPic_PsychicM:: @ 8D59150
.incbin "graphics/trainers/front_pics/psychic_m_front_pic.4bpp.lz"
.align 2
gTrainerPalette_PsychicM:: @ 8D5947C
.incbin "graphics/trainers/palettes/psychic_m.gbapal.lz"
.align 2
gTrainerFrontPic_PsychicF:: @ 8D594A4
.incbin "graphics/trainers/front_pics/psychic_f_front_pic.4bpp.lz"
.align 2
gTrainerPalette_PsychicF:: @ 8D597CC
.incbin "graphics/trainers/palettes/psychic_f.gbapal.lz"
.align 2
gTrainerFrontPic_Gentleman:: @ 8D597F4
.incbin "graphics/trainers/front_pics/gentleman_front_pic.4bpp.lz"
.align 2
gTrainerPalette_Gentleman:: @ 8D59AF4
.incbin "graphics/trainers/palettes/gentleman.gbapal.lz"
.align 2
gTrainerFrontPic_EliteFourSidney:: @ 8D59B1C
.incbin "graphics/trainers/front_pics/elite_four_sidney_front_pic.4bpp.lz"
.align 2
gTrainerPalette_EliteFourSidney:: @ 8D59E50
.incbin "graphics/trainers/palettes/elite_four_sidney.gbapal.lz"
.align 2
gTrainerFrontPic_EliteFourPhoebe:: @ 8D59E78
.incbin "graphics/trainers/front_pics/elite_four_phoebe_front_pic.4bpp.lz"
.align 2
gTrainerPalette_EliteFourPhoebe:: @ 8D5A178
.incbin "graphics/trainers/palettes/elite_four_phoebe.gbapal.lz"
.align 2
gTrainerFrontPic_EliteFourGlacia:: @ 8D5A1A0
.incbin "graphics/trainers/front_pics/elite_four_glacia_front_pic.4bpp.lz"
.align 2
gTrainerPalette_EliteFourGlacia:: @ 8D5A524
.incbin "graphics/trainers/palettes/elite_four_glacia.gbapal.lz"
.align 2
gTrainerFrontPic_EliteFourDrake:: @ 8D5A54C
.incbin "graphics/trainers/front_pics/elite_four_drake_front_pic.4bpp.lz"
.align 2
gTrainerPalette_EliteFourDrake:: @ 8D5A8F4
.incbin "graphics/trainers/palettes/elite_four_drake.gbapal.lz"
.align 2
gTrainerFrontPic_LeaderRoxanne:: @ 8D5A91C
.incbin "graphics/trainers/front_pics/leader_roxanne_front_pic.4bpp.lz"
.align 2
gTrainerPalette_LeaderRoxanne:: @ 8D5AC08
.incbin "graphics/trainers/palettes/leader_roxanne.gbapal.lz"
.align 2
gTrainerFrontPic_LeaderBrawly:: @ 8D5AC30
.incbin "graphics/trainers/front_pics/leader_brawly_front_pic.4bpp.lz"
.align 2
gTrainerPalette_LeaderBrawly:: @ 8D5AFC4
.incbin "graphics/trainers/palettes/leader_brawly.gbapal.lz"
.align 2
gTrainerFrontPic_LeaderWattson:: @ 8D5AFEC
.incbin "graphics/trainers/front_pics/leader_wattson_front_pic.4bpp.lz"
.align 2
gTrainerPalette_LeaderWattson:: @ 8D5B334
.incbin "graphics/trainers/palettes/leader_wattson.gbapal.lz"
.align 2
gTrainerFrontPic_LeaderFlannery:: @ 8D5B35C
.incbin "graphics/trainers/front_pics/leader_flannery_front_pic.4bpp.lz"
.align 2
gTrainerPalette_LeaderFlannery:: @ 8D5B6DC
.incbin "graphics/trainers/palettes/leader_flannery.gbapal.lz"
.align 2
gTrainerFrontPic_LeaderNorman:: @ 8D5B704
.incbin "graphics/trainers/front_pics/leader_norman_front_pic.4bpp.lz"
.align 2
gTrainerPalette_LeaderNorman:: @ 8D5BA40
.incbin "graphics/trainers/palettes/leader_norman.gbapal.lz"
.align 2
gTrainerFrontPic_LeaderWinona:: @ 8D5BA68
.incbin "graphics/trainers/front_pics/leader_winona_front_pic.4bpp.lz"
.align 2
gTrainerPalette_LeaderWinona:: @ 8D5BDE8
.incbin "graphics/trainers/palettes/leader_winona.gbapal.lz"
.align 2
gTrainerFrontPic_LeaderTateAndLiza:: @ 8D5BE10
.incbin "graphics/trainers/front_pics/leader_tate_and_liza_front_pic.4bpp.lz"
.align 2
gTrainerPalette_LeaderTateAndLiza:: @ 8D5C254
.incbin "graphics/trainers/palettes/leader_tate_and_liza.gbapal.lz"
.align 2
gTrainerFrontPic_LeaderJuan:: @ 8D5C27C
.incbin "graphics/trainers/front_pics/leader_juan_front_pic.4bpp.lz"
.align 2
gTrainerPalette_LeaderJuan:: @ 8D5C624
.incbin "graphics/trainers/palettes/leader_juan.gbapal.lz"
.align 2
gTrainerFrontPic_SchoolKidM:: @ 8D5C64C
.incbin "graphics/trainers/front_pics/school_kid_m_front_pic.4bpp.lz"
.align 2
gTrainerPalette_SchoolKidM:: @ 8D5C90C
.incbin "graphics/trainers/palettes/school_kid_m.gbapal.lz"
.align 2
gTrainerFrontPic_SchoolKidF:: @ 8D5C934
.incbin "graphics/trainers/front_pics/school_kid_f_front_pic.4bpp.lz"
.align 2
gTrainerPalette_SchoolKidF:: @ 8D5CBD0
.incbin "graphics/trainers/palettes/school_kid_f.gbapal.lz"
.align 2
gTrainerFrontPic_SrAndJr:: @ 8D5CBF8
.incbin "graphics/trainers/front_pics/sr_and_jr_front_pic.4bpp.lz"
.align 2
gTrainerPalette_SrAndJr:: @ 8D5D068
.incbin "graphics/trainers/palettes/sr_and_jr.gbapal.lz"
.align 2
gTrainerFrontPic_WinstrateM:: @ 8D5D090
.incbin "graphics/trainers/front_pics/winstrate_m_front_pic.4bpp.lz"
.align 2
gTrainerPalette_WinstrateM:: @ 8D5D44C
.incbin "graphics/trainers/palettes/winstrate_m.gbapal.lz"
.align 2
gTrainerFrontPic_WinstrateF:: @ 8D5D474
.incbin "graphics/trainers/front_pics/winstrate_f_front_pic.4bpp.lz"
.align 2
gTrainerPalette_WinstrateF:: @ 8D5D840
.incbin "graphics/trainers/palettes/winstrate_f.gbapal.lz"
.align 2
gTrainerFrontPic_Youngster:: @ 8D5D868
.incbin "graphics/trainers/front_pics/youngster_front_pic.4bpp.lz"
.align 2
gTrainerPalette_Youngster:: @ 8D5DB10
.incbin "graphics/trainers/palettes/youngster.gbapal.lz"
.align 2
gTrainerFrontPic_ChampionWallace:: @ 8D5DB38
.incbin "graphics/trainers/front_pics/champion_wallace_front_pic.4bpp.lz"
.align 2
gTrainerPalette_ChampionWallace:: @ 8D5DF8C
.incbin "graphics/trainers/palettes/champion_wallace.gbapal.lz"
.align 2
gTrainerFrontPic_Fisherman:: @ 8D5DFB4
.incbin "graphics/trainers/front_pics/fisherman_front_pic.4bpp.lz"
.align 2
gTrainerPalette_Fisherman:: @ 8D5E398
.incbin "graphics/trainers/palettes/fisherman.gbapal.lz"
.align 2
gTrainerFrontPic_CyclingTriathleteM:: @ 8D5E3C0
.incbin "graphics/trainers/front_pics/cycling_triathlete_m_front_pic.4bpp.lz"
.align 2
gTrainerPalette_CyclingTriathleteM:: @ 8D5E7D0
.incbin "graphics/trainers/palettes/cycling_triathlete_m.gbapal.lz"
.align 2
gTrainerFrontPic_CyclingTriathleteF:: @ 8D5E7F8
.incbin "graphics/trainers/front_pics/cycling_triathlete_f_front_pic.4bpp.lz"
.align 2
gTrainerPalette_CyclingTriathleteF:: @ 8D5EC04
.incbin "graphics/trainers/palettes/cycling_triathlete_f.gbapal.lz"
.align 2
gTrainerFrontPic_RunningTriathleteM:: @ 8D5EC2C
.incbin "graphics/trainers/front_pics/running_triathlete_m_front_pic.4bpp.lz"
.align 2
gTrainerPalette_RunningTriathleteM:: @ 8D5EEE4
.incbin "graphics/trainers/palettes/running_triathlete_m.gbapal.lz"
.align 2
gTrainerFrontPic_RunningTriathleteF:: @ 8D5EF0C
.incbin "graphics/trainers/front_pics/running_triathlete_f_front_pic.4bpp.lz"
.align 2
gTrainerPalette_RunningTriathleteF:: @ 8D5F1B0
.incbin "graphics/trainers/palettes/running_triathlete_f.gbapal.lz"
.align 2
gTrainerFrontPic_SwimmingTriathleteM:: @ 8D5F1D8
.incbin "graphics/trainers/front_pics/swimming_triathlete_m_front_pic.4bpp.lz"
.align 2
gTrainerPalette_SwimmingTriathleteM:: @ 8D5F504
.incbin "graphics/trainers/palettes/swimming_triathlete_m.gbapal.lz"
.align 2
gTrainerFrontPic_SwimmingTriathleteF:: @ 8D5F52C
.incbin "graphics/trainers/front_pics/swimming_triathlete_f_front_pic.4bpp.lz"
.align 2
gTrainerPalette_SwimmingTriathleteF:: @ 8D5F808
.incbin "graphics/trainers/palettes/swimming_triathlete_f.gbapal.lz"
.align 2
gTrainerFrontPic_DragonTamer:: @ 8D5F830
.incbin "graphics/trainers/front_pics/dragon_tamer_front_pic.4bpp.lz"
.align 2
gTrainerPalette_DragonTamer:: @ 8D5FB84
.incbin "graphics/trainers/palettes/dragon_tamer.gbapal.lz"
.align 2
gTrainerFrontPic_NinjaBoy:: @ 8D5FBAC
.incbin "graphics/trainers/front_pics/ninja_boy_front_pic.4bpp.lz"
.align 2
gTrainerPalette_NinjaBoy:: @ 8D5FE88
.incbin "graphics/trainers/palettes/ninja_boy.gbapal.lz"
.align 2
gTrainerFrontPic_BattleGirl:: @ 8D5FEB0
.incbin "graphics/trainers/front_pics/battle_girl_front_pic.4bpp.lz"
.align 2
gTrainerPalette_BattleGirl:: @ 8D601D0
.incbin "graphics/trainers/palettes/battle_girl.gbapal.lz"
.align 2
gTrainerFrontPic_ParasolLady:: @ 8D601F8
.incbin "graphics/trainers/front_pics/parasol_lady_front_pic.4bpp.lz"
.align 2
gTrainerPalette_ParasolLady:: @ 8D60530
.incbin "graphics/trainers/palettes/parasol_lady.gbapal.lz"
.align 2
gTrainerFrontPic_SwimmerF:: @ 8D60558
.incbin "graphics/trainers/front_pics/swimmer_f_front_pic.4bpp.lz"
.align 2
gTrainerPalette_SwimmerF:: @ 8D60828
.incbin "graphics/trainers/palettes/swimmer_f.gbapal.lz"
.align 2
gTrainerFrontPic_Twins:: @ 8D60850
.incbin "graphics/trainers/front_pics/twins_front_pic.4bpp.lz"
.align 2
gTrainerPalette_Twins:: @ 8D60C14
.incbin "graphics/trainers/palettes/twins.gbapal.lz"
.align 2
gTrainerFrontPic_Sailor:: @ 8D60C3C
.incbin "graphics/trainers/front_pics/sailor_front_pic.4bpp.lz"
.align 2
gTrainerPalette_Sailor:: @ 8D60FEC
.incbin "graphics/trainers/palettes/sailor.gbapal.lz"
.align 2
gTrainerFrontPic_MagmaAdmin:: @ 8D61014
.incbin "graphics/trainers/front_pics/magma_admin_front_pic.4bpp.lz"
.align 2
gTrainerPalette_MagmaAdmin:: @ 8D613EC
.incbin "graphics/trainers/palettes/magma_admin.gbapal.lz"
.align 2
gTrainerFrontPic_Wally:: @ 8D61414
.incbin "graphics/trainers/front_pics/wally_front_pic.4bpp.lz"
.align 2
gTrainerPalette_Wally:: @ 8D616E4
.incbin "graphics/trainers/palettes/wally.gbapal.lz"
.align 2
gTrainerFrontPic_Brendan:: @ 8D6170C
.incbin "graphics/trainers/front_pics/brendan_front_pic.4bpp.lz"
.align 2
gTrainerPalette_Brendan:: @ 8D61A30
.incbin "graphics/trainers/palettes/brendan.gbapal.lz"
.align 2
gTrainerFrontPic_May:: @ 8D61A58
.incbin "graphics/trainers/front_pics/may_front_pic.4bpp.lz"
.align 2
gTrainerPalette_May:: @ 8D61D58
.incbin "graphics/trainers/palettes/may.gbapal.lz"
.align 2
gTrainerFrontPic_BugCatcher:: @ 8D61D80
.incbin "graphics/trainers/front_pics/bug_catcher_front_pic.4bpp.lz"
.align 2
gTrainerPalette_BugCatcher:: @ 8D620AC
.incbin "graphics/trainers/palettes/bug_catcher.gbapal.lz"
.align 2
gTrainerFrontPic_PokemonRangerM:: @ 8D620D4
.incbin "graphics/trainers/front_pics/pokemon_ranger_m_front_pic.4bpp.lz"
.align 2
gTrainerPalette_PokemonRangerM:: @ 8D6241C
.incbin "graphics/trainers/palettes/pokemon_ranger_m.gbapal.lz"
.align 2
gTrainerFrontPic_PokemonRangerF:: @ 8D62444
.incbin "graphics/trainers/front_pics/pokemon_ranger_f_front_pic.4bpp.lz"
.align 2
gTrainerPalette_PokemonRangerF:: @ 8D62778
.incbin "graphics/trainers/palettes/pokemon_ranger_f.gbapal.lz"
.align 2
gTrainerFrontPic_MagmaLeaderMaxie:: @ 8D627A0
.incbin "graphics/trainers/front_pics/magma_leader_maxie_front_pic.4bpp.lz"
.align 2
gTrainerPalette_MagmaLeaderMaxie:: @ 8D62A94
.incbin "graphics/trainers/palettes/magma_leader_maxie.gbapal.lz"
.align 2
gTrainerFrontPic_Lass:: @ 8D62ABC
.incbin "graphics/trainers/front_pics/lass_front_pic.4bpp.lz"
.align 2
gTrainerPalette_Lass:: @ 8D62D94
.incbin "graphics/trainers/palettes/lass.gbapal.lz"
.align 2
gTrainerFrontPic_YoungCouple:: @ 8D62DBC
.incbin "graphics/trainers/front_pics/young_couple_front_pic.4bpp.lz"
.align 2
gTrainerPalette_YoungCouple:: @ 8D6317C
.incbin "graphics/trainers/palettes/young_couple.gbapal.lz"
.align 2
gTrainerFrontPic_OldCouple:: @ 8D631A4
.incbin "graphics/trainers/front_pics/old_couple_front_pic.4bpp.lz"
.align 2
gTrainerPalette_OldCouple:: @ 8D636B4
.incbin "graphics/trainers/palettes/old_couple.gbapal.lz"
.align 2
gTrainerFrontPic_SisAndBro:: @ 8D636DC
.incbin "graphics/trainers/front_pics/sis_and_bro_front_pic.4bpp.lz"
.align 2
gTrainerPalette_SisAndBro:: @ 8D63B28
.incbin "graphics/trainers/palettes/sis_and_bro.gbapal.lz"
.align 2
gTrainerFrontPic_Steven:: @ 8D63B50
.incbin "graphics/trainers/front_pics/steven_front_pic.4bpp.lz"
.align 2
gTrainerPalette_Steven:: @ 8D63E88
.incbin "graphics/trainers/palettes/steven.gbapal.lz"
.align 2
gTrainerFrontPic_SalonMaidenAnabel:: @ 8D63EB0
.incbin "graphics/trainers/front_pics/salon_maiden_anabel_front_pic.4bpp.lz"
.align 2
gTrainerPalette_SalonMaidenAnabel:: @ 8D641B8
.incbin "graphics/trainers/palettes/salon_maiden_anabel.gbapal.lz"
.align 2
gTrainerFrontPic_DomeAceTucker:: @ 8D641E0
.incbin "graphics/trainers/front_pics/dome_ace_tucker_front_pic.4bpp.lz"
.align 2
gTrainerPalette_DomeAceTucker:: @ 8D645E4
.incbin "graphics/trainers/palettes/dome_ace_tucker.gbapal.lz"
.align 2
gTrainerFrontPic_PalaceMavenSpenser:: @ 8D6460C
.incbin "graphics/trainers/front_pics/palace_maven_spenser_front_pic.4bpp.lz"
.align 2
gTrainerPalette_PalaceMavenSpenser:: @ 8D649B0
.incbin "graphics/trainers/palettes/palace_maven_spenser.gbapal.lz"
.align 2
gTrainerFrontPic_ArenaTycoonGreta:: @ 8D649D8
.incbin "graphics/trainers/front_pics/arena_tycoon_greta_front_pic.4bpp.lz"
.align 2
gTrainerPalette_ArenaTycoonGreta:: @ 8D64D08
.incbin "graphics/trainers/palettes/arena_tycoon_greta.gbapal.lz"
.align 2
gTrainerFrontPic_FactoryHeadNoland:: @ 8D64D30
.incbin "graphics/trainers/front_pics/factory_head_noland_front_pic.4bpp.lz"
.align 2
gTrainerPalette_FactoryHeadNoland:: @ 8D650AC
.incbin "graphics/trainers/palettes/factory_head_noland.gbapal.lz"
.align 2
gTrainerFrontPic_PikeQueenLucy:: @ 8D650D4
.incbin "graphics/trainers/front_pics/pike_queen_lucy_front_pic.4bpp.lz"
.align 2
gTrainerPalette_PikeQueenLucy:: @ 8D653C8
.incbin "graphics/trainers/palettes/pike_queen_lucy.gbapal.lz"
.align 2
gTrainerFrontPic_PyramidKingBrandon:: @ 8D653F0
.incbin "graphics/trainers/front_pics/pyramid_king_brandon_front_pic.4bpp.lz"
.align 2
gTrainerPalette_PyramidKingBrandon:: @ 8D6575C
.incbin "graphics/trainers/palettes/pyramid_king_brandon.gbapal.lz"
.align 2
gTrainerFrontPic_Red:: @ 8D65784
.incbin "graphics/trainers/front_pics/red_front_pic.4bpp.lz"
.align 2
gTrainerPalette_Red:: @ 8D65A90
.incbin "graphics/trainers/palettes/red.gbapal.lz"
.align 2
gTrainerFrontPic_Leaf:: @ 8D65AB8
.incbin "graphics/trainers/front_pics/leaf_front_pic.4bpp.lz"
.align 2
gTrainerPalette_Leaf:: @ 8D65DF4
.incbin "graphics/trainers/palettes/leaf.gbapal.lz"
.align 2
gTrainerFrontPic_RubySapphireBrendan:: @ 8D65E1C
.incbin "graphics/trainers/front_pics/ruby_sapphire_brendan_front_pic.4bpp.lz"
.align 2
gTrainerPalette_RubySapphireBrendan:: @ 8D66130
.incbin "graphics/trainers/palettes/ruby_sapphire_brendan.gbapal.lz"
.align 2
gTrainerFrontPic_RubySapphireMay:: @ 8D66158
.incbin "graphics/trainers/front_pics/ruby_sapphire_may_front_pic.4bpp.lz"
.align 2
gTrainerPalette_RubySapphireMay:: @ 8D66458
.incbin "graphics/trainers/palettes/ruby_sapphire_may.gbapal.lz"
.align 2
gTrainerBackPic_Brendan:: @ 8D66480
.incbin "graphics/trainers/back_pics/brendan_back_pic.4bpp"
.align 2
gTrainerBackPic_May:: @ 8D68480
.incbin "graphics/trainers/back_pics/may_back_pic.4bpp"
.align 2
gTrainerBackPic_Red:: @ 8D6A480
.incbin "graphics/trainers/back_pics/red_back_pic.4bpp"
.align 2
gTrainerBackPic_Leaf:: @ 8D6CC80
.incbin "graphics/trainers/back_pics/leaf_back_pic.4bpp"
.align 2
gTrainerBackPic_RubySapphireBrendan:: @ 8D6F480
.incbin "graphics/trainers/back_pics/ruby_sapphire_brendan_back_pic.4bpp"
.align 2
gTrainerBackPic_RubySapphireMay:: @ 8D71480
.incbin "graphics/trainers/back_pics/ruby_sapphire_may_back_pic.4bpp"
.align 2
gTrainerBackPic_Wally:: @ 8D73480
.incbin "graphics/trainers/back_pics/wally_back_pic.4bpp"
.align 2
gTrainerBackPic_Steven:: @ 8D75480
.incbin "graphics/trainers/back_pics/steven_back_pic.4bpp"
.align 2
gTrainerBackPicPalette_Red:: @ 8D77480
.incbin "graphics/trainers/palettes/red_back_pic.gbapal.lz"
.align 2
gTrainerBackPicPalette_Leaf:: @ 8D774A8
.incbin "graphics/trainers/palettes/leaf_back_pic.gbapal.lz"
data/learn_move.s
-93
View File
@@ -1,93 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
gUnknown_085CE9F8:: @ 85CE9F8
.incbin "graphics/interface/ui_learn_move.gbapal"
gUnknown_085CEA18:: @ 85CEA18
.incbin "graphics/interface/ui_learn_move.4bpp"
gUnknown_085CEB98:: @ 85CEB98
.2byte 0
.2byte 0
.2byte 0
.2byte 0
.2byte 0x8000
.2byte 0
.2byte 0
.2byte 0
.2byte 0x4000
.2byte 0
.2byte 0
.2byte 0
gUnknown_085CEBB0:: @ 85CEBB0
obj_tiles gUnknown_085CEA18, 0x180, 0x1595
gUnknown_085CEBB8:: @ 85CEBB8
obj_pal gUnknown_085CE9F8, 0x1596
gUnknown_085CEBC0:: @ 85CEBC0
.byte 0
.byte 0x1B
.byte 16
.byte 1
.byte 0x75
.byte 16
.2byte 0xFFFF
.2byte 0xFFFF
.2byte 0x14CD
.2byte 0x14CD
.byte 0, 0
gUnknown_085CEBD0:: @ 85CEBD0
.byte 2
.byte 0xC0
.byte 8
.byte 3
.byte 0xC0
.byte 0x68
.2byte 0
.2byte 0
.2byte 0x1531
.2byte 0x1531
.byte 0, 0
gUnknown_085CEBE0:: @ 85CEBE0
.2byte 8
.2byte 5
.2byte 0xFFFF
.2byte 0
gUnknown_085CEBE8:: @ 85CEBE8
.2byte 9
.2byte 5
.2byte 0xFFFF
.2byte 0
gUnknown_085CEBF0:: @ 85CEBF0
.2byte 10
.2byte 5
.2byte 0xFFFF
.2byte 0
gUnknown_085CEBF8:: @ 85CEBF8
.2byte 11
.2byte 5
.2byte 0xFFFF
.2byte 0
gUnknown_085CEC00:: @ 85CEC00
.4byte gUnknown_085CEBE0
.4byte gUnknown_085CEBE8
.4byte gUnknown_085CEBF0
.4byte gUnknown_085CEBF8
gUnknown_085CEC10:: @ 85CEC10
spr_template 0x1595, 0x1596, gUnknown_085CEB98, gUnknown_085CEC00, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
gUnknown_085CEC28:: @ 85CEC28
.4byte 0x1F0
.4byte 0x11E1
data/maps/AbandonedShip_HiddenFloorRooms/scripts.inc
+4 -4
View File
@@ -43,7 +43,7 @@ AbandonedShip_HiddenFloorRooms_EventScript_238CE3:: @ 8238CE3
setfieldeffectargument 1, 10
setfieldeffectargument 2, 0
dofieldeffect 54
specialvar VAR_RESULT, sub_81392F8
specialvar VAR_RESULT, FoundAbandonedShipRoom4Key
compare VAR_RESULT, 0
call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_238DD3
waitfieldeffect 54
@@ -54,7 +54,7 @@ AbandonedShip_HiddenFloorRooms_EventScript_238D0C:: @ 8238D0C
end
AbandonedShip_HiddenFloorRooms_EventScript_238D0D:: @ 8238D0D
specialvar VAR_RESULT, sub_81392AC
specialvar VAR_RESULT, FoundAbandonedShipRoom1Key
compare VAR_RESULT, 1
goto_eq AbandonedShip_HiddenFloorRooms_EventScript_238D32
delay 20
@@ -77,7 +77,7 @@ AbandonedShip_HiddenFloorRooms_EventScript_238D33:: @ 8238D33
setfieldeffectargument 1, 3
setfieldeffectargument 2, 0
dofieldeffect 54
specialvar VAR_RESULT, sub_8139320
specialvar VAR_RESULT, FoundAbandonedShipRoom6Key
compare VAR_RESULT, 0
call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_238DE3
waitfieldeffect 54
@@ -98,7 +98,7 @@ AbandonedShip_HiddenFloorRooms_EventScript_238D6B:: @ 8238D6B
setfieldeffectargument 1, 6
setfieldeffectargument 2, 0
dofieldeffect 54
specialvar VAR_RESULT, sub_81392D4
specialvar VAR_RESULT, FoundAbandonedShipRoom2Key
compare VAR_RESULT, 0
call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_238DC3
waitfieldeffect 54
data/maps/AncientTomb/scripts.inc
+2 -2
View File
@@ -10,7 +10,7 @@ AncientTomb_MapScript1_238FC3: @ 8238FC3
end
AncientTomb_EventScript_238FCD:: @ 8238FCD
specialvar VAR_RESULT, sub_8138B80
specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 7
goto_if 5, AncientTomb_EventScript_27374E
removeobject VAR_LAST_TALKED
@@ -75,7 +75,7 @@ AncientTomb_EventScript_23905A:: @ 823905A
special StartRegiBattle
waitstate
clearflag FLAG_SYS_CTRL_OBJ_DELETE
specialvar VAR_RESULT, sub_8138B80
specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 1
goto_eq AncientTomb_EventScript_2390A1
compare VAR_RESULT, 4
data/maps/AquaHideout_B1F/scripts.inc
+3 -3
View File
@@ -9,7 +9,7 @@ AquaHideout_B1F_MapScript1_2339B2: @ 82339B2
end
AquaHideout_B1F_EventScript_2339BC:: @ 82339BC
specialvar VAR_RESULT, sub_8138B80
specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 7
goto_if 5, AquaHideout_B1F_EventScript_27374E
removeobject VAR_LAST_TALKED
@@ -41,7 +41,7 @@ AquaHideout_B1F_EventScript_2339EB:: @ 82339EB
setflag FLAG_SYS_CTRL_OBJ_DELETE
dowildbattle
clearflag FLAG_SYS_CTRL_OBJ_DELETE
specialvar VAR_RESULT, sub_8138B80
specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 1
goto_eq AquaHideout_B1F_EventScript_233A2F
compare VAR_RESULT, 4
@@ -68,7 +68,7 @@ AquaHideout_B1F_EventScript_233A38:: @ 8233A38
setflag FLAG_SYS_CTRL_OBJ_DELETE
dowildbattle
clearflag FLAG_SYS_CTRL_OBJ_DELETE
specialvar VAR_RESULT, sub_8138B80
specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 1
goto_eq AquaHideout_B1F_EventScript_233A7C
compare VAR_RESULT, 4
data/maps/BattleFrontier_BattleArenaLobby/scripts.inc
+1 -1
View File
@@ -133,7 +133,7 @@ BattleFrontier_BattleArenaLobby_EventScript_255DF4:: @ 8255DF4
lock
faceplayer
setvar VAR_FRONTIER_FACILITY, 3
setvar VAR_0x40CE, 0
setvar VAR_FRONTIER_BATTLE_MODE, 0
special SavePlayerParty
msgbox BattleFrontier_BattleArenaLobby_Text_256166, 4
data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc
+16 -16
View File
@@ -7,7 +7,7 @@ BattleFrontier_BattleDomeBattleRoom_MapScripts:: @ 824BC9C
BattleFrontier_BattleDomeBattleRoom_MapScript1_24BCB1: @ 824BCB1
setvar VAR_0x8004, 10
special sub_818E9AC
special CallBattleDomeFunction
setvar VAR_0x8004, 1
setvar VAR_0x8005, 2
special sub_81A1780
@@ -72,7 +72,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BD61:: @ 824BD61
BattleFrontier_BattleDomeBattleRoom_EventScript_24BD82:: @ 824BD82
setvar VAR_0x8004, 4
special sub_818E9AC
special CallBattleDomeFunction
msgbox BattleFrontier_BattleDomeBattleRoom_Text_24C990, 4
closemessage
applymovement 13, BattleFrontier_BattleDomeBattleRoom_Movement_24C77B
@@ -84,7 +84,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BD82:: @ 824BD82
msgbox 0x2021fc4, 4
closemessage
setvar VAR_0x8004, 5
special sub_818E9AC
special CallBattleDomeFunction
call BattleFrontier_BattleDomeBattleRoom_EventScript_24C440
setvar VAR_TEMP_2, 0
switch VAR_RESULT
@@ -109,7 +109,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BDF7:: @ 824BDF7
compare VAR_TEMP_2, 2
goto_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24BE4F
setvar VAR_0x8004, 19
special sub_818E9AC
special CallBattleDomeFunction
switch VAR_RESULT
case 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24BEE0
@@ -117,7 +117,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BE4F:: @ 824BE4F
applymovement 1, BattleFrontier_BattleDomeBattleRoom_Movement_2725B4
waitmovement 0
setvar VAR_0x8004, 4
special sub_818E9AC
special CallBattleDomeFunction
compare VAR_TEMP_2, 0
call_if 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24BEB1
compare VAR_TEMP_2, 1
@@ -131,7 +131,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BE4F:: @ 824BE4F
BattleFrontier_BattleDomeBattleRoom_EventScript_24BE8D:: @ 824BE8D
setvar VAR_0x8004, 12
setvar VAR_0x8005, 2
special sub_818E9AC
special CallBattleDomeFunction
BattleFrontier_BattleDomePreBattleRoom_EventScript_24BE9A:: @ 824BE9A
setvar VAR_0x8004, 2
@@ -173,10 +173,10 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BEE0:: @ 824BEE0
call BattleFrontier_BattleDomeBattleRoom_EventScript_24C82E
delay 60
setvar VAR_0x8004, 3
special sub_818E9AC
special CallBattleDomeFunction
setvar VAR_0x8004, 12
setvar VAR_0x8005, 1
special sub_818E9AC
special CallBattleDomeFunction
setvar VAR_0x8004, 1
setvar VAR_0x8005, 2
special sub_81A1780
@@ -227,17 +227,17 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BFCC:: @ 824BFCC
BattleFrontier_BattleDomeBattleRoom_EventScript_24BFD5:: @ 824BFD5
setvar VAR_0x8004, 1
setvar VAR_0x8005, 6
special sub_818E9AC
special CallBattleDomeFunction
compare VAR_RESULT, 0
goto_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24C023
setvar VAR_0x8004, 1
setvar VAR_0x8005, 7
special sub_818E9AC
special CallBattleDomeFunction
compare VAR_RESULT, 0
goto_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24C076
setvar VAR_0x8004, 1
setvar VAR_0x8005, 1
special sub_818E9AC
special CallBattleDomeFunction
compare VAR_RESULT, 0
goto_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24C16A
goto BattleFrontier_BattleDomeBattleRoom_EventScript_24C0C9
@@ -446,7 +446,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C2B9:: @ 824C2B9
msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D0F6, 4
setvar VAR_0x8004, 12
setvar VAR_0x8005, 1
special sub_818E9AC
special CallBattleDomeFunction
setvar VAR_0x8004, 12
special sub_81A1780
compare VAR_RESULT, 0
@@ -485,7 +485,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C373:: @ 824C373
msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D0F6, 4
setvar VAR_0x8004, 12
setvar VAR_0x8005, 1
special sub_818E9AC
special CallBattleDomeFunction
setvar VAR_0x8004, 12
special sub_81A1780
compare VAR_RESULT, 2
@@ -536,10 +536,10 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C440:: @ 824C440
waitstate
setvar VAR_TEMP_9, 0
setvar VAR_0x8004, 17
special sub_818E9AC
special CallBattleDomeFunction
special HealPlayerParty
setvar VAR_0x8004, 16
special sub_818E9AC
special CallBattleDomeFunction
return
BattleFrontier_BattleDomeBattleRoom_MapScript2_24C481: @ 824C481
@@ -950,7 +950,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C82E:: @ 824C82E
BattleFrontier_BattleDomeBattleRoom_EventScript_24C8F5:: @ 824C8F5
BattleFrontier_BattleDomePreBattleRoom_EventScript_24C8F5:: @ 824C8F5
copyvar VAR_RESULT, VAR_0x40CE
copyvar VAR_RESULT, VAR_FRONTIER_BATTLE_MODE
compare VAR_RESULT, 1
goto_eq BattleFrontier_BattleDomePreBattleRoom_EventScript_24C90F
warp MAP_BATTLE_FRONTIER_BATTLE_DOME_LOBBY, 255, 5, 11
data/maps/BattleFrontier_BattleDomeLobby/scripts.inc
+33 -33
View File
@@ -6,7 +6,7 @@ BattleFrontier_BattleDomeLobby_MapScripts:: @ 82497E2
BattleFrontier_BattleDomeLobby_MapScript1_2497F2: @ 82497F2
setvar VAR_0x8004, 21
special sub_818E9AC
special CallBattleDomeFunction
end
BattleFrontier_BattleDomeLobby_MapScript2_2497FB: @ 82497FB
@@ -39,15 +39,15 @@ BattleFrontier_BattleDomeLobby_EventScript_249842:: @ 8249842
setvar VAR_0x8004, 2
setvar VAR_0x8005, 0
setvar VAR_0x8006, 0
special sub_818E9AC
special CallBattleDomeFunction
setvar VAR_0x8004, 2
setvar VAR_0x8005, 1
setvar VAR_0x8006, 0
special sub_818E9AC
special CallBattleDomeFunction
setvar VAR_0x8004, 2
setvar VAR_0x8005, 6
setvar VAR_0x8006, 1
special sub_818E9AC
special CallBattleDomeFunction
setvar VAR_0x8004, 2
setvar VAR_0x8005, 0
setvar VAR_0x8006, 0
@@ -85,15 +85,15 @@ BattleFrontier_BattleDomeLobby_EventScript_2498C9:: @ 82498C9
setvar VAR_0x8004, 2
setvar VAR_0x8005, 6
setvar VAR_0x8006, 1
special sub_818E9AC
special CallBattleDomeFunction
setvar VAR_0x8004, 2
setvar VAR_0x8005, 7
setvar VAR_0x8006, 1
special sub_818E9AC
special CallBattleDomeFunction
setvar VAR_0x8004, 2
setvar VAR_0x8005, 1
setvar VAR_0x8006, 1
special sub_818E9AC
special CallBattleDomeFunction
special LoadPlayerParty
special HealPlayerParty
goto BattleFrontier_BattleDomeLobby_EventScript_249991
@@ -112,18 +112,18 @@ BattleFrontier_BattleDomeLobby_EventScript_249940:: @ 8249940
setvar VAR_0x8004, 2
setvar VAR_0x8005, 1
setvar VAR_0x8006, 0
special sub_818E9AC
special CallBattleDomeFunction
setvar VAR_0x8004, 2
setvar VAR_0x8005, 6
setvar VAR_0x8006, 1
special sub_818E9AC
special CallBattleDomeFunction
special LoadPlayerParty
special HealPlayerParty
BattleFrontier_BattleDomeLobby_EventScript_249991:: @ 8249991
setvar VAR_0x8004, 13
setvar VAR_0x8005, 0
special sub_818E9AC
special CallBattleDomeFunction
playse SE_SAVE
waitse
call BattleFrontier_BattleDomeLobby_EventScript_23E8E0
@@ -154,7 +154,7 @@ BattleFrontier_BattleDomeLobby_EventScript_2499F9:: @ 82499F9
waitmessage
setvar VAR_0x8004, 13
setvar VAR_0x8005, 1
special sub_818E9AC
special CallBattleDomeFunction
playse SE_SAVE
waitse
setvar VAR_0x8004, 2
@@ -168,7 +168,7 @@ BattleFrontier_BattleDomeLobby_EventScript_249A35:: @ 8249A35
lock
faceplayer
setvar VAR_FRONTIER_FACILITY, 1
setvar VAR_0x40CE, 0
setvar VAR_FRONTIER_BATTLE_MODE, 0
goto BattleFrontier_BattleDomeLobby_EventScript_249A59
end
@@ -176,21 +176,21 @@ BattleFrontier_BattleDomeLobby_EventScript_249A47:: @ 8249A47
lock
faceplayer
setvar VAR_FRONTIER_FACILITY, 1
setvar VAR_0x40CE, 1
setvar VAR_FRONTIER_BATTLE_MODE, 1
goto BattleFrontier_BattleDomeLobby_EventScript_249A59
end
BattleFrontier_BattleDomeLobby_EventScript_249A59:: @ 8249A59
special SavePlayerParty
compare VAR_0x40CE, 0
compare VAR_FRONTIER_BATTLE_MODE, 0
call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249CFD
compare VAR_0x40CE, 1
compare VAR_FRONTIER_BATTLE_MODE, 1
call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249D06
BattleFrontier_BattleDomeLobby_EventScript_249A72:: @ 8249A72
compare VAR_0x40CE, 0
compare VAR_FRONTIER_BATTLE_MODE, 0
call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249D0F
compare VAR_0x40CE, 1
compare VAR_FRONTIER_BATTLE_MODE, 1
call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249D15
waitmessage
multichoice 17, 6, 23, 0
@@ -236,7 +236,7 @@ BattleFrontier_BattleDomeLobby_EventScript_249B60:: @ 8249B60
setvar VAR_0x8005, 4
special sub_81A1780
setvar VAR_0x8004, 0
special sub_818E9AC
special CallBattleDomeFunction
setvar VAR_0x8004, 2
setvar VAR_0x8005, 0
setvar VAR_0x8006, 1
@@ -253,7 +253,7 @@ BattleFrontier_BattleDomeLobby_EventScript_249B60:: @ 8249B60
compare VAR_RESULT, 0
goto_eq BattleFrontier_BattleDomeLobby_EventScript_249C4A
setvar VAR_0x8004, 22
special sub_818E9AC
special CallBattleDomeFunction
BattleFrontier_BattleDomeLobby_EventScript_249BC2:: @ 8249BC2
special SavePlayerParty
@@ -261,7 +261,7 @@ BattleFrontier_BattleDomeLobby_EventScript_249BC2:: @ 8249BC2
setvar VAR_0x8005, 3
special sub_81A1780
setvar VAR_0x8004, 15
special sub_818E9AC
special CallBattleDomeFunction
msgbox BattleFrontier_BattleDomeLobby_Text_24A437, 4
closemessage
call BattleFrontier_BattleDomeLobby_EventScript_249C6E
@@ -272,9 +272,9 @@ BattleFrontier_BattleDomeLobby_EventScript_249BC2:: @ 8249BC2
end
BattleFrontier_BattleDomeLobby_EventScript_249BFA:: @ 8249BFA
compare VAR_0x40CE, 0
compare VAR_FRONTIER_BATTLE_MODE, 0
call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249D1B
compare VAR_0x40CE, 1
compare VAR_FRONTIER_BATTLE_MODE, 1
call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249D24
goto BattleFrontier_BattleDomeLobby_EventScript_249A72
@@ -309,26 +309,26 @@ BattleFrontier_BattleDomeLobby_EventScript_249C6C:: @ 8249C6C
end
BattleFrontier_BattleDomeLobby_EventScript_249C6E:: @ 8249C6E
compare VAR_0x40CE, 0
compare VAR_FRONTIER_BATTLE_MODE, 0
call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249CDD
compare VAR_0x40CE, 1
compare VAR_FRONTIER_BATTLE_MODE, 1
call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249CE5
applymovement 255, BattleFrontier_BattleDomeLobby_Movement_249D45
waitmovement 0
compare VAR_0x40CE, 0
compare VAR_FRONTIER_BATTLE_MODE, 0
call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249D2D
compare VAR_0x40CE, 1
compare VAR_FRONTIER_BATTLE_MODE, 1
call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249D33
waitdooranim
compare VAR_0x40CE, 0
compare VAR_FRONTIER_BATTLE_MODE, 0
call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249CED
compare VAR_0x40CE, 1
compare VAR_FRONTIER_BATTLE_MODE, 1
call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249CF5
applymovement 255, BattleFrontier_BattleDomeLobby_Movement_249D4E
waitmovement 0
compare VAR_0x40CE, 0
compare VAR_FRONTIER_BATTLE_MODE, 0
call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249D39
compare VAR_0x40CE, 1
compare VAR_FRONTIER_BATTLE_MODE, 1
call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249D3F
waitdooranim
return
@@ -433,7 +433,7 @@ BattleFrontier_BattleDomeLobby_EventScript_249D6B:: @ 8249D6B
BattleFrontier_BattleDomeLobby_EventScript_249D84:: @ 8249D84
setvar VAR_0x8004, 1
setvar VAR_0x8005, 9
special sub_818E9AC
special CallBattleDomeFunction
compare VAR_RESULT, 0
call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249DC9
compare VAR_RESULT, 1
@@ -444,7 +444,7 @@ BattleFrontier_BattleDomeLobby_EventScript_249D84:: @ 8249D84
call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249DE4
fadescreen 1
setvar VAR_0x8004, 8
special sub_818E9AC
special CallBattleDomeFunction
waitstate
end
@@ -466,7 +466,7 @@ BattleFrontier_BattleDomeLobby_EventScript_249DE4:: @ 8249DE4
BattleFrontier_BattleDomeLobby_EventScript_249DED:: @ 8249DED
setvar VAR_0x8004, 20
special sub_818E9AC
special CallBattleDomeFunction
msgbox BattleFrontier_BattleDomeLobby_Text_24AA76, 2
end
data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc
+8 -8
View File
@@ -87,7 +87,7 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B377:: @ 824B377
BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3A9:: @ 824B3A9
setvar VAR_0x8004, 12
setvar VAR_0x8005, 9
special sub_818E9AC
special CallBattleDomeFunction
goto BattleFrontier_BattleDomePreBattleRoom_EventScript_24BE9A
BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3BB:: @ 824B3BB
@@ -95,7 +95,7 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3BB:: @ 824B3BB
waitmessage
setvar VAR_0x8004, 13
setvar VAR_0x8005, 2
special sub_818E9AC
special CallBattleDomeFunction
playse SE_SAVE
waitse
fadescreen 1
@@ -107,7 +107,7 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3DD:: @ 824B3DD
msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24B9B5, 4
fadescreen 1
setvar VAR_0x8004, 6
special sub_818E9AC
special CallBattleDomeFunction
waitstate
goto BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F
@@ -115,7 +115,7 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3F5:: @ 824B3F5
call BattleFrontier_BattleDomePreBattleRoom_EventScript_24B40A
fadescreen 1
setvar VAR_0x8004, 7
special sub_818E9AC
special CallBattleDomeFunction
waitstate
goto BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F
@@ -162,11 +162,11 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B46D:: @ 824B46D
goto_eq BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F
setvar VAR_0x8004, 2
setvar VAR_0x8005, 8
special sub_818E9AC
special CallBattleDomeFunction
setvar VAR_0x8004, 18
special sub_818E9AC
special CallBattleDomeFunction
setvar VAR_0x8004, 9
special sub_818E9AC
special CallBattleDomeFunction
msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24B748, 4
closemessage
applymovement 1, BattleFrontier_BattleDomePreBattleRoom_Movement_24B64F
@@ -253,7 +253,7 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5C7:: @ 824B5C7
call BattleFrontier_BattleDomePreBattleRoom_EventScript_24B600
fadescreen 1
setvar VAR_0x8004, 11
special sub_818E9AC
special CallBattleDomeFunction
waitstate
goto BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F
data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc
+1 -1
View File
@@ -291,7 +291,7 @@ BattleFrontier_BattleFactoryBattleRoom_Movement_25B18B: @ 825B18B
BattleFrontier_BattleFactoryBattleRoom_EventScript_25B190:: @ 825B190
BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25B190:: @ 825B190
copyvar VAR_RESULT, VAR_0x40CE
copyvar VAR_RESULT, VAR_FRONTIER_BATTLE_MODE
compare VAR_RESULT, 1
goto_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25B1AA
warp MAP_BATTLE_FRONTIER_BATTLE_FACTORY_LOBBY, 255, 4, 8
data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc
+10 -10
View File
@@ -143,27 +143,27 @@ BattleFrontier_BattleFactoryLobby_EventScript_2585CB:: @ 82585CB
lock
faceplayer
setvar VAR_FRONTIER_FACILITY, 4
setvar VAR_0x40CE, 0
setvar VAR_FRONTIER_BATTLE_MODE, 0
goto BattleFrontier_BattleFactoryLobby_EventScript_2585ED
end
BattleFrontier_BattleFactoryLobby_EventScript_2585DD:: @ 82585DD
setvar VAR_FRONTIER_FACILITY, 4
setvar VAR_0x40CE, 1
setvar VAR_FRONTIER_BATTLE_MODE, 1
goto BattleFrontier_BattleFactoryLobby_EventScript_2585ED
end
BattleFrontier_BattleFactoryLobby_EventScript_2585ED:: @ 82585ED
special SavePlayerParty
compare VAR_0x40CE, 0
compare VAR_FRONTIER_BATTLE_MODE, 0
call_if 1, BattleFrontier_BattleFactoryLobby_EventScript_2587B1
compare VAR_0x40CE, 1
compare VAR_FRONTIER_BATTLE_MODE, 1
call_if 1, BattleFrontier_BattleFactoryLobby_EventScript_2587BA
BattleFrontier_BattleFactoryLobby_EventScript_258606:: @ 8258606
compare VAR_0x40CE, 0
compare VAR_FRONTIER_BATTLE_MODE, 0
call_if 1, BattleFrontier_BattleFactoryLobby_EventScript_2587C3
compare VAR_0x40CE, 1
compare VAR_FRONTIER_BATTLE_MODE, 1
call_if 1, BattleFrontier_BattleFactoryLobby_EventScript_2587C9
waitmessage
multichoice 17, 6, 23, 0
@@ -218,9 +218,9 @@ BattleFrontier_BattleFactoryLobby_EventScript_25871A:: @ 825871A
special SavePlayerParty
msgbox BattleFrontier_BattleFactoryLobby_Text_258CB1, 4
closemessage
compare VAR_0x40CE, 0
compare VAR_FRONTIER_BATTLE_MODE, 0
call_if 1, BattleFrontier_BattleFactoryLobby_EventScript_25875C
compare VAR_0x40CE, 1
compare VAR_FRONTIER_BATTLE_MODE, 1
call_if 1, BattleFrontier_BattleFactoryLobby_EventScript_258762
applymovement VAR_LAST_TALKED, BattleFrontier_BattleFactoryLobby_Movement_2587A7
applymovement 255, BattleFrontier_BattleFactoryLobby_Movement_2587AC
@@ -239,9 +239,9 @@ BattleFrontier_BattleFactoryLobby_EventScript_258762:: @ 8258762
return
BattleFrontier_BattleFactoryLobby_EventScript_258768:: @ 8258768
compare VAR_0x40CE, 0
compare VAR_FRONTIER_BATTLE_MODE, 0
call_if 1, BattleFrontier_BattleFactoryLobby_EventScript_2587CF
compare VAR_0x40CE, 1
compare VAR_FRONTIER_BATTLE_MODE, 1
call_if 1, BattleFrontier_BattleFactoryLobby_EventScript_2587D8
goto BattleFrontier_BattleFactoryLobby_EventScript_258606
data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc
+1 -1
View File
@@ -459,7 +459,7 @@ BattleFrontier_BattlePalaceBattleRoom_Movement_24FEB6: @ 824FEB6
step_end
BattleFrontier_BattlePalaceBattleRoom_EventScript_24FEBB:: @ 824FEBB
copyvar VAR_RESULT, VAR_0x40CE
copyvar VAR_RESULT, VAR_FRONTIER_BATTLE_MODE
compare VAR_RESULT, 1
goto_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24FED5
warp MAP_BATTLE_FRONTIER_BATTLE_PALACE_LOBBY, 255, 5, 7
data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc
+13 -13
View File
@@ -134,7 +134,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24D944:: @ 824D944
lock
faceplayer
setvar VAR_FRONTIER_FACILITY, 2
setvar VAR_0x40CE, 0
setvar VAR_FRONTIER_BATTLE_MODE, 0
goto BattleFrontier_BattlePalaceLobby_EventScript_24D968
end
@@ -142,7 +142,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24D956:: @ 824D956
lock
faceplayer
setvar VAR_FRONTIER_FACILITY, 2
setvar VAR_0x40CE, 1
setvar VAR_FRONTIER_BATTLE_MODE, 1
goto BattleFrontier_BattlePalaceLobby_EventScript_24D968
end
@@ -153,15 +153,15 @@ BattleFrontier_BattlePalaceLobby_EventScript_24D968:: @ 824D968
compare VAR_RESULT, 0
goto_if 5, BattleFrontier_BattlePalaceLobby_EventScript_24D817
special SavePlayerParty
compare VAR_0x40CE, 0
compare VAR_FRONTIER_BATTLE_MODE, 0
call_if 1, BattleFrontier_BattlePalaceLobby_EventScript_24DB9E
compare VAR_0x40CE, 1
compare VAR_FRONTIER_BATTLE_MODE, 1
call_if 1, BattleFrontier_BattlePalaceLobby_EventScript_24DBA7
BattleFrontier_BattlePalaceLobby_EventScript_24D999:: @ 824D999
compare VAR_0x40CE, 0
compare VAR_FRONTIER_BATTLE_MODE, 0
call_if 1, BattleFrontier_BattlePalaceLobby_EventScript_24DBB0
compare VAR_0x40CE, 1
compare VAR_FRONTIER_BATTLE_MODE, 1
call_if 1, BattleFrontier_BattlePalaceLobby_EventScript_24DBB6
waitmessage
multichoice 17, 6, 23, 0
@@ -242,7 +242,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24DAF3:: @ 824DAF3
end
BattleFrontier_BattlePalaceLobby_EventScript_24DB20:: @ 824DB20
compare VAR_0x40CE, 1
compare VAR_FRONTIER_BATTLE_MODE, 1
goto_eq BattleFrontier_BattlePalaceLobby_EventScript_24DB38
msgbox BattleFrontier_BattlePalaceLobby_Text_24DE17, 4
goto BattleFrontier_BattlePalaceLobby_EventScript_24D999
@@ -298,24 +298,24 @@ BattleFrontier_BattlePalaceLobby_EventScript_24DBB6:: @ 824DBB6
return
BattleFrontier_BattlePalaceLobby_EventScript_24DBBC:: @ 824DBBC
compare VAR_0x40CE, 0
compare VAR_FRONTIER_BATTLE_MODE, 0
call_if 1, BattleFrontier_BattlePalaceLobby_EventScript_24DC23
compare VAR_0x40CE, 1
compare VAR_FRONTIER_BATTLE_MODE, 1
call_if 1, BattleFrontier_BattlePalaceLobby_EventScript_24DC29
applymovement VAR_LAST_TALKED, BattleFrontier_BattlePalaceLobby_Movement_24DC47
applymovement 255, BattleFrontier_BattlePalaceLobby_Movement_24DC47
waitmovement 0
compare VAR_0x40CE, 0
compare VAR_FRONTIER_BATTLE_MODE, 0
call_if 1, BattleFrontier_BattlePalaceLobby_EventScript_24DC2F
compare VAR_0x40CE, 1
compare VAR_FRONTIER_BATTLE_MODE, 1
call_if 1, BattleFrontier_BattlePalaceLobby_EventScript_24DC35
waitdooranim
applymovement VAR_LAST_TALKED, BattleFrontier_BattlePalaceLobby_Movement_24DC49
applymovement 255, BattleFrontier_BattlePalaceLobby_Movement_24DC4C
waitmovement 0
compare VAR_0x40CE, 0
compare VAR_FRONTIER_BATTLE_MODE, 0
call_if 1, BattleFrontier_BattlePalaceLobby_EventScript_24DC3B
compare VAR_0x40CE, 1
compare VAR_FRONTIER_BATTLE_MODE, 1
call_if 1, BattleFrontier_BattlePalaceLobby_EventScript_24DC41
waitdooranim
return
data/maps/BattleFrontier_BattlePikeLobby/scripts.inc
+1 -1
View File
@@ -126,7 +126,7 @@ BattleFrontier_BattlePikeLobby_EventScript_25B868:: @ 825B868
lock
faceplayer
setvar VAR_FRONTIER_FACILITY, 5
setvar VAR_0x40CE, 0
setvar VAR_FRONTIER_BATTLE_MODE, 0
special SavePlayerParty
msgbox BattleFrontier_BattlePikeLobby_Text_25BB52, 4
data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc
+1 -1
View File
@@ -130,7 +130,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_2508B1:: @ 82508B1
lock
faceplayer
setvar VAR_FRONTIER_FACILITY, 6
setvar VAR_0x40CE, 0
setvar VAR_FRONTIER_BATTLE_MODE, 0
special SavePlayerParty
msgbox BattleFrontier_BattlePyramidLobby_Text_250F31, 4
data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc
+2 -2
View File
@@ -366,7 +366,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_24210E:: @ 824210E
setvar VAR_0x8005, 0
special sub_8163AC4
waitstate
copyvar VAR_0x8004, VAR_0x40CE
copyvar VAR_0x8004, VAR_FRONTIER_BATTLE_MODE
compare VAR_0x8004, 3
goto_eq BattleFrontier_BattleTowerBattleRoom_EventScript_24215A
setvar VAR_0x8004, 18
@@ -484,7 +484,7 @@ BattleFrontier_BattleTowerBattleRoom_Movement_2421B2: @ 82421B2
BattleFrontier_BattleTowerBattleRoom2_EventScript_2421B8:: @ 82421B8
BattleFrontier_BattleTowerBattleRoom_EventScript_2421B8:: @ 82421B8
copyvar VAR_RESULT, VAR_0x40CE
copyvar VAR_RESULT, VAR_FRONTIER_BATTLE_MODE
compare VAR_RESULT, 1
goto_eq BattleFrontier_BattleTowerBattleRoom_EventScript_2421E8
compare VAR_RESULT, 2
data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc
+7 -7
View File
@@ -5,9 +5,9 @@ BattleFrontier_BattleTowerBattleRoom2_MapScripts:: @ 8248EE8
.byte 0
BattleFrontier_BattleTowerBattleRoom2_MapScript1_248EF8: @ 8248EF8
compare VAR_0x40CE, 2
compare VAR_FRONTIER_BATTLE_MODE, 2
call_if 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_248F0F
compare VAR_0x40CE, 3
compare VAR_FRONTIER_BATTLE_MODE, 3
call_if 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_248F2F
end
@@ -70,7 +70,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_248FB4:: @ 8248FB4
applymovement 1, BattleFrontier_BattleTowerBattleRoom2_Movement_249528
applymovement 4, BattleFrontier_BattleTowerBattleRoom2_Movement_24952E
waitmovement 0
compare VAR_0x40CE, 3
compare VAR_FRONTIER_BATTLE_MODE, 3
goto_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_249026
setvar VAR_0x8004, 7
setvar VAR_0x8005, 0
@@ -142,7 +142,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_2490AA:: @ 82490AA
applymovement 5, BattleFrontier_BattleTowerBattleRoom2_Movement_249524
applymovement 6, BattleFrontier_BattleTowerBattleRoom2_Movement_249524
waitmovement 0
compare VAR_0x40CE, 3
compare VAR_FRONTIER_BATTLE_MODE, 3
goto_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_249118
msgbox BattleFrontier_BattleTowerBattleRoom2_Text_242217, 4
goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249121
@@ -157,7 +157,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_249121:: @ 8249121
setvar VAR_0x8004, 3
setvar VAR_0x8005, 2
special sub_81A1780
compare VAR_0x40CE, 3
compare VAR_FRONTIER_BATTLE_MODE, 3
call_if 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_249514
playfanfare MUS_ME_ASA
waitfanfare
@@ -168,7 +168,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_249143:: @ 8249143
setvar VAR_0x8005, 2
special sub_81A1780
call BattleFrontier_BattleTowerBattleRoom2_EventScript_2492FD
compare VAR_0x40CE, 3
compare VAR_FRONTIER_BATTLE_MODE, 3
goto_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_249283
call BattleFrontier_BattleTowerBattleRoom2_EventScript_23E8E0
compare VAR_RESULT, 1
@@ -256,7 +256,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_2492DB:: @ 82492DB
end
BattleFrontier_BattleTowerBattleRoom2_EventScript_2492FD:: @ 82492FD
compare VAR_0x40CE, 3
compare VAR_FRONTIER_BATTLE_MODE, 3
goto_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_24937E
copyvar VAR_TEMP_F, VAR_RESULT
switch VAR_TEMP_F
data/maps/BattleFrontier_BattleTowerCorridor2/scripts.inc
+6 -6
View File
@@ -5,9 +5,9 @@ BattleFrontier_BattleTowerCorridor2_MapScripts:: @ 8248D4A
.byte 0
BattleFrontier_BattleTowerCorridor2_MapScript1_248D5A: @ 8248D5A
compare VAR_0x40CE, 2
compare VAR_FRONTIER_BATTLE_MODE, 2
call_if 1, BattleFrontier_BattleTowerCorridor2_EventScript_248D71
compare VAR_0x40CE, 3
compare VAR_FRONTIER_BATTLE_MODE, 3
call_if 1, BattleFrontier_BattleTowerCorridor2_EventScript_248D91
end
@@ -87,13 +87,13 @@ BattleFrontier_BattleTowerCorridor2_EventScript_248DBC:: @ 8248DBC
end
BattleFrontier_BattleTowerCorridor2_EventScript_248E71:: @ 8248E71
compare VAR_0x40CE, 0
compare VAR_FRONTIER_BATTLE_MODE, 0
call_if 1, BattleFrontier_BattleTowerCorridor2_EventScript_248E9E
compare VAR_0x40CE, 1
compare VAR_FRONTIER_BATTLE_MODE, 1
call_if 1, BattleFrontier_BattleTowerCorridor2_EventScript_248E9E
compare VAR_0x40CE, 2
compare VAR_FRONTIER_BATTLE_MODE, 2
call_if 1, BattleFrontier_BattleTowerCorridor2_EventScript_248EA8
compare VAR_0x40CE, 3
compare VAR_FRONTIER_BATTLE_MODE, 3
call_if 1, BattleFrontier_BattleTowerCorridor2_EventScript_248EB2
return
data/maps/BattleFrontier_BattleTowerElevator/scripts.inc
+5 -5
View File
@@ -14,7 +14,7 @@ BattleFrontier_BattleTowerElevator_EventScript_2419F0:: @ 82419F0
waitmovement 0
special sub_813A080
waitse
special sub_8139A78
special ShakeScreenInElevator
waitstate
delay 48
applymovement 1, BattleFrontier_BattleTowerElevator_Movement_241A8E
@@ -24,13 +24,13 @@ BattleFrontier_BattleTowerElevator_EventScript_2419F0:: @ 82419F0
end
BattleFrontier_BattleTowerElevator_EventScript_241A28:: @ 8241A28
compare VAR_0x40CE, 0
compare VAR_FRONTIER_BATTLE_MODE, 0
call_if 1, BattleFrontier_BattleTowerElevator_EventScript_241A55
compare VAR_0x40CE, 1
compare VAR_FRONTIER_BATTLE_MODE, 1
call_if 1, BattleFrontier_BattleTowerElevator_EventScript_241A55
compare VAR_0x40CE, 2
compare VAR_FRONTIER_BATTLE_MODE, 2
call_if 1, BattleFrontier_BattleTowerElevator_EventScript_241A5F
compare VAR_0x40CE, 3
compare VAR_FRONTIER_BATTLE_MODE, 3
call_if 1, BattleFrontier_BattleTowerElevator_EventScript_241A72
return
data/maps/BattleFrontier_BattleTowerLobby/scripts.inc
+25 -25
View File
@@ -119,7 +119,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23E7E2:: @ 823E7E2
end
BattleFrontier_BattleTowerLobby_EventScript_23E7F2:: @ 823E7F2
compare VAR_0x40CE, 2
compare VAR_FRONTIER_BATTLE_MODE, 2
goto_if 5, BattleFrontier_BattleTowerLobby_EventScript_23E81E
checkflag FLAG_0x152
goto_eq BattleFrontier_BattleTowerLobby_EventScript_23E81E
@@ -214,7 +214,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23E8E0:: @ 823E8E0
BattleFrontier_BattleTowerLobby_EventScript_23E8EE:: @ 823E8EE
lock
faceplayer
compare VAR_0x40CE, 0
compare VAR_FRONTIER_BATTLE_MODE, 0
call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23E930
message BattleFrontier_BattleTowerLobby_Text_23F737
waitmessage
@@ -254,7 +254,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23E948:: @ 823E948
case 127, BattleFrontier_BattleTowerLobby_EventScript_23F0E6
BattleFrontier_BattleTowerLobby_EventScript_23E984:: @ 823E984
setvar VAR_0x40CE, 0
setvar VAR_FRONTIER_BATTLE_MODE, 0
message BattleFrontier_BattleTowerLobby_Text_23FD3B
waitmessage
multichoice 17, 6, 24, 0
@@ -334,7 +334,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EAB1:: @ 823EAB1
case 127, BattleFrontier_BattleTowerLobby_EventScript_23F0E6
BattleFrontier_BattleTowerLobby_EventScript_23EAED:: @ 823EAED
setvar VAR_0x40CE, 1
setvar VAR_FRONTIER_BATTLE_MODE, 1
message BattleFrontier_BattleTowerLobby_Text_23FD3B
waitmessage
multichoice 17, 6, 24, 0
@@ -415,7 +415,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EC1D:: @ 823EC1D
case 127, BattleFrontier_BattleTowerLobby_EventScript_23F0E6
BattleFrontier_BattleTowerLobby_EventScript_23EC59:: @ 823EC59
setvar VAR_0x40CE, 2
setvar VAR_FRONTIER_BATTLE_MODE, 2
message BattleFrontier_BattleTowerLobby_Text_23FD3B
waitmessage
multichoice 17, 6, 24, 0
@@ -495,7 +495,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23ED86:: @ 823ED86
case 127, BattleFrontier_BattleTowerLobby_EventScript_23F0E6
BattleFrontier_BattleTowerLobby_EventScript_23EDC2:: @ 823EDC2
setvar VAR_0x40CE, 3
setvar VAR_FRONTIER_BATTLE_MODE, 3
message BattleFrontier_BattleTowerLobby_Text_23FD3B
waitmessage
multichoice 17, 6, 24, 0
@@ -679,7 +679,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23F02B:: @ 823F02B
case 1, BattleFrontier_BattleTowerLobby_EventScript_23F08B
BattleFrontier_BattleTowerLobby_EventScript_23F046:: @ 823F046
switch VAR_0x40CE
switch VAR_FRONTIER_BATTLE_MODE
case 0, BattleFrontier_BattleTowerLobby_EventScript_23F06F
case 1, BattleFrontier_BattleTowerLobby_EventScript_23F07D
msgbox BattleFrontier_BattleTowerLobby_Text_24038B, 4
@@ -697,7 +697,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23F07D:: @ 823F07D
end
BattleFrontier_BattleTowerLobby_EventScript_23F08B:: @ 823F08B
switch VAR_0x40CE
switch VAR_FRONTIER_BATTLE_MODE
case 0, BattleFrontier_BattleTowerLobby_EventScript_23F0B4
case 1, BattleFrontier_BattleTowerLobby_EventScript_23F0C2
msgbox BattleFrontier_BattleTowerLobby_Text_24046B, 4
@@ -754,7 +754,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23F108:: @ 823F108
BattleFrontier_BattleTowerLobby_EventScript_23F135:: @ 823F135
call BattleFrontier_BattleTowerLobby_EventScript_23F1A7
compare VAR_0x40CE, 3
compare VAR_FRONTIER_BATTLE_MODE, 3
goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F152
msgbox BattleFrontier_BattleTowerLobby_Text_23FE11, 4
goto BattleFrontier_BattleTowerLobby_EventScript_23F15B
@@ -807,13 +807,13 @@ BattleFrontier_BattleTowerLobby_Movement_23F1A0: @ 823F1A0
step_end
BattleFrontier_BattleTowerLobby_EventScript_23F1A7:: @ 823F1A7
compare VAR_0x40CE, 0
compare VAR_FRONTIER_BATTLE_MODE, 0
call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F1D4
compare VAR_0x40CE, 1
compare VAR_FRONTIER_BATTLE_MODE, 1
call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F1D9
compare VAR_0x40CE, 2
compare VAR_FRONTIER_BATTLE_MODE, 2
call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F1DE
compare VAR_0x40CE, 3
compare VAR_FRONTIER_BATTLE_MODE, 3
call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F1E3
return
@@ -834,13 +834,13 @@ BattleFrontier_BattleTowerLobby_EventScript_23F1E3:: @ 823F1E3
return
BattleFrontier_BattleTowerLobby_EventScript_23F1E8:: @ 823F1E8
compare VAR_0x40CE, 0
compare VAR_FRONTIER_BATTLE_MODE, 0
call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F215
compare VAR_0x40CE, 1
compare VAR_FRONTIER_BATTLE_MODE, 1
call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F21B
compare VAR_0x40CE, 2
compare VAR_FRONTIER_BATTLE_MODE, 2
call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F221
compare VAR_0x40CE, 3
compare VAR_FRONTIER_BATTLE_MODE, 3
call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F227
return
@@ -861,13 +861,13 @@ BattleFrontier_BattleTowerLobby_EventScript_23F227:: @ 823F227
return
BattleFrontier_BattleTowerLobby_EventScript_23F22D:: @ 823F22D
compare VAR_0x40CE, 0
compare VAR_FRONTIER_BATTLE_MODE, 0
call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F25A
compare VAR_0x40CE, 1
compare VAR_FRONTIER_BATTLE_MODE, 1
call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F260
compare VAR_0x40CE, 2
compare VAR_FRONTIER_BATTLE_MODE, 2
call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F266
compare VAR_0x40CE, 3
compare VAR_FRONTIER_BATTLE_MODE, 3
call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F26C
return
@@ -888,13 +888,13 @@ BattleFrontier_BattleTowerLobby_EventScript_23F26C:: @ 823F26C
return
BattleFrontier_BattleTowerLobby_EventScript_23F272:: @ 823F272
compare VAR_0x40CE, 0
compare VAR_FRONTIER_BATTLE_MODE, 0
call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F29F
compare VAR_0x40CE, 1
compare VAR_FRONTIER_BATTLE_MODE, 1
call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F2A5
compare VAR_0x40CE, 2
compare VAR_FRONTIER_BATTLE_MODE, 2
call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F2AB
compare VAR_0x40CE, 3
compare VAR_FRONTIER_BATTLE_MODE, 3
call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F2B1
return
data/maps/BattleFrontier_OutsideEast/scripts.inc
+2 -2
View File
@@ -9,7 +9,7 @@ BattleFrontier_OutsideEast_MapScript1_242C0F: @ 8242C0F
end
BattleFrontier_OutsideEast_EventScript_242C19:: @ 8242C19
specialvar VAR_RESULT, sub_8138B80
specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 7
goto_if 5, BattleFrontier_OutsideEast_EventScript_27374E
removeobject VAR_LAST_TALKED
@@ -134,7 +134,7 @@ BattleFrontier_OutsideEast_EventScript_242CFC:: @ 8242CFC
setflag FLAG_SYS_CTRL_OBJ_DELETE
dowildbattle
clearflag FLAG_SYS_CTRL_OBJ_DELETE
specialvar VAR_RESULT, sub_8138B80
specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 1
goto_eq BattleFrontier_OutsideEast_EventScript_242D60
compare VAR_RESULT, 4
data/maps/BattleFrontier_PokemonCenter_1F/scripts.inc
+1 -1
View File
@@ -4,7 +4,7 @@ BattleFrontier_PokemonCenter_1F_MapScripts:: @ 82678F9
.byte 0
BattleFrontier_PokemonCenter_1F_MapScript1_267904: @ 8267904
setrespawn 22
setrespawn HEAL_LOCATION_BATTLE_FRONTIER_OUTSIDE_EAST
end
BattleFrontier_PokemonCenter_1F_EventScript_267908:: @ 8267908
data/maps/BattleFrontier_ScottsHouse/scripts.inc
+2 -2
View File
@@ -110,7 +110,7 @@ BattleFrontier_ScottsHouse_EventScript_263811:: @ 8263811
end
BattleFrontier_ScottsHouse_EventScript_26381B:: @ 826381B
setvar VAR_0x40CE, 0
setvar VAR_FRONTIER_BATTLE_MODE, 0
setvar VAR_0x8004, 2
setvar VAR_0x8005, 1
setvar VAR_0x8006, 0
@@ -153,7 +153,7 @@ BattleFrontier_ScottsHouse_EventScript_2638AA:: @ 82638AA
end
BattleFrontier_ScottsHouse_EventScript_2638B4:: @ 82638B4
setvar VAR_0x40CE, 0
setvar VAR_FRONTIER_BATTLE_MODE, 0
setvar VAR_0x8004, 2
setvar VAR_0x8005, 1
setvar VAR_0x8006, 0
data/maps/BirthIsland_Exterior/scripts.inc
+2 -2
View File
@@ -37,7 +37,7 @@ BirthIsland_Exterior_MapScript1_267F65: @ 8267F65
end
BirthIsland_Exterior_EventScript_267F6F:: @ 8267F6F
specialvar VAR_RESULT, sub_8138B80
specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 7
goto_if 5, BirthIsland_Exterior_EventScript_27374E
removeobject 2
@@ -91,7 +91,7 @@ BirthIsland_Exterior_EventScript_267FC1:: @ 8267FC1
special BattleSetup_StartLegendaryBattle
waitstate
clearflag FLAG_SYS_CTRL_OBJ_DELETE
specialvar VAR_RESULT, sub_8138B80
specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 1
goto_eq BirthIsland_Exterior_EventScript_26803B
compare VAR_RESULT, 4
data/maps/DesertRuins/scripts.inc
+2 -2
View File
@@ -10,7 +10,7 @@ DesertRuins_MapScript1_22D96B: @ 822D96B
end
DesertRuins_EventScript_22D975:: @ 822D975
specialvar VAR_RESULT, sub_8138B80
specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 7
goto_if 5, DesertRuins_EventScript_27374E
removeobject VAR_LAST_TALKED
@@ -75,7 +75,7 @@ DesertRuins_EventScript_22DA02:: @ 822DA02
special StartRegiBattle
waitstate
clearflag FLAG_SYS_CTRL_OBJ_DELETE
specialvar VAR_RESULT, sub_8138B80
specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 1
goto_eq DesertRuins_EventScript_22DA49
compare VAR_RESULT, 4
data/maps/DewfordTown_PokemonCenter_1F/scripts.inc
+1 -1
View File
@@ -4,7 +4,7 @@ DewfordTown_PokemonCenter_1F_MapScripts:: @ 81FC523
.byte 0
DewfordTown_PokemonCenter_1F_MapScript1_1FC52E: @ 81FC52E
setrespawn 15
setrespawn HEAL_LOCATION_DEWFORD_TOWN
call DewfordTown_PokemonCenter_1F_EventScript_2718DE
end

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