Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
golem galvanize 2018-03-30 16:49:08 -04:00
commit 069a7e71fc
223 changed files with 24430 additions and 43349 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -13,7 +13,7 @@ cache:
apt: true
install:
- pushd $HOME
- travis_retry wget http://download.sourceforge.net/devkitpro/devkitARM_r47-x86_64-linux.tar.bz2
- travis_retry wget https://downloads.sourceforge.net/project/devkitpro/devkitARM/devkitARM_r47/devkitARM_r47-x86_64-linux.tar.bz2
- tar xf devkitARM*.tar.bz2
- travis_retry git clone https://github.com/pret/agbcc.git
- cd agbcc && ./build.sh && ./install.sh $TRAVIS_BUILD_DIR

4891
asm/battle_link_817C95C.s
View File

File diff suppressed because it is too large Load Diff

2
asm/battle_tower.s
View File

@ -3134,7 +3134,7 @@ _081639FC:
bl __umodsi3
cmp r0, 0
bne _08163A78
bl sub_81DA57C
bl UpdateGymLeaderRematch
b _08163A78
.pool
_08163A2C:

823
asm/blit.s
View File

@ -1,823 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start BlitBitmapRect4BitWithoutColorKey
@ void BlitBitmapRect4BitWithoutColorKey(struct Bitmap *src, struct Bitmap *dest, u16 srcX, u16 srcY, u16 destX, u16 destY, u16 width, u16 height)
BlitBitmapRect4BitWithoutColorKey: @ 8002BDC
push {r4-r7,lr}
mov r7, r8
push {r7}
sub sp, 0x14
ldr r4, [sp, 0x2C]
ldr r5, [sp, 0x30]
ldr r6, [sp, 0x34]
ldr r7, [sp, 0x38]
lsls r2, 16
lsrs r2, 16
lsls r3, 16
lsrs r3, 16
lsls r4, 16
lsrs r4, 16
lsls r5, 16
lsrs r5, 16
lsls r6, 16
lsrs r6, 16
lsls r7, 16
lsrs r7, 16
str r4, [sp]
str r5, [sp, 0x4]
str r6, [sp, 0x8]
str r7, [sp, 0xC]
movs r4, 0xFF
str r4, [sp, 0x10]
bl BlitBitmapRect4Bit
add sp, 0x14
pop {r3}
mov r8, r3
pop {r4-r7}
pop {r0}
bx r0
thumb_func_end BlitBitmapRect4BitWithoutColorKey
thumb_func_start BlitBitmapRect4Bit
@ void BlitBitmapRect4Bit(struct Bitmap *src, struct Bitmap *dest, u16 srcX, u16 srcY, u16 destX, u16 destY, u16 width, u16 height, u8 colorKey)
BlitBitmapRect4Bit: @ 8002C20
push {r4-r7,lr}
mov r7, r10
mov r6, r9
mov r5, r8
push {r5-r7}
sub sp, 0x2C
str r0, [sp]
str r1, [sp, 0x4]
ldr r0, [sp, 0x4C]
ldr r1, [sp, 0x50]
ldr r4, [sp, 0x54]
ldr r5, [sp, 0x58]
ldr r6, [sp, 0x5C]
lsls r2, 16
lsrs r2, 16
str r2, [sp, 0x8]
lsls r3, 16
lsrs r7, r3, 16
lsls r0, 16
lsrs r0, 16
str r0, [sp, 0xC]
lsls r1, 16
lsrs r1, 16
mov r9, r1
lsls r4, 16
lsrs r4, 16
lsls r5, 16
lsrs r5, 16
lsls r6, 24
lsrs r6, 24
str r6, [sp, 0x10]
ldr r0, [sp, 0x4]
ldrh r3, [r0, 0x4]
ldr r1, [sp, 0xC]
subs r0, r3, r1
adds r2, r4
mov r8, r2
cmp r0, r4
bge _08002C74
ldr r2, [sp, 0x8]
adds r0, r2
mov r8, r0
_08002C74:
ldr r4, [sp, 0x4]
ldrh r0, [r4, 0x6]
mov r1, r9
subs r0, r1
adds r2, r5, r7
str r2, [sp, 0x14]
cmp r0, r5
bge _08002C88
adds r0, r7
str r0, [sp, 0x14]
_08002C88:
ldr r4, [sp]
ldrh r1, [r4, 0x4]
movs r2, 0x7
adds r0, r1, 0
ands r0, r2
adds r1, r0
asrs r1, 3
str r1, [sp, 0x18]
adds r0, r3, 0
ands r0, r2
adds r0, r3, r0
asrs r0, 3
str r0, [sp, 0x1C]
ldr r0, [sp, 0x10]
cmp r0, 0xFF
bne _08002D46
adds r3, r7, 0
mov r1, r9
ldr r2, [sp, 0x14]
cmp r3, r2
blt _08002CB4
b _08002DEE
_08002CB4:
ldr r5, [sp, 0x8]
ldr r6, [sp, 0xC]
adds r4, r3, 0x1
str r4, [sp, 0x24]
adds r0, r1, 0x1
str r0, [sp, 0x28]
cmp r5, r8
bge _08002D3A
movs r7, 0x3
asrs r0, r3, 3
ldr r2, [sp, 0x18]
muls r0, r2
lsls r0, 5
mov r10, r0
lsls r0, r3, 29
lsrs r0, 27
mov r9, r0
asrs r0, r1, 3
ldr r4, [sp, 0x1C]
muls r0, r4
lsls r0, 5
mov r12, r0
lsls r0, r1, 29
lsrs r3, r0, 27
_08002CE4:
asrs r0, r5, 1
ands r0, r7
ldr r2, [sp]
ldr r1, [r2]
adds r1, r0
asrs r0, r5, 3
lsls r0, 5
adds r1, r0
add r1, r10
mov r4, r9
adds r2, r1, r4
asrs r0, r6, 1
ands r0, r7
ldr r4, [sp, 0x4]
ldr r1, [r4]
adds r1, r0
asrs r0, r6, 3
lsls r0, 5
adds r1, r0
add r1, r12
adds r4, r1, r3
ldrb r2, [r2]
adds r0, r5, 0
movs r1, 0x1
ands r0, r1
lsls r0, 2
asrs r2, r0
movs r0, 0xF
ands r2, r0
adds r0, r6, 0
ands r0, r1
lsls r1, r0, 2
lsls r2, r1
movs r0, 0xF0
asrs r0, r1
ldrb r1, [r4]
ands r0, r1
orrs r2, r0
strb r2, [r4]
adds r5, 0x1
adds r6, 0x1
cmp r5, r8
blt _08002CE4
_08002D3A:
ldr r3, [sp, 0x24]
ldr r1, [sp, 0x28]
ldr r2, [sp, 0x14]
cmp r3, r2
blt _08002CB4
b _08002DEE
_08002D46:
adds r3, r7, 0
mov r1, r9
ldr r4, [sp, 0x14]
cmp r3, r4
bge _08002DEE
_08002D50:
ldr r5, [sp, 0x8]
ldr r6, [sp, 0xC]
adds r0, r3, 0x1
str r0, [sp, 0x24]
adds r2, r1, 0x1
str r2, [sp, 0x28]
cmp r5, r8
bge _08002DE4
movs r4, 0x3
mov r9, r4
asrs r0, r3, 3
ldr r2, [sp, 0x18]
muls r0, r2
lsls r0, 5
str r0, [sp, 0x20]
lsls r0, r3, 29
lsrs r0, 27
mov r10, r0
movs r3, 0x1
asrs r0, r1, 3
ldr r4, [sp, 0x1C]
muls r0, r4
lsls r0, 5
mov r12, r0
lsls r0, r1, 29
lsrs r7, r0, 27
_08002D84:
asrs r0, r5, 1
mov r1, r9
ands r0, r1
ldr r2, [sp]
ldr r1, [r2]
adds r1, r0
asrs r0, r5, 3
lsls r0, 5
adds r1, r0
ldr r4, [sp, 0x20]
adds r1, r4
mov r0, r10
adds r2, r1, r0
asrs r0, r6, 1
mov r1, r9
ands r0, r1
ldr r4, [sp, 0x4]
ldr r1, [r4]
adds r1, r0
asrs r0, r6, 3
lsls r0, 5
adds r1, r0
add r1, r12
adds r4, r1, r7
ldrb r2, [r2]
adds r0, r5, 0
ands r0, r3
lsls r0, 2
asrs r2, r0
movs r0, 0xF
ands r2, r0
ldr r0, [sp, 0x10]
cmp r2, r0
beq _08002DDC
adds r0, r6, 0
ands r0, r3
lsls r1, r0, 2
lsls r2, r1
movs r0, 0xF0
asrs r0, r1
ldrb r1, [r4]
ands r0, r1
orrs r2, r0
strb r2, [r4]
_08002DDC:
adds r5, 0x1
adds r6, 0x1
cmp r5, r8
blt _08002D84
_08002DE4:
ldr r3, [sp, 0x24]
ldr r1, [sp, 0x28]
ldr r2, [sp, 0x14]
cmp r3, r2
blt _08002D50
_08002DEE:
add sp, 0x2C
pop {r3-r5}
mov r8, r3
mov r9, r4
mov r10, r5
pop {r4-r7}
pop {r0}
bx r0
thumb_func_end BlitBitmapRect4Bit
thumb_func_start FillBitmapRect4Bit
@ void FillBitmapRect4Bit(struct Bitmap *surface, u16 x, u16 y, u16 width, u16 height, u8 fillValue)
FillBitmapRect4Bit: @ 8002E00
push {r4-r7,lr}
mov r7, r10
mov r6, r9
mov r5, r8
push {r5-r7}
sub sp, 0x8
mov r9, r0
ldr r0, [sp, 0x28]
ldr r4, [sp, 0x2C]
lsls r1, 16
lsrs r1, 16
str r1, [sp]
lsls r2, 16
lsrs r2, 16
adds r6, r2, 0
lsls r3, 16
lsrs r3, 16
lsls r0, 16
lsrs r0, 16
lsls r4, 24
lsrs r5, r4, 24
adds r4, r1, r3
mov r3, r9
ldrh r1, [r3, 0x4]
cmp r4, r1
ble _08002E36
adds r4, r1, 0
_08002E36:
adds r2, r0
mov r12, r2
mov r2, r9
ldrh r0, [r2, 0x6]
cmp r12, r0
ble _08002E44
mov r12, r0
_08002E44:
movs r0, 0x7
ands r0, r1
adds r0, r1, r0
asrs r0, 3
str r0, [sp, 0x4]
lsls r0, r5, 28
lsrs r0, 24
mov r8, r0
movs r3, 0xF
mov r10, r3
mov r0, r10
ands r0, r5
mov r10, r0
adds r1, r6, 0
cmp r1, r12
bge _08002EB6
_08002E64:
ldr r3, [sp]
adds r7, r1, 0x1
cmp r3, r4
bge _08002EB0
asrs r0, r1, 3
ldr r2, [sp, 0x4]
muls r0, r2
lsls r6, r0, 5
lsls r0, r1, 29
lsrs r5, r0, 27
_08002E78:
asrs r2, r3, 1
movs r0, 0x3
ands r2, r0
mov r0, r9
ldr r1, [r0]
adds r1, r2
asrs r0, r3, 3
lsls r0, 5
adds r1, r0
adds r1, r6
adds r2, r1, r5
lsls r0, r3, 31
cmp r0, 0
beq _08002E9E
ldrb r1, [r2]
movs r0, 0xF
ands r0, r1
mov r1, r8
b _08002EA6
_08002E9E:
ldrb r1, [r2]
movs r0, 0xF0
ands r0, r1
mov r1, r10
_08002EA6:
orrs r0, r1
strb r0, [r2]
adds r3, 0x1
cmp r3, r4
blt _08002E78
_08002EB0:
adds r1, r7, 0
cmp r1, r12
blt _08002E64
_08002EB6:
add sp, 0x8
pop {r3-r5}
mov r8, r3
mov r9, r4
mov r10, r5
pop {r4-r7}
pop {r0}
bx r0
thumb_func_end FillBitmapRect4Bit
thumb_func_start BlitBitmapRect4BitTo8Bit
@ void BlitBitmapRect4BitTo8Bit(struct Bitmap *src, struct Bitmap *dest, u16 srcX, u16 srcY, u16 destX, u16 destY, u16 width, u16 height, u8 colorKey, u8 paletteOffset)
BlitBitmapRect4BitTo8Bit: @ 8002EC8
push {r4-r7,lr}
mov r7, r10
mov r6, r9
mov r5, r8
push {r5-r7}
sub sp, 0x3C
str r0, [sp]
str r1, [sp, 0x4]
ldr r0, [sp, 0x5C]
ldr r1, [sp, 0x60]
ldr r5, [sp, 0x64]
ldr r4, [sp, 0x68]
ldr r6, [sp, 0x6C]
ldr r7, [sp, 0x70]
mov r8, r7
lsls r2, 16
lsrs r2, 16
str r2, [sp, 0x8]
lsls r3, 16
lsrs r3, 16
lsls r0, 16
lsrs r0, 16
str r0, [sp, 0xC]
lsls r1, 16
lsrs r7, r1, 16
lsls r5, 16
lsrs r5, 16
lsls r4, 16
lsrs r4, 16
lsls r6, 24
lsrs r6, 24
str r6, [sp, 0x10]
mov r0, r8
lsls r0, 28
lsrs r0, 24
str r0, [sp, 0x14]
lsls r0, r6, 28
lsrs r0, 24
str r0, [sp, 0x28]
ldr r1, [sp, 0x4]
ldrh r0, [r1, 0x4]
ldr r2, [sp, 0xC]
subs r0, r2
ldr r1, [sp, 0x8]
adds r1, r5, r1
str r1, [sp, 0x18]
cmp r0, r5
bge _08002F2E
ldr r2, [sp, 0x8]
adds r0, r2
str r0, [sp, 0x18]
_08002F2E:
ldr r5, [sp, 0x4]
ldrh r1, [r5, 0x6]
subs r0, r1, r7
cmp r0, r4
bge _08002F40
adds r0, r3, r1
subs r0, r7
str r0, [sp, 0x1C]
b _08002F44
_08002F40:
adds r4, r3, r4
str r4, [sp, 0x1C]
_08002F44:
ldr r0, [sp]
ldrh r1, [r0, 0x4]
movs r2, 0x7
adds r0, r1, 0
ands r0, r2
adds r1, r0
asrs r1, 3
str r1, [sp, 0x20]
ldr r5, [sp, 0x4]
ldrh r1, [r5, 0x4]
adds r0, r1, 0
ands r0, r2
adds r1, r0
asrs r1, 3
str r1, [sp, 0x24]
ldr r0, [sp, 0x10]
cmp r0, 0xFF
bne _08003024
adds r2, r3, 0
adds r5, r7, 0
ldr r1, [sp, 0x1C]
cmp r2, r1
blt _08002F74
b _08003106
_08002F74:
ldr r3, [sp, 0x8]
lsrs r3, 1
str r3, [sp, 0x2C]
movs r0, 0x3
ands r3, r0
str r3, [sp, 0x2C]
ldr r7, [sp, 0x8]
lsrs r0, r7, 3
lsls r0, 5
str r0, [sp, 0x30]
_08002F88:
ldr r0, [sp]
ldr r1, [r0]
ldr r3, [sp, 0x2C]
adds r1, r3
ldr r7, [sp, 0x30]
adds r1, r7
asrs r0, r2, 3
ldr r3, [sp, 0x20]
muls r0, r3
lsls r0, 5
mov r8, r0
add r1, r8
lsls r0, r2, 29
lsrs r7, r0, 27
adds r6, r1, r7
ldr r3, [sp, 0x8]
ldr r4, [sp, 0xC]
adds r2, 0x1
mov r10, r2
adds r0, r5, 0x1
str r0, [sp, 0x38]
ldr r1, [sp, 0x18]
cmp r3, r1
bge _08003018
asrs r0, r5, 3
ldr r2, [sp, 0x24]
muls r0, r2
lsls r0, 6
mov r12, r0
lsls r0, r5, 29
lsrs r0, 26
mov r9, r0
_08002FC8:
movs r0, 0x7
ands r0, r4
ldr r5, [sp, 0x4]
ldr r1, [r5]
adds r1, r0
asrs r0, r4, 3
lsls r0, 6
adds r1, r0
add r1, r12
mov r0, r9
adds r5, r1, r0
movs r0, 0x1
ands r0, r3
cmp r0, 0
beq _08002FEC
ldrb r0, [r6]
lsrs r0, 4
b _08003008
_08002FEC:
asrs r2, r3, 1
movs r0, 0x3
ands r2, r0
ldr r0, [sp]
ldr r1, [r0]
adds r1, r2
asrs r0, r3, 3
lsls r0, 5
adds r1, r0
add r1, r8
adds r6, r1, r7
ldrb r1, [r6]
movs r0, 0xF
ands r0, r1
_08003008:
ldr r1, [sp, 0x14]
adds r0, r1, r0
strb r0, [r5]
adds r3, 0x1
adds r4, 0x1
ldr r2, [sp, 0x18]
cmp r3, r2
blt _08002FC8
_08003018:
mov r2, r10
ldr r5, [sp, 0x38]
ldr r3, [sp, 0x1C]
cmp r2, r3
blt _08002F88
b _08003106
_08003024:
adds r2, r3, 0
adds r5, r7, 0
ldr r7, [sp, 0x1C]
cmp r2, r7
bge _08003106
ldr r0, [sp, 0x8]
lsrs r0, 1
str r0, [sp, 0x34]
movs r0, 0x3
ldr r1, [sp, 0x34]
ands r1, r0
str r1, [sp, 0x34]
_0800303C:
ldr r3, [sp]
ldr r1, [r3]
ldr r7, [sp, 0x34]
adds r1, r7
ldr r3, [sp, 0x8]
lsrs r0, r3, 3
lsls r0, 5
adds r1, r0
asrs r0, r2, 3
ldr r7, [sp, 0x20]
muls r0, r7
lsls r0, 5
mov r8, r0
add r1, r8
lsls r0, r2, 29
lsrs r7, r0, 27
adds r6, r1, r7
ldr r4, [sp, 0xC]
adds r2, 0x1
mov r10, r2
adds r0, r5, 0x1
str r0, [sp, 0x38]
ldr r1, [sp, 0x18]
cmp r3, r1
bge _080030FC
asrs r0, r5, 3
ldr r2, [sp, 0x24]
muls r0, r2
lsls r0, 6
mov r9, r0
lsls r0, r5, 29
lsrs r0, 26
mov r12, r0
_0800307E:
movs r0, 0x1
ands r0, r3
cmp r0, 0
beq _080030B2
ldrb r2, [r6]
movs r0, 0xF0
ands r0, r2
ldr r5, [sp, 0x28]
cmp r0, r5
beq _080030F2
adds r0, r4, 0
movs r1, 0x7
ands r0, r1
ldr r5, [sp, 0x4]
ldr r1, [r5]
adds r1, r0
asrs r0, r4, 3
lsls r0, 6
adds r1, r0
add r1, r9
mov r0, r12
adds r5, r1, r0
lsrs r0, r2, 4
ldr r1, [sp, 0x14]
adds r0, r1, r0
b _080030F0
_080030B2:
asrs r2, r3, 1
movs r0, 0x3
ands r2, r0
ldr r5, [sp]
ldr r1, [r5]
adds r1, r2
asrs r0, r3, 3
lsls r0, 5
adds r1, r0
add r1, r8
adds r6, r1, r7
ldrb r0, [r6]
movs r2, 0xF
ands r2, r0
ldr r0, [sp, 0x10]
cmp r2, r0
beq _080030F2
adds r0, r4, 0
movs r1, 0x7
ands r0, r1
ldr r5, [sp, 0x4]
ldr r1, [r5]
adds r1, r0
asrs r0, r4, 3
lsls r0, 6
adds r1, r0
add r1, r9
mov r0, r12
adds r5, r1, r0
ldr r1, [sp, 0x14]
adds r0, r1, r2
_080030F0:
strb r0, [r5]
_080030F2:
adds r3, 0x1
adds r4, 0x1
ldr r2, [sp, 0x18]
cmp r3, r2
blt _0800307E
_080030FC:
mov r2, r10
ldr r5, [sp, 0x38]
ldr r3, [sp, 0x1C]
cmp r2, r3
blt _0800303C
_08003106:
add sp, 0x3C
pop {r3-r5}
mov r8, r3
mov r9, r4
mov r10, r5
pop {r4-r7}
pop {r0}
bx r0
thumb_func_end BlitBitmapRect4BitTo8Bit
thumb_func_start FillBitmapRect8Bit
@ void FillBitmapRect8Bit(struct Bitmap *surface, u16 x, u16 y, u16 width, u16 height, u8 fillValue)
FillBitmapRect8Bit: @ 8003118
push {r4-r7,lr}
mov r7, r10
mov r6, r9
mov r5, r8
push {r5-r7}
sub sp, 0x8
mov r8, r0
ldr r0, [sp, 0x28]
ldr r4, [sp, 0x2C]
lsls r1, 16
lsrs r1, 16
mov r10, r1
lsls r2, 16
lsrs r2, 16
adds r6, r2, 0
lsls r3, 16
lsrs r3, 16
lsls r0, 16
lsrs r0, 16
lsls r4, 24
lsrs r4, 24
mov r9, r4
adds r5, r1, r3
mov r3, r8
ldrh r1, [r3, 0x4]
cmp r5, r1
ble _08003150
adds r5, r1, 0
_08003150:
adds r7, r2, r0
mov r2, r8
ldrh r0, [r2, 0x6]
cmp r7, r0
ble _0800315C
adds r7, r0, 0
_0800315C:
movs r0, 0x7
ands r0, r1
adds r0, r1, r0
asrs r0, 3
str r0, [sp]
adds r1, r6, 0
cmp r1, r7
bge _080031AC
_0800316C:
mov r3, r10
adds r6, r1, 0x1
str r6, [sp, 0x4]
cmp r3, r5
bge _080031A6
movs r0, 0x7
mov r12, r0
asrs r0, r1, 3
ldr r2, [sp]
muls r0, r2
lsls r4, r0, 6
lsls r0, r1, 29
lsrs r2, r0, 26
_08003186:
adds r0, r3, 0
mov r6, r12
ands r0, r6
mov r6, r8
ldr r1, [r6]
adds r1, r0
asrs r0, r3, 3
lsls r0, 6
adds r1, r0
adds r1, r4
adds r1, r2
mov r0, r9
strb r0, [r1]
adds r3, 0x1
cmp r3, r5
blt _08003186
_080031A6:
ldr r1, [sp, 0x4]
cmp r1, r7
blt _0800316C
_080031AC:
add sp, 0x8
pop {r3-r5}
mov r8, r3
mov r9, r4
mov r10, r5
pop {r4-r7}
pop {r0}
bx r0
thumb_func_end FillBitmapRect8Bit
.align 2, 0 @ Don't pad with nop.

2
asm/cable_club.s
View File

@ -1729,7 +1729,7 @@ _080B3248:
thumb_func_start sub_80B3254
sub_80B3254: @ 80B3254
push {lr}
bl sub_809FF80
bl SaveGame
pop {r0}
bx r0
thumb_func_end sub_80B3254

3903
asm/credits.s
View File

File diff suppressed because it is too large Load Diff

2
asm/field_control_avatar.s
View File

@ -326,7 +326,7 @@ _0809C13A:
beq _0809C15C
movs r0, 0x6
bl PlaySE
bl sub_809FA9C
bl ShowStartMenu
_0809C14E:
movs r0, 0x1
b _0809C172

18
asm/field_specials.s
View File

@ -3388,7 +3388,7 @@ _0813980C:
_0813981C:
ldrh r5, [r2]
adds r0, r5, 0
bl sub_80EF370
bl CountDigits
adds r3, r0, 0
lsls r3, 24
lsrs r3, 24
@ -3408,7 +3408,7 @@ _0813983C:
adds r4, 0x4
ldrh r5, [r2]
adds r0, r5, 0
bl sub_80EF370
bl CountDigits
adds r3, r0, 0
lsls r3, 24
lsrs r3, 24
@ -4894,7 +4894,7 @@ sub_813A46C: @ 813A46C
lsrs r0, 24
mov r1, sp
movs r2, 0
bl sub_81AE860
bl ListMenuGetScrollAndRow
ldr r1, =gUnknown_0203AB68
mov r0, sp
ldrh r0, [r0]
@ -4903,7 +4903,7 @@ sub_813A46C: @ 813A46C
lsls r0, 24
lsrs r0, 24
mov r1, sp
bl sub_81AE838
bl ListMenuGetCurrentItemArrayId
ldrh r0, [r4, 0x1E]
ldr r5, =gUnknown_0203AB6A
ldrh r1, [r5]
@ -5007,7 +5007,7 @@ sub_813A570: @ 813A570
lsls r0, 24
lsrs r0, 24
mov r1, sp
bl sub_81AE838
bl ListMenuGetCurrentItemArrayId
ldrh r0, [r4, 0x1E]
mov r1, sp
ldrh r1, [r1]
@ -5019,7 +5019,7 @@ sub_813A570: @ 813A570
lsrs r0, 24
movs r1, 0
movs r2, 0
bl sub_81AE6C8
bl DestroyListMenuTask
ldr r0, =gUnknown_0203AB64
ldr r0, [r0]
bl Free
@ -6012,7 +6012,7 @@ sub_813ADD4: @ 813ADD4
adds r4, 0x16
add r1, sp, 0x14
adds r2, r4, 0
bl sub_81AE860
bl ListMenuGetScrollAndRow
ldrh r0, [r6, 0x22]
lsls r0, 24
lsrs r0, 24
@ -6173,7 +6173,7 @@ sub_813AF48: @ 813AF48
lsrs r0, 24
movs r1, 0
movs r2, 0
bl sub_81AE6C8
bl DestroyListMenuTask
ldr r0, =gUnknown_0203AB64
ldr r0, [r0]
bl Free
@ -6817,7 +6817,7 @@ sub_813B4E0: @ 813B4E0
push {lr}
ldr r0, =gSpecialVar_0x8004
ldrh r0, [r0]
bl sub_81D15CC
bl GetRematchIdxByTrainerIdx
cmp r0, 0
blt _0813B50C
movs r1, 0xAE

709
asm/fldeff_flash.s
View File

@ -1,709 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start SetUpFieldMove_Flash
SetUpFieldMove_Flash: @ 81370FC
push {r4,lr}
bl ShouldDoBrailleFlyEffect
lsls r0, 24
cmp r0, 0
beq _08137134
ldr r4, =gSpecialVar_Result
bl GetCursorSelectionMonId
lsls r0, 24
lsrs r0, 24
strh r0, [r4]
ldr r1, =gUnknown_03005DB0
ldr r0, =FieldCallback_Teleport
str r0, [r1]
ldr r1, =gUnknown_0203CEEC
ldr r0, =sub_8179918
b _08137152
.pool
_08137134:
ldr r0, =gMapHeader
ldrb r0, [r0, 0x15]
cmp r0, 0x1
bne _08137170
ldr r0, =0x00000888
bl FlagGet
lsls r0, 24
cmp r0, 0
bne _08137170
ldr r1, =gUnknown_03005DB0
ldr r0, =FieldCallback_Teleport
str r0, [r1]
ldr r1, =gUnknown_0203CEEC
ldr r0, =hm2_flash
_08137152:
str r0, [r1]
movs r0, 0x1
b _08137172
.pool
_08137170:
movs r0, 0
_08137172:
pop {r4}
pop {r1}
bx r1
thumb_func_end SetUpFieldMove_Flash
thumb_func_start hm2_flash
hm2_flash: @ 8137178
push {r4,lr}
bl oei_task_add
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
bl GetCursorSelectionMonId
ldr r1, =gFieldEffectArguments
lsls r0, 24
lsrs r0, 24
str r0, [r1]
ldr r1, =gTasks
lsls r0, r4, 2
adds r0, r4
lsls r0, 3
adds r0, r1
ldr r2, =sub_81371B4
lsrs r1, r2, 16
strh r1, [r0, 0x18]
strh r2, [r0, 0x1A]
pop {r4}
pop {r0}
bx r0
.pool
thumb_func_end hm2_flash
thumb_func_start sub_81371B4
sub_81371B4: @ 81371B4
push {lr}
movs r0, 0xCF
bl PlaySE
ldr r0, =0x00000888
bl FlagSet
ldr r0, =EventScript_2926F8
bl ScriptContext1_SetupScript
pop {r0}
bx r0
.pool
thumb_func_end sub_81371B4
thumb_func_start sub_81371D4
sub_81371D4: @ 81371D4
push {lr}
bl RunTasks
bl AnimateSprites
bl BuildOamBuffer
bl UpdatePaletteFade
pop {r0}
bx r0
thumb_func_end sub_81371D4
thumb_func_start sub_81371EC
sub_81371EC: @ 81371EC
push {lr}
bl LoadOam
bl ProcessSpriteCopyRequests
bl TransferPlttBuffer
pop {r0}
bx r0
thumb_func_end sub_81371EC
thumb_func_start c2_change_map
c2_change_map: @ 8137200
push {r4,lr}
sub sp, 0x8
movs r0, 0
bl SetVBlankCallback
movs r0, 0
movs r1, 0
bl SetGpuReg
movs r0, 0xC
movs r1, 0
bl SetGpuReg
movs r0, 0xA
movs r1, 0
bl SetGpuReg
movs r0, 0x8
movs r1, 0
bl SetGpuReg
movs r0, 0x18
movs r1, 0
bl SetGpuReg
movs r0, 0x1A
movs r1, 0
bl SetGpuReg
movs r0, 0x14
movs r1, 0
bl SetGpuReg
movs r0, 0x16
movs r1, 0
bl SetGpuReg
movs r0, 0x10
movs r1, 0
bl SetGpuReg
movs r0, 0x12
movs r1, 0
bl SetGpuReg
mov r1, sp
movs r0, 0
strh r0, [r1]
ldr r1, =0x040000d4
mov r0, sp
str r0, [r1]
movs r0, 0xC0
lsls r0, 19
str r0, [r1, 0x4]
ldr r0, =0x8100c000
str r0, [r1, 0x8]
ldr r0, [r1, 0x8]
movs r4, 0
str r4, [sp, 0x4]
add r0, sp, 0x4
str r0, [r1]
movs r0, 0xE0
lsls r0, 19
str r0, [r1, 0x4]
ldr r0, =0x85000100
str r0, [r1, 0x8]
ldr r0, [r1, 0x8]
mov r0, sp
strh r4, [r0]
str r0, [r1]
ldr r0, =0x05000002
str r0, [r1, 0x4]
ldr r0, =0x810001ff
str r0, [r1, 0x8]
ldr r0, [r1, 0x8]
bl ResetPaletteFade
bl ResetTasks
bl ResetSpriteData
ldr r3, =0x04000208
ldrh r2, [r3]
strh r4, [r3]
ldr r4, =0x04000200
ldrh r0, [r4]
movs r1, 0x1
orrs r0, r1
strh r0, [r4]
strh r2, [r3]
ldr r0, =sub_81371EC
bl SetVBlankCallback
ldr r0, =sub_81371D4
bl SetMainCallback2
bl sub_8137304
lsls r0, 24
cmp r0, 0
bne _081372D2
ldr r0, =gMain
ldr r0, [r0, 0x8]
bl SetMainCallback2
_081372D2:
add sp, 0x8
pop {r4}
pop {r0}
bx r0
.pool
thumb_func_end c2_change_map
thumb_func_start sub_8137304
sub_8137304: @ 8137304
push {r4-r7,lr}
bl get_map_light_from_warp0
lsls r0, 24
lsrs r6, r0, 24
bl Overworld_GetMapTypeOfSaveblockLocation
lsls r0, 24
lsrs r5, r0, 24
movs r3, 0
ldr r4, =gUnknown_085B27C8
ldrb r0, [r4]
cmp r0, 0
beq _08137358
adds r7, r4, 0
adds r0, r4, 0x4
mov r12, r0
_08137326:
lsls r2, r3, 3
adds r1, r2, r7
ldrb r0, [r1]
cmp r0, r6
bne _08137348
ldrb r0, [r1, 0x1]
cmp r0, r5
bne _08137348
mov r1, r12
adds r0, r2, r1
ldr r0, [r0]
bl _call_via_r0
movs r0, 0x1
b _0813735A
.pool
_08137348:
adds r0, r3, 0x1
lsls r0, 24
lsrs r3, r0, 24
lsls r0, r3, 3
adds r0, r4
ldrb r0, [r0]
cmp r0, 0
bne _08137326
_08137358:
movs r0, 0
_0813735A:
pop {r4-r7}
pop {r1}
bx r1
thumb_func_end sub_8137304
thumb_func_start sub_8137360
sub_8137360: @ 8137360
push {r4-r6,lr}
lsls r0, 24
lsls r1, 24
lsrs r5, r0, 24
lsrs r4, r1, 24
movs r3, 0
ldr r1, =gUnknown_085B27C8
ldrb r0, [r1]
cmp r0, 0
beq _081373A0
adds r6, r1, 0
_08137376:
lsls r0, r3, 3
adds r2, r0, r6
ldrb r0, [r2]
cmp r0, r5
bne _08137390
ldrb r0, [r2, 0x1]
cmp r0, r4
bne _08137390
ldrb r0, [r2, 0x2]
b _081373A2
.pool
_08137390:
adds r0, r3, 0x1
lsls r0, 24
lsrs r3, r0, 24
lsls r0, r3, 3
adds r0, r1
ldrb r0, [r0]
cmp r0, 0
bne _08137376
_081373A0:
movs r0, 0
_081373A2:
pop {r4-r6}
pop {r1}
bx r1
thumb_func_end sub_8137360
thumb_func_start fade_type_for_given_maplight_pair
fade_type_for_given_maplight_pair: @ 81373A8
push {r4-r6,lr}
lsls r0, 24
lsls r1, 24
lsrs r5, r0, 24
lsrs r4, r1, 24
movs r3, 0
ldr r1, =gUnknown_085B27C8
ldrb r0, [r1]
cmp r0, 0
beq _081373E8
adds r6, r1, 0
_081373BE:
lsls r0, r3, 3
adds r2, r0, r6
ldrb r0, [r2]
cmp r0, r5
bne _081373D8
ldrb r0, [r2, 0x1]
cmp r0, r4
bne _081373D8
ldrb r0, [r2, 0x3]
b _081373EA
.pool
_081373D8:
adds r0, r3, 0x1
lsls r0, 24
lsrs r3, r0, 24
lsls r0, r3, 3
adds r0, r1
ldrb r0, [r0]
cmp r0, 0
bne _081373BE
_081373E8:
movs r0, 0
_081373EA:
pop {r4-r6}
pop {r1}
bx r1
thumb_func_end fade_type_for_given_maplight_pair
thumb_func_start sub_81373F0
sub_81373F0: @ 81373F0
push {lr}
ldr r0, =sub_8137404
movs r1, 0
bl CreateTask
pop {r0}
bx r0
.pool
thumb_func_end sub_81373F0
thumb_func_start sub_8137404
sub_8137404: @ 8137404
lsls r0, 24
lsrs r0, 24
ldr r2, =gTasks
lsls r1, r0, 2
adds r1, r0
lsls r1, 3
adds r1, r2
ldr r0, =sub_8137420
str r0, [r1]
bx lr
.pool
thumb_func_end sub_8137404
thumb_func_start sub_8137420
sub_8137420: @ 8137420
push {r4,lr}
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
movs r0, 0
movs r1, 0
bl SetGpuReg
ldr r0, =gCaveTransitionTiles
ldr r1, =0x0600c000
bl LZ77UnCompVram
ldr r0, =gCaveTransitionTilemap
ldr r1, =0x0600f800
bl LZ77UnCompVram
ldr r0, =gCaveTransitionPalette_White
movs r1, 0xE0
movs r2, 0x20
bl LoadPalette
ldr r0, =gUnknown_085B28A0
movs r1, 0xE0
movs r2, 0x10
bl LoadPalette
ldr r1, =0x00003e41
movs r0, 0x50
bl SetGpuReg
movs r0, 0x52
movs r1, 0
bl SetGpuReg
movs r0, 0x54
movs r1, 0
bl SetGpuReg
ldr r1, =0x00001f0c
movs r0, 0x8
bl SetGpuReg
movs r1, 0x8A
lsls r1, 5
movs r0, 0
bl SetGpuReg
ldr r1, =gTasks
lsls r0, r4, 2
adds r0, r4
lsls r0, 3
adds r0, r1
ldr r1, =sub_81374C4
str r1, [r0]
movs r2, 0
movs r1, 0x10
strh r1, [r0, 0x8]
strh r2, [r0, 0xA]
pop {r4}
pop {r0}
bx r0
.pool
thumb_func_end sub_8137420
thumb_func_start sub_81374C4
sub_81374C4: @ 81374C4
push {r4,r5,lr}
lsls r0, 24
lsrs r0, 24
ldr r2, =gTasks
lsls r1, r0, 2
adds r1, r0
lsls r1, 3
adds r5, r1, r2
ldrh r4, [r5, 0xA]
movs r0, 0x80
lsls r0, 5
adds r1, r4, r0
lsls r1, 16
lsrs r1, 16
movs r0, 0x52
bl SetGpuReg
cmp r4, 0x10
bhi _081374F8
ldrh r0, [r5, 0xA]
adds r0, 0x1
strh r0, [r5, 0xA]
b _08137500
.pool
_081374F8:
movs r0, 0
strh r0, [r5, 0xC]
ldr r0, =sub_813750C
str r0, [r5]
_08137500:
pop {r4,r5}
pop {r0}
bx r0
.pool
thumb_func_end sub_81374C4
thumb_func_start sub_813750C
sub_813750C: @ 813750C
push {r4,lr}
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
ldr r1, =0x00001010
movs r0, 0x52
bl SetGpuReg
ldr r1, =gTasks
lsls r0, r4, 2
adds r0, r4
lsls r0, 3
adds r4, r0, r1
ldrh r1, [r4, 0xC]
cmp r1, 0x7
bhi _08137554
adds r0, r1, 0x1
strh r0, [r4, 0xC]
lsls r1, 1
ldr r0, =gUnknown_085B28A0
adds r0, r1, r0
movs r2, 0x10
subs r2, r1
lsls r2, 16
lsrs r2, 16
movs r1, 0xE0
bl LoadPalette
b _08137566
.pool
_08137554:
ldr r0, =gCaveTransitionPalette_White
movs r1, 0
movs r2, 0x20
bl LoadPalette
ldr r0, =sub_8137574
str r0, [r4]
movs r0, 0x8
strh r0, [r4, 0xC]
_08137566:
pop {r4}
pop {r0}
bx r0
.pool
thumb_func_end sub_813750C
thumb_func_start sub_8137574
sub_8137574: @ 8137574
push {lr}
lsls r0, 24
lsrs r0, 24
ldr r2, =gTasks
lsls r1, r0, 2
adds r1, r0
lsls r1, 3
adds r1, r2
ldrh r2, [r1, 0xC]
movs r3, 0xC
ldrsh r0, [r1, r3]
cmp r0, 0
beq _08137598
subs r0, r2, 0x1
strh r0, [r1, 0xC]
b _081375A0
.pool
_08137598:
ldr r0, =gMain
ldr r0, [r0, 0x8]
bl SetMainCallback2
_081375A0:
pop {r0}
bx r0
.pool
thumb_func_end sub_8137574
thumb_func_start sub_81375A8
sub_81375A8: @ 81375A8
push {lr}
ldr r0, =sub_81375BC
movs r1, 0
bl CreateTask
pop {r0}
bx r0
.pool
thumb_func_end sub_81375A8
thumb_func_start sub_81375BC
sub_81375BC: @ 81375BC
lsls r0, 24
lsrs r0, 24
ldr r2, =gTasks
lsls r1, r0, 2
adds r1, r0
lsls r1, 3
adds r1, r2
ldr r0, =sub_81375D8
str r0, [r1]
bx lr
.pool
thumb_func_end sub_81375BC
thumb_func_start sub_81375D8
sub_81375D8: @ 81375D8
push {r4,lr}
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
movs r0, 0
movs r1, 0
bl SetGpuReg
ldr r0, =gCaveTransitionTiles
ldr r1, =0x0600c000
bl LZ77UnCompVram
ldr r0, =gCaveTransitionTilemap
ldr r1, =0x0600f800
bl LZ77UnCompVram
movs r0, 0x50
movs r1, 0
bl SetGpuReg
movs r0, 0x52
movs r1, 0
bl SetGpuReg
movs r0, 0x54
movs r1, 0
bl SetGpuReg
ldr r1, =0x00001f0c
movs r0, 0x8
bl SetGpuReg
movs r1, 0x8A
lsls r1, 5
movs r0, 0
bl SetGpuReg
ldr r0, =gCaveTransitionPalette_White
movs r1, 0xE0
movs r2, 0x20
bl LoadPalette
ldr r0, =gCaveTransitionPalette_Black
movs r1, 0
movs r2, 0x20
bl LoadPalette
ldr r1, =gTasks
lsls r0, r4, 2
adds r0, r4
lsls r0, 3
adds r0, r1
ldr r1, =sub_8137678
str r1, [r0]
movs r2, 0
movs r1, 0x10
strh r1, [r0, 0x8]
strh r2, [r0, 0xA]
strh r2, [r0, 0xC]
pop {r4}
pop {r0}
bx r0
.pool
thumb_func_end sub_81375D8
thumb_func_start sub_8137678
sub_8137678: @ 8137678
push {r4,lr}
lsls r0, 24
lsrs r0, 24
ldr r2, =gTasks
lsls r1, r0, 2
adds r1, r0
lsls r1, 3
adds r4, r1, r2
ldrh r1, [r4, 0xC]
cmp r1, 0xF
bhi _081376B4
adds r2, r1, 0x1
adds r0, r2, 0x1
strh r0, [r4, 0xC]
movs r0, 0xF
subs r0, r1
lsls r0, 1
ldr r1, =gUnknown_085B2890
adds r0, r1
lsls r2, 17
lsrs r2, 16
movs r1, 0xE0
bl LoadPalette
b _081376C8
.pool
_081376B4:
ldr r1, =0x00001010
movs r0, 0x52
bl SetGpuReg
ldr r1, =0x00003e41
movs r0, 0x50
bl SetGpuReg
ldr r0, =sub_81376DC
str r0, [r4]
_081376C8:
pop {r4}
pop {r0}
bx r0
.pool
thumb_func_end sub_8137678
thumb_func_start sub_81376DC
sub_81376DC: @ 81376DC
push {r4,r5,lr}
lsls r0, 24
lsrs r0, 24
ldr r2, =gTasks
lsls r1, r0, 2
adds r1, r0
lsls r1, 3
adds r5, r1, r2
ldrh r0, [r5, 0xA]
movs r1, 0x10
subs r1, r0
lsls r1, 16
lsrs r4, r1, 16
movs r0, 0x80
lsls r0, 21
adds r1, r0
lsrs r1, 16
movs r0, 0x52
bl SetGpuReg
cmp r4, 0
beq _08137714
ldrh r0, [r5, 0xA]
adds r0, 0x1
strh r0, [r5, 0xA]
b _08137726
.pool
_08137714:
ldr r0, =gCaveTransitionPalette_Black
movs r1, 0
movs r2, 0x20
bl LoadPalette
ldr r0, =gMain
ldr r0, [r0, 0x8]
bl SetMainCallback2
_08137726:
pop {r4,r5}
pop {r0}
bx r0
.pool
thumb_func_end sub_81376DC

596
asm/fldeff_groundshake.s
View File

@ -1,596 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start sub_81BE66C
sub_81BE66C: @ 81BE66C
push {lr}
ldr r0, =gSaveBlock1Ptr
ldr r0, [r0]
ldrh r1, [r0, 0x4]
movs r0, 0xD0
lsls r0, 5
cmp r1, r0
bne _081BE690
movs r0, 0xA7
lsls r0, 1
bl FlagGet
lsls r0, 24
lsrs r0, 24
b _081BE692
.pool
_081BE690:
movs r0, 0
_081BE692:
pop {r1}
bx r1
thumb_func_end sub_81BE66C
thumb_func_start sub_81BE698
sub_81BE698: @ 81BE698
push {lr}
ldr r0, =gUnknown_0203CF18
ldr r0, [r0]
adds r0, 0x4
bl sub_8151E50
pop {r0}
bx r0
.pool
thumb_func_end sub_81BE698
thumb_func_start sub_81BE6AC
sub_81BE6AC: @ 81BE6AC
ldr r1, =gUnknown_0203CF18
movs r0, 0
str r0, [r1]
bx lr
.pool
thumb_func_end sub_81BE6AC
thumb_func_start sub_81BE6B8
sub_81BE6B8: @ 81BE6B8
push {r4,lr}
ldr r4, =gUnknown_0203CF18
ldr r0, [r4]
cmp r0, 0
beq _081BE6CC
movs r0, 0
str r0, [r4]
b _081BE718
.pool
_081BE6CC:
ldr r0, =gSaveBlock1Ptr
ldr r0, [r0]
ldrh r1, [r0, 0x4]
movs r0, 0xD0
lsls r0, 5
cmp r1, r0
bne _081BE718
movs r0, 0xA7
lsls r0, 1
bl FlagGet
lsls r0, 24
cmp r0, 0
beq _081BE718
movs r0, 0xC8
bl AllocZeroed
str r0, [r4]
adds r0, 0x4
bl sub_8151B3C
ldr r0, [r4]
adds r0, 0x4
ldr r1, =gUnknown_08617E18
bl sub_8151B68
ldr r0, [r4]
adds r0, 0x4
movs r1, 0x1
movs r2, 0x1
bl sub_8151CA8
ldr r0, =sub_81BE698
movs r1, 0xFF
bl CreateTask
ldr r1, [r4]
strb r0, [r1]
_081BE718:
pop {r4}
pop {r0}
bx r0
.pool
thumb_func_end sub_81BE6B8
thumb_func_start sub_81BE72C
sub_81BE72C: @ 81BE72C
push {r4,lr}
ldr r0, =gSaveBlock1Ptr
ldr r0, [r0]
ldrh r1, [r0, 0x4]
movs r0, 0xD0
lsls r0, 5
cmp r1, r0
bne _081BE788
movs r0, 0xA7
lsls r0, 1
bl FlagGet
lsls r0, 24
cmp r0, 0
beq _081BE788
ldr r4, =gUnknown_0203CF18
ldr r0, [r4]
cmp r0, 0
beq _081BE788
ldr r0, =sub_81BE698
bl FuncIsActiveTask
lsls r0, 24
cmp r0, 0
beq _081BE766
ldr r0, [r4]
ldrb r0, [r0]
bl DestroyTask
_081BE766:
ldr r0, [r4]
adds r0, 0x4
movs r1, 0x1
movs r2, 0x1
bl sub_8151D28
ldr r0, [r4]
adds r0, 0x4
movs r1, 0x1
movs r2, 0x1
bl sub_8151C50
ldr r0, [r4]
bl Free
movs r0, 0
str r0, [r4]
_081BE788:
pop {r4}
pop {r0}
bx r0
.pool
thumb_func_end sub_81BE72C
thumb_func_start sub_81BE79C
sub_81BE79C: @ 81BE79C
push {r4,lr}
ldr r0, =0x000040cb
bl VarGet
lsls r0, 16
cmp r0, 0
beq _081BE7B8
movs r0, 0xA7
lsls r0, 1
bl FlagClear
b _081BE7EE
.pool
_081BE7B8:
bl Random
lsls r0, 16
lsrs r4, r0, 16
movs r0, 0x1
ands r4, r0
movs r0, 0x9D
bl FlagGet
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
bne _081BE7D4
movs r4, 0x1
_081BE7D4:
cmp r4, 0
beq _081BE7E6
movs r0, 0xA7
lsls r0, 1
bl FlagSet
bl sub_81BE6B8
b _081BE7EE
_081BE7E6:
movs r0, 0xA7
lsls r0, 1
bl FlagClear
_081BE7EE:
pop {r4}
pop {r0}
bx r0
thumb_func_end sub_81BE79C
thumb_func_start sub_81BE7F4
sub_81BE7F4: @ 81BE7F4
push {lr}
ldr r0, =sub_81BE808
movs r1, 0x8
bl CreateTask
pop {r0}
bx r0
.pool
thumb_func_end sub_81BE7F4
thumb_func_start sub_81BE808
sub_81BE808: @ 81BE808
push {r4,r5,lr}
sub sp, 0x4
lsls r0, 24
lsrs r5, r0, 24
ldr r0, =gSaveBlock1Ptr
ldr r0, [r0]
ldrb r1, [r0, 0x5]
ldrb r2, [r0, 0x4]
movs r0, 0x2D
mov r3, sp
bl TryGetFieldObjectIdByLocalIdAndMap
mov r0, sp
ldrb r0, [r0]
lsls r2, r0, 3
adds r2, r0
lsls r2, 2
ldr r4, =gMapObjects
adds r2, r4
ldr r3, =gSprites
ldrb r1, [r2, 0x4]
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
adds r0, r3
ldrh r1, [r0, 0x26]
adds r1, 0x4
strh r1, [r0, 0x26]
ldr r0, =gPlayerAvatar
ldrb r0, [r0, 0x5]
lsls r1, r0, 3
adds r1, r0
lsls r1, 2
adds r1, r4
ldrb r2, [r2, 0x4]
lsls r0, r2, 4
adds r0, r2
lsls r0, 2
adds r0, r3
movs r4, 0x22
ldrsh r2, [r0, r4]
movs r4, 0x26
ldrsh r0, [r0, r4]
adds r2, r0
ldrb r1, [r1, 0x4]
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
adds r0, r3
movs r3, 0x22
ldrsh r1, [r0, r3]
movs r4, 0x26
ldrsh r0, [r0, r4]
adds r1, r0
cmp r2, r1
blt _081BE882
adds r0, r5, 0
bl DestroyTask
bl EnableBothScriptContexts
_081BE882:
add sp, 0x4
pop {r4,r5}
pop {r0}
bx r0
.pool
thumb_func_end sub_81BE808
thumb_func_start sp136_strengh_sound
sp136_strengh_sound: @ 81BE89C
push {r4-r6,lr}
mov r6, r8
push {r6}
mov r8, r0
adds r4, r1, 0
adds r5, r2, 0
adds r6, r3, 0
lsls r0, 24
lsrs r0, 24
mov r8, r0
lsls r4, 24
lsrs r4, 24
lsls r5, 24
lsrs r5, 24
lsls r6, 24
lsrs r6, 24
ldr r0, =sub_81BE900
movs r1, 0x9
bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, =gTasks
lsls r1, r0, 2
adds r1, r0
lsls r1, 3
adds r1, r2
movs r0, 0
strh r4, [r1, 0x8]
strh r0, [r1, 0xA]
strh r5, [r1, 0xC]
strh r6, [r1, 0xE]
mov r0, r8
strh r0, [r1, 0x10]
movs r0, 0
bl SetCameraPanningCallback
movs r0, 0xD6
bl PlaySE
pop {r3}
mov r8, r3
pop {r4-r6}
pop {r0}
bx r0
.pool
thumb_func_end sp136_strengh_sound
thumb_func_start sub_81BE900
sub_81BE900: @ 81BE900
push {r4,r5,lr}
lsls r0, 24
lsrs r5, r0, 24
lsls r0, r5, 2
adds r0, r5
lsls r0, 3
ldr r1, =gTasks + 0x8
adds r4, r0, r1
ldrh r0, [r4, 0x2]
adds r0, 0x1
strh r0, [r4, 0x2]
movs r1, 0x2
ldrsh r0, [r4, r1]
movs r2, 0x6
ldrsh r1, [r4, r2]
bl __modsi3
cmp r0, 0
bne _081BE95C
strh r0, [r4, 0x2]
ldrh r0, [r4, 0x4]
subs r0, 0x1
strh r0, [r4, 0x4]
ldrh r0, [r4]
negs r0, r0
strh r0, [r4]
ldrh r0, [r4, 0x8]
negs r0, r0
strh r0, [r4, 0x8]
movs r1, 0
ldrsh r0, [r4, r1]
movs r2, 0x8
ldrsh r1, [r4, r2]
bl SetCameraPanning
movs r1, 0x4
ldrsh r0, [r4, r1]
cmp r0, 0
bne _081BE95C
bl sub_81BE968
adds r0, r5, 0
bl DestroyTask
bl InstallCameraPanAheadCallback
_081BE95C:
pop {r4,r5}
pop {r0}
bx r0
.pool
thumb_func_end sub_81BE900
thumb_func_start sub_81BE968
sub_81BE968: @ 81BE968
push {lr}
ldr r0, =sub_81BE9C0
bl FindTaskIdByFunc
lsls r0, 24
lsrs r2, r0, 24
cmp r2, 0xFF
beq _081BE988
ldr r0, =gTasks
lsls r1, r2, 2
adds r1, r2
lsls r1, 3
adds r1, r0
ldrh r0, [r1, 0x8]
adds r0, 0x1
strh r0, [r1, 0x8]
_081BE988:
pop {r0}
bx r0
.pool
thumb_func_end sub_81BE968
thumb_func_start sub_81BE994
sub_81BE994: @ 81BE994
push {lr}
ldr r0, =gUnknown_08617D94
bl LoadSpriteSheets
bl sub_81BEA20
ldr r0, =sub_81BE9C0
movs r1, 0x8
bl CreateTask
movs r0, 0x2
movs r1, 0x1
movs r2, 0x10
movs r3, 0x3
bl sp136_strengh_sound
pop {r0}
bx r0
.pool
thumb_func_end sub_81BE994
thumb_func_start sub_81BE9C0
sub_81BE9C0: @ 81BE9C0
push {r4,lr}
lsls r0, 24
lsrs r0, 24
lsls r1, r0, 2
adds r1, r0
lsls r3, r1, 3
ldr r4, =gTasks + 0x8
adds r2, r3, r4
ldrh r0, [r2, 0x2]
adds r0, 0x1
strh r0, [r2, 0x2]
lsls r0, 16
movs r1, 0xFA
lsls r1, 18
cmp r0, r1
beq _081BE9E6
ldrh r0, [r2]
cmp r0, 0x11
bne _081BE9F0
_081BE9E6:
adds r0, r4, 0
subs r0, 0x8
adds r0, r3, r0
ldr r1, =sub_81BEA00
str r1, [r0]
_081BE9F0:
pop {r4}
pop {r0}
bx r0
.pool
thumb_func_end sub_81BE9C0
thumb_func_start sub_81BEA00
sub_81BEA00: @ 81BEA00
push {r4,lr}
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
movs r0, 0xFA
lsls r0, 4
bl FreeSpriteTilesByTag
adds r0, r4, 0
bl DestroyTask
bl EnableBothScriptContexts
pop {r4}
pop {r0}
bx r0
thumb_func_end sub_81BEA00
thumb_func_start sub_81BEA20
sub_81BEA20: @ 81BEA20
push {r4-r7,lr}
movs r4, 0
ldr r5, =gUnknown_08617D64
adds r7, r5, 0x2
ldr r6, =gSprites
_081BEA2A:
lsls r0, r4, 1
adds r0, r4
lsls r0, 1
adds r1, r0, r5
ldrh r1, [r1]
adds r1, 0x78
lsls r1, 16
asrs r1, 16
adds r0, r7
movs r3, 0
ldrsh r2, [r0, r3]
ldr r0, =gUnknown_08617E60
movs r3, 0x8
bl CreateSprite
lsls r0, 24
lsrs r1, r0, 24
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
adds r0, r6
ldrb r2, [r0, 0x5]
movs r3, 0xD
negs r3, r3
adds r1, r3, 0
ands r2, r1
movs r1, 0xF
ands r2, r1
strb r2, [r0, 0x5]
strh r4, [r0, 0x2E]
adds r0, r4, 0x1
lsls r0, 24
lsrs r4, r0, 24
cmp r4, 0x7
bls _081BEA2A
movs r4, 0
ldr r5, =gUnknown_08617D64
adds r7, r5, 0x2
ldr r6, =gSprites
_081BEA78:
lsls r0, r4, 1
adds r0, r4
lsls r0, 1
adds r1, r0, r5
ldrh r1, [r1]
adds r1, 0x73
lsls r1, 16
asrs r1, 16
adds r0, r7
ldrh r2, [r0]
subs r2, 0x3
lsls r2, 16
asrs r2, 16
ldr r0, =gUnknown_08617E34
movs r3, 0x8
bl CreateSprite
lsls r0, 24
lsrs r1, r0, 24
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
adds r0, r6
ldrb r2, [r0, 0x5]
movs r3, 0xD
negs r3, r3
adds r1, r3, 0
ands r2, r1
movs r1, 0xF
ands r2, r1
strb r2, [r0, 0x5]
strh r4, [r0, 0x2E]
adds r0, r4, 0x1
lsls r0, 24
lsrs r4, r0, 24
cmp r4, 0x7
bls _081BEA78
pop {r4-r7}
pop {r0}
bx r0
.pool
thumb_func_end sub_81BEA20
thumb_func_start sub_81BEAD8
sub_81BEAD8: @ 81BEAD8
push {r4,lr}
adds r4, r0, 0
ldrh r0, [r4, 0x30]
adds r0, 0x2
strh r0, [r4, 0x30]
movs r1, 0x30
ldrsh r0, [r4, r1]
lsrs r1, r0, 31
adds r0, r1
asrs r0, 1
strh r0, [r4, 0x26]
movs r0, 0x22
ldrsh r3, [r4, r0]
movs r1, 0x26
ldrsh r0, [r4, r1]
adds r3, r0
ldr r2, =gUnknown_08617D64
movs r0, 0x2E
ldrsh r1, [r4, r0]
lsls r0, r1, 1
adds r0, r1
lsls r0, 1
adds r2, 0x4
adds r0, r2
movs r1, 0
ldrsh r0, [r0, r1]
cmp r3, r0
ble _081BEB1A
adds r0, r4, 0
bl DestroySprite
bl sub_81BE968
_081BEB1A:
pop {r4}
pop {r0}
bx r0
.pool
thumb_func_end sub_81BEAD8
.align 2, 0 @ Don't pad with nop.

339
asm/fldeff_softboiled.s
View File

@ -1,339 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start hm_prepare_dive_probably
hm_prepare_dive_probably: @ 8161508
push {r4-r6,lr}
bl GetCursorSelectionMonId
lsls r0, 24
lsrs r0, 24
movs r6, 0x64
muls r0, r6
ldr r4, =gPlayerParty
adds r0, r4
movs r1, 0x3A
bl GetMonData
adds r5, r0, 0
lsls r5, 16
lsrs r5, 16
bl GetCursorSelectionMonId
lsls r0, 24
lsrs r0, 24
muls r0, r6
adds r0, r4
movs r1, 0x39
bl GetMonData
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
adds r0, r5, 0
movs r1, 0x5
bl __udivsi3
lsls r0, 16
lsrs r0, 16
cmp r4, r0
bhi _08161558
movs r0, 0
b _0816155A
.pool
_08161558:
movs r0, 0x1
_0816155A:
pop {r4-r6}
pop {r1}
bx r1
thumb_func_end hm_prepare_dive_probably
thumb_func_start sub_8161560
sub_8161560: @ 8161560
push {r4,lr}
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
ldr r0, =gUnknown_0203CEC8
movs r1, 0xA
strb r1, [r0, 0xB]
ldrb r1, [r0, 0x9]
strb r1, [r0, 0xA]
bl GetCursorSelectionMonId
lsls r0, 24
lsrs r0, 24
movs r1, 0x1
bl sub_81B0FCC
movs r0, 0x5
bl display_pokemon_menu_message
ldr r1, =gTasks
lsls r0, r4, 2
adds r0, r4
lsls r0, 3
adds r0, r1
ldr r1, =sub_81B1370
str r1, [r0]
pop {r4}
pop {r0}
bx r0
.pool
thumb_func_end sub_8161560
thumb_func_start sub_81615A8
sub_81615A8: @ 81615A8
push {r4-r7,lr}
mov r7, r10
mov r6, r9
mov r5, r8
push {r5-r7}
sub sp, 0x8
lsls r0, 24
lsrs r4, r0, 24
str r4, [sp, 0x4]
ldr r1, =gUnknown_0203CEC8
ldrb r7, [r1, 0x9]
mov r8, r7
ldrb r0, [r1, 0xA]
adds r5, r0, 0
cmp r5, 0x6
bls _081615EC
movs r0, 0
strb r0, [r1, 0xB]
bl display_pokemon_menu_message
ldr r1, =gTasks
lsls r0, r4, 2
adds r0, r4
lsls r0, 3
adds r0, r1
ldr r1, =sub_81B1370
str r1, [r0]
b _08161658
.pool
_081615EC:
movs r0, 0x64
mov r10, r0
mov r0, r10
muls r0, r5
ldr r1, =gPlayerParty
mov r9, r1
adds r6, r0, r1
adds r0, r6, 0
movs r1, 0x39
bl GetMonData
lsls r0, 16
lsrs r4, r0, 16
cmp r4, 0
beq _0816161A
cmp r7, r5
beq _0816161A
adds r0, r6, 0
movs r1, 0x3A
bl GetMonData
cmp r0, r4
bne _08161628
_0816161A:
ldr r0, [sp, 0x4]
bl sub_81617B8
b _08161658
.pool
_08161628:
movs r0, 0x1
bl PlaySE
mov r1, r10
mov r0, r8
muls r0, r1
add r0, r9
movs r1, 0x3A
bl GetMonData
movs r1, 0x5
bl __udivsi3
adds r3, r0, 0
lsls r3, 16
asrs r3, 16
movs r2, 0x1
negs r2, r2
ldr r0, =sub_816166C
str r0, [sp]
ldr r0, [sp, 0x4]
mov r1, r8
bl sub_81B1F18
_08161658:
add sp, 0x8
pop {r3-r5}
mov r8, r3
mov r9, r4
mov r10, r5
pop {r4-r7}
pop {r0}
bx r0
.pool
thumb_func_end sub_81615A8
thumb_func_start sub_816166C
sub_816166C: @ 816166C
push {r4,r5,lr}
sub sp, 0x4
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
movs r0, 0x1
bl PlaySE
ldr r5, =gUnknown_0203CEC8
movs r1, 0x9
ldrsb r1, [r5, r1]
movs r0, 0x64
muls r0, r1
ldr r1, =gPlayerParty
adds r0, r1
movs r1, 0x3A
bl GetMonData
movs r1, 0x5
bl __udivsi3
adds r3, r0, 0
lsls r3, 16
asrs r3, 16
ldrb r1, [r5, 0xA]
ldr r0, =sub_81616C0
str r0, [sp]
adds r0, r4, 0
movs r2, 0x1
bl sub_81B1F18
add sp, 0x4
pop {r4,r5}
pop {r0}
bx r0
.pool
thumb_func_end sub_816166C
thumb_func_start sub_81616C0
sub_81616C0: @ 81616C0
push {r4,r5,lr}
adds r5, r0, 0
lsls r5, 24
lsrs r5, 24
ldr r0, =gUnknown_0203CEC8
movs r1, 0xA
ldrsb r1, [r0, r1]
movs r0, 0x64
muls r0, r1
ldr r1, =gPlayerParty
adds r0, r1
ldr r1, =gStringVar1
bl GetMonNickname
ldr r4, =gStringVar4
ldr r1, =gText_PkmnHPRestoredByVar2
adds r0, r4, 0
bl StringExpandPlaceholders
adds r0, r4, 0
movs r1, 0
bl sub_81B1B5C
movs r0, 0x2
bl schedule_bg_copy_tilemap_to_vram
ldr r1, =gTasks
lsls r0, r5, 2
adds r0, r5
lsls r0, 3
adds r0, r1
ldr r1, =sub_8161724
str r1, [r0]
pop {r4,r5}
pop {r0}
bx r0
.pool
thumb_func_end sub_81616C0
thumb_func_start sub_8161724
sub_8161724: @ 8161724
push {r4,r5,lr}
lsls r0, 24
lsrs r5, r0, 24
bl sub_81B1BD4
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
beq _08161772
ldr r4, =gUnknown_0203CEC8
movs r0, 0
strb r0, [r4, 0xB]
ldrb r0, [r4, 0x9]
movs r1, 0
bl sub_81B0FCC
ldrb r0, [r4, 0xA]
strb r0, [r4, 0x9]
ldrb r0, [r4, 0xA]
movs r1, 0x1
bl sub_81B0FCC
movs r0, 0x6
movs r1, 0
bl sub_8198070
movs r0, 0x6
bl ClearWindowTilemap
movs r0, 0
bl display_pokemon_menu_message
ldr r1, =gTasks
lsls r0, r5, 2
adds r0, r5
lsls r0, 3
adds r0, r1
ldr r1, =sub_81B1370
str r1, [r0]
_08161772:
pop {r4,r5}
pop {r0}
bx r0
.pool
thumb_func_end sub_8161724
thumb_func_start sub_8161784
sub_8161784: @ 8161784
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
bl sub_81B1BD4
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
beq _081617AA
movs r0, 0x5
bl display_pokemon_menu_message
ldr r0, =gTasks
lsls r1, r4, 2
adds r1, r4
lsls r1, 3
adds r1, r0
ldr r0, =sub_81B1370
str r0, [r1]
_081617AA:
pop {r4}
pop {r0}
bx r0
.pool
thumb_func_end sub_8161784
thumb_func_start sub_81617B8
sub_81617B8: @ 81617B8
push {r4,lr}
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
movs r0, 0x5
bl PlaySE
ldr r0, =gText_CantBeUsedOnPkmn
movs r1, 0
bl sub_81B1B5C
movs r0, 0x2
bl schedule_bg_copy_tilemap_to_vram
ldr r1, =gTasks
lsls r0, r4, 2
adds r0, r4
lsls r0, 3
adds r0, r1
ldr r1, =sub_8161784
str r1, [r0]
pop {r4}
pop {r0}
bx r0
.pool
thumb_func_end sub_81617B8
.align 2, 0 @ Don't pad with nop.

887
asm/fossil_specials.s
View File

@ -5,893 +5,6 @@
.text
thumb_func_start sub_81BEB24
sub_81BEB24: @ 81BEB24
push {r4,r5,lr}
movs r4, 0
ldr r5, =gUnknown_08617DA4
_081BEB2A:
lsls r2, r4, 2
adds r2, r5
ldrb r0, [r2]
adds r0, 0x7
ldrb r1, [r2, 0x1]
adds r1, 0x7
ldrh r2, [r2, 0x2]
bl MapGridSetMetatileIdAt
adds r0, r4, 0x1
lsls r0, 24
lsrs r4, r0, 24
cmp r4, 0x11
bls _081BEB2A
bl DrawWholeMapView
pop {r4,r5}
pop {r0}
bx r0
.pool
thumb_func_end sub_81BEB24
thumb_func_start sub_81BEB54
sub_81BEB54: @ 81BEB54
push {lr}
ldr r0, =sub_81BED50
movs r1, 0x9
bl CreateTask
pop {r0}
bx r0
.pool
thumb_func_end sub_81BEB54
thumb_func_start sub_81BEB68
sub_81BEB68: @ 81BEB68
push {lr}
ldr r0, =sub_81BEBF4
movs r1, 0x9
bl CreateTask
pop {r0}
bx r0
.pool
thumb_func_end sub_81BEB68
thumb_func_start sub_81BEB7C
sub_81BEB7C: @ 81BEB7C
push {lr}
ldr r0, =sub_81BF028
movs r1, 0x9
bl CreateTask
pop {r0}
bx r0
.pool
thumb_func_end sub_81BEB7C
thumb_func_start sub_81BEB90
sub_81BEB90: @ 81BEB90
push {r4,lr}
ldr r4, =gUnknown_0203CF14
ldr r0, [r4]
ldrh r1, [r0]
movs r0, 0x10
bl SetGpuReg
ldr r0, [r4]
ldrh r1, [r0, 0x2]
movs r0, 0x12
bl SetGpuReg
pop {r4}
pop {r0}
bx r0
.pool
thumb_func_end sub_81BEB90
thumb_func_start sub_81BEBB4
sub_81BEBB4: @ 81BEBB4
push {lr}
lsls r0, 24
lsrs r0, 24
ldr r2, =gTasks
lsls r1, r0, 2
adds r1, r0
lsls r1, 3
adds r2, r1, r2
ldrh r1, [r2, 0x8]
movs r3, 0x8
ldrsh r0, [r2, r3]
cmp r0, 0
bne _081BEBEC
ldr r0, =gUnknown_0203CF14
ldr r1, [r0]
ldrh r0, [r1]
negs r0, r0
strh r0, [r1]
movs r0, 0x2
strh r0, [r2, 0x8]
bl sub_81BEB90
b _081BEBF0
.pool
_081BEBEC:
subs r0, r1, 0x1
strh r0, [r2, 0x8]
_081BEBF0:
pop {r0}
bx r0
thumb_func_end sub_81BEBB4
thumb_func_start sub_81BEBF4
sub_81BEBF4: @ 81BEBF4
push {r4,r5,lr}
sub sp, 0xC
lsls r0, 24
lsrs r5, r0, 24
ldr r1, =gTasks
lsls r0, r5, 2
adds r0, r5
lsls r0, 3
adds r0, r1
movs r1, 0x8
ldrsh r0, [r0, r1]
cmp r0, 0x6
bls _081BEC10
b _081BED40
_081BEC10:
lsls r0, 2
ldr r1, =_081BEC24
adds r0, r1
ldr r0, [r0]
mov pc, r0
.pool
.align 2, 0
_081BEC24:
.4byte _081BEC40
.4byte _081BEC50
.4byte _081BEC88
.4byte _081BECB0
.4byte _081BECF8
.4byte _081BED00
.4byte _081BED1C
_081BEC40:
bl FreeAllWindowBuffers
movs r0, 0
movs r1, 0x7
movs r2, 0x2
bl SetBgAttribute
b _081BED04
_081BEC50:
ldr r4, =gUnknown_0203CF04
movs r0, 0x92
lsls r0, 4
bl AllocZeroed
str r0, [r4]
ldr r4, =gUnknown_0203CF08
movs r0, 0x80
lsls r0, 4
bl AllocZeroed
str r0, [r4]
movs r0, 0
movs r1, 0
movs r2, 0
bl ChangeBgX
movs r0, 0
movs r1, 0
movs r2, 0
bl ChangeBgY
b _081BECD8
.pool
_081BEC88:
ldr r0, =gUnknown_08617274
ldr r4, =gUnknown_0203CF04
ldr r1, [r4]
movs r2, 0x92
lsls r2, 3
bl CpuSet
ldr r1, [r4]
movs r2, 0x92
lsls r2, 4
movs r0, 0
movs r3, 0
bl LoadBgTiles
b _081BECD8
.pool
_081BECB0:
ldr r0, =gUnknown_0203CF08
ldr r1, [r0]
movs r0, 0
bl SetBgTilemapBuffer
ldr r1, =gUnknown_08617B94
movs r0, 0x6
str r0, [sp]
movs r0, 0xC
str r0, [sp, 0x4]
movs r0, 0x11
str r0, [sp, 0x8]
movs r0, 0
movs r2, 0xC
movs r3, 0x1D
bl CopyToBgTilemapBufferRect_ChangePalette
movs r0, 0
bl CopyBgTilemapBufferToVram
_081BECD8:
ldr r1, =gTasks
lsls r0, r5, 2
adds r0, r5
lsls r0, 3
adds r0, r1
ldrh r1, [r0, 0x8]
adds r1, 0x1
strh r1, [r0, 0x8]
b _081BED40
.pool
_081BECF8:
movs r0, 0
bl ShowBg
b _081BED04
_081BED00:
bl sub_81BEB24
_081BED04:
ldr r0, =gTasks
lsls r1, r5, 2
adds r1, r5
lsls r1, 3
adds r1, r0
ldrh r0, [r1, 0x8]
adds r0, 0x1
strh r0, [r1, 0x8]
b _081BED40
.pool
_081BED1C:
ldr r4, =gUnknown_0203CF14
movs r0, 0x4
bl Alloc
str r0, [r4]
movs r2, 0
movs r1, 0x2
strh r1, [r0]
strh r2, [r0, 0x2]
ldr r0, =sub_81BEBB4
movs r1, 0xA
bl CreateTask
adds r0, r5, 0
bl DestroyTask
bl EnableBothScriptContexts
_081BED40:
add sp, 0xC
pop {r4,r5}
pop {r0}
bx r0
.pool
thumb_func_end sub_81BEBF4
thumb_func_start sub_81BED50
sub_81BED50: @ 81BED50
push {r4-r7,lr}
mov r7, r10
mov r6, r9
mov r5, r8
push {r5-r7}
sub sp, 0x10
lsls r0, 24
lsrs r0, 24
mov r10, r0
ldr r1, =gTasks
lsls r0, 2
add r0, r10
lsls r0, 3
adds r0, r1
ldrh r0, [r0, 0x8]
subs r0, 0x1
lsls r0, 16
asrs r0, 16
adds r6, r1, 0
cmp r0, 0x7
bls _081BED7C
b _081BF002
_081BED7C:
lsls r0, 2
ldr r1, =_081BED90
adds r0, r1
ldr r0, [r0]
mov pc, r0
.pool
.align 2, 0
_081BED90:
.4byte _081BEDB0
.4byte _081BF002
.4byte _081BEDC4
.4byte _081BEF64
.4byte _081BEF94
.4byte _081BEFD0
.4byte _081BEFF0
.4byte _081BEFF8
_081BEDB0:
ldr r4, =gUnknown_0203CF10
movs r0, 0xC0
lsls r0, 2
bl AllocZeroed
str r0, [r4]
b _081BF002
.pool
_081BEDC4:
mov r1, r10
lsls r0, r1, 2
adds r1, r0, r1
lsls r1, 3
adds r2, r1, r6
ldrh r3, [r2, 0xE]
movs r4, 0xE
ldrsh r1, [r2, r4]
str r0, [sp, 0x8]
cmp r1, 0x5F
bgt _081BEE8A
movs r1, 0xA
ldrsh r0, [r2, r1]
cmp r0, 0x1
ble _081BEE7C
lsls r0, r3, 24
lsrs r4, r0, 24
movs r0, 0x30
bl Alloc
ldr r3, =gUnknown_0203CF10
ldr r1, [r3]
lsls r2, r4, 3
adds r1, r2, r1
str r0, [r1]
movs r5, 0
adds r4, r2, 0
_081BEDFA:
ldr r0, [r3]
adds r0, r4, r0
ldr r0, [r0]
adds r0, r5
strb r5, [r0]
adds r0, r5, 0x1
lsls r0, 16
lsrs r5, r0, 16
cmp r5, 0x2F
bls _081BEDFA
movs r5, 0
ldr r7, =gUnknown_0203CF10
adds r6, r2, 0
_081BEE14:
bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0x30
bl __umodsi3
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0x30
bl __umodsi3
lsls r0, 16
lsrs r0, 16
ldr r1, [r7]
adds r1, r6, r1
ldr r1, [r1]
adds r0, r1, r0
ldrb r2, [r0]
adds r1, r4
ldrb r1, [r1]
strb r1, [r0]
ldr r0, [r7]
adds r0, r6, r0
ldr r0, [r0]
adds r0, r4
strb r2, [r0]
adds r0, r5, 0x1
lsls r0, 16
lsrs r5, r0, 16
cmp r5, 0x2F
bls _081BEE14
ldr r0, =gTasks
ldr r1, [sp, 0x8]
add r1, r10
lsls r1, 3
adds r2, r1, r0
ldrh r3, [r2, 0xE]
movs r4, 0xE
ldrsh r1, [r2, r4]
adds r6, r0, 0
cmp r1, 0x5F
bgt _081BEE78
adds r0, r3, 0x1
strh r0, [r2, 0xE]
_081BEE78:
movs r0, 0
strh r0, [r2, 0xA]
_081BEE7C:
ldr r1, [sp, 0x8]
add r1, r10
lsls r1, 3
adds r1, r6
ldrh r0, [r1, 0xA]
adds r0, 0x1
strh r0, [r1, 0xA]
_081BEE8A:
ldr r0, [sp, 0x8]
add r0, r10
lsls r0, 3
adds r0, r6
ldrb r4, [r0, 0xE]
ldrb r5, [r0, 0xC]
lsls r0, r4, 16
cmp r5, r4
bcs _081BEF32
str r0, [sp, 0xC]
_081BEE9E:
movs r6, 0
adds r0, r5, 0x1
str r0, [sp, 0x4]
lsls r4, r5, 3
movs r2, 0x5F
subs r1, r2, r5
lsls r0, r1, 1
adds r0, r1
lsls r0, 4
mov r9, r0
_081BEEB2:
ldr r0, =gUnknown_0203CF04
ldr r0, [r0]
ldr r7, =gUnknown_0203CF10
ldr r3, [r7]
adds r3, r4, r3
ldrb r2, [r3, 0x4]
adds r1, r2, 0x1
strb r1, [r3, 0x4]
lsls r2, 24
lsrs r2, 24
ldr r1, [r3]
adds r1, r2
ldrb r1, [r1]
add r1, r9
lsls r1, 16
lsrs r1, 16
movs r2, 0x1
mov r8, r2
str r2, [sp]
movs r2, 0
movs r3, 0x30
bl sub_81BF2B8
adds r0, r6, 0x1
lsls r0, 24
lsrs r6, r0, 24
cmp r6, 0
beq _081BEEB2
ldr r0, [r7]
adds r1, r4, r0
ldrb r0, [r1, 0x4]
cmp r0, 0x2F
bls _081BEF24
ldr r0, [r1]
bl Free
ldr r0, [r7]
adds r0, r4, r0
movs r1, 0
str r1, [r0]
ldr r1, [sp, 0x8]
add r1, r10
lsls r1, 3
ldr r4, =gTasks
adds r1, r4
ldrh r0, [r1, 0xC]
adds r0, 0x1
strh r0, [r1, 0xC]
mov r0, r8
ands r5, r0
cmp r5, 0x1
bne _081BEF24
ldr r0, =gUnknown_0203CF14
ldr r1, [r0]
ldrh r0, [r1, 0x2]
subs r0, 0x1
strh r0, [r1, 0x2]
_081BEF24:
ldr r1, [sp, 0x4]
lsls r0, r1, 16
lsrs r5, r0, 16
ldr r2, [sp, 0xC]
lsrs r0, r2, 16
cmp r5, r0
bcc _081BEE9E
_081BEF32:
ldr r0, =gUnknown_0203CF04
ldr r1, [r0]
movs r2, 0x92
lsls r2, 4
movs r0, 0
movs r3, 0
bl LoadBgTiles
ldr r0, =gUnknown_0203CF10
ldr r0, [r0]
movs r4, 0xBE
lsls r4, 2
adds r0, r4
ldrb r0, [r0, 0x4]
cmp r0, 0x2F
bhi _081BF002
b _081BF014
.pool
_081BEF64:
movs r0, 0
bl UnsetBgTilemapBuffer
ldr r0, =sub_81BEBB4
bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
cmp r0, 0xFF
beq _081BEF7C
bl DestroyTask
_081BEF7C:
ldr r0, =gUnknown_0203CF14
ldr r1, [r0]
movs r0, 0
strh r0, [r1]
strh r0, [r1, 0x2]
bl sub_81BEB90
b _081BF002
.pool
_081BEF94:
ldr r4, =gUnknown_0203CF14
ldr r0, [r4]
bl Free
movs r5, 0
str r5, [r4]
ldr r4, =gUnknown_0203CF10
ldr r0, [r4]
bl Free
str r5, [r4]
ldr r4, =gUnknown_0203CF04
ldr r0, [r4]
bl Free
str r5, [r4]
ldr r4, =gUnknown_0203CF08
ldr r0, [r4]
bl Free
str r5, [r4]
b _081BF002
.pool
_081BEFD0:
movs r0, 0xC
movs r1, 0x2
bl SetGpuRegBits
movs r0, 0x8
movs r1, 0
bl SetGpuRegBits
movs r0, 0
movs r1, 0x7
movs r2, 0
bl SetBgAttribute
bl sub_81971D0
b _081BF002
_081BEFF0:
movs r0, 0
bl ShowBg
b _081BF002
_081BEFF8:
mov r0, r10
bl DestroyTask
bl EnableBothScriptContexts
_081BF002:
ldr r0, =gTasks
mov r2, r10
lsls r1, r2, 2
add r1, r10
lsls r1, 3
adds r1, r0
ldrh r0, [r1, 0x8]
adds r0, 0x1
strh r0, [r1, 0x8]
_081BF014:
add sp, 0x10
pop {r3-r5}
mov r8, r3
mov r9, r4
mov r10, r5
pop {r4-r7}
pop {r0}
bx r0
.pool
thumb_func_end sub_81BED50
thumb_func_start sub_81BF028
sub_81BF028: @ 81BF028
push {r4-r7,lr}
mov r7, r8
push {r7}
sub sp, 0x18
lsls r0, 24
lsrs r7, r0, 24
ldr r1, =gTasks
lsls r0, r7, 2
adds r0, r7
lsls r0, 3
adds r0, r1
ldrh r0, [r0, 0x8]
subs r0, 0x1
lsls r0, 16
asrs r0, 16
cmp r0, 0x7
bls _081BF04C
b _081BF228
_081BF04C:
lsls r0, 2
ldr r1, =_081BF060
adds r0, r1
ldr r0, [r0]
mov pc, r0
.pool
.align 2, 0
_081BF060:
.4byte _081BF080
.4byte _081BF0B4
.4byte _081BF0DC
.4byte _081BF0F0
.4byte _081BF148
.4byte _081BF170
.4byte _081BF1CC
.4byte _081BF224
_081BF080:
ldr r4, =gUnknown_0203CF0C
movs r0, 0x14
bl AllocZeroed
str r0, [r4]
movs r0, 0x80
bl AllocZeroed
ldr r1, [r4]
str r0, [r1]
movs r0, 0x8
bl AllocZeroed
ldr r1, [r4]
str r0, [r1, 0x4]
movs r0, 0x80
lsls r0, 2
bl AllocZeroed
ldr r1, [r4]
str r0, [r1, 0xC]
movs r0, 0
strh r0, [r1, 0x10]
b _081BF228
.pool
_081BF0B4:
ldr r0, =gUnknown_0203CF0C
ldr r0, [r0]
ldr r1, [r0]
movs r5, 0
ldr r2, =gRootFossil_Gfx
_081BF0BE:
adds r0, r5, r2
ldrb r0, [r0]
strb r0, [r1]
adds r0, r5, 0x1
lsls r0, 16
lsrs r5, r0, 16
adds r1, 0x1
cmp r5, 0x7F
bls _081BF0BE
b _081BF228
.pool
_081BF0DC:
ldr r0, =gUnknown_0203CF0C
ldr r0, [r0]
ldr r1, [r0, 0x4]
ldr r0, [r0]
str r0, [r1]
movs r0, 0x80
strh r0, [r1, 0x4]
b _081BF228
.pool
_081BF0F0:
mov r1, sp
ldr r0, =gUnknown_08617E00
ldm r0!, {r2-r4}
stm r1!, {r2-r4}
ldm r0!, {r2-r4}
stm r1!, {r2-r4}
ldr r4, =gUnknown_0203CF0C
ldr r0, [r4]
ldr r0, [r0, 0x4]
str r0, [sp, 0xC]
movs r2, 0x10
negs r2, r2
mov r0, sp
movs r1, 0x80
movs r3, 0x1
bl CreateSprite
ldr r1, [r4]
movs r3, 0
strb r0, [r1, 0x8]
ldr r2, =gSprites
ldr r0, [r4]
ldrb r1, [r0, 0x8]
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
adds r0, r2
adds r0, 0x28
strb r3, [r0]
ldr r3, [r4]
ldrb r1, [r3, 0x8]
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
adds r0, r2
ldrh r1, [r0, 0x20]
strh r1, [r0, 0x2E]
ldrb r1, [r3, 0x8]
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
adds r0, r2
movs r1, 0x1
strh r1, [r0, 0x30]
_081BF148:
movs r5, 0
ldr r2, =gUnknown_0203CF0C
_081BF14C:
ldr r0, [r2]
ldr r1, [r0, 0xC]
lsls r0, r5, 1
adds r0, r1
strh r5, [r0]
adds r0, r5, 0x1
lsls r0, 16
lsrs r5, r0, 16
cmp r5, 0xFF
bls _081BF14C
b _081BF228
.pool
_081BF170:
movs r5, 0
movs r6, 0xFF
ldr r0, =0x000001ff
mov r8, r0
_081BF178:
bl Random
adds r4, r6, 0
ands r4, r0
bl Random
adds r1, r6, 0
ands r1, r0
ldr r0, =gUnknown_0203CF0C
ldr r3, [r0]
ldr r0, [r3, 0xC]
lsls r1, 1
adds r1, r0
ldrh r2, [r1]
lsls r4, 1
adds r4, r0
ldrh r0, [r4]
strh r0, [r1]
strh r2, [r4]
adds r0, r5, 0x1
lsls r0, 16
lsrs r5, r0, 16
cmp r5, r8
bls _081BF178
ldr r2, =gSprites
ldrb r1, [r3, 0x8]
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
adds r2, 0x1C
adds r0, r2
ldr r1, =sub_81BF248
str r1, [r0]
b _081BF228
.pool
_081BF1CC:
ldr r3, =gSprites
ldr r5, =gUnknown_0203CF0C
ldr r0, [r5]
ldrb r1, [r0, 0x8]
lsls r0, r1, 4
adds r0, r1
lsls r2, r0, 2
adds r0, r3, 0
adds r0, 0x1C
adds r0, r2, r0
ldr r1, [r0]
ldr r0, =SpriteCallbackDummy
cmp r1, r0
bne _081BF238
adds r0, r2, r3
bl DestroySprite
ldr r0, [r5]
ldr r0, [r0, 0xC]
bl Free
ldr r0, [r5]
movs r4, 0
str r4, [r0, 0xC]
ldr r0, [r0, 0x4]
bl Free
ldr r0, [r5]
str r4, [r0, 0x4]
ldr r0, [r0]
bl Free
ldr r0, [r5]
str r4, [r0]
bl Free
str r4, [r5]
b _081BF228
.pool
_081BF224:
bl EnableBothScriptContexts
_081BF228:
ldr r0, =gTasks
lsls r1, r7, 2
adds r1, r7
lsls r1, 3
adds r1, r0
ldrh r0, [r1, 0x8]
adds r0, 0x1
strh r0, [r1, 0x8]
_081BF238:
add sp, 0x18
pop {r3}
mov r8, r3
pop {r4-r7}
pop {r0}
bx r0
.pool
thumb_func_end sub_81BF028
thumb_func_start sub_81BF248
sub_81BF248: @ 81BF248
push {r4,r5,lr}
sub sp, 0x4
adds r5, r0, 0
ldr r0, =gUnknown_0203CF0C
ldr r0, [r0]
ldrh r0, [r0, 0x10]
cmp r0, 0xFF
bls _081BF268
ldr r0, =SpriteCallbackDummy
str r0, [r5, 0x1C]
b _081BF2B0
.pool
_081BF268:
ldrh r1, [r5, 0x22]
movs r2, 0x22
ldrsh r0, [r5, r2]
cmp r0, 0x5F
ble _081BF2AC
movs r4, 0
_081BF274:
ldr r0, =gUnknown_0203CF0C
ldr r3, [r0]
ldr r0, [r3]
ldrh r1, [r3, 0x10]
adds r2, r1, 0x1
strh r2, [r3, 0x10]
lsls r1, 16
ldr r2, [r3, 0xC]
lsrs r1, 15
adds r1, r2
ldrh r1, [r1]
movs r2, 0
str r2, [sp]
movs r3, 0x10
bl sub_81BF2B8
adds r0, r4, 0x1
lsls r0, 24
lsrs r4, r0, 24
cmp r4, 0x1
bls _081BF274
adds r0, r5, 0
movs r1, 0
bl StartSpriteAnim
b _081BF2B0
.pool
_081BF2AC:
adds r0, r1, 0x1
strh r0, [r5, 0x22]
_081BF2B0:
add sp, 0x4
pop {r4,r5}
pop {r0}
bx r0
thumb_func_end sub_81BF248
thumb_func_start sub_81BF2B8
sub_81BF2B8: @ 81BF2B8
push {r4-r7,lr}

6270
asm/intro.s
View File

File diff suppressed because it is too large Load Diff

1077
asm/intro_credits_graphics.s
View File

File diff suppressed because it is too large Load Diff

637
asm/item_menu_icons.s
View File

@ -1,637 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start RemoveBagObject
@ void RemoveBagObject(u8 a1)
RemoveBagObject: @ 80D4CA8
push {r4,r5,lr}
lsls r0, 24
lsrs r4, r0, 24
ldr r0, =gUnknown_0203CE54
ldr r2, =0x00000804
adds r1, r4, r2
ldr r0, [r0]
adds r5, r0, r1
ldrb r0, [r5]
cmp r0, 0xFF
beq _080D4CEE
adds r4, 0x64
adds r0, r4, 0
bl FreeSpriteTilesByTag
adds r0, r4, 0
bl FreeSpritePaletteByTag
ldrb r1, [r5]
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r4, =gSprites
adds r0, r4
bl FreeSpriteOamMatrix
ldrb r1, [r5]
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
adds r0, r4
bl DestroySprite
movs r0, 0xFF
strb r0, [r5]
_080D4CEE:
pop {r4,r5}
pop {r0}
bx r0
.pool
thumb_func_end RemoveBagObject
thumb_func_start AddBagVisualObject
@ void AddBagVisualObject(u8 bagPocketId)
AddBagVisualObject: @ 80D4D00
push {r4,r5,lr}
adds r5, r0, 0
lsls r5, 24
lsrs r5, 24
ldr r0, =gUnknown_0203CE54
ldr r4, [r0]
ldr r0, =0x00000804
adds r4, r0
ldr r0, =gUnknown_0857FB4C
movs r1, 0x44
movs r2, 0x42
movs r3, 0
bl CreateSprite
strb r0, [r4]
adds r0, r5, 0
movs r1, 0
bl SetBagVisualPocketId
pop {r4,r5}
pop {r0}
bx r0
.pool
thumb_func_end AddBagVisualObject
thumb_func_start SetBagVisualPocketId
@ void SetBagVisualPocketId(u8 bagPocketId, bool8 isSwitchingPockets)
SetBagVisualPocketId: @ 80D4D38
push {lr}
lsls r0, 24
lsrs r3, r0, 24
lsls r1, 24
ldr r0, =gUnknown_0203CE54
ldr r0, [r0]
ldr r2, =0x00000804
adds r0, r2
ldrb r2, [r0]
lsls r0, r2, 4
adds r0, r2
lsls r0, 2
ldr r2, =gSprites
adds r2, r0, r2
cmp r1, 0
beq _080D4D84
ldr r0, =0x0000fffb
strh r0, [r2, 0x26]
ldr r0, =ObjectCB_BagVisualSwitchingPockets
str r0, [r2, 0x1C]
adds r0, r3, 0x1
strh r0, [r2, 0x2E]
adds r0, r2, 0
movs r1, 0
bl StartSpriteAnim
b _080D4D90
.pool
_080D4D84:
adds r1, r3, 0x1
lsls r1, 24
lsrs r1, 24
adds r0, r2, 0
bl StartSpriteAnim
_080D4D90:
pop {r0}
bx r0
thumb_func_end SetBagVisualPocketId
thumb_func_start ObjectCB_BagVisualSwitchingPockets
@ void ObjectCB_BagVisualSwitchingPockets(struct obj *object)
ObjectCB_BagVisualSwitchingPockets: @ 80D4D94
push {r4,lr}
adds r4, r0, 0
ldrh r1, [r4, 0x26]
movs r2, 0x26
ldrsh r0, [r4, r2]
cmp r0, 0
beq _080D4DA8
adds r0, r1, 0x1
strh r0, [r4, 0x26]
b _080D4DB8
_080D4DA8:
ldrh r1, [r4, 0x2E]
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
bl StartSpriteAnim
ldr r0, =SpriteCallbackDummy
str r0, [r4, 0x1C]
_080D4DB8:
pop {r4}
pop {r0}
bx r0
.pool
thumb_func_end ObjectCB_BagVisualSwitchingPockets
thumb_func_start ShakeBagVisual
@ void ShakeBagVisual()
ShakeBagVisual: @ 80D4DC4
push {r4,lr}
ldr r0, =gUnknown_0203CE54
ldr r0, [r0]
ldr r1, =0x00000804
adds r0, r1
ldrb r1, [r0]
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =gSprites
adds r4, r0, r1
adds r0, r4, 0
adds r0, 0x3F
ldrb r1, [r0]
movs r0, 0x20
ands r0, r1
cmp r0, 0
beq _080D4DF4
adds r0, r4, 0
movs r1, 0x1
bl StartSpriteAffineAnim
ldr r0, =ObjectCB_ShakeBagVisual
str r0, [r4, 0x1C]
_080D4DF4:
pop {r4}
pop {r0}
bx r0
.pool
thumb_func_end ShakeBagVisual
thumb_func_start ObjectCB_ShakeBagVisual
@ void ObjectCB_ShakeBagVisual(struct obj *object)
ObjectCB_ShakeBagVisual: @ 80D4E0C
push {r4,lr}
adds r4, r0, 0
adds r0, 0x3F
ldrb r1, [r0]
movs r0, 0x20
ands r0, r1
cmp r0, 0
beq _080D4E28
adds r0, r4, 0
movs r1, 0
bl StartSpriteAffineAnim
ldr r0, =SpriteCallbackDummy
str r0, [r4, 0x1C]
_080D4E28:
pop {r4}
pop {r0}
bx r0
.pool
thumb_func_end ObjectCB_ShakeBagVisual
thumb_func_start AddSwitchPocketRotatingBallObject
@ void AddSwitchPocketRotatingBallObject(u16 rotationDirection)
AddSwitchPocketRotatingBallObject: @ 80D4E34
push {r4,r5,lr}
adds r5, r0, 0
lsls r5, 16
lsrs r5, 16
ldr r0, =gUnknown_0203CE54
ldr r4, [r0]
ldr r0, =0x00000805
adds r4, r0
ldr r0, =gUnknown_0857FBA0
bl LoadSpriteSheet
ldr r0, =gUnknown_0857FBA8
bl LoadSpritePalette
ldr r0, =gUnknown_0857FBB0
movs r1, 0x10
movs r2, 0x10
movs r3, 0
bl CreateSprite
strb r0, [r4]
ldr r2, =gSprites
ldrb r1, [r4]
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
adds r0, r2
strh r5, [r0, 0x2E]
pop {r4,r5}
pop {r0}
bx r0
.pool
thumb_func_end AddSwitchPocketRotatingBallObject
thumb_func_start update_switch_pocket_rotating_ball_coords
@ void update_switch_pocket_rotating_ball_coords(struct obj *object)
update_switch_pocket_rotating_ball_coords: @ 80D4E8C
ldrh r2, [r0, 0x30]
ldrh r1, [r0, 0x34]
adds r1, 0x1
movs r3, 0x1
ands r1, r3
subs r2, r1
adds r1, r0, 0
adds r1, 0x28
strb r2, [r1]
ldrh r2, [r0, 0x30]
ldrh r1, [r0, 0x34]
adds r1, 0x1
ands r1, r3
subs r2, r1
adds r0, 0x29
strb r2, [r0]
bx lr
thumb_func_end update_switch_pocket_rotating_ball_coords
thumb_func_start ObjectCB_SwitchPocketRotatingBallInit
@ void ObjectCB_SwitchPocketRotatingBallInit(struct obj *object)
ObjectCB_SwitchPocketRotatingBallInit: @ 80D4EB0
push {r4,lr}
adds r4, r0, 0
ldrb r1, [r4, 0x1]
movs r0, 0x4
negs r0, r0
ands r0, r1
movs r1, 0x1
orrs r0, r1
strb r0, [r4, 0x1]
movs r0, 0x2E
ldrsh r1, [r4, r0]
movs r0, 0x1
negs r0, r0
cmp r1, r0
bne _080D4ED8
ldr r0, =gUnknown_0857FB98
b _080D4EDA
.pool
_080D4ED8:
ldr r0, =gUnknown_0857FB9C
_080D4EDA:
str r0, [r4, 0x10]
adds r0, r4, 0
bl InitSpriteAffineAnim
adds r0, r4, 0
adds r0, 0x28
ldrb r0, [r0]
lsls r0, 24
asrs r0, 24
strh r0, [r4, 0x30]
adds r0, r4, 0
adds r0, 0x29
ldrb r0, [r0]
lsls r0, 24
asrs r0, 24
strh r0, [r4, 0x30]
adds r0, r4, 0
bl update_switch_pocket_rotating_ball_coords
ldr r0, =ObjectCB_SwitchPocketRotatingBallContinue
str r0, [r4, 0x1C]
pop {r4}
pop {r0}
bx r0
.pool
thumb_func_end ObjectCB_SwitchPocketRotatingBallInit
thumb_func_start ObjectCB_SwitchPocketRotatingBallContinue
@ void ObjectCB_SwitchPocketRotatingBallContinue(struct obj *object)
ObjectCB_SwitchPocketRotatingBallContinue: @ 80D4F14
push {r4,lr}
adds r4, r0, 0
ldrh r0, [r4, 0x34]
adds r0, 0x1
strh r0, [r4, 0x34]
adds r0, r4, 0
bl update_switch_pocket_rotating_ball_coords
movs r1, 0x34
ldrsh r0, [r4, r1]
cmp r0, 0x10
bne _080D4F32
movs r0, 0x1
bl RemoveBagObject
_080D4F32:
pop {r4}
pop {r0}
bx r0
thumb_func_end ObjectCB_SwitchPocketRotatingBallContinue
thumb_func_start AddBagItemIconObject
@ void AddBagItemIconObject(u16 itemId, u8 a2)
AddBagItemIconObject: @ 80D4F38
push {r4-r6,lr}
lsls r0, 16
lsrs r6, r0, 16
lsls r1, 24
lsrs r4, r1, 24
ldr r0, =gUnknown_0203CE54
ldr r2, =0x00000806
adds r1, r4, r2
ldr r0, [r0]
adds r5, r0, r1
ldrb r0, [r5]
cmp r0, 0xFF
bne _080D4F86
adds r4, 0x66
adds r0, r4, 0
bl FreeSpriteTilesByTag
adds r0, r4, 0
bl FreeSpritePaletteByTag
adds r0, r4, 0
adds r1, r4, 0
adds r2, r6, 0
bl AddItemIconSprite
lsls r0, 24
lsrs r2, r0, 24
cmp r2, 0x40
beq _080D4F86
strb r2, [r5]
ldr r1, =gSprites
lsls r0, r2, 4
adds r0, r2
lsls r0, 2
adds r0, r1
movs r1, 0x18
strh r1, [r0, 0x24]
movs r1, 0x58
strh r1, [r0, 0x26]
_080D4F86:
pop {r4-r6}
pop {r0}
bx r0
.pool
thumb_func_end AddBagItemIconObject
thumb_func_start RemoveBagItemIconObject
@ void RemoveBagItemIconObject(u8 a1)
RemoveBagItemIconObject: @ 80D4F98
push {lr}
lsls r0, 24
movs r1, 0x80
lsls r1, 18
adds r0, r1
lsrs r0, 24
bl RemoveBagObject
pop {r0}
bx r0
thumb_func_end RemoveBagItemIconObject
thumb_func_start sub_80D4FAC
sub_80D4FAC: @ 80D4FAC
push {lr}
ldr r0, =gUnknown_0203CE54
ldr r0, [r0]
ldr r1, =0x00000808
adds r0, r1
movs r1, 0x8
bl sub_8122344
pop {r0}
bx r0
.pool
thumb_func_end sub_80D4FAC
thumb_func_start sub_80D4FC8
sub_80D4FC8: @ 80D4FC8
push {lr}
adds r2, r0, 0
lsls r2, 24
lsrs r2, 24
ldr r0, =gUnknown_0203CE54
ldr r0, [r0]
ldr r1, =0x00000808
adds r0, r1
movs r1, 0x8
bl sub_81223FC
pop {r0}
bx r0
.pool
thumb_func_end sub_80D4FC8
thumb_func_start sub_80D4FEC
sub_80D4FEC: @ 80D4FEC
push {lr}
adds r3, r0, 0
lsls r3, 24
ldr r0, =gUnknown_0203CE54
ldr r0, [r0]
ldr r1, =0x00000808
adds r0, r1
lsrs r3, 4
movs r1, 0x80
lsls r1, 13
adds r3, r1
lsrs r3, 16
movs r1, 0x88
movs r2, 0x78
bl sub_8122448
pop {r0}
bx r0
.pool
thumb_func_end sub_80D4FEC
thumb_func_start sub_80D5018
sub_80D5018: @ 80D5018
push {r4-r7,lr}
mov r7, r8
push {r7}
adds r6, r0, 0
adds r4, r1, 0
movs r2, 0x80
lsls r2, 4
adds r0, r4, 0
movs r1, 0
bl memset
movs r0, 0x80
lsls r0, 1
adds r4, r0
movs r7, 0
_080D5036:
adds r4, 0x20
movs r5, 0
adds r1, r7, 0x1
mov r8, r1
_080D503E:
adds r0, r4, 0
adds r1, r6, 0
movs r2, 0x20
bl memcpy
adds r4, 0x20
adds r6, 0x20
adds r0, r5, 0x1
lsls r0, 24
lsrs r5, r0, 24
cmp r5, 0x5
bls _080D503E
cmp r7, 0x5
beq _080D505C
adds r4, 0x20
_080D505C:
mov r1, r8
lsls r0, r1, 24
lsrs r7, r0, 24
cmp r7, 0x5
bls _080D5036
pop {r3}
mov r8, r3
pop {r4-r7}
pop {r0}
bx r0
thumb_func_end sub_80D5018
thumb_func_start sub_80D5070
sub_80D5070: @ 80D5070
push {r4,r5,lr}
sub sp, 0x8
lsls r0, 24
lsrs r0, 24
adds r4, r0, 0
cmp r4, 0x2A
bne _080D5082
bl IsEnigmaBerryValid
_080D5082:
ldr r5, =gBerryPicTable
lsls r4, 3
adds r0, r5, 0x4
adds r0, r4, r0
ldr r0, [r0]
str r0, [sp]
ldr r1, =0xffff0000
ldr r0, [sp, 0x4]
ands r0, r1
ldr r1, =0x00007544
orrs r0, r1
str r0, [sp, 0x4]
mov r0, sp
bl LoadCompressedObjectPalette
adds r4, r5
ldr r0, [r4]
ldr r4, =0x0201d000
adds r1, r4, 0
bl LZDecompressWram
ldr r0, =0xfffff000
adds r1, r4, r0
adds r0, r4, 0
bl sub_80D5018
add sp, 0x8
pop {r4,r5}
pop {r0}
bx r0
.pool
thumb_func_end sub_80D5070
thumb_func_start CreateBerryTagSprite
CreateBerryTagSprite: @ 80D50D4
push {r4,r5,lr}
adds r4, r1, 0
adds r5, r2, 0
lsls r0, 24
lsrs r0, 24
lsls r4, 16
lsrs r4, 16
lsls r5, 16
lsrs r5, 16
bl sub_80D5070
ldr r0, =gUnknown_0857FBEC
lsls r4, 16
asrs r4, 16
lsls r5, 16
asrs r5, 16
adds r1, r4, 0
adds r2, r5, 0
movs r3, 0
bl CreateSprite
lsls r0, 24
lsrs r0, 24
pop {r4,r5}
pop {r1}
bx r1
.pool
thumb_func_end CreateBerryTagSprite
thumb_func_start FreeBerryTagSpritePalette
FreeBerryTagSpritePalette: @ 80D510C
push {lr}
ldr r0, =0x00007544
bl FreeSpritePaletteByTag
pop {r0}
bx r0
.pool
thumb_func_end FreeBerryTagSpritePalette
thumb_func_start sub_80D511C
sub_80D511C: @ 80D511C
push {r4-r6,lr}
mov r6, r8
push {r6}
adds r4, r0, 0
adds r5, r1, 0
adds r6, r2, 0
mov r8, r3
lsls r4, 24
lsrs r4, 24
lsls r5, 24
lsrs r5, 24
lsls r6, 24
lsrs r6, 24
mov r0, r8
lsls r0, 24
lsrs r0, 24
mov r8, r0
ldr r0, =0x00007544
bl FreeSpritePaletteByTag
adds r0, r4, 0
bl sub_80D5070
ldr r0, =gUnknown_0857FC7C
adds r1, r5, 0
adds r2, r6, 0
movs r3, 0
bl CreateSprite
lsls r0, 24
lsrs r1, r0, 24
adds r4, r1, 0
mov r0, r8
cmp r0, 0x1
bne _080D5172
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =gSprites
adds r0, r1
movs r1, 0x1
bl StartSpriteAffineAnim
_080D5172:
adds r0, r4, 0
pop {r3}
mov r8, r3
pop {r4-r6}
pop {r1}
bx r1
.pool
thumb_func_end sub_80D511C
thumb_func_start CreateBerryFlavorCircleSprite
CreateBerryFlavorCircleSprite: @ 80D518C
push {lr}
adds r1, r0, 0
ldr r0, =gUnknown_0857FE10
lsls r1, 16
asrs r1, 16
movs r2, 0x74
movs r3, 0
bl CreateSprite
lsls r0, 24
lsrs r0, 24
pop {r1}
bx r1
.pool
thumb_func_end CreateBerryFlavorCircleSprite
.align 2, 0 @ Don't pad with nop.

4
asm/learn_move.s
View File

@ -903,7 +903,7 @@ sub_8160EA0: @ 8160EA0
ldrb r0, [r0]
ldr r1, =gUnknown_0203BC38
adds r2, r1, 0x2
bl sub_81AE6C8
bl DestroyListMenuTask
bl FreeAllWindowBuffers
ldr r0, [r4]
bl Free
@ -988,7 +988,7 @@ sub_8160F50: @ 8160F50
ldr r4, =gUnknown_0203BC38
adds r2, r4, 0x2
adds r1, r4, 0
bl sub_81AE860
bl ListMenuGetScrollAndRow
movs r0, 0x2
negs r0, r0
cmp r5, r0

1643
asm/list_menu.s
View File

File diff suppressed because it is too large Load Diff

2
asm/map_name_popup.s
View File

@ -8,7 +8,7 @@
thumb_func_start sub_80D47D4
sub_80D47D4: @ 80D47D4
push {lr}
bl sub_80A0934
bl HideStartMenu
bl ShowMapNamePopup
movs r0, 0x1
pop {r1}

4
asm/party_menu.s
View File

@ -15413,7 +15413,7 @@ sub_81B8448: @ 81B8448
str r0, [sp]
ldr r0, =sub_81B1370
str r0, [sp, 0x4]
ldr r0, =sub_816BB28
ldr r0, =Mailbox_ReturnToMailListAfterDeposit
str r0, [sp, 0x8]
movs r0, 0
movs r1, 0
@ -15442,7 +15442,7 @@ sub_81B8474: @ 81B8474
movs r0, 0
strb r0, [r1]
ldr r2, =gSaveBlock1Ptr
ldr r0, =gUnknown_0203BCB8
ldr r0, =playerPCItemPageInfo
ldrh r1, [r0]
adds r1, 0x6
ldrh r0, [r0, 0x2]

3436
asm/player_pc.s
View File

File diff suppressed because it is too large Load Diff

16
asm/pokemon_summary_screen.s
View File

@ -3469,7 +3469,7 @@ sub_81C5B4C: @ 81C5B4C
ldr r4, =gUnknown_0203CF38
subs r2, r4, 0x2
adds r1, r4, 0
bl sub_81AE6C8
bl DestroyListMenuTask
ldr r0, =gUnknown_0203CF2C
ldr r0, [r0]
ldr r0, [r0]
@ -3545,7 +3545,7 @@ _081C5C12:
adds r1, r4, 0
adds r1, 0x8
adds r2, r4, 0x6
bl sub_81AE860
bl ListMenuGetScrollAndRow
ldrh r1, [r4, 0x8]
ldrh r0, [r4, 0x6]
adds r1, r0
@ -3572,7 +3572,7 @@ _081C5C5C:
mov r8, r1
mov r2, r8
subs r2, 0x2
bl sub_81AE860
bl ListMenuGetScrollAndRow
movs r0, 0x2
negs r0, r0
cmp r6, r0
@ -4642,7 +4642,7 @@ sub_81C65CC: @ 81C65CC
ldrb r0, [r4]
adds r1, r6, 0
adds r2, r7, 0
bl sub_81AE6C8
bl DestroyListMenuTask
bl sub_81C5924
bl sub_81C59BC
bl sub_81C5314
@ -4953,7 +4953,7 @@ sub_81C68B0: @ 81C68B0
ldrb r0, [r4]
ldr r1, =gUnknown_0203CF38
subs r2, r1, 0x2
bl sub_81AE860
bl ListMenuGetScrollAndRow
b _081C6940
.pool
_081C68F8:
@ -4964,7 +4964,7 @@ _081C68F8:
ldr r4, =gUnknown_0203CF38
subs r2, r4, 0x2
adds r1, r4, 0
bl sub_81AE860
bl ListMenuGetScrollAndRow
movs r0, 0
bl sub_81C7028
subs r4, 0x8
@ -5054,7 +5054,7 @@ _081C69A8:
ldrb r0, [r5]
adds r1, r7, 0
mov r2, r8
bl sub_81AE6C8
bl DestroyListMenuTask
movs r3, 0x2
ldrsh r0, [r5, r3]
cmp r0, r4
@ -5109,7 +5109,7 @@ sub_81C6A14: @ 81C6A14
ldrb r0, [r4]
adds r1, r5, 0
adds r2, r7, 0
bl sub_81AE6C8
bl DestroyListMenuTask
movs r0, 0x2
ldrsh r2, [r4, r0]
ldrh r0, [r5]

1053
asm/pokenav.s
View File

File diff suppressed because it is too large Load Diff

20
asm/rom_8011DC0.s
View File

@ -1192,7 +1192,7 @@ sub_8012F64: @ 8012F64
ldrb r0, [r4, 0x12]
movs r1, 0
movs r2, 0
bl sub_81AE6C8
bl DestroyListMenuTask
ldrb r0, [r4, 0x10]
bl ClearWindowTilemap
ldrb r0, [r4, 0xF]
@ -2394,7 +2394,7 @@ _08013A8C:
ldrb r0, [r6, 0xE]
movs r1, 0
movs r2, 0
bl sub_81AE6C8
bl DestroyListMenuTask
ldrb r0, [r6, 0xC]
bl ClearWindowTilemap
ldrb r0, [r6, 0xB]
@ -4511,7 +4511,7 @@ _08014E16:
ldrb r0, [r5, 0x12]
movs r1, 0
movs r2, 0
bl sub_81AE6C8
bl DestroyListMenuTask
movs r0, 0
bl CopyBgTilemapBufferToVram
ldrb r0, [r5, 0xF]
@ -4567,7 +4567,7 @@ _08014EA8:
ldrb r0, [r5, 0x12]
movs r1, 0
movs r2, 0
bl sub_81AE6C8
bl DestroyListMenuTask
movs r0, 0
bl CopyBgTilemapBufferToVram
ldrb r0, [r5, 0xF]
@ -4923,7 +4923,7 @@ _08015204:
ldrb r0, [r7, 0xE]
movs r1, 0
movs r2, 0
bl sub_81AE6C8
bl DestroyListMenuTask
movs r0, 0
bl CopyBgTilemapBufferToVram
ldrb r0, [r7, 0xD]
@ -5292,7 +5292,7 @@ _08015564:
ldrb r0, [r5, 0xE]
movs r1, 0
movs r2, 0
bl sub_81AE6C8
bl DestroyListMenuTask
movs r0, 0
bl CopyBgTilemapBufferToVram
ldrb r0, [r5, 0xB]
@ -8545,7 +8545,7 @@ _08017228:
ldrb r0, [r4]
movs r1, 0
movs r2, 0
bl sub_81AE6C8
bl DestroyListMenuTask
ldrb r0, [r5]
movs r1, 0x1
bl sub_819746C
@ -8565,7 +8565,7 @@ _08017264:
ldrb r0, [r6]
movs r1, 0
movs r2, 0
bl sub_81AE6C8
bl DestroyListMenuTask
ldrb r0, [r5]
movs r1, 0x1
bl sub_819746C
@ -8669,7 +8669,7 @@ _0801733E:
ldrb r0, [r4]
movs r1, 0
movs r2, 0
bl sub_81AE6C8
bl DestroyListMenuTask
ldrb r0, [r6]
bl RemoveWindow
mov r7, r9
@ -8691,7 +8691,7 @@ _08017368:
ldrb r0, [r1]
movs r1, 0
movs r2, 0
bl sub_81AE6C8
bl DestroyListMenuTask
ldrb r0, [r6]
bl RemoveWindow
mov r3, r9

2
asm/script_menu.s
View File

@ -836,7 +836,7 @@ _080E24C6:
adds r1, r4, 0
adds r2, r7, 0
movs r3, 0x11
bl sub_819A024
bl PrintPlayerNameOnWindow
adds r0, r6, 0
mov r1, r8
movs r2, 0

2
asm/shop.s
View File

@ -1985,7 +1985,7 @@ _080E0AEA:
adds r1, r2, r3
subs r3, 0x2
adds r2, r3
bl sub_81AE860
bl ListMenuGetScrollAndRow
movs r0, 0x2
negs r0, r0
cmp r5, r0

2101
asm/start_menu.s
View File

File diff suppressed because it is too large Load Diff

206
asm/trainer_rematch.s
View File

@ -1,206 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start sub_81DA57C
sub_81DA57C: @ 81DA57C
push {lr}
ldr r0, =0x00000864
bl FlagGet
lsls r0, 24
cmp r0, 0
beq _081DA5CA
bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0x64
bl __umodsi3
lsls r0, 16
lsrs r0, 16
cmp r0, 0x1E
bhi _081DA5CA
movs r0, 0x5B
bl FlagGet
lsls r0, 24
cmp r0, 0
beq _081DA5C0
ldr r0, =gUnknown_0862AD34
movs r1, 0x8
movs r2, 0x5
bl sub_81DA5D4
b _081DA5CA
.pool
_081DA5C0:
ldr r0, =gUnknown_0862AD44
movs r1, 0x7
movs r2, 0x1
bl sub_81DA5D4
_081DA5CA:
pop {r0}
bx r0
.pool
thumb_func_end sub_81DA57C
thumb_func_start sub_81DA5D4
sub_81DA5D4: @ 81DA5D4
push {r4-r7,lr}
mov r7, r10
mov r6, r9
mov r5, r8
push {r5-r7}
sub sp, 0x8
mov r9, r0
adds r7, r1, 0
mov r10, r2
movs r6, 0
movs r0, 0x5
mov r8, r0
movs r5, 0
cmp r5, r7
bcs _081DA61C
mov r4, r9
_081DA5F4:
ldr r0, =gSaveBlock1Ptr
ldr r0, [r0]
ldrh r1, [r4]
ldr r2, =0x000009ca
adds r0, r2
adds r0, r1
ldrb r0, [r0]
cmp r0, 0
bne _081DA614
adds r0, r1, 0
bl sub_81DA6CC
cmp r8, r0
ble _081DA612
mov r8, r0
_081DA612:
adds r6, 0x1
_081DA614:
adds r4, 0x2
adds r5, 0x1
cmp r5, r7
bcc _081DA5F4
_081DA61C:
cmp r6, 0
beq _081DA6BA
cmp r8, r10
bhi _081DA6BA
movs r6, 0
movs r5, 0
cmp r5, r7
bcs _081DA654
mov r4, r9
_081DA62E:
ldr r0, =gSaveBlock1Ptr
ldr r0, [r0]
ldrh r1, [r4]
ldr r2, =0x000009ca
adds r0, r2
adds r0, r1
ldrb r0, [r0]
cmp r0, 0
bne _081DA64C
adds r0, r1, 0
bl sub_81DA6CC
cmp r0, r8
bne _081DA64C
adds r6, 0x1
_081DA64C:
adds r4, 0x2
adds r5, 0x1
cmp r5, r7
bcc _081DA62E
_081DA654:
cmp r6, 0
beq _081DA6BA
bl Random
lsls r0, 16
lsrs r0, 16
adds r1, r6, 0
bl __modsi3
adds r6, r0, 0
movs r5, 0
cmp r5, r7
bcs _081DA6BA
ldr r2, =gSaveBlock1Ptr
ldr r3, =0x000009ca
mov r4, r9
_081DA674:
ldr r0, [r2]
ldrh r1, [r4]
adds r0, r3
adds r0, r1
ldrb r0, [r0]
cmp r0, 0
bne _081DA6B2
adds r0, r1, 0
str r2, [sp]
str r3, [sp, 0x4]
bl sub_81DA6CC
ldr r2, [sp]
ldr r3, [sp, 0x4]
cmp r0, r8
bne _081DA6B2
cmp r6, 0
bne _081DA6B0
ldr r0, [r2]
adds r0, r3
ldrh r4, [r4]
adds r0, r4
mov r1, r8
strb r1, [r0]
b _081DA6BA
.pool
_081DA6B0:
subs r6, 0x1
_081DA6B2:
adds r4, 0x2
adds r5, 0x1
cmp r5, r7
bcc _081DA674
_081DA6BA:
add sp, 0x8
pop {r3-r5}
mov r8, r3
mov r9, r4
mov r10, r5
pop {r4-r7}
pop {r0}
bx r0
thumb_func_end sub_81DA5D4
thumb_func_start sub_81DA6CC
sub_81DA6CC: @ 81DA6CC
push {r4-r6,lr}
adds r5, r0, 0
movs r4, 0
ldr r6, =gRematchTable
_081DA6D4:
lsls r0, r4, 1
lsls r1, r5, 4
adds r0, r1
adds r0, r6
ldrh r0, [r0]
bl HasTrainerBeenFought
lsls r0, 24
cmp r0, 0
bne _081DA6F0
adds r0, r4, 0
b _081DA6F8
.pool
_081DA6F0:
adds r4, 0x1
cmp r4, 0x4
ble _081DA6D4
movs r0, 0x5
_081DA6F8:
pop {r4-r6}
pop {r1}
bx r1
thumb_func_end sub_81DA6CC
.align 2, 0 @ Don't pad with nop.

2
common_syms/intro.txt Normal file
View File

@ -0,0 +1,2 @@
gIntroFrameCounter
gMultibootProgramStruct

2
common_syms/list_menu.txt Normal file
View File

@ -0,0 +1,2 @@
gUnknown_03006300
gMultiuseListMenuTemplate

15
constants/battle_move_constants.inc
View File

@ -1,15 +0,0 @@
.set TARGET_SELECTED_POKEMON, 0
.set F_TARGET_SPECIAL, 1 << 0
.set F_TARGET_RANDOM, 1 << 2
.set F_TARGET_BOTH_ENEMIES, 1 << 3
.set F_TARGET_USER, 1 << 4
.set F_TARGET_ALL_EXCEPT_USER, 1 << 5
.set F_TARGET_ENEMY_SIDE, 1 << 6
.set F_MAKES_CONTACT, 1 << 0
.set F_AFFECTED_BY_PROTECT, 1 << 1
.set F_AFFECTED_BY_MAGIC_COAT, 1 << 2
.set F_AFFECTED_BY_SNATCH, 1 << 3
.set F_MIRROR_MOVE_COMPATIBLE, 1 << 4
.set F_AFFECTED_BY_KINGS_ROCK, 1 << 5

1
constants/constants.inc
View File

@ -3,7 +3,6 @@
.include "constants/contest_constants.inc"
.include "constants/pokemon_data_constants.inc"
.include "constants/item_data_constants.inc"
.include "constants/battle_move_constants.inc"
.include "constants/battle_frontier_constants.inc"
.include "constants/map_constants.inc"
.include "constants/berry_constants.inc"

2804
data/battle_ai_scripts.s
View File

File diff suppressed because it is too large Load Diff

174
data/battle_link_817C95C.s
View File

@ -1,174 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 1
gUnknown_0860A4AC:: @ 860A4AC
.2byte 0x0044, 0x005a, 0x0075, 0x00f3, 0x0020, 0x00af, 0x00b3, 0x00ed, 0x0149, 0x0108, 0x011c, 0x0143, 0x008a, 0x0137, 0x00ad, 0x00dc
.2byte 0x000c, 0x00da, 0x00d8, 0x011b, 0x00d9, 0x0117, 0xffff, 0x00de, 0x0095, 0xffff
.align 1
gUnknown_0860A4E0:: @ 860A4E0
.2byte 0x0001, 0x0001, 0x0001, 0x0004, 0x0001, 0x0001, 0x0001, 0x0000, 0x0005, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001
.2byte 0x0001, 0x0002, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0005, 0x0005, 0x0004, 0x0005, 0x0001, 0x0003, 0x0001
.2byte 0x0003, 0x0005, 0x0001, 0x0007, 0x0001, 0x0007, 0x0007, 0x0001, 0x0005, 0x0002, 0x0004, 0x0001, 0x0001, 0x0001, 0x0005, 0x0001
.2byte 0x0002, 0x0004, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0000, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001
.2byte 0x0001, 0x0007, 0x0004, 0x0004, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0004, 0x0001, 0x0001, 0x0001, 0x0004
.2byte 0x0005, 0x0002, 0x0004, 0x0001, 0x0004, 0x0001, 0x0007, 0x0002, 0x0001, 0x0005, 0x0007, 0x0003, 0x0003, 0x0004, 0x0003, 0x0003
.2byte 0x0003, 0x0003, 0x0003, 0x0002, 0x0004, 0x0001, 0x0005, 0x0001, 0x0001, 0x0004, 0x0005, 0x0003, 0x0001, 0x0002, 0x0001, 0x0005
.2byte 0x0004, 0x0003, 0x0006, 0x0004, 0x0003, 0x0003, 0x0003, 0x0002, 0x0004, 0x0001, 0x0001, 0x0001, 0x0005, 0x0001, 0x0001, 0x0007
.2byte 0x0002, 0x0002, 0x0001, 0x0001, 0x0004, 0x0004, 0x0004, 0x0001, 0x0004, 0x0004, 0x0001, 0x0001, 0x0001, 0x0001, 0x0007, 0x0007
.2byte 0x0006, 0x0003, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0002, 0x0003, 0x0001, 0x0001, 0x0004, 0x0004
.2byte 0x0003, 0x0003, 0x0003, 0x0001, 0x0004, 0x0007, 0x0007, 0x0005, 0x0007, 0x0001, 0x0007, 0x0001, 0x0005, 0x0000, 0x0004, 0x0004
.2byte 0x0004, 0x0004, 0x0004, 0x0002, 0x0002, 0x0006, 0x0003, 0x0006, 0x0004, 0x0004, 0x0002, 0x0005, 0x0002, 0x0001, 0x0001, 0x0006
.2byte 0x0006, 0x0006, 0x0001, 0x0001, 0x0001, 0x0001, 0x0002, 0x0006, 0x0001, 0x0004, 0x0001, 0x0001, 0x0003, 0x0001, 0x0001, 0x0001
.2byte 0x0001, 0x0001, 0x0004, 0x0001, 0x0001, 0x0003
.align 1
gUnknown_0860A68C:: @ 860A68C
.2byte 0x0004, 0xfffd, 0xfffa
.align 1
gUnknown_0860A692:: @ 860A692
.2byte 0x0004, 0x0004, 0x0006, 0x0006, 0x0007, 0x0006, 0x0002
.align 1
gUnknown_0860A6A0:: @ 860A6A0
.2byte 0x0091, 0x0003, 0x00fa, 0x0003, 0x00be, 0x0003, 0x0080, 0x0003, 0x006e, 0x0003, 0x0098, 0x0003, 0x0143, 0x0003, 0x0123, 0x0003
.2byte 0x007f, 0x0003, 0x014a, 0x0003, 0x0039, 0x0003, 0x0134, 0x0003, 0x0038, 0x0003, 0x003d, 0x0003, 0x015a, 0x0000, 0x0037, 0x0003
.2byte 0x0160, 0x0003, 0x0137, 0x0003, 0x0057, 0x0003, 0x004c, 0xfffc, 0x013b, 0xfffc, 0x00ac, 0xfffc, 0x0035, 0xfffc, 0x00dd, 0xfffc
.2byte 0x007e, 0xfffc, 0x0101, 0xfffc, 0x0034, 0xfffc, 0x0133, 0xfffc, 0x012b, 0xfffc, 0x011c, 0xfffc, 0x0053, 0xfffc, 0x0007, 0xfffc
.2byte 0x004c, 0xfffc, 0xffff, 0x0000
.align 1
gUnknown_0860A728:: @ 860A728
.2byte 0x013b, 0x0003, 0x00ac, 0x0003, 0x0035, 0x0003, 0x00dd, 0x0003, 0x007e, 0x0003, 0x0101, 0x0003, 0x0034, 0x0003, 0x0133, 0x0003
.2byte 0x012b, 0x0003, 0x011c, 0x0003, 0x0053, 0x0003, 0x0007, 0x0003, 0x004c, 0x0005, 0x00eb, 0x0003, 0x00ea, 0x0003, 0x00ec, 0x0003
.2byte 0x0137, 0x0003, 0xffff, 0x0000
.align 1
gUnknown_0860A770:: @ 860A770
.2byte 0x0137, 0x0003, 0x004c, 0xfffd, 0xffff, 0x0000
.align 1
gUnknown_0860A77C:: @ 860A77C
.2byte 0x0137, 0x0003, 0x004c, 0xfffd, 0xffff, 0x0000
.align 1
gUnknown_0860A788:: @ 860A788
.2byte 0x0055, 0x0003, 0x0009, 0x0003, 0x00d1, 0x0003, 0x0054, 0x0003, 0x00c0, 0x0003, 0x015f, 0x0003, 0x0056, 0x0000, 0x0057, 0x0003
.2byte 0x0158, 0x0003, 0xffff, 0x0000
.align 1
gUnknown_0860A7B0:: @ 860A7B0
.2byte 0x0005, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003
.align 1
gUnknown_0860A7BE:: @ 860A7BE
.2byte 0x0005, 0x0005, 0x0005, 0x0005, 0x0005
.align 1
gUnknown_0860A7C8:: @ 860A7C8
.2byte 0x0004
.align 1
gUnknown_0860A7CA:: @ 860A7CA
.2byte 0x0005
.align 1
gUnknown_0860A7CC:: @ 860A7CC
.2byte 0x0005
.align 1
gUnknown_0860A7CE:: @ 860A7CE
.2byte 0x0003
.align 1
gUnknown_0860A7D0:: @ 860A7D0
.2byte 0x0003
.align 1
gUnknown_0860A7D2:: @ 860A7D2
.2byte 0x0004
.align 1
gUnknown_0860A7D4:: @ 860A7D4
.2byte 0x0003
.align 1
gUnknown_0860A7D6:: @ 860A7D6
.2byte 0x0006
.align 1
gUnknown_0860A7D8:: @ 860A7D8
.2byte 0x0006
.align 1
gUnknown_0860A7DA:: @ 860A7DA
.2byte 0x0006
.align 1
gUnknown_0860A7DC:: @ 860A7DC
.2byte 0x0004
.align 1
gUnknown_0860A7DE:: @ 860A7DE
.2byte 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002
.align 1
gUnknown_0860A7EC:: @ 860A7EC
.2byte 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004
.align 1
gUnknown_0860A7FA:: @ 860A7FA
.2byte 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff
.align 1
gUnknown_0860A808:: @ 860A808
.2byte 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002
.align 1
gUnknown_0860A816:: @ 860A816
.2byte 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004
.align 1
gUnknown_0860A824:: @ 860A824
.2byte 0xfffe, 0xfffe, 0xfffe, 0xfffe, 0xfffe, 0xfffe, 0xfffe
.align 2
gUnknown_0860A834:: @ 860A834
.4byte gUnknown_0860A4E0
.4byte gUnknown_0860A68C
.4byte gUnknown_0860A692
.4byte gUnknown_0860A6A0
.4byte gUnknown_0860A728
.4byte gUnknown_0860A770
.4byte gUnknown_0860A77C
.4byte gUnknown_0860A788
.4byte gUnknown_0860A7B0
.4byte gUnknown_0860A7BE
.4byte gUnknown_0860A7C8
.4byte gUnknown_0860A7CA
.4byte gUnknown_0860A7CC
.4byte gUnknown_0860A7CE
.4byte gUnknown_0860A7D0
.4byte gUnknown_0860A7D2
.4byte gUnknown_0860A7D4
.4byte gUnknown_0860A7D6
.4byte gUnknown_0860A7D8
.4byte gUnknown_0860A7DA
.4byte gUnknown_0860A7DA
.4byte gUnknown_0860A7DC
.4byte gUnknown_0860A7DE
.4byte gUnknown_0860A7EC
.4byte gUnknown_0860A7FA
.4byte gUnknown_0860A808
.4byte gUnknown_0860A816
.4byte gUnknown_0860A824
.align 1
gUnknown_0860A8A4:: @ 860A8A4
.2byte 0x0097, 0x00b2, 0x00bc, 0x008c, 0x00b4, 0x00b5, 0x0093, 0x006a, 0x0091, 0x005e, 0x0030, 0x002a, 0x0095, 0x001c, 0x001d, 0x0064
.2byte 0x0060, 0xffff

3906
data/battle_moves.inc
View File

File diff suppressed because it is too large Load Diff

1577
data/credits.s
View File

File diff suppressed because it is too large Load Diff

18
data/data2b.s
View File

@ -4866,21 +4866,3 @@ gUnknown_0831ACDC:: @ 831ACDC
.align 2
gUnknown_0831ACE0:: @ 831ACE0
.byte 0xe0, 0xf0, 0xf0, 0xe0, 0xe0, 0x00, 0x00, 0x00
@ 831ACE8
.include "data/type_effectiveness.inc"
@ 831AE38
.include "data/text/type_names.inc"
@ 831AEB8
.include "data/trainer_money.inc"
@ 831AF98
.include "data/text/ability_descriptions.inc"
@ 831B6DB
.include "data/text/ability_names.inc"
@ 831BAD4
.include "data/text/ability_description_pointers.inc"

18
data/data2c.s
View File

@ -1,18 +0,0 @@
#include "constants/abilities.h"
#include "constants/items.h"
#include "constants/moves.h"
#include "constants/species.h"
#include "constants/pokemon.h"
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
@ 831C898
.include "data/battle_moves.inc"
@ 0x31d93c
@ unreferenced unknown data
.byte 0x34, 0x00, 0x10, 0x00, 0x01, 0x01, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00

12
data/event_scripts.s
View File

@ -49,7 +49,7 @@ gStdScripts:: @ 81DC2A0
.4byte Std_5
.4byte Std_6
.4byte Std_ObtainDecoration
.4byte Std_8
.4byte Std_RegisteredInMatchCall
.4byte Std_9
.4byte Std_10
@ -835,7 +835,7 @@ SlateportCity_BattleTentLobby_EventScript_27134F:: @ 827134F
SootopolisCity_MysteryEventsHouse_1F_EventScript_27134F:: @ 827134F
TrainerHill_Entrance_EventScript_27134F:: @ 827134F
VerdanturfTown_BattleTentLobby_EventScript_27134F:: @ 827134F
special sub_809FF80
special SaveGame
waitstate
return
@ -1161,7 +1161,7 @@ EventScript_2715DE:: @ 82715DE
setflag FLAG_0x376
setflag FLAG_0x374
setflag FLAG_0x375
setflag FLAG_0x3C1
setflag FLAG_SPRITEVIS_SLATEPORT_MUSEUM_POPULATION
setflag FLAG_0x378
setflag FLAG_0x2F0
setflag FLAG_0x2F5
@ -1177,7 +1177,7 @@ EventScript_2715DE:: @ 82715DE
setflag FLAG_0x38F
setflag FLAG_0x393
setflag FLAG_0x358
setflag FLAG_0x390
setflag FLAG_SPRITEVIS_MAUVILLE_CITY_WATTSON
setflag FLAG_0x2FD
setflag FLAG_0x398
setflag FLAG_0x399
@ -1788,7 +1788,7 @@ EventScript_271DBC:: @ 8271DBC
EventScript_271DF9:: @ 8271DF9
playse SE_PC_LOGIN
msgbox gUnknown_082726C2, 4
special sub_816AE98
special PlayerPC
waitstate
goto EventScript_271DAC
end
@ -4075,7 +4075,7 @@ Underwater3_EventScript_2742C0:: @ 82742C0
setescapewarp ROUTE_129, 255, 43, 20
return
Std_8:: @ 82742C9
Std_RegisteredInMatchCall:: @ 82742C9
buffertrainerclassname 0, VAR_0x8000
buffertrainername 1, VAR_0x8000
closemessage

81
data/fldeff_flash.s
View File

@ -1,81 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnknown_085B27C8:: @ 85B27C8
.byte 0x01, 0x04, 0x01, 0x00
.4byte sub_81375A8
.byte 0x02, 0x04, 0x01, 0x00
.4byte sub_81375A8
.byte 0x03, 0x04, 0x01, 0x00
.4byte sub_81375A8
.byte 0x05, 0x04, 0x01, 0x00
.4byte sub_81375A8
.byte 0x06, 0x04, 0x01, 0x00
.4byte sub_81375A8
.byte 0x07, 0x04, 0x01, 0x00
.4byte sub_81375A8
.byte 0x08, 0x04, 0x01, 0x00
.4byte sub_81375A8
.byte 0x09, 0x04, 0x01, 0x00
.4byte sub_81375A8
.byte 0x04, 0x01, 0x00, 0x01
.4byte sub_81373F0
.byte 0x04, 0x02, 0x00, 0x01
.4byte sub_81373F0
.byte 0x04, 0x03, 0x00, 0x01
.4byte sub_81373F0
.byte 0x04, 0x05, 0x00, 0x01
.4byte sub_81373F0
.byte 0x04, 0x06, 0x00, 0x01
.4byte sub_81373F0
.byte 0x04, 0x07, 0x00, 0x01
.4byte sub_81373F0
.byte 0x04, 0x08, 0x00, 0x01
.4byte sub_81373F0
.byte 0x04, 0x09, 0x00, 0x01
.4byte sub_81373F0
.byte 0x00, 0x00, 0x00, 0x00
.4byte NULL
.align 2
gCaveTransitionPalette_White:: @ 85B2850
.incbin "graphics/misc/cave_transition_white.gbapal"
.align 2
gCaveTransitionPalette_Black:: @ 85B2870
.incbin "graphics/misc/cave_transition_black.gbapal"
.align 2
gUnknown_085B2890:: @ 85B2890
.incbin "graphics/misc/85B2890.gbapal"
.align 2
gUnknown_085B28A0:: @ 85B28A0
.incbin "graphics/misc/85B28A0.gbapal"
.align 2
gCaveTransitionTilemap:: @ 85B28B0
.incbin "graphics/misc/cave_transition_map.bin.lz"
.align 2
gCaveTransitionTiles:: @ 85B2A90
.incbin "graphics/misc/cave_transition.4bpp.lz"

98
data/fossil_special_fldeff_groundshake.s
View File

@ -1,98 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnknown_08617274:: @ 8617274
.space 0x20
.incbin "graphics/misc/mirage_tower.4bpp"
.align 2
gUnknown_08617B94:: @ 8617B94
.incbin "graphics/misc/mirage_tower.bin"
.align 2
gRootFossil_Pal:: @ 8617C24
.incbin "graphics/misc/fossil.gbapal"
.align 2
gRootFossil_Gfx:: @ 8617C44
.incbin "graphics/misc/fossil.4bpp"
.align 2
gMirageTowerCrumbles_Gfx:: @ 8617CC4
.incbin "graphics/misc/mirage_tower_crumbles.4bpp"
.align 2
gMirageTowerCrumbles_Palette:: @ 8617D44
.incbin "graphics/misc/mirage_tower_crumbles.gbapal"
.align 1
gUnknown_08617D64:: @ 8617D64
.2byte 0x0000, 0x000a, 0x0041, 0x0011, 0x0003, 0x0032, 0xfff4, 0x0000, 0x004b, 0x000a, 0x000f, 0x005a, 0x0007, 0x0008, 0x0041, 0xffee
.2byte 0x0005, 0x004b, 0x0016, 0xfff6, 0x0037, 0xffe8, 0xfffc, 0x0041
.align 2
gUnknown_08617D94:: @ 8617D94
obj_tiles gMirageTowerCrumbles_Gfx, 0x0080, 0x0fa0
null_obj_tiles
.align 2
gUnknown_08617DA4:: @ 8617DA4
.byte 0x12, 0x35, 0x51, 0x02, 0x13, 0x35, 0x51, 0x02, 0x14, 0x35, 0x51, 0x02, 0x12, 0x36, 0x51, 0x02, 0x13, 0x36, 0x51, 0x02, 0x14, 0x36, 0x51, 0x02, 0x12, 0x37, 0x51, 0x02, 0x13, 0x37, 0x51, 0x02
.byte 0x14, 0x37, 0x51, 0x02, 0x12, 0x38, 0x51, 0x02, 0x13, 0x38, 0x51, 0x02, 0x14, 0x38, 0x51, 0x02, 0x12, 0x39, 0x59, 0x02, 0x13, 0x39, 0x59, 0x02, 0x14, 0x39, 0x59, 0x02, 0x12, 0x3a, 0x21, 0x01
.byte 0x13, 0x3a, 0x21, 0x01, 0x14, 0x3a, 0x21, 0x01
.align 2
gSpriteAnim_8617DEC:: @ 8617DEC
.2byte 0x0000, 0x0001, 0xffff, 0x0000
.align 2
gOamData_8617DF4:: @ 8617DF4
.2byte 0x0000, 0x4000, 0x3000, 0x0000
.align 2
gSpriteAnimTable_8617DFC:: @ 8617DFC
.4byte gSpriteAnim_8617DEC
.align 2
gUnknown_08617E00:: @ 8617E00
spr_template 0xffff, 0xffff, gOamData_8617DF4, gSpriteAnimTable_8617DFC, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
gUnknown_08617E18:: @ 8617E18
.byte 0x3b, 0x43, 0x61, 0x00, 0x0f, 0x05, 0xff, 0x9b
.align 2
gSpriteAnim_8617E20:: @ 8617E20
.2byte 0x0000, 0x000c, 0xfffe, 0x0000
.align 2
gSpriteAnimTable_8617E28:: @ 8617E28
.4byte gSpriteAnim_8617E20
.align 2
gUnknown_08617E2C:: @ 8617E2C
.2byte 0x0000, 0x0000, 0x0000, 0x0000
.align 2
gUnknown_08617E34:: @ 8617E34
spr_template 0x0fa0, 0xffff, gUnknown_08617E2C, gSpriteAnimTable_8617E28, NULL, gDummySpriteAffineAnimTable, sub_81BEAD8
.align 2
gSpriteAnim_8617E4C:: @ 8617E4C
.2byte 0x0000, 0x000c, 0xfffe, 0x0000
.align 2
gSpriteAnim_8617E54:: @ 8617E54
.4byte gSpriteAnim_8617E4C
.align 2
gOamData_8617E58:: @ 8617E58
.2byte 0x0000, 0x4000, 0x0000, 0x0000
.align 2
gUnknown_08617E60:: @ 8617E60
spr_template 0x0fa0, 0xffff, gOamData_8617E58, gSpriteAnim_8617E54, NULL, gDummySpriteAffineAnimTable, sub_81BEAD8

45
data/graphics/berries/berry_pic_table.inc
View File

@ -1,45 +0,0 @@
.align 2
gBerryPicTable:: @ 857FC94
.4byte gBerryPic_Cheri, gBerryPalette_Cheri
.4byte gBerryPic_Chesto, gBerryPalette_Chesto
.4byte gBerryPic_Pecha, gBerryPalette_Pecha
.4byte gBerryPic_Rawst, gBerryPalette_Rawst
.4byte gBerryPic_Aspear, gBerryPalette_Aspear
.4byte gBerryPic_Leppa, gBerryPalette_Leppa
.4byte gBerryPic_Oran, gBerryPalette_Oran
.4byte gBerryPic_Persim, gBerryPalette_Persim
.4byte gBerryPic_Lum, gBerryPalette_Lum
.4byte gBerryPic_Sitrus, gBerryPalette_Sitrus
.4byte gBerryPic_Figy, gBerryPalette_Figy
.4byte gBerryPic_Wiki, gBerryPalette_Wiki
.4byte gBerryPic_Mago, gBerryPalette_Mago
.4byte gBerryPic_Aguav, gBerryPalette_Aguav
.4byte gBerryPic_Iapapa, gBerryPalette_Iapapa
.4byte gBerryPic_Razz, gBerryPalette_Razz
.4byte gBerryPic_Bluk, gBerryPalette_Bluk
.4byte gBerryPic_Nanab, gBerryPalette_Nanab
.4byte gBerryPic_Wepear, gBerryPalette_Wepear
.4byte gBerryPic_Pinap, gBerryPalette_Pinap
.4byte gBerryPic_Pomeg, gBerryPalette_Pomeg
.4byte gBerryPic_Kelpsy, gBerryPalette_Kelpsy
.4byte gBerryPic_Qualot, gBerryPalette_Qualot
.4byte gBerryPic_Hondew, gBerryPalette_Hondew
.4byte gBerryPic_Grepa, gBerryPalette_Grepa
.4byte gBerryPic_Tamato, gBerryPalette_Tamato
.4byte gBerryPic_Cornn, gBerryPalette_Cornn
.4byte gBerryPic_Magost, gBerryPalette_Magost
.4byte gBerryPic_Rabuta, gBerryPalette_Rabuta
.4byte gBerryPic_Nomel, gBerryPalette_Nomel
.4byte gBerryPic_Spelon, gBerryPalette_Spelon
.4byte gBerryPic_Pamtre, gBerryPalette_Pamtre
.4byte gBerryPic_Watmel, gBerryPalette_Watmel
.4byte gBerryPic_Durin, gBerryPalette_Durin
.4byte gBerryPic_Belue, gBerryPalette_Belue
.4byte gBerryPic_Liechi, gBerryPalette_Liechi
.4byte gBerryPic_Ganlon, gBerryPalette_Ganlon
.4byte gBerryPic_Salac, gBerryPalette_Salac
.4byte gBerryPic_Petaya, gBerryPalette_Petaya
.4byte gBerryPic_Apicot, gBerryPalette_Apicot
.4byte gBerryPic_Lansat, gBerryPalette_Lansat
.4byte gBerryPic_Starf, gBerryPalette_Starf
.4byte gBerryPic_Enigma, gBerryPalette_Enigma

529
data/intro.s
View File

@ -1,529 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gIntro1DropsPal:: @ 85DFF90
.incbin "graphics/intro/intro1_drops.gbapal"
.align 2
gIntro1GFLogoPal:: @ 85DFFB0
.incbin "graphics/intro/intro1_gflogo.gbapal"
.align 2
gIntroTiles:: @ 85DFFD0
.incbin "graphics/intro/intro.4bpp.lz"
.align 2
gIntro1BGPals:: @ 85E05C4
.incbin "graphics/intro/intro1_bgpal.gbapal"
.align 2
gIntro1BG0_Tilemap:: @ 85E07C4
.incbin "graphics/intro/intro1_bg0_map.bin.lz"
.align 2
gIntro1BG1_Tilemap:: @ 85E0B78
.incbin "graphics/intro/intro1_bg1_map.bin.lz"
.align 2
gIntro1BG2_Tilemap:: @ 85E0EAC
.incbin "graphics/intro/intro1_bg2_map.bin.lz"
.align 2
gIntro1BG3_Tilemap:: @ 85E119C
.incbin "graphics/intro/intro1_bg3_map.bin.lz"
.align 2
gIntro1BGLeavesGfx:: @ 85E13B4
.incbin "graphics/intro/introgfx.4bpp.lz"
.align 2
gIntro3PokeballPal:: @ 85E3524
.incbin "graphics/intro/intro3_pokeball.gbapal"
.align 2
gIntro3Pokeball_Tilemap:: @ 85E3724
.incbin "graphics/intro/intro3_pokeball_map.bin.lz"
.align 2
gIntro3Pokeball_Gfx:: @ 85E3854
.incbin "graphics/intro/intro3_pokeball.8bpp.lz"
.align 2
.incbin "graphics/intro/intro3_streaks.gbapal"
.align 2
.incbin "graphics/intro/intro3_streaks.4bpp.lz"
.align 2
.incbin "graphics/intro/intro3_streaks_map.bin.lz"
.align 2
gIntro3Misc1Pal:: @ 85E4570
.incbin "graphics/intro/intro3_misc1.gbapal"
.align 2
.incbin "graphics/intro/intro3_misc2.gbapal"
.align 2
gIntro3MiscTiles:: @ 85E45B0
.incbin "graphics/intro/intro3_misc.4bpp.lz"
.align 2
gIntro1FlygonPal:: @ 85E492C
.incbin "graphics/intro/intro1_flygon.gbapal"
.align 2
.incbin "graphics/intro/intro1_eon.4bpp.lz"
.align 2
.byte 0x02, 0x03, 0x04, 0x05, 0x01, 0x01, 0x01, 0x06
.byte 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x02, 0x0d
.byte 0x0e, 0x0f, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15
.byte 0x16, 0x17, 0x18, 0x19, 0x02, 0x0d, 0x0e, 0x0f
.byte 0x10, 0x11, 0x12, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e
.byte 0x1f, 0x20, 0x21, 0x02, 0x0d, 0x0e, 0x0f, 0x10
.byte 0x11, 0x12, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27
.byte 0x28, 0x29, 0x2a, 0x00
.align 2
gUnknown_085E4A74:: @ 85E4A74
obj_tiles gIntro1SparkleGfx, 0x0400, 0x05e1
null_obj_tiles
.align 2
gUnknown_085E4A84:: @ 85E4A84
obj_pal gIntro3LightningPal, 0x05e1
null_obj_pal
.align 2
gUnknown_085E4A94:: @ 85E4A94
.byte 0xa0, 0x00, 0x00, 0x40, 0x00, 0x04, 0x00, 0x00
.align 2
gUnknown_085E4A9C:: @ 85E4A9C
.2byte 0x0000, 0x0002, 0x0004, 0x0002, 0x0008, 0x0002, 0x000c, 0x0002, 0x0010, 0x0002, 0xfffe, 0x0000
.align 2
gUnknown_085E4AB4:: @ 85E4AB4
.4byte gUnknown_085E4A9C
.align 2
gUnknown_085E4AB8:: @ 85E4AB8
spr_template 0x05e1, 0x05e1, gUnknown_085E4A94, gUnknown_085E4AB4, NULL, gDummySpriteAffineAnimTable, sub_816D338
.align 2
gUnknown_085E4AD0:: @ 85E4AD0
.byte 0x7c, 0x28, 0x66, 0x1e, 0x4d, 0x1e, 0x36, 0x0f
.byte 0x94, 0x09, 0x3f, 0x1c, 0x5d, 0x28, 0x94, 0x20
.byte 0xad, 0x29, 0x5e, 0x14, 0xd0, 0x26, 0x00, 0x00
.align 2
gUnknown_085E4AE8:: @ 85E4AE8
obj_tiles gIntro2VolbeatGfx, 0x0400, 0x05dc
obj_tiles gIntro2TorchicGfx, 0x0c00, 0x05dd
obj_tiles gIntro2ManectricGfx, 0x2000, 0x05de
null_obj_tiles
.align 2
gUnknown_085E4B08:: @ 85E4B08
obj_pal gIntro2VolbeatPal, 0x05dc
obj_pal gIntro2TorchicPal, 0x05dd
obj_pal gIntro2ManectricPal, 0x05de
null_obj_pal
.align 2
gUnknown_085E4B28:: @ 85E4B28
.byte 0xa0, 0x00, 0x00, 0x80, 0x00, 0x04, 0x00, 0x00
.align 2
gUnknown_085E4B30:: @ 85E4B30
.2byte 0x0000, 0x0002, 0x0010, 0x0002, 0xfffe, 0x0000
.align 2
gUnknown_085E4B3C:: @ 85E4B3C
.4byte gUnknown_085E4B30
.align 2
gUnknown_085E4B40:: @ 85E4B40
spr_template 0x05dc, 0x05dc, gUnknown_085E4B28, gUnknown_085E4B3C, NULL, gDummySpriteAffineAnimTable, sub_816D81C
.align 2
gUnknown_085E4B58:: @ 85E4B58
.byte 0xa0, 0x00, 0x00, 0x80, 0x00, 0x04, 0x00, 0x00
.align 2
gUnknown_085E4B60:: @ 85E4B60
.2byte 0x0000, 0x0005, 0x0010, 0x0005, 0x0020, 0x0005, 0x0010, 0x0005, 0xfffe, 0x0000
.align 2
gUnknown_085E4B74:: @ 85E4B74
.2byte 0x0000, 0x0003, 0x0010, 0x0003, 0x0020, 0x0003, 0x0010, 0x0003, 0xfffe, 0x0000
.align 2
gUnknown_085E4B88:: @ 85E4B88
.2byte 0x0030, 0x0004, 0x0040, 0x0006, 0x0050, 0x0000, 0xffff, 0x0000
.align 2
gUnknown_085E4B98:: @ 85E4B98
.4byte gUnknown_085E4B60
.4byte gUnknown_085E4B74
.4byte gUnknown_085E4B88
.align 2
gUnknown_085E4BA4:: @ 85E4BA4
spr_template 0x05dd, 0x05dd, gUnknown_085E4B58, gUnknown_085E4B98, NULL, gDummySpriteAffineAnimTable, sub_816D9C0
.align 2
gUnknown_085E4BBC:: @ 85E4BBC
.byte 0xa0, 0x00, 0x00, 0xc0, 0x00, 0x04, 0x00, 0x00
.align 2
gUnknown_085E4BC4:: @ 85E4BC4
.2byte 0x0000, 0x0004, 0x0040, 0x0004, 0x0080, 0x0004, 0x00c0, 0x0004, 0xfffe, 0x0000
.align 2
gUnknown_085E4BD8:: @ 85E4BD8
.4byte gUnknown_085E4BC4
.align 2
gUnknown_085E4BDC:: @ 85E4BDC
spr_template 0x05de, 0x05de, gUnknown_085E4BBC, gUnknown_085E4BD8, NULL, gDummySpriteAffineAnimTable, sub_816DAE8
.align 2
gUnknown_085E4BF4:: @ 85E4BF4
obj_tiles gIntro3LightningGfx, 0x0c00, 0x05df
null_obj_tiles
.align 2
gUnknown_085E4C04:: @ 85E4C04
obj_pal gIntro3LightningPal, 0x05df
null_obj_pal
.align 2
gUnknown_085E4C14:: @ 85E4C14
.byte 0xa0, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00
.align 2
gUnknown_085E4C1C:: @ 85E4C1C
.2byte 0x0000, 0x0002, 0x0030, 0x0002, 0xffff, 0x0000
.align 2
gUnknown_085E4C28:: @ 85E4C28
.2byte 0x0010, 0x0002, 0x0040, 0x0002, 0xffff, 0x0000
.align 2
gUnknown_085E4C34:: @ 85E4C34
.2byte 0x0020, 0x0002, 0x0050, 0x0002, 0xffff, 0x0000
.align 2
gUnknown_085E4C40:: @ 85E4C40
.4byte gUnknown_085E4C1C
.4byte gUnknown_085E4C28
.4byte gUnknown_085E4C34
.align 2
gUnknown_085E4C4C:: @ 85E4C4C
spr_template 0x05df, 0x05df, gUnknown_085E4C14, gUnknown_085E4C40, NULL, gDummySpriteAffineAnimTable, sub_816EC6C
.align 2
gUnknown_085E4C64:: @ 85E4C64
.2byte 0x0068, 0x0000, 0x00c0, 0x008e, 0x0003, 0x0280, 0x0053, 0x0001
.2byte 0x0180, 0x009b, 0x0000, 0x0080, 0x0038, 0x0002, 0x0200, 0x00ae
.2byte 0x0001, 0x0100
.align 2
gUnknown_085E4C88:: @ 85E4C88
obj_tiles gIntro2BubblesGfx, 0x0600, 0x05e0
null_obj_tiles
.align 2
gUnknown_085E4C98:: @ 85E4C98
obj_pal gIntro2BubblesPal, 0x05e0
null_obj_pal
.align 2
gUnknown_085E4CA8:: @ 85E4CA8
.2byte 0x0042, 0x0040, 0x0001, 0x0060, 0x0060, 0x0008, 0x0080, 0x0040
.2byte 0x0001, 0x0090, 0x0030, 0x0008, 0x00a0, 0x0048, 0x0001, 0x00b0
.2byte 0x0060, 0x0008, 0x0060, 0x0060, 0x0004, 0x0070, 0x0068, 0x0008
.2byte 0x0080, 0x0060, 0x0004, 0x0058, 0x0020, 0x0004, 0x0068, 0x0018
.2byte 0x0008, 0x0078, 0x0020, 0x0004
.align 2
gUnknown_085E4CF0:: @ 85E4CF0
.byte 0xa0, 0x80, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00
.align 2
gUnknown_085E4CF8:: @ 85E4CF8
.2byte 0x0000, 0x0004, 0x0008, 0x0004, 0x0010, 0x0004, 0x0018, 0x0004
.2byte 0x0020, 0x0004, 0xffff, 0x0000
.align 2
gUnknown_085E4D10:: @ 85E4D10
.4byte gUnknown_085E4CF8
.align 2
gUnknown_085E4D14:: @ 85E4D14
spr_template 0x05e0, 0x05e0, gUnknown_085E4CF0, gUnknown_085E4D10, NULL, gDummySpriteAffineAnimTable, sub_816E7B4
.align 2
gUnknown_085E4D2C:: @ 85E4D2C
.byte 0xa0, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00
.align 2
gUnknown_085E4D34:: @ 85E4D34
.2byte 0x0010, 0x0008, 0xffff, 0x0000
.align 2
gUnknown_085E4D3C:: @ 85E4D3C
.2byte 0x0018, 0x0008, 0xffff, 0x0000
.align 2
gUnknown_085E4D44:: @ 85E4D44
.2byte 0x0000, 0x0008, 0xffff, 0x0000
.align 2
gUnknown_085E4D4C:: @ 85E4D4C
.2byte 0x0030, 0x0008, 0xffff, 0x0000
.align 2
gUnknown_085E4D54:: @ 85E4D54
.4byte gUnknown_085E4D34
.4byte gUnknown_085E4D3C
.4byte gUnknown_085E4D44
.4byte gUnknown_085E4D4C
.align 2
gUnknown_085E4D64:: @ 85E4D64
spr_template 0x07d0, 0x07d0, gUnknown_085E4D2C, gUnknown_085E4D54, NULL, gDummySpriteAffineAnimTable, sub_816F454
.align 2
gUnknown_085E4D7C:: @ 85E4D7C
.byte 0x00, 0x00, 0x04, 0x00, 0x40, 0x00, 0x04, 0x00
.align 2
gUnknown_085E4D84:: @ 85E4D84
.2byte 0x0080, 0x0004, 0x00c0, 0x0004, 0xfffe, 0x0000
.align 2
gUnknown_085E4D90:: @ 85E4D90
.2byte 0x0000, 0x0008, 0x0040, 0x0008, 0x0080, 0x0008, 0x00c0, 0x0008, 0xfffe, 0x0000
.align 2
gUnknown_085E4DA4:: @ 85E4DA4
.2byte 0x0100, 0x0004, 0x0140, 0x0004, 0x0180, 0x0004, 0xffff, 0x0000
.align 2
gUnknown_085E4DB4:: @ 85E4DB4
.2byte 0x0180, 0x0010, 0x0140, 0x0010, 0x0100, 0x0010, 0xffff, 0x0000
.align 2
gUnknown_085E4DC4:: @ 85E4DC4
.4byte gUnknown_085E4D7C
.4byte gUnknown_085E4D90
.4byte gUnknown_085E4DA4
.4byte gUnknown_085E4DB4
.align 2
gUnknown_085E4DD4:: @ 85E4DD4
.2byte 0x03a0, 0x4000, 0x0000, 0x0000
.align 2
gUnknown_085E4DDC:: @ 85E4DDC
.2byte 0x00a0, 0x0000, 0x0000, 0x0000
.align 2
gUnknown_085E4DE4:: @ 85E4DE4
.2byte 0x87a0, 0xc000, 0x0000, 0x0000
.align 2
gUnknown_085E4DEC:: @ 85E4DEC
.2byte 0x0050, 0x0008, 0xffff, 0x0000
.align 2
gUnknown_085E4DF4:: @ 85E4DF4
.2byte 0x0054, 0x0008, 0xffff, 0x0000
.align 2
gUnknown_085E4DFC:: @ 85E4DFC
.2byte 0x0058, 0x0008, 0xffff, 0x0000
.align 2
gUnknown_085E4E04:: @ 85E4E04
.2byte 0x005c, 0x0008, 0xffff, 0x0000
.align 2
gUnknown_085E4E0C:: @ 85E4E0C
.2byte 0x0060, 0x0008, 0xffff, 0x0000
.align 2
gUnknown_085E4E14:: @ 85E4E14
.2byte 0x0064, 0x0008, 0xffff, 0x0000
.align 2
gUnknown_085E4E1C:: @ 85E4E1C
.2byte 0x0068, 0x0008, 0xffff, 0x0000
.align 2
gUnknown_085E4E24:: @ 85E4E24
.2byte 0x0070, 0x0008, 0xffff, 0x0000
.align 2
gUnknown_085E4E2C:: @ 85E4E2C
.2byte 0x0071, 0x0008, 0xffff, 0x0000
.align 2
gUnknown_085E4E34:: @ 85E4E34
.2byte 0x0072, 0x0008, 0xffff, 0x0000
.align 2
gUnknown_085E4E3C:: @ 85E4E3C
.2byte 0x0073, 0x0008, 0xffff, 0x0000
.align 2
gUnknown_085E4E44:: @ 85E4E44
.2byte 0x0074, 0x0008, 0xffff, 0x0000
.align 2
gUnknown_085E4E4C:: @ 85E4E4C
.2byte 0x0075, 0x0008, 0xffff, 0x0000
.align 2
gUnknown_085E4E54:: @ 85E4E54
.2byte 0x0080, 0x0008, 0xffff, 0x0000
.align 2
gUnknown_085E4E5C:: @ 85E4E5C
.4byte gUnknown_085E4DEC
.4byte gUnknown_085E4DF4
.4byte gUnknown_085E4DFC
.4byte gUnknown_085E4E04
.4byte gUnknown_085E4E0C
.4byte gUnknown_085E4E14
.4byte gUnknown_085E4E1C
.align 2
gUnknown_085E4E78:: @ 85E4E78
.4byte gUnknown_085E4E24
.4byte gUnknown_085E4E2C
.4byte gUnknown_085E4E34
.4byte gUnknown_085E4E3C
.4byte gUnknown_085E4E44
.4byte gUnknown_085E4E4C
.align 2
gUnknown_085E4E90:: @ 85E4E90
.4byte gUnknown_085E4E54
.align 2
gUnknown_085E4E94:: @ 85E4E94
.2byte 0x0000, 0xffb8, 0x0001, 0xffc8, 0x0002, 0xffd8, 0x0003, 0xffe8
.2byte 0x0004, 0x0008, 0x0005, 0x0018, 0x0003, 0x0028, 0x0001, 0x0038
.2byte 0x0006, 0x0048, 0x0000, 0xffe4, 0x0001, 0xffec, 0x0002, 0xfff4
.2byte 0x0003, 0xfffc, 0x0002, 0x0004, 0x0004, 0x000c, 0x0005, 0x0014
.2byte 0x0003, 0x001c
.align 2
gUnknown_085E4ED8:: @ 85E4ED8
.2byte 0x0080, 0x0080, 0x0000, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
.align 2
gUnknown_085E4EE8:: @ 85E4EE8
.2byte 0x0080, 0x0080, 0x0000, 0x0000, 0x0010, 0x0010, 0x1000, 0x0000
.2byte 0xfff0, 0xfff0, 0x0800, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
.align 2
gUnknown_085E4F08:: @ 85E4F08
.2byte 0x0100, 0x0100, 0x0000, 0x0000, 0x0008, 0x0008, 0x3000, 0x0000
.2byte 0x7fff, 0x0000, 0x0000, 0x0000
.align 2
gUnknown_085E4F20:: @ 85E4F20
.2byte 0x0100, 0x0100, 0x0000, 0x0000, 0x0002, 0x0002, 0x3000, 0x0000
.2byte 0x7fff, 0x0000, 0x0000, 0x0000
.align 2
gUnknown_085E4F38:: @ 85E4F38
.4byte gUnknown_085E4ED8
.4byte gUnknown_085E4EE8
.4byte gUnknown_085E4F08
.4byte gUnknown_085E4F20
.align 2
gUnknown_085E4F48:: @ 85E4F48
.2byte 0x0100, 0x00c0, 0x0080, 0x0040, 0x0000, 0x0040, 0x0080, 0x00c0
.2byte 0x0100, 0x0000
.align 2
gUnknown_085E4F5C:: @ 85E4F5C
spr_template 0x07d0, 0x07d1, gUnknown_085E4DD4, gUnknown_085E4E5C, NULL, gUnknown_085E4F38, sub_816FB38
spr_template 0x07d0, 0x07d1, gUnknown_085E4DDC, gUnknown_085E4E78, NULL, gDummySpriteAffineAnimTable, sub_816FB38
.align 2
gUnknown_085E4F8C:: @ 85E4F8C
spr_template 0x07d0, 0x07d1, gUnknown_085E4DE4, gUnknown_085E4E90, NULL, gUnknown_085E4F38, sub_816FD44
.align 2
gUnknown_085E4FA4:: @ 85E4FA4
.byte 0x00, 0x17, 0x17, 0x31, 0x3e, 0x24, 0x24, 0x0a, 0x0a, 0x00, 0x00, 0x00
.align 2
gUnknown_085E4FB0:: @ 85E4FB0
.byte 0xa0, 0x40, 0x00, 0xc0, 0x00, 0x00, 0x00, 0x00
.align 2
gUnknown_085E4FB8:: @ 85E4FB8
.2byte 0x0000, 0x000a, 0xfffe, 0x0000
.align 2
gUnknown_085E4FC0:: @ 85E4FC0
.4byte gUnknown_085E4FB8
.align 2
gUnknown_085E4FC4:: @ 85E4FC4
spr_template 0x07d2, 0x07d2, gUnknown_085E4FB0, gUnknown_085E4FC0, NULL, gDummySpriteAffineAnimTable, sub_816FEDC
.align 2
gUnknown_085E4FDC:: @ 85E4FDC
obj_tiles gIntroTiles, 0x1400, 0x07d0
null_obj_tiles
gUnknown_085E4FEC:: @ 85E4FEC
obj_tiles gIntro1FlygonGfx, 0x0400, 0x07d2
null_obj_tiles
.align 2
gUnknown_085E4FFC:: @ 85E4FFC
obj_pal gIntro1DropsPal, 0x07d0
obj_pal gIntro1GFLogoPal, 0x07d1
obj_pal gIntro1FlygonPal, 0x07d2
null_obj_pal
.align 2
gUnknown_085E501C:: @ 85E501C
.byte 0xa0, 0x00, 0x00, 0xc0, 0x00, 0x00, 0x00, 0x00
.align 2
gUnknown_085E5024:: @ 85E5024
.2byte 0x0010, 0x0008, 0xffff, 0x0000
.align 2
gUnknown_085E502C:: @ 85E502C
.4byte gUnknown_085E5024
.align 2
gUnknown_085E5030:: @ 85E5030
spr_template 0x07d3, 0x07d3, gUnknown_085E501C, gUnknown_085E502C, NULL, gDummySpriteAffineAnimTable, sub_8170040
.align 2
gUnknown_085E5048:: @ 85E5048
obj_tiles gIntro3MiscTiles, 0x0a00, 0x07d3
null_obj_tiles
gUnknown_085E5058:: @ 85E5058
obj_pal gIntro3Misc1Pal, 0x07d3
null_obj_pal

459
data/intro_credits_graphics.s
View File

@ -1,459 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnknown_085F06E0:: @ 85F06E0
.incbin "graphics/intro/intro2_grass.gbapal"
.align 2
gUnknown_085F0700:: @ 85F0700
.incbin "graphics/intro/intro2_grass_afternoon.gbapal"
.align 2
gUnknown_085F0720:: @ 85F0720
.incbin "graphics/intro/intro2_grass_night.gbapal"
.align 2
gUnknown_085F0740:: @ 85F0740
.incbin "graphics/intro/intro2_grass.4bpp.lz"
.align 2
gUnknown_085F0BC0:: @ 85F0BC0
.incbin "graphics/intro/intro2_grass_map.bin.lz"
.align 2
gUnknown_085F0CFC:: @ 85F0CFC
.incbin "graphics/intro/85F0CFC.gbapal"
.align 2
gUnknown_085F0D5C:: @ 85F0D5C
.incbin "graphics/intro/85F0D5C.gbapal"
.align 2
gUnknown_085F0DBC:: @ 85F0DBC
.incbin "graphics/intro/intro2_bgclouds.4bpp.lz"
.align 2
gUnknown_085F1398:: @ 85F1398
.incbin "graphics/intro/intro2_bgclouds_map.bin.lz"
.align 2
gUnknown_085F1668:: @ 85F1668
.incbin "graphics/intro/intro2_bgclouds.gbapal"
.align 2
gUnknown_085F1688:: @ 85F1688
.incbin "graphics/intro/intro2_bgclouds_afternoon.gbapal"
.align 2
gUnknown_085F16A8:: @ 85F16A8
.incbin "graphics/intro/intro2_bgclouds2.4bpp.lz"
.align 2
gUnknown_085F17E4:: @ 85F17E4
.incbin "graphics/intro/intro2_bgtrees2.gbapal"
.align 2
gUnknown_085F1804:: @ 85F1804
.incbin "graphics/intro/intro2_bgtrees2_afternoon.gbapal"
.align 2
gUnknown_085F1824:: @ 85F1824
.incbin "graphics/intro/intro2_bgtrees.4bpp.lz"
.align 2
gUnknown_085F1EAC:: @ 85F1EAC
.incbin "graphics/intro/intro2_bgtrees_map.bin.lz"
.align 2
gUnknown_085F21B0:: @ 85F21B0
.incbin "graphics/intro/intro2_bgtrees.gbapal"
.align 2
gIntro2TreeGfx:: @ 85F21D0
.incbin "graphics/intro/intro2_bgtreessmall.4bpp.lz"
.align 2
gUnknown_085F231C:: @ 85F231C
.incbin "graphics/intro/85F231C.gbapal"
.align 2
gUnknown_085F235C:: @ 85F235C
.incbin "graphics/intro/intro2_bgnight.4bpp.lz"
.align 2
gUnknown_085F2548:: @ 85F2548
.incbin "graphics/intro/intro2_bgnight.gbapal"
.align 2
gUnknown_085F2568:: @ 85F2568
.incbin "graphics/intro/intro2_bgnight_map.bin.lz"
.align 2
gIntro2NightGfx:: @ 85F2814
.incbin "graphics/intro/intro2_night.4bpp.lz"
.align 2
gIntro2BrendanPal:: @ 85F2898
.incbin "graphics/intro/intro2_brendan.gbapal"
.align 2
gIntro2BrendanGfx:: @ 85F28B8
.incbin "graphics/intro/intro2_brendan.4bpp.lz"
.align 2
gIntro2MayPal:: @ 85F3470
.incbin "graphics/intro/intro2_may.gbapal"
.align 2
gUnknown_085F3490:: @ 85F3490
.space 0x1E0
.align 2
gIntro2MayGfx:: @ 85F3670
.incbin "graphics/intro/intro2_may.4bpp.lz"
.align 2
gIntro2BicycleGfx:: @ 85F4318
.incbin "graphics/intro/intro2_bicycle.4bpp.lz"
.align 2
gIntro2LatiosPal:: @ 85F4744
.incbin "graphics/intro/intro2_latios.gbapal"
.align 2
gIntro2LatiosGfx:: @ 85F4764
.incbin "graphics/intro/intro2_latios.4bpp.lz"
.align 2
gIntro2LatiasPal:: @ 85F4C08
.incbin "graphics/intro/intro2_latias.gbapal"
.align 2
gIntro2LatiasGfx:: @ 85F4C28
.incbin "graphics/intro/intro2_latias.4bpp.lz"
.align 2
gUnknown_085F504C:: @ 85F504C
spr_template 0x07d0, 0xffff, gDummyOamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_817B62C
.align 2
gUnknown_085F5064:: @ 85F5064
obj_tiles gUnknown_085F16A8, 0x0400, 0x07d0
null_obj_tiles
.align 2
gUnknown_085F5074:: @ 85F5074
obj_image_anim_frame 0, 30
obj_image_anim_end
.align 2
gUnknown_085F507C:: @ 85F507C
obj_image_anim_frame 16, 30
obj_image_anim_end
.align 2
gUnknown_085F5084:: @ 85F5084
obj_image_anim_frame 20, 30
obj_image_anim_end
.align 2
gUnknown_085F508C:: @ 85F508C
obj_image_anim_frame 22, 30
obj_image_anim_end
.align 2
gUnknown_085F5094:: @ 85F5094
.4byte gUnknown_085F5074
.4byte gUnknown_085F507C
.4byte gUnknown_085F5084
.4byte gUnknown_085F508C
.align 2
gUnknown_085F50A4:: @ 85F50A4
.byte -128, 72, 32, 100
.2byte 0xC00
.space 2
.byte -128, -98, 32, 100
.2byte 0xC00
.space 2
.byte 65, -64, 40, 101
.2byte 0x800
.space 2
.byte 65, 56, 40, 101
.2byte 0x800
.space 2
.byte 18, 100, 44, 102
.2byte 0x400
.space 2
.byte 18, -104, 44, 102
.2byte 0x400
.space 2
.byte 19, 8, 46, 103
.2byte 0x100
.space 2
.byte 19, 56, 46, 103
.2byte 0x100
.space 2
.byte 19, -16, 46, 103
.2byte 0x100
.space 2
.align 2
gUnknown_085F50EC:: @ 85F50EC
obj_tiles gIntro2TreeGfx, 0x0400, 0x07d0
null_obj_tiles
.align 2
gUnknown_085F50FC:: @ 85F50FC
obj_image_anim_frame 0, 30
obj_image_anim_end
.align 2
gUnknown_085F5104:: @ 85F5104
obj_image_anim_frame 16, 30
obj_image_anim_end
.align 2
gUnknown_085F510C:: @ 85F510C
obj_image_anim_frame 24, 30
obj_image_anim_end
.align 2
gUnknown_085F5114:: @ 85F5114
.4byte gUnknown_085F50FC
.4byte gUnknown_085F5104
.4byte gUnknown_085F510C
.align 2
gUnknown_085F5120:: @ 85F5120
.byte -128, 16, 88, 100
.2byte 0x2000
.space 2
.byte -128, 80, 88, 100
.2byte 0x2000
.space 2
.byte -128, -112, 88, 100
.2byte 0x2000
.space 2
.byte -128, -48, 88, 100
.2byte 0x2000
.space 2
.byte -95, 40, 88, 101
.2byte 0x1000
.space 2
.byte -95, 104, 88, 101
.2byte 0x1000
.space 2
.byte -95, -88, 88, 101
.2byte 0x1000
.space 2
.byte -95, -24, 88, 101
.2byte 0x1000
.space 2
.byte -94, 56, 88, 102
.2byte 0x800
.space 2
.byte -94, 120, 88, 102
.2byte 0x800
.space 2
.byte -94, -72, 88, 102
.2byte 0x800
.space 2
.byte -94, -8, 88, 102
.2byte 0x800
.space 2
.align 2
gUnknown_085F5180:: @ 85F5180
obj_tiles gIntro2NightGfx, 0x0400, 0x07d0
null_obj_tiles
.align 2
gUnknown_085F5190:: @ 85F5190
obj_image_anim_frame 0, 30
obj_image_anim_end
.align 2
gUnknown_085F5198:: @ 85F5198
.4byte gUnknown_085F5190
.align 2
gUnknown_085F519C:: @ 85F519C
.byte -128, 24, 88, 100
.2byte 0x1000
.space 2
.byte -128, 64, 88, 100
.2byte 0x1000
.space 2
.byte -128, 104, 88, 100
.2byte 0x1000
.space 2
.byte -128, -112, 88, 100
.2byte 0x1000
.space 2
.byte -128, -72, 88, 100
.2byte 0x1000
.space 2
.byte -128, -32, 88, 100
.2byte 0x1000
.space 2
.align 2
gOamData_85F51CC:: @ 85F51CC
.2byte 0x00A0
.2byte 0xC000
.2byte 0x0400
.align 2
gUnknown_085F51D4:: @ 85F51D4
obj_image_anim_frame 0, 8
obj_image_anim_frame 64, 8
obj_image_anim_frame 128, 8
obj_image_anim_frame 192, 8
obj_image_anim_jump 0
.align 2
gUnknown_085F51E8:: @ 85F51E8
.4byte gUnknown_085F51D4
.align 2
gUnknown_085F51EC:: @ 85F51EC
spr_template 0x03ea, 0x03ea, gOamData_85F51CC, gUnknown_085F51E8, NULL, gDummySpriteAffineAnimTable, nullsub_65
.align 2
gUnknown_085F5204:: @ 85F5204
spr_template 0x03eb, 0x03eb, gOamData_85F51CC, gUnknown_085F51E8, NULL, gDummySpriteAffineAnimTable, nullsub_65
.align 2
gUnknown_085F521C:: @ 85F521C
.2byte 0x40A0
.2byte 0xC000
.2byte 0x0400
.align 2
gUnknown_085F5224:: @ 85F5224
obj_image_anim_frame 0, 8
obj_image_anim_frame 32, 8
obj_image_anim_frame 64, 8
obj_image_anim_frame 96, 8
obj_image_anim_jump 0
.align 2
gUnknown_085F5238:: @ 85F5238
.4byte gUnknown_085F5224
.align 2
gUnknown_085F523C:: @ 85F523C
spr_template 0x03e9, 0x03ea, gUnknown_085F521C, gUnknown_085F5238, NULL, gDummySpriteAffineAnimTable, sub_817B7C4
.align 2
gUnknown_085F5254:: @ 85F5254
spr_template 0x03e9, 0x03eb, gUnknown_085F521C, gUnknown_085F5238, NULL, gDummySpriteAffineAnimTable, sub_817B7C4
.align 2
gUnknown_085F526C:: @ 85F526C
.2byte 0x00A0
.2byte 0xC000
.2byte 0x0400
.align 2
gUnknown_085F5274:: @ 85F5274
obj_image_anim_frame 0, 16
obj_image_anim_end
.align 2
gUnknown_085F527C:: @ 85F527C
obj_image_anim_frame 64, 16
obj_image_anim_end
.align 2
gUnknown_085F5284:: @ 85F5284
.4byte gUnknown_085F5274
.4byte gUnknown_085F527C
.align 2
gUnknown_085F528C:: @ 85F528C
spr_template 0x03ec, 0x03ec, gUnknown_085F526C, gUnknown_085F5284, NULL, gDummySpriteAffineAnimTable, nullsub_66
.align 2
gUnknown_085F52A4:: @ 85F52A4
spr_template 0x03ed, 0x03ed, gUnknown_085F526C, gUnknown_085F5284, NULL, gDummySpriteAffineAnimTable, nullsub_66
.align 2
gUnknown_085F52BC:: @ 85F52BC
obj_tiles gIntro2BrendanNoTurnGfx, 0x2000, 0x03ea
null_obj_tiles
.align 2
gUnknown_085F52CC:: @ 85F52CC
obj_tiles gIntro2MayNoTurnGfx, 0x2000, 0x03eb
null_obj_tiles
.align 2
gUnknown_085F52DC:: @ 85F52DC
obj_tiles gIntro2BicycleGfx, 0x1000, 0x03e9
null_obj_tiles
.align 2
gUnknown_085F52EC:: @ 85F52EC
obj_tiles gIntro2FlygonGfx, 0x1000, 0x03ec
null_obj_tiles
.align 2
gUnknown_085F52FC:: @ 85F52FC
obj_tiles gIntro2FlygonGfx, 0x1000, 0x03ed
null_obj_tiles
.align 2
gUnknown_085F530C:: @ 85F530C
obj_pal gIntro2BrendanNoTurnPal, 0x03ea
obj_pal gIntro2BrendanNoTurnPal, 0x03eb
obj_pal gIntro2FlygonPal, 0x03ec
obj_pal gIntro2FlygonPal, 0x03ed
null_obj_pal
.align 2
gUnknown_085F5334:: @ 85F5334
obj_tiles gIntro2BrendanGfx, 0x3800, 0x03ea
null_obj_tiles
.align 2
gUnknown_085F5344:: @ 85F5344
obj_tiles gIntro2MayGfx, 0x3800, 0x03eb
null_obj_tiles
.align 2
gUnknown_085F5354:: @ 85F5354
obj_tiles gIntro2BicycleGfx, 0x1000, 0x03e9
null_obj_tiles
.align 2
gUnknown_085F5364:: @ 85F5364
obj_tiles gIntro2LatiosGfx, 0x1000, 0x03ec
null_obj_tiles
.align 2
gUnknown_085F5374:: @ 85F5374
obj_tiles gIntro2LatiasGfx, 0x1000, 0x03ed
null_obj_pal
.align 2
gUnknown_085F5384:: @ 85F5384
obj_pal gIntro2BrendanPal, 0x03ea
obj_pal gIntro2MayPal, 0x03eb
obj_pal gIntro2LatiosPal, 0x03ec
obj_pal gIntro2LatiasPal, 0x03ed
null_obj_pal
.align 2
gUnknown_085F53AC:: @ 85F53AC
obj_tiles gIntro2BrendanGfx, 0x2000, 0x03ea
null_obj_tiles
.align 2
gUnknown_085F53BC:: @ 85F53BC
obj_tiles gIntro2MayGfx, 0x2000, 0x03eb
null_obj_tiles

213
data/item_menu_icons.s
View File

@ -4,219 +4,6 @@
.section .rodata
.align 2
gUnknown_0857F564:: @ 857F564
.incbin "graphics/interface/bag_spinner.gbapal"
.align 2
gUnknown_0857F584:: @ 857F584
.incbin "graphics/interface/bag_spinner.4bpp"
.align 2
gUnknown_0857F604:: @ 857F604
.incbin "graphics/unused/cherry.4bpp"
.align 2
gUnknown_0857FA84:: @ 857FA84
.incbin "graphics/unused/cherry.gbapal"
.align 2
gOamData_857FAA4:: @ 857FAA4
.2byte 0x0100, 0xc000, 0x0400, 0x0000
.align 2
gSpriteAnim_857FAAC:: @ 857FAAC
.2byte 0x0000, 0x0004, 0xffff, 0x0000
.align 2
gSpriteAnim_857FAB4:: @ 857FAB4
.2byte 0x0040, 0x0004, 0xffff, 0x0000
.align 2
gSpriteAnim_857FABC:: @ 857FABC
.2byte 0x0080, 0x0004, 0xffff, 0x0000
.align 2
gSpriteAnim_857FAC4:: @ 857FAC4
.2byte 0x00c0, 0x0004, 0xffff, 0x0000
.align 2
gSpriteAnim_857FACC:: @ 857FACC
.2byte 0x0100, 0x0004, 0xffff, 0x0000
.align 2
gSpriteAnim_857FAD4:: @ 857FAD4
.2byte 0x0140, 0x0004, 0xffff, 0x0000
.align 2
gSpriteAnimTable_857FADC:: @ 857FADC
.4byte gSpriteAnim_857FAAC
.4byte gSpriteAnim_857FAB4
.4byte gSpriteAnim_857FAC4
.4byte gSpriteAnim_857FACC
.4byte gSpriteAnim_857FAD4
.4byte gSpriteAnim_857FABC
.align 2
gSpriteAffineAnim_857FAF4:: @ 857FAF4
.2byte 0x0100, 0x0100, 0x0000, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
.align 2
gSpriteAffineAnim_857FB04:: @ 857FB04
.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_857FB2C:: @ 857FB2C
.4byte gSpriteAffineAnim_857FAF4
.4byte gSpriteAffineAnim_857FB04
.align 2
gUnknown_0857FB34:: @ 857FB34
obj_tiles gBagMaleTiles, 0x3000, 0x0064
.align 2
gUnknown_0857FB3C:: @ 857FB3C
obj_tiles gBagFemaleTiles, 0x3000, 0x0064
.align 2
gUnknown_0857FB44:: @ 857FB44
obj_pal gBagPalette, 0x0064
.align 2
gUnknown_0857FB4C:: @ 857FB4C
spr_template 0x0064, 0x0064, gOamData_857FAA4, gSpriteAnimTable_857FADC, NULL, gSpriteAffineAnimTable_857FB2C, SpriteCallbackDummy
.align 2
gOamData_857FB64:: @ 857FB64
.2byte 0x0000, 0x4800, 0x0800, 0x0000
.align 2
gSpriteAnim_857FB6C:: @ 857FB6C
.2byte 0x0000, 0x0000, 0xffff, 0x0000
.align 2
gSpriteAnimTable_857FB74:: @ 857FB74
.4byte gSpriteAnim_857FB6C
.align 2
gSpriteAffineAnim_857FB78:: @ 857FB78
.2byte 0x0000, 0x0000, 0x1008, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
.align 2
gSpriteAffineAnim_857FB88:: @ 857FB88
.2byte 0x0000, 0x0000, 0x10f8, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
.align 2
gUnknown_0857FB98:: @ 857FB98
.4byte gSpriteAffineAnim_857FB78
.align 2
gUnknown_0857FB9C:: @ 857FB9C
.4byte gSpriteAffineAnim_857FB88
.align 2
gUnknown_0857FBA0:: @ 857FBA0
obj_tiles gUnknown_0857F584, 0x0080, 0x0065
.align 2
gUnknown_0857FBA8:: @ 857FBA8
obj_pal gUnknown_0857F564, 0x0065
.align 2
gUnknown_0857FBB0:: @ 857FBB0
spr_template 0x0065, 0x0065, gOamData_857FB64, gSpriteAnimTable_857FB74, NULL, gUnknown_0857FB98, ObjectCB_SwitchPocketRotatingBallInit
.align 2
gOamData_857FBC8:: @ 857FBC8
.2byte 0x0000, 0xc000, 0x7400, 0x0000
.align 2
gOamData_857FBD0:: @ 857FBD0
.2byte 0x0300, 0xc000, 0x7000, 0x0000
.align 2
gSpriteAnim_857FBD8:: @ 857FBD8
.2byte 0x0000, 0x0000, 0xffff, 0x0000
.align 2
gSpriteAnimTable_857FBE0:: @ 857FBE0
.4byte gSpriteAnim_857FBD8
.align 2
gOamData_857FBE4:: @ 857FBE4
.2byte 0xc000, 0x0201, 0x0800, 0x0000
.align 2
gUnknown_0857FBEC:: @ 857FBEC
spr_template 0xffff, 0x7544, gOamData_857FBC8, gSpriteAnimTable_857FBE0, gOamData_857FBE4, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
gSpriteAffineAnim_857FC04:: @ 857FC04
.2byte 0xffff, 0xffff, 0x60fd, 0x0000, 0x0000, 0x0000, 0x1000, 0x0000, 0xfffe, 0xfffe, 0x40ff, 0x0000, 0xfff8, 0x0000, 0x1000, 0x0000
.2byte 0x0000, 0xfff8, 0x1000, 0x0000, 0x0100, 0x0100, 0x0000, 0x0000, 0x7ffe, 0x0000, 0x0000, 0x0000
.align 2
gSpriteAffineAnim_857FC3C:: @ 857FC3C
.2byte 0xffff, 0xffff, 0x6003, 0x0000, 0x0000, 0x0000, 0x1000, 0x0000, 0xfffe, 0xfffe, 0x4001, 0x0000, 0xfff8, 0x0000, 0x1000, 0x0000
.2byte 0x0000, 0xfff8, 0x1000, 0x0000, 0x0100, 0x0100, 0x0000, 0x0000, 0x7ffe, 0x0000, 0x0000, 0x0000
.align 2
gSpriteAffineAnimTable_857FC74:: @ 857FC74
.4byte gSpriteAffineAnim_857FC04
.4byte gSpriteAffineAnim_857FC3C
.align 2
gUnknown_0857FC7C:: @ 857FC7C
spr_template 0xffff, 0x7544, gOamData_857FBD0, gSpriteAnimTable_857FBE0, gOamData_857FBE4, gSpriteAffineAnimTable_857FC74, SpriteCallbackDummy
@ 857FC94
.include "data/graphics/berries/berry_pic_table.inc"
.align 2
gUnknown_0857FDEC:: @ 857FDEC
obj_tiles gBerryCheckCircle_Gfx, 0x0800, 0x2710
.align 2
gUnknown_0857FDF4:: @ 857FDF4
obj_pal gUnknown_08D9BEF0, 0x2710
.align 2
gOamData_857FDFC:: @ 857FDFC
.2byte 0x0000, 0xc000, 0x0400, 0x0000
.align 2
gSpriteAnim_857FE04:: @ 857FE04
.2byte 0x0000, 0x0000, 0xffff, 0x0000
.align 2
gSpriteAnimTable_857FE0C:: @ 857FE0C
.4byte gSpriteAnim_857FE04
.align 2
gUnknown_0857FE10:: @ 857FE10
spr_template 0x2710, 0x2710, gOamData_857FDFC, gSpriteAnimTable_857FE0C, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
gUnknown_0857FE28:: @ 857FE28
spr_template 0x0000, 0x0000, gDummyOamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80D5860
.align 2
gUnknown_0857FE40:: @ 857FE40
spr_template 0x0000, 0x0000, gDummyOamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80D58F8
.align 2
gUnknown_0857FE58:: @ 857FE58
spr_template 0x0000, 0x0000, gDummyOamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80D5968
.align 2
gUnknown_0857FE70:: @ 857FE70
spr_template 0x0000, 0x0000, gDummyOamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80D5A94
.align 2
gUnknown_0857FE88:: @ 857FE88
spr_template 0x0000, 0x0000, gDummyOamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80D5B48
@ 857FEA0
.include "data/text/item_descriptions.inc"

4
data/party_menu.s
View File

@ -442,8 +442,8 @@ gUnknown_08615D9C:: @ 8615D9C
.4byte SetUpFieldMove_Teleport, 0x0000000d
.4byte sub_813572C, 0x0000000d
.4byte sub_80FA004, 0x0000000d
.4byte hm_prepare_dive_probably, 0x00000010
.4byte hm_prepare_dive_probably, 0x00000010
.4byte SetUpFieldMove_SoftBoiled, 0x00000010
.4byte SetUpFieldMove_SoftBoiled, 0x00000010
.4byte SetUpFieldMove_SweetScent, 0x0000000d
.align 2

75
data/player_pc.s
View File

@ -1,75 +0,0 @@
#include "constants/items.h"
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnknown_085DFEA4:: @ 85DFEA4
.4byte gText_TakeOutItemsFromPC
.4byte gText_StoreItemsInPC
.4byte gText_ThrowAwayItemsInPC
.4byte gText_GoBackPrevMenu
.align 2
gUnknown_085DFEB4:: @ 85DFEB4
.4byte gText_ItemStorage, task_pc_itemstorage
.4byte gText_Mailbox, sub_816B0A8
.4byte gText_Decoration, sub_816B138
.4byte gText_TurnOff, sub_816B148
.align 2
gUnknown_085DFED4:: @ 85DFED4
.byte 0x00, 0x01, 0x02, 0x03
.align 2
gUnknown_085DFED8:: @ 85DFED8
.byte 0x00, 0x01, 0x03, 0x00
.align 2
gUnknown_085DFEDC:: @ 85DFEDC
.4byte gText_WithdrawItem, sub_816B398
.4byte gText_DepositItem, sub_816B2C8
.4byte gText_TossItem, sub_816B3E4
.4byte gText_Cancel, sub_816B4A4
.align 2
gUnknown_085DFEFC:: @ 85DFEFC
.2byte ITEM_POTION, 0x0001
.2byte 0x0000, 0x0000
.align 2
gUnknown_085DFF04:: @ 85DFF04
.4byte gText_Read, sub_816B878
.4byte gText_MoveToBag, sub_816B994
.4byte gText_Give2, sub_816BABC
.4byte gText_Cancel2, sub_816BBD4
.align 2
gUnknown_085DFF24:: @ 85DFF24
.4byte 0x09010100, 0x00010f06, 0x09010100, 0x00010f08, 0x0a010100, 0x00010f08
.align 2
gUnknown_085DFF3C:: @ 85DFF3C
.4byte sub_816CA94
.4byte sub_816CAC8
.align 2
gUnknown_085DFF44:: @ 85DFF44
.4byte 0x00000000, sub_816BDDC, fish4_goto_x5_or_x6, 0x00000000, 0x00080000, 0x07003129
.align 2
gUnknown_085DFF5C:: @ 85DFF5C
window_template 0x00, 0x10, 0x01, 0x0d, 0x12, 0x0f, 0x0001
window_template 0x00, 0x01, 0x0d, 0x0d, 0x06, 0x0f, 0x00eb
window_template 0x00, 0x01, 0x08, 0x03, 0x03, 0x0f, 0x0153
window_template 0x00, 0x01, 0x01, 0x0d, 0x02, 0x0f, 0x0139
window_template 0x00, 0x08, 0x09, 0x06, 0x02, 0x0f, 0x015c
.align 2
gUnknown_085DFF84:: @ 85DFF84
window_template 0x00, 0x09, 0x07, 0x05, 0x04, 0x0f, 0x0168
.align 2
gUnknown_085DFF8C:: @ 85DFF8C
.byte 0x01, 0x03, 0x02, 0x00

748
data/pokenav.s
View File

@ -2030,754 +2030,8 @@ gUnknown_08624CF8:: @ 8624CF8
gUnknown_08624D04:: @ 8624D04
spr_template 9, 15, gUnknown_08624CB0, gDummySpriteAnimTable, NULL, gUnknown_08624CF8, SpriteCallbackDummy
gUnknown_08624D1C:: @ 8624D1C
.4byte gText_MrStone_Pokenav_2B60C0
.2byte 0xFFFF
.byte 0x58
.byte 1
.4byte gText_MrStone_Pokenav_2B61E6
.byte 0x58
.byte 1
.2byte 0xFFFF
.4byte gText_MrStone_Pokenav_2B6302
.byte 0xBD
.byte 0
.2byte 0xFFFF
.4byte gText_MrStone_Pokenav_2B63A0
.byte 16
.byte 1
.2byte 0xFFFF
.4byte gText_MrStone_Pokenav_2B64A2
.byte 0x6A
.byte 0
.2byte 0xFFFF
.4byte gText_MrStone_Pokenav_2B6526
.byte 0xF4
.byte 4
.2byte 0xFFFF
.4byte gText_MrStone_Pokenav_2B65BB
.byte 0x97
.byte 0
.2byte 0xFFFF
.4byte gText_MrStone_Pokenav_2B6664
.byte 0x6f
.byte 0
.2byte 0xFFFF
.4byte gText_MrStone_Pokenav_2B66B1
.byte 0x70
.byte 0
.2byte 0xFFFF
.4byte gText_MrStone_Pokenav_2B6703
.byte 0xf7
.byte 4
.2byte 0xFFFF
.4byte gText_MrStone_Pokenav_2B67ED
.byte 0x64
.byte 8
.2byte 0xFFFF
.4byte NULL
.4byte 0xFFFFFFFF
gUnknown_08624D7C:: @ 8624D7C
.byte 0
.byte 10
.2byte 0xFFFF
.4byte gUnknown_085EFAEF
.4byte gUnknown_085EFAFA
.4byte gUnknown_08624D1C
gUnknown_08624D8C:: @ 8624D8C
.4byte gText_Norman_Pokenav_2B5719
.byte 0x32
.byte 1
.2byte 0xFFFF
.4byte gText_Norman_Pokenav_2B5795
.byte 0xF1
.byte 4
.2byte 0xFFFF
.4byte gText_Norman_Pokenav_2B584D
.byte 0xF3
.byte 4
.2byte 0xFFFF
.4byte gText_Norman_Pokenav_2B58E3
.byte 0xF4
.byte 4
.2byte 0xFFFF
.4byte gText_Norman_Pokenav_2B5979
.byte 0xD4
.byte 0
.2byte 0xFFFF
.4byte gText_Norman_Pokenav_2B5A07
.byte 0xFE
.byte 0xFF
.2byte 0xFFFF
.4byte gText_Norman_Pokenav_2B5A69
.byte 0x64
.byte 8
.2byte 0xFFFF
.4byte gText_Norman_Pokenav_2B5ACF
.byte 0x64
.byte 8
.2byte 0xFFFF
.4byte gText_Norman_Pokenav_2B5B5E
.byte 0x64
.byte 8
.2byte 0xFFFF
.4byte NULL
.4byte 0xFFFFFFFF
gUnknown_08624DDC:: @ 8624DDC
.byte 5, 7, 0x32, 1, 0x45, 0, 0, 0
.4byte gUnknown_085EFB25
.4byte gUnknown_085EFB47
.4byte gUnknown_08624D8C
gUnknown_08624DF0:: @ 8624DF0
.byte 3, 0, 0x19, 1
.4byte gUnknown_085EFBC9
.4byte gUnknown_085E8270
gUnknown_08624DFC:: @ 8624DFC
.4byte gText_Mom_Pokenav_2B227B
.byte 0xFF
.byte 0xFF
.2byte 0xFFFF
.4byte gText_Mom_Pokenav_2B2310
.byte 0xF4
.byte 0x4
.2byte 0xFFFF
.4byte gText_Mom_Pokenav_2B23F3
.byte 0x64
.byte 8
.2byte 0xFFFF
.4byte NULL
.4byte 0xFFFFFFFF
gUnknown_08624E1C:: @ 8624E1C
.byte 0, 0, 0xD8, 0
.4byte gUnknown_085EFB32
.4byte gUnknown_085EFB4B
.4byte gUnknown_08624DFC
gUnknown_08624E2C:: @ 8624E2C
.4byte gText_Steven_Pokenav_2B5B95
.byte 0xFF
.byte 0xFF
.2byte 0xFFFF
.4byte gText_Steven_Pokenav_2B5C53
.byte 0xC7
.byte 0
.2byte 0xFFFF
.4byte gText_Steven_Pokenav_2B5CC9
.byte 0xD4
.byte 0
.2byte 0xFFFF
.4byte gText_Steven_Pokenav_2B5DB4
.byte 0x70
.byte 0
.2byte 0xFFFF
.4byte gText_Steven_Pokenav_2B5E26
.byte 0xF6
.byte 4
.2byte 0xFFFF
.4byte gText_Steven_Pokenav_2B5EA2
.byte 0x81
.byte 0
.2byte 0xFFFF
.4byte gText_Steven_Pokenav_2B5ED9
.byte 0x64
.byte 8
.2byte 0xFFFF
.4byte NULL
.4byte 0xFFFFFFFF
gUnknown_08624E6C:: @ 8624E6C
.byte 0, 0xD5, 0x31, 1
.4byte gUnknown_085EFB04
.4byte gUnknown_085EFB11
.4byte gUnknown_08624E2C
gUnknown_08624E7C:: @ 8624E7C
.4byte gText_May_Pokenav_2B3AB3
.byte 0xFF
.byte 0xFF
.2byte 0xFFFF
.4byte gText_May_Pokenav_2B3B3F
.byte 0xF1
.byte 0x4
.2byte 0xFFFF
.4byte gText_May_Pokenav_2B3C13
.byte 0x95
.byte 0
.2byte 0xFFFF
.4byte gText_May_Pokenav_2B3CF3
.byte 0x24
.byte 0x3
.2byte 0xFFFF
.4byte gText_May_Pokenav_2B3D4B
.byte 0x6A
.byte 0
.2byte 0xFFFF
.4byte gText_May_Pokenav_2B3DD1
.byte 0xF3
.byte 0x4
.2byte 0xFFFF
.4byte gText_May_Pokenav_2B3E69
.byte 0xF4
.byte 4
.2byte 0xFFFF
.4byte gText_May_Pokenav_2B3ECD
.byte 0x97
.byte 0
.2byte 0xFFFF
.4byte gText_May_Pokenav_2B3F2B
.byte 0xD4
.byte 0
.2byte 0xFFFF
.4byte gText_May_Pokenav_2B3FFB
.byte 0x6F
.byte 0
.2byte 0xFFFF
.4byte gText_May_Pokenav_2B402B
.byte 0x61
.byte 0
.2byte 0xFFFF
.4byte gText_May_Pokenav_2B414B
.byte 0x70
.byte 0
.2byte 0xFFFF
.4byte gText_May_Pokenav_2B4228
.byte 0x81
.byte 0
.2byte 0xFFFF
.4byte gText_May_Pokenav_2B42E0
.byte 0xF7
.byte 4
.2byte 0xFFFF
.4byte gText_May_Pokenav_2B4350
.byte 0x64
.byte 8
.2byte 0xFFFF
.4byte NULL
.4byte 0xFFFFFFFF
gUnknown_08624EFC:: @ 8624EFC
.byte 4, 0, 0xFD, 0
.4byte gUnknown_085EFB18
.4byte gExpandedPlaceholder_May
.4byte gUnknown_08624E7C
gUnknown_08624F0C:: @ 8624F0C
.4byte gText_Brendan_Pokenav_2B43EF
.byte 0xFF
.byte 0xFF
.2byte 0xFFFF
.4byte gText_Brendan_Pokenav_2B4486
.byte 0xF1
.byte 0x4
.2byte 0xFFFF
.4byte gText_Brendan_Pokenav_2B4560
.byte 0x95
.byte 0
.2byte 0xFFFF
.4byte gText_Brendan_Pokenav_2B463F
.byte 0x24
.byte 0x3
.2byte 0xFFFF
.4byte gText_Brendan_Pokenav_2B46B7
.byte 0x6A
.byte 0
.2byte 0xFFFF
.4byte gText_Brendan_Pokenav_2B4761
.byte 0xF3
.byte 0x4
.2byte 0xFFFF
.4byte gText_Brendan_Pokenav_2B47F4
.byte 0xF4
.byte 4
.2byte 0xFFFF
.4byte gText_Brendan_Pokenav_2B4882
.byte 0x97
.byte 0
.2byte 0xFFFF
.4byte gText_Brendan_Pokenav_2B4909
.byte 0xD4
.byte 0
.2byte 0xFFFF
.4byte gText_Brendan_Pokenav_2B49C4
.byte 0x6F
.byte 0
.2byte 0xFFFF
.4byte gText_Brendan_Pokenav_2B4A44
.byte 0x61
.byte 0
.2byte 0xFFFF
.4byte gText_Brendan_Pokenav_2B4B28
.byte 0x70
.byte 0
.2byte 0xFFFF
.4byte gText_Brendan_Pokenav_2B4C15
.byte 0x81
.byte 0
.2byte 0xFFFF
.4byte gText_Brendan_Pokenav_2B4CD8
.byte 0xF7
.byte 4
.2byte 0xFFFF
.4byte gText_Brendan_Pokenav_2B4D46
.byte 0x64
.byte 8
.2byte 0xFFFF
.4byte NULL
.4byte 0xFFFFFFFF
gUnknown_08624F8C:: @ 8624F8C
.byte 4, 1, 0xFD, 0
.4byte gUnknown_085EFB18
.4byte gExpandedPlaceholder_Brendan
.4byte gUnknown_08624F0C
gUnknown_08624F9C:: @ 8624F9C
.4byte gText_Wally_Pokenav_2B4DE2
.byte 0xFF
.byte 0xFF
.2byte 0xFFFF
.4byte gText_Wally_Pokenav_2B4E57
.byte 0xC7
.byte 0
.2byte 0xFFFF
.4byte gText_Wally_Pokenav_2B4EA5
.byte 0xF3
.byte 0x4
.2byte 0xFFFF
.4byte gText_Wally_Pokenav_2B4F41
.byte 0x97
.byte 0
.2byte 0xFFFF
.4byte gText_Wally_Pokenav_2B4FF3
.byte 0x6F
.byte 0
.2byte 0xFFFF
.4byte gText_Wally_Pokenav_2B50B1
.byte 0x81
.byte 0
.2byte 0xFFFF
.4byte gText_Wally_Pokenav_2B5100
.byte 0x7E
.byte 0
.2byte 0xFFFF
.4byte NULL
.4byte 0xFFFFFFFF
gUnknown_08624FDC:: @ 8624FDC
.byte 0x24, 3, 5, 0
.2byte 0x6F, 0xD5
.byte 0x5A, 3, 0x46, 0, 0xFF, 0xFF, 0xD5, 0
gUnknown_08624FEC:: @ 8624FEC
.byte 2, 0, 0xD6, 0
.4byte 0x40
.4byte gUnknown_085EFB3E
.4byte gUnknown_08624F9C
.4byte gUnknown_08624FDC
gUnknown_08624500:: @ 8624500
.4byte gText_Scott_Pokenav_2B5184
.byte 0xFF
.byte 0xFF
.2byte 0xFFFF
.4byte gText_Scott_Pokenav_2B5275
.byte 0x8B
.byte 0
.2byte 0xFFFF
.4byte gText_Scott_Pokenav_2B5323
.byte 0x97
.byte 0
.2byte 0xFFFF
.4byte gText_Scott_Pokenav_2B53DB
.byte 0xD4
.byte 0
.2byte 0xFFFF
.4byte gText_Scott_Pokenav_2B54A5
.byte 0x70
.byte 0
.2byte 0xFFFF
.4byte gText_Scott_Pokenav_2B5541
.byte 0xF7
.byte 4
.2byte 0xFFFF
.4byte gText_Scott_Pokenav_2B56CA
.byte 0x64
.byte 8
.2byte 0xFFFF
.4byte NULL
.4byte 0xFFFFFFFF
gUnknown_08625040:: @ 8625040
.byte 0, 0xD5, 0xD7, 0
.4byte gUnknown_085EFB4F
.4byte gUnknown_085EFB5C
.4byte gUnknown_08624500
gUnknown_08625050:: @ 8625050
.4byte gText_Roxanne_Pokenav_2B2456
.byte 0xFE
.byte 0xFF
.2byte 0xFFFF
.4byte gText_Roxanne_Pokenav_2B250E
.byte 0xFF
.byte 0xFF
.2byte 0xFFFF
.4byte gText_Roxanne_Pokenav_2B25C1
.byte 0xFF
.byte 0xFF
.2byte 0xFFFF
.4byte gText_Roxanne_Pokenav_2B2607
.byte 0x64
.byte 0x8
.2byte 0xFFFF
.4byte NULL
.4byte 0xFFFFFFFF
gUnknown_08625078:: @ 8625078
.byte 5, 10, 0xD3, 1
.4byte 0x41
.4byte gUnknown_085EFB62
.4byte NULL
.4byte gUnknown_08625050
gUnknown_0862508C:: @ 862508C
.4byte gText_Brawly_Pokenav_2B2659
.byte 0xFE
.byte 0xFF
.2byte 0xFFFF
.4byte gText_Brawly_Pokenav_2B275D
.byte 0xFF
.byte 0xFF
.2byte 0xFFFF
.4byte gText_Brawly_Pokenav_2B286F
.byte 0xFF
.byte 0xFF
.2byte 0xFFFF
.4byte gText_Brawly_Pokenav_2B28D1
.byte 0x64
.byte 0x8
.2byte 0xFFFF
.4byte NULL
.4byte 0xFFFFFFFF
gUnknown_086250B4:: @ 86250B4
.byte 5, 2, 0xD4, 1
.4byte 0x42
.4byte gUnknown_085EFB6F
.4byte NULL
.4byte gUnknown_0862508C
gUnknown_086250C8:: @ 86250C8
.4byte gText_Wattson_Pokenav_2B2912
.byte 0xFE
.byte 0xFF
.2byte 0xFFFF
.4byte gText_Wattson_Pokenav_2B29CA
.byte 0xFF
.byte 0xFF
.2byte 0xFFFF
.4byte gText_Wattson_Pokenav_2B2AB6
.byte 0xFF
.byte 0xFF
.2byte 0xFFFF
.4byte gText_Wattson_Pokenav_2B2B01
.byte 0x64
.byte 0x8
.2byte 0xFFFF
.4byte NULL
.4byte 0xFFFFFFFF
gUnknown_086250F0:: @ 86250F0
.byte 5, 9, 0xD5, 1
.4byte 0x43
.4byte gUnknown_085EFB7B
.4byte NULL
.4byte gUnknown_086250C8
gUnknown_08625104:: @ 8625104
.4byte gText_Flannery_Pokenav_2B2B4D
.byte 0xFE
.byte 0xFF
.2byte 0xFFFF
.4byte gText_Flannery_Pokenav_2B2C0E
.byte 0xFF
.byte 0xFF
.2byte 0xFFFF
.4byte gText_Flannery_Pokenav_2B2CF1
.byte 0xFF
.byte 0xFF
.2byte 0xFFFF
.4byte gText_Flannery_Pokenav_2B2D54
.byte 0x64
.byte 0x8
.2byte 0xFFFF
.4byte NULL
.4byte 0xFFFFFFFF
gUnknown_0862512C:: @ 862512C
.byte 5, 3, 0xD6, 1
.4byte 0x44
.4byte gUnknown_085EFB87
.4byte NULL
.4byte gUnknown_08625104
gUnknown_08625140:: @ 8625140
.4byte gText_Winona_Pokenav_2B2DA4
.byte 0xFE
.byte 0xFF
.2byte 0xFFFF
.4byte gText_Winona_Pokenav_2B2E2B
.byte 0xFF
.byte 0xFF
.2byte 0xFFFF
.4byte gText_Winona_Pokenav_2B2EC2
.byte 0xFF
.byte 0xFF
.2byte 0xFFFF
.4byte gText_Winona_Pokenav_2B2F16
.byte 0x64
.byte 0x8
.2byte 0xFFFF
.4byte NULL
.4byte 0xFFFFFFFF
gUnknown_08625168:: @ 8625168
.byte 5, 11, 0xD7, 1
.4byte 0x46
.4byte gUnknown_085EFB94
.4byte NULL
.4byte gUnknown_08625140
gUnknown_0862517C:: @ 862517C
.4byte gText_TateLiza_Pokenav_2B2F97
.byte 0xFE
.byte 0xFF
.2byte 0xFFFF
.4byte gText_TateLiza_Pokenav_2B306E
.byte 0xFF
.byte 0xFF
.2byte 0xFFFF
.4byte gText_TateLiza_Pokenav_2B3158
.byte 0xFF
.byte 0xFF
.2byte 0xFFFF
.4byte gText_TateLiza_Pokenav_2B31CD
.byte 0x64
.byte 0x8
.2byte 0xFFFF
.4byte NULL
.4byte 0xFFFFFFFF
gUnknown_086251A4:: @ 86251A4
.byte 5, 13, 0xD8, 1
.4byte 0x47
.4byte gUnknown_085EFB9E
.4byte NULL
.4byte gUnknown_0862517C
gUnknown_086251B8:: @ 86251B8
.4byte gText_Juan_Pokenav_2B3249
.byte 0xFE
.byte 0xFF
.2byte 0xFFFF
.4byte gText_Juan_Pokenav_2B32EC
.byte 0xFF
.byte 0xFF
.2byte 0xFFFF
.4byte gText_Juan_Pokenav_2B33AA
.byte 0xFF
.byte 0xFF
.2byte 0xFFFF
.4byte gText_Juan_Pokenav_2B341E
.byte 0x64
.byte 0x8
.2byte 0xFFFF
.4byte NULL
.4byte 0xFFFFFFFF
gUnknown_086251E0:: @ 86251E0
.byte 5, 14, 0xD9, 1
.4byte 0x48
.4byte gUnknown_085EFBA9
.4byte NULL
.4byte gUnknown_086251B8
gUnknown_086251F4:: @ 86251F4
.4byte gText_Sidney_Pokenav_2B34CC
.byte 0xFF
.byte 0xFF
.2byte 0xFFFF
.4byte NULL
.4byte 0xFFFFFFFF
gUnknown_08625204:: @ 8625204
.byte 5, 15, 0xA5, 1
.4byte 0x49
.4byte gUnknown_085EFBB5
.4byte NULL
.4byte gUnknown_086251F4
gUnknown_08625218:: @ 8625218
.4byte gText_Phoebe_Pokenav_2B3561
.byte 0xFF
.byte 0xFF
.2byte 0xFFFF
.4byte NULL
.4byte 0xFFFFFFFF
gUnknown_08625228:: @ 8625228
.byte 5, 15, 0xA6, 1
.4byte 0x4A
.4byte gUnknown_085EFBB5
.4byte NULL
.4byte gUnknown_08625218
gUnknown_0862523C:: @ 862523C
.4byte gText_Glacia_Pokenav_2B35E4
.byte 0xFF
.byte 0xFF
.2byte 0xFFFF
.4byte NULL
.4byte 0xFFFFFFFF
gUnknown_0862524C:: @ 862524C
.byte 5, 15, 0xA7, 1
.4byte 0x4B
.4byte gUnknown_085EFBB5
.4byte NULL
.4byte gUnknown_0862523C
gUnknown_08625260:: @ 8625260
.4byte gText_Drake_Pokenav_2B368B
.byte 0xFF
.byte 0xFF
.2byte 0xFFFF
.4byte NULL
.4byte 0xFFFFFFFF
gUnknown_08625270:: @ 8625270
.byte 5, 15, 0xA8, 1
.4byte 0x4C
.4byte gUnknown_085EFBB5
.4byte NULL
.4byte gUnknown_08625260
gUnknown_08625284:: @ 8625284
.4byte gText_Wallace_Pokenav_2B3790
.byte 0xFF
.byte 0xFF
.2byte 0xFFFF
.4byte NULL
.4byte 0xFFFFFFFF
gUnknown_08625294:: @ 8625294
.byte 5, 15, 0xA9, 1
.4byte 0x4D
.4byte gUnknown_085EFBC0
.4byte NULL
.4byte gUnknown_08625284
gUnknown_086252A8:: @ 86252A8
.4byte gUnknown_08624D7C
.4byte gUnknown_08624DF0
.4byte gUnknown_08624F8C
.4byte gUnknown_08624EFC
.4byte gUnknown_08624FEC
.4byte gUnknown_08624DDC
.4byte gUnknown_08624E1C
.4byte gUnknown_08624E6C
.4byte gUnknown_08625040
.4byte gUnknown_08625078
.4byte gUnknown_086250B4
.4byte gUnknown_086250F0
.4byte gUnknown_0862512C
.4byte gUnknown_08625168
.4byte gUnknown_086251A4
.4byte gUnknown_086251E0
.4byte gUnknown_08625204
.4byte gUnknown_08625228
.4byte gUnknown_0862524C
.4byte gUnknown_08625270
.4byte gUnknown_08625294
gUnknown_086252FC:: @ 86252FC
.4byte sub_81D1628
.4byte sub_81D164C
.4byte sub_81D1670
.4byte sub_81D1694
.4byte sub_81D16CC
gUnknown_08625310:: @ 8625310
.4byte sub_81D1714
.4byte sub_81D1718
.4byte sub_81D171C
.4byte sub_81D1750
.4byte sub_81D1754
gUnknown_08625324:: @ 8625324
.4byte sub_81D178C
.4byte sub_81D1790
.4byte sub_81D17C0
.4byte sub_81D17E0
.4byte sub_81D17E4
gUnknown_08625338:: @ 8625338
.4byte sub_81D1840
.4byte sub_81D1844
.4byte sub_81D1848
.4byte sub_81D184C
.4byte sub_81D1850
gUnknown_0862534C:: @ 862534C
.4byte sub_81D1888
.4byte sub_81D188C
.4byte sub_81D1890
.4byte sub_81D1894
.4byte sub_81D1898
gUnknown_08625360:: @ 8625360
.4byte sub_81D18D0
.4byte sub_81D18DC
.4byte sub_81D18FC
.4byte sub_81D1908
.4byte sub_81D1914
gUnknown_08625374:: @ 8625374
.4byte sub_81D1AB0
.4byte sub_81D1ABC
.4byte sub_81D1ADC
.4byte sub_81D1AF4
.4byte sub_81D1B00
gUnknown_08625388:: @ 8625388
.2byte 7, 0x4B, 0xFFFF, 0
.4byte gUnknown_085ED453
.4byte gUnknown_085ED46B
.4byte gUnknown_085ED483
.4byte gUnknown_085ED49D
.2byte 7, 0x4B, 0x4F6, 0
.4byte gUnknown_085ED453
.4byte gUnknown_085ED46B
.4byte gUnknown_085ED4B3
.4byte gUnknown_085ED4CE
.2byte 2, 0X3C, 0xFFFF, 0
.4byte gUnknown_085ED4E3
.4byte gUnknown_085ED4FA
.4byte gUnknown_085ED516
.4byte gUnknown_085ED52F
.2byte 3, 0x3F, 0xFFFF, 0
.4byte gUnknown_085ED547
.4byte gUnknown_085ED563
.4byte gUnknown_085ED579
.4byte gUnknown_085ED58F
.section .rodata.after.match.call
gUnknown_086253E8:: @ 86253E8
.4byte 0x8010100

6
data/rom_8011DC0.s
View File

@ -2506,13 +2506,13 @@ gUnknown_082F2D40:: @ 82F2D40
.4byte gText_RegisteredTextChanged
.byte 0x02, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00
.4byte gText_AlreadySavedFile
.4byte gText_AlreadySavedFile_Unused
.byte 0x02, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00
.4byte gText_SavingDontTurnOff
.4byte gText_SavingDontTurnOff_Unused
.byte 0x02, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00
.4byte gText_PlayerSavedGame
.4byte gText_PlayerSavedGame_Unused
.byte 0x02, 0x00, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00
.4byte gText_IfLeaderLeavesChatEnds

4
data/scripts/maps/AbandonedShip_Rooms2_1F.inc
View File

@ -13,7 +13,7 @@ AbandonedShip_Rooms2_1F_EventScript_2380A7:: @ 82380A7
AbandonedShip_Rooms2_1F_EventScript_2380D7:: @ 82380D7
msgbox AbandonedShip_Rooms2_1F_Text_2383BB, 4
setvar VAR_0x8004, 642
special sub_81D1C20
special SetMatchCallRegisteredFlag
setorcopyvar VAR_0x8000, 642
callstd 8
release
@ -36,7 +36,7 @@ AbandonedShip_Rooms2_1F_EventScript_23810B:: @ 823810B
AbandonedShip_Rooms2_1F_EventScript_23813B:: @ 823813B
msgbox AbandonedShip_Rooms2_1F_Text_2383BB, 4
setvar VAR_0x8004, 642
special sub_81D1C20
special SetMatchCallRegisteredFlag
setorcopyvar VAR_0x8000, 642
callstd 8
release

2
data/scripts/maps/AbandonedShip_Rooms_1F.inc
View File

@ -24,7 +24,7 @@ AbandonedShip_Rooms_1F_EventScript_237ADF:: @ 8237ADF
waitmovement 0
msgbox AbandonedShip_Rooms_1F_Text_237C2A, 4
setvar VAR_0x8004, 144
special sub_81D1C20
special SetMatchCallRegisteredFlag
setorcopyvar VAR_0x8000, 144
callstd 8
release

4
data/scripts/maps/BattleFrontier_BattlePyramidEmptySquare.inc
View File

@ -180,12 +180,12 @@ BattleFrontier_BattlePyramidEmptySquare_EventScript_252C88:: @ 8252C88
BattleFrontier_BattlePyramidEmptySquare_Text_252C8D: @ 8252C8D
.string "This is a sample message.$"
BattleFrontier_BattlePyramidEmptySquare_Text_252CA7:: @ 8252CA7
gText_BattlePyramidConfirmRest:: @ 8252CA7
.string "Your BATTLE PYRAMID quest will be\n"
.string "saved so that you may quit for now.\l"
.string "Is that okay?$"
BattleFrontier_BattlePyramidEmptySquare_Text_252CFB:: @ 8252CFB
gText_BattlePyramidConfirmRetire:: @ 8252CFB
.string "Are you sure you want to quit your\n"
.string "PYRAMID quest?$"

4
data/scripts/maps/JaggedPass.inc
View File

@ -115,7 +115,7 @@ JaggedPass_EventScript_2307C8:: @ 82307C8
special sub_80B4808
msgbox JaggedPass_Text_230A2C, 4
setvar VAR_0x8004, 474
special sub_81D1C20
special SetMatchCallRegisteredFlag
setorcopyvar VAR_0x8000, 474
callstd 8
release
@ -139,7 +139,7 @@ JaggedPass_EventScript_230827:: @ 8230827
special sub_80B4808
msgbox JaggedPass_Text_230BC6, 4
setvar VAR_0x8004, 216
special sub_81D1C20
special SetMatchCallRegisteredFlag
setorcopyvar VAR_0x8000, 216
callstd 8
release

2
data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc
View File

@ -259,7 +259,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F8626:: @ 81F8626
special DoPCTurnOnEffect
playse SE_PC_ON
msgbox gUnknown_08272D87, 4
special sub_816AE58
special BedroomPC
waitstate
releaseall
end

2
data/scripts/maps/LittlerootTown_MaysHouse_2F.inc
View File

@ -320,7 +320,7 @@ LittlerootTown_MaysHouse_2F_EventScript_1F9576:: @ 81F9576
special DoPCTurnOnEffect
playse SE_PC_ON
msgbox gUnknown_08272D87, 4
special sub_816AE58
special BedroomPC
waitstate
releaseall
end

18
data/scripts/maps/MauvilleCity.inc
View File

@ -5,18 +5,18 @@ MauvilleCity_MapScripts:: @ 81DF385
MauvilleCity_MapScript1_1DF38B: @ 81DF38B
setflag FLAG_VISITED_MAUVILLE_CITY
clearflag FLAG_0x09D
clearflag FLAG_0x3C1
clearflag FLAG_SPRITEVIS_SLATEPORT_MUSEUM_POPULATION
setflag FLAG_SYS_TV_START
clearflag FLAG_0x063
setvar VAR_0x4093, 0
checkflag FLAG_0x0D1
checkflag FLAG_GOT_TM24_FROM_WATTSON
call_if 1, MauvilleCity_EventScript_1DF3A9
end
MauvilleCity_EventScript_1DF3A9:: @ 81DF3A9
clearflag FLAG_0x391
setflag FLAG_0x390
setflag FLAG_0x05B
clearflag FLAG_SPRITEVIS_MAUVILLE_GYM_WATTSON
setflag FLAG_SPRITEVIS_MAUVILLE_CITY_WATTSON
setflag FLAG_WATTSON_REMATCH_AVAILABLE
return
MauvilleCity_EventScript_1DF3B3:: @ 81DF3B3
@ -424,15 +424,15 @@ MauvilleCity_Movement_1DF72F: @ 81DF72F
MauvilleCity_EventScript_1DF73A:: @ 81DF73A
lock
faceplayer
checkflag FLAG_0x0D1
checkflag FLAG_GOT_TM24_FROM_WATTSON
goto_eq MauvilleCity_EventScript_1DF7B0
compare VAR_0x40BA, 2
goto_eq MauvilleCity_EventScript_1DF784
checkflag FLAG_0x0D0
checkflag FLAG_GOT_BASEMENT_KEY_FROM_WATTSON
goto_eq MauvilleCity_EventScript_1DF77A
msgbox MauvilleCity_Text_1DFFE4, 4
giveitem_std ITEM_BASEMENT_KEY
setflag FLAG_0x0D0
setflag FLAG_GOT_BASEMENT_KEY_FROM_WATTSON
msgbox MauvilleCity_Text_1E0154, 4
release
end
@ -447,7 +447,7 @@ MauvilleCity_EventScript_1DF784:: @ 81DF784
giveitem_std ITEM_TM24
compare VAR_RESULT, 0
goto_eq MauvilleCity_EventScript_272054
setflag FLAG_0x0D1
setflag FLAG_GOT_TM24_FROM_WATTSON
msgbox MauvilleCity_Text_1E02AA, 4
release
end

6
data/scripts/maps/MeteorFalls_1F_2R.inc
View File

@ -15,7 +15,7 @@ MeteorFalls_1F_2R_EventScript_22C50A:: @ 822C50A
waitmovement 0
msgbox MeteorFalls_1F_2R_Text_22C6F6, 4
setvar VAR_0x8004, 392
special sub_81D1C20
special SetMatchCallRegisteredFlag
setorcopyvar VAR_0x8000, 392
callstd 8
release
@ -38,7 +38,7 @@ MeteorFalls_1F_2R_EventScript_22C540:: @ 822C540
MeteorFalls_1F_2R_EventScript_22C570:: @ 822C570
msgbox MeteorFalls_1F_2R_Text_22C99C, 4
setvar VAR_0x8004, 681
special sub_81D1C20
special SetMatchCallRegisteredFlag
setorcopyvar VAR_0x8000, 681
callstd 8
release
@ -61,7 +61,7 @@ MeteorFalls_1F_2R_EventScript_22C5A4:: @ 822C5A4
MeteorFalls_1F_2R_EventScript_22C5D4:: @ 822C5D4
msgbox MeteorFalls_1F_2R_Text_22C99C, 4
setvar VAR_0x8004, 681
special sub_81D1C20
special SetMatchCallRegisteredFlag
setorcopyvar VAR_0x8000, 681
callstd 8
release

4
data/scripts/maps/MtChimney.inc
View File

@ -500,7 +500,7 @@ MtChimney_EventScript_22F176:: @ 822F176
waitmovement 0
msgbox MtChimney_Text_2300E3, 4
setvar VAR_0x8004, 313
special sub_81D1C20
special SetMatchCallRegisteredFlag
setorcopyvar VAR_0x8000, 313
callstd 8
release
@ -545,7 +545,7 @@ MtChimney_EventScript_22F234:: @ 822F234
waitmovement 0
msgbox MtChimney_Text_230557, 4
setvar VAR_0x8004, 1
special sub_81D1C20
special SetMatchCallRegisteredFlag
setorcopyvar VAR_0x8000, 1
callstd 8
release

2
data/scripts/maps/MtPyre_3F.inc
View File

@ -25,7 +25,7 @@ MtPyre_3F_EventScript_2317AD:: @ 82317AD
waitmovement 0
msgbox MtPyre_3F_Text_231A49, 4
setvar VAR_0x8004, 9
special sub_81D1C20
special SetMatchCallRegisteredFlag
setorcopyvar VAR_0x8000, 9
callstd 8
release

2
data/scripts/maps/MtPyre_6F.inc
View File

@ -15,7 +15,7 @@ MtPyre_6F_EventScript_231D67:: @ 8231D67
waitmovement 0
msgbox MtPyre_6F_Text_231E43, 4
setvar VAR_0x8004, 108
special sub_81D1C20
special SetMatchCallRegisteredFlag
setorcopyvar VAR_0x8000, 108
callstd 8
release

4
data/scripts/maps/PetalburgCity_Gym.inc
View File

@ -423,8 +423,8 @@ PetalburgCity_Gym_EventScript_204E3B:: @ 8204E3B
setflag FLAG_BADGE05_GET
special sub_813B9A0
call PetalburgCity_Gym_EventScript_2721F8
setflag FLAG_0x391
clearflag FLAG_0x390
setflag FLAG_SPRITEVIS_MAUVILLE_GYM_WATTSON
clearflag FLAG_SPRITEVIS_MAUVILLE_CITY_WATTSON
setvar VAR_0x8008, 5
call PetalburgCity_Gym_EventScript_271F43
clearflag FLAG_0x3AC

4
data/scripts/maps/PetalburgWoods.inc
View File

@ -301,7 +301,7 @@ PetalburgWoods_EventScript_22E2C5:: @ 822E2C5
PetalburgWoods_EventScript_22E2D6:: @ 822E2D6
msgbox PetalburgWoods_Text_22E8C3, 4
setvar VAR_0x8004, 621
special sub_81D1C20
special SetMatchCallRegisteredFlag
setorcopyvar VAR_0x8000, 621
callstd 8
release
@ -317,7 +317,7 @@ PetalburgWoods_EventScript_22E2EF:: @ 822E2EF
PetalburgWoods_EventScript_22E302:: @ 822E302
msgbox PetalburgWoods_Text_22E914, 4
setvar VAR_0x8004, 621
special sub_81D1C20
special SetMatchCallRegisteredFlag
setorcopyvar VAR_0x8000, 621
callstd 8
release

4
data/scripts/maps/Route102.inc
View File

@ -41,7 +41,7 @@ Route102_EventScript_1EC146:: @ 81EC146
Route102_EventScript_1EC157:: @ 81EC157
msgbox Route102_Text_294668, 4
setvar VAR_0x8004, 318
special sub_81D1C20
special SetMatchCallRegisteredFlag
setorcopyvar VAR_0x8000, 318
callstd 8
release
@ -57,7 +57,7 @@ Route102_EventScript_1EC170:: @ 81EC170
Route102_EventScript_1EC183:: @ 81EC183
msgbox Route102_Text_2945EB, 4
setvar VAR_0x8004, 318
special sub_81D1C20
special SetMatchCallRegisteredFlag
setorcopyvar VAR_0x8000, 318
callstd 8
release

6
data/scripts/maps/Route103.inc
View File

@ -218,7 +218,7 @@ Route103_EventScript_1EC60B:: @ 81EC60B
Route103_EventScript_1EC63A:: @ 81EC63A
msgbox Route103_Text_294B8A, 4
setvar VAR_0x8004, 481
special sub_81D1C20
special SetMatchCallRegisteredFlag
setorcopyvar VAR_0x8000, 481
callstd 8
release
@ -240,7 +240,7 @@ Route103_EventScript_1EC66E:: @ 81EC66E
Route103_EventScript_1EC69D:: @ 81EC69D
msgbox Route103_Text_294B8A, 4
setvar VAR_0x8004, 481
special sub_81D1C20
special SetMatchCallRegisteredFlag
setorcopyvar VAR_0x8000, 481
callstd 8
release
@ -270,7 +270,7 @@ Route103_EventScript_1EC714:: @ 81EC714
waitmovement 0
msgbox Route103_Text_294F7E, 4
setvar VAR_0x8004, 293
special sub_81D1C20
special SetMatchCallRegisteredFlag
setorcopyvar VAR_0x8000, 293
callstd 8
release

12
data/scripts/maps/Route104.inc
View File

@ -904,7 +904,7 @@ Route104_EventScript_1ED3CE:: @ 81ED3CE
Route104_EventScript_1ED3DF:: @ 81ED3DF
msgbox Route104_Text_29576B, 4
setvar VAR_0x8004, 604
special sub_81D1C20
special SetMatchCallRegisteredFlag
setorcopyvar VAR_0x8000, 604
callstd 8
release
@ -920,7 +920,7 @@ Route104_EventScript_1ED3F8:: @ 81ED3F8
Route104_EventScript_1ED40B:: @ 81ED40B
msgbox Route104_Text_2956FF, 4
setvar VAR_0x8004, 604
special sub_81D1C20
special SetMatchCallRegisteredFlag
setorcopyvar VAR_0x8000, 604
callstd 8
release
@ -955,7 +955,7 @@ Route104_EventScript_1ED47C:: @ 81ED47C
Route104_EventScript_1ED48D:: @ 81ED48D
msgbox Route104_Text_29595A, 4
setvar VAR_0x8004, 136
special sub_81D1C20
special SetMatchCallRegisteredFlag
setorcopyvar VAR_0x8000, 136
callstd 8
release
@ -971,7 +971,7 @@ Route104_EventScript_1ED4A6:: @ 81ED4A6
Route104_EventScript_1ED4B9:: @ 81ED4B9
msgbox Route104_Text_2958F8, 4
setvar VAR_0x8004, 136
special sub_81D1C20
special SetMatchCallRegisteredFlag
setorcopyvar VAR_0x8000, 136
callstd 8
release
@ -1006,7 +1006,7 @@ Route104_EventScript_1ED52A:: @ 81ED52A
Route104_EventScript_1ED53B:: @ 81ED53B
msgbox Route104_Text_295B60, 4
setvar VAR_0x8004, 114
special sub_81D1C20
special SetMatchCallRegisteredFlag
setorcopyvar VAR_0x8000, 114
callstd 8
release
@ -1022,7 +1022,7 @@ Route104_EventScript_1ED554:: @ 81ED554
Route104_EventScript_1ED567:: @ 81ED567
msgbox Route104_Text_295B01, 4
setvar VAR_0x8004, 114
special sub_81D1C20
special SetMatchCallRegisteredFlag
setorcopyvar VAR_0x8000, 114
callstd 8
release

2
data/scripts/maps/Route105.inc
View File

@ -75,7 +75,7 @@ Route105_EventScript_1EE300:: @ 81EE300
waitmovement 0
msgbox Route105_Text_296159, 4
setvar VAR_0x8004, 737
special sub_81D1C20
special SetMatchCallRegisteredFlag
setorcopyvar VAR_0x8000, 737
callstd 8
release

2
data/scripts/maps/Route106.inc
View File

@ -29,7 +29,7 @@ Route106_EventScript_1EE4ED:: @ 81EE4ED
waitmovement 0
msgbox Route106_Text_2963E3, 4
setvar VAR_0x8004, 339
special sub_81D1C20
special SetMatchCallRegisteredFlag
setorcopyvar VAR_0x8000, 339
callstd 8
release

2
data/scripts/maps/Route107.inc
View File

@ -20,7 +20,7 @@ Route107_EventScript_1EE5D8:: @ 81EE5D8
waitmovement 0
msgbox Route107_Text_29685A, 4
setvar VAR_0x8004, 155
special sub_81D1C20
special SetMatchCallRegisteredFlag
setorcopyvar VAR_0x8000, 155
callstd 8
release

2
data/scripts/maps/Route108.inc
View File

@ -40,7 +40,7 @@ Route108_EventScript_1EE729:: @ 81EE729
waitmovement 0
msgbox Route108_Text_296FD8, 4
setvar VAR_0x8004, 740
special sub_81D1C20
special SetMatchCallRegisteredFlag
setorcopyvar VAR_0x8000, 740
callstd 8
release

4
data/scripts/maps/Route109.inc
View File

@ -409,7 +409,7 @@ Route109_EventScript_1EEAC5:: @ 81EEAC5
waitmovement 0
msgbox Route109_Text_2973C1, 4
setvar VAR_0x8004, 64
special sub_81D1C20
special SetMatchCallRegisteredFlag
setorcopyvar VAR_0x8000, 64
callstd 8
release
@ -434,7 +434,7 @@ Route109_EventScript_1EEB27:: @ 81EEB27
waitmovement 0
msgbox Route109_Text_297520, 4
setvar VAR_0x8004, 57
special sub_81D1C20
special SetMatchCallRegisteredFlag
setorcopyvar VAR_0x8000, 57
callstd 8
release

8
data/scripts/maps/Route110.inc
View File

@ -188,7 +188,7 @@ Route110_EventScript_1EF44C:: @ 81EF44C
waitmovement 0
msgbox Route110_Text_298201, 4
setvar VAR_0x8004, 512
special sub_81D1C20
special SetMatchCallRegisteredFlag
setorcopyvar VAR_0x8000, 512
callstd 8
release
@ -228,7 +228,7 @@ Route110_EventScript_1EF4F3:: @ 81EF4F3
waitmovement 0
msgbox Route110_Text_297CFE, 4
setvar VAR_0x8004, 353
special sub_81D1C20
special SetMatchCallRegisteredFlag
setorcopyvar VAR_0x8000, 353
callstd 8
release
@ -258,7 +258,7 @@ Route110_EventScript_1EF56C:: @ 81EF56C
waitmovement 0
msgbox Route110_Text_297ECD, 4
setvar VAR_0x8004, 358
special sub_81D1C20
special SetMatchCallRegisteredFlag
setorcopyvar VAR_0x8000, 358
callstd 8
release
@ -283,7 +283,7 @@ Route110_EventScript_1EF5CE:: @ 81EF5CE
waitmovement 0
msgbox Route110_Text_2983EE, 4
setvar VAR_0x8004, 302
special sub_81D1C20
special SetMatchCallRegisteredFlag
setorcopyvar VAR_0x8000, 302
callstd 8
release

6
data/scripts/maps/Route111.inc
View File

@ -485,7 +485,7 @@ Route111_EventScript_1F128C:: @ 81F128C
waitmovement 0
msgbox Route111_Text_298C00, 4
setvar VAR_0x8004, 44
special sub_81D1C20
special SetMatchCallRegisteredFlag
setorcopyvar VAR_0x8000, 44
callstd 8
release
@ -525,7 +525,7 @@ Route111_EventScript_1F1333:: @ 81F1333
waitmovement 0
msgbox Route111_Text_29903D, 4
setvar VAR_0x8004, 78
special sub_81D1C20
special SetMatchCallRegisteredFlag
setorcopyvar VAR_0x8000, 78
callstd 8
release
@ -550,7 +550,7 @@ Route111_EventScript_1F1395:: @ 81F1395
waitmovement 0
msgbox Route111_Text_29921D, 4
setvar VAR_0x8004, 94
special sub_81D1C20
special SetMatchCallRegisteredFlag
setorcopyvar VAR_0x8000, 94
callstd 8
release

2
data/scripts/maps/Route112.inc
View File

@ -79,7 +79,7 @@ Route112_EventScript_1F1EAD:: @ 81F1EAD
waitmovement 0
msgbox Route112_Text_29993C, 4
setvar VAR_0x8004, 627
special sub_81D1C20
special SetMatchCallRegisteredFlag
setorcopyvar VAR_0x8000, 627
callstd 8
release

4
data/scripts/maps/Route113.inc
View File

@ -72,7 +72,7 @@ Route113_EventScript_1F221A:: @ 81F221A
waitmovement 0
msgbox Route113_Text_299F49, 4
setvar VAR_0x8004, 434
special sub_81D1C20
special SetMatchCallRegisteredFlag
setorcopyvar VAR_0x8000, 434
callstd 8
release
@ -97,7 +97,7 @@ Route113_EventScript_1F227C:: @ 81F227C
waitmovement 0
msgbox Route113_Text_29A0A2, 4
setvar VAR_0x8004, 419
special sub_81D1C20
special SetMatchCallRegisteredFlag
setorcopyvar VAR_0x8000, 419
callstd 8
release

4
data/scripts/maps/Route114.inc
View File

@ -122,7 +122,7 @@ Route114_EventScript_1F26C8:: @ 81F26C8
waitmovement 0
msgbox Route114_Text_29A9F7, 4
setvar VAR_0x8004, 143
special sub_81D1C20
special SetMatchCallRegisteredFlag
setorcopyvar VAR_0x8000, 143
callstd 8
release
@ -147,7 +147,7 @@ Route114_EventScript_1F272A:: @ 81F272A
waitmovement 0
msgbox Route114_Text_29ABA6, 4
setvar VAR_0x8004, 206
special sub_81D1C20
special SetMatchCallRegisteredFlag
setorcopyvar VAR_0x8000, 206
callstd 8
release

6
data/scripts/maps/Route115.inc
View File

@ -50,7 +50,7 @@ Route115_EventScript_1F29BA:: @ 81F29BA
waitmovement 0
msgbox Route115_Text_29B2B3, 4
setvar VAR_0x8004, 307
special sub_81D1C20
special SetMatchCallRegisteredFlag
setorcopyvar VAR_0x8000, 307
callstd 8
release
@ -80,7 +80,7 @@ Route115_EventScript_1F2A33:: @ 81F2A33
waitmovement 0
msgbox Route115_Text_29B50B, 4
setvar VAR_0x8004, 183
special sub_81D1C20
special SetMatchCallRegisteredFlag
setorcopyvar VAR_0x8000, 183
callstd 8
release
@ -105,7 +105,7 @@ Route115_EventScript_1F2A95:: @ 81F2A95
waitmovement 0
msgbox Route115_Text_29B6AB, 4
setvar VAR_0x8004, 427
special sub_81D1C20
special SetMatchCallRegisteredFlag
setorcopyvar VAR_0x8000, 427
callstd 8
release

8
data/scripts/maps/Route116.inc
View File

@ -281,7 +281,7 @@ Route116_EventScript_1F2F03:: @ 81F2F03
waitmovement 0
msgbox Route116_Text_29BE71, 4
setvar VAR_0x8004, 273
special sub_81D1C20
special SetMatchCallRegisteredFlag
setorcopyvar VAR_0x8000, 273
callstd 8
release
@ -297,7 +297,7 @@ Route116_EventScript_1F2F22:: @ 81F2F22
Route116_EventScript_1F2F35:: @ 81F2F35
msgbox Route116_Text_29BDEF, 4
setvar VAR_0x8004, 273
special sub_81D1C20
special SetMatchCallRegisteredFlag
setorcopyvar VAR_0x8000, 273
callstd 8
release
@ -342,7 +342,7 @@ Route116_EventScript_1F2FDF:: @ 81F2FDF
waitmovement 0
msgbox Route116_Text_29C096, 4
setvar VAR_0x8004, 280
special sub_81D1C20
special SetMatchCallRegisteredFlag
setorcopyvar VAR_0x8000, 280
callstd 8
release
@ -358,7 +358,7 @@ Route116_EventScript_1F2FFE:: @ 81F2FFE
Route116_EventScript_1F3011:: @ 81F3011
msgbox Route116_Text_29C052, 4
setvar VAR_0x8004, 280
special sub_81D1C20
special SetMatchCallRegisteredFlag
setorcopyvar VAR_0x8000, 280
callstd 8
release

12
data/scripts/maps/Route117.inc
View File

@ -52,7 +52,7 @@ Route117_EventScript_1F39FC:: @ 81F39FC
waitmovement 0
msgbox Route117_Text_29C508, 4
setvar VAR_0x8004, 538
special sub_81D1C20
special SetMatchCallRegisteredFlag
setorcopyvar VAR_0x8000, 538
callstd 8
release
@ -77,7 +77,7 @@ Route117_EventScript_1F3A5E:: @ 81F3A5E
waitmovement 0
msgbox Route117_Text_29C6BC, 4
setvar VAR_0x8004, 545
special sub_81D1C20
special SetMatchCallRegisteredFlag
setorcopyvar VAR_0x8000, 545
callstd 8
release
@ -102,7 +102,7 @@ Route117_EventScript_1F3AC0:: @ 81F3AC0
waitmovement 0
msgbox Route117_Text_29C846, 4
setvar VAR_0x8004, 364
special sub_81D1C20
special SetMatchCallRegisteredFlag
setorcopyvar VAR_0x8000, 364
callstd 8
release
@ -127,7 +127,7 @@ Route117_EventScript_1F3B22:: @ 81F3B22
waitmovement 0
msgbox Route117_Text_29CA32, 4
setvar VAR_0x8004, 369
special sub_81D1C20
special SetMatchCallRegisteredFlag
setorcopyvar VAR_0x8000, 369
callstd 8
release
@ -155,7 +155,7 @@ Route117_EventScript_1F3B6F:: @ 81F3B6F
Route117_EventScript_1F3B9F:: @ 81F3B9F
msgbox Route117_Text_29CD1D, 4
setvar VAR_0x8004, 287
special sub_81D1C20
special SetMatchCallRegisteredFlag
setorcopyvar VAR_0x8000, 287
callstd 8
release
@ -178,7 +178,7 @@ Route117_EventScript_1F3BD3:: @ 81F3BD3
Route117_EventScript_1F3C03:: @ 81F3C03
msgbox Route117_Text_29CD1D, 4
setvar VAR_0x8004, 287
special sub_81D1C20
special SetMatchCallRegisteredFlag
setorcopyvar VAR_0x8000, 287
callstd 8
release

4
data/scripts/maps/Route118.inc
View File

@ -200,7 +200,7 @@ Route118_EventScript_1F3FB3:: @ 81F3FB3
waitmovement 0
msgbox Route118_Text_29D343, 4
setvar VAR_0x8004, 37
special sub_81D1C20
special SetMatchCallRegisteredFlag
setorcopyvar VAR_0x8000, 37
callstd 8
release
@ -235,7 +235,7 @@ Route118_EventScript_1F4043:: @ 81F4043
waitmovement 0
msgbox Route118_Text_29D74A, 4
setvar VAR_0x8004, 196
special sub_81D1C20
special SetMatchCallRegisteredFlag
setorcopyvar VAR_0x8000, 196
callstd 8
release

4
data/scripts/maps/Route119.inc
View File

@ -380,7 +380,7 @@ Route119_EventScript_1F483C:: @ 81F483C
waitmovement 0
msgbox Route119_Text_29DD1C, 4
setvar VAR_0x8004, 552
special sub_81D1C20
special SetMatchCallRegisteredFlag
setorcopyvar VAR_0x8000, 552
callstd 8
release
@ -405,7 +405,7 @@ Route119_EventScript_1F489E:: @ 81F489E
waitmovement 0
msgbox Route119_Text_29DEF7, 4
setvar VAR_0x8004, 559
special sub_81D1C20
special SetMatchCallRegisteredFlag
setorcopyvar VAR_0x8000, 559
callstd 8
release

4
data/scripts/maps/Route120.inc
View File

@ -309,7 +309,7 @@ Route120_EventScript_1F581A:: @ 81F581A
waitmovement 0
msgbox Route120_Text_29E75D, 4
setvar VAR_0x8004, 406
special sub_81D1C20
special SetMatchCallRegisteredFlag
setorcopyvar VAR_0x8000, 406
callstd 8
release
@ -344,7 +344,7 @@ Route120_EventScript_1F58AA:: @ 81F58AA
waitmovement 0
msgbox Route120_Text_29EA31, 4
setvar VAR_0x8004, 226
special sub_81D1C20
special SetMatchCallRegisteredFlag
setorcopyvar VAR_0x8000, 226
callstd 8
release

6
data/scripts/maps/Route121.inc
View File

@ -84,7 +84,7 @@ Route121_EventScript_1F5EB7:: @ 81F5EB7
waitmovement 0
msgbox Route121_Text_29F25B, 4
setvar VAR_0x8004, 254
special sub_81D1C20
special SetMatchCallRegisteredFlag
setorcopyvar VAR_0x8000, 254
callstd 8
release
@ -124,7 +124,7 @@ Route121_EventScript_1F5F66:: @ 81F5F66
waitmovement 0
msgbox Route121_Text_29F69F, 4
setvar VAR_0x8004, 127
special sub_81D1C20
special SetMatchCallRegisteredFlag
setorcopyvar VAR_0x8000, 127
callstd 8
release
@ -169,7 +169,7 @@ Route121_EventScript_1F6024:: @ 81F6024
waitmovement 0
msgbox Route121_Text_29F80D, 4
setvar VAR_0x8004, 767
special sub_81D1C20
special SetMatchCallRegisteredFlag
setorcopyvar VAR_0x8000, 767
callstd 8
release

6
data/scripts/maps/Route123.inc
View File

@ -74,7 +74,7 @@ Route123_EventScript_1F6236:: @ 81F6236
waitmovement 0
msgbox Route123_Text_29FE70, 4
setvar VAR_0x8004, 238
special sub_81D1C20
special SetMatchCallRegisteredFlag
setorcopyvar VAR_0x8000, 238
callstd 8
release
@ -99,7 +99,7 @@ Route123_EventScript_1F6298:: @ 81F6298
waitmovement 0
msgbox Route123_Text_2A0027, 4
setvar VAR_0x8004, 249
special sub_81D1C20
special SetMatchCallRegisteredFlag
setorcopyvar VAR_0x8000, 249
callstd 8
release
@ -174,7 +174,7 @@ Route123_EventScript_1F63E8:: @ 81F63E8
waitmovement 0
msgbox Route123_Text_2A03C1, 4
setvar VAR_0x8004, 195
special sub_81D1C20
special SetMatchCallRegisteredFlag
setorcopyvar VAR_0x8000, 195
callstd 8
release

6
data/scripts/maps/Route124.inc
View File

@ -35,7 +35,7 @@ Route124_EventScript_1F65DF:: @ 81F65DF
waitmovement 0
msgbox Route124_Text_2A0C14, 4
setvar VAR_0x8004, 449
special sub_81D1C20
special SetMatchCallRegisteredFlag
setorcopyvar VAR_0x8000, 449
callstd 8
release
@ -68,7 +68,7 @@ Route124_EventScript_1F6643:: @ 81F6643
Route124_EventScript_1F6673:: @ 81F6673
msgbox Route124_Text_2A109F, 4
setvar VAR_0x8004, 687
special sub_81D1C20
special SetMatchCallRegisteredFlag
setorcopyvar VAR_0x8000, 687
callstd 8
release
@ -91,7 +91,7 @@ Route124_EventScript_1F66A7:: @ 81F66A7
Route124_EventScript_1F66D7:: @ 81F66D7
msgbox Route124_Text_2A109F, 4
setvar VAR_0x8004, 687
special sub_81D1C20
special SetMatchCallRegisteredFlag
setorcopyvar VAR_0x8000, 687
callstd 8
release

2
data/scripts/maps/Route125.inc
View File

@ -60,7 +60,7 @@ Route125_EventScript_1F682C:: @ 81F682C
waitmovement 0
msgbox Route125_Text_2A17CF, 4
setvar VAR_0x8004, 492
special sub_81D1C20
special SetMatchCallRegisteredFlag
setorcopyvar VAR_0x8000, 492
callstd 8
release

2
data/scripts/maps/Route126.inc
View File

@ -56,7 +56,7 @@ Route126_EventScript_1F69A3:: @ 81F69A3
waitmovement 0
msgbox Route126_Text_2A1F5A, 4
setvar VAR_0x8004, 377
special sub_81D1C20
special SetMatchCallRegisteredFlag
setorcopyvar VAR_0x8000, 377
callstd 8
release

2
data/scripts/maps/Route127.inc
View File

@ -75,7 +75,7 @@ Route127_EventScript_1F6B02:: @ 81F6B02
waitmovement 0
msgbox Route127_Text_2A26EE, 4
setvar VAR_0x8004, 672
special sub_81D1C20
special SetMatchCallRegisteredFlag
setorcopyvar VAR_0x8000, 672
callstd 8
release

4
data/scripts/maps/Route128.inc
View File

@ -189,7 +189,7 @@ Route128_EventScript_1F6CEA:: @ 81F6CEA
waitmovement 0
msgbox Route128_Text_2A2916, 4
setvar VAR_0x8004, 376
special sub_81D1C20
special SetMatchCallRegisteredFlag
setorcopyvar VAR_0x8000, 376
callstd 8
release
@ -214,7 +214,7 @@ Route128_EventScript_1F6D4C:: @ 81F6D4C
waitmovement 0
msgbox Route128_Text_2A2AF9, 4
setvar VAR_0x8004, 386
special sub_81D1C20
special SetMatchCallRegisteredFlag
setorcopyvar VAR_0x8000, 386
callstd 8
release

8
data/specials.inc
View File

@ -104,7 +104,7 @@ gSpecials:: @ 81DBA64
def_special sub_80F8D24
def_special sub_80F8C7C
def_special sub_80B3000
def_special sub_809FF80
def_special SaveGame
def_special sub_80FAFF8
def_special easy_chat_input_maybe
def_special sub_811EECC
@ -260,8 +260,8 @@ gSpecials:: @ 81DBA64
def_special ValidateEReaderTrainer
def_special sub_8139228
def_special sub_80F94E8
def_special sub_816AE58
def_special sub_816AE98
def_special BedroomPC
def_special PlayerPC
def_special FieldShowRegionMap
def_special sub_807E73C
def_special sub_807EA10
@ -497,7 +497,7 @@ gSpecials:: @ 81DBA64
def_special ChangeBoxPokemonNickname
def_special get_unknown_box_id
def_special sub_813B21C
def_special sub_81D1C20
def_special SetMatchCallRegisteredFlag
def_special sub_8175280
def_special sub_813B2E4
def_special sub_813B374

80
data/strings.s
View File

@ -51,7 +51,7 @@ gText_EggNickname:: @ 85E8264
gText_Pokemon:: @ 85E8268
.string "POKéMON$"
gUnknown_085E8270:: @ 85E8270
gProfBirchMatchCallName:: @ 85E8270
.string "PROF. BIRCH$"
gText_MainMenuNewGame:: @ 85E827C
@ -3704,13 +3704,13 @@ gText_LeaderLeftEndingChat:: @ 85ED2FA
gText_RegisteredTextChanged:: @ 85ED325
.string "The registered text has been changed.\nIs it okay to save the game?$"
gText_AlreadySavedFile:: @ 85ED368
gText_AlreadySavedFile_Unused:: @ 85ED368
.string "There is already a saved file.\nIs it okay to overwrite it?$"
gText_SavingDontTurnOff:: @ 85ED3A3
gText_SavingDontTurnOff_Unused:: @ 85ED3A3
.string "SAVING…\nDON’T TURN OFF THE POWER.$"
gText_PlayerSavedGame:: @ 85ED3C5
gText_PlayerSavedGame_Unused:: @ 85ED3C5
.string "{SPECIAL_F7 0x00} saved the game.$"
gText_IfLeaderLeavesChatEnds:: @ 85ED3D8
@ -3746,46 +3746,46 @@ gText_ThankYou:: @ 85ED440
gText_ByeBye:: @ 85ED44A
.string "BYE-BYE!$"
gUnknown_085ED453:: @ 85ED453
gMatchCallStevenStrategyText:: @ 85ED453
.string "Attack the weak points!$"
gUnknown_085ED46B:: @ 85ED46B
gMatchCall_StevenTrainersPokemonText:: @ 85ED46B
.string "Ultimate STEEL POKéMON.$"
gUnknown_085ED483:: @ 85ED483
gMatchCall_StevenSelfIntroductionText_Line1_BeforeMeteorFallsBattle:: @ 85ED483
.string "I’d climb even waterfalls$"
gUnknown_085ED49D:: @ 85ED49D
gMatchCall_StevenSelfIntroductionText_Line2_BeforeMeteorFallsBattle:: @ 85ED49D
.string "to find a rare stone!$"
gUnknown_085ED4B3:: @ 85ED4B3
gMatchCall_StevenSelfIntroductionText_Line1_AfterMeteorFallsBattle:: @ 85ED4B3
.string "I’m the strongest and most$"
gUnknown_085ED4CE:: @ 85ED4CE
gMatchCall_StevenSelfIntroductionText_Line2_AfterMeteorFallsBattle:: @ 85ED4CE
.string "energetic after all!$"
gUnknown_085ED4E3:: @ 85ED4E3
gMatchCall_BrendanStrategyText:: @ 85ED4E3
.string "Battle with knowledge!$"
gUnknown_085ED4FA:: @ 85ED4FA
gMatchCall_BrendanTrainersPokemonText:: @ 85ED4FA
.string "I will use various POKéMON.$"
gUnknown_085ED516:: @ 85ED516
gMatchCall_BrendanSelfIntroductionText_Line1:: @ 85ED516
.string "I’ll be a better POKéMON$"
gUnknown_085ED52F:: @ 85ED52F
gMatchCall_BrendanSelfIntroductionText_Line2:: @ 85ED52F
.string "prof than my father is!$"
gUnknown_085ED547:: @ 85ED547
gMatchCall_MayStrategyText:: @ 85ED547
.string "I’m not so good at battles.$"
gUnknown_085ED563:: @ 85ED563
gMatchCall_MayTrainersPokemonText:: @ 85ED563
.string "I’ll use any POKéMON!$"
gUnknown_085ED579:: @ 85ED579
gMatchCall_MaySelfIntroductionText_Line1:: @ 85ED579
.string "My POKéMON and I help$"
gUnknown_085ED58F:: @ 85ED58F
gMatchCall_MaySelfIntroductionText_Line2:: @ 85ED58F
.string "my father’s research.$"
gText_HatchedFromEgg:: @ 85ED5A5
@ -5242,70 +5242,70 @@ gText_Confirm3:: @ 85EFAE0
gText_Cancel4:: @ 85EFAE8
.string "CANCEL$"
gUnknown_085EFAEF:: @ 85EFAEF
gMrStoneMatchCallDesc:: @ 85EFAEF
.string "DEVON PRES$"
gUnknown_085EFAFA:: @ 85EFAFA
gMrStoneMatchCallName:: @ 85EFAFA
.string "MR. STONE$"
gUnknown_085EFB04:: @ 85EFB04
gStevenMatchCallDesc:: @ 85EFB04
.string "HARD AS ROCK$"
gUnknown_085EFB11:: @ 85EFB11
gStevenMatchCallName:: @ 85EFB11
.string "STEVEN$"
gUnknown_085EFB18:: @ 85EFB18
gMayBrendanMatchCallDesc:: @ 85EFB18
.string "RAD NEIGHBOR$"
gUnknown_085EFB25:: @ 85EFB25
gNormanMatchCallDesc:: @ 85EFB25
.string "RELIABLE ONE$"
gUnknown_085EFB32:: @ 85EFB32
gMomMatchCallDesc:: @ 85EFB32
.string "CALM & KIND$"
gUnknown_085EFB3E:: @ 85EFB3E
gWallyMatchCallDesc:: @ 85EFB3E
.string "{PKMN} LOVER$"
gUnknown_085EFB47:: @ 85EFB47
gNormanMatchCallName:: @ 85EFB47
.string "DAD$"
gUnknown_085EFB4B:: @ 85EFB4B
gMomMatchCallName:: @ 85EFB4B
.string "MOM$"
gUnknown_085EFB4F:: @ 85EFB4F
gScottMatchCallDesc:: @ 85EFB4F
.string "ELUSIVE EYES$"
gUnknown_085EFB5C:: @ 85EFB5C
gScottMatchCallName:: @ 85EFB5C
.string "SCOTT$"
gUnknown_085EFB62:: @ 85EFB62
gRoxanneMatchCallDesc:: @ 85EFB62
.string "ROCKIN’ WHIZ$"
gUnknown_085EFB6F:: @ 85EFB6F
gBrawlyMatchCallDesc:: @ 85EFB6F
.string "THE BIG HIT$"
gUnknown_085EFB7B:: @ 85EFB7B
gWattsonMatchCallDesc:: @ 85EFB7B
.string "SWELL SHOCK$"
gUnknown_085EFB87:: @ 85EFB87
gFlanneryMatchCallDesc:: @ 85EFB87
.string "PASSION BURN$"
gUnknown_085EFB94:: @ 85EFB94
gWinonaMatchCallDesc:: @ 85EFB94
.string "SKY TAMER$"
gUnknown_085EFB9E:: @ 85EFB9E
gTateLizaMatchCallDesc:: @ 85EFB9E
.string "MYSTIC DUO$"
gUnknown_085EFBA9:: @ 85EFBA9
gJuanMatchCallDesc:: @ 85EFBA9
.string "DANDY CHARM$"
gUnknown_085EFBB5:: @ 85EFBB5
gEliteFourMatchCallDesc:: @ 85EFBB5
.string "ELITE FOUR$"
gUnknown_085EFBC0:: @ 85EFBC0
gChampionMatchCallDesc:: @ 85EFBC0
.string "CHAMPION$"
gUnknown_085EFBC9:: @ 85EFBC9
gProfBirchMatchCallDesc:: @ 85EFBC9
.string "{PKMN} PROF.$"
gText_CommStandbyAwaitingOtherPlayer:: @ 85EFBD2

80
data/text/ability_description_pointers.inc
View File

@ -1,80 +0,0 @@
.align 2
gAbilityDescriptionPointers:: @ 831BAD4
.4byte gNoneAbilityDescription
.4byte gStenchAbilityDescription
.4byte gDrizzleAbilityDescription
.4byte gSpeedBoostAbilityDescription
.4byte gBattleArmorAbilityDescription
.4byte gSturdyAbilityDescription
.4byte gDampAbilityDescription
.4byte gLimberAbilityDescription
.4byte gSandVeilAbilityDescription
.4byte gStaticAbilityDescription
.4byte gVoltAbsorbAbilityDescription
.4byte gWaterAbsorbAbilityDescription
.4byte gObliviousAbilityDescription
.4byte gCloudNineAbilityDescription
.4byte gCompoundEyesAbilityDescription
.4byte gInsomniaAbilityDescription
.4byte gColorChangeAbilityDescription
.4byte gImmunityAbilityDescription
.4byte gFlashFireAbilityDescription
.4byte gShieldDustAbilityDescription
.4byte gOwnTempoAbilityDescription
.4byte gSuctionCupsAbilityDescription
.4byte gIntimidateAbilityDescription
.4byte gShadowTagAbilityDescription
.4byte gRoughSkinAbilityDescription
.4byte gWonderGuardAbilityDescription
.4byte gLevitateAbilityDescription
.4byte gEffectSporeAbilityDescription
.4byte gSynchronizeAbilityDescription
.4byte gClearBodyAbilityDescription
.4byte gNaturalCureAbilityDescription
.4byte gLightningRodAbilityDescription
.4byte gSereneGraceAbilityDescription
.4byte gSwiftSwimAbilityDescription
.4byte gChlorophyllAbilityDescription
.4byte gIlluminateAbilityDescription
.4byte gTraceAbilityDescription
.4byte gHugePowerAbilityDescription
.4byte gPoisonPointAbilityDescription
.4byte gInnerFocusAbilityDescription
.4byte gMagmaArmorAbilityDescription
.4byte gWaterVeilAbilityDescription
.4byte gMagnetPullAbilityDescription
.4byte gSoundproofAbilityDescription
.4byte gRainDishAbilityDescription
.4byte gSandStreamAbilityDescription
.4byte gPressureAbilityDescription
.4byte gThickFatAbilityDescription
.4byte gEarlyBirdAbilityDescription
.4byte gFlameBodyAbilityDescription
.4byte gRunAwayAbilityDescription
.4byte gKeenEyeAbilityDescription
.4byte gHyperCutterAbilityDescription
.4byte gPickupAbilityDescription
.4byte gTruantAbilityDescription
.4byte gHustleAbilityDescription
.4byte gCuteCharmAbilityDescription
.4byte gPlusAbilityDescription
.4byte gMinusAbilityDescription
.4byte gForecastAbilityDescription
.4byte gStickyHoldAbilityDescription
.4byte gShedSkinAbilityDescription
.4byte gGutsAbilityDescription
.4byte gMarvelScaleAbilityDescription
.4byte gLiquidOozeAbilityDescription
.4byte gOvergrowAbilityDescription
.4byte gBlazeAbilityDescription
.4byte gTorrentAbilityDescription
.4byte gSwarmAbilityDescription
.4byte gRockHeadAbilityDescription
.4byte gDroughtAbilityDescription
.4byte gArenaTrapAbilityDescription
.4byte gVitalSpiritAbilityDescription
.4byte gWhiteSmokeAbilityDescription
.4byte gPurePowerAbilityDescription
.4byte gShellArmorAbilityDescription
.4byte gCacophonyAbilityDescription
.4byte gAirLockAbilityDescription

233
data/text/ability_descriptions.inc
View File

@ -1,233 +0,0 @@
gNoneAbilityDescription:: @ 831AF98
.string "No special ability.$"
gStenchAbilityDescription:: @ 831AFAC
.string "Helps repel wild POKéMON.$"
gDrizzleAbilityDescription:: @ 831AFC6
.string "Summons rain in battle.$"
gSpeedBoostAbilityDescription:: @ 831AFDE
.string "Gradually boosts SPEED.$"
gBattleArmorAbilityDescription:: @ 831AFF6
.string "Blocks critical hits.$"
gSturdyAbilityDescription:: @ 831B00C
.string "Negates 1-hit KO attacks.$"
gDampAbilityDescription:: @ 831B026
.string "Prevents self-destruction.$"
gLimberAbilityDescription:: @ 831B041
.string "Prevents paralysis.$"
gSandVeilAbilityDescription:: @ 831B055
.string "Ups evasion in a sandstorm.$"
gStaticAbilityDescription:: @ 831B071
.string "Paralyzes on contact.$"
gVoltAbsorbAbilityDescription:: @ 831B087
.string "Turns electricity into HP.$"
gWaterAbsorbAbilityDescription:: @ 831B0A2
.string "Changes water into HP.$"
gObliviousAbilityDescription:: @ 831B0B9
.string "Prevents attraction.$"
gCloudNineAbilityDescription:: @ 831B0CE
.string "Negates weather effects.$"
gCompoundEyesAbilityDescription:: @ 831B0E7
.string "Raises accuracy.$"
gInsomniaAbilityDescription:: @ 831B0F8
.string "Prevents sleep.$"
gColorChangeAbilityDescription:: @ 831B108
.string "Changes type to foe’s move.$"
gImmunityAbilityDescription:: @ 831B124
.string "Prevents poisoning.$"
gFlashFireAbilityDescription:: @ 831B138
.string "Powers up if hit by fire.$"
gShieldDustAbilityDescription:: @ 831B152
.string "Prevents added effects.$"
gOwnTempoAbilityDescription:: @ 831B16A
.string "Prevents confusion.$"
gSuctionCupsAbilityDescription:: @ 831B17E
.string "Firmly anchors the body.$"
gIntimidateAbilityDescription:: @ 831B197
.string "Lowers the foe’s ATTACK.$"
gShadowTagAbilityDescription:: @ 831B1B0
.string "Prevents the foe’s escape.$"
gRoughSkinAbilityDescription:: @ 831B1CB
.string "Hurts to touch.$"
gWonderGuardAbilityDescription:: @ 831B1DB
.string "“Super effective” hits.$"
gLevitateAbilityDescription:: @ 831B1F3
.string "Not hit by GROUND attacks.$"
gEffectSporeAbilityDescription:: @ 831B20E
.string "Leaves spores on contact.$"
gSynchronizeAbilityDescription:: @ 831B228
.string "Passes on status problems.$"
gClearBodyAbilityDescription:: @ 831B243
.string "Prevents ability reduction.$"
gNaturalCureAbilityDescription:: @ 831B25F
.string "Heals upon switching out.$"
gLightningRodAbilityDescription:: @ 831B279
.string "Draws electrical moves.$"
gSereneGraceAbilityDescription:: @ 831B291
.string "Promotes added effects.$"
gSwiftSwimAbilityDescription:: @ 831B2A9
.string "Raises SPEED in rain.$"
gChlorophyllAbilityDescription:: @ 831B2BF
.string "Raises SPEED in sunshine.$"
gIlluminateAbilityDescription:: @ 831B2D9
.string "Encounter rate increases.$"
gTraceAbilityDescription:: @ 831B2F3
.string "Copies special ability.$"
gHugePowerAbilityDescription:: @ 831B30B
.string "Raises ATTACK.$"
gPoisonPointAbilityDescription:: @ 831B31A
.string "Poisons foe on contact.$"
gInnerFocusAbilityDescription:: @ 831B332
.string "Prevents flinching.$"
gMagmaArmorAbilityDescription:: @ 831B346
.string "Prevents freezing.$"
gWaterVeilAbilityDescription:: @ 831B359
.string "Prevents burns.$"
gMagnetPullAbilityDescription:: @ 831B369
.string "Traps STEEL-type POKéMON.$"
gSoundproofAbilityDescription:: @ 831B383
.string "Avoids sound-based moves.$"
gRainDishAbilityDescription:: @ 831B39D
.string "Slight HP recovery in rain.$"
gSandStreamAbilityDescription:: @ 831B3B9
.string "Summons a sandstorm.$"
gPressureAbilityDescription:: @ 831B3CE
.string "Raises foe’s PP usage.$"
gThickFatAbilityDescription:: @ 831B3E5
.string "Heat-and-cold protection.$"
gEarlyBirdAbilityDescription:: @ 831B3FF
.string "Awakens quickly from sleep.$"
gFlameBodyAbilityDescription:: @ 831B41B
.string "Burns the foe on contact.$"
gRunAwayAbilityDescription:: @ 831B435
.string "Makes escaping easier.$"
gKeenEyeAbilityDescription:: @ 831B44C
.string "Prevents loss of accuracy.$"
gHyperCutterAbilityDescription:: @ 831B467
.string "Prevents ATTACK reduction.$"
gPickupAbilityDescription:: @ 831B482
.string "May pick up items.$"
gTruantAbilityDescription:: @ 831B495
.string "Moves only every two turns.$"
gHustleAbilityDescription:: @ 831B4B1
.string "Trades accuracy for power.$"
gCuteCharmAbilityDescription:: @ 831B4CC
.string "Infatuates on contact.$"
gPlusAbilityDescription:: @ 831B4E3
.string "Powers up with MINUS.$"
gMinusAbilityDescription:: @ 831B4F9
.string "Powers up with PLUS.$"
gForecastAbilityDescription:: @ 831B50E
.string "Changes with the weather.$"
gStickyHoldAbilityDescription:: @ 831B528
.string "Prevents item theft.$"
gShedSkinAbilityDescription:: @ 831B53D
.string "Heals the body by shedding.$"
gGutsAbilityDescription:: @ 831B559
.string "Ups ATTACK if suffering.$"
gMarvelScaleAbilityDescription:: @ 831B572
.string "Ups DEFENSE if suffering.$"
gLiquidOozeAbilityDescription:: @ 831B58C
.string "Draining causes injury.$"
gOvergrowAbilityDescription:: @ 831B5A4
.string "Ups GRASS moves in a pinch.$"
gBlazeAbilityDescription:: @ 831B5C0
.string "Ups FIRE moves in a pinch.$"
gTorrentAbilityDescription:: @ 831B5DB
.string "Ups WATER moves in a pinch.$"
gSwarmAbilityDescription:: @ 831B5F7
.string "Ups BUG moves in a pinch.$"
gRockHeadAbilityDescription:: @ 831B611
.string "Prevents recoil damage.$"
gDroughtAbilityDescription:: @ 831B629
.string "Summons sunlight in battle.$"
gArenaTrapAbilityDescription:: @ 831B645
.string "Prevents fleeing.$"
gVitalSpiritAbilityDescription:: @ 831B657
.string "Prevents sleep.$"
gWhiteSmokeAbilityDescription:: @ 831B667
.string "Prevents ability reduction.$"
gPurePowerAbilityDescription:: @ 831B683
.string "Raises ATTACK.$"
gShellArmorAbilityDescription:: @ 831B692
.string "Blocks critical hits.$"
gCacophonyAbilityDescription:: @ 831B6A8
.string "Avoids sound-based moves.$"
gAirLockAbilityDescription:: @ 831B6C2
.string "Negates weather effects.$"

79
data/text/ability_names.inc
View File

@ -1,79 +0,0 @@
gAbilityNames:: @ 831B6DB
.string "-------$", 13
.string "STENCH$", 13
.string "DRIZZLE$", 13
.string "SPEED BOOST$", 13
.string "BATTLE ARMOR$", 13
.string "STURDY$", 13
.string "DAMP$", 13
.string "LIMBER$", 13
.string "SAND VEIL$", 13
.string "STATIC$", 13
.string "VOLT ABSORB$", 13
.string "WATER ABSORB$", 13
.string "OBLIVIOUS$", 13
.string "CLOUD NINE$", 13
.string "COMPOUNDEYES$", 13
.string "INSOMNIA$", 13
.string "COLOR CHANGE$", 13
.string "IMMUNITY$", 13
.string "FLASH FIRE$", 13
.string "SHIELD DUST$", 13
.string "OWN TEMPO$", 13
.string "SUCTION CUPS$", 13
.string "INTIMIDATE$", 13
.string "SHADOW TAG$", 13
.string "ROUGH SKIN$", 13
.string "WONDER GUARD$", 13
.string "LEVITATE$", 13
.string "EFFECT SPORE$", 13
.string "SYNCHRONIZE$", 13
.string "CLEAR BODY$", 13
.string "NATURAL CURE$", 13
.string "LIGHTNINGROD$", 13
.string "SERENE GRACE$", 13
.string "SWIFT SWIM$", 13
.string "CHLOROPHYLL$", 13
.string "ILLUMINATE$", 13
.string "TRACE$", 13
.string "HUGE POWER$", 13
.string "POISON POINT$", 13
.string "INNER FOCUS$", 13
.string "MAGMA ARMOR$", 13
.string "WATER VEIL$", 13
.string "MAGNET PULL$", 13
.string "SOUNDPROOF$", 13
.string "RAIN DISH$", 13
.string "SAND STREAM$", 13
.string "PRESSURE$", 13
.string "THICK FAT$", 13
.string "EARLY BIRD$", 13
.string "FLAME BODY$", 13
.string "RUN AWAY$", 13
.string "KEEN EYE$", 13
.string "HYPER CUTTER$", 13
.string "PICKUP$", 13
.string "TRUANT$", 13
.string "HUSTLE$", 13
.string "CUTE CHARM$", 13
.string "PLUS$", 13
.string "MINUS$", 13
.string "FORECAST$", 13
.string "STICKY HOLD$", 13
.string "SHED SKIN$", 13
.string "GUTS$", 13
.string "MARVEL SCALE$", 13
.string "LIQUID OOZE$", 13
.string "OVERGROW$", 13
.string "BLAZE$", 13
.string "TORRENT$", 13
.string "SWARM$", 13
.string "ROCK HEAD$", 13
.string "DROUGHT$", 13
.string "ARENA TRAP$", 13
.string "VITAL SPIRIT$", 13
.string "WHITE SMOKE$", 13
.string "PURE POWER$", 13
.string "SHELL ARMOR$", 13
.string "CACOPHONY$", 13
.string "AIR LOCK$", 13

12
data/text/save.inc
View File

@ -1,18 +1,18 @@
gUnknown_082C87B4:: @ 82C87B4
gText_ConfirmSave:: @ 82C87B4
.string "Would you like to save the game?$"
gUnknown_082C87D5:: @ 82C87D5
gText_AlreadySavedFile:: @ 82C87D5
.string "There is already a saved file.\n"
.string "Is it okay to overwrite it?$"
gUnknown_082C8810:: @ 82C8810
gText_SavingDontTurnOff:: @ 82C8810
.string "SAVING…\n"
.string "DON’T TURN OFF THE POWER.$"
gUnknown_082C8832:: @ 82C8832
gText_PlayerSavedGame:: @ 82C8832
.string "{PLAYER} saved the game.$"
gUnknown_082C8845:: @ 82C8845
gText_DifferentSaveFile:: @ 82C8845
.string "WARNING!\p"
.string "There is a different game file that\n"
.string "is already saved.\p"
@ -22,7 +22,7 @@ gUnknown_082C8845:: @ 82C8845
.string "Are you sure you want to save now\n"
.string "and overwrite the other save file?$"
gUnknown_082C892A:: @ 82C892A
gText_SaveError:: @ 82C892A
.string "Save error.\p"
.string "Please exchange the\n"
.string "backup memory.$"

19
data/text/type_names.inc
View File

@ -1,19 +0,0 @@
gTypeNames:: @ 831AE38
.string "NORMAL$", 7
.string "FIGHT$", 7
.string "FLYING$", 7
.string "POISON$", 7
.string "GROUND$", 7
.string "ROCK$", 7
.string "BUG$", 7
.string "GHOST$", 7
.string "STEEL$", 7
.string "???$", 7
.string "FIRE$", 7
.string "WATER$", 7
.string "GRASS$", 7
.string "ELECTR$", 7
.string "PSYCHC$", 7
.string "ICE$", 7
.string "DRAGON$", 7
.string "DARK$", 7

59
data/trainer_money.inc
View File

@ -1,59 +0,0 @@
@ This is a factor in how much money you get for beating a trainer.
.align 2
gTrainerMoneyTable:: @ 831AEB8
.byte TRAINER_CLASS_TEAM_AQUA, 5, 0, 0
.byte TRAINER_CLASS_AQUA_ADMIN, 10, 0, 0
.byte TRAINER_CLASS_AQUA_LEADER, 20, 0, 0
.byte TRAINER_CLASS_AROMA_LADY, 10, 0, 0
.byte TRAINER_CLASS_RUIN_MANIAC, 15, 0, 0
.byte TRAINER_CLASS_INTERVIEWER, 12, 0, 0
.byte TRAINER_CLASS_TUBER_1, 1, 0, 0
.byte TRAINER_CLASS_TUBER_2, 1, 0, 0
.byte TRAINER_CLASS_SIS_AND_BRO, 3, 0, 0
.byte TRAINER_CLASS_COOLTRAINER_1, 12, 0, 0
.byte TRAINER_CLASS_HEX_MANIAC, 6, 0, 0
.byte TRAINER_CLASS_LADY, 50, 0, 0
.byte TRAINER_CLASS_BEAUTY, 20, 0, 0
.byte TRAINER_CLASS_RICH_BOY, 50, 0, 0
.byte TRAINER_CLASS_POKEMANIAC, 15, 0, 0
.byte TRAINER_CLASS_SWIMMER_M, 2, 0, 0
.byte TRAINER_CLASS_BLACK_BELT, 8, 0, 0
.byte TRAINER_CLASS_GUITARIST, 8, 0, 0
.byte TRAINER_CLASS_KINDLER, 8, 0, 0
.byte TRAINER_CLASS_CAMPER, 4, 0, 0
.byte TRAINER_CLASS_OLD_COUPLE, 10, 0, 0
.byte TRAINER_CLASS_BUG_MANIAC, 15, 0, 0
.byte TRAINER_CLASS_PSYCHIC, 6, 0, 0
.byte TRAINER_CLASS_GENTLEMAN, 20, 0, 0
.byte TRAINER_CLASS_ELITE_FOUR, 25, 0, 0
.byte TRAINER_CLASS_LEADER, 25, 0, 0
.byte TRAINER_CLASS_SCHOOL_KID, 5, 0, 0
.byte TRAINER_CLASS_SR_AND_JR, 4, 0, 0
.byte TRAINER_CLASS_POKEFAN, 20, 0, 0
.byte TRAINER_CLASS_EXPERT, 10, 0, 0
.byte TRAINER_CLASS_YOUNGSTER, 4, 0, 0
.byte TRAINER_CLASS_CHAMPION, 50, 0, 0
.byte TRAINER_CLASS_FISHERMAN, 10, 0, 0
.byte TRAINER_CLASS_TRIATHLETE, 10, 0, 0
.byte TRAINER_CLASS_DRAGON_TAMER, 12, 0, 0
.byte TRAINER_CLASS_BIRD_KEEPER, 8, 0, 0
.byte TRAINER_CLASS_NINJA_BOY, 3, 0, 0
.byte TRAINER_CLASS_BATTLE_GIRL, 6, 0, 0
.byte TRAINER_CLASS_PARASOL_LADY, 10, 0, 0
.byte TRAINER_CLASS_SWIMMER_F, 2, 0, 0
.byte TRAINER_CLASS_PICNICKER, 4, 0, 0
.byte TRAINER_CLASS_TWINS, 3, 0, 0
.byte TRAINER_CLASS_SAILOR, 8, 0, 0
.byte TRAINER_CLASS_COLLECTOR, 15, 0, 0
.byte TRAINER_CLASS_PKMN_TRAINER_3, 15, 0, 0
.byte TRAINER_CLASS_PKMN_BREEDER, 10, 0, 0
.byte TRAINER_CLASS_PKMN_RANGER, 12, 0, 0
.byte TRAINER_CLASS_TEAM_MAGMA, 5, 0, 0
.byte TRAINER_CLASS_MAGMA_ADMIN, 10, 0, 0
.byte TRAINER_CLASS_MAGMA_LEADER, 20, 0, 0
.byte TRAINER_CLASS_LASS, 4, 0, 0
.byte TRAINER_CLASS_BUG_CATCHER, 4, 0, 0
.byte TRAINER_CLASS_HIKER, 10, 0, 0
.byte TRAINER_CLASS_YOUNG_COUPLE, 8, 0, 0
.byte TRAINER_CLASS_WINSTRATE, 10, 0, 0
.byte -1, 5, 0, 0

10
data/trainer_rematch.s
View File

@ -1,10 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
gUnknown_0862AD34:: @ 862AD34
.2byte 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, 0x0048
gUnknown_0862AD44:: @ 862AD44
.2byte 0x0041, 0x0042, 0x0044, 0x0045, 0x0046, 0x0047, 0x0048, 0x0000

119
data/type_effectiveness.inc
View File

@ -1,119 +0,0 @@
@ format: attacking type, defending type, damage multiplier
@ the multiplier is a (decimal) fixed-point number:
@ 20 is ×2.0
@ 05 is ×0.5
@ 00 is ×0
gTypeEffectiveness:: @ 831ACE8
.byte TYPE_NORMAL, TYPE_ROCK, 5
.byte TYPE_NORMAL, TYPE_STEEL, 5
.byte TYPE_FIRE, TYPE_FIRE, 5
.byte TYPE_FIRE, TYPE_WATER, 5
.byte TYPE_FIRE, TYPE_GRASS, 20
.byte TYPE_FIRE, TYPE_ICE, 20
.byte TYPE_FIRE, TYPE_BUG, 20
.byte TYPE_FIRE, TYPE_ROCK, 5
.byte TYPE_FIRE, TYPE_DRAGON, 5
.byte TYPE_FIRE, TYPE_STEEL, 20
.byte TYPE_WATER, TYPE_FIRE, 20
.byte TYPE_WATER, TYPE_WATER, 5
.byte TYPE_WATER, TYPE_GRASS, 5
.byte TYPE_WATER, TYPE_GROUND, 20
.byte TYPE_WATER, TYPE_ROCK, 20
.byte TYPE_WATER, TYPE_DRAGON, 5
.byte TYPE_ELECTRIC, TYPE_WATER, 20
.byte TYPE_ELECTRIC, TYPE_ELECTRIC, 5
.byte TYPE_ELECTRIC, TYPE_GRASS, 5
.byte TYPE_ELECTRIC, TYPE_GROUND, 0
.byte TYPE_ELECTRIC, TYPE_FLYING, 20
.byte TYPE_ELECTRIC, TYPE_DRAGON, 5
.byte TYPE_GRASS, TYPE_FIRE, 5
.byte TYPE_GRASS, TYPE_WATER, 20
.byte TYPE_GRASS, TYPE_GRASS, 5
.byte TYPE_GRASS, TYPE_POISON, 5
.byte TYPE_GRASS, TYPE_GROUND, 20
.byte TYPE_GRASS, TYPE_FLYING, 5
.byte TYPE_GRASS, TYPE_BUG, 5
.byte TYPE_GRASS, TYPE_ROCK, 20
.byte TYPE_GRASS, TYPE_DRAGON, 5
.byte TYPE_GRASS, TYPE_STEEL, 5
.byte TYPE_ICE, TYPE_WATER, 5
.byte TYPE_ICE, TYPE_GRASS, 20
.byte TYPE_ICE, TYPE_ICE, 5
.byte TYPE_ICE, TYPE_GROUND, 20
.byte TYPE_ICE, TYPE_FLYING, 20
.byte TYPE_ICE, TYPE_DRAGON, 20
.byte TYPE_ICE, TYPE_STEEL, 5
.byte TYPE_ICE, TYPE_FIRE, 5
.byte TYPE_FIGHTING, TYPE_NORMAL, 20
.byte TYPE_FIGHTING, TYPE_ICE, 20
.byte TYPE_FIGHTING, TYPE_POISON, 5
.byte TYPE_FIGHTING, TYPE_FLYING, 5
.byte TYPE_FIGHTING, TYPE_PSYCHIC, 5
.byte TYPE_FIGHTING, TYPE_BUG, 5
.byte TYPE_FIGHTING, TYPE_ROCK, 20
.byte TYPE_FIGHTING, TYPE_DARK, 20
.byte TYPE_FIGHTING, TYPE_STEEL, 20
.byte TYPE_POISON, TYPE_GRASS, 20
.byte TYPE_POISON, TYPE_POISON, 5
.byte TYPE_POISON, TYPE_GROUND, 5
.byte TYPE_POISON, TYPE_ROCK, 5
.byte TYPE_POISON, TYPE_GHOST, 5
.byte TYPE_POISON, TYPE_STEEL, 0
.byte TYPE_GROUND, TYPE_FIRE, 20
.byte TYPE_GROUND, TYPE_ELECTRIC, 20
.byte TYPE_GROUND, TYPE_GRASS, 5
.byte TYPE_GROUND, TYPE_POISON, 20
.byte TYPE_GROUND, TYPE_FLYING, 0
.byte TYPE_GROUND, TYPE_BUG, 5
.byte TYPE_GROUND, TYPE_ROCK, 20
.byte TYPE_GROUND, TYPE_STEEL, 20
.byte TYPE_FLYING, TYPE_ELECTRIC, 5
.byte TYPE_FLYING, TYPE_GRASS, 20
.byte TYPE_FLYING, TYPE_FIGHTING, 20
.byte TYPE_FLYING, TYPE_BUG, 20
.byte TYPE_FLYING, TYPE_ROCK, 5
.byte TYPE_FLYING, TYPE_STEEL, 5
.byte TYPE_PSYCHIC, TYPE_FIGHTING, 20
.byte TYPE_PSYCHIC, TYPE_POISON, 20
.byte TYPE_PSYCHIC, TYPE_PSYCHIC, 5
.byte TYPE_PSYCHIC, TYPE_DARK, 0
.byte TYPE_PSYCHIC, TYPE_STEEL, 5
.byte TYPE_BUG, TYPE_FIRE, 5
.byte TYPE_BUG, TYPE_GRASS, 20
.byte TYPE_BUG, TYPE_FIGHTING, 5
.byte TYPE_BUG, TYPE_POISON, 5
.byte TYPE_BUG, TYPE_FLYING, 5
.byte TYPE_BUG, TYPE_PSYCHIC, 20
.byte TYPE_BUG, TYPE_GHOST, 5
.byte TYPE_BUG, TYPE_DARK, 20
.byte TYPE_BUG, TYPE_STEEL, 5
.byte TYPE_ROCK, TYPE_FIRE, 20
.byte TYPE_ROCK, TYPE_ICE, 20
.byte TYPE_ROCK, TYPE_FIGHTING, 5
.byte TYPE_ROCK, TYPE_GROUND, 5
.byte TYPE_ROCK, TYPE_FLYING, 20
.byte TYPE_ROCK, TYPE_BUG, 20
.byte TYPE_ROCK, TYPE_STEEL, 5
.byte TYPE_GHOST, TYPE_NORMAL, 0
.byte TYPE_GHOST, TYPE_PSYCHIC, 20
.byte TYPE_GHOST, TYPE_DARK, 5
.byte TYPE_GHOST, TYPE_STEEL, 5
.byte TYPE_GHOST, TYPE_GHOST, 20
.byte TYPE_DRAGON, TYPE_DRAGON, 20
.byte TYPE_DRAGON, TYPE_STEEL, 5
.byte TYPE_DARK, TYPE_FIGHTING, 5
.byte TYPE_DARK, TYPE_PSYCHIC, 20
.byte TYPE_DARK, TYPE_GHOST, 20
.byte TYPE_DARK, TYPE_DARK, 5
.byte TYPE_DARK, TYPE_STEEL, 5
.byte TYPE_STEEL, TYPE_FIRE, 5
.byte TYPE_STEEL, TYPE_WATER, 5
.byte TYPE_STEEL, TYPE_ELECTRIC, 5
.byte TYPE_STEEL, TYPE_ICE, 20
.byte TYPE_STEEL, TYPE_ROCK, 20
.byte TYPE_STEEL, TYPE_STEEL, 5
.byte 0xFE, 0xFE, 0
.byte TYPE_NORMAL, TYPE_GHOST, 0
.byte TYPE_FIGHTING, TYPE_GHOST, 0
.byte 0xFF, 0xFF, 0

1
data/unk_transition.s
View File

@ -3,6 +3,7 @@
.section .rodata
.align 2, 0
gUnknown_0862AD54:: @ 862AD54
.incbin "graphics/battle_transitions/frontier_transition.4bpp.lz"

135
include/battle.h
View File

@ -3,9 +3,9 @@
// should they be included here or included individually by every file?
#include "constants/battle.h"
#include "battle_main.h"
#include "battle_util.h"
#include "battle_script_commands.h"
#include "battle_main.h"
#include "battle_ai_switch_items.h"
#include "battle_gfx_sfx_util.h"
#include "battle_util2.h"
@ -66,29 +66,14 @@
#define MSG_DISPLAY 0x7
#define BATTLE_COMMUNICATION_ENTRIES_COUNT 0x8
#define MOVE_TARGET_SELECTED 0x0
#define MOVE_TARGET_DEPENDS 0x1
#define MOVE_TARGET_USER 0x2
#define MOVE_TARGET_RANDOM 0x4
#define MOVE_TARGET_x10 0x10
#define MOVE_TARGET_BOTH 0x8
#define MOVE_TARGET_FOES_AND_ALLY 0x20
#define MOVE_TARGET_OPPONENTS_FIELD 0x40
// defines for the u8 array gTypeEffectiveness
#define TYPE_EFFECT_ATK_TYPE(i)((gTypeEffectiveness[i + 0]))
#define TYPE_EFFECT_DEF_TYPE(i)((gTypeEffectiveness[i + 1]))
#define TYPE_EFFECT_MULTIPLIER(i)((gTypeEffectiveness[i + 2]))
// defines for the gTypeEffectiveness multipliers
#define TYPE_MUL_NO_EFFECT 0
#define TYPE_MUL_NOT_EFFECTIVE 5
#define TYPE_MUL_NORMAL 10
#define TYPE_MUL_SUPER_EFFECTIVE 20
// special type table Ids
#define TYPE_FORESIGHT 0xFE
#define TYPE_ENDTABLE 0xFF
#define MOVE_TARGET_SELECTED 0x0
#define MOVE_TARGET_DEPENDS 0x1
#define MOVE_TARGET_USER_OR_SELECTED 0x2
#define MOVE_TARGET_RANDOM 0x4
#define MOVE_TARGET_BOTH 0x8
#define MOVE_TARGET_USER 0x10
#define MOVE_TARGET_FOES_AND_ALLY 0x20
#define MOVE_TARGET_OPPONENTS_FIELD 0x40
#define BATTLE_BUFFER_LINK_SIZE 0x1000
@ -368,6 +353,91 @@ struct BattleResults
u8 catchAttempts[11]; // 0x36
};
struct BattleTv_Side
{
u32 spikesMonId:3;
u32 reflectMonId:3;
u32 lightScreenMonId:3;
u32 safeguardMonId:3;
u32 mistMonId:3;
u32 futureSightMonId:3;
u32 doomDesireMonId:3;
u32 perishSongMonId:3;
u32 wishMonId:3;
u32 grudgeMonId:3;
u32 usedMoveSlot:2;
u32 spikesMoveSlot:2;
u32 reflectMoveSlot:2;
u32 lightScreenMoveSlot:2;
u32 safeguardMoveSlot:2;
u32 mistMoveSlot:2;
u32 futureSightMoveSlot:2;
u32 doomDesireMoveSlot:2;
u32 perishSongMoveSlot:2;
u32 wishMoveSlot:2;
u32 grudgeMoveSlot:2;
u32 destinyBondMonId:3;
u32 destinyBondMoveSlot:2;
u32 faintCause:4;
u32 faintCauseMonId:3;
u32 explosion:1;
u32 explosionMoveSlot:2;
u32 explosionMonId:3;
u32 perishSong:1;
};
struct BattleTv_Position
{
u32 curseMonId:3;
u32 leechSeedMonId:3;
u32 nightmareMonId:3;
u32 wrapMonId:3;
u32 attractMonId:3;
u32 confusionMonId:3;
u32 curseMoveSlot:2;
u32 leechSeedMoveSlot:2;
u32 nightmareMoveSlot:2;
u32 wrapMoveSlot:2;
u32 attractMoveSlot:2;
u32 confusionMoveSlot:2;
u32 waterSportMoveSlot:2;
u32 waterSportMonId:3;
u32 mudSportMonId:3;
u32 mudSportMoveSlot:2;
u32 ingrainMonId:3;
u32 ingrainMoveSlot:2;
u32 attackedByMonId:3;
u32 attackedByMoveSlot:2;
};
struct BattleTv_Mon
{
u32 psnMonId:3;
u32 badPsnMonId:3;
u32 brnMonId:3;
u32 prlzMonId:3;
u32 slpMonId:3;
u32 frzMonId:3;
u32 psnMoveSlot:2;
u32 badPsnMoveSlot:2;
u32 brnMoveSlot:2;
u32 prlzMoveSlot:2;
u32 slpMoveSlot:2;
u32 frzMoveSlot:2;
};
struct BattleTv
{
struct BattleTv_Mon mon[2][6]; // [side][partyId]
struct BattleTv_Position pos[2][2]; // [side][flank]
struct BattleTv_Side side[2]; // [side]
};
struct BattleTvMovePoints
{
s16 points[2][PARTY_SIZE * 4];
};
struct BattleStruct
{
u8 turnEffectsTracker;
@ -447,7 +517,7 @@ struct BattleStruct
u8 field_B0;
u8 hpScale;
u8 synchronizeMoveEffect;
u8 field_B3;
bool8 anyMonHasTransformed;
void (*savedCallback)(void);
u16 usedHeldItems[MAX_BATTLERS_COUNT];
u8 chosenItem[4]; // why is this an u8?
@ -472,9 +542,9 @@ struct BattleStruct
u8 wishPerishSongBattlerId;
bool8 overworldWeatherDone;
u8 atkCancellerTracker;
u8 field_1A4[96];
u8 field_204[104];
u8 field_26C[40];
struct BattleTvMovePoints tvMovePoints;
struct BattleTv tv;
u8 notSureWhatFieldLol[0x28];
u8 AI_monToSwitchIntoId[MAX_BATTLERS_COUNT];
u8 field_298[8];
u8 field_2A0;
@ -493,6 +563,15 @@ struct BattleStruct
#define IS_MOVE_PHYSICAL(moveType)(moveType < TYPE_MYSTERY)
#define IS_MOVE_SPECIAL(moveType)(moveType > TYPE_MYSTERY)
#define TARGET_TURN_DAMAGED ((gSpecialStatuses[gBattlerTarget].physicalDmg != 0 || gSpecialStatuses[gBattlerTarget].specialDmg != 0))
#define IS_BATTLER_OF_TYPE(battlerId, type)((gBattleMons[battlerId].type1 == type || gBattleMons[battlerId].type2 == type))
#define SET_BATTLER_TYPE(battlerId, type) \
{ \
gBattleMons[battlerId].type1 = type; \
gBattleMons[battlerId].type2 = type; \
}
#define GET_STAT_BUFF_ID(n)((n & 0xF)) // first four bits 0x1, 0x2, 0x4, 0x8
#define GET_STAT_BUFF_VALUE(n)(((n >> 4) & 7)) // 0x10, 0x20, 0x40
#define STAT_BUFF_NEGATIVE 0x80 // 0x80, the sign bit

1
include/battle_frontier_1.h
View File

@ -2,6 +2,7 @@
#define GUARD_BATTLE_FRONTIER_1_H
bool32 sub_8196094(void);
void sub_8197080(u8 *);
void sub_8196080(const u8 *str);
#endif // GUARD_BATTLE_FRONTIER_1_H

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