mirror of
https://github.com/Ninjdai1/pokeemerald.git
synced 2025-03-07 07:58:22 +01:00
Merge branch 'battle_engine_v2' into beta
This commit is contained in:
Papa Cancer
GitHub
commit
33d484a7ed
@ -6401,7 +6401,7 @@ sub_8027BEC: @ 8027BEC
|
||||
adds r0, r7, 0
|
||||
adds r1, r4, 0
|
||||
movs r2, 0xD
|
||||
bl sub_8098858
|
||||
bl DrawTextBorderOuter
|
||||
adds r0, r7, 0
|
||||
movs r1, 0x11
|
||||
bl FillWindowPixelBuffer
|
||||
|
||||
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
|
||||
|
||||
@ -1139,7 +1139,7 @@
|
||||
.4byte \ptr
|
||||
.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 sub_801D0C4
|
||||
sub_801D0C4: @ 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 sub_801D0C4
|
||||
|
||||
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 sub_801B00C
|
||||
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 sub_801D484
|
||||
sub_801D484: @ 801D484
|
||||
push {r4,r5,lr}
|
||||
adds r5, r0, 0
|
||||
ldr r4, =gUnknown_02022C80
|
||||
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 sub_801D484
|
||||
|
||||
thumb_func_start sub_801D4A8
|
||||
sub_801D4A8: @ 801D4A8
|
||||
push {r4-r6,lr}
|
||||
adds r6, r0, 0
|
||||
ldr r4, =gUnknown_02022C80
|
||||
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 sub_801D55C
|
||||
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 sub_801D4A8
|
||||
|
||||
thumb_func_start sub_801D4E4
|
||||
sub_801D4E4: @ 801D4E4
|
||||
ldr r0, =gUnknown_02022C80
|
||||
ldr r1, [r0]
|
||||
ldr r0, [r1, 0xC]
|
||||
adds r0, 0x1
|
||||
str r0, [r1, 0xC]
|
||||
bx lr
|
||||
.pool
|
||||
thumb_func_end sub_801D4E4
|
||||
|
||||
thumb_func_start sub_801D4F4
|
||||
sub_801D4F4: @ 801D4F4
|
||||
ldr r0, =gUnknown_02022C80
|
||||
ldr r0, [r0]
|
||||
ldr r0, [r0, 0x20]
|
||||
bx lr
|
||||
.pool
|
||||
thumb_func_end sub_801D4F4
|
||||
|
||||
thumb_func_start sub_801D500
|
||||
sub_801D500: @ 801D500
|
||||
ldr r1, =gUnknown_02022C80
|
||||
ldr r1, [r1]
|
||||
str r0, [r1, 0x4]
|
||||
bx lr
|
||||
.pool
|
||||
thumb_func_end sub_801D500
|
||||
|
||||
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 sub_801D55C
|
||||
sub_801D55C: @ 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 sub_801D55C
|
||||
|
||||
thumb_func_start sub_801D580
|
||||
sub_801D580: @ 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 sub_801D580
|
||||
|
||||
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 sub_801D580
|
||||
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
|
||||
@ -5491,7 +5491,7 @@ _0802D4A4:
|
||||
ldrb r0, [r0, 0x12]
|
||||
movs r1, 0x1
|
||||
movs r2, 0xE
|
||||
bl sub_8098858
|
||||
bl DrawTextBorderOuter
|
||||
movs r0, 0x17
|
||||
movs r1, 0x7
|
||||
movs r2, 0
|
||||
@ -5575,7 +5575,7 @@ _0802D550:
|
||||
ldrb r0, [r0, 0x12]
|
||||
movs r1, 0x1
|
||||
movs r2, 0xE
|
||||
bl sub_8098858
|
||||
bl DrawTextBorderOuter
|
||||
movs r0, 0
|
||||
bl CopyBgTilemapBufferToVram
|
||||
_0802D574:
|
||||
@ -5693,7 +5693,7 @@ _0802D640:
|
||||
ldrb r0, [r0, 0x12]
|
||||
movs r1, 0x1
|
||||
movs r2, 0xE
|
||||
bl sub_8098858
|
||||
bl DrawTextBorderOuter
|
||||
movs r0, 0
|
||||
bl CopyBgTilemapBufferToVram
|
||||
_0802D664:
|
||||
@ -5773,7 +5773,7 @@ _0802D6E4:
|
||||
ldrb r0, [r0, 0x12]
|
||||
movs r1, 0x1
|
||||
movs r2, 0xE
|
||||
bl sub_8098858
|
||||
bl DrawTextBorderOuter
|
||||
movs r0, 0
|
||||
bl CopyBgTilemapBufferToVram
|
||||
_0802D708:
|
||||
@ -6107,7 +6107,7 @@ _0802D99A:
|
||||
ldrb r0, [r0, 0x12]
|
||||
movs r1, 0x1
|
||||
movs r2, 0xE
|
||||
bl sub_8098858
|
||||
bl DrawTextBorderOuter
|
||||
movs r0, 0
|
||||
bl CopyBgTilemapBufferToVram
|
||||
ldr r1, [r4]
|
||||
@ -7596,7 +7596,7 @@ sub_802E500: @ 802E500
|
||||
adds r0, r4, 0
|
||||
adds r1, r5, 0
|
||||
movs r2, 0xD
|
||||
bl sub_8098858
|
||||
bl DrawTextBorderOuter
|
||||
adds r0, r4, 0
|
||||
movs r1, 0x11
|
||||
bl FillWindowPixelBuffer
|
||||
|
||||
@ -8104,7 +8104,7 @@ sub_81CC09C: @ 81CC09C
|
||||
ldrb r0, [r4, 0x14]
|
||||
movs r1, 0x1
|
||||
movs r2, 0x4
|
||||
bl sub_8098858
|
||||
bl DrawTextBorderOuter
|
||||
ldrb r0, [r4, 0x14]
|
||||
movs r1, 0x11
|
||||
bl FillWindowPixelBuffer
|
||||
@ -9354,7 +9354,7 @@ sub_81CCA1C: @ 81CCA1C
|
||||
ldrb r0, [r5, 0x8]
|
||||
movs r1, 0x42
|
||||
movs r2, 0x4
|
||||
bl sub_8098858
|
||||
bl DrawTextBorderOuter
|
||||
ldr r1, =gUnknown_08622888
|
||||
str r4, [sp]
|
||||
movs r0, 0x1
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -401,6 +401,8 @@ B_ATK_TRAINER_CLASS = FD 36
|
||||
B_ATK_TEAM1 = FD 37
|
||||
B_ATK_TEAM2 = FD 38
|
||||
B_DEF_NAME = FD 39
|
||||
B_DEF_TEAM1 = FD 3A
|
||||
B_DEF_TEAM2 = FD 3B
|
||||
|
||||
@ indicates the end of a town/city name (before " TOWN" or " CITY")
|
||||
NAME_END = FC 00
|
||||
|
||||
3
common_syms/faraway_island.txt
Executable file
3
common_syms/faraway_island.txt
Executable file
@ -0,0 +1,3 @@
|
||||
sPlayerToMewDeltaX
|
||||
sPlayerToMewDeltaY
|
||||
sMewDirectionCandidates
|
||||
@ -249,6 +249,7 @@ AI_CheckBadMove_CheckEffect: @ 82DC045
|
||||
if_effect EFFECT_SHELL_SMASH, AI_CBM_ShellSmash
|
||||
if_effect EFFECT_LAST_RESORT, AI_CBM_LastResort
|
||||
if_effect EFFECT_BELCH, AI_CBM_Belch
|
||||
if_effect EFFECT_DO_NOTHING, Score_Minus8
|
||||
end
|
||||
|
||||
AI_CBM_Belch:
|
||||
@ -2078,7 +2079,7 @@ AI_CV_Encore_EncouragedMovesToEncore:
|
||||
.byte EFFECT_POISON
|
||||
.byte EFFECT_PARALYZE
|
||||
.byte EFFECT_LEECH_SEED
|
||||
.byte EFFECT_SPLASH
|
||||
.byte EFFECT_DO_NOTHING
|
||||
.byte EFFECT_ATTACK_UP_2
|
||||
.byte EFFECT_ENCORE
|
||||
.byte EFFECT_CONVERSION_2
|
||||
@ -3628,7 +3629,6 @@ AI_HPAware_DiscouragedEffectsWhenTargetLowHP: @ 82DE2B1
|
||||
.byte EFFECT_LIGHT_SCREEN
|
||||
.byte EFFECT_OHKO
|
||||
.byte EFFECT_SUPER_FANG
|
||||
.byte EFFECT_SUPER_FANG
|
||||
.byte EFFECT_MIST
|
||||
.byte EFFECT_FOCUS_ENERGY
|
||||
.byte EFFECT_CONFUSE
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -100,7 +100,7 @@ gBattleScriptsForMoveEffects:: @ 82D86A8
|
||||
.4byte BattleScript_EffectMimic
|
||||
.4byte BattleScript_EffectMetronome
|
||||
.4byte BattleScript_EffectLeechSeed
|
||||
.4byte BattleScript_EffectSplash
|
||||
.4byte BattleScript_EffectDoNothing
|
||||
.4byte BattleScript_EffectDisable
|
||||
.4byte BattleScript_EffectLevelDamage
|
||||
.4byte BattleScript_EffectPsywave
|
||||
@ -345,8 +345,9 @@ gBattleScriptsForMoveEffects:: @ 82D86A8
|
||||
.4byte BattleScript_EffectPartingShot
|
||||
.4byte BattleScript_EffectSpectralThief
|
||||
.4byte BattleScript_EffectVCreate
|
||||
.4byte BattleScript_EffectMatBlock
|
||||
.4byte BattleScript_EffectStompingTantrum
|
||||
|
||||
|
||||
BattleScript_EffectVCreate:
|
||||
setmoveeffect MOVE_EFFECT_V_CREATE | MOVE_EFFECT_AFFECTS_USER
|
||||
goto BattleScript_EffectHit
|
||||
@ -2837,16 +2838,33 @@ BattleScript_DoLeechSeed::
|
||||
waitmessage 0x40
|
||||
goto BattleScript_MoveEnd
|
||||
|
||||
BattleScript_EffectSplash::
|
||||
BattleScript_EffectDoNothing::
|
||||
attackcanceler
|
||||
attackstring
|
||||
ppreduce
|
||||
jumpifmove MOVE_HOLD_HANDS, BattleScript_EffectHoldHands
|
||||
attackanimation
|
||||
waitanimation
|
||||
jumpifmove MOVE_CELEBRATE, BattleScript_EffectCelebrate
|
||||
jumpifmove MOVE_HAPPY_HOUR, BattleScript_EffectHappyHour
|
||||
incrementgamestat GAME_STAT_USED_SPLASH
|
||||
printstring STRINGID_BUTNOTHINGHAPPENED
|
||||
waitmessage 0x40
|
||||
goto BattleScript_MoveEnd
|
||||
BattleScript_EffectHoldHands:
|
||||
jumpifsideaffecting BS_TARGET, SIDE_STATUS_CRAFTY_SHIELD, BattleScript_ButItFailed
|
||||
jumpifnotbattletype BATTLE_TYPE_TWO_OPPONENTS | BATTLE_TYPE_DOUBLE, BattleScript_ButItFailed
|
||||
attackanimation
|
||||
waitanimation
|
||||
goto BattleScript_MoveEnd
|
||||
BattleScript_EffectCelebrate:
|
||||
printstring STRINGID_CELEBRATEMESSAGE
|
||||
waitmessage 0x40
|
||||
goto BattleScript_MoveEnd
|
||||
BattleScript_EffectHappyHour:
|
||||
setmoveeffect MOVE_EFFECT_HAPPY_HOUR
|
||||
seteffectprimary
|
||||
goto BattleScript_MoveEnd
|
||||
|
||||
BattleScript_EffectDisable::
|
||||
attackcanceler
|
||||
@ -3196,9 +3214,15 @@ BattleScript_DoGhostCurse::
|
||||
tryfaintmon BS_ATTACKER, FALSE, NULL
|
||||
goto BattleScript_MoveEnd
|
||||
|
||||
BattleScript_EffectMatBlock::
|
||||
attackcanceler
|
||||
jumpifnotfirstturn BattleScript_ButItFailedAtkStringPpReduce
|
||||
goto BattleScript_ProtectLikeAtkString
|
||||
|
||||
BattleScript_EffectProtect::
|
||||
BattleScript_EffectEndure::
|
||||
attackcanceler
|
||||
BattleScript_ProtectLikeAtkString:
|
||||
attackstring
|
||||
ppreduce
|
||||
setprotectlike
|
||||
@ -4016,7 +4040,7 @@ BattleScript_EffectWish::
|
||||
BattleScript_EffectAssist:
|
||||
attackcanceler
|
||||
attackstring
|
||||
asistattackselect BattleScript_ButItFailedPpReduce
|
||||
assistattackselect BattleScript_ButItFailedPpReduce
|
||||
attackanimation
|
||||
waitanimation
|
||||
setbyte sB_ANIM_TURN, 0x0
|
||||
|
||||
412
data/contest.s
412
data/contest.s
@ -1,412 +0,0 @@
|
||||
#include "constants/species.h"
|
||||
#include "constants/moves.h"
|
||||
.include "asm/macros.inc"
|
||||
.include "constants/constants.inc"
|
||||
|
||||
.section .rodata
|
||||
.align 2, 0
|
||||
|
||||
gUnknown_08587A6C:: @ 8587A6C
|
||||
.byte 0x24, 0x4c, 0x74, 0x9c
|
||||
|
||||
gUnknown_08587A70:: @ 8587A70
|
||||
.byte 0x24, 0x4c, 0x74, 0x9c
|
||||
|
||||
.align 2
|
||||
gUnknown_08587A74:: @ 8587A74
|
||||
obj_tiles gTiles_8C19450, 0x0020, 0x4e20
|
||||
|
||||
.align 2
|
||||
gOamData_8587A7C:: @ 8587A7C
|
||||
.2byte 0x0000
|
||||
.2byte 0x0000
|
||||
.2byte 0x0000
|
||||
|
||||
.align 2
|
||||
gSpriteAffineAnim_8587A84:: @ 8587A84
|
||||
obj_rot_scal_anim_frame 0x100, 0x100, 0, 0
|
||||
obj_rot_scal_anim_end
|
||||
|
||||
.align 2
|
||||
gSpriteAffineAnim_8587A94:: @ 8587A94
|
||||
obj_rot_scal_anim_frame 0x100, 0x100, 0, 0
|
||||
obj_rot_scal_anim_frame 0xFFF6, 0xFFF6, -20, 20
|
||||
obj_rot_scal_anim_end
|
||||
|
||||
.align 2
|
||||
gSpriteAffineAnim_8587AAC:: @ 8587AAC
|
||||
obj_rot_scal_anim_frame 0x38, 0x38, 0, 0
|
||||
obj_rot_scal_anim_frame 0xA, 0xA, 20, 20
|
||||
obj_rot_scal_anim_end
|
||||
|
||||
.align 2
|
||||
gSpriteAffineAnimTable_8587AC4:: @ 8587AC4
|
||||
.4byte gSpriteAffineAnim_8587A84
|
||||
.4byte gSpriteAffineAnim_8587A94
|
||||
.4byte gSpriteAffineAnim_8587AAC
|
||||
|
||||
.align 2
|
||||
gSpriteTemplate_8587AD0:: @ 8587AD0
|
||||
spr_template 0x4e20, 0xabe0, gOamData_8587A7C, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_8587AC4, SpriteCallbackDummy
|
||||
|
||||
.align 2
|
||||
gUnknown_08587AE8:: @ 8587AE8
|
||||
obj_tiles gContestNextTurnGfx, 0x0100, 0x4e22
|
||||
obj_tiles gContestNextTurnGfx, 0x0100, 0x4e23
|
||||
obj_tiles gContestNextTurnGfx, 0x0100, 0x4e24
|
||||
obj_tiles gContestNextTurnGfx, 0x0100, 0x4e25
|
||||
|
||||
.align 2
|
||||
gUnknown_08587B08:: @ 8587B08
|
||||
obj_pal gContestPal, 0x4e22
|
||||
|
||||
.align 2
|
||||
gOamData_8587B10:: @ 8587B10
|
||||
.2byte 0x4000
|
||||
.2byte 0x4000
|
||||
.2byte 0x0000
|
||||
|
||||
.align 2
|
||||
gSpriteTemplate_8587B18:: @ 8587B18
|
||||
spr_template 0x4e22, 0x4e22, gOamData_8587B10, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
|
||||
spr_template 0x4e23, 0x4e22, gOamData_8587B10, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
|
||||
spr_template 0x4e24, 0x4e22, gOamData_8587B10, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
|
||||
spr_template 0x4e25, 0x4e22, gOamData_8587B10, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
|
||||
|
||||
.align 2
|
||||
gSubspriteTable_8587B78:: @ 8587B78
|
||||
subsprite -28, -4, 0, 0, 32x8
|
||||
subsprite 4, -4, 0, 4, 32x8
|
||||
|
||||
.align 2
|
||||
gSubspriteTables_8587B80:: @ 8587B80
|
||||
.4byte 2, gSubspriteTable_8587B78
|
||||
|
||||
.align 2
|
||||
gUnknown_08587B88:: @ 8587B88
|
||||
obj_tiles gUnknown_08C19168, 0x0180, 0xabe1
|
||||
|
||||
.align 2
|
||||
gOamData_8587B90:: @ 8587B90
|
||||
.2byte 0x0000
|
||||
.2byte 0x4000
|
||||
.2byte 0x0000
|
||||
|
||||
.align 2
|
||||
gSpriteTemplate_8587B98:: @ 8587B98
|
||||
spr_template 0xabe1, 0xabe0, gOamData_8587B90, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
|
||||
|
||||
.align 2
|
||||
gUnknown_08587BB0:: @ 8587BB0
|
||||
obj_tiles gContestApplauseGfx, 0x0400, 0xabe2
|
||||
|
||||
.align 2
|
||||
gUnknown_08587BB8:: @ 8587BB8
|
||||
obj_pal gContestPal, 0xabe2
|
||||
|
||||
.align 2
|
||||
gOamData_8587BC0:: @ 8587BC0
|
||||
.2byte 0x4000
|
||||
.2byte 0xC000
|
||||
.2byte 0x0000
|
||||
|
||||
.align 2
|
||||
gSpriteTemplate_8587BC8:: @ 8587BC8
|
||||
spr_template 0xabe2, 0xabe2, gOamData_8587BC0, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
|
||||
|
||||
.align 2
|
||||
gOamData_8587BE0:: @ 8587BE0
|
||||
.2byte 0x0000
|
||||
.2byte 0xC000
|
||||
.2byte 0x2C00
|
||||
|
||||
.align 2
|
||||
gSpriteTemplate_8587BE8:: @ 8587BE8
|
||||
spr_template 0x4e21, 0x4e21, gOamData_8587BE0, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
|
||||
|
||||
.align 2
|
||||
gUnknown_08587C00:: @ 8587C00
|
||||
obj_tiles gContestJudgeGfx, 0x0800, 0x4e21
|
||||
|
||||
.align 2
|
||||
gUnknown_08587C08:: @ 8587C08
|
||||
obj_tiles gContestJudgeSymbolsGfx, 0x0380, 0xabe0
|
||||
|
||||
.align 2
|
||||
gUnknown_08587C10:: @ 8587C10
|
||||
obj_pal gContest3Pal, 0xabe0
|
||||
|
||||
.align 2
|
||||
gSpriteTemplate_8587C18:: @ 8587C18
|
||||
spr_template 0xabe0, 0xabe0, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
|
||||
|
||||
.align 2
|
||||
gUnknown_08587C30:: @ 8587C30
|
||||
.incbin "graphics/unknown/unknown_587C30.gbapal"
|
||||
|
||||
@ 8587C50
|
||||
.include "data/text/contest_text_pointers.inc"
|
||||
|
||||
.align 2
|
||||
gUnknown_08587D5C:: @ 8587D5C
|
||||
.4byte gText_0827D5C1
|
||||
.4byte gText_0827D5DC
|
||||
.4byte gText_0827D600
|
||||
.4byte gText_0827D612
|
||||
.4byte gText_0827D612
|
||||
.4byte gText_0827D62D
|
||||
.4byte gText_0827D654
|
||||
.4byte gText_0827D67E
|
||||
.4byte gText_0827D69C
|
||||
.4byte gText_0827D6BA
|
||||
.4byte gText_0827D6E5
|
||||
.4byte gText_0827D706
|
||||
.4byte gText_0827D71D
|
||||
|
||||
.align 2
|
||||
gUnknown_08587D90:: @ 8587D90
|
||||
.4byte gText_0827D743
|
||||
.4byte gText_0827D764
|
||||
.4byte gText_0827D785
|
||||
.4byte gText_0827D7A5
|
||||
.4byte gText_0827D7C8
|
||||
.4byte gText_0827D7E8
|
||||
.4byte gText_0827D831
|
||||
.4byte gText_0827D855
|
||||
.4byte gText_0827D830
|
||||
.4byte gText_0827D872
|
||||
.4byte gText_0827D88F
|
||||
.4byte gText_0827D8B5
|
||||
.4byte gText_0827D8E4
|
||||
.4byte gText_0827D8FE
|
||||
.4byte gText_0827D926
|
||||
.4byte gText_0827D947
|
||||
.4byte gText_0827D961
|
||||
.4byte gText_0827D986
|
||||
.4byte gText_0827D9B1
|
||||
.4byte gText_0827D9D9
|
||||
.4byte gText_0827DA03
|
||||
.4byte gText_0827DA31
|
||||
.4byte gText_0827DA5B
|
||||
.4byte gText_0827DA85
|
||||
.4byte gText_0827DAB2
|
||||
.4byte gText_0827DADA
|
||||
.4byte gText_0827DB03
|
||||
.4byte gText_0827D830
|
||||
.4byte gText_0827D830
|
||||
.4byte gText_0827D830
|
||||
.4byte gText_0827DB1F
|
||||
.4byte gText_0827DB4E
|
||||
|
||||
.align 2
|
||||
gUnknown_08587E10:: @ 8587E10
|
||||
.4byte gText_827DB75
|
||||
.4byte gText_827DBB0
|
||||
.4byte gText_827DBE0
|
||||
.4byte gText_827DC0F
|
||||
.4byte gText_827DC45
|
||||
.4byte gText_827DC7C
|
||||
.4byte gText_827DCB4
|
||||
.4byte gText_827DCE7
|
||||
.4byte gText_827DD12
|
||||
.4byte gText_827DD3D
|
||||
.4byte gText_827DD6F
|
||||
.4byte gText_827DD8E
|
||||
.4byte gText_827DDC7
|
||||
.4byte gText_827DDF2
|
||||
.4byte gText_827DE14
|
||||
.4byte gText_827DE44
|
||||
.4byte gText_827DE73
|
||||
.4byte gText_827DEA5
|
||||
.4byte gText_827DED9
|
||||
.4byte gText_827DF02
|
||||
.4byte gText_827DF3A
|
||||
.4byte gText_827DF63
|
||||
.4byte gText_827DF8C
|
||||
.4byte gText_827DFB8
|
||||
.4byte gText_827DFE2
|
||||
.4byte gText_827E00C
|
||||
.4byte gText_827E02F
|
||||
.4byte gText_827E05F
|
||||
.4byte gText_827E08B
|
||||
.4byte gText_827E0B5
|
||||
.4byte gText_827E0DD
|
||||
.4byte gText_827E107
|
||||
.4byte gText_827E143
|
||||
.4byte gText_827E17F
|
||||
.4byte gText_827E1BB
|
||||
.4byte gText_827E1F3
|
||||
.4byte gText_827E220
|
||||
.4byte gText_827E254
|
||||
.4byte gText_827E289
|
||||
.4byte gText_827E2C5
|
||||
.4byte gText_0827E2FE
|
||||
.4byte gText_0827E32E
|
||||
.4byte gText_0827E35B
|
||||
.4byte gText_0827E38D
|
||||
.4byte gText_0827E3C1
|
||||
.4byte gText_0827E3EB
|
||||
.4byte gText_0827E416
|
||||
.4byte gText_0827E448
|
||||
.4byte gText_0827E473
|
||||
.4byte gText_0827E4A6
|
||||
.4byte gText_0827E4D5
|
||||
.4byte gText_0827E504
|
||||
.4byte gText_0827E531
|
||||
.4byte gText_0827E55A
|
||||
.4byte gText_0827E5B2
|
||||
.4byte gText_0827E5D0
|
||||
.4byte gText_0827E606
|
||||
.4byte gText_0827E638
|
||||
.4byte gText_0827E658
|
||||
.4byte gText_0827E68B
|
||||
.4byte gText_0827E6C4
|
||||
.4byte gText_0827E7BA
|
||||
|
||||
.align 2
|
||||
gUnknown_08587F08:: @ 8587F08
|
||||
.4byte gText_0827E85F
|
||||
.4byte gText_0827E868
|
||||
.4byte gText_0827E86F
|
||||
.4byte gText_0827E878
|
||||
.4byte gText_0827E882
|
||||
|
||||
.align 2
|
||||
gUnknown_08587F1C:: @ 8587F1C
|
||||
.4byte gText_0827E894
|
||||
.4byte gText_0827E89E
|
||||
.4byte gText_0827E8AA
|
||||
.4byte gText_0827E8B4
|
||||
.4byte gText_0827E8BF
|
||||
.4byte gText_0827E8CA
|
||||
|
||||
.align 2
|
||||
gUnknown_08587F34:: @ 8587F34
|
||||
.4byte 0x00000580, 0x000015e9, 0x000005c2, 0x000031a3
|
||||
|
||||
.align 2
|
||||
gUnknown_08587F44:: @ 8587F44
|
||||
window_template 0x00, 0x12, 0x00, 0x0c, 0x02, 0x0f, 0x0200
|
||||
window_template 0x00, 0x12, 0x05, 0x0c, 0x02, 0x0f, 0x0218
|
||||
window_template 0x00, 0x12, 0x0a, 0x0c, 0x02, 0x0f, 0x0230
|
||||
window_template 0x00, 0x12, 0x0f, 0x0c, 0x02, 0x0f, 0x0248
|
||||
window_template 0x00, 0x01, 0x0f, 0x11, 0x04, 0x0f, 0x0260
|
||||
window_template 0x00, 0x01, 0x1f, 0x09, 0x02, 0x0f, 0x02a4
|
||||
window_template 0x00, 0x01, 0x21, 0x09, 0x02, 0x0f, 0x02b6
|
||||
window_template 0x00, 0x01, 0x23, 0x09, 0x02, 0x0f, 0x02c8
|
||||
window_template 0x00, 0x01, 0x25, 0x09, 0x02, 0x0f, 0x02da
|
||||
window_template 0x00, 0x10, 0x1f, 0x01, 0x02, 0x0f, 0x02ec
|
||||
window_template 0x00, 0x0b, 0x23, 0x12, 0x04, 0x0f, 0x02ee
|
||||
null_window_template
|
||||
|
||||
.align 2
|
||||
gUnknown_08587FA4:: @ 8587FA4
|
||||
.4byte NULL, 0xFFFF
|
||||
.2byte SPECIES_ELECTRIKE
|
||||
.byte 2
|
||||
.string "ELECTER$", 11
|
||||
.string "EZRA$", 8
|
||||
.2byte 0
|
||||
.4byte NULL, 0xFFFF
|
||||
.2byte SPECIES_TROPIUS
|
||||
.byte 0
|
||||
.string "TROPO$", 11
|
||||
.string "ALLAN$", 8
|
||||
.2byte 2
|
||||
.4byte NULL, 0xFFFF
|
||||
.2byte SPECIES_XATU
|
||||
.byte 1
|
||||
.string "TUXA$", 11
|
||||
.string "JULIET$", 8
|
||||
.2byte 0
|
||||
.4byte NULL, 0xFFFF
|
||||
.2byte SPECIES_PLUSLE
|
||||
.byte 4
|
||||
.string "PULSE$", 11
|
||||
.string "BAILY$", 8
|
||||
.2byte 3
|
||||
.4byte NULL, 0xFFFF
|
||||
.2byte SPECIES_SHUPPET
|
||||
.byte 3
|
||||
.string "SHUPUP$", 11
|
||||
.string "MELANY$", 8
|
||||
.2byte 1
|
||||
.4byte NULL, 0xFFFF
|
||||
.2byte SPECIES_ZANGOOSE
|
||||
.byte 0
|
||||
.string "GOOZAN$", 11
|
||||
.string "HANA$", 8
|
||||
.2byte 2
|
||||
.4byte NULL, 0xFFFF
|
||||
.2byte SPECIES_LOUDRED
|
||||
.byte 1
|
||||
.string "LOUDED$", 11
|
||||
.string "BRYANT$", 8
|
||||
.2byte 2
|
||||
.4byte NULL, 0xFFFF
|
||||
.2byte SPECIES_DELCATTY
|
||||
.byte 2
|
||||
.string "KITSY$", 11
|
||||
.string "OMAR$", 8
|
||||
.2byte 3
|
||||
|
||||
|
||||
.align 2
|
||||
gContestOpponents:: @ 85880A4
|
||||
.include "data/contest_opponents.inc"
|
||||
|
||||
gUnknown_085898A4:: @ 85898A4
|
||||
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
|
||||
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02
|
||||
.byte 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02
|
||||
|
||||
.align 2
|
||||
gUnknown_08589904:: @ 8589904
|
||||
obj_tiles gBlankGfxCompressed, 0x1000, 0x80e8
|
||||
obj_tiles gBlankGfxCompressed, 0x1000, 0x80e9
|
||||
obj_tiles gBlankGfxCompressed, 0x1000, 0x80ea
|
||||
obj_tiles gBlankGfxCompressed, 0x1000, 0x80eb
|
||||
|
||||
.align 2
|
||||
gUnknown_08589924:: @ 8589924 Yup this is super dangerous but that's how it is here
|
||||
obj_pal gHeap + 0x1A0A4, 0x80e8
|
||||
obj_pal gHeap + 0x1A0C4, 0x80e9
|
||||
obj_pal gHeap + 0x1A0E4, 0x80ea
|
||||
obj_pal gHeap + 0x1A104, 0x80eb
|
||||
|
||||
.align 2
|
||||
gOamData_8589944:: @ 8589944
|
||||
.2byte 0x0700
|
||||
.2byte 0xC000
|
||||
.2byte 0x0000
|
||||
|
||||
.align 2
|
||||
gSpriteAffineAnim_858994C:: @ 858994C
|
||||
obj_rot_scal_anim_frame 0x100, 0x100, 0, 0
|
||||
obj_rot_scal_anim_end
|
||||
|
||||
.align 2
|
||||
gSpriteAffineAnim_858995C:: @ 858995C
|
||||
obj_rot_scal_anim_frame 0x3, 0x3, 0, 15
|
||||
obj_rot_scal_anim_frame 0xFFFD, 0xFFFD, 0, 15
|
||||
obj_rot_scal_anim_frame 0x3, 0x3, 0, 15
|
||||
obj_rot_scal_anim_frame 0xFFFD, 0xFFFD, 0, 15
|
||||
obj_rot_scal_anim_end
|
||||
|
||||
.align 2
|
||||
gSpriteAffineAnimTable_8589984:: @ 8589984
|
||||
.4byte gSpriteAffineAnim_858994C
|
||||
.4byte gSpriteAffineAnim_858995C
|
||||
|
||||
.align 2
|
||||
gSpriteTemplate_858998C:: @ 858998C
|
||||
spr_template 0x80e8, 0x80e8, gOamData_8589944, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_8589984, SpriteCallbackDummy
|
||||
spr_template 0x80e9, 0x80e9, gOamData_8589944, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_8589984, SpriteCallbackDummy
|
||||
spr_template 0x80ea, 0x80ea, gOamData_8589944, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_8589984, SpriteCallbackDummy
|
||||
spr_template 0x80eb, 0x80eb, gOamData_8589944, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_8589984, SpriteCallbackDummy
|
||||
|
||||
.align 2
|
||||
gContestExcitementTable:: @ 85899EC
|
||||
.2byte 0x0001, 0xffff, 0x0000, 0x0001, 0xffff, 0x00ff, 0x0001, 0xffff, 0x00ff, 0x0001, 0xff00, 0x00ff, 0x0001, 0x0000
|
||||
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -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
|
||||
|
||||
@ -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"
|
||||
}
|
||||
],
|
||||
@ -59,4 +59,4 @@
|
||||
],
|
||||
"coord_events": [],
|
||||
"bg_events": []
|
||||
}
|
||||
}
|
||||
|
||||
@ -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"
|
||||
}
|
||||
],
|
||||
|
||||
@ -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
|
||||
|
||||
|
||||
@ -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
|
||||
|
||||
|
||||
@ -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
|
||||
@ -47,18 +47,30 @@ EverGrandeCity_PokemonLeague_1F_Pokemart_229624: @ 8229624
|
||||
|
||||
EverGrandeCity_PokemonLeague_1F_EventScript_229636:: @ 8229636
|
||||
special SavePlayerParty
|
||||
|
||||
trainerbattle 10, TRAINER_WALLACE, 0, NULL, EverGrandeCity_PokemonLeague_1F_Text_2296E8
|
||||
|
||||
fadescreen 1
|
||||
special ChooseHalfPartyForBattle
|
||||
waitstate
|
||||
@ Check here to see if the player didn't choose Cancel.
|
||||
|
||||
special ReducePlayerPartyToSelectedMons
|
||||
setvar VAR_0x8004, 2
|
||||
setvar VAR_0x8005, 4
|
||||
special CallFrontierUtilFunc
|
||||
|
||||
trainerbattle 10, 1, 0, NULL, EverGrandeCity_PokemonLeague_1F_Text_2296E8
|
||||
trainerbattle 11, TRAINER_ALEXA, 0, NULL, EverGrandeCity_PokemonLeague_1F_Text_2297EF
|
||||
|
||||
setvar VAR_0x8004, SPECIAL_BATTLE_MULTI
|
||||
setvar VAR_0x8005, 0
|
||||
setvar VAR_0x8005, 2 | 0x80
|
||||
setvar VAR_0x8006, TRAINER_EDWARDO
|
||||
setvar VAR_0x8007, TRAINER_BACK_PIC_LEAF
|
||||
special DoSpecialTrainerBattle
|
||||
|
||||
waitstate
|
||||
|
||||
setvar VAR_0x8004, 6
|
||||
special CallFrontierUtilFunc
|
||||
|
||||
special LoadPlayerParty
|
||||
|
||||
lockall
|
||||
|
||||
@ -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"
|
||||
},
|
||||
{
|
||||
@ -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"
|
||||
},
|
||||
{
|
||||
|
||||
@ -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"
|
||||
},
|
||||
{
|
||||
|
||||
@ -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"
|
||||
},
|
||||
{
|
||||
|
||||
@ -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"
|
||||
}
|
||||
],
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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"
|
||||
},
|
||||
{
|
||||
|
||||
@ -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"
|
||||
},
|
||||
{
|
||||
|
||||
@ -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"
|
||||
},
|
||||
{
|
||||
@ -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"
|
||||
},
|
||||
{
|
||||
@ -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
|
||||
|
||||
@ -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"
|
||||
},
|
||||
{
|
||||
|
||||
@ -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"
|
||||
},
|
||||
{
|
||||
|
||||
@ -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"
|
||||
},
|
||||
{
|
||||
|
||||
@ -63,7 +63,7 @@
|
||||
"movement_range_y": 0,
|
||||
"trainer_type": "0",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "Route110_TrickHousePuzzle6_EventScript_29145C",
|
||||
"script": "Route110_TrickHousePuzzle6_EventScript_ItemGlitterMail",
|
||||
"flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_6_GLITTER_MAIL"
|
||||
}
|
||||
],
|
||||
|
||||
@ -63,7 +63,7 @@
|
||||
"movement_range_y": 0,
|
||||
"trainer_type": "0",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "Route110_TrickHousePuzzle7_EventScript_291469",
|
||||
"script": "Route110_TrickHousePuzzle7_EventScript_ItemTropicMail",
|
||||
"flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_7_TROPIC_MAIL"
|
||||
},
|
||||
{
|
||||
|
||||
@ -63,7 +63,7 @@
|
||||
"movement_range_y": 0,
|
||||
"trainer_type": "0",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "Route110_TrickHousePuzzle8_EventScript_291476",
|
||||
"script": "Route110_TrickHousePuzzle8_EventScript_ItemBeadMail",
|
||||
"flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_8_BEAD_MAIL"
|
||||
}
|
||||
],
|
||||
|
||||
@ -261,7 +261,7 @@
|
||||
"movement_range_y": 0,
|
||||
"trainer_type": "0",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "Route111_EventScript_290D9B",
|
||||
"script": "Route111_EventScript_ItemTM37",
|
||||
"flag": "FLAG_ITEM_ROUTE_111_TM_37"
|
||||
},
|
||||
{
|
||||
@ -352,7 +352,7 @@
|
||||
"movement_range_y": 0,
|
||||
"trainer_type": "0",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "Route111_EventScript_290DA8",
|
||||
"script": "Route111_EventScript_ItemStardust",
|
||||
"flag": "FLAG_ITEM_ROUTE_111_STARDUST"
|
||||
},
|
||||
{
|
||||
@ -365,7 +365,7 @@
|
||||
"movement_range_y": 0,
|
||||
"trainer_type": "0",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "Route111_EventScript_290DB5",
|
||||
"script": "Route111_EventScript_ItemHPUp",
|
||||
"flag": "FLAG_ITEM_ROUTE_111_HP_UP"
|
||||
},
|
||||
{
|
||||
@ -573,7 +573,7 @@
|
||||
"movement_range_y": 1,
|
||||
"trainer_type": "0",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "Route111_EventScript_290DC2",
|
||||
"script": "Route111_EventScript_ItemElixir",
|
||||
"flag": "FLAG_ITEM_ROUTE_111_ELIXIR"
|
||||
},
|
||||
{
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
Route111_OldLadysRestStop_MapScripts:: @ 822A916
|
||||
map_script MAP_SCRIPT_ON_TRANSITION, Route111_OldLadysRestStop_MapScript1_22A91C
|
||||
map_script MAP_SCRIPT_ON_TRANSITION, Route111_OldLadysRestStop_OnTransition
|
||||
.byte 0
|
||||
|
||||
Route111_OldLadysRestStop_MapScript1_22A91C: @ 822A91C
|
||||
Route111_OldLadysRestStop_OnTransition: @ 822A91C
|
||||
setflag FLAG_LANDMARK_OLD_LADY_REST_SHOP
|
||||
end
|
||||
|
||||
|
||||
@ -183,7 +183,7 @@
|
||||
"movement_range_y": 0,
|
||||
"trainer_type": "0",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "Route112_EventScript_290DCF",
|
||||
"script": "Route112_EventScript_ItemNugget",
|
||||
"flag": "FLAG_ITEM_ROUTE_112_NUGGET"
|
||||
},
|
||||
{
|
||||
|
||||
@ -105,7 +105,7 @@
|
||||
"movement_range_y": 0,
|
||||
"trainer_type": "0",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "Route113_EventScript_290DDC",
|
||||
"script": "Route113_EventScript_ItemMaxEther",
|
||||
"flag": "FLAG_ITEM_ROUTE_113_MAX_ETHER"
|
||||
},
|
||||
{
|
||||
@ -118,7 +118,7 @@
|
||||
"movement_range_y": 0,
|
||||
"trainer_type": "0",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "Route113_EventScript_290DE9",
|
||||
"script": "Route113_EventScript_ItemSuperRepel",
|
||||
"flag": "FLAG_ITEM_ROUTE_113_SUPER_REPEL"
|
||||
},
|
||||
{
|
||||
@ -183,7 +183,7 @@
|
||||
"movement_range_y": 1,
|
||||
"trainer_type": "0",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "Route113_EventScript_290DF6",
|
||||
"script": "Route113_EventScript_ItemHyperPotion",
|
||||
"flag": "FLAG_ITEM_ROUTE_113_HYPER_POTION"
|
||||
},
|
||||
{
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
Route113_GlassWorkshop_MapScripts:: @ 826ED03
|
||||
map_script MAP_SCRIPT_ON_TRANSITION, Route113_GlassWorkshop_MapScript1_26ED09
|
||||
map_script MAP_SCRIPT_ON_TRANSITION, Route113_GlassWorkshop_OnTransition
|
||||
.byte 0
|
||||
|
||||
Route113_GlassWorkshop_MapScript1_26ED09: @ 826ED09
|
||||
Route113_GlassWorkshop_OnTransition: @ 826ED09
|
||||
setflag FLAG_LANDMARK_GLASS_WORKSHOP
|
||||
compare VAR_GLASS_WORKSHOP_STATE, 1
|
||||
call_if_eq Route113_GlassWorkshop_EventScript_26ED18
|
||||
|
||||
@ -139,7 +139,7 @@
|
||||
"movement_range_y": 0,
|
||||
"trainer_type": "0",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "Route114_EventScript_290E03",
|
||||
"script": "Route114_EventScript_ItemRareCandy",
|
||||
"flag": "FLAG_ITEM_ROUTE_114_RARE_CANDY"
|
||||
},
|
||||
{
|
||||
@ -152,7 +152,7 @@
|
||||
"movement_range_y": 0,
|
||||
"trainer_type": "0",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "Route114_EventScript_290E10",
|
||||
"script": "Route114_EventScript_ItemProtein",
|
||||
"flag": "FLAG_ITEM_ROUTE_114_PROTEIN"
|
||||
},
|
||||
{
|
||||
@ -360,7 +360,7 @@
|
||||
"movement_range_y": 1,
|
||||
"trainer_type": "0",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "Route114_EventScript_290E1D",
|
||||
"script": "Route114_EventScript_ItemEnergyPowder",
|
||||
"flag": "FLAG_ITEM_ROUTE_114_ENERGY_POWDER"
|
||||
},
|
||||
{
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
Route114_FossilManiacsHouse_MapScripts:: @ 822AD30
|
||||
map_script MAP_SCRIPT_ON_TRANSITION, Route114_FossilManiacsHouse_MapScript1_22AD36
|
||||
map_script MAP_SCRIPT_ON_TRANSITION, Route114_FossilManiacsHouse_OnTransition
|
||||
.byte 0
|
||||
|
||||
Route114_FossilManiacsHouse_MapScript1_22AD36: @ 822AD36
|
||||
Route114_FossilManiacsHouse_OnTransition: @ 822AD36
|
||||
setflag FLAG_LANDMARK_FOSSIL_MANIACS_HOUSE
|
||||
end
|
||||
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
Route114_LanettesHouse_MapScripts:: @ 822B2C8
|
||||
map_script MAP_SCRIPT_ON_TRANSITION, Route114_LanettesHouse_MapScript1_22B2CE
|
||||
map_script MAP_SCRIPT_ON_TRANSITION, Route114_LanettesHouse_OnTransition
|
||||
.byte 0
|
||||
|
||||
Route114_LanettesHouse_MapScript1_22B2CE: @ 822B2CE
|
||||
Route114_LanettesHouse_OnTransition: @ 822B2CE
|
||||
setflag FLAG_LANDMARK_LANETTES_HOUSE
|
||||
end
|
||||
|
||||
|
||||
@ -152,7 +152,7 @@
|
||||
"movement_range_y": 0,
|
||||
"trainer_type": "0",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "Route115_EventScript_290E2A",
|
||||
"script": "Route115_EventScript_ItemSuperPotion",
|
||||
"flag": "FLAG_ITEM_ROUTE_115_SUPER_POTION"
|
||||
},
|
||||
{
|
||||
@ -165,7 +165,7 @@
|
||||
"movement_range_y": 0,
|
||||
"trainer_type": "0",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "Route115_EventScript_290E37",
|
||||
"script": "Route115_EventScript_ItemTM01",
|
||||
"flag": "FLAG_ITEM_ROUTE_115_TM_01"
|
||||
},
|
||||
{
|
||||
@ -178,7 +178,7 @@
|
||||
"movement_range_y": 0,
|
||||
"trainer_type": "0",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "Route115_EventScript_290E44",
|
||||
"script": "Route115_EventScript_ItemIron",
|
||||
"flag": "FLAG_ITEM_ROUTE_115_IRON"
|
||||
},
|
||||
{
|
||||
@ -230,7 +230,7 @@
|
||||
"movement_range_y": 1,
|
||||
"trainer_type": "0",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "Route115_EventScript_290E51",
|
||||
"script": "Route115_EventScript_ItemGreatBall",
|
||||
"flag": "FLAG_ITEM_ROUTE_115_GREAT_BALL"
|
||||
},
|
||||
{
|
||||
@ -308,7 +308,7 @@
|
||||
"movement_range_y": 1,
|
||||
"trainer_type": "0",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "Route115_EventScript_290E6B",
|
||||
"script": "Route115_EventScript_ItemPPUp",
|
||||
"flag": "FLAG_ITEM_ROUTE_115_PP_UP"
|
||||
},
|
||||
{
|
||||
@ -321,7 +321,7 @@
|
||||
"movement_range_y": 1,
|
||||
"trainer_type": "0",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "Route115_EventScript_290E5E",
|
||||
"script": "Route115_EventScript_ItemHealPowder",
|
||||
"flag": "FLAG_ITEM_ROUTE_115_HEAL_POWDER"
|
||||
}
|
||||
],
|
||||
|
||||
@ -113,7 +113,7 @@
|
||||
"movement_range_y": 0,
|
||||
"trainer_type": "0",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "Route116_EventScript_290E85",
|
||||
"script": "Route116_EventScript_ItemEther",
|
||||
"flag": "FLAG_ITEM_ROUTE_116_ETHER"
|
||||
},
|
||||
{
|
||||
@ -126,7 +126,7 @@
|
||||
"movement_range_y": 0,
|
||||
"trainer_type": "0",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "Route116_EventScript_290E92",
|
||||
"script": "Route116_EventScript_ItemRepel",
|
||||
"flag": "FLAG_ITEM_ROUTE_116_REPEL"
|
||||
},
|
||||
{
|
||||
@ -217,7 +217,7 @@
|
||||
"movement_range_y": 0,
|
||||
"trainer_type": "0",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "Route116_EventScript_290E9F",
|
||||
"script": "Route116_EventScript_ItemHPUp",
|
||||
"flag": "FLAG_ITEM_ROUTE_116_HP_UP"
|
||||
},
|
||||
{
|
||||
@ -282,7 +282,7 @@
|
||||
"movement_range_y": 1,
|
||||
"trainer_type": "0",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "Route116_EventScript_290E78",
|
||||
"script": "Route116_EventScript_ItemXSpecial",
|
||||
"flag": "FLAG_ITEM_ROUTE_116_X_SPECIAL"
|
||||
},
|
||||
{
|
||||
@ -347,7 +347,7 @@
|
||||
"movement_range_y": 1,
|
||||
"trainer_type": "0",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "Route116_EventScript_290EAC",
|
||||
"script": "Route116_EventScript_ItemPotion",
|
||||
"flag": "FLAG_ITEM_ROUTE_116_POTION"
|
||||
},
|
||||
{
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
Route116_TunnelersRestHouse_MapScripts:: @ 822B850
|
||||
map_script MAP_SCRIPT_ON_TRANSITION, Route116_TunnelersRestHouse_MapScript1_22B856
|
||||
map_script MAP_SCRIPT_ON_TRANSITION, Route116_TunnelersRestHouse_OnTransition
|
||||
.byte 0
|
||||
|
||||
Route116_TunnelersRestHouse_MapScript1_22B856: @ 822B856
|
||||
Route116_TunnelersRestHouse_OnTransition: @ 822B856
|
||||
setflag FLAG_LANDMARK_TUNNELERS_REST_HOUSE
|
||||
end
|
||||
|
||||
|
||||
@ -204,7 +204,7 @@
|
||||
"movement_range_y": 0,
|
||||
"trainer_type": "0",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "Route117_EventScript_290EB9",
|
||||
"script": "Route117_EventScript_ItemGreatBall",
|
||||
"flag": "FLAG_ITEM_ROUTE_117_GREAT_BALL"
|
||||
},
|
||||
{
|
||||
@ -230,7 +230,7 @@
|
||||
"movement_range_y": 0,
|
||||
"trainer_type": "0",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "Route117_EventScript_290EC6",
|
||||
"script": "Route117_EventScript_ItemRevive",
|
||||
"flag": "FLAG_ITEM_ROUTE_117_REVIVE"
|
||||
},
|
||||
{
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
Route117_PokemonDayCare_MapScripts:: @ 822BBB1
|
||||
map_script MAP_SCRIPT_ON_TRANSITION, Route117_PokemonDayCare_MapScript1_22BBB7
|
||||
map_script MAP_SCRIPT_ON_TRANSITION, Route117_PokemonDayCare_OnTransition
|
||||
.byte 0
|
||||
|
||||
Route117_PokemonDayCare_MapScript1_22BBB7: @ 822BBB7
|
||||
Route117_PokemonDayCare_OnTransition: @ 822BBB7
|
||||
setflag FLAG_LANDMARK_POKEMON_DAYCARE
|
||||
end
|
||||
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
x
Reference in New Issue
Block a user