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

Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into pokemon_expansion

Browse Source
This commit is contained in:
DizzyEggg 2020-02-23 12:42:21 +01:00
commit 3c938d1809
1182 changed files with 26455 additions and 24506 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -232,6 +232,10 @@ $(C_BUILDDIR)/agb_flash_mx.o: CFLAGS := -O -mthumb-interwork
$(C_BUILDDIR)/m4a.o: CC1 := tools/agbcc/bin/old_agbcc $(C_BUILDDIR)/m4a.o: CC1 := tools/agbcc/bin/old_agbcc
$(C_BUILDDIR)/record_mixing.o: CFLAGS += -ffreestanding $(C_BUILDDIR)/record_mixing.o: CFLAGS += -ffreestanding
$(C_BUILDDIR)/librfu_intr.o: CC1 := tools/agbcc/bin/agbcc_arm
$(C_BUILDDIR)/librfu_intr.o: CFLAGS := -O2 -mthumb-interwork -quiet
else
$(C_BUILDDIR)/librfu_intr.o: CFLAGS := -mthumb-interwork -O2 -mabi=apcs-gnu -mtune=arm7tdmi -march=armv4t -fno-toplevel-reorder -fno-aggressive-loop-optimizations -Wno-pointer-to-int-cast
endif endif
ifeq ($(NODEP),1) ifeq ($(NODEP),1)

696
asm/librfu_intr.s
View File

@ -1,696 +0,0 @@
.include "asm/macros.inc"
.syntax unified
.text
arm_func_start IntrSIO32
IntrSIO32: @ 82E3554
mov r12, sp
stmdb sp!, {r11,r12,lr,pc}
ldr r3, _082E35B4
ldr r0, [r3]
ldr r2, [r0]
sub r11, r12, 0x4
cmp r2, 0xA
bne _082E3590
ldr r0, [r0, 0x20]
cmp r0, 0
ldmdbeq r11, {r11,sp,lr}
bxeq lr
bl Callback_Dummy_ID
ldmdb r11, {r11,sp,lr}
bx lr
_082E3590:
ldrb r3, [r0, 0x14]
cmp r3, 0x1
bne _082E35A8
bl sio32intr_clock_master
ldmdb r11, {r11,sp,lr}
bx lr
_082E35A8:
bl sio32intr_clock_slave
ldmdb r11, {r11,sp,lr}
bx lr
.align 2, 0
_082E35B4: .4byte gSTWIStatus
arm_func_end IntrSIO32
arm_func_start sio32intr_clock_master
sio32intr_clock_master: @ 82E35B8
mov r12, sp
stmdb sp!, {r4-r6,r11,r12,lr,pc}
mov r0, 0x50
sub r11, r12, 0x4
bl STWI_set_timer_in_RAM
mov r4, 0x120
ldr r2, _082E382C
add r4, r4, 0x4000000
ldr lr, [r4]
ldr r12, [r2]
ldr r3, [r12]
mov r6, r2
cmp r3, 0
bne _082E3638
cmp lr, 0x80000000
bne _082E36B8
ldrb r2, [r12, 0x5]
ldrb r3, [r12, 0x4]
cmp r2, r3
bhi _082E3628
ldr r3, [r12, 0x24]
mov r1, r2
ldr r2, [r3, r1, lsl 2]
str r2, [r4]
ldrb r3, [r12, 0x5]
add r3, r3, 0x1
strb r3, [r12, 0x5]
b _082E3714
_082E3628:
mov r3, 0x1
str r3, [r12]
str lr, [r4]
b _082E3714
_082E3638:
ldr r3, [r12]
cmp r3, 0x1
bne _082E36C8
mov r3, 0x99000000
add r3, r3, 0x660000
mov r5, 0x80000000
and r2, lr, r5, asr 15
cmp r2, r3
bne _082E36B8
mov r3, 0
strb r3, [r12, 0x8]
ldr r1, [r6]
ldrb r0, [r1, 0x8]
ldr r2, [r1, 0x28]
str lr, [r2, r0, lsl 2]
ldrb r3, [r1, 0x8]
add r3, r3, 0x1
strb r3, [r1, 0x8]
ldr r2, [r6]
strb lr, [r2, 0x9]
ldr r3, [r6]
mov r2, lr, lsr 8
strb r2, [r3, 0x7]
ldr r1, [r6]
ldrb r2, [r1, 0x7]
ldrb r3, [r1, 0x8]
cmp r2, r3
bcc _082E3700
mov r3, 0x2
str r3, [r1]
str r5, [r4]
b _082E3714
_082E36B8:
bl STWI_stop_timer_in_RAM
mov r0, 0x82
bl STWI_set_timer_in_RAM
b _082E3840
_082E36C8:
ldr r3, [r12]
cmp r3, 0x2
bne _082E3714
ldrb r1, [r12, 0x8]
ldr r2, [r12, 0x28]
str lr, [r2, r1, lsl 2]
ldrb r3, [r12, 0x8]
add r3, r3, 0x1
strb r3, [r12, 0x8]
ldr r1, [r6]
ldrb r2, [r1, 0x7]
ldrb r3, [r1, 0x8]
cmp r2, r3
bcs _082E370C
_082E3700:
mov r3, 0x3
str r3, [r1]
b _082E3714
_082E370C:
mov r3, 0x80000000
str r3, [r4]
_082E3714:
mov r0, 0x1
bl handshake_wait
mov r0, r0, lsl 16
cmp r0, 0x10000
beq _082E3840
mov r4, 0x128
add r4, r4, 0x4000000
mov r5, 0x5000
add r3, r5, 0xB
strh r3, [r4]
mov r0, 0
bl handshake_wait
mov r0, r0, lsl 16
cmp r0, 0x10000
beq _082E3840
bl STWI_stop_timer_in_RAM
ldr r1, [r6]
ldr r0, [r1]
cmp r0, 0x3
bne _082E3830
ldrb r3, [r1, 0x9]
cmp r3, 0xA5
cmpne r3, 0xA7
beq _082E3788
and r3, r3, 0xFF
cmp r3, 0xB5
beq _082E3788
cmp r3, 0xB7
bne _082E37D0
_082E3788:
mov r1, 0x120
add r1, r1, 0x4000000
mov r12, 0x128
add r12, r12, 0x4000000
ldr r0, [r6]
mov r3, 0
strb r3, [r0, 0x14]
mov r2, 0x80000000
str r2, [r1]
add r3, r3, 0x5000
add r2, r3, 0x2
strh r2, [r12]
add r3, r3, 0x82
strh r3, [r12]
ldr r2, [r6]
mov r3, 0x5
str r3, [r2]
b _082E3800
_082E37D0:
cmp r3, 0xEE
bne _082E37F0
add r3, r5, 0x3
strh r3, [r4]
mov r2, 0x4
str r2, [r1]
strh r0, [r1, 0x12]
b _082E3800
_082E37F0:
add r3, r5, 0x3
strh r3, [r4]
mov r2, 0x4
str r2, [r1]
_082E3800:
ldr r2, [r6]
mov r3, 0
strb r3, [r2, 0x2C]
ldr r0, [r6]
ldr r2, [r0, 0x18]
cmp r2, r3
beq _082E3840
ldrh r1, [r0, 0x12]
ldrb r0, [r0, 0x6]
bl Callback_Dummy_M
b _082E3840
.align 2, 0
_082E382C: .4byte gSTWIStatus
_082E3830:
add r3, r5, 0x3
strh r3, [r4]
add r2, r5, 0x83
strh r2, [r4]
_082E3840:
ldmdb r11, {r4-r6,r11,sp,lr}
bx lr
arm_func_end sio32intr_clock_master
arm_func_start sio32intr_clock_slave
sio32intr_clock_slave: @ 82E3848
mov r12, sp
stmdb sp!, {r4-r6,r11,r12,lr,pc}
ldr r4, _082E3BF4
mov r0, 0x64
ldr r3, [r4]
mov r6, 0
strb r6, [r3, 0x10]
sub r11, r12, 0x4
bl STWI_set_timer_in_RAM
mov r0, r6
bl handshake_wait
mov r0, r0, lsl 16
cmp r0, 0x10000
mov r5, r4
beq _082E3C4C
mov r3, 0x128
add r3, r3, 0x4000000
mov r2, 0x5000
add r2, r2, 0xA
strh r2, [r3]
mov lr, 0x120
ldr r0, [r5]
add lr, lr, 0x4000000
ldr r12, [lr]
ldr r3, [r0]
cmp r3, 0x5
bne _082E3978
ldr r3, [r0, 0x28]
mov r4, 0x1
mov r0, 0x99000000
str r12, [r3]
add r0, r0, 0x660000
ldr r2, [r5]
mov r3, r0, lsr 16
strb r4, [r2, 0x5]
cmp r3, r12, lsr 16
bne _082E3AC4
ldr r3, [r5]
mov r2, r12, lsr 8
strb r2, [r3, 0x4]
ldr r2, [r5]
strb r12, [r2, 0x6]
ldr r1, [r5]
ldrb r3, [r1, 0x4]
cmp r3, r6
bne _082E395C
ldrb r2, [r1, 0x6]
sub r3, r2, 0x27
cmp r2, 0x36
cmpne r3, 0x2
bhi _082E3930
add r3, r2, 0x80
strb r3, [r1, 0x9]
ldr r2, [r5]
ldrb r3, [r2, 0x9]
ldr r1, [r2, 0x24]
add r3, r3, r0
b _082E39E0
_082E3930:
ldr r2, [r1, 0x24]
ldr r3, _082E3BF8
str r3, [r2]
ldr r2, [r5]
ldrb r3, [r2, 0x6]
sub r3, r3, 0x10
cmp r3, 0x2D
bhi _082E3A18
ldr r3, [r2, 0x24]
str r4, [r3, 0x4]
b _082E3A24
_082E395C:
mov r3, 0x80000000
str r3, [lr]
strb r4, [r1, 0x5]
ldr r2, [r5]
add r3, r3, 0x80000006
str r3, [r2]
b _082E3AD4
_082E3978:
ldr r3, [r0]
cmp r3, 0x6
bne _082E3A78
ldrb r1, [r0, 0x5]
ldr r2, [r0, 0x28]
str r12, [r2, r1, lsl 2]
ldrb r3, [r0, 0x5]
add r3, r3, 0x1
strb r3, [r0, 0x5]
ldr r1, [r5]
ldrb r2, [r1, 0x4]
ldrb r3, [r1, 0x5]
cmp r2, r3
bcs _082E3A6C
ldrb r2, [r1, 0x6]
sub r3, r2, 0x28
cmp r2, 0x36
cmpne r3, 0x1
bhi _082E39F0
add r3, r2, 0x80
strb r3, [r1, 0x9]
ldr r2, [r5]
ldrb r3, [r2, 0x9]
ldr r1, [r2, 0x24]
orr r3, r3, 0x99000000
orr r3, r3, 0x660000
_082E39E0:
str r3, [r1]
ldr r2, [r5]
strb r6, [r2, 0x7]
b _082E3A3C
_082E39F0:
ldr r2, [r1, 0x24]
ldr r3, _082E3BF8
str r3, [r2]
ldr r2, [r5]
ldrb r3, [r2, 0x6]
sub r3, r3, 0x10
cmp r3, 0x2D
ldrls r2, [r2, 0x24]
movls r3, 0x1
bls _082E3A20
_082E3A18:
ldr r2, [r2, 0x24]
mov r3, 0x2
_082E3A20:
str r3, [r2, 0x4]
_082E3A24:
ldr r2, [r5]
mov r3, 0x1
strb r3, [r2, 0x7]
ldr r1, [r5]
add r3, r3, 0x2
strh r3, [r1, 0x12]
_082E3A3C:
ldr r0, [r5]
ldr r2, [r0, 0x24]
mov r3, 0x120
ldr r1, [r2]
add r3, r3, 0x4000000
str r1, [r3]
mov r2, 0x1
strb r2, [r0, 0x8]
ldr r1, [r5]
mov r3, 0x7
str r3, [r1]
b _082E3AD4
_082E3A6C:
mov r3, 0x80000000
str r3, [lr]
b _082E3AD4
_082E3A78:
ldr r3, [r0]
cmp r3, 0x7
bne _082E3AD4
cmp r12, 0x80000000
bne _082E3AC4
ldrb r2, [r0, 0x7]
ldrb r3, [r0, 0x8]
cmp r2, r3
movcc r3, 0x8
strcc r3, [r0]
bcc _082E3AD4
ldrb r1, [r0, 0x8]
ldr r3, [r0, 0x24]
ldr r2, [r3, r1, lsl 2]
str r2, [lr]
ldrb r3, [r0, 0x8]
add r3, r3, 0x1
strb r3, [r0, 0x8]
b _082E3AD4
_082E3AC4:
bl STWI_stop_timer_in_RAM
mov r0, 0x64
bl STWI_set_timer_in_RAM
b _082E3C4C
_082E3AD4:
mov r0, 0x1
bl handshake_wait
mov r0, r0, lsl 16
cmp r0, 0x10000
beq _082E3C4C
mov r6, r5
ldr r3, [r6]
ldr r2, [r3]
cmp r2, 0x8
bne _082E3B9C
mov r4, 0x128
add r4, r4, 0x4000000
mov r3, 0x5000
add r3, r3, 0x2
strh r3, [r4]
bl STWI_stop_timer_in_RAM
ldr r0, [r6]
ldrh r3, [r0, 0x12]
cmp r3, 0x3
bne _082E3B48
bl STWI_init_slave
ldr r3, [r6]
ldr r1, [r3, 0x1C]
cmp r1, 0
beq _082E3C4C
mov r0, 0x1EC
add r0, r0, 0x2
bl Callback_Dummy_S
b _082E3C4C
_082E3B48:
mov r3, 0x120
add r3, r3, 0x4000000
mov r1, 0
str r1, [r3]
mov r2, 0x5000
strh r1, [r4]
add r2, r2, 0x3
strh r2, [r4]
mov r3, 0x1
strb r3, [r0, 0x14]
ldr r0, [r5]
ldr r2, [r0, 0x1C]
str r1, [r0]
cmp r2, r1
beq _082E3C4C
ldrb r3, [r0, 0x4]
ldrb r0, [r0, 0x6]
mov r1, r2
orr r0, r0, r3, lsl 8
bl Callback_Dummy_S
b _082E3C4C
_082E3B9C:
mov r3, 0x208
add r3, r3, 0x4000000
mov r2, 0
strh r2, [r3]
mov r1, 0x100
add r2, r1, 0x4000002
ldrh r3, [r2]
tst r3, 0x80
beq _082E3C20
ldrh r3, [r2]
tst r3, 0x3
bne _082E3BFC
mov r2, 0xFF00
add r1, r1, 0x4000000
ldrh r3, [r1]
add r2, r2, 0x9B
cmp r3, r2
bls _082E3C20
_082E3BE4:
ldrh r3, [r1]
cmp r3, r2
bhi _082E3BE4
b _082E3C20
.align 2, 0
_082E3BF4: .4byte gSTWIStatus
_082E3BF8: .4byte 0x996601ee
_082E3BFC:
mov r2, 0xFF00
add r1, r1, 0x4000000
ldrh r3, [r1]
add r2, r2, 0xFE
cmp r3, r2
bls _082E3C20
_082E3C14:
ldrh r3, [r1]
cmp r3, r2
bhi _082E3C14
_082E3C20:
mov r1, 0x128
add r1, r1, 0x4000000
mov r0, 0x208
add r0, r0, 0x4000000
mov r3, 0x5000
add r2, r3, 0x2
strh r2, [r1]
add r3, r3, 0x82
strh r3, [r1]
mov r2, 0x1
strh r2, [r0]
_082E3C4C:
ldmdb r11, {r4-r6,r11,sp,lr}
bx lr
arm_func_end sio32intr_clock_slave
arm_func_start handshake_wait
handshake_wait: @ 82E3C54
mov r12, sp
stmdb sp!, {r11,r12,lr,pc}
mov r1, 0x128
add r1, r1, 0x4000000
mov r0, r0, lsl 16
ldr r2, _082E3CB8
sub r11, r12, 0x4
mov lr, r0, lsr 14
ldr r12, [r2]
_082E3C78:
ldrb r3, [r12, 0x10]
and r0, r3, 0xFF
cmp r0, 0x1
beq _082E3CA4
ldrh r3, [r1]
and r3, r3, 0x4
cmp r3, lr
bne _082E3C78
mov r0, 0
ldmdb r11, {r11,sp,lr}
bx lr
_082E3CA4:
ldr r2, [r2]
mov r3, 0
strb r3, [r2, 0x10]
ldmdb r11, {r11,sp,lr}
bx lr
.align 2, 0
_082E3CB8: .4byte gSTWIStatus
arm_func_end handshake_wait
arm_func_start STWI_set_timer_in_RAM
STWI_set_timer_in_RAM: @ 82E3CBC
mov r12, sp
stmdb sp!, {r4,r5,r11,r12,lr,pc}
mov r1, 0x208
add r1, r1, 0x4000000
mov r3, 0
sub r11, r12, 0x4
ldr r12, _082E3D74
and lr, r0, 0xFF
ldr r2, [r12]
cmp lr, 0x50
ldrb r0, [r2, 0xA]
mov r4, r12
mov r2, lr
strh r3, [r1]
mov r0, r0, lsl 2
add r3, r3, 0x100
add r1, r3, 0x4000000
add r3, r3, 0x4000002
add r5, r0, r3
beq _082E3D44
bgt _082E3D1C
cmp lr, 0x32
beq _082E3D30
b _082E3D90
_082E3D1C:
cmp r2, 0x64
beq _082E3D5C
cmp r2, 0x82
beq _082E3D78
b _082E3D90
_082E3D30:
mvn r3, 0x334
strh r3, [r0, r1]
ldr r2, [r4]
mov r3, 0x1
b _082E3D8C
_082E3D44:
mov r3, 0xAE000000
mov r3, r3, asr 20
strh r3, [r0, r1]
ldr r2, [r4]
mov r3, 0x2
b _082E3D8C
_082E3D5C:
mvn r3, 0x660
sub r3, r3, 0x9
strh r3, [r0, r1]
ldr r2, [r4]
mov r3, 0x3
b _082E3D8C
.align 2, 0
_082E3D74: .4byte gSTWIStatus
_082E3D78:
mvn r3, 0x850
sub r3, r3, 0x2
strh r3, [r0, r1]
ldr r2, [r4]
mov r3, 0x4
_082E3D8C:
str r3, [r2, 0xC]
_082E3D90:
mov r12, 0x200
add r12, r12, 0x4000002
mov r3, 0xC3
strh r3, [r5]
mov r1, 0x208
ldr r2, [r4]
add r1, r1, 0x4000000
ldrb r0, [r2, 0xA]
sub r3, r3, 0xBB
mov r3, r3, lsl r0
strh r3, [r12]
mov r2, 0x1
strh r2, [r1]
ldmdb r11, {r4,r5,r11,sp,lr}
bx lr
arm_func_end STWI_set_timer_in_RAM
arm_func_start STWI_stop_timer_in_RAM
STWI_stop_timer_in_RAM: @ 82E3DCC
mov r12, sp
stmdb sp!, {r11,r12,lr,pc}
mov r1, 0x100
ldr lr, _082E3E18
add r0, r1, 0x4000000
ldr r2, [lr]
sub r11, r12, 0x4
ldrb r3, [r2, 0xA]
mov r12, 0
str r12, [r2, 0xC]
mov r3, r3, lsl 2
strh r12, [r3, r0]
ldr r2, [lr]
ldrb r3, [r2, 0xA]
add r1, r1, 0x4000002
mov r3, r3, lsl 2
strh r12, [r3, r1]
ldmdb r11, {r11,sp,lr}
bx lr
.align 2, 0
_082E3E18: .4byte gSTWIStatus
arm_func_end STWI_stop_timer_in_RAM
arm_func_start STWI_init_slave
STWI_init_slave: @ 82E3E1C
mov r12, sp
stmdb sp!, {r11,r12,lr,pc}
ldr r0, _082E3EA4
ldr r2, [r0]
mov r3, 0x5
str r3, [r2]
mov r1, 0
strb r1, [r2, 0x14]
ldr r3, [r0]
strb r1, [r3, 0x4]
ldr r2, [r0]
strb r1, [r2, 0x5]
ldr r3, [r0]
strb r1, [r3, 0x6]
ldr r2, [r0]
strb r1, [r2, 0x7]
ldr r3, [r0]
strb r1, [r3, 0x8]
ldr r2, [r0]
strb r1, [r2, 0x9]
ldr r3, [r0]
str r1, [r3, 0xC]
sub r11, r12, 0x4
strb r1, [r3, 0x10]
mov r2, 0x128
ldr r12, [r0]
add r2, r2, 0x4000000
strh r1, [r12, 0x12]
mov r3, 0x5000
strb r1, [r12, 0x15]
add r3, r3, 0x82
strh r3, [r2]
ldmdb r11, {r11,sp,lr}
bx lr
.align 2, 0
_082E3EA4: .4byte gSTWIStatus
arm_func_end STWI_init_slave
arm_func_start Callback_Dummy_M
Callback_Dummy_M: @ 82E3EA8
bx r2
arm_func_end Callback_Dummy_M
arm_func_start Callback_Dummy_S
Callback_Dummy_S: @ 82E3EAC
bx r1
arm_func_end Callback_Dummy_S
arm_func_start Callback_Dummy_ID
Callback_Dummy_ID: @ 82E3EB0
bx r0
arm_func_end Callback_Dummy_ID

2
asm/macros/event.inc
View File

@ -763,7 +763,7 @@
.2byte \y .2byte \y
.endm .endm
@ Copies a live event object's xy position to its template, so that if the sprite goes off screen, it'll still be there when it comes back on screen. @ Copies a live object event's xy position to its template, so that if the sprite goes off screen, it'll still be there when it comes back on screen.
.macro copyobjectxytoperm index:req .macro copyobjectxytoperm index:req
.byte 0x64 .byte 0x64
.2byte \index .2byte \index

1
common_syms/AgbRfu_LinkManager.txt Normal file
View File

@ -0,0 +1 @@
lman

2
common_syms/field_control_avatar.txt
View File

@ -1 +1 @@
gSelectedEventObject gSelectedObjectEvent

2
common_syms/link_rfu.txt
View File

@ -1,2 +0,0 @@
gUnknown_03004140
gUnknown_03005000

2
common_syms/link_rfu_2.txt Normal file
View File

@ -0,0 +1,2 @@
gf_rfu_REQ_api
Rfu

363
data/berry_crush.s
View File

@ -1,363 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnknown_082F325C:: @ 82F325C
.byte 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80
.align 2
gUnknown_082F3264:: @ 82F3264
.byte 0x00, 0x01, 0x02, 0x03, 0x05, 0x00, 0x00, 0x00
.align 2
gUnknown_082F326C:: @ 82F326C
.byte 0x04, 0x01, 0x00, 0xff, 0x00, 0x00, 0x00, 0x04
.byte 0x02, 0x00, 0xff, 0x00, 0x00, 0x00, 0x04, 0x02
.byte 0x00, 0xfe, 0x00, 0x00, 0x00, 0x06, 0x03, 0x01
.byte 0xff, 0xfd, 0xff, 0x00, 0x06, 0x04, 0x01, 0xfe
.byte 0xfc, 0xfe, 0x00, 0x00
.align 2
gUnknown_082F3290:: @ 82F3290
.byte 0x03, 0x02, 0x01, 0x00, 0x03, 0x03, 0x01, 0x00
.byte 0x03, 0x03, 0x02, 0x00, 0x03, 0x04, 0x02, 0x00
.byte 0x03, 0x05, 0x03, 0x00
.align 2
gUnknown_082F32A4:: @ 82F32A4
.4byte gText_ReadyToBerryCrush
.4byte gText_WaitForAllChooseBerry
.4byte gText_EndedWithXUnitsPowder
.4byte gText_RecordingGameResults
.4byte gText_PlayBerryCrushAgain
.4byte gText_YouHaveNoBerries
.4byte gText_MemberDroppedOut
.4byte gText_TimesUpNoGoodPowder
.4byte gText_CommunicationStandby2
.align 2
gUnknown_082F32C8:: @ 82F32C8 struct BgTemplate
.4byte 0x000000F8
.align 2
gUnknown_082F32CC:: @ 82F32CC struct BgTemplate? not sure
.byte 0xd1, 0x14, 0x00, 0x00, 0xc2, 0x20, 0x00, 0x00
.byte 0xb3, 0x30, 0x00, 0x00
.align 2
sBerryCrushTextColors1:: @ 82F32D8
.byte 0x01, 0x02, 0x03 @ TEXT_COLOR_WHITE, TEXT_COLOR_DARK_GREY, TEXT_COLOR_LIGHT_GREY
sBerryCrushTextColors2:: @ 82F32DB
.byte 0x00, 0x01, 0x02 @ TEXT_COLOR_TRANSPARENT, TEXT_COLOR_WHITE, TEXT_COLOR_DARK_GREY
sBerryCrushTextColors3:: @ 82F32DE
.byte 0x00, 0x03, 0x04 @ TEXT_COLOR_TRANSPARENT, TEXT_COLOR_LIGHT_GREY, TEXT_COLOR_RED
sBerryCrushTextColorTable:: @ 82F32E1
.byte 0x01, 0x08, 0x09 @ TEXT_COLOR_WHITE, TEXT_COLOR_BLUE, TEXT_COLOR_LIGHT_BLUE
.byte 0x01, 0x06, 0x07 @ TEXT_COLOR_WHITE, TEXT_COLOR_GREEN, TEXT_COLOR_LIGHT_GREEN
sBerryCrushTextColors4:: @ 82F32E7
.byte 0x01, 0x04, 0x05 @ TEXT_COLOR_WHITE, TEXT_COLOR_RED, TEXT_COLOR_LIGHT_RED
.align 2
gUnknown_082F32EC:: @ 82F32EC
window_template 0x00, 0x03, 0x04, 0x18, 0x0d, 0x0f, 0x0001
.align 2
gUnknown_082F32F4:: @ 82F32F4
window_template 0x00, 0x00, 0x00, 0x09, 0x02, 0x08, 0x03ed
window_template 0x00, 0x00, 0x03, 0x09, 0x02, 0x08, 0x03db
window_template 0x00, 0x00, 0x06, 0x09, 0x02, 0x08, 0x03c9
window_template 0x00, 0x15, 0x03, 0x09, 0x02, 0x08, 0x03b7
window_template 0x00, 0x15, 0x06, 0x09, 0x02, 0x08, 0x03a5
null_window_template
window_template 0x00, 0x05, 0x02, 0x14, 0x10, 0x0f, 0x0001
window_template 0x00, 0x05, 0x02, 0x14, 0x10, 0x0f, 0x0001
window_template 0x00, 0x04, 0x02, 0x16, 0x10, 0x0f, 0x0001
null_window_template
.align 2
gUnknown_082F3344:: @ 82F3344
.byte 0x06, 0x08, 0x09, 0x0b, 0x0c, 0x0e, 0x0f, 0x10
.align 2
gUnknown_082F334C:: @ 82F334C
.byte 0x80, 0xf0, 0xfa, 0x02, 0x40, 0x78, 0x7d, 0x01
.byte 0x20, 0xbc, 0xbe, 0x00, 0x10, 0x5e, 0x5f, 0x00
.byte 0x08, 0xaf, 0x2f, 0x00, 0x84, 0xd7, 0x17, 0x00
.byte 0xc2, 0xeb, 0x0b, 0x00, 0xe1, 0xf5, 0x05, 0x00
.align 2
gBerryCrushGrinderBasePal:: @ 82F336C
.incbin "graphics/link_games/berrycrush_grinder_base.gbapal"
.align 2
gBerryCrushMiscSpritesPal:: @ 82F338C
.incbin "graphics/link_games/berrycrush_misc.gbapal"
.align 2
gBerryCrushTimerDigitsPal:: @ 82F33AC
.incbin "graphics/link_games/berrycrush_timerdigits.gbapal"
.align 2
gBerryCrushGrinderBaseGfx:: @ 82F33CC
.incbin "graphics/link_games/berrycrush_grinder_base.4bpp.lz"
.align 2
gBerryCrushBtnPressGfx:: @ 82F36F8
.incbin "graphics/link_games/berrycrush_btnpress.4bpp.lz"
.align 2
gBerryCrushSparkleGfx:: @ 82F3A74
.incbin "graphics/link_games/berrycrush_sparkle.4bpp.lz"
.align 2
gBerryCrushTimerDigitsGfx:: @ 82F3BC0
.incbin "graphics/link_games/berrycrush_timerdigits.4bpp.lz"
.align 2
gBerryCrushGrinderTopTilemap:: @ 82F3C8C
.incbin "graphics/link_games/berrycrush_grinder_top.bin.lz"
.align 2
gBerryCrushContainerCapTilemap:: @ 82F3DBC
.incbin "graphics/link_games/berrycrush_container_cap.bin.lz"
.align 2
gBerryCrushBackgroundTilemap:: @ 82F3F54
.incbin "graphics/link_games/berrycrush_background.bin.lz"
.align 2
gUnknown_082F417C:: @ 82F417C
.byte 0x01, 0x03, 0x00, 0x00, 0x00, 0x00, 0x01, 0x03
.byte 0x00, 0x00, 0x01, 0x03, 0x02, 0x04, 0x00, 0x00
.byte 0x01, 0x03, 0x02, 0x04
.align 2
gUnknown_082F4190:: @ 82F4190
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0xff
.byte 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x03, 0x00
.byte 0xe4, 0xff, 0xfc, 0xff, 0xe8, 0xff, 0x10, 0x00
.byte 0x02, 0x00, 0x06, 0x00, 0xf0, 0xff, 0x14, 0x00
.byte 0xf8, 0xff, 0x10, 0x00, 0x03, 0x14, 0x03, 0x00
.byte 0x1c, 0x00, 0xfc, 0xff, 0x20, 0x00, 0xf8, 0xff
.byte 0x04, 0x14, 0x06, 0x00, 0x10, 0x00, 0x14, 0x00
.byte 0x10, 0x00, 0xf8, 0xff
.align 2
gUnknown_082F41CC:: @ 82F41CC
.byte 0x00, 0x00
.byte 0xff, 0x00
.byte 0x01, 0x01
gUnknown_082F41D2::
.byte 0x00, 0x00
.byte 0xf0, 0xfc
.byte 0x10, 0xfc
.byte 0xf8, 0xfe
.byte 0x08, 0xfe
.byte 0xe8, 0xf8
.byte 0x18, 0xf8
.byte 0xe0, 0xf4
.byte 0x20, 0xf4
.byte 0xd8, 0xf0
.byte 0x28, 0xf0
.align 2
gUnknown_082F41E8:: @ 82F41E8
.2byte 0x0005, 0x0006, 0x0007, 0x0008, 0x0009, 0x0000
.align 2
gUnknown_082F41F4:: @ 82F41F4
.4byte gBerryCrushGrinderBaseGfx
.2byte 0x0800, 0x0001
.4byte gBerryCrushBtnPressGfx
.2byte 0x0e00, 0x0002
.4byte gBerryCrushSparkleGfx
.2byte 0x0700, 0x0003
.align 2
gUnknown_082F420C:: @ 82F420C
.4byte gBerryCrushTimerDigitsGfx
.2byte 0x02c0, 0x0004
.4byte NULL
.2byte 0x0000, 0x0000
.align 2
gUnknown_082F421C:: @ 82F421C
.4byte gBerryCrushGrinderBasePal
.2byte 0x0001
.align 2
.4byte gBerryCrushMiscSpritesPal
.2byte 0x0002
.align 2
gUnknown_082F422C:: @ 82F422C
.align 2
.4byte gBerryCrushTimerDigitsPal
.2byte 0x0004
.align 2
.4byte NULL
.2byte 0x0000
.align 2
gUnknown_082F423C:: @ 82F423C
.2byte 0x0000, 0x0000, 0xffff, 0x0000
.align 2
gUnknown_082F4244:: @ 82F4244
.2byte 0x0000, 0x0004, 0x0010, 0x0004, 0x0020, 0x0004, 0xffff, 0x0000
.align 2
gUnknown_082F4254:: @ 82F4254
.2byte 0x0030, 0x0002, 0x0040, 0x0002, 0x0050, 0x0002, 0x0060, 0x0002
.2byte 0xffff, 0x0000
.align 2
gUnknown_082F4268:: @ 82F4268
.2byte 0x0000, 0x0002, 0x0004, 0x0002, 0x0008, 0x0002, 0x000c, 0x0002
.2byte 0x0010, 0x0002, 0x0014, 0x0002, 0xfffe, 0x0000
.align 2
gUnknown_082F4284:: @ 82F4284
.2byte 0x0018, 0x0004, 0x001c, 0x0004, 0x0020, 0x0004, 0x0024, 0x0004
.2byte 0x0028, 0x0004, 0x002c, 0x0004, 0x0030, 0x0004, 0x0034, 0x0004
.2byte 0xfffe, 0x0000
.align 2
gUnknown_082F42A8:: @ 82F42A8
.2byte 0x0014, 0x0000, 0xffff, 0x0000
.align 2
gUnknown_082F42B0:: @ 82F42B0
.2byte 0x0000, 0x0000, 0xffff, 0x0000
.align 2
gUnknown_082F42B8:: @ 82F42B8
.2byte 0x0100, 0x0100, 0x0000, 0x0000, 0x0000, 0x0000, 0x0102, 0x0000
.2byte 0x7ffe, 0x0001, 0x0000, 0x0000
.align 2
gUnknown_082F42D0:: @ 82F42D0
.2byte 0x0100, 0x0100, 0x0000, 0x0000, 0x0000, 0x0000, 0x01fe, 0x0000
.2byte 0x7ffe, 0x0001, 0x0000, 0x0000
.align 2
gUnknown_082F42E8:: @ 82F42E8
.4byte gUnknown_082F423C
.align 2
gUnknown_082F42EC:: @ 82F42EC
.4byte gUnknown_082F4244
.4byte gUnknown_082F4254
.align 2
gUnknown_082F42F4:: @ 82F42F4
.4byte gUnknown_082F4268
.4byte gUnknown_082F4284
.align 2
gUnknown_082F42FC:: @ 82F42FC
.4byte gUnknown_082F42A8
.align 2
gUnknown_082F4300:: @ 82F4300
.4byte gUnknown_082F42B0
.align 2
gUnknown_082F4304:: @ 82F4304
.4byte gUnknown_082F42B8
.4byte gUnknown_082F42D0
.align 2
gUnknown_082F430C:: @ 82F430C
spr_template 0x0001, 0x0001, gOamData_AffineOff_ObjNormal_64x64, gUnknown_082F42E8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
gUnknown_082F4324:: @ 82F4324
spr_template 0x0002, 0x0002, gOamData_AffineOff_ObjNormal_32x32, gUnknown_082F42EC, NULL, gDummySpriteAffineAnimTable, sub_8022A20
.align 2
gUnknown_082F433C:: @ 82F433C
spr_template 0x0003, 0x0002, gOamData_AffineOff_ObjNormal_16x16, gUnknown_082F42F4, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
gUnknown_082F4354:: @ 82F4354
spr_template 0x0004, 0x0004, gOamData_AffineOff_ObjNormal_8x16, gUnknown_082F42FC, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
gUnknown_082F436C:: @ 82F436C
spr_template 0x0005, 0x0005, gOamData_AffineDouble_ObjNormal_32x32, gUnknown_082F4300, NULL, gUnknown_082F4304, SpriteCallbackDummy
.align 2
gUnknown_082F4384:: @ 82F4384
.byte 0x09, 0x02, 0x08, 0x00, 0x9c, 0x00, 0x00, 0x00
.4byte gUnknown_082F420C
.4byte gUnknown_082F422C
.byte 0x08, 0x02, 0x08, 0x00, 0xb4, 0x00, 0x00, 0x00
.4byte gUnknown_082F420C
.4byte gUnknown_082F422C
.byte 0x08, 0x02, 0x08, 0x00, 0xcc, 0x00, 0x00, 0x00
.4byte gUnknown_082F420C
.4byte gUnknown_082F422C
.align 2
gUnknown_082F43B4:: @ 82F43B4
.4byte gText_SpaceTimes2
.4byte gText_XDotY
.4byte gText_Var1Berry
.4byte gText_NeatnessRankings
.4byte gText_CoopRankings
.4byte gText_PressingPowerRankings
.align 2
gUnknown_082F43CC:: @ 82F43CC
.4byte NULL
.4byte sub_8022C58
.4byte sub_8022CB0
.4byte sub_8022D14
.4byte sub_8022E1C
.4byte sub_8022E3C
.4byte sub_8022E5C
.4byte sub_8022EAC
.4byte sub_8022F04
.4byte sub_8022F1C
.4byte sub_8023070
.4byte sub_80231B8
.4byte sub_80232EC
.4byte sub_80238F0
.4byte sub_8023998
.4byte sub_8023A30
.4byte sub_8023BC0
.4byte sub_8023CAC
.4byte sub_8024048
.4byte sub_8024134
.4byte sub_8024228
.4byte sub_80242E0
.4byte sub_80243BC
.4byte sub_8024444
.4byte sub_8024508
.4byte sub_8024568
.align 2
gUnknown_082F4434:: @ 82F4434
.byte 0x02, 0x04, 0x06, 0x07, 0x03, 0x05, 0x08, 0x0b
.byte 0x03, 0x07, 0x0b, 0x0f, 0x04, 0x08, 0x0c, 0x11
gUnknown_082F4444:: @ 82F4444
.byte 0x05, 0x07, 0x09, 0x0c
gUnknown_082F4448:: @ 82F4448
.byte 0x03, 0x07, 0x0f, 0x1f

36
data/berry_powder.s
View File

@ -1,36 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnknown_082F7BA4_UnrefDupe:: @ 82F444C struct BgTemplate(???)
.4byte 0x000001e0
.4byte 0x000012c9
.4byte 0x000012ea
.4byte 0x000021ff
.4byte 0x000000ff
.4byte 0x00000000
.align 2
gUnknown_082F7BBC_UnrefDupe:: @ 82F4464
window_template 0x00, 0x01, 0x01, 0x1c, 0x02, 0x0d, 0x0013
window_template 0x00, 0x01, 0x05, 0x1c, 0x0e, 0x0d, 0x004b
.align 2
gUnknown_082F7BCC_UnrefDupe:: @ 82F4474
window_template 0x00, 0x01, 0x05, 0x1c, 0x07, 0x0d, 0x004b
.align 2
gUnknown_082F7BD4_UnrefDupe:: @ 82F447C
window_template 0x00, 0x01, 0x08, 0x13, 0x03, 0x0d, 0x0013
window_template 0x00, 0x16, 0x07, 0x06, 0x04, 0x0d, 0x004c
.align 2
gUnknown_082F7BE4_UnrefDupe:: @ 82F448C
window_template 0x00, 0x04, 0x06, 0x16, 0x05, 0x0d, 0x0013
.align 2
gUnknown_082F7BEC_UnrefDupe:: @ 82F4494
window_template 0x00, 0x05, 0x08, 0x13, 0x03, 0x0d, 0x0013

88
data/contest_link_80F57C4.s
View File

@ -1,88 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnknown_0858D6B0:: @ 858D6B0
.incbin "graphics/unknown/unknown_58D6B0.gbapal"
.align 2
gUnknown_0858D6D0:: @ 858D6D0
.incbin "graphics/unknown/unknown_58D6D0.4bpp"
.align 2
gMiscBlank_Pal:: @ 858D7D0
.incbin "graphics/interface/blank.gbapal"
.align 2
gOamData_858D7F0:: @ 858D7F0
.2byte 0x4000
.2byte 0xC000
.2byte 0x2C00
.align 2
gSpriteTemplate_858D7F8:: @ 858D7F8
spr_template 0x0bc1, 0x0bc1, gOamData_858D7F0, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
gUnknown_0858D810:: @ 858D810
obj_tiles gMiscBlank_Gfx, 0x0400, 0x0bc1
obj_tiles gMiscBlank_Gfx, 0x0400, 0x0bc2
obj_tiles gMiscBlank_Gfx, 0x0400, 0x0bc3
obj_tiles gMiscBlank_Gfx, 0x0400, 0x0bc4
obj_tiles gMiscBlank_Gfx, 0x0400, 0x0bc5
obj_tiles gMiscBlank_Gfx, 0x0400, 0x0bc6
obj_tiles gMiscBlank_Gfx, 0x0400, 0x0bc7
obj_tiles gMiscBlank_Gfx, 0x0400, 0x0bc8
.align 2
gUnknown_0858D850:: @ 858D850
obj_pal gMiscBlank_Pal, 0x0bc1
.align 2
gOamData_858D858:: @ 858D858
.2byte 0x0000
.2byte 0x0000
.2byte 0x0000
.align 2
gSpriteTemplate_858D860:: @ 858D860
spr_template 0x0bc9, 0x0bc9, gOamData_858D858, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80F7768
.align 2
gUnknown_0858D878:: @ 858D878
obj_tiles gContestConfetti_Gfx, 0x0220, 0x0bc9
.align 2
gUnknown_0858D880:: @ 858D880
obj_pal gContestConfetti_Pal, 0x0bc9
.align 2
gUnknown_0858D888:: @ 858D888
.4byte 0x000001e0, 0x00003181, 0x000031c2, 0x000031a3
.align 2
gUnknown_0858D898:: @ 858D898
window_template 0x01, 0x07, 0x04, 0x0c, 0x02, 0x0f, 0x0302
window_template 0x01, 0x07, 0x07, 0x0c, 0x02, 0x0f, 0x031a
window_template 0x01, 0x07, 0x0a, 0x0c, 0x02, 0x0f, 0x0332
window_template 0x01, 0x07, 0x0d, 0x0c, 0x02, 0x0f, 0x034a
null_window_template
.align 2
gUnknown_0858D8C0:: @ 858D8C0
.byte 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00
.align 2
gSpriteTemplate_858D8C8:: @ 858D8C8
spr_template 0x56ce, 0x0000, gUnknown_0858D8C0, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
gUnknown_0858D8E0:: @ 858D8E0
obj_tiles gMiscBlank_Gfx, 0x0200, 0x56ce
.align 2
sContestLinkTextColors:: @ 858D8E8
.byte 0x01, 0x0f, 0x0e, 0x00 @ TEXT_COLOR_WHITE, TEXT_DYNAMIC_COLOR_6, TEXT_DYNAMIC_COLOR_5

10
data/event_scripts.s
View File

@ -19,7 +19,7 @@
#include "constants/decorations.h" #include "constants/decorations.h"
#include "constants/easy_chat.h" #include "constants/easy_chat.h"
#include "constants/event_objects.h" #include "constants/event_objects.h"
#include "constants/event_object_movement_constants.h" #include "constants/event_object_movement.h"
#include "constants/field_effects.h" #include "constants/field_effects.h"
#include "constants/field_poison.h" #include "constants/field_poison.h"
#include "constants/field_specials.h" #include "constants/field_specials.h"
@ -785,11 +785,11 @@ RusturfTunnel_EventScript_SetRusturfTunnelOpen:: @ 8272216
EventScript_UnusedBoardFerry:: @ 827222B EventScript_UnusedBoardFerry:: @ 827222B
delay 30 delay 30
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
waitmovement 0 waitmovement 0
showobjectat EVENT_OBJ_ID_PLAYER, 0 showobjectat OBJ_EVENT_ID_PLAYER, 0
delay 30 delay 30
applymovement EVENT_OBJ_ID_PLAYER, Movement_UnusedBoardFerry applymovement OBJ_EVENT_ID_PLAYER, Movement_UnusedBoardFerry
waitmovement 0 waitmovement 0
delay 30 delay 30
return return
@ -804,7 +804,7 @@ Common_EventScript_FerryDepartIsland:: @ 8272250
compare VAR_FACING, DIR_WEST compare VAR_FACING, DIR_WEST
call_if_eq Ferry_EventScript_DepartIslandWest call_if_eq Ferry_EventScript_DepartIslandWest
delay 30 delay 30
hideobjectat EVENT_OBJ_ID_PLAYER, 0 hideobjectat OBJ_EVENT_ID_PLAYER, 0
call Common_EventScript_FerryDepart call Common_EventScript_FerryDepart
return return

4
data/map_events.s
View File

@ -1,5 +1,5 @@
#include "constants/bg_event_constants.h" #include "constants/event_bg.h"
#include "constants/event_object_movement_constants.h" #include "constants/event_object_movement.h"
#include "constants/event_objects.h" #include "constants/event_objects.h"
#include "constants/flags.h" #include "constants/flags.h"
#include "constants/items.h" #include "constants/items.h"

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

@ -15,7 +15,7 @@
"connections": null, "connections": null,
"object_events": [ "object_events": [
{ {
"graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1",
"x": 3, "x": 3,
"y": 4, "y": 4,
"elevation": 3, "elevation": 3,
@ -28,7 +28,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
"x": 0, "x": 0,
"y": 6, "y": 6,
"elevation": 3, "elevation": 3,

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

@ -15,7 +15,7 @@
"connections": null, "connections": null,
"object_events": [ "object_events": [
{ {
"graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER",
"x": 17, "x": 17,
"y": 7, "y": 7,
"elevation": 3, "elevation": 3,
@ -28,7 +28,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_TUBER_M", "graphics_id": "OBJ_EVENT_GFX_TUBER_M",
"x": 5, "x": 5,
"y": 10, "y": 10,
"elevation": 3, "elevation": 3,

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

@ -15,7 +15,7 @@
"connections": null, "connections": null,
"object_events": [ "object_events": [
{ {
"graphics_id": "EVENT_OBJ_GFX_TUBER_M", "graphics_id": "OBJ_EVENT_GFX_TUBER_M",
"x": 2, "x": 2,
"y": 8, "y": 8,
"elevation": 3, "elevation": 3,
@ -28,7 +28,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_SAILOR", "graphics_id": "OBJ_EVENT_GFX_SAILOR",
"x": 9, "x": 9,
"y": 6, "y": 6,
"elevation": 3, "elevation": 3,

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

@ -15,7 +15,7 @@
"connections": null, "connections": null,
"object_events": [ "object_events": [
{ {
"graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
"x": 41, "x": 41,
"y": 4, "y": 4,
"elevation": 3, "elevation": 3,
@ -28,7 +28,7 @@
"flag": "FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_6_LUXURY_BALL" "flag": "FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_6_LUXURY_BALL"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
"x": 16, "x": 16,
"y": 10, "y": 10,
"elevation": 3, "elevation": 3,
@ -41,7 +41,7 @@
"flag": "FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_4_SCANNER" "flag": "FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_4_SCANNER"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
"x": 5, "x": 5,
"y": 11, "y": 11,
"elevation": 3, "elevation": 3,
@ -54,7 +54,7 @@
"flag": "FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_1_TM_18" "flag": "FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_1_TM_18"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
"x": 31, "x": 31,
"y": 11, "y": 11,
"elevation": 3, "elevation": 3,

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

@ -15,7 +15,7 @@
"connections": null, "connections": null,
"object_events": [ "object_events": [
{ {
"graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
"x": 4, "x": 4,
"y": 4, "y": 4,
"elevation": 3, "elevation": 3,

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

@ -15,7 +15,7 @@
"connections": null, "connections": null,
"object_events": [ "object_events": [
{ {
"graphics_id": "EVENT_OBJ_GFX_MAN_4", "graphics_id": "OBJ_EVENT_GFX_MAN_4",
"x": 7, "x": 7,
"y": 13, "y": 13,
"elevation": 3, "elevation": 3,
@ -28,7 +28,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_WOMAN_4", "graphics_id": "OBJ_EVENT_GFX_WOMAN_4",
"x": 6, "x": 6,
"y": 13, "y": 13,
"elevation": 3, "elevation": 3,
@ -41,7 +41,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
"x": 4, "x": 4,
"y": 4, "y": 4,
"elevation": 3, "elevation": 3,
@ -54,7 +54,7 @@
"flag": "FLAG_ITEM_ABANDONED_SHIP_ROOMS_2_1F_REVIVE" "flag": "FLAG_ITEM_ABANDONED_SHIP_ROOMS_2_1F_REVIVE"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_HIKER", "graphics_id": "OBJ_EVENT_GFX_HIKER",
"x": 3, "x": 3,
"y": 2, "y": 2,
"elevation": 3, "elevation": 3,
@ -67,7 +67,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_TUBER_F", "graphics_id": "OBJ_EVENT_GFX_TUBER_F",
"x": 7, "x": 7,
"y": 2, "y": 2,
"elevation": 3, "elevation": 3,

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

@ -15,7 +15,7 @@
"connections": null, "connections": null,
"object_events": [ "object_events": [
{ {
"graphics_id": "EVENT_OBJ_GFX_CAMPER", "graphics_id": "OBJ_EVENT_GFX_CAMPER",
"x": 3, "x": 3,
"y": 4, "y": 4,
"elevation": 3, "elevation": 3,
@ -28,7 +28,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
"x": 13, "x": 13,
"y": 3, "y": 3,
"elevation": 3, "elevation": 3,

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

@ -15,7 +15,7 @@
"connections": null, "connections": null,
"object_events": [ "object_events": [
{ {
"graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN",
"x": 12, "x": 12,
"y": 5, "y": 5,
"elevation": 3, "elevation": 3,
@ -28,7 +28,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
"x": 4, "x": 4,
"y": 5, "y": 5,
"elevation": 3, "elevation": 3,
@ -41,7 +41,7 @@
"flag": "FLAG_ITEM_ABANDONED_SHIP_ROOMS_1F_HARBOR_MAIL" "flag": "FLAG_ITEM_ABANDONED_SHIP_ROOMS_1F_HARBOR_MAIL"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_BEAUTY", "graphics_id": "OBJ_EVENT_GFX_BEAUTY",
"x": 10, "x": 10,
"y": 11, "y": 11,
"elevation": 3, "elevation": 3,
@ -54,7 +54,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER",
"x": 10, "x": 10,
"y": 16, "y": 16,
"elevation": 3, "elevation": 3,

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

@ -15,7 +15,7 @@
"connections": null, "connections": null,
"object_events": [ "object_events": [
{ {
"graphics_id": "EVENT_OBJ_GFX_FAT_MAN", "graphics_id": "OBJ_EVENT_GFX_FAT_MAN",
"x": 25, "x": 25,
"y": 6, "y": 6,
"elevation": 3, "elevation": 3,
@ -28,7 +28,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
"x": 6, "x": 6,
"y": 7, "y": 7,
"elevation": 3, "elevation": 3,

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

@ -15,7 +15,7 @@
"connections": null, "connections": null,
"object_events": [ "object_events": [
{ {
"graphics_id": "EVENT_OBJ_GFX_REGISTEEL", "graphics_id": "OBJ_EVENT_GFX_REGISTEEL",
"x": 8, "x": 8,
"y": 7, "y": 7,
"elevation": 3, "elevation": 3,

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

@ -15,7 +15,7 @@
"connections": null, "connections": null,
"object_events": [ "object_events": [
{ {
"graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M",
"x": 13, "x": 13,
"y": 11, "y": 11,
"elevation": 3, "elevation": 3,
@ -28,7 +28,7 @@
"flag": "FLAG_HIDE_AQUA_HIDEOUT_1F_GRUNT_1_BLOCKING_ENTRANCE" "flag": "FLAG_HIDE_AQUA_HIDEOUT_1F_GRUNT_1_BLOCKING_ENTRANCE"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M",
"x": 14, "x": 14,
"y": 11, "y": 11,
"elevation": 3, "elevation": 3,
@ -41,7 +41,7 @@
"flag": "FLAG_HIDE_AQUA_HIDEOUT_1F_GRUNT_2_BLOCKING_ENTRANCE" "flag": "FLAG_HIDE_AQUA_HIDEOUT_1F_GRUNT_2_BLOCKING_ENTRANCE"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M",
"x": 20, "x": 20,
"y": 4, "y": 4,
"elevation": 3, "elevation": 3,

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

@ -15,7 +15,7 @@
"connections": null, "connections": null,
"object_events": [ "object_events": [
{ {
"graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M",
"x": 28, "x": 28,
"y": 16, "y": 16,
"elevation": 3, "elevation": 3,
@ -28,7 +28,7 @@
"flag": "FLAG_HIDE_AQUA_HIDEOUT_GRUNTS" "flag": "FLAG_HIDE_AQUA_HIDEOUT_GRUNTS"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M",
"x": 6, "x": 6,
"y": 6, "y": 6,
"elevation": 3, "elevation": 3,
@ -41,7 +41,7 @@
"flag": "FLAG_HIDE_AQUA_HIDEOUT_GRUNTS" "flag": "FLAG_HIDE_AQUA_HIDEOUT_GRUNTS"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
"x": 29, "x": 29,
"y": 12, "y": 12,
"elevation": 3, "elevation": 3,
@ -54,7 +54,7 @@
"flag": "FLAG_ITEM_AQUA_HIDEOUT_B1F_MAX_ELIXIR" "flag": "FLAG_ITEM_AQUA_HIDEOUT_B1F_MAX_ELIXIR"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_F", "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_F",
"x": 20, "x": 20,
"y": 18, "y": 18,
"elevation": 3, "elevation": 3,
@ -67,7 +67,7 @@
"flag": "FLAG_HIDE_AQUA_HIDEOUT_GRUNTS" "flag": "FLAG_HIDE_AQUA_HIDEOUT_GRUNTS"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
"x": 15, "x": 15,
"y": 9, "y": 9,
"elevation": 3, "elevation": 3,
@ -80,7 +80,7 @@
"flag": "FLAG_ITEM_AQUA_HIDEOUT_B1F_MASTER_BALL" "flag": "FLAG_ITEM_AQUA_HIDEOUT_B1F_MASTER_BALL"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
"x": 16, "x": 16,
"y": 9, "y": 9,
"elevation": 3, "elevation": 3,
@ -93,7 +93,7 @@
"flag": "FLAG_HIDE_AQUA_HIDEOUT_B1F_ELECTRODE_1" "flag": "FLAG_HIDE_AQUA_HIDEOUT_B1F_ELECTRODE_1"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
"x": 15, "x": 15,
"y": 10, "y": 10,
"elevation": 3, "elevation": 3,
@ -106,7 +106,7 @@
"flag": "FLAG_ITEM_AQUA_HIDEOUT_B1F_NUGGET" "flag": "FLAG_ITEM_AQUA_HIDEOUT_B1F_NUGGET"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
"x": 16, "x": 16,
"y": 10, "y": 10,
"elevation": 3, "elevation": 3,
@ -119,7 +119,7 @@
"flag": "FLAG_HIDE_AQUA_HIDEOUT_B1F_ELECTRODE_2" "flag": "FLAG_HIDE_AQUA_HIDEOUT_B1F_ELECTRODE_2"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_F", "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_F",
"x": 28, "x": 28,
"y": 21, "y": 21,
"elevation": 3, "elevation": 3,

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

@ -15,7 +15,7 @@
"connections": null, "connections": null,
"object_events": [ "object_events": [
{ {
"graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M",
"x": 23, "x": 23,
"y": 19, "y": 19,
"elevation": 3, "elevation": 3,
@ -28,7 +28,7 @@
"flag": "FLAG_HIDE_AQUA_HIDEOUT_GRUNTS" "flag": "FLAG_HIDE_AQUA_HIDEOUT_GRUNTS"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M",
"x": 23, "x": 23,
"y": 10, "y": 10,
"elevation": 3, "elevation": 3,
@ -41,7 +41,7 @@
"flag": "FLAG_HIDE_AQUA_HIDEOUT_GRUNTS" "flag": "FLAG_HIDE_AQUA_HIDEOUT_GRUNTS"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
"x": 3, "x": 3,
"y": 13, "y": 13,
"elevation": 3, "elevation": 3,
@ -54,7 +54,7 @@
"flag": "FLAG_ITEM_AQUA_HIDEOUT_B2F_NEST_BALL" "flag": "FLAG_ITEM_AQUA_HIDEOUT_B2F_NEST_BALL"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_SUBMARINE_SHADOW", "graphics_id": "OBJ_EVENT_GFX_SUBMARINE_SHADOW",
"x": 19, "x": 19,
"y": 20, "y": 20,
"elevation": 1, "elevation": 1,
@ -67,7 +67,7 @@
"flag": "FLAG_HIDE_AQUA_HIDEOUT_B2F_SUBMARINE_SHADOW" "flag": "FLAG_HIDE_AQUA_HIDEOUT_B2F_SUBMARINE_SHADOW"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_F", "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_F",
"x": 7, "x": 7,
"y": 5, "y": 5,
"elevation": 3, "elevation": 3,
@ -80,7 +80,7 @@
"flag": "FLAG_HIDE_AQUA_HIDEOUT_GRUNTS" "flag": "FLAG_HIDE_AQUA_HIDEOUT_GRUNTS"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M",
"x": 13, "x": 13,
"y": 5, "y": 5,
"elevation": 3, "elevation": 3,

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

@ -15,7 +15,7 @@
"connections": null, "connections": null,
"object_events": [ "object_events": [
{ {
"graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
"x": 14, "x": 14,
"y": 5, "y": 5,
"elevation": 3, "elevation": 3,

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

@ -15,7 +15,7 @@
"connections": null, "connections": null,
"object_events": [ "object_events": [
{ {
"graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
"x": 32, "x": 32,
"y": 38, "y": 38,
"elevation": 3, "elevation": 3,

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

@ -15,7 +15,7 @@
"connections": null, "connections": null,
"object_events": [ "object_events": [
{ {
"graphics_id": "EVENT_OBJ_GFX_LINK_RECEPTIONIST", "graphics_id": "OBJ_EVENT_GFX_LINK_RECEPTIONIST",
"x": 9, "x": 9,
"y": 3, "y": 3,
"elevation": 3, "elevation": 3,

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

@ -15,7 +15,7 @@
"connections": null, "connections": null,
"object_events": [ "object_events": [
{ {
"graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT",
"x": 5, "x": 5,
"y": 3, "y": 3,
"elevation": 3, "elevation": 3,
@ -28,7 +28,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT",
"x": 10, "x": 10,
"y": 3, "y": 3,
"elevation": 3, "elevation": 3,
@ -41,7 +41,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT",
"x": 5, "x": 5,
"y": 9, "y": 9,
"elevation": 3, "elevation": 3,
@ -54,7 +54,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT",
"x": 10, "x": 10,
"y": 9, "y": 9,
"elevation": 3, "elevation": 3,
@ -67,7 +67,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT",
"x": 4, "x": 4,
"y": 5, "y": 5,
"elevation": 3, "elevation": 3,
@ -80,7 +80,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT",
"x": 11, "x": 11,
"y": 5, "y": 5,
"elevation": 3, "elevation": 3,
@ -93,7 +93,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_VAR_0", "graphics_id": "OBJ_EVENT_GFX_VAR_0",
"x": 15, "x": 15,
"y": 6, "y": 6,
"elevation": 3, "elevation": 3,
@ -106,7 +106,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_VAR_1", "graphics_id": "OBJ_EVENT_GFX_VAR_1",
"x": 0, "x": 0,
"y": 6, "y": 6,
"elevation": 3, "elevation": 3,
@ -119,7 +119,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT",
"x": 7, "x": 7,
"y": 4, "y": 4,
"elevation": 3, "elevation": 3,

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

@ -26,11 +26,11 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_SetPlayerGfx:: @ 82574AE
return return
BattleFrontier_BattleArenaBattleRoom_EventScript_SetPlayerGfxMale:: @ 82574C6 BattleFrontier_BattleArenaBattleRoom_EventScript_SetPlayerGfxMale:: @ 82574C6
setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL setvar VAR_OBJ_GFX_ID_1, OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL
return return
BattleFrontier_BattleArenaBattleRoom_EventScript_SetPlayerGfxFemale:: @ 82574CC BattleFrontier_BattleArenaBattleRoom_EventScript_SetPlayerGfxFemale:: @ 82574CC
setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL setvar VAR_OBJ_GFX_ID_1, OBJ_EVENT_GFX_RIVAL_MAY_NORMAL
return return
BattleFrontier_BattleArenaBattleRoom_OnFrame: @ 82574D2 BattleFrontier_BattleArenaBattleRoom_OnFrame: @ 82574D2
@ -482,7 +482,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_SetUpRoomObjects:: @ 8257C16
hideobjectat 8, MAP_BATTLE_FRONTIER_BATTLE_ARENA_BATTLE_ROOM hideobjectat 8, MAP_BATTLE_FRONTIER_BATTLE_ARENA_BATTLE_ROOM
removeobject 7 removeobject 7
call BattleFrontier_BattleDomeBattleRoom_EventScript_SetPlayerGfx call BattleFrontier_BattleDomeBattleRoom_EventScript_SetPlayerGfx
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleDomeBattleRoom_Movement_SetInvisible applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleDomeBattleRoom_Movement_SetInvisible
setvar VAR_TEMP_1, 1 setvar VAR_TEMP_1, 1
end end

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

@ -15,7 +15,7 @@
"connections": null, "connections": null,
"object_events": [ "object_events": [
{ {
"graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT",
"x": 9, "x": 9,
"y": 12, "y": 12,
"elevation": 0, "elevation": 0,

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

@ -10,14 +10,14 @@ BattleFrontier_BattleArenaCorridor_EventScript_WalkToBattleRoom:: @ 82573C9
delay 16 delay 16
setvar VAR_TEMP_0, 1 setvar VAR_TEMP_0, 1
applymovement 1, BattleFrontier_BattleArenaCorridor_Movement_AttendantWalkToDoor applymovement 1, BattleFrontier_BattleArenaCorridor_Movement_AttendantWalkToDoor
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleArenaCorridor_Movement_PlayerWalkToDoor applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleArenaCorridor_Movement_PlayerWalkToDoor
waitmovement 0 waitmovement 0
applymovement 1, BattleFrontier_BattleArenaCorridor_Movement_AttendantFacePlayer applymovement 1, BattleFrontier_BattleArenaCorridor_Movement_AttendantFacePlayer
waitmovement 0 waitmovement 0
msgbox BattleFrontier_BattleArenaCorridor_Text_PleaseStepIn, MSGBOX_SIGN msgbox BattleFrontier_BattleArenaCorridor_Text_PleaseStepIn, MSGBOX_SIGN
applymovement 1, BattleFrontier_BattleArenaCorridor_Movement_AttendantMoveOutOfWay applymovement 1, BattleFrontier_BattleArenaCorridor_Movement_AttendantMoveOutOfWay
waitmovement 0 waitmovement 0
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleArenaCorridor_Movement_PlayerEnterDoor applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleArenaCorridor_Movement_PlayerEnterDoor
waitmovement 0 waitmovement 0
setvar VAR_0x8006, 0 setvar VAR_0x8006, 0
warp MAP_BATTLE_FRONTIER_BATTLE_ARENA_BATTLE_ROOM, 255, 7, 5 warp MAP_BATTLE_FRONTIER_BATTLE_ARENA_BATTLE_ROOM, 255, 7, 5

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

@ -15,7 +15,7 @@
"connections": null, "connections": null,
"object_events": [ "object_events": [
{ {
"graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT",
"x": 7, "x": 7,
"y": 7, "y": 7,
"elevation": 0, "elevation": 0,
@ -28,7 +28,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_WOMAN_5", "graphics_id": "OBJ_EVENT_GFX_WOMAN_5",
"x": 2, "x": 2,
"y": 10, "y": 10,
"elevation": 3, "elevation": 3,
@ -41,7 +41,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_MAN_5", "graphics_id": "OBJ_EVENT_GFX_MAN_5",
"x": 14, "x": 14,
"y": 11, "y": 11,
"elevation": 3, "elevation": 3,
@ -54,7 +54,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_CAMPER", "graphics_id": "OBJ_EVENT_GFX_CAMPER",
"x": 14, "x": 14,
"y": 12, "y": 12,
"elevation": 3, "elevation": 3,
@ -67,7 +67,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER",
"x": 14, "x": 14,
"y": 10, "y": 10,
"elevation": 3, "elevation": 3,

10
data/maps/BattleFrontier_BattleArenaLobby/scripts.inc
View File

@ -9,7 +9,7 @@ BattleFrontier_BattleArenaLobby_OnWarp: @ 8255C41
BattleFrontier_BattleArenaLobby_EventScript_TurnPlayerNorth:: @ 8255C4B BattleFrontier_BattleArenaLobby_EventScript_TurnPlayerNorth:: @ 8255C4B
setvar VAR_TEMP_1, 1 setvar VAR_TEMP_1, 1
turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
end end
BattleFrontier_BattleArenaLobby_OnFrame: @ 8255C55 BattleFrontier_BattleArenaLobby_OnFrame: @ 8255C55
@ -207,12 +207,12 @@ BattleFrontier_BattleArenaLobby_EventScript_EndCancelChallenge:: @ 8256003
BattleFrontier_BattleArenaLobby_EventScript_WalkToDoorLv50:: @ 8256005 BattleFrontier_BattleArenaLobby_EventScript_WalkToDoorLv50:: @ 8256005
applymovement 1, BattleFrontier_BattleArenaLobby_Movement_AttendantWalkToLeftDoor applymovement 1, BattleFrontier_BattleArenaLobby_Movement_AttendantWalkToLeftDoor
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleArenaLobby_Movement_PlayerWalkToLeftDoor applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleArenaLobby_Movement_PlayerWalkToLeftDoor
waitmovement 0 waitmovement 0
opendoor 2, 2 opendoor 2, 2
waitdooranim waitdooranim
applymovement 1, BattleFrontier_BattleArenaLobby_Movement_AttendantEnterDoor applymovement 1, BattleFrontier_BattleArenaLobby_Movement_AttendantEnterDoor
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleArenaLobby_Movement_PlayerEnterDoor applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleArenaLobby_Movement_PlayerEnterDoor
waitmovement 0 waitmovement 0
closedoor 2, 2 closedoor 2, 2
waitdooranim waitdooranim
@ -256,12 +256,12 @@ BattleFrontier_BattleArenaLobby_Movement_PlayerEnterDoor: @ 825604C
BattleFrontier_BattleArenaLobby_EventScript_WalkToDoorLvOpen:: @ 8256050 BattleFrontier_BattleArenaLobby_EventScript_WalkToDoorLvOpen:: @ 8256050
applymovement 1, BattleFrontier_BattleArenaLobby_Movement_AttendantWalkToRightDoor applymovement 1, BattleFrontier_BattleArenaLobby_Movement_AttendantWalkToRightDoor
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleArenaLobby_Movement_PlayerWalkToRightDoor applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleArenaLobby_Movement_PlayerWalkToRightDoor
waitmovement 0 waitmovement 0
opendoor 11, 2 opendoor 11, 2
waitdooranim waitdooranim
applymovement 1, BattleFrontier_BattleArenaLobby_Movement_AttendantEnterDoor applymovement 1, BattleFrontier_BattleArenaLobby_Movement_AttendantEnterDoor
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleArenaLobby_Movement_PlayerEnterDoor applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleArenaLobby_Movement_PlayerEnterDoor
waitmovement 0 waitmovement 0
closedoor 11, 2 closedoor 11, 2
waitdooranim waitdooranim

30
data/maps/BattleFrontier_BattleDomeBattleRoom/map.json
View File

@ -15,7 +15,7 @@
"connections": null, "connections": null,
"object_events": [ "object_events": [
{ {
"graphics_id": "EVENT_OBJ_GFX_REPORTER_M", "graphics_id": "OBJ_EVENT_GFX_REPORTER_M",
"x": 5, "x": 5,
"y": 4, "y": 4,
"elevation": 0, "elevation": 0,
@ -28,7 +28,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_TWIN", "graphics_id": "OBJ_EVENT_GFX_TWIN",
"x": 7, "x": 7,
"y": 2, "y": 2,
"elevation": 0, "elevation": 0,
@ -41,7 +41,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_BOY_1", "graphics_id": "OBJ_EVENT_GFX_BOY_1",
"x": 9, "x": 9,
"y": 2, "y": 2,
"elevation": 0, "elevation": 0,
@ -54,7 +54,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_BOY_2", "graphics_id": "OBJ_EVENT_GFX_BOY_2",
"x": 11, "x": 11,
"y": 2, "y": 2,
"elevation": 0, "elevation": 0,
@ -67,7 +67,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", "graphics_id": "OBJ_EVENT_GFX_NINJA_BOY",
"x": 16, "x": 16,
"y": 2, "y": 2,
"elevation": 0, "elevation": 0,
@ -80,7 +80,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_MAN_1", "graphics_id": "OBJ_EVENT_GFX_MAN_1",
"x": 4, "x": 4,
"y": 2, "y": 2,
"elevation": 0, "elevation": 0,
@ -93,7 +93,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_EXPERT_M", "graphics_id": "OBJ_EVENT_GFX_EXPERT_M",
"x": 16, "x": 16,
"y": 1, "y": 1,
"elevation": 0, "elevation": 0,
@ -106,7 +106,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_CAMPER", "graphics_id": "OBJ_EVENT_GFX_CAMPER",
"x": 8, "x": 8,
"y": 1, "y": 1,
"elevation": 0, "elevation": 0,
@ -119,7 +119,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_MAN_2", "graphics_id": "OBJ_EVENT_GFX_MAN_2",
"x": 0, "x": 0,
"y": 4, "y": 4,
"elevation": 0, "elevation": 0,
@ -132,7 +132,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_FAT_MAN", "graphics_id": "OBJ_EVENT_GFX_FAT_MAN",
"x": 12, "x": 12,
"y": 1, "y": 1,
"elevation": 0, "elevation": 0,
@ -145,7 +145,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_GIRL_2", "graphics_id": "OBJ_EVENT_GFX_GIRL_2",
"x": 13, "x": 13,
"y": 2, "y": 2,
"elevation": 0, "elevation": 0,
@ -158,7 +158,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_GIRL_1", "graphics_id": "OBJ_EVENT_GFX_GIRL_1",
"x": 10, "x": 10,
"y": 2, "y": 2,
"elevation": 0, "elevation": 0,
@ -171,7 +171,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_VAR_1", "graphics_id": "OBJ_EVENT_GFX_VAR_1",
"x": 4, "x": 4,
"y": 9, "y": 9,
"elevation": 4, "elevation": 4,
@ -184,7 +184,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_WOMAN_3", "graphics_id": "OBJ_EVENT_GFX_WOMAN_3",
"x": 14, "x": 14,
"y": 2, "y": 2,
"elevation": 0, "elevation": 0,
@ -197,7 +197,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_VAR_0", "graphics_id": "OBJ_EVENT_GFX_VAR_0",
"x": 11, "x": 11,
"y": 6, "y": 6,
"elevation": 0, "elevation": 0,

134
data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc
View File

@ -27,11 +27,11 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_SetPlayerGfx:: @ 824BCDC
return return
BattleFrontier_BattleDomeBattleRoom_EventScript_SetPlayerGfxMale:: @ 824BCF4 BattleFrontier_BattleDomeBattleRoom_EventScript_SetPlayerGfxMale:: @ 824BCF4
setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL setvar VAR_OBJ_GFX_ID_1, OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL
return return
BattleFrontier_BattleDomeBattleRoom_EventScript_SetPlayerGfxFemale:: @ 824BCFA BattleFrontier_BattleDomeBattleRoom_EventScript_SetPlayerGfxFemale:: @ 824BCFA
setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL setvar VAR_OBJ_GFX_ID_1, OBJ_EVENT_GFX_RIVAL_MAY_NORMAL
return return
BattleFrontier_BattleDomeBattleRoom_OnFrame: @ 824BD00 BattleFrontier_BattleDomeBattleRoom_OnFrame: @ 824BD00
@ -481,7 +481,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_SetUpObjects:: @ 824C48B
call BattleFrontier_BattleDomeBattleRoom_EventScript_AddAudience call BattleFrontier_BattleDomeBattleRoom_EventScript_AddAudience
call BattleFrontier_BattleDomeBattleRoom_EventScript_SetPlayerGfx call BattleFrontier_BattleDomeBattleRoom_EventScript_SetPlayerGfx
setvar VAR_TEMP_1, 1 setvar VAR_TEMP_1, 1
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleDomeBattleRoom_Movement_SetInvisible applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleDomeBattleRoom_Movement_SetInvisible
frontier_get FRONTIER_DATA_BATTLE_NUM frontier_get FRONTIER_DATA_BATTLE_NUM
compare VAR_RESULT, DOME_FINAL compare VAR_RESULT, DOME_FINAL
goto_if_ne BattleFrontier_BattleDomeBattleRoom_EventScript_EndSetUpObjects goto_if_ne BattleFrontier_BattleDomeBattleRoom_EventScript_EndSetUpObjects
@ -522,76 +522,76 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_AddRound1Audience:: @ 824C52F
return return
BattleFrontier_BattleDomeBattleRoom_EventScript_AddRound2Audience:: @ 824C530 BattleFrontier_BattleDomeBattleRoom_EventScript_AddRound2Audience:: @ 824C530
createvobject EVENT_OBJ_GFX_SCIENTIST_1, 1, 3, 0, 3, DIR_SOUTH createvobject OBJ_EVENT_GFX_SCIENTIST_1, 1, 3, 0, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_EXPERT_F, 4, 6, 0, 3, DIR_SOUTH createvobject OBJ_EVENT_GFX_EXPERT_F, 4, 6, 0, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_NINJA_BOY, 6, 8, 0, 3, DIR_SOUTH createvobject OBJ_EVENT_GFX_NINJA_BOY, 6, 8, 0, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_LITTLE_GIRL, 9, 11, 0, 3, DIR_SOUTH createvobject OBJ_EVENT_GFX_LITTLE_GIRL, 9, 11, 0, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_SCIENTIST_1, 11, 13, 0, 3, DIR_SOUTH createvobject OBJ_EVENT_GFX_SCIENTIST_1, 11, 13, 0, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_MAN_5, 13, 15, 0, 3, DIR_SOUTH createvobject OBJ_EVENT_GFX_MAN_5, 13, 15, 0, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_BEAUTY, 19, 7, 1, 3, DIR_SOUTH createvobject OBJ_EVENT_GFX_BEAUTY, 19, 7, 1, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_WOMAN_5, 22, 11, 1, 3, DIR_SOUTH createvobject OBJ_EVENT_GFX_WOMAN_5, 22, 11, 1, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_LITTLE_BOY, 25, 15, 1, 3, DIR_SOUTH createvobject OBJ_EVENT_GFX_LITTLE_BOY, 25, 15, 1, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_YOUNGSTER, 26, 2, 2, 3, DIR_SOUTH createvobject OBJ_EVENT_GFX_YOUNGSTER, 26, 2, 2, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_SCHOOL_KID_M, 29, 5, 1, 3, DIR_SOUTH createvobject OBJ_EVENT_GFX_SCHOOL_KID_M, 29, 5, 1, 3, DIR_SOUTH
return return
BattleFrontier_BattleDomeBattleRoom_EventScript_AddSemifinalAudience:: @ 824C594 BattleFrontier_BattleDomeBattleRoom_EventScript_AddSemifinalAudience:: @ 824C594
createvobject EVENT_OBJ_GFX_SCIENTIST_1, 1, 3, 0, 3, DIR_SOUTH createvobject OBJ_EVENT_GFX_SCIENTIST_1, 1, 3, 0, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_EXPERT_F, 4, 6, 0, 3, DIR_SOUTH createvobject OBJ_EVENT_GFX_EXPERT_F, 4, 6, 0, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_NINJA_BOY, 6, 8, 0, 3, DIR_SOUTH createvobject OBJ_EVENT_GFX_NINJA_BOY, 6, 8, 0, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_WOMAN_2, 7, 9, 0, 3, DIR_SOUTH createvobject OBJ_EVENT_GFX_WOMAN_2, 7, 9, 0, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_LITTLE_GIRL, 9, 11, 0, 3, DIR_SOUTH createvobject OBJ_EVENT_GFX_LITTLE_GIRL, 9, 11, 0, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_LASS, 10, 12, 0, 3, DIR_SOUTH createvobject OBJ_EVENT_GFX_LASS, 10, 12, 0, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_SCIENTIST_1, 11, 13, 0, 3, DIR_SOUTH createvobject OBJ_EVENT_GFX_SCIENTIST_1, 11, 13, 0, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_MAN_5, 13, 15, 0, 3, DIR_SOUTH createvobject OBJ_EVENT_GFX_MAN_5, 13, 15, 0, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_GENTLEMAN, 15, 2, 1, 3, DIR_SOUTH createvobject OBJ_EVENT_GFX_GENTLEMAN, 15, 2, 1, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_NINJA_BOY, 16, 3, 1, 3, DIR_SOUTH createvobject OBJ_EVENT_GFX_NINJA_BOY, 16, 3, 1, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_WOMAN_2, 17, 4, 1, 3, DIR_SOUTH createvobject OBJ_EVENT_GFX_WOMAN_2, 17, 4, 1, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_BEAUTY, 19, 7, 1, 3, DIR_SOUTH createvobject OBJ_EVENT_GFX_BEAUTY, 19, 7, 1, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_EXPERT_F, 20, 9, 1, 3, DIR_SOUTH createvobject OBJ_EVENT_GFX_EXPERT_F, 20, 9, 1, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_WOMAN_5, 22, 11, 1, 3, DIR_SOUTH createvobject OBJ_EVENT_GFX_WOMAN_5, 22, 11, 1, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_SCIENTIST_1, 23, 13, 1, 3, DIR_SOUTH createvobject OBJ_EVENT_GFX_SCIENTIST_1, 23, 13, 1, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_LITTLE_BOY, 25, 15, 1, 3, DIR_SOUTH createvobject OBJ_EVENT_GFX_LITTLE_BOY, 25, 15, 1, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_YOUNGSTER, 26, 2, 2, 3, DIR_SOUTH createvobject OBJ_EVENT_GFX_YOUNGSTER, 26, 2, 2, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_HEX_MANIAC, 28, 5, 2, 3, DIR_SOUTH createvobject OBJ_EVENT_GFX_HEX_MANIAC, 28, 5, 2, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_SCHOOL_KID_M, 29, 5, 1, 3, DIR_SOUTH createvobject OBJ_EVENT_GFX_SCHOOL_KID_M, 29, 5, 1, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_MART_EMPLOYEE, 30, 6, 2, 3, DIR_SOUTH createvobject OBJ_EVENT_GFX_MART_EMPLOYEE, 30, 6, 2, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_WOMAN_5, 31, 8, 2, 3, 1 createvobject OBJ_EVENT_GFX_WOMAN_5, 31, 8, 2, 3, 1
return return
BattleFrontier_BattleDomeBattleRoom_EventScript_AddFinalAudience:: @ 824C652 BattleFrontier_BattleDomeBattleRoom_EventScript_AddFinalAudience:: @ 824C652
createvobject EVENT_OBJ_GFX_NINJA_BOY, 0, 2, 0, 3, DIR_SOUTH createvobject OBJ_EVENT_GFX_NINJA_BOY, 0, 2, 0, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_SCIENTIST_1, 1, 3, 0, 3, DIR_SOUTH createvobject OBJ_EVENT_GFX_SCIENTIST_1, 1, 3, 0, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_BEAUTY, 2, 15, 0, 3, DIR_SOUTH createvobject OBJ_EVENT_GFX_BEAUTY, 2, 15, 0, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_MAN_5, 3, 5, 0, 3, DIR_SOUTH createvobject OBJ_EVENT_GFX_MAN_5, 3, 5, 0, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_EXPERT_F, 4, 6, 0, 3, DIR_SOUTH createvobject OBJ_EVENT_GFX_EXPERT_F, 4, 6, 0, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_SCIENTIST_1, 5, 7, 0, 3, DIR_SOUTH createvobject OBJ_EVENT_GFX_SCIENTIST_1, 5, 7, 0, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_NINJA_BOY, 6, 8, 0, 3, DIR_SOUTH createvobject OBJ_EVENT_GFX_NINJA_BOY, 6, 8, 0, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_WOMAN_2, 7, 9, 0, 3, DIR_SOUTH createvobject OBJ_EVENT_GFX_WOMAN_2, 7, 9, 0, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_WOMAN_3, 8, 10, 0, 3, DIR_SOUTH createvobject OBJ_EVENT_GFX_WOMAN_3, 8, 10, 0, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_LITTLE_GIRL, 9, 11, 0, 3, DIR_SOUTH createvobject OBJ_EVENT_GFX_LITTLE_GIRL, 9, 11, 0, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_LASS, 10, 12, 0, 3, DIR_SOUTH createvobject OBJ_EVENT_GFX_LASS, 10, 12, 0, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_SCIENTIST_1, 11, 13, 0, 3, DIR_SOUTH createvobject OBJ_EVENT_GFX_SCIENTIST_1, 11, 13, 0, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_BEAUTY, 12, 14, 0, 3, DIR_SOUTH createvobject OBJ_EVENT_GFX_BEAUTY, 12, 14, 0, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_MAN_5, 13, 15, 2, 3, DIR_SOUTH createvobject OBJ_EVENT_GFX_MAN_5, 13, 15, 2, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_HIKER, 14, 12, 2, 3, DIR_SOUTH createvobject OBJ_EVENT_GFX_HIKER, 14, 12, 2, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_GENTLEMAN, 15, 2, 1, 3, DIR_SOUTH createvobject OBJ_EVENT_GFX_GENTLEMAN, 15, 2, 1, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_NINJA_BOY, 16, 3, 1, 3, DIR_SOUTH createvobject OBJ_EVENT_GFX_NINJA_BOY, 16, 3, 1, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_WOMAN_2, 17, 4, 1, 3, DIR_SOUTH createvobject OBJ_EVENT_GFX_WOMAN_2, 17, 4, 1, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_WOMAN_3, 18, 6, 1, 3, DIR_SOUTH createvobject OBJ_EVENT_GFX_WOMAN_3, 18, 6, 1, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_BEAUTY, 19, 7, 1, 3, DIR_SOUTH createvobject OBJ_EVENT_GFX_BEAUTY, 19, 7, 1, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_EXPERT_F, 20, 9, 1, 3, DIR_SOUTH createvobject OBJ_EVENT_GFX_EXPERT_F, 20, 9, 1, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_MAN_2, 21, 10, 1, 3, DIR_SOUTH createvobject OBJ_EVENT_GFX_MAN_2, 21, 10, 1, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_WOMAN_5, 22, 11, 1, 3, DIR_SOUTH createvobject OBJ_EVENT_GFX_WOMAN_5, 22, 11, 1, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_SCIENTIST_1, 23, 13, 1, 3, DIR_SOUTH createvobject OBJ_EVENT_GFX_SCIENTIST_1, 23, 13, 1, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_GENTLEMAN, 24, 14, 1, 3, DIR_SOUTH createvobject OBJ_EVENT_GFX_GENTLEMAN, 24, 14, 1, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_LITTLE_BOY, 25, 15, 1, 3, DIR_SOUTH createvobject OBJ_EVENT_GFX_LITTLE_BOY, 25, 15, 1, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_YOUNGSTER, 26, 2, 2, 3, DIR_SOUTH createvobject OBJ_EVENT_GFX_YOUNGSTER, 26, 2, 2, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_FAT_MAN, 27, 3, 2, 3, DIR_SOUTH createvobject OBJ_EVENT_GFX_FAT_MAN, 27, 3, 2, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_HEX_MANIAC, 28, 5, 2, 3, DIR_SOUTH createvobject OBJ_EVENT_GFX_HEX_MANIAC, 28, 5, 2, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_SCHOOL_KID_M, 29, 5, 1, 3, DIR_SOUTH createvobject OBJ_EVENT_GFX_SCHOOL_KID_M, 29, 5, 1, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_MART_EMPLOYEE, 30, 6, 2, 3, DIR_SOUTH createvobject OBJ_EVENT_GFX_MART_EMPLOYEE, 30, 6, 2, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_WOMAN_5, 31, 8, 2, 3, DIR_SOUTH createvobject OBJ_EVENT_GFX_WOMAN_5, 31, 8, 2, 3, DIR_SOUTH
return return
BattleFrontier_BattleDomeBattleRoom_Movement_SetInvisible: @ 824C773 BattleFrontier_BattleDomeBattleRoom_Movement_SetInvisible: @ 824C773

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

@ -15,7 +15,7 @@
"connections": null, "connections": null,
"object_events": [ "object_events": [
{ {
"graphics_id": "EVENT_OBJ_GFX_TEALA", "graphics_id": "OBJ_EVENT_GFX_TEALA",
"x": 23, "x": 23,
"y": 5, "y": 5,
"elevation": 0, "elevation": 0,

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

@ -13,12 +13,12 @@ BattleFrontier_BattleDomeCorridor_EventScript_EnterCorridor:: @ 824B10E
compare VAR_RESULT, FRONTIER_LVL_OPEN compare VAR_RESULT, FRONTIER_LVL_OPEN
goto_if_eq BattleFrontier_BattleDomeCorridor_EventScript_WalkToBattleRoomLvOpen goto_if_eq BattleFrontier_BattleDomeCorridor_EventScript_WalkToBattleRoomLvOpen
applymovement 1, BattleFrontier_BattleDomeCorridor_Movement_AttendantWalkToDoorLv50 applymovement 1, BattleFrontier_BattleDomeCorridor_Movement_AttendantWalkToDoorLv50
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleDomeCorridor_Movement_PlayerWalkToDoorLv50 applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleDomeCorridor_Movement_PlayerWalkToDoorLv50
waitmovement 0 waitmovement 0
opendoor 13, 3 opendoor 13, 3
waitdooranim waitdooranim
applymovement 1, BattleFrontier_BattleDomeCorridor_Movement_AttendantEnterDoorLv50 applymovement 1, BattleFrontier_BattleDomeCorridor_Movement_AttendantEnterDoorLv50
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleDomeCorridor_Movement_PlayerEnterDoorLv50 applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleDomeCorridor_Movement_PlayerEnterDoorLv50
waitmovement 0 waitmovement 0
closedoor 13, 3 closedoor 13, 3
waitdooranim waitdooranim
@ -26,12 +26,12 @@ BattleFrontier_BattleDomeCorridor_EventScript_EnterCorridor:: @ 824B10E
BattleFrontier_BattleDomeCorridor_EventScript_WalkToBattleRoomLvOpen:: @ 824B161 BattleFrontier_BattleDomeCorridor_EventScript_WalkToBattleRoomLvOpen:: @ 824B161
applymovement 1, BattleFrontier_BattleDomeCorridor_Movement_AttendantWalkToDoorLvOpen applymovement 1, BattleFrontier_BattleDomeCorridor_Movement_AttendantWalkToDoorLvOpen
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleDomeCorridor_Movement_PlayerWalkToDoorLvOpen applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleDomeCorridor_Movement_PlayerWalkToDoorLvOpen
waitmovement 0 waitmovement 0
opendoor 37, 3 opendoor 37, 3
waitdooranim waitdooranim
applymovement 1, BattleFrontier_BattleDomeCorridor_Movement_AttendantEnterDoorLvOpen applymovement 1, BattleFrontier_BattleDomeCorridor_Movement_AttendantEnterDoorLvOpen
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleDomeCorridor_Movement_PlayerEnterDoorLvOpen applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleDomeCorridor_Movement_PlayerEnterDoorLvOpen
waitmovement 0 waitmovement 0
closedoor 37, 3 closedoor 37, 3
waitdooranim waitdooranim

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

@ -15,7 +15,7 @@
"connections": null, "connections": null,
"object_events": [ "object_events": [
{ {
"graphics_id": "EVENT_OBJ_GFX_TEALA", "graphics_id": "OBJ_EVENT_GFX_TEALA",
"x": 5, "x": 5,
"y": 10, "y": 10,
"elevation": 0, "elevation": 0,
@ -28,7 +28,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_MAN_3", "graphics_id": "OBJ_EVENT_GFX_MAN_3",
"x": 1, "x": 1,
"y": 11, "y": 11,
"elevation": 0, "elevation": 0,
@ -41,7 +41,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_LASS", "graphics_id": "OBJ_EVENT_GFX_LASS",
"x": 14, "x": 14,
"y": 14, "y": 14,
"elevation": 0, "elevation": 0,
@ -54,7 +54,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_FAT_MAN", "graphics_id": "OBJ_EVENT_GFX_FAT_MAN",
"x": 18, "x": 18,
"y": 14, "y": 14,
"elevation": 0, "elevation": 0,
@ -67,7 +67,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_MANIAC", "graphics_id": "OBJ_EVENT_GFX_MANIAC",
"x": 8, "x": 8,
"y": 14, "y": 14,
"elevation": 0, "elevation": 0,
@ -80,7 +80,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_TEALA", "graphics_id": "OBJ_EVENT_GFX_TEALA",
"x": 17, "x": 17,
"y": 10, "y": 10,
"elevation": 0, "elevation": 0,

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

@ -14,7 +14,7 @@ BattleFrontier_BattleDomeLobby_OnWarp: @ 82497FB
BattleFrontier_BattleDomeLobby_EventScript_TurnPlayerNorth:: @ 8249805 BattleFrontier_BattleDomeLobby_EventScript_TurnPlayerNorth:: @ 8249805
setvar VAR_TEMP_1, 1 setvar VAR_TEMP_1, 1
turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
end end
BattleFrontier_BattleDomeLobby_OnFrame: @ 824980F BattleFrontier_BattleDomeLobby_OnFrame: @ 824980F
@ -241,7 +241,7 @@ BattleFrontier_BattleDomeLobby_EventScript_WalkToDoor:: @ 8249C6E
call_if_eq BattleFrontier_BattleDomeLobby_EventScript_SinglesAttendantWalkToDoor call_if_eq BattleFrontier_BattleDomeLobby_EventScript_SinglesAttendantWalkToDoor
compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES
call_if_eq BattleFrontier_BattleDomeLobby_EventScript_DoublesAttendantWalkToDoor call_if_eq BattleFrontier_BattleDomeLobby_EventScript_DoublesAttendantWalkToDoor
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleDomeLobby_Movement_WalkToDoor applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleDomeLobby_Movement_WalkToDoor
waitmovement 0 waitmovement 0
compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES
call_if_eq BattleFrontier_BattleDomeLobby_EventScript_OpenSinglesDoor call_if_eq BattleFrontier_BattleDomeLobby_EventScript_OpenSinglesDoor
@ -252,7 +252,7 @@ BattleFrontier_BattleDomeLobby_EventScript_WalkToDoor:: @ 8249C6E
call_if_eq BattleFrontier_BattleDomeLobby_EventScript_SinglesAttendantEnterDoor call_if_eq BattleFrontier_BattleDomeLobby_EventScript_SinglesAttendantEnterDoor
compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES
call_if_eq BattleFrontier_BattleDomeLobby_EventScript_DoublesAttendantEnterDoor call_if_eq BattleFrontier_BattleDomeLobby_EventScript_DoublesAttendantEnterDoor
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleDomeLobby_Movement_PlayerEnterDoor applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleDomeLobby_Movement_PlayerEnterDoor
waitmovement 0 waitmovement 0
compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES
call_if_eq BattleFrontier_BattleDomeLobby_EventScript_CloseSinglesDoor call_if_eq BattleFrontier_BattleDomeLobby_EventScript_CloseSinglesDoor

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

@ -15,7 +15,7 @@
"connections": null, "connections": null,
"object_events": [ "object_events": [
{ {
"graphics_id": "EVENT_OBJ_GFX_TEALA", "graphics_id": "OBJ_EVENT_GFX_TEALA",
"x": 5, "x": 5,
"y": 2, "y": 2,
"elevation": 3, "elevation": 3,

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

@ -9,7 +9,7 @@ BattleFrontier_BattleDomePreBattleRoom_OnWarp: @ 824B204
BattleFrontier_BattleDomePreBattleRoom_EventScript_TurnPlayerNorth:: @ 824B20E BattleFrontier_BattleDomePreBattleRoom_EventScript_TurnPlayerNorth:: @ 824B20E
setvar VAR_TEMP_1, 1 setvar VAR_TEMP_1, 1
turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
end end
BattleFrontier_BattleDomePreBattleRoom_OnFrame: @ 824B218 BattleFrontier_BattleDomePreBattleRoom_OnFrame: @ 824B218
@ -21,7 +21,7 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_EnterRoom:: @ 824B222
goto_if_eq BattleFrontier_BattleDomePreBattleRoom_EventScript_ReturnFromBattle goto_if_eq BattleFrontier_BattleDomePreBattleRoom_EventScript_ReturnFromBattle
frontier_set FRONTIER_DATA_RECORD_DISABLED, TRUE frontier_set FRONTIER_DATA_RECORD_DISABLED, TRUE
setvar VAR_TEMP_0, 1 setvar VAR_TEMP_0, 1
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleDomePreBattleRoom_Movement_PlayerEnter applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleDomePreBattleRoom_Movement_PlayerEnter
waitmovement 0 waitmovement 0
lockall lockall
BattleFrontier_BattleDomePreBattleRoom_EventScript_AskReadyForNextRound:: @ 824B24F BattleFrontier_BattleDomePreBattleRoom_EventScript_AskReadyForNextRound:: @ 824B24F
@ -153,11 +153,11 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_ContinueChallenge:: @ 824B46D
closemessage closemessage
applymovement 1, BattleFrontier_BattleDomePreBattleRoom_Movement_AttendantMoveAside applymovement 1, BattleFrontier_BattleDomePreBattleRoom_Movement_AttendantMoveAside
waitmovement 0 waitmovement 0
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleDomePreBattleRoom_Movement_PlayerWalkToDoor applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleDomePreBattleRoom_Movement_PlayerWalkToDoor
waitmovement 0 waitmovement 0
opendoor 5, 1 opendoor 5, 1
waitdooranim waitdooranim
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleDomePreBattleRoom_Movement_PlayerEnterDoor applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleDomePreBattleRoom_Movement_PlayerEnterDoor
waitmovement 0 waitmovement 0
closedoor 5, 1 closedoor 5, 1
waitdooranim waitdooranim

16
data/maps/BattleFrontier_BattleFactoryBattleRoom/map.json
View File

@ -15,7 +15,7 @@
"connections": null, "connections": null,
"object_events": [ "object_events": [
{ {
"graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1",
"x": 0, "x": 0,
"y": 6, "y": 6,
"elevation": 0, "elevation": 0,
@ -28,7 +28,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_VAR_0", "graphics_id": "OBJ_EVENT_GFX_VAR_0",
"x": 7, "x": 7,
"y": 4, "y": 4,
"elevation": 0, "elevation": 0,
@ -41,7 +41,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1",
"x": 0, "x": 0,
"y": 4, "y": 4,
"elevation": 0, "elevation": 0,
@ -54,7 +54,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1",
"x": 0, "x": 0,
"y": 8, "y": 8,
"elevation": 0, "elevation": 0,
@ -67,7 +67,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1",
"x": 12, "x": 12,
"y": 4, "y": 4,
"elevation": 0, "elevation": 0,
@ -80,7 +80,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1",
"x": 12, "x": 12,
"y": 6, "y": 6,
"elevation": 0, "elevation": 0,
@ -93,7 +93,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1",
"x": 12, "x": 12,
"y": 8, "y": 8,
"elevation": 0, "elevation": 0,
@ -106,7 +106,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_VAR_F", "graphics_id": "OBJ_EVENT_GFX_VAR_F",
"x": 5, "x": 5,
"y": 11, "y": 11,
"elevation": 0, "elevation": 0,

10
data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc
View File

@ -31,7 +31,7 @@ BattleFrontier_BattleFactoryBattleRoom_OnWarp: @ 825AE00
BattleFrontier_BattleFactoryBattleRoom_EventScript_HideObjects:: @ 825AE0A BattleFrontier_BattleFactoryBattleRoom_EventScript_HideObjects:: @ 825AE0A
setvar VAR_TEMP_1, 1 setvar VAR_TEMP_1, 1
hideobjectat EVENT_OBJ_ID_PLAYER, MAP_BATTLE_FRONTIER_BATTLE_FACTORY_BATTLE_ROOM hideobjectat OBJ_EVENT_ID_PLAYER, MAP_BATTLE_FRONTIER_BATTLE_FACTORY_BATTLE_ROOM
compare VAR_TEMP_F, FRONTIER_BRAIN_NOT_READY compare VAR_TEMP_F, FRONTIER_BRAIN_NOT_READY
goto_if_ne BattleFrontier_BattleFactoryBattleRoom_EventScript_EndHideObjects goto_if_ne BattleFrontier_BattleFactoryBattleRoom_EventScript_EndHideObjects
hideobjectat 2, MAP_BATTLE_FRONTIER_BATTLE_FACTORY_BATTLE_ROOM hideobjectat 2, MAP_BATTLE_FRONTIER_BATTLE_FACTORY_BATTLE_ROOM
@ -39,11 +39,11 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_EndHideObjects:: @ 825AE24
end end
BattleFrontier_BattleFactoryBattleRoom_EventScript_SetPlayerGfxMale:: @ 825AE25 BattleFrontier_BattleFactoryBattleRoom_EventScript_SetPlayerGfxMale:: @ 825AE25
setvar VAR_OBJ_GFX_ID_F, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL setvar VAR_OBJ_GFX_ID_F, OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL
return return
BattleFrontier_BattleFactoryBattleRoom_EventScript_SetPlayerGfxFemale:: @ 825AE2B BattleFrontier_BattleFactoryBattleRoom_EventScript_SetPlayerGfxFemale:: @ 825AE2B
setvar VAR_OBJ_GFX_ID_F, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL setvar VAR_OBJ_GFX_ID_F, OBJ_EVENT_GFX_RIVAL_MAY_NORMAL
return return
BattleFrontier_BattleFactoryBattleRoom_OnFrame: @ 825AE31 BattleFrontier_BattleFactoryBattleRoom_OnFrame: @ 825AE31
@ -55,7 +55,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_EnterRoomFactoryHeadBattle::
closemessage closemessage
applymovement 2, BattleFrontier_BattleFactoryBattleRoom_Movement_NolandMoveToBattle applymovement 2, BattleFrontier_BattleFactoryBattleRoom_Movement_NolandMoveToBattle
applymovement 8, BattleFrontier_BattleFactoryBattleRoom_Movement_PlayerEnterRoom applymovement 8, BattleFrontier_BattleFactoryBattleRoom_Movement_PlayerEnterRoom
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleFactoryBattleRoom_Movement_PlayerEnterRoom applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleFactoryBattleRoom_Movement_PlayerEnterRoom
waitmovement 0 waitmovement 0
call BattleFrontier_BattleFactoryBattleRoom_EventScript_ScientistsFaceBattle call BattleFrontier_BattleFactoryBattleRoom_EventScript_ScientistsFaceBattle
goto BattleFrontier_BattleFactoryBattleRoom_EventScript_BattleOpponent goto BattleFrontier_BattleFactoryBattleRoom_EventScript_BattleOpponent
@ -65,7 +65,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_EnterRoom:: @ 825AE67
compare VAR_TEMP_F, FRONTIER_BRAIN_NOT_READY compare VAR_TEMP_F, FRONTIER_BRAIN_NOT_READY
goto_if_ne BattleFrontier_BattleFactoryBattleRoom_EventScript_EnterRoomFactoryHeadBattle goto_if_ne BattleFrontier_BattleFactoryBattleRoom_EventScript_EnterRoomFactoryHeadBattle
applymovement 8, BattleFrontier_BattleFactoryBattleRoom_Movement_PlayerEnterRoom applymovement 8, BattleFrontier_BattleFactoryBattleRoom_Movement_PlayerEnterRoom
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleFactoryBattleRoom_Movement_PlayerEnterRoom applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleFactoryBattleRoom_Movement_PlayerEnterRoom
waitmovement 0 waitmovement 0
call BattleFrontier_BattleFactoryBattleRoom_EventScript_ScientistsFaceBattle call BattleFrontier_BattleFactoryBattleRoom_EventScript_ScientistsFaceBattle
factory_setopponentgfx factory_setopponentgfx

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

@ -15,7 +15,7 @@
"connections": null, "connections": null,
"object_events": [ "object_events": [
{ {
"graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1",
"x": 4, "x": 4,
"y": 7, "y": 7,
"elevation": 0, "elevation": 0,
@ -28,7 +28,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_WOMAN_1", "graphics_id": "OBJ_EVENT_GFX_WOMAN_1",
"x": 3, "x": 3,
"y": 11, "y": 11,
"elevation": 0, "elevation": 0,
@ -41,7 +41,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_CAMPER", "graphics_id": "OBJ_EVENT_GFX_CAMPER",
"x": 14, "x": 14,
"y": 11, "y": 11,
"elevation": 0, "elevation": 0,
@ -54,7 +54,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_PICNICKER", "graphics_id": "OBJ_EVENT_GFX_PICNICKER",
"x": 13, "x": 13,
"y": 11, "y": 11,
"elevation": 0, "elevation": 0,
@ -67,7 +67,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_FAT_MAN", "graphics_id": "OBJ_EVENT_GFX_FAT_MAN",
"x": 6, "x": 6,
"y": 10, "y": 10,
"elevation": 0, "elevation": 0,
@ -80,7 +80,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1",
"x": 14, "x": 14,
"y": 7, "y": 7,
"elevation": 0, "elevation": 0,

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

@ -9,7 +9,7 @@ BattleFrontier_BattleFactoryLobby_OnWarp: @ 82583F3
BattleFrontier_BattleFactoryLobby_EventScript_TurnPlayerNorth:: @ 82583FD BattleFrontier_BattleFactoryLobby_EventScript_TurnPlayerNorth:: @ 82583FD
setvar VAR_TEMP_1, 1 setvar VAR_TEMP_1, 1
turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
end end
BattleFrontier_BattleFactoryLobby_OnFrame: @ 8258407 BattleFrontier_BattleFactoryLobby_OnFrame: @ 8258407
@ -176,7 +176,7 @@ BattleFrontier_BattleFactoryLobby_EventScript_EnterChallenge:: @ 825871A
compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES
call_if_eq BattleFrontier_BattleFactoryLobby_EventScript_TalkedToDoublesAttendant call_if_eq BattleFrontier_BattleFactoryLobby_EventScript_TalkedToDoublesAttendant
applymovement VAR_LAST_TALKED, BattleFrontier_BattleFactoryLobby_Movement_AttendantEnterDoor applymovement VAR_LAST_TALKED, BattleFrontier_BattleFactoryLobby_Movement_AttendantEnterDoor
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleFactoryLobby_Movement_PlayerEnterDoor applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleFactoryLobby_Movement_PlayerEnterDoor
waitmovement 0 waitmovement 0
warp MAP_BATTLE_FRONTIER_BATTLE_FACTORY_PRE_BATTLE_ROOM, 255, 8, 13 warp MAP_BATTLE_FRONTIER_BATTLE_FACTORY_PRE_BATTLE_ROOM, 255, 8, 13
setvar VAR_TEMP_0, 0 setvar VAR_TEMP_0, 0

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

@ -15,7 +15,7 @@
"connections": null, "connections": null,
"object_events": [ "object_events": [
{ {
"graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1",
"x": 8, "x": 8,
"y": 12, "y": 12,
"elevation": 0, "elevation": 0,

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

@ -14,7 +14,7 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_SetUpObjects:: @ 8259ACF
setobjectxy 1, 8, 7 setobjectxy 1, 8, 7
turnobject 1, DIR_SOUTH turnobject 1, DIR_SOUTH
BattleFrontier_BattleFactoryPreBattleRoom_EventScript_TurnPlayerNorth:: @ 8259AEA BattleFrontier_BattleFactoryPreBattleRoom_EventScript_TurnPlayerNorth:: @ 8259AEA
turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
end end
BattleFrontier_BattleFactoryPreBattleRoom_OnFrame: @ 8259AEF BattleFrontier_BattleFactoryPreBattleRoom_OnFrame: @ 8259AEF
@ -26,7 +26,7 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_EnterRoom:: @ 8259AF9
goto_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_ReturnToRoomFromBattle goto_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_ReturnToRoomFromBattle
setvar VAR_TEMP_0, 1 setvar VAR_TEMP_0, 1
applymovement 1, BattleFrontier_BattleFactoryPreBattleRoom_Movement_AttendantEnterRoom applymovement 1, BattleFrontier_BattleFactoryPreBattleRoom_Movement_AttendantEnterRoom
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleFactoryPreBattleRoom_Movement_PlayerEnterRoom applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleFactoryPreBattleRoom_Movement_PlayerEnterRoom
waitmovement 0 waitmovement 0
compare VAR_0x8006, 2 compare VAR_0x8006, 2
goto_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_ResumeChallenge goto_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_ResumeChallenge
@ -420,12 +420,12 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskSwapBeforeHead:: @ 825A
BattleFrontier_BattleFactoryPreBattleRoom_EventScript_WalkToBattleRoomLv50:: @ 825A17C BattleFrontier_BattleFactoryPreBattleRoom_EventScript_WalkToBattleRoomLv50:: @ 825A17C
applymovement 1, BattleFrontier_BattleFactoryPreBattleRoom_Movement_GuideWalkToBattleRoomLv50 applymovement 1, BattleFrontier_BattleFactoryPreBattleRoom_Movement_GuideWalkToBattleRoomLv50
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleFactoryPreBattleRoom_Movement_PlayerWalkToBattleRoomLv50 applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleFactoryPreBattleRoom_Movement_PlayerWalkToBattleRoomLv50
return return
BattleFrontier_BattleFactoryPreBattleRoom_EventScript_WalkToBattleRoomLvOpen:: @ 825A18B BattleFrontier_BattleFactoryPreBattleRoom_EventScript_WalkToBattleRoomLvOpen:: @ 825A18B
applymovement 1, BattleFrontier_BattleFactoryPreBattleRoom_Movement_GuideWalkToBattleRoomLvOpen applymovement 1, BattleFrontier_BattleFactoryPreBattleRoom_Movement_GuideWalkToBattleRoomLvOpen
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleFactoryPreBattleRoom_Movement_PlayerWalkToBattleRoomLvOpen applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleFactoryPreBattleRoom_Movement_PlayerWalkToBattleRoomLvOpen
return return
BattleFrontier_BattleFactoryPreBattleRoom_Movement_PlayerEnterRoom: @ 825A19A BattleFrontier_BattleFactoryPreBattleRoom_Movement_PlayerEnterRoom: @ 825A19A

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

@ -15,7 +15,7 @@
"connections": null, "connections": null,
"object_events": [ "object_events": [
{ {
"graphics_id": "EVENT_OBJ_GFX_VAR_1", "graphics_id": "OBJ_EVENT_GFX_VAR_1",
"x": 1, "x": 1,
"y": 9, "y": 9,
"elevation": 3, "elevation": 3,
@ -28,7 +28,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_VAR_0", "graphics_id": "OBJ_EVENT_GFX_VAR_0",
"x": 13, "x": 13,
"y": 1, "y": 1,
"elevation": 3, "elevation": 3,
@ -41,7 +41,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_EXPERT_M", "graphics_id": "OBJ_EVENT_GFX_EXPERT_M",
"x": 1, "x": 1,
"y": 4, "y": 4,
"elevation": 3, "elevation": 3,
@ -54,7 +54,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_DUSCLOPS", "graphics_id": "OBJ_EVENT_GFX_DUSCLOPS",
"x": 13, "x": 13,
"y": 1, "y": 1,
"elevation": 3, "elevation": 3,
@ -67,7 +67,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_AZURILL", "graphics_id": "OBJ_EVENT_GFX_AZURILL",
"x": 13, "x": 13,
"y": 1, "y": 1,
"elevation": 3, "elevation": 3,

10
data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc
View File

@ -23,13 +23,13 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_SetPlayerGfx:: @ 824F833
@ The opponent's gfx are set to the players by default @ The opponent's gfx are set to the players by default
BattleFrontier_BattlePalaceBattleRoom_EventScript_SetPlayerGfxMale:: @ 824F84B BattleFrontier_BattlePalaceBattleRoom_EventScript_SetPlayerGfxMale:: @ 824F84B
setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL setvar VAR_OBJ_GFX_ID_1, OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL
setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL setvar VAR_OBJ_GFX_ID_0, OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL
return return
BattleFrontier_BattlePalaceBattleRoom_EventScript_SetPlayerGfxFemale:: @ 824F856 BattleFrontier_BattlePalaceBattleRoom_EventScript_SetPlayerGfxFemale:: @ 824F856
setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL setvar VAR_OBJ_GFX_ID_1, OBJ_EVENT_GFX_RIVAL_MAY_NORMAL
setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL setvar VAR_OBJ_GFX_ID_0, OBJ_EVENT_GFX_RIVAL_MAY_NORMAL
return return
BattleFrontier_BattlePalaceBattleRoom_OnFrame: @ 824F861 BattleFrontier_BattlePalaceBattleRoom_OnFrame: @ 824F861
@ -309,7 +309,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_SetUpRoomObjects:: @ 824FE3E
hideobjectat 1, MAP_BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM hideobjectat 1, MAP_BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM
call BattleFrontier_BattlePalaceBattleRoom_EventScript_SetPlayerGfx call BattleFrontier_BattlePalaceBattleRoom_EventScript_SetPlayerGfx
setvar VAR_TEMP_1, 1 setvar VAR_TEMP_1, 1
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePalaceBattleRoom_Movement_SetInvisible applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePalaceBattleRoom_Movement_SetInvisible
removeobject 2 removeobject 2
applymovement 4, BattleFrontier_BattlePalaceBattleRoom_Movement_SetInvisible applymovement 4, BattleFrontier_BattlePalaceBattleRoom_Movement_SetInvisible
applymovement 5, BattleFrontier_BattlePalaceBattleRoom_Movement_SetInvisible applymovement 5, BattleFrontier_BattlePalaceBattleRoom_Movement_SetInvisible

14
data/maps/BattleFrontier_BattlePalaceCorridor/map.json
View File

@ -15,7 +15,7 @@
"connections": null, "connections": null,
"object_events": [ "object_events": [
{ {
"graphics_id": "EVENT_OBJ_GFX_EXPERT_M", "graphics_id": "OBJ_EVENT_GFX_EXPERT_M",
"x": 8, "x": 8,
"y": 12, "y": 12,
"elevation": 3, "elevation": 3,
@ -28,7 +28,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_AZURILL", "graphics_id": "OBJ_EVENT_GFX_AZURILL",
"x": 3, "x": 3,
"y": 5, "y": 5,
"elevation": 0, "elevation": 0,
@ -41,7 +41,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_KIRLIA", "graphics_id": "OBJ_EVENT_GFX_KIRLIA",
"x": 12, "x": 12,
"y": 6, "y": 6,
"elevation": 0, "elevation": 0,
@ -54,7 +54,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_PIKACHU", "graphics_id": "OBJ_EVENT_GFX_PIKACHU",
"x": 15, "x": 15,
"y": 5, "y": 5,
"elevation": 0, "elevation": 0,
@ -67,7 +67,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_ZIGZAGOON_2", "graphics_id": "OBJ_EVENT_GFX_ZIGZAGOON_2",
"x": 4, "x": 4,
"y": 9, "y": 9,
"elevation": 0, "elevation": 0,
@ -80,7 +80,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_AZUMARILL", "graphics_id": "OBJ_EVENT_GFX_AZUMARILL",
"x": 13, "x": 13,
"y": 9, "y": 9,
"elevation": 0, "elevation": 0,
@ -93,7 +93,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_WINGULL", "graphics_id": "OBJ_EVENT_GFX_WINGULL",
"x": 3, "x": 3,
"y": 10, "y": 10,
"elevation": 0, "elevation": 0,

10
data/maps/BattleFrontier_BattlePalaceCorridor/scripts.inc
View File

@ -9,7 +9,7 @@ BattleFrontier_BattlePalaceCorridor_OnFrame: @ 824F4A9
BattleFrontier_BattlePalaceCorridor_EventScript_WalkThroughCorridor:: @ 824F4B3 BattleFrontier_BattlePalaceCorridor_EventScript_WalkThroughCorridor:: @ 824F4B3
delay 16 delay 16
applymovement 1, BattleFrontier_BattlePalaceCorridor_Movement_EnterCorridor applymovement 1, BattleFrontier_BattlePalaceCorridor_Movement_EnterCorridor
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePalaceCorridor_Movement_EnterCorridor applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePalaceCorridor_Movement_EnterCorridor
waitmovement 0 waitmovement 0
lockall lockall
palace_getcomment palace_getcomment
@ -28,12 +28,12 @@ BattleFrontier_BattlePalaceCorridor_EventScript_WalkThroughCorridor:: @ 824F4B3
compare VAR_RESULT, FRONTIER_LVL_OPEN compare VAR_RESULT, FRONTIER_LVL_OPEN
goto_if_eq BattleFrontier_BattlePalaceCorridor_EventScript_WalkToOpenBattleRoom goto_if_eq BattleFrontier_BattlePalaceCorridor_EventScript_WalkToOpenBattleRoom
applymovement 1, BattleFrontier_BattlePalaceCorridor_Movement_AttendantWalkTo50BattleRoom applymovement 1, BattleFrontier_BattlePalaceCorridor_Movement_AttendantWalkTo50BattleRoom
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePalaceCorridor_Movement_PlayerWalkTo50BattleRoom applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePalaceCorridor_Movement_PlayerWalkTo50BattleRoom
waitmovement 0 waitmovement 0
opendoor 6, 3 opendoor 6, 3
waitdooranim waitdooranim
applymovement 1, BattleFrontier_BattlePalaceCorridor_Movement_AttendantEnterBattleRoom applymovement 1, BattleFrontier_BattlePalaceCorridor_Movement_AttendantEnterBattleRoom
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePalaceCorridor_Movement_PlayerEnterBattleRoom applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePalaceCorridor_Movement_PlayerEnterBattleRoom
waitmovement 0 waitmovement 0
closedoor 6, 3 closedoor 6, 3
waitdooranim waitdooranim
@ -41,12 +41,12 @@ BattleFrontier_BattlePalaceCorridor_EventScript_WalkThroughCorridor:: @ 824F4B3
BattleFrontier_BattlePalaceCorridor_EventScript_WalkToOpenBattleRoom:: @ 824F553 BattleFrontier_BattlePalaceCorridor_EventScript_WalkToOpenBattleRoom:: @ 824F553
applymovement 1, BattleFrontier_BattlePalaceCorridor_Movement_AttendantWalkToOpenBattleRoom applymovement 1, BattleFrontier_BattlePalaceCorridor_Movement_AttendantWalkToOpenBattleRoom
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePalaceCorridor_Movement_PlayerWalkToOpenBattleRoom applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePalaceCorridor_Movement_PlayerWalkToOpenBattleRoom
waitmovement 0 waitmovement 0
opendoor 10, 3 opendoor 10, 3
waitdooranim waitdooranim
applymovement 1, BattleFrontier_BattlePalaceCorridor_Movement_AttendantEnterBattleRoom applymovement 1, BattleFrontier_BattlePalaceCorridor_Movement_AttendantEnterBattleRoom
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePalaceCorridor_Movement_PlayerEnterBattleRoom applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePalaceCorridor_Movement_PlayerEnterBattleRoom
waitmovement 0 waitmovement 0
closedoor 10, 3 closedoor 10, 3
waitdooranim waitdooranim

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

@ -15,7 +15,7 @@
"connections": null, "connections": null,
"object_events": [ "object_events": [
{ {
"graphics_id": "EVENT_OBJ_GFX_EXPERT_M", "graphics_id": "OBJ_EVENT_GFX_EXPERT_M",
"x": 5, "x": 5,
"y": 6, "y": 6,
"elevation": 0, "elevation": 0,
@ -28,7 +28,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT",
"x": 11, "x": 11,
"y": 8, "y": 8,
"elevation": 0, "elevation": 0,
@ -41,7 +41,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_MANIAC", "graphics_id": "OBJ_EVENT_GFX_MANIAC",
"x": 24, "x": 24,
"y": 5, "y": 5,
"elevation": 0, "elevation": 0,
@ -54,7 +54,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_MAN_3", "graphics_id": "OBJ_EVENT_GFX_MAN_3",
"x": 18, "x": 18,
"y": 10, "y": 10,
"elevation": 0, "elevation": 0,
@ -67,7 +67,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_BEAUTY", "graphics_id": "OBJ_EVENT_GFX_BEAUTY",
"x": 2, "x": 2,
"y": 10, "y": 10,
"elevation": 0, "elevation": 0,
@ -80,7 +80,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_EXPERT_M", "graphics_id": "OBJ_EVENT_GFX_EXPERT_M",
"x": 19, "x": 19,
"y": 6, "y": 6,
"elevation": 0, "elevation": 0,

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

@ -9,7 +9,7 @@ BattleFrontier_BattlePalaceLobby_OnWarp: @ 824D789
BattleFrontier_BattlePalaceLobby_EventScript_TurnPlayerNorth:: @ 824D793 BattleFrontier_BattlePalaceLobby_EventScript_TurnPlayerNorth:: @ 824D793
setvar VAR_TEMP_1, 1 setvar VAR_TEMP_1, 1
turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
end end
BattleFrontier_BattlePalaceLobby_OnFrame: @ 824D79D BattleFrontier_BattlePalaceLobby_OnFrame: @ 824D79D
@ -251,7 +251,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_WalkToDoor:: @ 824DBBC
compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES
call_if_eq BattleFrontier_BattlePalaceLobby_EventScript_TalkedToDoublesAttendant call_if_eq BattleFrontier_BattlePalaceLobby_EventScript_TalkedToDoublesAttendant
applymovement VAR_LAST_TALKED, BattleFrontier_BattlePalaceLobby_Movement_WalkToDoor applymovement VAR_LAST_TALKED, BattleFrontier_BattlePalaceLobby_Movement_WalkToDoor
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePalaceLobby_Movement_WalkToDoor applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePalaceLobby_Movement_WalkToDoor
waitmovement 0 waitmovement 0
compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES
call_if_eq BattleFrontier_BattlePalaceLobby_EventScript_OpenSinglesHallDoor call_if_eq BattleFrontier_BattlePalaceLobby_EventScript_OpenSinglesHallDoor
@ -259,7 +259,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_WalkToDoor:: @ 824DBBC
call_if_eq BattleFrontier_BattlePalaceLobby_EventScript_OpenDoublesHallDoor call_if_eq BattleFrontier_BattlePalaceLobby_EventScript_OpenDoublesHallDoor
waitdooranim waitdooranim
applymovement VAR_LAST_TALKED, BattleFrontier_BattlePalaceLobby_Movement_AttendantEnterDoor applymovement VAR_LAST_TALKED, BattleFrontier_BattlePalaceLobby_Movement_AttendantEnterDoor
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePalaceLobby_Movement_PlayerEnterDoor applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePalaceLobby_Movement_PlayerEnterDoor
waitmovement 0 waitmovement 0
compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES
call_if_eq BattleFrontier_BattlePalaceLobby_EventScript_CloseSinglesHallDoor call_if_eq BattleFrontier_BattlePalaceLobby_EventScript_CloseSinglesHallDoor

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

@ -15,7 +15,7 @@
"connections": null, "connections": null,
"object_events": [ "object_events": [
{ {
"graphics_id": "EVENT_OBJ_GFX_LINK_RECEPTIONIST", "graphics_id": "OBJ_EVENT_GFX_LINK_RECEPTIONIST",
"x": 6, "x": 6,
"y": 6, "y": 6,
"elevation": 3, "elevation": 3,

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

@ -12,14 +12,14 @@ BattleFrontier_BattlePikeCorridor_EventScript_EnterCorridor:: @ 825C786
frontier_set FRONTIER_DATA_BATTLE_NUM, 1 frontier_set FRONTIER_DATA_BATTLE_NUM, 1
pike_cleartrainerids pike_cleartrainerids
pike_nohealing TRUE pike_nohealing TRUE
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeCorridor_Movement_PlayerEnterCorridor applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePikeCorridor_Movement_PlayerEnterCorridor
applymovement 1, BattleFrontier_BattlePikeCorridor_Movement_AttendantEnterCorridor applymovement 1, BattleFrontier_BattlePikeCorridor_Movement_AttendantEnterCorridor
waitmovement 0 waitmovement 0
lockall lockall
msgbox BattleFrontier_BattlePikeCorridor_Text_YourChallengeHasBegun, MSGBOX_DEFAULT msgbox BattleFrontier_BattlePikeCorridor_Text_YourChallengeHasBegun, MSGBOX_DEFAULT
closemessage closemessage
releaseall releaseall
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeCorridor_Movement_PlayerExitCorridor applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePikeCorridor_Movement_PlayerExitCorridor
waitmovement 0 waitmovement 0
frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 99 frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 99
call BattleFrontier_BattlePike_EventScript_CloseCurtain call BattleFrontier_BattlePike_EventScript_CloseCurtain
@ -33,7 +33,7 @@ BattleFrontier_BattlePikeCorridor_OnWarp: @ 825C7F7
BattleFrontier_BattlePikeCorridor_EventScript_TurnPlayerNorth:: @ 825C801 BattleFrontier_BattlePikeCorridor_EventScript_TurnPlayerNorth:: @ 825C801
setvar VAR_TEMP_1, 1 setvar VAR_TEMP_1, 1
turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
end end
BattleFrontier_BattlePikeCorridor_Movement_PlayerEnterCorridor: @ 825C80B BattleFrontier_BattlePikeCorridor_Movement_PlayerEnterCorridor: @ 825C80B

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

@ -15,7 +15,7 @@
"connections": null, "connections": null,
"object_events": [ "object_events": [
{ {
"graphics_id": "EVENT_OBJ_GFX_LINK_RECEPTIONIST", "graphics_id": "OBJ_EVENT_GFX_LINK_RECEPTIONIST",
"x": 5, "x": 5,
"y": 5, "y": 5,
"elevation": 3, "elevation": 3,
@ -28,7 +28,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_HIKER", "graphics_id": "OBJ_EVENT_GFX_HIKER",
"x": 10, "x": 10,
"y": 9, "y": 9,
"elevation": 3, "elevation": 3,
@ -41,7 +41,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_TWIN", "graphics_id": "OBJ_EVENT_GFX_TWIN",
"x": 0, "x": 0,
"y": 5, "y": 5,
"elevation": 3, "elevation": 3,
@ -54,7 +54,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_BEAUTY", "graphics_id": "OBJ_EVENT_GFX_BEAUTY",
"x": 8, "x": 8,
"y": 9, "y": 9,
"elevation": 3, "elevation": 3,

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

@ -16,7 +16,7 @@ BattleFrontier_BattlePikeLobby_OnWarp: @ 825B6F3
BattleFrontier_BattlePikeLobby_EventScript_TurnPlayerNorth:: @ 825B6FD BattleFrontier_BattlePikeLobby_EventScript_TurnPlayerNorth:: @ 825B6FD
setvar VAR_TEMP_1, 1 setvar VAR_TEMP_1, 1
turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
end end
BattleFrontier_BattlePikeLobby_EventScript_GetChallengeStatus:: @ 825B707 BattleFrontier_BattlePikeLobby_EventScript_GetChallengeStatus:: @ 825B707
@ -201,7 +201,7 @@ BattleFrontier_BattlePikeLobby_EventScript_ShowResults:: @ 825BA80
BattleFrontier_BattlePikeLobby_EventScript_WalkToCorridor:: @ 825BA94 BattleFrontier_BattlePikeLobby_EventScript_WalkToCorridor:: @ 825BA94
applymovement 1, BattleFrontier_BattlePikeLobby_Movement_AttendantWalkToCorridor applymovement 1, BattleFrontier_BattlePikeLobby_Movement_AttendantWalkToCorridor
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeLobby_Movement_PlayerWalkToCorridor applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePikeLobby_Movement_PlayerWalkToCorridor
waitmovement 0 waitmovement 0
return return

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

@ -15,7 +15,7 @@
"connections": null, "connections": null,
"object_events": [ "object_events": [
{ {
"graphics_id": "EVENT_OBJ_GFX_LINK_RECEPTIONIST", "graphics_id": "OBJ_EVENT_GFX_LINK_RECEPTIONIST",
"x": 2, "x": 2,
"y": 4, "y": 4,
"elevation": 3, "elevation": 3,

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

@ -31,7 +31,7 @@ BattleFrontier_BattlePikeRoomFinal_OnWarp: @ 825E3DE
BattleFrontier_BattlePikeRoomFinal_EventScript_TurnPlayerNorth:: @ 825E3E8 BattleFrontier_BattlePikeRoomFinal_EventScript_TurnPlayerNorth:: @ 825E3E8
setvar VAR_TEMP_4, 1 setvar VAR_TEMP_4, 1
turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
end end
BattleFrontier_BattlePikeRoomFinal_Text_CongratsThisWayPlease: @ 825E3F2 BattleFrontier_BattlePikeRoomFinal_Text_CongratsThisWayPlease: @ 825E3F2

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

@ -15,7 +15,7 @@
"connections": null, "connections": null,
"object_events": [ "object_events": [
{ {
"graphics_id": "EVENT_OBJ_GFX_VAR_0", "graphics_id": "OBJ_EVENT_GFX_VAR_0",
"x": 4, "x": 4,
"y": 4, "y": 4,
"elevation": 3, "elevation": 3,
@ -28,7 +28,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_VAR_1", "graphics_id": "OBJ_EVENT_GFX_VAR_1",
"x": 3, "x": 3,
"y": 4, "y": 4,
"elevation": 3, "elevation": 3,

14
data/maps/BattleFrontier_BattlePikeRoomNormal/scripts.inc
View File

@ -103,7 +103,7 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_LucyEnter:: @ 825D2FB
msgbox BattleFrontier_BattlePikeRoomNormal_Text_ShallFetchOurMaster, MSGBOX_DEFAULT msgbox BattleFrontier_BattlePikeRoomNormal_Text_ShallFetchOurMaster, MSGBOX_DEFAULT
closemessage closemessage
special SpawnCameraObject special SpawnCameraObject
applymovement EVENT_OBJ_ID_CAMERA, BattleFrontier_BattlePikeRoomNormal_Movement_CameraPanUp applymovement OBJ_EVENT_ID_CAMERA, BattleFrontier_BattlePikeRoomNormal_Movement_CameraPanUp
applymovement 2, BattleFrontier_BattlePikeRoomNormal_Movement_HealNPCExitForLucy applymovement 2, BattleFrontier_BattlePikeRoomNormal_Movement_HealNPCExitForLucy
waitmovement 0 waitmovement 0
playse SE_CURTAIN playse SE_CURTAIN
@ -190,7 +190,7 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_DefeatedLucyGold:: @ 825D460
BattleFrontier_BattlePikeRoomNormal_EventScript_DefeatedLucy:: @ 825D49D BattleFrontier_BattlePikeRoomNormal_EventScript_DefeatedLucy:: @ 825D49D
applymovement 1, BattleFrontier_BattlePikeRoomNormal_Movement_LucyMoveAside applymovement 1, BattleFrontier_BattlePikeRoomNormal_Movement_LucyMoveAside
waitmovement 0 waitmovement 0
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeRoomNormal_Movement_PlayerWalkUp2 applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePikeRoomNormal_Movement_PlayerWalkUp2
waitmovement 0 waitmovement 0
pike_get PIKE_DATA_WIN_STREAK pike_get PIKE_DATA_WIN_STREAK
addvar VAR_RESULT, 1 addvar VAR_RESULT, 1
@ -247,13 +247,13 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_EnterDoubleBattleRoom:: @ 825D53
applymovement 1, BattleFrontier_BattlePikeRoomNormal_Movement_Trainer1FacePlayer applymovement 1, BattleFrontier_BattlePikeRoomNormal_Movement_Trainer1FacePlayer
applymovement 2, BattleFrontier_BattlePikeRoomNormal_Movement_Trainer2FacePlayer applymovement 2, BattleFrontier_BattlePikeRoomNormal_Movement_Trainer2FacePlayer
waitmovement 0 waitmovement 0
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeRoomNormal_Movement_PlayerFaceTrainer1 applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePikeRoomNormal_Movement_PlayerFaceTrainer1
waitmovement 0 waitmovement 0
pike_gettrainerintro 0 pike_gettrainerintro 0
msgbox gStringVar4, MSGBOX_DEFAULT msgbox gStringVar4, MSGBOX_DEFAULT
closemessage closemessage
delay 16 delay 16
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeRoomNormal_Movement_PlayerFaceTrainer2 applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePikeRoomNormal_Movement_PlayerFaceTrainer2
waitmovement 0 waitmovement 0
pike_gettrainerintro 1 pike_gettrainerintro 1
msgbox gStringVar4, MSGBOX_DEFAULT msgbox gStringVar4, MSGBOX_DEFAULT
@ -268,13 +268,13 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_EnterDoubleBattleRoom:: @ 825D53
end end
BattleFrontier_BattlePikeRoomNormal_EventScript_WonDoubleBattle:: @ 825D5DC BattleFrontier_BattlePikeRoomNormal_EventScript_WonDoubleBattle:: @ 825D5DC
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeRoomNormal_Movement_PlayerFaceTrainer2 applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePikeRoomNormal_Movement_PlayerFaceTrainer2
waitmovement 0 waitmovement 0
applymovement 1, BattleFrontier_BattlePikeRoomNormal_Movement_Trainer1Exit applymovement 1, BattleFrontier_BattlePikeRoomNormal_Movement_Trainer1Exit
waitmovement 0 waitmovement 0
applymovement 2, BattleFrontier_BattlePikeRoomNormal_Movement_Trainer2Exit applymovement 2, BattleFrontier_BattlePikeRoomNormal_Movement_Trainer2Exit
waitmovement 0 waitmovement 0
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeRoomNormal_Movement_PlayerFaceUp applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePikeRoomNormal_Movement_PlayerFaceUp
waitmovement 0 waitmovement 0
end end
@ -392,7 +392,7 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_DusclopsUsedWillOWisp:: @ 825D77
BattleFrontier_BattlePikeRoomNormal_EventScript_DoPikeQueenBattle:: @ 825D77B BattleFrontier_BattlePikeRoomNormal_EventScript_DoPikeQueenBattle:: @ 825D77B
closemessage closemessage
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeRoomNormal_Movement_PlayerWalkUp2 applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePikeRoomNormal_Movement_PlayerWalkUp2
waitmovement 0 waitmovement 0
setvar VAR_0x8004, SPECIAL_BATTLE_PIKE_SINGLE setvar VAR_0x8004, SPECIAL_BATTLE_PIKE_SINGLE
setvar VAR_0x8005, 0 setvar VAR_0x8005, 0

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

@ -26,7 +26,7 @@ BattleFrontier_BattlePikeRoomWildMons_OnWarp: @ 825E466
BattleFrontier_BattlePikeRoomWildMons_EventScript_TurnPlayerNorth:: @ 825E470 BattleFrontier_BattlePikeRoomWildMons_EventScript_TurnPlayerNorth:: @ 825E470
setvar VAR_TEMP_4, 1 setvar VAR_TEMP_4, 1
turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
end end
BattleFrontier_BattlePikeRoomWildMons_OnResume: @ 825E47A BattleFrontier_BattlePikeRoomWildMons_OnResume: @ 825E47A

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

@ -15,7 +15,7 @@
"connections": null, "connections": null,
"object_events": [ "object_events": [
{ {
"graphics_id": "EVENT_OBJ_GFX_LINK_RECEPTIONIST", "graphics_id": "OBJ_EVENT_GFX_LINK_RECEPTIONIST",
"x": 4, "x": 4,
"y": 10, "y": 10,
"elevation": 3, "elevation": 3,
@ -28,7 +28,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_LINK_RECEPTIONIST", "graphics_id": "OBJ_EVENT_GFX_LINK_RECEPTIONIST",
"x": 8, "x": 8,
"y": 5, "y": 5,
"elevation": 3, "elevation": 3,

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

@ -18,7 +18,7 @@ BattleFrontier_BattlePikeThreePathRoom_OnWarp: @ 825C87D
BattleFrontier_BattlePikeThreePathRoom_EventScript_TurnPlayerNorth:: @ 825C887 BattleFrontier_BattlePikeThreePathRoom_EventScript_TurnPlayerNorth:: @ 825C887
setvar VAR_TEMP_4, 1 setvar VAR_TEMP_4, 1
turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
end end
BattleFrontier_BattlePikeThreePathRoom_EventScript_GetChallengeStatus:: @ 825C891 BattleFrontier_BattlePikeThreePathRoom_EventScript_GetChallengeStatus:: @ 825C891

32
data/maps/BattleFrontier_BattlePyramidFloor/map.json
View File

@ -15,7 +15,7 @@
"connections": null, "connections": null,
"object_events": [ "object_events": [
{ {
"graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", "graphics_id": "OBJ_EVENT_GFX_NINJA_BOY",
"x": 0, "x": 0,
"y": 0, "y": 0,
"elevation": 0, "elevation": 0,
@ -28,7 +28,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL", "graphics_id": "OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL",
"x": 1, "x": 1,
"y": 0, "y": 0,
"elevation": 3, "elevation": 3,
@ -41,7 +41,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL", "graphics_id": "OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL",
"x": 2, "x": 2,
"y": 0, "y": 0,
"elevation": 3, "elevation": 3,
@ -54,7 +54,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL", "graphics_id": "OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL",
"x": 3, "x": 3,
"y": 0, "y": 0,
"elevation": 3, "elevation": 3,
@ -67,7 +67,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL", "graphics_id": "OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL",
"x": 4, "x": 4,
"y": 0, "y": 0,
"elevation": 3, "elevation": 3,
@ -80,7 +80,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL", "graphics_id": "OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL",
"x": 5, "x": 5,
"y": 0, "y": 0,
"elevation": 3, "elevation": 3,
@ -93,7 +93,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL", "graphics_id": "OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL",
"x": 6, "x": 6,
"y": 0, "y": 0,
"elevation": 3, "elevation": 3,
@ -106,7 +106,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL", "graphics_id": "OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL",
"x": 7, "x": 7,
"y": 0, "y": 0,
"elevation": 0, "elevation": 0,
@ -119,7 +119,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL", "graphics_id": "OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL",
"x": 0, "x": 0,
"y": 1, "y": 1,
"elevation": 3, "elevation": 3,
@ -132,7 +132,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL", "graphics_id": "OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL",
"x": 1, "x": 1,
"y": 1, "y": 1,
"elevation": 3, "elevation": 3,
@ -145,7 +145,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL", "graphics_id": "OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL",
"x": 3, "x": 3,
"y": 1, "y": 1,
"elevation": 0, "elevation": 0,
@ -158,7 +158,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL", "graphics_id": "OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL",
"x": 4, "x": 4,
"y": 1, "y": 1,
"elevation": 0, "elevation": 0,
@ -171,7 +171,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL", "graphics_id": "OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL",
"x": 5, "x": 5,
"y": 1, "y": 1,
"elevation": 0, "elevation": 0,
@ -184,7 +184,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL", "graphics_id": "OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL",
"x": 6, "x": 6,
"y": 1, "y": 1,
"elevation": 0, "elevation": 0,
@ -197,7 +197,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL", "graphics_id": "OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL",
"x": 7, "x": 7,
"y": 1, "y": 1,
"elevation": 0, "elevation": 0,
@ -210,7 +210,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL", "graphics_id": "OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL",
"x": 2, "x": 2,
"y": 1, "y": 1,
"elevation": 0, "elevation": 0,

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

@ -15,7 +15,7 @@
"connections": null, "connections": null,
"object_events": [ "object_events": [
{ {
"graphics_id": "EVENT_OBJ_GFX_HIKER", "graphics_id": "OBJ_EVENT_GFX_HIKER",
"x": 7, "x": 7,
"y": 12, "y": 12,
"elevation": 4, "elevation": 4,
@ -28,7 +28,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_HEX_MANIAC", "graphics_id": "OBJ_EVENT_GFX_HEX_MANIAC",
"x": 14, "x": 14,
"y": 13, "y": 13,
"elevation": 4, "elevation": 4,
@ -41,7 +41,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_WOMAN_3", "graphics_id": "OBJ_EVENT_GFX_WOMAN_3",
"x": 2, "x": 2,
"y": 15, "y": 15,
"elevation": 4, "elevation": 4,
@ -54,7 +54,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_FAT_MAN", "graphics_id": "OBJ_EVENT_GFX_FAT_MAN",
"x": 12, "x": 12,
"y": 16, "y": 16,
"elevation": 4, "elevation": 4,

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

@ -10,7 +10,7 @@ BattleFrontier_BattlePyramidLobby_OnWarp: @ 8250721
BattleFrontier_BattlePyramidLobby_EventScript_TurnPlayerNorth: @ 825072B BattleFrontier_BattlePyramidLobby_EventScript_TurnPlayerNorth: @ 825072B
setvar VAR_TEMP_1, 1 setvar VAR_TEMP_1, 1
turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
end end
BattleFrontier_BattlePyramidLobby_OnFrame: @ 8250735 BattleFrontier_BattlePyramidLobby_OnFrame: @ 8250735
@ -371,7 +371,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_ShowResults:: @ 8250D42
BattleFrontier_BattlePyramidLobby_EventScript_WalkToPanelAndReceiveBag:: @ 8250D56 BattleFrontier_BattlePyramidLobby_EventScript_WalkToPanelAndReceiveBag:: @ 8250D56
applymovement 1, BattleFrontier_BattlePyramidLobby_Movement_AttendantWalkToPanel applymovement 1, BattleFrontier_BattlePyramidLobby_Movement_AttendantWalkToPanel
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePyramidLobby_Movement_PlayerWalkToPanel applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePyramidLobby_Movement_PlayerWalkToPanel
waitmovement 0 waitmovement 0
msgbox BattleFrontier_BattlePyramidLobby_Text_WeWillHoldBagForSafekeeping, MSGBOX_DEFAULT msgbox BattleFrontier_BattlePyramidLobby_Text_WeWillHoldBagForSafekeeping, MSGBOX_DEFAULT
pyramid_get PYRAMID_DATA_WIN_STREAK pyramid_get PYRAMID_DATA_WIN_STREAK
@ -391,7 +391,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_ReceiveBattleBag:: @ 8250D9C
closemessage closemessage
applymovement 1, BattleFrontier_BattlePyramidLobby_Movement_AttendantMoveAside applymovement 1, BattleFrontier_BattlePyramidLobby_Movement_AttendantMoveAside
waitmovement 0 waitmovement 0
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePyramidLobby_Movement_PlayerStepOnPanel applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePyramidLobby_Movement_PlayerStepOnPanel
waitmovement 0 waitmovement 0
return return

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

@ -15,7 +15,7 @@
"connections": null, "connections": null,
"object_events": [ "object_events": [
{ {
"graphics_id": "EVENT_OBJ_GFX_HIKER", "graphics_id": "OBJ_EVENT_GFX_HIKER",
"x": 17, "x": 17,
"y": 11, "y": 11,
"elevation": 6, "elevation": 6,
@ -28,7 +28,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_BRANDON", "graphics_id": "OBJ_EVENT_GFX_BRANDON",
"x": 17, "x": 17,
"y": 7, "y": 7,
"elevation": 0, "elevation": 0,

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

@ -16,7 +16,7 @@ BattleFrontier_BattlePyramidTop_OnWarp: @ 82550CE
BattleFrontier_BattlePyramidTop_EventScript_SetUpObjects:: @ 82550D8 BattleFrontier_BattlePyramidTop_EventScript_SetUpObjects:: @ 82550D8
setvar VAR_TEMP_1, 1 setvar VAR_TEMP_1, 1
turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
compare VAR_TEMP_C, 0 compare VAR_TEMP_C, 0
goto_if_ne BattleFrontier_BattlePyramidTop_EventScript_EndSetUpObjects goto_if_ne BattleFrontier_BattlePyramidTop_EventScript_EndSetUpObjects
setobjectxyperm 2, 0, 0 setobjectxyperm 2, 0, 0
@ -79,7 +79,7 @@ BattleFrontier_BattlePyramidTop_EventScript_Attendant:: @ 82551D0
closemessage closemessage
applymovement 1, BattleFrontier_BattlePyramidTop_Movement_AttendantMoveAside applymovement 1, BattleFrontier_BattlePyramidTop_Movement_AttendantMoveAside
waitmovement 0 waitmovement 0
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePyramidTop_Movement_PlayerClimbToTop applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePyramidTop_Movement_PlayerClimbToTop
waitmovement 0 waitmovement 0
applymovement 1, BattleFrontier_BattlePyramidTop_Movement_AttendantBlockPath applymovement 1, BattleFrontier_BattlePyramidTop_Movement_AttendantBlockPath
waitmovement 0 waitmovement 0
@ -116,7 +116,7 @@ BattleFrontier_BattlePyramidTop_EventScript_BattleBrandon:: @ 8255256
compare VAR_RESULT, FALSE compare VAR_RESULT, FALSE
goto_if_ne BattleFrontier_BattlePyramidTop_EventScript_BrandonHeardSilverSpeech goto_if_ne BattleFrontier_BattlePyramidTop_EventScript_BrandonHeardSilverSpeech
special SpawnCameraObject special SpawnCameraObject
applymovement EVENT_OBJ_ID_CAMERA, BattleFrontier_BattlePyramidTop_Movement_CameraPanUp applymovement OBJ_EVENT_ID_CAMERA, BattleFrontier_BattlePyramidTop_Movement_CameraPanUp
waitmovement 0 waitmovement 0
msgbox BattleFrontier_BattlePyramidTop_Text_ExplorationsAreGrandestAdventure, MSGBOX_DEFAULT msgbox BattleFrontier_BattlePyramidTop_Text_ExplorationsAreGrandestAdventure, MSGBOX_DEFAULT
closemessage closemessage
@ -156,7 +156,7 @@ BattleFrontier_BattlePyramidTop_EventScript_BrandonIntroGold:: @ 8255335
compare VAR_RESULT, FALSE compare VAR_RESULT, FALSE
goto_if_ne BattleFrontier_BattlePyramidTop_EventScript_BrandonHeardGoldSpeech goto_if_ne BattleFrontier_BattlePyramidTop_EventScript_BrandonHeardGoldSpeech
special SpawnCameraObject special SpawnCameraObject
applymovement EVENT_OBJ_ID_CAMERA, BattleFrontier_BattlePyramidTop_Movement_CameraPanUp applymovement OBJ_EVENT_ID_CAMERA, BattleFrontier_BattlePyramidTop_Movement_CameraPanUp
waitmovement 0 waitmovement 0
msgbox BattleFrontier_BattlePyramidTop_Text_BrandonYouveReturned, MSGBOX_DEFAULT msgbox BattleFrontier_BattlePyramidTop_Text_BrandonYouveReturned, MSGBOX_DEFAULT
closemessage closemessage

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

@ -15,7 +15,7 @@
"connections": null, "connections": null,
"object_events": [ "object_events": [
{ {
"graphics_id": "EVENT_OBJ_GFX_VAR_0", "graphics_id": "OBJ_EVENT_GFX_VAR_0",
"x": 5, "x": 5,
"y": 1, "y": 1,
"elevation": 3, "elevation": 3,
@ -28,7 +28,7 @@
"flag": "FLAG_HIDE_BATTLE_TOWER_OPPONENT" "flag": "FLAG_HIDE_BATTLE_TOWER_OPPONENT"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_TEALA", "graphics_id": "OBJ_EVENT_GFX_TEALA",
"x": 1, "x": 1,
"y": 7, "y": 7,
"elevation": 3, "elevation": 3,
@ -41,7 +41,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_TEALA", "graphics_id": "OBJ_EVENT_GFX_TEALA",
"x": 4, "x": 4,
"y": 8, "y": 8,
"elevation": 3, "elevation": 3,

10
data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc
View File

@ -18,14 +18,14 @@ BattleFrontier_BattleTowerBattleRoom_OnFrame: @ 8241B62
BattleFrontier_BattleTowerBattleRoom_EventScript_EnterRoom:: @ 8241B6C BattleFrontier_BattleTowerBattleRoom_EventScript_EnterRoom:: @ 8241B6C
setvar VAR_TEMP_0, 1 setvar VAR_TEMP_0, 1
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleTowerBattleRoom_Movement_PlayerEnter applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleTowerBattleRoom_Movement_PlayerEnter
waitmovement 0 waitmovement 0
frontier_get FRONTIER_DATA_BATTLE_NUM frontier_get FRONTIER_DATA_BATTLE_NUM
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_if_eq BattleFrontier_BattleTowerBattleRoom_EventScript_OpponentEnter goto_if_eq BattleFrontier_BattleTowerBattleRoom_EventScript_OpponentEnter
applymovement 2, BattleFrontier_BattleTowerBattleRoom_Movement_AttendantApproachPlayer applymovement 2, BattleFrontier_BattleTowerBattleRoom_Movement_AttendantApproachPlayer
waitmovement 0 waitmovement 0
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleTowerBattleRoom_Movement_PlayerFaceAttendant applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleTowerBattleRoom_Movement_PlayerFaceAttendant
waitmovement 0 waitmovement 0
setvar VAR_TEMP_2, 1 setvar VAR_TEMP_2, 1
frontier_set FRONTIER_DATA_RECORD_DISABLED, TRUE frontier_set FRONTIER_DATA_RECORD_DISABLED, TRUE
@ -62,7 +62,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_DefeatedOpponent:: @ 8241C2F
call_if_ne BattleFrontier_BattleTowerBattleRoom_EventScript_SecondAttendantEnter call_if_ne BattleFrontier_BattleTowerBattleRoom_EventScript_SecondAttendantEnter
applymovement 2, BattleFrontier_BattleTowerBattleRoom_Movement_AttendantApproachPlayer applymovement 2, BattleFrontier_BattleTowerBattleRoom_Movement_AttendantApproachPlayer
waitmovement 0 waitmovement 0
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleTowerBattleRoom_Movement_PlayerFaceAttendant applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleTowerBattleRoom_Movement_PlayerFaceAttendant
waitmovement 0 waitmovement 0
msgbox BattleFrontier_BattleTowerBattleRoom_Text_RestoreMonsToFullHealth, MSGBOX_DEFAULT msgbox BattleFrontier_BattleTowerBattleRoom_Text_RestoreMonsToFullHealth, MSGBOX_DEFAULT
playfanfare MUS_ME_ASA playfanfare MUS_ME_ASA
@ -125,7 +125,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_AskRetireChallenge:: @ 8241DAA
BattleFrontier_BattleTowerBattleRoom_EventScript_ContinueChallenge:: @ 8241DDC BattleFrontier_BattleTowerBattleRoom_EventScript_ContinueChallenge:: @ 8241DDC
closemessage closemessage
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleTowerBattleRoom_Movement_PlayerFaceBattle applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleTowerBattleRoom_Movement_PlayerFaceBattle
waitmovement 0 waitmovement 0
applymovement 2, BattleFrontier_BattleTowerBattleRoom_Movement_AttendantReturnToPos applymovement 2, BattleFrontier_BattleTowerBattleRoom_Movement_AttendantReturnToPos
waitmovement 0 waitmovement 0
@ -239,7 +239,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_AskReadyForMaidenNoRecord:: @ 8
BattleFrontier_BattleTowerBattleRoom_EventScript_BattleAnabel:: @ 8241FAF BattleFrontier_BattleTowerBattleRoom_EventScript_BattleAnabel:: @ 8241FAF
call BattleFrontier_EventScript_SetBrainObjectGfx call BattleFrontier_EventScript_SetBrainObjectGfx
closemessage closemessage
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleTowerBattleRoom_Movement_PlayerFaceBattle applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleTowerBattleRoom_Movement_PlayerFaceBattle
waitmovement 0 waitmovement 0
applymovement 2, BattleFrontier_BattleTowerBattleRoom_Movement_AttendantReturnToPos applymovement 2, BattleFrontier_BattleTowerBattleRoom_Movement_AttendantReturnToPos
waitmovement 0 waitmovement 0

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

@ -15,7 +15,7 @@
"connections": null, "connections": null,
"object_events": [ "object_events": [
{ {
"graphics_id": "EVENT_OBJ_GFX_TEALA", "graphics_id": "OBJ_EVENT_GFX_TEALA",
"x": 9, "x": 9,
"y": 2, "y": 2,
"elevation": 3, "elevation": 3,

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

@ -24,13 +24,13 @@ BattleFrontier_BattleTowerCorridor_EventScript_EnterCorridor:: @ 8241AF0
compare VAR_0x8006, 1 compare VAR_0x8006, 1
goto_if_eq BattleFrontier_BattleTowerCorridor_EventScript_WalkToFarDoor goto_if_eq BattleFrontier_BattleTowerCorridor_EventScript_WalkToFarDoor
applymovement 1, BattleFrontier_BattleTowerCorridor_Movement_AttendantWalkToDoor applymovement 1, BattleFrontier_BattleTowerCorridor_Movement_AttendantWalkToDoor
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleTowerCorridor_Movement_PlayerWalkToDoor applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleTowerCorridor_Movement_PlayerWalkToDoor
waitmovement 0 waitmovement 0
goto BattleFrontier_BattleTowerCorridor_EventScript_WarpToBattleRoom goto BattleFrontier_BattleTowerCorridor_EventScript_WarpToBattleRoom
BattleFrontier_BattleTowerCorridor_EventScript_WalkToFarDoor:: @ 8241B16 BattleFrontier_BattleTowerCorridor_EventScript_WalkToFarDoor:: @ 8241B16
applymovement 1, BattleFrontier_BattleTowerCorridor_Movement_AttendantWalkToFarDoor applymovement 1, BattleFrontier_BattleTowerCorridor_Movement_AttendantWalkToFarDoor
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleTowerCorridor_Movement_PlayerWalkToFarDoor applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleTowerCorridor_Movement_PlayerWalkToFarDoor
waitmovement 0 waitmovement 0
BattleFrontier_BattleTowerCorridor_EventScript_WarpToBattleRoom:: @ 8241B27 BattleFrontier_BattleTowerCorridor_EventScript_WarpToBattleRoom:: @ 8241B27

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

@ -15,7 +15,7 @@
"connections": null, "connections": null,
"object_events": [ "object_events": [
{ {
"graphics_id": "EVENT_OBJ_GFX_TEALA", "graphics_id": "OBJ_EVENT_GFX_TEALA",
"x": 1, "x": 1,
"y": 5, "y": 5,
"elevation": 3, "elevation": 3,

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

@ -10,7 +10,7 @@ BattleFrontier_BattleTowerElevator_OnFrame: @ 82419E6
BattleFrontier_BattleTowerElevator_EventScript_EnterElevator:: @ 82419F0 BattleFrontier_BattleTowerElevator_EventScript_EnterElevator:: @ 82419F0
setvar VAR_TEMP_0, 1 setvar VAR_TEMP_0, 1
applymovement 1, BattleFrontier_BattleTowerElevator_Movement_AttendantEnter applymovement 1, BattleFrontier_BattleTowerElevator_Movement_AttendantEnter
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleTowerElevator_Movement_PlayerEnter applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleTowerElevator_Movement_PlayerEnter
waitmovement 0 waitmovement 0
special BufferBattleTowerElevatorFloors special BufferBattleTowerElevatorFloors
waitse waitse
@ -18,7 +18,7 @@ BattleFrontier_BattleTowerElevator_EventScript_EnterElevator:: @ 82419F0
waitstate waitstate
delay 48 delay 48
applymovement 1, BattleFrontier_BattleTowerElevator_Movement_AttendantExit applymovement 1, BattleFrontier_BattleTowerElevator_Movement_AttendantExit
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleTowerElevator_Movement_PlayerExit applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleTowerElevator_Movement_PlayerExit
waitmovement 0 waitmovement 0
call BattleFrontier_BattleTowerElevator_EventScript_WarpToNextRoom call BattleFrontier_BattleTowerElevator_EventScript_WarpToNextRoom
end end
@ -85,6 +85,6 @@ BattleFrontier_BattleTowerElevator_OnWarp: @ 8241A96
BattleFrontier_BattleTowerElevator_EventScript_TurnPlayerNorth:: @ 8241AA0 BattleFrontier_BattleTowerElevator_EventScript_TurnPlayerNorth:: @ 8241AA0
setvar VAR_TEMP_1, 1 setvar VAR_TEMP_1, 1
turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
end end

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

@ -15,7 +15,7 @@
"connections": null, "connections": null,
"object_events": [ "object_events": [
{ {
"graphics_id": "EVENT_OBJ_GFX_TEALA", "graphics_id": "OBJ_EVENT_GFX_TEALA",
"x": 6, "x": 6,
"y": 5, "y": 5,
"elevation": 3, "elevation": 3,
@ -28,7 +28,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_MAN_4", "graphics_id": "OBJ_EVENT_GFX_MAN_4",
"x": 23, "x": 23,
"y": 5, "y": 5,
"elevation": 3, "elevation": 3,
@ -41,7 +41,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_WOMAN_5", "graphics_id": "OBJ_EVENT_GFX_WOMAN_5",
"x": 17, "x": 17,
"y": 8, "y": 8,
"elevation": 3, "elevation": 3,
@ -54,7 +54,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_BOY_1", "graphics_id": "OBJ_EVENT_GFX_BOY_1",
"x": 15, "x": 15,
"y": 9, "y": 9,
"elevation": 3, "elevation": 3,
@ -67,7 +67,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_REPORTER_F", "graphics_id": "OBJ_EVENT_GFX_REPORTER_F",
"x": 11, "x": 11,
"y": 9, "y": 9,
"elevation": 3, "elevation": 3,
@ -80,7 +80,7 @@
"flag": "FLAG_HIDE_BATTLE_TOWER_REPORTER" "flag": "FLAG_HIDE_BATTLE_TOWER_REPORTER"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_VAR_0", "graphics_id": "OBJ_EVENT_GFX_VAR_0",
"x": 1, "x": 1,
"y": 5, "y": 5,
"elevation": 3, "elevation": 3,
@ -93,7 +93,7 @@
"flag": "FLAG_HIDE_APPRENTICE" "flag": "FLAG_HIDE_APPRENTICE"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_TEALA", "graphics_id": "OBJ_EVENT_GFX_TEALA",
"x": 10, "x": 10,
"y": 5, "y": 5,
"elevation": 3, "elevation": 3,
@ -106,7 +106,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_TEALA", "graphics_id": "OBJ_EVENT_GFX_TEALA",
"x": 14, "x": 14,
"y": 5, "y": 5,
"elevation": 3, "elevation": 3,
@ -119,7 +119,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_TEALA", "graphics_id": "OBJ_EVENT_GFX_TEALA",
"x": 18, "x": 18,
"y": 5, "y": 5,
"elevation": 3, "elevation": 3,

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

@ -31,7 +31,7 @@ BattleFrontier_BattleTowerLobby_OnWarp: @ 823E6C9
BattleFrontier_BattleTowerLobby_EventScript_PlayerFaceNorth:: @ 823E6D3 BattleFrontier_BattleTowerLobby_EventScript_PlayerFaceNorth:: @ 823E6D3
setvar VAR_TEMP_1, 1 setvar VAR_TEMP_1, 1
turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
end end
BattleFrontier_BattleTowerLobby_OnFrame: @ 823E6DD BattleFrontier_BattleTowerLobby_OnFrame: @ 823E6DD
@ -629,12 +629,12 @@ BattleFrontier_BattleTowerLobby_EventScript_WalkToElevator:: @ 823F15B
call BattleFrontier_BattleTowerLobby_EventScript_SetAttendantTalkedTo call BattleFrontier_BattleTowerLobby_EventScript_SetAttendantTalkedTo
call BattleFrontier_BattleTowerLobby_EventScript_GetDoorXCoord call BattleFrontier_BattleTowerLobby_EventScript_GetDoorXCoord
applymovement VAR_LAST_TALKED, BattleFrontier_BattleTowerLobby_Movement_WalkToElevator applymovement VAR_LAST_TALKED, BattleFrontier_BattleTowerLobby_Movement_WalkToElevator
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleTowerLobby_Movement_WalkToElevator applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleTowerLobby_Movement_WalkToElevator
waitmovement 0 waitmovement 0
opendoor VAR_0x8004, 1 opendoor VAR_0x8004, 1
waitdooranim waitdooranim
applymovement VAR_LAST_TALKED, BattleFrontier_BattleTowerLobby_Movement_AttendantEnterElevator applymovement VAR_LAST_TALKED, BattleFrontier_BattleTowerLobby_Movement_AttendantEnterElevator
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleTowerLobby_Movement_PlayerEnterElevator applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleTowerLobby_Movement_PlayerEnterElevator
waitmovement 0 waitmovement 0
closedoor VAR_0x8004, 1 closedoor VAR_0x8004, 1
waitdooranim waitdooranim

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

@ -15,7 +15,7 @@
"connections": null, "connections": null,
"object_events": [ "object_events": [
{ {
"graphics_id": "EVENT_OBJ_GFX_VAR_0", "graphics_id": "OBJ_EVENT_GFX_VAR_0",
"x": 5, "x": 5,
"y": 1, "y": 1,
"elevation": 3, "elevation": 3,
@ -28,7 +28,7 @@
"flag": "FLAG_HIDE_BATTLE_TOWER_OPPONENT" "flag": "FLAG_HIDE_BATTLE_TOWER_OPPONENT"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_TEALA", "graphics_id": "OBJ_EVENT_GFX_TEALA",
"x": 1, "x": 1,
"y": 4, "y": 4,
"elevation": 3, "elevation": 3,
@ -41,7 +41,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_TEALA", "graphics_id": "OBJ_EVENT_GFX_TEALA",
"x": 1, "x": 1,
"y": 5, "y": 5,
"elevation": 3, "elevation": 3,
@ -54,7 +54,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_VAR_1", "graphics_id": "OBJ_EVENT_GFX_VAR_1",
"x": 4, "x": 4,
"y": 1, "y": 1,
"elevation": 3, "elevation": 3,
@ -67,7 +67,7 @@
"flag": "FLAG_HIDE_BATTLE_TOWER_OPPONENT" "flag": "FLAG_HIDE_BATTLE_TOWER_OPPONENT"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_VAR_F", "graphics_id": "OBJ_EVENT_GFX_VAR_F",
"x": 4, "x": 4,
"y": 8, "y": 8,
"elevation": 3, "elevation": 3,
@ -80,7 +80,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_VAR_E", "graphics_id": "OBJ_EVENT_GFX_VAR_E",
"x": 5, "x": 5,
"y": 8, "y": 8,
"elevation": 3, "elevation": 3,

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

@ -20,11 +20,11 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_SetObjGfx:: @ 8248F0F
checkplayergender checkplayergender
compare VAR_RESULT, FEMALE compare VAR_RESULT, FEMALE
goto_if_eq BattleFrontier_BattleTowerMultiBattleRoom_EventScript_SetPlayerGfxFemale goto_if_eq BattleFrontier_BattleTowerMultiBattleRoom_EventScript_SetPlayerGfxFemale
setvar VAR_OBJ_GFX_ID_F, EVENT_OBJ_GFX_BRENDAN_NORMAL setvar VAR_OBJ_GFX_ID_F, OBJ_EVENT_GFX_BRENDAN_NORMAL
return return
BattleFrontier_BattleTowerMultiBattleRoom_EventScript_SetPlayerGfxFemale:: @ 8248F29 BattleFrontier_BattleTowerMultiBattleRoom_EventScript_SetPlayerGfxFemale:: @ 8248F29
setvar VAR_OBJ_GFX_ID_F, EVENT_OBJ_GFX_MAY_NORMAL setvar VAR_OBJ_GFX_ID_F, OBJ_EVENT_GFX_MAY_NORMAL
return return
BattleFrontier_BattleTowerMultiBattleRoom_EventScript_SetLinkPlayerGfx:: @ 8248F2F BattleFrontier_BattleTowerMultiBattleRoom_EventScript_SetLinkPlayerGfx:: @ 8248F2F
@ -36,7 +36,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_OnWarp: @ 8248F33
.2byte 0 .2byte 0
BattleFrontier_BattleTowerMultiBattleRoom_EventScript_HidePlayerObj:: @ 8248F3D BattleFrontier_BattleTowerMultiBattleRoom_EventScript_HidePlayerObj:: @ 8248F3D
hideobjectat EVENT_OBJ_ID_PLAYER, MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_BATTLE_ROOM hideobjectat OBJ_EVENT_ID_PLAYER, MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_BATTLE_ROOM
end end
BattleFrontier_BattleTowerMultiBattleRoom_OnFrame: @ 8248F43 BattleFrontier_BattleTowerMultiBattleRoom_OnFrame: @ 8248F43

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

@ -15,7 +15,7 @@
"connections": null, "connections": null,
"object_events": [ "object_events": [
{ {
"graphics_id": "EVENT_OBJ_GFX_VAR_F", "graphics_id": "OBJ_EVENT_GFX_VAR_F",
"x": 1, "x": 1,
"y": 1, "y": 1,
"elevation": 0, "elevation": 0,
@ -28,7 +28,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_TEALA", "graphics_id": "OBJ_EVENT_GFX_TEALA",
"x": 14, "x": 14,
"y": 3, "y": 3,
"elevation": 3, "elevation": 3,
@ -41,7 +41,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_TEALA", "graphics_id": "OBJ_EVENT_GFX_TEALA",
"x": 1, "x": 1,
"y": 3, "y": 3,
"elevation": 3, "elevation": 3,
@ -54,7 +54,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_VAR_E", "graphics_id": "OBJ_EVENT_GFX_VAR_E",
"x": 14, "x": 14,
"y": 1, "y": 1,
"elevation": 0, "elevation": 0,

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

@ -20,11 +20,11 @@ BattleFrontier_BattleTowerMultiCorridor_EventScript_SetObjGfx:: @ 8248D71
checkplayergender checkplayergender
compare VAR_RESULT, FEMALE compare VAR_RESULT, FEMALE
goto_if_eq BattleFrontier_BattleTowerMultiCorridor_EventScript_SetPlayerGfxFemale goto_if_eq BattleFrontier_BattleTowerMultiCorridor_EventScript_SetPlayerGfxFemale
setvar VAR_OBJ_GFX_ID_F, EVENT_OBJ_GFX_BRENDAN_NORMAL setvar VAR_OBJ_GFX_ID_F, OBJ_EVENT_GFX_BRENDAN_NORMAL
return return
BattleFrontier_BattleTowerMultiCorridor_EventScript_SetPlayerGfxFemale:: @ 8248D8B BattleFrontier_BattleTowerMultiCorridor_EventScript_SetPlayerGfxFemale:: @ 8248D8B
setvar VAR_OBJ_GFX_ID_F, EVENT_OBJ_GFX_MAY_NORMAL setvar VAR_OBJ_GFX_ID_F, OBJ_EVENT_GFX_MAY_NORMAL
return return
BattleFrontier_BattleTowerMultiCorridor_EventScript_SetLinkPlayerGfx:: @ 8248D91 BattleFrontier_BattleTowerMultiCorridor_EventScript_SetLinkPlayerGfx:: @ 8248D91
@ -36,7 +36,7 @@ BattleFrontier_BattleTowerMultiCorridor_OnWarp: @ 8248D95
.2byte 0 .2byte 0
BattleFrontier_BattleTowerMultiCorridor_EventScript_SetUpObjects:: @ 8248D9F BattleFrontier_BattleTowerMultiCorridor_EventScript_SetUpObjects:: @ 8248D9F
hideobjectat EVENT_OBJ_ID_PLAYER, MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_CORRIDOR hideobjectat OBJ_EVENT_ID_PLAYER, MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_CORRIDOR
hideobjectat 1, MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_CORRIDOR hideobjectat 1, MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_CORRIDOR
hideobjectat 4, MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_CORRIDOR hideobjectat 4, MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_CORRIDOR
special OffsetCameraForBattle special OffsetCameraForBattle

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

@ -15,7 +15,7 @@
"connections": null, "connections": null,
"object_events": [ "object_events": [
{ {
"graphics_id": "EVENT_OBJ_GFX_TEALA", "graphics_id": "OBJ_EVENT_GFX_TEALA",
"x": 11, "x": 11,
"y": 2, "y": 2,
"elevation": 3, "elevation": 3,
@ -28,7 +28,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_VAR_0", "graphics_id": "OBJ_EVENT_GFX_VAR_0",
"x": 2, "x": 2,
"y": 10, "y": 10,
"elevation": 3, "elevation": 3,
@ -41,7 +41,7 @@
"flag": "FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_1" "flag": "FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_1"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_VAR_1", "graphics_id": "OBJ_EVENT_GFX_VAR_1",
"x": 17, "x": 17,
"y": 11, "y": 11,
"elevation": 3, "elevation": 3,
@ -54,7 +54,7 @@
"flag": "FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_2" "flag": "FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_2"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_VAR_2", "graphics_id": "OBJ_EVENT_GFX_VAR_2",
"x": 6, "x": 6,
"y": 9, "y": 9,
"elevation": 3, "elevation": 3,
@ -67,7 +67,7 @@
"flag": "FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_3" "flag": "FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_3"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_VAR_3", "graphics_id": "OBJ_EVENT_GFX_VAR_3",
"x": 8, "x": 8,
"y": 13, "y": 13,
"elevation": 3, "elevation": 3,
@ -80,7 +80,7 @@
"flag": "FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_4" "flag": "FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_4"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_VAR_4", "graphics_id": "OBJ_EVENT_GFX_VAR_4",
"x": 10, "x": 10,
"y": 11, "y": 11,
"elevation": 3, "elevation": 3,
@ -93,7 +93,7 @@
"flag": "FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_5" "flag": "FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_5"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_VAR_5", "graphics_id": "OBJ_EVENT_GFX_VAR_5",
"x": 13, "x": 13,
"y": 10, "y": 10,
"elevation": 3, "elevation": 3,
@ -106,7 +106,7 @@
"flag": "FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_6" "flag": "FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_6"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_VAR_6", "graphics_id": "OBJ_EVENT_GFX_VAR_6",
"x": 15, "x": 15,
"y": 13, "y": 13,
"elevation": 3, "elevation": 3,
@ -119,7 +119,7 @@
"flag": "FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_ALT_1" "flag": "FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_ALT_1"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_VAR_7", "graphics_id": "OBJ_EVENT_GFX_VAR_7",
"x": 4, "x": 4,
"y": 12, "y": 12,
"elevation": 3, "elevation": 3,

28
data/maps/BattleFrontier_BattleTowerMultiPartnerRoom/scripts.inc
View File

@ -23,14 +23,14 @@ BattleFrontier_BattleTowerMultiPartnerRoom_OnTransition: @ 8243DB0
end end
BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_ChosePartner:: @ 8243DDA BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_ChosePartner:: @ 8243DDA
setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_BOY_1 setvar VAR_OBJ_GFX_ID_0, OBJ_EVENT_GFX_BOY_1
setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_BOY_1 setvar VAR_OBJ_GFX_ID_1, OBJ_EVENT_GFX_BOY_1
setvar VAR_OBJ_GFX_ID_2, EVENT_OBJ_GFX_BOY_1 setvar VAR_OBJ_GFX_ID_2, OBJ_EVENT_GFX_BOY_1
setvar VAR_OBJ_GFX_ID_3, EVENT_OBJ_GFX_BOY_1 setvar VAR_OBJ_GFX_ID_3, OBJ_EVENT_GFX_BOY_1
setvar VAR_OBJ_GFX_ID_4, EVENT_OBJ_GFX_BOY_1 setvar VAR_OBJ_GFX_ID_4, OBJ_EVENT_GFX_BOY_1
setvar VAR_OBJ_GFX_ID_5, EVENT_OBJ_GFX_BOY_1 setvar VAR_OBJ_GFX_ID_5, OBJ_EVENT_GFX_BOY_1
setvar VAR_OBJ_GFX_ID_6, EVENT_OBJ_GFX_BOY_1 setvar VAR_OBJ_GFX_ID_6, OBJ_EVENT_GFX_BOY_1
setvar VAR_OBJ_GFX_ID_7, EVENT_OBJ_GFX_BOY_1 setvar VAR_OBJ_GFX_ID_7, OBJ_EVENT_GFX_BOY_1
setvar VAR_TEMP_1, 1 setvar VAR_TEMP_1, 1
setvar VAR_TEMP_3, 1 setvar VAR_TEMP_3, 1
setobjectxyperm 1, 10, 2 setobjectxyperm 1, 10, 2
@ -41,7 +41,7 @@ BattleFrontier_BattleTowerMultiPartnerRoom_OnWarp: @ 8243E14
.2byte 0 .2byte 0
BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_TurnPlayerNorth:: @ 8243E1E BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_TurnPlayerNorth:: @ 8243E1E
turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
end end
BattleFrontier_BattleTowerMultiPartnerRoom_OnFrame: @ 8243E23 BattleFrontier_BattleTowerMultiPartnerRoom_OnFrame: @ 8243E23
@ -57,12 +57,12 @@ BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_ExitRoom:: @ 8243E35
BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_EnterRoom:: @ 8243E41 BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_EnterRoom:: @ 8243E41
lockall lockall
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleTowerMultiPartnerRoom_Movement_PlayerEnterRoom applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleTowerMultiPartnerRoom_Movement_PlayerEnterRoom
waitmovement 0 waitmovement 0
applymovement 1, BattleFrontier_BattleTowerMultiPartnerRoom_Movement_AttendantBlockExit applymovement 1, BattleFrontier_BattleTowerMultiPartnerRoom_Movement_AttendantBlockExit
waitmovement 0 waitmovement 0
copyobjectxytoperm 1 copyobjectxytoperm 1
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
waitmovement 0 waitmovement 0
msgbox BattleFrontier_BattleTowerMultiPartnerRoom_Text_PleaseFindPartner, MSGBOX_DEFAULT msgbox BattleFrontier_BattleTowerMultiPartnerRoom_Text_PleaseFindPartner, MSGBOX_DEFAULT
special HealPlayerParty special HealPlayerParty
@ -113,21 +113,21 @@ BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_EnterElevator:: @ 8243EB5
BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_MoveToElevator:: @ 8243EE4 BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_MoveToElevator:: @ 8243EE4
applymovement 1, BattleFrontier_BattleTowerMultiPartnerRoom_Movement_AttendantEnterElevator applymovement 1, BattleFrontier_BattleTowerMultiPartnerRoom_Movement_AttendantEnterElevator
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleTowerMultiPartnerRoom_Movement_PlayerEnterElevator applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleTowerMultiPartnerRoom_Movement_PlayerEnterElevator
waitmovement 0 waitmovement 0
return return
@ Unused @ Unused
BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_MoveToElevatorEast: @ 8243EF6 BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_MoveToElevatorEast: @ 8243EF6
applymovement 1, BattleFrontier_BattleTowerMultiPartnerRoom_Movement_AttendantEnterElevator applymovement 1, BattleFrontier_BattleTowerMultiPartnerRoom_Movement_AttendantEnterElevator
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleTowerMultiPartnerRoom_Movement_PlayerEnterElevatorEast applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleTowerMultiPartnerRoom_Movement_PlayerEnterElevatorEast
waitmovement 0 waitmovement 0
return return
@ Unused @ Unused
BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_MoveToElevatorWest: @ 8243F08 BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_MoveToElevatorWest: @ 8243F08
applymovement 1, BattleFrontier_BattleTowerMultiPartnerRoom_Movement_AttendantEnterElevator applymovement 1, BattleFrontier_BattleTowerMultiPartnerRoom_Movement_AttendantEnterElevator
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleTowerMultiPartnerRoom_Movement_PlayerEneterElevatorWest applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleTowerMultiPartnerRoom_Movement_PlayerEneterElevatorWest
waitmovement 0 waitmovement 0
return return

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

@ -15,7 +15,7 @@
"connections": null, "connections": null,
"object_events": [ "object_events": [
{ {
"graphics_id": "EVENT_OBJ_GFX_TEALA", "graphics_id": "OBJ_EVENT_GFX_TEALA",
"x": 4, "x": 4,
"y": 4, "y": 4,
"elevation": 0, "elevation": 0,
@ -28,7 +28,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_RICH_BOY", "graphics_id": "OBJ_EVENT_GFX_RICH_BOY",
"x": 0, "x": 0,
"y": 5, "y": 5,
"elevation": 0, "elevation": 0,
@ -41,7 +41,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", "graphics_id": "OBJ_EVENT_GFX_POKEFAN_F",
"x": 0, "x": 0,
"y": 4, "y": 4,
"elevation": 0, "elevation": 0,
@ -54,7 +54,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_SAILOR", "graphics_id": "OBJ_EVENT_GFX_SAILOR",
"x": 14, "x": 14,
"y": 6, "y": 6,
"elevation": 0, "elevation": 0,
@ -67,7 +67,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_MAN_5", "graphics_id": "OBJ_EVENT_GFX_MAN_5",
"x": 1, "x": 1,
"y": 9, "y": 9,
"elevation": 0, "elevation": 0,
@ -80,7 +80,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_TEALA", "graphics_id": "OBJ_EVENT_GFX_TEALA",
"x": 5, "x": 5,
"y": 5, "y": 5,
"elevation": 0, "elevation": 0,
@ -93,7 +93,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_TEALA", "graphics_id": "OBJ_EVENT_GFX_TEALA",
"x": 9, "x": 9,
"y": 5, "y": 5,
"elevation": 0, "elevation": 0,
@ -106,7 +106,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_TEALA", "graphics_id": "OBJ_EVENT_GFX_TEALA",
"x": 10, "x": 10,
"y": 4, "y": 4,
"elevation": 0, "elevation": 0,
@ -119,7 +119,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_GIRL_1", "graphics_id": "OBJ_EVENT_GFX_GIRL_1",
"x": 12, "x": 12,
"y": 10, "y": 10,
"elevation": 0, "elevation": 0,

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

@ -15,7 +15,7 @@
"connections": null, "connections": null,
"object_events": [ "object_events": [
{ {
"graphics_id": "EVENT_OBJ_GFX_OLD_MAN", "graphics_id": "OBJ_EVENT_GFX_OLD_MAN",
"x": 0, "x": 0,
"y": 6, "y": 6,
"elevation": 0, "elevation": 0,
@ -28,7 +28,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_BOY_3", "graphics_id": "OBJ_EVENT_GFX_BOY_3",
"x": 7, "x": 7,
"y": 6, "y": 6,
"elevation": 0, "elevation": 0,
@ -41,7 +41,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_BOY_2", "graphics_id": "OBJ_EVENT_GFX_BOY_2",
"x": 5, "x": 5,
"y": 4, "y": 4,
"elevation": 0, "elevation": 0,

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

@ -15,7 +15,7 @@
"connections": null, "connections": null,
"object_events": [ "object_events": [
{ {
"graphics_id": "EVENT_OBJ_GFX_MANIAC", "graphics_id": "OBJ_EVENT_GFX_MANIAC",
"x": 8, "x": 8,
"y": 4, "y": 4,
"elevation": 0, "elevation": 0,
@ -28,7 +28,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_MANIAC", "graphics_id": "OBJ_EVENT_GFX_MANIAC",
"x": 10, "x": 10,
"y": 4, "y": 4,
"elevation": 0, "elevation": 0,
@ -41,7 +41,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_MANIAC", "graphics_id": "OBJ_EVENT_GFX_MANIAC",
"x": 10, "x": 10,
"y": 3, "y": 3,
"elevation": 0, "elevation": 0,
@ -54,7 +54,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F", "graphics_id": "OBJ_EVENT_GFX_RUNNING_TRIATHLETE_F",
"x": 4, "x": 4,
"y": 6, "y": 6,
"elevation": 0, "elevation": 0,
@ -67,7 +67,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_MANIAC", "graphics_id": "OBJ_EVENT_GFX_MANIAC",
"x": 10, "x": 10,
"y": 5, "y": 5,
"elevation": 0, "elevation": 0,

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

@ -15,7 +15,7 @@
"connections": null, "connections": null,
"object_events": [ "object_events": [
{ {
"graphics_id": "EVENT_OBJ_GFX_HIKER", "graphics_id": "OBJ_EVENT_GFX_HIKER",
"x": 4, "x": 4,
"y": 6, "y": 6,
"elevation": 0, "elevation": 0,
@ -28,7 +28,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_FAT_MAN", "graphics_id": "OBJ_EVENT_GFX_FAT_MAN",
"x": 4, "x": 4,
"y": 4, "y": 4,
"elevation": 0, "elevation": 0,
@ -41,7 +41,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_WOMAN_2", "graphics_id": "OBJ_EVENT_GFX_WOMAN_2",
"x": 3, "x": 3,
"y": 5, "y": 5,
"elevation": 0, "elevation": 0,
@ -54,7 +54,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", "graphics_id": "OBJ_EVENT_GFX_POKEFAN_F",
"x": 5, "x": 5,
"y": 5, "y": 5,
"elevation": 0, "elevation": 0,
@ -67,7 +67,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_MAN_3", "graphics_id": "OBJ_EVENT_GFX_MAN_3",
"x": 0, "x": 0,
"y": 6, "y": 6,
"elevation": 0, "elevation": 0,

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

@ -15,7 +15,7 @@
"connections": null, "connections": null,
"object_events": [ "object_events": [
{ {
"graphics_id": "EVENT_OBJ_GFX_WOMAN_3", "graphics_id": "OBJ_EVENT_GFX_WOMAN_3",
"x": 4, "x": 4,
"y": 4, "y": 4,
"elevation": 0, "elevation": 0,
@ -28,7 +28,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_COOK", "graphics_id": "OBJ_EVENT_GFX_COOK",
"x": 6, "x": 6,
"y": 6, "y": 6,
"elevation": 0, "elevation": 0,
@ -41,7 +41,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_MAN_3", "graphics_id": "OBJ_EVENT_GFX_MAN_3",
"x": 0, "x": 0,
"y": 5, "y": 5,
"elevation": 0, "elevation": 0,

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

@ -15,7 +15,7 @@
"connections": null, "connections": null,
"object_events": [ "object_events": [
{ {
"graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL", "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL",
"x": 12, "x": 12,
"y": 4, "y": 4,
"elevation": 4, "elevation": 4,
@ -28,7 +28,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN",
"x": 0, "x": 0,
"y": 4, "y": 4,
"elevation": 3, "elevation": 3,
@ -41,7 +41,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT",
"x": 6, "x": 6,
"y": 5, "y": 5,
"elevation": 0, "elevation": 0,
@ -54,7 +54,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY", "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY",
"x": 11, "x": 11,
"y": 7, "y": 7,
"elevation": 0, "elevation": 0,

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

@ -15,7 +15,7 @@
"connections": null, "connections": null,
"object_events": [ "object_events": [
{ {
"graphics_id": "EVENT_OBJ_GFX_BEAUTY", "graphics_id": "OBJ_EVENT_GFX_BEAUTY",
"x": 2, "x": 2,
"y": 4, "y": 4,
"elevation": 0, "elevation": 0,

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

@ -15,7 +15,7 @@
"connections": null, "connections": null,
"object_events": [ "object_events": [
{ {
"graphics_id": "EVENT_OBJ_GFX_SAILOR", "graphics_id": "OBJ_EVENT_GFX_SAILOR",
"x": 0, "x": 0,
"y": 7, "y": 7,
"elevation": 0, "elevation": 0,
@ -28,7 +28,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_EXPERT_F", "graphics_id": "OBJ_EVENT_GFX_EXPERT_F",
"x": 2, "x": 2,
"y": 5, "y": 5,
"elevation": 0, "elevation": 0,
@ -41,7 +41,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_EXPERT_F", "graphics_id": "OBJ_EVENT_GFX_EXPERT_F",
"x": 6, "x": 6,
"y": 5, "y": 5,
"elevation": 0, "elevation": 0,
@ -54,7 +54,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN",
"x": 8, "x": 8,
"y": 3, "y": 3,
"elevation": 0, "elevation": 0,

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

@ -15,7 +15,7 @@
"connections": null, "connections": null,
"object_events": [ "object_events": [
{ {
"graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", "graphics_id": "OBJ_EVENT_GFX_NINJA_BOY",
"x": 4, "x": 4,
"y": 5, "y": 5,
"elevation": 0, "elevation": 0,
@ -28,7 +28,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_MAN_3", "graphics_id": "OBJ_EVENT_GFX_MAN_3",
"x": 8, "x": 8,
"y": 7, "y": 7,
"elevation": 0, "elevation": 0,
@ -41,7 +41,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_WOMAN_5", "graphics_id": "OBJ_EVENT_GFX_WOMAN_5",
"x": 8, "x": 8,
"y": 4, "y": 4,
"elevation": 0, "elevation": 0,

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

@ -15,7 +15,7 @@
"connections": null, "connections": null,
"object_events": [ "object_events": [
{ {
"graphics_id": "EVENT_OBJ_GFX_GIRL_2", "graphics_id": "OBJ_EVENT_GFX_GIRL_2",
"x": 6, "x": 6,
"y": 3, "y": 3,
"elevation": 0, "elevation": 0,

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

@ -15,7 +15,7 @@
"connections": null, "connections": null,
"object_events": [ "object_events": [
{ {
"graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE", "graphics_id": "OBJ_EVENT_GFX_MART_EMPLOYEE",
"x": 1, "x": 1,
"y": 3, "y": 3,
"elevation": 3, "elevation": 3,
@ -28,7 +28,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_OLD_WOMAN", "graphics_id": "OBJ_EVENT_GFX_OLD_WOMAN",
"x": 5, "x": 5,
"y": 4, "y": 4,
"elevation": 3, "elevation": 3,
@ -41,7 +41,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_OLD_MAN", "graphics_id": "OBJ_EVENT_GFX_OLD_MAN",
"x": 5, "x": 5,
"y": 5, "y": 5,
"elevation": 3, "elevation": 3,
@ -54,7 +54,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_BOY_2", "graphics_id": "OBJ_EVENT_GFX_BOY_2",
"x": 8, "x": 8,
"y": 4, "y": 4,
"elevation": 3, "elevation": 3,

52
data/maps/BattleFrontier_OutsideEast/map.json
View File

@ -21,7 +21,7 @@
], ],
"object_events": [ "object_events": [
{ {
"graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", "graphics_id": "OBJ_EVENT_GFX_NINJA_BOY",
"x": 20, "x": 20,
"y": 17, "y": 17,
"elevation": 0, "elevation": 0,
@ -34,7 +34,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_MAN_3", "graphics_id": "OBJ_EVENT_GFX_MAN_3",
"x": 42, "x": 42,
"y": 15, "y": 15,
"elevation": 0, "elevation": 0,
@ -47,7 +47,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_HIKER", "graphics_id": "OBJ_EVENT_GFX_HIKER",
"x": 53, "x": 53,
"y": 6, "y": 6,
"elevation": 0, "elevation": 0,
@ -60,7 +60,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_HEX_MANIAC", "graphics_id": "OBJ_EVENT_GFX_HEX_MANIAC",
"x": 54, "x": 54,
"y": 16, "y": 16,
"elevation": 0, "elevation": 0,
@ -73,7 +73,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT",
"x": 37, "x": 37,
"y": 32, "y": 32,
"elevation": 0, "elevation": 0,
@ -86,7 +86,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_COOK", "graphics_id": "OBJ_EVENT_GFX_COOK",
"x": 41, "x": 41,
"y": 56, "y": 56,
"elevation": 3, "elevation": 3,
@ -99,7 +99,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_EXPERT_F", "graphics_id": "OBJ_EVENT_GFX_EXPERT_F",
"x": 8, "x": 8,
"y": 46, "y": 46,
"elevation": 0, "elevation": 0,
@ -112,7 +112,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_RUNNING_TRIATHLETE_M", "graphics_id": "OBJ_EVENT_GFX_RUNNING_TRIATHLETE_M",
"x": 34, "x": 34,
"y": 41, "y": 41,
"elevation": 0, "elevation": 0,
@ -125,7 +125,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_RICH_BOY", "graphics_id": "OBJ_EVENT_GFX_RICH_BOY",
"x": 45, "x": 45,
"y": 47, "y": 47,
"elevation": 3, "elevation": 3,
@ -138,7 +138,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F", "graphics_id": "OBJ_EVENT_GFX_CYCLING_TRIATHLETE_F",
"x": 59, "x": 59,
"y": 35, "y": 35,
"elevation": 0, "elevation": 0,
@ -151,7 +151,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_TWIN", "graphics_id": "OBJ_EVENT_GFX_TWIN",
"x": 18, "x": 18,
"y": 40, "y": 40,
"elevation": 0, "elevation": 0,
@ -164,7 +164,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_MAN_1", "graphics_id": "OBJ_EVENT_GFX_MAN_1",
"x": 17, "x": 17,
"y": 40, "y": 40,
"elevation": 0, "elevation": 0,
@ -177,7 +177,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_ZIGZAGOON_2", "graphics_id": "OBJ_EVENT_GFX_ZIGZAGOON_2",
"x": 40, "x": 40,
"y": 56, "y": 56,
"elevation": 3, "elevation": 3,
@ -190,7 +190,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_SUDOWOODO", "graphics_id": "OBJ_EVENT_GFX_SUDOWOODO",
"x": 54, "x": 54,
"y": 62, "y": 62,
"elevation": 3, "elevation": 3,
@ -203,7 +203,7 @@
"flag": "FLAG_HIDE_BATTLE_FRONTIER_SUDOWOODO" "flag": "FLAG_HIDE_BATTLE_FRONTIER_SUDOWOODO"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_MANIAC", "graphics_id": "OBJ_EVENT_GFX_MANIAC",
"x": 42, "x": 42,
"y": 34, "y": 34,
"elevation": 3, "elevation": 3,
@ -216,7 +216,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_GIRL_3", "graphics_id": "OBJ_EVENT_GFX_GIRL_3",
"x": 51, "x": 51,
"y": 53, "y": 53,
"elevation": 3, "elevation": 3,
@ -229,7 +229,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_PSYCHIC_M", "graphics_id": "OBJ_EVENT_GFX_PSYCHIC_M",
"x": 62, "x": 62,
"y": 18, "y": 18,
"elevation": 0, "elevation": 0,
@ -242,7 +242,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_MAN_3", "graphics_id": "OBJ_EVENT_GFX_MAN_3",
"x": 11, "x": 11,
"y": 21, "y": 21,
"elevation": 0, "elevation": 0,
@ -255,7 +255,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_WOMAN_5", "graphics_id": "OBJ_EVENT_GFX_WOMAN_5",
"x": 10, "x": 10,
"y": 21, "y": 21,
"elevation": 0, "elevation": 0,
@ -268,7 +268,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_WOMAN_5", "graphics_id": "OBJ_EVENT_GFX_WOMAN_5",
"x": 16, "x": 16,
"y": 30, "y": 30,
"elevation": 0, "elevation": 0,
@ -281,7 +281,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT",
"x": 33, "x": 33,
"y": 14, "y": 14,
"elevation": 0, "elevation": 0,
@ -294,7 +294,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_MANIAC", "graphics_id": "OBJ_EVENT_GFX_MANIAC",
"x": 54, "x": 54,
"y": 31, "y": 31,
"elevation": 0, "elevation": 0,
@ -307,7 +307,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_WOMAN_4", "graphics_id": "OBJ_EVENT_GFX_WOMAN_4",
"x": 54, "x": 54,
"y": 32, "y": 32,
"elevation": 0, "elevation": 0,
@ -320,7 +320,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_OLD_WOMAN", "graphics_id": "OBJ_EVENT_GFX_OLD_WOMAN",
"x": 58, "x": 58,
"y": 55, "y": 55,
"elevation": 3, "elevation": 3,
@ -333,7 +333,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN",
"x": 48, "x": 48,
"y": 41, "y": 41,
"elevation": 0, "elevation": 0,
@ -346,7 +346,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_CAMPER", "graphics_id": "OBJ_EVENT_GFX_CAMPER",
"x": 29, "x": 29,
"y": 14, "y": 14,
"elevation": 0, "elevation": 0,

48
data/maps/BattleFrontier_OutsideWest/map.json
View File

@ -21,7 +21,7 @@
], ],
"object_events": [ "object_events": [
{ {
"graphics_id": "EVENT_OBJ_GFX_BOY_2", "graphics_id": "OBJ_EVENT_GFX_BOY_2",
"x": 26, "x": 26,
"y": 38, "y": 38,
"elevation": 0, "elevation": 0,
@ -34,7 +34,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_SS_TIDAL", "graphics_id": "OBJ_EVENT_GFX_SS_TIDAL",
"x": 20, "x": 20,
"y": 70, "y": 70,
"elevation": 0, "elevation": 0,
@ -47,7 +47,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_BEAUTY", "graphics_id": "OBJ_EVENT_GFX_BEAUTY",
"x": 19, "x": 19,
"y": 68, "y": 68,
"elevation": 0, "elevation": 0,
@ -60,7 +60,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_EXPERT_M", "graphics_id": "OBJ_EVENT_GFX_EXPERT_M",
"x": 26, "x": 26,
"y": 20, "y": 20,
"elevation": 0, "elevation": 0,
@ -73,7 +73,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_MAN_3", "graphics_id": "OBJ_EVENT_GFX_MAN_3",
"x": 27, "x": 27,
"y": 30, "y": 30,
"elevation": 0, "elevation": 0,
@ -86,7 +86,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_WOMAN_5", "graphics_id": "OBJ_EVENT_GFX_WOMAN_5",
"x": 33, "x": 33,
"y": 41, "y": 41,
"elevation": 0, "elevation": 0,
@ -99,7 +99,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_FAT_MAN", "graphics_id": "OBJ_EVENT_GFX_FAT_MAN",
"x": 28, "x": 28,
"y": 43, "y": 43,
"elevation": 0, "elevation": 0,
@ -112,7 +112,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN",
"x": 17, "x": 17,
"y": 20, "y": 20,
"elevation": 0, "elevation": 0,
@ -125,7 +125,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_MANIAC", "graphics_id": "OBJ_EVENT_GFX_MANIAC",
"x": 13, "x": 13,
"y": 44, "y": 44,
"elevation": 0, "elevation": 0,
@ -138,7 +138,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_MANIAC", "graphics_id": "OBJ_EVENT_GFX_MANIAC",
"x": 14, "x": 14,
"y": 44, "y": 44,
"elevation": 0, "elevation": 0,
@ -151,7 +151,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_MAN_5", "graphics_id": "OBJ_EVENT_GFX_MAN_5",
"x": 23, "x": 23,
"y": 47, "y": 47,
"elevation": 0, "elevation": 0,
@ -164,7 +164,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_GIRL_1", "graphics_id": "OBJ_EVENT_GFX_GIRL_1",
"x": 38, "x": 38,
"y": 27, "y": 27,
"elevation": 0, "elevation": 0,
@ -177,7 +177,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_WOMAN_3", "graphics_id": "OBJ_EVENT_GFX_WOMAN_3",
"x": 45, "x": 45,
"y": 18, "y": 18,
"elevation": 0, "elevation": 0,
@ -190,7 +190,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_CAMPER", "graphics_id": "OBJ_EVENT_GFX_CAMPER",
"x": 9, "x": 9,
"y": 47, "y": 47,
"elevation": 0, "elevation": 0,
@ -203,7 +203,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_LASS", "graphics_id": "OBJ_EVENT_GFX_LASS",
"x": 35, "x": 35,
"y": 5, "y": 5,
"elevation": 0, "elevation": 0,
@ -216,7 +216,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_MAN_2", "graphics_id": "OBJ_EVENT_GFX_MAN_2",
"x": 11, "x": 11,
"y": 66, "y": 66,
"elevation": 0, "elevation": 0,
@ -229,7 +229,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_FISHERMAN", "graphics_id": "OBJ_EVENT_GFX_FISHERMAN",
"x": 31, "x": 31,
"y": 31, "y": 31,
"elevation": 0, "elevation": 0,
@ -242,7 +242,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_FISHERMAN", "graphics_id": "OBJ_EVENT_GFX_FISHERMAN",
"x": 42, "x": 42,
"y": 48, "y": 48,
"elevation": 0, "elevation": 0,
@ -255,7 +255,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_FAT_MAN", "graphics_id": "OBJ_EVENT_GFX_FAT_MAN",
"x": 38, "x": 38,
"y": 22, "y": 22,
"elevation": 0, "elevation": 0,
@ -268,7 +268,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_WOMAN_2", "graphics_id": "OBJ_EVENT_GFX_WOMAN_2",
"x": 12, "x": 12,
"y": 9, "y": 9,
"elevation": 0, "elevation": 0,
@ -281,7 +281,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_BOY_1", "graphics_id": "OBJ_EVENT_GFX_BOY_1",
"x": 12, "x": 12,
"y": 10, "y": 10,
"elevation": 0, "elevation": 0,
@ -294,7 +294,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_OLD_MAN", "graphics_id": "OBJ_EVENT_GFX_OLD_MAN",
"x": 11, "x": 11,
"y": 10, "y": 10,
"elevation": 0, "elevation": 0,
@ -307,7 +307,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_MAN_4", "graphics_id": "OBJ_EVENT_GFX_MAN_4",
"x": 8, "x": 8,
"y": 5, "y": 5,
"elevation": 0, "elevation": 0,
@ -320,7 +320,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", "graphics_id": "OBJ_EVENT_GFX_POKEFAN_F",
"x": 4, "x": 4,
"y": 26, "y": 26,
"elevation": 0, "elevation": 0,

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

@ -15,7 +15,7 @@
"connections": null, "connections": null,
"object_events": [ "object_events": [
{ {
"graphics_id": "EVENT_OBJ_GFX_NURSE", "graphics_id": "OBJ_EVENT_GFX_NURSE",
"x": 7, "x": 7,
"y": 2, "y": 2,
"elevation": 3, "elevation": 3,
@ -28,7 +28,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_SCHOOL_KID_M", "graphics_id": "OBJ_EVENT_GFX_SCHOOL_KID_M",
"x": 4, "x": 4,
"y": 5, "y": 5,
"elevation": 3, "elevation": 3,
@ -41,7 +41,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_MAN_3", "graphics_id": "OBJ_EVENT_GFX_MAN_3",
"x": 11, "x": 11,
"y": 4, "y": 4,
"elevation": 3, "elevation": 3,
@ -54,7 +54,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_PICNICKER", "graphics_id": "OBJ_EVENT_GFX_PICNICKER",
"x": 2, "x": 2,
"y": 3, "y": 3,
"elevation": 3, "elevation": 3,
@ -67,7 +67,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_SKITTY", "graphics_id": "OBJ_EVENT_GFX_SKITTY",
"x": 1, "x": 1,
"y": 3, "y": 3,
"elevation": 3, "elevation": 3,

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

@ -15,7 +15,7 @@
"connections": null, "connections": null,
"object_events": [ "object_events": [
{ {
"graphics_id": "EVENT_OBJ_GFX_TEALA", "graphics_id": "OBJ_EVENT_GFX_TEALA",
"x": 6, "x": 6,
"y": 2, "y": 2,
"elevation": 0, "elevation": 0,
@ -28,7 +28,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_TEALA", "graphics_id": "OBJ_EVENT_GFX_TEALA",
"x": 2, "x": 2,
"y": 2, "y": 2,
"elevation": 0, "elevation": 0,
@ -41,7 +41,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_TEALA", "graphics_id": "OBJ_EVENT_GFX_TEALA",
"x": 10, "x": 10,
"y": 2, "y": 2,
"elevation": 0, "elevation": 0,
@ -54,7 +54,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_MYSTERY_GIFT_MAN", "graphics_id": "OBJ_EVENT_GFX_MYSTERY_GIFT_MAN",
"x": 1, "x": 1,
"y": 2, "y": 2,
"elevation": 0, "elevation": 0,

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

@ -15,7 +15,7 @@
"connections": null, "connections": null,
"object_events": [ "object_events": [
{ {
"graphics_id": "EVENT_OBJ_GFX_TEALA", "graphics_id": "OBJ_EVENT_GFX_TEALA",
"x": 24, "x": 24,
"y": 13, "y": 13,
"elevation": 3, "elevation": 3,
@ -28,7 +28,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", "graphics_id": "OBJ_EVENT_GFX_NINJA_BOY",
"x": 4, "x": 4,
"y": 10, "y": 10,
"elevation": 3, "elevation": 3,
@ -41,7 +41,7 @@
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_BOY_3", "graphics_id": "OBJ_EVENT_GFX_BOY_3",
"x": 44, "x": 44,
"y": 11, "y": 11,
"elevation": 3, "elevation": 3,

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