Merge branch 'master' into contest-ai-cleanup
This commit is contained in:
Phlosioneer
1
.gitignore
vendored
1
.gitignore
vendored
@@ -27,3 +27,4 @@ Thumbs.db
|
||||
build/
|
||||
.DS_Store
|
||||
*.ddump
|
||||
porymap.project.cfg
|
||||
|
||||
25
asm/m4a_1.s
25
asm/m4a_1.s
@@ -1907,3 +1907,28 @@ _081DDD90:
|
||||
thumb_func_end ply_mod
|
||||
|
||||
.align 2, 0 @ Don't pad with nop.
|
||||
|
||||
.bss
|
||||
gUnknown_03001300:
|
||||
.space 0x40
|
||||
.size gUnknown_03001300, .-gUnknown_03001300
|
||||
|
||||
.global gMPlayTrack_BGM
|
||||
gMPlayTrack_BGM:
|
||||
.space 0x320
|
||||
.size gMPlayTrack_BGM, .-gMPlayTrack_BGM
|
||||
|
||||
.global gMPlayTrack_SE1
|
||||
gMPlayTrack_SE1:
|
||||
.space 0xF0
|
||||
.size gMPlayTrack_SE1, .-gMPlayTrack_SE1
|
||||
|
||||
.global gMPlayTrack_SE2
|
||||
gMPlayTrack_SE2:
|
||||
.space 0x2D0
|
||||
.size gMPlayTrack_SE2, .-gMPlayTrack_SE2
|
||||
|
||||
.global gMPlayTrack_SE3
|
||||
gMPlayTrack_SE3:
|
||||
.space 0x50
|
||||
.size gMPlayTrack_SE3, .-gMPlayTrack_SE3
|
||||
|
||||
@@ -153,19 +153,19 @@
|
||||
.byte \param4
|
||||
.endm
|
||||
|
||||
.macro loopsewithpan se:req, param1:req, param2:req, param3:req
|
||||
.macro loopsewithpan se:req, pan:req, wait:req, times:req
|
||||
.byte 0x1c
|
||||
.2byte \se
|
||||
.byte \param1
|
||||
.byte \param2
|
||||
.byte \param3
|
||||
.byte \pan
|
||||
.byte \wait
|
||||
.byte \times
|
||||
.endm
|
||||
|
||||
.macro waitplaysewithpan se:req, param1:req, param2:req
|
||||
.macro waitplaysewithpan se:req, pan:req, wait:req
|
||||
.byte 0x1d
|
||||
.2byte \se
|
||||
.byte \param1
|
||||
.byte \param2
|
||||
.byte \pan
|
||||
.byte \wait
|
||||
.endm
|
||||
|
||||
.macro setbldcnt param0:req
|
||||
|
||||
@@ -1124,7 +1124,7 @@
|
||||
.byte 0xdd
|
||||
.endm
|
||||
|
||||
.macro asistattackselect param0:req
|
||||
.macro assistattackselect param0:req
|
||||
.byte 0xde
|
||||
.4byte \param0
|
||||
.endm
|
||||
|
||||
@@ -77,7 +77,7 @@
|
||||
.endm
|
||||
|
||||
@ Executes a script stored in a default RAM location.
|
||||
.macro gotoram
|
||||
.macro returnram
|
||||
.byte 0x0c
|
||||
.endm
|
||||
|
||||
@@ -1440,7 +1440,7 @@
|
||||
.endm
|
||||
|
||||
@ Depending on factors I haven't managed to understand yet, this command may cause script execution to jump to the offset specified by the pointer at 0x020375C0.
|
||||
.macro execram
|
||||
.macro gotoram
|
||||
.byte 0xcf
|
||||
.endm
|
||||
|
||||
|
||||
@@ -1,336 +0,0 @@
|
||||
|
||||
.include "asm/macros.inc"
|
||||
.include "constants/constants.inc"
|
||||
|
||||
.syntax unified
|
||||
|
||||
.text
|
||||
|
||||
|
||||
|
||||
|
||||
thumb_func_start DrawLevelUpWindowPg1
|
||||
DrawLevelUpWindowPg1: @ 81D3640
|
||||
push {r4-r7,lr}
|
||||
mov r7, r10
|
||||
mov r6, r9
|
||||
mov r5, r8
|
||||
push {r5-r7}
|
||||
sub sp, 0x2C
|
||||
mov r8, r0
|
||||
adds r6, r1, 0
|
||||
adds r5, r2, 0
|
||||
adds r4, r3, 0
|
||||
ldr r3, [sp, 0x4C]
|
||||
ldr r0, [sp, 0x50]
|
||||
mov r9, r0
|
||||
lsls r4, 24
|
||||
lsrs r4, 24
|
||||
lsls r3, 24
|
||||
lsrs r3, 24
|
||||
mov r1, r9
|
||||
lsls r1, 24
|
||||
lsrs r1, 24
|
||||
mov r9, r1
|
||||
mov r0, r8
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
mov r8, r0
|
||||
lsls r1, r4, 4
|
||||
orrs r1, r4
|
||||
lsls r1, 24
|
||||
lsrs r1, 24
|
||||
str r3, [sp, 0x28]
|
||||
bl FillWindowPixelBuffer
|
||||
add r2, sp, 0xC
|
||||
ldrh r0, [r5]
|
||||
ldrh r1, [r6]
|
||||
subs r0, r1
|
||||
strh r0, [r2]
|
||||
ldrh r0, [r5, 0x2]
|
||||
ldrh r1, [r6, 0x2]
|
||||
subs r0, r1
|
||||
strh r0, [r2, 0x2]
|
||||
ldrh r0, [r5, 0x4]
|
||||
ldrh r1, [r6, 0x4]
|
||||
subs r0, r1
|
||||
strh r0, [r2, 0x4]
|
||||
ldrh r0, [r5, 0x8]
|
||||
ldrh r1, [r6, 0x8]
|
||||
subs r0, r1
|
||||
strh r0, [r2, 0x6]
|
||||
ldrh r0, [r5, 0xA]
|
||||
ldrh r1, [r6, 0xA]
|
||||
subs r0, r1
|
||||
strh r0, [r2, 0x8]
|
||||
ldrh r0, [r5, 0x6]
|
||||
ldrh r1, [r6, 0x6]
|
||||
subs r0, r1
|
||||
strh r0, [r2, 0xA]
|
||||
add r0, sp, 0x24
|
||||
strb r4, [r0]
|
||||
ldr r3, [sp, 0x28]
|
||||
strb r3, [r0, 0x1]
|
||||
mov r1, r9
|
||||
strb r1, [r0, 0x2]
|
||||
movs r7, 0
|
||||
mov r10, r0
|
||||
movs r0, 0x1
|
||||
negs r0, r0
|
||||
mov r9, r0
|
||||
add r6, sp, 0x18
|
||||
_081D36CA:
|
||||
lsls r0, r7, 4
|
||||
subs r0, r7
|
||||
lsls r0, 24
|
||||
lsrs r5, r0, 24
|
||||
mov r1, r10
|
||||
str r1, [sp]
|
||||
mov r0, r9
|
||||
str r0, [sp, 0x4]
|
||||
ldr r1, =gUnknown_08625B54
|
||||
lsls r0, r7, 2
|
||||
adds r0, r1
|
||||
ldr r0, [r0]
|
||||
str r0, [sp, 0x8]
|
||||
mov r0, r8
|
||||
movs r1, 0x1
|
||||
movs r2, 0
|
||||
adds r3, r5, 0
|
||||
bl AddTextPrinterParameterized3
|
||||
lsls r0, r7, 1
|
||||
mov r4, sp
|
||||
adds r4, r0
|
||||
adds r4, 0xC
|
||||
movs r1, 0
|
||||
ldrsh r0, [r4, r1]
|
||||
ldr r1, =gText_Dash
|
||||
cmp r0, 0
|
||||
blt _081D3704
|
||||
ldr r1, =gText_UnkCtrlF904
|
||||
_081D3704:
|
||||
adds r0, r6, 0
|
||||
bl StringCopy
|
||||
mov r0, r10
|
||||
str r0, [sp]
|
||||
mov r1, r9
|
||||
str r1, [sp, 0x4]
|
||||
str r6, [sp, 0x8]
|
||||
mov r0, r8
|
||||
movs r1, 0x1
|
||||
movs r2, 0x38
|
||||
adds r3, r5, 0
|
||||
bl AddTextPrinterParameterized3
|
||||
movs r0, 0
|
||||
ldrsh r1, [r4, r0]
|
||||
adds r0, r1, 0
|
||||
cmp r1, 0
|
||||
bge _081D372C
|
||||
negs r0, r1
|
||||
_081D372C:
|
||||
movs r4, 0xC
|
||||
cmp r0, 0x9
|
||||
bgt _081D3734
|
||||
movs r4, 0x12
|
||||
_081D3734:
|
||||
cmp r1, 0
|
||||
bge _081D373A
|
||||
negs r1, r1
|
||||
_081D373A:
|
||||
adds r0, r6, 0
|
||||
movs r2, 0
|
||||
movs r3, 0x2
|
||||
bl ConvertIntToDecimalStringN
|
||||
adds r2, r4, 0
|
||||
adds r2, 0x38
|
||||
mov r1, r10
|
||||
str r1, [sp]
|
||||
mov r0, r9
|
||||
str r0, [sp, 0x4]
|
||||
str r6, [sp, 0x8]
|
||||
mov r0, r8
|
||||
movs r1, 0x1
|
||||
adds r3, r5, 0
|
||||
bl AddTextPrinterParameterized3
|
||||
adds r0, r7, 0x1
|
||||
lsls r0, 16
|
||||
lsrs r7, r0, 16
|
||||
cmp r7, 0x5
|
||||
bls _081D36CA
|
||||
add sp, 0x2C
|
||||
pop {r3-r5}
|
||||
mov r8, r3
|
||||
mov r9, r4
|
||||
mov r10, r5
|
||||
pop {r4-r7}
|
||||
pop {r0}
|
||||
bx r0
|
||||
.pool
|
||||
thumb_func_end DrawLevelUpWindowPg1
|
||||
|
||||
thumb_func_start DrawLevelUpWindowPg2
|
||||
DrawLevelUpWindowPg2: @ 81D3784
|
||||
push {r4-r7,lr}
|
||||
mov r7, r10
|
||||
mov r6, r9
|
||||
mov r5, r8
|
||||
push {r5-r7}
|
||||
sub sp, 0x2C
|
||||
mov r8, r0
|
||||
adds r5, r1, 0
|
||||
adds r4, r2, 0
|
||||
adds r6, r3, 0
|
||||
ldr r2, [sp, 0x4C]
|
||||
lsls r4, 24
|
||||
lsrs r4, 24
|
||||
lsls r6, 24
|
||||
lsrs r6, 24
|
||||
lsls r2, 24
|
||||
lsrs r2, 24
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
mov r8, r0
|
||||
lsls r1, r4, 4
|
||||
orrs r1, r4
|
||||
lsls r1, 24
|
||||
lsrs r1, 24
|
||||
str r2, [sp, 0x28]
|
||||
bl FillWindowPixelBuffer
|
||||
add r1, sp, 0xC
|
||||
ldrh r0, [r5]
|
||||
strh r0, [r1]
|
||||
ldrh r0, [r5, 0x2]
|
||||
strh r0, [r1, 0x2]
|
||||
ldrh r0, [r5, 0x4]
|
||||
strh r0, [r1, 0x4]
|
||||
ldrh r0, [r5, 0x8]
|
||||
strh r0, [r1, 0x6]
|
||||
ldrh r0, [r5, 0xA]
|
||||
strh r0, [r1, 0x8]
|
||||
ldrh r0, [r5, 0x6]
|
||||
strh r0, [r1, 0xA]
|
||||
add r0, sp, 0x24
|
||||
strb r4, [r0]
|
||||
strb r6, [r0, 0x1]
|
||||
ldr r2, [sp, 0x28]
|
||||
strb r2, [r0, 0x2]
|
||||
movs r6, 0
|
||||
add r1, sp, 0x18
|
||||
mov r9, r1
|
||||
mov r7, r8
|
||||
mov r10, r0
|
||||
movs r2, 0x1
|
||||
negs r2, r2
|
||||
mov r8, r2
|
||||
_081D37EE:
|
||||
lsls r1, r6, 1
|
||||
mov r0, sp
|
||||
adds r0, r1
|
||||
adds r0, 0xC
|
||||
movs r2, 0
|
||||
ldrsh r0, [r0, r2]
|
||||
movs r4, 0x3
|
||||
cmp r0, 0x63
|
||||
bgt _081D3808
|
||||
movs r4, 0x1
|
||||
cmp r0, 0x9
|
||||
ble _081D3808
|
||||
movs r4, 0x2
|
||||
_081D3808:
|
||||
mov r0, sp
|
||||
adds r0, r1
|
||||
adds r0, 0xC
|
||||
movs r2, 0
|
||||
ldrsh r1, [r0, r2]
|
||||
mov r0, r9
|
||||
movs r2, 0
|
||||
adds r3, r4, 0
|
||||
bl ConvertIntToDecimalStringN
|
||||
movs r0, 0x4
|
||||
subs r0, r4
|
||||
lsls r4, r0, 1
|
||||
adds r4, r0
|
||||
lsls r4, 17
|
||||
lsrs r4, 16
|
||||
lsls r5, r6, 4
|
||||
subs r5, r6
|
||||
lsls r5, 24
|
||||
lsrs r5, 24
|
||||
mov r0, r10
|
||||
str r0, [sp]
|
||||
mov r1, r8
|
||||
str r1, [sp, 0x4]
|
||||
ldr r1, =gUnknown_08625B54
|
||||
lsls r0, r6, 2
|
||||
adds r0, r1
|
||||
ldr r0, [r0]
|
||||
str r0, [sp, 0x8]
|
||||
adds r0, r7, 0
|
||||
movs r1, 0x1
|
||||
movs r2, 0
|
||||
adds r3, r5, 0
|
||||
bl AddTextPrinterParameterized3
|
||||
adds r4, 0x38
|
||||
lsls r4, 24
|
||||
lsrs r4, 24
|
||||
mov r2, r10
|
||||
str r2, [sp]
|
||||
mov r0, r8
|
||||
str r0, [sp, 0x4]
|
||||
mov r1, r9
|
||||
str r1, [sp, 0x8]
|
||||
adds r0, r7, 0
|
||||
movs r1, 0x1
|
||||
adds r2, r4, 0
|
||||
adds r3, r5, 0
|
||||
bl AddTextPrinterParameterized3
|
||||
adds r0, r6, 0x1
|
||||
lsls r0, 16
|
||||
lsrs r6, r0, 16
|
||||
cmp r6, 0x5
|
||||
bls _081D37EE
|
||||
add sp, 0x2C
|
||||
pop {r3-r5}
|
||||
mov r8, r3
|
||||
mov r9, r4
|
||||
mov r10, r5
|
||||
pop {r4-r7}
|
||||
pop {r0}
|
||||
bx r0
|
||||
.pool
|
||||
thumb_func_end DrawLevelUpWindowPg2
|
||||
|
||||
thumb_func_start GetMonLevelUpWindowStats
|
||||
GetMonLevelUpWindowStats: @ 81D388C
|
||||
push {r4,r5,lr}
|
||||
adds r4, r0, 0
|
||||
adds r5, r1, 0
|
||||
movs r1, 0x3A @ MON_DATA_MAX_HP
|
||||
bl GetMonData
|
||||
strh r0, [r5]
|
||||
adds r0, r4, 0
|
||||
movs r1, 0x3B @ MON_DATA_ATK
|
||||
bl GetMonData
|
||||
strh r0, [r5, 0x2]
|
||||
adds r0, r4, 0
|
||||
movs r1, 0x3C @ MON_DATA_DEF
|
||||
bl GetMonData
|
||||
strh r0, [r5, 0x4]
|
||||
adds r0, r4, 0
|
||||
movs r1, 0x3D @ MON_DATA_SPEED
|
||||
bl GetMonData
|
||||
strh r0, [r5, 0x6]
|
||||
adds r0, r4, 0
|
||||
movs r1, 0x3E @ MON_DATA_SPATK
|
||||
bl GetMonData
|
||||
strh r0, [r5, 0x8]
|
||||
adds r0, r4, 0
|
||||
movs r1, 0x3F @ MON_DATA_SPDEF
|
||||
bl GetMonData
|
||||
strh r0, [r5, 0xA]
|
||||
pop {r4,r5}
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end GetMonLevelUpWindowStats
|
||||
|
||||
.align 2, 0 @ Don't pad with nop.
|
||||
@@ -1,534 +0,0 @@
|
||||
.include "asm/macros.inc"
|
||||
.include "constants/constants.inc"
|
||||
|
||||
.syntax unified
|
||||
|
||||
.text
|
||||
|
||||
thumb_func_start mevent_srv_init_wnews
|
||||
mevent_srv_init_wnews: @ 801D07C
|
||||
push {r4,lr}
|
||||
ldr r4, =gUnknown_02022C7C
|
||||
movs r0, 0x60
|
||||
bl AllocZeroed
|
||||
str r0, [r4]
|
||||
ldr r1, =gUnknown_082F298C
|
||||
movs r2, 0
|
||||
movs r3, 0x1
|
||||
bl mevent_srv_init_common
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
bx r0
|
||||
.pool
|
||||
thumb_func_end mevent_srv_init_wnews
|
||||
|
||||
thumb_func_start mevent_srv_new_wcard
|
||||
mevent_srv_new_wcard: @ 801D0A0
|
||||
push {r4,lr}
|
||||
ldr r4, =gUnknown_02022C7C
|
||||
movs r0, 0x60
|
||||
bl AllocZeroed
|
||||
str r0, [r4]
|
||||
ldr r1, =gUnknown_082F29EC
|
||||
movs r2, 0
|
||||
movs r3, 0x1
|
||||
bl mevent_srv_init_common
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
bx r0
|
||||
.pool
|
||||
thumb_func_end mevent_srv_new_wcard
|
||||
|
||||
thumb_func_start mevent_srv_common_do_exec
|
||||
mevent_srv_common_do_exec: @ 801D0C4
|
||||
push {r4-r6,lr}
|
||||
adds r6, r0, 0
|
||||
ldr r4, =gUnknown_02022C7C
|
||||
ldr r0, [r4]
|
||||
cmp r0, 0
|
||||
bne _0801D0D8
|
||||
movs r0, 0x3
|
||||
b _0801D0F8
|
||||
.pool
|
||||
_0801D0D8:
|
||||
bl mevent_dispatch_08145600
|
||||
adds r5, r0, 0
|
||||
cmp r5, 0x3
|
||||
bne _0801D0F6
|
||||
ldr r0, [r4]
|
||||
ldr r1, [r0, 0x4]
|
||||
strh r1, [r6]
|
||||
bl mevent_srv_free_resources
|
||||
ldr r0, [r4]
|
||||
bl Free
|
||||
movs r0, 0
|
||||
str r0, [r4]
|
||||
_0801D0F6:
|
||||
adds r0, r5, 0
|
||||
_0801D0F8:
|
||||
pop {r4-r6}
|
||||
pop {r1}
|
||||
bx r1
|
||||
thumb_func_end mevent_srv_common_do_exec
|
||||
|
||||
thumb_func_start mevent_srv_init_common
|
||||
mevent_srv_init_common: @ 801D100
|
||||
push {r4-r6,lr}
|
||||
mov r6, r9
|
||||
mov r5, r8
|
||||
push {r5,r6}
|
||||
adds r4, r0, 0
|
||||
adds r6, r1, 0
|
||||
mov r8, r2
|
||||
mov r9, r3
|
||||
movs r5, 0
|
||||
str r5, [r4]
|
||||
str r5, [r4, 0x8]
|
||||
movs r0, 0xA6
|
||||
lsls r0, 1
|
||||
bl AllocZeroed
|
||||
str r0, [r4, 0x18]
|
||||
movs r0, 0xDE
|
||||
lsls r0, 1
|
||||
bl AllocZeroed
|
||||
str r0, [r4, 0x1C]
|
||||
movs r0, 0x80
|
||||
lsls r0, 3
|
||||
bl AllocZeroed
|
||||
str r0, [r4, 0x14]
|
||||
movs r0, 0x64
|
||||
bl AllocZeroed
|
||||
str r0, [r4, 0x20]
|
||||
str r6, [r4, 0x10]
|
||||
str r5, [r4, 0xC]
|
||||
adds r4, 0x38
|
||||
adds r0, r4, 0
|
||||
mov r1, r8
|
||||
mov r2, r9
|
||||
bl sub_801D8D8
|
||||
pop {r3,r4}
|
||||
mov r8, r3
|
||||
mov r9, r4
|
||||
pop {r4-r6}
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end mevent_srv_init_common
|
||||
|
||||
thumb_func_start mevent_srv_free_resources
|
||||
mevent_srv_free_resources: @ 801D158
|
||||
push {r4,lr}
|
||||
adds r4, r0, 0
|
||||
ldr r0, [r4, 0x18]
|
||||
bl Free
|
||||
ldr r0, [r4, 0x1C]
|
||||
bl Free
|
||||
ldr r0, [r4, 0x14]
|
||||
bl Free
|
||||
ldr r0, [r4, 0x20]
|
||||
bl Free
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end mevent_srv_free_resources
|
||||
|
||||
thumb_func_start mevent_srv_814501C
|
||||
mevent_srv_814501C: @ 801D17C
|
||||
push {lr}
|
||||
adds r0, 0x38
|
||||
bl sub_801D904
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end mevent_srv_814501C
|
||||
|
||||
thumb_func_start sub_801D188
|
||||
sub_801D188: @ 801D188
|
||||
push {lr}
|
||||
cmp r0, 0
|
||||
bne _0801D190
|
||||
adds r0, r1, 0
|
||||
_0801D190:
|
||||
pop {r1}
|
||||
bx r1
|
||||
thumb_func_end sub_801D188
|
||||
|
||||
thumb_func_start sub_801D194
|
||||
sub_801D194: @ 801D194
|
||||
push {lr}
|
||||
cmp r1, r0
|
||||
bcs _0801D19E
|
||||
movs r0, 0
|
||||
b _0801D1A8
|
||||
_0801D19E:
|
||||
cmp r1, r0
|
||||
beq _0801D1A6
|
||||
movs r0, 0x2
|
||||
b _0801D1A8
|
||||
_0801D1A6:
|
||||
movs r0, 0x1
|
||||
_0801D1A8:
|
||||
pop {r1}
|
||||
bx r1
|
||||
thumb_func_end sub_801D194
|
||||
|
||||
thumb_func_start sub_801D1AC
|
||||
sub_801D1AC: @ 801D1AC
|
||||
movs r1, 0x4
|
||||
str r1, [r0, 0x8]
|
||||
movs r0, 0
|
||||
bx lr
|
||||
thumb_func_end sub_801D1AC
|
||||
|
||||
thumb_func_start sub_801D1B4
|
||||
sub_801D1B4: @ 801D1B4
|
||||
movs r0, 0x3
|
||||
bx lr
|
||||
thumb_func_end sub_801D1B4
|
||||
|
||||
thumb_func_start sub_801D1B8
|
||||
sub_801D1B8: @ 801D1B8
|
||||
push {r4,lr}
|
||||
adds r4, r0, 0
|
||||
adds r0, 0x38
|
||||
bl sub_801D8C0
|
||||
cmp r0, 0
|
||||
beq _0801D1CA
|
||||
movs r0, 0x4
|
||||
str r0, [r4, 0x8]
|
||||
_0801D1CA:
|
||||
movs r0, 0x1
|
||||
pop {r4}
|
||||
pop {r1}
|
||||
bx r1
|
||||
thumb_func_end sub_801D1B8
|
||||
|
||||
thumb_func_start sub_801D1D4
|
||||
sub_801D1D4: @ 801D1D4
|
||||
push {r4,lr}
|
||||
adds r4, r0, 0
|
||||
adds r0, 0x38
|
||||
bl sub_801D8CC
|
||||
cmp r0, 0
|
||||
beq _0801D1E6
|
||||
movs r0, 0x4
|
||||
str r0, [r4, 0x8]
|
||||
_0801D1E6:
|
||||
movs r0, 0x1
|
||||
pop {r4}
|
||||
pop {r1}
|
||||
bx r1
|
||||
thumb_func_end sub_801D1D4
|
||||
|
||||
thumb_func_start sub_801D1F0
|
||||
sub_801D1F0: @ 801D1F0
|
||||
push {r4,r5,lr}
|
||||
adds r5, r0, 0
|
||||
ldr r0, [r5, 0xC]
|
||||
lsls r1, r0, 1
|
||||
adds r1, r0
|
||||
lsls r1, 2
|
||||
ldr r2, [r5, 0x10]
|
||||
adds r3, r2, r1
|
||||
adds r0, 0x1
|
||||
str r0, [r5, 0xC]
|
||||
ldr r0, [r3]
|
||||
cmp r0, 0x1E
|
||||
bls _0801D20C
|
||||
b _0801D464
|
||||
_0801D20C:
|
||||
lsls r0, 2
|
||||
ldr r1, =_0801D21C
|
||||
adds r0, r1
|
||||
ldr r0, [r0]
|
||||
mov pc, r0
|
||||
.pool
|
||||
.align 2, 0
|
||||
_0801D21C:
|
||||
.4byte _0801D298
|
||||
.4byte _0801D2A2
|
||||
.4byte _0801D2A8
|
||||
.4byte _0801D2E2
|
||||
.4byte _0801D2D8
|
||||
.4byte _0801D2BA
|
||||
.4byte _0801D2C6
|
||||
.4byte _0801D2EC
|
||||
.4byte _0801D300
|
||||
.4byte _0801D308
|
||||
.4byte _0801D31E
|
||||
.4byte _0801D32E
|
||||
.4byte _0801D33A
|
||||
.4byte _0801D360
|
||||
.4byte _0801D348
|
||||
.4byte _0801D390
|
||||
.4byte _0801D378
|
||||
.4byte _0801D3DC
|
||||
.4byte _0801D3A8
|
||||
.4byte _0801D3C0
|
||||
.4byte _0801D3CE
|
||||
.4byte _0801D406
|
||||
.4byte _0801D3EA
|
||||
.4byte _0801D3F8
|
||||
.4byte _0801D40E
|
||||
.4byte _0801D418
|
||||
.4byte _0801D422
|
||||
.4byte _0801D43C
|
||||
.4byte _0801D450
|
||||
.4byte _0801D458
|
||||
.4byte _0801D2CC
|
||||
_0801D298:
|
||||
movs r0, 0x1
|
||||
str r0, [r5, 0x8]
|
||||
ldr r0, [r3, 0x4]
|
||||
str r0, [r5, 0x4]
|
||||
b _0801D464
|
||||
_0801D2A2:
|
||||
movs r0, 0x3
|
||||
str r0, [r5, 0x8]
|
||||
b _0801D464
|
||||
_0801D2A8:
|
||||
adds r0, r5, 0
|
||||
adds r0, 0x38
|
||||
ldr r1, [r3, 0x4]
|
||||
ldr r2, [r5, 0x14]
|
||||
bl sub_801D928
|
||||
movs r0, 0x2
|
||||
str r0, [r5, 0x8]
|
||||
b _0801D464
|
||||
_0801D2BA:
|
||||
ldr r0, [r5, 0x20]
|
||||
ldr r1, [r5, 0x14]
|
||||
movs r2, 0x64
|
||||
bl memcpy
|
||||
b _0801D464
|
||||
_0801D2C6:
|
||||
ldr r0, [r5, 0x20]
|
||||
movs r1, 0
|
||||
b _0801D2D0
|
||||
_0801D2CC:
|
||||
ldr r0, [r5, 0x20]
|
||||
movs r1, 0x1
|
||||
_0801D2D0:
|
||||
bl sub_801B6A0
|
||||
str r0, [r5, 0x4]
|
||||
b _0801D464
|
||||
_0801D2D8:
|
||||
ldr r1, [r5, 0x4]
|
||||
ldr r0, [r3, 0x4]
|
||||
cmp r1, r0
|
||||
beq _0801D2E2
|
||||
b _0801D464
|
||||
_0801D2E2:
|
||||
movs r0, 0
|
||||
str r0, [r5, 0xC]
|
||||
ldr r0, [r3, 0x8]
|
||||
str r0, [r5, 0x10]
|
||||
b _0801D464
|
||||
_0801D2EC:
|
||||
ldr r0, [r3, 0x8]
|
||||
ldr r1, [r5, 0x18]
|
||||
bl sub_801D188
|
||||
adds r2, r0, 0
|
||||
ldr r1, [r5, 0x20]
|
||||
bl sub_801B6EC
|
||||
str r0, [r5, 0x4]
|
||||
b _0801D464
|
||||
_0801D300:
|
||||
ldr r0, [r5, 0x14]
|
||||
ldr r0, [r0]
|
||||
str r0, [r5, 0x4]
|
||||
b _0801D464
|
||||
_0801D308:
|
||||
ldr r0, [r3, 0x8]
|
||||
adds r1, r5, 0
|
||||
adds r1, 0x34
|
||||
bl sub_801D188
|
||||
adds r2, r0, 0
|
||||
ldr r1, [r5, 0x20]
|
||||
bl sub_801B708
|
||||
str r0, [r5, 0x4]
|
||||
b _0801D464
|
||||
_0801D31E:
|
||||
ldr r0, [r5, 0x20]
|
||||
ldr r1, [r3, 0x4]
|
||||
bl sub_801B784
|
||||
lsls r0, 16
|
||||
lsrs r0, 16
|
||||
str r0, [r5, 0x4]
|
||||
b _0801D464
|
||||
_0801D32E:
|
||||
ldr r0, [r5, 0x20]
|
||||
ldr r1, [r3, 0x8]
|
||||
bl sub_801B748
|
||||
str r0, [r5, 0x4]
|
||||
b _0801D464
|
||||
_0801D33A:
|
||||
ldr r0, [r3, 0x8]
|
||||
ldr r1, [r5, 0x14]
|
||||
ldr r1, [r1]
|
||||
bl sub_801D194
|
||||
str r0, [r5, 0x4]
|
||||
b _0801D464
|
||||
_0801D348:
|
||||
ldr r0, [r3, 0x8]
|
||||
ldr r1, [r5, 0x1C]
|
||||
bl sub_801D188
|
||||
adds r2, r0, 0
|
||||
movs r3, 0xDE
|
||||
lsls r3, 1
|
||||
adds r0, r5, 0
|
||||
movs r1, 0x17
|
||||
bl mevent_srv_814501C
|
||||
b _0801D464
|
||||
_0801D360:
|
||||
ldr r0, [r3, 0x8]
|
||||
ldr r1, [r5, 0x18]
|
||||
bl sub_801D188
|
||||
adds r2, r0, 0
|
||||
movs r3, 0xA6
|
||||
lsls r3, 1
|
||||
adds r0, r5, 0
|
||||
movs r1, 0x16
|
||||
bl mevent_srv_814501C
|
||||
b _0801D464
|
||||
_0801D378:
|
||||
ldr r0, [r3, 0x8]
|
||||
adds r1, r5, 0
|
||||
adds r1, 0x34
|
||||
bl sub_801D188
|
||||
adds r2, r0, 0
|
||||
adds r0, r5, 0
|
||||
movs r1, 0x18
|
||||
movs r3, 0x4
|
||||
bl mevent_srv_814501C
|
||||
b _0801D464
|
||||
_0801D390:
|
||||
ldr r2, [r3, 0x8]
|
||||
cmp r2, 0
|
||||
bne _0801D39C
|
||||
ldr r2, [r5, 0x24]
|
||||
ldr r3, [r5, 0x28]
|
||||
b _0801D39E
|
||||
_0801D39C:
|
||||
ldr r3, [r3, 0x4]
|
||||
_0801D39E:
|
||||
adds r0, r5, 0
|
||||
movs r1, 0x19
|
||||
bl mevent_srv_814501C
|
||||
b _0801D464
|
||||
_0801D3A8:
|
||||
ldr r2, [r3, 0x8]
|
||||
cmp r2, 0
|
||||
bne _0801D3B4
|
||||
ldr r2, [r5, 0x2C]
|
||||
ldr r3, [r5, 0x30]
|
||||
b _0801D3B6
|
||||
_0801D3B4:
|
||||
ldr r3, [r3, 0x4]
|
||||
_0801D3B6:
|
||||
adds r0, r5, 0
|
||||
movs r1, 0x10
|
||||
bl mevent_srv_814501C
|
||||
b _0801D464
|
||||
_0801D3C0:
|
||||
ldr r2, [r3, 0x8]
|
||||
adds r0, r5, 0
|
||||
movs r1, 0x1A
|
||||
movs r3, 0xBC
|
||||
bl mevent_srv_814501C
|
||||
b _0801D464
|
||||
_0801D3CE:
|
||||
ldr r2, [r3, 0x8]
|
||||
ldr r3, [r3, 0x4]
|
||||
adds r0, r5, 0
|
||||
movs r1, 0x15
|
||||
bl mevent_srv_814501C
|
||||
b _0801D464
|
||||
_0801D3DC:
|
||||
ldr r2, [r3, 0x8]
|
||||
ldr r3, [r3, 0x4]
|
||||
adds r0, r5, 0
|
||||
movs r1, 0x1C
|
||||
bl mevent_srv_814501C
|
||||
b _0801D464
|
||||
_0801D3EA:
|
||||
ldr r0, [r5, 0x18]
|
||||
ldr r1, [r3, 0x8]
|
||||
movs r2, 0xA6
|
||||
lsls r2, 1
|
||||
bl memcpy
|
||||
b _0801D464
|
||||
_0801D3F8:
|
||||
ldr r0, [r5, 0x1C]
|
||||
ldr r1, [r3, 0x8]
|
||||
movs r2, 0xDE
|
||||
lsls r2, 1
|
||||
bl memcpy
|
||||
b _0801D464
|
||||
_0801D406:
|
||||
ldr r0, [r3, 0x8]
|
||||
ldr r0, [r0]
|
||||
str r0, [r5, 0x34]
|
||||
b _0801D464
|
||||
_0801D40E:
|
||||
ldr r0, [r3, 0x8]
|
||||
str r0, [r5, 0x24]
|
||||
ldr r0, [r3, 0x4]
|
||||
str r0, [r5, 0x28]
|
||||
b _0801D464
|
||||
_0801D418:
|
||||
ldr r0, [r3, 0x8]
|
||||
str r0, [r5, 0x2C]
|
||||
ldr r0, [r3, 0x4]
|
||||
str r0, [r5, 0x30]
|
||||
b _0801D464
|
||||
_0801D422:
|
||||
ldr r4, [r5, 0x18]
|
||||
bl sav1_get_mevent_buffer_1
|
||||
adds r1, r0, 0
|
||||
movs r2, 0xA6
|
||||
lsls r2, 1
|
||||
adds r0, r4, 0
|
||||
bl memcpy
|
||||
ldr r0, [r5, 0x18]
|
||||
bl sub_801B3C0
|
||||
b _0801D464
|
||||
_0801D43C:
|
||||
ldr r4, [r5, 0x1C]
|
||||
bl sav1_get_mevent_buffer_0
|
||||
adds r1, r0, 0
|
||||
movs r2, 0xDE
|
||||
lsls r2, 1
|
||||
adds r0, r4, 0
|
||||
bl memcpy
|
||||
b _0801D464
|
||||
_0801D450:
|
||||
bl sub_8099244
|
||||
str r0, [r5, 0x24]
|
||||
b _0801D464
|
||||
_0801D458:
|
||||
ldr r2, [r3, 0x8]
|
||||
ldr r3, [r3, 0x4]
|
||||
adds r0, r5, 0
|
||||
movs r1, 0x1B
|
||||
bl mevent_srv_814501C
|
||||
_0801D464:
|
||||
movs r0, 0x1
|
||||
pop {r4,r5}
|
||||
pop {r1}
|
||||
bx r1
|
||||
thumb_func_end sub_801D1F0
|
||||
|
||||
thumb_func_start mevent_dispatch_08145600
|
||||
mevent_dispatch_08145600: @ 801D46C
|
||||
push {lr}
|
||||
ldr r2, =gUnknown_082F2548
|
||||
ldr r1, [r0, 0x8]
|
||||
lsls r1, 2
|
||||
adds r1, r2
|
||||
ldr r1, [r1]
|
||||
bl _call_via_r1
|
||||
pop {r1}
|
||||
bx r1
|
||||
.pool
|
||||
thumb_func_end mevent_dispatch_08145600
|
||||
|
||||
.align 2, 0 @ don't pad with nop
|
||||
@@ -1,373 +0,0 @@
|
||||
.include "asm/macros.inc"
|
||||
.include "constants/constants.inc"
|
||||
|
||||
.syntax unified
|
||||
|
||||
.text
|
||||
|
||||
thumb_func_start sub_801D8C0
|
||||
sub_801D8C0: @ 801D8C0
|
||||
push {lr}
|
||||
ldr r1, [r0, 0x20]
|
||||
bl _call_via_r1
|
||||
pop {r1}
|
||||
bx r1
|
||||
thumb_func_end sub_801D8C0
|
||||
|
||||
thumb_func_start sub_801D8CC
|
||||
sub_801D8CC: @ 801D8CC
|
||||
push {lr}
|
||||
ldr r1, [r0, 0x24]
|
||||
bl _call_via_r1
|
||||
pop {r1}
|
||||
bx r1
|
||||
thumb_func_end sub_801D8CC
|
||||
|
||||
thumb_func_start sub_801D8D8
|
||||
sub_801D8D8: @ 801D8D8
|
||||
movs r3, 0
|
||||
strb r1, [r0, 0x4]
|
||||
strb r2, [r0, 0x5]
|
||||
str r3, [r0]
|
||||
strh r3, [r0, 0x12]
|
||||
strh r3, [r0, 0x14]
|
||||
strh r3, [r0, 0x10]
|
||||
strh r3, [r0, 0xA]
|
||||
strh r3, [r0, 0xC]
|
||||
strh r3, [r0, 0x8]
|
||||
str r3, [r0, 0x1C]
|
||||
str r3, [r0, 0x18]
|
||||
ldr r1, =sub_801DA5C
|
||||
str r1, [r0, 0x24]
|
||||
ldr r1, =sub_801D988
|
||||
str r1, [r0, 0x20]
|
||||
bx lr
|
||||
.pool
|
||||
thumb_func_end sub_801D8D8
|
||||
|
||||
thumb_func_start sub_801D904
|
||||
sub_801D904: @ 801D904
|
||||
push {r4,lr}
|
||||
adds r4, r0, 0
|
||||
movs r0, 0
|
||||
str r0, [r4]
|
||||
strh r1, [r4, 0xE]
|
||||
strh r0, [r4, 0x10]
|
||||
strh r0, [r4, 0x12]
|
||||
cmp r3, 0
|
||||
beq _0801D91A
|
||||
strh r3, [r4, 0x14]
|
||||
b _0801D920
|
||||
_0801D91A:
|
||||
movs r0, 0x80
|
||||
lsls r0, 3
|
||||
strh r0, [r4, 0x14]
|
||||
_0801D920:
|
||||
str r2, [r4, 0x1C]
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_801D904
|
||||
|
||||
thumb_func_start sub_801D928
|
||||
sub_801D928: @ 801D928
|
||||
movs r3, 0
|
||||
str r3, [r0]
|
||||
strh r1, [r0, 0x6]
|
||||
strh r3, [r0, 0x8]
|
||||
strh r3, [r0, 0xA]
|
||||
strh r3, [r0, 0xC]
|
||||
str r2, [r0, 0x18]
|
||||
bx lr
|
||||
thumb_func_end sub_801D928
|
||||
|
||||
thumb_func_start sub_801D938
|
||||
sub_801D938: @ 801D938
|
||||
push {lr}
|
||||
adds r3, r0, 0
|
||||
adds r0, r1, 0
|
||||
lsls r3, 8
|
||||
ldr r1, =gBlockRecvBuffer
|
||||
adds r3, r1
|
||||
adds r1, r3, 0
|
||||
bl memcpy
|
||||
pop {r0}
|
||||
bx r0
|
||||
.pool
|
||||
thumb_func_end sub_801D938
|
||||
|
||||
thumb_func_start sub_801D954
|
||||
sub_801D954: @ 801D954
|
||||
push {r4,lr}
|
||||
adds r4, r0, 0
|
||||
bl GetBlockReceivedStatus
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
asrs r0, r4
|
||||
movs r1, 0x1
|
||||
ands r0, r1
|
||||
cmp r0, 0
|
||||
bne _0801D96E
|
||||
movs r0, 0
|
||||
b _0801D970
|
||||
_0801D96E:
|
||||
movs r0, 0x1
|
||||
_0801D970:
|
||||
pop {r4}
|
||||
pop {r1}
|
||||
bx r1
|
||||
thumb_func_end sub_801D954
|
||||
|
||||
thumb_func_start sub_801D978
|
||||
sub_801D978: @ 801D978
|
||||
push {lr}
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
bl ResetBlockReceivedFlag
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_801D978
|
||||
|
||||
thumb_func_start sub_801D988
|
||||
sub_801D988: @ 801D988
|
||||
push {r4-r6,lr}
|
||||
sub sp, 0x8
|
||||
adds r5, r0, 0
|
||||
ldr r6, [r5]
|
||||
cmp r6, 0x1
|
||||
beq _0801D9EC
|
||||
cmp r6, 0x1
|
||||
bgt _0801D99E
|
||||
cmp r6, 0
|
||||
beq _0801D9A4
|
||||
b _0801DA52
|
||||
_0801D99E:
|
||||
cmp r6, 0x2
|
||||
beq _0801DA38
|
||||
b _0801DA52
|
||||
_0801D9A4:
|
||||
ldrb r0, [r5, 0x5]
|
||||
bl sub_801D954
|
||||
cmp r0, 0
|
||||
beq _0801DA52
|
||||
ldrb r0, [r5, 0x5]
|
||||
mov r4, sp
|
||||
mov r1, sp
|
||||
movs r2, 0x8
|
||||
bl sub_801D938
|
||||
ldrh r1, [r4, 0x4]
|
||||
strh r1, [r5, 0xC]
|
||||
ldrh r0, [r4, 0x2]
|
||||
strh r0, [r5, 0xA]
|
||||
lsls r1, 16
|
||||
movs r0, 0x80
|
||||
lsls r0, 19
|
||||
cmp r1, r0
|
||||
bls _0801D9D2
|
||||
_0801D9CC:
|
||||
bl sub_8010198
|
||||
b _0801DA52
|
||||
_0801D9D2:
|
||||
mov r1, sp
|
||||
ldrh r0, [r5, 0x6]
|
||||
ldrh r1, [r1]
|
||||
cmp r0, r1
|
||||
bne _0801D9CC
|
||||
strh r6, [r5, 0x8]
|
||||
ldrb r0, [r5, 0x5]
|
||||
bl sub_801D978
|
||||
ldr r0, [r5]
|
||||
adds r0, 0x1
|
||||
str r0, [r5]
|
||||
b _0801DA52
|
||||
_0801D9EC:
|
||||
ldrb r0, [r5, 0x5]
|
||||
bl sub_801D954
|
||||
cmp r0, 0
|
||||
beq _0801DA52
|
||||
ldrh r0, [r5, 0x8]
|
||||
lsls r1, r0, 6
|
||||
subs r1, r0
|
||||
lsls r3, r1, 2
|
||||
ldrh r0, [r5, 0xC]
|
||||
subs r2, r0, r3
|
||||
cmp r2, 0xFC
|
||||
bhi _0801DA1E
|
||||
ldrb r0, [r5, 0x5]
|
||||
ldr r1, [r5, 0x18]
|
||||
adds r1, r3
|
||||
bl sub_801D938
|
||||
ldrh r0, [r5, 0x8]
|
||||
adds r0, 0x1
|
||||
strh r0, [r5, 0x8]
|
||||
ldr r0, [r5]
|
||||
adds r0, 0x1
|
||||
str r0, [r5]
|
||||
b _0801DA30
|
||||
_0801DA1E:
|
||||
ldrb r0, [r5, 0x5]
|
||||
ldr r1, [r5, 0x18]
|
||||
adds r1, r3
|
||||
movs r2, 0xFC
|
||||
bl sub_801D938
|
||||
ldrh r0, [r5, 0x8]
|
||||
adds r0, 0x1
|
||||
strh r0, [r5, 0x8]
|
||||
_0801DA30:
|
||||
ldrb r0, [r5, 0x5]
|
||||
bl sub_801D978
|
||||
b _0801DA52
|
||||
_0801DA38:
|
||||
ldr r0, [r5, 0x18]
|
||||
ldrh r1, [r5, 0xC]
|
||||
bl CalcCRC16WithTable
|
||||
lsls r0, 16
|
||||
lsrs r0, 16
|
||||
ldrh r1, [r5, 0xA]
|
||||
cmp r0, r1
|
||||
bne _0801D9CC
|
||||
movs r0, 0
|
||||
str r0, [r5]
|
||||
movs r0, 0x1
|
||||
b _0801DA54
|
||||
_0801DA52:
|
||||
movs r0, 0
|
||||
_0801DA54:
|
||||
add sp, 0x8
|
||||
pop {r4-r6}
|
||||
pop {r1}
|
||||
bx r1
|
||||
thumb_func_end sub_801D988
|
||||
|
||||
thumb_func_start sub_801DA5C
|
||||
sub_801DA5C: @ 801DA5C
|
||||
push {r4,r5,lr}
|
||||
sub sp, 0x8
|
||||
adds r4, r0, 0
|
||||
ldr r5, [r4]
|
||||
cmp r5, 0x1
|
||||
beq _0801DAC8
|
||||
cmp r5, 0x1
|
||||
bgt _0801DA72
|
||||
cmp r5, 0
|
||||
beq _0801DA7C
|
||||
b _0801DB5E
|
||||
_0801DA72:
|
||||
cmp r5, 0x2
|
||||
beq _0801DB1C
|
||||
cmp r5, 0x3
|
||||
beq _0801DB46
|
||||
b _0801DB5E
|
||||
_0801DA7C:
|
||||
bl IsLinkTaskFinished
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _0801DB5E
|
||||
ldrh r1, [r4, 0xE]
|
||||
ldr r2, =0xffff0000
|
||||
ldr r0, [sp]
|
||||
ands r0, r2
|
||||
orrs r0, r1
|
||||
str r0, [sp]
|
||||
ldrh r1, [r4, 0x14]
|
||||
ldr r0, [sp, 0x4]
|
||||
ands r0, r2
|
||||
orrs r0, r1
|
||||
str r0, [sp, 0x4]
|
||||
ldr r0, [r4, 0x1C]
|
||||
bl CalcCRC16WithTable
|
||||
lsls r0, 16
|
||||
ldr r2, =0x0000ffff
|
||||
ldr r1, [sp]
|
||||
ands r1, r2
|
||||
orrs r1, r0
|
||||
str r1, [sp]
|
||||
lsrs r1, 16
|
||||
strh r1, [r4, 0x12]
|
||||
strh r5, [r4, 0x10]
|
||||
movs r0, 0
|
||||
mov r1, sp
|
||||
movs r2, 0x8
|
||||
bl SendBlock
|
||||
b _0801DB3E
|
||||
.pool
|
||||
_0801DAC8:
|
||||
bl IsLinkTaskFinished
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _0801DB5E
|
||||
ldrb r0, [r4, 0x4]
|
||||
bl sub_801D954
|
||||
cmp r0, 0
|
||||
beq _0801DB5E
|
||||
ldrb r0, [r4, 0x4]
|
||||
bl sub_801D978
|
||||
ldrh r1, [r4, 0x10]
|
||||
lsls r0, r1, 6
|
||||
subs r0, r1
|
||||
lsls r3, r0, 2
|
||||
ldrh r0, [r4, 0x14]
|
||||
subs r0, r3
|
||||
cmp r0, 0xFC
|
||||
bhi _0801DB08
|
||||
ldr r1, [r4, 0x1C]
|
||||
adds r1, r3
|
||||
lsls r2, r0, 16
|
||||
lsrs r2, 16
|
||||
movs r0, 0
|
||||
bl SendBlock
|
||||
ldrh r0, [r4, 0x10]
|
||||
adds r0, 0x1
|
||||
strh r0, [r4, 0x10]
|
||||
b _0801DB3E
|
||||
_0801DB08:
|
||||
ldr r1, [r4, 0x1C]
|
||||
adds r1, r3
|
||||
movs r0, 0
|
||||
movs r2, 0xFC
|
||||
bl SendBlock
|
||||
ldrh r0, [r4, 0x10]
|
||||
adds r0, 0x1
|
||||
strh r0, [r4, 0x10]
|
||||
b _0801DB5E
|
||||
_0801DB1C:
|
||||
bl IsLinkTaskFinished
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _0801DB5E
|
||||
ldr r0, [r4, 0x1C]
|
||||
ldrh r1, [r4, 0x14]
|
||||
bl CalcCRC16WithTable
|
||||
lsls r0, 16
|
||||
lsrs r0, 16
|
||||
ldrh r1, [r4, 0x12]
|
||||
cmp r0, r1
|
||||
beq _0801DB3E
|
||||
bl sub_8010198
|
||||
b _0801DB5E
|
||||
_0801DB3E:
|
||||
ldr r0, [r4]
|
||||
adds r0, 0x1
|
||||
str r0, [r4]
|
||||
b _0801DB5E
|
||||
_0801DB46:
|
||||
ldrb r0, [r4, 0x4]
|
||||
bl sub_801D954
|
||||
cmp r0, 0
|
||||
beq _0801DB5E
|
||||
ldrb r0, [r4, 0x4]
|
||||
bl sub_801D978
|
||||
movs r0, 0
|
||||
str r0, [r4]
|
||||
movs r0, 0x1
|
||||
b _0801DB60
|
||||
_0801DB5E:
|
||||
movs r0, 0
|
||||
_0801DB60:
|
||||
add sp, 0x8
|
||||
pop {r4,r5}
|
||||
pop {r1}
|
||||
bx r1
|
||||
thumb_func_end sub_801DA5C
|
||||
|
||||
.align 2, 0 @ don't pad with nop
|
||||
@@ -1,567 +0,0 @@
|
||||
.include "asm/macros.inc"
|
||||
.include "constants/constants.inc"
|
||||
|
||||
.syntax unified
|
||||
|
||||
.text
|
||||
|
||||
thumb_func_start mevent_srv_ish_do_init
|
||||
mevent_srv_ish_do_init: @ 801D484
|
||||
push {r4,r5,lr}
|
||||
adds r5, r0, 0
|
||||
ldr r4, =s_mevent_srv_ish_ptr
|
||||
movs r0, 0x50
|
||||
bl AllocZeroed
|
||||
str r0, [r4]
|
||||
movs r1, 0x1
|
||||
movs r2, 0
|
||||
bl mevent_srv_ish_init
|
||||
ldr r0, [r4]
|
||||
str r5, [r0, 0x4C]
|
||||
pop {r4,r5}
|
||||
pop {r0}
|
||||
bx r0
|
||||
.pool
|
||||
thumb_func_end mevent_srv_ish_do_init
|
||||
|
||||
thumb_func_start mevent_srv_ish_do_exec
|
||||
mevent_srv_ish_do_exec: @ 801D4A8
|
||||
push {r4-r6,lr}
|
||||
adds r6, r0, 0
|
||||
ldr r4, =s_mevent_srv_ish_ptr
|
||||
ldr r0, [r4]
|
||||
cmp r0, 0
|
||||
bne _0801D4BC
|
||||
movs r0, 0x6
|
||||
b _0801D4DC
|
||||
.pool
|
||||
_0801D4BC:
|
||||
bl mevent_srv_ish_exec
|
||||
adds r5, r0, 0
|
||||
cmp r5, 0x6
|
||||
bne _0801D4DA
|
||||
ldr r0, [r4]
|
||||
ldr r1, [r0, 0x4]
|
||||
strh r1, [r6]
|
||||
bl mevent_srv_ish_free_resources
|
||||
ldr r0, [r4]
|
||||
bl Free
|
||||
movs r0, 0
|
||||
str r0, [r4]
|
||||
_0801D4DA:
|
||||
adds r0, r5, 0
|
||||
_0801D4DC:
|
||||
pop {r4-r6}
|
||||
pop {r1}
|
||||
bx r1
|
||||
thumb_func_end mevent_srv_ish_do_exec
|
||||
|
||||
thumb_func_start mevent_srv_ish_inc_flag
|
||||
mevent_srv_ish_inc_flag: @ 801D4E4
|
||||
ldr r0, =s_mevent_srv_ish_ptr
|
||||
ldr r1, [r0]
|
||||
ldr r0, [r1, 0xC]
|
||||
adds r0, 0x1
|
||||
str r0, [r1, 0xC]
|
||||
bx lr
|
||||
.pool
|
||||
thumb_func_end mevent_srv_ish_inc_flag
|
||||
|
||||
thumb_func_start mevent_srv_ish_get_buffer
|
||||
mevent_srv_ish_get_buffer: @ 801D4F4
|
||||
ldr r0, =s_mevent_srv_ish_ptr
|
||||
ldr r0, [r0]
|
||||
ldr r0, [r0, 0x20]
|
||||
bx lr
|
||||
.pool
|
||||
thumb_func_end mevent_srv_ish_get_buffer
|
||||
|
||||
thumb_func_start mevent_srv_ish_set_param
|
||||
mevent_srv_ish_set_param: @ 801D500
|
||||
ldr r1, =s_mevent_srv_ish_ptr
|
||||
ldr r1, [r1]
|
||||
str r0, [r1, 0x4]
|
||||
bx lr
|
||||
.pool
|
||||
thumb_func_end mevent_srv_ish_set_param
|
||||
|
||||
thumb_func_start mevent_srv_ish_init
|
||||
mevent_srv_ish_init: @ 801D50C
|
||||
push {r4-r6,lr}
|
||||
mov r6, r8
|
||||
push {r6}
|
||||
adds r4, r0, 0
|
||||
adds r6, r1, 0
|
||||
mov r8, r2
|
||||
movs r0, 0
|
||||
str r0, [r4]
|
||||
str r0, [r4, 0x8]
|
||||
str r0, [r4, 0xC]
|
||||
movs r5, 0x80
|
||||
lsls r5, 3
|
||||
adds r0, r5, 0
|
||||
bl AllocZeroed
|
||||
str r0, [r4, 0x14]
|
||||
adds r0, r5, 0
|
||||
bl AllocZeroed
|
||||
str r0, [r4, 0x18]
|
||||
adds r0, r5, 0
|
||||
bl AllocZeroed
|
||||
str r0, [r4, 0x1C]
|
||||
movs r0, 0x40
|
||||
bl AllocZeroed
|
||||
str r0, [r4, 0x20]
|
||||
adds r4, 0x24
|
||||
adds r0, r4, 0
|
||||
adds r1, r6, 0
|
||||
mov r2, r8
|
||||
bl sub_801D8D8
|
||||
pop {r3}
|
||||
mov r8, r3
|
||||
pop {r4-r6}
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end mevent_srv_ish_init
|
||||
|
||||
thumb_func_start mevent_srv_ish_free_resources
|
||||
mevent_srv_ish_free_resources: @ 801D55C
|
||||
push {r4,lr}
|
||||
adds r4, r0, 0
|
||||
ldr r0, [r4, 0x14]
|
||||
bl Free
|
||||
ldr r0, [r4, 0x18]
|
||||
bl Free
|
||||
ldr r0, [r4, 0x1C]
|
||||
bl Free
|
||||
ldr r0, [r4, 0x20]
|
||||
bl Free
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end mevent_srv_ish_free_resources
|
||||
|
||||
thumb_func_start mevent_srv_ish_jmp_buffer
|
||||
mevent_srv_ish_jmp_buffer: @ 801D580
|
||||
push {r4,lr}
|
||||
adds r4, r0, 0
|
||||
ldr r0, [r4, 0x1C]
|
||||
ldr r1, [r4, 0x18]
|
||||
movs r2, 0x80
|
||||
lsls r2, 3
|
||||
bl memcpy
|
||||
movs r0, 0
|
||||
str r0, [r4, 0x10]
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end mevent_srv_ish_jmp_buffer
|
||||
|
||||
thumb_func_start sub_801D59C
|
||||
sub_801D59C: @ 801D59C
|
||||
push {r4-r6,lr}
|
||||
sub sp, 0x4
|
||||
adds r4, r0, 0
|
||||
adds r6, r1, 0
|
||||
adds r5, r2, 0
|
||||
movs r0, 0
|
||||
str r0, [sp]
|
||||
ldr r1, [r4, 0x14]
|
||||
ldr r2, =0x05000100
|
||||
mov r0, sp
|
||||
bl CpuSet
|
||||
ldr r2, [r4, 0x14]
|
||||
str r5, [r2]
|
||||
adds r4, 0x24
|
||||
adds r0, r4, 0
|
||||
adds r1, r6, 0
|
||||
movs r3, 0x4
|
||||
bl sub_801D904
|
||||
add sp, 0x4
|
||||
pop {r4-r6}
|
||||
pop {r0}
|
||||
bx r0
|
||||
.pool
|
||||
thumb_func_end sub_801D59C
|
||||
|
||||
thumb_func_start sub_801D5D0
|
||||
sub_801D5D0: @ 801D5D0
|
||||
push {r4,lr}
|
||||
adds r4, r0, 0
|
||||
ldr r0, [r4, 0x1C]
|
||||
ldr r1, =gUnknown_082F2598
|
||||
movs r2, 0x80
|
||||
lsls r2, 3
|
||||
bl memcpy
|
||||
movs r1, 0
|
||||
str r1, [r4, 0x10]
|
||||
movs r0, 0x4
|
||||
str r0, [r4, 0x8]
|
||||
str r1, [r4, 0xC]
|
||||
movs r0, 0
|
||||
pop {r4}
|
||||
pop {r1}
|
||||
bx r1
|
||||
.pool
|
||||
thumb_func_end sub_801D5D0
|
||||
|
||||
thumb_func_start sub_801D5F8
|
||||
sub_801D5F8: @ 801D5F8
|
||||
movs r0, 0x6
|
||||
bx lr
|
||||
thumb_func_end sub_801D5F8
|
||||
|
||||
thumb_func_start sub_801D5FC
|
||||
sub_801D5FC: @ 801D5FC
|
||||
push {r4,lr}
|
||||
adds r4, r0, 0
|
||||
adds r0, 0x24
|
||||
bl sub_801D8C0
|
||||
cmp r0, 0
|
||||
beq _0801D612
|
||||
movs r0, 0x4
|
||||
str r0, [r4, 0x8]
|
||||
movs r0, 0
|
||||
str r0, [r4, 0xC]
|
||||
_0801D612:
|
||||
movs r0, 0x1
|
||||
pop {r4}
|
||||
pop {r1}
|
||||
bx r1
|
||||
thumb_func_end sub_801D5FC
|
||||
|
||||
thumb_func_start sub_801D61C
|
||||
sub_801D61C: @ 801D61C
|
||||
push {r4,lr}
|
||||
adds r4, r0, 0
|
||||
adds r0, 0x24
|
||||
bl sub_801D8CC
|
||||
cmp r0, 0
|
||||
beq _0801D632
|
||||
movs r0, 0x4
|
||||
str r0, [r4, 0x8]
|
||||
movs r0, 0
|
||||
str r0, [r4, 0xC]
|
||||
_0801D632:
|
||||
movs r0, 0x1
|
||||
pop {r4}
|
||||
pop {r1}
|
||||
bx r1
|
||||
thumb_func_end sub_801D61C
|
||||
|
||||
thumb_func_start sub_801D63C
|
||||
sub_801D63C: @ 801D63C
|
||||
push {r4,lr}
|
||||
adds r4, r0, 0
|
||||
ldr r0, [r4, 0x10]
|
||||
lsls r2, r0, 3
|
||||
ldr r1, [r4, 0x1C]
|
||||
adds r2, r1, r2
|
||||
adds r0, 0x1
|
||||
str r0, [r4, 0x10]
|
||||
ldr r0, [r2]
|
||||
cmp r0, 0x15
|
||||
bls _0801D654
|
||||
b _0801D804
|
||||
_0801D654:
|
||||
lsls r0, 2
|
||||
ldr r1, =_0801D664
|
||||
adds r0, r1
|
||||
ldr r0, [r0]
|
||||
mov pc, r0
|
||||
.pool
|
||||
.align 2, 0
|
||||
_0801D664:
|
||||
.4byte _0801D804
|
||||
.4byte _0801D6BC
|
||||
.4byte _0801D6C4
|
||||
.4byte _0801D6D4
|
||||
.4byte _0801D70E
|
||||
.4byte _0801D716
|
||||
.4byte _0801D6FE
|
||||
.4byte _0801D708
|
||||
.4byte _0801D764
|
||||
.4byte _0801D790
|
||||
.4byte _0801D788
|
||||
.4byte _0801D72C
|
||||
.4byte _0801D742
|
||||
.4byte _0801D758
|
||||
.4byte _0801D77C
|
||||
.4byte _0801D7B8
|
||||
.4byte _0801D7BC
|
||||
.4byte _0801D7C4
|
||||
.4byte _0801D7D0
|
||||
.4byte _0801D6EA
|
||||
.4byte _0801D6D8
|
||||
.4byte _0801D7F0
|
||||
_0801D6BC:
|
||||
ldr r0, [r2, 0x4]
|
||||
str r0, [r4, 0x4]
|
||||
movs r0, 0x1
|
||||
b _0801D7FE
|
||||
_0801D6C4:
|
||||
adds r0, r4, 0
|
||||
adds r0, 0x24
|
||||
ldr r1, [r2, 0x4]
|
||||
ldr r2, [r4, 0x18]
|
||||
bl sub_801D928
|
||||
movs r0, 0x2
|
||||
b _0801D7FE
|
||||
_0801D6D4:
|
||||
movs r0, 0x3
|
||||
b _0801D7FE
|
||||
_0801D6D8:
|
||||
adds r0, r4, 0
|
||||
adds r0, 0x24
|
||||
ldr r2, [r4, 0x14]
|
||||
movs r1, 0x14
|
||||
movs r3, 0
|
||||
bl sub_801D904
|
||||
movs r0, 0x3
|
||||
b _0801D7FE
|
||||
_0801D6EA:
|
||||
ldrb r0, [r2, 0x4]
|
||||
bl GetGameStat
|
||||
adds r2, r0, 0
|
||||
adds r0, r4, 0
|
||||
movs r1, 0x12
|
||||
bl sub_801D59C
|
||||
movs r0, 0x3
|
||||
b _0801D7FE
|
||||
_0801D6FE:
|
||||
ldr r0, [r4, 0x4]
|
||||
cmp r0, 0
|
||||
beq _0801D706
|
||||
b _0801D804
|
||||
_0801D706:
|
||||
b _0801D70E
|
||||
_0801D708:
|
||||
ldr r0, [r4, 0x4]
|
||||
cmp r0, 0x1
|
||||
bne _0801D804
|
||||
_0801D70E:
|
||||
adds r0, r4, 0
|
||||
bl mevent_srv_ish_jmp_buffer
|
||||
b _0801D804
|
||||
_0801D716:
|
||||
ldr r0, [r4, 0x20]
|
||||
ldr r1, [r4, 0x18]
|
||||
movs r2, 0x40
|
||||
bl memcpy
|
||||
movs r0, 0x5
|
||||
str r0, [r4, 0x8]
|
||||
movs r0, 0
|
||||
str r0, [r4, 0xC]
|
||||
movs r0, 0x2
|
||||
b _0801D806
|
||||
_0801D72C:
|
||||
ldr r0, [r4, 0x20]
|
||||
ldr r1, [r4, 0x18]
|
||||
movs r2, 0x40
|
||||
bl memcpy
|
||||
movs r0, 0x5
|
||||
str r0, [r4, 0x8]
|
||||
movs r0, 0
|
||||
str r0, [r4, 0xC]
|
||||
movs r0, 0x3
|
||||
b _0801D806
|
||||
_0801D742:
|
||||
ldr r0, [r4, 0x20]
|
||||
ldr r1, [r4, 0x18]
|
||||
movs r2, 0x40
|
||||
bl memcpy
|
||||
movs r0, 0x5
|
||||
str r0, [r4, 0x8]
|
||||
movs r0, 0
|
||||
str r0, [r4, 0xC]
|
||||
movs r0, 0x5
|
||||
b _0801D806
|
||||
_0801D758:
|
||||
movs r0, 0x5
|
||||
str r0, [r4, 0x8]
|
||||
movs r0, 0
|
||||
str r0, [r4, 0xC]
|
||||
movs r0, 0x4
|
||||
b _0801D806
|
||||
_0801D764:
|
||||
ldr r0, [r4, 0x14]
|
||||
ldr r1, [r4, 0x4C]
|
||||
bl sub_801B580
|
||||
adds r0, r4, 0
|
||||
adds r0, 0x24
|
||||
ldr r2, [r4, 0x14]
|
||||
movs r1, 0x11
|
||||
movs r3, 0x64
|
||||
bl sub_801D904
|
||||
b _0801D804
|
||||
_0801D77C:
|
||||
ldr r2, [r4, 0x4]
|
||||
adds r0, r4, 0
|
||||
movs r1, 0x13
|
||||
bl sub_801D59C
|
||||
b _0801D804
|
||||
_0801D788:
|
||||
ldr r0, [r4, 0x18]
|
||||
bl sub_801B21C
|
||||
b _0801D804
|
||||
_0801D790:
|
||||
ldr r0, [r4, 0x18]
|
||||
bl sub_801B1A4
|
||||
cmp r0, 0
|
||||
bne _0801D7AC
|
||||
ldr r0, [r4, 0x18]
|
||||
bl sub_801B078
|
||||
adds r0, r4, 0
|
||||
movs r1, 0x13
|
||||
movs r2, 0
|
||||
bl sub_801D59C
|
||||
b _0801D804
|
||||
_0801D7AC:
|
||||
adds r0, r4, 0
|
||||
movs r1, 0x13
|
||||
movs r2, 0x1
|
||||
bl sub_801D59C
|
||||
b _0801D804
|
||||
_0801D7B8:
|
||||
movs r0, 0x6
|
||||
b _0801D7FE
|
||||
_0801D7BC:
|
||||
ldr r0, [r4, 0x18]
|
||||
bl sub_801B508
|
||||
b _0801D804
|
||||
_0801D7C4:
|
||||
ldr r0, [r4, 0x18]
|
||||
movs r1, 0xFA
|
||||
lsls r1, 2
|
||||
bl sub_80992A0
|
||||
b _0801D804
|
||||
_0801D7D0:
|
||||
ldr r0, =gSaveBlock2Ptr
|
||||
ldr r0, [r0]
|
||||
ldr r1, =0x00000bec
|
||||
adds r0, r1
|
||||
ldr r1, [r4, 0x18]
|
||||
movs r2, 0xBC
|
||||
bl memcpy
|
||||
bl ValidateEReaderTrainer
|
||||
b _0801D804
|
||||
.pool
|
||||
_0801D7F0:
|
||||
ldr r0, =gDecompressionBuffer
|
||||
ldr r1, [r4, 0x18]
|
||||
movs r2, 0x80
|
||||
lsls r2, 3
|
||||
bl memcpy
|
||||
movs r0, 0x7
|
||||
_0801D7FE:
|
||||
str r0, [r4, 0x8]
|
||||
movs r0, 0
|
||||
str r0, [r4, 0xC]
|
||||
_0801D804:
|
||||
movs r0, 0x1
|
||||
_0801D806:
|
||||
pop {r4}
|
||||
pop {r1}
|
||||
bx r1
|
||||
.pool
|
||||
thumb_func_end sub_801D63C
|
||||
|
||||
thumb_func_start sub_801D810
|
||||
sub_801D810: @ 801D810
|
||||
push {lr}
|
||||
adds r1, r0, 0
|
||||
ldr r0, [r1, 0xC]
|
||||
cmp r0, 0
|
||||
beq _0801D822
|
||||
movs r0, 0x4
|
||||
str r0, [r1, 0x8]
|
||||
movs r0, 0
|
||||
str r0, [r1, 0xC]
|
||||
_0801D822:
|
||||
movs r0, 0x1
|
||||
pop {r1}
|
||||
bx r1
|
||||
thumb_func_end sub_801D810
|
||||
|
||||
thumb_func_start sub_801D828
|
||||
sub_801D828: @ 801D828
|
||||
push {r4,lr}
|
||||
adds r4, r0, 0
|
||||
ldr r0, [r4, 0xC]
|
||||
cmp r0, 0
|
||||
beq _0801D838
|
||||
cmp r0, 0x1
|
||||
beq _0801D846
|
||||
b _0801D858
|
||||
_0801D838:
|
||||
ldr r0, [r4, 0x18]
|
||||
bl sub_8153870
|
||||
ldr r0, [r4, 0xC]
|
||||
adds r0, 0x1
|
||||
str r0, [r4, 0xC]
|
||||
b _0801D858
|
||||
_0801D846:
|
||||
adds r0, r4, 0x4
|
||||
bl sub_8153884
|
||||
adds r1, r0, 0
|
||||
cmp r1, 0
|
||||
bne _0801D858
|
||||
movs r0, 0x4
|
||||
str r0, [r4, 0x8]
|
||||
str r1, [r4, 0xC]
|
||||
_0801D858:
|
||||
movs r0, 0x1
|
||||
pop {r4}
|
||||
pop {r1}
|
||||
bx r1
|
||||
thumb_func_end sub_801D828
|
||||
|
||||
thumb_func_start sub_801D860
|
||||
sub_801D860: @ 801D860
|
||||
push {r4,lr}
|
||||
adds r4, r0, 0
|
||||
ldr r3, =gDecompressionBuffer
|
||||
adds r0, r4, 0x4
|
||||
ldr r1, =gSaveBlock2Ptr
|
||||
ldr r1, [r1]
|
||||
ldr r2, =gSaveBlock1Ptr
|
||||
ldr r2, [r2]
|
||||
bl _call_via_r3
|
||||
cmp r0, 0x1
|
||||
bne _0801D880
|
||||
movs r0, 0x4
|
||||
str r0, [r4, 0x8]
|
||||
movs r0, 0
|
||||
str r0, [r4, 0xC]
|
||||
_0801D880:
|
||||
movs r0, 0x1
|
||||
pop {r4}
|
||||
pop {r1}
|
||||
bx r1
|
||||
.pool
|
||||
thumb_func_end sub_801D860
|
||||
|
||||
thumb_func_start mevent_srv_ish_exec
|
||||
mevent_srv_ish_exec: @ 801D894
|
||||
push {r4,r5,lr}
|
||||
sub sp, 0x20
|
||||
mov r2, sp
|
||||
ldr r1, =gUnknown_082F255C
|
||||
ldm r1!, {r3-r5}
|
||||
stm r2!, {r3-r5}
|
||||
ldm r1!, {r3-r5}
|
||||
stm r2!, {r3-r5}
|
||||
ldm r1!, {r3,r4}
|
||||
stm r2!, {r3,r4}
|
||||
ldr r1, [r0, 0x8]
|
||||
lsls r1, 2
|
||||
add r1, sp
|
||||
ldr r1, [r1]
|
||||
bl _call_via_r1
|
||||
add sp, 0x20
|
||||
pop {r4,r5}
|
||||
pop {r1}
|
||||
bx r1
|
||||
.pool
|
||||
thumb_func_end mevent_srv_ish_exec
|
||||
|
||||
.align 2, 0 @ don't pad with nop
|
||||
1249
asm/pokemon_jump.s
1249
asm/pokemon_jump.s
File diff suppressed because it is too large
Load Diff
18699
asm/pokenav.s
18699
asm/pokenav.s
File diff suppressed because it is too large
Load Diff
864
asm/pokenav_unk_1.s
Normal file
864
asm/pokenav_unk_1.s
Normal file
@@ -0,0 +1,864 @@
|
||||
.include "asm/macros.inc"
|
||||
.include "constants/constants.inc"
|
||||
|
||||
.syntax unified
|
||||
|
||||
@ File centered around AllocSubstruct(1)
|
||||
|
||||
thumb_func_start sub_81C9268
|
||||
sub_81C9268: @ 81C9268
|
||||
push {r4,lr}
|
||||
movs r4, 0
|
||||
movs r0, 0x98
|
||||
lsls r0, 1
|
||||
bl FlagGet
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _081C928A
|
||||
movs r4, 0x1
|
||||
ldr r0, =0x0000089b
|
||||
bl FlagGet
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _081C928A
|
||||
movs r4, 0x2
|
||||
_081C928A:
|
||||
adds r0, r4, 0
|
||||
pop {r4}
|
||||
pop {r1}
|
||||
bx r1
|
||||
.pool
|
||||
thumb_func_end sub_81C9268
|
||||
|
||||
thumb_func_start sub_81C9298
|
||||
sub_81C9298: @ 81C9298
|
||||
push {r4,lr}
|
||||
movs r0, 0x1
|
||||
movs r1, 0x10
|
||||
bl AllocSubstruct
|
||||
adds r4, r0, 0
|
||||
cmp r4, 0
|
||||
beq _081C92C4
|
||||
bl sub_81C9268
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
movs r1, 0
|
||||
strh r0, [r4]
|
||||
strh r1, [r4, 0x2]
|
||||
strh r1, [r4, 0x4]
|
||||
strh r1, [r4, 0x6]
|
||||
adds r0, r4, 0
|
||||
bl sub_81C939C
|
||||
movs r0, 0x1
|
||||
b _081C92C6
|
||||
_081C92C4:
|
||||
movs r0, 0
|
||||
_081C92C6:
|
||||
pop {r4}
|
||||
pop {r1}
|
||||
bx r1
|
||||
thumb_func_end sub_81C9298
|
||||
|
||||
thumb_func_start sub_81C92CC
|
||||
sub_81C92CC: @ 81C92CC
|
||||
push {r4,lr}
|
||||
movs r0, 0x1
|
||||
movs r1, 0x10
|
||||
bl AllocSubstruct
|
||||
adds r4, r0, 0
|
||||
cmp r4, 0
|
||||
beq _081C92FA
|
||||
bl sub_81C9268
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
movs r1, 0
|
||||
strh r0, [r4]
|
||||
movs r0, 0x2
|
||||
strh r0, [r4, 0x2]
|
||||
strh r0, [r4, 0x4]
|
||||
strh r1, [r4, 0x6]
|
||||
adds r0, r4, 0
|
||||
bl sub_81C939C
|
||||
movs r0, 0x1
|
||||
b _081C92FC
|
||||
_081C92FA:
|
||||
movs r0, 0
|
||||
_081C92FC:
|
||||
pop {r4}
|
||||
pop {r1}
|
||||
bx r1
|
||||
thumb_func_end sub_81C92CC
|
||||
|
||||
thumb_func_start sub_81C9304
|
||||
sub_81C9304: @ 81C9304
|
||||
push {r4,lr}
|
||||
movs r0, 0x1
|
||||
movs r1, 0x10
|
||||
bl AllocSubstruct
|
||||
adds r4, r0, 0
|
||||
cmp r4, 0
|
||||
beq _081C932E
|
||||
bl sub_81C9268
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r4]
|
||||
movs r0, 0x3
|
||||
strh r0, [r4, 0x2]
|
||||
strh r0, [r4, 0x4]
|
||||
adds r0, r4, 0
|
||||
bl sub_81C939C
|
||||
movs r0, 0x1
|
||||
b _081C9330
|
||||
_081C932E:
|
||||
movs r0, 0
|
||||
_081C9330:
|
||||
pop {r4}
|
||||
pop {r1}
|
||||
bx r1
|
||||
thumb_func_end sub_81C9304
|
||||
|
||||
thumb_func_start sub_81C9338
|
||||
sub_81C9338: @ 81C9338
|
||||
push {lr}
|
||||
movs r0, 0x1
|
||||
movs r1, 0x10
|
||||
bl AllocSubstruct
|
||||
adds r2, r0, 0
|
||||
cmp r2, 0
|
||||
beq _081C9360
|
||||
movs r0, 0
|
||||
movs r1, 0x3
|
||||
strh r1, [r2]
|
||||
strh r0, [r2, 0x2]
|
||||
movs r1, 0x5
|
||||
strh r1, [r2, 0x4]
|
||||
strh r0, [r2, 0x6]
|
||||
adds r0, r2, 0
|
||||
bl sub_81C939C
|
||||
movs r0, 0x1
|
||||
b _081C9362
|
||||
_081C9360:
|
||||
movs r0, 0
|
||||
_081C9362:
|
||||
pop {r1}
|
||||
bx r1
|
||||
thumb_func_end sub_81C9338
|
||||
|
||||
thumb_func_start sub_81C9368
|
||||
sub_81C9368: @ 81C9368
|
||||
push {r4,r5,lr}
|
||||
movs r0, 0x1
|
||||
movs r1, 0x10
|
||||
bl AllocSubstruct
|
||||
adds r5, r0, 0
|
||||
cmp r5, 0
|
||||
beq _081C9394
|
||||
movs r4, 0
|
||||
movs r0, 0x4
|
||||
strh r0, [r5]
|
||||
bl sub_81C76AC
|
||||
strh r0, [r5, 0x2]
|
||||
adds r0, 0x8
|
||||
strh r0, [r5, 0x4]
|
||||
strh r4, [r5, 0x6]
|
||||
adds r0, r5, 0
|
||||
bl sub_81C939C
|
||||
movs r0, 0x1
|
||||
b _081C9396
|
||||
_081C9394:
|
||||
movs r0, 0
|
||||
_081C9396:
|
||||
pop {r4,r5}
|
||||
pop {r1}
|
||||
bx r1
|
||||
thumb_func_end sub_81C9368
|
||||
|
||||
thumb_func_start sub_81C939C
|
||||
sub_81C939C: @ 81C939C
|
||||
push {r4,lr}
|
||||
adds r4, r0, 0
|
||||
ldrh r0, [r4]
|
||||
cmp r0, 0x4
|
||||
bhi _081C93E0
|
||||
lsls r0, 2
|
||||
ldr r1, =_081C93B4
|
||||
adds r0, r1
|
||||
ldr r0, [r0]
|
||||
mov pc, r0
|
||||
.pool
|
||||
.align 2, 0
|
||||
_081C93B4:
|
||||
.4byte _081C93C8
|
||||
.4byte _081C93CE
|
||||
.4byte _081C93CE
|
||||
.4byte _081C93D4
|
||||
.4byte _081C93DC
|
||||
_081C93C8:
|
||||
movs r0, 0
|
||||
bl SetPokenavMode
|
||||
_081C93CE:
|
||||
bl sub_81C93EC
|
||||
b _081C93DE
|
||||
_081C93D4:
|
||||
ldr r0, =sub_81C963C
|
||||
b _081C93DE
|
||||
.pool
|
||||
_081C93DC:
|
||||
ldr r0, =sub_81C96FC
|
||||
_081C93DE:
|
||||
str r0, [r4, 0xC]
|
||||
_081C93E0:
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
bx r0
|
||||
.pool
|
||||
thumb_func_end sub_81C939C
|
||||
|
||||
thumb_func_start sub_81C93EC
|
||||
sub_81C93EC: @ 81C93EC
|
||||
push {lr}
|
||||
bl GetPokenavMode
|
||||
cmp r0, 0x1
|
||||
beq _081C9408
|
||||
cmp r0, 0x1
|
||||
bcc _081C93FE
|
||||
cmp r0, 0x2
|
||||
beq _081C9410
|
||||
_081C93FE:
|
||||
ldr r0, =sub_81C943C
|
||||
b _081C9412
|
||||
.pool
|
||||
_081C9408:
|
||||
ldr r0, =sub_81C9520
|
||||
b _081C9412
|
||||
.pool
|
||||
_081C9410:
|
||||
ldr r0, =c2_pre_battle_1
|
||||
_081C9412:
|
||||
pop {r1}
|
||||
bx r1
|
||||
.pool
|
||||
thumb_func_end sub_81C93EC
|
||||
|
||||
thumb_func_start sub_81C941C
|
||||
sub_81C941C: @ 81C941C
|
||||
push {lr}
|
||||
movs r0, 0x1
|
||||
bl GetSubstructPtr
|
||||
ldr r1, [r0, 0xC]
|
||||
bl _call_via_r1
|
||||
pop {r1}
|
||||
bx r1
|
||||
thumb_func_end sub_81C941C
|
||||
|
||||
thumb_func_start sub_81C9430
|
||||
sub_81C9430: @ 81C9430
|
||||
push {lr}
|
||||
movs r0, 0x1
|
||||
bl FreePokenavSubstruct
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_81C9430
|
||||
|
||||
thumb_func_start sub_81C943C
|
||||
sub_81C943C: @ 81C943C
|
||||
push {r4,r5,lr}
|
||||
adds r4, r0, 0
|
||||
bl sub_81C9814
|
||||
cmp r0, 0
|
||||
beq _081C944C
|
||||
movs r0, 0x1
|
||||
b _081C951A
|
||||
_081C944C:
|
||||
ldr r2, =gMain
|
||||
ldrh r1, [r2, 0x2E]
|
||||
movs r0, 0x1
|
||||
ands r0, r1
|
||||
adds r5, r2, 0
|
||||
cmp r0, 0
|
||||
beq _081C9508
|
||||
ldr r3, =gUnknown_0861FC59
|
||||
movs r0, 0x2
|
||||
ldrsh r1, [r4, r0]
|
||||
ldrh r2, [r4]
|
||||
lsls r0, r2, 1
|
||||
adds r0, r2
|
||||
lsls r0, 1
|
||||
adds r1, r0
|
||||
adds r1, r3
|
||||
ldrb r0, [r1]
|
||||
cmp r0, 0x4
|
||||
bhi _081C9508
|
||||
lsls r0, 2
|
||||
ldr r1, =_081C9488
|
||||
adds r0, r1
|
||||
ldr r0, [r0]
|
||||
mov pc, r0
|
||||
.pool
|
||||
.align 2, 0
|
||||
_081C9488:
|
||||
.4byte _081C949C
|
||||
.4byte _081C94BC
|
||||
.4byte _081C94D4
|
||||
.4byte _081C94E0
|
||||
.4byte _081C9516
|
||||
_081C949C:
|
||||
ldr r0, =gSaveBlock2Ptr
|
||||
ldr r0, [r0]
|
||||
ldrb r1, [r0, 0x15]
|
||||
movs r0, 0x8
|
||||
ands r0, r1
|
||||
movs r1, 0x1
|
||||
cmp r0, 0
|
||||
beq _081C94AE
|
||||
movs r1, 0x2
|
||||
_081C94AE:
|
||||
strh r1, [r4, 0x6]
|
||||
ldr r1, =0x000186a6
|
||||
b _081C94EE
|
||||
.pool
|
||||
_081C94BC:
|
||||
movs r1, 0
|
||||
movs r0, 0x3
|
||||
strh r0, [r4]
|
||||
strh r1, [r4, 0x2]
|
||||
ldrb r0, [r3, 0x12]
|
||||
strh r0, [r4, 0x4]
|
||||
ldr r0, =sub_81C963C
|
||||
str r0, [r4, 0xC]
|
||||
movs r0, 0x2
|
||||
b _081C951A
|
||||
.pool
|
||||
_081C94D4:
|
||||
movs r0, 0x6
|
||||
strh r0, [r4, 0x6]
|
||||
ldr r1, =0x000186ab
|
||||
b _081C94EE
|
||||
.pool
|
||||
_081C94E0:
|
||||
bl CanViewRibbonsMenu
|
||||
cmp r0, 0
|
||||
beq _081C94FC
|
||||
movs r0, 0x9
|
||||
strh r0, [r4, 0x6]
|
||||
ldr r1, =0x000186ac
|
||||
_081C94EE:
|
||||
adds r0, r4, 0
|
||||
bl sub_81C97B0
|
||||
movs r0, 0x8
|
||||
b _081C951A
|
||||
.pool
|
||||
_081C94FC:
|
||||
ldr r0, =sub_81C9600
|
||||
str r0, [r4, 0xC]
|
||||
movs r0, 0x6
|
||||
b _081C951A
|
||||
.pool
|
||||
_081C9508:
|
||||
ldrh r1, [r5, 0x2E]
|
||||
movs r0, 0x2
|
||||
ands r0, r1
|
||||
cmp r0, 0
|
||||
bne _081C9516
|
||||
movs r0, 0
|
||||
b _081C951A
|
||||
_081C9516:
|
||||
movs r0, 0x1
|
||||
negs r0, r0
|
||||
_081C951A:
|
||||
pop {r4,r5}
|
||||
pop {r1}
|
||||
bx r1
|
||||
thumb_func_end sub_81C943C
|
||||
|
||||
thumb_func_start sub_81C9520
|
||||
sub_81C9520: @ 81C9520
|
||||
push {r4,lr}
|
||||
adds r4, r0, 0
|
||||
bl sub_81C9814
|
||||
cmp r0, 0
|
||||
beq _081C9530
|
||||
movs r0, 0x1
|
||||
b _081C9580
|
||||
_081C9530:
|
||||
ldr r0, =gMain
|
||||
ldrh r1, [r0, 0x2E]
|
||||
movs r0, 0x1
|
||||
ands r0, r1
|
||||
cmp r0, 0
|
||||
beq _081C9570
|
||||
ldr r3, =gUnknown_0861FC59
|
||||
movs r0, 0x2
|
||||
ldrsh r1, [r4, r0]
|
||||
ldrh r2, [r4]
|
||||
lsls r0, r2, 1
|
||||
adds r0, r2
|
||||
lsls r0, 1
|
||||
adds r1, r0
|
||||
adds r1, r3
|
||||
ldrb r0, [r1]
|
||||
cmp r0, 0x2
|
||||
bne _081C9578
|
||||
movs r0, 0x6
|
||||
strh r0, [r4, 0x6]
|
||||
ldr r1, =0x000186ab
|
||||
adds r0, r4, 0
|
||||
bl sub_81C97B0
|
||||
movs r0, 0x8
|
||||
b _081C9580
|
||||
.pool
|
||||
_081C9570:
|
||||
movs r0, 0x2
|
||||
ands r0, r1
|
||||
cmp r0, 0
|
||||
beq _081C957E
|
||||
_081C9578:
|
||||
movs r0, 0x20
|
||||
bl PlaySE
|
||||
_081C957E:
|
||||
movs r0, 0
|
||||
_081C9580:
|
||||
pop {r4}
|
||||
pop {r1}
|
||||
bx r1
|
||||
thumb_func_end sub_81C9520
|
||||
|
||||
thumb_func_start c2_pre_battle_1
|
||||
c2_pre_battle_1: @ 81C9588
|
||||
push {r4,lr}
|
||||
adds r4, r0, 0
|
||||
bl sub_81C9814
|
||||
cmp r0, 0
|
||||
beq _081C9598
|
||||
movs r0, 0x1
|
||||
b _081C95F8
|
||||
_081C9598:
|
||||
ldr r0, =gMain
|
||||
ldrh r1, [r0, 0x2E]
|
||||
movs r0, 0x1
|
||||
ands r0, r1
|
||||
cmp r0, 0
|
||||
beq _081C95E8
|
||||
ldr r3, =gUnknown_0861FC59
|
||||
movs r0, 0x2
|
||||
ldrsh r1, [r4, r0]
|
||||
ldrh r2, [r4]
|
||||
lsls r0, r2, 1
|
||||
adds r0, r2
|
||||
lsls r0, 1
|
||||
adds r1, r0
|
||||
adds r1, r3
|
||||
ldrb r0, [r1]
|
||||
cmp r0, 0x2
|
||||
beq _081C95D4
|
||||
cmp r0, 0x4
|
||||
beq _081C95F4
|
||||
movs r0, 0x20
|
||||
bl PlaySE
|
||||
movs r0, 0
|
||||
b _081C95F8
|
||||
.pool
|
||||
_081C95D4:
|
||||
movs r0, 0x6
|
||||
strh r0, [r4, 0x6]
|
||||
ldr r1, =0x000186ab
|
||||
adds r0, r4, 0
|
||||
bl sub_81C97B0
|
||||
movs r0, 0x8
|
||||
b _081C95F8
|
||||
.pool
|
||||
_081C95E8:
|
||||
movs r0, 0x2
|
||||
ands r0, r1
|
||||
cmp r0, 0
|
||||
bne _081C95F4
|
||||
movs r0, 0
|
||||
b _081C95F8
|
||||
_081C95F4:
|
||||
movs r0, 0x1
|
||||
negs r0, r0
|
||||
_081C95F8:
|
||||
pop {r4}
|
||||
pop {r1}
|
||||
bx r1
|
||||
thumb_func_end c2_pre_battle_1
|
||||
|
||||
thumb_func_start sub_81C9600
|
||||
sub_81C9600: @ 81C9600
|
||||
push {r4,lr}
|
||||
adds r4, r0, 0
|
||||
bl sub_81C9814
|
||||
cmp r0, 0
|
||||
beq _081C9616
|
||||
bl sub_81C93EC
|
||||
str r0, [r4, 0xC]
|
||||
movs r0, 0x1
|
||||
b _081C9634
|
||||
_081C9616:
|
||||
ldr r0, =gMain
|
||||
ldrh r1, [r0, 0x2E]
|
||||
movs r0, 0x3
|
||||
ands r0, r1
|
||||
cmp r0, 0
|
||||
bne _081C962C
|
||||
movs r0, 0
|
||||
b _081C9634
|
||||
.pool
|
||||
_081C962C:
|
||||
bl sub_81C93EC
|
||||
str r0, [r4, 0xC]
|
||||
movs r0, 0x7
|
||||
_081C9634:
|
||||
pop {r4}
|
||||
pop {r1}
|
||||
bx r1
|
||||
thumb_func_end sub_81C9600
|
||||
|
||||
thumb_func_start sub_81C963C
|
||||
sub_81C963C: @ 81C963C
|
||||
push {r4-r6,lr}
|
||||
adds r4, r0, 0
|
||||
bl sub_81C9814
|
||||
adds r3, r0, 0
|
||||
cmp r3, 0
|
||||
beq _081C964E
|
||||
movs r0, 0x1
|
||||
b _081C96F6
|
||||
_081C964E:
|
||||
ldr r2, =gMain
|
||||
ldrh r1, [r2, 0x2E]
|
||||
movs r0, 0x1
|
||||
ands r0, r1
|
||||
adds r6, r2, 0
|
||||
cmp r0, 0
|
||||
beq _081C96B8
|
||||
ldr r5, =gUnknown_0861FC59
|
||||
movs r1, 0x2
|
||||
ldrsh r0, [r4, r1]
|
||||
ldrh r2, [r4]
|
||||
lsls r1, r2, 1
|
||||
adds r1, r2
|
||||
lsls r1, 1
|
||||
adds r0, r1
|
||||
adds r0, r5
|
||||
ldrb r0, [r0]
|
||||
cmp r0, 0x6
|
||||
beq _081C968E
|
||||
cmp r0, 0x6
|
||||
bgt _081C9688
|
||||
cmp r0, 0x5
|
||||
beq _081C96A4
|
||||
b _081C96B8
|
||||
.pool
|
||||
_081C9688:
|
||||
cmp r0, 0x7
|
||||
beq _081C96E4
|
||||
b _081C96B8
|
||||
_081C968E:
|
||||
movs r0, 0x4
|
||||
strh r0, [r4]
|
||||
strh r3, [r4, 0x2]
|
||||
ldrb r0, [r5, 0x18]
|
||||
strh r0, [r4, 0x4]
|
||||
ldr r0, =sub_81C96FC
|
||||
str r0, [r4, 0xC]
|
||||
movs r0, 0x4
|
||||
b _081C96F6
|
||||
.pool
|
||||
_081C96A4:
|
||||
strh r3, [r4, 0x6]
|
||||
ldr r1, =0x000186a7
|
||||
adds r0, r4, 0
|
||||
bl sub_81C97B0
|
||||
movs r0, 0x8
|
||||
b _081C96F6
|
||||
.pool
|
||||
_081C96B8:
|
||||
ldrh r1, [r6, 0x2E]
|
||||
movs r0, 0x2
|
||||
ands r0, r1
|
||||
cmp r0, 0
|
||||
beq _081C96F4
|
||||
movs r0, 0x2
|
||||
ldrsh r2, [r4, r0]
|
||||
ldr r1, =gUnknown_0861FC54
|
||||
ldrh r0, [r4]
|
||||
adds r0, r1
|
||||
ldrb r0, [r0]
|
||||
cmp r2, r0
|
||||
beq _081C96E4
|
||||
strh r0, [r4, 0x2]
|
||||
ldr r0, =sub_81C9798
|
||||
str r0, [r4, 0xC]
|
||||
movs r0, 0x1
|
||||
b _081C96F6
|
||||
.pool
|
||||
_081C96E4:
|
||||
movs r0, 0x5
|
||||
bl PlaySE
|
||||
adds r0, r4, 0
|
||||
bl sub_81C97C0
|
||||
movs r0, 0x3
|
||||
b _081C96F6
|
||||
_081C96F4:
|
||||
movs r0, 0
|
||||
_081C96F6:
|
||||
pop {r4-r6}
|
||||
pop {r1}
|
||||
bx r1
|
||||
thumb_func_end sub_81C963C
|
||||
|
||||
thumb_func_start sub_81C96FC
|
||||
sub_81C96FC: @ 81C96FC
|
||||
push {r4,lr}
|
||||
adds r4, r0, 0
|
||||
bl sub_81C9814
|
||||
cmp r0, 0
|
||||
beq _081C970C
|
||||
movs r0, 0x1
|
||||
b _081C9792
|
||||
_081C970C:
|
||||
ldr r0, =gMain
|
||||
ldrh r1, [r0, 0x2E]
|
||||
movs r0, 0x1
|
||||
ands r0, r1
|
||||
cmp r0, 0
|
||||
beq _081C9754
|
||||
ldr r3, =gUnknown_0861FC59
|
||||
movs r0, 0x2
|
||||
ldrsh r1, [r4, r0]
|
||||
ldrh r2, [r4]
|
||||
lsls r0, r2, 1
|
||||
adds r0, r2
|
||||
lsls r0, 1
|
||||
adds r1, r0
|
||||
adds r1, r3
|
||||
ldrb r0, [r1]
|
||||
cmp r0, 0xD
|
||||
beq _081C9780
|
||||
subs r0, 0x8
|
||||
bl sub_81C7694
|
||||
ldr r1, =0x000186a8
|
||||
adds r0, r4, 0
|
||||
bl sub_81C97B0
|
||||
movs r0, 0x3
|
||||
strh r0, [r4, 0x6]
|
||||
movs r0, 0x8
|
||||
b _081C9792
|
||||
.pool
|
||||
_081C9754:
|
||||
movs r0, 0x2
|
||||
ands r0, r1
|
||||
cmp r0, 0
|
||||
beq _081C9790
|
||||
movs r0, 0x2
|
||||
ldrsh r2, [r4, r0]
|
||||
ldr r1, =gUnknown_0861FC54
|
||||
ldrh r0, [r4]
|
||||
adds r0, r1
|
||||
ldrb r0, [r0]
|
||||
cmp r2, r0
|
||||
beq _081C9780
|
||||
strh r0, [r4, 0x2]
|
||||
ldr r0, =sub_81C97A4
|
||||
str r0, [r4, 0xC]
|
||||
movs r0, 0x1
|
||||
b _081C9792
|
||||
.pool
|
||||
_081C9780:
|
||||
movs r0, 0x5
|
||||
bl PlaySE
|
||||
adds r0, r4, 0
|
||||
bl sub_81C97F8
|
||||
movs r0, 0x5
|
||||
b _081C9792
|
||||
_081C9790:
|
||||
movs r0, 0
|
||||
_081C9792:
|
||||
pop {r4}
|
||||
pop {r1}
|
||||
bx r1
|
||||
thumb_func_end sub_81C96FC
|
||||
|
||||
thumb_func_start sub_81C9798
|
||||
sub_81C9798: @ 81C9798
|
||||
push {lr}
|
||||
bl sub_81C97C0
|
||||
movs r0, 0x3
|
||||
pop {r1}
|
||||
bx r1
|
||||
thumb_func_end sub_81C9798
|
||||
|
||||
thumb_func_start sub_81C97A4
|
||||
sub_81C97A4: @ 81C97A4
|
||||
push {lr}
|
||||
bl sub_81C97F8
|
||||
movs r0, 0x5
|
||||
pop {r1}
|
||||
bx r1
|
||||
thumb_func_end sub_81C97A4
|
||||
|
||||
thumb_func_start sub_81C97B0
|
||||
sub_81C97B0: @ 81C97B0
|
||||
str r1, [r0, 0x8]
|
||||
ldr r1, =sub_81C97BC
|
||||
str r1, [r0, 0xC]
|
||||
bx lr
|
||||
.pool
|
||||
thumb_func_end sub_81C97B0
|
||||
|
||||
thumb_func_start sub_81C97BC
|
||||
sub_81C97BC: @ 81C97BC
|
||||
ldr r0, [r0, 0x8]
|
||||
bx lr
|
||||
thumb_func_end sub_81C97BC
|
||||
|
||||
thumb_func_start sub_81C97C0
|
||||
sub_81C97C0: @ 81C97C0
|
||||
push {r4,lr}
|
||||
adds r4, r0, 0
|
||||
bl sub_81C9268
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r4]
|
||||
movs r0, 0x1
|
||||
strh r0, [r4, 0x2]
|
||||
ldr r2, =gUnknown_0861FC59
|
||||
ldrh r1, [r4]
|
||||
lsls r0, r1, 1
|
||||
adds r0, r1
|
||||
lsls r0, 1
|
||||
adds r0, 0x1
|
||||
adds r0, r2
|
||||
ldrb r0, [r0]
|
||||
strh r0, [r4, 0x4]
|
||||
ldr r0, =sub_81C943C
|
||||
str r0, [r4, 0xC]
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
bx r0
|
||||
.pool
|
||||
thumb_func_end sub_81C97C0
|
||||
|
||||
thumb_func_start sub_81C97F8
|
||||
sub_81C97F8: @ 81C97F8
|
||||
movs r1, 0x3
|
||||
strh r1, [r0]
|
||||
movs r1, 0x1
|
||||
strh r1, [r0, 0x2]
|
||||
ldr r1, =gUnknown_0861FC59
|
||||
ldrb r1, [r1, 0x13]
|
||||
strh r1, [r0, 0x4]
|
||||
ldr r1, =sub_81C963C
|
||||
str r1, [r0, 0xC]
|
||||
bx lr
|
||||
.pool
|
||||
thumb_func_end sub_81C97F8
|
||||
|
||||
thumb_func_start sub_81C9814
|
||||
sub_81C9814: @ 81C9814
|
||||
push {r4,r5,lr}
|
||||
adds r4, r0, 0
|
||||
ldr r0, =gMain
|
||||
ldrh r1, [r0, 0x2E]
|
||||
movs r0, 0x40
|
||||
ands r0, r1
|
||||
lsls r0, 16
|
||||
lsrs r5, r0, 16
|
||||
cmp r5, 0
|
||||
beq _081C9848
|
||||
ldrh r0, [r4, 0x2]
|
||||
subs r0, 0x1
|
||||
strh r0, [r4, 0x2]
|
||||
lsls r0, 16
|
||||
ldrh r3, [r4]
|
||||
cmp r0, 0
|
||||
bge _081C986A
|
||||
ldr r0, =gUnknown_0861FC54
|
||||
adds r0, r3, r0
|
||||
ldrb r0, [r0]
|
||||
strh r0, [r4, 0x2]
|
||||
b _081C986A
|
||||
.pool
|
||||
_081C9848:
|
||||
movs r0, 0x80
|
||||
ands r0, r1
|
||||
cmp r0, 0
|
||||
beq _081C988C
|
||||
ldrh r0, [r4, 0x2]
|
||||
adds r0, 0x1
|
||||
strh r0, [r4, 0x2]
|
||||
movs r0, 0x2
|
||||
ldrsh r2, [r4, r0]
|
||||
ldr r0, =gUnknown_0861FC54
|
||||
ldrh r1, [r4]
|
||||
adds r0, r1, r0
|
||||
adds r3, r1, 0
|
||||
ldrb r0, [r0]
|
||||
cmp r2, r0
|
||||
ble _081C986A
|
||||
strh r5, [r4, 0x2]
|
||||
_081C986A:
|
||||
ldr r2, =gUnknown_0861FC59
|
||||
movs r0, 0x2
|
||||
ldrsh r1, [r4, r0]
|
||||
lsls r0, r3, 1
|
||||
adds r0, r3
|
||||
lsls r0, 1
|
||||
adds r1, r0
|
||||
adds r1, r2
|
||||
ldrb r0, [r1]
|
||||
strh r0, [r4, 0x4]
|
||||
movs r0, 0x1
|
||||
b _081C988E
|
||||
.pool
|
||||
_081C988C:
|
||||
movs r0, 0
|
||||
_081C988E:
|
||||
pop {r4,r5}
|
||||
pop {r1}
|
||||
bx r1
|
||||
thumb_func_end sub_81C9814
|
||||
|
||||
thumb_func_start sub_81C9894
|
||||
sub_81C9894: @ 81C9894
|
||||
push {lr}
|
||||
movs r0, 0x1
|
||||
bl GetSubstructPtr
|
||||
ldrh r0, [r0]
|
||||
pop {r1}
|
||||
bx r1
|
||||
thumb_func_end sub_81C9894
|
||||
|
||||
thumb_func_start sub_81C98A4
|
||||
sub_81C98A4: @ 81C98A4
|
||||
push {lr}
|
||||
movs r0, 0x1
|
||||
bl GetSubstructPtr
|
||||
movs r1, 0x2
|
||||
ldrsh r0, [r0, r1]
|
||||
pop {r1}
|
||||
bx r1
|
||||
thumb_func_end sub_81C98A4
|
||||
|
||||
thumb_func_start sub_81C98B4
|
||||
sub_81C98B4: @ 81C98B4
|
||||
push {lr}
|
||||
movs r0, 0x1
|
||||
bl GetSubstructPtr
|
||||
ldrh r0, [r0, 0x4]
|
||||
pop {r1}
|
||||
bx r1
|
||||
thumb_func_end sub_81C98B4
|
||||
|
||||
thumb_func_start sub_81C98C4
|
||||
sub_81C98C4: @ 81C98C4
|
||||
push {lr}
|
||||
movs r0, 0x1
|
||||
bl GetSubstructPtr
|
||||
ldrh r0, [r0, 0x6]
|
||||
pop {r1}
|
||||
bx r1
|
||||
thumb_func_end sub_81C98C4
|
||||
|
||||
.align 2, 0 @ Don't pad with nop.
|
||||
2185
asm/pokenav_unk_10.s
Normal file
2185
asm/pokenav_unk_10.s
Normal file
File diff suppressed because it is too large
Load Diff
2277
asm/pokenav_unk_2.s
Normal file
2277
asm/pokenav_unk_2.s
Normal file
File diff suppressed because it is too large
Load Diff
1036
asm/pokenav_unk_3.s
Normal file
1036
asm/pokenav_unk_3.s
Normal file
File diff suppressed because it is too large
Load Diff
2347
asm/pokenav_unk_4.s
Normal file
2347
asm/pokenav_unk_4.s
Normal file
File diff suppressed because it is too large
Load Diff
1396
asm/pokenav_unk_5.s
Normal file
1396
asm/pokenav_unk_5.s
Normal file
File diff suppressed because it is too large
Load Diff
1752
asm/pokenav_unk_6.s
Normal file
1752
asm/pokenav_unk_6.s
Normal file
File diff suppressed because it is too large
Load Diff
2001
asm/pokenav_unk_7.s
Normal file
2001
asm/pokenav_unk_7.s
Normal file
File diff suppressed because it is too large
Load Diff
1377
asm/pokenav_unk_8.s
Normal file
1377
asm/pokenav_unk_8.s
Normal file
File diff suppressed because it is too large
Load Diff
1393
asm/pokenav_unk_9.s
Normal file
1393
asm/pokenav_unk_9.s
Normal file
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
11
asmdiff.ps1
11
asmdiff.ps1
@@ -107,8 +107,13 @@ if ($start_num -gt 0x1000000)
|
||||
$end_str = [System.Convert]::ToString($start_num + $offset_num, 16)
|
||||
$end_str = "0x$end_str"
|
||||
|
||||
Write-Host "$Start - $end_str"
|
||||
$start_str = "0x$Start"
|
||||
|
||||
Write-Host "$start_str - $end_str"
|
||||
$objdump = Join-Path -Path $env:DEVKITARM -ChildPath "arm-none-eabi\bin\objdump.exe"
|
||||
&$objdump -D -bbinary -marmv4t -Mforce-thumb --start-address="$Start" --stop-address="$end_str" .\baserom.gba > .\baserom.dump
|
||||
&$objdump -D -bbinary -marmv4t -Mforce-thumb --start-address="$Start" --stop-address="$end_str" .\pokeemerald.gba > .\pokeemerald.dump
|
||||
Write-Host "Dumping [0/2]"
|
||||
&$objdump -D -bbinary -marmv4t -Mforce-thumb --start-address="$start_str" --stop-address="$end_str" .\baserom.gba > .\baserom.dump
|
||||
Write-Host "Dumping [1/2]"
|
||||
&$objdump -D -bbinary -marmv4t -Mforce-thumb --start-address="$start_str" --stop-address="$end_str" .\pokeemerald.gba > .\pokeemerald.dump
|
||||
Write-Host "Dumping [2/2]"
|
||||
Invoke-Expression "$DiffTool .\baserom.dump .\pokeemerald.dump"
|
||||
|
||||
3
common_syms/faraway_island.txt
Executable file
3
common_syms/faraway_island.txt
Executable file
@@ -0,0 +1,3 @@
|
||||
sPlayerToMewDeltaX
|
||||
sPlayerToMewDeltaY
|
||||
sMewDirectionCandidates
|
||||
@@ -1515,7 +1515,7 @@ Move_VINE_WHIP:
|
||||
createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 4, 6
|
||||
delay 6
|
||||
playsewithpan SE_W010, SOUND_PAN_TARGET
|
||||
createsprite gUnknown_085928E8, ANIM_TARGET, 2, 0, 0
|
||||
createsprite gVineWhipSpriteTemplate, ANIM_TARGET, 2, 0, 0
|
||||
delay 6
|
||||
createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 6, 1
|
||||
end
|
||||
@@ -1656,12 +1656,12 @@ Explosion1:
|
||||
Move_DEFENSE_CURL:
|
||||
loadspritegfx ANIM_TAG_ECLIPSING_ORB
|
||||
loopsewithpan SE_W161, SOUND_PAN_ATTACKER, 18, 3
|
||||
createvisualtask sub_811489C, 5, 0, 0
|
||||
createvisualtask AnimTask_SetGreyscaleOrOriginalPal, 5, ANIM_ATTACKER, 0
|
||||
createvisualtask sub_815B338, 5
|
||||
waitforvisualfinish
|
||||
createsprite gUnknown_085CE338, ANIM_ATTACKER, 2, 0, 6, 0, 1
|
||||
waitforvisualfinish
|
||||
createvisualtask sub_811489C, 5, 0, 1
|
||||
createvisualtask AnimTask_SetGreyscaleOrOriginalPal, 5, ANIM_ATTACKER, 1
|
||||
waitforvisualfinish
|
||||
end
|
||||
|
||||
@@ -2003,7 +2003,7 @@ Move_ATTRACT:
|
||||
createsprite gBattleAnimSpriteTemplate_85939B8, ANIM_TARGET, 3, -384, -31
|
||||
waitforvisualfinish
|
||||
waitplaysewithpan SE_W213B, 0, 15
|
||||
createvisualtask sub_81062E8, 5
|
||||
createvisualtask AnimTask_HeartsBackground, 5
|
||||
createsprite gUnknown_085939D0, ANIM_ATTACKER, 40, 16, 256, 0
|
||||
createsprite gUnknown_085939D0, ANIM_ATTACKER, 40, 224, 240, 15
|
||||
createsprite gUnknown_085939D0, ANIM_ATTACKER, 40, 126, 272, 30
|
||||
@@ -2012,7 +2012,7 @@ Move_ATTRACT:
|
||||
createsprite gUnknown_085939D0, ANIM_ATTACKER, 40, 40, 256, 75
|
||||
createsprite gUnknown_085939D0, ANIM_ATTACKER, 40, 112, 256, 90
|
||||
createsprite gUnknown_085939D0, ANIM_ATTACKER, 40, 200, 272, 90
|
||||
delay 0x4B
|
||||
delay 75
|
||||
createvisualtask sub_8115A04, 2, 4, 4, 4, 0, 10, RGB(31, 25, 27)
|
||||
end
|
||||
|
||||
@@ -2960,7 +2960,7 @@ SkyAttackSetUpAgainstPartner:
|
||||
SkyAttackUnleash:
|
||||
loadspritegfx ANIM_TAG_IMPACT
|
||||
loadspritegfx ANIM_TAG_BIRD
|
||||
call SetFlyingBg
|
||||
call SetSkyBg
|
||||
monbg ANIM_ATTACKER
|
||||
createvisualtask sub_8116620, 10, 2, 0, 0, 16, RGB_WHITE
|
||||
delay 4
|
||||
@@ -2977,7 +2977,7 @@ SkyAttackUnleash:
|
||||
createvisualtask sub_8116620, 10, 2, 0, 15, 0, RGB_WHITE
|
||||
waitforvisualfinish
|
||||
clearmonbg ANIM_ATTACKER
|
||||
call UnsetFlyingBg
|
||||
call UnsetSkyBg
|
||||
goto SkyAttackEnd
|
||||
|
||||
Move_FLASH:
|
||||
@@ -3220,13 +3220,13 @@ EndureEffect:
|
||||
Move_CHARM:
|
||||
loadspritegfx ANIM_TAG_MAGENTA_HEART
|
||||
createvisualtask AnimTask_RockMonBackAndForth, 5, ANIM_ATTACKER, 2, 0
|
||||
createsprite gUnknown_08593970, ANIM_ATTACKER, 3, 0, 20
|
||||
createsprite gMagentaHeartSpriteTemplate, ANIM_ATTACKER, 3, 0, 20
|
||||
playsewithpan SE_W204, SOUND_PAN_ATTACKER
|
||||
delay 15
|
||||
createsprite gUnknown_08593970, ANIM_ATTACKER, 3, -20, 20
|
||||
createsprite gMagentaHeartSpriteTemplate, ANIM_ATTACKER, 3, -20, 20
|
||||
playsewithpan SE_W204, SOUND_PAN_ATTACKER
|
||||
delay 15
|
||||
createsprite gUnknown_08593970, ANIM_ATTACKER, 3, 20, 20
|
||||
createsprite gMagentaHeartSpriteTemplate, ANIM_ATTACKER, 3, 20, 20
|
||||
playsewithpan SE_W204, SOUND_PAN_ATTACKER
|
||||
waitforvisualfinish
|
||||
end
|
||||
@@ -4358,7 +4358,7 @@ Move_AERIAL_ACE:
|
||||
|
||||
Move_IRON_DEFENSE:
|
||||
loopsewithpan SE_REAPOKE, SOUND_PAN_ATTACKER, 28, 2
|
||||
createvisualtask sub_81144F8, 5, 0, 0, 0
|
||||
createvisualtask AnimTask_MetallicShine, 5, 0, 0, 0
|
||||
createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 8, 2, RGB_WHITEALPHA, 14, -1, 0
|
||||
waitforvisualfinish
|
||||
end
|
||||
@@ -4393,13 +4393,13 @@ Move_COVET:
|
||||
loadspritegfx ANIM_TAG_MAGENTA_HEART
|
||||
loadspritegfx ANIM_TAG_ITEM_BAG
|
||||
createvisualtask AnimTask_RockMonBackAndForth, 5, ANIM_ATTACKER, 2, 0
|
||||
createsprite gUnknown_08593970, ANIM_ATTACKER, 3, 0, 20
|
||||
createsprite gMagentaHeartSpriteTemplate, ANIM_ATTACKER, 3, 0, 20
|
||||
playsewithpan SE_W204, SOUND_PAN_ATTACKER
|
||||
delay 15
|
||||
createsprite gUnknown_08593970, ANIM_ATTACKER, 3, -20, 20
|
||||
createsprite gMagentaHeartSpriteTemplate, ANIM_ATTACKER, 3, -20, 20
|
||||
playsewithpan SE_W204, SOUND_PAN_ATTACKER
|
||||
delay 15
|
||||
createsprite gUnknown_08593970, ANIM_ATTACKER, 3, 20, 20
|
||||
createsprite gMagentaHeartSpriteTemplate, ANIM_ATTACKER, 3, 20, 20
|
||||
playsewithpan SE_W204, SOUND_PAN_ATTACKER
|
||||
waitforvisualfinish
|
||||
createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 8, 1
|
||||
@@ -4570,7 +4570,7 @@ Move_SHOCK_WAVE:
|
||||
|
||||
Move_HARDEN:
|
||||
loopsewithpan SE_W231, SOUND_PAN_ATTACKER, 28, 2
|
||||
createvisualtask sub_81144F8, 5, 0, 0, 0
|
||||
createvisualtask AnimTask_MetallicShine, 5, 0, 0, 0
|
||||
waitforvisualfinish
|
||||
end
|
||||
|
||||
@@ -5347,7 +5347,7 @@ Move_ICE_BEAM:
|
||||
loadspritegfx ANIM_TAG_ICE_CRYSTALS
|
||||
createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 1, 0, 7, RGB_BLACK
|
||||
waitforvisualfinish
|
||||
createsoundtask sub_8158C58, 183, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 4, 4, 0, 10
|
||||
createsoundtask sub_8158C58, SE_W062B, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 4, 4, 0, 10
|
||||
createsprite gUnknown_08595B2C, ANIM_ATTACKER, 2, 20, 12, 0, 12, 20
|
||||
createsprite gUnknown_08595B2C, ANIM_ATTACKER, 2, 20, -12, 0, -12, 20
|
||||
delay 1
|
||||
@@ -5392,7 +5392,7 @@ Move_WITHDRAW:
|
||||
|
||||
Move_AURORA_BEAM:
|
||||
loadspritegfx ANIM_TAG_RAINBOW_RINGS
|
||||
fadetobg BG_AURORABEAM
|
||||
fadetobg BG_AURORA
|
||||
waitbgfadein
|
||||
playsewithpan SE_W062, SOUND_PAN_ATTACKER
|
||||
setarg 7, 0
|
||||
@@ -5403,7 +5403,7 @@ Move_AURORA_BEAM:
|
||||
call AuroraBeam1
|
||||
call AuroraBeam1
|
||||
setarg 7, -1
|
||||
createsoundtask sub_8158C58, 183, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 3, 6, 0, 10
|
||||
createsoundtask sub_8158C58, SE_W062B, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 3, 6, 0, 10
|
||||
createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 2, 0, 40, 1
|
||||
call AuroraBeam1
|
||||
call AuroraBeam1
|
||||
@@ -6195,7 +6195,7 @@ Move_AEROBLAST:
|
||||
loadspritegfx ANIM_TAG_AIR_WAVE_2
|
||||
loadspritegfx ANIM_TAG_IMPACT
|
||||
monbg ANIM_DEF_PARTNER
|
||||
call SetFlyingBg
|
||||
call SetSkyBg
|
||||
monbgprio_28 ANIM_TARGET
|
||||
setalpha 12, 8
|
||||
call Aeroblast1
|
||||
@@ -6211,7 +6211,7 @@ Move_AEROBLAST:
|
||||
clearmonbg ANIM_DEF_PARTNER
|
||||
blendoff
|
||||
delay 0
|
||||
call UnsetFlyingBg
|
||||
call UnsetSkyBg
|
||||
end
|
||||
Aeroblast1:
|
||||
playsewithpan SE_W026, SOUND_PAN_ATTACKER
|
||||
@@ -6568,7 +6568,7 @@ Move_DYNAMIC_PUNCH:
|
||||
loadspritegfx ANIM_TAG_HANDS_AND_FEET
|
||||
loadspritegfx ANIM_TAG_IMPACT
|
||||
loadspritegfx ANIM_TAG_EXPLOSION
|
||||
loadspritegfx ANIM_TAG_UNUSED_EXPLOSION
|
||||
loadspritegfx ANIM_TAG_EXPLOSION_6
|
||||
delay 1
|
||||
monbg ANIM_DEF_PARTNER
|
||||
setalpha 12, 8
|
||||
@@ -7123,7 +7123,7 @@ Move_PSYBEAM:
|
||||
loadspritegfx ANIM_TAG_GOLD_RING
|
||||
playsewithpan SE_W060, SOUND_PAN_ATTACKER
|
||||
call SetPsychicBackground
|
||||
createsoundtask sub_8158C58, 200, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 3, 4, 0, 15
|
||||
createsoundtask sub_8158C58, SE_W060B, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 3, 4, 0, 15
|
||||
call Psybeam1
|
||||
call Psybeam1
|
||||
createvisualtask AnimTask_SwayMon, 5, 0, 6, 2048, 4, ANIM_TARGET
|
||||
@@ -7169,7 +7169,7 @@ Move_PSYWAVE:
|
||||
playsewithpan SE_W060, SOUND_PAN_ATTACKER
|
||||
call SetPsychicBackground
|
||||
createvisualtask sub_81076C8, 5, 100
|
||||
createsoundtask sub_8158C58, 203, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 2, 9, 0, 10
|
||||
createsoundtask sub_8158C58, SE_W100, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 2, 9, 0, 10
|
||||
call Psywave1
|
||||
call Psywave1
|
||||
createvisualtask sub_8115A04, 2, 4, 1, 4, 0, 12, RGB(31, 18, 31)
|
||||
@@ -7213,7 +7213,7 @@ Move_STEEL_WING:
|
||||
loadspritegfx ANIM_TAG_GUST
|
||||
loadspritegfx ANIM_TAG_IMPACT
|
||||
loopsewithpan SE_W231, SOUND_PAN_ATTACKER, 28, 2
|
||||
createvisualtask sub_81144F8, 5, 0, 0, 0
|
||||
createvisualtask AnimTask_MetallicShine, 5, 0, 0, 0
|
||||
waitforvisualfinish
|
||||
monbg ANIM_DEF_PARTNER
|
||||
monbgprio_28 ANIM_TARGET
|
||||
@@ -7239,7 +7239,7 @@ Move_STEEL_WING:
|
||||
Move_IRON_TAIL:
|
||||
loadspritegfx ANIM_TAG_IMPACT
|
||||
loopsewithpan SE_W231, SOUND_PAN_ATTACKER, 28, 2
|
||||
createvisualtask sub_81144F8, 5, 1, 0, 0
|
||||
createvisualtask AnimTask_MetallicShine, 5, 1, 0, 0
|
||||
waitforvisualfinish
|
||||
monbg ANIM_TARGET
|
||||
setalpha 12, 8
|
||||
@@ -7249,7 +7249,7 @@ Move_IRON_TAIL:
|
||||
createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1
|
||||
playsewithpan SE_W233B, SOUND_PAN_TARGET
|
||||
waitforvisualfinish
|
||||
createvisualtask sub_811489C, 5, 0, 1
|
||||
createvisualtask AnimTask_SetGreyscaleOrOriginalPal, 5, ANIM_ATTACKER, 1
|
||||
clearmonbg ANIM_TARGET
|
||||
blendoff
|
||||
waitforvisualfinish
|
||||
@@ -7259,7 +7259,7 @@ Move_POISON_TAIL:
|
||||
loadspritegfx ANIM_TAG_IMPACT
|
||||
loadspritegfx ANIM_TAG_POISON_BUBBLE
|
||||
loopsewithpan SE_W231, SOUND_PAN_ATTACKER, 28, 2
|
||||
createvisualtask sub_81144F8, 5, 1, 1, RGB(24, 6, 23)
|
||||
createvisualtask AnimTask_MetallicShine, 5, 1, 1, RGB(24, 6, 23)
|
||||
waitforvisualfinish
|
||||
monbg ANIM_TARGET
|
||||
setalpha 12, 8
|
||||
@@ -7269,7 +7269,7 @@ Move_POISON_TAIL:
|
||||
createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1
|
||||
playsewithpan SE_W233B, SOUND_PAN_TARGET
|
||||
waitforvisualfinish
|
||||
createvisualtask sub_811489C, 5, 0, 1
|
||||
createvisualtask AnimTask_SetGreyscaleOrOriginalPal, 5, ANIM_ATTACKER, 1
|
||||
clearmonbg ANIM_TARGET
|
||||
blendoff
|
||||
call PoisonBubblesEffect
|
||||
@@ -7279,7 +7279,7 @@ Move_POISON_TAIL:
|
||||
Move_METAL_CLAW:
|
||||
loadspritegfx ANIM_TAG_CLAW_SLASH
|
||||
loopsewithpan SE_W231, SOUND_PAN_ATTACKER, 28, 2
|
||||
createvisualtask sub_81144F8, 5, 0, 0, 0
|
||||
createvisualtask AnimTask_MetallicShine, 5, 0, 0, 0
|
||||
waitforvisualfinish
|
||||
createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 6, 4
|
||||
delay 2
|
||||
@@ -7346,8 +7346,8 @@ Move_SHADOW_BALL:
|
||||
fadetobg BG_GHOST
|
||||
waitbgfadein
|
||||
delay 15
|
||||
createsoundtask sub_8158C58, 168, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 5, 5, 0, 5
|
||||
createsprite gUnknown_08596D58, ANIM_TARGET, 2, 16, 16, 8
|
||||
createsoundtask sub_8158C58, SE_W054, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 5, 5, 0, 5
|
||||
createsprite gShadowBallSpriteTemplate, ANIM_TARGET, 2, 16, 16, 8
|
||||
waitforvisualfinish
|
||||
playsewithpan SE_W028, SOUND_PAN_TARGET
|
||||
createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 8, 1
|
||||
@@ -7459,7 +7459,7 @@ Move_STRING_SHOT:
|
||||
end
|
||||
|
||||
StringShot1:
|
||||
createsprite gUnknown_085969E0, ANIM_TARGET, 2, 20, 0, 512, 20, 1
|
||||
createsprite gWebThreadSpriteTemplate, ANIM_TARGET, 2, 20, 0, 512, 20, 1
|
||||
delay 1
|
||||
return
|
||||
|
||||
@@ -7488,7 +7488,7 @@ Move_SPIDER_WEB:
|
||||
call SpiderWeb1
|
||||
waitforvisualfinish
|
||||
playsewithpan SE_W081B, SOUND_PAN_TARGET
|
||||
createsprite gUnknown_08596A2C, ANIM_ATTACKER, 2
|
||||
createsprite gSpiderWebSpriteTemplate, ANIM_ATTACKER, 2
|
||||
waitforvisualfinish
|
||||
clearmonbg ANIM_DEF_PARTNER
|
||||
delay 1
|
||||
@@ -7496,7 +7496,7 @@ Move_SPIDER_WEB:
|
||||
end
|
||||
|
||||
SpiderWeb1:
|
||||
createsprite gUnknown_085969E0, ANIM_TARGET, 2, 20, 0, 512, 20, 0
|
||||
createsprite gWebThreadSpriteTemplate, ANIM_TARGET, 2, 20, 0, 512, 20, 0
|
||||
delay 1
|
||||
return
|
||||
|
||||
@@ -7941,16 +7941,16 @@ Move_PERISH_SONG:
|
||||
panse_1B SE_W195, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0
|
||||
delay 80
|
||||
createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 0, 16, RGB_BLACK
|
||||
createvisualtask sub_811489C, 5, 4, 0
|
||||
createvisualtask sub_811489C, 5, 5, 0
|
||||
createvisualtask sub_811489C, 5, 6, 0
|
||||
createvisualtask sub_811489C, 5, 7, 0
|
||||
createvisualtask AnimTask_SetGreyscaleOrOriginalPal, 5, 4, 0
|
||||
createvisualtask AnimTask_SetGreyscaleOrOriginalPal, 5, 5, 0
|
||||
createvisualtask AnimTask_SetGreyscaleOrOriginalPal, 5, 6, 0
|
||||
createvisualtask AnimTask_SetGreyscaleOrOriginalPal, 5, 7, 0
|
||||
delay 100
|
||||
createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 16, 0, RGB_BLACK
|
||||
createvisualtask sub_811489C, 5, 4, 1
|
||||
createvisualtask sub_811489C, 5, 5, 1
|
||||
createvisualtask sub_811489C, 5, 6, 1
|
||||
createvisualtask sub_811489C, 5, 7, 1
|
||||
createvisualtask AnimTask_SetGreyscaleOrOriginalPal, 5, 4, 1
|
||||
createvisualtask AnimTask_SetGreyscaleOrOriginalPal, 5, 5, 1
|
||||
createvisualtask AnimTask_SetGreyscaleOrOriginalPal, 5, 6, 1
|
||||
createvisualtask AnimTask_SetGreyscaleOrOriginalPal, 5, 7, 1
|
||||
waitforvisualfinish
|
||||
end
|
||||
|
||||
@@ -8019,7 +8019,7 @@ Move_TRI_ATTACK:
|
||||
delay 20
|
||||
playsewithpan SE_W161, SOUND_PAN_ATTACKER
|
||||
delay 20
|
||||
createsoundtask sub_8158C58, 220, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 5, 6, 0, 7
|
||||
createsoundtask sub_8158C58, SE_W161, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 5, 6, 0, 7
|
||||
waitforvisualfinish
|
||||
createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 2, 0, 16, RGB_BLACK
|
||||
delay 16
|
||||
@@ -8356,7 +8356,7 @@ Move_HYPER_BEAM:
|
||||
createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 4, 1
|
||||
waitforvisualfinish
|
||||
delay 30
|
||||
createsoundtask sub_8158C58, 247, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 1, 15, 0, 5
|
||||
createsoundtask sub_8158C58, SE_W063B, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 1, 15, 0, 5
|
||||
createvisualtask AnimTask_ShakeMon, 2, ANIM_ATTACKER, 0, 4, 50, 1
|
||||
createvisualtask sub_8115D94, 2, ANIM_TAG_ORBS, 1, 12, 31, 16, 0, 0
|
||||
call HyperBeam1
|
||||
@@ -9419,7 +9419,7 @@ Move_SEISMIC_TOSS:
|
||||
waitforvisualfinish
|
||||
createvisualtask AnimTask_GetSeismicTossDamageLevel, 3
|
||||
delay 1
|
||||
fadetobg BG_SEISMICTOSS_SKUUPPERCUT
|
||||
fadetobg BG_IN_AIR
|
||||
waitbgfadeout
|
||||
createvisualtask sub_811152C, 3
|
||||
playsewithpan SE_W327, 0
|
||||
@@ -9570,7 +9570,7 @@ Move_DOOM_DESIRE:
|
||||
createvisualtask sub_8114960, 2
|
||||
delay 1
|
||||
monbg ANIM_ATK_PARTNER
|
||||
createvisualtask sub_811489C, 5, 1, 0
|
||||
createvisualtask AnimTask_SetGreyscaleOrOriginalPal, 5, ANIM_TARGET, 0
|
||||
createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 1, 0, 4, RGB_BLACK
|
||||
waitforvisualfinish
|
||||
setalpha 8, 8
|
||||
@@ -9578,7 +9578,7 @@ Move_DOOM_DESIRE:
|
||||
createvisualtask AnimTask_ScaleMonAndRestore, 5, -4, -4, 15, ANIM_ATTACKER, 1
|
||||
waitforvisualfinish
|
||||
delay 20
|
||||
createvisualtask sub_811489C, 5, 1, 1
|
||||
createvisualtask AnimTask_SetGreyscaleOrOriginalPal, 5, ANIM_TARGET, 1
|
||||
createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 1, 4, 0, RGB_BLACK
|
||||
waitforvisualfinish
|
||||
clearmonbg ANIM_ATK_PARTNER
|
||||
@@ -9589,7 +9589,7 @@ Move_SKY_UPPERCUT:
|
||||
loadspritegfx ANIM_TAG_IMPACT
|
||||
monbg ANIM_DEF_PARTNER
|
||||
monbgprio_28 ANIM_TARGET
|
||||
fadetobg BG_SEISMICTOSS_SKUUPPERCUT
|
||||
fadetobg BG_IN_AIR
|
||||
waitbgfadeout
|
||||
playsewithpan SE_W327, SOUND_PAN_ATTACKER
|
||||
createvisualtask sub_810DABC, 5, 55
|
||||
@@ -10165,21 +10165,21 @@ UnsetPsychicBackground:
|
||||
waitbgfadein
|
||||
return
|
||||
|
||||
SetFlyingBg:
|
||||
jumpifcontest SetBgFlyingContest
|
||||
fadetobg BG_FLYING
|
||||
SetSkyBg:
|
||||
jumpifcontest SetSkyBgContest
|
||||
fadetobg BG_SKY
|
||||
waitbgfadeout
|
||||
createvisualtask sub_8117660, 5, -2304, 768, 1, -1
|
||||
SetBgFlyingContinue:
|
||||
SetSkyBgContinue:
|
||||
waitbgfadein
|
||||
return
|
||||
SetBgFlyingContest:
|
||||
fadetobg BG_FLYING_CONTESTS
|
||||
SetSkyBgContest:
|
||||
fadetobg BG_SKY_CONTESTS
|
||||
waitbgfadeout
|
||||
createvisualtask sub_8117660, 5, 2304, 768, 0, -1
|
||||
goto SetBgFlyingContinue
|
||||
goto SetSkyBgContinue
|
||||
|
||||
UnsetFlyingBg:
|
||||
UnsetSkyBg:
|
||||
restorebg
|
||||
waitbgfadeout
|
||||
setarg 7, -1
|
||||
@@ -10237,13 +10237,13 @@ Burn1:
|
||||
Status_Infatuation:
|
||||
loadspritegfx ANIM_TAG_MAGENTA_HEART
|
||||
playsewithpan SE_W204, SOUND_PAN_ATTACKER
|
||||
createsprite gUnknown_08593970, ANIM_ATTACKER, 3, 0, 20
|
||||
createsprite gMagentaHeartSpriteTemplate, ANIM_ATTACKER, 3, 0, 20
|
||||
delay 15
|
||||
playsewithpan SE_W204, SOUND_PAN_ATTACKER
|
||||
createsprite gUnknown_08593970, ANIM_ATTACKER, 3, -20, 20
|
||||
createsprite gMagentaHeartSpriteTemplate, ANIM_ATTACKER, 3, -20, 20
|
||||
delay 15
|
||||
playsewithpan SE_W204, SOUND_PAN_ATTACKER
|
||||
createsprite gUnknown_08593970, ANIM_ATTACKER, 3, 20, 20
|
||||
createsprite gMagentaHeartSpriteTemplate, ANIM_ATTACKER, 3, 20, 20
|
||||
end
|
||||
|
||||
Status_Sleep:
|
||||
|
||||
@@ -2384,7 +2384,7 @@ BattleScript_EffectWish::
|
||||
BattleScript_EffectAssist::
|
||||
attackcanceler
|
||||
attackstring
|
||||
asistattackselect BattleScript_ButItFailedPpReduce
|
||||
assistattackselect BattleScript_ButItFailedPpReduce
|
||||
attackanimation
|
||||
waitanimation
|
||||
setbyte sB_ANIM_TURN, 0x0
|
||||
|
||||
@@ -5,44 +5,49 @@
|
||||
|
||||
gUnknown_08625B6C:: @ 8625B6C
|
||||
@ apparently e-reader trainer data? idk
|
||||
.byte 0x6f, 0x57, 0x54, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x0c, 0x01, 0x00, 0x00, 0x00, 0x2e, 0x14, 0x0c, 0x0e, 0x23, 0x10, 0x47, 0x0a, 0x1f, 0x06, 0x24, 0x0e, 0x48, 0x0a, 0x0f, 0x06
|
||||
.byte 0x22, 0x27, 0x2c, 0x16, 0x07, 0x06, 0x01, 0x0c, 0x47, 0x0a, 0x06, 0x06, 0x24, 0x0e, 0x00, 0x1e, 0x19, 0x12, 0x05, 0x0c, 0x25, 0x16, 0x25, 0x10, 0x0d, 0x1c, 0x2a, 0x1c, 0x06, 0x0a, 0x06, 0x0c
|
||||
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
|
||||
.byte 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
|
||||
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
|
||||
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
|
||||
.byte 0xff, 0xff, 0xff, 0x00, 0x70, 0x01, 0xdb, 0x00, 0xbc, 0x00, 0xf7, 0x00, 0xdc, 0x00, 0x19, 0x01, 0x00, 0x00, 0x37, 0xff, 0x64, 0x00, 0x00, 0x64, 0x00, 0x00, 0x00, 0x10, 0xa5, 0x94, 0x52, 0x8a
|
||||
.byte 0x80, 0x00, 0x00, 0x00, 0x6f, 0x79, 0x69, 0xae, 0x71, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x26, 0x01, 0xb3, 0x00, 0x3e, 0x01, 0xbc, 0x00, 0xf7, 0x00, 0xca, 0x00, 0x00, 0x00, 0x00, 0xff
|
||||
.byte 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x10, 0xa5, 0x94, 0x52, 0x0a, 0x06, 0x00, 0x00, 0x00, 0x95, 0x58, 0x59, 0x52, 0x79, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7d, 0x01, 0xb7, 0x00
|
||||
.byte 0xf6, 0x00, 0x39, 0x00, 0x59, 0x00, 0x85, 0x00, 0x00, 0x00, 0x64, 0x00, 0x00, 0x00, 0x9b, 0xff, 0x00, 0x00, 0x00, 0x10, 0xa5, 0x94, 0x52, 0x0a, 0x2f, 0x00, 0x00, 0x00, 0x8d, 0xae, 0x77, 0x7e
|
||||
.byte 0x5d, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x6a, 0x79, 0x6b, 0x64, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x1b, 0x01, 0x00, 0x00, 0x00, 0x54, 0x27, 0x2b, 0x0e, 0xff, 0xff, 0x3b, 0x0a
|
||||
.byte 0x20, 0x06, 0x00, 0x0c, 0x13, 0x24, 0x2b, 0x0e, 0xff, 0xff, 0x3b, 0x0a, 0x05, 0x12, 0x00, 0x0c, 0x6b, 0x26, 0x2b, 0x0e, 0xff, 0xff, 0x3b, 0x0a, 0x0e, 0x12, 0x00, 0x0c, 0x2c, 0x24, 0x2b, 0x0e
|
||||
.byte 0xff, 0xff, 0x3b, 0x0a, 0x17, 0x12, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
|
||||
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
|
||||
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00
|
||||
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
|
||||
.byte 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x59, 0x01, 0xb7, 0x00, 0xca, 0x00, 0xb9, 0x00, 0x09, 0x00, 0x4a, 0x00, 0x00, 0x00, 0x37, 0x00, 0x64, 0x00, 0xff, 0x64
|
||||
.byte 0x00, 0x00, 0x00, 0x10, 0xa5, 0x94, 0x52, 0x0a, 0x8c, 0x00, 0x00, 0x00, 0x69, 0x58, 0x60, 0x5d, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x31, 0x01, 0xb3, 0x00, 0x07, 0x01, 0x4c, 0x01
|
||||
.byte 0x62, 0x00, 0x68, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0xa5, 0x94, 0x52, 0x0a, 0x80, 0x00, 0x00, 0x00, 0x55, 0x55, 0x5d, 0x96, 0x72, 0xff, 0xff, 0xff
|
||||
.byte 0xff, 0xff, 0xff, 0xff, 0x44, 0x01, 0x86, 0x00, 0x39, 0x00, 0x59, 0x00, 0x85, 0x00, 0x9c, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x10, 0xa5, 0x94, 0x52, 0x0a
|
||||
.byte 0x00, 0x00, 0x00, 0x00, 0x65, 0x6f, 0x8e, 0x7e, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x72, 0x52, 0x5a, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x27, 0x01, 0x00, 0x00, 0x00
|
||||
.byte 0x4a, 0x04, 0x0e, 0x02, 0x35, 0x16, 0x10, 0x10, 0xda, 0x26, 0x3e, 0x10, 0x4a, 0x04, 0x0e, 0x02, 0x47, 0x0a, 0xd9, 0x26, 0x21, 0x16, 0x3e, 0x10, 0x14, 0x1e, 0x07, 0x1e, 0x30, 0x06, 0x23, 0x16
|
||||
.byte 0x24, 0x0e, 0x06, 0x0c, 0x18, 0x14, 0x2f, 0x14, 0x1a, 0x08, 0x27, 0x1c, 0x00, 0x0c, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
|
||||
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00
|
||||
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff
|
||||
.byte 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
|
||||
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x3c, 0x01, 0x8d, 0x00, 0x2f, 0x00, 0x22, 0x00, 0xf7, 0x00, 0xe7, 0x00
|
||||
.byte 0x00, 0x00, 0x00, 0xff, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0xa5, 0x94, 0x52, 0x0a, 0x03, 0x00, 0x00, 0x00, 0x54, 0x68, 0x5a, 0x7b, 0x7b, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
|
||||
.byte 0x6b, 0x01, 0xc8, 0x00, 0xca, 0x00, 0x40, 0x01, 0x5c, 0x00, 0x49, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x10, 0xa5, 0x94, 0x52, 0x8a, 0x06, 0x00, 0x00, 0x00
|
||||
.byte 0x7b, 0x8f, 0x78, 0x51, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x24, 0x01, 0xb3, 0x00, 0x3e, 0x01, 0x4c, 0x01, 0xd5, 0x00, 0x5e, 0x00, 0x00, 0x00, 0x64, 0xc8, 0x00, 0x00, 0xc8, 0x00
|
||||
.byte 0x00, 0x00, 0x00, 0x10, 0xa5, 0x94, 0x52, 0x0a, 0x06, 0x00, 0x00, 0x00, 0x51, 0x8a, 0x6a, 0x7e, 0x64, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x9c, 0x54, 0xae, 0x79, 0xff, 0xff, 0xff, 0xff
|
||||
.byte 0x00, 0x00, 0x00, 0x20, 0x01, 0x00, 0x00, 0x00, 0x46, 0x0a, 0x02, 0x06, 0x20, 0x06, 0x0a, 0x0a, 0x23, 0x10, 0x00, 0x0c, 0x28, 0x0c, 0x14, 0x18, 0x32, 0x14, 0x02, 0x16, 0x05, 0x10, 0xff, 0xff
|
||||
.byte 0x0c, 0x1e, 0x0a, 0x0a, 0x34, 0x12, 0x11, 0x1e, 0x1a, 0x08, 0x05, 0x0c, 0x1e, 0x0a, 0x02, 0x06, 0x20, 0x06, 0x22, 0x0a, 0x15, 0x10, 0x01, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
|
||||
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
|
||||
.byte 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
|
||||
.byte 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
|
||||
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x63, 0x01, 0xb3, 0x00
|
||||
.byte 0xf2, 0x00, 0x35, 0x00, 0x09, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x64, 0x00, 0xff, 0x9b, 0x00, 0x00, 0x00, 0x10, 0xa5, 0x94, 0x52, 0x8a, 0x00, 0x00, 0x00, 0x00, 0x58, 0x61, 0xae, 0x64
|
||||
.byte 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x4b, 0x01, 0xc6, 0x00, 0x39, 0x00, 0xf2, 0x00, 0x26, 0x00, 0x59, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x10
|
||||
.byte 0xa5, 0x94, 0x52, 0x0a, 0x96, 0x00, 0x00, 0x00, 0x5b, 0x72, 0x6a, 0x91, 0xae, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7a, 0x01, 0x8d, 0x00, 0x5e, 0x00, 0xf7, 0x00, 0x55, 0x00, 0x05, 0x01
|
||||
.byte 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x10, 0xa5, 0x94, 0x52, 0x0a, 0x96, 0x00, 0x00, 0x00, 0x8d, 0x85, 0x9e, 0xa0, 0x60, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
|
||||
.byte 0x6f, 0x57, 0x54, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x0c, 0x01, 0x00, 0x00, 0x00, 0x2e, 0x14, 0x0c, 0x0e, 0x23, 0x10, 0x47, 0x0a, 0x1f, 0x06, 0x24, 0x0e, 0x48, 0x0a, 0x0f, 0x06
|
||||
.byte 0x22, 0x27, 0x2c, 0x16, 0x07, 0x06, 0x01, 0x0c, 0x47, 0x0a, 0x06, 0x06, 0x24, 0x0e, 0x00, 0x1e, 0x19, 0x12, 0x05, 0x0c, 0x25, 0x16, 0x25, 0x10, 0x0d, 0x1c, 0x2a, 0x1c, 0x06, 0x0a, 0x06, 0x0c
|
||||
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
|
||||
.byte 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
|
||||
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
|
||||
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
|
||||
.byte 0xff, 0xff, 0xff, 0x00, 0x70, 0x01, 0xdb, 0x00, 0xbc, 0x00, 0xf7, 0x00, 0xdc, 0x00, 0x19, 0x01, 0x00, 0x00, 0x37, 0xff, 0x64, 0x00, 0x00, 0x64, 0x00, 0x00, 0x00, 0x10, 0xa5, 0x94, 0x52, 0x8a
|
||||
.byte 0x80, 0x00, 0x00, 0x00, 0x6f, 0x79, 0x69, 0xae, 0x71, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x26, 0x01, 0xb3, 0x00, 0x3e, 0x01, 0xbc, 0x00, 0xf7, 0x00, 0xca, 0x00, 0x00, 0x00, 0x00, 0xff
|
||||
.byte 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x10, 0xa5, 0x94, 0x52, 0x0a, 0x06, 0x00, 0x00, 0x00, 0x95, 0x58, 0x59, 0x52, 0x79, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7d, 0x01, 0xb7, 0x00
|
||||
.byte 0xf6, 0x00, 0x39, 0x00, 0x59, 0x00, 0x85, 0x00, 0x00, 0x00, 0x64, 0x00, 0x00, 0x00, 0x9b, 0xff, 0x00, 0x00, 0x00, 0x10, 0xa5, 0x94, 0x52, 0x0a, 0x2f, 0x00, 0x00, 0x00, 0x8d, 0xae, 0x77, 0x7e
|
||||
.byte 0x5d, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
|
||||
|
||||
|
||||
.byte 0x6a, 0x79, 0x6b, 0x64, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x1b, 0x01, 0x00, 0x00, 0x00, 0x54, 0x27, 0x2b, 0x0e, 0xff, 0xff, 0x3b, 0x0a, 0x20, 0x06, 0x00, 0x0c, 0x13, 0x24, 0x2b, 0x0e
|
||||
.byte 0xff, 0xff, 0x3b, 0x0a, 0x05, 0x12, 0x00, 0x0c, 0x6b, 0x26, 0x2b, 0x0e, 0xff, 0xff, 0x3b, 0x0a, 0x0e, 0x12, 0x00, 0x0c, 0x2c, 0x24, 0x2b, 0x0e, 0xff, 0xff, 0x3b, 0x0a, 0x17, 0x12, 0x00, 0x0c
|
||||
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
|
||||
.byte 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
|
||||
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
|
||||
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
|
||||
.byte 0xff, 0xff, 0xff, 0x00, 0x59, 0x01, 0xb7, 0x00, 0xca, 0x00, 0xb9, 0x00, 0x09, 0x00, 0x4a, 0x00, 0x00, 0x00, 0x37, 0x00, 0x64, 0x00, 0xff, 0x64, 0x00, 0x00, 0x00, 0x10, 0xa5, 0x94, 0x52, 0x0a
|
||||
.byte 0x8c, 0x00, 0x00, 0x00, 0x69, 0x58, 0x60, 0x5d, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x31, 0x01, 0xb3, 0x00, 0x07, 0x01, 0x4c, 0x01, 0x62, 0x00, 0x68, 0x00, 0x00, 0x00, 0xff, 0xff
|
||||
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0xa5, 0x94, 0x52, 0x0a, 0x80, 0x00, 0x00, 0x00, 0x55, 0x55, 0x5d, 0x96, 0x72, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x44, 0x01, 0x86, 0x00
|
||||
.byte 0x39, 0x00, 0x59, 0x00, 0x85, 0x00, 0x9c, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x10, 0xa5, 0x94, 0x52, 0x0a, 0x00, 0x00, 0x00, 0x00, 0x65, 0x6f, 0x8e, 0x7e
|
||||
.byte 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
|
||||
.byte 0x72, 0x52, 0x5a, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x27, 0x01, 0x00, 0x00, 0x00, 0x4a, 0x04, 0x0e, 0x02, 0x35, 0x16, 0x10, 0x10, 0xda, 0x26, 0x3e, 0x10, 0x4a, 0x04, 0x0e, 0x02
|
||||
.byte 0x47, 0x0a, 0xd9, 0x26, 0x21, 0x16, 0x3e, 0x10, 0x14, 0x1e, 0x07, 0x1e, 0x30, 0x06, 0x23, 0x16, 0x24, 0x0e, 0x06, 0x0c, 0x18, 0x14, 0x2f, 0x14, 0x1a, 0x08, 0x27, 0x1c, 0x00, 0x0c, 0xff, 0xff
|
||||
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
|
||||
.byte 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
|
||||
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
|
||||
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
|
||||
.byte 0xff, 0xff, 0xff, 0x00, 0x3c, 0x01, 0x8d, 0x00, 0x2f, 0x00, 0x22, 0x00, 0xf7, 0x00, 0xe7, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0xa5, 0x94, 0x52, 0x0a
|
||||
.byte 0x03, 0x00, 0x00, 0x00, 0x54, 0x68, 0x5a, 0x7b, 0x7b, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x6b, 0x01, 0xc8, 0x00, 0xca, 0x00, 0x40, 0x01, 0x5c, 0x00, 0x49, 0x00, 0x00, 0x00, 0xff, 0x00
|
||||
.byte 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x10, 0xa5, 0x94, 0x52, 0x8a, 0x06, 0x00, 0x00, 0x00, 0x7b, 0x8f, 0x78, 0x51, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x24, 0x01, 0xb3, 0x00
|
||||
.byte 0x3e, 0x01, 0x4c, 0x01, 0xd5, 0x00, 0x5e, 0x00, 0x00, 0x00, 0x64, 0xc8, 0x00, 0x00, 0xc8, 0x00, 0x00, 0x00, 0x00, 0x10, 0xa5, 0x94, 0x52, 0x0a, 0x06, 0x00, 0x00, 0x00, 0x51, 0x8a, 0x6a, 0x7e
|
||||
.byte 0x64, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
|
||||
.byte 0x9c, 0x54, 0xae, 0x79, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x20, 0x01, 0x00, 0x00, 0x00, 0x46, 0x0a, 0x02, 0x06, 0x20, 0x06, 0x0a, 0x0a, 0x23, 0x10, 0x00, 0x0c, 0x28, 0x0c, 0x14, 0x18
|
||||
.byte 0x32, 0x14, 0x02, 0x16, 0x05, 0x10, 0xff, 0xff, 0x0c, 0x1e, 0x0a, 0x0a, 0x34, 0x12, 0x11, 0x1e, 0x1a, 0x08, 0x05, 0x0c, 0x1e, 0x0a, 0x02, 0x06, 0x20, 0x06, 0x22, 0x0a, 0x15, 0x10, 0x01, 0x0c
|
||||
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
|
||||
.byte 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
|
||||
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
|
||||
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
|
||||
.byte 0xff, 0xff, 0xff, 0x00, 0x63, 0x01, 0xb3, 0x00, 0xf2, 0x00, 0x35, 0x00, 0x09, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x64, 0x00, 0xff, 0x9b, 0x00, 0x00, 0x00, 0x10, 0xa5, 0x94, 0x52, 0x8a
|
||||
.byte 0x00, 0x00, 0x00, 0x00, 0x58, 0x61, 0xae, 0x64, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x4b, 0x01, 0xc6, 0x00, 0x39, 0x00, 0xf2, 0x00, 0x26, 0x00, 0x59, 0x00, 0x00, 0x00, 0xff, 0x00
|
||||
.byte 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x10, 0xa5, 0x94, 0x52, 0x0a, 0x96, 0x00, 0x00, 0x00, 0x5b, 0x72, 0x6a, 0x91, 0xae, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7a, 0x01, 0x8d, 0x00
|
||||
.byte 0x5e, 0x00, 0xf7, 0x00, 0x55, 0x00, 0x05, 0x01, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x10, 0xa5, 0x94, 0x52, 0x0a, 0x96, 0x00, 0x00, 0x00, 0x8d, 0x85, 0x9e, 0xa0
|
||||
.byte 0x60, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
|
||||
|
||||
@@ -454,7 +454,7 @@ EventScript_SecretBasePC:: @ 823B4BB
|
||||
EventScript_SecretBasePCShowMainMenu:: @ 823B4D3
|
||||
message Text_SecretBasePCStartMenu
|
||||
waitmessage
|
||||
goto_if_set FLAG_DECORATION_16, EventScript_SecretBasePCMainMenuChoice
|
||||
goto_if_set FLAG_SECRET_BASE_REGISTRY_ENABLED, EventScript_SecretBasePCMainMenuChoice
|
||||
goto EventScript_23B531
|
||||
end
|
||||
|
||||
@@ -487,16 +487,16 @@ EventScript_23B568:: @ 823B568
|
||||
compare VAR_RESULT, 0
|
||||
goto_if_eq EventScript_SecretBasePCShowMainMenu
|
||||
closemessage
|
||||
special sub_80E9AC0
|
||||
special MoveOutOfSecretBase
|
||||
releaseall
|
||||
end
|
||||
|
||||
EventScript_23B581:: @ 823B581
|
||||
special sub_80E9C74
|
||||
special ShowSecretBaseDecorationMenu
|
||||
end
|
||||
|
||||
EventScript_23B585:: @ 823B585
|
||||
special sub_80E9C88
|
||||
special ShowSecretBaseRegistryMenu
|
||||
end
|
||||
|
||||
EventScript_RecordMixingSecretBasePC:: @ 823B589
|
||||
@@ -529,17 +529,17 @@ gUnknown_0823B5E9:: @ 823B5E9
|
||||
end
|
||||
|
||||
EventScript_23B5F0:: @ 823B5F0
|
||||
special sub_80E9BDC
|
||||
special GetCurSecretBaseRegistrationValidity
|
||||
compare VAR_RESULT, 1
|
||||
goto_if_eq EventScript_23B62F
|
||||
compare VAR_RESULT, 2
|
||||
goto_if_eq EventScript_CantRegisterTooManyBases
|
||||
special sub_80E980C
|
||||
msgbox Text_276707, MSGBOX_YESNO
|
||||
special CopyCurSecretBaseOwnerName_StrVar1
|
||||
msgbox Text_WantToRegisterSecretBase, MSGBOX_YESNO
|
||||
compare VAR_RESULT, 0
|
||||
goto_if_eq EventScript_23B5A1
|
||||
msgbox Text_2767D1, MSGBOX_SIGN
|
||||
special sub_80E9C2C
|
||||
special ToggleCurSecretBaseRegistry
|
||||
special DoSecretBasePCTurnOffEffect
|
||||
releaseall
|
||||
end
|
||||
@@ -549,7 +549,7 @@ EventScript_23B62F:: @ 823B62F
|
||||
compare VAR_RESULT, 0
|
||||
goto_if_eq EventScript_23B5A1
|
||||
msgbox Text_2767E9, MSGBOX_SIGN
|
||||
special sub_80E9C2C
|
||||
special ToggleCurSecretBaseRegistry
|
||||
special DoSecretBasePCTurnOffEffect
|
||||
releaseall
|
||||
end
|
||||
@@ -573,23 +573,23 @@ EventScript_23B66E:: @ 823B66E
|
||||
end
|
||||
|
||||
EventScript_23B674:: @ 823B674
|
||||
special sub_80EB498
|
||||
special SetSecretBaseSecretsTvFlags_Poster
|
||||
end
|
||||
|
||||
EventScript_23B678:: @ 823B678
|
||||
special sub_80EB56C
|
||||
special SetSecretBaseSecretsTvFlags_MiscFurnature
|
||||
end
|
||||
|
||||
EventScript_23B67C:: @ 823B67C
|
||||
special sub_80EB9E0
|
||||
special SetSecretBaseSecretsTvFlags_LargeDecorationSpot
|
||||
end
|
||||
|
||||
EventScript_23B680:: @ 823B680
|
||||
special sub_80EBB28
|
||||
special SetSecretBaseSecretsTvFlags_SmallDecorationSpot
|
||||
end
|
||||
|
||||
EventScript_SecretBaseSandOrnament:: @ 823B684
|
||||
special sub_80EBE7C
|
||||
special SetSecretBaseSecretsTvFlags_SandOrnament
|
||||
dofieldeffect FLDEFF_SAND_PILLAR
|
||||
waitstate
|
||||
end
|
||||
|
||||
@@ -37,7 +37,7 @@
|
||||
"movement_range_y": 1,
|
||||
"trainer_type": "0",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "AbandonedShip_CaptainsOffice_EventScript_29126E",
|
||||
"script": "AbandonedShip_CaptainsOffice_EventScript_ItemStorageKey",
|
||||
"flag": "FLAG_ITEM_ABANDONED_SHIP_CAPTAINS_OFFICE_STORAGE_KEY"
|
||||
}
|
||||
],
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
AbandonedShip_Deck_MapScripts:: @ 823799A
|
||||
map_script MAP_SCRIPT_ON_TRANSITION, AbandonedShip_Deck_MapScript1_2379A0
|
||||
map_script MAP_SCRIPT_ON_TRANSITION, AbandonedShip_Deck_OnTransition
|
||||
.byte 0
|
||||
|
||||
AbandonedShip_Deck_MapScript1_2379A0: @ 82379A0
|
||||
AbandonedShip_Deck_OnTransition: @ 82379A0
|
||||
setflag FLAG_LANDMARK_ABANDONED_SHIP
|
||||
end
|
||||
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
"movement_range_y": 0,
|
||||
"trainer_type": "0",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "AbandonedShip_HiddenFloorRooms_EventScript_29127B",
|
||||
"script": "AbandonedShip_HiddenFloorRooms_EventScript_ItemLuxuryBall",
|
||||
"flag": "FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_6_LUXURY_BALL"
|
||||
},
|
||||
{
|
||||
@@ -37,7 +37,7 @@
|
||||
"movement_range_y": 0,
|
||||
"trainer_type": "0",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "AbandonedShip_HiddenFloorRooms_EventScript_291288",
|
||||
"script": "AbandonedShip_HiddenFloorRooms_EventScript_ItemScanner",
|
||||
"flag": "FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_4_SCANNER"
|
||||
},
|
||||
{
|
||||
@@ -50,7 +50,7 @@
|
||||
"movement_range_y": 1,
|
||||
"trainer_type": "0",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "AbandonedShip_HiddenFloorRooms_EventScript_2912A2",
|
||||
"script": "AbandonedShip_HiddenFloorRooms_EventScript_ItemTM18",
|
||||
"flag": "FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_1_TM_18"
|
||||
},
|
||||
{
|
||||
@@ -63,7 +63,7 @@
|
||||
"movement_range_y": 1,
|
||||
"trainer_type": "0",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "AbandonedShip_HiddenFloorRooms_EventScript_291295",
|
||||
"script": "AbandonedShip_HiddenFloorRooms_EventScript_ItemWaterStone",
|
||||
"flag": "FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_3_WATER_STONE"
|
||||
}
|
||||
],
|
||||
|
||||
@@ -42,11 +42,11 @@ AbandonedShip_HiddenFloorRooms_EventScript_238CE3:: @ 8238CE3
|
||||
setfieldeffectargument 0, 10
|
||||
setfieldeffectargument 1, 10
|
||||
setfieldeffectargument 2, 0
|
||||
dofieldeffect 54
|
||||
dofieldeffect FLDEFF_SPARKLE
|
||||
specialvar VAR_RESULT, FoundAbandonedShipRoom4Key
|
||||
compare VAR_RESULT, 0
|
||||
call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_238DD3
|
||||
waitfieldeffect 54
|
||||
waitfieldeffect FLDEFF_SPARKLE
|
||||
delay 10
|
||||
end
|
||||
|
||||
@@ -60,7 +60,7 @@ AbandonedShip_HiddenFloorRooms_EventScript_238D0D:: @ 8238D0D
|
||||
delay 20
|
||||
compare VAR_RESULT, 0
|
||||
call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_238DB3
|
||||
waitfieldeffect 54
|
||||
waitfieldeffect FLDEFF_SPARKLE
|
||||
delay 10
|
||||
end
|
||||
|
||||
@@ -72,15 +72,15 @@ AbandonedShip_HiddenFloorRooms_EventScript_238D33:: @ 8238D33
|
||||
setfieldeffectargument 0, 8
|
||||
setfieldeffectargument 1, 5
|
||||
setfieldeffectargument 2, 0
|
||||
dofieldeffect 54
|
||||
dofieldeffect FLDEFF_SPARKLE
|
||||
setfieldeffectargument 0, 11
|
||||
setfieldeffectargument 1, 3
|
||||
setfieldeffectargument 2, 0
|
||||
dofieldeffect 54
|
||||
dofieldeffect FLDEFF_SPARKLE
|
||||
specialvar VAR_RESULT, FoundAbandonedShipRoom6Key
|
||||
compare VAR_RESULT, 0
|
||||
call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_238DE3
|
||||
waitfieldeffect 54
|
||||
waitfieldeffect FLDEFF_SPARKLE
|
||||
delay 10
|
||||
end
|
||||
|
||||
@@ -89,19 +89,19 @@ AbandonedShip_HiddenFloorRooms_EventScript_238D6B:: @ 8238D6B
|
||||
setfieldeffectargument 0, 16
|
||||
setfieldeffectargument 1, 3
|
||||
setfieldeffectargument 2, 0
|
||||
dofieldeffect 54
|
||||
dofieldeffect FLDEFF_SPARKLE
|
||||
setfieldeffectargument 0, 25
|
||||
setfieldeffectargument 1, 2
|
||||
setfieldeffectargument 2, 0
|
||||
dofieldeffect 54
|
||||
dofieldeffect FLDEFF_SPARKLE
|
||||
setfieldeffectargument 0, 24
|
||||
setfieldeffectargument 1, 6
|
||||
setfieldeffectargument 2, 0
|
||||
dofieldeffect 54
|
||||
dofieldeffect FLDEFF_SPARKLE
|
||||
specialvar VAR_RESULT, FoundAbandonedShipRoom2Key
|
||||
compare VAR_RESULT, 0
|
||||
call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_238DC3
|
||||
waitfieldeffect 54
|
||||
waitfieldeffect FLDEFF_SPARKLE
|
||||
delay 10
|
||||
end
|
||||
|
||||
@@ -112,28 +112,28 @@ AbandonedShip_HiddenFloorRooms_EventScript_238DB3:: @ 8238DB3
|
||||
setfieldeffectargument 0, 42
|
||||
setfieldeffectargument 1, 10
|
||||
setfieldeffectargument 2, 0
|
||||
dofieldeffect 54
|
||||
dofieldeffect FLDEFF_SPARKLE
|
||||
return
|
||||
|
||||
AbandonedShip_HiddenFloorRooms_EventScript_238DC3:: @ 8238DC3
|
||||
setfieldeffectargument 0, 20
|
||||
setfieldeffectargument 1, 5
|
||||
setfieldeffectargument 2, 0
|
||||
dofieldeffect 54
|
||||
dofieldeffect FLDEFF_SPARKLE
|
||||
return
|
||||
|
||||
AbandonedShip_HiddenFloorRooms_EventScript_238DD3:: @ 8238DD3
|
||||
setfieldeffectargument 0, 1
|
||||
setfieldeffectargument 1, 12
|
||||
setfieldeffectargument 2, 0
|
||||
dofieldeffect 54
|
||||
dofieldeffect FLDEFF_SPARKLE
|
||||
return
|
||||
|
||||
AbandonedShip_HiddenFloorRooms_EventScript_238DE3:: @ 8238DE3
|
||||
setfieldeffectargument 0, 1
|
||||
setfieldeffectargument 1, 2
|
||||
setfieldeffectargument 2, 0
|
||||
dofieldeffect 54
|
||||
dofieldeffect FLDEFF_SPARKLE
|
||||
return
|
||||
|
||||
AbandonedShip_HiddenFloorRooms_EventScript_238DF3:: @ 8238DF3
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
"movement_range_y": 1,
|
||||
"trainer_type": "0",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "AbandonedShip_Room_B1F_EventScript_291254",
|
||||
"script": "AbandonedShip_Room_B1F_EventScript_ItemTM13",
|
||||
"flag": "FLAG_ITEM_ABANDONED_SHIP_ROOMS_B1F_TM_13"
|
||||
}
|
||||
],
|
||||
|
||||
@@ -50,7 +50,7 @@
|
||||
"movement_range_y": 1,
|
||||
"trainer_type": "0",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "AbandonedShip_Rooms2_1F_EventScript_291261",
|
||||
"script": "AbandonedShip_Rooms2_1F_EventScript_ItemRevive",
|
||||
"flag": "FLAG_ITEM_ABANDONED_SHIP_ROOMS_2_1F_REVIVE"
|
||||
},
|
||||
{
|
||||
|
||||
@@ -37,7 +37,7 @@
|
||||
"movement_range_y": 1,
|
||||
"trainer_type": "0",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "AbandonedShip_Rooms2_B1F_EventScript_291247",
|
||||
"script": "AbandonedShip_Rooms2_B1F_EventScript_ItemDiveBall",
|
||||
"flag": "FLAG_ITEM_ABANDONED_SHIP_ROOMS_2_B1F_DIVE_BALL"
|
||||
}
|
||||
],
|
||||
|
||||
@@ -37,7 +37,7 @@
|
||||
"movement_range_y": 1,
|
||||
"trainer_type": "0",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "AbandonedShip_Rooms_1F_EventScript_29122D",
|
||||
"script": "AbandonedShip_Rooms_1F_EventScript_ItemHarborMail",
|
||||
"flag": "FLAG_ITEM_ABANDONED_SHIP_ROOMS_1F_HARBOR_MAIL"
|
||||
},
|
||||
{
|
||||
|
||||
@@ -37,7 +37,7 @@
|
||||
"movement_range_y": 1,
|
||||
"trainer_type": "0",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "AbandonedShip_Rooms_B1F_EventScript_29123A",
|
||||
"script": "AbandonedShip_Rooms_B1F_EventScript_ItemEscapeRope",
|
||||
"flag": "FLAG_ITEM_ABANDONED_SHIP_ROOMS_B1F_ESCAPE_ROPE"
|
||||
}
|
||||
],
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
AlteringCave_MapScripts:: @ 823B177
|
||||
map_script MAP_SCRIPT_ON_TRANSITION, AlteringCave_MapScript1_23B17D
|
||||
map_script MAP_SCRIPT_ON_TRANSITION, AlteringCave_OnTransition
|
||||
.byte 0
|
||||
|
||||
AlteringCave_MapScript1_23B17D: @ 823B17D
|
||||
AlteringCave_OnTransition: @ 823B17D
|
||||
setflag FLAG_LANDMARK_ALTERING_CAVE
|
||||
end
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
AncientTomb_MapScripts:: @ 8238FB3
|
||||
map_script MAP_SCRIPT_ON_RESUME, AncientTomb_MapScript1_238FC3
|
||||
map_script MAP_SCRIPT_ON_LOAD, AncientTomb_MapScript1_238FF2
|
||||
map_script MAP_SCRIPT_ON_TRANSITION, AncientTomb_MapScript1_238FE1
|
||||
map_script MAP_SCRIPT_ON_TRANSITION, AncientTomb_OnTransition
|
||||
.byte 0
|
||||
|
||||
AncientTomb_MapScript1_238FC3: @ 8238FC3
|
||||
@@ -15,7 +15,7 @@ AncientTomb_EventScript_238FCD:: @ 8238FCD
|
||||
removeobject VAR_LAST_TALKED
|
||||
return
|
||||
|
||||
AncientTomb_MapScript1_238FE1: @ 8238FE1
|
||||
AncientTomb_OnTransition: @ 8238FE1
|
||||
setflag FLAG_LANDMARK_ANCIENT_TOMB
|
||||
call_if_unset FLAG_DEFEATED_REGISTEEL, AncientTomb_EventScript_238FEE
|
||||
end
|
||||
|
||||
@@ -50,7 +50,7 @@
|
||||
"movement_range_y": 0,
|
||||
"trainer_type": "0",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "AquaHideout_B1F_EventScript_291372",
|
||||
"script": "AquaHideout_B1F_EventScript_ItemMaxElixir",
|
||||
"flag": "FLAG_ITEM_AQUA_HIDEOUT_B1F_MAX_ELIXIR"
|
||||
},
|
||||
{
|
||||
@@ -76,7 +76,7 @@
|
||||
"movement_range_y": 1,
|
||||
"trainer_type": "0",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "AquaHideout_B1F_EventScript_291358",
|
||||
"script": "AquaHideout_B1F_EventScript_ItemMasterBall",
|
||||
"flag": "FLAG_ITEM_AQUA_HIDEOUT_B1F_MASTER_BALL"
|
||||
},
|
||||
{
|
||||
@@ -102,7 +102,7 @@
|
||||
"movement_range_y": 1,
|
||||
"trainer_type": "0",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "AquaHideout_B1F_EventScript_291365",
|
||||
"script": "AquaHideout_B1F_EventScript_ItemNugget",
|
||||
"flag": "FLAG_ITEM_AQUA_HIDEOUT_B1F_NUGGET"
|
||||
},
|
||||
{
|
||||
|
||||
@@ -50,7 +50,7 @@
|
||||
"movement_range_y": 0,
|
||||
"trainer_type": "0",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "AquaHideout_B2F_EventScript_29137F",
|
||||
"script": "AquaHideout_B2F_EventScript_ItemNestBall",
|
||||
"flag": "FLAG_ITEM_AQUA_HIDEOUT_B2F_NEST_BALL"
|
||||
},
|
||||
{
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
"movement_range_y": 1,
|
||||
"trainer_type": "0",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "ArtisanCave_1F_EventScript_2914D1",
|
||||
"script": "ArtisanCave_1F_EventScript_ItemCarbos",
|
||||
"flag": "FLAG_ITEM_ARTISAN_CAVE_1F_CARBOS"
|
||||
}
|
||||
],
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
"movement_range_y": 1,
|
||||
"trainer_type": "0",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "ArtisanCave_B1F_EventScript_2914C4",
|
||||
"script": "ArtisanCave_B1F_EventScript_ItemHPUp",
|
||||
"flag": "FLAG_ITEM_ARTISAN_CAVE_B1F_HP_UP"
|
||||
}
|
||||
],
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
ArtisanCave_B1F_MapScripts:: @ 823AFAD
|
||||
map_script MAP_SCRIPT_ON_TRANSITION, ArtisanCave_B1F_MapScript1_23AFB3
|
||||
map_script MAP_SCRIPT_ON_TRANSITION, ArtisanCave_B1F_OnTransition
|
||||
.byte 0
|
||||
|
||||
ArtisanCave_B1F_MapScript1_23AFB3: @ 823AFB3
|
||||
ArtisanCave_B1F_OnTransition: @ 823AFB3
|
||||
setflag FLAG_LANDMARK_ARTISAN_CAVE
|
||||
end
|
||||
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
BattleFrontier_ReceptionGate_MapScripts:: @ 82661DA
|
||||
map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_ReceptionGate_MapScript2_2661E9
|
||||
map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_ReceptionGate_MapScript1_2661E5
|
||||
map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_ReceptionGate_OnTransition
|
||||
.byte 0
|
||||
|
||||
BattleFrontier_ReceptionGate_MapScript1_2661E5: @ 82661E5
|
||||
BattleFrontier_ReceptionGate_OnTransition: @ 82661E5
|
||||
setflag FLAG_LANDMARK_BATTLE_FRONTIER
|
||||
end
|
||||
|
||||
|
||||
@@ -68,9 +68,9 @@ BirthIsland_Exterior_EventScript_267FC1:: @ 8267FC1
|
||||
setfieldeffectargument 0, 1
|
||||
setfieldeffectargument 1, 58
|
||||
setfieldeffectargument 2, 26
|
||||
dofieldeffect 65
|
||||
dofieldeffect FLDEFF_65
|
||||
playbgm MUS_RG_DEOEYE, 0
|
||||
waitfieldeffect 65
|
||||
waitfieldeffect FLDEFF_65
|
||||
addobject 2
|
||||
applymovement 2, BirthIsland_Exterior_Movement_268054
|
||||
waitmovement 0
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
DesertRuins_MapScripts:: @ 822D95B
|
||||
map_script MAP_SCRIPT_ON_RESUME, DesertRuins_MapScript1_22D96B
|
||||
map_script MAP_SCRIPT_ON_LOAD, DesertRuins_MapScript1_22D989
|
||||
map_script MAP_SCRIPT_ON_TRANSITION, DesertRuins_MapScript1_22D9CA
|
||||
map_script MAP_SCRIPT_ON_TRANSITION, DesertRuins_OnTransition
|
||||
.byte 0
|
||||
|
||||
DesertRuins_MapScript1_22D96B: @ 822D96B
|
||||
@@ -28,7 +28,7 @@ DesertRuins_EventScript_22D993:: @ 822D993
|
||||
setmetatile 9, 20, 565, 1
|
||||
return
|
||||
|
||||
DesertRuins_MapScript1_22D9CA: @ 822D9CA
|
||||
DesertRuins_OnTransition: @ 822D9CA
|
||||
setflag FLAG_LANDMARK_DESERT_RUINS
|
||||
call_if_unset FLAG_DEFEATED_REGIROCK, DesertRuins_EventScript_22D9D7
|
||||
end
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
DesertUnderpass_MapScripts:: @ 823AF37
|
||||
map_script MAP_SCRIPT_ON_TRANSITION, DesertUnderpass_MapScript1_23AF3D
|
||||
map_script MAP_SCRIPT_ON_TRANSITION, DesertUnderpass_OnTransition
|
||||
.byte 0
|
||||
|
||||
DesertUnderpass_MapScript1_23AF3D: @ 823AF3D
|
||||
DesertUnderpass_OnTransition: @ 823AF3D
|
||||
setflag FLAG_LANDMARK_DESERT_UNDERPASS
|
||||
end
|
||||
|
||||
|
||||
@@ -38,8 +38,8 @@ EverGrandeCity_HallOfFame_EventScript_229850:: @ 8229850
|
||||
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp
|
||||
waitmovement 0
|
||||
delay 20
|
||||
dofieldeffect 62
|
||||
waitfieldeffect 62
|
||||
dofieldeffect FLDEFF_HALL_OF_FAME_RECORD
|
||||
waitfieldeffect FLDEFF_HALL_OF_FAME_RECORD
|
||||
delay 40
|
||||
setvar VAR_TEMP_1, 1
|
||||
call EverGrandeCity_HallOfFame_EventScript_2717C1
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
EverGrandeCity_PokemonLeague_1F_MapScripts:: @ 82295D2
|
||||
map_script MAP_SCRIPT_ON_TRANSITION, EverGrandeCity_PokemonLeague_1F_MapScript1_2295DD
|
||||
map_script MAP_SCRIPT_ON_TRANSITION, EverGrandeCity_PokemonLeague_1F_OnTransition
|
||||
map_script MAP_SCRIPT_ON_RESUME, EverGrandeCity_PokemonLeague_1F_MapScript1_277C30
|
||||
.byte 0
|
||||
|
||||
EverGrandeCity_PokemonLeague_1F_MapScript1_2295DD: @ 82295DD
|
||||
EverGrandeCity_PokemonLeague_1F_OnTransition: @ 82295DD
|
||||
setrespawn HEAL_LOCATION_EVER_GRANDE_CITY_2
|
||||
setflag FLAG_LANDMARK_POKEMON_LEAGUE
|
||||
call_if_unset FLAG_ENTERED_ELITE_FOUR, EverGrandeCity_PokemonLeague_1F_EventScript_2295ED
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
"movement_range_y": 1,
|
||||
"trainer_type": "0",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "FieryPath_EventScript_29119E",
|
||||
"script": "FieryPath_EventScript_ItemTM06",
|
||||
"flag": "FLAG_ITEM_FIERY_PATH_TM06"
|
||||
},
|
||||
{
|
||||
@@ -37,7 +37,7 @@
|
||||
"movement_range_y": 0,
|
||||
"trainer_type": "0",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "FieryPath_EventScript_2908BA",
|
||||
"script": "EventScript_StrengthBoulder",
|
||||
"flag": "FLAG_TEMP_11"
|
||||
},
|
||||
{
|
||||
@@ -50,7 +50,7 @@
|
||||
"movement_range_y": 0,
|
||||
"trainer_type": "0",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "FieryPath_EventScript_2908BA",
|
||||
"script": "EventScript_StrengthBoulder",
|
||||
"flag": "FLAG_TEMP_12"
|
||||
},
|
||||
{
|
||||
@@ -63,7 +63,7 @@
|
||||
"movement_range_y": 0,
|
||||
"trainer_type": "0",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "FieryPath_EventScript_2908BA",
|
||||
"script": "EventScript_StrengthBoulder",
|
||||
"flag": "FLAG_TEMP_13"
|
||||
},
|
||||
{
|
||||
@@ -76,7 +76,7 @@
|
||||
"movement_range_y": 0,
|
||||
"trainer_type": "0",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "FieryPath_EventScript_2908BA",
|
||||
"script": "EventScript_StrengthBoulder",
|
||||
"flag": "FLAG_TEMP_14"
|
||||
},
|
||||
{
|
||||
@@ -89,7 +89,7 @@
|
||||
"movement_range_y": 0,
|
||||
"trainer_type": "0",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "FieryPath_EventScript_2908BA",
|
||||
"script": "EventScript_StrengthBoulder",
|
||||
"flag": "FLAG_TEMP_15"
|
||||
},
|
||||
{
|
||||
@@ -102,7 +102,7 @@
|
||||
"movement_range_y": 0,
|
||||
"trainer_type": "0",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "FieryPath_EventScript_2908BA",
|
||||
"script": "EventScript_StrengthBoulder",
|
||||
"flag": "FLAG_TEMP_16"
|
||||
},
|
||||
{
|
||||
@@ -115,7 +115,7 @@
|
||||
"movement_range_y": 1,
|
||||
"trainer_type": "0",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "FieryPath_EventScript_291191",
|
||||
"script": "FieryPath_EventScript_ItemFireStone",
|
||||
"flag": "FLAG_ITEM_FIERY_PATH_FIRE_STONE"
|
||||
}
|
||||
],
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
FieryPath_MapScripts:: @ 8230F24
|
||||
map_script MAP_SCRIPT_ON_TRANSITION, FieryPath_MapScript1_230F2A
|
||||
map_script MAP_SCRIPT_ON_TRANSITION, FieryPath_OnTransition
|
||||
.byte 0
|
||||
|
||||
FieryPath_MapScript1_230F2A: @ 8230F2A
|
||||
FieryPath_OnTransition: @ 8230F2A
|
||||
call_if_unset FLAG_LANDMARK_FIERY_PATH, FieryPath_EventScript_230F37
|
||||
setflag FLAG_LANDMARK_FIERY_PATH
|
||||
end
|
||||
|
||||
@@ -37,7 +37,7 @@
|
||||
"movement_range_y": 0,
|
||||
"trainer_type": "0",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "GraniteCave_1F_EventScript_291150",
|
||||
"script": "GraniteCave_1F_EventScript_ItemEscapeRope",
|
||||
"flag": "FLAG_ITEM_GRANITE_CAVE_1F_ESCAPE_ROPE"
|
||||
}
|
||||
],
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
"movement_range_y": 0,
|
||||
"trainer_type": "0",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "GraniteCave_B1F_EventScript_29115D",
|
||||
"script": "GraniteCave_B1F_EventScript_ItemPokeBall",
|
||||
"flag": "FLAG_ITEM_GRANITE_CAVE_B1F_POKE_BALL"
|
||||
}
|
||||
],
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
"movement_range_y": 0,
|
||||
"trainer_type": "0",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "GraniteCave_B2F_EventScript_29116A",
|
||||
"script": "GraniteCave_B2F_EventScript_ItemRepel",
|
||||
"flag": "FLAG_ITEM_GRANITE_CAVE_B2F_REPEL"
|
||||
},
|
||||
{
|
||||
@@ -37,7 +37,7 @@
|
||||
"movement_range_y": 0,
|
||||
"trainer_type": "0",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "GraniteCave_B2F_EventScript_291177",
|
||||
"script": "GraniteCave_B2F_EventScript_ItemRareCandy",
|
||||
"flag": "FLAG_ITEM_GRANITE_CAVE_B2F_RARE_CANDY"
|
||||
},
|
||||
{
|
||||
@@ -50,7 +50,7 @@
|
||||
"movement_range_y": 1,
|
||||
"trainer_type": "0",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "GraniteCave_B2F_EventScript_2907A6",
|
||||
"script": "EventScript_RockSmash",
|
||||
"flag": "FLAG_TEMP_11"
|
||||
},
|
||||
{
|
||||
@@ -63,7 +63,7 @@
|
||||
"movement_range_y": 1,
|
||||
"trainer_type": "0",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "GraniteCave_B2F_EventScript_2907A6",
|
||||
"script": "EventScript_RockSmash",
|
||||
"flag": "FLAG_TEMP_12"
|
||||
},
|
||||
{
|
||||
@@ -76,7 +76,7 @@
|
||||
"movement_range_y": 1,
|
||||
"trainer_type": "0",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "GraniteCave_B2F_EventScript_2907A6",
|
||||
"script": "EventScript_RockSmash",
|
||||
"flag": "FLAG_TEMP_13"
|
||||
},
|
||||
{
|
||||
@@ -89,7 +89,7 @@
|
||||
"movement_range_y": 1,
|
||||
"trainer_type": "0",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "GraniteCave_B2F_EventScript_2907A6",
|
||||
"script": "EventScript_RockSmash",
|
||||
"flag": "FLAG_TEMP_14"
|
||||
},
|
||||
{
|
||||
@@ -102,7 +102,7 @@
|
||||
"movement_range_y": 1,
|
||||
"trainer_type": "0",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "GraniteCave_B2F_EventScript_2907A6",
|
||||
"script": "EventScript_RockSmash",
|
||||
"flag": "FLAG_TEMP_15"
|
||||
},
|
||||
{
|
||||
@@ -115,7 +115,7 @@
|
||||
"movement_range_y": 1,
|
||||
"trainer_type": "0",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "GraniteCave_B2F_EventScript_2907A6",
|
||||
"script": "EventScript_RockSmash",
|
||||
"flag": "FLAG_TEMP_16"
|
||||
},
|
||||
{
|
||||
@@ -128,7 +128,7 @@
|
||||
"movement_range_y": 1,
|
||||
"trainer_type": "0",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "GraniteCave_B2F_EventScript_2907A6",
|
||||
"script": "EventScript_RockSmash",
|
||||
"flag": "FLAG_TEMP_17"
|
||||
}
|
||||
],
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
IslandCave_MapScripts:: @ 8238E2A
|
||||
map_script MAP_SCRIPT_ON_RESUME, IslandCave_MapScript1_238E3A
|
||||
map_script MAP_SCRIPT_ON_LOAD, IslandCave_MapScript1_238E58
|
||||
map_script MAP_SCRIPT_ON_TRANSITION, IslandCave_MapScript1_238E99
|
||||
map_script MAP_SCRIPT_ON_TRANSITION, IslandCave_OnTransition
|
||||
.byte 0
|
||||
|
||||
IslandCave_MapScript1_238E3A: @ 8238E3A
|
||||
@@ -28,7 +28,7 @@ IslandCave_EventScript_238E62:: @ 8238E62
|
||||
setmetatile 9, 20, 565, 1
|
||||
return
|
||||
|
||||
IslandCave_MapScript1_238E99: @ 8238E99
|
||||
IslandCave_OnTransition: @ 8238E99
|
||||
setflag FLAG_LANDMARK_ISLAND_CAVE
|
||||
call IslandCave_EventScript_238F45
|
||||
call_if_unset FLAG_DEFEATED_REGICE, IslandCave_EventScript_238EAB
|
||||
|
||||
@@ -50,7 +50,7 @@
|
||||
"movement_range_y": 0,
|
||||
"trainer_type": "0",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "JaggedPass_EventScript_291184",
|
||||
"script": "JaggedPass_EventScript_ItemBurnHeal",
|
||||
"flag": "FLAG_ITEM_JAGGED_PASS_BURN_HEAL"
|
||||
},
|
||||
{
|
||||
|
||||
@@ -165,7 +165,7 @@
|
||||
"movement_range_y": 0,
|
||||
"trainer_type": "0",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "LilycoveCity_EventScript_2910E8",
|
||||
"script": "LilycoveCity_EventScript_ItemMaxRepel",
|
||||
"flag": "FLAG_ITEM_LILYCOVE_CITY_MAX_REPEL"
|
||||
},
|
||||
{
|
||||
|
||||
@@ -391,10 +391,10 @@ LilycoveCity_EventScript_1E3006:: @ 81E3006
|
||||
waitmovement 0
|
||||
delay 50
|
||||
setfieldeffectargument 0, 1
|
||||
dofieldeffect 30
|
||||
dofieldeffect FLDEFF_NPCFLY_OUT
|
||||
delay 15
|
||||
removeobject VAR_LAST_TALKED
|
||||
waitfieldeffect 30
|
||||
waitfieldeffect FLDEFF_NPCFLY_OUT
|
||||
savebgm MUS_DUMMY
|
||||
fadedefaultbgm
|
||||
setflag FLAG_MET_RIVAL_LILYCOVE
|
||||
|
||||
@@ -37,7 +37,7 @@
|
||||
"movement_range_y": 1,
|
||||
"trainer_type": "0",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "MagmaHideout_1F_EventScript_2914DE",
|
||||
"script": "MagmaHideout_1F_EventScript_ItemRareCandy",
|
||||
"flag": "FLAG_ITEM_MAGMA_HIDEOUT_1F_RARE_CANDY"
|
||||
},
|
||||
{
|
||||
@@ -63,7 +63,7 @@
|
||||
"movement_range_y": 0,
|
||||
"trainer_type": "0",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "MagmaHideout_1F_EventScript_2908BA",
|
||||
"script": "EventScript_StrengthBoulder",
|
||||
"flag": "FLAG_TEMP_11"
|
||||
},
|
||||
{
|
||||
@@ -76,7 +76,7 @@
|
||||
"movement_range_y": 0,
|
||||
"trainer_type": "0",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "MagmaHideout_1F_EventScript_2908BA",
|
||||
"script": "EventScript_StrengthBoulder",
|
||||
"flag": "FLAG_TEMP_12"
|
||||
},
|
||||
{
|
||||
@@ -89,7 +89,7 @@
|
||||
"movement_range_y": 0,
|
||||
"trainer_type": "0",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "MagmaHideout_1F_EventScript_2908BA",
|
||||
"script": "EventScript_StrengthBoulder",
|
||||
"flag": "FLAG_TEMP_13"
|
||||
}
|
||||
],
|
||||
|
||||
@@ -50,7 +50,7 @@
|
||||
"movement_range_y": 1,
|
||||
"trainer_type": "0",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "MagmaHideout_2F_2R_EventScript_2914EB",
|
||||
"script": "MagmaHideout_2F_2R_EventScript_MaxElixir",
|
||||
"flag": "FLAG_ITEM_MAGMA_HIDEOUT_2F_2R_MAX_ELIXIR"
|
||||
},
|
||||
{
|
||||
@@ -89,7 +89,7 @@
|
||||
"movement_range_y": 1,
|
||||
"trainer_type": "0",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "MagmaHideout_2F_2R_EventScript_2914F8",
|
||||
"script": "MagmaHideout_2F_2R_EventScript_ItemFullRestore",
|
||||
"flag": "FLAG_ITEM_MAGMA_HIDEOUT_2F_2R_FULL_RESTORE"
|
||||
}
|
||||
],
|
||||
|
||||
@@ -50,7 +50,7 @@
|
||||
"movement_range_y": 1,
|
||||
"trainer_type": "0",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "MagmaHideout_3F_1R_EventScript_291505",
|
||||
"script": "MagmaHideout_3F_1R_EventScript_ItemNugget",
|
||||
"flag": "FLAG_ITEM_MAGMA_HIDEOUT_3F_1R_NUGGET"
|
||||
}
|
||||
],
|
||||
|
||||
@@ -37,7 +37,7 @@
|
||||
"movement_range_y": 1,
|
||||
"trainer_type": "0",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "MagmaHideout_3F_2R_EventScript_291512",
|
||||
"script": "MagmaHideout_3F_2R_EventScript_ItemPPMax",
|
||||
"flag": "FLAG_ITEM_MAGMA_HIDEOUT_3F_2R_PP_MAX"
|
||||
}
|
||||
],
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
"movement_range_y": 1,
|
||||
"trainer_type": "0",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "MagmaHideout_3F_3R_EventScript_29152C",
|
||||
"script": "MagmaHideout_3F_3R_EventScript_ItemEscapeRope",
|
||||
"flag": "FLAG_ITEM_MAGMA_HIDEOUT_3F_3R_ECAPE_ROPE"
|
||||
}
|
||||
],
|
||||
|
||||
@@ -115,7 +115,7 @@
|
||||
"movement_range_y": 1,
|
||||
"trainer_type": "0",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "MagmaHideout_4F_EventScript_29151F",
|
||||
"script": "MagmaHideout_4F_EventScript_MaxRevive",
|
||||
"flag": "FLAG_ITEM_MAGMA_HIDEOUT_4F_MAX_REVIVE"
|
||||
}
|
||||
],
|
||||
|
||||
@@ -12,8 +12,8 @@ MagmaHideout_4F_EventScript_23A560:: @ 823A560
|
||||
setfieldeffectargument 0, 18
|
||||
setfieldeffectargument 1, 42
|
||||
setfieldeffectargument 2, 0
|
||||
dofieldeffect 54
|
||||
waitfieldeffect 54
|
||||
dofieldeffect FLDEFF_SPARKLE
|
||||
waitfieldeffect FLDEFF_SPARKLE
|
||||
setvar VAR_RESULT, 1
|
||||
playfanfare MUS_ME_TAMA
|
||||
playse SE_TAMA
|
||||
|
||||
@@ -149,7 +149,7 @@
|
||||
"movement_range_y": 1,
|
||||
"trainer_type": "0",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "MauvilleCity_EventScript_2910CE",
|
||||
"script": "MauvilleCity_EventScript_ItemXSpeed",
|
||||
"flag": "FLAG_ITEM_MAUVILLE_CITY_X_SPEED"
|
||||
},
|
||||
{
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
"movement_range_y": 0,
|
||||
"trainer_type": "0",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "MeteorFalls_1F_1R_EventScript_2911AB",
|
||||
"script": "MeteorFalls_1F_1R_EventScript_ItemTM23",
|
||||
"flag": "FLAG_ITEM_METEOR_FALLS_1F_1R_TM_23"
|
||||
},
|
||||
{
|
||||
@@ -37,7 +37,7 @@
|
||||
"movement_range_y": 0,
|
||||
"trainer_type": "0",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "MeteorFalls_1F_1R_EventScript_2911C5",
|
||||
"script": "MeteorFalls_1F_1R_EventScript_ItemMoonStone",
|
||||
"flag": "FLAG_ITEM_METEOR_FALLS_1F_1R_MOON_STONE"
|
||||
},
|
||||
{
|
||||
@@ -50,7 +50,7 @@
|
||||
"movement_range_y": 0,
|
||||
"trainer_type": "0",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "MeteorFalls_1F_1R_EventScript_2911B8",
|
||||
"script": "MeteorFalls_1F_1R_EventScript_ItemFullHeal",
|
||||
"flag": "FLAG_ITEM_METEOR_FALLS_1F_1R_FULL_HEAL"
|
||||
},
|
||||
{
|
||||
@@ -63,7 +63,7 @@
|
||||
"movement_range_y": 0,
|
||||
"trainer_type": "0",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "MeteorFalls_1F_1R_EventScript_2911D2",
|
||||
"script": "MeteorFalls_1F_1R_EventScript_ItemPPUP",
|
||||
"flag": "FLAG_ITEM_METEOR_FALLS_1F_1R_PP_UP"
|
||||
},
|
||||
{
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
"movement_range_y": 1,
|
||||
"trainer_type": "0",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "MeteorFalls_B1F_2R_EventScript_2911DF",
|
||||
"script": "MeteorFalls_B1F_2R_EventScript_ItemTM02",
|
||||
"flag": "FLAG_ITEM_METEOR_FALLS_B1F_2R_TM_02"
|
||||
}
|
||||
],
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
MirageTower_1F_MapScripts:: @ 823AD01
|
||||
map_script MAP_SCRIPT_ON_TRANSITION, MirageTower_1F_MapScript1_23AD07
|
||||
map_script MAP_SCRIPT_ON_TRANSITION, MirageTower_1F_OnTransition
|
||||
.byte 0
|
||||
|
||||
MirageTower_1F_MapScript1_23AD07: @ 823AD07
|
||||
MirageTower_1F_OnTransition: @ 823AD07
|
||||
setflag FLAG_ENTERED_MIRAGE_TOWER
|
||||
setflag FLAG_FORCE_MIRAGE_TOWER_VISIBLE
|
||||
setflag FLAG_LANDMARK_MIRAGE_TOWER
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
"movement_range_y": 1,
|
||||
"trainer_type": "0",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "MirageTower_3F_EventScript_2907A6",
|
||||
"script": "EventScript_RockSmash",
|
||||
"flag": "FLAG_TEMP_11"
|
||||
},
|
||||
{
|
||||
@@ -37,7 +37,7 @@
|
||||
"movement_range_y": 1,
|
||||
"trainer_type": "0",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "MirageTower_3F_EventScript_2907A6",
|
||||
"script": "EventScript_RockSmash",
|
||||
"flag": "FLAG_TEMP_12"
|
||||
}
|
||||
],
|
||||
|
||||
@@ -50,7 +50,7 @@
|
||||
"movement_range_y": 1,
|
||||
"trainer_type": "0",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "MirageTower_4F_EventScript_2907A6",
|
||||
"script": "EventScript_RockSmash",
|
||||
"flag": "FLAG_TEMP_11"
|
||||
}
|
||||
],
|
||||
|
||||
@@ -105,7 +105,7 @@
|
||||
"movement_range_y": 0,
|
||||
"trainer_type": "0",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "MossdeepCity_EventScript_2910F5",
|
||||
"script": "MossdeepCity_EventScript_ItemNetBall",
|
||||
"flag": "FLAG_ITEM_MOSSDEEP_CITY_NET_BALL"
|
||||
},
|
||||
{
|
||||
|
||||
@@ -17,7 +17,7 @@ MossdeepCity_House4_EventScript_222DED:: @ 8222DED
|
||||
MossdeepCity_House4_EventScript_222DF7:: @ 8222DF7
|
||||
lock
|
||||
faceplayer
|
||||
special sub_80E8BC8
|
||||
special CheckPlayerHasSecretBase
|
||||
compare VAR_RESULT, 0
|
||||
goto_if_eq MossdeepCity_House4_EventScript_222E14
|
||||
special GetSecretBaseNearbyMapName
|
||||
|
||||
@@ -37,7 +37,7 @@
|
||||
"movement_range_y": 1,
|
||||
"trainer_type": "0",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "MtPyre_2F_EventScript_2912FD",
|
||||
"script": "MtPyre_2F_EventScript_ItemUltraBall",
|
||||
"flag": "FLAG_ITEM_MT_PYRE_2F_ULTRA_BALL"
|
||||
},
|
||||
{
|
||||
|
||||
@@ -50,7 +50,7 @@
|
||||
"movement_range_y": 1,
|
||||
"trainer_type": "0",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "MtPyre_3F_EventScript_29130A",
|
||||
"script": "MtPyre_3F_EventScript_ItemSuperRepel",
|
||||
"flag": "FLAG_ITEM_MT_PYRE_3F_SUPER_REPEL"
|
||||
},
|
||||
{
|
||||
|
||||
@@ -37,7 +37,7 @@
|
||||
"movement_range_y": 1,
|
||||
"trainer_type": "0",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "MtPyre_4F_EventScript_291317",
|
||||
"script": "MtPyre_4F_EventScript_ItemSeaIncense",
|
||||
"flag": "FLAG_ITEM_MT_PYRE_4F_SEA_INCENSE"
|
||||
}
|
||||
],
|
||||
|
||||
@@ -37,7 +37,7 @@
|
||||
"movement_range_y": 1,
|
||||
"trainer_type": "0",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "MtPyre_5F_EventScript_291324",
|
||||
"script": "MtPyre_5F_EventScript_ItemLaxIncense",
|
||||
"flag": "FLAG_ITEM_MT_PYRE_5F_LAX_INCENSE"
|
||||
}
|
||||
],
|
||||
|
||||
@@ -37,7 +37,7 @@
|
||||
"movement_range_y": 1,
|
||||
"trainer_type": "0",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "MtPyre_6F_EventScript_291331",
|
||||
"script": "MtPyre_6F_EventScript_ItemTM30",
|
||||
"flag": "FLAG_ITEM_MT_PYRE_6F_TM_30"
|
||||
},
|
||||
{
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
"movement_range_y": 0,
|
||||
"trainer_type": "0",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "MtPyre_Exterior_EventScript_29133E",
|
||||
"script": "MtPyre_Exterior_EventScript_ItemMaxPotion",
|
||||
"flag": "FLAG_ITEM_MT_PYRE_EXTERIOR_MAX_POTION"
|
||||
},
|
||||
{
|
||||
@@ -37,7 +37,7 @@
|
||||
"movement_range_y": 0,
|
||||
"trainer_type": "0",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "MtPyre_Exterior_EventScript_29134B",
|
||||
"script": "MtPyre_Exterior_EventScript_ItemTM48",
|
||||
"flag": "FLAG_ITEM_MT_PYRE_EXTERIOR_TM_48"
|
||||
}
|
||||
],
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
NewMauville_Entrance_MapScripts:: @ 82372AD
|
||||
map_script MAP_SCRIPT_ON_LOAD, NewMauville_Entrance_MapScript1_2372B8
|
||||
map_script MAP_SCRIPT_ON_TRANSITION, NewMauville_Entrance_MapScript1_2372FB
|
||||
map_script MAP_SCRIPT_ON_TRANSITION, NewMauville_Entrance_OnTransition
|
||||
.byte 0
|
||||
|
||||
NewMauville_Entrance_MapScript1_2372B8: @ 82372B8
|
||||
@@ -17,7 +17,7 @@ NewMauville_Entrance_EventScript_2372C4:: @ 82372C4
|
||||
setmetatile 5, 1, 798, 1
|
||||
return
|
||||
|
||||
NewMauville_Entrance_MapScript1_2372FB: @ 82372FB
|
||||
NewMauville_Entrance_OnTransition: @ 82372FB
|
||||
setflag FLAG_LANDMARK_NEW_MAUVILLE
|
||||
end
|
||||
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
"movement_range_y": 0,
|
||||
"trainer_type": "0",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "NewMauville_Inside_EventScript_2911EC",
|
||||
"script": "NewMauville_Inside_EventScript_ItemUltraRope",
|
||||
"flag": "FLAG_ITEM_NEW_MAUVILLE_ULTRA_BALL"
|
||||
},
|
||||
{
|
||||
@@ -37,7 +37,7 @@
|
||||
"movement_range_y": 0,
|
||||
"trainer_type": "0",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "NewMauville_Inside_EventScript_2911F9",
|
||||
"script": "NewMauville_Inside_EventScript_ItemEscapeRope",
|
||||
"flag": "FLAG_ITEM_NEW_MAUVILLE_ESCAPE_ROPE"
|
||||
},
|
||||
{
|
||||
@@ -50,7 +50,7 @@
|
||||
"movement_range_y": 1,
|
||||
"trainer_type": "0",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "NewMauville_Inside_EventScript_291206",
|
||||
"script": "NewMauville_Inside_EventScript_ItemThunderStone",
|
||||
"flag": "FLAG_ITEM_NEW_MAUVILLE_THUNDER_STONE"
|
||||
},
|
||||
{
|
||||
@@ -63,7 +63,7 @@
|
||||
"movement_range_y": 1,
|
||||
"trainer_type": "0",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "NewMauville_Inside_EventScript_291213",
|
||||
"script": "NewMauville_Inside_EventScript_ItemFullHeal",
|
||||
"flag": "FLAG_ITEM_NEW_MAUVILLE_FULL_HEAL"
|
||||
},
|
||||
{
|
||||
@@ -76,7 +76,7 @@
|
||||
"movement_range_y": 1,
|
||||
"trainer_type": "0",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "NewMauville_Inside_EventScript_291220",
|
||||
"script": "NewMauville_Inside_EventScript_ItemParalyzeHeal",
|
||||
"flag": "FLAG_ITEM_NEW_MAUVILLE_PARALYZE_HEAL"
|
||||
},
|
||||
{
|
||||
|
||||
@@ -100,7 +100,7 @@
|
||||
"movement_range_y": 0,
|
||||
"trainer_type": "0",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "PetalburgCity_EventScript_2910B4",
|
||||
"script": "PetalburgCity_EventScript_ItemMaxRevive",
|
||||
"flag": "FLAG_ITEM_PETALBURG_CITY_MAX_REVIVE"
|
||||
},
|
||||
{
|
||||
@@ -113,7 +113,7 @@
|
||||
"movement_range_y": 0,
|
||||
"trainer_type": "0",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "PetalburgCity_EventScript_2910C1",
|
||||
"script": "PetalburgCity_EventScript_ItemEther",
|
||||
"flag": "FLAG_ITEM_PETALBURG_CITY_ETHER"
|
||||
},
|
||||
{
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
"movement_range_y": 0,
|
||||
"trainer_type": "0",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "PetalburgWoods_EventScript_2906BB",
|
||||
"script": "EventScript_CutTree",
|
||||
"flag": "FLAG_TEMP_11"
|
||||
},
|
||||
{
|
||||
@@ -37,7 +37,7 @@
|
||||
"movement_range_y": 0,
|
||||
"trainer_type": "0",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "PetalburgWoods_EventScript_2906BB",
|
||||
"script": "EventScript_CutTree",
|
||||
"flag": "FLAG_TEMP_12"
|
||||
},
|
||||
{
|
||||
@@ -76,7 +76,7 @@
|
||||
"movement_range_y": 0,
|
||||
"trainer_type": "0",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "PetalburgWoods_EventScript_29110F",
|
||||
"script": "PetalburgWoods_EventScript_ItemGreatBall",
|
||||
"flag": "FLAG_ITEM_PETALBURG_WOODS_GREAT_BALL"
|
||||
},
|
||||
{
|
||||
@@ -89,7 +89,7 @@
|
||||
"movement_range_y": 0,
|
||||
"trainer_type": "0",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "PetalburgWoods_EventScript_291102",
|
||||
"script": "PetalburgWoods_EventScript_ItemXAttack",
|
||||
"flag": "FLAG_ITEM_PETALBURG_WOODS_X_ATTACK"
|
||||
},
|
||||
{
|
||||
@@ -102,7 +102,7 @@
|
||||
"movement_range_y": 0,
|
||||
"trainer_type": "0",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "PetalburgWoods_EventScript_29111C",
|
||||
"script": "PetalburgWoods_EventScript_ItemEther",
|
||||
"flag": "FLAG_ITEM_PETALBURG_WOODS_ETHER"
|
||||
},
|
||||
{
|
||||
@@ -167,7 +167,7 @@
|
||||
"movement_range_y": 1,
|
||||
"trainer_type": "0",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "PetalburgWoods_EventScript_291129",
|
||||
"script": "PetalburgWoods_EventScript_ItemParalyzeHeal",
|
||||
"flag": "FLAG_ITEM_PETALBURD_WOODS_PARALYZE_HEAL"
|
||||
},
|
||||
{
|
||||
|
||||
@@ -100,7 +100,7 @@
|
||||
"movement_range_y": 0,
|
||||
"trainer_type": "0",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "Route102_EventScript_290CD8",
|
||||
"script": "Route102_EventScript_ItemPotion",
|
||||
"flag": "FLAG_ITEM_ROUTE_102_POTION"
|
||||
},
|
||||
{
|
||||
|
||||
@@ -191,7 +191,7 @@
|
||||
"movement_range_y": 1,
|
||||
"trainer_type": "0",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "Route103_EventScript_290CE5",
|
||||
"script": "Route103_EventScript_ItemGuardSpec",
|
||||
"flag": "FLAG_ITEM_ROUTE_103_GUARD_SPEC"
|
||||
},
|
||||
{
|
||||
@@ -204,7 +204,7 @@
|
||||
"movement_range_y": 1,
|
||||
"trainer_type": "0",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "Route103_EventScript_2906BB",
|
||||
"script": "EventScript_CutTree",
|
||||
"flag": "FLAG_TEMP_12"
|
||||
},
|
||||
{
|
||||
@@ -217,7 +217,7 @@
|
||||
"movement_range_y": 1,
|
||||
"trainer_type": "0",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "Route103_EventScript_2906BB",
|
||||
"script": "EventScript_CutTree",
|
||||
"flag": "FLAG_TEMP_13"
|
||||
},
|
||||
{
|
||||
@@ -282,7 +282,7 @@
|
||||
"movement_range_y": 1,
|
||||
"trainer_type": "0",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "Route103_EventScript_290CF2",
|
||||
"script": "Route103_EventScript_ItemPPUp",
|
||||
"flag": "FLAG_ITEM_ROUTE_103_PP_UP"
|
||||
}
|
||||
],
|
||||
|
||||
@@ -300,7 +300,7 @@
|
||||
"movement_range_y": 0,
|
||||
"trainer_type": "0",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "Route104_EventScript_290CFF",
|
||||
"script": "Route104_EventScript_ItemPPUp",
|
||||
"flag": "FLAG_ITEM_ROUTE_104_PP_UP"
|
||||
},
|
||||
{
|
||||
@@ -378,7 +378,7 @@
|
||||
"movement_range_y": 1,
|
||||
"trainer_type": "0",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "Route104_EventScript_290D0C",
|
||||
"script": "Route104_EventScript_ItemPokeBall",
|
||||
"flag": "FLAG_ITEM_ROUTE_104_POKE_BALL"
|
||||
},
|
||||
{
|
||||
@@ -404,7 +404,7 @@
|
||||
"movement_range_y": 1,
|
||||
"trainer_type": "0",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "Route104_EventScript_290D19",
|
||||
"script": "Route104_EventScript_ItemXAccuracy",
|
||||
"flag": "FLAG_ITEM_ROUTE_104_X_ACCURACY"
|
||||
},
|
||||
{
|
||||
@@ -417,7 +417,7 @@
|
||||
"movement_range_y": 1,
|
||||
"trainer_type": "0",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "Route104_EventScript_2906BB",
|
||||
"script": "EventScript_CutTree",
|
||||
"flag": "FLAG_TEMP_11"
|
||||
},
|
||||
{
|
||||
@@ -430,7 +430,7 @@
|
||||
"movement_range_y": 1,
|
||||
"trainer_type": "0",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "Route104_EventScript_290D26",
|
||||
"script": "Route104_EventScript_ItemPotion",
|
||||
"flag": "FLAG_ITEM_ROUTE_104_POTION"
|
||||
},
|
||||
{
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
Route104_MrBrineysHouse_MapScripts:: @ 8229D2E
|
||||
map_script MAP_SCRIPT_ON_TRANSITION, Route104_MrBrineysHouse_MapScript1_229D34
|
||||
map_script MAP_SCRIPT_ON_TRANSITION, Route104_MrBrineysHouse_OnTransition
|
||||
.byte 0
|
||||
|
||||
Route104_MrBrineysHouse_MapScript1_229D34: @ 8229D34
|
||||
Route104_MrBrineysHouse_OnTransition: @ 8229D34
|
||||
setflag FLAG_LANDMARK_MR_BRINEY_HOUSE
|
||||
compare VAR_BRINEY_HOUSE_STATE, 1
|
||||
call_if_eq Route104_MrBrineysHouse_EventScript_229D50
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
Route104_PrettyPetalFlowerShop_MapScripts:: @ 822A34C
|
||||
map_script MAP_SCRIPT_ON_TRANSITION, Route104_PrettyPetalFlowerShop_MapScript1_22A352
|
||||
map_script MAP_SCRIPT_ON_TRANSITION, Route104_PrettyPetalFlowerShop_OnTransition
|
||||
.byte 0
|
||||
|
||||
Route104_PrettyPetalFlowerShop_MapScript1_22A352: @ 822A352
|
||||
Route104_PrettyPetalFlowerShop_OnTransition: @ 822A352
|
||||
setflag FLAG_LANDMARK_FLOWER_SHOP
|
||||
goto_if_unset FLAG_MET_PRETTY_PETAL_SHOP_OWNER, Route104_PrettyPetalFlowerShop_EventScript_22A36B
|
||||
goto_if_unset FLAG_BADGE03_GET, Route104_PrettyPetalFlowerShop_EventScript_22A36B
|
||||
|
||||
@@ -92,7 +92,7 @@
|
||||
"movement_range_y": 0,
|
||||
"trainer_type": "0",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "Route105_EventScript_290D33",
|
||||
"script": "Route105_EventScript_ItemIron",
|
||||
"flag": "FLAG_ITEM_ROUTE_105_IRON"
|
||||
},
|
||||
{
|
||||
|
||||
@@ -87,7 +87,7 @@
|
||||
"movement_range_y": 0,
|
||||
"trainer_type": "0",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "Route106_EventScript_290D40",
|
||||
"script": "Route106_EventScript_ItemProtein",
|
||||
"flag": "FLAG_ITEM_ROUTE_106_PROTEIN"
|
||||
}
|
||||
],
|
||||
|
||||
@@ -113,7 +113,7 @@
|
||||
"movement_range_y": 1,
|
||||
"trainer_type": "0",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "Route108_EventScript_290D4D",
|
||||
"script": "Route108_EventScript_ItemStarPiece",
|
||||
"flag": "FLAG_ITEM_ROUTE_108_STAR_PIECE"
|
||||
}
|
||||
],
|
||||
|
||||
@@ -152,7 +152,7 @@
|
||||
"movement_range_y": 0,
|
||||
"trainer_type": "0",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "Route109_EventScript_290D5A",
|
||||
"script": "Route109_EventScript_ItemPPUp",
|
||||
"flag": "FLAG_ITEM_ROUTE_109_PP_UP"
|
||||
},
|
||||
{
|
||||
@@ -321,7 +321,7 @@
|
||||
"movement_range_y": 1,
|
||||
"trainer_type": "0",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "Route109_EventScript_290D67",
|
||||
"script": "Route109_EventScript_ItemPotion",
|
||||
"flag": "FLAG_ITEM_ROUTE_109_POTION"
|
||||
},
|
||||
{
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
Route109_SeashoreHouse_MapScripts:: @ 82693F4
|
||||
map_script MAP_SCRIPT_ON_TRANSITION, Route109_SeashoreHouse_MapScript1_2693FA
|
||||
map_script MAP_SCRIPT_ON_TRANSITION, Route109_SeashoreHouse_OnTransition
|
||||
.byte 0
|
||||
|
||||
Route109_SeashoreHouse_MapScript1_2693FA: @ 82693FA
|
||||
Route109_SeashoreHouse_OnTransition: @ 82693FA
|
||||
setflag FLAG_LANDMARK_SEASHORE_HOUSE
|
||||
end
|
||||
|
||||
|
||||
@@ -274,7 +274,7 @@
|
||||
"movement_range_y": 0,
|
||||
"trainer_type": "0",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "Route110_EventScript_290D81",
|
||||
"script": "Route110_EventScript_ItemDireHit",
|
||||
"flag": "FLAG_ITEM_ROUTE_110_DIRE_HIT"
|
||||
},
|
||||
{
|
||||
@@ -287,7 +287,7 @@
|
||||
"movement_range_y": 0,
|
||||
"trainer_type": "0",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "Route110_EventScript_290D74",
|
||||
"script": "Route110_EventScript_ItemRareCandy",
|
||||
"flag": "FLAG_ITEM_ROUTE_109_RARE_CANDY"
|
||||
},
|
||||
{
|
||||
@@ -482,7 +482,7 @@
|
||||
"movement_range_y": 1,
|
||||
"trainer_type": "0",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "Route110_EventScript_290D8E",
|
||||
"script": "Route110_EventScript_ItemElixir",
|
||||
"flag": "FLAG_ITEM_ROUTE_110_ELIXIR"
|
||||
},
|
||||
{
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
Route110_TrickHouseEntrance_MapScripts:: @ 8269A50
|
||||
map_script MAP_SCRIPT_ON_TRANSITION, Route110_TrickHouseEntrance_MapScript1_269A60
|
||||
map_script MAP_SCRIPT_ON_TRANSITION, Route110_TrickHouseEntrance_OnTransition
|
||||
map_script MAP_SCRIPT_ON_FRAME_TABLE, Route110_TrickHouseEntrance_MapScript2_269CEE
|
||||
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, Route110_TrickHouseEntrance_MapScript2_269BD3
|
||||
.byte 0
|
||||
|
||||
Route110_TrickHouseEntrance_MapScript1_269A60: @ 8269A60
|
||||
Route110_TrickHouseEntrance_OnTransition: @ 8269A60
|
||||
setflag FLAG_LANDMARK_TRICK_HOUSE
|
||||
compare VAR_TRICK_HOUSE_STATE, 1
|
||||
goto_if_eq Route110_TrickHouseEntrance_EventScript_269AF3
|
||||
@@ -759,8 +759,8 @@ Route110_TrickHouseEntrance_EventScript_26A459:: @ 826A459
|
||||
setfieldeffectargument 0, VAR_0x8004
|
||||
setfieldeffectargument 1, VAR_0x8005
|
||||
setfieldeffectargument 2, VAR_0x8006
|
||||
dofieldeffect 54
|
||||
waitfieldeffect 54
|
||||
dofieldeffect FLDEFF_SPARKLE
|
||||
waitfieldeffect FLDEFF_SPARKLE
|
||||
delay 10
|
||||
return
|
||||
|
||||
|
||||
@@ -63,7 +63,7 @@
|
||||
"movement_range_y": 0,
|
||||
"trainer_type": "0",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "Route110_TrickHousePuzzle1_EventScript_2906BB",
|
||||
"script": "EventScript_CutTree",
|
||||
"flag": "FLAG_TEMP_13"
|
||||
},
|
||||
{
|
||||
@@ -76,7 +76,7 @@
|
||||
"movement_range_y": 0,
|
||||
"trainer_type": "0",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "Route110_TrickHousePuzzle1_EventScript_2906BB",
|
||||
"script": "EventScript_CutTree",
|
||||
"flag": "FLAG_TEMP_12"
|
||||
},
|
||||
{
|
||||
@@ -89,7 +89,7 @@
|
||||
"movement_range_y": 0,
|
||||
"trainer_type": "0",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "Route110_TrickHousePuzzle1_EventScript_2906BB",
|
||||
"script": "EventScript_CutTree",
|
||||
"flag": "FLAG_TEMP_14"
|
||||
},
|
||||
{
|
||||
@@ -102,7 +102,7 @@
|
||||
"movement_range_y": 0,
|
||||
"trainer_type": "0",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "Route110_TrickHousePuzzle1_EventScript_2906BB",
|
||||
"script": "EventScript_CutTree",
|
||||
"flag": "FLAG_TEMP_17"
|
||||
},
|
||||
{
|
||||
@@ -115,7 +115,7 @@
|
||||
"movement_range_y": 0,
|
||||
"trainer_type": "0",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "Route110_TrickHousePuzzle1_EventScript_2906BB",
|
||||
"script": "EventScript_CutTree",
|
||||
"flag": "FLAG_TEMP_16"
|
||||
},
|
||||
{
|
||||
@@ -128,7 +128,7 @@
|
||||
"movement_range_y": 0,
|
||||
"trainer_type": "0",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "Route110_TrickHousePuzzle1_EventScript_2906BB",
|
||||
"script": "EventScript_CutTree",
|
||||
"flag": "FLAG_TEMP_15"
|
||||
},
|
||||
{
|
||||
@@ -141,7 +141,7 @@
|
||||
"movement_range_y": 0,
|
||||
"trainer_type": "0",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "Route110_TrickHousePuzzle1_EventScript_2906BB",
|
||||
"script": "EventScript_CutTree",
|
||||
"flag": "FLAG_TEMP_19"
|
||||
},
|
||||
{
|
||||
@@ -154,7 +154,7 @@
|
||||
"movement_range_y": 0,
|
||||
"trainer_type": "0",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "Route110_TrickHousePuzzle1_EventScript_2906BB",
|
||||
"script": "EventScript_CutTree",
|
||||
"flag": "FLAG_TEMP_18"
|
||||
},
|
||||
{
|
||||
@@ -167,7 +167,7 @@
|
||||
"movement_range_y": 0,
|
||||
"trainer_type": "0",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "Route110_TrickHousePuzzle1_EventScript_2906BB",
|
||||
"script": "EventScript_CutTree",
|
||||
"flag": "FLAG_TEMP_1B"
|
||||
},
|
||||
{
|
||||
@@ -180,7 +180,7 @@
|
||||
"movement_range_y": 0,
|
||||
"trainer_type": "0",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "Route110_TrickHousePuzzle1_EventScript_29140E",
|
||||
"script": "Route110_TrickHousePuzzle1_EventScript_ItemOrangeMail",
|
||||
"flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_1_ORANGE_MAIL"
|
||||
},
|
||||
{
|
||||
@@ -193,7 +193,7 @@
|
||||
"movement_range_y": 0,
|
||||
"trainer_type": "0",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "Route110_TrickHousePuzzle1_EventScript_2906BB",
|
||||
"script": "EventScript_CutTree",
|
||||
"flag": "FLAG_TEMP_1C"
|
||||
},
|
||||
{
|
||||
@@ -206,7 +206,7 @@
|
||||
"movement_range_y": 0,
|
||||
"trainer_type": "0",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "Route110_TrickHousePuzzle1_EventScript_2906BB",
|
||||
"script": "EventScript_CutTree",
|
||||
"flag": "FLAG_TEMP_1E"
|
||||
}
|
||||
],
|
||||
|
||||
@@ -63,7 +63,7 @@
|
||||
"movement_range_y": 0,
|
||||
"trainer_type": "0",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "Route110_TrickHousePuzzle2_EventScript_291428",
|
||||
"script": "Route110_TrickHousePuzzle2_EventScript_ItemWaveMail",
|
||||
"flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_2_WAVE_MAIL"
|
||||
},
|
||||
{
|
||||
@@ -76,7 +76,7 @@
|
||||
"movement_range_y": 0,
|
||||
"trainer_type": "0",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "Route110_TrickHousePuzzle2_EventScript_29141B",
|
||||
"script": "Route110_TrickHousePuzzle2_EventScript_ItemHarborMail",
|
||||
"flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_2_HARBOR_MAIL"
|
||||
}
|
||||
],
|
||||
|
||||
@@ -63,7 +63,7 @@
|
||||
"movement_range_y": 0,
|
||||
"trainer_type": "0",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "Route110_TrickHousePuzzle3_EventScript_291442",
|
||||
"script": "Route110_TrickHousePuzzle3_EventScript_ItemWoodMail",
|
||||
"flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_3_WOOD_MAIL"
|
||||
},
|
||||
{
|
||||
@@ -76,7 +76,7 @@
|
||||
"movement_range_y": 0,
|
||||
"trainer_type": "0",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "Route110_TrickHousePuzzle3_EventScript_291435",
|
||||
"script": "Route110_TrickHousePuzzle3_EventScript_ItemShadowMail",
|
||||
"flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_3_SHADOW_MAIL"
|
||||
},
|
||||
{
|
||||
@@ -89,7 +89,7 @@
|
||||
"movement_range_y": 1,
|
||||
"trainer_type": "0",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "Route110_TrickHousePuzzle3_EventScript_2907A6",
|
||||
"script": "EventScript_RockSmash",
|
||||
"flag": "FLAG_TEMP_15"
|
||||
},
|
||||
{
|
||||
@@ -102,7 +102,7 @@
|
||||
"movement_range_y": 1,
|
||||
"trainer_type": "0",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "Route110_TrickHousePuzzle3_EventScript_2907A6",
|
||||
"script": "EventScript_RockSmash",
|
||||
"flag": "FLAG_TEMP_16"
|
||||
}
|
||||
],
|
||||
|
||||
@@ -63,7 +63,7 @@
|
||||
"movement_range_y": 0,
|
||||
"trainer_type": "0",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "Route110_TrickHousePuzzle4_EventScript_29144F",
|
||||
"script": "Route110_TrickHousePuzzle4_EventScript_ItemMechMail",
|
||||
"flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_4_MECH_MAIL"
|
||||
},
|
||||
{
|
||||
@@ -76,7 +76,7 @@
|
||||
"movement_range_y": 0,
|
||||
"trainer_type": "0",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "Route110_TrickHousePuzzle4_EventScript_2908BA",
|
||||
"script": "EventScript_StrengthBoulder",
|
||||
"flag": "FLAG_TEMP_11"
|
||||
},
|
||||
{
|
||||
@@ -89,7 +89,7 @@
|
||||
"movement_range_y": 0,
|
||||
"trainer_type": "0",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "Route110_TrickHousePuzzle4_EventScript_2908BA",
|
||||
"script": "EventScript_StrengthBoulder",
|
||||
"flag": "FLAG_TEMP_12"
|
||||
},
|
||||
{
|
||||
@@ -102,7 +102,7 @@
|
||||
"movement_range_y": 0,
|
||||
"trainer_type": "0",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "Route110_TrickHousePuzzle4_EventScript_2908BA",
|
||||
"script": "EventScript_StrengthBoulder",
|
||||
"flag": "FLAG_TEMP_13"
|
||||
},
|
||||
{
|
||||
@@ -115,7 +115,7 @@
|
||||
"movement_range_y": 0,
|
||||
"trainer_type": "0",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "Route110_TrickHousePuzzle4_EventScript_2908BA",
|
||||
"script": "EventScript_StrengthBoulder",
|
||||
"flag": "FLAG_TEMP_14"
|
||||
},
|
||||
{
|
||||
@@ -128,7 +128,7 @@
|
||||
"movement_range_y": 0,
|
||||
"trainer_type": "0",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "Route110_TrickHousePuzzle4_EventScript_2908BA",
|
||||
"script": "EventScript_StrengthBoulder",
|
||||
"flag": "FLAG_TEMP_15"
|
||||
},
|
||||
{
|
||||
@@ -141,7 +141,7 @@
|
||||
"movement_range_y": 0,
|
||||
"trainer_type": "0",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "Route110_TrickHousePuzzle4_EventScript_2908BA",
|
||||
"script": "EventScript_StrengthBoulder",
|
||||
"flag": "FLAG_TEMP_16"
|
||||
},
|
||||
{
|
||||
@@ -154,7 +154,7 @@
|
||||
"movement_range_y": 0,
|
||||
"trainer_type": "0",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "Route110_TrickHousePuzzle4_EventScript_2908BA",
|
||||
"script": "EventScript_StrengthBoulder",
|
||||
"flag": "FLAG_TEMP_17"
|
||||
},
|
||||
{
|
||||
@@ -167,7 +167,7 @@
|
||||
"movement_range_y": 0,
|
||||
"trainer_type": "0",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "Route110_TrickHousePuzzle4_EventScript_2908BA",
|
||||
"script": "EventScript_StrengthBoulder",
|
||||
"flag": "FLAG_TEMP_18"
|
||||
},
|
||||
{
|
||||
@@ -180,7 +180,7 @@
|
||||
"movement_range_y": 0,
|
||||
"trainer_type": "0",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "Route110_TrickHousePuzzle4_EventScript_2908BA",
|
||||
"script": "EventScript_StrengthBoulder",
|
||||
"flag": "FLAG_TEMP_19"
|
||||
},
|
||||
{
|
||||
@@ -193,7 +193,7 @@
|
||||
"movement_range_y": 0,
|
||||
"trainer_type": "0",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "Route110_TrickHousePuzzle4_EventScript_2908BA",
|
||||
"script": "EventScript_StrengthBoulder",
|
||||
"flag": "FLAG_TEMP_1A"
|
||||
}
|
||||
],
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user