ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-26 21:33:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge with master and fix web moves

Browse Source
This commit is contained in:
DizzyEggg 2019-04-05 12:43:44 +02:00
commit 183b714ff1
224 changed files with 5681 additions and 5859 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
asm/m4a_1.s
View File

@ -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

14
asm/macros/battle_anim_script.inc
View File

@ -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

2
asm/macros/battle_script.inc
View File

@ -1139,7 +1139,7 @@
.4byte \ptr
.endm
.macro asistattackselect param0:req
.macro assistattackselect param0:req
.byte 0xde
.4byte \param0
.endm

4
asm/macros/event.inc
View File

@ -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

336
asm/menu_specialized.s
View File

@ -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.

534
asm/mevent_server.s
View File

@ -1,534 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start mevent_srv_init_wnews
mevent_srv_init_wnews: @ 801D07C
push {r4,lr}
ldr r4, =gUnknown_02022C7C
movs r0, 0x60
bl AllocZeroed
str r0, [r4]
ldr r1, =gUnknown_082F298C
movs r2, 0
movs r3, 0x1
bl mevent_srv_init_common
pop {r4}
pop {r0}
bx r0
.pool
thumb_func_end mevent_srv_init_wnews
thumb_func_start mevent_srv_new_wcard
mevent_srv_new_wcard: @ 801D0A0
push {r4,lr}
ldr r4, =gUnknown_02022C7C
movs r0, 0x60
bl AllocZeroed
str r0, [r4]
ldr r1, =gUnknown_082F29EC
movs r2, 0
movs r3, 0x1
bl mevent_srv_init_common
pop {r4}
pop {r0}
bx r0
.pool
thumb_func_end mevent_srv_new_wcard
thumb_func_start mevent_srv_common_do_exec
mevent_srv_common_do_exec: @ 801D0C4
push {r4-r6,lr}
adds r6, r0, 0
ldr r4, =gUnknown_02022C7C
ldr r0, [r4]
cmp r0, 0
bne _0801D0D8
movs r0, 0x3
b _0801D0F8
.pool
_0801D0D8:
bl mevent_dispatch_08145600
adds r5, r0, 0
cmp r5, 0x3
bne _0801D0F6
ldr r0, [r4]
ldr r1, [r0, 0x4]
strh r1, [r6]
bl mevent_srv_free_resources
ldr r0, [r4]
bl Free
movs r0, 0
str r0, [r4]
_0801D0F6:
adds r0, r5, 0
_0801D0F8:
pop {r4-r6}
pop {r1}
bx r1
thumb_func_end mevent_srv_common_do_exec
thumb_func_start mevent_srv_init_common
mevent_srv_init_common: @ 801D100
push {r4-r6,lr}
mov r6, r9
mov r5, r8
push {r5,r6}
adds r4, r0, 0
adds r6, r1, 0
mov r8, r2
mov r9, r3
movs r5, 0
str r5, [r4]
str r5, [r4, 0x8]
movs r0, 0xA6
lsls r0, 1
bl AllocZeroed
str r0, [r4, 0x18]
movs r0, 0xDE
lsls r0, 1
bl AllocZeroed
str r0, [r4, 0x1C]
movs r0, 0x80
lsls r0, 3
bl AllocZeroed
str r0, [r4, 0x14]
movs r0, 0x64
bl AllocZeroed
str r0, [r4, 0x20]
str r6, [r4, 0x10]
str r5, [r4, 0xC]
adds r4, 0x38
adds r0, r4, 0
mov r1, r8
mov r2, r9
bl sub_801D8D8
pop {r3,r4}
mov r8, r3
mov r9, r4
pop {r4-r6}
pop {r0}
bx r0
thumb_func_end mevent_srv_init_common
thumb_func_start mevent_srv_free_resources
mevent_srv_free_resources: @ 801D158
push {r4,lr}
adds r4, r0, 0
ldr r0, [r4, 0x18]
bl Free
ldr r0, [r4, 0x1C]
bl Free
ldr r0, [r4, 0x14]
bl Free
ldr r0, [r4, 0x20]
bl Free
pop {r4}
pop {r0}
bx r0
thumb_func_end mevent_srv_free_resources
thumb_func_start mevent_srv_814501C
mevent_srv_814501C: @ 801D17C
push {lr}
adds r0, 0x38
bl sub_801D904
pop {r0}
bx r0
thumb_func_end mevent_srv_814501C
thumb_func_start sub_801D188
sub_801D188: @ 801D188
push {lr}
cmp r0, 0
bne _0801D190
adds r0, r1, 0
_0801D190:
pop {r1}
bx r1
thumb_func_end sub_801D188
thumb_func_start sub_801D194
sub_801D194: @ 801D194
push {lr}
cmp r1, r0
bcs _0801D19E
movs r0, 0
b _0801D1A8
_0801D19E:
cmp r1, r0
beq _0801D1A6
movs r0, 0x2
b _0801D1A8
_0801D1A6:
movs r0, 0x1
_0801D1A8:
pop {r1}
bx r1
thumb_func_end sub_801D194
thumb_func_start sub_801D1AC
sub_801D1AC: @ 801D1AC
movs r1, 0x4
str r1, [r0, 0x8]
movs r0, 0
bx lr
thumb_func_end sub_801D1AC
thumb_func_start sub_801D1B4
sub_801D1B4: @ 801D1B4
movs r0, 0x3
bx lr
thumb_func_end sub_801D1B4
thumb_func_start sub_801D1B8
sub_801D1B8: @ 801D1B8
push {r4,lr}
adds r4, r0, 0
adds r0, 0x38
bl sub_801D8C0
cmp r0, 0
beq _0801D1CA
movs r0, 0x4
str r0, [r4, 0x8]
_0801D1CA:
movs r0, 0x1
pop {r4}
pop {r1}
bx r1
thumb_func_end sub_801D1B8
thumb_func_start sub_801D1D4
sub_801D1D4: @ 801D1D4
push {r4,lr}
adds r4, r0, 0
adds r0, 0x38
bl sub_801D8CC
cmp r0, 0
beq _0801D1E6
movs r0, 0x4
str r0, [r4, 0x8]
_0801D1E6:
movs r0, 0x1
pop {r4}
pop {r1}
bx r1
thumb_func_end sub_801D1D4
thumb_func_start sub_801D1F0
sub_801D1F0: @ 801D1F0
push {r4,r5,lr}
adds r5, r0, 0
ldr r0, [r5, 0xC]
lsls r1, r0, 1
adds r1, r0
lsls r1, 2
ldr r2, [r5, 0x10]
adds r3, r2, r1
adds r0, 0x1
str r0, [r5, 0xC]
ldr r0, [r3]
cmp r0, 0x1E
bls _0801D20C
b _0801D464
_0801D20C:
lsls r0, 2
ldr r1, =_0801D21C
adds r0, r1
ldr r0, [r0]
mov pc, r0
.pool
.align 2, 0
_0801D21C:
.4byte _0801D298
.4byte _0801D2A2
.4byte _0801D2A8
.4byte _0801D2E2
.4byte _0801D2D8
.4byte _0801D2BA
.4byte _0801D2C6
.4byte _0801D2EC
.4byte _0801D300
.4byte _0801D308
.4byte _0801D31E
.4byte _0801D32E
.4byte _0801D33A
.4byte _0801D360
.4byte _0801D348
.4byte _0801D390
.4byte _0801D378
.4byte _0801D3DC
.4byte _0801D3A8
.4byte _0801D3C0
.4byte _0801D3CE
.4byte _0801D406
.4byte _0801D3EA
.4byte _0801D3F8
.4byte _0801D40E
.4byte _0801D418
.4byte _0801D422
.4byte _0801D43C
.4byte _0801D450
.4byte _0801D458
.4byte _0801D2CC
_0801D298:
movs r0, 0x1
str r0, [r5, 0x8]
ldr r0, [r3, 0x4]
str r0, [r5, 0x4]
b _0801D464
_0801D2A2:
movs r0, 0x3
str r0, [r5, 0x8]
b _0801D464
_0801D2A8:
adds r0, r5, 0
adds r0, 0x38
ldr r1, [r3, 0x4]
ldr r2, [r5, 0x14]
bl sub_801D928
movs r0, 0x2
str r0, [r5, 0x8]
b _0801D464
_0801D2BA:
ldr r0, [r5, 0x20]
ldr r1, [r5, 0x14]
movs r2, 0x64
bl memcpy
b _0801D464
_0801D2C6:
ldr r0, [r5, 0x20]
movs r1, 0
b _0801D2D0
_0801D2CC:
ldr r0, [r5, 0x20]
movs r1, 0x1
_0801D2D0:
bl sub_801B6A0
str r0, [r5, 0x4]
b _0801D464
_0801D2D8:
ldr r1, [r5, 0x4]
ldr r0, [r3, 0x4]
cmp r1, r0
beq _0801D2E2
b _0801D464
_0801D2E2:
movs r0, 0
str r0, [r5, 0xC]
ldr r0, [r3, 0x8]
str r0, [r5, 0x10]
b _0801D464
_0801D2EC:
ldr r0, [r3, 0x8]
ldr r1, [r5, 0x18]
bl sub_801D188
adds r2, r0, 0
ldr r1, [r5, 0x20]
bl sub_801B6EC
str r0, [r5, 0x4]
b _0801D464
_0801D300:
ldr r0, [r5, 0x14]
ldr r0, [r0]
str r0, [r5, 0x4]
b _0801D464
_0801D308:
ldr r0, [r3, 0x8]
adds r1, r5, 0
adds r1, 0x34
bl sub_801D188
adds r2, r0, 0
ldr r1, [r5, 0x20]
bl sub_801B708
str r0, [r5, 0x4]
b _0801D464
_0801D31E:
ldr r0, [r5, 0x20]
ldr r1, [r3, 0x4]
bl sub_801B784
lsls r0, 16
lsrs r0, 16
str r0, [r5, 0x4]
b _0801D464
_0801D32E:
ldr r0, [r5, 0x20]
ldr r1, [r3, 0x8]
bl sub_801B748
str r0, [r5, 0x4]
b _0801D464
_0801D33A:
ldr r0, [r3, 0x8]
ldr r1, [r5, 0x14]
ldr r1, [r1]
bl sub_801D194
str r0, [r5, 0x4]
b _0801D464
_0801D348:
ldr r0, [r3, 0x8]
ldr r1, [r5, 0x1C]
bl sub_801D188
adds r2, r0, 0
movs r3, 0xDE
lsls r3, 1
adds r0, r5, 0
movs r1, 0x17
bl mevent_srv_814501C
b _0801D464
_0801D360:
ldr r0, [r3, 0x8]
ldr r1, [r5, 0x18]
bl sub_801D188
adds r2, r0, 0
movs r3, 0xA6
lsls r3, 1
adds r0, r5, 0
movs r1, 0x16
bl mevent_srv_814501C
b _0801D464
_0801D378:
ldr r0, [r3, 0x8]
adds r1, r5, 0
adds r1, 0x34
bl sub_801D188
adds r2, r0, 0
adds r0, r5, 0
movs r1, 0x18
movs r3, 0x4
bl mevent_srv_814501C
b _0801D464
_0801D390:
ldr r2, [r3, 0x8]
cmp r2, 0
bne _0801D39C
ldr r2, [r5, 0x24]
ldr r3, [r5, 0x28]
b _0801D39E
_0801D39C:
ldr r3, [r3, 0x4]
_0801D39E:
adds r0, r5, 0
movs r1, 0x19
bl mevent_srv_814501C
b _0801D464
_0801D3A8:
ldr r2, [r3, 0x8]
cmp r2, 0
bne _0801D3B4
ldr r2, [r5, 0x2C]
ldr r3, [r5, 0x30]
b _0801D3B6
_0801D3B4:
ldr r3, [r3, 0x4]
_0801D3B6:
adds r0, r5, 0
movs r1, 0x10
bl mevent_srv_814501C
b _0801D464
_0801D3C0:
ldr r2, [r3, 0x8]
adds r0, r5, 0
movs r1, 0x1A
movs r3, 0xBC
bl mevent_srv_814501C
b _0801D464
_0801D3CE:
ldr r2, [r3, 0x8]
ldr r3, [r3, 0x4]
adds r0, r5, 0
movs r1, 0x15
bl mevent_srv_814501C
b _0801D464
_0801D3DC:
ldr r2, [r3, 0x8]
ldr r3, [r3, 0x4]
adds r0, r5, 0
movs r1, 0x1C
bl mevent_srv_814501C
b _0801D464
_0801D3EA:
ldr r0, [r5, 0x18]
ldr r1, [r3, 0x8]
movs r2, 0xA6
lsls r2, 1
bl memcpy
b _0801D464
_0801D3F8:
ldr r0, [r5, 0x1C]
ldr r1, [r3, 0x8]
movs r2, 0xDE
lsls r2, 1
bl memcpy
b _0801D464
_0801D406:
ldr r0, [r3, 0x8]
ldr r0, [r0]
str r0, [r5, 0x34]
b _0801D464
_0801D40E:
ldr r0, [r3, 0x8]
str r0, [r5, 0x24]
ldr r0, [r3, 0x4]
str r0, [r5, 0x28]
b _0801D464
_0801D418:
ldr r0, [r3, 0x8]
str r0, [r5, 0x2C]
ldr r0, [r3, 0x4]
str r0, [r5, 0x30]
b _0801D464
_0801D422:
ldr r4, [r5, 0x18]
bl sav1_get_mevent_buffer_1
adds r1, r0, 0
movs r2, 0xA6
lsls r2, 1
adds r0, r4, 0
bl memcpy
ldr r0, [r5, 0x18]
bl sub_801B3C0
b _0801D464
_0801D43C:
ldr r4, [r5, 0x1C]
bl sav1_get_mevent_buffer_0
adds r1, r0, 0
movs r2, 0xDE
lsls r2, 1
adds r0, r4, 0
bl memcpy
b _0801D464
_0801D450:
bl sub_8099244
str r0, [r5, 0x24]
b _0801D464
_0801D458:
ldr r2, [r3, 0x8]
ldr r3, [r3, 0x4]
adds r0, r5, 0
movs r1, 0x1B
bl mevent_srv_814501C
_0801D464:
movs r0, 0x1
pop {r4,r5}
pop {r1}
bx r1
thumb_func_end sub_801D1F0
thumb_func_start mevent_dispatch_08145600
mevent_dispatch_08145600: @ 801D46C
push {lr}
ldr r2, =gUnknown_082F2548
ldr r1, [r0, 0x8]
lsls r1, 2
adds r1, r2
ldr r1, [r1]
bl _call_via_r1
pop {r1}
bx r1
.pool
thumb_func_end mevent_dispatch_08145600
.align 2, 0 @ don't pad with nop

373
asm/mevent_server_helpers.s
View File

@ -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

567
asm/mevent_server_ish.s
View File

@ -1,567 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start mevent_srv_ish_do_init
mevent_srv_ish_do_init: @ 801D484
push {r4,r5,lr}
adds r5, r0, 0
ldr r4, =s_mevent_srv_ish_ptr
movs r0, 0x50
bl AllocZeroed
str r0, [r4]
movs r1, 0x1
movs r2, 0
bl mevent_srv_ish_init
ldr r0, [r4]
str r5, [r0, 0x4C]
pop {r4,r5}
pop {r0}
bx r0
.pool
thumb_func_end mevent_srv_ish_do_init
thumb_func_start mevent_srv_ish_do_exec
mevent_srv_ish_do_exec: @ 801D4A8
push {r4-r6,lr}
adds r6, r0, 0
ldr r4, =s_mevent_srv_ish_ptr
ldr r0, [r4]
cmp r0, 0
bne _0801D4BC
movs r0, 0x6
b _0801D4DC
.pool
_0801D4BC:
bl mevent_srv_ish_exec
adds r5, r0, 0
cmp r5, 0x6
bne _0801D4DA
ldr r0, [r4]
ldr r1, [r0, 0x4]
strh r1, [r6]
bl mevent_srv_ish_free_resources
ldr r0, [r4]
bl Free
movs r0, 0
str r0, [r4]
_0801D4DA:
adds r0, r5, 0
_0801D4DC:
pop {r4-r6}
pop {r1}
bx r1
thumb_func_end mevent_srv_ish_do_exec
thumb_func_start mevent_srv_ish_inc_flag
mevent_srv_ish_inc_flag: @ 801D4E4
ldr r0, =s_mevent_srv_ish_ptr
ldr r1, [r0]
ldr r0, [r1, 0xC]
adds r0, 0x1
str r0, [r1, 0xC]
bx lr
.pool
thumb_func_end mevent_srv_ish_inc_flag
thumb_func_start mevent_srv_ish_get_buffer
mevent_srv_ish_get_buffer: @ 801D4F4
ldr r0, =s_mevent_srv_ish_ptr
ldr r0, [r0]
ldr r0, [r0, 0x20]
bx lr
.pool
thumb_func_end mevent_srv_ish_get_buffer
thumb_func_start mevent_srv_ish_set_param
mevent_srv_ish_set_param: @ 801D500
ldr r1, =s_mevent_srv_ish_ptr
ldr r1, [r1]
str r0, [r1, 0x4]
bx lr
.pool
thumb_func_end mevent_srv_ish_set_param
thumb_func_start mevent_srv_ish_init
mevent_srv_ish_init: @ 801D50C
push {r4-r6,lr}
mov r6, r8
push {r6}
adds r4, r0, 0
adds r6, r1, 0
mov r8, r2
movs r0, 0
str r0, [r4]
str r0, [r4, 0x8]
str r0, [r4, 0xC]
movs r5, 0x80
lsls r5, 3
adds r0, r5, 0
bl AllocZeroed
str r0, [r4, 0x14]
adds r0, r5, 0
bl AllocZeroed
str r0, [r4, 0x18]
adds r0, r5, 0
bl AllocZeroed
str r0, [r4, 0x1C]
movs r0, 0x40
bl AllocZeroed
str r0, [r4, 0x20]
adds r4, 0x24
adds r0, r4, 0
adds r1, r6, 0
mov r2, r8
bl sub_801D8D8
pop {r3}
mov r8, r3
pop {r4-r6}
pop {r0}
bx r0
thumb_func_end mevent_srv_ish_init
thumb_func_start mevent_srv_ish_free_resources
mevent_srv_ish_free_resources: @ 801D55C
push {r4,lr}
adds r4, r0, 0
ldr r0, [r4, 0x14]
bl Free
ldr r0, [r4, 0x18]
bl Free
ldr r0, [r4, 0x1C]
bl Free
ldr r0, [r4, 0x20]
bl Free
pop {r4}
pop {r0}
bx r0
thumb_func_end mevent_srv_ish_free_resources
thumb_func_start mevent_srv_ish_jmp_buffer
mevent_srv_ish_jmp_buffer: @ 801D580
push {r4,lr}
adds r4, r0, 0
ldr r0, [r4, 0x1C]
ldr r1, [r4, 0x18]
movs r2, 0x80
lsls r2, 3
bl memcpy
movs r0, 0
str r0, [r4, 0x10]
pop {r4}
pop {r0}
bx r0
thumb_func_end mevent_srv_ish_jmp_buffer
thumb_func_start sub_801D59C
sub_801D59C: @ 801D59C
push {r4-r6,lr}
sub sp, 0x4
adds r4, r0, 0
adds r6, r1, 0
adds r5, r2, 0
movs r0, 0
str r0, [sp]
ldr r1, [r4, 0x14]
ldr r2, =0x05000100
mov r0, sp
bl CpuSet
ldr r2, [r4, 0x14]
str r5, [r2]
adds r4, 0x24
adds r0, r4, 0
adds r1, r6, 0
movs r3, 0x4
bl sub_801D904
add sp, 0x4
pop {r4-r6}
pop {r0}
bx r0
.pool
thumb_func_end sub_801D59C
thumb_func_start sub_801D5D0
sub_801D5D0: @ 801D5D0
push {r4,lr}
adds r4, r0, 0
ldr r0, [r4, 0x1C]
ldr r1, =gUnknown_082F2598
movs r2, 0x80
lsls r2, 3
bl memcpy
movs r1, 0
str r1, [r4, 0x10]
movs r0, 0x4
str r0, [r4, 0x8]
str r1, [r4, 0xC]
movs r0, 0
pop {r4}
pop {r1}
bx r1
.pool
thumb_func_end sub_801D5D0
thumb_func_start sub_801D5F8
sub_801D5F8: @ 801D5F8
movs r0, 0x6
bx lr
thumb_func_end sub_801D5F8
thumb_func_start sub_801D5FC
sub_801D5FC: @ 801D5FC
push {r4,lr}
adds r4, r0, 0
adds r0, 0x24
bl sub_801D8C0
cmp r0, 0
beq _0801D612
movs r0, 0x4
str r0, [r4, 0x8]
movs r0, 0
str r0, [r4, 0xC]
_0801D612:
movs r0, 0x1
pop {r4}
pop {r1}
bx r1
thumb_func_end sub_801D5FC
thumb_func_start sub_801D61C
sub_801D61C: @ 801D61C
push {r4,lr}
adds r4, r0, 0
adds r0, 0x24
bl sub_801D8CC
cmp r0, 0
beq _0801D632
movs r0, 0x4
str r0, [r4, 0x8]
movs r0, 0
str r0, [r4, 0xC]
_0801D632:
movs r0, 0x1
pop {r4}
pop {r1}
bx r1
thumb_func_end sub_801D61C
thumb_func_start sub_801D63C
sub_801D63C: @ 801D63C
push {r4,lr}
adds r4, r0, 0
ldr r0, [r4, 0x10]
lsls r2, r0, 3
ldr r1, [r4, 0x1C]
adds r2, r1, r2
adds r0, 0x1
str r0, [r4, 0x10]
ldr r0, [r2]
cmp r0, 0x15
bls _0801D654
b _0801D804
_0801D654:
lsls r0, 2
ldr r1, =_0801D664
adds r0, r1
ldr r0, [r0]
mov pc, r0
.pool
.align 2, 0
_0801D664:
.4byte _0801D804
.4byte _0801D6BC
.4byte _0801D6C4
.4byte _0801D6D4
.4byte _0801D70E
.4byte _0801D716
.4byte _0801D6FE
.4byte _0801D708
.4byte _0801D764
.4byte _0801D790
.4byte _0801D788
.4byte _0801D72C
.4byte _0801D742
.4byte _0801D758
.4byte _0801D77C
.4byte _0801D7B8
.4byte _0801D7BC
.4byte _0801D7C4
.4byte _0801D7D0
.4byte _0801D6EA
.4byte _0801D6D8
.4byte _0801D7F0
_0801D6BC:
ldr r0, [r2, 0x4]
str r0, [r4, 0x4]
movs r0, 0x1
b _0801D7FE
_0801D6C4:
adds r0, r4, 0
adds r0, 0x24
ldr r1, [r2, 0x4]
ldr r2, [r4, 0x18]
bl sub_801D928
movs r0, 0x2
b _0801D7FE
_0801D6D4:
movs r0, 0x3
b _0801D7FE
_0801D6D8:
adds r0, r4, 0
adds r0, 0x24
ldr r2, [r4, 0x14]
movs r1, 0x14
movs r3, 0
bl sub_801D904
movs r0, 0x3
b _0801D7FE
_0801D6EA:
ldrb r0, [r2, 0x4]
bl GetGameStat
adds r2, r0, 0
adds r0, r4, 0
movs r1, 0x12
bl sub_801D59C
movs r0, 0x3
b _0801D7FE
_0801D6FE:
ldr r0, [r4, 0x4]
cmp r0, 0
beq _0801D706
b _0801D804
_0801D706:
b _0801D70E
_0801D708:
ldr r0, [r4, 0x4]
cmp r0, 0x1
bne _0801D804
_0801D70E:
adds r0, r4, 0
bl mevent_srv_ish_jmp_buffer
b _0801D804
_0801D716:
ldr r0, [r4, 0x20]
ldr r1, [r4, 0x18]
movs r2, 0x40
bl memcpy
movs r0, 0x5
str r0, [r4, 0x8]
movs r0, 0
str r0, [r4, 0xC]
movs r0, 0x2
b _0801D806
_0801D72C:
ldr r0, [r4, 0x20]
ldr r1, [r4, 0x18]
movs r2, 0x40
bl memcpy
movs r0, 0x5
str r0, [r4, 0x8]
movs r0, 0
str r0, [r4, 0xC]
movs r0, 0x3
b _0801D806
_0801D742:
ldr r0, [r4, 0x20]
ldr r1, [r4, 0x18]
movs r2, 0x40
bl memcpy
movs r0, 0x5
str r0, [r4, 0x8]
movs r0, 0
str r0, [r4, 0xC]
movs r0, 0x5
b _0801D806
_0801D758:
movs r0, 0x5
str r0, [r4, 0x8]
movs r0, 0
str r0, [r4, 0xC]
movs r0, 0x4
b _0801D806
_0801D764:
ldr r0, [r4, 0x14]
ldr r1, [r4, 0x4C]
bl sub_801B580
adds r0, r4, 0
adds r0, 0x24
ldr r2, [r4, 0x14]
movs r1, 0x11
movs r3, 0x64
bl sub_801D904
b _0801D804
_0801D77C:
ldr r2, [r4, 0x4]
adds r0, r4, 0
movs r1, 0x13
bl sub_801D59C
b _0801D804
_0801D788:
ldr r0, [r4, 0x18]
bl sub_801B21C
b _0801D804
_0801D790:
ldr r0, [r4, 0x18]
bl sub_801B1A4
cmp r0, 0
bne _0801D7AC
ldr r0, [r4, 0x18]
bl sub_801B078
adds r0, r4, 0
movs r1, 0x13
movs r2, 0
bl sub_801D59C
b _0801D804
_0801D7AC:
adds r0, r4, 0
movs r1, 0x13
movs r2, 0x1
bl sub_801D59C
b _0801D804
_0801D7B8:
movs r0, 0x6
b _0801D7FE
_0801D7BC:
ldr r0, [r4, 0x18]
bl sub_801B508
b _0801D804
_0801D7C4:
ldr r0, [r4, 0x18]
movs r1, 0xFA
lsls r1, 2
bl sub_80992A0
b _0801D804
_0801D7D0:
ldr r0, =gSaveBlock2Ptr
ldr r0, [r0]
ldr r1, =0x00000bec
adds r0, r1
ldr r1, [r4, 0x18]
movs r2, 0xBC
bl memcpy
bl ValidateEReaderTrainer
b _0801D804
.pool
_0801D7F0:
ldr r0, =gDecompressionBuffer
ldr r1, [r4, 0x18]
movs r2, 0x80
lsls r2, 3
bl memcpy
movs r0, 0x7
_0801D7FE:
str r0, [r4, 0x8]
movs r0, 0
str r0, [r4, 0xC]
_0801D804:
movs r0, 0x1
_0801D806:
pop {r4}
pop {r1}
bx r1
.pool
thumb_func_end sub_801D63C
thumb_func_start sub_801D810
sub_801D810: @ 801D810
push {lr}
adds r1, r0, 0
ldr r0, [r1, 0xC]
cmp r0, 0
beq _0801D822
movs r0, 0x4
str r0, [r1, 0x8]
movs r0, 0
str r0, [r1, 0xC]
_0801D822:
movs r0, 0x1
pop {r1}
bx r1
thumb_func_end sub_801D810
thumb_func_start sub_801D828
sub_801D828: @ 801D828
push {r4,lr}
adds r4, r0, 0
ldr r0, [r4, 0xC]
cmp r0, 0
beq _0801D838
cmp r0, 0x1
beq _0801D846
b _0801D858
_0801D838:
ldr r0, [r4, 0x18]
bl sub_8153870
ldr r0, [r4, 0xC]
adds r0, 0x1
str r0, [r4, 0xC]
b _0801D858
_0801D846:
adds r0, r4, 0x4
bl sub_8153884
adds r1, r0, 0
cmp r1, 0
bne _0801D858
movs r0, 0x4
str r0, [r4, 0x8]
str r1, [r4, 0xC]
_0801D858:
movs r0, 0x1
pop {r4}
pop {r1}
bx r1
thumb_func_end sub_801D828
thumb_func_start sub_801D860
sub_801D860: @ 801D860
push {r4,lr}
adds r4, r0, 0
ldr r3, =gDecompressionBuffer
adds r0, r4, 0x4
ldr r1, =gSaveBlock2Ptr
ldr r1, [r1]
ldr r2, =gSaveBlock1Ptr
ldr r2, [r2]
bl _call_via_r3
cmp r0, 0x1
bne _0801D880
movs r0, 0x4
str r0, [r4, 0x8]
movs r0, 0
str r0, [r4, 0xC]
_0801D880:
movs r0, 0x1
pop {r4}
pop {r1}
bx r1
.pool
thumb_func_end sub_801D860
thumb_func_start mevent_srv_ish_exec
mevent_srv_ish_exec: @ 801D894
push {r4,r5,lr}
sub sp, 0x20
mov r2, sp
ldr r1, =gUnknown_082F255C
ldm r1!, {r3-r5}
stm r2!, {r3-r5}
ldm r1!, {r3-r5}
stm r2!, {r3-r5}
ldm r1!, {r3,r4}
stm r2!, {r3,r4}
ldr r1, [r0, 0x8]
lsls r1, 2
add r1, sp
ldr r1, [r1]
bl _call_via_r1
add sp, 0x20
pop {r4,r5}
pop {r1}
bx r1
.pool
thumb_func_end mevent_srv_ish_exec
.align 2, 0 @ don't pad with nop

2
charmap.txt
View File

@ -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
View File

@ -0,0 +1,3 @@
sPlayerToMewDeltaX
sPlayerToMewDeltaY
sMewDirectionCandidates

106
data/battle_anim_scripts.s
View File

@ -803,7 +803,7 @@ Move_HAMMER_ARM:
Move_GYRO_BALL:
loadspritegfx ANIM_TAG_IMPACT
loopsewithpan SE_W231, SOUND_PAN_ATTACKER, 28, 2
createvisualtask sub_81144F8, 5, 0, 0, 0
createvisualtask AnimTask_MetallicShine, 5, 0, 0, 0
waitforvisualfinish
playsewithpan SE_W207, SOUND_PAN_ATTACKER
waitplaysewithpan SE_W207, SOUND_PAN_ATTACKER, 8
@ -927,7 +927,7 @@ Move_METAL_BURST:
loadspritegfx ANIM_TAG_ECLIPSING_ORB
loadspritegfx ANIM_TAG_RED_ORB
loopsewithpan SE_W161, -64, 18, 3
createvisualtask sub_811489C, 5, 0, 0
createvisualtask AnimTask_SetGreyscaleOrOriginalPal, 5, ANIM_ATTACKER, 0
createvisualtask sub_815B338, 5
waitforvisualfinish
setarg 7, -1
@ -942,7 +942,7 @@ Move_METAL_BURST:
createsprite gHiddenPowerOrbScatterSpriteTemplate, ANIM_TARGET, 20, 192
createsprite gHiddenPowerOrbScatterSpriteTemplate, ANIM_TARGET, 2, 224
waitforvisualfinish
createvisualtask sub_811489C, 5, 0, 1
createvisualtask AnimTask_SetGreyscaleOrOriginalPal, 5, ANIM_ATTACKER, 1
waitforvisualfinish
end
@ -1768,7 +1768,7 @@ Move_ICE_SHARD:
loadspritegfx ANIM_TAG_ICE_CRYSTALS
fadetobg BG_ICE
waitbgfadein
createsoundtask sub_8158C58, 183, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 4, 4, 0, 10
createsoundtask sub_8158C58, SE_W062B, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 4, 4, 0, 10
createsprite gUnknown_08595B2C, ANIM_ATTACKER, 2, -20, 70, 0, 42, 35
createsprite gUnknown_08595B14, ANIM_ATTACKER, 2, -20, 58, 0, 30, 35
createsprite gUnknown_08595B2C, ANIM_ATTACKER, 2, -20, -12, 0, 22, 40
@ -2037,7 +2037,7 @@ Move_IRON_HEAD:
loadspritegfx ANIM_TAG_GUST
loadspritegfx ANIM_TAG_IMPACT
loopsewithpan SE_W231, SOUND_PAN_ATTACKER, 28, 2
createvisualtask sub_81144F8, 5, 1, 0, 0
createvisualtask AnimTask_MetallicShine, 5, 1, 0, 0
waitforvisualfinish
createsprite gUnknown_08592CD8, ANIM_ATTACKER, 2, 0
playsewithpan SE_W029, SOUND_PAN_ATTACKER
@ -2051,7 +2051,7 @@ Move_IRON_HEAD:
createsprite gUnknown_085973E8, ANIM_TARGET, 3, 0, 0, 1, 1
playsewithpan SE_W233B, SOUND_PAN_TARGET
waitforvisualfinish
createvisualtask sub_811489C, 5, 0, 1
createvisualtask AnimTask_SetGreyscaleOrOriginalPal, 5, ANIM_ATTACKER, 1
waitforvisualfinish
end
@ -2319,7 +2319,7 @@ Move_ELECTROWEB:
monbgprio_28 ANIM_TARGET
waitforvisualfinish
playsewithpan SE_W081B, SOUND_PAN_TARGET
createsprite gUnknown_08596A2C, ANIM_ATTACKER, 2, 0, 0
createsprite gSpiderWebSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, TRUE
waitforvisualfinish
clearmonbg ANIM_DEF_PARTNER
delay 1
@ -2466,13 +2466,13 @@ Move_STICKY_WEB:
call SpiderWeb1
waitforvisualfinish
playsewithpan SE_W081B, SOUND_PAN_TARGET
createsprite gUnknown_08596A2C, ANIM_ATTACKER, 2, 0, 0
createsprite gSpiderWebSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, TRUE
delay 50
playsewithpan SE_W081B, SOUND_PAN_TARGET
createsprite gUnknown_08596A2C, ANIM_ATTACKER, 2, -30, 30
createsprite gSpiderWebSpriteTemplate, ANIM_ATTACKER, 2, -30, 30, TRUE
delay 50
playsewithpan SE_W081B, SOUND_PAN_TARGET
createsprite gUnknown_08596A2C, ANIM_ATTACKER, 2, 30, -30
createsprite gSpiderWebSpriteTemplate, ANIM_ATTACKER, 2, 30, -30, TRUE
waitforvisualfinish
clearmonbg ANIM_DEF_PARTNER
delay 1
@ -3782,7 +3782,7 @@ Move_VINE_WHIP:
createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 4, 6
delay 6
playsewithpan SE_W010, SOUND_PAN_TARGET
createsprite gUnknown_085928E8, ANIM_TARGET, 2, 0, 0
createsprite gVineWhipSpriteTemplate, ANIM_TARGET, 2, 0, 0
delay 6
createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 6, 1
end
@ -3923,12 +3923,12 @@ Explosion1:
Move_DEFENSE_CURL:
loadspritegfx ANIM_TAG_ECLIPSING_ORB
loopsewithpan SE_W161, SOUND_PAN_ATTACKER, 18, 3
createvisualtask sub_811489C, 5, 0, 0
createvisualtask AnimTask_SetGreyscaleOrOriginalPal, 5, ANIM_ATTACKER, 0
createvisualtask sub_815B338, 5
waitforvisualfinish
createsprite gUnknown_085CE338, ANIM_ATTACKER, 2, 0, 6, 0, 1
waitforvisualfinish
createvisualtask sub_811489C, 5, 0, 1
createvisualtask AnimTask_SetGreyscaleOrOriginalPal, 5, ANIM_ATTACKER, 1
waitforvisualfinish
end
@ -4270,7 +4270,7 @@ Move_ATTRACT:
createsprite gBattleAnimSpriteTemplate_85939B8, ANIM_TARGET, 3, -384, -31
waitforvisualfinish
waitplaysewithpan SE_W213B, 0, 15
createvisualtask sub_81062E8, 5
createvisualtask AnimTask_HeartsBackground, 5
createsprite gUnknown_085939D0, ANIM_ATTACKER, 40, 16, 256, 0
createsprite gUnknown_085939D0, ANIM_ATTACKER, 40, 224, 240, 15
createsprite gUnknown_085939D0, ANIM_ATTACKER, 40, 126, 272, 30
@ -4279,7 +4279,7 @@ Move_ATTRACT:
createsprite gUnknown_085939D0, ANIM_ATTACKER, 40, 40, 256, 75
createsprite gUnknown_085939D0, ANIM_ATTACKER, 40, 112, 256, 90
createsprite gUnknown_085939D0, ANIM_ATTACKER, 40, 200, 272, 90
delay 0x4B
delay 75
createvisualtask sub_8115A04, 2, 4, 4, 4, 0, 10, RGB(31, 25, 27)
end
@ -5487,13 +5487,13 @@ EndureEffect:
Move_CHARM:
loadspritegfx ANIM_TAG_MAGENTA_HEART
createvisualtask AnimTask_RockMonBackAndForth, 5, ANIM_ATTACKER, 2, 0
createsprite gUnknown_08593970, ANIM_ATTACKER, 3, 0, 20
createsprite gMagentaHeartSpriteTemplate, ANIM_ATTACKER, 3, 0, 20
playsewithpan SE_W204, SOUND_PAN_ATTACKER
delay 15
createsprite gUnknown_08593970, ANIM_ATTACKER, 3, -20, 20
createsprite gMagentaHeartSpriteTemplate, ANIM_ATTACKER, 3, -20, 20
playsewithpan SE_W204, SOUND_PAN_ATTACKER
delay 15
createsprite gUnknown_08593970, ANIM_ATTACKER, 3, 20, 20
createsprite gMagentaHeartSpriteTemplate, ANIM_ATTACKER, 3, 20, 20
playsewithpan SE_W204, SOUND_PAN_ATTACKER
waitforvisualfinish
end
@ -6625,7 +6625,7 @@ Move_AERIAL_ACE:
Move_IRON_DEFENSE:
loopsewithpan SE_REAPOKE, SOUND_PAN_ATTACKER, 28, 2
createvisualtask sub_81144F8, 5, 0, 0, 0
createvisualtask AnimTask_MetallicShine, 5, 0, 0, 0
createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 8, 2, RGB_WHITEALPHA, 14, -1, 0
waitforvisualfinish
end
@ -6660,13 +6660,13 @@ Move_COVET:
loadspritegfx ANIM_TAG_MAGENTA_HEART
loadspritegfx ANIM_TAG_ITEM_BAG
createvisualtask AnimTask_RockMonBackAndForth, 5, ANIM_ATTACKER, 2, 0
createsprite gUnknown_08593970, ANIM_ATTACKER, 3, 0, 20
createsprite gMagentaHeartSpriteTemplate, ANIM_ATTACKER, 3, 0, 20
playsewithpan SE_W204, SOUND_PAN_ATTACKER
delay 15
createsprite gUnknown_08593970, ANIM_ATTACKER, 3, -20, 20
createsprite gMagentaHeartSpriteTemplate, ANIM_ATTACKER, 3, -20, 20
playsewithpan SE_W204, SOUND_PAN_ATTACKER
delay 15
createsprite gUnknown_08593970, ANIM_ATTACKER, 3, 20, 20
createsprite gMagentaHeartSpriteTemplate, ANIM_ATTACKER, 3, 20, 20
playsewithpan SE_W204, SOUND_PAN_ATTACKER
waitforvisualfinish
createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 8, 1
@ -6837,7 +6837,7 @@ Move_SHOCK_WAVE:
Move_HARDEN:
loopsewithpan SE_W231, SOUND_PAN_ATTACKER, 28, 2
createvisualtask sub_81144F8, 5, 0, 0, 0
createvisualtask AnimTask_MetallicShine, 5, 0, 0, 0
waitforvisualfinish
end
@ -7614,7 +7614,7 @@ Move_ICE_BEAM:
loadspritegfx ANIM_TAG_ICE_CRYSTALS
createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 1, 0, 7, RGB_BLACK
waitforvisualfinish
createsoundtask sub_8158C58, 183, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 4, 4, 0, 10
createsoundtask sub_8158C58, SE_W062B, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 4, 4, 0, 10
createsprite gUnknown_08595B2C, ANIM_ATTACKER, 2, 20, 12, 0, 12, 20
createsprite gUnknown_08595B2C, ANIM_ATTACKER, 2, 20, -12, 0, -12, 20
delay 1
@ -7670,7 +7670,7 @@ Move_AURORA_BEAM:
call AuroraBeam1
call AuroraBeam1
setarg 7, -1
createsoundtask sub_8158C58, 183, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 3, 6, 0, 10
createsoundtask sub_8158C58, SE_W062B, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 3, 6, 0, 10
createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 2, 0, 40, 1
call AuroraBeam1
call AuroraBeam1
@ -9390,7 +9390,7 @@ Move_PSYBEAM:
loadspritegfx ANIM_TAG_GOLD_RING
playsewithpan SE_W060, SOUND_PAN_ATTACKER
call SetPsychicBackground
createsoundtask sub_8158C58, 200, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 3, 4, 0, 15
createsoundtask sub_8158C58, SE_W060B, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 3, 4, 0, 15
call Psybeam1
call Psybeam1
createvisualtask AnimTask_SwayMon, 5, 0, 6, 2048, 4, ANIM_TARGET
@ -9436,7 +9436,7 @@ Move_PSYWAVE:
playsewithpan SE_W060, SOUND_PAN_ATTACKER
call SetPsychicBackground
createvisualtask sub_81076C8, 5, 100
createsoundtask sub_8158C58, 203, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 2, 9, 0, 10
createsoundtask sub_8158C58, SE_W100, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 2, 9, 0, 10
call Psywave1
call Psywave1
createvisualtask sub_8115A04, 2, 4, 1, 4, 0, 12, RGB(31, 18, 31)
@ -9480,7 +9480,7 @@ Move_STEEL_WING:
loadspritegfx ANIM_TAG_GUST
loadspritegfx ANIM_TAG_IMPACT
loopsewithpan SE_W231, SOUND_PAN_ATTACKER, 28, 2
createvisualtask sub_81144F8, 5, 0, 0, 0
createvisualtask AnimTask_MetallicShine, 5, 0, 0, 0
waitforvisualfinish
monbg ANIM_DEF_PARTNER
monbgprio_28 ANIM_TARGET
@ -9506,7 +9506,7 @@ Move_STEEL_WING:
Move_IRON_TAIL:
loadspritegfx ANIM_TAG_IMPACT
loopsewithpan SE_W231, SOUND_PAN_ATTACKER, 28, 2
createvisualtask sub_81144F8, 5, 1, 0, 0
createvisualtask AnimTask_MetallicShine, 5, 1, 0, 0
waitforvisualfinish
monbg ANIM_TARGET
setalpha 12, 8
@ -9516,7 +9516,7 @@ Move_IRON_TAIL:
createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1
playsewithpan SE_W233B, SOUND_PAN_TARGET
waitforvisualfinish
createvisualtask sub_811489C, 5, 0, 1
createvisualtask AnimTask_SetGreyscaleOrOriginalPal, 5, ANIM_ATTACKER, 1
clearmonbg ANIM_TARGET
blendoff
waitforvisualfinish
@ -9526,7 +9526,7 @@ Move_POISON_TAIL:
loadspritegfx ANIM_TAG_IMPACT
loadspritegfx ANIM_TAG_POISON_BUBBLE
loopsewithpan SE_W231, SOUND_PAN_ATTACKER, 28, 2
createvisualtask sub_81144F8, 5, 1, 1, RGB(24, 6, 23)
createvisualtask AnimTask_MetallicShine, 5, 1, 1, RGB(24, 6, 23)
waitforvisualfinish
monbg ANIM_TARGET
setalpha 12, 8
@ -9536,7 +9536,7 @@ Move_POISON_TAIL:
createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1
playsewithpan SE_W233B, SOUND_PAN_TARGET
waitforvisualfinish
createvisualtask sub_811489C, 5, 0, 1
createvisualtask AnimTask_SetGreyscaleOrOriginalPal, 5, ANIM_ATTACKER, 1
clearmonbg ANIM_TARGET
blendoff
call PoisonBubblesEffect
@ -9546,7 +9546,7 @@ Move_POISON_TAIL:
Move_METAL_CLAW:
loadspritegfx ANIM_TAG_CLAW_SLASH
loopsewithpan SE_W231, SOUND_PAN_ATTACKER, 28, 2
createvisualtask sub_81144F8, 5, 0, 0, 0
createvisualtask AnimTask_MetallicShine, 5, 0, 0, 0
waitforvisualfinish
createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 6, 4
delay 2
@ -9613,8 +9613,8 @@ Move_SHADOW_BALL:
fadetobg BG_GHOST
waitbgfadein
delay 15
createsoundtask sub_8158C58, 168, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 5, 5, 0, 5
createsprite gUnknown_08596D58, ANIM_TARGET, 2, 16, 16, 8
createsoundtask sub_8158C58, SE_W054, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 5, 5, 0, 5
createsprite gShadowBallSpriteTemplate, ANIM_TARGET, 2, 16, 16, 8
waitforvisualfinish
playsewithpan SE_W028, SOUND_PAN_TARGET
createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 8, 1
@ -9726,7 +9726,7 @@ Move_STRING_SHOT:
end
StringShot1:
createsprite gUnknown_085969E0, ANIM_TARGET, 2, 20, 0, 512, 20, 1
createsprite gWebThreadSpriteTemplate, ANIM_TARGET, 2, 20, 0, 512, 20, 1
delay 1
return
@ -9755,7 +9755,7 @@ Move_SPIDER_WEB:
call SpiderWeb1
waitforvisualfinish
playsewithpan SE_W081B, SOUND_PAN_TARGET
createsprite gUnknown_08596A2C, ANIM_ATTACKER, 2, 0, 0
createsprite gSpiderWebSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, FALSE
waitforvisualfinish
clearmonbg ANIM_DEF_PARTNER
delay 1
@ -9763,7 +9763,7 @@ Move_SPIDER_WEB:
end
SpiderWeb1:
createsprite gUnknown_085969E0, ANIM_TARGET, 2, 20, 0, 512, 20, 0
createsprite gWebThreadSpriteTemplate, ANIM_TARGET, 2, 20, 0, 512, 20, 0
delay 1
return
@ -10208,16 +10208,16 @@ Move_PERISH_SONG:
panse_1B SE_W195, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0
delay 80
createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 0, 16, RGB_BLACK
createvisualtask sub_811489C, 5, 4, 0
createvisualtask sub_811489C, 5, 5, 0
createvisualtask sub_811489C, 5, 6, 0
createvisualtask sub_811489C, 5, 7, 0
createvisualtask AnimTask_SetGreyscaleOrOriginalPal, 5, 4, 0
createvisualtask AnimTask_SetGreyscaleOrOriginalPal, 5, 5, 0
createvisualtask AnimTask_SetGreyscaleOrOriginalPal, 5, 6, 0
createvisualtask AnimTask_SetGreyscaleOrOriginalPal, 5, 7, 0
delay 100
createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 16, 0, RGB_BLACK
createvisualtask sub_811489C, 5, 4, 1
createvisualtask sub_811489C, 5, 5, 1
createvisualtask sub_811489C, 5, 6, 1
createvisualtask sub_811489C, 5, 7, 1
createvisualtask AnimTask_SetGreyscaleOrOriginalPal, 5, 4, 1
createvisualtask AnimTask_SetGreyscaleOrOriginalPal, 5, 5, 1
createvisualtask AnimTask_SetGreyscaleOrOriginalPal, 5, 6, 1
createvisualtask AnimTask_SetGreyscaleOrOriginalPal, 5, 7, 1
waitforvisualfinish
end
@ -10286,7 +10286,7 @@ Move_TRI_ATTACK:
delay 20
playsewithpan SE_W161, SOUND_PAN_ATTACKER
delay 20
createsoundtask sub_8158C58, 220, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 5, 6, 0, 7
createsoundtask sub_8158C58, SE_W161, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 5, 6, 0, 7
waitforvisualfinish
createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 2, 0, 16, RGB_BLACK
delay 16
@ -10623,7 +10623,7 @@ Move_HYPER_BEAM:
createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 4, 1
waitforvisualfinish
delay 30
createsoundtask sub_8158C58, 247, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 1, 15, 0, 5
createsoundtask sub_8158C58, SE_W063B, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 1, 15, 0, 5
createvisualtask AnimTask_ShakeMon, 2, ANIM_ATTACKER, 0, 4, 50, 1
createvisualtask sub_8115D94, 2, ANIM_TAG_ORBS, 1, 12, 31, 16, 0, 0
call HyperBeam1
@ -11837,7 +11837,7 @@ Move_DOOM_DESIRE:
createvisualtask sub_8114960, 2
delay 1
monbg ANIM_ATK_PARTNER
createvisualtask sub_811489C, 5, 1, 0
createvisualtask AnimTask_SetGreyscaleOrOriginalPal, 5, ANIM_TARGET, 0
createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 1, 0, 4, RGB_BLACK
waitforvisualfinish
setalpha 8, 8
@ -11845,7 +11845,7 @@ Move_DOOM_DESIRE:
createvisualtask AnimTask_ScaleMonAndRestore, 5, -4, -4, 15, ANIM_ATTACKER, 1
waitforvisualfinish
delay 20
createvisualtask sub_811489C, 5, 1, 1
createvisualtask AnimTask_SetGreyscaleOrOriginalPal, 5, ANIM_TARGET, 1
createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 1, 4, 0, RGB_BLACK
waitforvisualfinish
clearmonbg ANIM_ATK_PARTNER
@ -12504,13 +12504,13 @@ Burn1:
Status_Infatuation:
loadspritegfx ANIM_TAG_MAGENTA_HEART
playsewithpan SE_W204, SOUND_PAN_ATTACKER
createsprite gUnknown_08593970, ANIM_ATTACKER, 3, 0, 20
createsprite gMagentaHeartSpriteTemplate, ANIM_ATTACKER, 3, 0, 20
delay 15
playsewithpan SE_W204, SOUND_PAN_ATTACKER
createsprite gUnknown_08593970, ANIM_ATTACKER, 3, -20, 20
createsprite gMagentaHeartSpriteTemplate, ANIM_ATTACKER, 3, -20, 20
delay 15
playsewithpan SE_W204, SOUND_PAN_ATTACKER
createsprite gUnknown_08593970, ANIM_ATTACKER, 3, 20, 20
createsprite gMagentaHeartSpriteTemplate, ANIM_ATTACKER, 3, 20, 20
end
Status_Sleep:

2
data/battle_scripts_1.s
View File

@ -4014,7 +4014,7 @@ BattleScript_EffectWish::
BattleScript_EffectAssist:
attackcanceler
attackstring
asistattackselect BattleScript_ButItFailedPpReduce
assistattackselect BattleScript_ButItFailedPpReduce
attackanimation
waitanimation
setbyte sB_ANIM_TURN, 0x0

87
data/ereader_helpers.s
View File

@ -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

2
data/maps/AbandonedShip_CaptainsOffice/map.json
View File

@ -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"
}
],

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

@ -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

8
data/maps/AbandonedShip_HiddenFloorRooms/map.json
View File

@ -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"
}
],

2
data/maps/AbandonedShip_Room_B1F/map.json
View File

@ -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"
}
],

2
data/maps/AbandonedShip_Rooms2_1F/map.json
View File

@ -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"
},
{

2
data/maps/AbandonedShip_Rooms2_B1F/map.json
View File

@ -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"
}
],

2
data/maps/AbandonedShip_Rooms_1F/map.json
View File

@ -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"
},
{

2
data/maps/AbandonedShip_Rooms_B1F/map.json
View File

@ -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"
}
],

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

@ -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

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

@ -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

6
data/maps/AquaHideout_B1F/map.json
View File

@ -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"
},
{

2
data/maps/AquaHideout_B2F/map.json
View File

@ -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"
},
{

2
data/maps/ArtisanCave_1F/map.json
View File

@ -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"
}
],

2
data/maps/ArtisanCave_B1F/map.json
View File

@ -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"
}
],

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

@ -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

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

@ -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

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

@ -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

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

@ -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

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

@ -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

4
data/maps/FieryPath/map.json
View File

@ -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"
}
],

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

@ -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

2
data/maps/GraniteCave_1F/map.json
View File

@ -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"
}
],

2
data/maps/GraniteCave_B1F/map.json
View File

@ -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"
}
],

4
data/maps/GraniteCave_B2F/map.json
View File

@ -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"
},
{

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

@ -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

2
data/maps/JaggedPass/map.json
View File

@ -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"
},
{

2
data/maps/LilycoveCity/map.json
View File

@ -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"
},
{

2
data/maps/MagmaHideout_1F/map.json
View File

@ -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"
},
{

4
data/maps/MagmaHideout_2F_2R/map.json
View File

@ -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"
}
],

2
data/maps/MagmaHideout_3F_1R/map.json
View File

@ -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"
}
],

2
data/maps/MagmaHideout_3F_2R/map.json
View File

@ -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"
}
],

2
data/maps/MagmaHideout_3F_3R/map.json
View File

@ -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"
}
],

2
data/maps/MagmaHideout_4F/map.json
View File

@ -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"
}
],

2
data/maps/MauvilleCity/map.json
View File

@ -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"
},
{

8
data/maps/MeteorFalls_1F_1R/map.json
View File

@ -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"
},
{

2
data/maps/MeteorFalls_B1F_2R/map.json
View File

@ -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"
}
],

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

@ -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

2
data/maps/MossdeepCity/map.json
View File

@ -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"
},
{

2
data/maps/MtPyre_2F/map.json
View File

@ -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"
},
{

2
data/maps/MtPyre_3F/map.json
View File

@ -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"
},
{

2
data/maps/MtPyre_4F/map.json
View File

@ -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"
}
],

2
data/maps/MtPyre_5F/map.json
View File

@ -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"
}
],

2
data/maps/MtPyre_6F/map.json
View File

@ -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"
},
{

4
data/maps/MtPyre_Exterior/map.json
View File

@ -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"
}
],

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

@ -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

10
data/maps/NewMauville_Inside/map.json
View File

@ -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"
},
{

4
data/maps/PetalburgCity/map.json
View File

@ -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"
},
{

8
data/maps/PetalburgWoods/map.json
View File

@ -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"
},
{

2
data/maps/Route102/map.json
View File

@ -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"
},
{

4
data/maps/Route103/map.json
View File

@ -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"
}
],

8
data/maps/Route104/map.json
View File

@ -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"
},
{

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

@ -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

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

@ -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

2
data/maps/Route105/map.json
View File

@ -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"
},
{

2
data/maps/Route106/map.json
View File

@ -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"
}
],

2
data/maps/Route108/map.json
View File

@ -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"
}
],

4
data/maps/Route109/map.json
View File

@ -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"
},
{

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

@ -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

6
data/maps/Route110/map.json
View File

@ -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"
},
{

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

@ -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

2
data/maps/Route110_TrickHousePuzzle1/map.json
View File

@ -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"
},
{

4
data/maps/Route110_TrickHousePuzzle2/map.json
View File

@ -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"
}
],

4
data/maps/Route110_TrickHousePuzzle3/map.json
View File

@ -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"
},
{

2
data/maps/Route110_TrickHousePuzzle4/map.json
View File

@ -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"
},
{

2
data/maps/Route110_TrickHousePuzzle6/map.json
View File

@ -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"
}
],

2
data/maps/Route110_TrickHousePuzzle7/map.json
View File

@ -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"
},
{

2
data/maps/Route110_TrickHousePuzzle8/map.json
View File

@ -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"
}
],

8
data/maps/Route111/map.json
View File

@ -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"
},
{

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

@ -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

2
data/maps/Route112/map.json
View File

@ -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"
},
{

6
data/maps/Route113/map.json
View File

@ -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"
},
{

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

@ -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

6
data/maps/Route114/map.json
View File

@ -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"
},
{

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

@ -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

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

@ -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

12
data/maps/Route115/map.json
View File

@ -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"
}
],

10
data/maps/Route116/map.json
View File

@ -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"
},
{

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

@ -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

4
data/maps/Route117/map.json
View File

@ -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"
},
{

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

@ -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

2
data/maps/Route118/map.json
View File

@ -287,7 +287,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route118_EventScript_290ED3",
"script": "Route118_EventScript_ItemHyperPotion",
"flag": "FLAG_ITEM_ROUTE_118_HYPER_POTION"
},
{

18
data/maps/Route119/map.json
View File

@ -243,7 +243,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route119_EventScript_290EE0",
"script": "Route119_EventScript_ItemSuperRepel",
"flag": "FLAG_ITEM_ROUTE_119_SUPER_REPEL"
},
{
@ -256,7 +256,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route119_EventScript_290EED",
"script": "Route119_EventScript_ItemZinc",
"flag": "FLAG_ITEM_ROUTE_119_ZINC"
},
{
@ -269,7 +269,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route119_EventScript_290EFA",
"script": "Route119_EventScript_ItemElixir",
"flag": "FLAG_ITEM_ROUTE_119_ELIXIR_1"
},
{
@ -282,7 +282,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route119_EventScript_290F07",
"script": "Route119_EventScript_ItemLeafStone",
"flag": "FLAG_ITEM_ROUTE_119_LEAF_STONE"
},
{
@ -295,7 +295,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route119_EventScript_290F14",
"script": "Route119_EventScript_ItemRareCandy",
"flag": "FLAG_ITEM_ROUTE_119_RARE_CANDY"
},
{
@ -308,7 +308,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route119_EventScript_290F21",
"script": "Route119_EventScript_ItemHyperPotion",
"flag": "FLAG_ITEM_ROUTE_119_HYPER_POTION_1"
},
{
@ -438,7 +438,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route119_EventScript_290F2E",
"script": "Route119_EventScript_ItemHyperPotion2",
"flag": "FLAG_ITEM_ROUTE_119_HYPER_POTION_2"
},
{
@ -555,7 +555,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route119_EventScript_291399",
"script": "Route119_EventScript_ItemNugget",
"flag": "FLAG_ITEM_ROUTE_119_NUGGET"
},
{
@ -568,7 +568,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route119_EventScript_290F3B",
"script": "Route119_EventScript_ItemElixir2",
"flag": "FLAG_ITEM_ROUTE_119_ELIXIR_2"
},
{

10
data/maps/Route120/map.json
View File

@ -230,7 +230,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route120_EventScript_290F48",
"script": "Route120_EventScript_ItemNugget",
"flag": "FLAG_ITEM_ROUTE_120_NUGGET"
},
{
@ -308,7 +308,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route120_EventScript_290F55",
"script": "Route120_EventScript_ItemFullHeal",
"flag": "FLAG_ITEM_ROUTE_120_FULL_HEAL"
},
{
@ -386,7 +386,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route120_EventScript_290F6F",
"script": "Route120_EventScript_ItemNestBall",
"flag": "FLAG_ITEM_ROUTE_120_NEST_BALL"
},
{
@ -399,7 +399,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route120_EventScript_290F62",
"script": "Route120_EventScript_ItemHyperPotion",
"flag": "FLAG_ITEM_ROUTE_120_HYPER_POTION"
},
{
@ -594,7 +594,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route120_EventScript_290F7C",
"script": "Route120_EventScript_ItemRevive",
"flag": "FLAG_ITEM_ROUTE_120_REVIVE"
}
],

6
data/maps/Route121/map.json
View File

@ -300,7 +300,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route121_EventScript_290F89",
"script": "Route121_EventScript_ItemCarbos",
"flag": "FLAG_ITEM_ROUTE_121_CARBOS"
},
{
@ -391,7 +391,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route121_EventScript_290F96",
"script": "Route121_EventScript_ItemRevive",
"flag": "FLAG_ITEM_ROUTE_121_REVIVE"
},
{
@ -404,7 +404,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route121_EventScript_290FA3",
"script": "Route121_EventScript_ItemZinc",
"flag": "FLAG_ITEM_ROUTE_121_ZINC"
}
],

10
data/maps/Route123/map.json
View File

@ -295,7 +295,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route123_EventScript_290FB0",
"script": "Route123_EventScript_ItemCalcium",
"flag": "FLAG_ITEM_ROUTE_123_CALCIUM"
},
{
@ -438,7 +438,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route123_EventScript_290FBD",
"script": "Route123_EventScript_ItemUltraBall",
"flag": "FLAG_ITEM_ROUTE_123_ULTRA_BALL"
},
{
@ -451,7 +451,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route123_EventScript_290FCA",
"script": "Route123_EventScript_ItemElixir",
"flag": "FLAG_ITEM_ROUTE_123_ELIXIR"
},
{
@ -542,7 +542,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route123_EventScript_290FD7",
"script": "Route123_EventScript_ItemPPUp",
"flag": "FLAG_ITEM_ROUTE_123_PP_UP"
},
{
@ -581,7 +581,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route123_EventScript_290FE4",
"script": "Route123_EventScript_ItemRevivalHerb",
"flag": "FLAG_ITEM_ROUTE_123_REVIVAL_HERB"
}
],

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

@ -1,8 +1,8 @@
Route123_BerryMastersHouse_MapScripts:: @ 826F83B
map_script MAP_SCRIPT_ON_TRANSITION, Route123_BerryMastersHouse_MapScript1_26F841
map_script MAP_SCRIPT_ON_TRANSITION, Route123_BerryMastersHouse_OnTransition
.byte 0
Route123_BerryMastersHouse_MapScript1_26F841: @ 826F841
Route123_BerryMastersHouse_OnTransition: @ 826F841
setflag FLAG_LANDMARK_BERRY_MASTERS_HOUSE
end

6
data/maps/Route124/map.json
View File

@ -115,7 +115,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route124_EventScript_290FF1",
"script": "Route124_EventScript_ItemRedShard",
"flag": "FLAG_ITEM_ROUTE_124_RED_SHARD"
},
{
@ -128,7 +128,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route124_EventScript_290FFE",
"script": "Route124_EventScript_ItemBlueShard",
"flag": "FLAG_ITEM_ROUTE_124_BLUE_SHARD"
},
{
@ -141,7 +141,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route124_EventScript_29100B",
"script": "Route124_EventScript_ItemYellowShard",
"flag": "FLAG_ITEM_ROUTE_124_YELLOW_SHARD"
},
{

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